[pkgsrc/trunk]: pkgsrc Fix CONF_FILES in xorg-clients, the 'xdm' subdir alrea...

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/881c6e8c9592
branches:  trunk
changeset: 482908:881c6e8c9592
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Fri Nov 05 02:58:56 2004 +0000

description:
Fix CONF_FILES in xorg-clients, the 'xdm' subdir already was set by
EGDIR! (hi reed!)

diffstat:

 meta-pkgs/xorg/Makefile.common |   4 ++--
 x11/xorg-clients/Makefile      |  21 +++++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diffs (57 lines):

diff -r 8a825d391b2a -r 881c6e8c9592 meta-pkgs/xorg/Makefile.common
--- a/meta-pkgs/xorg/Makefile.common    Thu Nov 04 22:51:58 2004 +0000
+++ b/meta-pkgs/xorg/Makefile.common    Fri Nov 05 02:58:56 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2004/11/01 23:41:59 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.13 2004/11/05 02:58:56 xtraeme Exp $
 #
 # XBUILD_DIRS is the group of directories under ${WRKSRC} that will 
 #   be built in.
@@ -128,7 +128,7 @@
 WRKSRC?=               ${WRKDIR}/xc
 X11ROOT?=              ${LOCALBASE}/${X11ROOT_PREFIX}
 PREPEND_PATH+=         ${X11ROOT}/bin # Make sure we have this in PATH :)
-EGDIR=                 ${LOCALBASE}/share/examples/xorg
+EGDIR?=                        ${LOCALBASE}/share/examples/xorg
 
 PLIST_SUBST+=          X11ROOT_PREFIX=${X11ROOT_PREFIX}
 MESSAGE_SUBST+=                X11ROOT=${X11ROOT}
diff -r 8a825d391b2a -r 881c6e8c9592 x11/xorg-clients/Makefile
--- a/x11/xorg-clients/Makefile Thu Nov 04 22:51:58 2004 +0000
+++ b/x11/xorg-clients/Makefile Fri Nov 05 02:58:56 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/10/20 18:55:57 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2004/11/05 02:58:56 xtraeme Exp $
 
 DISTNAME=              ${DISTFILES}
 PKGNAME=               xorg-clients-${XORG_VER}
@@ -32,19 +32,20 @@
 
 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 \
+
+CONF_FILES=            ${EGDIR}/xdm-config ${PKG_SYSCONFDIR}/xdm-config
+CONF_FILES+=           ${EGDIR}/Xservers ${PKG_SYSCONFDIR}/Xservers
+CONF_FILES+=           ${EGDIR}/Xresources ${PKG_SYSCONFDIR}/Xresources
+CONF_FILES+=           ${EGDIR}/Xaccess ${PKG_SYSCONFDIR}/Xaccess
+CONF_FILES_PERMS=      ${EGDIR}/Xsetup_0 ${PKG_SYSCONFDIR}/Xsetup_0 \
        ${ROOT_USER} ${ROOT_GROUP} 0755
-CONF_FILES_PERMS+=     ${EGDIR}/xdm/Xsession ${PKG_SYSCONFDIR}/Xsession \
+CONF_FILES_PERMS+=     ${EGDIR}/Xsession ${PKG_SYSCONFDIR}/Xsession \
        ${ROOT_USER} ${ROOT_GROUP} 0755
-CONF_FILES_PERMS+=     ${EGDIR}/xdm/TakeConsole ${PKG_SYSCONFDIR}/TakeConsole \
+CONF_FILES_PERMS+=     ${EGDIR}/TakeConsole ${PKG_SYSCONFDIR}/TakeConsole \
        ${ROOT_USER} ${ROOT_GROUP} 0755
-CONF_FILES_PERMS+=     ${EGDIR}/xdm/GiveConsole ${PKG_SYSCONFDIR}/GiveConsole \
+CONF_FILES_PERMS+=     ${EGDIR}/GiveConsole ${PKG_SYSCONFDIR}/GiveConsole \
        ${ROOT_USER} ${ROOT_GROUP} 0755
-CONF_FILES_PERMS+=     ${EGDIR}/xdm/Xwilling ${PKG_SYSCONFDIR}/Xwilling \
+CONF_FILES_PERMS+=     ${EGDIR}/Xwilling ${PKG_SYSCONFDIR}/Xwilling \
        ${ROOT_USER} ${ROOT_GROUP} 0755
 
 post-buildlink: