Sat Apr 10 02:03:36 PDT 2004

Committed by: gisburn

Update of /cvs/xorg/xc/config/cf
In directory pdx:/tmp/cvs-serv7662/xc/config/cf

Modified Files:
      Tag: XPRINT
	Amoeba.cf DGUX.cf FreeBSD.cf Imake.rules Imake.tmpl Imakefile 
	NetBSD.cf OpenBSD.cf QNX4.cf Server.tmpl X11.tmpl bsdi.cf 
	cygwin.cf darwin.cf gnu.cf linux.cf lnxdoc.rules lnxdoc.tmpl 
	lynx.cf mach.cf minix.cf nto.cf os2.cf sco.cf sco5.cf 
	sequent.cf sgi.cf site.def site.sample svr3.cf svr4.cf 
	xf86.tmpl 
Log Message:
Resync to 2004-04-10 XORG-RELEASE-1 branch

Index: Amoeba.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Amoeba.cf,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1

--- a/Amoeba.cf	4 Mar 2004 17:45:36 -0000	1.1.4.1.6.1
+++ b/Amoeba.cf	10 Apr 2004 09:03:31 -0000	1.1.4.1.6.1.6.1
@@ -186,7 +186,7 @@
 TOOLSET         = ack
 ALDFLAGS        = /* -mam_i80386 now in CCopts */ -.c -Rcv-s32
 
-#include <xfree86.cf>
+#include <xorg.cf>
 #endif
 
 #if defined(Sun3Architecture)

Index: DGUX.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/DGUX.cf,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/DGUX.cf	4 Mar 2004 17:45:36 -0000	1.1.4.1.6.1
+++ b/DGUX.cf	10 Apr 2004 09:03:31 -0000	1.1.4.1.6.1.6.1
@@ -180,7 +180,7 @@
 #endif
 
 #ifdef i386Architecture
-#include <xfree86.cf>
+#include <xorg.cf>
 #endif
 
 #include <sv4Lib.rules>

Index: FreeBSD.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/FreeBSD.cf,v
retrieving revision 1.1.4.5.2.2
retrieving revision 1.1.4.5.2.2.6.1
diff -u -d -r1.1.4.5.2.2 -r1.1.4.5.2.2.6.1
--- a/FreeBSD.cf	4 Mar 2004 17:45:36 -0000	1.1.4.5.2.2
+++ b/FreeBSD.cf	10 Apr 2004 09:03:31 -0000	1.1.4.5.2.2.6.1
@@ -564,4 +564,4 @@
 
 #include <bsdLib.rules>
 
-#include <xfree86.cf>
+#include <xorg.cf>

Index: Imake.rules
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Imake.rules,v
retrieving revision 1.1.4.3.6.2
retrieving revision 1.1.4.3.6.2.4.1
diff -u -d -r1.1.4.3.6.2 -r1.1.4.3.6.2.4.1
--- a/Imake.rules	14 Mar 2004 03:27:09 -0000	1.1.4.3.6.2
+++ b/Imake.rules	10 Apr 2004 09:03:31 -0000	1.1.4.3.6.2.4.1
@@ -557,6 +557,13 @@
 	MakeDir(dir)
 #endif /* InstallDirectory */
 
+#ifndef InstallCreateLink
+# define InstallCreateLink(dest,from,to)				@@\
+install:: $(DESTDIR)dest/from						@@\
+	  cd $(DESTDIR)dest && \					@@\
+	  $(LN) -sf from to
+#endif
+
 #ifndef BuildIncludesTop
 #define BuildIncludesTop(srclist)					@@\
 includes:: srclist							@@\
@@ -1487,6 +1494,7 @@
 #if BuildHtmlManPages
 #define InstallHtmlManPageAliases(file,aliases,suffix)			@@\
 install.man:: file.suffix.html						@@\
