Upgrade X.Org ports to 6.8.2.

Release notes are available at
http://www.x.org/X11R6.8.2/doc/RELNOTES.html

Thanks to kris and krion for running several cluster test builds,
maintainers of GNOME for prompt responses, portmgr for postponing ports
freeze for this update, testers on FreeBSD-X11@ list and others that I
might have mised here.

Also included:
- fix for ATI Mobility on Dell Inspiron 7500 (obtained from Marc Aurele La
  France; obtained and tested by julian)
- fix for kbd driver on Sparc64 (tested by Aaron Dudek, Michael G. Jung and
  Matthias Muthmann), which still appears to have problems with some
  keyboards - so
- fix for kbd driver on PC98 (reported and tested by NAKAJI Hiroyuki; PR
  ports/77217)
- fix for i810 on HP D530 (obtained from Egbert Eich; obtained and tested
  by Anders Nor Berle; PR ports/74757)

4 files changed, 65 insertions, 17 deletions

diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile
index 1f4555b6a6bb..9df059c6075a 100644
--- a/x11/xorg-clients/Makefile
+++ b/x11/xorg-clients/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	xorg-clients
-PORTVERSION=	6.8.1
-PORTREVISION=	1
+PORTVERSION=	6.8.2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R6.8.1/tars
+MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
 DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
 		X11R${PORTVERSION}-src2.tar.gz \
 		X11R${PORTVERSION}-src3.tar.gz
@@ -54,6 +53,7 @@ post-install:
 	${CHOWN} root:wheel ${PREFIX}/bin/luit
 	${CHMOD} 04711 ${PREFIX}/bin/luit
 .endif
+	${MKDIR} ${PREFIX}/lib/X11/xinit
 	${INSTALL_DATA} ${WRKSRC}/programs/xinit/xinitrc \
 		${PREFIX}/lib/X11/xinit/xinitrc.default
 .for i in ${XDMCONFDATA}
diff --git a/x11/xorg-clients/distinfo b/x11/xorg-clients/distinfo
index 0c514cc6b0f3..2833f6b9461c 100644
--- a/x11/xorg-clients/distinfo
+++ b/x11/xorg-clients/distinfo
@@ -1,6 +1,6 @@
-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
+MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab
+SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802
+MD5 (xorg/X11R6.8.2-src2.tar.gz) = b6f011b3131e442b8dab85d443d9a56f
+SIZE (xorg/X11R6.8.2-src2.tar.gz) = 5974936
+MD5 (xorg/X11R6.8.2-src3.tar.gz) = 057d20af30569434e2c6693c1ca66e57
+SIZE (xorg/X11R6.8.2-src3.tar.gz) = 10379299
diff --git a/x11/xorg-clients/pkg-plist b/x11/xorg-clients/pkg-plist
index 27e0adb88a33..8f470516426d 100644
--- a/x11/xorg-clients/pkg-plist
+++ b/x11/xorg-clients/pkg-plist
@@ -511,7 +511,9 @@ 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-it.lst
 lib/X11/xkb/rules/xfree86.lst
+lib/X11/xkb/rules/xfree86.xml
 lib/X11/xkb/rules/xorg
 lib/X11/xkb/rules/xorg-it.lst
 lib/X11/xkb/rules/xorg.lst
@@ -752,14 +754,6 @@ 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
@@ -768,3 +762,56 @@ bin/xterm
 lib/X11/app-defaults/UXTerm
 lib/X11/app-defaults/XTerm-color
 lib/X11/app-defaults/XTerm
+
+@dirrm include/X11/PM
+@dirrm lib/X11/proxymngr
+@dirrm lib/X11/rstart/commands/x11r6
+@dirrm lib/X11/rstart/commands
+@dirrm lib/X11/rstart/contexts
+@dirrm lib/X11/rstart
+@dirrm lib/X11/twm
+@dirrm lib/X11/x11perfcomp
+@dirrm lib/X11/xdm/pixmaps
+@dirrm lib/X11/xdm
+@dirrm lib/X11/xedit/lisp/progmodes
+@dirrm lib/X11/xedit/lisp
+@dirrm lib/X11/xedit
+@dirrm lib/X11/xkb/compat
+@dirrm lib/X11/xkb/geometry/digital
+@dirrm lib/X11/xkb/geometry/ibm
+@dirrm lib/X11/xkb/geometry/sgi
+@dirrm lib/X11/xkb/geometry
+@dirrm lib/X11/xkb/keycodes/digital
+@dirrm lib/X11/xkb/keycodes/sgi
+@dirrm lib/X11/xkb/keycodes
+@dirrm lib/X11/xkb/keymap/digital
+@dirrm lib/X11/xkb/keymap/sgi
+@dirrm lib/X11/xkb/keymap/sun
+@dirrm lib/X11/xkb/keymap
+@dirrm lib/X11/xkb/semantics
+@dirrm lib/X11/xkb/symbols/hp
+@dirrm lib/X11/xkb/symbols/digital
+@dirrm lib/X11/xkb/symbols/fujitsu
+@dirrm lib/X11/xkb/symbols/macintosh
+@dirrm lib/X11/xkb/symbols/nec
+@dirrm lib/X11/xkb/symbols/sgi
+@dirrm lib/X11/xkb/symbols/sony
+@dirrm lib/X11/xkb/symbols/sun
+@dirrm lib/X11/xkb/symbols/xfree68
+@dirrm lib/X11/xkb/symbols/pc
+@dirrm lib/X11/xkb/symbols
+@dirrm lib/X11/xkb/types
+@dirrm lib/X11/xkb/compiled
+@dirrm lib/X11/xkb/rules
+@dirrm lib/X11/xkb
+@dirrm lib/X11/xsm
+@dirrm lib/X11/icons/default
+@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
+@dirrm lib/X11/xinit
+@unexec rmdir %D/lib/X11/fonts/util 2>/dev/null || true
diff --git a/x11/xorg-clients/scripts/configure b/x11/xorg-clients/scripts/configure
index aa92ba29b024..5b2332cff3fb 100644
--- a/x11/xorg-clients/scripts/configure
+++ b/x11/xorg-clients/scripts/configure
@@ -7,6 +7,7 @@ echo "#define BuildServer NO"			>> $LOCALDEF
 echo "#define BuildLBX NO"			>> $LOCALDEF
 echo "#define BuildXterm NO"			>> $LOCALDEF
 echo "#define BuildFontServer NO"			>> $LOCALDEF
+echo "#define BuildPlugin NO"			>> $LOCALDEF
 echo "#define UseInstalledPrograms YES"			>> $LOCALDEF
 echo "#define UseInstalledLibraries YES"	>> $LOCALDEF
 echo "#define StandardIncludes -I${PREFIX}/include"	>> $LOCALDEF