- Grab a fix for ati driver panel mode decoding from Marc La France. [1]

- Install driver manpages with 'x' postfix so the ones that clash with
  FreeBSD ones are easier to obtain. [2]
- Fix plist.

PR:		ports/25576 [2]
Obtained from:	XFree86 CVS [1]
Reported and tested by:	julian [1]

4 files changed, 138 insertions, 51 deletions

diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index ce81ea46360c..5afd4211fa10 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Server
 PORTVERSION=	4.4.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
@@ -77,20 +77,20 @@ MAN3=			XF86VidMode.3 \
 			XF86VidModeSwitchMode.3 \
 			XF86VidModeSwitchToMode.3 \
 			XF86VidModeValidateModeLine.3
-MAN4=			citron.4 \
-			dynapro.4 \
-			elographics.4 \
-			fbdevhw.4 \
-			kbd.4 \
-			keyboard.4 \
-			microtouch.4 \
-			mouse.4 \
-			mutouch.4 \
-			nv.4 \
-			r128.4 \
-			radeon.4 \
-			void.4 \
-			wacom.4
+MAN4=			citron.4x \
+			dynapro.4x \
+			elographics.4x \
+			fbdevhw.4x \
+			kbd.4x \
+			keyboard.4x \
+			microtouch.4x \
+			mouse.4x \
+			mutouch.4x \
+			nv.4x \
+			r128.4x \
+			radeon.4x \
+			void.4x \
+			wacom.4x
 MAN5=			XF86Config.5 \
 			getconfig.5
 PKGMESSAGE=		${WRKDIR}/.pkg-message
@@ -119,26 +119,28 @@ PLIST_SUB+=		DRI="@comment "
 
 .if ${ARCH} == alpha
 PLIST_SUB+=	ALPHA_NA="@comment "
-MAN4+=		cirrus.4
+MAN4+=		cirrus.4x
 .else
 PLIST_SUB+=	ALPHA_NA=""
 .endif
 
 .if ${ARCH} == amd64
 PLIST_SUB+=	AMD64_NA="@comment "
-MAN4+=		apm.4 \
-		chips.4 \
-		cirrus.4 \
-		cyrix.4 \
-		fbdev.4 \
-		i128.4 \
-		neomagic.4 \
-		sis.4 \
-		trident.4 \
-		tseng.4 \
-		vesa.4
+PLIST_SUB+=	AMD64=""
+MAN4+=		apm.4x \
+		chips.4x \
+		cirrus.4x \
+		cyrix.4x \
+		fbdev.4x \
+		i128.4x \
+		neomagic.4x \
+		sis.4x \
+		trident.4x \
+		tseng.4x \
+		vesa.4x
 .else
 PLIST_SUB+=	AMD64_NA=""
+PLIST_SUB+=	AMD64="@comment "
 .endif
 
 .if ${ARCH} == ia64
@@ -150,38 +152,38 @@ PLIST_SUB+=	IA64_NA=""
 .if ${ARCH} == sparc64
 PLIST_SUB+=	SPARC64_NA="@comment "
 PLIST_SUB+=	SPARC64=""
-MAN4+=		sunffb.4
+MAN4+=		sunffb.4x
 .else
 PLIST_SUB+=	SPARC64="@comment "
 PLIST_SUB+=	SPARC64_NA=""
-MAN4+=		glint.4 \
-		mga.4 \
-		rendition.4 \
-		s3virge.4 \
-		savage.4 \
-		siliconmotion.4 \
-		tdfx.4 \
-		vga.4
+MAN4+=		glint.4x \
+		mga.4x \
+		rendition.4x \
+		s3virge.4x \
+		savage.4x \
+		siliconmotion.4x \
+		tdfx.4x \
+		vga.4x
 .endif
 
 .if ${ARCH} == i386
 PLIST_SUB+=	I386=""
 MAN1+=		scanpci.1
