8 files changed, 38 insertions, 60 deletions

diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 7b8ec43ddec4..dc20237ffe27 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -7,9 +7,7 @@
 
 PORTNAME=	Server
 PORTVERSION=	4.2.0
-.if defined(WITH_MATROX_GXX_DRIVER)
-PORTREVISION=	1
-.endif
+PORTREVISION=	2
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE} \
 		ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
@@ -34,7 +32,7 @@ SCRIPTS_ENV=		OSVERSION=${OSVERSION} \
 			HasPam=${HasPam} \
 			ExtendedInputDevices=${ExtendedInputDevices} \
 			BuildXF86DRI=${BuildXF86DRI} \
-			BuildXF86DRM=${BuildXF86DRM} \
+			HasGlide3=${HasGlide3} \
 			HaveMatroxHal=${HaveMatroxHal}
 MAKE_ENV=		MAN_INSTALL_TARGET=FreeBSDPortsInstall.man WORLDOPTS=
 MAKE_ARGS=		WORLDOPTS=
@@ -88,23 +86,24 @@ HasXdmAuth?=		YES
 HasSecureRPC?=		DEFAULT
 HasPam?=		DEFAULT
 ExtendedInputDevices?=	DEFAULT
-.if ${ARCH} == i386  && (exists(/sys) || exists(/usr/src/sys))
+
+.if ${ARCH} == i386
 BuildXF86DRI=		YES
-BuildXF86DRM=		YES
 PLIST_SUB+=		DRI=""
-PLIST_SUB+=		DRI_KMOD=""
+MASTER_SITES+=		http://gladstone.uoregon.edu/~eanholt/dri/:glide
+DISTFILES+=		freebsd-glide3headers.tar.gz:glide
+HasGlide3=		YES
+
+post-extract:
+	@(cd ${WRKSRC}/lib/GL/mesa/src/drv/tdfx/ ; \
+		tar xfpz ${DISTDIR}/${DIST_SUBDIR}/freebsd-glide3headers.tar.gz)
 .else
 pre-fetch::
-.if ${ARCH} == i386
-	@${ECHO_MSG} "DRI would not build: kernel source required in /sys."
-.else
 	@${ECHO_MSG} "DRI only built on i386"
-.endif # i386
 BuildXF86DRI=		NO
-BuildXF86DRM=		NO
+HasGlide3=		NO
 PLIST_SUB+=		DRI="@comment "
-PLIST_SUB+=		DRI_KMOD="@comment "
-.endif	# have /sys
+.endif # i386
 
 # Some things are not applicable if this machine is an alpha
 .if ${ARCH} == alpha
@@ -197,16 +196,8 @@ PLIST_SUB+=		MATROX="@comment "
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 
-.if ${BuildXF86DRM} == "YES"
-pre-install:
-	${MKDIR} ${PREFIX}/lib/X11/kernel
-.endif
-
 post-build:
 	@${RM} -f ${PKGMESSAGE}
-.if ${BuildXF86DRM} == "YES"
-	@${CAT} ${.CURDIR}/pkg-message-drm > ${PKGMESSAGE}
-.endif
 	@${CAT} ${.CURDIR}/pkg-message >> ${PKGMESSAGE}
 
 post-install::
diff --git a/x11-servers/XFree86-4-Server-snap/distinfo b/x11-servers/XFree86-4-Server-snap/distinfo
index ab4ff21ec8be..35c16b7c8e40 100644
--- a/x11-servers/XFree86-4-Server-snap/distinfo
+++ b/x11-servers/XFree86-4-Server-snap/distinfo
@@ -1,3 +1,4 @@
 MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
 MD5 (xc/mgadrivers-2.0-src.tgz) = 877db503967ae837c147953dbcd8ee6d
 MD5 (xc/Wraphelp.c) = IGNORE
