Make this build on NetBSD/amd64. Patch provided by Nicolas Joly

on port-amd64@.  OK'd by xtraeme@.

3 files changed, 84 insertions, 14 deletions

diff --git a/x11/xorg-imake/distinfo b/x11/xorg-imake/distinfo
index 931f9df7f8d..4e602bcfd7d 100644
--- a/x11/xorg-imake/distinfo
+++ b/x11/xorg-imake/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2004/11/08 08:19:48 xtraeme Exp $
+$NetBSD: distinfo,v 1.7 2004/11/15 11:15:42 hira Exp $
 
 SHA1 (X11R6.8.1-src1.tar.gz) = 027d16317e07d9df166c0176a1f28b2614f38cc9
 Size (X11R6.8.1-src1.tar.gz) = 30562401 bytes
@@ -6,9 +6,9 @@ SHA1 (X11R6.8.1-src3.tar.gz) = e17afc90b0c43f4f40b2ff7410f4ff5d4297de28
 Size (X11R6.8.1-src3.tar.gz) = 10014808 bytes
 SHA1 (patch-aa) = f8d35ceb67df85ca04d9567d66bf99c5d292d322
 SHA1 (patch-ab) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa
-SHA1 (patch-ac) = 90584e5732fb882f431afd69f6fd1c26c9d22bee
+SHA1 (patch-ac) = 938c15a6103d741aa29f1ec45e19be2284fb2a0b
 SHA1 (patch-ad) = 7843332769ee47bc8a52a9adb1047b1a637af71b
 SHA1 (patch-ae) = a06752ee9f55e64a407fac6fbde3547fd096c71d
 SHA1 (patch-af) = 178d556fa11818420cd685308cf179ee5f6f7dac
 SHA1 (patch-ag) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad
-SHA1 (patch-ah) = 2d509b235d9b52317c435453db7d970e0ad54fd3
+SHA1 (patch-ah) = 6960406211ab12eff3044db477c22833c9eaa488
diff --git a/x11/xorg-imake/patches/patch-ac b/x11/xorg-imake/patches/patch-ac
index f5d2a5486c7..79907b5d248 100644
--- a/x11/xorg-imake/patches/patch-ac
+++ b/x11/xorg-imake/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $
+$NetBSD: patch-ac,v 1.2 2004/11/15 11:15:42 hira Exp $
 
---- config/cf/NetBSD.cf.in.orig	2004-03-03 07:53:38.000000000 +0000
-+++ config/cf/NetBSD.cf.in	2004-03-03 07:54:59.000000000 +0000
-@@ -143,7 +143,7 @@
+--- config/cf/NetBSD.cf.in.orig	2004-08-15 09:03:36.000000000 +0900
++++ config/cf/NetBSD.cf.in	2004-11-03 16:54:50.000000000 +0900
+@@ -146,7 +146,7 @@
  #define MkdirHierCmd		mkdir -p
  
  #undef CcCmd
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $
  #ifndef DefaultCCOptions
  #if defined(UseInstalled)
  #define DefaultCCOptions 	/**/
-@@ -159,7 +159,7 @@
+@@ -162,7 +162,7 @@
  #endif
  #endif
  
@@ -20,7 +20,16 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $
  #define StandardCppOptions	-traditional
  #define StandardCppDefines	/**/
  #define PreProcessCmd   	CcCmd -E
-@@ -208,13 +208,7 @@
+@@ -191,7 +191,7 @@
+  * Disabled for NetBSD/vax until I figure out the scheme. --CS 
+  */
+ #if ((OSMajorVersion > 0) && defined(i386Architecture)) || \
+-    defined(PpcArchitecture)
++    defined(PpcArchitecture) || defined(AMD64Architecture)
+ #  ifndef DoLoadableServer
+ #  define DoLoadableServer	YES
+ #  endif
+@@ -211,13 +211,7 @@
  #define HasWeakSymbols		UseElfFormat 
  
  #ifdef i386Architecture
@@ -35,7 +44,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $
  # if OSMajorVersion < 1
  #  define ServerOSDefines	XFree86ServerOSDefines -DXNO_SYSCONF
  # else
-@@ -224,7 +218,7 @@
+@@ -227,7 +221,7 @@
  #  define ServerExtraSysLibs	-li386
  # endif
  #else
@@ -44,3 +53,53 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $
  # if defined(SparcArchitecture)
  #  define ServerOSDefines 	-DDDXOSINIT
  # elif defined(AlphaArchitecture)
+@@ -236,11 +230,17 @@
+ #   define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
+ # elif defined(PpcArchitecture)
+ #  define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT
++# elif defined(AMD64Architecture)
++#  undef OptimizedCDebugFlags
++#  define OptimizedCDebugFlags -O2
++#  define ServerOSDefines 	XFree86ServerOSDefines
+ # else
+ #  define ServerOSDefines 	/**/
+ # endif
+ # if defined(AlphaArchitecture)
+ #  define ServerExtraSysLibs	-lalpha
++# elif defined(AMD64Architecture)
++#  define ServerExtraSysLibs   -lx86_64
+ # else
+ #  define ServerExtraSysLibs	/**/
+ # endif
+@@ -280,6 +280,11 @@
+ #  ifndef XFree86ConsoleDefines
+ #    define XFree86ConsoleDefines	-DWSCONS_SUPPORT
+ #  endif
++#elif defined(AMD64Architecture)
++# define ServerExtraDefines    GccGasOption XFree86ServerDefines -D_XSERVER64
++#  ifndef XFree86ConsoleDefines
++#    define XFree86ConsoleDefines -DWSCONS_SUPPORT -DPCVT_SUPPORT
++#  endif
+ #else
+ #  define ServerExtraDefines GccGasOption
+ #endif
+@@ -400,6 +405,10 @@
+ # endif /* MTRRBuiltin */
+ #endif /* i386Architecture */
+ 
++#if defined(AMD64Architecture)
++# define HasMTRRBuiltin		YES
++#endif
++
+ /*
+  * agpgart support (NetBSD 1.5Y and up)
+  */
+@@ -588,7 +597,7 @@
+ # 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
+ 
diff --git a/x11/xorg-imake/patches/patch-ah b/x11/xorg-imake/patches/patch-ah
index 0bd30e3d0a6..54ca49272ba 100644
--- a/x11/xorg-imake/patches/patch-ah
+++ b/x11/xorg-imake/patches/patch-ah
@@ -1,8 +1,19 @@
-$NetBSD: patch-ah,v 1.1 2004/11/01 23:41:59 xtraeme Exp $
+$NetBSD: patch-ah,v 1.2 2004/11/15 11:15:42 hira Exp $
 
---- config/cf/Imake.cf.orig	2004-10-25 15:42:06.000000000 +0000
-+++ config/cf/Imake.cf	2004-10-22 15:29:33.000000000 +0000
-@@ -253,7 +253,23 @@
+--- config/cf/Imake.cf.orig	2004-08-12 06:14:01.000000000 +0900
++++ config/cf/Imake.cf	2004-11-09 20:01:31.000000000 +0900
+@@ -246,6 +246,10 @@
+ #   define PpcArchitecture
+ #   undef __powerpc__
+ # endif
++# ifdef __x86_64__
++#  define AMD64Architecture
++#  undef __x86_64__
++# endif
+ #endif /* NetBSD */
+ 
+ /* Systems based on kernel of NetBSD */
+@@ -253,7 +257,23 @@
  #define KNetBSDArchitecture
  #endif