On Wed, 9 Feb 2005, Juan RP wrote:

> > Hi, I want to fix PR pkg/29212... but before I want to know comments
> > about people who have installed xorg-server on a GNU/Linux distribution,
> > for example:
> >
> > 	* Do you have man/man4/foo.4x or foo.4?
> > 	  (Same with the sections 5 and 7).
> >
> > 	* The name of your Linux distribution you're using.
>
> Ok, so looks like SuSe and Debian are using 4, 5 and 7.

I have all man/man4/*.4x.

> I'll add the files into the PLIST.Linux, because our man definitions are ok
> (or at least for these distributions).

There has been a little discussion on the xorg list to get rid of these
distribution specific customizations.

By the way, the same problem is in XFree86-server also.

> If you have problems building xorg-server on Linux, please let me know.

Here is a fix:
(The patch x11/xorg-server/PLIST.common_end below is unrelated.)

This was not tested on non-Linux yet.

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.18
diff -b -u -r1.18 Makefile.common
--- meta-pkgs/xorg/Makefile.common	9 Feb 2005 18:42:22 -0000	1.18
+++ meta-pkgs/xorg/Makefile.common	9 Feb 2005 19:19:04 -0000
@@ -206,6 +206,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" \
 		-e "s|@CARDDRIVERS@|${CARDDRIVERS}|g" \
 		${FILESDIR}/host.def > ${WRKSRC}/config/cf/host.def
 	@${LN} -sf ${X11ROOT}/bin/gccmakedep ${WRKSRC}/config/util
cvs diff: Diffing x11/xorg-libs
cvs diff: Diffing x11/xorg-libs/files
cvs diff: Diffing x11/xorg-libs/patches
cvs diff: Diffing x11/xorg-server
Index: x11/xorg-server/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xorg-server/Makefile,v
retrieving revision 1.15
diff -b -u -r1.15 Makefile
--- x11/xorg-server/Makefile	24 Jan 2005 17:24:08 -0000	1.15
+++ x11/xorg-server/Makefile	9 Feb 2005 19:19:05 -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 \
Index: x11/xorg-server/PLIST.common_end
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xorg-server/PLIST.common_end,v
retrieving revision 1.2
diff -b -u -r1.2 PLIST.common_end
--- x11/xorg-server/PLIST.common_end	8 Oct 2004 03:35:25 -0000	1.2
+++ x11/xorg-server/PLIST.common_end	9 Feb 2005 19:19:05 -0000
@@ -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}
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.7
diff -b -u -r1.7 host.def
--- x11/xorg-server/files/host.def	24 Jan 2005 10:57:27 -0000	1.7
+++ x11/xorg-server/files/host.def	9 Feb 2005 19:19:05 -0000
@@ -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@


 Jeremy C. Reed

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