>Number:         15041
>Category:       pkg
>Synopsis:       x11/xdm3d with xpkwedge doesn't work properly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Dec 23 21:24:00 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     Robert Elz
>Release:        NetBSD 1.5Z (-current of 20011212 pkgsrc 20011218)
>Organization:
	Prince of SOngkla University
>Environment:
	<The following information is extracted from your kernel. Please>
	<append output of "ldd", "ident" where relevant (multiple lines).>
System: NetBSD fuchsia 1.5Z NetBSD 1.5Z (FUCHSIA) #3: Wed Dec 12 01:54:04 ICT 2001 kre@fuchsia:/usr/obj/sys/FUCHSIA i386
Architecture: i386
Machine: i386
>Description:
	When xpkgwedge is installed, xdm3d has incorrect paths
	compiled into it.
>How-To-Repeat:
	The easy way to see this is:

	install xpkwedge
	make xdm3d
	strings xdm3d | grep /

	Observe that the paths to standard executables are set to
	be /usr/pkg/bin (xterm xrdb X itself ...)

>Fix:
	A fix that seems to work is to include the following two patches.
	(patch-ab and patch-ac - the existing patch-aa is not altered)
	It probably isn't the best way though.

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	patches/patch-ab
#	patches/patch-ac
#
echo x - patches/patch-ab
sed 's/^X//' >patches/patch-ab << 'END-of-patches/patch-ab'
X+++ Imakefile	Sun Dec 23 11:46:41 2001
X@@ -4,7 +4,7 @@
X #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
X 
X #undef XDMDIR
X-XDMDIR=$(X11BASE)/share/xdm3d
X+XDMDIR=$(PREFIX)/share/xdm3d
X 
X #ifndef BuildChooser
X #define BuildChooser !SystemV
X@@ -202,18 +202,18 @@
X XCOMM
X XCOMM Do NOT change these lines!
X XCOMM
X-DEF_SERVER = $(BINDIR)/X
X+DEF_SERVER = $(X11BASE)/bin/X
X DEF_USER_PATH = DefaultUserPath		/* no leading spaces or imake will */
X DEF_SYSTEM_PATH = DefaultSystemPath	/* indent as rule */
X BOURNE_SHELL = DefaultSystemShell
X #ifndef OS2Architecture
X RES_DEFINES = '-DDEF_SERVER_LINE=":0 local $(DEF_SERVER) :0"' \
X-		  '-DXRDB_PROGRAM="$(BINDIR)/xrdb"' \
X-		  '-DDEF_SESSION="$(BINDIR)/xterm -ls"' \
X+		  '-DXRDB_PROGRAM="$(X11BASE)/bin/xrdb"' \
X+		  '-DDEF_SESSION="$(X11BASE)/bin/xterm -ls"' \
X 		  '-DDEF_USER_PATH="$(DEF_USER_PATH)"' \
X 		  '-DDEF_SYSTEM_PATH="$(DEF_SYSTEM_PATH)"' \
X 		  '-DDEF_SYSTEM_SHELL="$(BOURNE_SHELL)"' \
X-		  '-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \
X+		  '-DDEF_FAILSAFE_CLIENT="$(X11BASE)/bin/xterm"' \
X 		  '-DDEF_XDM_CONFIG="$(XDMDIR)/xdm-config"' \
X 		  '-DDEF_CHOOSER="$(XDMDIR)/chooser"' \
X 		  '-DDEF_AUTH_DIR="$(XDMDIR)"' \
END-of-patches/patch-ab
echo x - patches/patch-ac
sed 's/^X//' >patches/patch-ac << 'END-of-patches/patch-ac'
X+++ xdmshell.c	Sun Dec 23 16:42:32 2001
X@@ -186,7 +186,7 @@
X      * exec /usr/bin/X11/xdm -nodaemon -udpPort 0
X      */
X     strcpy (cmdbuf, BINDIR);
X-    strcat (cmdbuf, "/xdm");
X+    strcat (cmdbuf, "/xdm3d");
X     args[0] = cmdbuf;
X     args[1] = "-nodaemon";
X     args[2] = "-udpPort";
END-of-patches/patch-ac
exit

>Release-Note:
>Audit-Trail:
>Unformatted:
 	<Please check that the above is correct for the bug being reported,>
 	<and append source date of snapshot, if applicable (one line).>