Thu Apr 15 03:13:17 PDT 2004

Committed by: eich

Update of /cvs/xorg/xc/config/cf
In directory pdx:/home/eich/tstbuild/xc/config/cf

Modified Files:
      Tag: XORG-CURRENT
	Amoeba.cf DGUX.cf FreeBSD.cf Imake.rules Imake.tmpl Imakefile 
	Library.tmpl NetBSD.cf OpenBSD.cf QNX4.cf Server.tmpl X11.tmpl 
	bsdi.cf cygwin.cf darwin.cf gnu.cf gnuLib.rules linux.cf 
	lnxLib.rules 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 sun.cf sunLib.tmpl svr3.cf svr4.cf 
Added Files:
      Tag: XORG-CURRENT
	xorg.cf xorg.tmpl xorgsite.def 
Removed Files:
      Tag: XORG-CURRENT
	TinyX.cf iPAQH3600.cf itsy.cf kdrive.cf 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch

--- NEW FILE: xorg.cf ---
XCOMM $XdotOrg: xc/config/cf/xorg.cf,v 1.1.10.1 2004/04/15 10:13:10 eich Exp $
/*
 * This configuration file contains all of the configuration
 * information for the Xorg based X Servers.
 *
 * Most of these settings can be overridden in a vendor.cf or the
 * BeforeVendor part of the site.def file.
 */
XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $

/* Get and set version information. */

#include "date.def"

#define XORG_VERSION_MAJOR  6
#define XORG_VERSION_MINOR  7
#define XORG_VERSION_PATCH  0
#define XORG_VERSION_SNAP   0

[...1988 lines suppressed...]
  || defined (AlphaArchitecture) \
  || defined (ia64Architecture) \
  || defined (PpcArchitecture) \
  || defined (SparcArchitecture) \
  || defined (s390xArchitecture) 
#  define StaticNeedsPicForShared YES
# else
#  define StaticNeedsPicForShared NO
# endif
#endif

#ifndef XF8_32Wid
# define XF8_32Wid		NO
#endif

#if CrossCompiling
#include <cross.def>
#endif
#include <xf86.rules>


--- NEW FILE: xorg.tmpl ---
XCOMM $Xorg: xf86.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
XCOMM $XdotOrg: xc/config/cf/xorg.tmpl,v 1.1.10.1 2004/04/15 10:13:10 eich Exp $

#ifndef ConfigDefines
# define ConfigDefines -D__XCONFIGFILE__='"$(XCONFIGFILE)"' \
	-D__XCONFIGDIR__='"$(XCONFIGDIR)"' -D__XLOGFILE__='"$(XLOGFILE)"' \
	-D__XSERVERNAME__='"$(XSERVERNAME)"'
#endif

CONFIG_DEFINES = ConfigDefines

#ifndef ServerDefines
#define ServerDefines StandardDefines VersionDefines
#endif

#ifdef BuilderEMailAddr
BUILDERADDR = BuilderEMailAddr
#else 
BUILDERADDR = "xorg at freedesktop.org"
#endif
#ifdef VendorSupportAddress
 VENDORSUPPORT = VendorSupportAddress
 BUGMSG = -DBUILDERADDR='$(BUILDERADDR)' -DVENDORSUPPORT='$(VENDORSUPPORT)'
#else
 BUGMSG = -DBUILDERADDR='$(BUILDERADDR)'
#endif

#if defined(XF86DriverSDK)
    BUILDMODULEDIR = $(DRIVERSDKMODULEDIR)
    BUILDMODULETOP = ..
    TOP_INCLUDES = TopIncludes
   IMAKE_DEFINES = -DXF86DriverSDK=1
#ifdef UseInstalled
       IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(TOP) -I$(IRULESRC) \
		   $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
#else
       IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \
		   $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
#endif

#undef ImakeSubCmdHelper
#ifdef UseInstalled
#define ImakeSubCmdHelper $(IMAKE) -DUseInstalled -I$(IMAKETOP) \
			  -I$(IRULESRC) $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
#else
#define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKETOP) \
			  $(IMAKE_DEFINES) $(IMAKE_WARNINGS) \
			  -I$(IMAKEPREFIX)$(IRULESRC)
#endif
#endif

#ifndef JoystickSupport
#define JoystickSupport		NO
#endif

/*
 * Module support: These overrides must be here, not in xf86.rules,
 * because they will replace rules after having seen the first lines
 * of Imakefile (include <Server.tmpl>)
 */

#ifndef HasGccStackProtector
#define HasGccStackProtector	NO
#endif

#if HasGccStackProtector
MODULE_GCC_FLAGS1 = -fno-stack-protector
#endif 

#ifndef HasGccMergeConstants
#define HasGccMergeConstants	NO
#endif

#if HasGccMergeConstants && DoLoadableServer && !MakeDllModules
MODULE_GCC_FLAGS2 = -fno-merge-constants
#endif

MODULE_GCC_FLAGS = $(MODULE_GCC_FLAGS1) $(MODULE_GCC_FLAGS2)

#if defined(IHaveModules) && MakeDllModules
MODULE_PIC_FLAGS = $(PICFLAGS)
#endif

MODULE_CFLAGS = $(MODULE_PIC_FLAGS) $(MODULE_GCC_FLAGS)

#if defined(IHaveModules)
# if DoLoadableServer
MODULE_DEFINES = -DIN_MODULE -DXFree86Module
# else
MODULE_DEFINES = -DXFree86Module
# endif
#endif

#if defined(IHaveModules) && DoLoadableServer

/* This overrides the ObjCompile in Imake.rules! */
#undef ObjectCompile
#define ObjectCompile(options) RemoveFile($@)                           @@\
	ClearmakeOSName\
	$(MODCC) $(MODCFLAGS) options -c $*.c

