Update to fslsfonts 1.0.2

8 files changed, 271 insertions, 66 deletions

diff --git a/app/fslsfonts/COPYING b/app/fslsfonts/COPYING
index 7f33cbfd2..f5bb6bcdc 100644
--- a/app/fslsfonts/COPYING
+++ b/app/fslsfonts/COPYING
@@ -1,12 +1,41 @@
-This is a stub file.  This package has not yet had its complete licensing
-information compiled.  Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright 1990, 1993, 1994, 1998  The Open Group
 
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
 
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+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
+OPEN GROUP 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.
 
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1990, 1991 Network Computing Devices;
+Portions Copyright 1987 by Digital Equipment Corporation 
+
+Permission to use, copy, modify, distribute, and sell this software and
+its documentation for any purpose is hereby granted without fee, provided
+that the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the names of Network Computing Devices, or Digital
+not be used in advertising or publicity pertaining to distribution
+of the software without specific, written prior permission.
+
+NETWORK COMPUTING DEVICES, AND DIGITAL DISCLAIM ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES,
+OR DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+THIS SOFTWARE.
diff --git a/app/fslsfonts/ChangeLog b/app/fslsfonts/ChangeLog
index 6eb4c515a..641aafcf1 100644
--- a/app/fslsfonts/ChangeLog
+++ b/app/fslsfonts/ChangeLog
@@ -1,25 +1,179 @@
-2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 449643fa6811de4539c498d43f3af777a0a7c037
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri May 23 16:31:20 2008 -0700
 
-	* configure.ac:
-	Update package version for X11R7 release.
+    fslsfonts 1.0.2
 
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 8c3d918964ff5823ce9685be54e129dc5909cc69
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri May 23 16:26:29 2008 -0700
 
-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
+    Fill in COPYING with copyright/license notices from sources
 
-2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 7b43c5804a406baacdeb88d4192ce0810994e8d8
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu May 22 19:46:17 2008 -0700
 
-	* Makefile.am:
-	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+    Clarify syntax of -server & FONTSERVER in man page
 
-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 02e0bc6cebba093a382e0ab57ebe02e0c467b0d5
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Thu Dec 6 16:36:58 2007 -0500
 
-	* configure.ac:
-	Update package version number for X11R7 RC3 release.
+    Replace static ChangeLog with dist-hook to generate from git log
 
-2005-10-18  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 04305c486e81c275b7b31a505395a8279a9e4867
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Aug 10 16:24:06 2007 -0700
 
-	* configure.ac:
-	Update package version number for RC1 release.
+    renamed: .cvsignore -> .gitignore
 