+	MakeDir($(DESTDIR)$(DOCHTMLDIR))				@@\
 	@SUF=`expr suffix \: '\(.\)'`; \				@@\
 	for i in aliases; do (set -x; \					@@\
 	  RemoveFile($(DESTDIR)$(DOCHTMLDIR)/$$i.$$SUF.html); \		@@\
@@ -1502,6 +1510,7 @@
 #if BuildHtmlManPages
 #define HtmlManIndex							@@\
 html_index::								@@\
+	MakeDir($(DESTDIR)$(DOCHTMLDIR))				@@\
 	$(HTMLINDEXCMD) $(DESTDIR)$(DOCHTMLDIR)
 #else
 #define HtmlManIndex	html_index::

Index: Imake.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Imake.tmpl,v
retrieving revision 1.1.4.6.2.1
retrieving revision 1.1.4.6.2.1.6.1
diff -u -d -r1.1.4.6.2.1 -r1.1.4.6.2.1.6.1
--- a/Imake.tmpl	4 Mar 2004 17:45:37 -0000	1.1.4.6.2.1
+++ b/Imake.tmpl	10 Apr 2004 09:03:31 -0000	1.1.4.6.2.1.6.1
@@ -894,6 +894,9 @@
 #ifndef AppLoadDefs
 #define AppLoadDefs -D__apploaddir__=$(XAPPLOADDIR)
 #endif
+#ifndef AppManDefs
+#define AppManDefs -D__appmansuffix__=$(MANSUFFIX)
+#endif
 #ifndef LibManDefs
 #define LibManDefs -D__libmansuffix__=$(LIBMANSUFFIX)
 #endif
@@ -912,6 +915,18 @@
 #ifndef ProjectManDefs
 #define ProjectManDefs -D__projectroot__=$(PROJECTROOT)
 #endif
+#ifndef XConfigFileManDefs
+#define XConfigFileManDefs -D__xconfigfile__=$(XCONFIGFILE)
+#endif
+#ifndef XConfigDirManDefs
+#define XConfigDirManDefs -D__xconfigdir__=$(XCONFIGDIR)
+#endif
+#ifndef XLogFileManDefs
+#define XLogFileManDefs -D__xlogfile__=$(XLOGFILE)
+#endif
+#ifndef XServerManDefs
+#define XServerManDefs -D__xservername__=$(XSERVERNAME)
+#endif
 
 #ifndef CompressManCmd
 #define CompressManCmd gzip -n
@@ -1818,7 +1833,7 @@
    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 AdminManDefs ProjectManDefs $(XORGMANDEFS) $(VENDORMANDEFS)
+          MANDEFS = AppLoadDefs AppManDefs FileManDefs LibManDefs MiscManDefs DriverManDefs AdminManDefs ProjectManDefs XConfigFileManDefs XConfigDirManDefs XLogFileManDefs XServerManDefs $(XORGMANDEFS) $(VENDORMANDEFS)
 
    COMPRESSMANCMD = CompressManCmd
 
@@ -2000,7 +2015,7 @@
  * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile
  */
       ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
-       ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
+       ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) $(VENDOR_DEFINES)
            CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
         LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
          LDPRELIB = LdPreLib $(INSTALLED_LIBS)
@@ -2111,6 +2126,7 @@
        LDPOSTLIBS = LdPostLibs
      TOP_INCLUDES = TopIncludes
   PROJECT_DEFINES = ProjectDefines
+   VENDOR_DEFINES = VendorDefines
 #if HasCplusplus
 CXXPROJECT_DEFINES = CplusplusProjectDefines
 #endif

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Imakefile,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/Imakefile	4 Mar 2004 17:45:37 -0000	1.1.4.1.6.1
+++ b/Imakefile	10 Apr 2004 09:03:31 -0000	1.1.4.1.6.1.6.1
@@ -17,6 +17,7 @@
 
 DEFFILES = \
 xf86site.def \
+xorgsite.def \
 date.def \
 version.def \
 $(HOSTDEFFILES) \
@@ -77,7 +78,8 @@
 sunLib.tmpl \
 sv3Lib.tmpl \
 sv4Lib.tmpl \
-xf86.tmpl
+xf86.tmpl \
+xorg.tmpl
 
 CFFILES = \
 Imake.cf \
@@ -127,7 +129,8 @@
 x386.cf \
 QNX4.cf \
 darwin.cf \
-xfree86.cf
+xfree86.cf \
+xorg.cf
 
 INSTFILES = $(RULEFILES) $(TMPLFILES) $(DEFFILES) $(CFFILES) $(LOCALFILES)
 
@@ -148,7 +151,7 @@
 		$(DESTDIR)$(CONFIGDIR)/host.def; \
 	RemoveFile($${TMP}))
 
