$NetBSD: patch-aa,v 1.5 2022/12/01 21:14:09 jperkin Exp $

--- NetBSD.cf.orig	2021-08-02 01:00:38
+++ NetBSD.cf
@@ -126,7 +126,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
 # if ((OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 11) || \
       (OSMajorVersion == 2 && OSMinorVersion < 99) || \
       (OSMajorVersion < 2))
-#  define LibraryMTDefines	-DUSE_NBSD_THREADLIB
+#  define LibraryMTDefines	@@NETBSD_THREADLIB@@
 # endif
 # define SystemMTDefines	-D_REENTRANT
 # define MTSafeAPIDefines	-DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
@@ -150,7 +150,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
 #define MkdirHierCmd		mkdir -p
 
 #undef CcCmd
-#define CcCmd 			gcc
+#define CcCmd 			@@PKGSRC_CC@@
 #ifndef DefaultCCOptions
 #if defined(UseInstalled)
 #define DefaultCCOptions 	/**/
@@ -166,7 +166,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
 #endif
 #endif
 
-#define CppCmd			cpp
+#define CppCmd			@@PKGSRC_CPP@@
 #define StandardCppOptions	-traditional
 #define StandardCppDefines	/**/
 #define PreProcessCmd   	CcCmd -E
@@ -199,6 +199,8 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
 #  ifndef DoLoadableServer
 #  define DoLoadableServer	YES
 #  endif
+#elif defined(ia64Architecture) || defined(AMD64Architecture)
+#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
 #else
 #  ifndef DoLoadableServer
 #  define DoLoadableServer	NO
@@ -342,6 +344,10 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
  */
 #ifndef HasPerl
 #define HasPerl			NO
+#endif
+
+#if defined(AMD64Architecture)
+# define HasMTRRBuiltin                YES
 #endif
 
 /*