Based on PR pkg/45471

    Update x11/xorg-cf-files 1.0.3 to 1.0.4

 Date:   Wed Jan 5 20:31:00 2011 -0800
    xorg-cf-files 1.0.4

-   config: Add missing AC_CONFIG_SRCDIR
-   Regroup AC statements under the Autoconf initialization section.
    Regroup AM statements under the Automake initialization section.
-   Update xorgversion.def from 7.5 to 7.6
-   Add support for darwin x86_64
-   Add .gitignore
-   Update README & COPYING files
-   Use INSTALL_CMD from xorg-macros-1.4 to make INSTALL file
-   Also bump minimum autoconf version to 2.60 for consistency with other
    X.Org modules
-   Remove libXp from XawClientLibs
-   libXaw has lost Xp support some times ago.
-   Use font-util 1.1 macros to set FontDir and FontEncDir in site.def
-   Replaces cygwin.cf rules to manually set these paths.
-   List X.Org version as 7.5 instead of 6.8.99.903
-    cf: Update Cygwin rules

3 files changed, 15 insertions, 20 deletions

diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
index c2967207de4..e82a94e0cd4 100644
--- a/x11/xorg-cf-files/Makefile
+++ b/x11/xorg-cf-files/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2010/05/21 22:09:42 schwarz Exp $
+# $NetBSD: Makefile,v 1.16 2011/10/25 01:36:44 mef Exp $
 #
 
-DISTNAME=		xorg-cf-files-1.0.3
+DISTNAME=		xorg-cf-files-1.0.4
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=util/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/xorg-cf-files/distinfo b/x11/xorg-cf-files/distinfo
index dea025f44de..47ef61c61e3 100644
--- a/x11/xorg-cf-files/distinfo
+++ b/x11/xorg-cf-files/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.9 2010/05/21 22:09:43 schwarz Exp $
+$NetBSD: distinfo,v 1.10 2011/10/25 01:36:44 mef Exp $
 
-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 (xorg-cf-files-1.0.4.tar.bz2) = c58b7252df481572ec1ccd77b9f1ab561ed89e45
+RMD160 (xorg-cf-files-1.0.4.tar.bz2) = 975942e8974812aae91c45d81eb27522e5aa0a5d
+Size (xorg-cf-files-1.0.4.tar.bz2) = 367380 bytes
 SHA1 (patch-aa) = af182a4c4a4f6675946f40eed3fd8914ea7aebd3
 SHA1 (patch-ab) = f8f816409eb233ae4d8430bd9d43b9bf83c5711d
 SHA1 (patch-ac) = 1f977650d9e903a4ea72afc8541b7649cb989ab8
 SHA1 (patch-ad) = 12c918ad85fa44518525d2c4bc628b342b8c0280
 SHA1 (patch-ae) = b1c870feb6372b8443aac498c24dfa802a536ba2
 SHA1 (patch-af) = bb3ff7952ba3ac24d1eb4165a1d3abc736e77cf7
-SHA1 (patch-ag) = f07076ed4d91f01dd976016f98ee6f4adc1fa93c
+SHA1 (patch-ag) = 20010c3ade12a6ee07e1093c6143d9600cca3b37
 SHA1 (patch-ah) = f329f44a81c49ba66e8da197ab99a53172a1d247
 SHA1 (patch-ai) = a0795dcd3442471a58c77c667b3eeb50d7bb47bb
 SHA1 (patch-aj) = 6fd05a766895c06b940e28cd5cadde48365790c3
diff --git a/x11/xorg-cf-files/patches/patch-ag b/x11/xorg-cf-files/patches/patch-ag
index 8a88340530e..fc331b9c245 100644
--- a/x11/xorg-cf-files/patches/patch-ag
+++ b/x11/xorg-cf-files/patches/patch-ag
@@ -1,8 +1,9 @@
-$NetBSD: patch-ag,v 1.2 2010/05/21 22:09:43 schwarz Exp $
+$NetBSD: patch-ag,v 1.3 2011/10/25 01:36:45 mef Exp $
 
---- 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 @@
+Add __ppc64__ and __arm__
+--- Imake.cf.orig	2010-09-04 08:19:43.000000000 +0900
++++ Imake.cf	2011-10-14 19:04:02.000000000 +0900
+@@ -25,9 +25,10 @@
  # define MacroIncludeFile <darwin.cf>
  # define MacroFile darwin.cf
  # define DarwinArchitecture
@@ -12,15 +13,9 @@ $NetBSD: patch-ag,v 1.2 2010/05/21 22:09:43 schwarz Exp $
  #  undef __ppc__
 +#  undef __ppc64__
  # endif
--# ifdef __i386__
-+# if defined __i386__ || defined __x86_64__
+ # ifdef __i386__
  #  define i386DarwinArchitecture
- #  undef __i386__
-+#  undef __x86_64__
- # endif
- #endif
- 
-@@ -234,8 +236,9 @@
+@@ -238,8 +239,9 @@
  # ifdef mc68000
  #   define Mc68020Architecture
  # endif
@@ -31,7 +26,7 @@ $NetBSD: patch-ag,v 1.2 2010/05/21 22:09:43 schwarz Exp $
  #   undef __arm32__
  # endif
  # ifdef __vax__
-@@ -246,6 +249,10 @@
+@@ -250,6 +252,10 @@
  #   define PpcArchitecture
  #   undef __powerpc__
  # endif