-#ifdef XFree86Version
+#if defined(XFree86Version) || defined(XorgVersion)
 install.sdk::
 	@(TMP=/tmp/tmp.$$$$; \
 	RemoveFile($${TMP}); \

Index: NetBSD.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/NetBSD.cf,v
retrieving revision 1.1.4.3.6.1
retrieving revision 1.1.4.3.6.1.6.1
diff -u -d -r1.1.4.3.6.1 -r1.1.4.3.6.1.6.1
--- a/NetBSD.cf	4 Mar 2004 17:45:37 -0000	1.1.4.3.6.1
+++ b/NetBSD.cf	10 Apr 2004 09:03:31 -0000	1.1.4.3.6.1.6.1
@@ -586,7 +586,7 @@
 #endif
 
 #if defined(i386Architecture) || defined(Arm32Architecture) || defined(AlphaArchitecture) || defined(PpcArchitecture)
-# include <xfree86.cf>
+# include <xorg.cf>
 #endif
 
 /*
@@ -618,7 +618,7 @@
 #define BuildXF86VidModeExt	NO
 #define BuildXF86DGA		NO
 #define BuildXInputExt		NO
-#include <xfree86.cf>
+#include <xorg.cf>
 #endif
 
 /*

Index: OpenBSD.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/OpenBSD.cf,v
retrieving revision 1.1.4.3.2.1
retrieving revision 1.1.4.3.2.1.6.1
diff -u -d -r1.1.4.3.2.1 -r1.1.4.3.2.1.6.1
--- a/OpenBSD.cf	4 Mar 2004 17:45:37 -0000	1.1.4.3.2.1
+++ b/OpenBSD.cf	10 Apr 2004 09:03:31 -0000	1.1.4.3.2.1.6.1
@@ -402,16 +402,16 @@
 #  define SharedLibXThrStub	NO
 # endif
 
-# ifndef XF86Server
+# ifndef XorgServer
 #  if OSMajorVersion == 3 && OSMinorVersion >= 2 || OSMajorVersion > 3
-#    define XF86Server		YES
+#    define XorgServer		YES
 #  else
-#    define XF86Server		NO
+#    define XorgServer		NO
 #  endif
 # endif
 
 /* Definitions for building the XFree86 server */
-# if XF86Server
+# if XorgServer
 #   ifndef HasNetBSDApertureDriver
 #     define HasNetBSDApertureDriver	YES
 #   endif
@@ -427,9 +427,9 @@
 #   endif
 #   define UseMatroxHal		NO	/* Matrox HAL is i386 only */
 
-# endif /* XF86Server */
+# endif /* XorgServer */
 
-# include <xfree86.cf>
+# include <xorg.cf>
 
 #endif /* AlphaArchitecture */
 
@@ -522,7 +522,7 @@
 #  define HasX86Support		UseElfFormat
 # endif
 
-# include <xfree86.cf>
+# include <xorg.cf>
 
 #endif /* i386Architecture */
 
@@ -559,7 +559,7 @@
 
 # define ServerExtraDefines	-DXFree86Server
 
-# include <xfree86.cf>
+# include <xorg.cf>
 
 #endif /* AmigaArchitecture */
 
@@ -580,7 +580,7 @@
 
 # define ServerExtraDefines	-DXFree86Server
 
-#include <xfree86.cf>
+#include <xorg.cf>
 
 #endif /* Hp300Architecture */
 
@@ -596,7 +596,7 @@
 
 # define ServerExtraDefines	-DXFree86Server
 
-# include <xfree86.cf>
+# include <xorg.cf>
 
 #endif /* mac68kArchitecture */
 
@@ -612,7 +612,7 @@
 
 # define ServerExtraDefines	-DXFree86Server
 
-# include <xfree86.cf>
+# include <xorg.cf>
 
 #endif /* Mvme68kArchitecture */
 
@@ -672,7 +672,7 @@
 #    define XFree86ConsoleDefines -DPCCONS_SUPPORT
 #  endif
 
-# include <xfree86.cf>
+# include <xorg.cf>
 
 #endif /* ArcArchitecture */
 
@@ -716,12 +716,12 @@
 #  endif
 # endif
 
-# ifndef XF86Server
-#   define XF86Server		YES
+# ifndef XorgServer
+#   define XorgServer		YES
 # endif
 
 /* Definitions for building the X server */
-# if XF86Server
+# if XorgServer
 #   define ServerOSDefines	XFree86ServerOSDefines \
 				-DDDXTIME -DDDXOSINIT
 #   define ServerExtraDefines	GccGasOption XFree86ServerDefines
@@ -743,9 +743,9 @@
 #     define UsbMouseSupport		YES
 #   endif
 
-# endif /* XF86Server */
+# endif /* XorgServer */
 
-# include <xfree86.cf>
+# include <xorg.cf>
 
 #endif /* PpcArchitecture */
 
@@ -792,7 +792,7 @@
 # define BuildXF86VidModeExt	NO
 # define BuildXF86DGA		NO
 # define BuildXInputExt		NO
-# include <xfree86.cf>
+# include <xorg.cf>
 
 #endif /* SparcArchitecture */
 
@@ -806,8 +806,8 @@
 #  define HasWeakSymbols	YES
 # endif
 
-# ifndef XF86Server
-#  define XF86Server		YES
+# ifndef XorgServer
+#  define XorgServer		YES
 # endif
 
 # define ServerExtraDefines	GccGasOption -D_XSERVER64 XFree86ServerDefines
@@ -815,14 +815,14 @@
 				-DDDXTIME -DDDXOSINIT
 # define XkbServerDefines	-DXKB_ALWAYS_USES_SOFT_REPEAT
 
-# if XF86Server
+# if XorgServer
 #   ifndef DoLoadableServer
 #     define DoLoadableServer	NO
 #   endif
 #   define XFree86ConsoleDefines -DWSCONS_SUPPORT
 # endif
 
-# include <xfree86.cf>
+# include <xorg.cf>
 
 #endif /* Sparc64Architecture */
 
@@ -849,7 +849,7 @@
 # define BuildGlxExt		NO
 # define BuildGLXLibrary	NO
 
-# include <xfree86.cf>
+# include <xorg.cf>
 
 #endif /* VaxArchitecture */
  

Index: QNX4.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/QNX4.cf,v
retrieving revision 1.1.10.1
retrieving revision 1.1.10.1.6.1
diff -u -d -r1.1.10.1 -r1.1.10.1.6.1
--- a/QNX4.cf	4 Mar 2004 17:45:37 -0000	1.1.10.1
+++ b/QNX4.cf	10 Apr 2004 09:03:31 -0000	1.1.10.1.6.1
@@ -90,5 +90,5 @@
 #define ExtraFilesToClean       *.err *.map 
 
 #include <QNX4.rules>
-#include <xfree86.cf>
+#include <xorg.cf>
 

Index: Server.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Server.tmpl,v
retrieving revision 1.1.4.2.6.1
retrieving revision 1.1.4.2.6.1.6.1
diff -u -d -r1.1.4.2.6.1 -r1.1.4.2.6.1.6.1
--- a/Server.tmpl	4 Mar 2004 17:45:37 -0000	1.1.4.2.6.1
+++ b/Server.tmpl	10 Apr 2004 09:03:31 -0000	1.1.4.2.6.1.6.1
@@ -73,3 +73,7 @@
 #ifdef XFree86Version
 #include <xf86.tmpl>
 #endif
+
+#ifdef XorgVersion
+#include <xorg.tmpl>
+#endif

Index: X11.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/X11.tmpl,v
retrieving revision 1.1.4.7.2.7
retrieving revision 1.1.4.7.2.7.4.1
diff -u -d -r1.1.4.7.2.7 -r1.1.4.7.2.7.4.1
--- a/X11.tmpl	14 Mar 2004 03:27:09 -0000	1.1.4.7.2.7
+++ b/X11.tmpl	10 Apr 2004 09:03:31 -0000	1.1.4.7.2.7.4.1
@@ -42,15 +42,28 @@
 
 /* X.Org release string */
 #ifndef XOrgReleaseString
-#define XOrgReleaseString	Release 6.6
+# if defined XorgVersionString
+#   define XOrgReleaseString	Release XorgVersionString
+# else
+#   define XOrgReleaseString	Release 6.7
+# endif
 #endif
 
 #ifndef XOrgManNameString
 #define XOrgManNameString	X Version 11
 #endif
-
-XORGRELSTRING = XOrgReleaseString
-XORGMANNAME = XOrgManNameString
+#ifndef XOrgNameString
+# define XOrgNameString   The X.Org Foundation
+#endif
+#ifndef XOrgNameStringShort
+# define XOrgNameStringShort   X.Org
+#endif
+#ifndef XOrgStdFilePrefix
+# define XOrgStdFilePrefix     xorg
+#endif
+#ifndef XOrgWebSupportAddress
+# define XOrgWebSupportAddress http://wiki.X.Org
+#endif
 
 #ifndef XOrgManDefs
 #define XOrgManDefs -D__xorgversion__='"$(XORGRELSTRING)" "$(XORGMANNAME)"'
@@ -62,14 +75,32 @@
 #ifndef XVendorManVersionString
 #define XVendorManVersionString XOrgReleaseString
 #endif
-
-VENDORMANNAME = XVendorManNameString
-VENDORMANVERSION = XVendorManVersionString
+#ifndef XVendorNameString
+# define XVendorNameString XOrgNameString
+#endif
+#ifndef XVendorNameStringShort
+# define XVendorNameStringShort XOrgNameStringShort
+#endif
+#ifndef XVendorWebSupport
+# define XVendorWebSupport XOrgWebSupportAddress
+#endif
+#ifndef XVendorStdFilePrefix
+# define XVendorStdFilePrefix XOrgStdFilePrefix
+#endif
 
 #ifndef VendorManDefs
 #define VendorManDefs -D__vendorversion__="$(VENDORMANVERSION) $(VENDORMANNAME)"
 #endif
 
+#ifndef VendorDefines
+#define VendorDefines -DXVENDORNAME='"$(VENDORNAME)"' -DXVENDORNAMESHORT='"$(VENDORNAMESHORT)"'
+#endif
+
+#ifndef VendorSupportDefines
+# if defined XVendorWebSupport
+#  define VendorSupportDefines -D__VENDORDWEBSUPPORT__='"$(VENDORWEBSUPPORT)"'
+# endif
+#endif
 /*
  * X-specific things
  */
@@ -334,7 +365,7 @@
 #define BuildDPMS		YES
 #endif
 #ifndef BuildFontLib
-#if !defined(XF86Server) || !XF86Server
+#if (!defined(XF86Server) || !XF86Server) && (!defined (XorgServer) || !XorgServer)
 #define BuildFontLib		(BuildLibraries || BuildServer)
 #else
 #define BuildFontLib		(BuildLibraries || \
@@ -489,7 +520,7 @@
 #ifndef BuildGlxExt
 #define BuildGlxExt		NO
 #else
-#if     BuildGlxExt && !defined(XFree86Version)
+#if     BuildGlxExt && !defined(XFree86Version) && !defined(XorgVersion)
 #undef  BuildXF86DRI
 #undef  BuildXF86DRM
 #undef  BuildXF86DRIDriverSupport
@@ -930,6 +961,12 @@
 #ifndef XkbServerDefines
 #define XkbServerDefines /**/
 #endif
+#ifndef XkbDefRulesDefines
+#define XkbDefRulesDefines  -D__XKBDEFRULES__='"$(XKBDEFRULES)"'
+#endif
+# ifndef XkbDefaultRulesFile
+# define XkbDefaultRulesFile  XVendorStdFilePrefix
+#endif
 #ifndef LbxDefines
 #if BuildLBX
 #define LbxDefines -DLBX
@@ -1645,9 +1682,25 @@
 #ifdef X11ProjectRoot
      XPROJECTROOT = X11ProjectRoot
 #endif
-
+    VENDORMANNAME = XVendorManNameString
+ VENDORMANVERSION = XVendorManVersionString
       XORGMANDEFS = XOrgManDefs
     VENDORMANDEFS = VendorManDefs
+       VENDORNAME = XVendorNameString
+  VENDORNAMESHORT = XVendorNameStringShort
+
+#if defined (XVendorWebSupport)
+ VENDORWEBSUPPORT = XVendorWebSupport
+#endif
+VENDORSUPPORTDEFS = VendorSupportDefines
+
+      XKBDEFRULES = XkbDefaultRulesFile
+  XKBDEFRULESDEFS = XkbDefRulesDefines
+  
+     XCONFIGFILE = XConfigFile
+      XCONFIGDIR = XConfigDir
+        XLOGFILE = XLogFile
+     XSERVERNAME = XServerName
 
 #if HasSharedLibraries
 #ifndef DontUseLibPathVar
@@ -2066,27 +2119,27 @@
 #endif
 
 #if BuildRandRLibrary
-#ifndef SharedLibXrandr
-#define SharedLibXrandr		HasSharedLibraries
-#endif
-#ifndef NormalLibXrandr
-#define NormalLibXrandr		(!SharedLibXrandr || ForceNormalLib)
-#endif
-#ifndef DebugLibXrandr
-#define DebugLibXrandr		NO
-#endif
-#ifndef ProfileLibXrandr
-#define ProfileLibXrandr	NO
-#endif
+# ifndef SharedLibXrandr
+#  define SharedLibXrandr		HasSharedLibraries
+# endif
+# ifndef NormalLibXrandr
+#  define NormalLibXrandr		(!SharedLibXrandr || ForceNormalLib)
+# endif
+# ifndef DebugLibXrandr
+#  define DebugLibXrandr	NO
+# endif
+# ifndef ProfileLibXrandr
+#  define ProfileLibXrandr	NO
+# endif
 #else
-#undef  SharedLibXrandr
-#define SharedLibXrandr		NO
-#undef  NormalLibXrandr
-#define NormalLibXrandr		NO
-#undef  DebugLibXrandr
-#define DebugLibXrandr		NO
-#undef  ProfileLibXrandr
-#define ProfileLibXrandr	NO
+# undef  SharedLibXrandr
+# define SharedLibXrandr	NO
+# undef  NormalLibXrandr
+# define NormalLibXrandr	NO
+# undef  DebugLibXrandr
+# define DebugLibXrandr		NO
+# undef  ProfileLibXrandr
+# define ProfileLibXrandr	NO
 #endif
 
 #if BuildXcursorLibrary
@@ -3232,7 +3285,7 @@
           XFTLIBSRC = $(LIBSRC)/Xft
 #if SharedLibXft
 #ifndef SharedXftRev
-#define SharedXftRev 2.1.1
+#define SharedXftRev 2.1.2
 #endif
 SharedLibReferences(XFT,Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev)
 #else

Index: bsdi.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/bsdi.cf,v
retrieving revision 1.1.4.3.2.1
retrieving revision 1.1.4.3.2.1.6.1
diff -u -d -r1.1.4.3.2.1 -r1.1.4.3.2.1.6.1
--- a/bsdi.cf	4 Mar 2004 17:45:37 -0000	1.1.4.3.2.1
+++ b/bsdi.cf	10 Apr 2004 09:03:31 -0000	1.1.4.3.2.1.6.1
@@ -327,7 +327,7 @@
 #ifdef i386Architecture
 #define i386Bsd 1
 #define i386Bsdi 1
-#include <xfree86.cf>
+#include <xorg.cf>
 #endif
 
 #ifdef SparcArchitecture

Index: cygwin.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/cygwin.cf,v
retrieving revision 1.1.4.2.2.1
retrieving revision 1.1.4.2.2.1.6.1
diff -u -d -r1.1.4.2.2.1 -r1.1.4.2.2.1.6.1
--- a/cygwin.cf	4 Mar 2004 17:45:37 -0000	1.1.4.2.2.1
+++ b/cygwin.cf	10 Apr 2004 09:03:31 -0000	1.1.4.2.2.1.6.1
@@ -341,6 +341,11 @@
 #define XF86Server		NO
 
 /*
+ * Don't build the Xorg server
+ */
+#define XorgServer		NO
+
+/*
  * Try to avoid building anything related to graphics cards
  */
 #define XFShadowFB		NO
@@ -400,4 +405,4 @@
 	  case "$$flag" in *=*) ;;--*) ;; *[makeflags]*) shellcmd;; esac; done
 
 #include <cygwin.rules>
