Update to showfont 1.0.2

10 files changed, 529 insertions, 127 deletions

diff --git a/app/showfont/COPYING b/app/showfont/COPYING
index 7f33cbfd2..b5c5c4165 100644
--- a/app/showfont/COPYING
+++ b/app/showfont/COPYING
@@ -1,12 +1,68 @@
-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 (c) 1987  X Consortium
 
-Please submit updated COPYING files to the Xorg bugzilla:
+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:
 
-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 X CONSORTIUM 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 X Consortium 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 X Consortium.
+
+
+
+Copyright 1990 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.
+
+
+Copyright 2005  Red Hat, Inc.
+ 
+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 name of Red Hat not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Red Hat makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+ 
+RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL RED HAT 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/showfont/ChangeLog b/app/showfont/ChangeLog
index 6eb4c515a..5e14188c1 100644
--- a/app/showfont/ChangeLog
+++ b/app/showfont/ChangeLog
@@ -1,25 +1,207 @@
-2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 916040fd10cd5cc1a5fe576e4ea967108d388e32
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri May 23 17:12:36 2008 -0700
 
-	* configure.ac:
-	Update package version for X11R7 release.
+    showfont 1.0.2
 
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit da9d9fc289090e7ac98cbce01b1336aa62cb5e87
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu May 22 19:35:11 2008 -0700
 
-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
+    Clarify syntax of -server & FONTSERVER in man page
 
-2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 6be4cac93365ef3f21fe867518f7b67dd386a388
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu May 22 18:49:44 2008 -0700
 
-	* Makefile.am:
-	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+    Replace hardcoded man page sections with variables
 
-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 1b4c25a764055147507ec9a21a5c11c0b5342234
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu May 22 18:40:00 2008 -0700
 
-	* configure.ac:
-	Update package version number for X11R7 RC3 release.
+    Fill in COPYING file with notices from sources
 
-2005-10-18  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 8e30da12a01c400967f1ac81fad14106a760189b
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu May 22 18:37:09 2008 -0700
 
-	* configure.ac:
-	Update package version number for RC1 release.
+    Change showfont_CFLAGS to AM_CFLAGS to make automake-1.10 happier
 
