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.

13 files changed, 146 insertions, 379 deletions

diff --git a/x11/xorg-imake/Makefile b/x11/xorg-imake/Makefile
index c3cc9b6d367..4f3a2807aab 100644
--- a/x11/xorg-imake/Makefile
+++ b/x11/xorg-imake/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2005/12/08 09:52:17 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2006/01/18 23:53:06 xtraeme Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	xorg-imake-${XORG_VER}
-PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG}
 DISTFILES=	X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src3.tar.gz
@@ -33,11 +32,10 @@ PLIST_SUBST+=	LNDIR=
 
 post-extract:
 	@${TOUCH} ${WRKSRC}/config/cf/date.def
-	@${CP} ${PKGSRCDIR}/x11/xorg-libs/files/DragonFly.cf \
-		${WRKSRC}/config/cf/
 .for F in ${SYSTEMS}
 	@${MV} ${WRKSRC}/config/cf/${F}.cf  ${WRKSRC}/config/cf/${F}.cf.in
 .endfor
+.undef F
 	@${SED} -e "s|CONFIGDIRSPEC|-I${X11ROOT}/lib/X11/config|" \
 		${WRKSRC}/config/util/xmkmf.cpp > \
 		${WRKSRC}/config/util/xmkmf.cpp.orig
@@ -53,10 +51,11 @@ pre-configure:
 		-e "s|@@DARWIN_USE_QUARTZ@@|${DARWIN_USE_QUARTZ}|g"	\
 		${WRKSRC}/config/cf/${F}.cf.in > ${WRKSRC}/config/cf/${F}.cf
 .endfor
+.undef F
 	@( \
 	${ECHO} "#define XORG_VERSION_MAJOR  6";	\
-	${ECHO} "#define XORG_VERSION_MINOR  8";	\
-	${ECHO} "#define XORG_VERSION_PATCH  2";	\
+	${ECHO} "#define XORG_VERSION_MINOR  9";	\
+	${ECHO} "#define XORG_VERSION_PATCH  0";	\
 	${ECHO} "#define XORG_VERSION_SNAP   0";	\
 	) > ${WRKSRC}/config/cf/version.def
 
diff --git a/x11/xorg-imake/PLIST b/x11/xorg-imake/PLIST
index 4b5f5cae67c..bfb587270f9 100644
--- a/x11/xorg-imake/PLIST
+++ b/x11/xorg-imake/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/03/02 02:07:31 hira Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/01/18 23:53:06 xtraeme Exp $
 ${X11ROOT_PREFIX}/bin/ccmakedep
 ${X11ROOT_PREFIX}/bin/cleanlinks
 ${X11ROOT_PREFIX}/bin/gccmakedep
@@ -76,6 +76,9 @@ ${X11ROOT_PREFIX}/lib/X11/config/luna.cf
 ${X11ROOT_PREFIX}/lib/X11/config/lynx.cf
 ${X11ROOT_PREFIX}/lib/X11/config/macII.cf
 ${X11ROOT_PREFIX}/lib/X11/config/mach.cf
+${X11ROOT_PREFIX}/lib/X11/config/mingw.cf
+${X11ROOT_PREFIX}/lib/X11/config/mingw.rules
+${X11ROOT_PREFIX}/lib/X11/config/mingw.tmpl
 ${X11ROOT_PREFIX}/lib/X11/config/minix.cf
 ${X11ROOT_PREFIX}/lib/X11/config/moto.cf
 ${X11ROOT_PREFIX}/lib/X11/config/ncr.cf
diff --git a/x11/xorg-imake/distinfo b/x11/xorg-imake/distinfo
index c974f7b6d18..726933c1561 100644
--- a/x11/xorg-imake/distinfo
+++ b/x11/xorg-imake/distinfo
@@ -1,21 +1,17 @@
-$NetBSD: distinfo,v 1.16 2005/10/16 16:28:27 hira Exp $
+$NetBSD: distinfo,v 1.17 2006/01/18 23:53:06 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 (X11R6.8.2-src3.tar.gz) = de1569856b8023c58fc92bd0b3c8406214451fce
-RMD160 (X11R6.8.2-src3.tar.gz) = d3c90401ba81dfeea843373d0d0d386962b636a6
-Size (X11R6.8.2-src3.tar.gz) = 10379299 bytes
+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 (X11R6.9.0-src3.tar.gz) = 0c8a0d6f9471ec022e12e2688d1991c985a1efb2
+RMD160 (X11R6.9.0-src3.tar.gz) = 1a2d1855f7b204012627a6c6bf0eaf5245fff414
+Size (X11R6.9.0-src3.tar.gz) = 10872474 bytes
 SHA1 (patch-aa) = f8d35ceb67df85ca04d9567d66bf99c5d292d322
 SHA1 (patch-ab) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa
-SHA1 (patch-ac) = 9849c826bb5b25dce8b52fb689672dd485daa34d
+SHA1 (patch-ac) = 682191f790eddb94917c486ec63818756fee8e8e
 SHA1 (patch-ad) = 7843332769ee47bc8a52a9adb1047b1a637af71b
-SHA1 (patch-ae) = a06752ee9f55e64a407fac6fbde3547fd096c71d
-SHA1 (patch-af) = 178d556fa11818420cd685308cf179ee5f6f7dac
-SHA1 (patch-ag) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad
-SHA1 (patch-ah) = 4500a20f369f186c90cb7b0b02cb1ba49e552b34
+SHA1 (patch-ae) = f6bff42193905fd3158b3de52bf925b5fb5f002a
+SHA1 (patch-ag) = 79d826e9d8d4a05f250378814d47f0383ab2eafe
+SHA1 (patch-ah) = 4d4e00a8f9e226323975596070a8fb3f59c34b4d
 SHA1 (patch-ai) = eb3853e360dd5e05ca5978791734bcba5541b162
-SHA1 (patch-aj) = 58594b376a62a584c0bc7f056e512fe8700d558e
-SHA1 (patch-ak) = c7e83c91d5192b5bd9e40c5b3ae3501900487a9f
-SHA1 (patch-al) = 14701767d5719cb2a47d2b828e69cffc1a6063bc
-SHA1 (patch-am) = 3686fea856a19acd3631c07f3ebfc9d2df1f12ec
+SHA1 (patch-aj) = 1343c744c3fde364b0407f24e09d0b11d5dcb8c4
diff --git a/x11/xorg-imake/files/xorgsite.def b/x11/xorg-imake/files/xorgsite.def
index 82f5d611690..1b4ad9df800 100644
--- a/x11/xorg-imake/files/xorgsite.def
+++ b/x11/xorg-imake/files/xorgsite.def
@@ -1,5 +1,5 @@
 /*
- * $NetBSD: xorgsite.def,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $
+ * $NetBSD: xorgsite.def,v 1.2 2006/01/18 23:53:06 xtraeme Exp $
  *
  * X.org packages for pkgsrc system 
  *  
@@ -23,3 +23,5 @@
 #define HasXdmAuth YES
 #define BuildXF86Setup NO
 #define NothingOutsideProjectRoot YES
+
+#define	BuildDPSLibrary	YES
diff --git a/x11/xorg-imake/patches/patch-ac b/x11/xorg-imake/patches/patch-ac
index 3b3458e9baa..f1e01c84c8f 100644
--- a/x11/xorg-imake/patches/patch-ac
+++ b/x11/xorg-imake/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.5 2005/10/16 16:28:27 hira Exp $
+$NetBSD: patch-ac,v 1.6 2006/01/18 23:53:06 xtraeme Exp $
 
---- config/cf/NetBSD.cf.in.orig	2004-08-15 09:03:36.000000000 +0900
-+++ config/cf/NetBSD.cf.in	2005-10-17 01:14:50.000000000 +0900
-@@ -123,7 +123,7 @@
- # define ThreadedX		YES
- # define HasThreadSafeAPI	YES
- # define ThreadsLibraries	-lpthread
--# define LibraryMTDefines	-DUSE_NBSD_THREADLIB
-+# define LibraryMTDefines	@@NETBSD_THREADLIB@@
+--- config/cf/NetBSD.cf.in.orig	2005-12-06 10:56:30.000000000 +0100
++++ config/cf/NetBSD.cf.in	2005-12-06 11:01:02.000000000 +0100
+@@ -126,7 +126,7 @@
+ # if ((OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 11) || \
+       (OSMajorVersion == 2 && OSMinorVersion < 99) || \
+       (OSMajorVersion < 2))
+-#  define LibraryMTDefines	-DUSE_NBSD_THREADLIB
++#  define LibraryMTDefines	@@NETBSD_THREADLIB@@
+ # endif
  # define SystemMTDefines	-D_REENTRANT
  # define MTSafeAPIDefines	-DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
- #else 
-@@ -146,7 +146,7 @@
+@@ -150,7 +150,7 @@
  #define MkdirHierCmd		mkdir -p
  
  #undef CcCmd
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.5 2005/10/16 16:28:27 hira Exp $
  #ifndef DefaultCCOptions
  #if defined(UseInstalled)
  #define DefaultCCOptions 	/**/
