3. Added missing parts to XKB to make XEVIE branch compile (Egbert Eich).XEVIE

2. Merged with XORG-CURRENT branch to obtain a bugfix (Egbert Eich).
1. First add of SUN's XIVIE extension (Stuart Kreitman).

26 files changed, 556 insertions, 164 deletions

diff --git a/FreeBSD.cf b/FreeBSD.cf
index e827ca9..b3e6880 100644
--- a/FreeBSD.cf
+++ b/FreeBSD.cf
@@ -1,9 +1,9 @@
 XCOMM platform:  $Xorg: FreeBSD.cf,v 1.3 2000/08/17 19:41:45 cpqbld Exp $
-XCOMM platform:  $XdotOrg: xc/config/cf/FreeBSD.cf,v 1.1.4.3 2003/12/20 00:28:21 kaleb Exp $
+XCOMM platform:  $XdotOrg: xc/config/cf/FreeBSD.cf,v 1.1.4.5 2004/02/23 21:31:43 kaleb Exp $
 XCOMM
 XCOMM
 XCOMM
-XCOMM platform:  $XFree86: xc/config/cf/FreeBSD.cf,v 3.145 2003/12/06 19:24:11 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/FreeBSD.cf,v 3.148 2004/02/07 04:30:15 dawes Exp $
 
 #ifndef UseElfFormat
 #define UseElfFormat		DefaultToElfFormat
@@ -131,6 +131,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #  endif
 #  if (OSRelVersion >= 500016)
 #   define ThreadsLibraries	-lc_r
+#   define SharedGLReqs		$(LDPRELIBS) $(XLIB) -lc
 #  else
 #   define ThreadsLibraries	-pthread
 #  endif
@@ -326,22 +327,53 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
  * and they can remove it from the list of directories they add to ld.so.cache 
  * in their /etc/rc file.
  */
-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)
-#ifndef ExtraLoadFlags
-#if UseElfFormat
-#define ExtraLoadFlags		-Wl,-rpath,$(USRLIBDIRPATH) -Wl,-rpath-link,$(BUILDLIBDIR)
-#else
-#define ExtraLoadFlags		-Wl,-R,$(USRLIBDIRPATH)
+
+#ifndef UseRpath
+# define UseRpath		YES
 #endif
+
+#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)
+
+# ifndef RpathLoadFlags
+#  if UseRpath
+#   if UseElfFormat
+#    define RpathLoadFlags	-Wl,-rpath,$(USRLIBDIRPATH)
+#   else
+#    define RpathLoadFlags	-Wl,-R,$(USRLIBDIRPATH)
+#   endif
+#  else
+#   define RpathLoadFlags	/**/
+#  endif
+# endif
+
+# ifndef ExtraLoadFlags
+#  if UseElfFormat && !defined(UseInstalled)
+#   define ExtraLoadFlags	RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR)
+#  else
+#   define ExtraLoadFlags	RpathLoadFlags
+#  endif
+# endif
+
 #endif
+
+#ifndef LibraryRpathLoadFlags
+# if UseRpath
+#  if UseElfFormat
+#   define LibraryRpathLoadFlags	-rpath $(USRLIBDIRPATH)
+#  else
+#   define LibraryRpathLoadFlags	-R $(USRLIBDIRPATH)
+#  endif
+# else
+#  define LibraryRpathLoadFlags		/**/
+# endif
 #endif
 
 #ifndef SharedLibraryLoadFlags
-#if UseElfFormat
-#define SharedLibraryLoadFlags	-shared -rpath $(USRLIBDIRPATH)
-#else
-#define SharedLibraryLoadFlags	-Bshareable -R $(USRLIBDIRPATH)
-#endif
+# if UseElfFormat
+#  define SharedLibraryLoadFlags	-shared LibraryRpathLoadFlags
+# else
+#  define SharedLibraryLoadFlags	-Bshareable LibraryRpathLoadFlags
+# endif
 #endif
 
 #ifndef GnuMallocLibrary
diff --git a/Imake.cf b/Imake.cf
index 5c05222..580e2ca 100644
--- a/Imake.cf
+++ b/Imake.cf
@@ -1,4 +1,4 @@
-XCOMM $XdotOrg: xc/config/cf/Imake.cf,v 1.1.4.4 2003/12/15 16:00:01 kaleb Exp $
+XCOMM $XdotOrg: xc/config/cf/Imake.cf,v 1.1.4.6 2004/02/23 21:31:43 kaleb Exp $
 XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $
 /*
  * To add support for another platform:
@@ -18,7 +18,7 @@ XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $
  *
  *     4.  Create a .cf file with the name given by MacroFile.
  */
-XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $
+XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.89 2004/01/25 01:12:20 dawes Exp $
 
 #if defined(__APPLE__)
 # undef __APPLE__
@@ -80,10 +80,13 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $
 # define VaxArchitecture
 #endif /* vax */
 
-#ifdef bsdi
+#ifdef __bsdi__
 # define MacroIncludeFile <bsdi.cf>
 # define MacroFile bsdi.cf
-# undef bsdi
+# undef __bsdi__
+# ifdef bsdi
+#  undef bsdi
+# endif
 # define BSDOSArchitecture
 # if defined(__i386__) || defined(i386)
 #  define i386BsdArchitecture
@@ -91,7 +94,14 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $
 #  undef i386
 #  undef __i386__
 # endif
+# if defined(__ppc__) || defined(ppc)
+#  define PpcBsdArchitecture
+#  define PpcArchitecture
+#  undef ppc
+#  undef __ppc__
+# endif
 # if defined(__sparc__) || defined(__sparc_v9__) || defined(sparc)
+#  define SparcBsdArchitecture
 #  define SparcArchitecture
 #  undef sparc
 #  undef __sparc__
diff --git a/Imake.tmpl b/Imake.tmpl
index 99f38ab..3fb43b3 100644
--- a/Imake.tmpl
+++ b/Imake.tmpl
@@ -1,12 +1,12 @@
 XCOMM ----------------------------------------------------------------------
 XCOMM Makefile generated from IMAKE_TEMPLATE and INCLUDE_IMAKEFILE
 XCOMM $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $
-XCOMM $XdotOrg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $
+XCOMM $XdotOrg: xc/config/cf/Imake.tmpl,v 1.1.4.6 2004/02/23 21:31:43 kaleb Exp $
 XCOMM
 XCOMM
 XCOMM
 XCOMM
-XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.154 2003/11/04 01:59:31 dawes Exp $
+XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.156 2004/01/12 21:43:18 herrb Exp $
 XCOMM ----------------------------------------------------------------------
 
 /*
@@ -906,6 +906,9 @@ TCLIBDIR = TclLibDir
 #ifndef DriverManDefs
 #define DriverManDefs -D__drivermansuffix__=$(DRIVERMANSUFFIX)
 #endif
+#ifndef AdminManDefs
+#define AdminManDefs -D__adminmansuffix__=$(ADMINMANSUFFIX)
+#endif
 #ifndef ProjectManDefs
 #define ProjectManDefs -D__projectroot__=$(PROJECTROOT)
 #endif
@@ -1330,7 +1333,7 @@ TCLIBDIR = TclLibDir
 #endif
 #endif
 #ifndef LdPostLib
-#if !defined(UseInstalled) && AlternateUsrLibDir && !HasLdRunPath
+#if !defined(UseInstalled) && AlternateUsrLibDir && !HasLdRunPath && !defined(CrossCompileDir)
 #define LdPostLib -L$(USRLIBDIR)
 #else
 #define LdPostLib /**/
@@ -1574,6 +1577,13 @@ TCLIBDIR = TclLibDir
 #define DriverManSuffix	4		/* use just one tab or cpp will die */
 #endif
 #endif
+#ifndef AdminManSuffix
+#if SystemV || SystemV4
+#define AdminManSuffix	1m		/* use just one tab or cpp will die */
+#else
+#define AdminManSuffix	8		/* use just one tab or cpp will die */
+#endif
+#endif
 #ifndef ExpandManNames
 #if SystemV
 #define ExpandManNames NO
@@ -1805,9 +1815,10 @@ CXXEXTRA_INCLUDES = CplusplusExtraIncludes
     FILEMANSUFFIX = FileManSuffix	/* suffix for file format man pages */
     MISCMANSUFFIX = MiscManSuffix	/* suffix for misc man pages */
   DRIVERMANSUFFIX = DriverManSuffix	/* suffix for driver man pages */
+   ADMINMANSUFFIX = AdminManSuffix	/* suffix for admin command man pages */
      MANSRCSUFFIX = ManSrcSuffix	/* suffix for man page source */
      MANNEWSUFFIX = ManNewSuffix	/* suffix for preprocessed man source */
-          MANDEFS = AppLoadDefs FileManDefs LibManDefs MiscManDefs DriverManDefs ProjectManDefs $(XORGMANDEFS) $(VENDORMANDEFS)
+          MANDEFS = AppLoadDefs FileManDefs LibManDefs MiscManDefs DriverManDefs AdminManDefs ProjectManDefs $(XORGMANDEFS) $(VENDORMANDEFS)
 
    COMPRESSMANCMD = CompressManCmd
 
@@ -2078,11 +2089,11 @@ XCOMM Not sure this belongs here
 #endif
 #include LocalTmplFile
 
-#if !BuildLibraries && AlternateIncRoot
+#if !BuildLibraries && AlternateIncRoot && !defined(CrossCompileDir)
 INSTALLED_INCLUDES = -I$(INCROOT)
 #endif
 
-#if !defined(UseInstalled) && !BuildLibraries && AlternateUsrLibDir
+#if !defined(UseInstalled) && !BuildLibraries && AlternateUsrLibDir && !defined(CrossCompileDir)
 INSTALLED_LIBS = -L$(USRLIBDIR)
 #endif
 
