XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_902xf86-4_3_99_901xf86-4_3_99_16

5 files changed, 52 insertions, 29 deletions

diff --git a/cleanlinks b/cleanlinks
index 51252e2..bd0eb8f 100644
--- a/cleanlinks
+++ b/cleanlinks
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# Copyright © 2000 by The XFree86 Project, Inc
+# Copyright © 2000, 2003 by The XFree86 Project, Inc
 # 
 # Remove dangling symlinks and empty directories from a shadow link tree
 # (created with lndir).
 #
 # Author: David Dawes <dawes@xfree86.org>
 #
-# $XFree86: xc/config/util/cleanlinks.sh,v 1.1 2001/03/21 20:25:00 dawes Exp $
+# $XFree86: xc/config/util/cleanlinks.sh,v 1.2 2003/04/15 03:05:16 dawes Exp $
 
 find . -type l -print |
 (
@@ -22,5 +22,6 @@ find . -type l -print |
 )
 
 echo Removing empty directories ...
-find . -type d -depth -print | xargs rmdir > /dev/null 2>&1
+#find . -type d -depth -print | xargs rmdir > /dev/null 2>&1
+find . -type d -depth -empty -print -exec rmdir {} \;
 exit 0
diff --git a/imake.c b/imake.c
index a85a166..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.63 2002/12/16 22:48:27 herrb Exp $ */
+/* $XFree86: xc/config/imake/imake.c,v 3.64 2003/03/26 20:43:47 tsi Exp $ */
 
 /*
  *
@@ -1825,7 +1825,7 @@ isempty(char *line)
 		    (pend[5] == ' ' || pend[5] == '\t' || pend[5] == '\r' || pend[5] == '\0'))
 		{
 		    *pend = '#';
-		    strcpy(pend+1, pend+5);
+		    memmove(pend+1, pend+5, strlen(pend+5)+1);
 		}
 #ifdef CROSSCOMPILE
 		if (magic_make_vars)
diff --git a/imakemdep.h b/imakemdep.h
index c31a000..fba4c23 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.68 2002/12/24 17:42:58 tsi Exp $ */
+/* $XFree86: xc/config/imake/imakemdep.h,v 3.71 2003/06/12 14:12:26 eich Exp $ */
 
 
 /* 
@@ -33,6 +33,10 @@ in this Software without prior written authorization from The Open Group.
  * definitions.  In general you should *not* edit ccimake.c or imake.c!
  */
 
+#ifdef __UNIXOS2__
+#define lstat stat
+#endif
+
 #ifdef CCIMAKE
 /*
  * Step 1:  imake_ccflags
@@ -367,8 +371,11 @@ char *cpp_argv[ARGUMENTS] = {
 # ifdef __ia64__
 	"-D__ia64__",
 # endif
+# ifdef __AMD64__
+	"-D__AMD64__",
+# endif
 # ifdef __x86_64__
-	"-D__x86_64__",
+	"-D__AMD64__",
 # endif
 # ifdef __s390__
 	"-D__s390__",
@@ -969,6 +976,10 @@ void (*defaultOsTeenyRevFrob)(char *buf, int size) = NULL;
  *     them to the the following table.  The definition of struct symtab is
  *     in util/makedepend/def.h.
  */