-@@ -162,7 +162,7 @@
+@@ -166,7 +166,7 @@
  #endif
  #endif
  
@@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.5 2005/10/16 16:28:27 hira Exp $
  #define StandardCppOptions	-traditional
  #define StandardCppDefines	/**/
  #define PreProcessCmd   	CcCmd -E
-@@ -191,7 +191,7 @@
+@@ -195,7 +195,7 @@
   * Disabled for NetBSD/vax until I figure out the scheme. --CS 
   */
  #if ((OSMajorVersion > 0) && defined(i386Architecture)) || \
@@ -38,83 +38,18 @@ $NetBSD: patch-ac,v 1.5 2005/10/16 16:28:27 hira Exp $
  #  ifndef DoLoadableServer
  #  define DoLoadableServer	YES
  #  endif
-@@ -211,13 +211,7 @@
- #define HasWeakSymbols		UseElfFormat 
- 
- #ifdef i386Architecture
--# ifndef DefaultGcc2i386Opt
--#  if OSMajorVersion > 1 || (OSMajorVersion == 1 && OSMinorVersion > 2)
--    /* The GCC strength-reduce bug is fixed for NetBSD 1.3 and later */
--#   define DefaultGcc2i386Opt -O2 GccAliasingArgs
--#  endif
--# endif
--# define OptimizedCDebugFlags 	DefaultGcc2i386Opt
-+# define OptimizedCDebugFlags 	@@PKGSRC_CFLAGS@@
- # if OSMajorVersion < 1
- #  define ServerOSDefines	XFree86ServerOSDefines -DXNO_SYSCONF
- # else
-@@ -227,7 +221,7 @@
- #  define ServerExtraSysLibs	-li386
- # endif
- #else
--# define OptimizedCDebugFlags 	-O2
-+# define OptimizedCDebugFlags 	@@PKGSRC_CFLAGS@@
- # if defined(SparcArchitecture)
- #  define ServerOSDefines 	-DDDXOSINIT
- # elif defined(AlphaArchitecture)
-@@ -236,11 +230,17 @@
- #   define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
- # elif defined(PpcArchitecture)
- #  define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT
-+# elif defined(AMD64Architecture)
-+#  undef OptimizedCDebugFlags
-+#  define OptimizedCDebugFlags -O2
-+#  define ServerOSDefines 	XFree86ServerOSDefines
- # else
- #  define ServerOSDefines 	/**/
- # endif
- # if defined(AlphaArchitecture)
- #  define ServerExtraSysLibs	-lalpha
-+# elif defined(AMD64Architecture)
-+#  define ServerExtraSysLibs   -lx86_64
- # else
- #  define ServerExtraSysLibs	/**/
- # endif
-@@ -280,6 +280,11 @@
- #  ifndef XFree86ConsoleDefines
- #    define XFree86ConsoleDefines	-DWSCONS_SUPPORT
- #  endif
-+#elif defined(AMD64Architecture)
-+# define ServerExtraDefines    GccGasOption XFree86ServerDefines -D_XSERVER64
-+#  ifndef XFree86ConsoleDefines
-+#    define XFree86ConsoleDefines -DWSCONS_SUPPORT -DPCVT_SUPPORT
-+#  endif
- #else
- #  define ServerExtraDefines GccGasOption
- #endif
-@@ -400,6 +405,10 @@
+@@ -404,6 +404,10 @@
  # endif /* MTRRBuiltin */
  #endif /* i386Architecture */
  
 +#if defined(AMD64Architecture)
-+# define HasMTRRBuiltin		YES
++# define HasMTRRBuiltin                YES
 +#endif
 +
  /*
   * agpgart support (NetBSD 1.5Y and up)
   */