-MAN4+=		apm.4 \
-		chips.4 \
-		cirrus.4 \
-		cyrix.4 \
-		i128.4 \
-		i740.4 \
-		i810.4 \
-		neomagic.4 \
-		nsc.4 \
-		sis.4 \
-		trident.4 \
-		tseng.4 \
-		vesa.4 \
-		via.4 \
-		vmware.4
+MAN4+=		apm.4x \
+		chips.4x \
+		cirrus.4x \
+		cyrix.4x \
+		i128.4x \
+		i740.4x \
+		i810.4x \
+		neomagic.4x \
+		nsc.4x \
+		sis.4x \
+		trident.4x \
+		tseng.4x \
+		vesa.4x \
+		via.4x \
+		vmware.4x
 .else
 PLIST_SUB+=	I386="@comment "
 .endif
diff --git a/x11-servers/XFree86-4-Server/files/patch-atimobility b/x11-servers/XFree86-4-Server/files/patch-atimobility
new file mode 100644
index 000000000000..b263a250ad5b
--- /dev/null
+++ b/x11-servers/XFree86-4-Server/files/patch-atimobility
@@ -0,0 +1,76 @@
+diff -ruN ../../orig/xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c ./programs/Xserver/hw/xfree86/drivers/ati/atimode.c
+--- ../../orig/xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c	Wed Jan 12 13:01:31 2005
++++ ./programs/Xserver/hw/xfree86/drivers/ati/atimode.c	Fri Feb  4 07:52:01 2005
+@@ -1,4 +1,4 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c,v 1.20 2004/12/31 16:07:06 tsi Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c,v 1.20tsi Exp $ */
+ /*
+  * Copyright 2000 through 2005 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
+  *
+@@ -646,7 +646,7 @@
+                             SetBits(pMode->CrtcVDisplay, CRTC_V_DISP);
+                     pATIHW->crtc_v_sync_strt_wid =
+                         SetBits(pMode->CrtcVSyncStart, CRTC_V_SYNC_STRT) |
+-                            SetBits(pMode->CrtcVSyncEnd, CRTC_V_SYNC_WID);
++                            SetBits(pMode->CrtcVSyncEnd, CRTC_V_SYNC_END_VGA);
+                     if (pMode->Flags & V_NVSYNC)
+                         pATIHW->crtc_v_sync_strt_wid |= CRTC_V_SYNC_POL;
+                 }
+diff -ruN ../../orig/xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c ./programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c
+--- ../../orig/xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c	Wed Jan 12 13:01:31 2005
++++ ./programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c	Fri Feb  4 07:52:01 2005
+@@ -1,4 +1,4 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.79 2004/12/31 16:07:06 tsi Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.79tsi Exp $ */
+ /*
+  * Copyright 1999 through 2005 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
+  *
+@@ -1900,10 +1900,10 @@
+                 VDisplay = GetBits(pATIHW->crtc_v_total_disp, CRTC_V_DISP);
+                 VSyncStart =
+                     GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_STRT);
+-                VSyncEnd = (VSyncStart & ~MaxBits(CRTC_V_SYNC_WID)) |
+-                    GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_WID);
++                VSyncEnd = (VSyncStart & ~MaxBits(CRTC_V_SYNC_END_VGA)) |
++                    GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_END_VGA);
+                 if (VSyncStart > VSyncEnd)
+-                    VSyncEnd += MaxBits(CRTC_V_SYNC_WID) + 1;
++                    VSyncEnd += MaxBits(CRTC_V_SYNC_END_VGA) + 1;
+                 VTotal = GetBits(pATIHW->crtc_v_total_disp, CRTC_V_TOTAL);
+ 
+                 VBlankStart = (VDisplay & ~0x03FFU) |
+@@ -2175,7 +2175,7 @@
+                 if ((pATIHW->horz_stretching &
+                     (HORZ_STRETCH_EN | AUTO_HORZ_RATIO)) !=
+                     (HORZ_STRETCH_EN | AUTO_HORZ_RATIO))
+-                    xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
++                    xf86DrvMsgVerb(pScreenInfo->scrnIndex, X_WARNING, 4,
+                         "Inconsistent panel horizontal dimension:"
+                         "  %d and %d.\n", pATI->LCDHorizontal, HDisplay);
+                 HDisplay = pATI->LCDHorizontal;
+@@ -2191,7 +2191,7 @@
+             {
+                 if (!(pATIHW->vert_stretching & VERT_STRETCH_EN) ||
+                     !(pATIHW->ext_vert_stretch & AUTO_VERT_RATIO))
+-                    xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
++                    xf86DrvMsgVerb(pScreenInfo->scrnIndex, X_WARNING, 4,
+                         "Inconsistent panel vertical dimension:  %d and %d.\n",
+                         pATI->LCDVertical, VDisplay);
+                 VDisplay = pATI->LCDVertical;
+diff -ruN ../../orig/xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h ./programs/Xserver/hw/xfree86/drivers/ati/atiregs.h
+--- ../../orig/xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h	Wed Jan 12 13:01:32 2005
++++ ./programs/Xserver/hw/xfree86/drivers/ati/atiregs.h	Fri Feb  4 07:52:01 2005
+@@ -1,4 +1,4 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h,v 1.26 2004/12/31 16:07:07 tsi Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h,v 1.26tsi Exp $ */
+ /*
+  * Copyright 1994 through 2005 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
+  *
+@@ -551,6 +551,7 @@
+ #define CRTC_V_SYNC_STRT		0x000007fful
+ /*	?				0x0000f800ul */
+ #define CRTC_V_SYNC_WID			0x001f0000ul
++#define CRTC_V_SYNC_END_VGA		0x000f0000ul
+ #define CRTC_V_SYNC_POL			0x00200000ul
+ /*	?				0xffc00000ul */
+ #define CRTC_VLINE_CRNT_VLINE	IOPortTag(0x04u, 0x04u)
diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist
index 2f16bf548484..f56b79fee502 100644
--- a/x11-servers/XFree86-4-Server/pkg-plist
+++ b/x11-servers/XFree86-4-Server/pkg-plist
@@ -119,6 +119,8 @@ lib/modules/drivers/atimisc_drv.o
 %%SPARC64_NA%%lib/modules/drivers/cirrus_drv.o
 %%SPARC64_NA%%lib/modules/drivers/cirrus_laguna.o
 %%AMD64_I386%%lib/modules/drivers/cyrix_drv.o