+commit 907a6cd8e28a754b0ea574ffa7d13bfc39252647
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Aug 10 16:23:31 2007 -0700
+
+    Change fslsfonts_CFLAGS to AM_CFLAGS to make automake-1.10 happier
+
+commit d95896f7ec4c9f721e90e68e4adc9eeefeebe27e
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Dec 21 02:29:42 2005 +0000
+
+    Update package version for X11R7 release.
+
+commit 3900748043ff4b6c179d29bab627950df51da9ba
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Mon Dec 19 16:22:40 2005 +0000
+
+    Stub COPYING files
+
+commit 76e8606615fabc7d59d784cc3bc51aa5bcaff51e
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 15 00:24:02 2005 +0000
+
+    Update package version number for final X11R7 release candidate.
+
+commit dbe7f917a70438e76f4b51222615dd55cde55aa1
+Author: Kevin E Martin <kem@kem.org>
+Date:   Tue Dec 6 22:48:16 2005 +0000
+
+    Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit fad46dca9871152094c7e936868752fcbc439fd6
+Author: Kevin E Martin <kem@kem.org>
+Date:   Sat Dec 3 05:49:15 2005 +0000
+
+    Update package version number for X11R7 RC3 release.
+
+commit 43f92f7d48025d32cf4afb13e551c69288785cea
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Nov 28 22:01:36 2005 +0000
+
+    Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+        update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 4470242281e691908a30e7ed2d5e0bb999c57b7f
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Mon Nov 21 10:34:55 2005 +0000
+
+    Another pass at .cvsignores for apps.
+
+commit 70c7a94df711bc4ff0995529b0592dcac9b2554b
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Sun Nov 20 22:08:48 2005 +0000
+
+    Add/improve .cvsignore files for apps.
+
+commit fd22b40b6ad75d65d6298f57db388e7e114ff0a1
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Oct 19 02:47:48 2005 +0000
+
+    Update package version number for RC1 release.
+
+commit 4e72c7c22a9cc85b677aae221647a6e9c97ca358
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Oct 17 23:56:19 2005 +0000
+
+    Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+        work better with BSD make
+
+commit e88396dbb6f9e4c918a01b31e97b7048c4f75cfc
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Fri Oct 14 00:25:41 2005 +0000
+
+    Use sed to fill in variables in man page
+
+commit c884539ec3cf80d489a4907ab3abdcc32f81dc4f
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Aug 1 20:25:27 2005 +0000
+
+    Install man pages to section 1 instead of section m (Patch from Donnie
+        Berkholz)
+
+commit f24a7a29a50a871aec34900e2e65dc9f268eae53
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Jul 29 21:22:28 2005 +0000
+
+    Various changes preparing packages for RC0:
+    - Verify and update package version numbers as needed
+    - Implement versioning scheme
+    - Change bug address to point to bugzilla bug entry form
+    - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+        reenable it)
+    - Fix makedepend to use pkgconfig and pass distcheck
+    - Update build script to build macros first
+    - Update modular Xorg version
+
+commit e03e8dd59d692c551c89e5d3dce5ed6dfdbea63b
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Wed Jul 20 19:31:48 2005 +0000
+
+    Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
+        configure cache, you cache it, and the cached value is probably wrong.
+
+commit 492cae010ee83167c662df163f37dec2ef5b8b8b
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Wed Jul 6 16:17:30 2005 +0000
+
+    Build system for fslsfonts
+
+commit 27fb0a16c0dad6976a675a23b2df811310d8df68
+Author: Egbert Eich <eich@suse.de>
+Date:   Fri Apr 23 19:54:32 2004 +0000
+
+    Merging XORG-CURRENT into trunk
+
+commit 7122e2d65c98630c3ff79b6ce1f39ff77c1bdb1d
+Author: Egbert Eich <eich@suse.de>
+Date:   Sun Mar 14 08:34:50 2004 +0000
+
+    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit ed0b544968dfe8514ead28f566a945f0b2d2e7b9
+Author: Egbert Eich <eich@suse.de>
+Date:   Wed Mar 3 12:12:50 2004 +0000
+
+    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit e7f14cc37ca82396ca7116efcc9f48a687644ea0
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 13:36:15 2004 +0000
+
+    readding XFree86's cvs IDs
+
+commit d7b500a10f7d6574d065baf32bd5f5e8e27588e1
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 09:23:54 2004 +0000
+
+    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit ab1d154e3006704f4a33b1d73b0435540299b9ba
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:57 2003 +0000
+
+    XFree86 4.3.0.1
+
+commit 0f93bed073a9dbc1b436f26a5f55ffbedea4471f
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 15:54:52 2003 +0000
+
+    R6.6 is the Xorg base-line
diff --git a/app/fslsfonts/Makefile.am b/app/fslsfonts/Makefile.am
index 3c69a69ba..bbb98a270 100644
--- a/app/fslsfonts/Makefile.am
+++ b/app/fslsfonts/Makefile.am
@@ -21,7 +21,7 @@
 
 bin_PROGRAMS = fslsfonts
 
-fslsfonts_CFLAGS = $(FSLSFONTS_CFLAGS)
+AM_CFLAGS = $(FSLSFONTS_CFLAGS)
 fslsfonts_LDADD = $(FSLSFONTS_LIBS)
 
 fslsfonts_SOURCES =	\
@@ -61,3 +61,13 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
 
 .man.$(APP_MAN_SUFFIX):
 	sed $(MAN_SUBSTS) < $< > $@
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
diff --git a/app/fslsfonts/Makefile.in b/app/fslsfonts/Makefile.in
index 2d064fff9..84b5fbe68 100644
--- a/app/fslsfonts/Makefile.in
+++ b/app/fslsfonts/Makefile.in
@@ -77,7 +77,7 @@ CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am_fslsfonts_OBJECTS = fslsfonts-fslsfonts.$(OBJEXT)
+am_fslsfonts_OBJECTS = fslsfonts.$(OBJEXT)
 fslsfonts_OBJECTS = $(am_fslsfonts_OBJECTS)
 am__DEPENDENCIES_1 =
 fslsfonts_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -207,7 +207,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-fslsfonts_CFLAGS = $(FSLSFONTS_CFLAGS)
+AM_CFLAGS = $(FSLSFONTS_CFLAGS)
 fslsfonts_LDADD = $(FSLSFONTS_LIBS)
 fslsfonts_SOURCES = \
         fslsfonts.c
