Make xdm use configs from under PKG_SYSCONFDIR.

Some ideas came from NetBSD's XFree86 customizations.

Use USE_PKGINSTALL and CONF_FILES for xorg-clients.
Installs xdm configs (and shell scripts) to examples directory.
Create OWN_DIRS for the authDir.

PLIST changes are for chooser is now in bin directory.
And pixmaps moved to include/X11/pixmaps directory.
xdm configs are no longer in lib/X11/xdm (so they are no longer lost
on reinstall).

(Anyone want to do twm and other configs?)

3 files changed, 40 insertions, 18 deletions

diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile
index 4eb796c8b75..dbff1af1c3a 100644
--- a/x11/xorg-clients/Makefile
+++ b/x11/xorg-clients/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2004/10/04 12:32:19 hira Exp $
+# $NetBSD: Makefile,v 1.7 2004/10/20 14:33:30 reed Exp $
 
 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 @@ COMMENT=		X.org client programs and related files
 
 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,23 @@ XBUILD_DIRS=		lib/xtrans lib/lbxutil programs fonts/util
 XINSTALL_DIRS=		programs fonts/util
 XINSTALL_MAN_DIRS=	programs
 
+# XXX todo: define build's VarDirectory to pkgsrc's VARBASE
+OWN_DIRS=               ${VARBASE}/lib/xdm
+OWN_DIRS_PERMS+=        ${VARBASE}/lib/xdm/authdir ${ROOT_USER} ${ROOT_GROUP} 0700
+OWN_DIRS_PERMS+=        ${VARBASE}/lib/xdm/authdir/authfiles ${ROOT_USER} ${ROOT_GROUP} 0700
+
+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
diff --git a/x11/xorg-clients/PLIST b/x11/xorg-clients/PLIST
index 4115f3f484a..74597dc11b2 100644
--- a/x11/xorg-clients/PLIST
+++ b/x11/xorg-clients/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/10/04 12:32:19 hira Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/10/20 14:33:30 reed Exp $
 ${X11ROOT_PREFIX}/bin/Xmark
 ${X11ROOT_PREFIX}/bin/appres
 ${X11ROOT_PREFIX}/bin/atobm
@@ -7,6 +7,7 @@ ${X11ROOT_PREFIX}/bin/bdftruncate
 ${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/black6
 ${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/twm/system.twmrc
 ${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}/xplsprinters.${MAN_SUFFIX}
 ${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 @@ ${X11ROOT_PREFIX}/${MAN_DIR}/xpxthelloworld.${MAN_SUFFIX}
 @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 @@ ${X11ROOT_PREFIX}/${MAN_DIR}/xpxthelloworld.${MAN_SUFFIX}
 @dirrm ${X11ROOT_PREFIX}/lib/X11/icons
 @dirrm ${X11ROOT_PREFIX}/lib/X11/fonts/util
 @dirrm ${X11ROOT_PREFIX}/include/X11/PM
+@unexec ${RMDIR} %D/${X11ROOT_PREFIX}/include/X11/pixmaps 2>/dev/null || ${TRUE}
diff --git a/x11/xorg-clients/files/host.def b/x11/xorg-clients/files/host.def
index f32b804d3f8..0cddb87c192 100644
--- a/x11/xorg-clients/files/host.def
+++ b/x11/xorg-clients/files/host.def
@@ -1,4 +1,4 @@
-/* $NetBSD: host.def,v 1.3 2004/09/21 17:38:53 xtraeme Exp $ */
+/* $NetBSD: host.def,v 1.4 2004/10/20 14:33:30 reed Exp $ */
 
 #define ProjectRoot @PREFIX@
 #define BuildHtmlManPages NO
@@ -64,3 +64,6 @@
 
 #define HasFontconfig YES
 #define FontconfigDir @BLNK@
+
+#define XdmDir @PKG_SYSCONFDIR@
+#define XdmEgDir @EGDIR@