3 files changed, 31 insertions, 28 deletions

diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 05e15c9e7ffe..981748848552 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Server
 PORTVERSION=	4.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE} \
 		ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
@@ -19,7 +19,7 @@ DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap
 EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
 IGNOREFILES=	Wraphelp.c
 
-MAINTAINER=	taguchi@tohoku.iij.ad.jp
+MAINTAINER=	anholt@freebsd.org
 
 XFREE86_VERSION=	4
 USE_IMAKE=		YES
@@ -37,8 +37,7 @@ SCRIPTS_ENV=		OSVERSION=${OSVERSION} \
 			BuildXF86DRI=${BuildXF86DRI} \
 			HasGlide3=${HasGlide3} \
 			HaveMatroxHal=${HaveMatroxHal}
-MAKE_ENV=		MAN_INSTALL_TARGET=FreeBSDPortsInstall.man WORLDOPTS=
-MAKE_ARGS=		WORLDOPTS=
+MAKE_ENV=		MAN_INSTALL_TARGET=FreeBSDPortsInstall.man
 ALL_TARGET=		FreeBSDPortsBuild
 INSTALL_TARGET=		FreeBSDPortsInstall  FreeBSDPortsInstall.man
 MAN1=			XFree86.1 \
@@ -65,6 +64,7 @@ MAN4=			mga.4 \
 			tdfx.4 \
 			glint.4 \
 			s3virge.4 \
+			r128.4 \
 			rendition.4 \
 			savage.4 \
 			nv.4 \
@@ -114,7 +114,6 @@ PLIST_SUB+=	ALPHA_NA="@comment "
 .else
 PLIST_SUB+=	ALPHA_NA=""
 MAN1+=		scanpci.1
-MAN4+=		vmware.4
 .endif
 
 .if ${ARCH} == i386
@@ -129,11 +128,11 @@ MAN4+=		apm.4 \
 		i740.4 \
 		i810.4 \
 		neomagic.4 \
-		r128.4 \
 		sis.4 \
 		trident.4 \
 		tseng.4 \
-		vesa.4
+		vesa.4 \
+		vmware.4
 .else
 PLIST_SUB+=	I386:="@comment "
 .endif
@@ -198,6 +197,7 @@ PLIST_SUB+=		MATROX="@comment "
 
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
+	@cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure
 
 post-build:
 	@${RM} -f ${PKGMESSAGE}
diff --git a/x11-servers/XFree86-4-Server-snap/pkg-plist b/x11-servers/XFree86-4-Server-snap/pkg-plist
index d083ffa1510b..a52cea5e9f79 100644
--- a/x11-servers/XFree86-4-Server-snap/pkg-plist
+++ b/x11-servers/XFree86-4-Server-snap/pkg-plist
@@ -24,7 +24,7 @@ lib/X11/doc/README.DRIcomp
 %%I386:%%lib/X11/doc/README.I128
 %%I386:%%lib/X11/doc/README.SiS
 %%I386:%%lib/X11/doc/README.apm
-%%I386:%%lib/X11/doc/README.ati
+lib/X11/doc/README.ati
 %%I386:%%lib/X11/doc/README.chips
 %%I386:%%lib/X11/doc/README.cyrix
 lib/X11/doc/README.dps
@@ -82,14 +82,14 @@ lib/modules/codeconv/libVISCII.a
 %%I386:%%%%DRI%%lib/modules/dri/i810_dri.so
 %%I386:%%%%DRI%%lib/modules/dri/i830_dri.so
 %%DRI%%lib/modules/dri/mga_dri.so
-%%I386:%%%%DRI%%lib/modules/dri/radeon_dri.so
-%%I386:%%%%DRI%%lib/modules/dri/r128_dri.so
+%%DRI%%lib/modules/dri/radeon_dri.so
+%%DRI%%lib/modules/dri/r128_dri.so
 %%I386:%%%%DRI%%lib/modules/dri/sis_dri.so
 %%DRI%%lib/modules/dri/tdfx_dri.so
 %%I386:%%lib/modules/drivers/apm_drv.o
 %%I386:%%lib/modules/drivers/ark_drv.o
-%%I386:%%lib/modules/drivers/ati_drv.o
-%%I386:%%lib/modules/drivers/atimisc_drv.o
+lib/modules/drivers/ati_drv.o
+lib/modules/drivers/atimisc_drv.o
 %%I386:%%lib/modules/drivers/chips_drv.o
 %%I386:%%lib/modules/drivers/cirrus_alpine.o
 %%I386:%%lib/modules/drivers/cirrus_drv.o
@@ -104,8 +104,8 @@ lib/modules/drivers/mga_drv.o
 %%MATROX%%lib/modules/drivers/mga_hal_drv.o
 %%I386:%%lib/modules/drivers/neomagic_drv.o
 lib/modules/drivers/nv_drv.o
-%%I386:%%lib/modules/drivers/r128_drv.o
-%%I386:%%lib/modules/drivers/radeon_drv.o
+lib/modules/drivers/r128_drv.o
+lib/modules/drivers/radeon_drv.o
 lib/modules/drivers/rendition_drv.o
 lib/modules/drivers/s3_drv.o
 lib/modules/drivers/s3virge_drv.o
diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index 7b98c307c507..b7f67d6c4d8b 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -25,7 +25,7 @@ configure () {
     # It's good for FreeBSD ports/packages system.
     echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF
 
-    # Now, We can use this configuration.
+    # Now, we can use this configuration.
     # Thanks, Trevor Johnson <trevor@jpj.net>
     echo "#define InstallXserverSetUID NO" >> $LOCALDEF
 
@@ -79,25 +79,28 @@ configure () {
     echo "#define XF86Server YES" >> $LOCALDEF
     echo "#define BuildServersOnly YES" >> $LOCALDEF
     echo "#define BuildXFree86ConfigTools YES" >> $LOCALDEF
+    
+    # More of the i386 drivers could probably move to XF86CardDrivers.
+    # Is fbdev driver useful to us?
+    # GlideDriver was left out because we have no Glide2 package.
     cat >> $LOCALDEF <<END
 #ifndef XF86CardDrivers
 #ifdef i386Architecture
-#define XF86CardDrivers         mga glint nv tga s3 s3virge sis rendition \
-                                neomagic i740 tdfx savage \
-                                cirrus vmware tseng trident chips apm \
-                                GlideDriver fbdev i128 \
-                                ati AgpGartDrivers DevelDrivers ark cyrix \
-				siliconmotion \
-				vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
-#else
-#ifdef AlphaArchitecture
-#define XF86CardDrivers         mga tdfx glint s3 s3virge rendition tga \
-				savage nv DevelDrivers siliconmotion vga \
-				XF86OSCardDrivers XF86ExtraCardDrivers
-#endif
+#define ArchSpecificDrivers	apm ark chips cirrus cyrix fbdev i740 \
+				i128 i810 neomagic sis trident tseng \
+				vesa vmware
+#define DriDrivers		gamma tdfx mga i810 i830 r128 radeon sis
+#elif defined(AlphaArchitecture)
+#define ArchSpecificDrivers
+#define DriDrivers		gamma tdfx mga r128 radeon
 #endif
+#define XF86CardDrivers		ati glint mga nv rendition s3 s3virge \
+				savage siliconmotion tdfx tga vga \
+				ArchSpecificDrivers DevelDrivers \
+				XF86OSCardDrivers XF86ExtraCardDrivers
 #endif
 END
+
     echo "#define BuildThreadStubLibrary YES" >> $LOCALDEF
     echo "#define FreeBSDBuildXxserv YES" >> $LOCALDEF