Update xorg-cf-files to 1.0.6.

This package contains the configuration files, platform data, & Makefile
templates for the old Imake build tool.

Today is the 10th anniversary of X.Org moving off this tool for our own
builds.  While we continue to accept patches and publish updates for the
benefit of other packages which still use Imake to build, we have not been
actively maintaining, testing, or adding new OS or platform support for
Imake.  Software that still uses Imake to build is encouraged to move
to another build system that is better maintained.

Alan Coopersmith (8):
      configure: Drop AM_MAINTAINER_MODE
      autogen.sh: Honor NOCONFIGURE=1
      Remove very out of date OS2 DLL mappings for no-longer-shipped makedef.cmd
      sun.cf: limit SysV man page sections to Solaris 2.0-11
      sun.cf: Sun Studio 12.0 & later compilers prefer -m32/-m64
      README: reword status section
      Remove os2def.db from EXTRA_DIST
      xorg-cf-files 1.0.6

Andreas Boll (1):
      Imake.tmpl: Use gzip -n to not save the timestamps

James Cloos (1):
      Minor adjustment to the or1k patch.

Manuel A. Fernandez Montecelo (1):
      Add support for OpenRISC 1000 (or1k) CPU

Riku Voipio (1):
      add DefaultGcc2AArch64Opt to xorg.cf

Thomas Klausner (2):
      NetBSD: add AMD64Architecture, fix Arm32Architecture.
      Always include xorg.cf for GccAliasingArgs.

4 files changed, 13 insertions, 66 deletions

diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
index 93595ca624c..11faf360f34 100644
--- a/x11/xorg-cf-files/Makefile
+++ b/x11/xorg-cf-files/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2015/07/15 17:16:50 dholland Exp $
+# $NetBSD: Makefile,v 1.30 2015/12/27 11:31:53 wiz Exp $
 
-DISTNAME=		xorg-cf-files-1.0.5
-PKGREVISION=		4
+DISTNAME=		xorg-cf-files-1.0.6
 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 6c73594c166..521ce8f2f09 100644
--- a/x11/xorg-cf-files/distinfo
+++ b/x11/xorg-cf-files/distinfo
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.25 2015/11/04 03:29:10 agc Exp $
+$NetBSD: distinfo,v 1.26 2015/12/27 11:31:53 wiz Exp $
 
-SHA1 (xorg-cf-files-1.0.5.tar.bz2) = ae22eb81d56d018f0b3b149f70965ebfef2385fd
-RMD160 (xorg-cf-files-1.0.5.tar.bz2) = c389c5c1642a7a3b3bc9603c2cb0217a028f905e
-SHA512 (xorg-cf-files-1.0.5.tar.bz2) = 139d2c51538257eac79118ea367cdfbebebcd095f353e784b61c109e008bf8e43eb4ef15bb0c8df74339dbed9d96af4c4d1e023c23d02d5de31dc2ea5b85ce5c
-Size (xorg-cf-files-1.0.5.tar.bz2) = 377835 bytes
+SHA1 (xorg-cf-files-1.0.6.tar.bz2) = 9b6ed71c74a83181a47eb180787e9ab9a5efdfa2
+RMD160 (xorg-cf-files-1.0.6.tar.bz2) = 544d19c017066cbab2c7108ecf702c4866144755
+SHA512 (xorg-cf-files-1.0.6.tar.bz2) = 1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa
+Size (xorg-cf-files-1.0.6.tar.bz2) = 337859 bytes
 SHA1 (patch-OpenBSDLib.rules) = 65b02b660839adb6e9c13287396a794a4586d927
 SHA1 (patch-X11.rules) = 2dac9bcc111f63b2dd887967ea5fab656f52f06b
 SHA1 (patch-X11.tmpl) = 3f0c5b8ad7a60cd0e1e47afcddaace936b9aaeed
