Merge branch 'sunweaver-pr/clean-up-old-vcs-comments' into 3.6.x

Attributes GH PR #254: https://github.com/ArcticaProject/nx-libs/pull/254

21 files changed, 2 insertions, 91 deletions

diff --git a/nx-X11/config/Imakefile b/nx-X11/config/Imakefile
index 305b87107..1cf85aac8 100644
--- a/nx-X11/config/Imakefile
+++ b/nx-X11/config/Imakefile
@@ -1,5 +1,3 @@
-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:45 cpqbld Exp $
-XCOMM $XFree86: xc/config/Imakefile,v 1.3 2001/01/17 16:22:29 dawes Exp $
 #define IHaveSubdirs
 #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
 
diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf
index 76e4664aa..8decfdc3c 100644
--- a/nx-X11/config/cf/Imake.cf
+++ b/nx-X11/config/cf/Imake.cf
@@ -1,5 +1,3 @@
-XCOMM $XdotOrg: xc/config/cf/Imake.cf,v 1.12 2005/11/08 06:33:24 jkj Exp $
-XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $
 /*
  * To add support for another platform:
  * 
@@ -18,7 +16,6 @@ XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $
  *
  *     4.  Create a .cf file with the name given by MacroFile.
  */
-XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $
 
 #if defined(__APPLE__)
 # undef __APPLE__
diff --git a/nx-X11/config/cf/Imake.rules b/nx-X11/config/cf/Imake.rules
index 7fffe5e31..fb6df65ce 100644
--- a/nx-X11/config/cf/Imake.rules
+++ b/nx-X11/config/cf/Imake.rules
@@ -1,12 +1,6 @@
 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: xc/config/cf/Imake.rules,v 1.11 2005/11/08 06:33:24 jkj Exp $
-XCOMM
-XCOMM
-XCOMM
-XCOMM
-XCOMM rules:  $XFree86: xc/config/cf/Imake.rules,v 3.128 2003/11/15 03:25:17 dawes Exp $
+XCOMM ---------------------------------------------------------------------
 
 /*
  *		   MACHINE-INDEPENDENT RULES; DO NOT MODIFY
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index 7ddd6d936..0545f1094 100644
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -1,12 +1,5 @@
 XCOMM ----------------------------------------------------------------------
 XCOMM Makefile generated from IMAKE_TEMPLATE and INCLUDE_IMAKEFILE
-XCOMM $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $
-XCOMM $XdotOrg: xc/config/cf/Imake.tmpl,v 1.16 2005/11/08 06:33:24 jkj Exp $
-XCOMM
-XCOMM
-XCOMM
-XCOMM
-XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.155 2003/12/24 18:58:41 dickey Exp $
 XCOMM ----------------------------------------------------------------------
 
 /*
diff --git a/nx-X11/config/cf/Imakefile b/nx-X11/config/cf/Imakefile
index a36adf323..714a865c9 100644
--- a/nx-X11/config/cf/Imakefile
+++ b/nx-X11/config/cf/Imakefile
@@ -1,6 +1,3 @@
-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/Imakefile,v 3.29 2002/10/16 14:07:49 tsi Exp $
-
 XCOMM Some compilers generate fatal errors if an -L directory does
 XCOMM not exist.  Since BUILDLIBDIR may not exist yet suppress its use.
          LDPRELIB =
diff --git a/nx-X11/config/cf/Library.tmpl b/nx-X11/config/cf/Library.tmpl
index 95a9207fb..a5c9dc2a3 100644
--- a/nx-X11/config/cf/Library.tmpl
+++ b/nx-X11/config/cf/Library.tmpl
@@ -14,13 +14,6 @@
  * Define LargePICTable YES if large (32-bit) PIC tables are needed.
  */
 
-XCOMM $Xorg: Library.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
-
-
-
-
-XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.23tsi Exp $
-
 #ifndef DoNormalLib
 #define DoNormalLib NO
 #endif
diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README
index 75fa4767c..27c2386a4 100644
--- a/nx-X11/config/cf/README
+++ b/nx-X11/config/cf/README
@@ -1,10 +1,3 @@
-$Xorg: README,v 1.4 2000/08/18 04:03:58 coskrey Exp $
-
-
-
-
-$XFree86: xc/config/cf/README,v 1.20 2003/04/14 20:35:50 herrb Exp $
-
 The easiest way to write an Imakefile is to find another one that does
 something similar and copy/modify it!
 
diff --git a/nx-X11/config/cf/Server.tmpl b/nx-X11/config/cf/Server.tmpl
index 3ada3087b..ffdca6811 100644
--- a/nx-X11/config/cf/Server.tmpl
+++ b/nx-X11/config/cf/Server.tmpl
@@ -1,11 +1,8 @@
-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.
  */
 
-XCOMM $Xorg: Server.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
-
 #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" LDSTRIPFLAGS="$(LDSTRIPFLAGS)"
 
 #ifndef ServerCcCmd
