Fix build on NetBSD/arm - _only_ affects #ifdef __NetBSD__ && __arm__.

No change for other platforms/OSs

4 files changed, 34 insertions, 12 deletions

diff --git a/x11/xorg-imake/distinfo b/x11/xorg-imake/distinfo
index f8c86ee497f..7454ec8cbe4 100644
--- a/x11/xorg-imake/distinfo
+++ b/x11/xorg-imake/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2006/10/30 10:14:17 dsainty Exp $
+$NetBSD: distinfo,v 1.24 2006/12/16 11:32:44 abs Exp $
 
 SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
 RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
@@ -11,7 +11,7 @@ SHA1 (patch-ab) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa
 SHA1 (patch-ac) = 9df1808bf84dbb78130287d69d619ca4359d3f47
 SHA1 (patch-ad) = 7843332769ee47bc8a52a9adb1047b1a637af71b
 SHA1 (patch-ae) = 33233761a745b4c62cf64855a5d9c196cd679cf2
-SHA1 (patch-ag) = 79d826e9d8d4a05f250378814d47f0383ab2eafe
+SHA1 (patch-ag) = ac33ed5da627b4e08bb4de8bfe1edf0cec56b422
 SHA1 (patch-ah) = 4d4e00a8f9e226323975596070a8fb3f59c34b4d
 SHA1 (patch-ai) = eb3853e360dd5e05ca5978791734bcba5541b162
 SHA1 (patch-aj) = 1343c744c3fde364b0407f24e09d0b11d5dcb8c4
diff --git a/x11/xorg-imake/patches/patch-ag b/x11/xorg-imake/patches/patch-ag
index 941f4eb4bc0..f43ccbb38a1 100644
--- a/x11/xorg-imake/patches/patch-ag
+++ b/x11/xorg-imake/patches/patch-ag
@@ -1,8 +1,19 @@
-$NetBSD: patch-ag,v 1.2 2006/01/18 23:53:06 xtraeme Exp $
+$NetBSD: patch-ag,v 1.3 2006/12/16 11:32:44 abs Exp $
 
---- 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 @@
+--- config/cf/Imake.cf.orig	2005-11-08 06:33:24.000000000 +0000
++++ config/cf/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
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo
index 3a71b45448c..c8d016b2953 100644
--- a/x11/xorg-libs/distinfo
+++ b/x11/xorg-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.56 2006/10/30 09:33:32 dsainty Exp $
+$NetBSD: distinfo,v 1.57 2006/12/16 11:32:44 abs Exp $
 
 SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
 RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
@@ -24,7 +24,7 @@ SHA1 (patch-al) = edfea125a835e564ba179a50b210f98d0f8e0402
 SHA1 (patch-am) = 9321d85cabb8b04b6bd236557f8f4e893d5559f6
 SHA1 (patch-an) = ba96209b55579f16c53f8a1c26337a3278d1808a
 SHA1 (patch-ao) = 9711178265b3fe334279273ab75bde157f0aea6a
-SHA1 (patch-ap) = 79d826e9d8d4a05f250378814d47f0383ab2eafe
+SHA1 (patch-ap) = ac33ed5da627b4e08bb4de8bfe1edf0cec56b422
 SHA1 (patch-aq) = fd2bcdb1c37ce0cc748b0f5c2a12d226e4486d0d
 SHA1 (patch-ar) = 1343c744c3fde364b0407f24e09d0b11d5dcb8c4
 SHA1 (patch-as) = 492de38023ab7babebe0db8ab700d76e5f2b8a8b
diff --git a/x11/xorg-libs/patches/patch-ap b/x11/xorg-libs/patches/patch-ap
index 77608e76e2b..223f9ffa289 100644
--- a/x11/xorg-libs/patches/patch-ap
+++ b/x11/xorg-libs/patches/patch-ap
@@ -1,8 +1,19 @@
-$NetBSD: patch-ap,v 1.4 2006/01/18 23:53:06 xtraeme Exp $
+$NetBSD: patch-ap,v 1.5 2006/12/16 11:32:44 abs Exp $
 
---- 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 @@
+--- config/cf/Imake.cf.orig	2005-11-08 06:33:24.000000000 +0000
++++ config/cf/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