Update meta-pkgs/xorg to 6.9.0.

The full list of changes:
http://ftp.x.org/pub/X11R7.0/doc/html/RELNOTES2.html

Thanks to joerg@ and reed@ for testing on DragonFlyBSD.

Tested on NetBSD/i386 3.0/-current and DragonFlyBSD-1.4/i386.

4 files changed, 46 insertions, 70 deletions

diff --git a/fonts/xorg-fontsEncodings/Makefile.common b/fonts/xorg-fontsEncodings/Makefile.common
index 42b24248fd0..7b1018358fa 100644
--- a/fonts/xorg-fontsEncodings/Makefile.common
+++ b/fonts/xorg-fontsEncodings/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.2 2005/12/05 20:50:15 rillig Exp $
+# $NetBSD: Makefile.common,v 1.3 2006/01/18 23:53:05 xtraeme Exp $
 
-.if !defined(XORG_FONTSENCODINGS_COMMON)
-XORG_FONTSENCODINGS_COMMON=	# defined
+.ifndef XORG_FONTSENCODINGS_COMMON
+XORG_FONTSENCODINGS_COMMON=	defined
 
 BUILD_DEPENDS+=	xorg-clients>=${XORG_VER}:../../x11/xorg-clients
 
diff --git a/fonts/xorg-fontsEncodings/PLIST b/fonts/xorg-fontsEncodings/PLIST
index dc56f6cfb11..ff8512e6588 100644
--- a/fonts/xorg-fontsEncodings/PLIST
+++ b/fonts/xorg-fontsEncodings/PLIST
@@ -1,24 +1,28 @@
-@comment $NetBSD: PLIST,v 1.3 2005/03/01 19:00:11 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/01/18 23:53:05 xtraeme Exp $
 ${X11ROOT_PREFIX}/lib/X11/fonts/encodings/adobe-dingbats.enc.gz
 ${X11ROOT_PREFIX}/lib/X11/fonts/encodings/adobe-standard.enc.gz
 ${X11ROOT_PREFIX}/lib/X11/fonts/encodings/adobe-symbol.enc.gz
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/ansi-1251.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/armscii-8.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/ascii-0.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/dec-special.enc
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/ansi-1251.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/armscii-8.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/ascii-0.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/dec-special.enc.gz
 ${X11ROOT_PREFIX}/lib/X11/fonts/encodings/encodings.dir
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/ibm-cp437.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/ibm-cp850.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/ibm-cp852.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/ibm-cp866.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/iso8859-11.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/iso8859-13.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/iso8859-16.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/iso8859-6.16.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/iso8859-6.8x.enc
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/ibm-cp437.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/ibm-cp850.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/ibm-cp852.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/ibm-cp866.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/iso8859-11.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/iso8859-13.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/iso8859-16.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/iso8859-6.16.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/iso8859-6.8x.enc.gz
 ${X11ROOT_PREFIX}/lib/X11/fonts/encodings/large/big5.eten-0.enc.gz
 ${X11ROOT_PREFIX}/lib/X11/fonts/encodings/large/big5hkscs-0.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/large/cns11643-1.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/large/cns11643-2.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/large/cns11643-3.enc.gz
 ${X11ROOT_PREFIX}/lib/X11/fonts/encodings/large/encodings.dir
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/large/gb18030-0.enc.gz
 ${X11ROOT_PREFIX}/lib/X11/fonts/encodings/large/gb18030.2000-0.enc.gz
 ${X11ROOT_PREFIX}/lib/X11/fonts/encodings/large/gb18030.2000-1.enc.gz
 ${X11ROOT_PREFIX}/lib/X11/fonts/encodings/large/gb2312.1980-0.enc.gz
