Subject: please test xorg-server patch for manpages
To: None <tech-pkg@netbsd.org>
From: Jeremy C. Reed <reed@reedmedia.net>
List: tech-pkg
Date: 01/07/2005 09:27:46
It was noticed that installing xorg-server on different Linux platforms
had different filename suffix for the driver and misc man pages.

I tested the following patch, but I want to make sure it is okay for other
platforms.

Please test and let me know what platforms it worked for you on.

(It is too slow for me to test on different platforms.)

Thank you

cvs diff: Diffing meta-pkgs/xorg
Index: meta-pkgs/xorg/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/meta-pkgs/xorg/Makefile.common,v
retrieving revision 1.14
diff -b -u -r1.14 Makefile.common
--- meta-pkgs/xorg/Makefile.common	27 Dec 2004 17:26:19 -0000	1.14
+++ meta-pkgs/xorg/Makefile.common	7 Jan 2005 17:03:34 -0000
@@ -203,6 +203,10 @@
 		-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" \
 		${FILESDIR}/host.def > ${WRKSRC}/config/cf/host.def
 	@${LN} -sf ${X11ROOT}/bin/gccmakedep ${WRKSRC}/config/util
 	@${LN} -sf ${X11ROOT}/bin/revpath ${WRKSRC}/config/util
cvs diff: Diffing x11/xorg-server
Index: x11/xorg-server/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xorg-server/Makefile,v
retrieving revision 1.13
diff -b -u -r1.13 Makefile
--- x11/xorg-server/Makefile	7 Jan 2005 16:57:36 -0000	1.13
+++ x11/xorg-server/Makefile	7 Jan 2005 17:03:34 -0000
@@ -2,7 +2,7 @@

 DISTNAME=		${DISTFILES}
 PKGNAME=		xorg-server-${XORG_VER}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XORG}
 DISTFILES=		X11R${XORG_VER}-src1.tar.gz \
cvs diff: Diffing x11/xorg-server/files
Index: x11/xorg-server/files/host.def
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xorg-server/files/host.def,v
retrieving revision 1.6
diff -b -u -r1.6 host.def
--- x11/xorg-server/files/host.def	23 Dec 2004 12:39:10 -0000	1.6
+++ x11/xorg-server/files/host.def	7 Jan 2005 17:03:34 -0000
@@ -57,3 +57,8 @@

 #define HasFontconfig YES
 #define FontconfigDir @BLNK@
+
+#define DriverManSuffix @KERNMAN_SUFFIX@
+#define MiscManSuffix @MISCMAN_SUFFIX@
+#define MiscManDir @PREFIX@/@MISCMAN_DIR@
+#define DriverManDir @PREFIX@/@KERNMAN_DIR@


 Jeremy C. Reed

 	  	 	 BSD News, BSD tutorials, BSD links
	  	 	 http://www.bsdnewsletter.com/