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)

2 files changed, 13 insertions, 1 deletions

diff --git a/x11-fonts/tv-fonts/Makefile b/x11-fonts/tv-fonts/Makefile
index c7ac1e4967b..c139c7fbe11 100644
--- a/x11-fonts/tv-fonts/Makefile
+++ b/x11-fonts/tv-fonts/Makefile
@@ -38,4 +38,12 @@ do-install:
 post-install:
 	@-${X11BASE}/bin/fc-cache -f -v ${FONTSDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${X_WINDOW_SYSTEM:L} == xorg
+PLIST_SUB+=	NEWMTREE=""
+.else
+PLIST_SUB+=	NEWMTREE="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11-fonts/tv-fonts/pkg-plist b/x11-fonts/tv-fonts/pkg-plist
index 3569af4ac13..0f12e178b89 100644
--- a/x11-fonts/tv-fonts/pkg-plist
+++ b/x11-fonts/tv-fonts/pkg-plist
@@ -20,3 +20,7 @@ lib/X11/fonts/misc/teletext2.pcf.gz
 lib/X11/fonts/misc/teletext2i.pcf.gz
 lib/X11/fonts/misc/teletext4.pcf.gz
 lib/X11/fonts/misc/teletext4i.pcf.gz
+@unexec rm %D/lib/X11/fonts/misc/fonts.cache-1 || true
+@unexec fc-cache -f -v %D/lib/X11/fonts/misc || true
+@unexec if [ ! -s %D/lib/X11/fonts/misc/fonts.cache-1 ]; then rm %D/lib/X11/fonts/misc/fonts.cache-1; fi
+%%NEWMTREE%%@unexec rmdir %D/lib/X11/fonts/misc 2>/dev/null || true