Update to libXfont 1.4.3. No functional change.

63 files changed, 106 insertions, 199 deletions

diff --git a/lib/libXfont/src/FreeType/Makefile.in b/lib/libXfont/src/FreeType/Makefile.in
index d6e31e198..81b537663 100644
--- a/lib/libXfont/src/FreeType/Makefile.in
+++ b/lib/libXfont/src/FreeType/Makefile.in
@@ -116,7 +116,11 @@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@
 GREP = @GREP@
 HAVE_FOP_FALSE = @HAVE_FOP_FALSE@
 HAVE_FOP_TRUE = @HAVE_FOP_TRUE@
+HAVE_STYLESHEETS_FALSE = @HAVE_STYLESHEETS_FALSE@
+HAVE_STYLESHEETS_TRUE = @HAVE_STYLESHEETS_TRUE@
 HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
+HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
+HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
 HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
@@ -155,6 +159,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 VERSION = @VERSION@
 XFONT_BDFFORMAT_FALSE = @XFONT_BDFFORMAT_FALSE@
 XFONT_BDFFORMAT_TRUE = @XFONT_BDFFORMAT_TRUE@
@@ -176,6 +181,8 @@ XFONT_SNFFORMAT_FALSE = @XFONT_SNFFORMAT_FALSE@
 XFONT_SNFFORMAT_TRUE = @XFONT_SNFFORMAT_TRUE@
 XMLTO = @XMLTO@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XORG_SGML_PATH = @XORG_SGML_PATH@
+XSL_STYLESHEET = @XSL_STYLESHEET@
 X_BZIP2_FONT_COMPRESSION_FALSE = @X_BZIP2_FONT_COMPRESSION_FALSE@
 X_BZIP2_FONT_COMPRESSION_TRUE = @X_BZIP2_FONT_COMPRESSION_TRUE@
 X_GZIP_FONT_COMPRESSION = @X_GZIP_FONT_COMPRESSION@
diff --git a/lib/libXfont/src/FreeType/ft.h b/lib/libXfont/src/FreeType/ft.h
index d5d789ec6..8cf31d4ab 100644
--- a/lib/libXfont/src/FreeType/ft.h
+++ b/lib/libXfont/src/FreeType/ft.h
@@ -21,8 +21,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-/* $XFree86: xc/lib/font/FreeType/ft.h,v 1.22 2003/06/08 15:41:13 herrb Exp $ */
-
 #ifndef _FT_H_
 #define _FT_H_
 
@@ -33,11 +31,9 @@ THE SOFTWARE.
 #undef DEBUG_TRUETYPE
 
 #ifdef DEBUG_TRUETYPE
-#define MUMBLE(s) (ErrorF((s)))
-#define MUMBLE1(s,x) (ErrorF((s),(x)))
+#define MUMBLE ErrorF
 #else
-#define MUMBLE(s)
-#define MUMBLE1(s,x)
+#define MUMBLE(...)
 #endif
 
 #undef MAX
diff --git a/lib/libXfont/src/FreeType/ftenc.c b/lib/libXfont/src/FreeType/ftenc.c
index 27964b003..99defbed6 100644
--- a/lib/libXfont/src/FreeType/ftenc.c
+++ b/lib/libXfont/src/FreeType/ftenc.c
@@ -19,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XFree86: xc/lib/font/FreeType/ftenc.c,v 1.24 2003/10/19 18:53:49 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXfont/src/FreeType/ftfuncs.c b/lib/libXfont/src/FreeType/ftfuncs.c
index 47ebac737..fd8e53e5f 100644
--- a/lib/libXfont/src/FreeType/ftfuncs.c
+++ b/lib/libXfont/src/FreeType/ftfuncs.c
@@ -25,9 +25,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XdotOrg: xc/lib/font/FreeType/ftfuncs.c,v 1.11 2005/07/03 07:00:58 daniels Exp $ */
-
-/* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.43 2004/02/07 04:37:18 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -188,7 +185,7 @@ FreeTypeOpenFace(FTFacePtr *facep, char *FTFileName, char *realFileName, int fac
         otherFace = otherFace->next;
     }
     if(otherFace) {
-        MUMBLE1("Returning cached face: %s\n", otherFace->filename);
+        MUMBLE("Returning cached face: %s\n", otherFace->filename);
         *facep = otherFace;
         return Successful;
     }
@@ -253,7 +250,7 @@ FreeTypeFreeFace(FTFacePtr face)
             else
                 ErrorF("FreeType: freeing unknown face\n");
         }
-        MUMBLE1("Closing face: %s\n", face->filename);
+        MUMBLE("Closing face: %s\n", face->filename);
         FT_Done_Face(face->face);
         free(face->filename);
         free(face);
@@ -3645,7 +3642,7 @@ FreeTypeGetMetrics(FontPtr pFont, unsigned long count, unsigned char *chars,
     struct TTCapInfo *ttcap;
     xCharInfo **mp, *m;
 
-    /*  MUMBLE1("Get metrics for %ld characters\n", count);*/
+    /*  MUMBLE("Get metrics for %ld characters\n", count);*/
 
     tf = (FTFontPtr)pFont->fontPrivate;
     ttcap = &tf->instance->ttcap;
