tech-pkg: making xorg-clients uses CONF

Subject: making xorg-clients uses CONF_FILES for xdm configs
To: None <xtraeme@NetBSD.org>
From: Jeremy C. Reed <reed@reedmedia.net>
List: tech-pkg
Date: 10/19/2004 14:06:03
Reinstalling xorg-clients makes you lose the xdm configurations (unless
you put your configs in non-default location).

I worked on the xdm part. (Others need to be done like twm.)

Please have a look at all the patches below.

 Jeremy C. Reed

? x11/xorg-libs/patches/patch-am
? x11/xorg-libs/patches/patch-an
? x11/xorg-libs/patches/patch-ao
? x11/xorg-libs/patches/patch-ap
Index: meta-pkgs/xorg/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/meta-pkgs/xorg/Makefile.common,v
retrieving revision 1.10
diff -b -u -r1.10 Makefile.common
--- meta-pkgs/xorg/Makefile.common	22 Sep 2004 15:52:18 -0000	1.10
+++ meta-pkgs/xorg/Makefile.common	19 Oct 2004 21:02:33 -0000
@@ -108,6 +108,7 @@
 WRKSRC?=		${WRKDIR}/xc
 X11ROOT?=		${LOCALBASE}/${X11ROOT_PREFIX}
 PREPEND_PATH+=		${X11ROOT}/bin # Make sure we have this in PATH :)
+EGDIR=			${LOCALBASE}/share/examples/xorg

 PLIST_SUBST+=		X11ROOT_PREFIX=${X11ROOT_PREFIX}
 MESSAGE_SUBST+=		X11ROOT=${X11ROOT}
@@ -164,6 +165,8 @@
 		-e "s|@LDFLAGS@|${GLOBAL_LDFLAGS}|g" \
 		-e "s|@WRKSRC@|${WRKSRC}|g" \
 		-e "s|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g" \
+		-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \
+		-e "s|@EGDIR@|${EGDIR}|g" \
 		${FILESDIR}/host.def > ${WRKSRC}/config/cf/host.def
 	@${LN} -sf ${X11ROOT}/bin/gccmakedep ${WRKSRC}/config/util
 	@${LN} -sf ${X11ROOT}/bin/revpath ${WRKSRC}/config/util
Index: x11/xorg-libs/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xorg-libs/distinfo,v
retrieving revision 1.5
diff -b -u -r1.5 distinfo
--- x11/xorg-libs/distinfo	8 Oct 2004 03:35:25 -0000	1.5
+++ x11/xorg-libs/distinfo	19 Oct 2004 21:02:33 -0000
@@ -16,3 +16,7 @@
 SHA1 (patch-aj) = 78855dfdafe76695290636e170f69b6685ad23e1
 SHA1 (patch-ak) = d600481936a6b141dc1247e1af2270e224b03b22
 SHA1 (patch-al) = cb82cecd7147da8edd19d9f38a0789f07cddea87
+SHA1 (patch-am) = a907d42a4d2a72871e165b99afdba81945d656c7
+SHA1 (patch-an) = 56a4d6e936744cf514c35197d8b179d65878de5d
+SHA1 (patch-ao) = 1fd087d39c57308febfbe5378db9dfe830ed3e00
+SHA1 (patch-ap) = 4a69e2df26e850ee33c1f7e6acc45ac205a46cd5
Index: x11/xorg-clients/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xorg-clients/Makefile,v
retrieving revision 1.6
diff -b -u -r1.6 Makefile
--- x11/xorg-clients/Makefile	4 Oct 2004 12:32:19 -0000	1.6
+++ x11/xorg-clients/Makefile	19 Oct 2004 21:02:33 -0000
@@ -2,7 +2,7 @@

 DISTNAME=		${DISTFILES}
 PKGNAME=		xorg-clients-${XORG_VER}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XORG}
 DISTFILES=		X11R${XORG_VER}-src1.tar.gz \
@@ -15,6 +15,7 @@

 USE_X11=		yes
 USE_BUILDLINK3=		yes
+USE_PKGINSTALL=		yes
 DISTINFO_FILE=		${.CURDIR}/../../x11/xorg-libs/distinfo
 PATCHDIR=		${.CURDIR}/../../x11/xorg-libs/patches

