22. Fixed typo that prevented the changelog date to be set correctly in

    xf86Build.h (Egbert Eich).

5 files changed, 86 insertions, 38 deletions

diff --git a/hw/xfree86/getconfig/cfg.man.pre b/hw/xfree86/getconfig/cfg.man.pre
index e0e2b11b0..6452a9143 100644
--- a/hw/xfree86/getconfig/cfg.man.pre
+++ b/hw/xfree86/getconfig/cfg.man.pre
@@ -28,7 +28,7 @@ the file format version number.  The signature string is
 .PP
 .RS 4
 .nf
-"XFree86 getconfig rules file.\ \ Version: "
+"Xorg getconfig rules file.\ \ Version: "
 .fi
 .RE
 .PP
@@ -69,12 +69,12 @@ They include:
 .BR "$subsys                 " "PCI subsystem ID"
 .BR "$subsysVendor           " "PCI subsystem vendor ID"
 .BR "$class                  " "PCI class"
-.BR "$XFree86Version         " "XFree86 version, as a 'v' string"
-.BR "$XFree86VersionNumeric  " "XFree86 numeric version"
-.BR "$XFree86VersionMajor    " "XFree86 major version"
-.BR "$XFree86VersionMinor    " "XFree86 minor version"
-.BR "$XFree86VersionPatch    " "XFree86 patch version"
-.BR "$XFree86VersionSnap     " "XFree86 snap version"
+.BR "$XorgVersion         " "Xorg version, as a 'v' string"
+.BR "$XorgVersionNumeric  " "Xorg numeric version"
+.BR "$XorgVersionMajor    " "Xorg major version"
+.BR "$XorgVersionMinor    " "Xorg minor version"
+.BR "$XorgVersionPatch    " "Xorg patch version"
+.BR "$XorgVersionSnap     " "Xorg snap version"
 .BR "$weight                 " "current rule weight"
 .fi
 .RE
@@ -134,4 +134,4 @@ __XCONFIGFILE__(__filemansuffix__).
 The __XSERVERNAME__ automatic configuration support and the
 .B getconfig
 interface was written by David H. Dawes, with the support of X-Oz
-Technologies.
+Technologies for XFree86.
diff --git a/hw/xfree86/getconfig/cfg.sample b/hw/xfree86/getconfig/cfg.sample
index 62d06ad38..93c98e4e2 100644
--- a/hw/xfree86/getconfig/cfg.sample
+++ b/hw/xfree86/getconfig/cfg.sample
@@ -1,14 +1,13 @@
 # $DHD: xc/programs/Xserver/hw/xfree86/getconfig/cfg.sample,v 1.2 2003/09/23 05:12:07 dawes Exp $
-# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/cfg.sample,v 1.1 2003/10/08 14:58:29 dawes Exp $
 
-# Some sample XFree86 getconfig rules file.
+# Some sample Xorg getconfig rules file.
 
 #
 # The line below is the getconfig rules file signature, and must be the
 # first non-blank, non-comment line.
 #
 
-XFree86 Project getconfig rules file.  Version: 1.0
+Xorg Project getconfig rules file.  Version: 1.0
 
 #
 # Set the weight for the following rules.  This should be set, otherwise
@@ -38,15 +37,15 @@ $weight = 1000
 #   $subsys		PCI subsystem ID
 #   $subsysVendor	PCI subsystem vendor ID
 #   $class		PCI class
-#   $XFree86Version	XFree86 version, as a 'v' string.
+#   $XorgVersion	Xorg version, as a 'v' string.
 #
-# The XFree86 version information is also available as the following:
+# The Xorg version information is also available as the following:
 #
-#   $XFree86VersionNumeric
-#   $XFree86VersionMajor
-#   $XFree86VersionMinor
-#   $XFree86VersionPatch
-#   $XFree86VersionSnap
+#   $XorgVersionNumeric
+#   $XorgVersionMajor
+#   $XorgVersionMinor
+#   $XorgVersionPatch
+#   $XorgVersionSnap
 #   
 
 # Define a fake vendor ID for some sample rules.
@@ -67,10 +66,10 @@ $device == $nodevice
 	Option \
 	"yy"
 
-# Increase the weight of the following rules if the XFree86 version is 4.3 or
+# Increase the weight of the following rules if the Xorg version is 4.3 or
 # higher.
 
-$weight++ if ($XFree86Version ge v4.3)
+$weight++ if ($XorgVersion ge v4.3)
 
 $vendor == $novendor
 	nodriver
@@ -83,7 +82,7 @@ $vendor == $novendor
 
 $weight = 100
 
-$vendor == $novendor && $XFree86Version eq v4.3.2.1
+$vendor == $novendor && $XorgVersion eq v4.3.2.1
 	nodriver3
 
 $weight = 600
diff --git a/hw/xfree86/getconfig/getconfig.man.pre b/hw/xfree86/getconfig/getconfig.man.pre
index 444f0504d..f6146c110 100644
--- a/hw/xfree86/getconfig/getconfig.man.pre
+++ b/hw/xfree86/getconfig/getconfig.man.pre
@@ -94,4 +94,4 @@ __XCONFIGFILE__(__filemansuffix__).
 The __XSERVERNAME__ automatic configuration support and the
 .B getconfig
 interface was written by David H. Dawes, with the support of X-Oz