@@ -217,7 +217,7 @@ appman_PRE = \
 
 appmandir = $(APP_MAN_DIR)
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) ChangeLog
 CLEANFILES = $(appman_DATA)
 SED = sed
 
@@ -238,6 +238,7 @@ MAN_SUBSTS = \
 	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
 
 SUFFIXES = .$(APP_MAN_SUFFIX) .man
+MAINTAINERCLEANFILES = ChangeLog
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -326,7 +327,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fslsfonts-fslsfonts.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fslsfonts.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -341,20 +342,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-fslsfonts-fslsfonts.o: fslsfonts.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fslsfonts_CFLAGS) $(CFLAGS) -MT fslsfonts-fslsfonts.o -MD -MP -MF "$(DEPDIR)/fslsfonts-fslsfonts.Tpo" -c -o fslsfonts-fslsfonts.o `test -f 'fslsfonts.c' || echo '$(srcdir)/'`fslsfonts.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/fslsfonts-fslsfonts.Tpo" "$(DEPDIR)/fslsfonts-fslsfonts.Po"; else rm -f "$(DEPDIR)/fslsfonts-fslsfonts.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fslsfonts.c' object='fslsfonts-fslsfonts.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fslsfonts_CFLAGS) $(CFLAGS) -c -o fslsfonts-fslsfonts.o `test -f 'fslsfonts.c' || echo '$(srcdir)/'`fslsfonts.c
-
-fslsfonts-fslsfonts.obj: fslsfonts.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fslsfonts_CFLAGS) $(CFLAGS) -MT fslsfonts-fslsfonts.obj -MD -MP -MF "$(DEPDIR)/fslsfonts-fslsfonts.Tpo" -c -o fslsfonts-fslsfonts.obj `if test -f 'fslsfonts.c'; then $(CYGPATH_W) 'fslsfonts.c'; else $(CYGPATH_W) '$(srcdir)/fslsfonts.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/fslsfonts-fslsfonts.Tpo" "$(DEPDIR)/fslsfonts-fslsfonts.Po"; else rm -f "$(DEPDIR)/fslsfonts-fslsfonts.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fslsfonts.c' object='fslsfonts-fslsfonts.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fslsfonts_CFLAGS) $(CFLAGS) -c -o fslsfonts-fslsfonts.obj `if test -f 'fslsfonts.c'; then $(CYGPATH_W) 'fslsfonts.c'; else $(CYGPATH_W) '$(srcdir)/fslsfonts.c'; fi`
 uninstall-info-am:
 install-appmanDATA: $(appman_DATA)
 	@$(NORMAL_INSTALL)
@@ -451,6 +438,9 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -580,6 +570,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@@ -635,8 +626,8 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
-	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-compile distclean-generic distclean-hdr \
+	dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
+	distclean distclean-compile distclean-generic distclean-hdr \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-appmanDATA install-binPROGRAMS install-data \
@@ -651,6 +642,13 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
 
 .man.$(APP_MAN_SUFFIX):
 	sed $(MAN_SUBSTS) < $< > $@
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
 # 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/app/fslsfonts/aclocal.m4 b/app/fslsfonts/aclocal.m4
index 5419cfb3c..48f9f8de2 100644
--- a/app/fslsfonts/aclocal.m4
+++ b/app/fslsfonts/aclocal.m4
@@ -1042,7 +1042,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
 	XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
 	XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
 	AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
-	[XORG_MACROS_version=1.1.5
+	[XORG_MACROS_version=1.1.6
 	XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
 	XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
 	if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -1191,7 +1191,11 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
 XORG_SGML_PATH=$prefix/share/sgml
 HAVE_DEFS_ENT=
 
-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+if test x"$cross_compiling" = x"yes" ; then
+  HAVE_DEFS_ENT=no
+else
+  AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+fi
 
 AC_PATH_PROG(LINUXDOC, linuxdoc)
 AC_PATH_PROG(PS2PDF, ps2pdf)
@@ -1463,14 +1467,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
 	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
 		[`echo $PACKAGE_VERSION | cut -d . -f 1`],
 		[Major version of this package])
-	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
 	if test "x$PVM" = "x"; then
 		PVM="0"
 	fi
 	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
 		[$PVM],
 		[Minor version of this package])
-	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
 	if test "x$PVP" = "x"; then
 		PVP="0"
 	fi
diff --git a/app/fslsfonts/configure b/app/fslsfonts/configure
index 4a5cc4260..5032149a5 100644
--- a/app/fslsfonts/configure
+++ b/app/fslsfonts/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for fslsfonts 1.0.1.
+# Generated by GNU Autoconf 2.59 for fslsfonts 1.0.2.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='fslsfonts'
 PACKAGE_TARNAME='fslsfonts'
-PACKAGE_VERSION='1.0.1'
-PACKAGE_STRING='fslsfonts 1.0.1'
+PACKAGE_VERSION='1.0.2'
+PACKAGE_STRING='fslsfonts 1.0.2'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE PKG_CONFIG ac_pt_PKG_CONFIG FSLSFONTS_CFLAGS FSLSFONTS_LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
@@ -750,7 +750,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 fslsfonts 1.0.1 to adapt to many kinds of systems.
+\`configure' configures fslsfonts 1.0.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -816,7 +816,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of fslsfonts 1.0.1:";;
+     short | recursive ) echo "Configuration of fslsfonts 1.0.2:";;
    esac
   cat <<\_ACEOF
 
@@ -946,7 +946,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-fslsfonts configure 1.0.1
+fslsfonts configure 1.0.2
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -960,7 +960,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by fslsfonts $as_me 1.0.1, which was
+It was created by fslsfonts $as_me 1.0.2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1558,7 +1558,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='fslsfonts'
- VERSION='1.0.1'
+ VERSION='1.0.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3265,7 +3265,7 @@ cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
 _ACEOF
 
-	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
 	if test "x$PVM" = "x"; then
 		PVM="0"
 	fi
@@ -3274,7 +3274,7 @@ cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION_MINOR $PVM
 _ACEOF
 
-	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
 	if test "x$PVP" = "x"; then
 		PVP="0"
 	fi
@@ -3669,7 +3669,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by fslsfonts $as_me 1.0.1, which was
+This file was extended by fslsfonts $as_me 1.0.2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3732,7 +3732,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-fslsfonts config.status 1.0.1
+fslsfonts config.status 1.0.2
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/app/fslsfonts/configure.ac b/app/fslsfonts/configure.ac
index 74d7f2bdf..bc2200cf3 100644
--- a/app/fslsfonts/configure.ac
+++ b/app/fslsfonts/configure.ac
@@ -22,7 +22,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT(fslsfonts,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],fslsfonts)
+AC_INIT(fslsfonts,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],fslsfonts)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
diff --git a/app/fslsfonts/fslsfonts.man b/app/fslsfonts/fslsfonts.man
index 891aa0e5e..ca2b3b6fb 100644
--- a/app/fslsfonts/fslsfonts.man
+++ b/app/fslsfonts/fslsfonts.man
@@ -33,7 +33,7 @@ fslsfonts \- list fonts served by X font server
 .B fslsfonts
 [\-options ...] [\-fn pattern]
 .SH DESCRIPTION
-.I Fslsfonts
+.I fslsfonts
 lists the fonts that match the given \fIpattern\fP.
 The wildcard character "*" may be used to match any sequence of
 characters (including none), and "?" to match any single character.
@@ -44,8 +44,14 @@ being expanded by the shell.
 .SH "OPTIONS"
 .PP
 .TP 8
-.B \-server \fIhost\fP:\fIport\fP
+.B \-server \fIservername\fP
 This option specifies the X font server to contact.
+.I servername 
+must be specified in one of the formats defined in the
+.I Font Server Names
+section of X(__miscmansuffix__).   If not specified, the server name in the
+.B FONTSERVER
+environment variable is used.
 .PP
 .TP 8
 .B \-l
@@ -83,12 +89,16 @@ number of character specified by \fB\-w\fP \fIwidth\fP.
 .B \-u
 This option indicates that the output should be left unsorted.
 .PP
-.SH "SEE ALSO"
-xfs(1), showfont(1), xlsfonts(1)
 .SH ENVIRONMENT
 .TP 8
 .B FONTSERVER
-to get the default host and port to use.
+To get the default fontserver.  The server name must
+be specified in one of the formats defined in the
+.I Font Server Names
+section of X(__miscmansuffix__).
+.SH "SEE ALSO"
+xfs(__appmansuffix__), showfont(__appmansuffix__), xlsfonts(__appmansuffix__),
+X(__miscmansuffix__).
 .SH BUGS
 Doing ``fslsfonts \-l'' can tie up your server for a very long time.
 This is really a bug with single-threaded non-preemptable servers, not with