updated to 1.0.3

included a default for DARWIN_USE_QUARTZ (fails on MacOS X if not set)
added a patch for 64 bit Darwin

6 files changed, 59 insertions, 85 deletions

diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
index 960c1724949..c2967207de4 100644
--- a/x11/xorg-cf-files/Makefile
+++ b/x11/xorg-cf-files/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2010/03/18 22:42:23 sbd Exp $
+# $NetBSD: Makefile,v 1.15 2010/05/21 22:09:42 schwarz Exp $
 #
 
-DISTNAME=		xorg-cf-files-1.0.2
-PKGREVISION=		11
+DISTNAME=		xorg-cf-files-1.0.3
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=util/}
 EXTRACT_SUFX=		.tar.bz2
@@ -18,6 +17,8 @@ USE_TOOLS+=		pkg-config
 
 .include "../../mk/bsd.prefs.mk"
 
+DARWIN_USE_QUARTZ?=	1
+
 post-extract:
 	${CP} ${FILESDIR}/host.def ${WRKSRC}
 	${CP} ${FILESDIR}/xorgsite.def ${WRKSRC}
diff --git a/x11/xorg-cf-files/distinfo b/x11/xorg-cf-files/distinfo
index dc87626c30e..dea025f44de 100644
--- a/x11/xorg-cf-files/distinfo
+++ b/x11/xorg-cf-files/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.8 2009/07/14 06:19:43 dholland Exp $
+$NetBSD: distinfo,v 1.9 2010/05/21 22:09:43 schwarz 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 (xorg-cf-files-1.0.3.tar.bz2) = 0c63edf6ceeb78fe32dd88bfce8d71c85e311bb0
+RMD160 (xorg-cf-files-1.0.3.tar.bz2) = de867edf4ea02da7fdb45a206076daa96c034029
+Size (xorg-cf-files-1.0.3.tar.bz2) = 342708 bytes
+SHA1 (patch-aa) = af182a4c4a4f6675946f40eed3fd8914ea7aebd3
+SHA1 (patch-ab) = f8f816409eb233ae4d8430bd9d43b9bf83c5711d
 SHA1 (patch-ac) = 1f977650d9e903a4ea72afc8541b7649cb989ab8
 SHA1 (patch-ad) = 12c918ad85fa44518525d2c4bc628b342b8c0280
-SHA1 (patch-ae) = bc41dbcfdb45fce8be152cd2ea275954d4aad935
+SHA1 (patch-ae) = b1c870feb6372b8443aac498c24dfa802a536ba2
 SHA1 (patch-af) = bb3ff7952ba3ac24d1eb4165a1d3abc736e77cf7
-SHA1 (patch-ag) = f2e665cc6e67cf2f687652b9adeab0a0de816729
+SHA1 (patch-ag) = f07076ed4d91f01dd976016f98ee6f4adc1fa93c
 SHA1 (patch-ah) = f329f44a81c49ba66e8da197ab99a53172a1d247
 SHA1 (patch-ai) = a0795dcd3442471a58c77c667b3eeb50d7bb47bb
 SHA1 (patch-aj) = 6fd05a766895c06b940e28cd5cadde48365790c3
diff --git a/x11/xorg-cf-files/patches/patch-aa b/x11/xorg-cf-files/patches/patch-aa
index c339b8c1729..97e26b2b838 100644
--- a/x11/xorg-cf-files/patches/patch-aa
+++ b/x11/xorg-cf-files/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2010/05/21 22:09:43 schwarz Exp $
 
---- NetBSD.cf.orig	2005-11-30 06:20:06.000000000 +0100
-+++ NetBSD.cf
-@@ -126,7 +126,7 @@ XCOMM operating system:  OSName (OSMajor
+--- NetBSD.cf.orig	2010-05-16 12:26:19.000000000 +0200
++++ NetBSD.cf	2010-05-16 12:27:44.000000000 +0200
+@@ -126,7 +126,7 @@
  # if ((OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 11) || \
        (OSMajorVersion == 2 && OSMinorVersion < 99) || \
        (OSMajorVersion < 2))
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
  # endif
  # define SystemMTDefines	-D_REENTRANT
  # define MTSafeAPIDefines	-DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