+commit a9178fd67ed387bfd50f6ad1d37b42bc7e7f7756
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu May 22 18:35:41 2008 -0700
+
+    Sun bug 1232854: showfont dumps core with jisx208, jisx212 japanese fonts
+    
+    <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=1232854>
+    Forward port to current X.Org source of fix originally made for Solaris 2.6
+    by Joe Warzecha.
+
+commit 2cacbce66116c24f0bc7d9b2593e8a5ee2c4d61c
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Apr 13 22:22:30 2008 -0700
+
+    Added missing AM_PROG_CC_C_O
+
+commit a354489a6bedeaa772e64ba97ce8e38f480bce15
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Thu Dec 6 16:37:06 2007 -0500
+
+    Replace static ChangeLog with dist-hook to generate from git log
+
+commit 297c3b528742a1897a436d92a218dcf309466f07
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Mon Sep 3 05:51:11 2007 -0400
+
+    Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 671fd02cad7e73680d974bbabf10ff93a2d3af5a
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Thu Aug 23 19:24:36 2007 -0400
+
+    Rename .cvsignore to .gitignore
+
+commit a668ffe99b2e1329f058f682725c6eeea09c14c8
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Dec 21 02:29:47 2005 +0000
+
+    Update package version for X11R7 release.
+
+commit a83d4853eb069286b84f8ba2e127bdf2bbfe24e2
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Mon Dec 19 16:22:41 2005 +0000
+
+    Stub COPYING files
+
+commit 583a4c8d5a1988e3b46b70b7a9bda76c0e65782a
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 15 00:24:04 2005 +0000
+
+    Update package version number for final X11R7 release candidate.
+
+commit 20a34d6dc5acd304ca463eed416531ba0850d804
+Author: Kevin E Martin <kem@kem.org>
+Date:   Tue Dec 6 22:48:18 2005 +0000
+
+    Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 011e1a298c76e3007948d1343961a1832abdef1b
+Author: Kevin E Martin <kem@kem.org>
+Date:   Sat Dec 3 05:49:17 2005 +0000
+
+    Update package version number for X11R7 RC3 release.
+
+commit 948b03483cd0f0958cce8f0d54be7874250cd5be
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Nov 28 22:01:38 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 dbd70dd9e2aab97673719861d6e50c21fb63f922
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Mon Nov 21 10:34:58 2005 +0000
+
+    Another pass at .cvsignores for apps.
+
+commit 880100f2b93a9d5b7755552f4dcbb397a344f80e
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Sun Nov 20 22:08:50 2005 +0000
+
+    Add/improve .cvsignore files for apps.
+
+commit 02441d6c3e38545a0308e96c1d0dc0447c386a9f
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Oct 19 02:47:50 2005 +0000
+
+    Update package version number for RC1 release.
+
+commit 65fd58a0d0f18192191efd059c354bee40dc303f
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Oct 17 23:56:20 2005 +0000
+
+    Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+        work better with BSD make
+
+commit d6fbfea960d2cf7fd6b0bafac8d5dc3a906e9cb3
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Fri Oct 14 00:25:42 2005 +0000
+
+    Use sed to fill in variables in man page
+
+commit 9d166cd88dad29d1a7994f97c9be2845dfad8386
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Aug 1 20:25:28 2005 +0000
+
+    Install man pages to section 1 instead of section m (Patch from Donnie
+        Berkholz)
+
+commit 169502596163e720f0483a16d57affb5457265ec
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Jul 29 21:22:30 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 b3b6f0d5e247af6f7caaff2d735dc13c14bd2746
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Wed Jul 20 19:31:50 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 be7ea5c74651a911570e8c2d42c13f641c8c9f65
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Wed Jun 29 18:42:26 2005 +0000
+
+    Add buildsystem for showfont
+
+commit bccb9870db6a9390df2ecc2f0148c50e96c56247
+Author: Egbert Eich <eich@suse.de>
+Date:   Fri Apr 23 19:54:37 2004 +0000
+
+    Merging XORG-CURRENT into trunk
+
+commit 3feadf8e6a5896ea73318a2031603deb62e732c8
+Author: Egbert Eich <eich@suse.de>
+Date:   Sun Mar 14 08:34:56 2004 +0000
+
+    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit f41ba9c5118c719a40daa2799c92c457fd621c40
+Author: Egbert Eich <eich@suse.de>
+Date:   Wed Mar 3 12:12:54 2004 +0000
+
+    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit fa3e18b5cade364b3a2afab2e64404d0a2ac240a
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 13:36:15 2004 +0000
+
+    readding XFree86's cvs IDs
+
+commit 9eddab425da243044e78e1d45e4c55e9428a77f2
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 09:23:57 2004 +0000
+
+    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 00bd9b5b1c6998a94628a46d75251f5ac8dcb846
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:58 2003 +0000
+
+    XFree86 4.3.0.1
+
+commit ab2be8865ceaa237d2478d291a90419b573cfb65
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:58 2003 +0000
+
+    Initial revision
diff --git a/app/showfont/Makefile.am b/app/showfont/Makefile.am
index 04fa1f62f..798fe2c77 100644
--- a/app/showfont/Makefile.am
+++ b/app/showfont/Makefile.am
@@ -21,7 +21,7 @@
 
 bin_PROGRAMS = showfont
 
-showfont_CFLAGS = $(SHOWFONT_CFLAGS)
+AM_CFLAGS = $(SHOWFONT_CFLAGS)
 showfont_LDADD = $(SHOWFONT_LIBS)
 
 showfont_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/showfont/Makefile.in b/app/showfont/Makefile.in
index bf0656fa6..994248f88 100644
--- a/app/showfont/Makefile.in
+++ b/app/showfont/Makefile.in
@@ -77,7 +77,7 @@ CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am_showfont_OBJECTS = showfont-showfont.$(OBJEXT)
+am_showfont_OBJECTS = showfont.$(OBJEXT)
 showfont_OBJECTS = $(am_showfont_OBJECTS)
 am__DEPENDENCIES_1 =
 showfont_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -207,7 +207,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-showfont_CFLAGS = $(SHOWFONT_CFLAGS)