diff --git a/OpenBSD.cf b/OpenBSD.cf
index 96d18d7..785d609 100644
--- a/OpenBSD.cf
+++ b/OpenBSD.cf
@@ -1,5 +1,5 @@
-XCOMM $XdotOrg$
-XCOMM platform:  $XFree86: xc/config/cf/OpenBSD.cf,v 3.99 2003/11/23 21:29:00 herrb Exp $
+XCOMM platform:  $XFree86: xc/config/cf/OpenBSD.cf,v 3.101 2004/01/09 00:35:00 dawes Exp $
+XCOMM $XdotOrg: xc/config/cf/OpenBSD.cf,v 1.1.4.3 2004/02/23 21:31:43 kaleb Exp $
 XCOMM
 
 #ifndef OSName
@@ -415,7 +415,8 @@ install:: fonts.alias							@@\
 #   ifndef HasNetBSDApertureDriver
 #     define HasNetBSDApertureDriver	YES
 #   endif
-#   define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT
+#   define ServerOSDefines	XFree86ServerOSDefines \
+				-DDDXTIME -DDDXOSINIT
 #   define ServerExtraDefines	GccGasOption -D_XSERVER64 XFree86ServerDefines
 #   define ServerExtraSysLibs	-lalpha
 #   ifndef DoLoadableServer
@@ -445,7 +446,7 @@ install:: fonts.alias							@@\
 /* Direct rendering (OpenBSD 3.3 and up). */ 
 # if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion > 2)
 #  ifndef BuildXF86DRI
-#   define BuildXF86DRI			YES
+#   define BuildXF86DRI			NO
 #  endif 
 #  ifndef BuildXF86DRM
 #   define BuildXF86DRM			NO
@@ -721,7 +722,8 @@ install:: fonts.alias							@@\
 
 /* Definitions for building the X server */
 # if XF86Server
-#   define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT
+#   define ServerOSDefines	XFree86ServerOSDefines \
+				-DDDXTIME -DDDXOSINIT
 #   define ServerExtraDefines	GccGasOption XFree86ServerDefines
 #   ifndef DoLoadableServer
 #     define DoLoadableServer	YES
@@ -809,7 +811,8 @@ install:: fonts.alias							@@\
 # endif
 
 # define ServerExtraDefines	GccGasOption -D_XSERVER64 XFree86ServerDefines
-# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT
+# define ServerOSDefines	XFree86ServerOSDefines \
+				-DDDXTIME -DDDXOSINIT
 # define XkbServerDefines	-DXKB_ALWAYS_USES_SOFT_REPEAT
 
 # if XF86Server
diff --git a/OpenBSDLib.rules b/OpenBSDLib.rules
index 4cdbb4c..4bdd741 100644
--- a/OpenBSDLib.rules
+++ b/OpenBSDLib.rules
@@ -7,7 +7,7 @@ XCOMM $OpenBSD: OpenBSDLib.rules,v 1.1 2000/10/09 20:43:58 matthieu Exp $
  * OpenBSD shared library rules
  */
 
-XCOMM $XFree86: xc/config/cf/OpenBSDLib.rules,v 1.10 2003/10/31 20:49:03 herrb Exp $
+XCOMM $XFree86: xc/config/cf/OpenBSDLib.rules,v 1.11 2004/01/27 01:37:38 dawes Exp $
 
 #ifndef UseElfFormat
 #define UseElfFormat NO
@@ -20,6 +20,10 @@ XCOMM $XFree86: xc/config/cf/OpenBSDLib.rules,v 1.10 2003/10/31 20:49:03 herrb E
 #define ForceNormalLib YES
 #endif
 
+#ifndef UseRpath
+#define UseRpath YES
+#endif
+
 #ifndef BaseShLibReqs
 #define BaseShLibReqs		/* -lc implied by $(CC) */
 #endif
@@ -36,8 +40,18 @@ XCOMM $XFree86: xc/config/cf/OpenBSDLib.rules,v 1.10 2003/10/31 20:49:03 herrb E
 #ifndef ShLibIncludeFile
 #define ShLibIncludeFile <OpenBSDLib.tmpl>
 #endif
+#ifndef RpathLoadFlags
+#if UseRpath
+#define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
+#else
+#define RpathLoadFlags /**/
+#endif
+#endif
+#ifndef LibraryRpathLoadFlags
+#define LibraryRpathLoadFlags RpathLoadFlags
+#endif
 #ifndef SharedLibraryLoadFlags
-#define SharedLibraryLoadFlags -shared PositionIndependentCFlags -Wl,-rpath,$(USRLIBDIR)
+#define SharedLibraryLoadFlags -shared PositionIndependentCFlags LibraryRpathLoadFlags
 #endif
 #ifndef PositionIndependentCFlags
 #define PositionIndependentCFlags -fPIC
@@ -48,13 +62,13 @@ XCOMM $XFree86: xc/config/cf/OpenBSDLib.rules,v 1.10 2003/10/31 20:49:03 herrb E
 #if UseElfFormat
 #ifndef ExtraLoadFlags
 #ifdef UseInstalled
-#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
+#define ExtraLoadFlags RpathLoadFlags
 #else
-#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) -Wl,-rpath-link,$(BUILDLIBDIR)
+#define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR)
 #endif
 #endif
 #ifndef HardCodeLibdirFlag
-#define HardCodeLibdirFlag -Wl,-rpath,$(USRLIBDIRPATH)
+#define HardCodeLibdirFlag RpathLoadFlags
 #endif
 #endif /* UseElfFormat */
 
diff --git a/OpenBSDLib.tmpl b/OpenBSDLib.tmpl
index b041ee3..3857d68 100644
--- a/OpenBSDLib.tmpl
+++ b/OpenBSDLib.tmpl
@@ -1,7 +1,13 @@
-XCOMM platform:	$XdotOrg: OpenBSDLib.tmpl,v 1.6 2003/04/04 19:48:58 matthieu Exp $
+XCOMM platform:	$XdotOrg: xc/config/cf/OpenBSDLib.tmpl,v 1.1.4.4 2004/02/25 21:46:22 kaleb Exp $
 XCOMM platform:	$OpenBSD: OpenBSDLib.tmpl,v 1.6 2003/04/04 19:48:58 matthieu Exp $
-XCOMM platform: $XFree86: xc/config/cf/OpenBSDLib.tmpl,v 1.8 2003/10/15 21:23:37 herrb Exp $
+XCOMM platform: $XFree86: xc/config/cf/OpenBSDLib.tmpl,v 1.9 2004/01/10 09:09:51 herrb Exp $
 XCOMM
+
+/* Shared libraries dependencies */
+#if HasGcc && GccMajorVersion >= 3
+# define SharedGLUReqs	$(LDPRELIB) $(XLIB) $(GLXLIB) -lsupc++
+#endif 
+
 /* Shared Library Revisions. Crank major on API Changes */
 
 #if OverrideShlibRevs
@@ -38,7 +44,7 @@ XCOMM
 #  define SharedXvMCRev 2.0
 # endif
 # ifndef SharedXineramaRev
-#  define SharedXineramaRev 3.0
+#  define SharedXineramaRev 2.0
 # endif
 # ifndef SharedDpsRev
 #  define SharedDpsRev 2.0
@@ -50,7 +56,12 @@ XCOMM
 #  define SharedPSResRev 2.0
 # endif
 # ifndef SharedGluRev
-#  define SharedGluRev 2.0
+#  if HasGcc && GccMajorVersion >= 3
+    /* Gcc 3 changes the name mangling scheme on OpenBSD */
+#   define SharedGluRev	3.0
+#  else
+#   define SharedGluRev 2.0
+#  endif
 # endif
 # ifndef SharedGlxRev
 #  define SharedGlxRev 2.0
diff --git a/README b/README
index 2d1bd5b..30c1b0a 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ $Xorg: README,v 1.4 2000/08/18 04:03:58 coskrey Exp $
 
 
 
-$XFree86: xc/config/cf/README,v 1.20 2003/04/14 20:35:50 herrb Exp $
+$XFree86: xc/config/cf/README,v 1.21 2003/12/20 19:31:46 dawes Exp $
 
 The easiest way to write an Imakefile is to find another one that does
 something similar and copy/modify it!
@@ -25,7 +25,6 @@ Imake.tmpl provides defaults for the following variables:
 	CURDIR			current directory relative to top of sources
 	CcCmd			command to run C compiler
 	CompressCmd		command to run compress program
-	GzipCmd			command to run gzip program
 	ConstructMFLAGS		System V option to set MFLAGS make variable
 	CpCmd			command to copy one file to another
 	CplusplusCmd		command to run C++ compiler
@@ -50,6 +49,7 @@ Imake.tmpl provides defaults for the following variables:
 	FortranCmd		command to run Fortran compiler
 	FortranDebugFlags	flags for Fortran debug info
 	FortranFlags		Fortran compiler flags
+	GzipCmd			command to run gzip program
 	HasBSD44Sockets		boolean for system has BSD4.4 sockets
 	HasBsdMake		use the 4.4BSD variant of the make program?
 	HasBsearch		boolean for libc has bsearch()
@@ -218,6 +218,8 @@ X11.tmpl provides defaults for the following variables:
 	DefaultUserPath		default user xdm PATH environment variable
 	DependCmd		command to run makedepend
 	DependDir		build directory containing makedepend program
+	DriverManDir		directory in which to install driver man pages
+	DriverManSuffix		man suffix for driver pages
 	ExtensionDefines	-D's for universal extensions
 	ExtensionOSDefines	-D's for additional extensions
 	FontCompilerFlags	flags for bdftosnf
