Sync the NetBSD.cf config file with what we shipped with NetBSD-1.5

with the exception that HasXdmAuth is set to NO (since vnc doesn't
have the Wraphelp.c file).

This fixes problems on pmax, alpha, and maybe others.

This closes PR 10108

2 files changed, 657 insertions, 15 deletions

diff --git a/net/vnc/files/patch-sum b/net/vnc/files/patch-sum
index 5086cf2ab02..2755d17f8a7 100644
--- a/net/vnc/files/patch-sum
+++ b/net/vnc/files/patch-sum
@@ -1,9 +1,9 @@
-$NetBSD: patch-sum,v 1.8 2001/03/12 10:24:03 wiz Exp $
+$NetBSD: patch-sum,v 1.9 2001/03/16 15:24:54 dmcmahill Exp $
 
-SHA1 (patch-aa) = c642605b62bccc7fca23eda3d00654015bf3b8ab
-SHA1 (patch-ab) = e90a434c6c83666e4850c29d5898b8af77f79579
-SHA1 (patch-ac) = 3b551e6c749ca793a165f49a21d10bb4437d00f7
-SHA1 (patch-ad) = a524db9a403428bd750819d25e6157d4c3cb96f7
-SHA1 (patch-ae) = 399ff1527ff75eee7d181dd4f90f95edab028bd7
-SHA1 (patch-af) = 369961aa3e089195653980da91e8fba53807fc53
-SHA1 (patch-ag) = 89ce8a6ac8d51ffd4d4be4588e59b7dd53366716
+MD5 (patch-aa) = 2b644299e7c1ebfbbadbb9a9f88ca9e1
+MD5 (patch-ab) = 2e0572f91c80dbdc418a7fdde9500d84
+MD5 (patch-ac) = 7706348a76cfed42d088721f4cf9ad60
+MD5 (patch-ad) = bb5b0e304749313ad7d1c75a58cfa286
+MD5 (patch-ae) = 9e4e7c8da40677d5a83d46aabd019d9a
+MD5 (patch-af) = 1c60c29502088523561c681b67aed024
+MD5 (patch-ag) = 8deb105fc2aae7a4b0346cffc9eb19d4
diff --git a/net/vnc/patches/patch-ab b/net/vnc/patches/patch-ab
index 75eb59d14f5..58d28a57094 100644
--- a/net/vnc/patches/patch-ab
+++ b/net/vnc/patches/patch-ab
@@ -1,11 +1,653 @@
-$NetBSD: patch-ab,v 1.5 2000/11/13 14:34:41 abs Exp $
+$NetBSD: patch-ab,v 1.6 2001/03/16 15:24:54 dmcmahill Exp $
 
