summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorreed <reed>2005-10-05 00:31:23 +0000
committerreed <reed>2005-10-05 00:31:23 +0000
commit905ea4ec67473d15f7d6237493a3da7ae7b40e63 (patch)
treef5f96b168a86460e69a953a4c9998e3255b8cb9a
parentb1dd54168417941c66489f25e3dc507f8f0165ec (diff)
downloadpkgsrc-905ea4ec67473d15f7d6237493a3da7ae7b40e63.tar.gz
Define FileManSuffix and FileManDir (just like already done
for MiscMan, DriverMan). This is to fix ongoing problem where I find manpages installed to 5x instead of 5 and PLIST is wrong so won't package. (I saw this on Linux and I tested this on Linux and NetBSD.)
-rw-r--r--meta-pkgs/xorg/Makefile.common4
-rw-r--r--x11/xorg-server/files/host.def4
2 files changed, 6 insertions, 2 deletions
diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common
index 4cad1485b69..c4ca34e9bf0 100644
--- a/meta-pkgs/xorg/Makefile.common
+++ b/meta-pkgs/xorg/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.34 2005/10/05 00:26:50 reed Exp $
+# $NetBSD: Makefile.common,v 1.35 2005/10/05 00:31:23 reed Exp $
#
# XBUILD_DIRS is the group of directories under ${WRKSRC} that will
# be built in.
@@ -253,8 +253,10 @@ post-extract:
-e "s|@EGDIR@|${EGDIR}|g" \
-e "s|@KERNMAN_SUFFIX@|${KERNMAN_SUFFIX}|g" \
-e "s|@MISCMAN_SUFFIX@|${MISCMAN_SUFFIX}|g" \
+ -e "s|@FILEMAN_SUFFIX@|${FILEMAN_SUFFIX}|g" \
-e "s|@KERNMAN_DIR@|${KERNMAN_DIR}|g" \
-e "s|@MISCMAN_DIR@|${MISCMAN_DIR}|g" \
+ -e "s|@FILEMAN_DIR@|${FILEMAN_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/files/host.def b/x11/xorg-server/files/host.def
index b860c47394f..caed252b1e4 100644
--- a/x11/xorg-server/files/host.def
+++ b/x11/xorg-server/files/host.def
@@ -1,4 +1,4 @@
-/* $NetBSD: host.def,v 1.11 2005/10/05 00:24:11 reed Exp $ */
+/* $NetBSD: host.def,v 1.12 2005/10/05 00:31:23 reed Exp $ */
#define ProjectRoot @PREFIX@
#define BuildHtmlManPages NO
@@ -65,5 +65,7 @@
#define DriverManSuffix @KERNMAN_SUFFIX@
#define MiscManSuffix @MISCMAN_SUFFIX@
+#define FileManSuffix @FILEMAN_SUFFIX@
#define MiscManDir @PREFIX@/@MISCMAN_DIR@
#define DriverManDir @PREFIX@/@KERNMAN_DIR@
+#define FileManDir @PREFIX@/@FILEMAN_DIR@