@@ -246,6 +248,7 @@ X11.tmpl provides defaults for the following variables:
 	ManSourcePath		common prefix of man page directories
 	ManSuffix		man suffix for programs
 	MiscManSuffix		man suffix for miscellaneous pages
+	MiscManDir		directory in which to install misc man pages
 	NeedDefaultDepLibs	boolean for enabling default DEPLIBS
 	NlsDir			directory in which to install nls files
 	NormalLibFS		build libFS.a
diff --git a/X11.tmpl b/X11.tmpl
index d71cb64..58afe96 100644
--- a/X11.tmpl
+++ b/X11.tmpl
@@ -1,12 +1,12 @@
 XCOMM ----------------------------------------------------------------------
 XCOMM X Window System Build Parameters and Rules
-XCOMM $XdotOrg$
+XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.1.4.7 2004/02/25 21:46:22 kaleb Exp $
 XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $
 XCOMM
 XCOMM
 XCOMM
 XCOMM
-XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.239 2003/12/12 03:20:32 dawes Exp $
+XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.247 2004/02/10 10:38:56 alanh Exp $
 
 /***************************************************************************
  *                                                                         *
@@ -159,9 +159,6 @@ VENDORMANVERSION = XVendorManVersionString
 #ifndef BuildCyrillicFonts
 #define BuildCyrillicFonts	YES
 #endif
-#ifndef UseKoi8RForCyrillic
-#define UseKoi8RForCyrillic	YES
-#endif
 /* Some bdf font generation details.  The scripts for this require perl. */
 #ifndef TruncateUCSFonts
 #define TruncateUCSFonts	HasPerl5
@@ -603,6 +600,10 @@ VENDORMANVERSION = XVendorManVersionString
 #define BuildAppleWMLibrary	NO
 #endif
 
+#ifndef BuildWindowsWMLibrary
+#define BuildWindowsWMLibrary	NO
+#endif
+
 #ifndef BuildMiscDocs
 #define BuildMiscDocs		NO
 #endif
@@ -696,17 +697,9 @@ VENDORMANVERSION = XVendorManVersionString
 #define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/75dpi/,$(FONTDIR)/100dpi/
 #else
 #if PrimaryScreenResolution < 88		/* (75 + 100) / 2 */
-#if BuildCIDFonts
-#define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/Speedo/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/75dpi/,$(FONTDIR)/100dpi/
+#define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/TTF/,$(FONTDIR)/Speedo/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/75dpi/,$(FONTDIR)/100dpi/
 #else
-#define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/Speedo/,$(FONTDIR)/Type1/,$(FONTDIR)/75dpi/,$(FONTDIR)/100dpi/
-#endif
-#else
-#if BuildCIDFonts
-#define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/Speedo/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/
-#else
-#define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/Speedo/,$(FONTDIR)/Type1/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/
-#endif
+#define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/TTF/,$(FONTDIR)/Speedo/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/
 #endif
 #endif
 #endif
@@ -1310,9 +1303,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
 #ifndef XTrueTypeStandAloneCConv
 #define XTrueTypeStandAloneCConv NO
 #endif
-#ifndef XTTInLibXFont
-#define XTTInLibXFont NO
-#endif
 #ifndef XTrueTypeSrcDir
 #define XTrueTypeSrcDir $(TOP)/extras/X-TrueType
 #endif
@@ -1374,6 +1364,9 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
 #ifndef BuildModuleDir
 #define BuildModuleDir $(BUILDLIBDIR)/modules
 #endif
+#ifndef BuildI18NDir
+# define BuildI18NDir $(BUILDLIBDIR)/locale
+#endif
 #ifndef BuildModuleTop
 #define BuildModuleTop $(BUILDLIBTOP)/..
 #endif
@@ -1549,6 +1542,7 @@ XCOMM X Window System make variables; these need to be coordinated with rules
       BUILDBINDIR = BuildBinDir		/* built binaries */
       BUILDBINTOP = BuildBinTop		/* top relative to BUILDBINDIR */
    BUILDMODULEDIR = BuildModuleDir	/* built server modules */
+     BUILDI18NDIR = BuildI18NDir	/* built i81n modules */
    BUILDMODULETOP = BuildModuleTop	/* top relative to BUILDMODULEDIR */
     XBUILDINCROOT = XBuildIncRoot	/* base of X build loc */
      XBUILDINCDIR = XBuildIncDir
@@ -1606,11 +1600,12 @@ XCOMM X Window System make variables; these need to be coordinated with rules
               RGB = $(CLIENTENVSETUP) $(XBUILDBINDIR)/rgb
 # if !CrossCompiling
             FONTC = $(CLIENTENVSETUP) $(PRELOADFONTSETUP) $(XBUILDBINDIR)/bdftopcf
-  MKFONTSCALE_DIR = $(PRELOADFREETYPESETUP) $(XBUILDBINDIR)/mkfontscale -b -s -l
-        MKFONTDIR = $(CLIENTENVSETUP) $(MKFONTSCALE_DIR)
+      MKFONTSCALE = $(CLIENTENVSETUP) $(PRELOADFREETYPESETUP) $(XBUILDBINDIR)/mkfontscale
+        MKFONTDIR = $(MKFONTSCALE) -b -s -l
        XCURSORGEN = $(CLIENTENVSETUP) $(PRELOADSETUP) $(XBUILDBINDIR)/xcursorgen
 # elif UseInstalledOnCrossCompile
         MKFONTDIR = $(BINDIR)/mkfontdir
+      MKFONTSCALE = $(BINDIR)/mkfontscale
             FONTC = $(BINDIR)/bdftopcf
        XCURSORGEN = $(BINDIR)/xcursorgen
 # endif
@@ -1673,8 +1668,9 @@ XCOMM X Window System make variables; these need to be coordinated with rules
 # ifdef SystemBuildLibPath
   SYSTEMENVLIBDIR = SystemBuildLibPath
 # endif
+#define XlocaleClientSetup Concat3(XLOCALEDIR,=,BuildI18NDir)
        XENVLIBDIR = X11BuildLibPath
-   CLIENTENVSETUP = Concat3(BuildLibPathVar,=,BuildLibPath)
+   CLIENTENVSETUP = Concat3(BuildLibPathVar,=,BuildLibPath) XlocaleClientSetup
 #else
    CLIENTENVSETUP =
 #endif
@@ -2149,6 +2145,30 @@ ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir)
 #define ProfileLibAppleWM	NO
 #endif
 
+#if BuildWindowsWMLibrary
+#ifndef SharedLibWindowsWM
+#define SharedLibWindowsWM	HasSharedLibraries
+#endif
+#ifndef NormalLibWindowsWM
+#define NormalLibWindowsWM	(!SharedLibWindowsWM || ForceNormalLib)
+#endif
+#ifndef DebugLibWindowsWM
+#define DebugLibWindowsWM	NO
+#endif
+#ifndef ProfileLibWindowsWM
+#define ProfileLibWindowsWM	NO
+#endif
+#else
+#undef  SharedLibWindowsWM
+#define SharedLibWindowsWM	NO
+#undef  NormalLibWindowsWM
+#define NormalLibWindowsWM	NO
+#undef  DebugLibWindowsWM
+#define DebugLibWindowsWM	NO
+#undef  ProfileLibWindowsWM
+#define ProfileLibWindowsWM	NO
+#endif
+
 #if BuildGLULibrary
 #ifndef SharedLibGlu
 #define SharedLibGlu		HasSharedLibraries
@@ -2352,7 +2372,7 @@ ProjectUnsharedLibReferences(XVMC,XvMC,$(XVMCLIBSRC),XBuildLibDir)
     XINERAMALIBSRC = $(LIBSRC)/Xinerama
 #if SharedLibXinerama
 #ifndef SharedXineramaRev
-#define SharedXineramaRev 2.0
+#define SharedXineramaRev 1.0
 #endif
 SharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev)
 #else
@@ -2469,6 +2489,16 @@ SharedLibReferences(APPLEWM,AppleWM,$(APPLEWMLIBSRC),SOAPPLEWMREV,SharedAppleWMR
 ProjectUnsharedLibReferences(APPLEWM,AppleWM,$(APPLEWMLIBSRC),XBuildLibDir)
 #endif
 
+   WINDOWSWMLIBSRC = $(LIBSRC)/windows
+#if SharedLibWindowsWM
+#ifndef SharedWindowsWMRev
+#define SharedWindowsWMRev 1.0
+#endif
+SharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),SOWINDOWSWMREV,SharedWindowsWMRev)
+#else
+ProjectUnsharedLibReferences(WINDOWSWM,WindowsWM,$(WINDOWSWMLIBSRC),XBuildLibDir)
+#endif
+
 # ifndef SharedLibXfontcache
 #  define SharedLibXfontcache	HasSharedLibraries
 # endif
@@ -3658,6 +3688,27 @@ install::								@@\
 #endif
 
 /*
+ * MakeFontsScale - generate rules to build fonts.scale database.
+ */
+#ifndef MakeFontsScale
+# if !CrossCompiling ||  UseInstalledOnCrossCompile
+#  define MakeFontsScale(deplist)					@@\
+all:: fonts.scale							@@\
+									@@\
+fonts.scale:  deplist							@@\
+	RemoveFile(fonts.scale)						@@\
+	RunProgram(MKFONTSCALE, .)					@@\
+									@@\
+clean::									@@\
+	RemoveFile(fonts.scale)
+# else
+#  define MakeFontsScale(deplist)					@@\
+clean::									@@\
+	RemoveFile(fonts.scale)
+# endif
+#endif /* MakeFontsScale */
+
+/*
  * MakeFontsDir - generate rules to build fonts.dir database.
  */
 #ifndef MakeFontsDir