-@@ -468,9 +477,7 @@
- file.0:: file.$(MANNEWSUFFIX)						@@\
- 	@if [ -f file.$(MANNEWSUFFIX) ]; \				@@\
- 	then \								@@\
--	cat file.$(MANNEWSUFFIX) | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \	@@\
--	cp /tmp/$$$$.man file.0; \					@@\
--	$(RM) /tmp/$$$$.man; \						@@\
-+	cat file.$(MANNEWSUFFIX) | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) > file.0; \	@@\
- 	fi 								@@\
- 									@@\
- install.man::                                                           @@\
-@@ -588,7 +595,7 @@
+@@ -590,7 +594,7 @@
  # define BuildXInputLib          YES
  #endif
  
@@ -123,11 +58,3 @@ $NetBSD: patch-ac,v 1.5 2005/10/16 16:28:27 hira Exp $
  # include <xorg.cf>
  #endif
  
-@@ -649,6 +656,7 @@
-  */
- #ifdef PpcArchitecture
- 
-+# undef OptimizedCDebugFlags
- # define OptimizedCDebugFlags 	-O2
- # define XkbServerDefines	-DXKB_ALWAYS_USES_SOFT_REPEAT
- 
diff --git a/x11/xorg-imake/patches/patch-ae b/x11/xorg-imake/patches/patch-ae
index b9dc07f9499..3e2ca944340 100644
--- a/x11/xorg-imake/patches/patch-ae
+++ b/x11/xorg-imake/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $
+$NetBSD: patch-ae,v 1.2 2006/01/18 23:53:06 xtraeme Exp $
 
---- config/cf/linux.cf.in.orig	2004-03-03 07:44:42.000000000 +0000
-+++ config/cf/linux.cf.in	2004-03-03 07:46:51.000000000 +0000
-@@ -549,15 +549,15 @@
+--- config/cf/linux.cf.in.orig	2005-12-06 11:06:50.000000000 +0100
++++ config/cf/linux.cf.in	2005-12-06 11:09:08.000000000 +0100
+@@ -609,10 +609,10 @@
  #  if defined (i386Architecture) && ((GccMajorVersion >3) \
     || ((GccMajorVersion == 3) &&  (GccMinorVersion >= 1)))
  #   ifndef CcCmd
@@ -10,10 +10,14 @@ $NetBSD: patch-ae,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $
 +#    define CcCmd		@@PKGSRC_CC@@
  #   endif
  #   ifndef CplusplusCmd
--#    define CplusplusCmd		c++ -m32
+-#    define CplusplusCmd	c++ -m32
 +#    define CplusplusCmd	@@PKGSRC_CXX@@
  #   endif
  #  endif
+ #  if defined (Ppc64Architecture)
+@@ -624,8 +624,8 @@
+ #   endif
+ #  endif
  #  ifndef CcCmd
 -#   define CcCmd		gcc
 -#   define CplusplusCmd		c++
@@ -22,7 +26,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $
  #  endif
  #  ifndef AsCmd
  #   define AsCmd		CcCmd -c -x assembler
-@@ -721,7 +721,6 @@
+@@ -779,7 +779,6 @@
  #define YaccCmd			bison -y
  #define LexCmd			flex -l
  #define HasFlex			YES
@@ -30,7 +34,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $
  #define PreProcessCmd		CcCmd -E
  #define PostIncDir		DefaultGccIncludeDir
  #define LdCombineFlags		-r
-@@ -791,7 +790,7 @@
+@@ -853,7 +852,7 @@
  
  #ifdef i386Architecture
  # ifndef OptimizedCDebugFlags