diff --git a/nx-X11/config/cf/ServerLib.tmpl b/nx-X11/config/cf/ServerLib.tmpl
index 18a76746d..66c83b83d 100644
--- a/nx-X11/config/cf/ServerLib.tmpl
+++ b/nx-X11/config/cf/ServerLib.tmpl
@@ -1,4 +1,3 @@
-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/nx-X11/config/cf/Threads.tmpl b/nx-X11/config/cf/Threads.tmpl
index bb0a7e805..d2d6f6d1c 100644
--- a/nx-X11/config/cf/Threads.tmpl
+++ b/nx-X11/config/cf/Threads.tmpl
@@ -1,9 +1,3 @@
-XCOMM $Xorg: Threads.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
-
-
-
-XCOMM $XFree86: xc/config/cf/Threads.tmpl,v 3.3tsi Exp $
-
 /*
  * For a multi-threaded application or library,
  * Define LocalThreadsDefines in your Imakefile (unless you like the
diff --git a/nx-X11/config/cf/X11.rules b/nx-X11/config/cf/X11.rules
index 51ae38c7d..0f6a67ed4 100644
--- a/nx-X11/config/cf/X11.rules
+++ b/nx-X11/config/cf/X11.rules
@@ -1,8 +1,3 @@
-XCOMM $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld 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
 # define SeenTopLevelProject	YES
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index 45a383935..33d108d06 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -1,12 +1,6 @@
 XCOMM ----------------------------------------------------------------------
 XCOMM X Window System Build Parameters and Rules
-XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.54 2005/12/14 23:41:52 alanc Exp $
-XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $
-XCOMM
-XCOMM
-XCOMM
-XCOMM
-XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $
+XCOMM ----------------------------------------------------------------------
 
 /***************************************************************************
  *                                                                         *
diff --git a/nx-X11/config/cf/cross.rules b/nx-X11/config/cf/cross.rules
index da02643af..fe8d119ab 100644
--- a/nx-X11/config/cf/cross.rules
+++ b/nx-X11/config/cf/cross.rules
@@ -1,5 +1,3 @@
-XCOMM $XFree86: xc/config/cf/cross.rules,v 1.7 2002/04/04 14:05:33 eich Exp $
-
 #ifndef HostCcCmd
 #define HostCcCmd cc
 #endif
diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf
index 37be61534..085984165 100644
--- a/nx-X11/config/cf/linux.cf
+++ b/nx-X11/config/cf/linux.cf
@@ -1,12 +1,3 @@
-XCOMM $XdotOrg: xc/config/cf/linux.cf,v 1.31 2005/10/21 19:10:27 ajax Exp $
-XCOMM platform:  $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-
-
-
-
-
-XCOMM platform:  $XFree86: xc/config/cf/linux.cf,v 3.220 2003/12/30 22:38:33 tsi Exp $
-
 #ifndef LinuxElfDefault
 # define LinuxElfDefault	YES
 #endif
diff --git a/nx-X11/config/cf/lnxLib.rules b/nx-X11/config/cf/lnxLib.rules
index b8a67e2b7..166e896f1 100644
--- a/nx-X11/config/cf/lnxLib.rules
+++ b/nx-X11/config/cf/lnxLib.rules
@@ -1,6 +1,3 @@
-XCOMM $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $
-
 /*
  * Linux shared library rules (DLL & ELF versions)
  */
diff --git a/nx-X11/config/cf/lnxLib.tmpl b/nx-X11/config/cf/lnxLib.tmpl
index a6e7f48d3..6748579cf 100644
--- a/nx-X11/config/cf/lnxLib.tmpl
+++ b/nx-X11/config/cf/lnxLib.tmpl
@@ -1,6 +1,3 @@
-XCOMM $Xorg: lnxLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld 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/nx-X11/config/cf/site.def b/nx-X11/config/cf/site.def
index 7f2053cb2..f5e769278 100644
--- a/nx-X11/config/cf/site.def
+++ b/nx-X11/config/cf/site.def
@@ -1,5 +1,3 @@
-XCOMM site:  $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $
-
 /***************************************************************************
  *                                                                         *
  *			   SITE-SPECIFIC DEFINITIONS                       *
@@ -21,7 +19,6 @@ 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.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/nx-X11/config/cf/xf86.rules b/nx-X11/config/cf/xf86.rules
index 3c69445f4..12125fb9b 100644
--- a/nx-X11/config/cf/xf86.rules
+++ b/nx-X11/config/cf/xf86.rules
@@ -1,10 +1,3 @@
-XCOMM $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-
-
-
-XCOMM $XFree86: xc/config/cf/xf86.rules,v 3.34tsi Exp $
-
 /*
  * Rules needed to build the XFree86 X Servers
  */
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index 5ed60e491..f967796f0 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -1,4 +1,3 @@
-XCOMM $XdotOrg: xc/config/cf/xorg.cf,v 1.53 2005/10/03 16:08:44 alanc Exp $
 /*
  * This configuration file contains all of the configuration
  * information for the Xorg based X Servers.
@@ -6,7 +5,6 @@ XCOMM $XdotOrg: xc/config/cf/xorg.cf,v 1.53 2005/10/03 16:08:44 alanc Exp $
  * 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. */
 
diff --git a/nx-X11/config/cf/xorg.tmpl b/nx-X11/config/cf/xorg.tmpl
index a1703b56b..c5f332b3a 100644
--- a/nx-X11/config/cf/xorg.tmpl
+++ b/nx-X11/config/cf/xorg.tmpl
@@ -1,6 +1,3 @@
-XCOMM $Xorg: xf86.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-XCOMM $XdotOrg: xc/config/cf/xorg.tmpl,v 1.5 2005/11/08 06:33:24 jkj Exp $
-
 #ifndef ConfigDefines
 # define ConfigDefines -D__XCONFIGFILE__='"$(XCONFIGFILE)"' \
 	-D__XCONFIGDIR__='"$(XCONFIGDIR)"' -D__XLOGFILE__='"$(XLOGFILE)"' \
diff --git a/nx-X11/config/cf/xorgsite.def b/nx-X11/config/cf/xorgsite.def
index 18fd96dbe..f28bb2b2e 100644
--- a/nx-X11/config/cf/xorgsite.def
+++ b/nx-X11/config/cf/xorgsite.def
@@ -1,4 +1,3 @@
-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