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)

9 files changed, 57 insertions, 79 deletions

diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile
index f2eec45..83a0d93 100644
--- a/x11/xorg-clients/Makefile
+++ b/x11/xorg-clients/Makefile
@@ -6,15 +6,13 @@
 #
 
 PORTNAME=	xorg-clients
-PORTVERSION=	6.7.0
-PORTREVISION=	5
+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
-DISTFILES=	X11R6.7.0-src1.tar.gz \
-		X11R6.7.0-src2.tar.gz \
-		X11R6.7.0-src3.tar.gz
+MASTER_SITES=	${MASTER_SITE_XORG}
+MASTER_SITE_SUBDIR=	X11R6.8.1/tars
+DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
+		X11R${PORTVERSION}-src2.tar.gz \
+		X11R${PORTVERSION}-src3.tar.gz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X client programs and related files from X.Org
diff --git a/x11/xorg-clients/distinfo b/x11/xorg-clients/distinfo
index de8ed62..0c514cc 100644
--- a/x11/xorg-clients/distinfo
+++ b/x11/xorg-clients/distinfo
@@ -1,6 +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-src2.tar.gz) = 6ef4e8f7647a28f080c10ea1bcf01f79
-SIZE (xorg/X11R6.7.0-src2.tar.gz) = 5739983
-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
+MD5 (xorg/X11R6.8.1-src2.tar.gz) = 6ba36becf1133c61a88c92e1d60c19ed
+SIZE (xorg/X11R6.8.1-src2.tar.gz) = 5808949
+MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3
+SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808
diff --git a/x11/xorg-clients/files/manpages b/x11/xorg-clients/files/manpages
index 4835130..f7708cf 100644
--- a/x11/xorg-clients/files/manpages
+++ b/x11/xorg-clients/files/manpages
@@ -50,6 +50,7 @@ MAN1=	Xmark.1 \
 	xditview.1 \
 	xdm.1 \
 	xdpyinfo.1 \
+	xdriinfo.1 \
 	xedit.1 \
 	xev.1 \
 	xeyes.1 \
@@ -76,8 +77,14 @@ MAN1=	Xmark.1 \
 	xmessage.1 \
 	xmh.1 \
 	xmodmap.1 \
+	xmore.1 \
 	xon.1 \
+	xphelloworld.1 \
+	xplsprinters.1 \
+	xprehashprinterlist.1 \
 	xprop.1 \
+	xpsimplehelloworld.1 \
+	xpxthelloworld.1 \
 	xrandr.1 \
 	xrdb.1 \
 	xrefresh.1 \
diff --git a/x11/xorg-clients/files/patch-dpsinfo-Imakefile b/x11/xorg-clients/files/patch-dpsinfo-Imakefile
index 03f08a4..b8bb1b8 100644
--- a/x11/xorg-clients/files/patch-dpsinfo-Imakefile
+++ b/x11/xorg-clients/files/patch-dpsinfo-Imakefile
@@ -1,23 +1,15 @@
---- programs/dpsinfo/Imakefile.orig	Thu Mar  4 09:48:47 2004
-+++ programs/dpsinfo/Imakefile	Sat May 29 16:21:20 2004
-@@ -3,7 +3,6 @@
- 
-         DEPLIBS = $(DEPDPSLIB) $(DEPXTOOLLIB) $(DEPXONLYLIB)
- LOCAL_LIBRARIES = $(DPSLIB) $(XTOOLLIB) $(XONLYLIB)
--         PSWRAP = PsWrap
- 
- SRCS = iwraps.psw dpsinfo.c
- 
-@@ -13,10 +12,10 @@
+--- programs/dpsinfo/Imakefile.orig	Fri Apr 23 12:54:31 2004
++++ programs/dpsinfo/Imakefile	Tue Oct 19 20:05:08 2004
+@@ -13,10 +13,10 @@
  
  .SUFFIXES: .psw .h
  
 -.psw.c : ProgramTargetName($(PSWRAP))
-+.psw.c : PsWrapDependency
++.psw.c : 
  	RunProgram(PSWRAP,-a -o $*.c -h $*.h $<)
  
 -.psw.h : ProgramTargetName($(PSWRAP))
-+.psw.h : PsWrapDependency
++.psw.h : 
  	RunProgram(PSWRAP,-a -h $*.h $< > /dev/null)
  
  depend:: $(DERIVED_FILES)
