summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2005-02-09 20:08:26 +0000
committerxtraeme <xtraeme@pkgsrc.org>2005-02-09 20:08:26 +0000
commit9010b56e01a7ae8a47edad4e5074c53b75b1a4a1 (patch)
treea8a31f0c001313d7cfe015e4603fb3a8919ef76f /x11
parent2f01c05e325e970cc7b2fe6710a96ff9b01416b9 (diff)
downloadpkgsrc-9010b56e01a7ae8a47edad4e5074c53b75b1a4a1.tar.gz
Apply patch from Jeremy C. Reed to define common values for the
manual pages on Linux. Also use unexec ${RMDIR} in a directory.
Diffstat (limited to 'x11')
-rw-r--r--x11/xorg-server/PLIST.common_end4
-rw-r--r--x11/xorg-server/files/host.def7
2 files changed, 8 insertions, 3 deletions
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@