Update X.Org ports to 6.8.1, and the DRI port to use Mesa 6.2. Because Mesa 6.2

DRI drivers are incompatible with the old libGL in XFree86, they have been
repocopied to graphics/xfree86-dri.  Also note that with this commit the html
manpages are going away, and with it the runtime dependency on perl for the
imake port.

Release notes at: http://www.x.org/X11R6.8.1/RELNOTES.txt

Props to:	kris (multiple cluster runs and sorting through logs)
		lesi (fixing all the issues in those logs, and more)

5 files changed, 86 insertions, 33 deletions

diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index f2de8ba34ce5..185b49b01748 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -6,35 +6,52 @@
 #
 
 PORTNAME=	dri
-PORTVERSION=	5.0.2
+PORTVERSION=	6.2
 PORTEPOCH=	2
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_XORG}
-DISTFILES=	X11R6.7.0-src1.tar.gz \
-		X11R6.7.0-src3.tar.gz
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	anholt
+DISTFILES=	Mesa-6.2-20041124.tar.bz2	\
+		drm-20041124.tar.bz2
 
 MAINTAINER=	anholt@FreeBSD.org
 COMMENT=	OpenGL hardware acceleration drivers for the DRI
 
-EXTRA_PATCHES+=		${CF_PATCHES}
+BUILD_DEPENDS=	makedepend:${X_IMAKE_PORT}
 
-USE_XLIB=		yes
+CONFLICTS=	xfree86-dri-*
 
-ONLY_FOR_ARCHS=		i386 alpha amd64
+WRKSRC=		${WRKDIR}/Mesa
+USE_X_PREFIX=	yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
 
-XBUILD_DIRS=		lib/GL
-XINSTALL_DIRS=		lib/GL/mesa/src/drv
+ONLY_FOR_ARCHS=	i386 alpha amd64
+
+DRIMODDIR=	${PREFIX}/lib/modules/dri
 
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
 .include <bsd.port.pre.mk>
