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)

13 files changed, 133 insertions, 59 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 8569fa226887..77d293324ed1 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -516,6 +516,7 @@
     SUBDIR += xfig
     SUBDIR += xfpovray
     SUBDIR += xfractint
+    SUBDIR += xfree86-dri
     SUBDIR += xglurbules
     SUBDIR += xgrasp
     SUBDIR += xli
diff --git a/graphics/dri-devel/Makefile b/graphics/dri-devel/Makefile
index 0ee67b64098b..235efd0f4b5d 100644
--- a/graphics/dri-devel/Makefile
+++ b/graphics/dri-devel/Makefile
@@ -28,6 +28,8 @@ LATEST_LINK=	${PORTNAME}-devel
 
 ONLY_FOR_ARCHS=	alpha i386
 
+IGNORE=		is currently older than graphics/dri. Please use that one instead
+
 do-configure:
 	@${RM} -f ${WRKSRC}/config/cf/projectroot.def
 	@${ECHO} "#define ProjectRoot ${X11BASE}" > ${WRKSRC}/config/cf/projectroot.def
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
diff --git a/graphics/libGLU/Makefile b/graphics/libGLU/Makefile
index a7c5b85712dd..1a1be44044ab 100644
--- a/graphics/libGLU/Makefile
+++ b/graphics/libGLU/Makefile
@@ -7,9 +7,10 @@
 
 PORTNAME=	libGLU
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://freedesktop.org/~xorg/X11R6.7.0/src/
-DISTNAME=	X11R6.7.0-src1
+MASTER_SITES=	${MASTER_SITE_XORG}
+DISTNAME=	X11R6.8.1-src1
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	OpenGL utility library
diff --git a/graphics/libGLU/distinfo b/graphics/libGLU/distinfo
index b9025936ccb4..1078854f7373 100644
--- a/graphics/libGLU/distinfo
+++ b/graphics/libGLU/distinfo
@@ -1,4 +1,2 @@
-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 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b
+SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401
diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile
index f70b8c3f270c..09e5bc9aab16 100644
--- a/graphics/mesa-demos/Makefile
+++ b/graphics/mesa-demos/Makefile
@@ -31,6 +31,12 @@ ALL_TARGET=	targets
 WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}/demos
 SHAREDIR=	${PREFIX}/share/mesa-demos
 
+.include <bsd.port.pre.mk>
+
+.if ${X_WINDOW_SYSTEM:L} == xorg
+IGNORE=		does not build with X.Org
+.endif
+
 post-extract:
 	${REINPLACE_CMD} -e 's|../images/|${SHAREDIR}/images/|g' \
 		-e 's|geartrain.dat|${SHAREDIR}/data/geartrain.dat|g' \
@@ -48,4 +54,4 @@ post-install:
 		${INSTALL_DATA} $$dat ${SHAREDIR}/data ; \
 	done
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/xfree86-dri/Makefile b/graphics/xfree86-dri/Makefile
index f2de8ba34ce5..90fa5d05371a 100644
--- a/graphics/xfree86-dri/Makefile
+++ b/graphics/xfree86-dri/Makefile
@@ -5,36 +5,47 @@
 # $FreeBSD$
 #
 
-PORTNAME=	dri
-PORTVERSION=	5.0.2
-PORTEPOCH=	2
+PORTNAME=	xfree86-dri
+PORTVERSION=	4.4.0
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_XORG}
-DISTFILES=	X11R6.7.0-src1.tar.gz \
-		X11R6.7.0-src3.tar.gz
+MASTER_SITES=	${MASTER_SITE_XFREE}
+MASTER_SITE_SUBDIR=	${PORTVERSION}
+DISTFILES=	XFree86-4.4.0-src-1.tgz \
+		XFree86-4.4.0-src-2.tgz \
+		XFree86-4.4.0-src-3.tgz
 
-MAINTAINER=	anholt@FreeBSD.org
-COMMENT=	OpenGL hardware acceleration drivers for the DRI
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	OpenGL hardware acceleration drivers for XFree86
 
-EXTRA_PATCHES+=		${CF_PATCHES}
+CONFLICTS=	dri-[5-9].*
 
-USE_XLIB=		yes
+EXTRA_PATCHES+=		${FILESDIR}/patch-GL-Imakefile
 
 ONLY_FOR_ARCHS=		i386 alpha amd64
 
 XBUILD_DIRS=		lib/GL
 XINSTALL_DIRS=		lib/GL/mesa/src/drv
 
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
+.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.pre.mk>
+
+.if ${X_WINDOW_SYSTEM:L} != xfree86-4
+IGNORE= is part of XFree86. For X.Org use graphics/dri port. See ports/UPDATING entry 20040723 for further information.
+.endif
+
 .if ${ARCH} == i386
 PLIST_SUB+=	I386=""
 .else
 PLIST_SUB+=	I386="@comment "
 .endif
+.if ${ARCH} == alpha
+PLIST_SUB+=	ALPHA_NA="@comment "
+.else
+PLIST_SUB+=	ALPHA_NA=""
+.endif
 .if ${ARCH} == amd64
-PLIST_SUB+=	NO_AMD64="@comment "
+PLIST_SUB+=	AMD64_NA="@comment "
 .else
-PLIST_SUB+=	NO_AMD64=""
+PLIST_SUB+=	AMD64_NA=""
 .endif
 .include <bsd.port.post.mk>
diff --git a/graphics/xfree86-dri/distinfo b/graphics/xfree86-dri/distinfo
index b9025936ccb4..ba2d5d81e5e3 100644
--- a/graphics/xfree86-dri/distinfo
+++ b/graphics/xfree86-dri/distinfo
@@ -1,4 +1,6 @@
-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 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469
+SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814
+MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523
+SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538
+MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d
+SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253
diff --git a/graphics/xfree86-dri/pkg-plist b/graphics/xfree86-dri/pkg-plist
index c3fcecbdcb66..fc64212b98f0 100644
--- a/graphics/xfree86-dri/pkg-plist
+++ b/graphics/xfree86-dri/pkg-plist
@@ -1,9 +1,9 @@
 lib/modules/dri/gamma_dri.so
-%%I386%%lib/modules/dri/i810_dri.so
+%%ALPHA_NA%%lib/modules/dri/i810_dri.so
 %%I386%%lib/modules/dri/i830_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
+%%AMD64_NA%%lib/modules/dri/tdfx_dri.so