+AM_CFLAGS = $(SHOWFONT_CFLAGS)
 showfont_LDADD = $(SHOWFONT_LIBS)
 showfont_SOURCES = \
         showfont.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)/showfont-showfont.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/showfont.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) '$<'`
-
-showfont-showfont.o: showfont.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(showfont_CFLAGS) $(CFLAGS) -MT showfont-showfont.o -MD -MP -MF "$(DEPDIR)/showfont-showfont.Tpo" -c -o showfont-showfont.o `test -f 'showfont.c' || echo '$(srcdir)/'`showfont.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/showfont-showfont.Tpo" "$(DEPDIR)/showfont-showfont.Po"; else rm -f "$(DEPDIR)/showfont-showfont.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='showfont.c' object='showfont-showfont.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) $(showfont_CFLAGS) $(CFLAGS) -c -o showfont-showfont.o `test -f 'showfont.c' || echo '$(srcdir)/'`showfont.c
-
-showfont-showfont.obj: showfont.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(showfont_CFLAGS) $(CFLAGS) -MT showfont-showfont.obj -MD -MP -MF "$(DEPDIR)/showfont-showfont.Tpo" -c -o showfont-showfont.obj `if test -f 'showfont.c'; then $(CYGPATH_W) 'showfont.c'; else $(CYGPATH_W) '$(srcdir)/showfont.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/showfont-showfont.Tpo" "$(DEPDIR)/showfont-showfont.Po"; else rm -f "$(DEPDIR)/showfont-showfont.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='showfont.c' object='showfont-showfont.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) $(showfont_CFLAGS) $(CFLAGS) -c -o showfont-showfont.obj `if test -f 'showfont.c'; then $(CYGPATH_W) 'showfont.c'; else $(CYGPATH_W) '$(srcdir)/showfont.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/showfont/aclocal.m4 b/app/showfont/aclocal.m4
index 5419cfb3c..e7bd1a8cd 100644
--- a/app/showfont/aclocal.m4
+++ b/app/showfont/aclocal.m4
@@ -740,6 +740,34 @@ AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
+# Copyright (C) 1999, 2000, 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 3
+
+# AM_PROG_CC_C_O
+# --------------
+# Like AC_PROG_CC_C_O, but changed for automake.
+AC_DEFUN([AM_PROG_CC_C_O],
+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+])
+
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
 # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
@@ -1042,7 +1070,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 +1219,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 +1495,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/showfont/config.h.in b/app/showfont/config.h.in
index 1ca40928b..630752401 100644
--- a/app/showfont/config.h.in
+++ b/app/showfont/config.h.in
@@ -1,5 +1,8 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
 /* Name of package */
 #undef PACKAGE
 
diff --git a/app/showfont/configure b/app/showfont/configure
index 5ed2d22f5..cc5d117be 100644
--- a/app/showfont/configure
+++ b/app/showfont/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for showfont 1.0.1.
+# Generated by GNU Autoconf 2.59 for showfont 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='showfont'
 PACKAGE_TARNAME='showfont'
-PACKAGE_VERSION='1.0.1'
-PACKAGE_STRING='showfont 1.0.1'
+PACKAGE_VERSION='1.0.2'
+PACKAGE_STRING='showfont 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 SHOWFONT_CFLAGS SHOWFONT_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 showfont 1.0.1 to adapt to many kinds of systems.
+\`configure' configures showfont 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 showfont 1.0.1:";;
+     short | recursive ) echo "Configuration of showfont 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
-showfont configure 1.0.1
+showfont 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 showfont $as_me 1.0.1, which was
+It was created by showfont $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='showfont'
- VERSION='1.0.1'
+ VERSION='1.0.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2820,6 +2820,109 @@ else
 fi
 
 
+if test "x$CC" != xcc; then
+  echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
+echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6
+else
+  echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
+echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6
+fi
+set dummy $CC; ac_cc=`echo $2 |
+		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+# Make sure it works both with $CC and with simple cc.
+# We do the test twice because some compilers refuse to overwrite an
+# existing .o file with -o, though they will create one.
+ac_try='$CC -c conftest.$ac_ext -o conftest.$ac_objext >&5'
+if { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+   test -f conftest.$ac_objext && { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); };
+then
+  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+  if test "x$CC" != xcc; then
+    # Test first that cc exists at all.
+    if { ac_try='cc -c conftest.$ac_ext >&5'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+      ac_try='cc -c conftest.$ac_ext -o conftest.$ac_objext >&5'
+      if { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 test -f conftest.$ac_objext && { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); };
+      then
+	# cc works too.
+	:
+      else
+	# cc exists but doesn't like -o.
+	eval ac_cv_prog_cc_${ac_cc}_c_o=no
+      fi
+    fi
+  fi
+else
+  eval ac_cv_prog_cc_${ac_cc}_c_o=no
+fi
+rm -f conftest*
+
+fi
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = yes"; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_MINUS_C_MINUS_O 1
+_ACEOF
+
+fi
+
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -3265,7 +3368,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 +3377,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 +3772,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by showfont $as_me 1.0.1, which was
+This file was extended by showfont $as_me 1.0.2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3732,7 +3835,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-showfont config.status 1.0.1
+showfont 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/showfont/configure.ac b/app/showfont/configure.ac
index fd9ea795f..11e5e3e53 100644
--- a/app/showfont/configure.ac
+++ b/app/showfont/configure.ac
@@ -22,13 +22,14 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT(showfont,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],showfont)
+AC_INIT(showfont,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],showfont)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_INSTALL
 
 # Checks for pkg-config packages
