summaryrefslogtreecommitdiff
path: root/meta-pkgs
diff options
context:
space:
mode:
authorreed <reed>2004-10-20 14:33:30 +0000
committerreed <reed>2004-10-20 14:33:30 +0000
commit1adfef482305e13288c3245d3f326358e6a7ef8e (patch)
treec9f79e257286431d41da8a9b7cf4679153bb94b7 /meta-pkgs
parent9ebc50f90531490a25cad4731f580b1a607c0403 (diff)
downloadpkgsrc-1adfef482305e13288c3245d3f326358e6a7ef8e.tar.gz
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?)
Diffstat (limited to 'meta-pkgs')
-rw-r--r--meta-pkgs/xorg/Makefile.common5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common
index 068c6b24ee7..a52fa6cd697 100644
--- a/meta-pkgs/xorg/Makefile.common
+++ b/meta-pkgs/xorg/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2004/09/22 15:52:18 adam Exp $
+# $NetBSD: Makefile.common,v 1.11 2004/10/20 14:33:30 reed Exp $
#
# XBUILD_DIRS is the group of directories under ${WRKSRC} that will
# be built in.
@@ -108,6 +108,7 @@ NO_MTREE= # defined
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 @@ post-extract:
-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