diff --git a/x11/xorg-imake/patches/patch-af b/x11/xorg-imake/patches/patch-af
deleted file mode 100644
index 3fa2e0d1cc5..00000000000
--- a/x11/xorg-imake/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $
-
---- config/cf/sun.cf.orig	2004-02-02 14:55:26.000000000 +1100
-+++ config/cf/sun.cf
-@@ -19,6 +19,9 @@ XCOMM platform:  $XFree86: xc/config/cf/
- #endif
- XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
- 
-+/* This is the XFree86 package - we want to build XFree86 on Solaris */
-+#define BuildXFree86OnSparcSunOS YES
-+
- /*
-  * Compiler setup.  This sun.cf file knows what options to use with 
-  * certain compilers, including Sun C, CenterLine C, and gcc.  It 
diff --git a/x11/xorg-imake/patches/patch-ag b/x11/xorg-imake/patches/patch-ag
index 33f3915b104..941f4eb4bc0 100644
--- a/x11/xorg-imake/patches/patch-ag
+++ b/x11/xorg-imake/patches/patch-ag
@@ -1,49 +1,15 @@
-$NetBSD: patch-ag,v 1.1.1.1 2004/07/29 04:49:53 xtraeme Exp $
+$NetBSD: patch-ag,v 1.2 2006/01/18 23:53:06 xtraeme Exp $
 
---- config/cf/OpenBSD.cf.in.orig	2004-07-22 00:18:37.000000000 +0200
-+++ config/cf/OpenBSD.cf.in	2004-07-22 00:19:48.000000000 +0200
-@@ -162,7 +162,7 @@
- #define MkdirHierCmd		mkdir -p
- 
- #ifndef CppCmd
--#define CppCmd          	/usr/libexec/cpp
-+#define CppCmd          	@@PKGSRC_CPP@@
- #endif
- #define StandardCppOptions	-traditional
- #define StandardCppDefines	/**/
-@@ -170,10 +170,10 @@
- #define PreIncDir		DefaultGccIncludeDir
- 
- #ifndef CcCmd
--#define CcCmd 			cc
-+#define CcCmd 			@@PKGSRC_CC@@
- #endif
- #ifndef AsCmd
--#define AsCmd			cc -c -x assembler
-+#define AsCmd			@@PKGSRC_CC@@ -c -x assembler
- #endif
- #ifndef DefaultCCOptions
- #if defined(UseInstalled)
-@@ -226,7 +226,6 @@
- 
- #define HasBsdMake		YES
- 
--#define BuildCyrillicFonts	YES
- #define GzipFontCompression	YES
- #define DefaultUserPath		/bin:/usr/bin:/usr/local/bin:$(BINDIR)
- #define DefaultSystemPath	/sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
-@@ -481,13 +480,7 @@
- # endif 
-  
- 
--# ifndef DefaultGcc2i386Opt
--#   if (OSMajorVersion == 2 && OSMinorVersion >= 3) || OSMajorVersion > 2
--      /* The GCC strength-reduce bug is fixed for OpenBSD 2.3 and later */
--#     define DefaultGcc2i386Opt	-O2 GccAliasingArgs
--#   endif
--# endif
--# define OptimizedCDebugFlags	DefaultGcc2i386Opt
-+# define OptimizedCDebugFlags	@@PKGSRC_CFLAGS@@
- # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
- # define ServerExtraSysLibs	-li386
- # define LdPostLib		/**/
+--- 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__
+ # endif
++# ifdef __x86_64__
++#  define AMD64Architecture
++#  undef __x86_64__
++# endif
+ #endif /* NetBSD */
+ 
+ /* Systems based on kernel of NetBSD */
diff --git a/x11/xorg-imake/patches/patch-ah b/x11/xorg-imake/patches/patch-ah
index e93ad318ddb..387f09d7347 100644
--- a/x11/xorg-imake/patches/patch-ah
+++ b/x11/xorg-imake/patches/patch-ah
@@ -1,41 +1,51 @@
-$NetBSD: patch-ah,v 1.3 2005/06/07 02:43:26 xtraeme Exp $
+$NetBSD: patch-ah,v 1.4 2006/01/18 23:53:06 xtraeme Exp $
 
---- config/cf/Imake.cf.orig	2004-08-12 06:14:01.000000000 +0900
-+++ config/cf/Imake.cf	2004-11-09 20:01:31.000000000 +0900
-@@ -246,6 +246,10 @@
- #   define PpcArchitecture
- #   undef __powerpc__
- # endif
-+# ifdef __x86_64__
-+#  define AMD64Architecture
-+#  undef __x86_64__
-+# endif
- #endif /* NetBSD */
+--- config/cf/darwin.cf.in.orig	2005-12-06 11:18:05.000000000 +0100
++++ config/cf/darwin.cf.in	2005-12-06 11:20:10.000000000 +0100
+@@ -97,7 +97,7 @@
+  * Turn off to build on raw Darwin systems.
+  */
+ #ifndef DarwinQuartzSupport
+-# define DarwinQuartzSupport    YES
++# define DarwinQuartzSupport    @@DARWIN_USE_QUARTZ@@
+ #endif
  