-Technologies.
+Technologies for XFree86.
diff --git a/hw/xfree86/getconfig/getconfig.pl b/hw/xfree86/getconfig/getconfig.pl
index fcfd7d057..85caf81f5 100644
--- a/hw/xfree86/getconfig/getconfig.pl
+++ b/hw/xfree86/getconfig/getconfig.pl
@@ -33,7 +33,6 @@
 # Author: David Dawes <dawes@XFree86.Org>.
 #
 
-# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.pl,v 1.1 2003/10/08 14:58:29 dawes Exp $
 
 #
 # This script takes PCI id information, compares it against an ordered list
@@ -52,7 +51,7 @@ $debug = 0;
 $myname = $0;
 $myname =~ s/.*\///;
 
-$signature = "XFree86 Project getconfig rules file.  Version: ";
+$signature = "Xorg Foundation getconfig rules file.  Version: ";
 
 while (@ARGV[0] =~ /^-[A-Za-z]$/) {
     $f = shift;
@@ -70,9 +69,9 @@ while (@ARGV[0] =~ /^-[A-Za-z]$/) {
 	    exit 0;
 	}
 	if ($f eq "-X") {
-	    $XFree86VersionNumeric = shift;
-	    if (!defined($XFree86VersionNumeric)) {
-		print STDERR "$myname: -X requires the XFree86 version.\n";
+	    $XorgVersionNumeric = shift;
+	    if (!defined($XorgVersionNumeric)) {
+		print STDERR "$myname: -X requires the Xorg version.\n";
 		exit 1;
 	    }
 	}
@@ -129,21 +128,21 @@ while (@ARGV[0] =~ /^-[A-Za-z]$/) {
 
 printf STDERR "$myname: Version %vd.\n", $GetconfigVersion;
 
-if (defined($XFree86VersionNumeric)) {
-    $XFree86VersionMajor = $XFree86VersionNumeric / 10000000;
-    $XFree86VersionMinor = ($XFree86VersionNumeric % 10000000) / 100000;
-    $XFree86VersionPatch = ($XFree86VersionNumeric % 100000) / 1000;
-    $XFree86VersionSnapshot = $XFree86VersionNumeric % 1000;
-    $XFree86Version = chr($XFree86VersionMajor) . chr($XFree86VersionMinor) .
-		chr($XFree86VersionPatch) . chr($XFree86VersionSnapshot);
+if (defined($XorgVersionNumeric)) {
+    $XorgVersionMajor = $XorgVersionNumeric / 10000000;
+    $XorgVersionMinor = ($XorgVersionNumeric % 10000000) / 100000;
+    $XorgVersionPatch = ($XorgVersionNumeric % 100000) / 1000;
+    $XorgVersionSnapshot = $XorgVersionNumeric % 1000;
+    $XorgVersion = chr($XorgVersionMajor) . chr($XorgVersionMinor) .
+		chr($XorgVersionPatch) . chr($XorgVersionSnapshot);
 }
 
 if ($debug) {
-    printf STDERR "$myname: XFree86 Version: %d, %d.%d.%d.%d, %vd.\n",
-	$XFree86VersionNumeric, $XFree86VersionMajor, $XFree86VersionMinor,
-	$XFree86VersionPatch, $XFree86VersionSnapshot, $XFree86Version;
+    printf STDERR "$myname: Xorg Version: %d, %d.%d.%d.%d, %vd.\n",
+	$XorgVersionNumeric, $XorgVersionMajor, $XorgVersionMinor,
+	$XorgVersionPatch, $XorgVersionSnapshot, $XorgVersion;
 } else {
-    printf STDERR "$myname: XFree86 Version: %vd.\n", $XFree86Version;
+    printf STDERR "$myname: Xorg Version: %vd.\n", $XorgVersion;
 }
   
 
diff --git a/hw/xfree86/getconfig/xorg.cfg b/hw/xfree86/getconfig/xorg.cfg
new file mode 100644
index 000000000..2b2d58afb
--- /dev/null
+++ b/hw/xfree86/getconfig/xorg.cfg
@@ -0,0 +1,50 @@
+# $DHD: xc/programs/Xserver/hw/xfree86/getconfig/xfree86.cfg,v 1.4 2003/09/23 05:12:07 dawes Exp $
+
+# Base Xorg getconfig rules file.
+
+#
+# The line below is the getconfig rules file signature, and must be the
+# first non-blank, non-comment line.
+#
+
+Xorg Project getconfig rules file.  Version: 1.0
+
+#
+# Set the weight for the following rules.  This should be set, otherwise
+# the previously set weight will get used, and you have no idea of knowing
+# what that might be.
+#
+
+$weight = 1000
+
+#
+# Rules.  Rules consist of a condition (in perl code) followed by
+# a driver name and optionally some additional strings.  The start of a
+# rule is indicated by a line with no leading white space.  subsequent
+# lines making up a rule must be indented.  Logical lines may be split
+# over multiple physical lines by using the usual continuation '\'.
+#
+# Rules that are not followed by a driver name may be used to do other
+# things, like setting the weight as above.
+#
+
+#
+# Pre-defined variables include:
+#
+#   $vendor		PCI vendor ID
+#   $device		PCI device ID
+#   $revision		PCI revision ID
+#   $subsys		PCI subsystem ID
+#   $subsysVendor	PCI subsystem vendor ID
+#   $class		PCI class
+#   $XorgVersion	Xorg version, as a 'v' string.
+#
+# The Xorg version information is also available as the following:
+#
+#   $XorgVersionNumeric
+#   $XorgVersionMajor
+#   $XorgVersionMinor
+#   $XorgVersionPatch
+#   $XorgVersionSnap
+#   
+