diff --git a/x11/xorg-clients/files/patch-programs_Imakefile b/x11/xorg-clients/files/patch-programs_Imakefile
deleted file mode 100644
index b2d7c92..0000000
--- a/x11/xorg-clients/files/patch-programs_Imakefile
+++ /dev/null
@@ -1,22 +0,0 @@
-
-$FreeBSD$
-
---- programs/Imakefile.orig	Sat Jul 24 02:13:01 2004
-+++ programs/Imakefile	Sat Jul 24 02:13:23 2004
-@@ -57,7 +57,6 @@
-        XRXSRCDIR = xrx
- #endif
-        XSMSRCDIR = xsm
--     XTERMSRCDIR = xterm
-       SCRIPTSDIR = scripts
- #endif
- #if BuildCID
-@@ -129,7 +128,7 @@
- 	xlsclients xlsfonts xmag xman xmessage xmh xmodmap xprop xrdb \
- 	xrefresh $(XRXSRCDIR) xset \
- 	xsetroot $(XSMSRCDIR) xstdcmap $(XINPUTCLIENTDIRS) \
--	$(XTERMSRCDIR) $(XTRAPCLIENTDIRS) $(XVIDTUNESRCDIR) xwd xwininfo xwud \
-+	$(XTRAPCLIENTDIRS) $(XVIDTUNESRCDIR) xwd xwininfo xwud \
- 	$(XPMCLIENTDIRS) $(XVINFOSRCDIR) \
- 	$(XSSRCDIR) $(XASSRCDIR) $(LBXPROXYSRCDIR) $(SCRIPTSDIR) \
- 	$(GLXCLIENTDIRS) $(XRANDRDIR) $(XCURSORGENDIR) 
diff --git a/x11/xorg-clients/files/patch-texteroids b/x11/xorg-clients/files/patch-texteroids
index 335883a..13240cf 100644
--- a/x11/xorg-clients/files/patch-texteroids
+++ b/x11/xorg-clients/files/patch-texteroids
@@ -1,23 +1,15 @@
---- programs/texteroids/Imakefile.orig	Mon Sep  2 13:23:43 2002
-+++ programs/texteroids/Imakefile	Mon Sep  2 13:27:13 2002
-@@ -3,7 +3,6 @@
-         DEPLIBS = $(DEPDPSLIB) $(DEPXTOOLLIB) $(DEPXLIB)
- LOCAL_LIBRARIES = $(XTOOLLIB) $(DPSLIB) $(XLIB)
-   SYS_LIBRARIES = MathLibrary
--         PSWRAP = PsWrap
- 
- SRCS = twraps.psw texteroids.c
- 
-@@ -13,10 +12,10 @@
+--- programs/texteroids/Imakefile.orig	Fri Apr 23 12:54:37 2004
++++ programs/texteroids/Imakefile	Tue Oct 19 20:07:40 2004
+@@ -13,10 +13,10 @@
  
  .SUFFIXES: .psw .h
  
 -.psw.c : ProgramTargetName($(PSWRAP))
-+.psw.c : PsWrapDependency
++.psw.c :
  	RunProgram(PSWRAP,-a -o $*.c -h $*.h $<)
  
 -.psw.h : ProgramTargetName($(PSWRAP))
-+.psw.h : PsWrapDependency
++.psw.h :
  	RunProgram(PSWRAP,-a -h $*.h $< > /dev/null)
  
  depend:: $(DERIVED_FILES)
diff --git a/x11/xorg-clients/files/patch-xdm-socket.c b/x11/xorg-clients/files/patch-xdm-socket.c
deleted file mode 100644
index 01c00e5..0000000
--- a/x11/xorg-clients/files/patch-xdm-socket.c
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: programs/xdm/socket.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/xdm/socket.c,v
-retrieving revision 1.2
-diff -u -r1.2 socket.c
---- programs/xdm/socket.c	23 Apr 2004 19:54:42 -0000	1.2
-+++ programs/xdm/socket.c	6 Jul 2004 00:28:43 -0000
-@@ -67,6 +67,9 @@
-     char *name = localHostname ();
-     registerHostname (name, strlen (name));
- 
-+    if (request_port == 0)
-+	return;
-+
- #if defined(IPv6) && defined(AF_INET6)
-     chooserFd = socket (AF_INET6, SOCK_STREAM, 0);
-     if (chooserFd == -1)
diff --git a/x11/xorg-clients/pkg-plist b/x11/xorg-clients/pkg-plist
index e3f83b4..27e0adb 100644
--- a/x11/xorg-clients/pkg-plist
+++ b/x11/xorg-clients/pkg-plist
@@ -52,6 +52,7 @@ bin/xcutsel
 bin/xditview
 bin/xdm
 bin/xdpyinfo
+bin/xdriinfo
 bin/xedit
 bin/xev
 bin/xeyes
@@ -81,8 +82,14 @@ bin/xman
 bin/xmessage
 bin/xmh
 bin/xmodmap
+bin/xmore
 bin/xon
+bin/xphelloworld
+bin/xplsprinters
+bin/xprehashprinterlist
 bin/xprop
+bin/xpsimplehelloworld
+bin/xpxthelloworld
 bin/xrandr
 bin/xrdb
 bin/xrefresh
@@ -141,6 +148,7 @@ lib/X11/app-defaults/XFontSel
 lib/X11/app-defaults/XLoad
 lib/X11/app-defaults/XLogo
 lib/X11/app-defaults/XLogo-color
+lib/X11/app-defaults/XMore
 lib/X11/app-defaults/XSm
 lib/X11/app-defaults/Xditview
 lib/X11/app-defaults/Xditview-chrtr
@@ -344,17 +352,26 @@ lib/X11/twm/system.twmrc
 lib/X11/x11perfcomp/fillblnk
 lib/X11/x11perfcomp/perfboth
 lib/X11/x11perfcomp/perfratio