/* This overrides an AssembleObject in xf86.rules or in an os-dependent
 * rules file (currently only minix.cf and os2.rules (uncritical))
 */
#define ModCPPOnlyAsm(basename,options) RemoveFile(basename.i)		@@\
	$(MODCPP) AsmDefines $(DEFINES) $(INCLUDES) options basename.S | \	@@\
		grep -v '^\#' > basename.i

#undef AssembleObject
#define AssembleObject(flags) ModCPPOnlyAsm($*,flags)			@@\
	RemoveFile($*.o)						@@\
	$(MODAS) $(MODASFLAGS) -o $*.o $*.i				@@\
	RemoveFile($*.i)

/* This overrides the NormalRelocatableTarget in Imake.rules */
#undef NormalRelocatableTarget
#define	NormalRelocatableTarget(objname,objlist)			@@\
AllTarget(objname.Osuf)							@@\
									@@\
objname.Osuf: objlist $(EXTRALIBRARYDEPS)				@@\
	RemoveFile($@)							@@\
	$(MODLD) $(MODLDCOMBINEFLAGS) objlist -o $@

/* This overrides the NormalDepRelocatableTarget in Imake.rules */
#undef NormalDepRelocatableTarget
#define	NormalDepRelocatableTarget(objname,deplist,objlist)		@@\
AllTarget(objname.Osuf)							@@\
									@@\
objname.Osuf: deplist $(EXTRALIBRARYDEPS)				@@\
	RemoveFile($@)							@@\
	$(MODLD) $(MODLDCOMBINEFLAGS) objlist -o $@

/* This overrides the RanLibrary in Imake.rules */
#if DoRanlibCmd || NeedModuleRanlib
#undef RanLibrary
#define RanLibrary(args) $(MODRANLIB) args
#endif

/* This overrides the MakeLibrary rule in Imake.rules */
#undef MakeLibrary
#define MakeLibrary(libname,objlist) $(MODAR) libname objlist

/* This overrides the LibraryTargetName rule in Imake.rules */
#undef LibraryTargetName
#define LibraryTargetName(libname)Concat(lib,libname.a)

/* This disables an OS/2 rule */
#undef BuildLibSupportLibs
#define BuildLibSupportLibs(dummy)

#endif /* IHaveModules */

--- NEW FILE: xorgsite.def ---
XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
/******************************************************************************/
/*
 * This file is to provide a quick method for most people to change the
 * behaviour of their XFree86 installation without having to fully
 * understand the workings of site.def and all the various '.cf' files.
 *
 * In the vast majority of cases, it should not be necessary to use this
 * file at all or change it in any way.
 *
 * This file is divided into two sections.  The first contains settings
 * that end-users might reasonably change.  The second contains settings
 * that developers might want to change.
 *
 * IMPORTANT NOTE:  In all cases changing the defaults may cause problems
 * and/or unexpected side-effects.  If you don't understand what a setting
 * does, then it's best to not change it.  If you make changes and have
 * problems, verify that those problems are also present when using an
 * empty host.def file and unchanged version of this file before reporting
 * them.
 *
 * A good way to use this file is to copy it to host.def, and make the
 * changes there.  That way, future patches to this file won't fail.
 * The host.def file will never be patched.
 *
 * The distributed version of this file MUST contain no uncommented
 * definitions.  Default definitions belong in xfree86.cf, or <vendor>.cf
 * files.
 */
/******************************************************************************/

/*
 * If you have build-specific modifications in your host.def file, but
 * want an empty host.def file installed when doing 'make install',
 * uncomment the following
 *
#define InstallEmptyHostDef
 */

/*
 * Which servers to build.  There is only Xorg server.
 * It can be disabled by the following.
 *
#define XorgServer		NO
 */

/*
 * To disable building the Xnest server, uncomment this.
 *
#define XnestServer		NO
 */

/*
 * To disable building Xvfb, uncomment this.
 *
#define XVirtualFramebufferServer	NO
 */

/*
 * To disable building Xprt, uncomment this.
 *
#define XprtServer NO
 */

/*
 * Set the default server (ie the one that gets the sym-link to "X")
 *
#define ServerToInstall		XFree86
 */

/*
 * If you only run the X server under xdm the X servers don't need to be
 * installed SetUID, and you may comment out the lines below.  If you run
 * the servers by hand (with xinit or startx), then they do need to be
 * installed SetUID on most platforms.
 *
 * Consult your system administrator before making the X server setuid.
 *
#define InstallXserverSetUID	NO
 */


/*
 * Server configuration parameters.  The defaults are shown here:
 */

/*
 * Which drivers to build.  When building a static server, each of these
 * will be included in it.  When building the loadable server each of these
 * modules will be built.
 *
#define XF86CardDrivers		mga glint nv tga s3virge sis rendition \
				neomagic i740 tdfx savage \
				cirrus vmware tseng trident chips apm \
				GlideDriver fbdev i128 \
				ati AgpGartDrivers DevelDrivers ark cyrix \
				siliconmotion \
				vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
 */

/*
 * To add third party drivers to the standard driver list, set the
 * following.
 *
#define XF86ExtraCardDrivers	extradriver1 extradriver2 ...
 */

/*
 * Select the XInput devices you want by uncommenting this.
 *
#define XInputDrivers		mouse keyboard acecad calcomp citron \
				digitaledge dmc dynapro elographics \
				microtouch mutouch penmount spaceorb summa \
				wacom void magictouch aiptek
 */

/*
 * There are three parameters that determine where and how the Matrox HAL
 * library is used:
 *
 *   HaveMatroxHal  -- You have the HALlib.a binary library installed
 *                     in xfree86/drivers/mga/HALlib, and you want it to
 *                     be used.
 *                     Default: NO
 *
 *   BuildMatroxHal -- You have the source for the HALlib library (installed
 *                     in xfree86/drivers/mga/hallib), and want to build and
 *                     use it.
 *                     Default: NO
 *
 *   UseMatroxHal   -- You want to build support for loading/using the HAL
 *                     library into the mga driver.  For module server builds
 *                     you don't need to have the HALlib library to do this.
 *                     but you want to build support for loading it and using
 *                     it into the mga driver module.
 *                     Default: YES for loadable server build
 *                              (HaveMatroxHal || BuildMatroxHal) for static
 */

