Update to libXfont 1.4.3. No functional change.

87 files changed, 1273 insertions, 447 deletions

diff --git a/lib/libXfont/ChangeLog b/lib/libXfont/ChangeLog
index bc788142b..b734a4a4a 100644
--- a/lib/libXfont/ChangeLog
+++ b/lib/libXfont/ChangeLog
@@ -1,3 +1,107 @@
+commit 12157fbebc35c2d039df2df4fc5ac2b299eeec03
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Thu Oct 28 20:43:27 2010 -0700
+
+    libXfont 1.4.3
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f29f1d68d7eca96e45ba3758686be07993d82e03
+Author: Jesse Adkins <jesserayadkins@gmail.com>
+Date:   Tue Sep 28 13:30:02 2010 -0700
+
+    Purge cvs tags.
+    
+    Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 6628b4d82426cf9ac240da363cd8a8252e6f71ef
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date:   Mon Sep 27 12:31:50 2010 -0700
+
+    FreeType: Cleanup MUMBLE and fix printing of XLFD in debug spew.
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit c482a2c104aa5cd1a265c2ca310a308dcc418fe7
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date:   Wed Apr 14 05:58:28 2010 -0500
+
+    Revert "Bug #6247: Fix build on Cygwin"
+    
+    libtool requires the '-no-undefined' flag in order to create shared
+    libraries on PE/COFF platforms (Cygwin/MinGW); on other platforms this
+    flag has no effect.
+    
+    The problem with libXfont is that PE weak symbols do not behave exactly
+    as they do on ELF platforms.  Since PE binaries (both executables and
+    libraries) must have all symbols resolved at link time, there is no way
+    for the real symbols in xserver to "displace" those in libXfont at
+    runtime, so the result is that libXfont uses its stubs, which do
+    nothing, and xserver ends up unable to find its fonts.
+    
+    Solving this will require either significant changes to libXfont or some
+    major improvement to the toolchain to handle this case.  Until that
+    happens, removing '-no-undefined' will result in a static-only library
+    on these platforms, which is the only currently working solution.
+    
+    http://sourceware.org/bugzilla/show_bug.cgi?id=11306
+    http://cygwin.com/ml/cygwin/2010-04/msg00281.html
+    
+    This reverts commit 69c4ae1e3e14a58bc2eb9b9b8820dc7183b82a67.
+    
+    Conflicts:
+    
+    	ChangeLog
+    
+    Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+
+commit 455ec66e82e3c4bedd9e789d2ab33030b8e64ffa
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Aug 8 00:19:36 2010 -0700
+
+    Fix builds with Sun compilers
+    
+    Sun compilers use #pragma weak in the *.c files to declare weak symbols,
+    so should have weak defined to empty, but not define NO_WEAK_SYMBOLS
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 0386fa77367a305deea3cc27f8a3865cc3c467c0
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date:   Sat Jul 10 10:08:21 2010 -0700
+
+    darwin: Fix build regression introduced by previous patch
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 8f75706901da0141590d46f0f898e5678feac953
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date:   Mon Jun 28 17:56:07 2010 +0100
+
+    Build fix for platforms which don't have weak linkage
+    
+    Since we fix this by removing the serverGeneration symbol, assuming
+    an external definition will be provided, this means on Windows libXfont
+    can only be built as a static library (since PE shared libraries cannot
+    contain undefined symbols).  This produces a libXfont which might only
+    be useful to the xserver, but the only other users we might care about
+    are xfs, which is obsolete, and bdftopcf, which fortunately doesn't
+    pull in any objects which reference serverGeneration from libXfont.
+    
+    Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+    Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 5c49c956e9c85d89f6b2e719eb9b6fbde62c2f72
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Mon Jun 28 13:18:22 2010 -0400
+
+    doc: use xorg-docs xorg.css stylesheet
+    
+    Use latest DocBook XML util-macros infrastructure
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
 commit 27270de56f7da5e047784434f3b29fa672f97ffd
 Author: Tiago Vignatti <tiago.vignatti@nokia.com>
 Date:   Thu Jun 10 16:29:37 2010 +0300
