diff options
| -rw-r--r-- | meta-pkgs/xorg/Makefile.common | 6 | ||||
| -rw-r--r-- | x11/xorg-server/PLIST.common_end | 4 | ||||
| -rw-r--r-- | x11/xorg-server/files/host.def | 7 |
3 files changed, 13 insertions, 4 deletions
diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common index 9cb49e0c49c..f5168643cb5 100644 --- a/meta-pkgs/xorg/Makefile.common +++ b/meta-pkgs/xorg/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.18 2005/02/09 18:42:22 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.19 2005/02/09 20:08:26 xtraeme Exp $ # # XBUILD_DIRS is the group of directories under ${WRKSRC} that will # be built in. @@ -206,6 +206,10 @@ post-extract: -e "s|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g" \ -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \ -e "s|@EGDIR@|${EGDIR}|g" \ + -e "s|@KERNMAN_SUFFIX@|${KERNMAN_SUFFIX}|g" \ + -e "s|@MISCMAN_SUFFIX@|${MISCMAN_SUFFIX}|g" \ + -e "s|@KERNMAN_DIR@|${KERNMAN_DIR}|g" \ + -e "s|@MISCMAN_DIR@|${MISCMAN_DIR}|g" \ -e "s|@CARDDRIVERS@|${CARDDRIVERS}|g" \ ${FILESDIR}/host.def > ${WRKSRC}/config/cf/host.def @${LN} -sf ${X11ROOT}/bin/gccmakedep ${WRKSRC}/config/util diff --git a/x11/xorg-server/PLIST.common_end b/x11/xorg-server/PLIST.common_end index 734549360dc..9022bab0514 100644 --- a/x11/xorg-server/PLIST.common_end +++ b/x11/xorg-server/PLIST.common_end @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common_end,v 1.2 2004/10/08 03:35:25 xtraeme Exp $ +@comment $NetBSD: PLIST.common_end,v 1.3 2005/02/09 20:08:26 xtraeme Exp $ @dirrm ${X11ROOT_PREFIX}/lib/modules/input @dirrm ${X11ROOT_PREFIX}/lib/modules/fonts @dirrm ${X11ROOT_PREFIX}/lib/modules/extensions @@ -28,4 +28,4 @@ @dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/en_US @dirrm ${X11ROOT_PREFIX}/lib/X11/xserver @dirrm ${X11ROOT_PREFIX}/lib/X11/getconfig -@dirrm ${X11ROOT_PREFIX}/include/X11/pixmaps +@unexec ${RMDIR} %D/${X11ROOT_PREFIX}/include/X11/pixmaps 2>/dev/null || ${TRUE} diff --git a/x11/xorg-server/files/host.def b/x11/xorg-server/files/host.def index 18dd9e6279c..5442e07221e 100644 --- a/x11/xorg-server/files/host.def +++ b/x11/xorg-server/files/host.def @@ -1,4 +1,4 @@ -/* $NetBSD: host.def,v 1.7 2005/01/24 10:57:27 hira Exp $ */ +/* $NetBSD: host.def,v 1.8 2005/02/09 20:08:26 xtraeme Exp $ */ #define ProjectRoot @PREFIX@ #define BuildHtmlManPages NO @@ -58,4 +58,9 @@ #define HasFontconfig YES #define FontconfigDir @BLNK@ +#define DriverManSuffix @KERNMAN_SUFFIX@ +#define MiscManSuffix @MISCMAN_SUFFIX@ +#define MiscManDir @PREFIX@/@MISCMAN_DIR@ +#define DriverManDir @PREFIX@/@KERNMAN_DIR@ + #define XF86CardDrivers @CARDDRIVERS@ |