-#include <xfree86.cf>
+#include <xorg.cf>

Index: darwin.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/darwin.cf,v
retrieving revision 1.1.4.3.2.1
retrieving revision 1.1.4.3.2.1.6.1
diff -u -d -r1.1.4.3.2.1 -r1.1.4.3.2.1.6.1
--- a/darwin.cf	4 Mar 2004 17:45:37 -0000	1.1.4.3.2.1
+++ b/darwin.cf	10 Apr 2004 09:03:31 -0000	1.1.4.3.2.1.6.1
@@ -303,5 +303,5 @@
 #endif
 
 /* include all the XFree86 rules */
-#include <xfree86.cf>
+#include <xorg.cf>
 

Index: gnu.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/gnu.cf,v
retrieving revision 1.1.4.2.2.1
retrieving revision 1.1.4.2.2.1.6.1
diff -u -d -r1.1.4.2.2.1 -r1.1.4.2.2.1.6.1
--- a/gnu.cf	4 Mar 2004 17:45:37 -0000	1.1.4.2.2.1
+++ b/gnu.cf	10 Apr 2004 09:03:31 -0000	1.1.4.2.2.1.6.1
@@ -181,5 +181,5 @@
 XCOMM XXX Might need this if they are not careful with slashes.
 XCOMM #define DirFailPrefix -
 
