Import of XFree86 4.0.1eX_4_0_1e

13 files changed, 487 insertions, 85 deletions

diff --git a/xc/config/cf/Imake.cf b/xc/config/cf/Imake.cf
index 95d2cd7a5..8a975c1be 100644
--- a/xc/config/cf/Imake.cf
+++ b/xc/config/cf/Imake.cf
@@ -17,7 +17,14 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
  *
  *     4.  Create a .cf file with the name given by MacroFile.
  */
-XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.61 2000/09/19 12:46:03 eich Exp $
+XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.63 2000/11/06 19:24:00 dawes Exp $
+
+#if defined(__APPLE__)
+# undef __APPLE__
+# define MacroIncludeFile <darwin.cf>
+# define MacroFile darwin.cf
+# define DarwinArchitecture
+#endif
 
 #if defined(clipper) || defined(__clipper__)
 # undef clipper
@@ -133,6 +140,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.61 2000/09/19 12:46:03 eich Exp $
 #  endif
 #  undef mc68000
 # endif
+# ifdef __powerpc__
+#  define PpcArchitecture
+#  undef __powerpc__
+# endif
 #endif /* OpenBSD */
 
 #ifdef __NetBSD__
@@ -169,6 +180,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.61 2000/09/19 12:46:03 eich Exp $
 #   define VaxArchitecture
 #   undef __vax__
 # endif
+# ifdef __powerpc__
+#   define PpcArchitecture
+#   undef __powerpc__
+# endif
 #endif /* NetBSD */
 
 #ifdef __FreeBSD__
diff --git a/xc/config/cf/Imake.rules b/xc/config/cf/Imake.rules
index 2c7afc516..3073d8060 100644
--- a/xc/config/cf/Imake.rules
+++ b/xc/config/cf/Imake.rules
@@ -5,7 +5,7 @@ XCOMM
 XCOMM
 XCOMM
 XCOMM
-XCOMM rules:  $XFree86: xc/config/cf/Imake.rules,v 3.79 2000/10/24 22:45:00 dawes Exp $
+XCOMM rules:  $XFree86: xc/config/cf/Imake.rules,v 3.81 2000/11/02 02:51:05 dawes Exp $
 
 /*
  *		   MACHINE-INDEPENDENT RULES; DO NOT MODIFY
@@ -538,6 +538,7 @@ includes:: srclist							@@\
 all:: $(BUILDBINDIR)/binary binary					@@\
 									@@\
 $(BUILDBINDIR)/binary: binary						@@\
+	MakeDir($(BUILDBINDIR))						@@\
 	RemoveFile($@)							@@\
 	cd $(BUILDBINDIR) && $(LN) $(BUILDBINTOP)/$(CURRENT_DIR)/binary .
 #endif /* LinkBuildBinary */
@@ -1319,7 +1320,7 @@ clean::									@@\
 install.man:: file.suffix.html						@@\
 	@SUF=`expr suffix \: '\(.\)'`; \				@@\
 	for i in aliases; do (set -x; \					@@\
-	  RemoveFile($(DESTDIR)$(DOCHTMLDIR)/$$i.suffix.html); \	@@\
+	  RemoveFile($(DESTDIR)$(DOCHTMLDIR)/$$i.$$SUF.html); \		@@\
 	  (cd $(DESTDIR)$(DOCHTMLDIR); \				@@\
 	    $(LN) file.$$SUF.html $$i.$$SUF.html)); \			@@\
 	done
@@ -1585,7 +1586,7 @@ install::								@@\
 		sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \		@@\
 	  cd Concat($(DESTDIR),opath); \				@@\
 	  if [ -f lfile -a ! -h lfile ]; then \ 			@@\