@@ -3780,7 +3777,7 @@ FreeTypeSetUpFont(FontPathElementPtr fpe, FontPtr xf, FontInfoPtr info,
     if ((xrc = CheckFSFormat(format, fmask, &bmfmt->bit, &bmfmt->byte,
                              &bmfmt->scan, &bmfmt->glyph,
                              &image)) != Successful) {
-        MUMBLE1("Aborting after checking FS format: %d\n", xrc);
+        MUMBLE("Aborting after checking FS format: %d\n", xrc);
         return xrc;
     }
 
@@ -3829,11 +3826,7 @@ FreeTypeOpenScalable(FontPathElementPtr fpe, FontPtr *ppFont, int flags,
     FontPtr xf;
     FontBitmapFormatRec bmfmt;
 
-    MUMBLE1("Open Scalable %s, XLFD=",fileName);
-#ifdef DEBUG_TRUETYPE
-    fwrite(entry->name.name, entry->name.length, 1, stdout);
-#endif
-    MUMBLE("\n");
+    MUMBLE("Open Scalable %s, XLFD=%s\n",fileName, entry->name.length ? entry->name.name : "");
 
     xf = CreateFontRec();
     if (xf == NULL)
@@ -3846,7 +3839,7 @@ FreeTypeOpenScalable(FontPathElementPtr fpe, FontPtr *ppFont, int flags,
     }
     xrc = FreeTypeLoadXFont(fileName, vals, xf, &xf->info, &bmfmt, entry);
     if(xrc != Successful) {
-        MUMBLE1("Error during load: %d\n",xrc);
+        MUMBLE("Error during load: %d\n",xrc);
         DestroyFontRec(xf);
         return xrc;
     }
@@ -3866,11 +3859,7 @@ FreeTypeGetInfoScalable(FontPathElementPtr fpe, FontInfoPtr info,
     int xrc;
     FontBitmapFormatRec bmfmt;
 
-    MUMBLE("Get info, XLFD= ");
-#ifdef DEBUG_TRUETYPE
-    fwrite(entry->name.name, entry->name.length, 1, stdout);
-#endif
-    MUMBLE("\n");
+    MUMBLE("Get info, XLFD=%s\n", entry->name.length ? entry->name.name : "");
 
     xrc = FreeTypeSetUpFont(fpe, 0, info, 0, 0, &bmfmt);
     if(xrc != Successful) {
@@ -3881,7 +3870,7 @@ FreeTypeGetInfoScalable(FontPathElementPtr fpe, FontInfoPtr info,
 
     xrc = FreeTypeLoadXFont(fileName, vals, 0, info, &bmfmt, entry);
     if(xrc != Successful) {
-        MUMBLE1("Error during load: %d\n", xrc);
+        MUMBLE("Error during load: %d\n", xrc);
         return xrc;
     }
 
diff --git a/lib/libXfont/src/FreeType/ftfuncs.h b/lib/libXfont/src/FreeType/ftfuncs.h
index e522dded8..068a59523 100644
--- a/lib/libXfont/src/FreeType/ftfuncs.h
+++ b/lib/libXfont/src/FreeType/ftfuncs.h
@@ -20,7 +20,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XFree86: xc/lib/font/FreeType/ftfuncs.h,v 1.17 2003/12/21 04:02:07 dawes Exp $ */
 
 /* Number of buckets in the hashtable holding faces */
 #define NUMFACEBUCKETS 32
diff --git a/lib/libXfont/src/FreeType/fttools.c b/lib/libXfont/src/FreeType/fttools.c
index 7277273fd..bc75b7e4f 100644
--- a/lib/libXfont/src/FreeType/fttools.c
+++ b/lib/libXfont/src/FreeType/fttools.c
@@ -21,8 +21,6 @@
   THE SOFTWARE.
 */
 
-/* $XFree86: xc/lib/font/FreeType/fttools.c,v 1.6 2003/06/08 15:41:13 herrb Exp $ */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/lib/libXfont/src/FreeType/xttcap.c b/lib/libXfont/src/FreeType/xttcap.c
index 89e092b0e..c2a412091 100644
--- a/lib/libXfont/src/FreeType/xttcap.c
+++ b/lib/libXfont/src/FreeType/xttcap.c
@@ -30,7 +30,6 @@
 
 Notice===
  */
-/* $XFree86: xc/lib/font/FreeType/xttcap.c,v 1.1 2003/10/19 18:53:50 dawes Exp $ */
 
 /*
 #include "xttversion.h"
diff --git a/lib/libXfont/src/FreeType/xttcap.h b/lib/libXfont/src/FreeType/xttcap.h
index e91e5232a..6a09cf610 100644
--- a/lib/libXfont/src/FreeType/xttcap.h
+++ b/lib/libXfont/src/FreeType/xttcap.h
@@ -30,7 +30,6 @@
 
 Notice===
  */
-/* $XFree86: xc/extras/X-TrueType/xttcap.h,v 1.2 2001/08/01 00:44:33 tsi Exp $ */
 
 #ifndef _XTTCAP_H_
 #define _XTTCAP_H_ (1)
diff --git a/lib/libXfont/src/Makefile.am b/lib/libXfont/src/Makefile.am
index d658667b8..26551bc04 100644
--- a/lib/libXfont/src/Makefile.am
+++ b/lib/libXfont/src/Makefile.am
@@ -65,4 +65,4 @@ libXfont_la_LIBADD = \
 
 libXfont_la_SOURCES = dummy.c
 
-libXfont_la_LDFLAGS = -version-number 1:4:1 -no-undefined
+libXfont_la_LDFLAGS = -version-number 1:4:1
diff --git a/lib/libXfont/src/Makefile.in b/lib/libXfont/src/Makefile.in
index 645017600..ba7b391d5 100644
--- a/lib/libXfont/src/Makefile.in
+++ b/lib/libXfont/src/Makefile.in
@@ -165,7 +165,11 @@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@
 GREP = @GREP@
 HAVE_FOP_FALSE = @HAVE_FOP_FALSE@
 HAVE_FOP_TRUE = @HAVE_FOP_TRUE@
+HAVE_STYLESHEETS_FALSE = @HAVE_STYLESHEETS_FALSE@
+HAVE_STYLESHEETS_TRUE = @HAVE_STYLESHEETS_TRUE@
 HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
+HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
+HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
 HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
@@ -204,6 +208,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 VERSION = @VERSION@
 XFONT_BDFFORMAT_FALSE = @XFONT_BDFFORMAT_FALSE@
 XFONT_BDFFORMAT_TRUE = @XFONT_BDFFORMAT_TRUE@
@@ -225,6 +230,8 @@ XFONT_SNFFORMAT_FALSE = @XFONT_SNFFORMAT_FALSE@
 XFONT_SNFFORMAT_TRUE = @XFONT_SNFFORMAT_TRUE@
 XMLTO = @XMLTO@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XORG_SGML_PATH = @XORG_SGML_PATH@
+XSL_STYLESHEET = @XSL_STYLESHEET@
 X_BZIP2_FONT_COMPRESSION_FALSE = @X_BZIP2_FONT_COMPRESSION_FALSE@
 X_BZIP2_FONT_COMPRESSION_TRUE = @X_BZIP2_FONT_COMPRESSION_TRUE@
 X_GZIP_FONT_COMPRESSION = @X_GZIP_FONT_COMPRESSION@
@@ -303,7 +310,7 @@ libXfont_la_LIBADD = \
 	$(FREETYPE_LIBS) $(Z_LIBS) $(MATH_LIBS) $(XFONT_LIBS)
 
 libXfont_la_SOURCES = dummy.c
-libXfont_la_LDFLAGS = -version-number 1:4:1 -no-undefined
+libXfont_la_LDFLAGS = -version-number 1:4:1
 all: all-recursive
 
 .SUFFIXES:
diff --git a/lib/libXfont/src/bitmap/Makefile.in b/lib/libXfont/src/bitmap/Makefile.in
index 2ae6a246d..f0c40186f 100644
--- a/lib/libXfont/src/bitmap/Makefile.in
+++ b/lib/libXfont/src/bitmap/Makefile.in
@@ -118,7 +118,11 @@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@
 GREP = @GREP@
 HAVE_FOP_FALSE = @HAVE_FOP_FALSE@
 HAVE_FOP_TRUE = @HAVE_FOP_TRUE@
+HAVE_STYLESHEETS_FALSE = @HAVE_STYLESHEETS_FALSE@
+HAVE_STYLESHEETS_TRUE = @HAVE_STYLESHEETS_TRUE@
 HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
+HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
+HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
 HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
@@ -157,6 +161,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 VERSION = @VERSION@
 XFONT_BDFFORMAT_FALSE = @XFONT_BDFFORMAT_FALSE@
 XFONT_BDFFORMAT_TRUE = @XFONT_BDFFORMAT_TRUE@
@@ -178,6 +183,8 @@ XFONT_SNFFORMAT_FALSE = @XFONT_SNFFORMAT_FALSE@
 XFONT_SNFFORMAT_TRUE = @XFONT_SNFFORMAT_TRUE@
 XMLTO = @XMLTO@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XORG_SGML_PATH = @XORG_SGML_PATH@
+XSL_STYLESHEET = @XSL_STYLESHEET@
 X_BZIP2_FONT_COMPRESSION_FALSE = @X_BZIP2_FONT_COMPRESSION_FALSE@
 X_BZIP2_FONT_COMPRESSION_TRUE = @X_BZIP2_FONT_COMPRESSION_TRUE@
 X_GZIP_FONT_COMPRESSION = @X_GZIP_FONT_COMPRESSION@
diff --git a/lib/libXfont/src/bitmap/bdfread.c b/lib/libXfont/src/bitmap/bdfread.c
index 083565358..2464c03cc 100644
--- a/lib/libXfont/src/bitmap/bdfread.c
+++ b/lib/libXfont/src/bitmap/bdfread.c
@@ -1,5 +1,3 @@
-/* $Xorg: bdfread.c,v 1.5 2001/02/09 02:04:01 xorgcvs Exp $ */
-
 /************************************************************************
 Copyright 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
@@ -50,7 +48,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/bitmap/bdfread.c,v 1.12tsi Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXfont/src/bitmap/bdfutils.c b/lib/libXfont/src/bitmap/bdfutils.c
index 17596c323..1d6cc7253 100644
--- a/lib/libXfont/src/bitmap/bdfutils.c
+++ b/lib/libXfont/src/bitmap/bdfutils.c
@@ -1,4 +1,3 @@
-/* $Xorg: bdfutils.c,v 1.5 2001/02/09 02:04:02 xorgcvs Exp $ */
 /************************************************************************
 Copyright 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
@@ -49,7 +48,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/bitmap/bdfutils.c,v 1.10 2001/12/14 19:56:45 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXfont/src/bitmap/bitmap.c b/lib/libXfont/src/bitmap/bitmap.c
index d238f4d30..1ceb4bb17 100644
--- a/lib/libXfont/src/bitmap/bitmap.c
+++ b/lib/libXfont/src/bitmap/bitmap.c
@@ -1,5 +1,3 @@
-/* $Xorg: bitmap.c,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -25,7 +23,6 @@ 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/lib/font/bitmap/bitmap.c,v 1.6 2001/01/17 19:43:27 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/src/bitmap/bitmapfunc.c b/lib/libXfont/src/bitmap/bitmapfunc.c
index 80d7da19d..47ce488d0 100644
--- a/lib/libXfont/src/bitmap/bitmapfunc.c
+++ b/lib/libXfont/src/bitmap/bitmapfunc.c
@@ -1,5 +1,3 @@
-/* $Xorg: bitmapfunc.c,v 1.5 2001/02/09 02:04:02 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -26,8 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-/* $XFree86: xc/lib/font/bitmap/bitmapfunc.c,v 3.17 2002/09/19 13:21:58 tsi Exp $ */
-
 /*
  * Author:  Keith Packard, MIT X Consortium
  */
diff --git a/lib/libXfont/src/bitmap/bitmaputil.c b/lib/libXfont/src/bitmap/bitmaputil.c
index 3a7bbc7a0..0a1c87e73 100644
--- a/lib/libXfont/src/bitmap/bitmaputil.c
+++ b/lib/libXfont/src/bitmap/bitmaputil.c
@@ -1,5 +1,3 @@
-/* $Xorg: bitmaputil.c,v 1.5 2001/02/09 02:04:02 xorgcvs Exp $ */
-
 /*
 
 Copyright 1990, 1994, 1998  The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/bitmap/bitmaputil.c,v 1.10 2002/09/24 20:52:48 tsi Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXfont/src/bitmap/bitscale.c b/lib/libXfont/src/bitmap/bitscale.c
index a4d991d3b..cf16bffed 100644
--- a/lib/libXfont/src/bitmap/bitscale.c
+++ b/lib/libXfont/src/bitmap/bitscale.c
@@ -25,7 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/bitmap/bitscale.c,v 3.29tsi Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/src/bitmap/fontink.c b/lib/libXfont/src/bitmap/fontink.c
index a9606f039..ad7091fa6 100644
--- a/lib/libXfont/src/bitmap/fontink.c
+++ b/lib/libXfont/src/bitmap/fontink.c
@@ -1,5 +1,3 @@
-/* $Xorg: fontink.c,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */
-
 /*
 
 Copyright 1990, 1998  The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/bitmap/fontink.c,v 1.6 2001/01/17 19:43:27 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/src/bitmap/pcfread.c b/lib/libXfont/src/bitmap/pcfread.c
index 182144adc..32f9856fa 100644
--- a/lib/libXfont/src/bitmap/pcfread.c
+++ b/lib/libXfont/src/bitmap/pcfread.c
@@ -25,7 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/bitmap/pcfread.c,v 1.21 2003/11/17 22:20:22 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/src/bitmap/pcfwrite.c b/lib/libXfont/src/bitmap/pcfwrite.c
index 5d1aab154..3ac07b359 100644
--- a/lib/libXfont/src/bitmap/pcfwrite.c
+++ b/lib/libXfont/src/bitmap/pcfwrite.c
@@ -1,4 +1,3 @@
-/* $Xorg: pcfwrite.c,v 1.5 2001/02/09 02:04:02 xorgcvs Exp $ */
 /*
 
 Copyright 1990, 1994, 1998  The Open Group
@@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/bitmap/pcfwrite.c,v 1.11 2003/11/17 22:20:22 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/src/bitmap/snfread.c b/lib/libXfont/src/bitmap/snfread.c
index 53a72da9f..d003cc5a5 100644
--- a/lib/libXfont/src/bitmap/snfread.c
+++ b/lib/libXfont/src/bitmap/snfread.c
@@ -1,4 +1,3 @@
-/* $Xorg: snfread.c,v 1.5 2001/02/09 02:04:02 xorgcvs Exp $ */
 /************************************************************************
 Copyright 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
@@ -49,7 +48,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/bitmap/snfread.c,v 1.12 2003/11/17 22:20:22 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXfont/src/bitmap/snfstr.h b/lib/libXfont/src/bitmap/snfstr.h
index 8158089bf..148bb1fcc 100644
--- a/lib/libXfont/src/bitmap/snfstr.h
+++ b/lib/libXfont/src/bitmap/snfstr.h
@@ -1,4 +1,3 @@
-/* $Xorg: snfstr.h,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */
 /***********************************************************
 Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
@@ -49,7 +48,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/bitmap/snfstr.h,v 1.5 2001/12/14 19:56:47 dawes Exp $ */
 
 #ifndef SNFSTR_H
 #define SNFSTR_H 1
@@ -180,6 +178,5 @@ extern void SnfSetFormat ( int bit, int byte, int glyph, int scan );
 extern int snfReadFont ( FontPtr pFont, FontFilePtr file, 
 			 int bit, int byte, int glyph, int scan );
 extern int snfReadFontInfo ( FontInfoPtr pFontInfo, FontFilePtr file );
-extern void snfError( const char* message, ... );
 
 #endif				/* SNFSTR_H */
diff --git a/lib/libXfont/src/builtins/Makefile.in b/lib/libXfont/src/builtins/Makefile.in
index 4daabcf87..6ce316009 100644
--- a/lib/libXfont/src/builtins/Makefile.in
+++ b/lib/libXfont/src/builtins/Makefile.in
@@ -116,7 +116,11 @@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@
 GREP = @GREP@
 HAVE_FOP_FALSE = @HAVE_FOP_FALSE@
 HAVE_FOP_TRUE = @HAVE_FOP_TRUE@
+HAVE_STYLESHEETS_FALSE = @HAVE_STYLESHEETS_FALSE@
+HAVE_STYLESHEETS_TRUE = @HAVE_STYLESHEETS_TRUE@
 HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
+HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
+HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
 HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
@@ -155,6 +159,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 VERSION = @VERSION@
 XFONT_BDFFORMAT_FALSE = @XFONT_BDFFORMAT_FALSE@
 XFONT_BDFFORMAT_TRUE = @XFONT_BDFFORMAT_TRUE@
@@ -176,6 +181,8 @@ XFONT_SNFFORMAT_FALSE = @XFONT_SNFFORMAT_FALSE@
 XFONT_SNFFORMAT_TRUE = @XFONT_SNFFORMAT_TRUE@
 XMLTO = @XMLTO@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XORG_SGML_PATH = @XORG_SGML_PATH@
+XSL_STYLESHEET = @XSL_STYLESHEET@
 X_BZIP2_FONT_COMPRESSION_FALSE = @X_BZIP2_FONT_COMPRESSION_FALSE@
 X_BZIP2_FONT_COMPRESSION_TRUE = @X_BZIP2_FONT_COMPRESSION_TRUE@
 X_GZIP_FONT_COMPRESSION = @X_GZIP_FONT_COMPRESSION@
diff --git a/lib/libXfont/src/builtins/builtin.h b/lib/libXfont/src/builtins/builtin.h
index ea98407eb..418bfe984 100644
--- a/lib/libXfont/src/builtins/builtin.h
+++ b/lib/libXfont/src/builtins/builtin.h
@@ -1,5 +1,4 @@
 /*
- * Id: builtin.h,v 1.2 1999/11/02 06:16:47 keithp Exp $
  *
  * Copyright 1999 SuSE, Inc.
  *
@@ -22,7 +21,6 @@
  *
  * Author:  Keith Packard, SuSE, Inc.
  */
-/* $XFree86: xc/lib/font/builtins/builtin.h,v 1.3 1999/12/30 02:29:49 robin Exp $ */
 
 #include <X11/Xdefs.h>
 #include <X11/fonts/font.h>
@@ -56,5 +54,9 @@ extern const int		builtin_dir_count;
 extern const BuiltinAliasRec	builtin_alias[];
 extern const int		builtin_alias_count;
 
-extern FontFilePtr	BuiltinFileOpen ();
-extern int		BuiltinFileClose ();
+extern FontFilePtr	BuiltinFileOpen (char *);
+extern int		BuiltinFileClose (BufFilePtr, int);
+extern int BuiltinReadDirectory (char *, FontDirectoryPtr *);
+extern void BuiltinRegisterFontFileFunctions (void);
+
+extern void BuiltinRegisterFpeFunctions (void);
diff --git a/lib/libXfont/src/builtins/file.c b/lib/libXfont/src/builtins/file.c
index f08f67f88..549253926 100644
--- a/lib/libXfont/src/builtins/file.c
+++ b/lib/libXfont/src/builtins/file.c
@@ -1,6 +1,4 @@
 /*
- * Id: file.c,v 1.2 1999/11/02 06:16:47 keithp Exp $
- *
  * Copyright 1999 SuSE, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +20,6 @@
  *
  * Author:  Keith Packard, SuSE, Inc.
  */
-/* $XFree86: xc/lib/font/builtins/file.c,v 1.3 1999/12/30 02:29:49 robin Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXfont/src/builtins/fonts.c b/lib/libXfont/src/builtins/fonts.c
index 24f42e2ec..9a9d7d273 100644
--- a/lib/libXfont/src/builtins/fonts.c
+++ b/lib/libXfont/src/builtins/fonts.c
@@ -1,6 +1,4 @@
 /*
- * Id: fonts.c,v 1.2 1999/11/02 06:16:47 keithp Exp $
- *
  * Copyright 1999 SuSE, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +20,6 @@
  *
  * Author:  Keith Packard, SuSE, Inc.
  */
-/* $XFree86: xc/lib/font/builtins/fonts.c,v 1.3 1999/12/30 02:29:49 robin Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -1229,15 +1226,15 @@ static char name_6x13[] = "-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60
 static char name_cursor[] = "cursor";
 
 const BuiltinFileRec builtin_files[] = {
-"6x13.builtin", sizeof file_6x13, file_6x13,
-"cursor.builtin", sizeof file_cursor, file_cursor,
+ { "6x13.builtin", sizeof file_6x13, file_6x13, },
+ { "cursor.builtin", sizeof file_cursor, file_cursor, }
 };
 
 const int builtin_files_count = sizeof (builtin_files) / sizeof (builtin_files[0]);
 
 const BuiltinDirRec builtin_dir[] = {
-"6x13.builtin", name_6x13,
-"cursor.builtin", name_cursor,
+ { "6x13.builtin", name_6x13, },
+ { "cursor.builtin", name_cursor, }
 };
 
 const int builtin_dir_count = sizeof (builtin_dir) / sizeof (builtin_dir[0]);
@@ -1247,9 +1244,9 @@ static char alias_6x13[] = "6x13";
 static char alias_6x13_100[] = "-misc-fixed-medium-r-semicondensed--13-100-100-100-c-60-iso8859-1";
 
 const BuiltinAliasRec builtin_alias[] = {
-alias_fixed, name_6x13,
-alias_6x13, name_6x13,
-alias_6x13_100, name_6x13,
+ { alias_fixed, name_6x13, },
+ { alias_6x13, name_6x13, },
+ { alias_6x13_100, name_6x13, }
 };
 
 const int builtin_alias_count = sizeof (builtin_alias) / sizeof (builtin_alias[0]);
diff --git a/lib/libXfont/src/builtins/fpe.c b/lib/libXfont/src/builtins/fpe.c
index f4ee93a29..403dbb7db 100644
--- a/lib/libXfont/src/builtins/fpe.c
+++ b/lib/libXfont/src/builtins/fpe.c
@@ -1,7 +1,4 @@
-/* $XdotOrg: $ */
 /*
- * Id: fpe.c,v 1.2 1999/11/02 06:16:48 keithp Exp $
- *
  * Copyright 1999 SuSE, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,27 +20,25 @@
  *
  * Author:  Keith Packard, SuSE, Inc.
  */
-/* $XFree86: xc/lib/font/builtins/fpe.c,v 1.3 1999/12/30 02:29:51 robin Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 #include    <X11/fonts/fntfilst.h>
+#include "builtin.h"
 
 static int  font_file_type;
 
-const char	builtin_fonts[] = "built-ins";
+static const char builtin_fonts[] = "built-ins";
 
-int
-BuiltinNameCheck (name)
-    char    *name;
+static int
+BuiltinNameCheck (char *name)
 {
     return (strcmp (name, builtin_fonts) == 0);
 }
 
-int
-BuiltinInitFPE (fpe)
-    FontPathElementPtr	fpe;
+static int
+BuiltinInitFPE (FontPathElementPtr fpe)
 {
     int			status;
     FontDirectoryPtr	dir;
@@ -56,9 +51,8 @@ BuiltinInitFPE (fpe)
 }
 
 /* ARGSUSED */
-int
-BuiltinResetFPE (fpe)
-    FontPathElementPtr	fpe;
+static int
+BuiltinResetFPE (FontPathElementPtr fpe)
 {
     FontDirectoryPtr	dir;
 
@@ -67,9 +61,8 @@ BuiltinResetFPE (fpe)
     return Successful;
 }
 
-int
-BuiltinFreeFPE (fpe)
-    FontPathElementPtr	fpe;
+static int
+BuiltinFreeFPE (FontPathElementPtr fpe)
 {
     FontFileFreeDir ((FontDirectoryPtr) fpe->private);
     return Successful;
diff --git a/lib/libXfont/src/builtins/render.c b/lib/libXfont/src/builtins/render.c
index 52c24b9dc..4d1048394 100644
--- a/lib/libXfont/src/builtins/render.c
+++ b/lib/libXfont/src/builtins/render.c
@@ -1,7 +1,4 @@
-/* $XdotOrg: $ */
 /*
- * Id: render.c,v 1.2 1999/11/02 06:16:48 keithp Exp $
- *
  * Copyright 1999 SuSE, Inc.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,7 +20,6 @@
  *
  * Author:  Keith Packard, SuSE, Inc.
  */
-/* $XFree86: xc/lib/font/builtins/render.c,v 1.3 1999/12/30 02:29:51 robin Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXfont/src/fc/Makefile.in b/lib/libXfont/src/fc/Makefile.in
index 01927e9d0..23bc07851 100644
--- a/lib/libXfont/src/fc/Makefile.in
+++ b/lib/libXfont/src/fc/Makefile.in
@@ -116,7 +116,11 @@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@
 GREP = @GREP@
 HAVE_FOP_FALSE = @HAVE_FOP_FALSE@
 HAVE_FOP_TRUE = @HAVE_FOP_TRUE@
+HAVE_STYLESHEETS_FALSE = @HAVE_STYLESHEETS_FALSE@
+HAVE_STYLESHEETS_TRUE = @HAVE_STYLESHEETS_TRUE@
 HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
+HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
+HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
 HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
@@ -155,6 +159,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 VERSION = @VERSION@
 XFONT_BDFFORMAT_FALSE = @XFONT_BDFFORMAT_FALSE@
 XFONT_BDFFORMAT_TRUE = @XFONT_BDFFORMAT_TRUE@
@@ -176,6 +181,8 @@ XFONT_SNFFORMAT_FALSE = @XFONT_SNFFORMAT_FALSE@
 XFONT_SNFFORMAT_TRUE = @XFONT_SNFFORMAT_TRUE@
 XMLTO = @XMLTO@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XORG_SGML_PATH = @XORG_SGML_PATH@
+XSL_STYLESHEET = @XSL_STYLESHEET@
 X_BZIP2_FONT_COMPRESSION_FALSE = @X_BZIP2_FONT_COMPRESSION_FALSE@
 X_BZIP2_FONT_COMPRESSION_TRUE = @X_BZIP2_FONT_COMPRESSION_TRUE@
 X_GZIP_FONT_COMPRESSION = @X_GZIP_FONT_COMPRESSION@
diff --git a/lib/libXfont/src/fc/fsconvert.c b/lib/libXfont/src/fc/fsconvert.c
index 724bc5fb4..15c5e4200 100644
--- a/lib/libXfont/src/fc/fsconvert.c
+++ b/lib/libXfont/src/fc/fsconvert.c
@@ -1,4 +1,3 @@
-/* $Xorg: fsconvert.c,v 1.3 2000/08/17 19:46:36 cpqbld Exp $ */
 /*
  * Copyright 1990 Network Computing Devices
  *
@@ -22,7 +21,6 @@
  *
  * Author:  	Dave Lemke, Network Computing Devices, Inc
  */
-/* $XFree86: xc/lib/font/fc/fsconvert.c,v 1.14 2003/08/30 18:06:29 dawes Exp $ */
 /*
  * FS data conversion
  */
diff --git a/lib/libXfont/src/fc/fserve.c b/lib/libXfont/src/fc/fserve.c
index 2ba08e8b0..b02b0b749 100644
--- a/lib/libXfont/src/fc/fserve.c
+++ b/lib/libXfont/src/fc/fserve.c
@@ -1,5 +1,3 @@
-/* $XdotOrg: lib/Xfont/src/fc/fserve.c,v 1.8 2005/07/09 06:36:12 keithp Exp $ */
-/* $Xorg: fserve.c,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */
 /*
 
 Copyright 1990, 1998  The Open Group
@@ -25,7 +23,6 @@ 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/lib/font/fc/fserve.c,v 3.26tsi Exp $ */
 
 /*
  * Copyright 1990 Network Computing Devices
diff --git a/lib/libXfont/src/fc/fserve.h b/lib/libXfont/src/fc/fserve.h
index 3254f40fa..5999861b6 100644
--- a/lib/libXfont/src/fc/fserve.h
+++ b/lib/libXfont/src/fc/fserve.h
@@ -1,4 +1,3 @@
-/* $Xorg: fserve.h,v 1.3 2000/08/17 19:46:36 cpqbld Exp $ */
 /*
  * Copyright 1990 Network Computing Devices
  *
@@ -24,7 +23,6 @@
  * Author:  	Dave Lemke, Network Computing Devices, Inc
  *
  */
-/* $XFree86: xc/lib/font/fc/fserve.h,v 1.4 2001/01/17 19:43:29 dawes Exp $ */
 
 #ifndef _FSERVE_H_
 #define _FSERVE_H_
@@ -80,9 +78,6 @@ extern FontPtr fs_create_font (FontPathElementPtr   fpe,
 			       fsBitmapFormatMask   fmask);
 
 extern int fs_load_all_glyphs ( FontPtr pfont );
-extern int _fs_load_glyphs ( pointer client, FontPtr pfont, Bool range_flag, 
-			     unsigned int nchars, int item_size, 
-			     unsigned char *data );
 
 /*
  * These should be declared elsewhere, but I'm concerned that moving them
diff --git a/lib/libXfont/src/fc/fservestr.h b/lib/libXfont/src/fc/fservestr.h
index 0e4166642..a6d0d1d53 100644
--- a/lib/libXfont/src/fc/fservestr.h
+++ b/lib/libXfont/src/fc/fservestr.h
@@ -1,4 +1,3 @@
-/* $Xorg: fservestr.h,v 1.3 2000/08/17 19:46:36 cpqbld Exp $ */
 /*
  * Copyright 1990 Network Computing Devices
  *
@@ -23,7 +22,6 @@
  *
  * Author:  	Dave Lemke, Network Computing Devices, Inc
  */
-/* $XFree86: xc/lib/font/fc/fservestr.h,v 3.3 2001/01/17 19:43:29 dawes Exp $ */
 
 #ifndef _FSERVESTR_H_
 #define _FSERVESTR_H_
@@ -197,15 +195,6 @@ extern int fs_build_range ( FontPtr pfont, Bool range_flag,
 extern void _fs_clean_aborted_loadglyphs ( FontPtr pfont, 
 					   int num_expected_ranges, 
 					   fsRange *expected_ranges );
-extern int _fs_check_extents ( FontPtr pfont, Mask flags, int nranges, 
-			       fsRange *range, FSBlockDataPtr blockrec );
-extern int _fs_check_bitmaps ( FontPtr pfont, fsBitmapFormat format, 
-			       Mask flags, int nranges, fsRange *range, 
-			       FSBlockDataPtr blockrec );
-extern int _fs_get_glyphs ( FontPtr pFont, unsigned long count, 
-			    unsigned char *chars, FontEncoding charEncoding, 
-			    unsigned long *glyphCount, CharInfoPtr *glyphs );
-extern void _fs_unload_font ( FontPtr pfont );
 extern void _fs_init_font ( FontPtr pfont );
 extern pointer fs_alloc_glyphs (FontPtr pFont, int size);
 #endif				/* _FSERVESTR_H_ */
diff --git a/lib/libXfont/src/fc/fsio.c b/lib/libXfont/src/fc/fsio.c
index 79dc0d695..63d3b4f3c 100644
--- a/lib/libXfont/src/fc/fsio.c
+++ b/lib/libXfont/src/fc/fsio.c
@@ -1,4 +1,3 @@
-/* $Xorg: fsio.c,v 1.3 2000/08/17 19:46:36 cpqbld Exp $ */
 /*
  * Copyright 1990 Network Computing Devices
  *
@@ -23,7 +22,6 @@
  *
  * Author:  	Dave Lemke, Network Computing Devices, Inc
  */
-/* $XFree86: xc/lib/font/fc/fsio.c,v 3.16tsi Exp $ */
 /*
  * font server i/o routines
  */
diff --git a/lib/libXfont/src/fc/fsio.h b/lib/libXfont/src/fc/fsio.h
index 224143601..bd0c621e8 100644
--- a/lib/libXfont/src/fc/fsio.h
+++ b/lib/libXfont/src/fc/fsio.h
@@ -1,4 +1,3 @@
-/* $Xorg: fsio.h,v 1.3 2000/08/17 19:46:36 cpqbld Exp $ */
 /*
  * Copyright 1990 Network Computing Devices
  *
@@ -23,7 +22,6 @@
  *
  * Author:  	Dave Lemke, Network Computing Devices, Inc
  */
-/* $XFree86: xc/lib/font/fc/fsio.h,v 1.5 1999/12/30 02:39:06 robin Exp $ */
 
 #ifndef	_FSIO_H_
 #define	_FSIO_H_
@@ -133,18 +131,11 @@ typedef struct _fs_fpe_data {
 extern Bool _fs_reopen_server ( FSFpePtr conn );
 extern int _fs_write ( FSFpePtr conn, char *data, long size );
 extern int _fs_write_pad ( FSFpePtr conn, char *data, long len );
-extern int _fs_data_ready ( FSFpePtr conn );
 extern int _fs_wait_for_readable ( FSFpePtr conn, int ms );
-extern int _fs_set_bit ( fd_set * mask, int fd );
-extern int _fs_is_bit_set ( fd_set * mask, int fd );
-extern void _fs_bit_clear ( fd_set * mask, int fd );
-extern int  _fs_any_bit_set ( fd_set * mask );
-extern void _fs_or_bits ( fd_set * dst, fd_set * m1, fd_set * m2 );
 extern long _fs_pad_length (long len);
 
 extern void _fs_connection_died ( FSFpePtr conn );
 
-extern int  _fs_fill (FSFpePtr conn);
 extern int  _fs_flush (FSFpePtr conn);
 extern void _fs_mark_block (FSFpePtr conn, CARD32 mask);
 extern void _fs_unmark_block (FSFpePtr conn, CARD32 mask);
diff --git a/lib/libXfont/src/fc/fslibos.h b/lib/libXfont/src/fc/fslibos.h
index 65c440c7a..c49f52e5b 100644
--- a/lib/libXfont/src/fc/fslibos.h
+++ b/lib/libXfont/src/fc/fslibos.h
@@ -1,4 +1,3 @@
-/* $Xorg: fslibos.h,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
 /*
  * Copyright 1990 Network Computing Devices;
  * Portions Copyright 1987 by Digital Equipment Corporation
@@ -31,7 +30,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/fc/fslibos.h,v 3.8 2003/08/29 18:01:14 herrb Exp $ */
 
 /*
  * FSlib networking & os include file
diff --git a/lib/libXfont/src/fontfile/Makefile.in b/lib/libXfont/src/fontfile/Makefile.in
index ce0d6a770..ccd0c2be3 100644
--- a/lib/libXfont/src/fontfile/Makefile.in
+++ b/lib/libXfont/src/fontfile/Makefile.in
@@ -126,7 +126,11 @@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@
 GREP = @GREP@
 HAVE_FOP_FALSE = @HAVE_FOP_FALSE@
 HAVE_FOP_TRUE = @HAVE_FOP_TRUE@
+HAVE_STYLESHEETS_FALSE = @HAVE_STYLESHEETS_FALSE@
+HAVE_STYLESHEETS_TRUE = @HAVE_STYLESHEETS_TRUE@
 HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
+HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
+HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
 HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
@@ -165,6 +169,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 VERSION = @VERSION@
 XFONT_BDFFORMAT_FALSE = @XFONT_BDFFORMAT_FALSE@
 XFONT_BDFFORMAT_TRUE = @XFONT_BDFFORMAT_TRUE@
@@ -186,6 +191,8 @@ XFONT_SNFFORMAT_FALSE = @XFONT_SNFFORMAT_FALSE@
 XFONT_SNFFORMAT_TRUE = @XFONT_SNFFORMAT_TRUE@
 XMLTO = @XMLTO@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XORG_SGML_PATH = @XORG_SGML_PATH@
+XSL_STYLESHEET = @XSL_STYLESHEET@
 X_BZIP2_FONT_COMPRESSION_FALSE = @X_BZIP2_FONT_COMPRESSION_FALSE@
 X_BZIP2_FONT_COMPRESSION_TRUE = @X_BZIP2_FONT_COMPRESSION_TRUE@
 X_GZIP_FONT_COMPRESSION = @X_GZIP_FONT_COMPRESSION@
diff --git a/lib/libXfont/src/fontfile/bitsource.c b/lib/libXfont/src/fontfile/bitsource.c
index d828ce815..1b79c2bcb 100644
--- a/lib/libXfont/src/fontfile/bitsource.c
+++ b/lib/libXfont/src/fontfile/bitsource.c
@@ -1,5 +1,3 @@
-/* $Xorg: bitsource.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -25,7 +23,6 @@ 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/lib/font/fontfile/bitsource.c,v 1.3 2001/01/17 19:43:29 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/src/fontfile/bufio.c b/lib/libXfont/src/fontfile/bufio.c
index dd8d6e282..34b7f3665 100644
--- a/lib/libXfont/src/fontfile/bufio.c
+++ b/lib/libXfont/src/fontfile/bufio.c
@@ -1,5 +1,3 @@
-/* $Xorg: bufio.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/fontfile/bufio.c,v 3.9 2001/12/14 19:56:50 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/src/fontfile/decompress.c b/lib/libXfont/src/fontfile/decompress.c
index cdfb49279..b1fc37b85 100644
--- a/lib/libXfont/src/fontfile/decompress.c
+++ b/lib/libXfont/src/fontfile/decompress.c
@@ -1,4 +1,3 @@
-/* $Xorg: decompress.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
 /*
  * Copyright 1985, 1986 The Regents of the University of California.
  * All rights reserved.
@@ -45,7 +44,6 @@ 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/lib/font/fontfile/decompress.c,v 1.4 2001/01/17 19:43:29 dawes Exp $ */
 /* 
  * decompress - cat a compressed file
  */
diff --git a/lib/libXfont/src/fontfile/defaults.c b/lib/libXfont/src/fontfile/defaults.c
index 7f20cab67..1ad7d7ce5 100644
--- a/lib/libXfont/src/fontfile/defaults.c
+++ b/lib/libXfont/src/fontfile/defaults.c
@@ -1,5 +1,3 @@
-/* $Xorg: defaults.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
-
 /*
 
 Copyright 1990, 1998  The Open Group
@@ -25,7 +23,6 @@ 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/lib/font/fontfile/defaults.c,v 1.7 2001/01/17 19:43:29 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/src/fontfile/dirfile.c b/lib/libXfont/src/fontfile/dirfile.c
index 588464ffb..c8aff6f4f 100644
--- a/lib/libXfont/src/fontfile/dirfile.c
+++ b/lib/libXfont/src/fontfile/dirfile.c
@@ -1,5 +1,3 @@
-/* $Xorg: dirfile.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -25,7 +23,6 @@ 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/lib/font/fontfile/dirfile.c,v 3.17 2004/02/08 01:52:27 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/src/fontfile/fileio.c b/lib/libXfont/src/fontfile/fileio.c
index 3e2f98a2b..80af51193 100644
--- a/lib/libXfont/src/fontfile/fileio.c
+++ b/lib/libXfont/src/fontfile/fileio.c
@@ -1,5 +1,3 @@
-/* $Xorg: fileio.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -25,7 +23,6 @@ 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/lib/font/fontfile/fileio.c,v 3.9 2001/12/14 19:56:51 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/src/fontfile/filewr.c b/lib/libXfont/src/fontfile/filewr.c
index f9c53a2be..bcc7b1eda 100644
--- a/lib/libXfont/src/fontfile/filewr.c
+++ b/lib/libXfont/src/fontfile/filewr.c
@@ -1,5 +1,3 @@
-/* $Xorg: filewr.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -25,7 +23,6 @@ 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/lib/font/fontfile/filewr.c,v 3.6 2001/12/14 19:56:51 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/src/fontfile/fontdir.c b/lib/libXfont/src/fontfile/fontdir.c
index 70f1b0f44..e052bb371 100644
--- a/lib/libXfont/src/fontfile/fontdir.c
+++ b/lib/libXfont/src/fontfile/fontdir.c
@@ -1,6 +1,3 @@
-/* $XdotOrg: xc/lib/font/fontfile/fontdir.c,v 1.4 2005/07/03 07:01:00 daniels Exp $ */
-/* $Xorg: fontdir.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -26,7 +23,6 @@ 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/lib/font/fontfile/fontdir.c,v 3.22 2003/07/07 16:40:11 eich Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/src/fontfile/fontencc.c b/lib/libXfont/src/fontfile/fontencc.c
index b54079acf..79977851d 100644
--- a/lib/libXfont/src/fontfile/fontencc.c
+++ b/lib/libXfont/src/fontfile/fontencc.c
@@ -19,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XFree86: xc/lib/font/fontfile/fontencc.c,v 1.1 2001/08/13 21:46:47 dawes Exp $ */
 
 /* Binary compatibility code. */
 
diff --git a/lib/libXfont/src/fontfile/fontfile.c b/lib/libXfont/src/fontfile/fontfile.c
index a738c4d34..eb37a8705 100644
--- a/lib/libXfont/src/fontfile/fontfile.c
+++ b/lib/libXfont/src/fontfile/fontfile.c
@@ -1,6 +1,3 @@
-/* $XdotOrg: xc/lib/font/fontfile/fontfile.c,v 1.4 2005/07/03 07:01:00 daniels Exp $ */
-/* $Xorg: fontfile.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -26,12 +23,10 @@ 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/lib/font/fontfile/fontfile.c,v 3.21 2003/12/02 19:50:40 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $NCDXorg: @(#)fontfile.c,v 1.6 1991/07/02 17:00:46 lemke Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXfont/src/fontfile/fontscale.c b/lib/libXfont/src/fontfile/fontscale.c
index 8002dde81..55aca298a 100644
--- a/lib/libXfont/src/fontfile/fontscale.c
+++ b/lib/libXfont/src/fontfile/fontscale.c
@@ -1,5 +1,3 @@
-/* $Xorg: fontscale.c,v 1.5 2001/02/09 02:04:03 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -25,7 +23,6 @@ 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/lib/font/fontfile/fontscale.c,v 3.9 2001/08/27 19:49:54 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/src/fontfile/gunzip.c b/lib/libXfont/src/fontfile/gunzip.c
index 6cf192bb8..9fa3eed00 100644
--- a/lib/libXfont/src/fontfile/gunzip.c
+++ b/lib/libXfont/src/fontfile/gunzip.c
@@ -1,8 +1,6 @@
-/* $Xorg: gunzip.c,v 1.3 2000/08/17 19:46:37 cpqbld Exp $ */
 /* lib/font/fontfile/gunzip.c
    written by Mark Eichin <eichin@kitten.gen.ma.us> September 1996.
    intended for inclusion in X11 public releases. */
-/* $XFree86: xc/lib/font/fontfile/gunzip.c,v 1.4 2000/09/19 12:46:08 eich Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXfont/src/fontfile/renderers.c b/lib/libXfont/src/fontfile/renderers.c
index bf82c1c1e..a9e4bef53 100644
--- a/lib/libXfont/src/fontfile/renderers.c
+++ b/lib/libXfont/src/fontfile/renderers.c
@@ -23,7 +23,6 @@ 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/lib/font/fontfile/renderers.c,v 1.7 2002/12/09 17:30:00 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/src/stubs/Makefile.in b/lib/libXfont/src/stubs/Makefile.in
index d57b4c222..92b081912 100644
--- a/lib/libXfont/src/stubs/Makefile.in
+++ b/lib/libXfont/src/stubs/Makefile.in
@@ -119,7 +119,11 @@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@
 GREP = @GREP@
 HAVE_FOP_FALSE = @HAVE_FOP_FALSE@
 HAVE_FOP_TRUE = @HAVE_FOP_TRUE@
+HAVE_STYLESHEETS_FALSE = @HAVE_STYLESHEETS_FALSE@
+HAVE_STYLESHEETS_TRUE = @HAVE_STYLESHEETS_TRUE@
 HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
+HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
+HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
 HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
@@ -158,6 +162,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 VERSION = @VERSION@
 XFONT_BDFFORMAT_FALSE = @XFONT_BDFFORMAT_FALSE@
 XFONT_BDFFORMAT_TRUE = @XFONT_BDFFORMAT_TRUE@
@@ -179,6 +184,8 @@ XFONT_SNFFORMAT_FALSE = @XFONT_SNFFORMAT_FALSE@
 XFONT_SNFFORMAT_TRUE = @XFONT_SNFFORMAT_TRUE@
 XMLTO = @XMLTO@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XORG_SGML_PATH = @XORG_SGML_PATH@
+XSL_STYLESHEET = @XSL_STYLESHEET@
 X_BZIP2_FONT_COMPRESSION_FALSE = @X_BZIP2_FONT_COMPRESSION_FALSE@
 X_BZIP2_FONT_COMPRESSION_TRUE = @X_BZIP2_FONT_COMPRESSION_TRUE@
 X_GZIP_FONT_COMPRESSION = @X_GZIP_FONT_COMPRESSION@
diff --git a/lib/libXfont/src/stubs/stubs.h b/lib/libXfont/src/stubs/stubs.h
index 41cde58df..7f0eef298 100644
--- a/lib/libXfont/src/stubs/stubs.h
+++ b/lib/libXfont/src/stubs/stubs.h
@@ -1,5 +1,3 @@
-/* $XFree86: xc/lib/font/stubs/stubs.h,v 1.3 1999/12/15 01:14:36 robin Exp $ */
-
 #include <stdio.h>
 #include <X11/fonts/fntfilst.h>
 #include <X11/fonts/font.h>
@@ -12,10 +10,22 @@
 #endif
 
 /* this probably works for Mach-O too, but probably not for PE */
-#if defined(__ELF__) && defined(__GNUC__) && (__GNUC__ >= 3)
+#if (defined(__APPLE__) || defined(__ELF__)) && defined(__GNUC__) && (__GNUC__ >= 3)
 #define weak __attribute__((weak))
 #else
 #define weak
+#ifndef __SUNPRO_C /* Sun compilers use #pragma weak in .c files instead */
+#define NO_WEAK_SYMBOLS
+#endif
+#endif
+
+/* This is really just a hack for now... __APPLE__ really should be using
+ * the weak symbols route above, but it's causing an as-yet unresolved issue,
+ * so we're instead building with flat_namespace.
+ */
+#ifdef __APPLE__
+#undef weak
+#define weak
 #endif
 
 extern FontPtr find_old_font ( FSID id );
diff --git a/lib/libXfont/src/util/Makefile.in b/lib/libXfont/src/util/Makefile.in
index 92cce16d7..a8e188a5e 100644
--- a/lib/libXfont/src/util/Makefile.in
+++ b/lib/libXfont/src/util/Makefile.in
@@ -118,7 +118,11 @@ FREETYPE_REQUIRES = @FREETYPE_REQUIRES@
 GREP = @GREP@
 HAVE_FOP_FALSE = @HAVE_FOP_FALSE@
 HAVE_FOP_TRUE = @HAVE_FOP_TRUE@
+HAVE_STYLESHEETS_FALSE = @HAVE_STYLESHEETS_FALSE@
+HAVE_STYLESHEETS_TRUE = @HAVE_STYLESHEETS_TRUE@
 HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
+HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
+HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
 HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
@@ -157,6 +161,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 VERSION = @VERSION@
 XFONT_BDFFORMAT_FALSE = @XFONT_BDFFORMAT_FALSE@
 XFONT_BDFFORMAT_TRUE = @XFONT_BDFFORMAT_TRUE@
@@ -178,6 +183,8 @@ XFONT_SNFFORMAT_FALSE = @XFONT_SNFFORMAT_FALSE@
 XFONT_SNFFORMAT_TRUE = @XFONT_SNFFORMAT_TRUE@
 XMLTO = @XMLTO@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XORG_SGML_PATH = @XORG_SGML_PATH@
+XSL_STYLESHEET = @XSL_STYLESHEET@
 X_BZIP2_FONT_COMPRESSION_FALSE = @X_BZIP2_FONT_COMPRESSION_FALSE@
 X_BZIP2_FONT_COMPRESSION_TRUE = @X_BZIP2_FONT_COMPRESSION_TRUE@
 X_GZIP_FONT_COMPRESSION = @X_GZIP_FONT_COMPRESSION@
diff --git a/lib/libXfont/src/util/atom.c b/lib/libXfont/src/util/atom.c
index bfb05ccbd..f15e3d8de 100644
--- a/lib/libXfont/src/util/atom.c
+++ b/lib/libXfont/src/util/atom.c
@@ -1,5 +1,3 @@
-/* $Xorg: atom.c,v 1.5 2001/02/09 02:04:04 xorgcvs Exp $ */
-
 /*
 
 Copyright 1990, 1994, 1998  The Open Group
@@ -25,7 +23,6 @@ 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/lib/font/util/atom.c,v 1.9 2002/09/19 13:22:00 tsi Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/src/util/fontaccel.c b/lib/libXfont/src/util/fontaccel.c
index c37f69a39..c5915dba9 100644
--- a/lib/libXfont/src/util/fontaccel.c
+++ b/lib/libXfont/src/util/fontaccel.c
@@ -1,5 +1,3 @@
-/* $Xorg: fontaccel.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
 /*
 
 Copyright 1990, 1998  The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/util/fontaccel.c,v 1.6 2001/01/17 19:43:33 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/src/util/fontnames.c b/lib/libXfont/src/util/fontnames.c
index d03cea773..ceafce593 100644
--- a/lib/libXfont/src/util/fontnames.c
+++ b/lib/libXfont/src/util/fontnames.c
@@ -1,5 +1,3 @@
-/* $Xorg: fontnames.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -27,12 +25,10 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/util/fontnames.c,v 1.4 2001/01/17 19:43:33 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
  *
- *	@(#)fontnames.c	3.1	91/04/10
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libXfont/src/util/fontutil.c b/lib/libXfont/src/util/fontutil.c
index aa89ce01a..22f6119ae 100644
--- a/lib/libXfont/src/util/fontutil.c
+++ b/lib/libXfont/src/util/fontutil.c
@@ -1,5 +1,3 @@
-/* $Xorg: fontutil.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/util/fontutil.c,v 3.6 2001/10/28 03:32:46 tsi Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/src/util/fontxlfd.c b/lib/libXfont/src/util/fontxlfd.c
index 462554006..81240376f 100644
--- a/lib/libXfont/src/util/fontxlfd.c
+++ b/lib/libXfont/src/util/fontxlfd.c
@@ -1,5 +1,3 @@
-/* $Xorg: fontxlfd.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
 /*
 
 Copyright 1990, 1998  The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/util/fontxlfd.c,v 3.16tsi Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/src/util/format.c b/lib/libXfont/src/util/format.c
index 6700721f9..f5424fe41 100644
--- a/lib/libXfont/src/util/format.c
+++ b/lib/libXfont/src/util/format.c
@@ -1,4 +1,3 @@
-/* $Xorg: format.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
 /*
  * Copyright 1990, 1991 Network Computing Devices;
  * Portions Copyright 1987 by Digital Equipment Corporation
@@ -50,7 +49,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/util/format.c,v 1.4 2001/01/17 19:43:33 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib/libXfont/src/util/miscutil.c b/lib/libXfont/src/util/miscutil.c
index 1e76b4b65..7173d3640 100644
--- a/lib/libXfont/src/util/miscutil.c
+++ b/lib/libXfont/src/util/miscutil.c
@@ -1,5 +1,3 @@
-/* $Xorg: miscutil.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1994, 1998  The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/font/util/miscutil.c,v 1.7 2001/07/25 15:04:57 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -48,8 +45,10 @@ from The Open Group.
 
 extern void BuiltinRegisterFpeFunctions(void);
 
+#ifndef NO_WEAK_SYMBOLS
 /* make sure everything initializes themselves at least once */
 weak long serverGeneration = 1;
+#endif
 
 weak void
 register_fpe_functions (void)
diff --git a/lib/libXfont/src/util/patcache.c b/lib/libXfont/src/util/patcache.c
index 5411810d6..548105a00 100644
--- a/lib/libXfont/src/util/patcache.c
+++ b/lib/libXfont/src/util/patcache.c
@@ -1,5 +1,3 @@
-/* $Xorg: patcache.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -25,7 +23,6 @@ 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/lib/font/util/patcache.c,v 3.4 2001/01/17 19:43:33 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/src/util/private.c b/lib/libXfont/src/util/private.c
index 6b760b4c3..36715b1fa 100644
--- a/lib/libXfont/src/util/private.c
+++ b/lib/libXfont/src/util/private.c
@@ -1,5 +1,3 @@
-/* $Xorg: private.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -25,7 +23,6 @@ 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/lib/font/util/private.c,v 1.8tsi Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/src/util/utilbitmap.c b/lib/libXfont/src/util/utilbitmap.c
index 978db89c8..5feb2d133 100644
--- a/lib/libXfont/src/util/utilbitmap.c
+++ b/lib/libXfont/src/util/utilbitmap.c
@@ -23,7 +23,6 @@ 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/lib/font/util/utilbitmap.c,v 1.4 2001/01/17 19:43:34 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium