7 files changed, 6 insertions, 298 deletions

diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 6ef0f6881827..67d77333f80b 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Server
 PORTVERSION=	4.3.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
@@ -25,13 +25,13 @@ EXTRACT_ONLY=	X430src-1.tgz \
 MAINTAINER=	anholt@freebsd.org
 COMMENT=	XFree86-4 X server and related programs
 
-.for pf in patch-savage-pci-id patch-alpha_video.c patch-Pci.h patch-radeondri \
+.for pf in patch-savage-pci-id patch-alpha_video.c patch-Pci.h \
 	patch-r128_driver.c patch-mga_driver.c patch-xkbInit.c patch-radeon_dri.c \
 	patch-mga_dri.c patch-nv_driver.c patch-nv_setup.c patch-int10-generic.c \
 	patch-radeon_cursor.c patch-radeon_reg.h patch-smi \
 	patch-libc_wrapper.c patch-xf86-common-Imakefile patch-loader-Imakefile \
 	patch-loader-elfloader.c patch-bsd-Imakefile patch-bsd-bsdResource.c \
-	patch-bus-Imakefile patch-r200_vtxtmp_x86.S patch-radeon_vtxtmp_x86.S \
+	patch-bus-Imakefile \
 	patch-compiler.h patch-os-support_Imakefile patch-bsd_Imakefile \
 	patch-freebsdPci.c patch-bus_Imakefile patch-xf86Sbus.h patch-loader.c \
 	patch-Sbus.c patch-elfloader.c patch-xfree86.cf patch-FreeBSD.cf \
@@ -96,15 +96,14 @@ NOT_FOR_ARCHS=		ia64
 .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == i386 ||  ${ARCH} == alpha
+.if ${ARCH} == i386 || ${ARCH} == alpha
+RUN_DEPENDS+=		${X11BASE}/lib/modules/dri/r200_dri.so:${PORTSDIR}/graphics/dri
 BuildXF86DRI=		YES
 PLIST_SUB+=		DRI=""
-XBUILD_DIRS+=		lib/XThrStub lib/X11 lib/Xext lib/GL
-XINSTALL_DIRS+=		lib/GL/mesa/src/drv
 .else
 BuildXF86DRI=		NO
 PLIST_SUB+=		DRI="@comment "
-.endif # i386
+.endif
 
 .if ${ARCH} == ia64
 PLIST_SUB+=	IA64_NA="@comment "