-	    cp -p lfile Concat($(DESTDIR),npath/cfile; \		@@\
+	    cp -p lfile Concat($(DESTDIR),npath/cfile); \		@@\
 	  fi; \								@@\
 	  $(RM) -r lfile; \						@@\
 	  $(LN) Concat($${RELPATH},npath/cfile) lfile; \		@@\
diff --git a/xc/config/cf/Imakefile b/xc/config/cf/Imakefile
index 5d189e281..7440c8583 100644
--- a/xc/config/cf/Imakefile
+++ b/xc/config/cf/Imakefile
@@ -1,5 +1,5 @@
 XCOMM $XConsortium: Imakefile /main/38 1996/11/07 14:43:46 kaleb $
-XCOMM $XFree86: xc/config/cf/Imakefile,v 3.23 2000/08/09 23:40:08 dawes Exp $
+XCOMM $XFree86: xc/config/cf/Imakefile,v 3.24 2000/11/02 02:51:06 dawes Exp $
 
 XCOMM Some compilers generate fatal errors if an -L directory does
 XCOMM not exist.  Since BUILDLIBDIR may not exist yet suppress its use.
@@ -122,6 +122,7 @@ usl.cf \
 lynx.cf \
 x386.cf \
 QNX4.cf \
+darwin.cf \
 xfree86.cf
 
 INSTFILES = $(RULEFILES) $(TMPLFILES) $(DEFFILES) $(CFFILES) $(LOCALFILES)
diff --git a/xc/config/cf/OpenBSD.cf b/xc/config/cf/OpenBSD.cf
index 2750309e1..be0215d2c 100644
--- a/xc/config/cf/OpenBSD.cf
+++ b/xc/config/cf/OpenBSD.cf
@@ -1,4 +1,4 @@
-XCOMM platform:  $XFree86: xc/config/cf/OpenBSD.cf,v 3.39 2000/08/01 23:38:45 dawes Exp $
+XCOMM platform:  $XFree86: xc/config/cf/OpenBSD.cf,v 3.40 2000/11/06 19:24:00 dawes Exp $
 XCOMM
 
 #ifndef OSName
@@ -19,6 +19,22 @@ XCOMM
 #endif
 XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
 
+#ifdef Ports
+
+#define BinDir			/usr/local/bin
+#define UsrLibDir		/usr/local/lib
+#define ManDirectoryRoot	/usr/local/man
+#define LdPreLib		-L/usr/X11R6/lib -L/usr/local/lib
+#define XpmLibDir		/usr/X11R6/lib
+#define XpmIncDir		/usr/X11R6/include
+#define ConfigDir		/usr/X11R6/lib/X11/config
+#define IncRoot			/usr/local/include
+#define TopXInclude		-I/usr/X11R6/include
+#define ImakeCmd		imake -DPorts
+#define DocDir			/usr/local/share/doc
+
+#endif
+
 /*
  * C library features
  */
@@ -39,7 +55,11 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #define HasKrbIV		YES
 #endif
 #define HasDlopen		YES
-#define DlLibrary		/**/
+#ifndef PpcArchitecture
+#  define DlLibrary		/**/
+#else 
+#  define DlLibrary		-ldl
+#endif
 #define HasUsableFileMmap	YES
 
 #define HasNCurses		YES
@@ -59,7 +79,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 /*
  * Multi-thread safe libs 
  */	
-#if OSMajorVersion == 2 && OSMinorVersion >= 6 || OSMajorVersion >= 3
+#if !defined(PpcArchitecture) && (OSMajorVersion == 2 && OSMinorVersion >= 6 || OSMajorVersion >= 3)
 # define HasPosixThreads	YES
 # define ThreadedX		YES
 # define SystemMTDefines	-D_REENTRANT
@@ -69,12 +89,12 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #  define BuildThreadStubLibrary  YES 
 #  define NeedUIThrStubs          YES 
 #  define ThreadsCompileFlags	-pthread
-#  define ThreadsLibraries 	-lc_r
+#  define ThreadsLibraries     -lc_r
 # endif
 #endif
 
 #if OSMajorVersion == 2 && OSMinorVersion > 6 || OSMajorVersion >= 3
-# define HasThreadSafeAPI	YES
+# define HasThreadSafeAPI      YES
 #endif
 
 /*
@@ -104,50 +124,68 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #if defined(UseInstalled)
 #define DefaultCCOptions 	/**/
 #else
-#define DefaultCCOptions 	-ansi -Dasm=__asm GccWarningOptions
+#  ifdef  PpcArchitecture
+#    define DefaultCCOptions	-ansi -fsigned-char -Dasm=__asm GccWarningOptions
+#  else
+#    define DefaultCCOptions 	-ansi -Dasm=__asm GccWarningOptions
+#  endif
 #endif
 
 #define GccGasOption 		-DGCCUSESGAS
 #define AsmDefines 		-DUSE_GAS
 
 #ifdef i386Architecture
-# ifndef DefaultGcc2i386Opt
-#  if (OSMajorVersion == 2 && OSMinorVersion >= 3) || OSMajorVersion > 2
-    /* The GCC strength-reduce bug is fixed for OpenBSD 2.3 and later */
-#   define DefaultGcc2i386Opt	-O2
+#  ifndef DefaultGcc2i386Opt
+#    if (OSMajorVersion == 2 && OSMinorVersion >= 3) || OSMajorVersion > 2
+       /* The GCC strength-reduce bug is fixed for OpenBSD 2.3 and later */
+#      define DefaultGcc2i386Opt	-O2
+#    endif
 #  endif
-# endif
-# define OptimizedCDebugFlags	DefaultGcc2i386Opt
-# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
-# define ServerExtraSysLibs	-li386
-# define LdPostLib		/**/
-#else
-# define OptimizedCDebugFlags 	-O2
-# if defined(SparcArchitecture) || defined(AlphaArchitecture)
+#  define OptimizedCDebugFlags	DefaultGcc2i386Opt
+#  define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
+#  define ServerExtraSysLibs	-li386
+#  define LdPostLib		/**/
+#  define ServerExtraDefines GccGasOption XFree86ServerDefines
+#  ifndef XFree86ConsoleDefines
+#    define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT
+#  endif
+#endif
+
+#ifdef SparcArchitecture
+#  define OptimizedCDebugFlags	-O2
 #  define ServerOSDefines 	-DDDXOSINIT
-# else
-#  define ServerOSDefines 	/**/
-# endif
+#  define ServerExtraDefines	XFree86ServerDefines
+#endif 
+
+#ifdef AlphaArchitecture
+#  define OptimizedCDebugFlags	-O2
+#  define ServerOSDefines 	-DDDXOSINIT
+#  define ServerExtraDefines	GccGasOption -D_XSERVER64
 #endif
-#if defined(i386Architecture) || defined(ArcArchitecture)
-# define ServerExtraDefines GccGasOption XFree86ServerDefines
-# ifndef XFree86ConsoleDefines
-#  if defined(ArcArchitecture)
-#   define XFree86ConsoleDefines -DPCCONS_SUPPORT
-#  else
-#   define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT
+
+#ifdef ArcArchitecture
+#  define ServerExtraDefines GccGasOption XFree86ServerDefines
+#  ifndef XFree86ConsoleDefines
+#    define XFree86ConsoleDefines -DPCCONS_SUPPORT
 #  endif
-# endif
-#else
-# if defined(SparcArchitecture)
-#  define ServerExtraDefines  XFree86ServerDefines
-# else
-#  if defined(AlphaArchitecture)
-#   define ServerExtraDefines GccGasOption -D_XSERVER64
-#  else
-#   define ServerExtraDefines GccGasOption
+#endif
+
+#ifdef PpcArchitecture
+#  define OptimizedCDebugFlags 	-O2
+#  define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT
+#  define ServerExtraDefines	GccGasOption XFree86ServerDefines
+#  define XkbServerDefines	-DXKB_ALWAYS_USES_SOFT_REPEAT
+#  ifndef XFree86ConsoleDefines
+#    define XFree86ConsoleDefines	-DWSCONS_SUPPORT
 #  endif
-# endif
+#endif /* Ppc */
+
+#ifndef ServerOSDefines
+#  define ServerOSDefines 	/**/
+#endif
+
+#ifndef ServerExtraDefines
+#  define ServerExtraDefines GccGasOption
 #endif
 
 #define StandardDefines	-DCSRG_BASED
@@ -302,6 +340,14 @@ install:: fonts.alias							@@\
 #endif /* InstallFontAliasesNoComment */
 
 /*
+ * OpenBSD specific Imake Config files
+ */
+#ifndef LocalConfigFiles
+#define LocalConfigFiles \
+	OpenBSDLib.rules
+#endif
+
+/*
  * Architecture specific sections - put all architecture dependent
  * options and setting here into the correct section
  */
@@ -550,17 +596,34 @@ install:: fonts.alias							@@\
  */
 #ifdef PpcArchitecture
 
-/* #define GccWarningOptions -Wall -Wpointer-artith */
+# define UseElfFormat		YES
 
-# include <xf86.rules>
-# ifndef BuildServer
-#  define BuildServer		NO
-# endif
+#  if XFree86Devel
+#   define GccWarningOptions -Wall -Wpointer-arith -Wstrict-prototypes \
+			  -Wmissing-prototypes -Wmissing-declarations \
+			  -Wnested-externs
+#  else
+#   define GccWarningOptions -Wall -Wpointer-arith
+#  endif
 
-# define HasSharedLibraries	NO
-# define UseElfFormat		YES
-# define BuildDynamicLoading	NO
+# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 8)
+#   ifndef DoLoadableServer
+#     define DoLoadableServer	YES
+#   endif
+#   define DevelDrivers cirrus ati
+    /* Support for USB Mices */
+#   define UsbMouseSupport		YES
+#   include <xfree86.cf>
 
+# else /* 2.7 and earlier */
+#  include <xf86.rules>
+#  ifndef BuildServer
+#   define BuildServer		YES
+#  endif
+
+#  define HasSharedLibraries	NO
+#  define BuildDynamicLoading	NO
+# endif
 #endif /* PpcArchitecture */
 
 /*
@@ -650,5 +713,8 @@ install:: fonts.alias							@@\
 #endif
 
 /* This must come last */
-#include <bsdLib.rules>
-
+#if OSMajorVersion == 2 && OSMinorVersion >= 8 || OSMajorVersion > 2
+# include <OpenBSDLib.rules>
+#else
+# include <bsdLib.rules>
+#endif
diff --git a/xc/config/cf/OpenBSDLib.rules b/xc/config/cf/OpenBSDLib.rules
new file mode 100644
index 000000000..9037183f2
--- /dev/null
+++ b/xc/config/cf/OpenBSDLib.rules
@@ -0,0 +1,162 @@
+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.1 2000/11/06 19:24:00 dawes Exp $
+
+#ifndef UseElfFormat
+#define UseElfFormat NO
+#endif
+
+#ifndef HasSharedLibraries
+#define HasSharedLibraries YES
+#endif
+#ifndef ForceNormalLib
+#define ForceNormalLib YES
+#endif
+
+#ifndef BaseShLibReqs
+#define BaseShLibReqs		/* -lc implied by $(CC) */
+#endif
+
+#ifndef SharedDataSeparation
+#define SharedDataSeparation NO
+#endif
+#ifndef SharedCodeDef
+#define SharedCodeDef /**/
+#endif
+#ifndef SharedLibraryDef
+#define SharedLibraryDef /**/
+#endif
+#ifndef ShLibIncludeFile
+#define ShLibIncludeFile <bsdLib.tmpl>
+#endif
+#ifndef SharedLibraryLoadFlags
+#define SharedLibraryLoadFlags -shared PositionIndependentCFlags -Wl,-rpath,$(USRLIBDIR)
+#endif
+#ifndef PositionIndependentCFlags
+#define PositionIndependentCFlags -fPIC
+#endif
+#ifndef PositionIndependentCplusplusFlags
+#define PositionIndependentCplusplusFlags -fPIC
+#endif
+#if UseElfFormat
+#ifndef ExtraLoadFlags
+#ifdef UseInstalled
+#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
+#else
+#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) -Wl,-rpath-link,$(BUILDLIBDIR)
+#endif
+#endif
+#endif
+/*
+ * InstallSharedLibrary - generate rules to install the shared library.
+ * NOTE: file must be executable, hence "INSTBINFLAGS"
+ */
+#ifndef InstallSharedLibrary
+#define InstallSharedLibrary(libname,rev,dest)				@@\
+install:: Concat(lib,libname.so.rev) 					@@\
+	MakeDir($(DESTDIR)dest)						@@\
+	$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest
+#endif /* InstallSharedLibrary */
+
+/*
+ * InstallSharedLibraryData - generate rules to install the shared library data
+ */
+#ifndef InstallSharedLibraryData
+#define InstallSharedLibraryData(libname,rev,dest)
+#endif /* InstallSharedLibraryData */
+
+
+/*
+ * SharedLibraryTarget - generate rules to create a shared library;
+ * build it into a different name so that we do not hose people by having
+ * the library gone for long periods.
+ */
+#ifndef SharedLibraryTarget
+#ifdef UseInstalled  
+#define LinkBuildSonameLibrary(lib) true
+#else
+#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
+	cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
+#endif
+
+#define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
+AllTarget(Concat(lib,libname.so.rev))					@@\
+									@@\
+Concat(lib,libname.so.rev):  solist					@@\
+	$(RM) $@~							@@\
+	set -x; \							@@\
+		(cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$@\ @@\
+		solist $(REQUIREDLIBS) BaseShLibReqs); 			@@\
+		LinkBuildSonameLibrary($@)				@@\
+	$(RM) $@							@@\
+	$(MV) $@~ $@							@@\
+									@@\
+clean::									@@\
+	$(RM) Concat(lib,libname.so.rev)
+
+#endif /* SharedLibraryTarget */
+
+
+/*
+ * SharedDepLibraryTarget - generate rules to create a shared library.
+ */
+#ifndef SharedDepLibraryTarget
+#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
+AllTarget(Concat(lib,libname.so.rev))					@@\
+									@@\
+Concat(lib,libname.so.rev):  deplist $(EXTRALIBRARYDEPS)		@@\
+	$(RM) $@~							@@\
+	(cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
+	$(RM) $@							@@\
+	$(MV) $@~ $@							@@\
+	LinkBuildLibrary($@)						@@\
+									@@\
+clean::									@@\
+	$(RM) Concat(lib,libname.so.rev)
+
+#endif /* SharedDepLibraryTarget */
+
+#ifndef SharedDepModuleTarget
+#define SharedDepModuleTarget(name,deps,solist)				@@\
+AllTarget(name)								@@\
+									@@\
+name: deps								@@\
+	$(RM) $@~							@@\
+	$(CC) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)		@@\
+	$(RM) $@							@@\
+	$(MV) $@~ $@							@@\
+									@@\
+clean::									@@\
+	$(RM) name
+
+#endif /* SharedDepModuleTarget */
+
+/*
+ * SharedLibraryDataTarget - generate rules to create shlib data file;
+ */
+#ifndef SharedLibraryDataTarget
+#define SharedLibraryDataTarget(libname,rev,salist)
+#endif /* SharedLibraryTarget */
+
+/*
+ * DynamicModuleTarget - build a module to be dynamically loaded
+ */
+#ifdef DynamicModuleTarget
+#undef DynamicModuleTarget
+#define DynamicModuleTarget(module,modlist)				@@\
+AllTarget(module)							@@\
+									@@\
+module: modlist								@@\
+	RemoveFile($@)							@@\
+	$(CC) -o $@ $(SHLIBLDFLAGS) modlist				@@\
+									@@\
+clean::									@@\
+	RemoveFile(module)
+#endif /* DynamicModuleTarget */
diff --git a/xc/config/cf/X11.rules b/xc/config/cf/X11.rules
index 97745c14e..cc959fe8d 100644
--- a/xc/config/cf/X11.rules
+++ b/xc/config/cf/X11.rules
@@ -1,7 +1,7 @@
 XCOMM $TOG: X11.rules /main/4 1997/04/30 15:23:24 kaleb $
 
 
-XCOMM $XFree86: xc/config/cf/X11.rules,v 1.4 1997/09/09 11:56:20 hohndel Exp $
+XCOMM $XFree86: xc/config/cf/X11.rules,v 1.5 2000/11/06 19:24:00 dawes Exp $
 
 /* Note whether we are the top level project. */
 #ifndef SeenTopLevelProject
@@ -67,14 +67,18 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.4 1997/09/09 11:56:20 hohndel Exp $
 #endif
 #define LdPostLibs	LdPostLib XLdPostLibs
 
-#if ImportX11
-# define TopXInclude	-I$(TOP)/imports/x11/include
-#elif !UseInstalledX11
-# define TopXInclude	-I$(TOP)/exports/include
-#elif defined(X11ProjectRoot)
-# define TopXInclude	-I$(XPROJECTROOT)/include
+#ifndef TopXInclude
+# if ImportX11 
+#  define TopXInclude	-I$(TOP)/imports/x11/include
+# elif !UseInstalledX11
+#  define TopXInclude	-I$(TOP)/exports/include
 #else
-# define TopXInclude	/**/
+#  ifdef X11ProjectRoot
+#   define TopXInclude	-I$(XPROJECTROOT)/include
+#  else
+#   define TopXInclude	/**/
+#  endif
+# endif
 #endif
 #ifdef TopIncludes
 # undef TopIncludes
diff --git a/xc/config/cf/X11.tmpl b/xc/config/cf/X11.tmpl
index 3ade6a7f7..bfaa77f72 100644
--- a/xc/config/cf/X11.tmpl
+++ b/xc/config/cf/X11.tmpl
@@ -5,7 +5,7 @@ XCOMM
 XCOMM
 XCOMM
 XCOMM
-XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.78 2000/10/24 18:07:33 dawes Exp $
+XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.79 2000/11/02 20:39:05 dawes Exp $
 
 /***************************************************************************
  *                                                                         *
@@ -535,6 +535,9 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
 #ifndef MesaSrcDir
 #define MesaSrcDir $(TOP)/extras/Mesa
 #endif
+#ifndef OglSampleSrcDir
+#define OglSampleSrcDir $(TOP)/extras/ogl-sample
+#endif
 #ifndef ShmDefines
 #if HasShm
 #define ShmDefines -DMITSHM
@@ -1195,6 +1198,7 @@ XCOMM X Window System make variables; these need to be coordinated with rules
       FTSOURCEDIR = FreeTypeSrcDir
      XTTSOURCEDIR = XTrueTypeSrcDir
        MESASRCDIR = MesaSrcDir
+  OGLSAMPLESRCDIR = OglSampleSrcDir
         PSWRAPSRC = $(XTOP)/config/pswrap
      TRANSCOMMSRC = $(LIBSRC)/xtrans
    TRANS_INCLUDES = -I$(TRANSCOMMSRC)
diff --git a/xc/config/cf/darwin.cf b/xc/config/cf/darwin.cf
new file mode 100644
index 000000000..f3f507cac
--- /dev/null
+++ b/xc/config/cf/darwin.cf
@@ -0,0 +1,104 @@
+XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.1 2000/11/02 02:51:06 dawes Exp $
+
+/* Darwin / MacOS-X configuration by John Carmack <johnc@idsoftware.com> */
+
+/* imake determines the default values by parsing uname */
+#define OSName                  DefaultOSName
+#define OSMajorVersion          DefaultOSMajorVersion
+#define OSMinorVersion          DefaultOSMinorVersion
+#define OSTeenyVersion          0
+
+#define HasSnprintf             YES
+#define HasPutenv               YES
+#define HasBSD44Sockets         YES
+#define BuildGlxExt             NO
+#ifndef HasShm
+# define HasShm                 YES
+#endif
+
+/*
+ * This enables some settings for developers.
+ */
+#define XFree86Devel            NO
+
+/* we don't need -lm */
+#define MathLibrary             /**/
+
+/* we don't have a termcap library */
+#define TermcapLibrary         /**/
+
+/* we don't have a dbm library */
+#define DBMLibrary             /**/
+
+/* our cpp isn't in /lib/cpp */
+#define CppCmd                  /usr/bin/cpp
+
+/* we have a gcc compatible compiler, but its not called gcc */
+#define CcCmd                   /usr/bin/cc
+
+/* if -c isn't passed, there are problems with the cfb libs when
+ * they include an object file without any symbols
+ */
+#define RanlibCmd               ranlib -c
+
+/* uncommenting this line will get -g instead of -O, which builds
+ * a lot faster and gets debug info
+ */
+#if 0
+#define DefaultCDebugFlags      -g
+#endif
+
+/* default flags to pass to cc */
+#if XFree86Devel
+# define DefaultCCOptions       -Wall -Wpointer-arith -Wstrict-prototypes \
+                                -Wmissing-prototypes -Wmissing-declarations \
+                                -Wredundant-decls -Wnested-externs
+#else
+# define DefaultCCOptions       -Wall -Wpointer-arith
+#endif
+
+/* a lot of xfree86 code needs __powerpc__ to avoid doing outport asm
+ *
+ * __DARWIN__ will be used for platform specific #ifdefs that can't
+ * be handled by existing X defines
+ *
+ * there is an unfortunate symbol collision with the appkit for TIFFFaxBlackCodes
+ *
+ * We need to define BSD44SOCKETS to get unix domain socket namelen calculated right
+ */
+#define StandardDefines         -D__powerpc__ -D__DARWIN__
+
+/* programs/rgb/rgb.h and others needs this */
+#define HasNdbm                 YES
+
+/* set this to NO to just build the client libs, which should work without
+ * having to write any platform specific code.
+ */
+#define BuildServer             YES
+
+/* our custom X server */
+#define XDarwinServer           YES
+
+/* pex? bah.  I'm not going to bother getting the device
+ * dependent part of this working.  If I get the time, i'll
+ * get glx working instead.
+ */
+#define BuildPexExt             NO
+
+/* no direct graphics extension */
+#define BuildXF86DGA            NO
+
+/* no extra tablets and weird input devices */
+#define BuildXInputExt          NO
+
+/* no Display Power Management extension */
+#define BuildDPMSExt            NO
+
+/* no Render extension */
+#define BuildRender             NO
+
+#define BuildXvExt              NO
+
+/* include all the xfree rules */
+/* I haven't tracked down why this is needed, but it is... */
+#include <xfree86.cf>
diff --git a/xc/config/cf/xf86.rules b/xc/config/cf/xf86.rules
index 98c11ac2f..b277d40c6 100644
--- a/xc/config/cf/xf86.rules
+++ b/xc/config/cf/xf86.rules
@@ -1,5 +1,5 @@
 XCOMM $XConsortium: xf86.rules /main/9 1996/10/31 14:54:26 kaleb $
-XCOMM $XFree86: xc/config/cf/xf86.rules,v 3.31 2000/03/31 22:55:15 dawes Exp $
+XCOMM $XFree86: xc/config/cf/xf86.rules,v 3.32 2000/10/30 23:02:06 tsi Exp $
 
 /*
  * These rules are needed to build the XFree86 X Servers
@@ -111,7 +111,10 @@ list: $(ICONFIGFILES)							@@\
 	DRIVERS="drivers"; \						@@\
 	if [ x"$$DRIVERS" != x ]; then \				@@\
 	  for i in $$DRIVERS; do \					@@\
-	    echo $$i/$${i}_drv.o >> list; \				@@\
+	    DRIVER="$$i/*_drv.o"; \					@@\
+	    for j in $$DRIVER; do \					@@\
+	      echo $$j >> list; \					@@\
+	    done; \							@@\
 	  done; \							@@\
 	else \								@@\
 	  echo "" > list; \						@@\
diff --git a/xc/config/cf/xf86site.def b/xc/config/cf/xf86site.def
index e61f074ec..137400d77 100644
--- a/xc/config/cf/xf86site.def
+++ b/xc/config/cf/xf86site.def
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.164 2000/10/24 18:07:34 dawes Exp $
+XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.165 2000/11/02 16:48:05 tsi Exp $
 /******************************************************************************/
 /*
  * This file is to provide a quick method for most people to change the
@@ -254,9 +254,9 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.164 2000/10/24 18:07:34 dawes Exp
 #define XF86CardDrivers		mga glint nv tga s3virge sis rendition \
 				neomagic i740 tdfx \
 				cirrus tseng trident chips apm \
-				GlideDriver fbdev \
-				ati i128 r128 AgpGartDrivers cyrix \
-				vga XF86OSCardDrivers XF86ExtraCardDrivers
+				GlideDriver fbdev i128 \
+				ati AgpGartDrivers DevelDrivers cyrix \
+				vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
  */
 
 /*
diff --git a/xc/config/cf/xfree86.cf b/xc/config/cf/xfree86.cf
index 396efa14b..9f07a6e3e 100644
--- a/xc/config/cf/xfree86.cf
+++ b/xc/config/cf/xfree86.cf
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.318 2000/10/20 14:58:56 alanh Exp $
+XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.324 2000/11/06 19:24:00 dawes Exp $
 /*
  * This configuration file contains all of the configuration
  * information for the XFree86 based X Servers.
@@ -30,6 +30,9 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
 #ifndef XConfigDir
 #define XConfigDir		$(LIBDIR)
 #endif
+#ifndef XLogFile
+#define XLogFile		XFree86
+#endif
 
 /*
  * Default settings for which X Servers to build.
@@ -40,10 +43,10 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
 #if 1
 #define XInputDrivers		mouse digitaledge dynapro elographics \
 				microtouch mutouch spaceorb summa \
-				wacom void
+				wacom void citron
 #else
 #define XInputDrivers		mouse digitaledge dynapro elo2300 \
-				elographics magellan \
+				elographics magellan citron \
 				microtouch mutouch spaceorb summa wacom void
 #endif
 #endif
@@ -174,7 +177,7 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
 				neomagic i740 tdfx \
 				cirrus tseng trident chips apm \
 				GlideDriver fbdev i128 \
-				r128 ati AgpGartDrivers DevelDrivers cyrix \
+				ati AgpGartDrivers DevelDrivers cyrix \
 				vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
 # endif
 #endif
@@ -360,13 +363,13 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
 /* Pure PCI drivers should go first */
 # ifndef XF86CardDrivers
 #  define XF86CardDrivers	mga tdfx glint s3virge rendition tga \
-				r128 DevelDrivers vga \
+				nv DevelDrivers vga \
 				XF86OSCardDrivers XF86ExtraCardDrivers
 # endif
 #endif
 
 /*
- * For Motorola 68k and PPC (currently Linux & LynxOS)
+ * For Motorola 68k and PPC (currently Linux, LynxOS and Net/OpenBSD)
  */
 #if defined(PpcArchitecture) || defined(Mc68020Architecture)
 # ifndef XF86Server
@@ -444,7 +447,7 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
 
 /* Pure PCI drivers should go first */
 # ifndef XF86CardDrivers
-#  define XF86CardDrivers	r128 mga glint s3virge sis \
+#  define XF86CardDrivers	mga glint s3virge sis \
 				trident chips fbdev \
 				DevelDrivers vga \
 				XF86OSCardDrivers XF86ExtraCardDrivers
diff --git a/xc/config/imake/imakemdep.h b/xc/config/imake/imakemdep.h
index a048d07e0..abff45764 100644
--- a/xc/config/imake/imakemdep.h
+++ b/xc/config/imake/imakemdep.h
@@ -20,7 +20,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/config/imake/imakemdep.h,v 3.43 2000/09/19 12:46:04 eich Exp $ */
+/* $XFree86: xc/config/imake/imakemdep.h,v 3.44 2000/11/02 02:51:08 dawes Exp $ */
 
 
 /* 
@@ -227,6 +227,11 @@ in this Software without prior written authorization from The Open Group.
 #define FIXUP_CPP_WHITESPACE
 #endif
 
+#if defined(__APPLE__)
+#define DEFAULT_CPP "/usr/bin/cpp"
+#endif
+
+
 #if defined(Lynx)
 /* On LynxOS 2.4.0 imake gets built with the old "legacy"
  * /bin/cc which has a rather pedantic builtin preprocessor.
@@ -656,6 +661,11 @@ char *cpp_argv[ARGUMENTS] = {
 #if defined(MIPS)
         "-DMIPS",
 #endif
+
+#if defined(__APPLE__)
+        "-D__DARWIN__",
+#endif
+
 #endif
 
 };
@@ -700,6 +710,12 @@ char *cpp_argv[ARGUMENTS] = {
 # define DEFAULT_OS_MINOR_REV	"v %*d.%1s"
 # define DEFAULT_OS_TEENY_REV	"v %*d.%*c%[.0-9]"
 # define DEFAULT_OS_NAME	"srvm %[^\n]"
+#elif defined(__APPLE__)
+/* uname -v returns "x.yz" or "x.y.z", e.g. "2.02" or "2.1.2". */
+# define DEFAULT_OS_MAJOR_REV	"r %[0-9]"
+# define DEFAULT_OS_MINOR_REV	"r %*d.%[0-9]"
+# define DEFAULT_OS_TEENY_REV	"r %*d.%*d.%[0-9]" /* this will just get 0 */
+# define DEFAULT_OS_NAME	"s %[^\n]"
 #elif defined(__osf__)
 /* uname -r returns "Wx.y", e.g. "V3.2" or "T4.0" */
 # define DEFAULT_OS_MAJOR_REV	"r %*[^0-9]%[0-9]"
@@ -1093,6 +1109,17 @@ struct symtab	predefs[] = {
 # ifdef __s390__
 	{"__s390__", "1"},
 # endif
+#if defined(__ppc__)
+        {"__ppc__", "1"},
+#endif
+#if defined(__BIG_ENDIAN__)
+      {"__BIG_ENDIAN__", "1"},
+#endif
+#if defined(__LITTLE_ENDIAN__)
+      {"__LITTLE_ENDIAN__", "1"},
+#endif
+
+
 	/* add any additional symbols before this line */
 	{NULL, NULL}
 };
diff --git a/xc/config/util/xmkmf.cpp b/xc/config/util/xmkmf.cpp
index d32a834d8..20546b916 100644
--- a/xc/config/util/xmkmf.cpp
+++ b/xc/config/util/xmkmf.cpp
@@ -1,5 +1,6 @@
 XCOMM!/bin/sh
 
+XCOMM $XFree86: xc/config/util/xmkmf.cpp,v 1.3 2000/11/06 21:57:10 dawes Exp $
 XCOMM
 XCOMM make a Makefile from an Imakefile from inside or outside the sources
 XCOMM 
@@ -11,13 +12,24 @@ configdirspec=CONFIGDIRSPEC
 topdir=
 curdir=.
 do_all=
+imake_defines=
 
-case "$1" in
--a)
-    do_all="yes"
-    shift
-    ;;
-esac
+while [ $# -gt 0 ]
+do
+    case "$1" in
+    -D*)
+       	imake_defines="$imake_defines $1"
+	shift
+	;;
+    -a)
+	do_all="yes"
+	shift
+	;;
+    *)
+    	break
+	;;
+    esac
+done
 
 case $# in 
     0) ;;
@@ -41,10 +53,10 @@ else
     args="-I$topdir/config/cf -DTOPDIR=$topdir -DCURDIR=$curdir"
 fi
 
-echo imake $args
+echo imake $imake_defines $args
 case "$do_all" in
 yes)
-    imake $args && 
+    imake $imake_defines $args && 
     echo "make Makefiles" &&
     make Makefiles &&
     echo "make includes" &&
@@ -53,6 +65,6 @@ yes)
     make depend
     ;;
 *)
-    imake $args
+    imake $imake_defines $args
     ;;
 esac