+#undef DEF_EVALUATE
+#undef DEF_STRINGIFY
+#define DEF_EVALUATE(__x) #__x
+#define DEF_STRINGIFY(_x) DEF_EVALUATE(_x)
 struct symtab	predefs[] = {
 #ifdef apollo
 	{"apollo", "1"},
@@ -1055,25 +1066,13 @@ struct symtab	predefs[] = {
 	{"mc68020", "1"},
 #endif
 #ifdef __GNUC__
-# if __GNUC__ == 1
-	{"__GNUC__", "1"},
-# elif __GNUC__ == 2
-	{"__GNUC__", "2"},
-# elif __GNUC__ == 3
-	{"__GNUC__", "3"},
-# endif
+	{"__GNUC__", DEF_STRINGIFY(__GNUC__)},
 #endif
 #ifdef __STRICT_ANSI__
 	{"__STRICT_ANSI__", "1"},
 #endif
 #ifdef __STDC__
-# if __STDC__ == 0
-	{"__STDC__", "0"},
-# elif __STDC__ == 1
-	{"__STDC__", "1"},
-# elif __STDC__ == 2
-	{"__STDC__", "2"},
-# endif
+	{"__STDC__", DEF_STRINGIFY(__STDC__)},
 #endif
 #ifdef __HIGHC__
 	{"__HIGHC__", "1"},
@@ -1202,6 +1201,24 @@ struct symtab	predefs[] = {
 #ifdef __sgi
 	{"__sgi", "1"},
 #endif
+#ifdef _MIPS_FPSET
+	{"_MIPS_FPSET", DEF_STRINGIFY(_MIPS_FPSET)},
+#endif
+#ifdef _MIPS_ISA
+	{"_MIPS_ISA", DEF_STRINGIFY(_MIPS_ISA)},
+#endif
+#ifdef _MIPS_SIM
+	{"_MIPS_SIM", DEF_STRINGIFY(_MIPS_SIM)},
+#endif
+#ifdef _MIPS_SZINT
+	{"_MIPS_SZINT", DEF_STRINGIFY(_MIPS_SZINT)},
+#endif
+#ifdef _MIPS_SZLONG
+	{"_MIPS_SZLONG", DEF_STRINGIFY(_MIPS_SZLONG)},
+#endif
+#ifdef _MIPS_SZPTR
+	{"_MIPS_SZPTR", DEF_STRINGIFY(_MIPS_SZPTR)},
+#endif
 #ifdef __FreeBSD__
 	{"__FreeBSD__", "1"},
 #endif
@@ -1238,10 +1255,12 @@ struct symtab	predefs[] = {
 # ifdef __ia64__
 	{"__ia64__", "1"},
 # endif
-# ifdef x86_64
+# if defined (AMD64) || defined (x86_64)
+	{"AMD64", "1"},
 	{"x86_64", "1"},
 # endif
-# ifdef __x86_64__
+# if defined (__AMD64__) || defined (__x86_64__)
+	{"__AMD64__", "1"},
 	{"__x86_64__", "1"},
 # endif
 # ifdef __i386__
@@ -1307,11 +1326,11 @@ struct symtab	predefs[] = {
 #if defined(__LITTLE_ENDIAN__)
       {"__LITTLE_ENDIAN__", "1"},
 #endif
-
-
 	/* add any additional symbols before this line */
 	{NULL, NULL}
 };
+#undef DEF_EVALUATE
+#undef DEF_STRINGIFY
 #endif /* CROSSCOMPILE */
 #endif /* MAKEDEPEND */
 
diff --git a/mergelib.man b/mergelib.man
index d05065f..1bc4bb9 100644
--- a/mergelib.man
+++ b/mergelib.man
@@ -1,4 +1,7 @@
-.TH mergelib 1 __xorgversion__
+.\" $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__
 .SH NAME
 mergelib \- merge one library into another
 .SH SYNOPSIS
@@ -14,7 +17,7 @@ The names of object files in
 .I from-library
 will be prefixed by
 .I object-filename-prefix
-(\(oq_\(cq by default) to avoid name clashes.
+(\*q_\*q by default) to avoid name clashes.
 The merged library will be left in
 .IR to-library .
 .SH AUTHOR
diff --git a/mkhtmlindex.sh b/mkhtmlindex.sh
index b880617..d5ba1cd 100644
--- a/mkhtmlindex.sh
+++ b/mkhtmlindex.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $XFree86: xc/config/util/mkhtmlindex.sh,v 1.4 2001/10/28 03:32:04 tsi Exp $
+# $XFree86: xc/config/util/mkhtmlindex.sh,v 1.5 2003/08/11 17:41:28 eich Exp $
 #
 # Copyright © 2000 by Precision Insight, Inc.
 #
@@ -43,7 +43,7 @@ for s in $VOLLIST; do
 <UL>
 EOF
 		for i in $list; do
-			title="`egrep '^[0-9A-Za-z]' $i | egrep -v '^Name' | head -1`"
+			title="`sed -e '/^[^0-9A-Za-z]/d' -e '/^$/' -e '/^Name/d' -e q $i`"
 			name="`echo \"$title\" | sed -e 's/ - .*//'`"
 			desc="`echo \"$title\" | sed -e 's/[^-]* - //' -e 's/<P>//'`"
 			echo "<LI><A href=\"$i\">$name</A> - $desc</LI>" >> $file