+MD5 (xc/freebsd-glide3headers.tar.gz) = 2bb614c909898a17c05e43e60cfb8e3b
diff --git a/x11-servers/XFree86-4-Server-snap/pkg-plist b/x11-servers/XFree86-4-Server-snap/pkg-plist
index 39161e7b8d7a..d083ffa1510b 100644
--- a/x11-servers/XFree86-4-Server-snap/pkg-plist
+++ b/x11-servers/XFree86-4-Server-snap/pkg-plist
@@ -47,12 +47,6 @@ lib/X11/etc/Xinstall.sh
 lib/X11/etc/sun.termcap
 lib/X11/etc/sun.terminfo
 lib/X11/etc/xmodmap.std
-%%DRI_KMOD%%lib/X11/kernel/gamma.ko
-%%DRI_KMOD%%lib/X11/kernel/mga.ko
-%%DRI_KMOD%%lib/X11/kernel/r128.ko
-%%DRI_KMOD%%lib/X11/kernel/radeon.ko
-%%DRI_KMOD%%lib/X11/kernel/tdfx.ko
-%%DRI_KMOD%%@dirrm lib/X11/kernel
 lib/X11/xserver/SecurityPolicy
 lib/modules/codeconv/libARABIC.a
 lib/modules/codeconv/libARMSCII8.a
@@ -88,9 +82,10 @@ 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
-%%DRI%%lib/modules/dri/radeon_dri.so
+%%I386:%%%%DRI%%lib/modules/dri/radeon_dri.so
 %%I386:%%%%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
diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index 35f80bd40383..7b98c307c507 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -46,7 +46,9 @@ configure () {
 	echo "#define XInputDrivers mouse" >> $LOCALDEF	
     fi
     echo "#define BuildXF86DRI ${BuildXF86DRI}" >> $LOCALDEF
-    echo "#define BuildXF86DRM ${BuildXF86DRM}" >> $LOCALDEF
+    echo "#define BuildXF86DRM NO" >> $LOCALDEF
+    echo "#define HasGlide3 ${HasGlide3}" >> $LOCALDEF
+    echo "#define Glide3IncDir glide3" >> $LOCALDEF
 
     # Matrox driver support
     echo "#define HaveMatroxHal $HaveMatroxHal" >> $LOCALDEF
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 7b8ec43ddec4..dc20237ffe27 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -7,9 +7,7 @@
 
 PORTNAME=	Server
 PORTVERSION=	4.2.0
-.if defined(WITH_MATROX_GXX_DRIVER)
-PORTREVISION=	1
-.endif
+PORTREVISION=	2
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE} \
 		ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
@@ -34,7 +32,7 @@ SCRIPTS_ENV=		OSVERSION=${OSVERSION} \
 			HasPam=${HasPam} \
 			ExtendedInputDevices=${ExtendedInputDevices} \
 			BuildXF86DRI=${BuildXF86DRI} \
-			BuildXF86DRM=${BuildXF86DRM} \
+			HasGlide3=${HasGlide3} \
 			HaveMatroxHal=${HaveMatroxHal}
 MAKE_ENV=		MAN_INSTALL_TARGET=FreeBSDPortsInstall.man WORLDOPTS=
 MAKE_ARGS=		WORLDOPTS=
@@ -88,23 +86,24 @@ HasXdmAuth?=		YES
 HasSecureRPC?=		DEFAULT
 HasPam?=		DEFAULT
 ExtendedInputDevices?=	DEFAULT
-.if ${ARCH} == i386  && (exists(/sys) || exists(/usr/src/sys))
+
+.if ${ARCH} == i386
 BuildXF86DRI=		YES
-BuildXF86DRM=		YES
 PLIST_SUB+=		DRI=""
-PLIST_SUB+=		DRI_KMOD=""
+MASTER_SITES+=		http://gladstone.uoregon.edu/~eanholt/dri/:glide
+DISTFILES+=		freebsd-glide3headers.tar.gz:glide
+HasGlide3=		YES
+
+post-extract:
+	@(cd ${WRKSRC}/lib/GL/mesa/src/drv/tdfx/ ; \
+		tar xfpz ${DISTDIR}/${DIST_SUBDIR}/freebsd-glide3headers.tar.gz)
 .else
 pre-fetch::