+@unexec if cmp -s %D/lib/X11/xdm/GiveConsole.default %D/lib/X11/xdm/GiveConsole; then rm -f %D/lib/X11/xdm/GiveConsole; fi
 lib/X11/xdm/GiveConsole.default
+@unexec if cmp -s %D/lib/X11/xdm/TakeConsole.default %D/lib/X11/xdm/TakeConsole; then rm -f %D/lib/X11/xdm/TakeConsole; fi
 lib/X11/xdm/TakeConsole.default
+@unexec if cmp -s %D/lib/X11/xdm/Xaccess.default %D/lib/X11/xdm/Xaccess; then rm -f %D/lib/X11/xdm/Xaccess; fi
 lib/X11/xdm/Xaccess.default
+@unexec if cmp -s %D/lib/X11/xdm/Xresources.default %D/lib/X11/xdm/Xresources; then rm -f %D/lib/X11/xdm/Xresources; fi
 lib/X11/xdm/Xresources.default
+@unexec if cmp -s %D/lib/X11/xdm/Xservers.default %D/lib/X11/xdm/Xservers; then rm -f %D/lib/X11/xdm/Xservers; fi
 lib/X11/xdm/Xservers.default
+@unexec if cmp -s %D/lib/X11/xdm/Xsession.default %D/lib/X11/xdm/Xsession; then rm -f %D/lib/X11/xdm/Xsession; fi
 lib/X11/xdm/Xsession.default
+@unexec if cmp -s %D/lib/X11/xdm/Xsetup_0.default %D/lib/X11/xdm/Xsetup_0; then rm -f %D/lib/X11/xdm/Xsetup_0; fi
 lib/X11/xdm/Xsetup_0.default
+@unexec if cmp -s %D/lib/X11/xdm/Xwilling.default %D/lib/X11/xdm/Xwilling; then rm -f %D/lib/X11/xdm/Xwilling; fi
 lib/X11/xdm/Xwilling.default
 lib/X11/xdm/chooser
 lib/X11/xdm/pixmaps/xorg-bw.xpm
 lib/X11/xdm/pixmaps/xorg.xpm
+@unexec if cmp -s %D/lib/X11/xdm/xdm-config.default %D/lib/X11/xdm/xdm-config; then rm -f %D/lib/X11/xdm/xdm-config; fi
 lib/X11/xdm/xdm-config.default
 lib/X11/xedit/lisp/indent.lsp
 lib/X11/xedit/lisp/lisp.lsp
@@ -373,6 +390,7 @@ lib/X11/xedit/lisp/progmodes/xlog.lsp
 lib/X11/xedit/lisp/progmodes/xrdb.lsp
 lib/X11/xedit/lisp/syntax.lsp
 lib/X11/xedit/lisp/xedit.lsp
+@unexec if cmp -s %D/lib/X11/xinit/xinitrc.default %D/lib/X11/xinit/xinitrc; then rm -f %D/lib/X11/xinit/xinitrc; fi
 lib/X11/xinit/xinitrc.default
 lib/X11/xkb/README
 lib/X11/xkb/README.config
@@ -493,6 +511,7 @@ lib/X11/xkb/rules/sgi.lst
 lib/X11/xkb/rules/sun
 lib/X11/xkb/rules/sun.lst
 lib/X11/xkb/rules/xfree86
+lib/X11/xkb/rules/xfree86.lst
 lib/X11/xkb/rules/xorg
 lib/X11/xkb/rules/xorg-it.lst
 lib/X11/xkb/rules/xorg.lst
@@ -733,6 +752,14 @@ lib/X11/xkb/types/pc
 lib/X11/xkb/xkbcomp
 lib/X11/xman.help
 lib/X11/xsm/system.xsm
+@dirrm lib/X11/icons/redglass/cursors
+@dirrm lib/X11/icons/redglass
+@dirrm lib/X11/icons/whiteglass/cursors
+@dirrm lib/X11/icons/whiteglass
+@dirrm lib/X11/icons/handhelds/cursors
+@dirrm lib/X11/icons/handhelds
+@dirrm lib/X11/icons/default
+@dirrm lib/X11/xkb/geometry/ibm
 
 @comment xterm workaround
 bin/resize
diff --git a/x11/xorg-clients/scripts/configure b/x11/xorg-clients/scripts/configure
index 139d289..aa92ba2 100644
--- a/x11/xorg-clients/scripts/configure
+++ b/x11/xorg-clients/scripts/configure
@@ -5,6 +5,7 @@ LOCALDEF=$WRKDIR/.config
 rm -f $LOCALDEF
 echo "#define BuildServer NO"			>> $LOCALDEF
 echo "#define BuildLBX NO"			>> $LOCALDEF
+echo "#define BuildXterm NO"			>> $LOCALDEF
 echo "#define BuildFontServer NO"			>> $LOCALDEF
 echo "#define UseInstalledPrograms YES"			>> $LOCALDEF
 echo "#define UseInstalledLibraries YES"	>> $LOCALDEF