-#include <xfree86.cf>
+#include <xorg.cf>
 

Index: linux.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/linux.cf,v
retrieving revision 1.1.4.5.2.5
retrieving revision 1.1.4.5.2.5.4.1
diff -u -d -r1.1.4.5.2.5 -r1.1.4.5.2.5.4.1
--- a/linux.cf	15 Mar 2004 15:37:38 -0000	1.1.4.5.2.5
+++ b/linux.cf	10 Apr 2004 09:03:31 -0000	1.1.4.5.2.5.4.1
@@ -998,7 +998,7 @@
 #endif
 
 #include <lnxLib.rules>
-# include <xfree86.cf>
+# include <xorg.cf>
 
 #ifndef XFree86ServerOSDefines
 # define XFree86ServerOSDefines

Index: lnxdoc.rules
===================================================================
RCS file: /cvs/xorg/xc/config/cf/lnxdoc.rules,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/lnxdoc.rules	4 Mar 2004 17:45:37 -0000	1.1.4.1.6.1
+++ b/lnxdoc.rules	10 Apr 2004 09:03:31 -0000	1.1.4.1.6.1.6.1
@@ -59,7 +59,7 @@
 	  set -x;\							@@\
 	  RemoveFile($$BASE.latin1);\					@@\
 	  $(SGMLFMTCMD) -f latin1 -b -n sgmlfile && \			@@\
