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)

4 files changed, 59 insertions, 17 deletions

diff --git a/x11/xorg-manpages/Makefile b/x11/xorg-manpages/Makefile
index 6a54b97..7900a6d 100644
--- a/x11/xorg-manpages/Makefile
+++ b/x11/xorg-manpages/Makefile
@@ -5,16 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	manpages
-PORTVERSION=	6.7.0
+PORTNAME=	xorg-manpages
+PORTVERSION=	6.8.1
 CATEGORIES=	x11
-MASTER_SITES=	http://freedesktop.org/~xorg/X11R6.7.0/src/ \
-		${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	R6.7/tars
-PKGNAMEPREFIX=	xorg-
-DISTFILES=	X11R6.7.0-src1.tar.gz \
-		X11R6.7.0-src3.tar.gz
-EXTRACT_ONLY=	X11R6.7.0-src1.tar.gz
+MASTER_SITES=	${MASTER_SITE_XORG}
+MASTER_SITE_SUBDIR=	X11R6.8.1/tars
+DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
+		X11R${PORTVERSION}-src3.tar.gz
+EXTRACT_ONLY=	X11R${PORTVERSION}-src1.tar.gz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org library manual pages
@@ -28,7 +26,7 @@ XINCLUDE_DIRS=	${XMAN_DIRS}
 
 post-extract:
 	(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-		${DISTDIR}/${DIST_SUBDIR}/X11R6.7.0-src3.tar.gz | \
+		${DISTDIR}/${DIST_SUBDIR}/X11R6.8.1-src3.tar.gz | \
 		${TAR} -xf - xc/programs/Xserver);
 
 .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
diff --git a/x11/xorg-manpages/distinfo b/x11/xorg-manpages/distinfo
index 6fd5e5d..62c1647 100644
--- a/x11/xorg-manpages/distinfo
+++ b/x11/xorg-manpages/distinfo
@@ -1,6 +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 (xorg/X11R6.7.0-src4.tar.gz) = 4f2ed6fe4378fe60b58b8b4c8487cab0
-SIZE (xorg/X11R6.7.0-src4.tar.gz) = 13044107
+MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b
+SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401
+MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3
+SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808
diff --git a/x11/xorg-manpages/files/manpages b/x11/xorg-manpages/files/manpages
index 2cdddab..c2016c2 100644
--- a/x11/xorg-manpages/files/manpages
+++ b/x11/xorg-manpages/files/manpages
@@ -645,6 +645,39 @@ MAN3=	AllPlanes.3 \
 	XmbufGetVersion.3 \
 	XmbufGetWindowAttributes.3 \
 	XmbufQueryExtension.3 \
+	XpCancelDoc.3 \
+	XpCancelJob.3 \
+	XpCancelPage.3 \
+	XpCreateContext.3 \
+	XpDestroyContext.3 \
+	XpEndDoc.3 \
+	XpEndJob.3 \
+	XpEndPage.3 \
+	XpFreePrinterList.3 \
+	XpGetAttributes.3 \
+	XpGetContext.3 \
+	XpGetDocumentData.3 \
+	XpGetImageResolution.3 \
+	XpGetLocaleHinter.3 \
+	XpGetOneAttribute.3 \
+	XpGetPageDimensions.3 \
+	XpGetPdmStartParams.3 \
+	XpGetPrinterList.3 \
+	XpGetScreenOfContext.3 \
+	XpInputSelected.3 \
+	XpPutDocumentData.3 \
+	XpQueryExtension.3 \
+	XpQueryScreens.3 \
+	XpQueryVersion.3 \
+	XpRehashPrinterList.3 \
+	XpSelectInput.3 \
+	XpSetAttributes.3 \
+	XpSetContext.3 \
+	XpSetImageResolution.3 \
+	XpSetLocaleHinter.3 \
+	XpStartDoc.3 \
+	XpStartJob.3 \
+	XpStartPage.3 \
 	Xrandr.3 \
 	XrmCombineDatabase.3 \
 	XrmCombineFileDatabase.3 \
@@ -1503,7 +1536,9 @@ MAN3=	AllPlanes.3 \
 	gluTessNormal.3 \
 	gluTessProperty.3 \
 	gluTessVertex.3 \
-	gluUnProject.3
+	gluUnProject.3 \
+	libXp.3
+
 MAN7=	X.7 \
 	X.Org.7 \
 	XConsortium.7 \
diff --git a/x11/xorg-manpages/files/patch-man-Imakefile b/x11/xorg-manpages/files/patch-man-Imakefile
new file mode 100644
index 0000000..ece1a93
--- /dev/null
+++ b/x11/xorg-manpages/files/patch-man-Imakefile
@@ -0,0 +1,11 @@
+--- doc/man/Imakefile.orig	Thu Nov 11 17:13:20 2004
++++ doc/man/Imakefile	Thu Nov 11 17:13:56 2004
+@@ -33,7 +33,7 @@
+ LIBMANDIRS = X11 Xt Xext Xi Xau $(XVDIR) $(GLXDIRS) $(GLUDIRS) $(DMXDIR) $(XPRINTLIBDIRS)
+ #endif
+ 
+-SUBDIRS = general $(LIBMANDIRS) $(MISCDIR)
++SUBDIRS = general $(LIBMANDIRS)
+ 
+ all::
+