@@ -22,6 +23,18 @@
 XINSTALL_DIRS=		programs fonts/util
 XINSTALL_MAN_DIRS=	programs

+EGDIR=			${LOCALBASE}/share/examples/xorg/xdm
+PKG_SYSCONFSUBDIR=	xorg/xdm
+CONF_FILES=		${EGDIR}/xdm/xdm-config ${PKG_SYSCONFDIR}/xdm-config
+CONF_FILES+=		${EGDIR}/xdm/Xservers ${PKG_SYSCONFDIR}/Xservers
+CONF_FILES+=		${EGDIR}/xdm/Xresources ${PKG_SYSCONFDIR}/Xresources
+CONF_FILES+=		${EGDIR}/xdm/Xaccess ${PKG_SYSCONFDIR}/Xaccess
+CONF_FILES_PERMS=	${EGDIR}/xdm/Xsetup_0 ${PKG_SYSCONFDIR}/Xsetup_0 ${ROOT_USER} ${ROOT_GROUP} 0755
+CONF_FILES_PERMS+=	${EGDIR}/xdm/Xsession ${PKG_SYSCONFDIR}/Xsession ${ROOT_USER} ${ROOT_GROUP} 0755
+CONF_FILES_PERMS+=	${EGDIR}/xdm/TakeConsole ${PKG_SYSCONFDIR}/TakeConsole ${ROOT_USER} ${ROOT_GROUP} 0755
+CONF_FILES_PERMS+=	${EGDIR}/xdm/GiveConsole ${PKG_SYSCONFDIR}/GiveConsole ${ROOT_USER} ${ROOT_GROUP} 0755
+CONF_FILES_PERMS+=	${EGDIR}/xdm/Xwilling ${PKG_SYSCONFDIR}/Xwilling ${ROOT_USER} ${ROOT_GROUP} 0755
+
 post-buildlink:
 	@${MKDIR} ${WRKSRC}/exports/include
 	@${CP} ${X11ROOT}/include/X11/fonts/*.h ${BUILDLINK_DIR}/include
Index: x11/xorg-clients/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xorg-clients/PLIST,v
retrieving revision 1.3
diff -b -u -r1.3 PLIST
--- x11/xorg-clients/PLIST	4 Oct 2004 12:32:19 -0000	1.3
+++ x11/xorg-clients/PLIST	19 Oct 2004 21:02:36 -0000
@@ -7,6 +7,7 @@
 ${X11ROOT_PREFIX}/bin/beforelight
 ${X11ROOT_PREFIX}/bin/bitmap
 ${X11ROOT_PREFIX}/bin/bmtoa
+${X11ROOT_PREFIX}/bin/chooser
 ${X11ROOT_PREFIX}/bin/cxpm
 ${X11ROOT_PREFIX}/bin/dga
 ${X11ROOT_PREFIX}/bin/dpsexec
@@ -135,6 +136,8 @@
 ${X11ROOT_PREFIX}/include/X11/bitmaps/box6
 ${X11ROOT_PREFIX}/include/X11/bitmaps/ldblarrow
 ${X11ROOT_PREFIX}/include/X11/bitmaps/rdblarrow
+${X11ROOT_PREFIX}/include/X11/pixmaps/xorg-bw.xpm
+${X11ROOT_PREFIX}/include/X11/pixmaps/xorg.xpm
 ${X11ROOT_PREFIX}/lib/X11/app-defaults/Beforelight
 ${X11ROOT_PREFIX}/lib/X11/app-defaults/Bitmap
 ${X11ROOT_PREFIX}/lib/X11/app-defaults/Bitmap-color
@@ -363,18 +366,6 @@
 ${X11ROOT_PREFIX}/lib/X11/x11perfcomp/fillblnk
 ${X11ROOT_PREFIX}/lib/X11/x11perfcomp/perfboth
 ${X11ROOT_PREFIX}/lib/X11/x11perfcomp/perfratio
-${X11ROOT_PREFIX}/lib/X11/xdm/GiveConsole
-${X11ROOT_PREFIX}/lib/X11/xdm/TakeConsole
-${X11ROOT_PREFIX}/lib/X11/xdm/Xaccess
-${X11ROOT_PREFIX}/lib/X11/xdm/Xresources
-${X11ROOT_PREFIX}/lib/X11/xdm/Xservers
-${X11ROOT_PREFIX}/lib/X11/xdm/Xsession
-${X11ROOT_PREFIX}/lib/X11/xdm/Xsetup_0
-${X11ROOT_PREFIX}/lib/X11/xdm/Xwilling
-${X11ROOT_PREFIX}/lib/X11/xdm/chooser
-${X11ROOT_PREFIX}/lib/X11/xdm/pixmaps/xorg-bw.xpm
-${X11ROOT_PREFIX}/lib/X11/xdm/pixmaps/xorg.xpm
-${X11ROOT_PREFIX}/lib/X11/xdm/xdm-config
 ${X11ROOT_PREFIX}/lib/X11/xedit/lisp/indent.lsp
 ${X11ROOT_PREFIX}/lib/X11/xedit/lisp/lisp.lsp
 ${X11ROOT_PREFIX}/lib/X11/xedit/lisp/progmodes/c.lsp
@@ -863,6 +854,17 @@
 ${X11ROOT_PREFIX}/${MAN_DIR}/xprehashprinterlist.${MAN_SUFFIX}
 ${X11ROOT_PREFIX}/${MAN_DIR}/xpsimplehelloworld.${MAN_SUFFIX}
 ${X11ROOT_PREFIX}/${MAN_DIR}/xpxthelloworld.${MAN_SUFFIX}
+share/examples/xorg/xdm/GiveConsole
+share/examples/xorg/xdm/TakeConsole
+share/examples/xorg/xdm/Xaccess
+share/examples/xorg/xdm/Xresources
+share/examples/xorg/xdm/Xservers
+share/examples/xorg/xdm/Xsession
+share/examples/xorg/xdm/Xsetup_0
+share/examples/xorg/xdm/Xwilling
+share/examples/xorg/xdm/xdm-config
+@dirrm share/examples/xorg/xdm
+@dirrm share/examples/xorg
 @dirrm ${X11ROOT_PREFIX}/lib/X11/xsm
 @dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/types
 @dirrm ${X11ROOT_PREFIX}/lib/X11/xkb/symbols/xfree68
@@ -896,8 +898,6 @@
 @dirrm ${X11ROOT_PREFIX}/lib/X11/xedit/lisp/progmodes
 @dirrm ${X11ROOT_PREFIX}/lib/X11/xedit/lisp
 @dirrm ${X11ROOT_PREFIX}/lib/X11/xedit
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xdm/pixmaps
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xdm
 @dirrm ${X11ROOT_PREFIX}/lib/X11/x11perfcomp
 @dirrm ${X11ROOT_PREFIX}/lib/X11/twm
 @dirrm ${X11ROOT_PREFIX}/lib/X11/rstart/contexts
@@ -916,3 +916,4 @@
 @dirrm ${X11ROOT_PREFIX}/lib/X11/icons
 @dirrm ${X11ROOT_PREFIX}/lib/X11/fonts/util
 @dirrm ${X11ROOT_PREFIX}/include/X11/PM
+@dirrm ${X11ROOT_PREFIX}/include/X11/pixmaps
Index: x11/xorg-clients/files/host.def
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xorg-clients/files/host.def,v
retrieving revision 1.3
diff -b -u -r1.3 host.def
--- x11/xorg-clients/files/host.def	21 Sep 2004 17:38:53 -0000	1.3
+++ x11/xorg-clients/files/host.def	19 Oct 2004 21:02:37 -0000
@@ -64,3 +64,6 @@

 #define HasFontconfig YES
 #define FontconfigDir @BLNK@
+
+#define XdmDir @PKG_SYSCONFDIR@
+#define XdmEgDir @EGDIR@

This is x11/xorg-libs/patches/patch-am

$NetBSD$

--- programs/xdm/Imakefile.orig	2004-07-26 15:56:33.000000000 -0700
+++ programs/xdm/Imakefile
@@ -195,6 +195,13 @@ LIFREQ_FLAGS = -Xa
 #endif
 #endif

+XDMLOGDIR = $(LOGDIRECTORY)
+#ifdef VarRunDirectory
+XDMPIDDIR = $(VARRUNDIR)
+#else
+XDMPIDDIR = $(XDMDIR)
+#endif
+
   SYS_LIBRARIES = $(SYS_LIBRARIES1) $(SYS_LIBRARIES2) $(SYS_LIBRARIES3)

    XDMCONFIGDIR = XdmConfigurationSubdirectory
@@ -252,7 +259,8 @@ LOCAL_LIBRARIES = $(GREETLIBS) $(XMULIB)
 #endif
        PROGRAMS = ProgramTargetName(xdm) ProgramTargetName(xdmshell) ProgramTargetName(sessreg) $(CHOOSER) $(XDM_SHADOW)

-    CHOOSERPATH = $(XDMDIR)/chooser
+    CHOOSERPATH = $(BINDIR)/chooser
+ GREETERLIBPATH = $(USRLIBDIR)/libXdmGreet.so
  OSMAJORVERSION = OSMajorVersion
  OSMINORVERSION = OSMinorVersion
    CONN_DEFINES = $(CONNECTION_FLAGS)
@@ -267,6 +275,10 @@ LOCAL_LIBRARIES = $(GREETLIBS) $(XMULIB)
 		$(XPM_DEFINES) $(XINERAMA_DEFINES) $(PROCTITLE_DEFINES) \
 		$(IFADDRS_DEFINES) $(IPV6_DEFINES) $(MKSTEMP_DEFINES)
    EXTRAMANDEFS = $(RANDOM_DEFINES) -DCHOOSERPATH=$(CHOOSERPATH) \
+		-DGREETERLIBPATH=$(GREETERLIBPATH) \
+		-DXDMDIR=$(XDMDIR) \
+		-DXDMAUTHDIR=$(XDMVARDIR) \
+		-DXDMPIDDIR=$(XDMPIDDIR) \
 		-DXDMLOGDIR=$(XDMLOGDIR)

 XCOMM
@@ -290,8 +302,8 @@ RES_DEFINES = '-DDEF_SERVER_LINE=":0 loc
 		  '-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \
 		  '-DDEF_XDM_CONFIG="$(XDMDIR)/xdm-config"' \
 		  '-DDEF_CHOOSER="$(CHOOSERPATH)"' \
-		  '-DDEF_AUTH_DIR="$(XDMDIR)"' \
-		  '-DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so"'
+		  '-DDEF_AUTH_DIR="$(XDMVARDIR)"' \
+		  '-DDEF_GREETER_LIB="$(GREETERLIBPATH)"'

 ComplexProgramTarget_1(xdm,$(LOCAL_LIBRARIES),NullParameter)
 #ifdef LinkConfDirectory
@@ -316,7 +328,7 @@ SpecialCObjectRule(daemon,$(ICONFIGFILES
 #if BuildChooser
 SpecialCObjectRule(chooser, $(ICONFIGFILES), $(SOCK_DEFINES) $(LIFREQ_FLAGS))
 NormalProgramTarget(chooser,$(OBJS3),$(DEPLIBS3),$(LIBS3),NullParameter)
-InstallProgram(chooser,$(XDMDIR))
+InstallProgram(chooser,$(BINDIR))
 InstallAppDefaults(Chooser)
 #endif
 #if BuildBoth

This is x11/xorg-libs/patches/patch-an

$NetBSD$

--- programs/xdm/xdm.man.orig	2004-07-26 15:56:33.000000000 -0700
+++ programs/xdm/xdm.man
@@ -164,7 +164,7 @@ as resources.
 Names the configuration file, which specifies resources to control
 the behavior of
 .I xdm.
-.I __projectroot__/lib/X11/xdm/xdm-config
+.I XDMDIR/xdm-config
 is the default.
 See the section \fBConfiguration File\fP.
 .IP "\fB\-nodaemon\fP"
@@ -306,7 +306,7 @@ uses the \fIlockf\fP library call, while
 This names a directory under which
 .I xdm
 stores authorization files while initializing the session.  The
-default value is \fI __projectroot__/lib/X11/xdm.\fP
+default value is \fI\&XDMAUTHDIR\fP.
 Can be overridden for specific displays by
 DisplayManager.\fIDISPLAY\fP.authFile.
 .IP \fBDisplayManager.autoRescan\fP
@@ -374,7 +374,7 @@ algorithm is used instead.
 .IP \fBDisplayManager.greeterLib\fP
 On systems that support a dynamically-loadable greeter library, the
 name of the library.  The default is
-\fI __projectroot__/lib/X11/xdm/libXdmGreet.so\fP.
+\fI\&GREETERLIBPATH\fP.
 .IP \fBDisplayManager.choiceTimeout\fP
 Number of seconds to wait for display to respond after user has
 selected a host from the chooser.  If the display sends an XDMCP
@@ -406,7 +406,7 @@ section
 which describes the various
 resources that are appropriate to place in this file.
 There is no default value for this resource, but
-\fI __projectroot__/lib/X11/xdm/Xresources\fP
+\fI\&XDMDIR/Xresources\fP
 is the conventional name.
 .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.chooser\fP"
 Specifies the program run to offer a host menu for Indirect queries
@@ -599,7 +599,7 @@ variable XAUTHORITY at the created file.
 First, the
 .I xdm
 configuration file should be set up.
-Make a directory (usually \fI __projectroot__/lib/X11/xdm\fP) to contain all
+Make a directory (usually \fI\&XDMDIR\fP) to contain all
 of the relevant files.
 .LP
 Here is a reasonable configuration file, which could be
@@ -608,12 +608,12 @@ named \fIxdm-config\fP:

 .ta .5i 4i

-	DisplayManager.servers:	__projectroot__/lib/X11/xdm/Xservers
+	DisplayManager.servers:	XDMDIR/Xservers
 	DisplayManager.errorLogFile:	XDMLOGDIR/xdm.log
-	DisplayManager*resources:	__projectroot__/lib/X11/xdm/Xresources
-	DisplayManager*startup:	__projectroot__/lib/X11/xdm/Xstartup
-	DisplayManager*session:	__projectroot__/lib/X11/xdm/Xsession
-	DisplayManager.pidFile:	__projectroot__/lib/X11/xdm/xdm-pid
+	DisplayManager*resources:	XDMDIR/Xresources
+	DisplayManager*startup:	XDMDIR/Xstartup
+	DisplayManager*session:	XDMDIR/Xsession
+	DisplayManager.pidFile:	XDMPIDDIR/xdm-pid
 	DisplayManager._0.authorize:	true
 	DisplayManager*authorize:	false

@@ -1123,8 +1123,8 @@ Here is a sample \fIXstartup\fP script:
 		xmessage\0\-file /etc/nologin\0\-timeout 30\0\-center
 		exit 1
 	fi
-	sessreg\0\-a\0\-l $DISPLAY\0\-x __projectroot__/lib/xdm/Xservers $LOGNAME
-	__projectroot__/lib/xdm/GiveConsole
+	sessreg\0\-a\0\-l $DISPLAY\0\-x XDMDIR/Xservers $LOGNAME
+	XDMDIR/GiveConsole
 	exit 0
 .fi
 .SH "SESSION PROGRAM"
@@ -1237,8 +1237,8 @@ A sample \fIXreset\fP script:
 \&	#
 \&	# This program is run as root after the session ends
 \&	#
-	sessreg\0\-d\0\-l $DISPLAY\0\-x __projectroot__/lib/xdm/Xservers $LOGNAME
-	__projectroot__/lib/xdm/TakeConsole
+	sessreg\0\-d\0\-l $DISPLAY\0\-x XDMDIR/Xservers $LOGNAME
+	XDMDIR/TakeConsole
 	exit 0
 .fi
 .SH "CONTROLLING THE SERVER"
@@ -1341,7 +1341,7 @@ interested in
 .I xinit.
 .SH FILES
 .TP 20
-.I __projectroot__/lib/X11/xdm/xdm-config
+.I XDMDIR/xdm-config
 the default configuration file
 .TP 20
 .I $HOME/.Xauthority
@@ -1359,7 +1359,7 @@ the default server
 .I __projectroot__/bin/xterm
 the default session program and failsafe client
 .TP 20
-.I __projectroot__/lib/X11/xdm/A<display>\-<suffix>
+.I XDMAUTHDIR/A<display>\-<suffix>
 the default place for authorization files
 .TP 20
 .I /tmp/K5C<display>

This is x11/xorg-libs/patches/patch-ao

$NetBSD$

--- programs/xdm/config/Imakefile.orig	2004-07-26 23:24:47.000000000 -0700
+++ programs/xdm/config/Imakefile
@@ -23,9 +23,9 @@ DEFAULTVT=vt7
 # define XdmbwPixmap XVendorStdFilePrefix-bw.xpm
 #endif

-CHOOSERPATH = $(XDMDIR)/chooser
+CHOOSERPATH = $(BINDIR)/chooser

-XPM_DEFINES=-DXPM -DBITMAPDIR=$(XDMDIR)/pixmaps -DXDM_PIXMAP=XdmPixmap\ @@\
+XPM_DEFINES=-DXPM -DBITMAPDIR=$(INCDIR)/X11/pixmaps -DXDM_PIXMAP=XdmPixmap\ @@\
 	-DXDM_BWPIXMAP=XdmbwPixmap

 XDMLOGDIR = $(LOGDIRECTORY)
@@ -42,21 +42,22 @@ SU = su
 #endif

 CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT),NullParameter)
-CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH),NullParameter)
+CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMAUTHDIR=$(XDMVARDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH),NullParameter)
 CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter)

 LinkFile(Xservers,Xservers.$(SERVERSTYPE))

 #if InstallXdmConfig
-InstallNonExecFile(xdm-config,$(XDMDIR))
-InstallNonExecFile(Xresources,$(XDMDIR))
-InstallNonExecFile(Xservers,$(XDMDIR))
-InstallNonExecFile(Xaccess,$(XDMDIR))
-InstallNamedProg(Xsession,Xsession,$(XDMDIR))
-InstallNamedProg(GiveConsole,GiveConsole,$(XDMDIR))
-InstallNamedProg(TakeConsole,TakeConsole,$(XDMDIR))
-InstallNamedProg(Xsetup_0,Xsetup_0,$(XDMDIR))
-InstallNamedProg(Xwilling,Xwilling,$(XDMDIR))
+XDMEGDIR = XdmEgDir
+InstallNonExecFile(xdm-config,$(XDMEGDIR))
+InstallNonExecFile(Xresources,$(XDMEGDIR))
+InstallNonExecFile(Xservers,$(XDMEGDIR))
+InstallNonExecFile(Xaccess,$(XDMEGDIR))
+InstallNamedProg(Xsession,Xsession,$(XDMEGDIR))
+InstallNamedProg(GiveConsole,GiveConsole,$(XDMEGDIR))
+InstallNamedProg(TakeConsole,TakeConsole,$(XDMEGDIR))
+InstallNamedProg(Xsetup_0,Xsetup_0,$(XDMEGDIR))
+InstallNamedProg(Xwilling,Xwilling,$(XDMEGDIR))
 #else
 InstallNonExecFileNoClobber(xdm-config,$(XDMDIR))
 InstallNonExecFileNoClobber(Xresources,$(XDMDIR))
@@ -70,8 +71,8 @@ InstallNamedProgNoClobber(Xwilling,Xwill
 #endif

 #if InstallXdmConfig
-InstallNonExecFile(XdmPixmap,$(XDMDIR)/pixmaps)
-InstallNonExecFile(XdmbwPixmap,$(XDMDIR)/pixmaps)
+InstallNonExecFile(XdmPixmap,$(INCDIR)/X11/pixmaps)
+InstallNonExecFile(XdmbwPixmap,$(INCDIR)/X11/pixmaps)
 #else
 InstallNonExecFileNoClobber(XdmPixmap,$(XDMDIR)/pixmaps)
 InstallNonExecFileNoClobber(XdmbwPixmap,$(XDMDIR)/pixmaps)

This is x11/xorg-libs/patches/patch-ap

$NetBSD$

--- programs/xdm/config/xdm-conf.cpp.orig	2004-04-23 12:54:43.000000000 -0700
+++ programs/xdm/config/xdm-conf.cpp
@@ -11,6 +11,7 @@ DisplayManager.keyFile:		XDMDIR/xdm-keys
 DisplayManager.servers:		XDMDIR/Xservers
 DisplayManager.accessFile:	XDMDIR/Xaccess
 DisplayManager.willing:		SU nobody -c XDMDIR/Xwilling
+DisplayManager.authDir		XDMAUTHDIR
 ! All displays should use authorization, but we cannot be sure
 ! X terminals may not be configured that way, so they will require
 ! individual resource settings.