Import xorg-cf-files-1.0.2 with the local changes from xorg-imake.

This are the default rules used by imake. Platforms other than
DragonFly, FreeBSD, Linux and NetBSD will most likely want some work
here.

OK for import during freeze: agc@ and wiz@

15 files changed, 559 insertions, 0 deletions

diff --git a/x11/xorg-cf-files/DESCR b/x11/xorg-cf-files/DESCR
new file mode 100644
index 00000000000..3845e9a959d
--- /dev/null
+++ b/x11/xorg-cf-files/DESCR
@@ -0,0 +1 @@
+This package contains the default Xorg imake rules.
diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
new file mode 100644
index 00000000000..eeb40e62366
--- /dev/null
+++ b/x11/xorg-cf-files/Makefile
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+#
+
+DISTNAME=		xorg-cf-files-1.0.2
+CATEGORIES=		x11 devel
+MASTER_SITES=		http://xorg.freedesktop.org/releases/individual/util/
+EXTRACT_SUFX=		.tar.bz2
+
+MAINTAINER=		joerg@NetBSD.org
+HOMEPAGE=		http://xorg.freedesktop.org/releases/individual/util/
+COMMENT=		Xorg imake rules
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+GNU_CONFIGURE=		yes
+USE_TOOLS+=		pkg-config
+
+post-extract:
+	${CP} ${FILESDIR}/host.def ${WRKSRC}
+	${CP} ${FILESDIR}/xorgsite.def ${WRKSRC}
+
+pre-configure:
+.for sys in NetBSD FreeBSD DragonFly linux darwin
+	mv ${WRKSRC}/${sys}.cf ${WRKSRC}/${sys}.cf.before &&
+	${SED} -e "s|@@PKGSRC_CC@@|${CC}|g"		\
+		-e "s|@@PKGSRC_CPP@@|${CPP}|g"		\
+		-e "s|@@PKGSRC_CXX@@|${CXX}|g"		\
+		-e "s|@@PKGSRC_CFLAGS@@|${CFLAGS}|g"	\
+		-e "s|@@DARWIN_USE_QUARTZ@@|${DARWIN_USE_QUARTZ}|g"	\
+		${WRKSRC}/${sys}.cf.before > ${WRKSRC}/${sys}.cf
+.endfor
+	${SED} -e "s|@PREFIX@|${PREFIX}|g"		\
+		-e "s|@MAKE@|${MAKE_PROGRAM}|"	${FILESDIR}/host.def > \
+		${WRKSRC}/host.def
+
+.include "../../x11/xproto/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xorg-cf-files/PLIST b/x11/xorg-cf-files/PLIST
new file mode 100644
index 00000000000..deb17744c11
--- /dev/null
+++ b/x11/xorg-cf-files/PLIST
@@ -0,0 +1,123 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+lib/X11/config/Amoeba.cf
+lib/X11/config/DGUX.cf
+lib/X11/config/DragonFly.cf
+lib/X11/config/FreeBSD.cf
+lib/X11/config/Imake.cf
+lib/X11/config/Imake.rules
+lib/X11/config/Imake.tmpl
+lib/X11/config/Library.tmpl
+lib/X11/config/Mips.cf
+lib/X11/config/Motif.rules
+lib/X11/config/Motif.tmpl
+lib/X11/config/NetBSD.cf
+lib/X11/config/Oki.cf
+lib/X11/config/OpenBSD.cf
+lib/X11/config/OpenBSDLib.rules
+lib/X11/config/OpenBSDLib.tmpl
+lib/X11/config/QNX4.cf
+lib/X11/config/QNX4.rules
+lib/X11/config/Server.tmpl
+lib/X11/config/ServerLib.tmpl
+lib/X11/config/Threads.tmpl
+lib/X11/config/Win32.cf
+lib/X11/config/Win32.rules
+lib/X11/config/WinLib.tmpl
+lib/X11/config/X11.rules
+lib/X11/config/X11.tmpl
+lib/X11/config/apollo.cf
+lib/X11/config/bsd.cf
+lib/X11/config/bsdLib.rules
+lib/X11/config/bsdLib.tmpl
+lib/X11/config/bsdi.cf
+lib/X11/config/bsdiLib.rules
+lib/X11/config/bsdiLib.tmpl
+lib/X11/config/cde.rules
+lib/X11/config/cde.tmpl
+lib/X11/config/convex.cf
+lib/X11/config/cray.cf
+lib/X11/config/cross.def
+lib/X11/config/cross.rules
+lib/X11/config/cygwin.cf
+lib/X11/config/cygwin.rules
+lib/X11/config/cygwin.tmpl
+lib/X11/config/darwin.cf
+lib/X11/config/darwinLib.rules
+lib/X11/config/darwinLib.tmpl
+lib/X11/config/date.def
+lib/X11/config/dmx.cf
+lib/X11/config/fujitsu.cf
+lib/X11/config/generic.cf
+lib/X11/config/gnu.cf
+lib/X11/config/gnuLib.rules
+lib/X11/config/gnuLib.tmpl
+lib/X11/config/host.def
+lib/X11/config/hp.cf
+lib/X11/config/hpLib.rules
+lib/X11/config/hpLib.tmpl
+lib/X11/config/ibm.cf
+lib/X11/config/ibmLib.rules
+lib/X11/config/ibmLib.tmpl
+lib/X11/config/isc.cf
+lib/X11/config/linux.cf
+lib/X11/config/lnxLib.rules
+lib/X11/config/lnxLib.tmpl
+lib/X11/config/lnxdoc.rules
+lib/X11/config/lnxdoc.tmpl
+lib/X11/config/luna.cf
+lib/X11/config/lynx.cf
+lib/X11/config/macII.cf
+lib/X11/config/mach.cf
+lib/X11/config/mingw.cf
+lib/X11/config/mingw.rules
+lib/X11/config/mingw.tmpl
+lib/X11/config/minix.cf
+lib/X11/config/moto.cf
+lib/X11/config/ncr.cf
+lib/X11/config/nec.cf
+lib/X11/config/necLib.rules
+lib/X11/config/necLib.tmpl
+lib/X11/config/noop.rules
+lib/X11/config/nto.cf
+lib/X11/config/nto.rules
+lib/X11/config/oldlib.rules
+lib/X11/config/os2.cf
+lib/X11/config/os2.rules
+lib/X11/config/os2Lib.rules
+lib/X11/config/os2Lib.tmpl
+lib/X11/config/osf1.cf
+lib/X11/config/osfLib.rules
+lib/X11/config/osfLib.tmpl
+lib/X11/config/pegasus.cf
+lib/X11/config/sco.cf
+lib/X11/config/sco5.cf
+lib/X11/config/scoLib.rules
+lib/X11/config/sequent.cf
+lib/X11/config/sequentLib.rules
+lib/X11/config/sgi.cf
+lib/X11/config/sgiLib.rules
+lib/X11/config/sgiLib.tmpl
+lib/X11/config/site.def
+lib/X11/config/sony.cf
+lib/X11/config/sun.cf
+lib/X11/config/sunLib.rules
+lib/X11/config/sunLib.tmpl
+lib/X11/config/sv3Lib.rules
+lib/X11/config/sv3Lib.tmpl
+lib/X11/config/sv4Lib.rules
+lib/X11/config/sv4Lib.tmpl
+lib/X11/config/svr3.cf
+lib/X11/config/svr4.cf
+lib/X11/config/ultrix.cf
+lib/X11/config/usl.cf
+lib/X11/config/version.def
+lib/X11/config/x386.cf
+lib/X11/config/xf86.rules
+lib/X11/config/xf86.tmpl
+lib/X11/config/xf86site.def
+lib/X11/config/xfree86.cf
+lib/X11/config/xorg.cf
+lib/X11/config/xorg.tmpl
+lib/X11/config/xorgsite.def
+lib/X11/config/xorgversion.def
+@dirrm lib/X11/config
diff --git a/x11/xorg-cf-files/distinfo b/x11/xorg-cf-files/distinfo
new file mode 100644
index 00000000000..7a4636c394d
--- /dev/null
+++ b/x11/xorg-cf-files/distinfo
@@ -0,0 +1,14 @@
+$NetBSD: distinfo,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+
+SHA1 (xorg-cf-files-1.0.2.tar.bz2) = a1182e1fd05a648e6282598a355b7c4be9339755
+RMD160 (xorg-cf-files-1.0.2.tar.bz2) = dc42aa06d7fb5bc073d51958763bf1bfcfd22926
+Size (xorg-cf-files-1.0.2.tar.bz2) = 264638 bytes
+SHA1 (patch-aa) = afe809bcc5d93be3b8a74e720faf2dc1daa4634d
+SHA1 (patch-ab) = 42fb5238ca07a25d54069aca72882fd36fb118cc
+SHA1 (patch-ac) = 7ed4cd5b33759736d86cdb6226ef53a42bbf7d7e
+SHA1 (patch-ad) = 12c918ad85fa44518525d2c4bc628b342b8c0280
+SHA1 (patch-ae) = bc41dbcfdb45fce8be152cd2ea275954d4aad935
+SHA1 (patch-af) = 6fdcbcb8858bd82d260d00563980e80e314b899c
+SHA1 (patch-ag) = f2e665cc6e67cf2f687652b9adeab0a0de816729
+SHA1 (patch-ah) = f329f44a81c49ba66e8da197ab99a53172a1d247
+SHA1 (patch-ai) = a0795dcd3442471a58c77c667b3eeb50d7bb47bb
diff --git a/x11/xorg-cf-files/files/host.def b/x11/xorg-cf-files/files/host.def
new file mode 100644
index 00000000000..7d611403c92
--- /dev/null
+++ b/x11/xorg-cf-files/files/host.def
@@ -0,0 +1,5 @@
+/* $NetBSD: host.def,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $ */
+
+#define ProjectRoot @PREFIX@
+#define BuildHtmlManPages NO
+#define MakeCmd @MAKE@
diff --git a/x11/xorg-cf-files/files/xorgsite.def b/x11/xorg-cf-files/files/xorgsite.def
new file mode 100644
index 00000000000..e15b26f312c
--- /dev/null
+++ b/x11/xorg-cf-files/files/xorgsite.def
@@ -0,0 +1,27 @@
+/*
+ * $NetBSD: xorgsite.def,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+ *
+ * X.org packages for pkgsrc system 
+ *  
+ */ 
+
+#ifndef HasSecureRPC
+#define HasSecureRPC YES
+#endif
+#ifndef BuildAoutLibraries
+#define BuildAoutLibraries NO
+#endif
+#ifndef InstallXdmConfig
+#define InstallXdmConfig YES
+#endif
+#ifndef InstallXinitConfig
+#define InstallXinitConfig YES
+#endif
+#ifndef InstallAppDefFiles
+#define InstallAppDefFiles YES
+#endif
+#define HasXdmAuth YES
+#define BuildXF86Setup NO
+#define NothingOutsideProjectRoot YES
+
+#define	BuildDPSLibrary	YES
diff --git a/x11/xorg-cf-files/patches/patch-aa b/x11/xorg-cf-files/patches/patch-aa
new file mode 100644
index 00000000000..c339b8c1729
--- /dev/null
+++ b/x11/xorg-cf-files/patches/patch-aa
@@ -0,0 +1,87 @@
+$NetBSD: patch-aa,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+
+--- NetBSD.cf.orig	2005-11-30 06:20:06.000000000 +0100
++++ NetBSD.cf
+@@ -126,7 +126,7 @@ XCOMM operating system:  OSName (OSMajor
+ # 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
+@@ -150,7 +150,7 @@ XCOMM operating system:  OSName (OSMajor
+ #define MkdirHierCmd		mkdir -p
+ 
+ #undef CcCmd
+-#define CcCmd 			gcc
++#define CcCmd 			@@PKGSRC_CC@@
+ #ifndef DefaultCCOptions
+ #if defined(UseInstalled)
+ #define DefaultCCOptions 	/**/
+@@ -166,7 +166,7 @@ XCOMM operating system:  OSName (OSMajor
+ #endif
+ #endif
+ 
+-#define CppCmd			cpp
++#define CppCmd			@@PKGSRC_CPP@@
+ #define StandardCppOptions	-traditional
+ #define StandardCppDefines	/**/
+ #define PreProcessCmd   	CcCmd -E
+@@ -195,7 +195,7 @@ XCOMM operating system:  OSName (OSMajor
+  * Disabled for NetBSD/vax until I figure out the scheme. --CS 
+  */
+ #if ((OSMajorVersion > 0) && defined(i386Architecture)) || \
+-    defined(PpcArchitecture)
++    defined(PpcArchitecture) || defined(AMD64Architecture)
+ #  ifndef DoLoadableServer
+ #  define DoLoadableServer	YES
+ #  endif
+@@ -231,7 +231,7 @@ XCOMM operating system:  OSName (OSMajor
+ #  define ServerExtraSysLibs	-li386
+ # endif
+ #else
+-# define OptimizedCDebugFlags 	-O2
++# define OptimizedCDebugFlags 	-O2 GccAliasingArgs
+ # if defined(SparcArchitecture)
+ #  define ServerOSDefines 	-DDDXOSINIT
+ # elif defined(AlphaArchitecture)
+@@ -284,6 +284,8 @@ XCOMM operating system:  OSName (OSMajor
+ #  ifndef XFree86ConsoleDefines
+ #    define XFree86ConsoleDefines	-DWSCONS_SUPPORT
+ #  endif
++#elif defined(ia64Architecture) || defined(AMD64Architecture)
++#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
+ #else
+ #  define ServerExtraDefines GccGasOption
+ #endif
+@@ -404,6 +406,10 @@ XCOMM operating system:  OSName (OSMajor
+ # endif /* MTRRBuiltin */
+ #endif /* i386Architecture */
+ 
++#if defined(AMD64Architecture)
++# define HasMTRRBuiltin                YES
++#endif
++
+ /*
+  * agpgart support (NetBSD 1.5Y and up)
+  */
+@@ -590,7 +596,7 @@ InstallManPageAliasesBase(file,destdir,a
+ # define BuildXInputLib          YES
+ #endif
+ 
+-#if defined(i386Architecture) || defined(Arm32Architecture) || defined(AlphaArchitecture) || defined(PpcArchitecture)
++#if defined(i386Architecture) || defined(Arm32Architecture) || defined(AlphaArchitecture) || defined(PpcArchitecture) || defined(AMD64Architecture)
+ # include <xorg.cf>
+ #endif
+ 
+@@ -651,7 +664,7 @@ sed 's/\.[0-9]*$$//'`
+  */
+ #ifdef PpcArchitecture
+ 
+-# define OptimizedCDebugFlags 	-O2
++# define OptimizedCDebugFlags 	-O2 GccAliasingArgs
+ # define XkbServerDefines	-DXKB_ALWAYS_USES_SOFT_REPEAT
+ 
+ # ifndef DoLoadableServer
diff --git a/x11/xorg-cf-files/patches/patch-ab b/x11/xorg-cf-files/patches/patch-ab
new file mode 100644
index 00000000000..7e5b8ed552b
--- /dev/null
+++ b/x11/xorg-cf-files/patches/patch-ab
@@ -0,0 +1,38 @@
+$NetBSD: patch-ab,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+
+--- FreeBSD.cf.orig	Fri Oct  8 02:16:19 2004
++++ FreeBSD.cf	Fri Oct  8 02:18:01 2004
+@@ -173,12 +173,12 @@
+ #endif
+ 
+ #ifndef CcCmd
+-#define CcCmd			cc
++#define CcCmd			@@PKGSRC_CC@@
+ #endif
+ #ifndef CplusplusCmd
+-#define CplusplusCmd		c++
++#define CplusplusCmd		@@PKGSRC_CXX@@
+ #endif
+-#define CppCmd			/usr/bin/cpp
++#define CppCmd			@@PKGSRC_CPP@@
+ #define PreProcessCmd		CppCmd
+ #define StandardCppOptions	-traditional
+ #define StandardCppDefines	/**/
+@@ -466,7 +466,7 @@
+ /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
+ #ifndef DefaultGcc2i386Opt
+ #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
+-#define DefaultGcc2i386Opt -O2 GccAliasingArgs
++#define DefaultGcc2i386Opt @@PKGSRC_CFLAGS@@
+ #endif
+ #endif
+ 
+@@ -500,7 +500,7 @@
+  * Compress manual pages
+  */
+ #ifndef CompressManPages
+-# define CompressManPages	YES
++# define CompressManPages	NO
+ #endif
+ 
+ #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1)
diff --git a/x11/xorg-cf-files/patches/patch-ac b/x11/xorg-cf-files/patches/patch-ac
new file mode 100644
index 00000000000..6ee415c26af
--- /dev/null
+++ b/x11/xorg-cf-files/patches/patch-ac
@@ -0,0 +1,55 @@
+$NetBSD: patch-ac,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+
+--- linux.cf.orig	2005-12-06 11:06:50.000000000 +0100
++++ linux.cf	2005-12-06 11:09:08.000000000 +0100
+@@ -609,10 +609,10 @@
+ #  if defined (i386Architecture) && ((GccMajorVersion >3) \
+    || ((GccMajorVersion == 3) &&  (GccMinorVersion >= 1)))
+ #   ifndef CcCmd
+-#    define CcCmd		gcc -m32
++#    define CcCmd		@@PKGSRC_CC@@
+ #   endif
+ #   ifndef CplusplusCmd
+-#    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++
++#   define CcCmd		@@PKGSRC_CC@@
++#   define CplusplusCmd		@@PKGSRC_CXX@@
+ #  endif
+ #  ifndef AsCmd
+ #   define AsCmd		CcCmd -c -x assembler
+@@ -779,7 +779,6 @@
+ #define YaccCmd			bison -y
+ #define LexCmd			flex -l
+ #define HasFlex			YES
+-#define LexLib			-lfl
+ #define PreProcessCmd		CcCmd -E
+ #define PostIncDir		DefaultGccIncludeDir
+ #define LdCombineFlags		-r
+@@ -853,7 +852,7 @@
+ 
+ #ifdef i386Architecture
+ # ifndef OptimizedCDebugFlags
+-#  define OptimizedCDebugFlags	DefaultGcc2i386Opt
++#  define OptimizedCDebugFlags	@@PKGSRC_CFLAGS@@
+ # endif
+ # define LinuxMachineDefines	-D__i386__
+ # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
+@@ -1053,9 +1052,6 @@ InstallNamedTargetNoClobber(install,file
+ #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
+ 
+ #if HaveLib64
+-# ifndef LibDirName
+-#  define LibDirName		lib64
+-# endif
+ # ifndef SystemUsrLibDir
+ #  define SystemUsrLibDir	/usr/lib64
+ # endif
diff --git a/x11/xorg-cf-files/patches/patch-ad b/x11/xorg-cf-files/patches/patch-ad
new file mode 100644
index 00000000000..250b68a9a66
--- /dev/null
+++ b/x11/xorg-cf-files/patches/patch-ad
@@ -0,0 +1,51 @@
+$NetBSD: patch-ad,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+
+--- darwin.cf.orig	2005-12-06 11:18:05.000000000 +0100
++++ darwin.cf	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
+ 
+ #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
+ 
+ /* 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-cf-files/patches/patch-ae b/x11/xorg-cf-files/patches/patch-ae
new file mode 100644
index 00000000000..ebf9092e419
--- /dev/null
+++ b/x11/xorg-cf-files/patches/patch-ae
@@ -0,0 +1,40 @@
+$NetBSD: patch-ae,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+
+--- DragonFly.cf.orig	2006-01-06 13:35:13.000000000 +0000
++++ DragonFly.cf
+@@ -96,12 +96,12 @@ XCOMM operating system:  OSName (OSMajor
+ #define HasFlex                  YES
+ 
+ #ifndef CcCmd
+-# define CcCmd                   cc
++# define CcCmd                   @@PKGSRC_CC@@
+ #endif
+ #ifndef CplusplusCmd
+-# define CplusplusCmd            c++
++# define CplusplusCmd            @@PKGSRC_CXX@@
+ #endif
+-#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
+ 
++#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
+ 
+ #define HasBsdMake    YES
diff --git a/x11/xorg-cf-files/patches/patch-af b/x11/xorg-cf-files/patches/patch-af
new file mode 100644
index 00000000000..ed9a81efb8b
--- /dev/null
+++ b/x11/xorg-cf-files/patches/patch-af
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+
+Run-time path fix for Solaris for the X client libraries.  Without this
+patch, libraries such as libXext.so will not contain a run-time link path
+to /usr/pkg/xorg/lib, causing run time link failures or possibly linking
+with other (non-Pkgsrc) X libraries on the system!
+
+--- sun.cf.orig	2005-12-04 06:20:48.000000000 +1300
++++ sun.cf	2006-10-26 13:11:56.535497000 +1300
+@@ -688,10 +688,10 @@
+     /* This is to work around what appears to be a PIC bug in some gcc/egcs
+        versions that shows up with the Solaris 7/x86 <ctype.h>. */
+ #    define SharedLibraryLdCmd $(LD)
+-#    define SharedLibraryLoadFlags -G -z textwarn
++#    define SharedLibraryLoadFlags -G -z textwarn LibraryRpathLoadFlags
+ #   else
+ #    define SharedLibraryLdCmd $(CC)
+-#    define SharedLibraryLoadFlags -shared -z text
++#    define SharedLibraryLoadFlags -shared -z text LibraryRpathLoadFlags
+ #   endif
+ #  endif
+ # else
diff --git a/x11/xorg-cf-files/patches/patch-ag b/x11/xorg-cf-files/patches/patch-ag
new file mode 100644
index 00000000000..3b7885c04c4
--- /dev/null
+++ b/x11/xorg-cf-files/patches/patch-ag
@@ -0,0 +1,26 @@
+$NetBSD: patch-ag,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+
+--- Imake.cf.orig	2005-11-08 06:33:24.000000000 +0000
++++ Imake.cf
+@@ -234,8 +234,9 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 
+ # ifdef mc68000
+ #   define Mc68020Architecture
+ # endif
+-# ifdef __arm32__
++# if defined(__arm__) || defined(__arm32__)
+ #   define Arm32Architecture
++#   undef __arm__
+ #   undef __arm32__
+ # endif
+ # ifdef __vax__
+@@ -246,6 +247,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 
+ #   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-cf-files/patches/patch-ah b/x11/xorg-cf-files/patches/patch-ah
new file mode 100644
index 00000000000..8bb855aac4b
--- /dev/null
+++ b/x11/xorg-cf-files/patches/patch-ah
@@ -0,0 +1,16 @@
+$NetBSD: patch-ah,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+
+--- bsdLib.rules.orig	2006-02-03 04:02:44.000000000 +0100
++++ bsdLib.rules
+@@ -229,11 +229,7 @@ LintLibReferences(varname,libname,libsou
+  * InstallSharedLibrary - generate rules to install the shared library.
+  * NOTE: file must be executable, hence "INSTBINFLAGS"
+  */
+-#if !defined(FreeBSDArchitecture) || defined(DragonFlyArchitecture)
+ INSTALLMINORREV = true
+-#else
+-INSTALLMINORREV = false
+-#endif
+ 
+ #ifndef InstallSharedLibrary
+ #define InstallSharedLibrary(libname,rev,dest)				@@\
diff --git a/x11/xorg-cf-files/patches/patch-ai b/x11/xorg-cf-files/patches/patch-ai
new file mode 100644
index 00000000000..7b894a2d5b8
--- /dev/null
+++ b/x11/xorg-cf-files/patches/patch-ai
@@ -0,0 +1,16 @@
+$NetBSD: patch-ai,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+
+--- Imake.tmpl.orig	2006-12-18 01:09:37.000000000 +0100
++++ Imake.tmpl
+@@ -1447,9 +1447,9 @@ TCLIBDIR = TclLibDir
+ #ifndef DependCmd
+ #if UseGccMakeDepend
+ #ifdef UseInstalled		/* assume BINDIR in path */
+-#define DependCmd gccmakedep
++#define DependCmd ccmakedep
+ #else
+-#define DependCmd $(DEPENDSRC)/gccmakedep
++#define DependCmd $(DEPENDSRC)/ccmakedep
+ #endif
+ #elif UseCCMakeDepend
+ #ifdef UseInstalled		/* assume BINDIR in path */