-@@ -150,7 +150,7 @@ XCOMM operating system:  OSName (OSMajor
+@@ -150,7 +150,7 @@
  #define MkdirHierCmd		mkdir -p
  
  #undef CcCmd
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
  #ifndef DefaultCCOptions
  #if defined(UseInstalled)
  #define DefaultCCOptions 	/**/
-@@ -166,7 +166,7 @@ XCOMM operating system:  OSName (OSMajor
+@@ -166,7 +166,7 @@
  #endif
  #endif
  
@@ -29,59 +29,23 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
  #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)
+@@ -199,6 +199,8 @@
  #  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
+ #  ifndef DoLoadableServer
+ #  define DoLoadableServer	NO
+@@ -344,6 +346,10 @@
+ #define HasPerl			NO
  #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
+  * NetBSD doesn't have gperf in default system
+  * you may override this in host.def if you installed perl from the packages
diff --git a/x11/xorg-cf-files/patches/patch-ab b/x11/xorg-cf-files/patches/patch-ab
index 7e5b8ed552b..c659a6fde92 100644
--- a/x11/xorg-cf-files/patches/patch-ab
+++ b/x11/xorg-cf-files/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2010/05/21 22:09:43 schwarz Exp $
 
---- FreeBSD.cf.orig	Fri Oct  8 02:16:19 2004
-+++ FreeBSD.cf	Fri Oct  8 02:18:01 2004
+--- FreeBSD.cf.orig	2010-05-16 12:24:16.000000000 +0200
++++ FreeBSD.cf	2010-05-16 12:24:38.000000000 +0200
 @@ -173,12 +173,12 @@
  #endif
  
@@ -18,7 +18,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
  #define PreProcessCmd		CppCmd
  #define StandardCppOptions	-traditional
  #define StandardCppDefines	/**/
-@@ -466,7 +466,7 @@
+@@ -470,7 +470,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)
@@ -27,7 +27,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
  #endif
  #endif
  
-@@ -500,7 +500,7 @@
+@@ -504,7 +504,7 @@
   * Compress manual pages
   */
  #ifndef CompressManPages
diff --git a/x11/xorg-cf-files/patches/patch-ae b/x11/xorg-cf-files/patches/patch-ae
index ebf9092e419..7bbe22e4172 100644
--- a/x11/xorg-cf-files/patches/patch-ae
+++ b/x11/xorg-cf-files/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+$NetBSD: patch-ae,v 1.2 2010/05/21 22:09:43 schwarz Exp $
 
---- DragonFly.cf.orig	2006-01-06 13:35:13.000000000 +0000
-+++ DragonFly.cf
-@@ -96,12 +96,12 @@ XCOMM operating system:  OSName (OSMajor
+--- DragonFly.cf.orig	2010-05-16 12:38:48.000000000 +0200
++++ DragonFly.cf	2010-05-16 12:41:18.000000000 +0200
+@@ -96,12 +96,12 @@
  #define HasFlex                  YES
  
  #ifndef CcCmd
@@ -18,8 +18,8 @@ $NetBSD: patch-ae,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
  #define PreProcessCmd            CppCmd
  #define StandardCppOptions       -traditional
  #define StandardCppDefines       /**/
-@@ -148,6 +148,10 @@ XCOMM operating system:  OSName (OSMajor
- # define HasSSESupport          NO
+@@ -152,6 +152,10 @@
+ #define BuildDmx		YES
  #endif
  
 +#ifndef BuildDmx
@@ -29,12 +29,3 @@ $NetBSD: patch-ae,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
  #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-ag b/x11/xorg-cf-files/patches/patch-ag
index 3b7885c04c4..8a88340530e 100644
--- a/x11/xorg-cf-files/patches/patch-ag
+++ b/x11/xorg-cf-files/patches/patch-ag
@@ -1,8 +1,26 @@
-$NetBSD: patch-ag,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+$NetBSD: patch-ag,v 1.2 2010/05/21 22:09:43 schwarz 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 
+--- Imake.cf.orig	2006-07-15 03:48:12.000000000 +0200
++++ Imake.cf	2010-05-16 14:01:52.000000000 +0200
+@@ -25,13 +25,15 @@
+ # define MacroIncludeFile <darwin.cf>
+ # define MacroFile darwin.cf
+ # define DarwinArchitecture
+-# ifdef __ppc__
++# if defined __ppc__ || defined __ppc64__
+ #  define PpcDarwinArchitecture
+ #  undef __ppc__
++#  undef __ppc64__
+ # endif
+-# ifdef __i386__
++# if defined __i386__ || defined __x86_64__
+ #  define i386DarwinArchitecture
+ #  undef __i386__
++#  undef __x86_64__
+ # endif
+ #endif
+ 
+@@ -234,8 +236,9 @@
  # ifdef mc68000
  #   define Mc68020Architecture
  # endif
@@ -13,7 +31,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
  #   undef __arm32__
  # endif
  # ifdef __vax__
-@@ -246,6 +247,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 
+@@ -246,6 +249,10 @@
  #   define PpcArchitecture
  #   undef __powerpc__
  # endif