/*
 * To disable use of the Matrox HAL library, uncomment this:
 *
#define UseMatroxHal		NO
 */

/*
 * If you have the HALlib.a binary installed in xfree86/drivers/mga/HALlib,
 * uncomment this:
 *
#define HaveMatroxHal		YES
 */

/*
 * If you have the HALlib source code installed in xfree86/drivers/mga/hallib,
 * uncomment this:
#define BuildMatroxHal		YES
 */

/*
 * To disable building the font server, uncomment this.
 *
#define BuildFontServer		NO
 */

/*
 * To disable support for Speedo fonts, uncomment this.
 *
#define BuildSpeedo		NO
 */

/*
 * To disable support for Type1 fonts, uncomment this.
 *
#define BuildType1		NO
 */

/*
 * To disable support for CID fonts, uncomment this.
 *
#define BuildCID		NO
 */

/*
 * To disable support for TrueType fonts, uncomment these.
 *
#define BuildFreeType		NO
#define BuildXTrueType		NO
 */

/*
 * To set non-default build options for the underlying FreeType libraries,
 * add them here and uncomment.
 *
#define Freetype2BuildDefines	-DFREETYPE_BUILD_DEFINES
 */

/*
 * If you want to use FreeType 1.x build options that differ from the FreeType2
 * build options, set them here and uncomment.  Otherwise the Freetype2 build
 * options will be used for both FreeType 2.x and 1.x.  Note: FreeType 1.x
 * is currently only used for the X-TrueType (xtt) module.
 *
#define Freetype1BuildDefines	-DFREETYPE1_BUILD_DEFINES
 */

/*
 * To build the FreeType libraries with the TrueType byte code interpreter
 * enabled, uncomment this.  Note that there are patent issues related to the
 * TrueType byte code interpreter, and we only recommend you enabling this
 * if you are sure that there are no legal impediments to you doing so.  See
 * <http://www.freetype.org/patents.html> for further information.
 *
#define Freetype2BuildDefines -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
 */

/*
 * Do you want to Build Fonts (Usually you only want to build and install
 * fonts once, if this is a first time install you will want to build the
 * fonts)
 *
#define BuildFonts		NO
 */

/*
 * To not build/install the 75dpi fonts, uncomment the following
 *
#define Build75DpiFonts		NO
 */

/*
 * To not build/install the 100dpi fonts, uncomment the following
 *
#define Build100DpiFonts	NO
 */

/*
 * To not build/install the Speedo fonts, uncomment the following
 *
#define BuildSpeedoFonts	NO
 */

/*
 * To not build/install the Type1 fonts, uncomment the following
 *
#define BuildType1Fonts		NO
 */

/*
 * To not build/install the CID fonts, uncomment the following
 *
#define BuildCIDFonts		NO
 */

/*
 * To not build/install the True Type fonts, uncomment the following
 *
#define BuildTrueTypeFonts	NO
 */

/*
 * To not build/install the Cyrillic fonts, uncomment the following
 *
#define BuildCyrillicFonts	NO
 */

/*
 * To not install the local font directory, uncomment the following
 *
#define MakeLocalFontDir	NO
 */

/*
 * To build only the servers with a cut-down source tree, uncomment
 * this.
 *
#define BuildServersOnly	YES
 */

/*
 * By default, the sample config files for xinit, xdm and xfs are installed
 * only when there is no pre-existing version installed.  Uncommenting the
 * following lines will force the sample versions to be installed even if
 * it means over-writing existing versions.
 *
#define InstallXinitConfig	YES
#define InstallXdmConfig	YES
#define InstallFSConfig		YES
 */

/*
 * By default the application defaults files are always installed.
 * Uncommenting the the following will prevent exising application
 * defaults files from being over-written.
 *
#define InstallAppDefFiles	NO
 */

/*
 * Undefine the following if you don't want to have config files and
 * app-defaults installed in a separate directory (i.e. /etc/X11).
 *
#define UseSeparateConfDir NO
 */

/* 
 * To enable building the glide driver, you need to define 
 * HasGlide2 to YES and set the Glide2IncDir variable. 
 * HasGlide2 is per default NO.
 *
#define HasGlide2 YES
 */

/*
 * Set the path to your Glide include files.
 *
#define Glide2IncDir /usr/include/glide
 */

/* 
 * Have glide 3?
 *
#define HasGlide3 YES
 */

/*
 * Set the path to your Glide 3 include files.
 *
#define Glide3IncDir /usr/include/glide3
 */



/*
 * Unless you're a developer you shouldn't need to change anything
 * beyond this point.
 */

/*
 * If you want to enable some developer settings, like more verbose
 * compiler warnings, uncomment this.
 *
#define XFree86Devel	YES
*/

/*
 * The default optimisation flags for GCC 2.x.  -fno-strength-reduce is
 * here to work around a bug in -O2 for GCC 2.x on i386 platforms.
 * If you are using a version that doesn't have this bug, you can
 * uncomment the following line, and remove '-fno-strength-reduce'
 * If you are building binaries for a 486, it may be beneficial to add
 * -m486
 *
#define DefaultGcc2i386Opt	-O2 -fno-strength-reduce
 */

/*
 * This allows the GCC warning flags to be set.  The default is shown here.
 *
#define GccWarningOptions -Wall -Wpointer-arith -Wstrict-prototypes \
                          -Wmissing-prototypes -Wmissing-declarations \
                          -Wredundant-decls -Wnested-externs
 */