-	  $(XFREE86IDENTFIX) < $$BASE.latin1 > _$@ && $(MV) _$@ $@ && \	@@\
+	  $(CVSIDENTFIX) < $$BASE.latin1 | $(XFREE86IDENTFIX) > _$@ && $(MV) _$@ $@ && \	@@\
 	  RemoveFile($$BASE.latin1))					@@\
 									@@\
 LinuxDocInstall(textfile,$(XFREE86DOCDIR))				@@\

Index: lnxdoc.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/lnxdoc.tmpl,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/lnxdoc.tmpl	4 Mar 2004 17:45:37 -0000	1.1.4.1.6.1
+++ b/lnxdoc.tmpl	10 Apr 2004 09:03:31 -0000	1.1.4.1.6.1.6.1
@@ -18,6 +18,11 @@
 			      -e '/\$$\XFree86:/s/\$$/Generated from /'
 #endif
 
+#ifndef CVSIdentFix
+#define CVSIdentFix	  sed -e '/\$$\Id:/s/....\/..\/.. ..:..:.. *//' \
+			      -e '/\$$\Id:/s/\$$/Generated from /'
+#endif
+
 #ifndef HasLatex
 #define HasLatex	  NO
 #endif
@@ -60,6 +65,7 @@
 
 
   XFREE86IDENTFIX = XFree86IdentFix
+      CVSIDENTFIX = CVSIdentFix
             DVIPS = DvipsCmd
      DVIPSOPTIONS = DvipsOptions
        SGMLFMTCMD = SgmlFmtCmd

Index: lynx.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/lynx.cf,v
retrieving revision 1.1.4.3.2.1
retrieving revision 1.1.4.3.2.1.6.1
diff -u -d -r1.1.4.3.2.1 -r1.1.4.3.2.1.6.1
--- a/lynx.cf	4 Mar 2004 17:45:37 -0000	1.1.4.3.2.1
+++ b/lynx.cf	10 Apr 2004 09:03:31 -0000	1.1.4.3.2.1.6.1
@@ -399,4 +399,4 @@
 #include <lynxLib.rules>
 #endif
 