- /* Systems based on kernel of NetBSD */
-@@ -253,7 +257,24 @@
- #define KNetBSDArchitecture
+ #if DarwinQuartzSupport
+@@ -170,7 +170,7 @@
+  * so we use the 3.1-based version in this case.
+  */
+ #if (GccMajorVersion == 3) && (GccMinorVersion == 3)
+-# define CppCmd                 /usr/bin/cpp3
++# define CppCmd                 /usr/bin/cpp
+ #else
+ # define CppCmd                 /usr/bin/cpp
+ #endif
+@@ -184,8 +184,8 @@
  #endif
  
--#ifdef __FreeBSD__
-+#ifdef __DragonFly__
-+# define MacroIncludeFile <DragonFly.cf>
-+# define MacroFile DragonFly.cf
-+# undef __DragonFly__
-+# define DragonFlyArchitecture
-+# 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__
+ /* we have a gcc compatible compiler, but its not called gcc */
+-#define CcCmd                   /usr/bin/cc
+-#define CplusplusCmd            /usr/bin/c++
++#define CcCmd                   @@PKGSRC_CC@@
++#define CplusplusCmd            @@PKGSRC_CXX@@
+ 
+ /* default flags to pass to cc */
+ #ifndef DefaultCCOptions
+@@ -213,7 +213,7 @@
+ #ifdef PpcDarwinArchitecture
+ # define DarwinMachineDefines   -D__powerpc__
+ # if HasGcc3
+-#  define OptimizedCDebugFlags  -Os
++#  define OptimizedCDebugFlags  @@PKGSRC_CFLAGS@@
+ # else
+ #  define OptimizedCDebugFlags  -O2
+ # endif
+@@ -223,7 +223,7 @@
+ #ifdef i386DarwinArchitecture
+ # define DarwinMachineDefines   -D__i386__
+ # if HasGcc3
+-#  define OptimizedCDebugFlags  -Os
++#  define OptimizedCDebugFlags  @@PKGSRC_CFLAGS@@
+ # else
+ #  define OptimizedCDebugFlags  -O2 -fno-strength-reduce
+ # endif
diff --git a/x11/xorg-imake/patches/patch-aj b/x11/xorg-imake/patches/patch-aj
index 8d5323b7a24..932ece06d22 100644
--- a/x11/xorg-imake/patches/patch-aj
+++ b/x11/xorg-imake/patches/patch-aj
@@ -1,55 +1,40 @@
-$NetBSD: patch-aj,v 1.1 2005/03/22 09:46:10 adam Exp $
+$NetBSD: patch-aj,v 1.2 2006/01/18 23:53:06 xtraeme Exp $
 