/* 
 * Sun Compiler stuff.. 
 *
#define HasSunC                         YES
#define HasSunCplusplus                 YES
#define CplusplusCompilerMajorVersion   5
#define CplusplusCompilerMinorVersion   0
#define CCompilerMajorVersion           5
#define CCompilerMinorVersion           0
 */

/*
 * Optimized Sun Compiler Build.
 *
#define DefaultCDebugFlags              -xO4 -xtarget=pentium_pro
#define OptimizedCDebugFlags            -xO4 -xtarget=pentium_pro
 */

/* 
 * Debuggable Sun Compiler Build. 
 * Note: This builds _EVERYTHING_ as debuggable
 *
#define DefaultCDebugFlags              -g -xs
#define OptimizedCDebugFlags            -g -xs
 */

/*
 * For Linux, this should match the Binutils version you have.  This example
 * is for 2.6.0.7.  See linux.cf for the default setting.
 *
 * This should automatically get set correctly by imake.
 *
#define LinuxBinUtilsMajorVersion	26
 */

/*
 * For Linux, these should match the libc version you have.  This example
 * is for libc.5.4.x.  See linux.cf for the default setting.
 *
 * This should automatically get set correctly by imake.
 *
#define LinuxCLibMajorVersion	5
#define LinuxClibMinorVersion	4
 */

/*
 * If you want to use the GNU malloc library, uncomment this
 *
#define UseGnuMalloc		YES
 */

/*
 * Set this to whatever is required to access the GNU malloc library.
 * The default is '-lgmalloc' unless is specified in the OS's .cf file.
 *
#define GnuMallocLibrary	-L/usr/local/lib -lgmalloc
 */

/*
 * To enable the internal Xserver malloc, uncomment this
 *
#define UseInternalMalloc	YES
 */

/*
 * Some Linux releases don't have a libtermcap.  In this case you may need
 * to uncomment the following
 *
#define TermcapLibrary		-lncurses
 */

/*
 * Build a server that dynamically loads the modules by setting
 * this to YES.  This defaults to YES on most platforms.  A static server
 * can be built by setting this to NO.
 *
#define DoLoadableServer	NO
 */

/*
 * Build dlopen() style modules instead of the standard loader modules.
 * Don't enable this unless you have specific development reasons for
 * doing so and understand how to deal with the problems you'll run in to.
 *
 * Enabling this for regular use is NOT supported, and will almost
 * certainly cause you problems.
 *
#define MakeDllModules		YES
 */

/*
 * Build XAA.  This can be disabled with:
 *
#define XF86XAA			NO
 */

/*
 * Build vgahw.  This can be disabled with:
 *
#define XF86VgaHw		NO
 */

/*
 * Build xf1bpp.  This can be disabled with:
 *
#define XF1Bpp			NO
 */

/*
 * Build xf4bpp.  This can be disabled with:
 *
#define XF4Bpp			NO
 */


/*
 * BSD Console driver support (for FreeBSD and NetBSD).
 *
 * By default, support is included for pccons and pcvt for NetBSD, and
 * pccons, syscons and pcvt for FreeBSD.
 *
 * To change the list of supported drivers, set the following parameter.
 * Possible values are -DPCCONS_SUPPORT, -DSYSCONS_SUPPORT, -DPCVT_SUPPORT.
 * The following example includes support for syscons and pcvt only.
 *
#define XFree86ConsoleDefines	-DSYSCONS_SUPPORT -DPCVT_SUPPORT
 */

/*
 * To link the X server with a dynamic version of the Xfont library,
 * uncomment this.
 *
#define XserverStaticFontLib	NO
 */

/*
 * To enable binary compatibility with previous versions of the font
 * encoding support, uncomment this.
 *
#define FontencCompatibility    YES
 */

/*
 * To disable building XInput support, uncomment this
 *
#define BuildXInputExt		NO
 */

/*
 * Uncomment this for joystick support.
 *
 * Note: Joystick support is broken, so don't enable this.
 *
#define JoystickSupport YES
 */

/*
 * To disable the ScreenSaver Extension, uncomment this line.
 *
#define BuildScreenSaverExt	NO
 */

/* 
 * If you don't want to build Xinerama support, uncomment this.
 *
#define BuildXinerama		NO
 */

/*
 * If you don't want to build support for the GLX extension, uncomment this.
 *
#define BuildGlxExt             NO
 */

/*
 * If you want to build the xf86rush extension, uncomment this line.
 * This isn't recommended.
 *
#define BuildXF86RushExt	YES
 */

/*
 * If you want to build the client library for the xf86rush extension,
 * uncomment this line.  This isn't recommended.
 *
#define BuildXF86RushLibrary	NO
 */

/*
 * If you are running NetBSD 0.9C or later, and have the aperture driver
 * installed, uncomment this.
 *
#define HasNetBSDApertureDriver	YES
 */

/*
 * If you are running SVR3 and have the mmap driver installed (for linear
 * framebuffer access) uncomment this.
 *
#define HasSVR3mmapDrv	YES
 */

/*
 * If you are using an SVR3 (like ISC 4.x) which supports long file names,
 * you can * uncomment this to have manual pages installed under their
 * full names
 *
#define ExpandManNames		YES
 */

/*
 * For a POSIXized build on Interactive uncomment this
 * Could be used with gcc 'till Version 2.6.3
 * Should be used with gcc 2.7.2. 
 *
#define UsePosix		YES
 */

/*
 * If you want XDMAUTH support (if you have Wraphelp.c), uncomment this.
 *
#define HasXdmAuth		YES
 */

/*
 * If you have Linux DECnet support, and want to build XFree86 with support
 * for connections over DECnet, uncomment this.
 *
#define HasDECnet		YES
 */

