$NetBSD: patch-aa,v 1.6 2023/01/20 22:46:34 mrg Exp $

--- NetBSD.cf.orig	2021-08-01 18:00:38.000000000 -0700
+++ NetBSD.cf	2023-01-18 14:02:16.164685843 -0800
@@ -126,7 +126,7 @@ XCOMM operating system:  OSName (OSMajor
 # 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
@@ -199,6 +199,8 @@ XCOMM operating system:  OSName (OSMajor
 #  ifndef DoLoadableServer
 #  define DoLoadableServer	YES
 #  endif
+#elif defined(ia64Architecture) || defined(AMD64Architecture)
+#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
 #else
 #  ifndef DoLoadableServer
 #  define DoLoadableServer	NO
@@ -333,6 +335,10 @@ XCOMM operating system:  OSName (OSMajor
 
 #define HasFlex			YES
 
+#ifndef HasGnuAr
+#define HasGnuAr		YES
+#endif
+
 /* NetBSD doesn't have gperf in the base install */
 #define DontRebuildGperfOutput	YES
 
@@ -344,6 +350,10 @@ XCOMM operating system:  OSName (OSMajor
 #define HasPerl			NO
 #endif
 
+#if defined(AMD64Architecture)
+# define HasMTRRBuiltin                YES
+#endif
+
 /*
  * NetBSD doesn't have gperf in default system
  * you may override this in host.def if you installed perl from the packages