summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:38:12 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:38:12 +0000
commit4012d7ede8cc6cb44e196c2802f5debf18f896ab (patch)
tree1dda7ec5f1439abc37a8a5e46afa8f2a1b9b6c4e
parent63441c8ccac11ae9a4214c5519f2180281038272 (diff)
23. Merged with XFree86 4.4.0. Added changes that went into infected files.DAMAGE-XFIXES-BASE
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid future conflicts on ASCII but not humal readable files. (There should probably be separate CreditsXorg.rtf files) (Egbert Eich).
Diffstat
-rw-r--r--Amoeba.cf2
-rw-r--r--DGUX.cf2
-rw-r--r--FreeBSD.cf2
-rw-r--r--Imake.cf2
-rw-r--r--Imake.rules10
-rw-r--r--Imake.tmpl2
-rw-r--r--Library.tmpl2
-rw-r--r--NetBSD.cf2
-rw-r--r--OpenBSD.cf2
-rw-r--r--OpenBSDLib.rules2
-rw-r--r--OpenBSDLib.tmpl2
-rw-r--r--QNX4.cf2
-rw-r--r--QNX4.rules2
-rw-r--r--README2
-rw-r--r--Server.tmpl2
-rw-r--r--ServerLib.tmpl2
-rw-r--r--Threads.tmpl2
-rw-r--r--Win32.rules2
-rw-r--r--WinLib.tmpl2
-rw-r--r--X11.rules2
-rw-r--r--X11.tmpl11
-rw-r--r--bsd.cf2
-rw-r--r--bsdLib.rules2
-rw-r--r--bsdLib.tmpl2
-rw-r--r--bsdi.cf2
-rw-r--r--bsdiLib.rules2
-rw-r--r--bsdiLib.tmpl2
-rw-r--r--cross.def2
-rw-r--r--cross.rules2
-rw-r--r--cygwin.cf2
-rw-r--r--cygwin.rules2
-rw-r--r--cygwin.tmpl2
-rw-r--r--darwin.cf2
-rw-r--r--darwinLib.rules2
-rw-r--r--darwinLib.tmpl2
-rw-r--r--gnu.cf2
-rw-r--r--gnuLib.rules2
-rw-r--r--gnuLib.tmpl2
-rw-r--r--hpLib.rules2
-rw-r--r--hpLib.tmpl2
-rw-r--r--ibmLib.rules1
-rw-r--r--ibmLib.tmpl2
-rw-r--r--isc.cf2
-rw-r--r--linux.cf2
-rw-r--r--lnxLib.rules2
-rw-r--r--lnxLib.tmpl2
-rw-r--r--lnxdoc.rules2
-rw-r--r--lnxdoc.tmpl2
-rw-r--r--lynx.cf2
-rw-r--r--mach.cf2
-rw-r--r--minix.cf2
-rw-r--r--ncr.cf2
-rw-r--r--necLib.rules2
-rw-r--r--nto.cf2
-rw-r--r--nto.rules2
-rw-r--r--os2.cf2
-rw-r--r--os2.rules2
-rw-r--r--os2Lib.rules2
-rw-r--r--os2Lib.tmpl2
-rw-r--r--os2def.db1
-rw-r--r--osf1.cf2
-rw-r--r--osfLib.rules2
-rw-r--r--osfLib.tmpl2
-rw-r--r--sco.cf2
-rw-r--r--sco5.cf2
-rw-r--r--scoLib.rules2
-rw-r--r--sgi.cf2
-rw-r--r--sgiLib.rules2
-rw-r--r--sgiLib.tmpl2
-rw-r--r--site.def2
-rw-r--r--sun.cf2
-rw-r--r--sunLib.rules2
-rw-r--r--sunLib.tmpl2
-rw-r--r--sv3Lib.rules2
-rw-r--r--sv3Lib.tmpl2
-rw-r--r--sv4Lib.rules2
-rw-r--r--sv4Lib.tmpl2
-rw-r--r--svr3.cf2
-rw-r--r--svr4.cf2
-rw-r--r--ultrix.cf2
-rw-r--r--usl.cf2
-rw-r--r--xf86.rules2
-rw-r--r--xf86.tmpl2
-rw-r--r--xf86site.def2
-rw-r--r--xfree86.cf2
85 files changed, 100 insertions, 85 deletions
diff --git a/Amoeba.cf b/Amoeba.cf
index 7291106..09c8467 100644
--- a/Amoeba.cf
+++ b/Amoeba.cf
@@ -1,5 +1,5 @@
XCOMM platform: $Xorg: Amoeba.cf,v 1.3 2000/08/17 19:41:45 cpqbld Exp $
-XCOMM platform: $XFree86: xc/config/cf/Amoeba.cf,v 3.11 2002/11/14 21:01:13 tsi Exp $
+XCOMM platform: $XFree86: xc/config/cf/Amoeba.cf,v 3.10tsi Exp $
/* The presence of this configuration file in the X distribution
* does not imply full support for the system it describes.
diff --git a/DGUX.cf b/DGUX.cf
index b7eb985..8f26a41 100644
--- a/DGUX.cf
+++ b/DGUX.cf
@@ -1,4 +1,4 @@
-XCOMM platform: $XFree86: xc/config/cf/DGUX.cf,v 1.6 2001/01/12 19:28:20 dawes Exp $
+XCOMM platform: $XFree86: xc/config/cf/DGUX.cf,v 1.5 2000/07/07 20:06:56 tsi Exp $
/* Copyright Takis Psarogiannakopoulos <takis@pmms.cam.ac.uk>
* This is the DG/ux configuration file of X11R6.3
*/
diff --git a/FreeBSD.cf b/FreeBSD.cf
index 7004ccc..824533b 100644
--- a/FreeBSD.cf
+++ b/FreeBSD.cf
@@ -3,7 +3,7 @@ XCOMM platform: $XdotOrg: xc/config/cf/FreeBSD.cf,v 1.1.4.4 2003/12/26 21:33:10
XCOMM
XCOMM
XCOMM
-XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.148 2004/02/07 04:30:15 dawes Exp $
+XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.147 2004/01/28 01:46:21 dawes Exp $
#ifndef UseElfFormat
#define UseElfFormat DefaultToElfFormat
diff --git a/Imake.cf b/Imake.cf
index fe45e7b..d4cf6bd 100644
--- a/Imake.cf
+++ b/Imake.cf
@@ -18,7 +18,7 @@ XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $
*
* 4. Create a .cf file with the name given by MacroFile.
*/
-XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.89 2004/01/25 01:12:20 dawes Exp $
+XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $
#if defined(__APPLE__)
# undef __APPLE__
diff --git a/Imake.rules b/Imake.rules
index d048465..ebb83c9 100644
--- a/Imake.rules
+++ b/Imake.rules
@@ -1151,11 +1151,15 @@ ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,$(_NOOP_))
#define LibraryTargetNameSuffix(libname,suffix)Concat3(lib,libname,suffix.a)
#endif
+#ifndef InstallNamedInline
+#define InstallNamedInline(srcname,flags,dest,dstname) $(INSTALL) $(INSTALLFLAGS) flags srcname $(DESTDIR)dest/dstname
+#endif
+
#ifndef InstallNamedTarget
#define InstallNamedTarget(step,srcname,flags,dest,dstname) @@\
step:: srcname @@\
MakeDir($(DESTDIR)dest) @@\
- $(INSTALL) $(INSTALLFLAGS) flags srcname $(DESTDIR)dest/dstname
+ InstallNamedInline(srcname,flags,dest,dstname)
#endif /* InstallNamedTarget */
/*
@@ -1179,6 +1183,10 @@ step:: srcname @@\
InstallNamedTarget(step,file,flags,dest,file)
#endif /* InstallTarget */
+#ifndef InstallInline
+#define InstallInline(file,flags,dest) InstallNamedInline(file,flags,dest,file)
+#endif
+
/*
* InstallLibrary - generate rules to install the indicated library.
*/
diff --git a/Imake.tmpl b/Imake.tmpl
index 46c7f8a..eb6748f 100644
--- a/Imake.tmpl
+++ b/Imake.tmpl
@@ -6,7 +6,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
-XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.156 2004/01/12 21:43:18 herrb Exp $
+XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.155 2003/12/24 18:58:41 dickey Exp $
XCOMM ----------------------------------------------------------------------
/*
diff --git a/Library.tmpl b/Library.tmpl
index ccb2a7f..f3e4d0d 100644
--- a/Library.tmpl
+++ b/Library.tmpl
@@ -19,7 +19,7 @@ XCOMM $Xorg: Library.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.24 2003/10/21 17:41:43 tsi Exp $
+XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.23tsi Exp $
#ifndef DoNormalLib
#define DoNormalLib NO
diff --git a/NetBSD.cf b/NetBSD.cf
index ffe6aea..42246c5 100644
--- a/NetBSD.cf
+++ b/NetBSD.cf
@@ -2,7 +2,7 @@ XCOMM platform: $Xorg: NetBSD.cf,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
-XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.123 2003/11/20 16:18:18 dawes Exp $
+XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.122 2003/11/18 18:09:45 dawes Exp $
#ifndef OSName
diff --git a/OpenBSD.cf b/OpenBSD.cf
index 689e275..6ac130c 100644
--- a/OpenBSD.cf
+++ b/OpenBSD.cf
@@ -1,4 +1,4 @@
-XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.101 2004/01/09 00:35:00 dawes Exp $
+XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.100 2004/01/08 22:51:41 herrb Exp $
XCOMM $XdotOrg: xc/config/cf/OpenBSD.cf,v 1.1.4.2 2003/12/06 13:22:41 kaleb Exp $
XCOMM
diff --git a/OpenBSDLib.rules b/OpenBSDLib.rules
index 4bdd741..5bb9a47 100644
--- a/OpenBSDLib.rules
+++ b/OpenBSDLib.rules
@@ -7,7 +7,7 @@ XCOMM $OpenBSD: OpenBSDLib.rules,v 1.1 2000/10/09 20:43:58 matthieu Exp $
* OpenBSD shared library rules
*/
-XCOMM $XFree86: xc/config/cf/OpenBSDLib.rules,v 1.11 2004/01/27 01:37:38 dawes Exp $
+XCOMM $XFree86: xc/config/cf/OpenBSDLib.rules,v 1.10 2003/10/31 20:49:03 herrb Exp $
#ifndef UseElfFormat
#define UseElfFormat NO
diff --git a/OpenBSDLib.tmpl b/OpenBSDLib.tmpl
index ad13aed..a23459a 100644
--- a/OpenBSDLib.tmpl
+++ b/OpenBSDLib.tmpl
@@ -1,6 +1,6 @@
XCOMM platform: $XdotOrg: xc/config/cf/OpenBSDLib.tmpl,v 1.1.4.3 2004/02/23 21:31:43 kaleb Exp $
XCOMM platform: $OpenBSD: OpenBSDLib.tmpl,v 1.6 2003/04/04 19:48:58 matthieu Exp $
-XCOMM platform: $XFree86: xc/config/cf/OpenBSDLib.tmpl,v 1.9 2004/01/10 09:09:51 herrb Exp $
+XCOMM platform: $XFree86: xc/config/cf/OpenBSDLib.tmpl,v 1.8 2003/10/15 21:23:37 herrb Exp $
XCOMM
/* Shared libraries dependencies */
diff --git a/QNX4.cf b/QNX4.cf
index ce75eb8..be5d03e 100644
--- a/QNX4.cf
+++ b/QNX4.cf
@@ -1,4 +1,4 @@
-XCOMM platform: $XFree86: xc/config/cf/QNX4.cf,v 1.4 2002/01/07 20:38:18 dawes Exp $
+XCOMM platform: $XFree86: xc/config/cf/QNX4.cf,v 1.3 2000/07/07 20:06:56 tsi Exp $
#define StripInstalledPrograms NO
#define BuildServer YES
diff --git a/QNX4.rules b/QNX4.rules
index 0dd88a3..c034d62 100644
--- a/QNX4.rules
+++ b/QNX4.rules
@@ -1,4 +1,4 @@
-XCOMM platform: $XFree86: xc/config/cf/QNX4.rules,v 1.2 2002/01/07 20:38:18 dawes Exp $
+XCOMM platform: $XFree86: xc/config/cf/QNX4.rules,v 1.1 1999/12/27 00:45:43 robin Exp $
XCOMM Rules to work around wlib for QNX...
diff --git a/README b/README
index 30c1b0a..d037b7e 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ $Xorg: README,v 1.4 2000/08/18 04:03:58 coskrey Exp $
-$XFree86: xc/config/cf/README,v 1.21 2003/12/20 19:31:46 dawes Exp $
+$XFree86: xc/config/cf/README,v 1.20 2003/04/14 20:35:50 herrb Exp $
The easiest way to write an Imakefile is to find another one that does
something similar and copy/modify it!
diff --git a/Server.tmpl b/Server.tmpl
index 9144268..51147e2 100644
--- a/Server.tmpl
+++ b/Server.tmpl
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/Server.tmpl,v 3.21 2003/04/15 03:59:03 dawes Exp $
+XCOMM $XFree86: xc/config/cf/Server.tmpl,v 3.20 2002/11/20 04:32:55 dawes Exp $
/*
* Server imakefile info - this contains any special redefinitions, etc.
* that Imakefiles in the server subtree will need.
diff --git a/ServerLib.tmpl b/ServerLib.tmpl
index 7230e5a..18a7674 100644
--- a/ServerLib.tmpl
+++ b/ServerLib.tmpl
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/ServerLib.tmpl,v 3.1 2003/10/21 17:41:43 tsi Exp $
+XCOMM $XFree86: xc/config/cf/ServerLib.tmpl,v 3.0tsi Exp $
/*
* Server Library imakefile info - this contains any special
* redefinitions, etc. that Imakefiles in the various server library
diff --git a/Threads.tmpl b/Threads.tmpl
index 45e46ea..bb0a7e8 100644
--- a/Threads.tmpl
+++ b/Threads.tmpl
@@ -2,7 +2,7 @@ XCOMM $Xorg: Threads.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/Threads.tmpl,v 3.4 2002/11/14 21:01:14 tsi Exp $
+XCOMM $XFree86: xc/config/cf/Threads.tmpl,v 3.3tsi Exp $
/*
* For a multi-threaded application or library,
diff --git a/Win32.rules b/Win32.rules
index 9b79eec..f284ad2 100644
--- a/Win32.rules
+++ b/Win32.rules
@@ -3,7 +3,7 @@ XCOMM platform: $Xorg: Win32.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/Win32.rules,v 1.5 2002/11/05 17:46:06 tsi Exp $
+XCOMM $XFree86$
#define HasSharedLibraries YES
#define NeedLibInsideFlag YES
diff --git a/WinLib.tmpl b/WinLib.tmpl
index 52f9f4f..2afabf2 100644
--- a/WinLib.tmpl
+++ b/WinLib.tmpl
@@ -2,7 +2,7 @@ XCOMM $Xorg: WinLib.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/WinLib.tmpl,v 1.5 2003/07/11 22:17:41 tsi Exp $
+XCOMM $XFree86: xc/config/cf/WinLib.tmpl,v 1.4tsi Exp $
#define SharedOldXReqs $(LDPRELIBS) $(XONLYLIB)
#define SharedXtReqs $(LDPRELIBS) $(XONLYLIB)
diff --git a/X11.rules b/X11.rules
index fb7b9e1..2863df1 100644
--- a/X11.rules
+++ b/X11.rules
@@ -1,7 +1,7 @@
XCOMM $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/X11.rules,v 1.7 2003/11/05 18:15:51 dawes Exp $
+XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $
/* Note whether we are the top level project. */
#ifndef SeenTopLevelProject
diff --git a/X11.tmpl b/X11.tmpl
index 2130f7f..1ee5e68 100644
--- a/X11.tmpl
+++ b/X11.tmpl
@@ -6,7 +6,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
-XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.247 2004/02/10 10:38:56 alanh Exp $
+XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $
/***************************************************************************
* *
@@ -3744,8 +3744,13 @@ clean:: @@\
# if !CrossCompiling || UseInstalledOnCrossCompile
# define InstallFontsDir(dest) @@\
install:: @@\
- RemoveFile($(DESTDIR)dest/fonts.scale) @@\
- RunProgram(MKFONTSCALE, $(DESTDIR)dest) @@\
+ MakeDir($(DESTDIR)dest) @@\
+ @if [ X$(STATIC_FONTS_SCALE) = X ]; then (set -x; \ @@\
+ RemoveFile($(DESTDIR)dest/fonts.scale); \ @@\
+ RunProgram(MKFONTSCALE, $(DESTDIR)dest)); \ @@\
+ else (set -x; \ @@\
+ InstallInline(fonts.scale,$(INSTDATFLAGS),dest)); \ @@\
+ fi @@\
RemoveFile($(DESTDIR)dest/fonts.dir) @@\
RunProgram(MKFONTDIR, $(MKFONTDIROPTS) $(DESTDIR)dest)
# else
diff --git a/bsd.cf b/bsd.cf
index 6f44f20..d478393 100644
--- a/bsd.cf
+++ b/bsd.cf
@@ -2,7 +2,7 @@ XCOMM platform: $Xorg: bsd.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/bsd.cf,v 1.3 2001/01/17 16:22:31 dawes Exp $
+XCOMM $XFree86: xc/config/cf/bsd.cf,v 1.2 1998/09/06 04:46:50 dawes Exp $
#ifndef OSName
#define OSName 4.3bsd
diff --git a/bsdLib.rules b/bsdLib.rules
index cc278e0..b293b3f 100644
--- a/bsdLib.rules
+++ b/bsdLib.rules
@@ -4,7 +4,7 @@ XCOMM $Xorg: bsdLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/bsdLib.rules,v 3.28 2004/01/27 01:37:39 dawes Exp $
+XCOMM $XFree86: xc/config/cf/bsdLib.rules,v 3.27 2003/11/20 00:41:37 dawes Exp $
/*
* NetBSD/FreeBSD shared library rules
*/
diff --git a/bsdLib.tmpl b/bsdLib.tmpl
index f582d1b..10c2876 100644
--- a/bsdLib.tmpl
+++ b/bsdLib.tmpl
@@ -1,5 +1,5 @@
XCOMM $Xorg: bsdLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.24 2003/11/20 16:18:19 dawes Exp $
+XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.23 2003/11/04 01:59:31 dawes Exp $
/*
* NetBSD/FreeBSD/OpenBSD shared library template
diff --git a/bsdi.cf b/bsdi.cf
index ee5c51f..c451b3e 100644
--- a/bsdi.cf
+++ b/bsdi.cf
@@ -2,7 +2,7 @@ XCOMM platform: $Xorg: bsdi.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-XCOMM platform: $XFree86: xc/config/cf/bsdi.cf,v 3.38 2004/01/25 01:12:20 dawes Exp $
+XCOMM platform: $XFree86: xc/config/cf/bsdi.cf,v 3.37 2003/04/24 22:14:53 herrb Exp $
#ifndef OSName
#define OSName DefaultOSName
#endif
diff --git a/bsdiLib.rules b/bsdiLib.rules
index d52db40..85a9952 100644
--- a/bsdiLib.rules
+++ b/bsdiLib.rules
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/bsdiLib.rules,v 3.4 2003/10/11 09:40:12 herrb Exp $
+XCOMM $XFree86: xc/config/cf/bsdiLib.rules,v 3.3 2003/10/09 22:43:18 herrb Exp $
/*
* BSDI shared library rules (converted from SVr4/Linux rules)
diff --git a/bsdiLib.tmpl b/bsdiLib.tmpl
index bcb29c2..5596cd0 100644
--- a/bsdiLib.tmpl
+++ b/bsdiLib.tmpl
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/bsdiLib.tmpl,v 3.4 2003/11/04 01:59:31 dawes Exp $
+XCOMM $XFree86: xc/config/cf/bsdiLib.tmpl,v 3.3 2003/05/29 21:56:57 herrb Exp $
/*
* BSDI shared library template (converted from Linux template)
diff --git a/cross.def b/cross.def
index 938b673..958c746 100644
--- a/cross.def
+++ b/cross.def
@@ -1,4 +1,4 @@
-/* $XFree86: xc/config/cf/cross.def,v 1.3 2002/04/04 14:05:33 eich Exp $ */
+/* $XFree86: xc/config/cf/cross.def,v 1.1 2000/12/08 22:09:34 keithp Exp $ */
/*
* This file contains redefinitions of some symbols to enable
* cross compilation: e.g. paths for include files and paths to
diff --git a/cross.rules b/cross.rules
index a1f1dc5..da02643 100644
--- a/cross.rules
+++ b/cross.rules
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/cross.rules,v 1.8 2002/07/14 17:08:15 alanh Exp $
+XCOMM $XFree86: xc/config/cf/cross.rules,v 1.7 2002/04/04 14:05:33 eich Exp $
#ifndef HostCcCmd
#define HostCcCmd cc
diff --git a/cygwin.cf b/cygwin.cf
index 2d6b60d..783ebd5 100644
--- a/cygwin.cf
+++ b/cygwin.cf
@@ -1,4 +1,4 @@
-XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.57 2003/12/24 18:58:41 dickey Exp $
+XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.56 2003/10/27 22:34:02 herrb Exp $
#ifndef OSName
# define OSName Cygwin
diff --git a/cygwin.rules b/cygwin.rules
index b4dc94b..2fdc0a1 100644
--- a/cygwin.rules
+++ b/cygwin.rules
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/cygwin.rules,v 3.28 2003/12/24 18:58:41 dickey Exp $
+XCOMM $XFree86: xc/config/cf/cygwin.rules,v 3.27 2003/10/26 18:17:37 herrb Exp $
/*
* Cygwin shared library rules (DLL versions)
diff --git a/cygwin.tmpl b/cygwin.tmpl
index 54d5458..8475fbb 100644
--- a/cygwin.tmpl
+++ b/cygwin.tmpl
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.19 2003/12/24 18:58:41 dickey Exp $
+XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.18 2003/10/19 08:27:05 herrb Exp $
#if UseCygIPC
# define SharedX11Reqs -lcygipc
diff --git a/darwin.cf b/darwin.cf
index 4820402..57c5952 100644
--- a/darwin.cf
+++ b/darwin.cf
@@ -1,4 +1,4 @@
-XCOMM platform: $XFree86: xc/config/cf/darwin.cf,v 1.51 2004/02/11 00:30:27 torrey Exp $
+XCOMM platform: $XFree86: xc/config/cf/darwin.cf,v 1.50 2004/01/20 23:54:50 torrey Exp $
/* Darwin / Mac OS X configuration by John Carmack <johnc@idsoftware.com> */
diff --git a/darwinLib.rules b/darwinLib.rules
index a9a3fab..01f69d3 100644
--- a/darwinLib.rules
+++ b/darwinLib.rules
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/darwinLib.rules,v 1.9 2003/10/11 09:40:12 herrb Exp $
+XCOMM $XFree86: xc/config/cf/darwinLib.rules,v 1.8 2003/10/09 22:43:18 herrb Exp $
/*
* Darwin/Mac OS X shared library rules
*/
diff --git a/darwinLib.tmpl b/darwinLib.tmpl
index ce51b63..4903d05 100644
--- a/darwinLib.tmpl
+++ b/darwinLib.tmpl
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/darwinLib.tmpl,v 1.20 2003/11/18 19:04:54 torrey Exp $
+XCOMM $XFree86: xc/config/cf/darwinLib.tmpl,v 1.19 2003/11/04 00:24:36 torrey Exp $
/*
* Darwin/Mac OS X shared library template
*/
diff --git a/gnu.cf b/gnu.cf
index df617f4..ca86079 100644
--- a/gnu.cf
+++ b/gnu.cf
@@ -1,4 +1,4 @@
-XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.13 2004/01/09 00:35:00 dawes Exp $
+XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.12 2003/11/24 02:02:26 dawes Exp $
XCOMM $XdotOrg: xc/config/cf/gnu.cf,v 1.1.4.1 2003/12/06 13:22:41 kaleb Exp $
#ifndef OSName
diff --git a/gnuLib.rules b/gnuLib.rules
index 22cf3bd..4dca2aa 100644
--- a/gnuLib.rules
+++ b/gnuLib.rules
@@ -1,7 +1,7 @@
/*
* GNU/Hurd shared library rules
*
- * $XFree86: xc/config/cf/gnuLib.rules,v 1.10 2004/01/27 01:37:39 dawes Exp $
+ * $XFree86: xc/config/cf/gnuLib.rules,v 1.9 2003/10/11 09:40:13 herrb Exp $
*/
/*
diff --git a/gnuLib.tmpl b/gnuLib.tmpl
index 33576f0..00f091c 100644
--- a/gnuLib.tmpl
+++ b/gnuLib.tmpl
@@ -1,7 +1,7 @@
XCOMM
XCOMM GNU Hurd shared library template
XCOMM
-XCOMM $XFree86: xc/config/cf/gnuLib.tmpl,v 1.6 2003/11/04 01:59:31 dawes Exp $
+XCOMM $XFree86: xc/config/cf/gnuLib.tmpl,v 1.5 2003/05/29 21:56:57 herrb Exp $
XCOMM
#ifndef FixupLibReferences
diff --git a/hpLib.rules b/hpLib.rules
index cd5dbb4..4d68f13 100644
--- a/hpLib.rules
+++ b/hpLib.rules
@@ -4,7 +4,7 @@ XCOMM $Xorg: hpLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
* HP shared library rules
*/
-XCOMM $XFree86: xc/config/cf/hpLib.rules,v 3.4 2001/01/17 16:22:31 dawes Exp $
+XCOMM $XFree86: xc/config/cf/hpLib.rules,v 3.3 1999/01/11 05:13:06 dawes Exp $
#ifndef HasSharedLibraries
# define HasSharedLibraries YES
diff --git a/hpLib.tmpl b/hpLib.tmpl
index d71feff..726a73b 100644
--- a/hpLib.tmpl
+++ b/hpLib.tmpl
@@ -2,7 +2,7 @@ XCOMM $Xorg: hpLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/hpLib.tmpl,v 1.2 2003/05/27 21:56:40 tsi Exp $
+XCOMM $XFree86$
/*
* HP shared library template
diff --git a/ibmLib.rules b/ibmLib.rules
index 549e15c..afcf700 100644
--- a/ibmLib.rules
+++ b/ibmLib.rules
@@ -5,6 +5,7 @@ XCOMM $XdotOrg: xc/config/cf/ibmLib.rules,v 1.1.4.3 2003/12/15 16:42:40 kaleb Ex
* AIX shared library rules
*/
+XCOMM $XFree86: xc/config/cf/ibmLib.rules,v 3.5 2000/02/13 06:15:18 dawes Exp $
#ifndef HasSharedLibraries
# define HasSharedLibraries YES
#endif
diff --git a/ibmLib.tmpl b/ibmLib.tmpl
index 968fe35..e943160 100644
--- a/ibmLib.tmpl
+++ b/ibmLib.tmpl
@@ -5,7 +5,7 @@ XCOMM $XdotOrg: ibmLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
* AIX shared library template
*/
-XCOMM $XFree86: xc/config/cf/ibmLib.tmpl,v 1.4 2003/05/27 21:56:40 tsi Exp $
+XCOMM $XFree86: xc/config/cf/ibmLib.tmpl,v 1.3tsi Exp $
/*
* IBM used an unusual shared object file name in some libraries.
diff --git a/isc.cf b/isc.cf
index 45f0f87..11bf737 100644
--- a/isc.cf
+++ b/isc.cf
@@ -2,7 +2,7 @@ XCOMM $Xorg: isc.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-XCOMM platform: $XFree86: xc/config/cf/isc.cf,v 3.16 2001/01/17 16:22:32 dawes Exp $
+XCOMM platform: $XFree86: xc/config/cf/isc.cf,v 3.15 1999/07/10 12:17:09 dawes Exp $
#ifndef HasGcc2
#define HasGcc2 YES
diff --git a/linux.cf b/linux.cf
index 80c5bed..85d4185 100644
--- a/linux.cf
+++ b/linux.cf
@@ -5,7 +5,7 @@ XCOMM platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.221 2004/01/09 00:35:00 dawes Exp $
+XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.220 2003/12/30 22:38:33 tsi Exp $
#ifndef LinuxElfDefault
# define LinuxElfDefault YES
diff --git a/lnxLib.rules b/lnxLib.rules
index 05ae646..3035b5e 100644
--- a/lnxLib.rules
+++ b/lnxLib.rules
@@ -1,5 +1,5 @@
XCOMM $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.53 2004/01/27 01:37:39 dawes Exp $
+XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $
/*
* Linux shared library rules (DLL & ELF versions)
diff --git a/lnxLib.tmpl b/lnxLib.tmpl
index 5928183..8794884 100644
--- a/lnxLib.tmpl
+++ b/lnxLib.tmpl
@@ -1,5 +1,5 @@
XCOMM $Xorg: lnxLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.20 2003/11/04 01:59:31 dawes Exp $
+XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $
/*
* Linux shared library template
diff --git a/lnxdoc.rules b/lnxdoc.rules
index 2063a00..1fd5e26 100644
--- a/lnxdoc.rules
+++ b/lnxdoc.rules
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/lnxdoc.rules,v 3.28 2003/10/18 02:14:21 dawes Exp $
+XCOMM $XFree86: xc/config/cf/lnxdoc.rules,v 3.27 2003/01/15 03:17:29 dawes Exp $
XCOMM
XCOMM Rules for formatting Linuxdoc-SGML documentation
XCOMM
diff --git a/lnxdoc.tmpl b/lnxdoc.tmpl
index e8e7836..32a2df0 100644
--- a/lnxdoc.tmpl
+++ b/lnxdoc.tmpl
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/lnxdoc.tmpl,v 3.12 2003/04/23 15:43:29 tsi Exp $
+XCOMM $XFree86: xc/config/cf/lnxdoc.tmpl,v 3.11tsi Exp $
XCOMM
#ifndef HasSgmlFmt
diff --git a/lynx.cf b/lynx.cf
index dab43c6..385bf8a 100644
--- a/lynx.cf
+++ b/lynx.cf
@@ -3,7 +3,7 @@ XCOMM $Xorg: lynx.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-XCOMM platform: $XFree86: xc/config/cf/lynx.cf,v 3.48 2004/01/09 00:35:00 dawes Exp $
+XCOMM platform: $XFree86: xc/config/cf/lynx.cf,v 3.47 2003/04/24 22:14:53 herrb Exp $
#ifndef OSName
diff --git a/mach.cf b/mach.cf
index 4489ee6..8dc8a53 100644
--- a/mach.cf
+++ b/mach.cf
@@ -2,7 +2,7 @@ XCOMM $Xorg: mach.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-XCOMM platform: $XFree86: xc/config/cf/mach.cf,v 3.13 2001/04/19 19:54:43 dawes Exp $
+XCOMM platform: $XFree86: xc/config/cf/mach.cf,v 3.12 2001/01/17 16:22:32 dawes Exp $
#define OSName Mach 2.5/3.0
#define OSVendor /**/
diff --git a/minix.cf b/minix.cf
index ff77d0e..a779b72 100644
--- a/minix.cf
+++ b/minix.cf
@@ -2,7 +2,7 @@ XCOMM $Xorg: minix.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-XCOMM platform: $XFree86: xc/config/cf/minix.cf,v 3.6 2001/01/17 16:22:32 dawes Exp $
+XCOMM platform: $XFree86: xc/config/cf/minix.cf,v 3.5 1999/07/10 07:24:33 dawes Exp $
/*
diff --git a/ncr.cf b/ncr.cf
index a59238e..64dfdb0 100644
--- a/ncr.cf
+++ b/ncr.cf
@@ -3,7 +3,7 @@ XCOMM platform: $Xorg: ncr.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-XCOMM platform: $XFree86: xc/config/cf/ncr.cf,v 3.21 2001/01/23 23:31:49 dawes Exp $
+XCOMM platform: $XFree86: xc/config/cf/ncr.cf,v 3.20 2001/01/17 16:22:32 dawes Exp $
#ifndef OSName
#define OSName Unix System V Release 4/MP-RAS
diff --git a/necLib.rules b/necLib.rules
index f01d60c..713ebdd 100644
--- a/necLib.rules
+++ b/necLib.rules
@@ -4,7 +4,7 @@ XCOMM $Xorg: necLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
* NECOS shared library rules
*/
-XCOMM $XFree86: xc/config/cf/necLib.rules,v 1.3 2001/01/17 16:22:32 dawes Exp $
+XCOMM $XFree86: xc/config/cf/necLib.rules,v 1.2 1999/01/11 05:13:07 dawes Exp $
#ifndef HasSharedLibraries
#define HasSharedLibraries YES
diff --git a/nto.cf b/nto.cf
index 5978f7d..8e98a42 100644
--- a/nto.cf
+++ b/nto.cf
@@ -1,4 +1,4 @@
-/* $XFree86: xc/config/cf/nto.cf,v 1.4 2001/11/16 16:47:50 dawes Exp $ */
+/* $XFree86: xc/config/cf/nto.cf,v 1.3 2000/07/07 20:06:56 tsi Exp $ */
/* Get X to build using the gcc toolchain, self hosted RTP x86 */
/* Let us try to separate the x86 stuff out of here as well... */
diff --git a/nto.rules b/nto.rules
index 857410a..fbf11ad 100644
--- a/nto.rules
+++ b/nto.rules
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/nto.rules,v 1.8 2003/10/11 09:40:15 herrb Exp $
+XCOMM $XFree86: xc/config/cf/nto.rules,v 1.7 2003/10/09 22:43:18 herrb Exp $
XCOMM Rules for QNX/Neutrino
XCOMM Note that some of these will disappear when we stop cross-compiling
diff --git a/os2.cf b/os2.cf
index 95cf9eb..68d051a 100644
--- a/os2.cf
+++ b/os2.cf
@@ -2,7 +2,7 @@ XCOMM $Xorg: os2.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM platform: $XFree86: xc/config/cf/os2.cf,v 3.41 2003/11/14 02:17:19 dawes Exp $
+XCOMM platform: $XFree86: xc/config/cf/os2.cf,v 3.40 2003/06/10 17:03:50 dawes Exp $
XCOMM hv: This file will now require a compiler that defines
XCOMM hv: the symbol __UNIXOS2__ (currently a modified EMX gcc,
diff --git a/os2.rules b/os2.rules
index c5a5e8d..a5f26ac 100644
--- a/os2.rules
+++ b/os2.rules
@@ -2,7 +2,7 @@ XCOMM $Xorg: os2.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM platform: $XFree86: xc/config/cf/os2.rules,v 3.24 2003/10/21 17:41:44 tsi Exp $
+XCOMM platform: $XFree86: xc/config/cf/os2.rules,v 3.23tsi Exp $
.SUFFIXES: .Osuf .c .CCsuf
diff --git a/os2Lib.rules b/os2Lib.rules
index 6f8e835..decbd72 100644
--- a/os2Lib.rules
+++ b/os2Lib.rules
@@ -2,7 +2,7 @@ XCOMM $Xorg: os2Lib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/os2Lib.rules,v 3.20 2003/11/12 00:10:23 dawes Exp $
+XCOMM $XFree86: xc/config/cf/os2Lib.rules,v 3.19 2003/10/11 09:40:15 herrb Exp $
/*
* OS2/EMX shared library rules (DLL version)
diff --git a/os2Lib.tmpl b/os2Lib.tmpl
index 4d40515..f6813f8 100644
--- a/os2Lib.tmpl
+++ b/os2Lib.tmpl
@@ -3,7 +3,7 @@ XCOMM $Xorg: os2Lib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.19 2003/11/29 01:51:31 dawes Exp $
+XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.18 2003/11/12 00:10:23 dawes Exp $
/*
* OS2/EMX shared library template
diff --git a/os2def.db b/os2def.db
index d3d2f31..e5e0a13 100644
--- a/os2def.db
+++ b/os2def.db
@@ -5120,6 +5120,7 @@ freetype FT_Get_BDF_Property 157
freetype FT_Activate_Size 158
freetype FT_Get_X11_Font_Format 159
freetype FT_Get_BDF_Charset_ID 160
+freetype FT_Get_Postscript_Name 161
LIBRARY XTrap XTrap
XTrap XEAddEventCB 1
XTrap XEAddEventCBs 2
diff --git a/osf1.cf b/osf1.cf
index 397f94c..ef4c5b8 100644
--- a/osf1.cf
+++ b/osf1.cf
@@ -3,7 +3,7 @@ XCOMM platform: $Xorg: osf1.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM platform: $XFree86: xc/config/cf/osf1.cf,v 3.9 2001/03/02 02:45:33 dawes Exp $
+XCOMM platform: $XFree86$
#ifndef OSName
# define OSName DefaultOSName
diff --git a/osfLib.rules b/osfLib.rules
index 71a2d69..7f9a386 100644
--- a/osfLib.rules
+++ b/osfLib.rules
@@ -4,7 +4,7 @@ XCOMM $Xorg: osfLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
* OSF/1 shared library rules
*/
-XCOMM $XFree86: xc/config/cf/osfLib.rules,v 1.3 2001/01/17 16:22:32 dawes Exp $
+XCOMM $XFree86: xc/config/cf/osfLib.rules,v 1.2 1999/01/11 05:13:08 dawes Exp $
#ifndef HasSharedLibraries
#define HasSharedLibraries YES
diff --git a/osfLib.tmpl b/osfLib.tmpl
index 92300f3..5d8e853 100644
--- a/osfLib.tmpl
+++ b/osfLib.tmpl
@@ -4,7 +4,7 @@ XCOMM $Xorg: osfLib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
* OSF/1 shared library template
*/
-XCOMM $XFree86: xc/config/cf/osfLib.tmpl,v 1.4 2003/05/27 21:56:40 tsi Exp $
+XCOMM $XFree86: xc/config/cf/osfLib.tmpl,v 1.3tsi Exp $
#if ThreadedX && ModernOSF1
#if OSMajorVersion < 4
diff --git a/sco.cf b/sco.cf
index 1db678f..1cbbd7a 100644
--- a/sco.cf
+++ b/sco.cf
@@ -1,5 +1,5 @@
XCOMM platform: $Xorg: sco.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM platform: $XFree86: xc/config/cf/sco.cf,v 3.14 2001/01/17 16:22:33 dawes Exp $
+XCOMM platform: $XFree86: xc/config/cf/sco.cf,v 3.13 1997/05/24 13:46:28 dawes Exp $
/*
* This is sco.cf, for SCO Open Server 5.0.2 and SCO UNIX.
diff --git a/sco5.cf b/sco5.cf
index 43f0367..a8d56fc 100644
--- a/sco5.cf
+++ b/sco5.cf
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.16 2004/01/07 04:30:27 dawes Exp $
+XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.15 2003/12/19 02:05:37 dawes Exp $
XCOMM $XdotOrg: xc/config/cf/sco5.cf,v 1.1.4.2 2003/12/20 00:28:21 kaleb Exp $
/*
diff --git a/scoLib.rules b/scoLib.rules
index 070ba57..05bdf3a 100644
--- a/scoLib.rules
+++ b/scoLib.rules
@@ -1,6 +1,6 @@
XCOMM $XdotOrg: xc/config/cf/scoLib.rules,v 1.1.4.2 2003/12/20 00:28:21 kaleb Exp $
XCOMM $Xorg: scoLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/scoLib.rules,v 1.11 2004/01/07 04:30:28 dawes Exp $
+XCOMM $XFree86: xc/config/cf/scoLib.rules,v 1.10 2003/12/18 16:38:34 dawes Exp $
#ifndef UseExportLists
# define UseExportLists NO
diff --git a/sgi.cf b/sgi.cf
index 270f85a..2673198 100644
--- a/sgi.cf
+++ b/sgi.cf
@@ -1,5 +1,5 @@
XCOMM platform: $Xorg: sgi.cf,v 1.4 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/sgi.cf,v 1.13 2003/10/21 17:41:44 tsi Exp $
+XCOMM $XFree86: xc/config/cf/sgi.cf,v 1.12tsi Exp $
#ifndef OSName
# define OSName DefaultOSName
diff --git a/sgiLib.rules b/sgiLib.rules
index e9e575d..2d5cd7d 100644
--- a/sgiLib.rules
+++ b/sgiLib.rules
@@ -1,5 +1,5 @@
XCOMM $Xorg: sgiLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/sgiLib.rules,v 1.4 2001/01/17 16:22:33 dawes Exp $
+XCOMM $XFree86: xc/config/cf/sgiLib.rules,v 1.3 2000/06/15 20:49:56 dawes Exp $
#ifndef HasSharedLibraries
#define HasSharedLibraries YES
diff --git a/sgiLib.tmpl b/sgiLib.tmpl
index 3648c9b..7ef4f14 100644
--- a/sgiLib.tmpl
+++ b/sgiLib.tmpl
@@ -3,7 +3,7 @@ XCOMM $Xorg: sgiLib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/sgiLib.tmpl,v 3.4 2003/05/27 22:26:20 tsi Exp $
+XCOMM $XFree86: xc/config/cf/sgiLib.tmpl,v 3.3tsi Exp $
/*
* SGI shared library template
diff --git a/site.def b/site.def
index 6a5d2f8..aba2359 100644
--- a/site.def
+++ b/site.def
@@ -21,7 +21,7 @@ XCOMM site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $
* .cf file, not overridden in site.def. *
* *
***************************************************************************/
-XCOMM site: $XFree86: xc/config/cf/site.def,v 3.25 2002/02/27 00:51:12 dawes Exp $
+XCOMM site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $
/* if you want host-specific customization, this is one way to do it */
/*
diff --git a/sun.cf b/sun.cf
index 71542f5..e0a63a7 100644
--- a/sun.cf
+++ b/sun.cf
@@ -4,7 +4,7 @@ XCOMM platform: $Xorg: sun.cf,v 1.4 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM platform: $XFree86: xc/config/cf/sun.cf,v 3.71 2004/02/02 03:55:26 dawes Exp $
+XCOMM platform: $XFree86: xc/config/cf/sun.cf,v 3.70 2004/01/13 02:42:51 tsi Exp $
#ifndef OSName
# define OSName DefaultOSName
diff --git a/sunLib.rules b/sunLib.rules
index 8fb82cf..11256b2 100644
--- a/sunLib.rules
+++ b/sunLib.rules
@@ -4,7 +4,7 @@ XCOMM $Xorg: sunLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
* SunOS shared library rules
*/
-XCOMM $XFree86: xc/config/cf/sunLib.rules,v 1.4 2001/05/28 02:42:25 tsi Exp $
+XCOMM $XFree86: xc/config/cf/sunLib.rules,v 1.3 2001/01/17 16:38:49 dawes Exp $
#ifndef HasSharedLibraries
#define HasSharedLibraries YES
diff --git a/sunLib.tmpl b/sunLib.tmpl
index b26bf78..ce01525 100644
--- a/sunLib.tmpl
+++ b/sunLib.tmpl
@@ -4,7 +4,7 @@ XCOMM $Xorg: sunLib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/sunLib.tmpl,v 3.13 2003/07/11 22:17:41 tsi Exp $
+XCOMM $XFree86: xc/config/cf/sunLib.tmpl,v 3.12tsi Exp $
/*
* SunOS shared library template
diff --git a/sv3Lib.rules b/sv3Lib.rules
index 21e1745..00c1d7d 100644
--- a/sv3Lib.rules
+++ b/sv3Lib.rules
@@ -2,7 +2,7 @@ XCOMM $Xorg: sv3Lib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/sv3Lib.rules,v 3.6 2003/04/14 20:35:50 herrb Exp $
+XCOMM $XFree86: xc/config/cf/sv3Lib.rules,v 3.5 2002/11/22 22:55:56 tsi Exp $
/*
* SVR3 shared library rules
* Copyright (c) 1992, 1993 by Thomas Wolfram, Berlin, Germany
diff --git a/sv3Lib.tmpl b/sv3Lib.tmpl
index 71c62d9..c9fd323 100644
--- a/sv3Lib.tmpl
+++ b/sv3Lib.tmpl
@@ -2,7 +2,7 @@ XCOMM $Xorg: sv3Lib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/sv3Lib.tmpl,v 3.3 2003/04/14 20:35:50 herrb Exp $
+XCOMM $XFree86: xc/config/cf/sv3Lib.tmpl,v 3.2 2001/01/17 16:38:49 dawes Exp $
/*
* SVR3 shared library template
* Copyright (c) 1992, 1993 by Thomas Wolfram, Berlin, Germany
diff --git a/sv4Lib.rules b/sv4Lib.rules
index 1d13eb9..803d9d5 100644
--- a/sv4Lib.rules
+++ b/sv4Lib.rules
@@ -4,7 +4,7 @@ XCOMM $Xorg: sv4Lib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
* SVR4 shared library rules
*/
-XCOMM $XFree86: xc/config/cf/sv4Lib.rules,v 3.9 2002/11/22 22:55:56 tsi Exp $
+XCOMM $XFree86: xc/config/cf/sv4Lib.rules,v 3.8tsi Exp $
#ifndef HasSharedLibraries
# define HasSharedLibraries YES
diff --git a/sv4Lib.tmpl b/sv4Lib.tmpl
index ffd730c..a0d2e48 100644
--- a/sv4Lib.tmpl
+++ b/sv4Lib.tmpl
@@ -4,7 +4,7 @@ XCOMM $Xorg: sv4Lib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
* SVR4 shared library template
*/
-XCOMM $XFree86: xc/config/cf/sv4Lib.tmpl,v 3.8 2003/11/04 01:25:31 dawes Exp $
+XCOMM $XFree86: xc/config/cf/sv4Lib.tmpl,v 3.7 2003/05/29 21:56:57 herrb Exp $
/* SVR4 shared libraries are deficient in link semantics */
XMULIBONLY = -lXmu
diff --git a/svr3.cf b/svr3.cf
index dccbe37..207e0b5 100644
--- a/svr3.cf
+++ b/svr3.cf
@@ -2,7 +2,7 @@ XCOMM $Xorg: svr3.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/svr3.cf,v 3.16 2004/01/09 00:35:00 dawes Exp $
+XCOMM $XFree86: xc/config/cf/svr3.cf,v 3.15 2002/08/19 03:16:31 tsi Exp $
#ifndef HasGcc
#define HasGcc YES
diff --git a/svr4.cf b/svr4.cf
index be9ebda..26f773b 100644
--- a/svr4.cf
+++ b/svr4.cf
@@ -2,7 +2,7 @@ XCOMM $Xorg: svr4.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.51 2004/01/07 04:28:01 dawes Exp $
+XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.50 2003/11/04 01:25:31 dawes Exp $
/*
* A default OS name
*/
diff --git a/ultrix.cf b/ultrix.cf
index 75c86fa..b3bf357 100644
--- a/ultrix.cf
+++ b/ultrix.cf
@@ -2,7 +2,7 @@ XCOMM platform: $Xorg: ultrix.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/ultrix.cf,v 1.2 2002/11/14 21:01:14 tsi Exp $
+XCOMM $XFree86$
#ifndef OSName
# define OSName DefaultOSName
diff --git a/usl.cf b/usl.cf
index 95fdfed..60a8f23 100644
--- a/usl.cf
+++ b/usl.cf
@@ -3,7 +3,7 @@ XCOMM platform: $Xorg: usl.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM platform: $XFree86: xc/config/cf/usl.cf,v 3.23 2001/01/17 16:38:50 dawes Exp $
+XCOMM platform: $XFree86: xc/config/cf/usl.cf,v 3.22 2001/01/12 19:28:24 dawes Exp $
#ifndef OSName
# define OSName DefaultOSName
diff --git a/xf86.rules b/xf86.rules
index a7c30e1..0931d7e 100644
--- a/xf86.rules
+++ b/xf86.rules
@@ -3,7 +3,7 @@ XCOMM $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/xf86.rules,v 3.35 2003/09/01 21:20:01 tsi Exp $
+XCOMM $XFree86: xc/config/cf/xf86.rules,v 3.34tsi Exp $
/*
* Rules needed to build the XFree86 X Servers
diff --git a/xf86.tmpl b/xf86.tmpl
index d33ecaa..770a11f 100644
--- a/xf86.tmpl
+++ b/xf86.tmpl
@@ -2,7 +2,7 @@ XCOMM $Xorg: xf86.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/xf86.tmpl,v 3.33 2002/12/16 23:01:43 herrb Exp $
+XCOMM $XFree86: xc/config/cf/xf86.tmpl,v 3.32 2002/11/14 21:01:14 tsi Exp $
#ifdef BuilderEMailAddr
BUILDERADDR = BuilderEMailAddr
diff --git a/xf86site.def b/xf86site.def
index fbb91ad..3125d30 100644
--- a/xf86site.def
+++ b/xf86site.def
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.187 2003/09/06 23:38:04 dawes Exp $
+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
diff --git a/xfree86.cf b/xfree86.cf
index fb720eb..1891043 100644
--- a/xfree86.cf
+++ b/xfree86.cf
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.467 2004/01/28 01:47:26 dawes Exp $
+XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.466 2004/01/11 18:48:11 dawes Exp $
/*
* This configuration file contains all of the configuration
* information for the XFree86 based X Servers.
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 21:25:29 +0000