/*
 * To build static and shared libraries with debugging information, uncomment
 * this. Assumes you have Gcc2.
 * (If you don't have Gcc2, you can use the DebugLib{X11,Xt,Xaw,...} variables
 * to build debugging versions of the libraries separately.)
 *
#define DebuggableLibraries	YES
*/

/*
 * To forceably build static libraries in addition to shared libraries,
 * uncomment this.
 *
#define ForceNormalLib		YES
 */

/*
 * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
 * not the Linux ELF versions.
 *
#define LinuxElfDefault		NO
 */

/*
 * To use ELF format shared libraries for supported OSs, uncomment this.
 *
 * For Linux the default setting of this is the same as the setting of
 * LinuxElfDefault.
 *
 * For FreeBSD this should automatically be set correctly by imake.  Only
 * change it here if you need to override the automatic setting.
 *
#define UseElfFormat		YES
 */

/*
 * For FreeBSD/ELF (FreeBSD 3.0) it is possible to also build and install
 * a.out compatibility libraries.  To enable that, uncomment this.
 *
#define BuildAoutLibraries	YES
 */

/*
 * If you have trouble with make bombing out in Xlib, try uncommenting this.
 * You will not get dependencies as a result, but better than nothing.
 *
#define MakeHashTableBug        YES
 */

/*
 * If you do not want your man pages compress under SVR3 systems that
 * support it, uncomment this.
 *
#define CompressManPages        NO
 */

/*
 * If you have sgmlfmt (the XFree86 doctools package) and want to build
 * formatted docs from the SGML source, uncomment this.
 *
#define HasSgmlFmt		YES
 */

/*
 * To disable building some document formats, uncomment some of these.
 *
#define BuildLinuxDocText	NO
#define BuildLinuxDocHtml	NO
#define BuildLinuxDocPS		NO
 */

/*
 * To install Japanese versions of the documentation uncomment this.
 * Note: The Japanese documentation consists of a subset of the
 * XFree86 3.1 docs.
 *
#define InstallJapaneseDocs	YES
 */

/*
 * To build/install X specs docs, uncomment the following.
 * The SpecsDocDirs setting here is recommended because it covers
 * the docs that XFree86 has changed or added.
 *
#define BuildSpecsDocs		YES
#define SpecsDocDirs		CTEXT GL ICCCM X11 Xext Xmu Xv XvMC i18n xterm
 */

/*
 * To build all specs docs, not just those listed in SpecsDocDirs, uncomment
 * the following.
 *
#define BuildAllSpecsDocs	YES
 */

/*
 * If your system doesn't support vm86() mode and you have
 * libx86emu set library path here
 *
#define X86EMU_LIBPATH /usr/local/lib
 */ 



Index: Amoeba.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Amoeba.cf,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Amoeba.cf	5 Mar 2004 13:38:11 -0000	1.1.4.2
+++ b/Amoeba.cf	15 Apr 2004 10:13:10 -0000	1.1.4.3
@@ -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.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/DGUX.cf	5 Mar 2004 13:38:11 -0000	1.1.4.2
+++ b/DGUX.cf	15 Apr 2004 10:13:10 -0000	1.1.4.3
@@ -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.6
retrieving revision 1.1.4.7
diff -u -d -r1.1.4.6 -r1.1.4.7
--- a/FreeBSD.cf	5 Mar 2004 13:38:11 -0000	1.1.4.6
+++ b/FreeBSD.cf	15 Apr 2004 10:13:10 -0000	1.1.4.7
@@ -395,6 +395,14 @@
 #endif
 #endif
 
+#ifndef HasExpat
+# define HasExpat		YES
+#endif
+
+#ifndef HasFreetype2
+# define HasFreetype2		YES
+#endif
+
 #undef  InstallCmd
 #define InstallCmd		/usr/bin/install
 
@@ -556,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.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/Imake.rules	5 Mar 2004 13:38:11 -0000	1.1.4.4
+++ b/Imake.rules	15 Apr 2004 10:13:10 -0000	1.1.4.5
@@ -1,6 +1,7 @@
 XCOMM ---------------------------------------------------------------------
 XCOMM Imake rules for building libraries, programs, scripts, and data files
 XCOMM rules:  $Xorg: Imake.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
+XCOMM rules:  $XdotOrg$
 XCOMM
 XCOMM
 XCOMM
@@ -188,6 +189,7 @@
  * DynamicModuleTarget		(module,modlist)
  * InstallDynamicModule		(module,dest,subdir)
  * InstallDynamicNamedModule	(module,instname,dest,subdir)
+ * LinkerRuntimeLibraryPathFlag	(path)
  *
  *
  * The following are in specific <os>Lib.rules:
@@ -555,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							@@\
@@ -1485,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); \		@@\
@@ -1500,6 +1510,7 @@
 #if BuildHtmlManPages
 #define HtmlManIndex							@@\
 html_index::								@@\
+	MakeDir($(DESTDIR)$(DOCHTMLDIR))				@@\
 	$(HTMLINDEXCMD) $(DESTDIR)$(DOCHTMLDIR)
 #else
 #define HtmlManIndex	html_index::
@@ -3582,3 +3593,11 @@
 #define BuildObjectFromLibrary(libname,objname) BuildObjectFromLibraryWithPath(.,libname,objname)
 #endif
 
+/*
+ * LinkerRuntimeLibraryPathFlag - defined here to be a no-op for systems that
+ * don't need it.   Overridden in system-specific config files for systems that
+ * need it, usually with something like "Concat(-R,path)"
+ */
+#ifndef LinkerRuntimeLibraryPathFlag
+# define LinkerRuntimeLibraryPathFlag(path)  /* */
+#endif