-#include <xfree86.cf>
+#include <xorg.cf>

Index: mach.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/mach.cf,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/mach.cf	4 Mar 2004 17:45:37 -0000	1.1.4.1.6.1
+++ b/mach.cf	10 Apr 2004 09:03:31 -0000	1.1.4.1.6.1.6.1
@@ -68,5 +68,5 @@
 #endif
 
 #ifdef i386Architecture
-# include <xfree86.cf>
+# include <xorg.cf>
 #endif

Index: minix.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/minix.cf,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/minix.cf	4 Mar 2004 17:45:37 -0000	1.1.4.1.6.1
+++ b/minix.cf	10 Apr 2004 09:03:31 -0000	1.1.4.1.6.1.6.1
@@ -61,4 +61,4 @@
 	$(RM) $*.i.s
 #endif
 
-#include <xfree86.cf>
+#include <xorg.cf>

Index: nto.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/nto.cf,v
retrieving revision 1.1.10.1
retrieving revision 1.1.10.1.6.1
diff -u -d -r1.1.10.1 -r1.1.10.1.6.1
--- a/nto.cf	4 Mar 2004 17:45:37 -0000	1.1.10.1
+++ b/nto.cf	10 Apr 2004 09:03:31 -0000	1.1.10.1.6.1
@@ -144,5 +144,5 @@
 #define ExtraFilesToClean       *.err *.map 
 
 #include <nto.rules>
-#include <xfree86.cf>
+#include <xorg.cf>
 

Index: os2.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/os2.cf,v
retrieving revision 1.1.4.2.6.1
retrieving revision 1.1.4.2.6.1.6.1
diff -u -d -r1.1.4.2.6.1 -r1.1.4.2.6.1.6.1
--- a/os2.cf	4 Mar 2004 17:45:37 -0000	1.1.4.2.6.1
+++ b/os2.cf	10 Apr 2004 09:03:31 -0000	1.1.4.2.6.1.6.1
@@ -208,6 +208,6 @@
 #include <os2.rules>
 #include <os2Lib.rules>
 
-# include <xfree86.cf>
+# include <xorg.cf>
 
 	

Index: sco.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/sco.cf,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/sco.cf	4 Mar 2004 17:45:37 -0000	1.1.4.1.6.1
+++ b/sco.cf	10 Apr 2004 09:03:31 -0000	1.1.4.1.6.1.6.1
@@ -201,6 +201,6 @@
 #endif /* SCO 3.2.4 and SCO 3.2.2 section */
 
 #ifdef i386Architecture
-#include <xfree86.cf>
+#include <xorg.cf>
 #endif
 

Index: sco5.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/sco5.cf,v
retrieving revision 1.1.4.3.2.1
retrieving revision 1.1.4.3.2.1.6.1
diff -u -d -r1.1.4.3.2.1 -r1.1.4.3.2.1.6.1
--- a/sco5.cf	4 Mar 2004 17:45:37 -0000	1.1.4.3.2.1
+++ b/sco5.cf	10 Apr 2004 09:03:31 -0000	1.1.4.3.2.1.6.1
@@ -267,4 +267,4 @@
 #include <scoLib.rules>  /* minor changes to sv4Lib.rules */
 #include <sv4Lib.rules>
 
-#include <xfree86.cf>
+#include <xorg.cf>

Index: sequent.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/sequent.cf,v
retrieving revision 1.1
retrieving revision 1.1.20.1
diff -u -d -r1.1 -r1.1.20.1
--- a/sequent.cf	14 Nov 2003 15:54:29 -0000	1.1
+++ b/sequent.cf	10 Apr 2004 09:03:31 -0000	1.1.20.1
@@ -169,7 +169,7 @@
 #define BuildXF86MiscExt	NO	/* turn off the server portion */
 #define BuildXF86VidModeExt	NO	/* turn off the server portion */
 #define BuildXInputExt		YES
-#define BuildXKBuilib		YES	/* override NO set in xfree86.cf */
+#define BuildXKBuilib		YES	/* override NO set in xorg.cf */
 #define ConnectionFlags		-DTCPCONN
 #define DefaultSystemPath	/bin:/etc:/usr/bin:$(BINDIR)
 #define DefaultUserPath		:/bin:/usr/bin:$(BINDIR)
@@ -443,6 +443,6 @@
 #endif /* UseHidesymsLists */
 
 #if OSMajorVersion >= 4
-#include <xfree86.cf>
+#include <xorg.cf>
 #include <sequentLib.rules>	/* include after macros, before Motif.rules */
 #endif /* OSMajorVersion >= 4 */