@@ -3666,6 +3717,7 @@ install::								@@\
 all:: fonts.dir								@@\
 									@@\
 fonts.dir:  deplist							@@\
+	RemoveFile(fonts.dir)						@@\
 	RunProgram(MKFONTDIR, $(MKFONTDIROPTS) .)			@@\
 									@@\
 clean::									@@\
@@ -3699,6 +3751,18 @@ clean::									@@\
 # endif
 #endif /* MakeFonts */
 
+#ifndef InstallFontsDir
+# if !CrossCompiling ||  UseInstalledOnCrossCompile
+#  define InstallFontsDir(dest)						@@\
+install::								@@\
+	RemoveFile($(DESTDIR)dest/fonts.scale)				@@\
+	RunProgram(MKFONTSCALE, $(DESTDIR)dest)				@@\
+	RemoveFile($(DESTDIR)dest/fonts.dir)				@@\
+	RunProgram(MKFONTDIR, $(MKFONTDIROPTS) $(DESTDIR)dest)
+# else
+#  define InstallFontsDir(dest)
+# endif
+#endif
 
 /*
  * InstallFontObjs - generate rules to install font files
@@ -3708,7 +3772,7 @@ clean::									@@\
 #  define InstallFontObjs(objs,dest)					@@\
 InstallMultipleFlags(objs,dest,$(INSTDATFLAGS))				@@\
 									@@\
-InstallTarget(install,fonts.dir,$(INSTDATFLAGS),dest)
+InstallFontsDir(dest)
 # else
 #  define InstallFontObjs(objs,dest)
 # endif
diff --git a/bsdLib.rules b/bsdLib.rules
index 3f80450..4fb4327 100644
--- a/bsdLib.rules
+++ b/bsdLib.rules
@@ -4,7 +4,7 @@ XCOMM $Xorg: bsdLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
 
 
 
-XCOMM $XFree86: xc/config/cf/bsdLib.rules,v 3.27 2003/11/20 00:41:37 dawes Exp $
+XCOMM $XFree86: xc/config/cf/bsdLib.rules,v 3.28 2004/01/27 01:37:39 dawes Exp $
 /*
  * NetBSD/FreeBSD shared library rules
  */
@@ -170,6 +170,10 @@ LintLibReferences(varname,libname,libsource)
 #define ForceNormalLib YES
 #endif
 
+#ifndef UseRpath
+#define UseRpath YES
+#endif
+
 #ifndef BaseShLibReqs
 #define BaseShLibReqs		/* -lc */
 #endif
@@ -186,8 +190,18 @@ LintLibReferences(varname,libname,libsource)
 #ifndef ShLibIncludeFile
 #define ShLibIncludeFile <bsdLib.tmpl>
 #endif
+#ifndef RpathLoadFlags
+#if UseRpath
+#define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
+#else
+#define RpathLoadFlags /**/
+#endif
+#endif
+#ifndef LibraryRpathLoadFlags
+#define LibraryRpathLoadFlags RpathLoadFlags
+#endif
 #ifndef SharedLibraryLoadFlags
-#define SharedLibraryLoadFlags -shared -Wl,-rpath,$(USRLIBDIRPATH)
+#define SharedLibraryLoadFlags -shared LibraryRpathLoadFlags
 #endif
 #ifndef PositionIndependentCFlags
 #define PositionIndependentCFlags -fPIC
@@ -197,14 +211,14 @@ LintLibReferences(varname,libname,libsource)
 #endif
 #ifndef ExtraLoadFlags
 #ifdef UseInstalled
-#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
+#define ExtraLoadFlags RpathLoadFlags
 #else
-#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) -Wl,-rpath-link,$(BUILDLIBDIR)
+#define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR)
 #endif
 #endif
 
 #ifndef HardCodeLibdirFlag
-#define HardCodeLibdirFlag -Wl,-rpath,$(USRLIBDIRPATH)
+#define HardCodeLibdirFlag RpathLoadFlags
 #endif
 
 #if !defined(ShlibGlobalsFlags)
diff --git a/bsdi.cf b/bsdi.cf
index 197c7e5..ee5c51f 100644
--- a/bsdi.cf
+++ b/bsdi.cf
@@ -2,7 +2,7 @@ XCOMM platform:  $Xorg: bsdi.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
 
 
 
-XCOMM platform:  $XFree86: xc/config/cf/bsdi.cf,v 3.37 2003/04/24 22:14:53 herrb Exp $
+XCOMM platform:  $XFree86: xc/config/cf/bsdi.cf,v 3.38 2004/01/25 01:12:20 dawes Exp $
 #ifndef OSName
 #define OSName		DefaultOSName
 #endif
@@ -25,17 +25,45 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #define HasDlopen		YES
 #define HasPutenv		YES
 #define HasSnprintf		YES
+#define HasMkstemp		YES
 #define HasUsableFileMmap	YES
 #define HasZlib			YES
+#define HasSetUseContext	YES
+#define HasBSDAuth		YES
+#define HasSetProcTitle		YES
+#define HasBasename		NO
+
+#if 0
+#define HasKrb5			YES
+#define Krb5Include		-I/usr/include/krb5
+#define Krb5Libraries		-lkrb5 -lk5crypto -lprofile -lcom_err
+#endif
+
+#define SharedGLUReqs		$(LDPRELIB) $(XLIB) $(GLXLIB) -lstdc++
 
 #if (OSMajorVersion == 4 && OSMinorVersion >= 1) || (OSMajorVersion > 4)
 #define HasNCurses		YES
 #else
 #define HasNCurses		NO
 #endif
+#if (OSMajorVersion == 4 && OSMinorVersion >= 3) || (OSMajorVersion > 4)
+#define HasStrlcat		YES
+#else
+#define HasStrlcat		NO
+#endif
 
 #define BuildLBX		YES
-#define GzipFontCompression	NO
+#define GzipFontCompression	YES
+#define BuildXaw6		NO
+
+XCOMM BSD/OS 5.1 (intel) comes with gcc 3.2.2 installed as gcc and cc.
+
+XCOMM BSD/OS 5.0 (intel) comes with gcc 2.95.3 installed as gcc and cc.
+
+XCOMM BSD/OS 4.3/4.3.1 (intel) comes with gcc 2.95.3 installed as gcc and cc.
+
+XCOMM BSD/OS 4.2 (intel) comes with gcc 2.95.2 installed as gcc and cc.
+XCOMM BSD/OS 4.2 (sparc) comes with gcc 2.95.2 installed as gcc and cc.
 
 XCOMM BSD/OS 4.1 (intel) comes with gcc 2.91.66 installed as gcc and cc.
 XCOMM BSD/OS 4.1 (sparc) comes with gcc 2.95.2 installed as gcc and cc.
@@ -78,11 +106,21 @@ XCOMM xf86site.def
 # ifdef i386Architecture
 #  define CcCmd			gcc /* shlicc */
 #  define CplusplusCmd		g++ /* shlicc++ */
-#  define OptimizedCDebugFlags	-O2 -m486
-# else
+#  if ((OSMajorVersion == 4 && OSMinorVersion >= 2) || (OSMajorVersion > 4))
+#   define OptimizedCDebugFlags	-O3 -mcpu=pentiumpro -march=pentium
+#  else
+#   define OptimizedCDebugFlags	-O2 -m486
+#  endif
+# endif
+# ifdef PpcArchitecture
 #  define CcCmd			gcc
 #  define CplusplusCmd		g++
-#  define OptimizedCDebugFlags	-O4 -mv8
+#  define OptimizedCDebugFlags	-O2
+# endif
+# ifdef SparcArchitecture
+#  define CcCmd			gcc
+#  define CplusplusCmd		g++
+#  define OptimizedCDebugFlags	-O2 -cpu=v8 -mtune=v8
 # endif
 #else
 # define CcCmd			cc
@@ -90,9 +128,9 @@ XCOMM xf86site.def
 #endif
 
 /*
- * A hack to work around an optimization problem with GCC 2.95.2
+ * A hack to work around an optimization problem with GCC 2.95.2 - 2.95.4
  */
-#if (OSMajorVersion == 4 && OSMinorVersion == 2)
+#if ((OSMajorVersion == 4 && OSMinorVersion >= 2) || (OSMajorVersion > 4))
 #define GccOptBug295
 #endif
 
@@ -128,19 +166,25 @@ XCOMM xf86site.def
 #endif
 
 /*
- * Build a threaded X server on 4.1 and newer systems
+ * Build a threaded X server on BSD/OS 4.1 and newer releases
  */
 #if (OSMajorVersion == 4 && OSMinorVersion >= 1) || (OSMajorVersion > 4)
 #define HasPosixThreads         YES     /* this will autodefine HasThreadedX */
 #define HasThreadSafeAPI        YES
-XCOMM math.h uses _REENTRANT in FreeBSD, so we define it here too
-#define SystemMTDefines         -D_REENTRANT -D_THREAD_SAFE
 /*
  * Heck, build a server that can load modules too...
  */
-#define DoLoadableServer        YES
+#define DoLoadableServer        Yes
 #endif
 
+XCOMM math.h uses _REENTRANT in FreeBSD, so we define it here too
+#if (OSMajorVersion >= 5)
+#define SystemMTDefines         -D_REENTRANT -D_THREAD_SAFE -D_POSIX_THREAD_SAFE_FUNCTIONS
+#elif (OSMajorVersion == 4 && OSMinorVersion >= 1)
+#define SystemMTDefines         -D_REENTRANT -D_THREAD_SAFE
+#endif
+
+
 #ifdef i386Architecture
 #ifndef BuildXF86DRI
 #define BuildXF86DRI            NO