Index: Imake.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Imake.tmpl,v
retrieving revision 1.1.4.7
retrieving revision 1.1.4.8
diff -u -d -r1.1.4.7 -r1.1.4.8
--- a/Imake.tmpl	5 Mar 2004 13:38:11 -0000	1.1.4.7
+++ b/Imake.tmpl	15 Apr 2004 10:13:10 -0000	1.1.4.8
@@ -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.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Imakefile	5 Mar 2004 13:38:11 -0000	1.1.4.2
+++ b/Imakefile	15 Apr 2004 10:13:10 -0000	1.1.4.3
@@ -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: Library.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Library.tmpl,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/Library.tmpl	5 Mar 2004 13:38:11 -0000	1.1.4.3
+++ b/Library.tmpl	15 Apr 2004 10:13:10 -0000	1.1.4.4
@@ -543,14 +543,18 @@
 # endif /* LibCreate */
 # ifdef IncSubdir
 #  ifdef IncSubSubdir
+#   if !defined(LibHeaders) || LibHeaders
 BuildIncludes($(HEADERS),IncSubdir/IncSubSubdir,../..)
-#   if BuildLibraries
+#    if BuildLibraries
 InstallMultipleFlags($(HEADERS),$(INCDIR)/IncSubdir/IncSubSubdir,$(INSTINCFLAGS))
+#     endif
 #   endif
 #  else
+#   if !defined(LibHeaders) || LibHeaders
 BuildIncludes($(HEADERS),IncSubdir,..)
-#   if BuildLibraries
+#    if BuildLibraries
 InstallMultipleFlags($(HEADERS),$(INCDIR)/IncSubdir,$(INSTINCFLAGS))
+#    endif
 #   endif
 #  endif
 # else

Index: NetBSD.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/NetBSD.cf,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/NetBSD.cf	5 Mar 2004 13:38:11 -0000	1.1.4.4
+++ b/NetBSD.cf	15 Apr 2004 10:13:10 -0000	1.1.4.5
@@ -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.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/OpenBSD.cf	5 Mar 2004 13:38:11 -0000	1.1.4.4
+++ b/OpenBSD.cf	15 Apr 2004 10:13:10 -0000	1.1.4.5
@@ -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.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/QNX4.cf	5 Mar 2004 13:38:11 -0000	1.1.4.1
+++ b/QNX4.cf	15 Apr 2004 10:13:10 -0000	1.1.4.2
@@ -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.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/Server.tmpl	5 Mar 2004 13:38:11 -0000	1.1.4.3
+++ b/Server.tmpl	15 Apr 2004 10:13:10 -0000	1.1.4.4
@@ -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.11
retrieving revision 1.1.4.12
diff -u -d -r1.1.4.11 -r1.1.4.12
--- a/X11.tmpl	29 Mar 2004 05:40:04 -0000	1.1.4.11
+++ b/X11.tmpl	15 Apr 2004 10:13:10 -0000	1.1.4.12
@@ -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,13 +365,13 @@
 #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 || \
 				 (BuildServer && !DoLoadableServer) || \
 				 XnestServer || XVirtualFramebufferServer || \
-				 XprtServer || KDriveXServer)
+				 XprtServer)
 #endif
 #endif
 #ifndef BuildFontCache
@@ -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
@@ -554,6 +585,9 @@
 #define UseFreetype2		(BuildXftLibrary || BuildXft1Library || \
 				 UseFontconfig || BuildFreeType)
 #endif
+#ifndef InstallFontconfigLibrary
+# define InstallFontconfigLibrary  YES
+#endif
 #ifndef HasExpat
 #define HasExpat		NO
 #endif
@@ -905,7 +939,7 @@
 #endif
 #ifndef XineramaDefines
 #if BuildXinerama
-#define XineramaDefines -DXINERAMA
+#define XineramaDefines -DPANORAMIX
 #else
 #define XineramaDefines /**/
 #endif
@@ -941,6 +975,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
@@ -1673,9 +1713,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
@@ -2094,27 +2150,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 BuildDamageLibrary
@@ -2496,7 +2552,7 @@
     XRENDERLIBSRC = $(LIBSRC)/Xrender
 #if SharedLibXrender
 #ifndef SharedXrenderRev
-#define SharedXrenderRev 1.2
+#define SharedXrenderRev 1.2.2
 #endif
 SharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev)
 #else
@@ -2516,7 +2572,7 @@
    XCURSORRLIBSRC = $(LIBSRC)/Xcursor
 #if SharedLibXcursor
 #ifndef SharedXcursorRev
-#define SharedXcursorRev 1.0
+#define SharedXcursorRev 1.0.2
 #endif
 SharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),SOXCURSORREV,SharedXcursorRev)
 #else
@@ -3036,23 +3092,23 @@
  * Get the library version information from version_info in
  * in xc/extras/freetype2/builds/unix/configure.ac.
  *
- * current:revision:age = 9:3:3
+ * current:revision:age = 9:5:3
  *
  * The LibtoolMinorVersions revision is "(current - age).age".
  * The !LibtoolMinorVersions revision is "current.0".
  * Freetype2Version should be set to "current.revision.age"
  */
 #ifndef Freetype2Version
-#define Freetype2Version 9.3.3
+#define Freetype2Version 9.5.3
 #endif
 
 #if SharedLibFreetype2
 #ifndef SharedLibtoolFreetype2Rev
-#define SharedLibtoolFreetype2Rev	9:3:3
+#define SharedLibtoolFreetype2Rev	9:5:3
 #endif
 #ifndef SharedFreetype2Rev
 #if LibtoolMinorVersions
-#define SharedFreetype2Rev 6.3
+#define SharedFreetype2Rev 6.3.5
 #else
 #define SharedFreetype2Rev 9.0
 #endif
@@ -3105,7 +3161,7 @@
 #if Freetype2LibDirStandard
 FREETYPE2LIB = -lfreetype
 #else