---- config/cf/darwin.cf.in.orig	Wed Dec 15 05:53:05 2004
-+++ config/cf/darwin.cf.in
-@@ -88,7 +88,7 @@ XCOMM operating system:  OSName (OSMajor
-  * Turn off to build on raw Darwin systems.
-  */
- #ifndef DarwinQuartzSupport
--# define DarwinQuartzSupport    YES
-+# define DarwinQuartzSupport    @@DARWIN_USE_QUARTZ@@
- #endif
+--- config/cf/DragonFly.cf.in.orig	2006-01-06 13:35:13.000000000 +0000
++++ config/cf/DragonFly.cf.in
+@@ -96,12 +96,12 @@ XCOMM operating system:  OSName (OSMajor
+ #define HasFlex                  YES
  
- #if DarwinQuartzSupport
-@@ -161,10 +161,10 @@ XCOMM operating system:  OSName (OSMajor
-  * so we use the 3.1-based version.
-  */
- #if OSMajorVersion >= 7
--# define CppCmd                 /usr/bin/cpp3
-+# define CppCmd                 /usr/bin/cpp
- # define StandardCppOptions     -traditional -D__GNUC__
- #else
--# define CppCmd                 /usr/bin/cpp
-+# define CppCmd                /usr/bin/cpp
+ #ifndef CcCmd
+-# define CcCmd                   cc
++# define CcCmd                   @@PKGSRC_CC@@
+ #endif
+ #ifndef CplusplusCmd
+-# define CplusplusCmd            c++
++# define CplusplusCmd            @@PKGSRC_CXX@@
  #endif
- #if HasGcc3
- # define RawCppCmd              CppCmd -undef
-@@ -173,8 +173,8 @@ XCOMM operating system:  OSName (OSMajor
+-#define CppCmd                   /usr/bin/cpp
++#define CppCmd                   @@PKGSRC_CPP@@
+ #define PreProcessCmd            CppCmd
+ #define StandardCppOptions       -traditional
+ #define StandardCppDefines       /**/
+@@ -148,6 +148,10 @@ XCOMM operating system:  OSName (OSMajor
+ # define HasSSESupport          NO
  #endif
  
- /* we have a gcc compatible compiler, but its not called gcc */
--#define CcCmd                   /usr/bin/cc
--#define CplusplusCmd            /usr/bin/c++
-+#define CcCmd                   @@PKGSRC_CC@@
-+#define CplusplusCmd            @@PKGSRC_CXX@@
++#ifndef BuildDmx
++#define BuildDmx		YES
++#endif
++
+ #ifndef UseRpath
+ # define UseRpath               YES
+ #endif
+@@ -293,7 +297,7 @@ XCOMM operating system:  OSName (OSMajor
+  * Compress manual pages
+  */
+ #ifndef CompressManPages
+-# define CompressManPages    YES
++# define CompressManPages    NO
+ #endif
  
- /* default flags to pass to cc */
- #ifndef DefaultCCOptions
-@@ -202,7 +202,7 @@ XCOMM operating system:  OSName (OSMajor
- #ifdef PpcDarwinArchitecture
- # define DarwinMachineDefines   -D__powerpc__
- # if HasGcc3
--#  define OptimizedCDebugFlags  -Os
-+#  define OptimizedCDebugFlags  @@PKGSRC_CFLAGS@@
- # else
- #  define OptimizedCDebugFlags  -O2
- # endif
-@@ -212,7 +212,7 @@ XCOMM operating system:  OSName (OSMajor
- #ifdef i386DarwinArchitecture
- # define DarwinMachineDefines   -D__i386__
- # if HasGcc3
--#  define OptimizedCDebugFlags  -Os
-+#  define OptimizedCDebugFlags  @@PKGSRC_CFLAGS@@
- # else
- #  define OptimizedCDebugFlags  -O2 -fno-strength-reduce
- # endif
+ #define HasBsdMake    YES
diff --git a/x11/xorg-imake/patches/patch-ak b/x11/xorg-imake/patches/patch-ak
deleted file mode 100644
index c0e83fd1bfb..00000000000
--- a/x11/xorg-imake/patches/patch-ak
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2005/05/23 19:14:14 xtraeme Exp $
-
---- config/imake/imake.c.orig	2004-03-04 18:45:52.000000000 +0100
-+++ config/imake/imake.c	2004-08-10 17:20:20.000000000 +0200
-@@ -145,7 +145,7 @@
-  *	#include INCLUDE_IMAKEFILE
-  *	<add any global targets like 'clean' and long dependencies>
-  */
--#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- /* This needs to be before _POSIX_SOURCE gets defined */
- # include <sys/param.h>
- # include <sys/types.h>
-@@ -1020,7 +1020,7 @@
- }
- #endif
- 
--#if defined(__OpenBSD__) 
-+#if defined(__OpenBSD__) || defined(__DragonFly__)
- static void
- get_stackprotector(FILE *inFile)
- {
-@@ -1285,6 +1285,7 @@
-      defined(__NetBSD__) || \
-      defined(__OpenBSD__) || \
-      defined(__FreeBSD__) || \
-+     defined(__DragonFly__) || \
-      defined(__APPLE__) || \
-      defined(__GNU__)
- 	"/usr/bin/cc",	/* for Linux PostIncDir */
-@@ -1603,7 +1604,7 @@
-       fprintf(inFile, "#define DefaultOSTeenyVersion 0\n");
-     }
- #endif /* EMX */
--#if defined(__OpenBSD__)
-+#if defined(__OpenBSD__) || defined(__DragonFly__)
-   get_stackprotector(inFile);
- #endif
-   return FALSE;
diff --git a/x11/xorg-imake/patches/patch-al b/x11/xorg-imake/patches/patch-al
deleted file mode 100644
index c6b9284ac06..00000000000
--- a/x11/xorg-imake/patches/patch-al
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-al,v 1.1 2005/05/23 19:14:14 xtraeme Exp $
-
---- config/imake/imakemdep.h.orig	2004-08-09 09:54:09.000000000 +0000
-+++ config/imake/imakemdep.h	2004-08-09 09:55:07.000000000 +0000
-@@ -285,7 +285,7 @@
- #if defined(__386BSD__)
- #define DEFAULT_CPP "/usr/libexec/cpp"
- #endif
--#if defined(__FreeBSD__)  || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__)  || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #define USE_CC_E
- #endif
- #if defined(__sgi) && defined(__ANSI_CPP__)
-@@ -348,7 +348,7 @@
- #endif
- #endif
- #if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
--    defined(__FreeBSD__) || defined(MACH) || defined(linux) || \
-+    defined(__FreeBSD__) || defined(__DragonFly__) || defined(MACH) || defined(linux) || \
-     defined(__GNU__) || defined(__bsdi__) || defined(__GNUC__)
- # ifdef __i386__
- 	"-D__i386__",
-@@ -807,14 +807,14 @@
- #  define DEFAULT_OS_MINOR_REV   "r %*d.%[0-9]"
- #  define DEFAULT_OS_TEENY_REV   "v %[0-9]" 
- /* # define DEFAULT_OS_NAME        "srm %[^\n]" */ /* Not useful on ISC */
--# elif defined(__FreeBSD__) || defined(__OpenBSD__)
-+# elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- /* BSD/OS too? */
- /* uname -r returns "x.y[.z]-mumble", e.g. "2.1.5-RELEASE" or "2.2-0801SNAP" */
- #  define DEFAULT_OS_MAJOR_REV   "r %[0-9]"
- #  define DEFAULT_OS_MINOR_REV   "r %*d.%[0-9]"
- #  define DEFAULT_OS_TEENY_REV   "r %*d.%*d.%[0-9]" 
- #  define DEFAULT_OS_NAME        "srm %[^\n]"
--#  if defined(__FreeBSD__)
-+#  if defined(__FreeBSD__) || defined(__DragonFly__)
- /* Use an alternate way to find the teeny version for -STABLE, -SNAP versions */
- #   ifndef CROSSCOMPILE_CPP
- #    define DEFAULT_OS_TEENY_REV_FROB(buf, size)			\
-@@ -1228,7 +1228,9 @@
- #ifdef _MIPS_SZPTR
- 	{"_MIPS_SZPTR", DEF_STRINGIFY(_MIPS_SZPTR)},
- #endif
--#ifdef __FreeBSD__
-+#ifdef __DragonFly__
-+	{"__DragonFly__", "1"},
-+#elif defined(__FreeBSD__)
- 	{"__FreeBSD__", "1"},
- #endif
- #ifdef __OpenBSD__
-@@ -1395,7 +1397,7 @@
- 
- #   ifdef linux
- System sys = LinuX;
--#   elif defined __FreeBSD__
-+#   elif defined __FreeBSD__ || defined(__DragonFly__)
- System sys = freebsd;
- #   elif defined __NetBSD__
- System sys = netBSD;
diff --git a/x11/xorg-imake/patches/patch-am b/x11/xorg-imake/patches/patch-am
deleted file mode 100644
index 624786525b9..00000000000
--- a/x11/xorg-imake/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1 2005/06/07 02:43:26 xtraeme Exp $
-
---- config/cf/bsdLib.rules.orig	2005-06-01 18:09:09.000000000 +0200
-+++ config/cf/bsdLib.rules
-@@ -229,7 +229,7 @@ LintLibReferences(varname,libname,libsou
-  * InstallSharedLibrary - generate rules to install the shared library.
-  * NOTE: file must be executable, hence "INSTBINFLAGS"
-  */
--#ifndef FreeBSDArchitecture
-+#if !defined(FreeBSDArchitecture) || defined(DragonFlyArchitecture)
- INSTALLMINORREV = true
- #else
- INSTALLMINORREV = false