@@ -148,10 +192,21 @@ XCOMM math.h uses _REENTRANT in FreeBSD, so we define it here too
 #endif
 
 #ifdef i386Architecture
+# define HasTk			YES
+# define TkLibName		tk4.2
+# define TkLibDir		/usr/contrib/lib
+# define TkIncDir		/usr/include
+# define XF86SetupUsesStaticTk	NO
+# define HasTcl			YES
+# define TclLibName		tcl7.6
+# define TclLibDir		/usr/contrib/lib
+# define TclIncDir		/usr/include
+# define XF86SetupUsesStaticTcl	NO
+# define SharedLibXv		YES
+# define SharedLibXinerama	YES
 # define ServerExtraDefines GccGasOption XFree86ServerDefines -I/sys
 # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-# define XFree86ConsoleDefines /**/
-# define AsmDefines -DUSE_GAS
+# define XFree86ConsoleDefines	-DBSDI_VT
 # if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion >= 1)
 #  include <bsdiLib.rules>
 #  define DontUseLibPathVar
@@ -159,6 +214,18 @@ XCOMM math.h uses _REENTRANT in FreeBSD, so we define it here too
 #  define ServerCcCmd         cc
 #  define ServerExtraSysLibs  DlLibrary
 # endif
+# define XConfigDir /etc/X11
+#endif
+
+#ifdef PpcArchitecture
+# define BuildServer		NO
+# define BuildFonts		NO
+# define XConfigDir /etc/X11
+# include <bsdiLib.rules>
+# define DontUseLibPathVar
+# define BuildDynamicLoading	YES
+# define ServerCcCmd		cc
+# define ServerExtraSysLibs	DlLibrary
 #endif
 
 #ifdef SparcArchitecture
@@ -166,10 +233,6 @@ XCOMM math.h uses _REENTRANT in FreeBSD, so we define it here too
 # define ServerOSDefines   -DDDXOSINIT
 #endif
 
-#ifdef PpcArchitecture
-# define BuildServer		NO
-#endif
-
 #define HasShm			YES
 #define AsmDefines -DUSE_GAS
 
diff --git a/cygwin.cf b/cygwin.cf
index 142a5ff..2d6b60d 100644
--- a/cygwin.cf
+++ b/cygwin.cf
@@ -1,4 +1,4 @@
-XCOMM platform:  $XFree86: xc/config/cf/cygwin.cf,v 3.56 2003/10/27 22:34:02 herrb Exp $
+XCOMM platform:  $XFree86: xc/config/cf/cygwin.cf,v 3.57 2003/12/24 18:58:41 dickey Exp $
 
 #ifndef OSName
 # define OSName                 Cygwin
@@ -58,6 +58,9 @@ XCOMM platform:  $XFree86: xc/config/cf/cygwin.cf,v 3.56 2003/10/27 22:34:02 her
 
 #define HasSnprintf		YES
 
+#ifndef HasMakefileSafeInclude
+# define HasMakefileSafeInclude YES
+#endif
 /*
  * Cygwin has Tcl/Tk, but you need to keep the version numbers
  * of the libs in sync.  These version numbers may change
@@ -319,6 +322,9 @@ XCOMM platform:  $XFree86: xc/config/cf/cygwin.cf,v 3.56 2003/10/27 22:34:02 her
 
 #define BuildScreenSaverExt	NO
 
+#define BuildWindowsWMLibrary  YES
+
+
 /*
  * What is Plugin?
  */
diff --git a/cygwin.rules b/cygwin.rules
index f0f1910..b4dc94b 100644
--- a/cygwin.rules
+++ b/cygwin.rules
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/cygwin.rules,v 3.27 2003/10/26 18:17:37 herrb Exp $
+XCOMM $XFree86: xc/config/cf/cygwin.rules,v 3.28 2003/12/24 18:58:41 dickey Exp $
 
 /*
  * Cygwin shared library rules (DLL versions)
@@ -25,6 +25,7 @@ XCOMM $XFree86: xc/config/cf/cygwin.rules,v 3.27 2003/10/26 18:17:37 herrb Exp $
 #define SharedLibDps		YES
 #define SharedLibDpsTk		YES
 #define SharedLibGlu		YES
+#define SharedLibWindowsWM	NO
 #ifndef SharedDataSeparation
 #define SharedDataSeparation	NO
 #endif
@@ -180,11 +181,11 @@ clean::									@@\
 
 /*
  * MakeDllProg
- */
-
-#define MakeDLLProg(libname,solist,prog,rev)				@@\
-	prog -shared -Wl,--out-implib=ImportLibraryName(libname,rev) -Wl,--enable-auto-import --def libname.def -Wl,--exclude-libs,ALL -o SharedLibraryName(libname,rev) solist $(REQUIREDLIBS)
-
+ */ 
+    
+#define MakeDLLProg(libname,solist,prog,rev)			        @@\
+	prog -shared -Wl,--out-implib=ImportLibraryName(libname,rev) -Wl,--enable-auto-import,--enable-runtime-pseudo-reloc --def libname.def -Wl,--exclude-libs,ALL -o SharedLibraryName(libname,rev) solist $(REQUIREDLIBS)
+    
 /*
  * MakeDll
  */
diff --git a/cygwin.tmpl b/cygwin.tmpl
index 8475fbb..54d5458 100644
--- a/cygwin.tmpl
+++ b/cygwin.tmpl
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.18 2003/10/19 08:27:05 herrb Exp $
+XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.19 2003/12/24 18:58:41 dickey Exp $
 
 #if UseCygIPC
 # define SharedX11Reqs		-lcygipc
diff --git a/darwin.cf b/darwin.cf
index 2ee5f30..4820402 100644
--- a/darwin.cf
+++ b/darwin.cf
@@ -1,4 +1,4 @@
-XCOMM platform:  $XFree86: xc/config/cf/darwin.cf,v 1.46 2003/11/18 19:00:14 torrey Exp $
+XCOMM platform:  $XFree86: xc/config/cf/darwin.cf,v 1.51 2004/02/11 00:30:27 torrey Exp $
 
 /* Darwin / Mac OS X configuration by John Carmack <johnc@idsoftware.com> */
 
@@ -25,21 +25,23 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
  * Define the operating system's capabilities
  */
 #define HasSnprintf             YES
-#define HasStrlcat		YES
 #define HasPutenv               YES
 #define HasBSD44Sockets         YES
 #define Malloc0ReturnsNull      NO
 #define HasShadowPasswd         NO
 #define HasUsableFileMmap       YES
 #define HasZlib                 YES
-#define HasArc4Random		YES
 #ifndef HasShm
 # define HasShm                 YES
 #endif
 #define HasNdbm                 YES
 #if OSMajorVersion >= 6
 # define HasNCurses             YES
+# define HasArc4Random          YES
+# define HasGetIfAddrs          YES
+# define HasStrlcat             YES
 #else
+# define HasBasename            NO
 # define HasNCurses             NO
 #endif
 #ifndef HasGroff
@@ -49,6 +51,11 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 # define HasGcc3                NO
 #endif
 
+/* Older versions don't really support IPv6, but #define AF_INET6. */
+#if OSMajorVersion < 6
+# define BuildIPv6              NO
+#endif
+
 /* Thread support */
 #define HasPosixThreads         YES
 #define SystemMTDefines         -D_REENTRANT
@@ -153,7 +160,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
  */
 #if OSMajorVersion >= 7
 # define CppCmd                 /usr/bin/cpp3
-# define StandardCppOptions	-traditional
+# define StandardCppOptions     -traditional -D__GNUC__
 #else
 # define CppCmd                 /usr/bin/cpp
 #endif
@@ -210,17 +217,22 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 # define ByteOrder              X_LITTLE_ENDIAN
 #endif /* i386DarwinArchitecture */
 
+#if OSMajorVersion < 7
+# define DarwinLocaleDefines    -DX_LOCALE
+#else
+# define DarwinLocaleDefines    /**/
+# define XawI18nDefines         -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
+#endif
+
 /*
  * __DARWIN__ will be used for platform specific #ifdefs that can't
  * be handled by existing X defines.
  *
  * Darwin's alloca() seg faults (rather than returning NULL) on failed
  * allocations, so we can't use it.
- *
- * Darwin's setlocale() doesn't work properly, so use X11's instead.
  */
 #define StandardDefines         DarwinMachineDefines -D__DARWIN__ \
-                                -DNO_ALLOCA -DX_LOCALE -DCSRG_BASED
+                                -DNO_ALLOCA -DCSRG_BASED DarwinLocaleDefines
 
 /*
  * Set this to NO to just build the client libs, which should work without
@@ -238,6 +250,9 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 # define InstallXserverSetUID   NO
 #endif
 
+/* disable XKB by default as it can cause problems */
+#define DfltDisableXKB          YES
+
 /* no direct graphics extension */
 #define BuildXF86DGA            NO
 
diff --git a/gnu.cf b/gnu.cf
index b4261bd..df08bf0 100644
--- a/gnu.cf
+++ b/gnu.cf
@@ -1,5 +1,5 @@
-XCOMM $XdotOrg$
-XCOMM platform:  $XFree86: xc/config/cf/gnu.cf,v 1.12 2003/11/24 02:02:26 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/gnu.cf,v 1.13 2004/01/09 00:35:00 dawes Exp $
+XCOMM $XdotOrg: xc/config/cf/gnu.cf,v 1.1.4.2 2004/02/23 21:31:43 kaleb Exp $
 
 #ifndef OSName
 #define OSName			DefaultOSName