diff --git a/x11-servers/XFree86-4-Server/files/patch-dri_util.c b/x11-servers/XFree86-4-Server/files/patch-dri_util.c
deleted file mode 100644
index 0084acff7a3e..000000000000
--- a/x11-servers/XFree86-4-Server/files/patch-dri_util.c
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: lib/GL/dri/dri_util.c
-===================================================================
-RCS file: /home/ncvs/xfree/xc/lib/GL/dri/dri_util.c,v
-retrieving revision 1.6
-retrieving revision 1.7
-diff -u -u -r1.6 -r1.7
---- lib/GL/dri/dri_util.c	15 Feb 2003 22:12:29 -0000	1.6
-+++ lib/GL/dri/dri_util.c	28 Apr 2003 17:01:25 -0000	1.7
-@@ -921,7 +921,7 @@
-     int directCapable;
-     __DRIscreenPrivate *psp;
-     drmHandle hFB, hSAREA;
--    char *BusID, *driverName;
-+    char *BusID, *driverName = NULL;
-     drmMagic magic;
- 
-     if (!XF86DRIQueryDirectRenderingCapable(dpy, scrn, &directCapable)) {
-@@ -1010,6 +1010,8 @@
- 	(void)XF86DRICloseConnection(dpy, scrn);
- 	return NULL;
-     }
-+    if (driverName)
-+	Xfree(driverName);
- 
-     /* install driver's callback functions */
-     memcpy(&psp->DriverAPI, driverAPI, sizeof(struct __DriverAPIRec));
diff --git a/x11-servers/XFree86-4-Server/files/patch-r200_vtxtmp_x86.S b/x11-servers/XFree86-4-Server/files/patch-r200_vtxtmp_x86.S
deleted file mode 100644
index c77182d8b85f..000000000000
--- a/x11-servers/XFree86-4-Server/files/patch-r200_vtxtmp_x86.S
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/GL/mesa/src/drv/r200/r200_vtxtmp_x86.S.orig	Wed Jul 16 13:48:41 2003
-+++ lib/GL/mesa/src/drv/r200/r200_vtxtmp_x86.S	Wed Jul 16 13:48:56 2003
-@@ -28,7 +28,7 @@
- 
- #define GLOBL( x )	\
- .globl x;		\
--x##:
-+x:
- 
- .data
- .align 4
diff --git a/x11-servers/XFree86-4-Server/files/patch-radeon_vtxtmp_x86.S b/x11-servers/XFree86-4-Server/files/patch-radeon_vtxtmp_x86.S
deleted file mode 100644
index 6703e2c952fe..000000000000
--- a/x11-servers/XFree86-4-Server/files/patch-radeon_vtxtmp_x86.S
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/GL/mesa/src/drv/radeon/radeon_vtxtmp_x86.S.orig	Wed Jul 16 13:47:09 2003
-+++ lib/GL/mesa/src/drv/radeon/radeon_vtxtmp_x86.S	Wed Jul 16 13:47:10 2003
-@@ -28,7 +28,7 @@
- 
- #define GLOBL( x )	\
- .globl x;		\
--x##:
-+x:
- 
- .data
- .align 4
diff --git a/x11-servers/XFree86-4-Server/files/patch-radeondri b/x11-servers/XFree86-4-Server/files/patch-radeondri
deleted file mode 100644
index 33d2bc6562b4..000000000000
--- a/x11-servers/XFree86-4-Server/files/patch-radeondri
+++ /dev/null
@@ -1,234 +0,0 @@
-diff -ru -x CVS lib/GL/mesa/src/drv.orig/r200/r200_context.c lib/GL/mesa/src/drv/r200/r200_context.c
---- lib/GL/mesa/src/drv.orig/r200/r200_context.c	Tue Mar 11 17:51:23 2003
-+++ lib/GL/mesa/src/drv/r200/r200_context.c	Tue Mar 11 17:46:57 2003
-@@ -391,6 +391,7 @@
-     */
-    _tnl_destroy_pipeline( ctx );
-    _tnl_install_pipeline( ctx, r200_pipeline );
-+   ctx->Driver.FlushVertices = r200FlushVertices;
- 
-    /* Try and keep materials and vertices separate:
-     */
-diff -ru -x CVS lib/GL/mesa/src/drv.orig/r200/r200_swtcl.c lib/GL/mesa/src/drv/r200/r200_swtcl.c
---- lib/GL/mesa/src/drv.orig/r200/r200_swtcl.c	Tue Mar 11 17:51:29 2003
-+++ lib/GL/mesa/src/drv/r200/r200_swtcl.c	Tue Mar 11 17:46:57 2003
-@@ -44,6 +44,7 @@
- #include "math/m_translate.h"
- #include "tnl/tnl.h"
- #include "tnl/t_context.h"
-+#include "tnl/t_imm_exec.h"
- #include "tnl/t_pipeline.h"
- 
- #include "r200_context.h"
-@@ -1220,6 +1221,14 @@
-       r200ChooseVertexState( ctx );
- }
- 
-+
-+void r200FlushVertices( GLcontext *ctx, GLuint flags )
-+{
-+   _tnl_flush_vertices( ctx, flags );
-+
-+   if (flags & FLUSH_STORED_VERTICES) 
-+      R200_FIREVERTICES( R200_CONTEXT( ctx ) );
-+}
- 
- /**********************************************************************/
- /*                            Initialization.                         */
-diff -ru -x CVS lib/GL/mesa/src/drv.orig/r200/r200_swtcl.h lib/GL/mesa/src/drv/r200/r200_swtcl.h
---- lib/GL/mesa/src/drv.orig/r200/r200_swtcl.h	Tue Mar 11 17:51:29 2003
-+++ lib/GL/mesa/src/drv/r200/r200_swtcl.h	Tue Mar 11 17:46:57 2003
-@@ -42,6 +42,7 @@
- extern void r200InitSwtcl( GLcontext *ctx );
- extern void r200DestroySwtcl( GLcontext *ctx );
- 
-+extern void r200FlushVertices( GLcontext *ctx, GLuint flags );
- extern void r200ChooseRenderState( GLcontext *ctx );
- extern void r200ChooseVertexState( GLcontext *ctx );
- 
-diff -ru -x CVS lib/GL/mesa/src/drv.orig/r200/r200_vtxfmt.c lib/GL/mesa/src/drv/r200/r200_vtxfmt.c
---- lib/GL/mesa/src/drv.orig/r200/r200_vtxfmt.c	Tue Mar 11 17:51:29 2003
-+++ lib/GL/mesa/src/drv/r200/r200_vtxfmt.c	Tue Mar 11 17:47:00 2003
-@@ -38,6 +38,7 @@
- #include "r200_ioctl.h"
- #include "r200_tex.h"
- #include "r200_tcl.h"
-+#include "r200_swtcl.h"
- #include "r200_vtxfmt.h"
- 
- #include "api_noop.h"
-@@ -59,7 +60,7 @@
- 
- struct r200_vb vb;
- 
--static void r200FlushVertices( GLcontext *, GLuint );
-+static void r200VtxFmtFlushVertices( GLcontext *, GLuint );
- 
- static void count_func( const char *name,  struct dynfn *l )
- {
-@@ -357,12 +358,13 @@
-       fprintf(stderr, "%s from %s\n", __FUNCTION__, caller);
- 
-    if (ctx->Driver.NeedFlush) 
--      r200FlushVertices( ctx, ctx->Driver.NeedFlush );
-+      r200VtxFmtFlushVertices( ctx, ctx->Driver.NeedFlush );
- 
-    if (ctx->NewState)
-       _mesa_update_state( ctx ); /* clear state so fell_back sticks */
- 
-    _tnl_wakeup_exec( ctx );
-+   ctx->Driver.FlushVertices = r200FlushVertices;
- 
-    assert( rmesa->dma.flush == 0 );
-    rmesa->vb.fell_back = GL_TRUE;
-@@ -404,6 +406,7 @@
-    prim = rmesa->vb.prim[0];
-    ctx->Driver.CurrentExecPrimitive = GL_POLYGON+1;
-    _tnl_wakeup_exec( ctx );
-+   ctx->Driver.FlushVertices = r200FlushVertices;
- 
-    assert(rmesa->dma.flush == 0);
-    rmesa->vb.fell_back = GL_TRUE;
-@@ -756,7 +759,7 @@
- 	    fprintf(stderr, "reinstall (new install)\n");
- 
- 	 _mesa_install_exec_vtxfmt( ctx, &rmesa->vb.vtxfmt );
--	 ctx->Driver.FlushVertices = r200FlushVertices;
-+	 ctx->Driver.FlushVertices = r200VtxFmtFlushVertices;
- 	 ctx->Driver.NewList = r200NewList;
- 	 rmesa->vb.installed = GL_TRUE;
- 	 vb.context = ctx;
-@@ -772,6 +775,7 @@
- 	 if (rmesa->dma.flush)
- 	    rmesa->dma.flush( rmesa );
- 	 _tnl_wakeup_exec( ctx );
-+	 ctx->Driver.FlushVertices = r200FlushVertices;
- 	 rmesa->vb.installed = GL_FALSE;
- 	 vb.context = 0;
-       }
-@@ -931,7 +935,7 @@
-    return GL_TRUE;
- }
- 
--static void r200FlushVertices( GLcontext *ctx, GLuint flags )
-+static void r200VtxFmtFlushVertices( GLcontext *ctx, GLuint flags )
- {
-    r200ContextPtr rmesa = R200_CONTEXT( ctx );
- 
-diff -ru -x CVS lib/GL/mesa/src/drv.orig/radeon/radeon_context.c lib/GL/mesa/src/drv/radeon/radeon_context.c
---- lib/GL/mesa/src/drv.orig/radeon/radeon_context.c	Tue Mar 11 17:51:29 2003
-+++ lib/GL/mesa/src/drv/radeon/radeon_context.c	Tue Mar 11 17:47:00 2003
-@@ -382,6 +382,7 @@
-     */
-    _tnl_destroy_pipeline( ctx );
-    _tnl_install_pipeline( ctx, radeon_pipeline );
-+   ctx->Driver.FlushVertices = radeonFlushVertices;
- 
-    /* Try and keep materials and vertices separate:
-     */
-diff -ru -x CVS lib/GL/mesa/src/drv.orig/radeon/radeon_swtcl.c lib/GL/mesa/src/drv/radeon/radeon_swtcl.c
---- lib/GL/mesa/src/drv.orig/radeon/radeon_swtcl.c	Tue Mar 11 17:51:29 2003
-+++ lib/GL/mesa/src/drv/radeon/radeon_swtcl.c	Tue Mar 11 17:47:00 2003
-@@ -45,6 +45,7 @@
- #include "math/m_translate.h"
- #include "tnl/tnl.h"
- #include "tnl/t_context.h"
-+#include "tnl/t_imm_exec.h"
- #include "tnl/t_pipeline.h"
- 
- #include "radeon_context.h"
-@@ -1133,6 +1134,14 @@
-    }
- }
- 
-+
-+void radeonFlushVertices( GLcontext *ctx, GLuint flags )
-+{
-+   _tnl_flush_vertices( ctx, flags );
-+
-+   if (flags & FLUSH_STORED_VERTICES) 
-+      RADEON_FIREVERTICES( RADEON_CONTEXT( ctx ) );
-+}
- 
- /**********************************************************************/
- /*                            Initialization.                         */
-diff -ru -x CVS lib/GL/mesa/src/drv.orig/radeon/radeon_swtcl.h lib/GL/mesa/src/drv/radeon/radeon_swtcl.h
---- lib/GL/mesa/src/drv.orig/radeon/radeon_swtcl.h	Tue Mar 11 17:51:29 2003
-+++ lib/GL/mesa/src/drv/radeon/radeon_swtcl.h	Tue Mar 11 17:47:00 2003
-@@ -43,6 +43,7 @@
- extern void radeonInitSwtcl( GLcontext *ctx );
- extern void radeonDestroySwtcl( GLcontext *ctx );
- 
-+extern void radeonFlushVertices( GLcontext *ctx, GLuint flags );
- extern void radeonChooseRenderState( GLcontext *ctx );
- extern void radeonChooseVertexState( GLcontext *ctx );
- 
-diff -ru -x CVS lib/GL/mesa/src/drv.orig/radeon/radeon_vtxfmt.c lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.c
---- lib/GL/mesa/src/drv.orig/radeon/radeon_vtxfmt.c	Tue Mar 11 17:51:29 2003
-+++ lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.c	Tue Mar 11 17:47:01 2003
-@@ -38,6 +38,7 @@
- #include "radeon_ioctl.h"
- #include "radeon_tex.h"
- #include "radeon_tcl.h"
-+#include "radeon_swtcl.h"
- #include "radeon_vtxfmt.h"
- 
- #include "api_noop.h"
-@@ -59,7 +60,7 @@
- 
- struct radeon_vb vb;
- 
--static void radeonFlushVertices( GLcontext *, GLuint );
-+static void radeonVtxfmtFlushVertices( GLcontext *, GLuint );
- 
- static void count_func( const char *name,  struct dynfn *l )
- {
-@@ -336,12 +337,13 @@
-       fprintf(stderr, "%s from %s\n", __FUNCTION__, caller);
- 
-    if (ctx->Driver.NeedFlush) 
--      radeonFlushVertices( ctx, ctx->Driver.NeedFlush );
-+      radeonVtxfmtFlushVertices( ctx, ctx->Driver.NeedFlush );
- 
-    if (ctx->NewState)
-       _mesa_update_state( ctx ); /* clear state so fell_back sticks */
- 
-    _tnl_wakeup_exec( ctx );
-+   ctx->Driver.FlushVertices = radeonFlushVertices;
- 
-    assert( rmesa->dma.flush == 0 );
-    rmesa->vb.fell_back = GL_TRUE;
-@@ -382,6 +384,7 @@
-    prim = rmesa->vb.prim[0];
-    ctx->Driver.CurrentExecPrimitive = GL_POLYGON+1;
-    _tnl_wakeup_exec( ctx );
-+   ctx->Driver.FlushVertices = radeonFlushVertices;
- 
-    assert(rmesa->dma.flush == 0);
-    rmesa->vb.fell_back = GL_TRUE;
-@@ -731,7 +734,7 @@
- 	    fprintf(stderr, "reinstall (new install)\n");
- 
- 	 _mesa_install_exec_vtxfmt( ctx, &rmesa->vb.vtxfmt );
--	 ctx->Driver.FlushVertices = radeonFlushVertices;
-+	 ctx->Driver.FlushVertices = radeonVtxfmtFlushVertices;
- 	 ctx->Driver.NewList = radeonNewList;
- 	 rmesa->vb.installed = GL_TRUE;
- 	 vb.context = ctx;
-@@ -747,6 +750,7 @@
- 	 if (rmesa->dma.flush)
- 	    rmesa->dma.flush( rmesa );
- 	 _tnl_wakeup_exec( ctx );
-+	 ctx->Driver.FlushVertices = radeonFlushVertices;
- 	 rmesa->vb.installed = GL_FALSE;
- 	 vb.context = 0;
-       }
-@@ -905,7 +909,7 @@
-    return GL_TRUE;
- }
- 
--static void radeonFlushVertices( GLcontext *ctx, GLuint flags )
-+static void radeonVtxfmtFlushVertices( GLcontext *ctx, GLuint flags )
- {
-    radeonContextPtr rmesa = RADEON_CONTEXT( ctx );
- 
diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist
index 81c968a748a1..f7a6f0372528 100644
--- a/x11-servers/XFree86-4-Server/pkg-plist
+++ b/x11-servers/XFree86-4-Server/pkg-plist
@@ -105,14 +105,6 @@ lib/modules/codeconv/libKSCJOHAB.a
 lib/modules/codeconv/libMULEENCODING.a
 lib/modules/codeconv/libTCVN.a
 lib/modules/codeconv/libVISCII.a
-%%DRI%%lib/modules/dri/gamma_dri.so
-%%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/r200_dri.so
-%%DRI%%lib/modules/dri/r128_dri.so
-%%DRI%%lib/modules/dri/radeon_dri.so
-%%DRI%%lib/modules/dri/tdfx_dri.so
 %%I386%%lib/modules/drivers/apm_drv.o
 %%I386%%lib/modules/drivers/ark_drv.o
 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 85ee63af6364..4c7a202f2168 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -32,7 +32,6 @@ echo "#define XInputDrivers mouse keyboard digitaledge dynapro elo2300 \
 			wacom void citron"	>> $LOCALDEF
 echo "#define BuildXF86DRI ${BuildXF86DRI}"	>> $LOCALDEF
 echo "#define BuildXF86DRM NO"			>> $LOCALDEF
-echo "#define HasGlide3 YES"			>> $LOCALDEF
 
 # disable some options
 for i in \