diff --git a/app/showfont/showfont.c b/app/showfont/showfont.c
index b1d1ff758..e49c67fe5 100644
--- a/app/showfont/showfont.c
+++ b/app/showfont/showfont.c
@@ -1,7 +1,7 @@
 /* $XConsortium: showfont.c,v 1.13 94/04/17 20:44:07 gildea Exp $ */
 /*
  * Copyright 1990 Network Computing Devices;
- * Portions Copyright 1987 by Digital Equipment Corporation and the
+ * 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
@@ -167,8 +167,7 @@ show_glyphs(
     FSXCharInfo *extents;
     int         err,
                 ch,
-                start,
-                end;
+		start;
     int         offset = 0;
     unsigned char *glyphs;
     FSOffset   *offsets;
@@ -178,6 +177,9 @@ show_glyphs(
     FSBitmapFormat format;
     FSChar2b    chars[2];
     int         num_chars;
+    int		row,
+		col,
+		temp_ch;
 
     if (show_all) {
 	num_chars = 0;
@@ -198,70 +200,75 @@ show_glyphs(
 	    exit(1);
 	}
     }
-    start = first.low + (first.high << 8);
-    end = last.low + (last.high << 8);
 
     scanpad = scan_pad >> 3;
 
-    for (ch = 0; ch <= (end - start); ch++) {
-	int         bottom,
-	            bpr,
-	            charwidth;
-
-	printf("char #%d", ch + start);
-	if ((ch + start >= 0) && (ch + start <= 127) && isprint(ch + start))
-	    printf(" '%c'\n", (char) (ch + start));
-	else
-	    printf(" 0x%04x\n", ch + start);
-	show_char_info(&extents[ch]);
-	if (extents_only)
-	    continue;
-	if (offset != offsets[ch].position)
-	    fprintf(stderr, "offset mismatch: expected %d, got %d\n",
-		    offset, offsets[ch].position);
-	switch (bitmap_format) {
-	case BitmapFormatImageRectMin:
-	    bottom = extents[ch].descent + extents[ch].ascent;
-	    charwidth = extents[ch].right - extents[ch].left;
-	    break;
-	case BitmapFormatImageRectMaxWidth:
-	    bottom = extents[ch].descent + extents[ch].ascent;
-	    charwidth = hdr->max_bounds.right - hdr->min_bounds.left;
-	    break;
-	case BitmapFormatImageRectMax:
-	    bottom = hdr->max_bounds.ascent +
-		hdr->max_bounds.descent;
-	    charwidth = hdr->max_bounds.right - hdr->min_bounds.left;
-	    break;
-	default:
-	    bottom = 0;
-	    charwidth = 0;
-	}
+    for (row = (int)first.high; row <= (int)last.high; row++) {
+	start = first.low + (row << 8);
+	for (col = (int)first.low; col <= (int)last.low; col++) {
+	    int		bottom,
+			bpr,
+	        	charwidth;
+
+	    ch = ((row - (int)first.high)
+		  * ((int)last.low - (int)first.low + 1))
+		+ (col - (int)first.low);
+	    temp_ch = start + (col - (int)first.low);
+	    printf("char #%d", temp_ch);
+	    if ((temp_ch >= 0) && (temp_ch <= 127) && isprint(temp_ch))
+		printf(" '%c'\n", (char) (temp_ch));
+	    else
+		printf(" 0x%04x\n", temp_ch);
+	    show_char_info(&extents[ch]);
+	    if (extents_only)
+		continue;
+	    if (offset != offsets[ch].position)
+		fprintf(stderr, "offset mismatch: expected %d, got %d\n",
+			offset, offsets[ch].position);
+	    switch (bitmap_format) {
+	    case BitmapFormatImageRectMin:
+		bottom = extents[ch].descent + extents[ch].ascent;
+		charwidth = extents[ch].right - extents[ch].left;
+		break;
+	    case BitmapFormatImageRectMaxWidth:
+		bottom = extents[ch].descent + extents[ch].ascent;
+		charwidth = hdr->max_bounds.right - hdr->min_bounds.left;
+		break;
+	    case BitmapFormatImageRectMax:
+		bottom = hdr->max_bounds.ascent +
+		    hdr->max_bounds.descent;
+		charwidth = hdr->max_bounds.right - hdr->min_bounds.left;
+		break;
+	    default:
+		bottom = 0;
+		charwidth = 0;
+	    }
 
-	if (extents[ch].left == 0 &&
-	    extents[ch].right == 0 &&
-	    extents[ch].width == 0 &&
-	    extents[ch].ascent == 0 &&
-	    extents[ch].descent == 0)
-	{
-	    printf ("Nonexistent character\n");
-	    continue;
-	}
-	bpr = GLWIDTHBYTESPADDED(charwidth, scanpad);
-	if (offsets[ch].length != bottom * bpr) {
-	    fprintf (stderr, "length mismatch: expected %d (%dx%d), got %d\n",
+	    if (extents[ch].left == 0 &&
+		extents[ch].right == 0 &&
+		extents[ch].width == 0 &&
+		extents[ch].ascent == 0 &&
+		extents[ch].descent == 0) {
+		printf ("Nonexistent character\n");
+		continue;
+	    }
+	    bpr = GLWIDTHBYTESPADDED(charwidth, scanpad);
+	    if (offsets[ch].length != bottom * bpr) {
+		fprintf (stderr,
+			 "length mismatch: expected %d (%dx%d), got %d\n",
 			 bottom * bpr, bpr, bottom, offsets[ch].length);
-	}
-	offset = offsets[ch].position;
-	for (r = 0; r < bottom; r++) {
-	    unsigned char *row = glyphs + offset;
-
-	    for (b = 0; b < charwidth; b++) {
-		putchar((row[b >> 3] &
-			 (1 << (7 - (b & 7)))) ? '#' : '-');
 	    }
-	    putchar('\n');
-	    offset += bpr;
+	    offset = offsets[ch].position;
+	    for (r = 0; r < bottom; r++) {
+		unsigned char *row = glyphs + offset;
+
+		for (b = 0; b < charwidth; b++) {
+		    putchar((row[b >> 3] &
+			     (1 << (7 - (b & 7)))) ? '#' : '-');
+		}
+		putchar('\n');
+		offset += bpr;
+	    }
 	}
     }
     FSFree((char *) extents);
diff --git a/app/showfont/showfont.man b/app/showfont/showfont.man
index 93b052b60..14074e9a7 100644
--- a/app/showfont/showfont.man
+++ b/app/showfont/showfont.man
@@ -1,6 +1,6 @@
 .\" $XConsortium: showfont.man,v 1.3 94/04/11 14:29:57 gildea Exp $
 .\" $XFree86: xc/programs/showfont/showfont.man,v 1.3 2000/02/17 14:00:33 dawes Exp $
-.TH SHOWFONT 1 __xorgversion__
+.TH SHOWFONT __appmansuffix__ __xorgversion__
 .SH NAME
 showfont \- font dumper for X font server
 .SH SYNOPSIS
@@ -24,8 +24,14 @@ being expanded by the shell.
 If no pattern is given, "*" is assumed.
 .SH "OPTIONS"
 .TP 8
-.B \-server \fIhost\fP:\fIport\fP
+.B \-server \fIservername\fP
 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.
 .TP 8
 .BI \-fn " name"
 The font to display.
@@ -70,14 +76,18 @@ where 0 is ImageRectMin, 1 is ImageRectMaxWidth and 2 is ImageRectMax).
 .B \-noprops
 Do not show the font properties.
 .SH "SEE ALSO"
-xfs(1), fslsfonts(1), xlsfonts(1)
+xfs(__appmansuffix__), fslsfonts(__appmansuffix__), 
+fstobdf(__appmansuffix__), xlsfonts(__appmansuffix__), X(__miscmansuffix__).
 .SH ENVIRONMENT
 .TP 8
 .B FONTSERVER
-the default X font server to contact.
+the default X font server to contact.  The server name must
+be specified in one of the formats defined in the
+.I Font Server Names
+section of X(__miscmansuffix__).
 .SH COPYRIGHT
 Copyright 1991, Network Computing Devices, Inc.
 .br
-See \fIX\fP(1) for a full statement of rights and permissions.
+See \fIX\fP(__miscmansuffix__) for a full statement of rights and permissions.
 .SH AUTHOR
 Dave Lemke, Network Computing Devices, Inc.