@@ -128,7 +128,7 @@ XCOMM Not implemented and will always fail.
 XCOMM i386Architecture
 #define OptimizedCDebugFlags	DefaultGcc2i386Opt
 #define GNUMachineDefines	-D__i386__
-#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DPART_NET
+#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME
 #define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
 #define HasPlugin		YES
 #define VendorHasX11R6_3libXext	YES
diff --git a/gnuLib.rules b/gnuLib.rules
index 096eeef..c476086 100644
--- a/gnuLib.rules
+++ b/gnuLib.rules
@@ -1,7 +1,7 @@
 /*
  * GNU/Hurd shared library rules
  *
- * $XFree86: xc/config/cf/gnuLib.rules,v 1.9 2003/10/11 09:40:13 herrb Exp $
+ * $XFree86: xc/config/cf/gnuLib.rules,v 1.10 2004/01/27 01:37:39 dawes Exp $
  */
 
 /*
@@ -17,6 +17,11 @@
 #define ForceNormalLib NO
 #endif
 
+XCOMM XXX To rpath or not to rpath...
+#ifndef UseRpath
+#define UseRpath NO
+#endif
+
 #ifndef SharedOldX
 #define SharedOldX NO
 #endif
@@ -38,10 +43,18 @@
 #ifndef ShLibIncludeFile
 #define ShLibIncludeFile <gnuLib.tmpl>
 #endif
+#ifndef RpathLoadFlags
+#if UseRpath
+#define RpathLoadFlags -Wl,-rpath=$(USRLIBDIRPATH)
+#else
+#define RpathLoadFlags /**/
+#endif
+#endif
+#ifndef LibraryRpathLoadFlags
+#define LibraryRpathLoadFlags RpathLoadFlags
+#endif
 #ifndef SharedLibraryLoadFlags
-XCOMM XXX To rpath or not to rpath...
-XCOMM #define SharedLibraryLoadFlags -shared -Wl,-rpath=$(USRLIBDIR)
-#define SharedLibraryLoadFlags -shared
+#define SharedLibraryLoadFlags -shared LibraryRpathLoadFlags
 #endif
 #ifndef PositionIndependentCFlags
 #define PositionIndependentCFlags -fPIC
@@ -52,9 +65,9 @@ XCOMM #define SharedLibraryLoadFlags -shared -Wl,-rpath=$(USRLIBDIR)
 #ifndef ExtraLoadFlags
 #ifdef UseInstalled
 XCOMM XXX Maybe superfluous.
-#define ExtraLoadFlags -Wl,-rpath-link=$(USRLIBDIRPATH)
+#define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link=$(USRLIBDIRPATH)
 #else
-#define ExtraLoadFlags -Wl,-rpath-link=$(BUILDLIBDIR)
+#define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link=$(BUILDLIBDIR)
 #endif
 #endif
 
diff --git a/linux.cf b/linux.cf
index 23042b6..cb75cc0 100644
--- a/linux.cf
+++ b/linux.cf
@@ -1,11 +1,11 @@
-XCOMM $XdotOrg: xc/config/cf/linux.cf,v 1.1.4.3 2003/12/06 13:22:41 kaleb Exp $
+XCOMM $XdotOrg: xc/config/cf/linux.cf,v 1.1.4.5 2004/02/23 21:31:43 kaleb Exp $
 XCOMM platform:  $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
 
 
 
 
 
-XCOMM platform:  $XFree86: xc/config/cf/linux.cf,v 3.219 2003/12/19 01:47:26 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/linux.cf,v 3.221 2004/01/09 00:35:00 dawes Exp $
 
 #ifndef LinuxElfDefault
 # define LinuxElfDefault	YES
@@ -264,15 +264,29 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 # endif
 #endif
 
+/* <linux/joystick.h> appeared in 2.1.45 (officially) */
+#ifndef JoystickSupport
+# define JoystickSupport	NO	/* joystick driver is broken */
+#endif
+#ifndef HasLinuxSupport
+# if JoystickSupport || \
+     (OSMajorVersion > 2) || \
+     ((OSMajorVersion == 2) && (OSMinorVersion > 1)) || \
+     ((OSMajorVersion == 2) && (OSMinorVersion == 1) && (OSTeenyVersion >= 45))
+#  define HasLinuxJoystick	YES
+# else
+#  define HasLinuxJoystick	NO
+# endif
+#endif
+
 /* Libtool on linux always uses minor numbers */
 #define LibtoolMinorVersions	YES
 
 /* On x86, determine whether to build with MTRR support */
 #ifndef HasMTRRSupport
 # if defined (i386Architecture) || defined (AMD64Architecture)
-/* There is no certain way to know if <asm/mtrr.h> is available,
-   but it made it into kernel 2.2, so... */
-#  if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)
+#  if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || \
+      (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 99)
 #   define HasMTRRSupport	YES
 #  else
 #   define HasMTRRSupport	NO
@@ -729,11 +743,17 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #endif
 
 #ifndef OSXInputDrivers
+# if HasLinuxJoystick
+#  define OSXInputDrivers1	ur98
+# else
+#  define OSXInputDrivers1	/**/
+# endif
 # if HasLinuxInput
-#  define OSXInputDrivers	ur98 aiptek
+#  define OSXInputDrivers2	aiptek
 # else
-#  define OSXInputDrivers	ur98
+#  define OSXInputDrivers2	/**/
 # endif
+# define OSXInputDrivers	OSXInputDrivers1 OSXInputDrivers2
 #endif
 
 #if UseElfFormat
@@ -746,7 +766,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #  define OptimizedCDebugFlags	DefaultGcc2AxpOpt
 # endif
 # define LinuxMachineDefines	-D__alpha__
-# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
+# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
 # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 -DJENSEN_SUPPORT
 # ifdef UseCompaqMathLibrary
 #  define MathLibrary		-lcpml -lm
@@ -759,14 +779,14 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #  define OptimizedCDebugFlags	-O3
 # endif
 # define LinuxMachineDefines	-D__arm__ -D__arm32__ -U__arm -Uarm
-# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
+# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
 # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
 #endif /* Arm32Achitecture */
 
 #ifdef HPArchitecture
 # define OptimizedCDebugFlags	-O2  GccAliasingArgs
 # define LinuxMachineDefines	-D__hppa__
-# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
+# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
 # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
 #endif
 
@@ -775,7 +795,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #  define OptimizedCDebugFlags	DefaultGcc2i386Opt
 # endif
 # define LinuxMachineDefines	-D__i386__
-# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
+# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
 # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
 #endif /* i386Architecture */
 
@@ -784,7 +804,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #  define OptimizedCDebugFlags	-O2  GccAliasingArgs
 # endif
 # define LinuxMachineDefines	-D__ia64__
-# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
+# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
 # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
 #endif /* ia64Architecture */
 
@@ -793,7 +813,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #  define OptimizedCDebugFlags	-O2  GccAliasingArgs
 # endif
 # define LinuxMachineDefines	-D__mc68000__
-# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
+# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
 # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
 #endif /* Mc68020Architecture */
 
@@ -802,7 +822,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #  define OptimizedCDebugFlags	-O2  GccAliasingArgs
 # endif
 # define LinuxMachineDefines	-D__mips__
-# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
+# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
 # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
 #endif
 
@@ -812,7 +832,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #  define OptimizedCDebugFlags	DefaultGcc2PpcOpt
 # endif
 # define LinuxMachineDefines	-D__powerpc__
-# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
+# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
 # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
 #endif /* PpcArchitecture */
 
@@ -821,7 +841,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #  define OptimizedCDebugFlags	-O2 -fomit-frame-pointer GccAliasingArgs
 # endif
 # define LinuxMachineDefines	-D__s390__
-# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
+# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
 # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
 #endif /* s390Architecture */
 
@@ -829,7 +849,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 /*#define DefaultCCOptions	-fsigned-char */
 #define OptimizedCDebugFlags	-O3 -fomit-frame-pointer
 #define LinuxMachineDefines	-D__s390x__
-#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DPART_NET
+#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME
 #define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
 #endif /* s390xArchitecture */
 
@@ -838,7 +858,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #  define OptimizedCDebugFlags	-O2  GccAliasingArgs
 # endif
 # define LinuxMachineDefines	-D__sparc__
-# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
+# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
 # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
 # define AsVISOption		-Av9a
 # ifdef Sparc64Architecture
@@ -869,7 +889,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #  define OptimizedCDebugFlags	-O2 SuperHArchOptFlags SuperHEndianFlags  GccAliasingArgs
 # endif
 # define LinuxMachineDefines	-D__sh__
-# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
+# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
 # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
 # ifndef DoLoadableServer
 #  define DoLoadableServer NO
@@ -881,7 +901,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 #  define OptimizedCDebugFlags	DefaultGcc2AMD64Opt
 # endif
 # define LinuxMachineDefines   -D__AMD64__
-# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
+# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
 # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
 #endif /* AMD64Architecture */
 
diff --git a/lnxLib.rules b/lnxLib.rules
index 5d5407f..29cefc5 100644
--- a/lnxLib.rules
+++ b/lnxLib.rules
@@ -1,5 +1,5 @@
 XCOMM $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $
+XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.53 2004/01/27 01:37:39 dawes Exp $
 
 /*
  * Linux shared library rules (DLL & ELF versions)
@@ -11,6 +11,10 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $
 # define ForceNormalLib NO
 #endif
 
+#ifndef UseRpath
+#define UseRpath NO
+#endif
+
 #ifndef SharedOldX
 # define SharedOldX NO
 #endif
@@ -63,6 +67,16 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $
 # ifndef ShLibIncludeFile
 #  define ShLibIncludeFile <lnxLib.tmpl>
 # endif
+#ifndef RpathLoadFlags
+#if UseRpath
+#define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
+#else
+#define RpathLoadFlags /**/
+#endif
+#endif
+#ifndef LibraryRpathLoadFlags
+#define LibraryRpathLoadFlags RpathLoadFlags
+#endif
 # ifndef SharedLibraryLoadFlags
 #  define SharedLibraryLoadFlags -shared
 # endif
