--- OLD/xc/config/cf/NetBSD.cf	Thu Jan  1 00:00:00 1970
+++ NEW/xc/config/cf/NetBSD.cf	Thu Jan  1 00:00:00 1970
@@ -138,7 +138,7 @@
 # endif
 #else
 # define OptimizedCDebugFlags 	-O2
-# if defined(SparcArchitecture)
+# if defined(SparcArchitecture) || defined(Sun3Architecture) || defined(NeXT68kArchitecture)
 #  define ServerOSDefines 	-DDDXOSINIT
 # else
 #  define ServerOSDefines 	/**/
@@ -151,6 +151,18 @@
 # endif
 #else
 # define ServerExtraDefines GccGasOption
+# if defined(Sun3Architecture)
+#  undef ServerExtraDefines
+#  define ServerExtraDefines GccGasOption -Dmc68000
+#  define BootstrapCFlags -Dsun3
+# elif defined(NeXT68kArchitecture)
+#  undef ServerExtraDefines
+#  define ServerExtraDefines GccGasOption -Dmc68000
+#  define BootstrapCFlags -Dnext68k
+# endif
+#endif
+#if defined(AlphaArchitecture) || defined(Sparc64Architecture)
+# define PositionIndependentCFlags -fPIC
 #endif
 
 #define StandardDefines	-DCSRG_BASED
@@ -186,8 +198,14 @@
 #define AvoidNullMakeCommand 	YES
 #define StripInstalledPrograms	YES
 #define CompressAllFonts	YES
+#ifndef DefaultUserPath
 #define DefaultUserPath		.:/bin:/usr/bin:/usr/local/bin:$(BINDIR)
+#endif
 #define DefaultSystemPath	/sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
+/* XXX this assumes an ELF system! */
+#define LinkBuildLibrary(lib) MakeDir($(BUILDLIBDIR))			@@\
+	RemoveFile($(BUILDLIBDIR)/lib)					@@\
+	cd $(BUILDLIBDIR) && lname=lib && $(LN) $(BUILDLIBTOP)/$(CURRENT_DIR)/lib . && case lib in *.so.*) rm -f $${lname%.*} $${lname%.*.*} && $(LN) -s lib $${lname%.*} && $(LN) -s lib $${lname%.*.*};; esac
 
 #ifdef  InstallCmd
 # undef  InstallCmd
@@ -283,6 +301,12 @@
 #define InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
 	InstallManPageAliases(file,destdir,aliases)
 
+#define SharedXmuReqs $(LDPRELIBS) $(XTOOLONLYLIB) $(EXTENSIONLIB) $(SMLIB) $(ICELIB) $(XONLYLIB) $(LDPOSTLIBS)
+#define InstallSharedLibrary(libname,rev,dest)				@@\
+install:: Concat(lib,libname.so.rev)					@@\
+	MakeDir($(DESTDIR)dest)						@@\
+	lname=Concat(lib,libname.so.rev) && $(INSTALL) -c $(INSTLIBFLAGS) $${lname} $(DESTDIR)dest && (cd $(DESTDIR)dest; rm -f $${lname%.*} $${lname%.*.*}; $(LN) $${lname} $${lname%.*}; $(LN) $${lname} $${lname%.*.*})	@@\
+
 #include <bsdLib.rules>
 
 #ifdef i386Architecture
@@ -290,9 +314,10 @@
 #endif
 
 /*
- * Definitions for the SUN server on NetBSD/sparc
+ * Definitions for the Sun server on NetBSD
  */
-#ifdef SparcArchitecture
+#if defined(SparcArchitecture) || defined(Sun3Architecture)
+#define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT
 #ifndef Xsun24Server
 #define Xsun24Server	NO
 #endif
@@ -305,14 +330,34 @@
 #ifndef BuildScreenSaverLibrary
 #define BuildScreenSaverLibrary	YES
 #endif
+#if defined(SparcArchitecture)
+#define Xs24Server YES
+#define Xcg14Server YES
+#endif
 /*
- * XFree86 uses its own (more portable) database routines to speed up 
+ * 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 
+ * However, if you want to use ndbm anyway, you can set that to NO in
  * site.def
+ *
+ * What this comment is doing in a SPARC-or-Sun3 portion of this
+ * file is a mystery to me. -Mouse, 19960815
  */
 #ifndef UseRgbTxt
 #define UseRgbTxt	YES
+#endif
+#endif
+
+/*
+ * Definitions for the NeXT server on NetBSD
+ */
+#if defined(NeXT68kArchitecture)
+#define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT
+#ifndef XnextServer
+#define XnextServer	YES
+#endif
+#ifndef BuildScreenSaverLibrary
+#define BuildScreenSaverLibrary	YES
 #endif
 #endif