Index: sgi.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/sgi.cf,v
retrieving revision 1.1.4.2.6.1
retrieving revision 1.1.4.2.6.1.6.1
diff -u -d -r1.1.4.2.6.1 -r1.1.4.2.6.1.6.1
--- a/sgi.cf	4 Mar 2004 17:45:37 -0000	1.1.4.2.6.1
+++ b/sgi.cf	10 Apr 2004 09:03:31 -0000	1.1.4.2.6.1.6.1
@@ -316,4 +316,4 @@
 #define DoLoadableServer YES
 #endif
 
-#include <xfree86.cf>
+#include <xorg.cf>

Index: site.def
===================================================================
RCS file: /cvs/xorg/xc/config/cf/site.def,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/site.def	4 Mar 2004 17:45:37 -0000	1.1.4.1.6.1
+++ b/site.def	10 Apr 2004 09:03:31 -0000	1.1.4.1.6.1.6.1
@@ -38,12 +38,12 @@
  * Include this for easy XFree86 customisations
  */
 #ifndef SiteIConfigFiles
-#define SiteIConfigFiles $(IRULESRC)/xf86site.def $(IRULESRC)/host.def
+#define SiteIConfigFiles $(IRULESRC)/xorgsite.def $(IRULESRC)/host.def
 #endif
 
 #include <host.def>
 
-#include <xf86site.def>
+#include <xorgsite.def>
 
 /* On systems where cpp doesn't correctly expand macros in include directives
  * the two following macros need to be defined directly (where "X11" is
@@ -138,7 +138,7 @@
 /* You MAY need SetUID if users run the server by hand or under xinit */
 /* Consult your system administrator before making the X server setuid */
 /*
-#ifdef XFree86Version
+#if defined(XFree86Version) || defined (XorgVersion)
 #define InstallXserverSetUID YES
 #endif
 */

Index: site.sample
===================================================================
RCS file: /cvs/xorg/xc/config/cf/site.sample,v
retrieving revision 1.1
retrieving revision 1.1.20.1
diff -u -d -r1.1 -r1.1.20.1
--- a/site.sample	14 Nov 2003 15:54:29 -0000	1.1
+++ b/site.sample	10 Apr 2004 09:03:31 -0000	1.1.20.1
@@ -60,7 +60,7 @@
 
 #ifdef AfterVendorCF
 
-#define ProjectRoot /usr/X11R6.4
+#define ProjectRoot Concat(/usr/X11R,XORG_VERSION_MAJOR.XORG_VERSION_MINOR)
 
 /* Only set HasXdmAuth to YES if you have a Wraphelp.c file. */
 /* #define HasXdmAuth YES */
@@ -109,7 +109,7 @@
 /* You MAY need SetUID if users run the server by hand or under xinit */
 /* Consult your system administrator before making the X server setuid */
 /*
-#ifdef XFree86Version
+#if defined(XFree86Version) || defined(XorgVersion)
 #define InstallXserverSetUID YES
 #endif
 */

Index: svr3.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/svr3.cf,v
retrieving revision 1.1.4.2.2.1
retrieving revision 1.1.4.2.2.1.6.1
diff -u -d -r1.1.4.2.2.1 -r1.1.4.2.2.1.6.1
--- a/svr3.cf	4 Mar 2004 17:45:37 -0000	1.1.4.2.2.1
+++ b/svr3.cf	10 Apr 2004 09:03:31 -0000	1.1.4.2.2.1.6.1
@@ -343,6 +343,6 @@
 #include <sv3Lib.rules>
 
 #ifdef i386Architecture
-#include <xfree86.cf>
+#include <xorg.cf>
 #endif
 

Index: svr4.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/svr4.cf,v
retrieving revision 1.1.4.3.2.1
retrieving revision 1.1.4.3.2.1.6.1
diff -u -d -r1.1.4.3.2.1 -r1.1.4.3.2.1.6.1
--- a/svr4.cf	4 Mar 2004 17:45:37 -0000	1.1.4.3.2.1
+++ b/svr4.cf	10 Apr 2004 09:03:31 -0000	1.1.4.3.2.1.6.1
@@ -265,7 +265,7 @@
 #ifndef DoLoadableServer
 #define DoLoadableServer	YES
 #endif
-#include <xfree86.cf>
+#include <xorg.cf>
 #endif
 
 #ifndef DoLoadableServer

Index: xf86.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/xf86.tmpl,v
retrieving revision 1.1.4.2.2.2
retrieving revision 1.1.4.2.2.2.4.1
diff -u -d -r1.1.4.2.2.2 -r1.1.4.2.2.2.4.1
--- a/xf86.tmpl	15 Mar 2004 16:02:03 -0000	1.1.4.2.2.2
+++ b/xf86.tmpl	10 Apr 2004 09:03:31 -0000	1.1.4.2.2.2.4.1
@@ -7,7 +7,7 @@
 #ifdef BuilderEMailAddr
 BUILDERADDR = BuilderEMailAddr
 #else 
-BUILDERADDR = "xfree86 at xfree86.org"
+BUILDERADDR = "xorg at freedesktop.org"
 #endif
 BUGMSG = -DBUILDERADDR='$(BUILDERADDR)'
 