@@ -76,17 +90,17 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $
 #  if LinuxBinUtilsMajorVersion >= 26
 #   ifdef UseInstalled
 #    if LinuxBinUtilsMajorVersion < 27
-#     define ExtraLoadFlags -Wl,-rpath-link,$(USRLIBDIRPATH)
+#     define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(USRLIBDIRPATH)
 #    endif
 #   else
-#    define ExtraLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR)
+#    define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR)
 #   endif
 #  else
-#   define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
+#   define ExtraLoadFlags RpathLoadFlags
 #  endif
 # endif
 # ifndef HardCodeLibdirFlag
-#  define HardCodeLibdirFlag -Wl,-rpath,$(USRLIBDIRPATH)
+#  define HardCodeLibdirFlag RpathLoadFlags
 # endif
 # if !defined(ShlibGlobalsFlags)
 #  define ShlibGlobalsFlags -Wl,-Bsymbolic
diff --git a/lynx.cf b/lynx.cf
index 10bbb40..dab43c6 100644
--- a/lynx.cf
+++ b/lynx.cf
@@ -3,7 +3,7 @@ XCOMM $Xorg: lynx.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
 
 
 
-XCOMM platform:  $XFree86: xc/config/cf/lynx.cf,v 3.47 2003/04/24 22:14:53 herrb Exp $
+XCOMM platform:  $XFree86: xc/config/cf/lynx.cf,v 3.48 2004/01/09 00:35:00 dawes Exp $
 
 
 #ifndef OSName
@@ -200,7 +200,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #define StandardCppOptions	-traditional
 #define StandardCppDefines	StandardDefines
 #if defined(i386Architecture) || defined(PpcArchitecture)
-# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
+# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
 # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
 # if OSMajorVersion == 2 && OSMinorVersion < 5
 #  define XkbServerDefines      -DNEED_POPEN_WORKAROUND
diff --git a/sco5.cf b/sco5.cf
index 343500d..44ff060 100644
--- a/sco5.cf
+++ b/sco5.cf
@@ -1,5 +1,5 @@
-XCOMM $XdotOrg: xc/config/cf/sco5.cf,v 3.15 2003/12/19 02:05:37 dawes Exp $
-XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.15 2003/12/19 02:05:37 dawes Exp $
+XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.16 2004/01/07 04:30:27 dawes Exp $
+XCOMM $XdotOrg: xc/config/cf/sco5.cf,v 1.1.4.3 2004/02/23 21:31:43 kaleb Exp $
 
 /*
  * This is for SCO Open Server 5.0.6A or later. You must have the
@@ -54,6 +54,18 @@ XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.15 2003/12/19 02:05:37 dawes Exp $
 #endif
 #endif
 
+/*
+ * Although OpenServer does not currently have threads, there are plans
+ * for it in the near future, and libc/libsocket are already thread
+ * safe, so use -D_REENTRANT when compiling libraries so that if an
+ * app that has either the new forthcoming threads, or one that uses
+ * GNU PTH or FSU pthreads is linked against X, that the libraries are
+ * safe at least with regards to things like errno and various _r functions.
+ */
+#ifndef LibraryCCOptions
+# define LibraryCCOptions	-D_REENTRANT
+#endif
+	
 #define StandardDefines		-Dsco -DSCO -DSCO5 -DSYSV -Di386 -DSCO325 -DFD_SETSIZE=256 -D_NO_STATIC -DMAXPATHLEN=1024
 #ifdef HasGcc2
 # define DefaultCCOptions       GccWarningOptions
@@ -158,7 +170,18 @@ XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.15 2003/12/19 02:05:37 dawes Exp $
 #define CppCmd			/lib/cpp
 #define PreProcessCmd		CppCmd
 #define RawCppCmd		CppCmd
-#define LdCmd                   ld
+
+#ifdef HasGcc2
+# define LdCmd                   CcCmd
+# ifndef SharedLibraryLoadFlags
+#  define SharedLibraryLoadFlags -shared
+# endif
+# undef LdCombineFlags
+# define LdCombineFlags		-nostdlib -r
+#else
+# define LdCmd			/usr/ccs/bin/elf/ld
+#endif
+
 #define LexCmd                  /usr/gnu/bin/flex
 #define MakeCmd	                /usr/gnu/bin/gmake
 #define YaccCmd                 /usr/gnu/bin/bison -y
@@ -178,7 +201,62 @@ XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.15 2003/12/19 02:05:37 dawes Exp $
 
 #define ConnectionFlags         -DLOCALCONN -DTCPCONN -DUNIXCONN 
 
-#define SharedGLUReqs           $(LDPRELIB) $(XLIB) $(GLXLIB)
+/*
+ * These settings control the interdependence of the shared libraries.
+ * Mostly borrowed from darwinLib.tmpl.
+ */
+#ifndef FixupLibReferences
+#define FixupLibReferences()						@@\
+XMULIBONLY = -lXmu							@@\
+XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
+#endif
+
+#ifndef XawClientLibs
+#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+#endif
+
+#define SharedXlibi18nReqs $(LDPRELIB) $(XLIBONLY)
+
+#define SharedXfontReqs     $(LDPRELIB) $(FONTSTUBLIB) GzipLibrary $(FREETYPE2LIB) $(XLIB)
+#define SharedFontencReqs   $(LDPRELIB) GzipLibrary
+#define SharedGLReqs        $(LDPRELIB) $(XLIB)
+#define SharedGLUReqs       $(LDPRELIB) $(XLIB) $(GLXLIB)
+#define SharedOSMesaReqs    $(LDPRELIB) $(XLIB) $(GLXLIB)
+#define SharedPexReqs       $(LDPRELIB) $(XONLYLIB) MathLibrary
+#define SharedSMReqs        $(LDPRELIB) $(ICELIB)
+#define SharedX11Reqs       $(LDPRELIB) -lsocket
+#define SharedXawReqs       $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+#define SharedXaw6Reqs      $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
+#define SharedXcursorReqs   $(LDPRELIB) $(XRENDERLIB) $(XLIB)
+#define SharedXextReqs      $(LDPRELIB) $(XONLYLIB)
+#define SharedXiReqs        $(LDPRELIB) $(XLIB)
+#define SharedXieReqs       $(LDPRELIB) $(XONLYLIB)
+#define SharedXmuReqs       $(LDPRELIB) $(XTOOLLIB) $(XLIB)
+#define SharedXmuuReqs      $(LDPRELIB) $(XONLYLIB)
+#define SharedXpReqs        $(LDPRELIB) $(XLIB)
+#define SharedXpmReqs       $(LDPRELIB) $(XLIB)
+#define SharedXrandrReqs    $(LDPRELIB) $(XRENDERLIB) $(XLIB)
+#define SharedXrenderReqs   $(LDPRELIB) $(XLIB)
+#define SharedXtReqs        $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
+#define SharedXtstReqs      $(LDPRELIB) $(XLIB)
+#define SharedXvReqs        $(LDPRELIB) $(XLIB)
+#define SharedDPSReqs       $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
+#define SharedDPSTKReqs     $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIB)
+#define SharedOldXReqs      $(LDPRELIB) $(XONLYLIB)
+#define SharedpsresReqs     $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
+#define SharedXResReqs	    $(LDPRELIB) $(XLIB)
+#define SharedXfontcacheReqs $(LDPRELIB) $(XLIB)
+#define SharedXineramaReqs  $(LDPRELIB) $(XLIB)
+#define SharedXssReqs	    $(LDPRELIB) $(XLIB)
+#define SharedXvMCReqs	    $(LDPRELIB) $(XLIB)
+#define SharedXxf86miscReqs $(LDPRELIB) $(XLIB)
+#define SharedXxf86vmReqs   $(LDPRELIB) $(XLIB)
+#define SharedxkbfileReqs   $(LDPRELIB) $(XONLYLIB)
+#define SharedxkbuiReqs	    $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB)
+#define SharedXReqs         $(XTOOLLIB) $(XPLIB) $(XLIB)
+#define SharedXmReqs        $(LDPRELIB) SharedXReqs
+#define SharedMrmReqs       $(LDPRELIB) $(XMLIB) SharedXReqs
+#define SharedUilReqs       $(LDPRELIB) $(XMLIB) SharedXReqs
 
 #define ObjectFromAsmSource(src,flags)					@@\
 									@@\
diff --git a/scoLib.rules b/scoLib.rules
index 53735c6..d450b01 100644
--- a/scoLib.rules
+++ b/scoLib.rules
@@ -1,6 +1,6 @@
-XCOMM $XdotOrg: scoLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
+XCOMM $XdotOrg: xc/config/cf/scoLib.rules,v 1.1.4.3 2004/02/23 21:31:43 kaleb Exp $
 XCOMM $Xorg: scoLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/scoLib.rules,v 1.10 2003/12/18 16:38:34 dawes Exp $
+XCOMM $XFree86: xc/config/cf/scoLib.rules,v 1.11 2004/01/07 04:30:28 dawes Exp $
 
 #ifndef UseExportLists
 # define UseExportLists NO
@@ -10,6 +10,16 @@ XCOMM $XFree86: xc/config/cf/scoLib.rules,v 1.10 2003/12/18 16:38:34 dawes Exp $
 #define ExtraLoadFlags -R $(USRLIBDIRPATH)
 #endif
 