-FREETYPE2LIB = -L$(FREETYPE2LIBDIR) -lfreetype
+FREETYPE2LIB = -L$(FREETYPE2LIBDIR) LinkerRuntimeLibraryPathFlag($(FREETYPE2LIBDIR)) -lfreetype
 #endif
 
 #endif /* HasFreetype2 */
@@ -3118,9 +3174,9 @@
 
 #if BuildFreetype2Library || HasFreetype2
 #if Freetype2IncDirStandard
-FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2
+FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config
 #else
-FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2INCDIR)/freetype2
+FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config
 #endif
 FREETYPE2DEFINES = -DFREETYPE2
 #endif
@@ -3284,7 +3340,7 @@
           XFTLIBSRC = $(LIBSRC)/Xft
 #if SharedLibXft
 #ifndef SharedXftRev
-#define SharedXftRev 2.1
+#define SharedXftRev 2.1.2
 #endif
 SharedLibReferences(XFT,Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev)
 #else
@@ -3317,7 +3373,7 @@
           FONTCONFIGLIBSRC = $(LIBSRC)/fontconfig
 #if SharedLibFontconfig
 #ifndef SharedFontconfigRev
-#define SharedFontconfigRev 1.0
+#define SharedFontconfigRev 1.0.4
 #endif
 SharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGLIBSRC),SOFONTCONFIGREV,SharedFontconfigRev)
 #else

Index: bsdi.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/bsdi.cf,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/bsdi.cf	5 Mar 2004 13:38:11 -0000	1.1.4.4
+++ b/bsdi.cf	15 Apr 2004 10:13:10 -0000	1.1.4.5
@@ -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.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/cygwin.cf	5 Mar 2004 13:38:11 -0000	1.1.4.3
+++ b/cygwin.cf	15 Apr 2004 10:13:10 -0000	1.1.4.4
@@ -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.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/darwin.cf	5 Mar 2004 13:38:11 -0000	1.1.4.4
+++ b/darwin.cf	15 Apr 2004 10:13:10 -0000	1.1.4.5
@@ -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.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/gnu.cf	5 Mar 2004 13:38:11 -0000	1.1.4.3
+++ b/gnu.cf	15 Apr 2004 10:13:10 -0000	1.1.4.4
@@ -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: gnuLib.rules
===================================================================
RCS file: /cvs/xorg/xc/config/cf/gnuLib.rules,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/gnuLib.rules	5 Mar 2004 13:38:11 -0000	1.1.4.4
+++ b/gnuLib.rules	15 Apr 2004 10:13:10 -0000	1.1.4.5
@@ -119,7 +119,7 @@
 	LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK))	@@\
 									@@\
 clean::									@@\
-	@MAJREV=`echo rev | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \	@@\
+	@MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \	@@\
 	set -x; $(RM) Concat(lib,libname.so.$$MAJREV)			@@\
 	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
 
@@ -147,7 +147,7 @@
 	LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK))	@@\
 									@@\
 clean::									@@\
-	@MAJREV=`echo rev | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \	@@\
+	@MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \	@@\
 	set -x; $(RM) Concat(lib,libname.so.$$MAJREV)			@@\
 	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
 

Index: linux.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/linux.cf,v
retrieving revision 1.1.4.7
retrieving revision 1.1.4.8
diff -u -d -r1.1.4.7 -r1.1.4.8
--- a/linux.cf	30 Mar 2004 14:23:10 -0000	1.1.4.7
+++ b/linux.cf	15 Apr 2004 10:13:10 -0000	1.1.4.8
@@ -484,6 +484,14 @@
 #define HasLibpng		YES
 #endif
 
+#ifndef HasExpat
+# define HasExpat		YES
+#endif
+
+#ifndef HasFreetype2
+# define HasFreetype2		YES
+#endif
+
 #define AvoidNullMakeCommand	YES
 #ifndef DebuggableLibraries
 #define DebuggableLibraries	NO
@@ -990,11 +998,7 @@
 #endif
 
 #include <lnxLib.rules>
-#ifdef KDriveXServer
-# include <kdrive.cf>
-#else
-# include <xfree86.cf>
-#endif
+# include <xorg.cf>
 
 #ifndef XFree86ServerOSDefines
 # define XFree86ServerOSDefines

Index: lnxLib.rules
===================================================================
RCS file: /cvs/xorg/xc/config/cf/lnxLib.rules,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/lnxLib.rules	5 Mar 2004 13:38:11 -0000	1.1.4.5
+++ b/lnxLib.rules	15 Apr 2004 10:13:10 -0000	1.1.4.6
@@ -174,7 +174,7 @@
 	LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK))	@@\
 									@@\
 clean::									@@\
-	@MAJREV=`echo rev | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \	@@\
+	@MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \	@@\
 	set -x; $(RM) Concat(lib,libname.so.$$MAJREV)			@@\
 	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
 
@@ -234,7 +234,7 @@
 	LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK))	@@\
 									@@\
 clean::									@@\
-	@MAJREV=`echo rev | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \	@@\
+	@MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \	@@\
 	set -x; $(RM) Concat(lib,libname.so.$$MAJREV)			@@\
 	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
 
@@ -262,7 +262,7 @@
 	LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK))	@@\
 									@@\
 clean::									@@\