-.if ${ARCH} == i386
-	@${ECHO_MSG} "DRI would not build: kernel source required in /sys."
-.else
 	@${ECHO_MSG} "DRI only built on i386"
-.endif # i386
 BuildXF86DRI=		NO
-BuildXF86DRM=		NO
+HasGlide3=		NO
 PLIST_SUB+=		DRI="@comment "
-PLIST_SUB+=		DRI_KMOD="@comment "
-.endif	# have /sys
+.endif # i386
 
 # Some things are not applicable if this machine is an alpha
 .if ${ARCH} == alpha
@@ -197,16 +196,8 @@ PLIST_SUB+=		MATROX="@comment "
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 
-.if ${BuildXF86DRM} == "YES"
-pre-install:
-	${MKDIR} ${PREFIX}/lib/X11/kernel
-.endif
-
 post-build:
 	@${RM} -f ${PKGMESSAGE}
-.if ${BuildXF86DRM} == "YES"
-	@${CAT} ${.CURDIR}/pkg-message-drm > ${PKGMESSAGE}
-.endif
 	@${CAT} ${.CURDIR}/pkg-message >> ${PKGMESSAGE}
 
 post-install::
diff --git a/x11-servers/XFree86-4-Server/distinfo b/x11-servers/XFree86-4-Server/distinfo
index ab4ff21ec8be..35c16b7c8e40 100644
--- a/x11-servers/XFree86-4-Server/distinfo
+++ b/x11-servers/XFree86-4-Server/distinfo
@@ -1,3 +1,4 @@
 MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
 MD5 (xc/mgadrivers-2.0-src.tgz) = 877db503967ae837c147953dbcd8ee6d
 MD5 (xc/Wraphelp.c) = IGNORE
+MD5 (xc/freebsd-glide3headers.tar.gz) = 2bb614c909898a17c05e43e60cfb8e3b
diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist
index 39161e7b8d7a..d083ffa1510b 100644
--- a/x11-servers/XFree86-4-Server/pkg-plist
+++ b/x11-servers/XFree86-4-Server/pkg-plist
@@ -47,12 +47,6 @@ lib/X11/etc/Xinstall.sh
 lib/X11/etc/sun.termcap
 lib/X11/etc/sun.terminfo
 lib/X11/etc/xmodmap.std
-%%DRI_KMOD%%lib/X11/kernel/gamma.ko
-%%DRI_KMOD%%lib/X11/kernel/mga.ko
-%%DRI_KMOD%%lib/X11/kernel/r128.ko
-%%DRI_KMOD%%lib/X11/kernel/radeon.ko
-%%DRI_KMOD%%lib/X11/kernel/tdfx.ko
-%%DRI_KMOD%%@dirrm lib/X11/kernel
 lib/X11/xserver/SecurityPolicy
 lib/modules/codeconv/libARABIC.a
 lib/modules/codeconv/libARMSCII8.a
@@ -88,9 +82,10 @@ 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
-%%DRI%%lib/modules/dri/radeon_dri.so
+%%I386:%%%%DRI%%lib/modules/dri/radeon_dri.so
 %%I386:%%%%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
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index 35f80bd40383..7b98c307c507 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -46,7 +46,9 @@ configure () {
 	echo "#define XInputDrivers mouse" >> $LOCALDEF	
     fi
     echo "#define BuildXF86DRI ${BuildXF86DRI}" >> $LOCALDEF
-    echo "#define BuildXF86DRM ${BuildXF86DRM}" >> $LOCALDEF
+    echo "#define BuildXF86DRM NO" >> $LOCALDEF
+    echo "#define HasGlide3 ${HasGlide3}" >> $LOCALDEF
+    echo "#define Glide3IncDir glide3" >> $LOCALDEF
 
     # Matrox driver support
     echo "#define HaveMatroxHal $HaveMatroxHal" >> $LOCALDEF