+do-install:
+.if ${ARCH} == i386
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/i810_dri.so ${DRIMODDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/i830_dri.so ${DRIMODDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/i915_dri.so ${DRIMODDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/unichrome_dri.so ${DRIMODDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/tdfx_dri.so ${DRIMODDIR}
+.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/mach64_dri.so ${DRIMODDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/mga_dri.so ${DRIMODDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/r128_dri.so ${DRIMODDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/r200_dri.so ${DRIMODDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/radeon_dri.so ${DRIMODDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/savage_dri.so ${DRIMODDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/sis_dri.so ${DRIMODDIR}
+
 .if ${ARCH} == i386
 PLIST_SUB+=	I386=""
+ALL_TARGET=	freebsd-dri-x86
 .else
 PLIST_SUB+=	I386="@comment "
-.endif
-.if ${ARCH} == amd64
-PLIST_SUB+=	NO_AMD64="@comment "
-.else
-PLIST_SUB+=	NO_AMD64=""
+ALL_TARGET=	freebsd-dri
 .endif
 .include <bsd.port.post.mk>
diff --git a/graphics/dri/distinfo b/graphics/dri/distinfo
index b9025936ccb4..e03af941ae18 100644
--- a/graphics/dri/distinfo
+++ b/graphics/dri/distinfo
@@ -1,4 +1,4 @@
-MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5
-SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655
-MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669
-SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793
+MD5 (Mesa-6.2-20041124.tar.bz2) = e6c93d64e34720c6ba617f811be5824d
+SIZE (Mesa-6.2-20041124.tar.bz2) = 4127945
+MD5 (drm-20041124.tar.bz2) = fdb9347f62d248edefadf6b7141e85ed
+SIZE (drm-20041124.tar.bz2) = 479029
diff --git a/graphics/dri/files/patch-GL-Imakefile b/graphics/dri/files/patch-GL-Imakefile
deleted file mode 100644
index 94e8b7e8875a..000000000000
--- a/graphics/dri/files/patch-GL-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/GL/Imakefile.orig	Sat Nov  8 23:54:33 2003
-+++ lib/GL/Imakefile	Sat Nov  8 23:55:05 2003
-@@ -106,7 +106,7 @@
- #if BuildXF86DRI && GlxUseBuiltInDRIDriver
- SUBDIRS = $(MESADIRS) $(DRIDIRS) $(DRIVERDIRS) $(GLXDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS)
- #else
--SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) $(DRIVERDIRS)
-+SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(DRIVERDIRS)
- #endif
- 
- MakeSubdirs($(SUBDIRS))
diff --git a/graphics/dri/files/patch-localvars b/graphics/dri/files/patch-localvars
new file mode 100644
index 000000000000..15affd3f6a47
--- /dev/null
+++ b/graphics/dri/files/patch-localvars
@@ -0,0 +1,44 @@
+--- configs/freebsd-dri.orig	Wed Nov 24 23:14:01 2004
++++ configs/freebsd-dri	Wed Nov 24 23:14:20 2004
+@@ -11,7 +11,7 @@
+ WARN_FLAGS = -Wall
+ OPT_FLAGS = -O
+ 
+-CFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wmissing-prototypes -g -std=c99  -Wundef -fPIC -ffast-math -I/usr/local/include -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
++CFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wmissing-prototypes -g -std=c9x -Wundef -fPIC -ffast-math -I/usr/local/include -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
+ CXXFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wall -g -ansi -pedantic -fPIC
+ 
+ ASM_SOURCES = 
+--- src/mesa/drivers/dri/r200/r200_tcl.c.orig	Thu Nov 25 01:38:38 2004
++++ src/mesa/drivers/dri/r200/r200_tcl.c	Thu Nov 25 01:39:09 2004
+@@ -101,7 +101,7 @@
+ };
+    
+ 
+-#define LOCAL_VARS r200ContextPtr rmesa = R200_CONTEXT(ctx); (void)rmesa
++#define LOCAL_VARS r200ContextPtr rmesa = R200_CONTEXT(ctx)
+ #define ELT_TYPE  GLushort
+ 
+ #define ELT_INIT(prim, hw_prim) \
+--- src/mesa/drivers/dri/radeon/radeon_swtcl.c.orig	Thu Nov 25 01:54:49 2004
++++ src/mesa/drivers/dri/radeon/radeon_swtcl.c	Thu Nov 25 01:55:10 2004
+@@ -508,7 +508,7 @@
+ 
+ 
+ 
+-#define LOCAL_VARS radeonContextPtr rmesa = RADEON_CONTEXT(ctx); (void)rmesa
++#define LOCAL_VARS radeonContextPtr rmesa = RADEON_CONTEXT(ctx)
+ #define ELTS_VARS( buf )  GLushort *dest = buf
+ #define INIT( prim ) radeonDmaPrimitive( rmesa, prim )
+ #define ELT_INIT(prim) radeonEltPrimitive( rmesa, prim )
+--- src/mesa/drivers/dri/radeon/radeon_tcl.c.orig	Thu Nov 25 01:47:13 2004
++++ src/mesa/drivers/dri/radeon/radeon_tcl.c	Thu Nov 25 01:47:30 2004
+@@ -105,7 +105,7 @@
+ };
+    
+ 
+-#define LOCAL_VARS radeonContextPtr rmesa = RADEON_CONTEXT(ctx); (void)rmesa
++#define LOCAL_VARS radeonContextPtr rmesa = RADEON_CONTEXT(ctx)
+ #define ELT_TYPE  GLushort
+ 
+ #define ELT_INIT(prim, hw_prim) \
diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist
index c3fcecbdcb66..d6382c88c7cf 100644
--- a/graphics/dri/pkg-plist
+++ b/graphics/dri/pkg-plist
@@ -1,9 +1,12 @@
-lib/modules/dri/gamma_dri.so
 %%I386%%lib/modules/dri/i810_dri.so
 %%I386%%lib/modules/dri/i830_dri.so
+%%I386%%lib/modules/dri/i915_dri.so
+lib/modules/dri/mach64_dri.so
 lib/modules/dri/mga_dri.so
 lib/modules/dri/r128_dri.so
 lib/modules/dri/r200_dri.so
 lib/modules/dri/radeon_dri.so
-%%I386%%lib/modules/dri/sis_dri.so
-%%NO_AMD64%%lib/modules/dri/tdfx_dri.so
+lib/modules/dri/savage_dri.so
+lib/modules/dri/sis_dri.so
+%%I386%%lib/modules/dri/tdfx_dri.so
+lib/modules/dri/unichrome_dri.so