---- Xvnc/config/cf/NetBSD.cf.orig	Sat Jul 26 07:30:39 1997
-+++ Xvnc/config/cf/NetBSD.cf
-@@ -373,5 +373,5 @@
-  * Definition for compiling on Alpha machines
+Sync this with what we shipped with NetBSD-1.5 with the exception that 
+HasXdmAuth is set to NO (since vnc doesn't have the Wraphelp.c file).
+This fixes problems on pmax, alpha, and maybe others.
+
+--- Xvnc/config/cf/NetBSD.cf.orig	Sat Jul 26 02:30:39 1997
++++ Xvnc/config/cf/NetBSD.cf	Wed Mar 14 13:46:28 2001
+@@ -4,5 +5,33 @@
+ 
+-XCOMM platform:  $XFree86: xc/config/cf/NetBSD.cf,v 3.49.2.9 1997/07/26 06:30:39 dawes Exp $
++XCOMM platform:  $XFree86: xc/config/cf/NetBSD.cf,v 3.49.2.13 1999/10/12 17:18:20 hohndel Exp $
+ 
+ 
++  
++XCOMM
++XCOMM This file currently contains support for:
++XCOMM
++XCOMM 		NetBSD/i386	client/server
++XCOMM 		NetBSD/sparc	client/server
++XCOMM 		NetBSD/sparc64	client/server
++XCOMM 		NetBSD/sun3	client/server
++XCOMM 		NetBSD/hp300	client
++XCOMM 		NetBSD/mac68k	client/server
++XCOMM 		NetBSD/pmax	client/server
++XCOMM		NetBSD/amiga	client/server
++XCOMM		NetBSD/alpha	client/server
++XCOMM		NetBSD/arm32	client/server
++XCOMM		NetBSD/atari	client/server
++XCOMM		NetBSD/vax	client/server
++XCOMM		NetBSD/pc532	client
++XCOMM		NetBSD/x68k	client/server
++XCOMM		NetBSD/macppc	client/server
++XCOMM		NetBSD/hpcmips	client/server
++XCOMM		NetBSD/next68k	client
++XCOMM		NetBSD/prep	client
++XCOMM		NetBSD/news68k	client
++XCOMM		NetBSD/cobalt	client
++XCOMM		NetBSD/sgimips	client
++XCOMM		NetBSD/luna68k	client
++XCOMM
++
+ #ifndef OSName
+@@ -16,2 +45,4 @@
+ #endif
++/* XXX this does not deal with patches, but, patches should not affect it */
++/* 1 = A, 2 = B, 3 = C, 4 = D, 5 = E, ... */
+ #ifndef OSTeenyVersion
+@@ -22,3 +53,3 @@
+ #ifndef OSVendor
+-#define	OSVendor	/**/
++#define	OSVendor		The NetBSD Foundation, Inc.
+ #endif
+@@ -27,2 +58,9 @@
+ /*
++ * Enable support for "xdmauth" authentification.
++ */
++#ifndef HasXdmAuth
++#define HasXdmAuth NO
++#endif
++
++/*
+  * C library features
+@@ -32,4 +70,5 @@
+      (OSMajorVersion == 1 && OSMinorVersion == 2 && OSTeenyVersion > 1))
+-#  define HasPoll			YES
++# define HasPoll		YES
+ #endif
++
+ #define HasNdbm         	YES
+@@ -63,3 +102,16 @@
+ #endif
+-/* Mkstemp is there since 1.2 (at least) */
++
++/*
++ * The USB HID library came after 1.4
++ */
++#if ((OSMajorVersion == 1 && OSMinorVersion > 4) || \
++     (OSMajorVersion == 1 && OSMinorVersion == 4 && OSTeenyVersion > 8))
++#  define HasUsbLib		YES
++#endif
++
++  
++#if OSMajorVersion >= 1
++# define LexCmd			lex -l
++#endif
++
+ #if (!(OSMajorVersion == 0 || \
+@@ -87,2 +139,3 @@
+ 
++#define HasMktemp		NO
+ #define MkdirHierCmd		mkdir -p
+@@ -98,2 +151,4 @@
+ #define DefaultCCOptions 	/**/
++#elif defined(arm32Architecture)
++#define DefaultCCOptions 	-ansi -Dasm=__asm -fsigned-char -fomit-frame-pointer
+ #else
+@@ -104,3 +159,3 @@
+ #define AsmDefines 		-DUSE_GAS
+-
++  
+ /* UseElfFormat defaults to YES if __ELF__ set */
+@@ -116,7 +171,14 @@
+ /*
++ * Make sure the binaries know where to look for the shared libaries.
++ * NOTE: This is done in bsdLib.rules for ELF libraries!
++ */
++#if (OSMajorVersion == 1 && OSMinorVersion >= 2) || OSMajorVersion > 1
++# if !defined(UseElfFormat) || UseElfFormat == NO
++#  define ExtraLoadFlags	-R$(USRLIBDIR)
++# endif
++#endif
++
++/*
+  * Dynamic loading supported starting in 1.0 on a.out platforms,
+  * and on all ELF platforms.
+- *
+- * XXX May not be correct on NetBSD/pmax (ELF, but might not have
+- * working shared libs).
+  */
+@@ -126,3 +188,6 @@
+ # ifndef BuildDynamicLoading
+-# define BuildDynamicLoading	YES
++#  define BuildDynamicLoading	YES
++# endif
++# ifndef ForceNormalLib
++#  define ForceNormalLib	YES
+ # endif
+@@ -131,8 +196,15 @@
+ #if UseElfFormat
+-#define DlLibrary		-rdynamic /* no -ldl yet */
++# define DlLibrary		-rdynamic /* no -ldl yet */
+ #else
+-#define DlLibrary		/**/
++# define DlLibrary		/**/
+ #endif
+ 
++/* The GCC strength-reduce bug is fixed for NetBSD 1.3 and later */
+ #ifdef i386Architecture
++# ifndef DefaultGcc2i386Opt
++#  if OSMajorVersion > 1 || (OSMajorVersion == 1 && OSMinorVersion > 2)
++    /* The GCC strength-reduce bug is fixed for NetBSD 1.3 and later */
++#   define DefaultGcc2i386Opt -O2
++#  endif
++# endif
+ # define OptimizedCDebugFlags 	DefaultGcc2i386Opt
+@@ -143,14 +215,4 @@
+ # endif
+-# if OSMajorVersion == 1 && OSMinorVersion >= 1 || OSMajorVersion >= 2
+-#  define ServerExtraSysLibs	-li386 DlLibrary
+-# endif
+-#else
+-# define OptimizedCDebugFlags 	-O2
+-# if defined(SparcArchitecture) || defined(AlphaArchitecture)
+-#  define ServerOSDefines 	-DDDXOSINIT
+-# else
+-#  define ServerOSDefines 	/**/
+-# endif
+ # if BuildDynamicLoading
+-#  define ServerExtraSysLibs	DlLibrary
++#  define ServerExtraSysLibs	-li386 DlLibrary
+ # else
+@@ -158,4 +220,2 @@
+ # endif
+-#endif
+-#ifdef i386Architecture
+ # define ServerExtraDefines GccGasOption XFree86ServerDefines
+@@ -165,6 +225,6 @@
+ #else
+-# if defined(AlphaArchitecture)
+-#  define ServerExtraDefines GccGasOption -D_XSERVER64
++# if defined(m68kArchitecture) && OSMajorVersion == 1 && OSMinorVersion <= 3
++#  define OptimizedCDebugFlags 	-O
+ # else
+-#  define ServerExtraDefines GccGasOption
++#  define OptimizedCDebugFlags 	-O2
+ # endif
+@@ -172,2 +232,178 @@
+ 
++/*
++ * On mips, all libs are compiled with ABIcalls, not just sharedlibs.
++ * Disable MIPS specific code which was not used and tested.
++ */
++#if defined(MipsArchitecture)
++# define SeparateSharedCompile NO
++# undef MipsArchitecture
++#endif
++
++/*
++ * XXX always build XKBuilib, override xfree86.cf
++ */
++#if defined(arm32Architecture) || defined(i386Architecture) || defined(atariArchitecture)
++# define BuildXKBuilib		YES
++#endif
++
++#if defined(SparcArchitecture)
++# define ServerOSDefines	-DDDXOSINIT
++# if defined(Sparc64Architecture)
++#  define ServerExtraDefines	GccGasOption -D_XSERVER64
++# else
++#  define ServerExtraDefines	GccGasOption
++# endif
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(Sun3Architecture)
++# define ServerOSDefines	-DDDXOSINIT
++# define ServerExtraDefines	GccGasOption -D__sun3__
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(hp300Architecture)
++# define BuildServer		NO		/* XXX */
++# define ServerOSDefines	-DDDXOSINIT
++# define ServerExtraDefines	GccGasOption
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(mac68kArchitecture)
++# define ServerOSDefines	-DDDXOSINIT
++# define ServerExtraDefines	GccGasOption -D__mac68k__
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(AlphaArchitecture)
++# define BuildServer		YES
++# define ServerOSDefines	-DDDXOSINIT
++# define ServerExtraDefines	GccGasOption -D_XSERVER64
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++# undef OptimizedCDebugFlags			/* XXX ??? */
++# define OptimizedCDebugFlags			/* XXX ??? */
++#endif
++
++#if defined(amigaArchitecture)
++# define ServerOSDefines	-DDDXOSINIT
++# define ServerExtraDefines	GccGasOption -D__amiga__
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++# define XserverNeedsSetUID	YES
++#endif
++
++#if defined(arm32Architecture)
++# define BuildServer		YES
++# define ServerOSDefines	-DDDXOSINIT -DDDXTIME
++# define ServerExtraDefines	GccGasOption XFree86ServerDefines
++# ifndef XFree86ConsoleDefines
++#  define XFree86ConsoleDefines -DPCCONS_SUPPORT
++# endif
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(atariArchitecture)
++# define BuildServer		YES
++# define ServerOSDefines	-DDDXOSINIT
++# define ServerExtraDefines	GccGasOption XFree86ServerDefines -D__atari__
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(VaxArchitecture)
++# define BuildServer		NO
++# define ServerExtraDefines	GccGasOption
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(pc532Architecture)
++# define BuildServer		NO
++# define ServerOSDefines	-DDDXOSINIT
++# define ServerExtraDefines	GccGasOption
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(x68kArchitecture)
++# define BuildServer		YES
++# define ServerOSDefines	-DDDXOSINIT
++# define ServerExtraDefines	GccGasOption -D__x68k__
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++# define XserverNeedsSetUID	YES
++#endif
++
++#if defined(macppcArchitecture)
++# define ServerOSDefines	-DDDXOSINIT
++# define ServerExtraDefines	GccGasOption -D__macppc__
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++# define XkbServerDefines	-DXKB_ALWAYS_USES_SOFT_REPEAT
++#endif
++
++#if defined(pmaxArchitecture)
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(hpcmipsArchitecture)
++# define ServerOSDefines	-DDDXOSINIT
++# define BuildServer		YES
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++# define ServerExtraDefines	-DSTATIC_COLOR
++# define XserverNeedsSetUID	YES
++#endif
++
++#if defined(next68kArchitecture)
++# define BuildServer		NO
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(prepArchitecture)
++# define BuildServer		NO
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(news68kArchitecture)
++# define BuildServer		NO
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(cobaltArchitecture)
++# define BuildServer		NO
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(sgimipsArchitecture)
++# define BuildServer		NO
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#if defined(luna68kArchitecture)
++# define BuildServer		NO
++# define PexDynamicModule	NO
++# define XieDynamicModule	NO
++#endif
++
++#ifndef OptimizedCDebugFlags
++# define OptimizedCDebugFlags 	-O2
++#endif
++
++#ifndef PositionIndependentCFlags
++# define PositionIndependentCFlags	-fPIC
++#endif
++
+ #define StandardDefines	-DCSRG_BASED
+@@ -179,3 +415,14 @@
+ #ifndef UseGnuMalloc
++/*
++ * There is no way to map 1.4J correctly to OS*Version, so 'J' is mapped
++ * to OSTeenyVersion == 10. This should be save since there will never a
++ * release for 1.4.10.
++ */
++# if ((OSMajorVersion > 1) || \
++     (OSMajorVersion == 1 && OSMinorVersion > 4) || \
++     (OSMajorVersion == 1 && OSMinorVersion == 4 && OSTeenyVersion >= 10))
++#  define UseGnuMalloc		NO
++# else
+ #  define UseGnuMalloc		YES
++# endif
+ #endif
+@@ -193,2 +440,9 @@
+ 
++/* 1.4R and later has setusercontext() */
++# if ((OSMajorVersion > 1) || \
++     (OSMajorVersion == 1 && OSMinorVersion > 4) || \
++     (OSMajorVersion == 1 && OSMinorVersion == 4 && OSTeenyVersion >= 18))
++#define HasSetUserContext  YES
++#endif
++
+ #define	AdmDir			/var/log
+@@ -202,4 +456,13 @@
+ #define GzipFontCompression	YES
+-#define DefaultUserPath		/bin:/usr/bin:/usr/local/bin:$(BINDIR)
+-#define DefaultSystemPath	/sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
++#define DefaultUserPath		/usr/bin:/bin:/usr/pkg/bin:$(BINDIR):/usr/local/bin
++#define DefaultSystemPath	/usr/bin:/bin:/usr/sbin:/sbin:/usr/pkg/bin:/usr/pkg/sbin:$(BINDIR):/usr/local/bin:/usr/local/sbin
++
++#define InstPgmFlags		-s -m 0555 -o root -g wheel
++#define InstBinFlags		-m 0555 -o root -g wheel
++#define InstUidFlags		-m 4511 -o root -g wheel
++#define InstLibFlags		-m 0444 -o root -g wheel
++#define InstIncFlags		-m 0444 -o root -g wheel
++#define InstManFlags		-m 0444 -o root -g wheel
++#define InstDatFlags		-m 0444 -o root -g wheel
++#define InstKmemFlags		-m 2555 -o root -g kmem
+ 
+@@ -214,2 +477,14 @@
+ 
++#ifdef arm32Architecture
++/*
++ * NetBSD's default .SUFFIXES target places .s at a higher priority
++ * than .c.  This breaks architectures which use the .c versions of
++ * various files in the XFree86 server tree for which there are also
++ * .s versions.  Default to the basic .SUFFIXES list specified in
++ * SUSv2 (without the SCCS-related suffixes) plus .cxx for Motif.rules.
++ */
++.SUFFIXES:
++.SUFFIXES: .o .c .y .l .a .sh .f .cxx
++#endif
++
+ /*
+@@ -217,4 +492,4 @@
+  */
+-#define NeqnCmd			neqn -Tlatin1
+-#define NroffCmd		nroff -Tlatin1
++#define NeqnCmd			neqn -Tascii
++#define NroffCmd		nroff -Tascii
+ #define	EqnCmd 			eqn -Tps
+@@ -266,3 +541,6 @@
+ 	$(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\
+-	fi
++	fi								@@\
++									@@\
++clean::									@@\
++	$(RM) file.0
+ 
+@@ -283,3 +561,12 @@
+ #define InstallMultipleMan(list,dest)                                   @@\
+-	InstallMultipleManSuffix(list,dest,man)
++	MakeDir($(DESTDIR)dest)						@@\
++	case '${MFLAGS}' in *[i]*) set +e;; esac; \			@@\
++	for i in list; do \                                             @@\
++	  (set -x; \							@@\
++	  MNAME=`echo $$i | cut -f1 -d.`; \				@@\
++	  cat $$i | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \	@@\
++	  $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$$$.man $(DESTDIR)dest/$${MNAME}.0; \	@@\
++	  $(RM) /tmp/$$$$.man); \						@@\
++	done
++
+ 
+@@ -301,9 +588,6 @@
+  * and on all ELF platforms.
+- *
+- * XXX May not be correct on NetBSD/pmax (ELF, but might not have
+- * working shared libs).
+  */
+ #if ((OSMajorVersion > 0) && \
+-     !defined(AlphaArchitecture) && !defined(MipsArchitecture)) || \
+-    UseElfFormat
++     !defined(AlphaArchitecture) && !defined(MipsArchitecture)) \
++     || UseElfFormat
+ # ifndef HasSharedLibraries
+@@ -329,13 +613,47 @@
+ 
+-#ifdef i386Architecture
++#if defined(i386Architecture) || defined(arm32Architecture) || \
++    defined(atariArchitecture)
+ # include <xfree86.cf>
+-#endif
+ 
+ /*
+- * Definitions for the SUN server on NetBSD/sparc
++ * XXX The DynamicModuleTarget macro in xf86.rules does NOT work properly
++ * XXX on ELF systems.  This macro should be moved into bsdLib.rules, since
++ * XXX it depends on how shlibs are built on that platform.
++ * XXX
++ * XXX The following overrides DynamicModuleTarget so it should work on
++ * XXX ELF and a.out.
++ */
++/*
++ * DynamicModuleTarget - build a module to be dynamically loaded
++ */
++# undef DynamicModuleTarget
++# define DynamicModuleTarget(module,modlist)				@@\
++AllTarget(module)							@@\
++									@@\
++module: modlist								@@\
++	RemoveFile($@)							@@\
++	$(CC) -nostdlib -o $@ -Wl,-Bshareable -R$(USRLIBDIR) modlist	@@\
++									@@\
++clean::									@@\
++	RemoveFile(module)
++
++#endif /* i386Architecture || arm32Architecture || atariArchitecture */
++
++/*
++ * NetBSD always uses the XFree86 contrib distribution.
++ */
++#undef	XF86Contrib
++#define	XF86Contrib	YES
++
++/*
++ * Definitions for the SUN server on NetBSD/sparc or NetBSD/sun3
+  */
+-#ifdef SparcArchitecture
++#if defined(SparcArchitecture) || defined(Sun3Architecture)
+ #ifndef Xsun24Server
++#if defined(SparcArchitecture)
++#define Xsun24Server	YES
++#else
+ #define Xsun24Server	NO
+ #endif
++#endif
+ #ifndef XsunServer
+@@ -346,14 +664,96 @@
+ #endif
+-#ifndef BuildScreenSaverLibrary
+-#define BuildScreenSaverLibrary	YES
+ #endif
++  
+ /*
+- * XFree86 uses its own (more portable) database routines to speed up 
+- * the RGB database lookups
+- * However, if you want to use ndbm anyway, you can set that to NO in 
+- * site.def
++ * Definitions for the NetBSD/mac68k server.
+  */
+-#ifndef UseRgbTxt
+-#define UseRgbTxt	YES
++#ifdef mac68kArchitecture
++# ifndef Xmac68kServer
++#  define Xmac68kServer		YES
++# endif
++#endif
++
++/*
++ * Definitions for the NetBSD/vax server.
++ */
++#ifdef VaxArchitecture
++# define XvaxMonoServer YES
++# if HasGcc
++#  define BuildPexExt XvaxMonoServer
++# else
++#  define BuildPex        NO      /* compiler runs out of table space */
++#  define BuildXInputLib  NO      /* compiler runs out of table space */
++# endif
++# define HasSaberC NO
++# define UnalignedReferencesAllowed YES         /* if arbitrary deref is okay */
++#endif
++
++/*
++ * Definitions for the NetBSD/amiga server.
++ */
++#ifdef amigaArchitecture
++# ifndef XamigaCCmono
++#  define XamigaCCmono		NO
++# endif
++# ifndef XamigaCCcolor
++#  define XamigaCCcolor		YES
++# endif
++# ifndef XamigaGfxCardSupport
++#  define XamigaGfxCardSupport	YES
++# endif
++# ifndef XamigaRetinaZ3Support
++#  define XamigaRetinaZ3Support	YES
++# endif
++# ifndef XamigaCl5426Server
++#  define XamigaCl5426Server	YES
++# endif
++# ifndef XamigaCV64Support
++#  define XamigaCV64Support	YES
++# endif
++/*
++ * You need XamigaGfxCardSupport if you enable XamigaCl5426Server,
++ * XamigaRetinaZ3Support or XamigaCV64Support and you can't use XamigaCCmono
++ * if you enable XamigaCCcolor.
++ * Don't change the next 10 lines !!!!!!!!!
++ */
++# if (XamigaCl5426Server || XamigaCV64Support || XamigaRetinaZ3Support) \
++	&& !XamigaGfxCardSupport
++#  undef XamigaGfxCardSupport
++#  define XamigaGfxCardSupport	YES
++# endif
++# if XamigaCCcolor
++#  undef XamigaCCmono
++#  define XamigaCCmono		NO
++# endif
++#endif
++
++/*
++ * Definitions for the NetBSD/alpha X server.
++ */
++#if defined(AlphaArchitecture)
++# define XalphaNetBSDServer	YES
++#ifndef XkbServerDefines
++#define XkbServerDefines	-DXKB_ALWAYS_USES_SOFT_REPEAT
++#endif
++#endif
++
++/*
++ * Definitions for the NetBSD/arm32 VIDC20 X server.
++ */
++#if defined(arm32Architecture)
++# define Xarm32VIDCServer	YES
++#endif
++
++/*
++ * Definitions for the NetBSD/x68k X server.
++ */
++#if defined(x68kArchitecture)
++# define X68kServer		YES
+ #endif
++
++/*
++ * Definitions for the NetBSD/macppc X server.
++ */
++#if defined(macppcArchitecture)
++# define XmacppcServer		YES
+ #endif
+@@ -361,10 +761,6 @@
+ /*
+- * Definition for compiling on MIPS machines
++ * Definitions for the NetBSD/pmax X server.
+  */
+-#ifdef MipsArchitecture
+-#define PositionIndependentCFlags
+-#define SharedLibraryLoadFlags -x -shared --whole-archive -soname `echo $@ |
+-sed 's/\.[0-9]*$$//'`
+-#define SharedXtReqs $(XLIBONLY) $(SMLIB) $(ICELIB)
+-#define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XONLYLIB) $(EXTENSIONLIB)
++#if defined(pmaxArchitecture)
++# define XpmaxServer YES
+ #endif
+@@ -372,6 +768,25 @@
+ /*
+- * Definition for compiling on Alpha machines
++ * Definitions for the NetBSD/hpcmips X server.
   */
- #ifdef AlphaArchitecture
+-#ifdef AlphaArchitecture
 -#define	BuildServer	NO
-+#define	BuildServer	YES
++#if defined(hpcmipsArchitecture)
++# define XhpcServer		YES
++#endif
++
++
++#ifndef BuildScreenSaverLibrary
++#define BuildScreenSaverLibrary	YES
++#endif
++
++#ifndef XkbServerDefines
++#define XkbServerDefines	-DXKB_ALWAYS_USES_SOFT_REPEAT
++#endif
++
++/*
++ * XFree86 uses its own (more portable) database routines to speed up 
++ * the RGB database lookups
++ * However, if you want to use ndbm anyway, you can set that to NO in 
++ * site.def
++ */
++#ifndef UseRgbTxt
++#define UseRgbTxt	NO
  #endif