-	@MAJREV=`echo rev | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \	@@\
+	@MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \	@@\
 	set -x; $(RM) Concat(lib,libname.so.$$MAJREV)			@@\
 	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
 

Index: lnxdoc.rules
===================================================================
RCS file: /cvs/xorg/xc/config/cf/lnxdoc.rules,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/lnxdoc.rules	5 Mar 2004 13:38:11 -0000	1.1.4.2
+++ b/lnxdoc.rules	15 Apr 2004 10:13:10 -0000	1.1.4.3
@@ -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.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/lnxdoc.tmpl	5 Mar 2004 13:38:11 -0000	1.1.4.2
+++ b/lnxdoc.tmpl	15 Apr 2004 10:13:10 -0000	1.1.4.3
@@ -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.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/lynx.cf	5 Mar 2004 13:38:11 -0000	1.1.4.4
+++ b/lynx.cf	15 Apr 2004 10:13:10 -0000	1.1.4.5
@@ -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.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/mach.cf	5 Mar 2004 13:38:11 -0000	1.1.4.2
+++ b/mach.cf	15 Apr 2004 10:13:10 -0000	1.1.4.3
@@ -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.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/minix.cf	5 Mar 2004 13:38:11 -0000	1.1.4.2
+++ b/minix.cf	15 Apr 2004 10:13:10 -0000	1.1.4.3
@@ -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.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/nto.cf	5 Mar 2004 13:38:11 -0000	1.1.4.1
+++ b/nto.cf	15 Apr 2004 10:13:10 -0000	1.1.4.2
@@ -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.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/os2.cf	5 Mar 2004 13:38:11 -0000	1.1.4.3
+++ b/os2.cf	15 Apr 2004 10:13:10 -0000	1.1.4.4
@@ -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.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/sco.cf	5 Mar 2004 13:38:11 -0000	1.1.4.2
+++ b/sco.cf	15 Apr 2004 10:13:10 -0000	1.1.4.3
@@ -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.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/sco5.cf	5 Mar 2004 13:38:11 -0000	1.1.4.4
+++ b/sco5.cf	15 Apr 2004 10:13:10 -0000	1.1.4.5
@@ -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.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/sequent.cf	14 Nov 2003 15:54:29 -0000	1.1
+++ b/sequent.cf	15 Apr 2004 10:13:10 -0000	1.1.4.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.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/sgi.cf	5 Mar 2004 13:38:11 -0000	1.1.4.3
+++ b/sgi.cf	15 Apr 2004 10:13:10 -0000	1.1.4.4
@@ -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.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/site.def	5 Mar 2004 13:38:11 -0000	1.1.4.2
+++ b/site.def	15 Apr 2004 10:13:10 -0000	1.1.4.3
@@ -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.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/site.sample	14 Nov 2003 15:54:29 -0000	1.1
+++ b/site.sample	15 Apr 2004 10:13:10 -0000	1.1.4.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: sun.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/sun.cf,v
retrieving revision 1.1.4.10
retrieving revision 1.1.4.11
diff -u -d -r1.1.4.10 -r1.1.4.11
--- a/sun.cf	5 Mar 2004 13:38:11 -0000	1.1.4.10
+++ b/sun.cf	15 Apr 2004 10:13:10 -0000	1.1.4.11
@@ -287,21 +287,35 @@
 #   define UseExportLists NO
 #  endif
 # endif
-# if OSMinorVersion > 5
+# if OSMinorVersion > 5 /* Solaris 2.6 and later */
 #  define HasSnprintf YES
 # endif
-# if OSMinorVersion > 7
+# if OSMinorVersion > 7 /* Solaris 8 and later */
 #  define HasStrlcat	YES
 #  define HasStrcasecmp	YES
 #  define HasZlib	YES
 # endif
-# if OSMinorVersion > 9
+# if OSMinorVersion > 9 /* Solaris 10 and later */
 #  define HasSetenv	YES
+/* Solaris 10 includes FreeType already.  It's also available in GNOME 2.0 for
+ * Solaris 8 & 9, and in Solaris 9 4/03 and later, but there's no easy way to
+ * detect that in imake, so users of those releases who want to use the 
+ * installed FreeType instead of the one in this tree should copy the following
+ * two settings to their host.def.  Those who want to use the in-tree copy
+ * regardless of OS version should add "#define HasFreetype2 NO" to host.def.
+ */
+#  ifndef HasFreetype2
+#   define HasFreetype2 YES 
+#   ifndef Freetype2Dir
+#    define Freetype2Dir /usr/sfw
+#   endif
+#  endif
 # endif
 # define HasVFork	NO
 # define HasDlopen	YES
 # define InstKmemFlags	-g sys -m 2711
 # define ShLibIncludeFile <sunLib.tmpl>
+# define LinkerRuntimeLibraryPathFlag(path) Concat(-R,path)
 /*
  * Set flags for position independent code before including sv4Lib.rules
  * if the compiler in use doesn't use standard SVR4 flags

Index: sunLib.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/sunLib.tmpl,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/sunLib.tmpl	5 Mar 2004 13:38:11 -0000	1.1.4.3
+++ b/sunLib.tmpl	15 Apr 2004 10:13:10 -0000	1.1.4.4
@@ -1,4 +1,5 @@
 XCOMM $Xorg: sunLib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
+XCOMM $XdotOrg$
 
 
 
@@ -55,6 +56,7 @@
 # endif
 # define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB)
 # define SharedXrenderReqs $(LDPRELIB) $(XLIB)
+# define SharedXfontReqs $(LDPRELIB) $(FREETYPE2LIB) GzipLibrary -lsocket MathLibrary -lc
 # define FixupLibReferences() /**/
 
 # define SharedPamReqs -ldl

Index: svr3.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/svr3.cf,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/svr3.cf	5 Mar 2004 13:38:11 -0000	1.1.4.3
+++ b/svr3.cf	15 Apr 2004 10:13:10 -0000	1.1.4.4
@@ -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.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/svr4.cf	5 Mar 2004 13:38:11 -0000	1.1.4.4
+++ b/svr4.cf	15 Apr 2004 10:13:10 -0000	1.1.4.5
@@ -265,7 +265,7 @@
 #ifndef DoLoadableServer
 #define DoLoadableServer	YES
 #endif
-#include <xfree86.cf>
+#include <xorg.cf>
 #endif
 
 #ifndef DoLoadableServer

--- TinyX.cf DELETED ---

--- iPAQH3600.cf DELETED ---

--- itsy.cf DELETED ---

--- kdrive.cf DELETED ---


