[xorg-commit-diffs] xc/config/util Imakefile, 1.1.4.5, 1.1.4.6 cleanlinks.man, 1.1, 1.1.4.1 gccmakedep.man, 1.1, 1.1.4.1 makedef.cmd, 1.1.4.3, 1.1.4.4 mkhtmlindex.man, 1.1, 1.1.4.1 mkhtmlindex.pl, 1.1.4.1, 1.1.4.2 mkhtmlindex.sh, 1.1.4.2, 1.1.4.3

[Egbert Eich]

Committed by: eich

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

Modified Files:
      Tag: XORG-CURRENT
	Imakefile cleanlinks.man gccmakedep.man makedef.cmd 
	mkhtmlindex.man mkhtmlindex.pl mkhtmlindex.sh 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/config/util/Imakefile,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/Imakefile	5 Mar 2004 13:38:14 -0000	1.1.4.5
+++ b/Imakefile	15 Apr 2004 10:13:11 -0000	1.1.4.6
@@ -109,7 +109,7 @@
 VOLLIST="1:2:3:4:5:6:7:8:9:o:l:n:p"
 MANTITLEPRINTF="%s(%s) manual page"
 MANREFPRINTF="%s.%s.html"
-RMANVERSION="3.0.8+XFree86"
+RMANVERSION="3.0.8+X.Org"
 #if CrossCompiling
 AllTarget(HostProgramTargetName(rman))
 SimpleHostProgramTarget_3(rman)
@@ -117,7 +117,7 @@
 AllTarget(ProgramTargetName(rman))
 SimpleProgramTarget_5(rman)
 #endif
-SpecialCObjectRule(rman,NullParameter,-DVOLLIST='$(VOLLIST)' -DMANTITLEPRINTF='$(MANTITLEPRINTF)' -DMANREFPRINTF='$(MANREFPRINTF)' -DPOLYGLOTMANVERSION='$(RMANVERSION)' -DXFree86)
+SpecialCObjectRule(rman,NullParameter,-DVOLLIST='$(VOLLIST)' -DMANTITLEPRINTF='$(MANTITLEPRINTF)' -DMANREFPRINTF='$(MANREFPRINTF)' -DPOLYGLOTMANVERSION='$(RMANVERSION)' -DXOrg)
 LinkSourceFile(rman.c,$(TOP)/extras/rman)
 LinkFile(rman.man,$(TOP)/extras/rman/rman.1)
 #endif

Index: cleanlinks.man
===================================================================
RCS file: /cvs/xorg/xc/config/util/cleanlinks.man,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/cleanlinks.man	14 Nov 2003 16:48:20 -0000	1.1
+++ b/cleanlinks.man	15 Apr 2004 10:13:11 -0000	1.1.4.1
@@ -21,8 +21,9 @@
 .BR lndir (1).
 .SH AUTHOR
 .PP
-David Dawes wrote the
+The version of the 
 .I cleanlinks
-program for XFree86.
+included in this X.Org Foundation release was originally written 
+by David Dawes wrote as a part of XFree86.
 .PP
 Colin Watson wrote this manual page, originally for the Debian Project.

Index: gccmakedep.man
===================================================================
RCS file: /cvs/xorg/xc/config/util/gccmakedep.man,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/gccmakedep.man	14 Nov 2003 16:48:20 -0000	1.1
+++ b/gccmakedep.man	15 Apr 2004 10:13:11 -0000	1.1.4.1
@@ -116,8 +116,10 @@
 .BR make (1),
 .BR makedepend (1).
 .SH AUTHOR
+The version of the 
 .B gccmakedep
-was written by the XFree86 Project based on code supplied by Hongjiu Lu.
+included in this X.Org Foundation release was originally 
+written by the XFree86 Project based on code supplied by Hongjiu Lu.
 .PP
 Colin Watson wrote this manual page, originally for the Debian Project,
 based partly on the manual page for

Index: makedef.cmd
===================================================================
RCS file: /cvs/xorg/xc/config/util/makedef.cmd,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/makedef.cmd	5 Mar 2004 13:38:14 -0000	1.1.4.3
+++ b/makedef.cmd	15 Apr 2004 10:13:11 -0000	1.1.4.4
@@ -1,8 +1,9 @@
 /* This is OS/2 REXX */
 /* $XFree86: xc/config/util/makedef.cmd,v 1.4 2003/11/12 00:10:24 dawes Exp $
  *
- * This file was taken from Odin32 project and modified to suit
- * XFree86 4.x build process
+ * This file was taken from Odin32 project, modified to suit
+ * XFree86 4.x build process and then modified to suit
+ * the X.org monolithic build process for X11R6.7
  *
  * Generate *os2.def linker definition files for OS/2
  */