@@ -29,26 +33,23 @@ ${X11ROOT_PREFIX}/lib/X11/fonts/encodings/large/jisx0212.1990-0.enc.gz
 ${X11ROOT_PREFIX}/lib/X11/fonts/encodings/large/ksc5601.1987-0.enc.gz
 ${X11ROOT_PREFIX}/lib/X11/fonts/encodings/large/ksc5601.1992-3.enc.gz
 ${X11ROOT_PREFIX}/lib/X11/fonts/encodings/large/sun.unicode.india-0.enc.gz
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/large/cns11643-1.enc.gz
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/large/cns11643-2.enc.gz
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/large/cns11643-3.enc.gz
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/microsoft-cp1250.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/microsoft-cp1251.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/microsoft-cp1252.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/microsoft-cp1253.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/microsoft-cp1254.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/microsoft-cp1255.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/microsoft-cp1256.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/microsoft-cp1257.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/microsoft-cp1258.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/microsoft-win3.1.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/mulearabic-0.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/mulearabic-1.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/mulearabic-2.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/mulelao-1.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/tcvn-0.enc
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/tis620-2.enc
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/microsoft-cp1250.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/microsoft-cp1251.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/microsoft-cp1252.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/microsoft-cp1253.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/microsoft-cp1254.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/microsoft-cp1255.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/microsoft-cp1256.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/microsoft-cp1257.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/microsoft-cp1258.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/microsoft-win3.1.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/mulearabic-0.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/mulearabic-1.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/mulearabic-2.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/mulelao-1.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/suneu-greek.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/tcvn-0.enc.gz
+${X11ROOT_PREFIX}/lib/X11/fonts/encodings/tis620-2.enc.gz
 ${X11ROOT_PREFIX}/lib/X11/fonts/encodings/viscii1.1-1.enc.gz
-${X11ROOT_PREFIX}/lib/X11/fonts/encodings/suneu-greek.enc
 @dirrm ${X11ROOT_PREFIX}/lib/X11/fonts/encodings/large
 @dirrm ${X11ROOT_PREFIX}/lib/X11/fonts/encodings
diff --git a/fonts/xorg-fontsEncodings/distinfo b/fonts/xorg-fontsEncodings/distinfo
index dfba8509cb2..bda37d857d4 100644
--- a/fonts/xorg-fontsEncodings/distinfo
+++ b/fonts/xorg-fontsEncodings/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/05/23 20:53:28 xtraeme Exp $
+$NetBSD: distinfo,v 1.6 2006/01/18 23:53:05 xtraeme Exp $
 
-SHA1 (X11R6.8.2-src1.tar.gz) = 23c60680274062a1db17f646a8388149309dc45c
-RMD160 (X11R6.8.2-src1.tar.gz) = bb170d7a11416c3d9bd1d23d461ba4cea9b1b2c8
-Size (X11R6.8.2-src1.tar.gz) = 32373802 bytes
-SHA1 (patch-aa) = d305ea935ba10d443f9bfdcfc2c74bab5a03ba60
+SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
+RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
+Size (X11R6.9.0-src1.tar.gz) = 33460996 bytes
+SHA1 (patch-aa) = 79d826e9d8d4a05f250378814d47f0383ab2eafe
diff --git a/fonts/xorg-fontsEncodings/patches/patch-aa b/fonts/xorg-fontsEncodings/patches/patch-aa
index a8ea7d6908e..17d2d5473ae 100644
--- a/fonts/xorg-fontsEncodings/patches/patch-aa
+++ b/fonts/xorg-fontsEncodings/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1 2005/05/23 20:53:28 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2006/01/18 23:53:05 xtraeme Exp $
 
---- config/cf/Imake.cf.orig	2004-08-12 06:14:01.000000000 +0900
-+++ config/cf/Imake.cf	2004-11-09 03:52:53.000000000 +0900
+--- config/cf/Imake.cf.orig	2005-12-06 11:10:24.000000000 +0100
++++ config/cf/Imake.cf	2005-12-06 11:10:43.000000000 +0100
 @@ -246,6 +246,10 @@
  #   define PpcArchitecture
  #   undef __powerpc__
@@ -13,28 +13,3 @@ $NetBSD: patch-aa,v 1.1 2005/05/23 20:53:28 xtraeme Exp $
  #endif /* NetBSD */
  
  /* Systems based on kernel of NetBSD */
-@@ -253,7 +257,23 @@
- #define KNetBSDArchitecture
- #endif
- 
--#ifdef __FreeBSD__
-+#ifdef __DragonFly__
-+# define MacroIncludeFile <DragonFly.cf>
-+# define MacroFile DragonFly.cf
-+# undef __DragonFly__
-+# define FreeBSDArchitecture
-+# define KFreeBSDArchitecture
-+# ifdef __i386__
-+#  define i386BsdArchitecture
-+#  define i386Architecture
-+#  undef i386
-+# endif
-+# ifdef __amd64__
-+#  define AMD64Architecture
-+#  undef __amd64__
-+#  undef __x86_64__
-+# endif
-+#elif defined __FreeBSD__
- # define MacroIncludeFile <FreeBSD.cf>
- # define MacroFile FreeBSD.cf
- # undef __FreeBSD__