From fa8f86352aab5825ca289969cfd11d90e56eb579 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Sun, 14 Mar 2004 08:27:28 +0000 Subject: Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 --- imake.c | 2 +- imake.man | 2 +- imakemdep.h | 2 +- makeg.man | 2 +- mdepend.cpp | 2 +- mergelib.man | 2 +- mkdirhier.man | 2 +- mkhtmlindex.pl | 15 ++++++++------- mkhtmlindex.sh | 2 +- revpath.man | 2 +- xmkmf.cpp | 2 +- xmkmf.man | 2 +- 12 files changed, 19 insertions(+), 18 deletions(-) diff --git a/imake.c b/imake.c index 6e3e2f1..0a13425 100644 --- a/imake.c +++ b/imake.c @@ -7,7 +7,7 @@ * be passed to the template file. * * * ***************************************************************************/ -/* $XFree86: xc/config/imake/imake.c,v 3.63tsi Exp $ */ +/* $XFree86: xc/config/imake/imake.c,v 3.64 2003/03/26 20:43:47 tsi Exp $ */ /* * diff --git a/imake.man b/imake.man index 34d5b94..a3b47bf 100644 --- a/imake.man +++ b/imake.man @@ -23,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: imake.man,v 1.8 2001/12/14 19:53:19 dawes Exp $ +.\" $XFree86: xc/config/imake/imake.man,v 1.9 2002/11/20 21:48:46 herrb Exp $ .\" .TH IMAKE 1 __xorgversion__ .SH NAME diff --git a/imakemdep.h b/imakemdep.h index db17752..f272429 100644 --- a/imakemdep.h +++ b/imakemdep.h @@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/imake/imakemdep.h,v 3.71 2003/06/12 14:12:26 eich Exp $ */ +/* $XFree86: xc/config/imake/imakemdep.h,v 3.72 2003/12/30 01:53:52 tsi Exp $ */ /* diff --git a/makeg.man b/makeg.man index 815031d..1259d43 100644 --- a/makeg.man +++ b/makeg.man @@ -24,7 +24,7 @@ .\" from The Open Group. .\" .\" -.\" $XFree86: xc/config/util/makeg.man,v 1.2 2001/01/27 18:19:55 dawes Exp $ +.\" $XFree86: xc/config/util/makeg.man,v 1.3 2001/12/14 19:53:22 dawes Exp $ .\" .TH MAKEG 1 __xorgversion__ .SH NAME diff --git a/mdepend.cpp b/mdepend.cpp index 3d5a252..617051b 100644 --- a/mdepend.cpp +++ b/mdepend.cpp @@ -22,7 +22,7 @@ XCOMM work on both USG and BSD systems. However, when System V.4 comes out, XCOMM USG users will probably have to change "silent" to "-s" instead of XCOMM "-" (at least, that is what the documentation implies). XCOMM -XCOMM $XFree86: xc/config/util/mdepend.cpp,v 3.9 2001/04/26 20:55:10 dawes Exp $ +XCOMM $XFree86: xc/config/util/mdepend.cpp,v 3.10 2001/08/17 13:27:50 dawes Exp $ XCOMM CC=PREPROC diff --git a/mergelib.man b/mergelib.man index 7685166..1bc4bb9 100644 --- a/mergelib.man +++ b/mergelib.man @@ -1,4 +1,4 @@ -.\" $XFree86$ +.\" $XFree86: xc/config/util/mergelib.man,v 1.2 2003/04/07 22:03:49 herrb Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH MERGELIB 1 __xorgversion__ diff --git a/mkdirhier.man b/mkdirhier.man index 4ad475e..0fd893b 100644 --- a/mkdirhier.man +++ b/mkdirhier.man @@ -23,7 +23,7 @@ .\" dealing in this Software without prior written authorization from The .\" Open Group. .\" -.\" $XFree86: xc/config/util/mkdirhier.man,v 1.2 2001/01/27 18:19:55 dawes Exp $ +.\" $XFree86: xc/config/util/mkdirhier.man,v 1.3 2001/12/14 19:53:22 dawes Exp $ .\" .TH MKDIRHIER 1 __xorgversion__ .SH NAME diff --git a/mkhtmlindex.pl b/mkhtmlindex.pl index dda3f44..fba2f79 100644 --- a/mkhtmlindex.pl +++ b/mkhtmlindex.pl @@ -1,8 +1,9 @@ #!/usr/bin/perl # -# $XFree86: xc/config/util/mkhtmlindex.pl,v 1.2 2001/03/15 19:02:31 dawes Exp $ +# $XFree86: xc/config/util/mkhtmlindex.pl,v 1.4 2004/03/01 17:56:25 dawes Exp $ # # Copyright © 2000,2001 by VA Linux Systems, Inc. +# Copyright © 2004 by David H. Dawes. # # Generate index files for HTML man pages. # @@ -53,19 +54,19 @@ foreach $vol (@vollist) { EOF foreach $file (sort readdir dir) { - if ($file =~ "\.$vol\.html") { + if ($file =~ /\.$vol\.html/) { open(file, "<$dir/$file") || die "Can't open $dir/$file"; while () { chop; - if (/^

/) { - if (! /<\/H2>$/) { - while ( && ! /<\/H2>$/) { + if (/^

/i) { + if (! /<\/H2>$/i) { + while ( && ! /<\/H2>$/i) { ; } } $heading = ""; while () { - if (/^

/) { + if (/^

/i) { last; } $heading = "$heading" . "$_"; @@ -76,7 +77,7 @@ EOF ($name, $descr) = split(/-/, $heading, 2); $file =~ /(.*)\.$vol\.html/; $fname = $1; - $descr =~ s/<[P]>//g; + $descr =~ s/<[Pp]>//g; print mindex "
  • $fname - $descr
    • "; } diff --git a/mkhtmlindex.sh b/mkhtmlindex.sh index 539812d..d5ba1cd 100644 --- a/mkhtmlindex.sh +++ b/mkhtmlindex.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $XFree86: xc/config/util/mkhtmlindex.sh,v 1.3 2000/08/26 04:30:49 dawes Exp $ +# $XFree86: xc/config/util/mkhtmlindex.sh,v 1.5 2003/08/11 17:41:28 eich Exp $ # # Copyright © 2000 by Precision Insight, Inc. # diff --git a/revpath.man b/revpath.man index 5b9cace..7d9cc94 100644 --- a/revpath.man +++ b/revpath.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/config/util/revpath.man,v 1.1 1999/01/03 03:58:14 dawes Exp $ +.\" $XFree86: xc/config/util/revpath.man,v 1.2 2001/01/27 18:19:55 dawes Exp $ .TH REVPATH 1 __vendorversion__ .SH NAME revpath \- generate a relative path that can be used to undo a change-directory diff --git a/xmkmf.cpp b/xmkmf.cpp index 3d03bde..7baf0ea 100644 --- a/xmkmf.cpp +++ b/xmkmf.cpp @@ -1,6 +1,6 @@ XCOMM!/bin/sh -XCOMM $XFree86: xc/config/util/xmkmf.cpp,v 1.3 2000/11/06 21:57:10 dawes Exp $ +XCOMM $XFree86: xc/config/util/xmkmf.cpp,v 1.4 2001/01/17 16:39:02 dawes Exp $ XCOMM XCOMM make a Makefile from an Imakefile from inside or outside the sources XCOMM diff --git a/xmkmf.man b/xmkmf.man index 8a4f234..bd018d6 100644 --- a/xmkmf.man +++ b/xmkmf.man @@ -23,7 +23,7 @@ .\" dealing in this Software without prior written authorization from The .\" Open Group. .\" -.\" $XFree86: xc/config/util/xmkmf.man,v 1.2 2001/01/27 18:19:55 dawes Exp $ +.\" $XFree86: xc/config/util/xmkmf.man,v 1.3 2001/12/14 19:53:22 dawes Exp $ .\" .TH XMKMF 1 __xorgversion__ .SH NAME -- cgit v1.2.3