+%%AMD64%%lib/modules/drivers/dummy_drv.o
+%%AMD64%%lib/modules/drivers/fbdev_drv.o
 %%SPARC64_NA%%lib/modules/drivers/glint_drv.o
 %%AMD64_I386%%lib/modules/drivers/i128_drv.o
 %%I386%%lib/modules/drivers/i740_drv.o
@@ -200,3 +202,5 @@ lib/modules/libxf8_32bpp.a
 %%SPARC64%%lib/modules/libxf8_32wid.a
 %%SPARC64_NA%%lib/modules/v10002d.uc
 %%SPARC64_NA%%lib/modules/v20002d.uc
+@dirrm lib/X11/getconfig
+@unexec rmdir %D/lib/X11/doc/Japanese 2>/dev/null || true
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index 56650d6df900..cae9a5090e8a 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -35,6 +35,11 @@ echo "#define BuildXF86DRM NO"			>> $LOCALDEF
 echo "#define InstSrcDir $WRKDIR/drmsource"	>> $LOCALDEF
 echo "#define HasGlide3 YES"			>> $LOCALDEF
 
+# Install driver manpages as foo.4x so they can easily be accesed by
+# 'man 4x foo'
+echo "#define DriverManSuffix 4x"		>> $LOCALDEF
+echo "#define DriverManDir \$(MANSOURCEPATH)4"	>> $LOCALDEF
+
 # disable some options
 for i in \
 	BuildFonts \