-SHA1 (patch-aa) = 6b776ab3c9cc04759eb2fefcd95dcd65ea5909b3
+SHA1 (patch-aa) = 795f9f2db4627cbb1ff9e54dfd4e5b7d3cc495f0
 SHA1 (patch-ab) = f8f816409eb233ae4d8430bd9d43b9bf83c5711d
 SHA1 (patch-ac) = 1f977650d9e903a4ea72afc8541b7649cb989ab8
 SHA1 (patch-ad) = 12c918ad85fa44518525d2c4bc628b342b8c0280
 SHA1 (patch-ae) = 7f39d7b26f8b85529af0b9550ee213ed08aaddde
 SHA1 (patch-af) = c000ab24fafd1f6e154df6b317291f89f952c479
-SHA1 (patch-ag) = 7f2e6061670cb98d6498cc4e156a8e909881635e
+SHA1 (patch-ag) = 72fcd4463207491c23e599f621c86560a2934bea
 SHA1 (patch-ah) = 9b64b2e5f419ab190d47dd8156b8f84634fd6a36
 SHA1 (patch-ai) = 455b398bba0d06ded08ed99f1e0e85cc4ff20449
 SHA1 (patch-aj) = 3be677041b6bff008caa1375d1e6dd5c90d9f501
diff --git a/x11/xorg-cf-files/patches/patch-aa b/x11/xorg-cf-files/patches/patch-aa
index 4382e59f445..2554796eabd 100644
--- a/x11/xorg-cf-files/patches/patch-aa
+++ b/x11/xorg-cf-files/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2012/01/15 14:01:59 shattered Exp $
+$NetBSD: patch-aa,v 1.4 2015/12/27 11:31:54 wiz Exp $
 
 --- NetBSD.cf.orig	2009-10-16 21:45:42.000000000 +0000
 +++ NetBSD.cf
@@ -49,33 +49,3 @@ $NetBSD: patch-aa,v 1.3 2012/01/15 14:01:59 shattered Exp $
  /*
   * NetBSD doesn't have gperf in default system
   * you may override this in host.def if you installed perl from the packages
-@@ -596,10 +602,6 @@
- # define BuildXInputLib          YES
- #endif
- 
--#if defined(i386Architecture) || defined(Arm32Architecture) || defined(AlphaArchitecture) || defined(PpcArchitecture) || defined(AMD64Architecture)
--# include <xorg.cf>
--#endif
--
- /*
-  * Definitions for the SUN server on NetBSD/sparc
-  */
-@@ -629,7 +631,6 @@
- #define BuildXF86VidModeExt	NO
- #define BuildXF86DGA		NO
- #define BuildXInputExt		NO
--#include <xorg.cf>
- #endif
- 
- /*
-@@ -696,3 +697,10 @@
- #define HasDevRandom		YES
- #define RandomDeviceFile	/dev/urandom
- #endif
-+
-+/*
-+ * Always include xorg.cf for GccAliasingArgs,
-+ * regardless of server support on this plattform
-+ */
-+#include <xorg.cf>
-+
diff --git a/x11/xorg-cf-files/patches/patch-ag b/x11/xorg-cf-files/patches/patch-ag
index 77afaa5bf08..47d610a7a62 100644
--- a/x11/xorg-cf-files/patches/patch-ag
+++ b/x11/xorg-cf-files/patches/patch-ag
@@ -1,9 +1,9 @@
-$NetBSD: patch-ag,v 1.4 2013/07/17 06:13:22 dholland Exp $
+$NetBSD: patch-ag,v 1.5 2015/12/27 11:31:54 wiz Exp $
 
 Add __ppc64__ and __arm__
 Recognize __sun as well as sun
 
---- Imake.cf.orig	2010-09-03 23:19:43.000000000 +0000
+--- Imake.cf.orig	2015-12-22 01:28:02.000000000 +0000
 +++ Imake.cf
 @@ -25,9 +25,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 
  # define MacroIncludeFile <darwin.cf>
@@ -17,29 +17,7 @@ Recognize __sun as well as sun
  # endif
  # ifdef __i386__
  #  define i386DarwinArchitecture
-@@ -238,8 +239,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__
-@@ -250,6 +252,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 */
-@@ -347,7 +353,7 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 
+@@ -352,7 +357,7 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 
  # endif
  #endif /* AMOEBA */