$NetBSD: patch-ag,v 1.2 2010/05/21 22:09:43 schwarz 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 @@
 # 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
-# ifdef __arm32__
+# if defined(__arm__) || defined(__arm32__)
 #   define Arm32Architecture
+#   undef __arm__
 #   undef __arm32__
 # endif
 # ifdef __vax__
@@ -246,6 +249,10 @@
 #   define PpcArchitecture
 #   undef __powerpc__
 # endif
+# ifdef __x86_64__
+#  define AMD64Architecture
+#  undef __x86_64__
+# endif
 #endif /* NetBSD */
 
 /* Systems based on kernel of NetBSD */