diff --git a/lib/libXfont/INSTALL b/lib/libXfont/INSTALL
new file mode 100644
index 000000000..8b82ade08
--- /dev/null
+++ b/lib/libXfont/INSTALL
@@ -0,0 +1,291 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+   This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+  6. Often, you can also type `make uninstall' to remove the installed
+     files again.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+   By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
+
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *Note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+
diff --git a/lib/libXfont/Makefile.am b/lib/libXfont/Makefile.am
index 49102e81e..9153e98bf 100644
--- a/lib/libXfont/Makefile.am
+++ b/lib/libXfont/Makefile.am
@@ -19,7 +19,7 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-SUBDIRS=src
+SUBDIRS=doc src
 
 libXfontincludedir = $(includedir)/X11/fonts
 libXfontinclude_HEADERS = \
@@ -54,28 +54,3 @@ ChangeLog:
 	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog INSTALL
-
-# Developer documentation - not installed on system
-EXTRA_DIST = doc/fontlib.xml doc/fontlib.xsl doc/fontlib.css
-
-if ENABLE_DEVEL_DOCS
-if HAVE_XMLTO
-noinst_DATA = doc/fontlib.txt doc/fontlib.html $(srcdir)/doc/fontlib.css
-if HAVE_FOP
-noinst_DATA += doc/fontlib.pdf doc/fontlib.ps
-endif
-CLEANFILES = doc/fontlib.txt doc/fontlib.html doc/fontlib.pdf doc/fontlib.ps
-
-doc/fontlib.txt: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl
-	$(AM_V_GEN)$(XMLTO) -m $(srcdir)/doc/fontlib.xsl -o doc txt $(srcdir)/doc/fontlib.xml
-
-doc/fontlib.html: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl
-	$(AM_V_GEN)$(XMLTO) -m $(srcdir)/doc/fontlib.xsl -o doc xhtml-nochunks $(srcdir)/doc/fontlib.xml
-
-doc/fontlib.pdf: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl
-	$(AM_V_GEN)$(XMLTO) --with-fop -m $(srcdir)/doc/fontlib.xsl -o doc pdf $(srcdir)/doc/fontlib.xml
-
-doc/fontlib.ps: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl
-	$(AM_V_GEN)$(XMLTO) --with-fop -m $(srcdir)/doc/fontlib.xsl -o doc ps $(srcdir)/doc/fontlib.xml
-endif HAVE_XMLTO
-endif ENABLE_DEVEL_DOCS
diff --git a/lib/libXfont/Makefile.in b/lib/libXfont/Makefile.in
index 34af3eb32..c7bab2287 100644
--- a/lib/libXfont/Makefile.in
+++ b/lib/libXfont/Makefile.in
@@ -58,7 +58,6 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = doc/fontlib.pdf doc/fontlib.ps
 DIST_COMMON = README $(am__configure_deps) $(libXfontinclude_HEADERS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/config.h.in $(srcdir)/xfont.pc.in \
@@ -94,7 +93,7 @@ am__installdirs = "$(DESTDIR)$(pkgconfigdir)" \
 	"$(DESTDIR)$(libXfontincludedir)" \
 	"$(DESTDIR)$(libXfontincludedir)"
 pkgconfigDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(noinst_DATA) $(pkgconfig_DATA)
+DATA = $(pkgconfig_DATA)
 libXfontincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 nodist_libXfontincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(libXfontinclude_HEADERS) $(nodist_libXfontinclude_HEADERS)
@@ -162,7 +161,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@
@@ -201,6 +204,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@
@@ -222,6 +226,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@
@@ -274,7 +280,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-SUBDIRS = src
+SUBDIRS = doc src
 libXfontincludedir = $(includedir)/X11/fonts
 libXfontinclude_HEADERS = \
 	include/X11/fonts/bdfint.h   \
@@ -298,15 +304,6 @@ nodist_libXfontinclude_HEADERS = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xfont.pc
 MAINTAINERCLEANFILES = ChangeLog INSTALL
-
-# Developer documentation - not installed on system
-EXTRA_DIST = doc/fontlib.xml doc/fontlib.xsl doc/fontlib.css
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@noinst_DATA =  \
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@	doc/fontlib.txt \
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@	doc/fontlib.html \
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@	$(srcdir)/doc/fontlib.css \
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@	$(am__append_1)
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = doc/fontlib.txt doc/fontlib.html doc/fontlib.pdf doc/fontlib.ps
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -570,7 +567,7 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/doc $(distdir)/include/X11/fonts $(distdir)/src/FreeType
+	$(mkdir_p) $(distdir)/. $(distdir)/include/X11/fonts $(distdir)/src/FreeType
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -737,7 +734,6 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -831,18 +827,6 @@ ChangeLog:
 	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog INSTALL
-
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@doc/fontlib.txt: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) -m $(srcdir)/doc/fontlib.xsl -o doc txt $(srcdir)/doc/fontlib.xml
-
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@doc/fontlib.html: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) -m $(srcdir)/doc/fontlib.xsl -o doc xhtml-nochunks $(srcdir)/doc/fontlib.xml
-
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@doc/fontlib.pdf: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) --with-fop -m $(srcdir)/doc/fontlib.xsl -o doc pdf $(srcdir)/doc/fontlib.xml
-
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@doc/fontlib.ps: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl
-@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) --with-fop -m $(srcdir)/doc/fontlib.xsl -o doc ps $(srcdir)/doc/fontlib.xml
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/lib/libXfont/aclocal.m4 b/lib/libXfont/aclocal.m4
index 8a285b164..49e69dd11 100644
--- a/lib/libXfont/aclocal.m4
+++ b/lib/libXfont/aclocal.m4
@@ -7621,7 +7621,7 @@ AC_SUBST([am__untar])
 
 dnl xorg-macros.m4.  Generated from xorg-macros.m4.in xorgversion.m4 by configure.
 dnl
-dnl Copyright 2005-2006 Sun Microsystems, Inc.  All rights reserved.
+dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
 dnl 
 dnl Permission is hereby granted, free of charge, to any person obtaining a
 dnl copy of this software and associated documentation files (the "Software"),
@@ -7658,7 +7658,7 @@ dnl DEALINGS IN THE SOFTWARE.
 # See the "minimum version" comment for each macro you use to see what 
 # version you require.
 m4_defun([XORG_MACROS_VERSION],[
-m4_define([vers_have], [1.8.0])
+m4_define([vers_have], [1.11.0])
 m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
 m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
 m4_if(m4_cmp(maj_have, maj_needed), 0,,
@@ -7809,6 +7809,7 @@ MAN_SUBSTS="\
 	-e 's|__xservername__|Xorg|g' \
 	-e 's|__xconfigfile__|xorg.conf|g' \
 	-e 's|__projectroot__|\$(prefix)|g' \
+	-e 's|__apploaddir__|\$(appdefaultdir)|g' \
 	-e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
 	-e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \
 	-e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \
@@ -7837,13 +7838,20 @@ PKG_CHECK_EXISTS([xorg-sgml-doctools m4_ifval([$1],[>= $1])],
          fi])
     ])
 
+# Define variables STYLESHEET_SRCDIR and XSL_STYLESHEET containing
+# the path and the name of the doc stylesheet
 if test "x$XORG_SGML_PATH" != "x" ; then
    AC_MSG_RESULT([$XORG_SGML_PATH])
+   STYLESHEET_SRCDIR=$XORG_SGML_PATH/X11
+   XSL_STYLESHEET=$STYLESHEET_SRCDIR/xorg.xsl
 else
    AC_MSG_RESULT([no])
 fi
 
 AC_SUBST(XORG_SGML_PATH)
+AC_SUBST(STYLESHEET_SRCDIR)
+AC_SUBST(XSL_STYLESHEET)
+AM_CONDITIONAL([HAVE_STYLESHEETS], [test "x$XSL_STYLESHEET" != "x"])
 ]) # XORG_CHECK_SGML_DOCTOOLS
 
 # XORG_CHECK_LINUXDOC
@@ -7959,15 +7967,17 @@ AC_SUBST(MAKE_PDF)
 AC_SUBST(MAKE_HTML)
 ]) # XORG_CHECK_DOCBOOK
 
-# XORG_WITH_XMLTO([MIN-VERSION])
+# XORG_WITH_XMLTO([MIN-VERSION], [DEFAULT])
 # ----------------
 # Minimum version: 1.5.0
+# Minimum version for optional DEFAULT argument: 1.11.0
 #
 # Documentation tools are not always available on all platforms and sometimes
 # not at the appropriate level. This macro enables a module to test for the
 # presence of the tool and obtain it's path in separate variables. Coupled with
 # the --with-xmlto option, it allows maximum flexibilty in making decisions
-# as whether or not to use the xmlto package.
+# as whether or not to use the xmlto package. When DEFAULT is not specified,
+# --with-xmlto assumes 'auto'.
 #
 # Interface to module:
 # HAVE_XMLTO: 	used in makefiles to conditionally generate documentation
@@ -7976,14 +7986,20 @@ AC_SUBST(MAKE_HTML)
 # --with-xmlto:	'yes' user instructs the module to use xmlto
 #		'no' user instructs the module not to use xmlto
 #
+# Added in version 1.10.0
+# HAVE_XMLTO_TEXT: used in makefiles to conditionally generate text documentation
+#                  xmlto for text output requires either lynx, links, or w3m browsers
+#
 # If the user sets the value of XMLTO, AC_PATH_PROG skips testing the path.
 #
 AC_DEFUN([XORG_WITH_XMLTO],[
 AC_ARG_VAR([XMLTO], [Path to xmlto command])
+m4_define([_defopt], m4_default([$2], [auto]))
 AC_ARG_WITH(xmlto,
 	AS_HELP_STRING([--with-xmlto],
-	   [Use xmlto to regenerate documentation (default: yes, if installed)]),
-	   [use_xmlto=$withval], [use_xmlto=auto])
+	   [Use xmlto to regenerate documentation (default: ]_defopt[)]),
+	   [use_xmlto=$withval], [use_xmlto=]_defopt)
+m4_undefine([_defopt])
 
 if test "x$use_xmlto" = x"auto"; then
    AC_PATH_PROG([XMLTO], [xmlto])
@@ -8007,6 +8023,8 @@ elif test "x$use_xmlto" = x"no" ; then
 else
    AC_MSG_ERROR([--with-xmlto expects 'yes' or 'no'])
 fi
+
+# Test for a minimum version of xmlto, if provided.
 m4_ifval([$1],
 [if test "$have_xmlto" = yes; then
     # scrape the xmlto version
@@ -8021,18 +8039,31 @@ m4_ifval([$1],
             AC_MSG_ERROR([xmlto version $xmlto_version found, but $1 needed])
         fi])
 fi])
+
+# Test for the ability of xmlto to generate a text target
+have_xmlto_text=no
+cat > conftest.xml << "EOF"
+EOF
+AS_IF([test "$have_xmlto" = yes],
+      [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],
+             [have_xmlto_text=yes],
+             [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])
+rm -f conftest.xml
+AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes])
 AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
 ]) # XORG_WITH_XMLTO
 
-# XORG_WITH_ASCIIDOC([MIN-VERSION])
+# XORG_WITH_ASCIIDOC([MIN-VERSION], [DEFAULT])
 # ----------------
 # Minimum version: 1.5.0
+# Minimum version for optional DEFAULT argument: 1.11.0
 #
 # Documentation tools are not always available on all platforms and sometimes
 # not at the appropriate level. This macro enables a module to test for the
 # presence of the tool and obtain it's path in separate variables. Coupled with
 # the --with-asciidoc option, it allows maximum flexibilty in making decisions
-# as whether or not to use the asciidoc package.
+# as whether or not to use the asciidoc package. When DEFAULT is not specified,
+# --with-asciidoc assumes 'auto'.
 #
 # Interface to module:
 # HAVE_ASCIIDOC: used in makefiles to conditionally generate documentation
@@ -8045,10 +8076,12 @@ AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
 #
 AC_DEFUN([XORG_WITH_ASCIIDOC],[
 AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command])
+m4_define([_defopt], m4_default([$2], [auto]))
 AC_ARG_WITH(asciidoc,
 	AS_HELP_STRING([--with-asciidoc],
-	   [Use asciidoc to regenerate documentation (default: yes, if installed)]),
-	   [use_asciidoc=$withval], [use_asciidoc=auto])
+	   [Use asciidoc to regenerate documentation (default: ]_defopt[)]),
+	   [use_asciidoc=$withval], [use_asciidoc=]_defopt)
+m4_undefine([_defopt])
 
 if test "x$use_asciidoc" = x"auto"; then
    AC_PATH_PROG([ASCIIDOC], [asciidoc])
@@ -8089,15 +8122,17 @@ fi])
 AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
 ]) # XORG_WITH_ASCIIDOC
 
-# XORG_WITH_DOXYGEN([MIN-VERSION])
+# XORG_WITH_DOXYGEN([MIN-VERSION], [DEFAULT])
 # --------------------------------
 # Minimum version: 1.5.0
+# Minimum version for optional DEFAULT argument: 1.11.0
 #
 # Documentation tools are not always available on all platforms and sometimes
 # not at the appropriate level. This macro enables a module to test for the
 # presence of the tool and obtain it's path in separate variables. Coupled with
 # the --with-doxygen option, it allows maximum flexibilty in making decisions
-# as whether or not to use the doxygen package.
+# as whether or not to use the doxygen package. When DEFAULT is not specified,
+# --with-doxygen assumes 'auto'.
 #
 # Interface to module:
 # HAVE_DOXYGEN: used in makefiles to conditionally generate documentation
@@ -8110,10 +8145,12 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
 #
 AC_DEFUN([XORG_WITH_DOXYGEN],[
 AC_ARG_VAR([DOXYGEN], [Path to doxygen command])
+m4_define([_defopt], m4_default([$2], [auto]))
 AC_ARG_WITH(doxygen,
 	AS_HELP_STRING([--with-doxygen],
-	   [Use doxygen to regenerate documentation (default: yes, if installed)]),
-	   [use_doxygen=$withval], [use_doxygen=auto])
+	   [Use doxygen to regenerate documentation (default: ]_defopt[)]),
+	   [use_doxygen=$withval], [use_doxygen=]_defopt)
+m4_undefine([_defopt])
 
 if test "x$use_doxygen" = x"auto"; then
    AC_PATH_PROG([DOXYGEN], [doxygen])
@@ -8154,15 +8191,17 @@ fi])
 AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
 ]) # XORG_WITH_DOXYGEN
 
-# XORG_WITH_GROFF
+# XORG_WITH_GROFF([DEFAULT])
 # ----------------
 # Minimum version: 1.6.0
+# Minimum version for optional DEFAULT argument: 1.11.0
 #
 # Documentation tools are not always available on all platforms and sometimes
 # not at the appropriate level. This macro enables a module to test for the
 # presence of the tool and obtain it's path in separate variables. Coupled with
 # the --with-groff option, it allows maximum flexibilty in making decisions
-# as whether or not to use the groff package.
+# as whether or not to use the groff package. When DEFAULT is not specified,
+# --with-groff assumes 'auto'.
 #
 # Interface to module:
 # HAVE_GROFF:	 used in makefiles to conditionally generate documentation
@@ -8173,6 +8212,12 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
 # --with-groff:	 'yes' user instructs the module to use groff
 #		 'no' user instructs the module not to use groff
 #
+# Added in version 1.9.0:
+# HAVE_GROFF_HTML: groff has dependencies to output HTML format:
+#		   pnmcut pnmcrop pnmtopng pnmtops from the netpbm package.
+#		   psselect from the psutils package.
+#		   the ghostcript package. Refer to the grohtml man pages
+#
 # If the user sets the value of GROFF, AC_PATH_PROG skips testing the path.
 #
 # OS and distros often splits groff in a basic and full package, the former
@@ -8185,10 +8230,12 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
 #
 AC_DEFUN([XORG_WITH_GROFF],[
 AC_ARG_VAR([GROFF], [Path to groff command])
+m4_define([_defopt], m4_default([$1], [auto]))
 AC_ARG_WITH(groff,
 	AS_HELP_STRING([--with-groff],
-	   [Use groff to regenerate documentation (default: yes, if installed)]),
-	   [use_groff=$withval], [use_groff=auto])
+	   [Use groff to regenerate documentation (default: ]_defopt[)]),
+	   [use_groff=$withval], [use_groff=]_defopt)
+m4_undefine([_defopt])
 
 if test "x$use_groff" = x"auto"; then
    AC_PATH_PROG([GROFF], [groff])
@@ -8212,6 +8259,7 @@ elif test "x$use_groff" = x"no" ; then
 else
    AC_MSG_ERROR([--with-groff expects 'yes' or 'no'])
 fi
+
 # We have groff, test for the presence of the macro packages
 if test "x$have_groff" = x"yes"; then
     AC_MSG_CHECKING([for ${GROFF} -ms macros])
@@ -8229,20 +8277,38 @@ if test "x$have_groff" = x"yes"; then
     fi
     AC_MSG_RESULT([$groff_mm_works])
 fi
+
+# We have groff, test for HTML dependencies, one command per package
+if test "x$have_groff" = x"yes"; then
+   AC_PATH_PROGS(GS_PATH, [gs gswin32c])
+   AC_PATH_PROG(PNMTOPNG_PATH, [pnmtopng])
+   AC_PATH_PROG(PSSELECT_PATH, [psselect])
+   if test "x$GS_PATH" != "x" -a "x$PNMTOPNG_PATH" != "x" -a "x$PSSELECT_PATH" != "x"; then
+      have_groff_html=yes
+   else
+      have_groff_html=no
+      AC_MSG_WARN([grohtml dependencies not found - HTML Documentation skipped. Refer to grohtml man pages])
+   fi
+fi
+
+# Set Automake conditionals for Makefiles
 AM_CONDITIONAL([HAVE_GROFF], [test "$have_groff" = yes])
 AM_CONDITIONAL([HAVE_GROFF_MS], [test "$groff_ms_works" = yes])
 AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes])
+AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes])
 ]) # XORG_WITH_GROFF
 
-# XORG_WITH_FOP
+# XORG_WITH_FOP([DEFAULT])
 # ----------------
 # Minimum version: 1.6.0
+# Minimum version for optional DEFAULT argument: 1.11.0
 #
 # Documentation tools are not always available on all platforms and sometimes
 # not at the appropriate level. This macro enables a module to test for the
 # presence of the tool and obtain it's path in separate variables. Coupled with
 # the --with-fop option, it allows maximum flexibilty in making decisions
-# as whether or not to use the fop package.
+# as whether or not to use the fop package. When DEFAULT is not specified,
+# --with-fop assumes 'auto'.
 #
 # Interface to module:
 # HAVE_FOP: 	used in makefiles to conditionally generate documentation
@@ -8255,10 +8321,12 @@ AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes])
 #
 AC_DEFUN([XORG_WITH_FOP],[
 AC_ARG_VAR([FOP], [Path to fop command])
+m4_define([_defopt], m4_default([$1], [auto]))
 AC_ARG_WITH(fop,
 	AS_HELP_STRING([--with-fop],
-	   [Use fop to regenerate documentation (default: yes, if installed)]),
-	   [use_fop=$withval], [use_fop=auto])
+	   [Use fop to regenerate documentation (default: ]_defopt[)]),
+	   [use_fop=$withval], [use_fop=]_defopt)
+m4_undefine([_defopt])
 
 if test "x$use_fop" = x"auto"; then
    AC_PATH_PROG([FOP], [fop])
@@ -8285,15 +8353,17 @@ fi
 AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
 ]) # XORG_WITH_FOP
 
-# XORG_WITH_PS2PDF
+# XORG_WITH_PS2PDF([DEFAULT])
 # ----------------
 # Minimum version: 1.6.0
+# Minimum version for optional DEFAULT argument: 1.11.0
 #
 # Documentation tools are not always available on all platforms and sometimes
 # not at the appropriate level. This macro enables a module to test for the
 # presence of the tool and obtain it's path in separate variables. Coupled with
 # the --with-ps2pdf option, it allows maximum flexibilty in making decisions
-# as whether or not to use the ps2pdf package.
+# as whether or not to use the ps2pdf package. When DEFAULT is not specified,
+# --with-ps2pdf assumes 'auto'.
 #
 # Interface to module:
 # HAVE_PS2PDF: 	used in makefiles to conditionally generate documentation
@@ -8306,10 +8376,12 @@ AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
 #
 AC_DEFUN([XORG_WITH_PS2PDF],[
 AC_ARG_VAR([PS2PDF], [Path to ps2pdf command])
+m4_define([_defopt], m4_default([$1], [auto]))
 AC_ARG_WITH(ps2pdf,
 	AS_HELP_STRING([--with-ps2pdf],
-	   [Use ps2pdf to regenerate documentation (default: yes, if installed)]),
-	   [use_ps2pdf=$withval], [use_ps2pdf=auto])
+	   [Use ps2pdf to regenerate documentation (default: ]_defopt[)]),
+	   [use_ps2pdf=$withval], [use_ps2pdf=]_defopt)
+m4_undefine([_defopt])
 
 if test "x$use_ps2pdf" = x"auto"; then
    AC_PATH_PROG([PS2PDF], [ps2pdf])
@@ -8360,14 +8432,12 @@ AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes])
 # parm1:	specify the default value, yes or no.
 #
 AC_DEFUN([XORG_ENABLE_DOCS],[
-default=$1
-if test "x$default" = x ; then
-  default="yes"
-fi
+m4_define([default], m4_default([$1], [yes]))
 AC_ARG_ENABLE(docs,
 	AS_HELP_STRING([--enable-docs],
-	   [Enable building the documentation (default: yes)]),
-	   [build_docs=$enableval], [build_docs=$default])
+	   [Enable building the documentation (default: ]default[)]),
+	   [build_docs=$enableval], [build_docs=]default)
+m4_undefine([default])
 AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes])
 AC_MSG_CHECKING([whether to build documentation])
 AC_MSG_RESULT([$build_docs])
@@ -8395,14 +8465,12 @@ AC_MSG_RESULT([$build_docs])
 # parm1:		specify the default value, yes or no.
 #
 AC_DEFUN([XORG_ENABLE_DEVEL_DOCS],[
-devel_default=$1
-if test "x$devel_default" = x ; then
-  devel_default="yes"
-fi
+m4_define([devel_default], m4_default([$1], [yes]))
 AC_ARG_ENABLE(devel-docs,
 	AS_HELP_STRING([--enable-devel-docs],
-	   [Enable building the developer documentation (default: yes)]),
-	   [build_devel_docs=$enableval], [build_devel_docs=$devel_default])
+	   [Enable building the developer documentation (default: ]devel_default[)]),
+	   [build_devel_docs=$enableval], [build_devel_docs=]devel_default)
+m4_undefine([devel_default])
 AM_CONDITIONAL(ENABLE_DEVEL_DOCS, [test x$build_devel_docs = xyes])
 AC_MSG_CHECKING([whether to build developer documentation])
 AC_MSG_RESULT([$build_devel_docs])
@@ -8430,14 +8498,12 @@ AC_MSG_RESULT([$build_devel_docs])
 # parm1:		specify the default value, yes or no.
 #
 AC_DEFUN([XORG_ENABLE_SPECS],[
-spec_default=$1
-if test "x$spec_default" = x ; then
-  spec_default="yes"
-fi
+m4_define([spec_default], m4_default([$1], [yes]))
 AC_ARG_ENABLE(specs,
 	AS_HELP_STRING([--enable-specs],
-	   [Enable building the specs (default: yes)]),
-	   [build_specs=$enableval], [build_specs=$spec_default])
+	   [Enable building the specs (default: ]spec_default[)]),
+	   [build_specs=$enableval], [build_specs=]spec_default)
+m4_undefine([spec_default])
 AM_CONDITIONAL(ENABLE_SPECS, [test x$build_specs = xyes])
 AC_MSG_CHECKING([whether to build functional specifications])
 AC_MSG_RESULT([$build_specs])
diff --git a/lib/libXfont/configure b/lib/libXfont/configure
index 4c0ef106b..a9bbb7eb6 100644
--- a/lib/libXfont/configure
+++ b/lib/libXfont/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for libXfont 1.4.2.
+# Generated by GNU Autoconf 2.62 for libXfont 1.4.3.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -810,8 +810,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='libXfont'
 PACKAGE_TARNAME='libXfont'
-PACKAGE_VERSION='1.4.2'
-PACKAGE_STRING='libXfont 1.4.2'
+PACKAGE_VERSION='1.4.3'
+PACKAGE_STRING='libXfont 1.4.3'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 # Factoring default headers for most tests.
@@ -961,11 +961,18 @@ AM_DEFAULT_VERBOSITY
 ENABLE_DEVEL_DOCS_TRUE
 ENABLE_DEVEL_DOCS_FALSE
 XMLTO
+HAVE_XMLTO_TEXT_TRUE
+HAVE_XMLTO_TEXT_FALSE
 HAVE_XMLTO_TRUE
 HAVE_XMLTO_FALSE
 FOP
 HAVE_FOP_TRUE
 HAVE_FOP_FALSE
+XORG_SGML_PATH
+STYLESHEET_SRCDIR
+XSL_STYLESHEET
+HAVE_STYLESHEETS_TRUE
+HAVE_STYLESHEETS_FALSE
 LN_S
 ECHO
 AR
@@ -1616,7 +1623,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libXfont 1.4.2 to adapt to many kinds of systems.
+\`configure' configures libXfont 1.4.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1686,7 +1693,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libXfont 1.4.2:";;
+     short | recursive ) echo "Configuration of libXfont 1.4.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1723,10 +1730,9 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-xmlto            Use xmlto to regenerate documentation (default: yes,
-                          if installed)
-  --with-fop              Use fop to regenerate documentation (default: yes,
-                          if installed)
+  --with-xmlto            Use xmlto to regenerate documentation (default:
+                          auto)
+  --with-fop              Use fop to regenerate documentation (default: auto)
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
@@ -1825,7 +1831,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libXfont configure 1.4.2
+libXfont configure 1.4.3
 generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1839,7 +1845,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libXfont $as_me 1.4.2, which was
+It was created by libXfont $as_me 1.4.3, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
@@ -2491,7 +2497,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libXfont'
- VERSION='1.4.2'
+ VERSION='1.4.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2662,7 +2668,7 @@ fi
 
 
 
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require xorg-macros minimum of 1.10 for DocBook XML documentation
 
 
 
@@ -5217,6 +5223,7 @@ MAN_SUBSTS="\
 	-e 's|__xservername__|Xorg|g' \
 	-e 's|__xconfigfile__|xorg.conf|g' \
 	-e 's|__projectroot__|\$(prefix)|g' \
+	-e 's|__apploaddir__|\$(appdefaultdir)|g' \
 	-e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
 	-e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \
 	-e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \
@@ -5230,19 +5237,17 @@ AM_DEFAULT_VERBOSITY=1
 
 
 
-devel_default=
-if test "x$devel_default" = x ; then
-  devel_default="yes"
-fi
+
 # Check whether --enable-devel-docs was given.
 if test "${enable_devel_docs+set}" = set; then
   enableval=$enable_devel_docs; build_devel_docs=$enableval
 else
-  build_devel_docs=$devel_default
+  build_devel_docs=yes
 fi
 
 
 
+
 if test x$build_devel_docs = xyes; then
   ENABLE_DEVEL_DOCS_TRUE=
   ENABLE_DEVEL_DOCS_FALSE='#'
@@ -5259,6 +5264,7 @@ $as_echo "$build_devel_docs" >&6; }
 
 
 
+
 # Check whether --with-xmlto was given.
 if test "${with_xmlto+set}" = set; then
   withval=$with_xmlto; use_xmlto=$withval
@@ -5267,6 +5273,7 @@ else
 fi
 
 
+
 if test "x$use_xmlto" = x"auto"; then
    # Extract the first word of "xmlto", so it can be a program name with args.
 set dummy xmlto; ac_word=$2
@@ -5373,6 +5380,8 @@ else
 $as_echo "$as_me: error: --with-xmlto expects 'yes' or 'no'" >&2;}
    { (exit 1); exit 1; }; }
 fi
+
+# Test for a minimum version of xmlto, if provided.
 if test "$have_xmlto" = yes; then
     # scrape the xmlto version
     { $as_echo "$as_me:$LINENO: checking the xmlto version" >&5
@@ -5398,6 +5407,32 @@ $as_echo "$as_me: error: xmlto version $xmlto_version found, but 0.0.20 needed"
 esac
 fi
 
+# Test for the ability of xmlto to generate a text target
+have_xmlto_text=no
+cat > conftest.xml << "EOF"
+EOF
+if test "$have_xmlto" = yes; then
+  if $XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1; then
+  have_xmlto_text=yes
+else
+  { $as_echo "$as_me:$LINENO: WARNING: xmlto cannot generate text format, this format skipped" >&5
+$as_echo "$as_me: WARNING: xmlto cannot generate text format, this format skipped" >&2;}
+fi
+
+fi
+
+rm -f conftest.xml
+
+
+if test $have_xmlto_text = yes; then
+  HAVE_XMLTO_TEXT_TRUE=
+  HAVE_XMLTO_TEXT_FALSE='#'
+else
+  HAVE_XMLTO_TEXT_TRUE='#'
+  HAVE_XMLTO_TEXT_FALSE=
+fi
+
+
 
 if test "$have_xmlto" = yes; then
   HAVE_XMLTO_TRUE=
@@ -5411,6 +5446,7 @@ fi
 
 
 
+
 # Check whether --with-fop was given.
 if test "${with_fop+set}" = set; then
   withval=$with_fop; use_fop=$withval
@@ -5419,6 +5455,7 @@ else
 fi
 
 
+
 if test "x$use_fop" = x"auto"; then
    # Extract the first word of "fop", so it can be a program name with args.
 set dummy fop; ac_word=$2
@@ -5537,6 +5574,48 @@ fi
 
 
 
+{ $as_echo "$as_me:$LINENO: checking for X.Org SGML entities >= 1.5" >&5
+$as_echo_n "checking for X.Org SGML entities >= 1.5... " >&6; }
+XORG_SGML_PATH=
+if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-sgml-doctools >= 1.5\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xorg-sgml-doctools >= 1.5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  XORG_SGML_PATH=`$PKG_CONFIG --variable=sgmlrootdir xorg-sgml-doctools`
+else
+  :
+
+fi
+
+# Define variables STYLESHEET_SRCDIR and XSL_STYLESHEET containing
+# the path and the name of the doc stylesheet
+if test "x$XORG_SGML_PATH" != "x" ; then
+   { $as_echo "$as_me:$LINENO: result: $XORG_SGML_PATH" >&5
+$as_echo "$XORG_SGML_PATH" >&6; }
+   STYLESHEET_SRCDIR=$XORG_SGML_PATH/X11
+   XSL_STYLESHEET=$STYLESHEET_SRCDIR/xorg.xsl
+else
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+
+
+if test "x$XSL_STYLESHEET" != "x"; then
+  HAVE_STYLESHEETS_TRUE=
+  HAVE_STYLESHEETS_FALSE='#'
+else
+  HAVE_STYLESHEETS_TRUE='#'
+  HAVE_STYLESHEETS_FALSE=
+fi
+
+
+
 # Check for progs
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -6898,7 +6977,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6901 "configure"' > conftest.$ac_ext
+  echo '#line 6980 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9521,11 +9600,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9524: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9603: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9528: \$? = $ac_status" >&5
+   echo "$as_me:9607: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9811,11 +9890,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9814: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9893: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9818: \$? = $ac_status" >&5
+   echo "$as_me:9897: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9915,11 +9994,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9918: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9997: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9922: \$? = $ac_status" >&5
+   echo "$as_me:10001: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12315,7 +12394,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12318 "configure"
+#line 12397 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12415,7 +12494,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12418 "configure"
+#line 12497 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14824,11 +14903,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14827: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14906: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14831: \$? = $ac_status" >&5
+   echo "$as_me:14910: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14928,11 +15007,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14931: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15010: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14935: \$? = $ac_status" >&5
+   echo "$as_me:15014: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16511,11 +16590,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16514: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16593: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16518: \$? = $ac_status" >&5
+   echo "$as_me:16597: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16615,11 +16694,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16618: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16697: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16622: \$? = $ac_status" >&5
+   echo "$as_me:16701: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18830,11 +18909,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18833: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18912: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18837: \$? = $ac_status" >&5
+   echo "$as_me:18916: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -19120,11 +19199,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19123: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19202: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19127: \$? = $ac_status" >&5
+   echo "$as_me:19206: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -19224,11 +19303,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19227: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19306: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19231: \$? = $ac_status" >&5
+   echo "$as_me:19310: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -23740,7 +23819,7 @@ case $host_os in
 esac
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile src/fontfile/Makefile src/FreeType/Makefile src/builtins/Makefile src/bitmap/Makefile src/fc/Makefile src/util/Makefile src/stubs/Makefile xfont.pc"
+ac_config_files="$ac_config_files Makefile doc/Makefile src/Makefile src/fontfile/Makefile src/FreeType/Makefile src/builtins/Makefile src/bitmap/Makefile src/fc/Makefile src/util/Makefile src/stubs/Makefile xfont.pc"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -23867,6 +23946,13 @@ $as_echo "$as_me: error: conditional \"ENABLE_DEVEL_DOCS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${HAVE_XMLTO_TEXT_TRUE}" && test -z "${HAVE_XMLTO_TEXT_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_XMLTO_TEXT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"HAVE_XMLTO_TEXT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${HAVE_XMLTO_TRUE}" && test -z "${HAVE_XMLTO_FALSE}"; then
   { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_XMLTO\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -23881,6 +23967,13 @@ $as_echo "$as_me: error: conditional \"HAVE_FOP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${HAVE_STYLESHEETS_TRUE}" && test -z "${HAVE_STYLESHEETS_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_STYLESHEETS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"HAVE_STYLESHEETS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
   { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -24280,7 +24373,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libXfont $as_me 1.4.2, which was
+This file was extended by libXfont $as_me 1.4.3, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24333,7 +24426,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-libXfont config.status 1.4.2
+libXfont config.status 1.4.3
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -24459,6 +24552,7 @@ do
     "include/X11/fonts/fontconf.h") CONFIG_HEADERS="$CONFIG_HEADERS include/X11/fonts/fontconf.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/fontfile/Makefile") CONFIG_FILES="$CONFIG_FILES src/fontfile/Makefile" ;;
     "src/FreeType/Makefile") CONFIG_FILES="$CONFIG_FILES src/FreeType/Makefile" ;;
diff --git a/lib/libXfont/configure.ac b/lib/libXfont/configure.ac
index 49f1d066c..8389dfceb 100644
--- a/lib/libXfont/configure.ac
+++ b/lib/libXfont/configure.ac
@@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
 AC_PREREQ([2.60])
 
 AC_INIT([libXfont],
-	1.4.2,
+	[1.4.3],
 	[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 	libXfont)
 # Autoheader generates config.h.in. No new lines allowed in the list.
@@ -37,14 +37,15 @@ dnl
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require xorg-macros minimum of 1.10 for DocBook XML documentation
 m4_ifndef([XORG_MACROS_VERSION],
-          [m4_fatal([must install xorg-macros 1.6 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.6)
+          [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.10)
 XORG_DEFAULT_OPTIONS
 XORG_ENABLE_DEVEL_DOCS
 XORG_WITH_XMLTO(0.0.20)
 XORG_WITH_FOP
+XORG_CHECK_SGML_DOCTOOLS(1.5)
 
 # Check for progs
 AC_PROG_CC
@@ -200,6 +201,7 @@ esac
 AC_SUBST([OS_CFLAGS])
 
 AC_OUTPUT([Makefile
+	   doc/Makefile
 	   src/Makefile
 	   src/fontfile/Makefile
 	   src/FreeType/Makefile
diff --git a/lib/libXfont/doc/Makefile.am b/lib/libXfont/doc/Makefile.am
new file mode 100644
index 000000000..dc3f0a6cb
--- /dev/null
+++ b/lib/libXfont/doc/Makefile.am
@@ -0,0 +1,66 @@
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# 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.
+#
+
+# Developer documentation - not installed on system
+EXTRA_DIST = fontlib.xml
+
+if ENABLE_DEVEL_DOCS
+doc_sources = fontlib.xml
+
+if HAVE_XMLTO
+noinst_DATA = $(doc_sources:.xml=.html)
+
+if HAVE_FOP
+noinst_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf)
+endif
+
+if HAVE_XMLTO_TEXT
+noinst_DATA += $(doc_sources:.xml=.txt)
+endif
+
+if HAVE_STYLESHEETS
+XMLTO_FLAGS = -m $(XSL_STYLESHEET)
+
+noinst_DATA += xorg.css
+xorg.css: $(STYLESHEET_SRCDIR)/xorg.css
+	$(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@
+endif
+
+CLEANFILES = $(noinst_DATA)
+
+SUFFIXES = .xml .ps .pdf .txt .html
+
+.xml.txt:
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<
+
+.xml.html:
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
+
+.xml.pdf:
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<
+
+.xml.ps:
+	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $<
+
+endif HAVE_XMLTO
+endif ENABLE_DEVEL_DOCS
diff --git a/lib/libXfont/doc/Makefile.in b/lib/libXfont/doc/Makefile.in
new file mode 100644
index 000000000..9d7697a46
--- /dev/null
+++ b/lib/libXfont/doc/Makefile.in
@@ -0,0 +1,437 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# 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.
+#
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf)
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(doc_sources:.xml=.txt)
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = xorg.css
+subdir = doc
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h \
+	$(top_builddir)/include/X11/fonts/fontconf.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DATA = $(noinst_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@
+ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+FOP = @FOP@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+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@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
+MATH_LIBS = @MATH_LIBS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+OS_CFLAGS = @OS_CFLAGS@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+RANLIB = @RANLIB@
+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@
+XFONT_BITMAP_FALSE = @XFONT_BITMAP_FALSE@
+XFONT_BITMAP_TRUE = @XFONT_BITMAP_TRUE@
+XFONT_BUILTINS_FALSE = @XFONT_BUILTINS_FALSE@
+XFONT_BUILTINS_TRUE = @XFONT_BUILTINS_TRUE@
+XFONT_CFLAGS = @XFONT_CFLAGS@
+XFONT_FC_FALSE = @XFONT_FC_FALSE@
+XFONT_FC_TRUE = @XFONT_FC_TRUE@
+XFONT_FONTFILE_FALSE = @XFONT_FONTFILE_FALSE@
+XFONT_FONTFILE_TRUE = @XFONT_FONTFILE_TRUE@
+XFONT_FREETYPE_FALSE = @XFONT_FREETYPE_FALSE@
+XFONT_FREETYPE_TRUE = @XFONT_FREETYPE_TRUE@
+XFONT_LIBS = @XFONT_LIBS@
+XFONT_PCFFORMAT_FALSE = @XFONT_PCFFORMAT_FALSE@
+XFONT_PCFFORMAT_TRUE = @XFONT_PCFFORMAT_TRUE@
+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@
+Z_LIBS = @Z_LIBS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+ft_config = @ft_config@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+
+# Developer documentation - not installed on system
+EXTRA_DIST = fontlib.xml
+@ENABLE_DEVEL_DOCS_TRUE@doc_sources = fontlib.xml
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@noinst_DATA = $(doc_sources:.xml=.html) \
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@	$(am__append_1) \
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@	$(am__append_2) \
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@	$(am__append_3)
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FLAGS = -m $(XSL_STYLESHEET)
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(noinst_DATA)
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@SUFFIXES = .xml .ps .pdf .txt .html
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .xml .ps .pdf .txt .html
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  doc/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
+
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@xorg.css: $(STYLESHEET_SRCDIR)/xorg.css
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@
+
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@.xml.txt:
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<
+
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@.xml.html:
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
+
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@.xml.pdf:
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<
+
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@.xml.ps:
+@ENABLE_DEVEL_DOCS_TRUE@@HAVE_XMLTO_TRUE@	$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $<
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/lib/libXfont/doc/fontlib.css b/lib/libXfont/doc/fontlib.css
deleted file mode 100644
index 0bc70e6de..000000000
--- a/lib/libXfont/doc/fontlib.css
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * 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.
- */
-
-.structname, .property, .errorname, .function, .parameter, .filename {
-  font-family: monospace;
-}
-
-h1, .author, .pubdate {
-  text-align: center;
-}
-
-.legalnotice {
-  text-align: justify;
-  font-size: small;
-  font-style: italic;
-}
-
-.warning {
-  border: 1px solid red;
-  background: yellow;
-}
diff --git a/lib/libXfont/doc/fontlib.xml b/lib/libXfont/doc/fontlib.xml
index 8b7245ef1..f2e4811c9 100644
--- a/lib/libXfont/doc/fontlib.xml
+++ b/lib/libXfont/doc/fontlib.xml
@@ -6,7 +6,6 @@
 
   <article id='fontlibms'>
 <!-- .ps 12 -->
-<!--  $Xorg: fontlib.ms,v 1.3 2000/08/17 19:42:42 cpqbld Exp $ -->
 <!-- .EF 'Font Library Interface'\- % \-'July 27, 1991' -->
 <!-- .OF 'Font Library Interface'\- % \-'July 27, 1991' -->
 <!-- .EH '''' -->
diff --git a/lib/libXfont/doc/fontlib.xsl b/lib/libXfont/doc/fontlib.xsl
deleted file mode 100644
index 5de4a2873..000000000
--- a/lib/libXfont/doc/fontlib.xsl
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-  <!--
-Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-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.
-   -->
-
-  <xsl:param name="html.stylesheet" select="'fontlib.css'"/>
-  <xsl:param name="chunker.output.indent">yes</xsl:param>
-  <xsl:param name="html.extra.head.links" select="1"></xsl:param>
-  <xsl:param name="saxon.character.representation" select="'entity;decimal'"></xsl:param>
-  <xsl:param name="function.parens" select="0"></xsl:param>
-</xsl:stylesheet>
diff --git a/lib/libXfont/include/X11/fonts/bdfint.h b/lib/libXfont/include/X11/fonts/bdfint.h
index d41c4a556..913f660df 100644
--- a/lib/libXfont/include/X11/fonts/bdfint.h
+++ b/lib/libXfont/include/X11/fonts/bdfint.h
@@ -1,5 +1,3 @@
-/* $Xorg: bdfint.h,v 1.4 2001/02/09 02:04:01 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/bdfint.h,v 1.4 2001/01/17 19:43:26 dawes Exp $ */
 
 #ifndef BDFINT_H
 #define BDFINT_H
diff --git a/lib/libXfont/include/X11/fonts/bitmap.h b/lib/libXfont/include/X11/fonts/bitmap.h
index 9b170a90a..c02342759 100644
--- a/lib/libXfont/include/X11/fonts/bitmap.h
+++ b/lib/libXfont/include/X11/fonts/bitmap.h
@@ -1,5 +1,3 @@
-/* $Xorg: bitmap.h,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/include/bitmap.h,v 1.9 2001/01/17 19:43:31 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/include/X11/fonts/bufio.h b/lib/libXfont/include/X11/fonts/bufio.h
index f8e58151e..e7a9f4a35 100644
--- a/lib/libXfont/include/X11/fonts/bufio.h
+++ b/lib/libXfont/include/X11/fonts/bufio.h
@@ -1,5 +1,3 @@
-/* $Xorg: bufio.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
 /*
 
 Copyright 1993, 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/include/bufio.h,v 1.6 2001/07/31 16:44:55 alanh Exp $ */
 
 #ifndef ___BUFIO_H___
 #define ___BUFIO_H___ 1
diff --git a/lib/libXfont/include/X11/fonts/fntfil.h b/lib/libXfont/include/X11/fonts/fntfil.h
index 81d2cbc3d..25d1f3054 100644
--- a/lib/libXfont/include/X11/fonts/fntfil.h
+++ b/lib/libXfont/include/X11/fonts/fntfil.h
@@ -1,5 +1,3 @@
-/* $Xorg: fntfil.h,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/include/fntfil.h,v 1.9 2001/12/14 19:56:54 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
@@ -92,6 +89,9 @@ extern int FontFileOpenBitmap ( FontPathElementPtr fpe, FontPtr *pFont,
 extern int FontFileListFonts ( pointer client, FontPathElementPtr fpe, 
 			       char *pat, int len, int max, 
 			       FontNamesPtr names );
+extern int FontFileStartListFonts ( pointer client, FontPathElementPtr fpe, 
+				    char *pat, int len, int max, 
+				    pointer *privatep, int mark_aliases );
 extern int FontFileStartListFontsWithInfo ( pointer client, 
 					    FontPathElementPtr fpe, 
 					    char *pat, int len, int max, 
@@ -111,6 +111,7 @@ extern int FontFileListNextFontOrAlias ( pointer client,
 					 char **resolvedp, int *resolvedlenp, 
 					 pointer private );
 extern void FontFileRegisterLocalFpeFunctions ( void );
+extern void CatalogueRegisterLocalFpeFunctions ( void );
 
 
 extern FontEntryPtr FontFileAddEntry ( FontTablePtr table, 
diff --git a/lib/libXfont/include/X11/fonts/fntfilio.h b/lib/libXfont/include/X11/fonts/fntfilio.h
index f8e24f390..3a8f4ca35 100644
--- a/lib/libXfont/include/X11/fonts/fntfilio.h
+++ b/lib/libXfont/include/X11/fonts/fntfilio.h
@@ -1,5 +1,3 @@
-/* $Xorg: fntfilio.h,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/include/fntfilio.h,v 1.6 2001/10/31 22:50:26 tsi Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/include/X11/fonts/fntfilst.h b/lib/libXfont/include/X11/fonts/fntfilst.h
index 407c4cf17..29e0a56fb 100644
--- a/lib/libXfont/include/X11/fonts/fntfilst.h
+++ b/lib/libXfont/include/X11/fonts/fntfilst.h
@@ -1,5 +1,3 @@
-/* $Xorg: fntfilst.h,v 1.5 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/include/fntfilst.h,v 3.8 2002/12/09 17:30:00 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/include/X11/fonts/fontencc.h b/lib/libXfont/include/X11/fonts/fontencc.h
index 51e0e1440..987cbfbed 100644
--- a/lib/libXfont/include/X11/fonts/fontencc.h
+++ b/lib/libXfont/include/X11/fonts/fontencc.h
@@ -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$ */
 
 /* Binary compatibility entry points. */
 
diff --git a/lib/libXfont/include/X11/fonts/fontmisc.h b/lib/libXfont/include/X11/fonts/fontmisc.h
index ed5fd1930..cd9d52a64 100644
--- a/lib/libXfont/include/X11/fonts/fontmisc.h
+++ b/lib/libXfont/include/X11/fonts/fontmisc.h
@@ -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/include/fontmisc.h,v 3.16 2001/12/14 19:56:54 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/include/X11/fonts/fontshow.h b/lib/libXfont/include/X11/fonts/fontshow.h
index 5bb48fe18..126cab698 100644
--- a/lib/libXfont/include/X11/fonts/fontshow.h
+++ b/lib/libXfont/include/X11/fonts/fontshow.h
@@ -1,5 +1,3 @@
-/* $Xorg: fontshow.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
 /*
 
 Copyright 1990, 1998  The Open Group
diff --git a/lib/libXfont/include/X11/fonts/fontutil.h b/lib/libXfont/include/X11/fonts/fontutil.h
index 9a73eaa47..71d507b1a 100644
--- a/lib/libXfont/include/X11/fonts/fontutil.h
+++ b/lib/libXfont/include/X11/fonts/fontutil.h
@@ -1,5 +1,3 @@
-/* $XFree86: xc/lib/font/include/fontutil.h,v 1.1 1999/03/14 11:17:49 dawes Exp $ */
-
 #ifndef _FONTUTIL_H_
 #define _FONTUTIL_H_
 
diff --git a/lib/libXfont/include/X11/fonts/fontxlfd.h b/lib/libXfont/include/X11/fonts/fontxlfd.h
index e87b93143..3555706e6 100644
--- a/lib/libXfont/include/X11/fonts/fontxlfd.h
+++ b/lib/libXfont/include/X11/fonts/fontxlfd.h
@@ -1,5 +1,3 @@
-/* $Xorg: fontxlfd.h,v 1.4 2001/02/09 02:04:04 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/include/fontxlfd.h,v 1.5 2001/01/17 19:43:32 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
diff --git a/lib/libXfont/include/X11/fonts/pcf.h b/lib/libXfont/include/X11/fonts/pcf.h
index 34bdf7bd3..a5fdbcd01 100644
--- a/lib/libXfont/include/X11/fonts/pcf.h
+++ b/lib/libXfont/include/X11/fonts/pcf.h
@@ -1,5 +1,3 @@
-/* $Xorg: pcf.h,v 1.4 2001/02/09 02:04:02 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/bitmap/pcf.h,v 1.4 2001/12/14 19:56:47 dawes Exp $ */
 
 /*
  * Author:  Keith Packard, MIT X Consortium
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