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, 5 insertions, 60 deletions

diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile
index 915b435513a9..bfdc6eefe3a4 100644
--- a/x11-fonts/xorg-fonts-100dpi/Makefile
+++ b/x11-fonts/xorg-fonts-100dpi/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	xorg-fonts-100dpi
-PORTVERSION=	6.8.1
+PORTVERSION=	6.8.2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/tars
+MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
 DISTNAME=	X11R${PORTVERSION}-src1
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-fonts/xorg-fonts-100dpi/distinfo b/x11-fonts/xorg-fonts-100dpi/distinfo
index 1078854f7373..e65a2428ce69 100644
--- a/x11-fonts/xorg-fonts-100dpi/distinfo
+++ b/x11-fonts/xorg-fonts-100dpi/distinfo
@@ -1,2 +1,2 @@
-MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b
-SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401
+MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab
+SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802
diff --git a/x11-fonts/xorg-fonts-100dpi/files/patch-bug-1560 b/x11-fonts/xorg-fonts-100dpi/files/patch-bug-1560
deleted file mode 100644
index 8b89779ba476..000000000000
--- a/x11-fonts/xorg-fonts-100dpi/files/patch-bug-1560
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: fonts/bdf/100dpi/Imakefile
-===================================================================
-RCS file: /cvs/xorg/xc/fonts/bdf/100dpi/Imakefile,v
-retrieving revision 1.3
-diff -u -r1.3 Imakefile
---- fonts/bdf/100dpi/Imakefile	26 Aug 2004 11:58:05 -0000	1.3
-+++ fonts/bdf/100dpi/Imakefile	8 Oct 2004 10:00:50 -0000
-@@ -11,8 +11,10 @@
- 
- OBJS1 = $(UCSOBJS1) $(DERIVEDOBJS1) $(PREDERIVEDOBJS1)
- OBJS2 = $(UCSOBJS2) $(DERIVEDOBJS2) $(PREDERIVEDOBJS2) $(MISCOBJS)
-+OBJS3 = $(DERIVEDOBJS3)
-+OBJS4 = $(DERIVEDOBJS4)
- 
--OBJS = $(OBJS1) $(OBJS2)
-+OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4)
- 
- FONTINSTDIR = $(FONTDIR)/100dpi
- 
-@@ -21,6 +23,8 @@
- #ifndef LynxOSArchitecture
- InstallFontObjs($(OBJS1),$(FONTINSTDIR))
- InstallFontObjs($(OBJS2),$(FONTINSTDIR))
-+InstallFontObjs($(OBJS3),$(FONTINSTDIR))
-+InstallFontObjs($(OBJS4),$(FONTINSTDIR))
- InstallFontAliases($(FONTINSTDIR))
- InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR))
- #else
-Index: fonts/bdf/75dpi/Imakefile
-===================================================================
-RCS file: /cvs/xorg/xc/fonts/bdf/75dpi/Imakefile,v
-retrieving revision 1.3
-diff -u -r1.3 Imakefile
---- fonts/bdf/75dpi/Imakefile	26 Aug 2004 11:58:05 -0000	1.3
-+++ fonts/bdf/75dpi/Imakefile	8 Oct 2004 10:00:50 -0000
-@@ -11,8 +11,10 @@
- 
- OBJS1 = $(UCSOBJS1) $(DERIVEDOBJS1) $(PREDERIVEDOBJS1)
- OBJS2 = $(UCSOBJS2) $(DERIVEDOBJS2) $(PREDERIVEDOBJS2) $(MISCOBJS)
-+OBJS3 = $(DERIVEDOBJS3)
-+OBJS4 = $(DERIVEDOBJS4)
- 
--OBJS = $(OBJS1) $(OBJS2)
-+OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4)
- 
- FONTINSTDIR = $(FONTDIR)/75dpi
- 
-@@ -21,6 +23,8 @@
- #ifndef LynxOSArchitecture
- InstallFontObjs($(OBJS1),$(FONTINSTDIR))
- InstallFontObjs($(OBJS2),$(FONTINSTDIR))
-+InstallFontObjs($(OBJS3),$(FONTINSTDIR))
-+InstallFontObjs($(OBJS4),$(FONTINSTDIR))
- InstallFontAliases($(FONTINSTDIR))
- InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR))
- #else
diff --git a/x11-fonts/xorg-fonts-100dpi/pkg-plist b/x11-fonts/xorg-fonts-100dpi/pkg-plist
index e490a38b7b26..ce6bdbade4c1 100644
--- a/x11-fonts/xorg-fonts-100dpi/pkg-plist
+++ b/x11-fonts/xorg-fonts-100dpi/pkg-plist
@@ -1896,3 +1896,4 @@ lib/X11/fonts/100dpi/timR24-ISO8859-3.pcf.gz
 lib/X11/fonts/100dpi/timR24-ISO8859-4.pcf.gz
 lib/X11/fonts/100dpi/timR24-ISO8859-9.pcf.gz
 lib/X11/fonts/100dpi/timR24.pcf.gz
+@unexec rmdir %D/lib/X11/fonts/100dpi 2>/dev/null || true