+#ifndef SCOAbsShlibPath
+# define SCOAbsShlibPath NO
+#endif
+
+#if SCOAbsShlibPath
+# define SCOShlibFlags -h $(SHLIBDIR)/$@
+#else
+# define SCOShlibFlags -R $(DESTDIR)$(SHLIBDIR) -h $@
+#endif
+
 /*
  * SharedLibraryTarget3 - generate rules to create a shared library;
  * build it into a different name so that we do not hose people by having
@@ -23,9 +33,10 @@ AllTarget(Concat(lib,libname.so.rev))					@@\
 									@@\
 Concat(lib,libname.so.rev): solist1 solist2 solist3 $(EXTRALIBRARYDEPS)	@@\
 	$(RM) $@~							@@\
-	echo -n $(LD) -o up/$@~ $(SHLIBLDFLAGS) -R $(DESTDIR)$(SHLIBDIR) -h $@ solist1 " " > Concat(down/lib,cmd) 	@@\
+	echo -n $(LD) -o up/$@~ $(SHLIBLDFLAGS) SCOShlibFlags solist1 " " > Concat(down/lib,cmd) 	@@\
 	echo -n solist2 " " >> Concat(down/lib,cmd)			@@\
-	echo -n solist3  >> Concat(down/lib,cmd)			@@\
+	echo -n solist3 " " >> Concat(down/lib,cmd)			@@\
+	echo -n $(REQUIREDLIBS) >> Concat(down/lib,cmd)			@@\
 	(cd down; $(SHELL) Concat(./lib,cmd))				@@\
 	$(RM) $@ Concat(lib,tmp1) Concat(lib,tmp2)			@@\
 	$(MV) $@~ $@							@@\
@@ -43,16 +54,16 @@ clean::									@@\
 #ifndef LinkWithExports
 # if UseExportLists
 #  define LinkWithExports(libname,rev,solist,down,up) \
-	(cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -R $(DESTDIR)$(SHLIBDIR) -h $@ solist $(REQUIREDLIBS))	@@\
+	(cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) SCOShlibFlags solist $(REQUIREDLIBS))	@@\
 	if [ -f Concat(lib,libname.elist) ]; then \			@@\
 	    $(RM) down/$@.exports $@.list; \				@@\
 	    $(CPP) $(ALLINCLUDES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES) Concat(lib,libname.elist) | CppSedMagic >$@.list; \	@@\
 	    $(EXPORTLISTGEN) $@~ $@.list > down/$@.exports; \		@@\
-	    (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ ShlibExportListOpt($@.exports) solist $(REQUIREDLIBS)); \	@@\
+	    (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) SCOShlibFlags ShlibExportListOpt($@.exports) solist $(REQUIREDLIBS)); \	@@\
 	    $(RM) down/$@.exports $@.list; \				@@\
 	fi;
 # else
 #  define LinkWithExports(libname,rev,solist,down,up) \
-	(cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -R $(DESTDIR)$(SHLIBDIR) -h $@ solist $(REQUIREDLIBS))
+	(cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) SCOShlibFlags solist $(REQUIREDLIBS))
 # endif
 #endif
diff --git a/sun.cf b/sun.cf
index 0e633e6..9642f22 100644
--- a/sun.cf
+++ b/sun.cf
@@ -1,10 +1,10 @@
-XCOMM $XdotOrg$
+XCOMM $XdotOrg: xc/config/cf/sun.cf,v 1.1.4.8 2004/02/23 22:11:03 kaleb Exp $
 XCOMM platform:  $Xorg: sun.cf,v 1.4 2000/08/17 19:41:48 cpqbld Exp $
 
 
 
 
-XCOMM platform:  $XFree86: xc/config/cf/sun.cf,v 3.69 2003/10/26 12:17:14 herrb Exp $
+XCOMM platform:  $XFree86: xc/config/cf/sun.cf,v 3.71 2004/02/02 03:55:26 dawes Exp $
 
 #ifndef OSName
 # define OSName		DefaultOSName
@@ -241,7 +241,12 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
 #  define InstallCmd	    /usr/ucb/install
 # endif
 # ifdef i386Architecture
-#  define StandardDefines	  -Dsun -Di386 -DSVR4 -D__EXTENSIONS__ -D__i386
+#  if (OSMajorVersion < 4) || ((OSMajorVersion == 5) && (OSMinorVersion <= 5))
+#   define StandardDefines	-Dsun -Di386 -DSVR4 -D__EXTENSIONS__ -D__i386 \
+				-D__SOL64__
+#  else
+#   define StandardDefines	-Dsun -Di386 -DSVR4 -D__EXTENSIONS__ -D__i386
+#  endif
 #  define ToolkitStringsABIOptions	-intelabi
 # else
 #  define StandardDefines	  -Dsun -Dsparc -DSVR4 -D__EXTENSIONS__
@@ -277,11 +282,12 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
 #  define HasSnprintf YES
 # endif
 # if OSMinorVersion > 7
-#  define HasStrlcat YES
-# endif
-# if OSMinorVersion > 7
 #  define HasStrlcat	YES
 #  define HasStrcasecmp	YES
+#  define HasZlib	YES
+# endif
+# if OSMinorVersion > 9
+#  define HasSetenv	YES
 # endif
 # define HasVFork	NO
 # define HasDlopen	YES
@@ -427,7 +433,6 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
 #      define DefaultCCOptions -Xa -v -xarch=v9
 #      define LargePICTable YES
 #     endif
-#     define DefaultCCOptions -Xa -v
 #    endif
 #   endif	
 #  endif	
@@ -539,3 +544,8 @@ man_keywords::								@@\
 #define	UseSeparateConfDir	NO
 #endif
 
+#ifndef BuildGLULibrary
+#if HasSunC
+#define BuildGLULibrary NO
+#endif
+#endif
diff --git a/svr3.cf b/svr3.cf
index db5ba7d..dccbe37 100644
--- a/svr3.cf
+++ b/svr3.cf
@@ -2,7 +2,7 @@ XCOMM $Xorg: svr3.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
 
 
 
-XCOMM $XFree86: xc/config/cf/svr3.cf,v 3.15 2002/08/19 03:16:31 tsi Exp $
+XCOMM $XFree86: xc/config/cf/svr3.cf,v 3.16 2004/01/09 00:35:00 dawes Exp $
 
 #ifndef HasGcc
 #define HasGcc      YES
@@ -135,7 +135,7 @@ XCOMM $XFree86: xc/config/cf/svr3.cf,v 3.15 2002/08/19 03:16:31 tsi Exp $
 
 #ifndef ServerOSDefines
 # ifdef i386Architecture
-#  define ServerOSDefines -DDDXTIME XFree86ServerOSDefines -DPART_NET
+#  define ServerOSDefines -DDDXTIME XFree86ServerOSDefines
 # else
 #  define ServerOSDefines -DDDXTIME
 # endif
diff --git a/svr4.cf b/svr4.cf
index ab72f20..be9ebda 100644
--- a/svr4.cf
+++ b/svr4.cf
@@ -2,7 +2,7 @@ XCOMM $Xorg: svr4.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
 
 
 
-XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.50 2003/11/04 01:25:31 dawes Exp $
+XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.51 2004/01/07 04:28:01 dawes Exp $
 /*
  * A default OS name
  */
@@ -45,7 +45,9 @@ XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.50 2003/11/04 01:25:31 dawes Exp $
 
 /* Some stuff that all SVR4s should have */
 
+#ifndef SystemV4
 #define SystemV4		YES
+#endif
 #ifndef HasLdRunPath
 #define HasLdRunPath		YES
 #endif
diff --git a/xf86.tmpl b/xf86.tmpl
index adc6cda..d33ecaa 100644
--- a/xf86.tmpl
+++ b/xf86.tmpl
@@ -7,7 +7,7 @@ XCOMM $XFree86: xc/config/cf/xf86.tmpl,v 3.33 2002/12/16 23:01:43 herrb Exp $
 #ifdef BuilderEMailAddr
 BUILDERADDR = BuilderEMailAddr
 #else 
-BUILDERADDR = "xfree86@xfree86.org"
+BUILDERADDR = "xorg@freedesktop.org"
 #endif
 BUGMSG = -DBUILDERADDR='$(BUILDERADDR)'
 
diff --git a/xfree86.cf b/xfree86.cf
index 7fefb2d..fb720eb 100644
--- a/xfree86.cf
+++ b/xfree86.cf
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.465 2003/11/07 23:57:43 dawes Exp $
+XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.467 2004/01/28 01:47:26 dawes Exp $
 /*
  * This configuration file contains all of the configuration
  * information for the XFree86 based X Servers.
@@ -74,8 +74,8 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
 
 #ifndef ChangelogDateCmd
 # define ChangelogDateCmd if tail $(CHANGELOGFILE) | \			@@\
-	grep -F -q '$$XFree86:'; then \					@@\
-	  tail $(CHANGELOGFILE) | grep -F '$$XFree86:' | \		@@\
+	fgrep '$$XFree86:' >/dev/null 2>&1; then \			@@\
+	  tail $(CHANGELOGFILE) | fgrep '$$XFree86:' | \		@@\
 	  sed s,'.* \([0-9][0-9]*\)/\([0-9][0-9]*\)/\([0-9][0-9]*\).*,\1\2\3,'; \ @@\
 	else echo 0; fi
 #endif
@@ -1623,9 +1623,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #ifndef BuildCyrillicFonts
 # define BuildCyrillicFonts	YES
 #endif
-#ifndef UseKoi8RForCyrillic
-# define UseKoi8RForCyrillic	YES
-#endif
 
 /*
  * Build scanpci?