@@ -22,13 +23,13 @@
 sASDFeatureId   = '';
 sCountryCode    = '';
 sDateTime       = left(' 'date()' 'time(), 26);
-sDescription    = 'XFree86 4.4';
+sDescription    = 'X.Org 6.7';
 sFixPakVer      = '';
 sHostname       = strip(substr(VALUE('HOSTNAME',,'OS2ENVIRONMENT'), 1, 11));
 sLanguageCode   = '';
 sMiniVer        = '';
-sVendor         = 'XFree86';
-sVersion        = '4.4.0';
+sVendor         = 'X.Org';
+sVersion        = '6.7';
 
 
 /*

Index: mkhtmlindex.man
===================================================================
RCS file: /cvs/xorg/xc/config/util/mkhtmlindex.man,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/mkhtmlindex.man	14 Nov 2003 16:48:20 -0000	1.1
+++ b/mkhtmlindex.man	15 Apr 2004 10:13:11 -0000	1.1.4.1
@@ -20,13 +20,13 @@
 .I mkhtmlindex
 takes only one argument: the directory to process.
 .SH NOTES
-This utility is currently rather specific to XFree86.
+This utility is currently rather specific to X manual pages.
 In particular, the format of the index files it outputs is not configurable,
 nor is the HTML formatting it expects of manual pages.
 .SH AUTHOR
-.PP
-David Dawes wrote the
+The version of the 
 .I mkhtmlindex
-program for XFree86.
+included in this X.Org Foundation release was originally written 
+by David Dawes wrote as a part of XFree86.
 .PP
 Colin Watson wrote this manual page, originally for the Debian Project.

Index: mkhtmlindex.pl
===================================================================
RCS file: /cvs/xorg/xc/config/util/mkhtmlindex.pl,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/mkhtmlindex.pl	5 Mar 2004 13:38:14 -0000	1.1.4.1
+++ b/mkhtmlindex.pl	15 Apr 2004 10:13:11 -0000	1.1.4.2
@@ -43,11 +43,11 @@
 <HTML>
 <HEAD>
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>XFree86[tm] Manual pages: Section $vol</TITLE>
+<TITLE>X.Org Manual pages: Section $vol</TITLE>
 </HEAD>
 <BODY BGCOLOR="#efefef" TEXT="black" LINK="blue" VLINK="#551A8B" ALINK="red">
 
-<H1>XFree86[tm] Manual pages: Section $vol</H1>
+<H1>X.Org Manual pages: Section $vol</H1>
 <P>
 <UL>
 EOF
@@ -57,15 +57,15 @@
 			open(file, "<$dir/$file") || die "Can't open $dir/$file";
 			while (<file>) {
 				chop;
-				if (/^<H2>/) {
-					if (! /<\/H2>$/) {
-						while (<file> && ! /<\/H2>$/) {
+				if (/^<[hH]2>/) {
+					if (! /<\/[hH]2>$/) {
+						while (<file> && ! /<\/[hH]2>$/) {
 							;
 						}
 					}
 					$heading = "";
 					while (<file>) {
-						if (/^<H2>/) {
+						if (/^<[hH]2>/) {
 							last;
 						}
 						$heading = "$heading" . "$_";
@@ -76,7 +76,7 @@
 						($name, $descr) = split(/-/, $heading, 2);
 						$file =~ /(.*)\.$vol\.html/;
 						$fname = $1;
-						$descr =~ s/<[P]>//g;
+						$descr =~ s/<[pP]>//g;
 						print mindex
 							"<LI><A href=\"$file\">$fname</A> - $descr</LI>";
 					}

Index: mkhtmlindex.sh
===================================================================
RCS file: /cvs/xorg/xc/config/util/mkhtmlindex.sh,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/mkhtmlindex.sh	5 Mar 2004 13:38:14 -0000	1.1.4.2
+++ b/mkhtmlindex.sh	15 Apr 2004 10:13:11 -0000	1.1.4.3
@@ -34,11 +34,11 @@
 <HTML>
 <HEAD>
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>XFree86[tm] Manual pages: Section $s</TITLE>
+<TITLE>X.Org Manual pages: Section $s</TITLE>
 </HEAD>
 <BODY BGCOLOR="#efefef" TEXT="black" LINK="blue" VLINK="#551A8B" ALINK="red">
 
-<H1>XFree86[tm] Manual pages: Section $s</H1>
+<H1>X.Org Manual pages: Section $s</H1>
 <P>
 <UL>
 EOF