Update to mkfontscale 1.2.1. This version got merged with mkfontdir.

2019-08-15 17:01:12 +00:00 · 2019-08-15 17:01:12 +00:00 · 38d585394d
commit 38d585394d
parent 3910490aae
36 changed files with 1056 additions and 21415 deletions
--- a/app/Makefile
+++ b/app/Makefile
@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.37 2019/08/15 12:11:36 schwarze Exp $
+# $OpenBSD: Makefile,v 1.38 2019/08/15 17:01:12 matthieu Exp $
 .include <bsd.xconf.mk>
-SUBDIR= bdftopcf mkfontscale mkfontdir \
+SUBDIR= bdftopcf mkfontscale \
 	appres beforelight bitmap editres fonttosfnt \
 	iceauth ico listres luit oclock \
 	rgb sessreg setxkbmap \
--- a/app/mkfontdir/COPYING
+++ b/app/mkfontdir/COPYING
@ -1,45 +0,0 @@
 Copyright 1993, 1994, 1998  The Open Group
 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.
 The above copyright notice and this permission notice 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 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.
 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 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.
--- a/app/mkfontdir/ChangeLog
+++ b/app/mkfontdir/ChangeLog
@ -1,436 +0,0 @@
 commit b99d2e8d1d2cd07d12cc3c08e3a33ac0aca13d68
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Fri Feb 10 19:58:00 2012 -0800
    mkfontdir 1.0.7
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit e3ee2b17572a26b6a6e78fdbfa4e38059da6c170
 Author: Jeremy Huddleston <jeremyhu@apple.com>
 Date:   Thu Oct 6 10:29:42 2011 -0700
    Fix issues where mkfontscale and mkfontdir are installed in different locations or bindir contains a space
    https://bugs.freedesktop.org/show_bug.cgi?id=24465
    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 commit f8ef438aba81485ff4402ff7f8cb4becf437b073
 Author: Jon TURNEY <jon.turney@dronecode.org.uk>
 Date:   Tue Mar 15 11:55:11 2011 +0000
    Fix for non-srcdir builds
    Fix commit ad5fefcc7a0a0beb1c02270d9f28c8b28da61199 for non-srcdir builds
    Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit ad5fefcc7a0a0beb1c02270d9f28c8b28da61199
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Fri Mar 11 14:10:19 2011 -0800
    Make Makefile.am compatible with Solaris make
    Solaris make won't substitute $< in explicit rules, only implicit ones
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 7f9922eac028518fa9f06aaf06c1bd6779b1e4c7
 Author: Gaetan Nadon <memsize@videotron.ca>
 Date:   Sat Jan 22 09:27:09 2011 -0500
    config: substitute bindir in mkfontdir using Autoconf @bindir@
    Use the Autoconf recommended way of substituting bindir, see
    http://www.gnu.org/software/autoconf/manual/autoconf.html
    Use # sign for comment in script.
    Only sed is used, drop the cpp terminology.
    Reviewed-by: Rémi Cardona <remi@gentoo.org>
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
 commit b9ccbf0de88e95aad25e368500a7eab217f6d434
 Author: Gaetan Nadon <memsize@videotron.ca>
 Date:   Wed Jan 19 10:06:55 2011 -0500
    config: move man pages into their own directory
    Use services provided by XORG_MANPAGE_SECTIONS.
    Use standard Makefile for man pages.
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
 commit ffd737b4a391415b9d5cae0c6323101f68b1cac0
 Author: Gaetan Nadon <memsize@videotron.ca>
 Date:   Thu Jan 13 11:15:47 2011 -0500
    man: remove trailing spaces and tabs
    Using s/[ \t]*$//
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
 commit 4790afc4c0992912ba6aed0996aba96c0355e0b3
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Sun Nov 7 11:16:38 2010 -0800
    mkfontdir 1.0.6
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 3122bbfac0a6ef937b0d3058bf65a901f420ec7d
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Sun Nov 7 11:14:14 2010 -0800
    Drop CVS version tag from mkfontdir.cpp too
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 5a57ccd8ee6f7b5692b2b3f9b3135c05282dae4b
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Sun Nov 7 11:12:11 2010 -0800
    config: Add missing AC_CONFIG_SRCDIR
    Regroup AC statements under the Autoconf initialization section.
    Regroup AM sttaements under the Automake initialization section.
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 8ee1e27b63c5f90bcf8a9b55b947f3b0a00eaf91
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Sun Nov 7 11:10:09 2010 -0800
    config: Remove unnecessary calls from configure.ac
    AC_PROG_SED & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit b03b1b175d551a4990d1c3ee2cf710592112095e
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Sun Nov 7 11:09:27 2010 -0800
    config: upgrade to util-macros 1.8 for additional man page support
    Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
    The value of MAN_SUBST is the same for all X.Org packages.
    Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
    Enables use of platform appropriate version of sed.
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 103f1b40357aee8099fd6071e11b710c516f6053
 Author: Gaetan Nadon <memsize@videotron.ca>
 Date:   Sun Nov 7 11:06:20 2010 -0800
    config: update AC_PREREQ statement to 2.60
    Unrelated to the previous patches, the new value simply reflects
    the reality that the minimum level for autoconf to configure
    all x.org modules is 2.60 dated June 2006.
    ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit e252249722a5eda00bf6b10601d4dbdae9de1d00
 Author: Jesse Adkins <jesserayadkins@gmail.com>
 Date:   Tue Sep 28 13:29:49 2010 -0700
    Purge cvs tags.
    Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
 commit 8fd1d5d18a567c46982e5c9f3918e24a38e7329e
 Author: Gaetan Nadon <memsize@videotron.ca>
 Date:   Thu Nov 26 09:19:52 2009 -0500
    Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
    Now that the INSTALL file is generated.
    Allows running make maintainer-clean.
 commit c6975a3be5cb34a3d1fd5bbf65816923bd5b2394
 Author: Gaetan Nadon <memsize@videotron.ca>
 Date:   Wed Oct 28 14:09:07 2009 -0400
    INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
    Add missing INSTALL file. Use standard GNU file on building tarball
    README may have been updated
    Remove AUTHORS file as it is empty and no content available yet.
    Remove NEWS file as it is empty and no content available yet.
 commit 47b4daf16e246c1fc23073a5cc692da702dcc2d8
 Author: Gaetan Nadon <memsize@videotron.ca>
 Date:   Mon Oct 26 22:08:38 2009 -0400
    Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
    ChangeLog filename is known to Automake and requires no further
    coding in the makefile.
 commit c258f52cfb477d7bd48dca503b8a8842e6b17513
 Author: Gaetan Nadon <memsize@videotron.ca>
 Date:   Thu Oct 22 12:34:14 2009 -0400
    .gitignore: use common defaults with custom section # 24239
    Using common defaults will reduce errors and maintenance.
    Only the very small or inexistent custom section need periodic maintenance
    when the structure of the component changes. Do not edit defaults.
 commit e8be20c2cd3ba3ac94b3a9d9b5a22b31aa2686a8
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Sat Oct 10 22:47:34 2009 -0700
    mkfontdir 1.0.5
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
 commit 006fa08ebb08b03b2c390c708e96d005f3613538
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Sat Oct 10 22:47:09 2009 -0700
    Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
 commit ca2834cb13734a4a3fa7b44f00ae1d69f7b8d364
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Thu Oct 1 14:54:18 2009 -0700
    Add README with pointers to mailing lists, bugzilla, & git
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
 commit 5cff04431124e447f3499850924601ae28d4fceb
 Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
 Date:   Fri Jan 16 20:11:47 2009 -0200
    Use XORG_CHANGELOG to correct "make distcheck"
 commit ae3643d936ae4eed9d0b1dfa60fe83718a9987e8
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Thu Mar 6 16:47:38 2008 -0500
    mkfontdir 1.0.4
 commit 24c0bbb24d2bc5aa37f4ef0bc79882d9ed48b94d
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Fri Jan 11 12:40:52 2008 -0800
    Fix formatting of man page so ellipsis are shown with Solaris nroff
 commit e5c6ba63b4848d6d747ef0af51f641d864ab75ea
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Fri Jan 11 12:39:00 2008 -0800
    Fill in COPYING file with copyright/license notices
 commit 4b24431325f37f8c2b1489bf16790fdb2db4872b
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Mon Jan 7 14:16:07 2008 -0800
    Add references to mkfontscale to man page
    Also convert (1) to (__appmansuffix__)
 commit b88571e67d65f0d6b98b49b955cd6750a1ff7c82
 Author: James Cloos <cloos@jhcloos.com>
 Date:   Thu Dec 6 16:37:03 2007 -0500
    Replace static ChangeLog with dist-hook to generate from git log
 commit 1c77c767024e60aac427c6c70a891f01ba2bcceb
 Author: James Cloos <cloos@jhcloos.com>
 Date:   Mon Sep 3 05:51:05 2007 -0400
    Add *~ to .gitignore to skip patch/emacs droppings
 commit fbe9cd99f9d96df07b0a499fefe5129ae8e1f715
 Author: James Cloos <cloos@jhcloos.com>
 Date:   Thu Aug 23 19:24:28 2007 -0400
    Rename .cvsignore to .gitignore
 commit 980d8223e76c39bce7765cef5a15457b29a1176a
 Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
 Date:   Wed Mar 21 16:06:59 2007 -0500
    Bump version number. (No changes, but source tarball will
    use recent util macros.)
 commit 8a0dcc73228a7efc59dbcc59401c68deb632c4a0
 Author: Adam Jackson <ajax@nwnk.net>
 Date:   Sun Apr 2 00:38:25 2006 +0000
    Bump to 1.0.2.
 commit 6c8aba9e4c5211eec5829f2fe4c60103439355dd
 Author: Matthieu Herrb <matthieu.herrb@laas.fr>
 Date:   Sun Mar 5 19:52:51 2006 +0000
    Let BSD make find mkfontdir.cpp when building in a separate obj dir
 commit 97ea84ce9da0e5aa8f98c008def6fcc20fd0f211
 Author: Kevin E Martin <kem@kem.org>
 Date:   Wed Dec 21 02:29:43 2005 +0000
    Update package version for X11R7 release.
 commit 907ed17423b86fc13753540e9dcaa59c699163b0
 Author: Adam Jackson <ajax@nwnk.net>
 Date:   Mon Dec 19 16:22:41 2005 +0000
    Stub COPYING files
 commit 3897b3a8ccd63807f813571175270f977e7de051
 Author: Kevin E Martin <kem@kem.org>
 Date:   Thu Dec 15 00:24:03 2005 +0000
    Update package version number for final X11R7 release candidate.
 commit bc722dc4035ad4504c78ce80066827021f40724e
 Author: Kevin E Martin <kem@kem.org>
 Date:   Tue Dec 6 22:48:17 2005 +0000
    Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
 commit bbba337b8317ea3ca7bae517b4fd84d77335e0a4
 Author: Kevin E Martin <kem@kem.org>
 Date:   Sat Dec 3 05:49:16 2005 +0000
    Update package version number for X11R7 RC3 release.
 commit d3ae95c6b1d87c5842ba011b353da4cadb9fb066
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Mon Nov 28 22:01:37 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 60da31432b2994b24a15d4bad6b99a49134e2fa1
 Author: Eric Anholt <anholt@freebsd.org>
 Date:   Mon Nov 21 10:34:56 2005 +0000
    Another pass at .cvsignores for apps.
 commit b9eb4c859cc3b40a1b3500a759e3a9b4c0c5adf0
 Author: Eric Anholt <anholt@freebsd.org>
 Date:   Sun Nov 20 22:08:49 2005 +0000
    Add/improve .cvsignore files for apps.
 commit fa50ea85ba0e0fb5cea23f9b9965da091acdf3d0
 Author: Kevin E Martin <kem@kem.org>
 Date:   Wed Oct 19 02:47:49 2005 +0000
    Update package version number for RC1 release.
 commit 8c7d262a193403bccdebc95abcdca44651d23ce7
 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 8595ad93606fd05002cdc61638002882b273438d
 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 16391b048755896eec71059f5b410e666f3199fb
 Author: Adam Jackson <ajax@nwnk.net>
 Date:   Tue Aug 2 01:58:09 2005 +0000
    Find mkfontscale through @bindir@ rather than AC_PATH_PROG, since the one
        in the path could be from an old install that doesn't support all the
        needed flags.
 commit 77232fd7d2789345182dc8604c3f361d51283fb9
 Author: Kevin E Martin <kem@kem.org>
 Date:   Fri Jul 29 21:22:29 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 ec144c204d5a94f13e472af21e3970e68171beae
 Author: Matthieu Herrb <matthieu.herrb@laas.fr>
 Date:   Thu Jul 14 20:59:48 2005 +0000
    build fix for non-GNU make
 commit c234aba48a96ff7b63841227ba62abb821306231
 Author: Kevin E Martin <kem@kem.org>
 Date:   Sat Jul 2 21:42:05 2005 +0000
    Add build system for bdftopcf, mkfontdir and mkfontscale
 commit a6969b729206fd626562609348e0bff7c71939e2
 Author: Egbert Eich <eich@suse.de>
 Date:   Fri Apr 23 19:54:36 2004 +0000
    Merging XORG-CURRENT into trunk
 commit 572109412f1b8c3c835348e995c0de9283fc4d18
 Author: Egbert Eich <eich@suse.de>
 Date:   Sun Mar 14 08:34:54 2004 +0000
    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
 commit ed58ece79a71af17459bf70954e3902a7e4c624a
 Author: Egbert Eich <eich@suse.de>
 Date:   Wed Mar 3 12:12:53 2004 +0000
    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
 commit e5ec1a9dc8d2b70d5411ec7bcaeb4faa498515b0
 Author: Egbert Eich <eich@suse.de>
 Date:   Thu Feb 26 13:36:15 2004 +0000
    readding XFree86's cvs IDs
 commit 8ce96bf2557fdf043e22efef53a882dd8d6a11e6
 Author: Egbert Eich <eich@suse.de>
 Date:   Thu Feb 26 09:23:56 2004 +0000
    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
 commit 2a85fa572521b9ec3fb846f20d0fa192f23ba7ec
 Author: Kaleb Keithley <kaleb@freedesktop.org>
 Date:   Tue Nov 25 19:29:02 2003 +0000
    XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
 commit 38106b47a4d9ae68758540e278f094712742467c
 Author: Kaleb Keithley <kaleb@freedesktop.org>
 Date:   Tue Nov 25 19:29:02 2003 +0000
    Initial revision
 commit 4b54ae25437aaaa8ff02175d23835421bff22030
 Author: Kaleb Keithley <kaleb@freedesktop.org>
 Date:   Fri Nov 14 16:48:57 2003 +0000
    XFree86 4.3.0.1
 commit 0d023fcb40ca4eea0a466dcb170fc3258dbdcf3c
 Author: Kaleb Keithley <kaleb@freedesktop.org>
 Date:   Fri Nov 14 15:54:53 2003 +0000
    R6.6 is the Xorg base-line
--- a/app/mkfontdir/INSTALL
+++ b/app/mkfontdir/INSTALL
@ -1,291 +0,0 @@
 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.
--- a/app/mkfontdir/Makefile.am
+++ b/app/mkfontdir/Makefile.am
@ -1,42 +0,0 @@
 # 
 #  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.
 SUBDIRS = man
 bin_SCRIPTS = mkfontdir
 CLEANFILES = $(bin_SCRIPTS)
 EXTRA_DIST = $(bin_SCRIPTS:=.in)
 DIR_SUBSTS = -e 's|@bindir[@]|$(bindir)|g'
 mkfontdir: mkfontdir.in
 	$(AM_V_GEN)$(SED) $(DIR_SUBSTS) < $(srcdir)/mkfontdir.in > $@
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 .PHONY: ChangeLog INSTALL
 INSTALL:
 	$(INSTALL_CMD)
 ChangeLog:
 	$(CHANGELOG_CMD)
 dist-hook: ChangeLog INSTALL
--- a/app/mkfontdir/Makefile.bsd-wrapper
+++ b/app/mkfontdir/Makefile.bsd-wrapper
@ -1,3 +0,0 @@
 # $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:27:26 matthieu Exp $
 .include <bsd.xorg.mk>
--- a/app/mkfontdir/Makefile.in
+++ b/app/mkfontdir/Makefile.in
@ -1,856 +0,0 @@
 # Makefile.in generated by automake 1.12.6 from Makefile.am.
 # @configure_input@
 # Copyright (C) 1994-2012 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 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.
 VPATH = @srcdir@
 am__make_dryrun = \
  { \
    am__dry=no; \
    case $$MAKEFLAGS in \
      *\\[\ \	]*) \
        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
      *) \
        for am__flg in $$MAKEFLAGS; do \
          case $$am__flg in \
            *=*|--*) ;; \
            *n*) am__dry=yes; break;; \
          esac; \
        done;; \
    esac; \
    test $$am__dry = yes; \
  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 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@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/configure COPYING \
 	ChangeLog INSTALL config.guess config.sub install-sh missing
 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)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
    *) f=$$p;; \
  esac;
 am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 am__install_max = 40
 am__nobase_strip_setup = \
  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 am__nobase_strip = \
  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 am__nobase_list = $(am__nobase_strip_setup); \
  for p in $$list; do echo "$$p $$p"; done | \
  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
    if (++n[$$2] == $(am__install_max)) \
      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
    END { for (dir in files) print dir, files[dir] }'
 am__base_list = \
  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__uninstall_files_from_dir = { \
  test -z "$$files" \
    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
         $(am__cd) "$$dir" && rm -f $$files; }; \
  }
 am__installdirs = "$(DESTDIR)$(bindir)"
 SCRIPTS = $(bin_SCRIPTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-dvi-recursive install-exec-recursive \
 	install-html-recursive install-info-recursive \
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
 am__can_run_installinfo = \
  case $$AM_UPDATE_INFO_DIR in \
    n|no|NO) false;; \
    *) (install-info --version) >/dev/null 2>&1;; \
  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
  distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
 	cscope distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
  if test -d "$(distdir)"; then \
    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
      && rm -rf "$(distdir)" \
      || { sleep 5 && rm -rf "$(distdir)"; }; \
  else :; fi
 am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
  dir0=`pwd`; \
  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
  sed_rest='s,^[^/]*/*,,'; \
  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
  sed_butlast='s,/*[^/]*$$,,'; \
  while test -n "$$dir1"; do \
    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
    if test "$$first" != "."; then \
      if test "$$first" = ".."; then \
        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
      else \
        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
        if test "$$first2" = "$$first"; then \
          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
        else \
          dir2="../$$dir2"; \
        fi; \
        dir0="$$dir0"/"$$first"; \
      fi; \
    fi; \
    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
  done; \
  reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
 GZIP_ENV = --best
 DIST_TARGETS = dist-bzip2 dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASE_CFLAGS = @BASE_CFLAGS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
 INSTALL = @INSTALL@
 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@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAN_SUBSTS = @MAN_SUBSTS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRICT_CFLAGS = @STRICT_CFLAGS@
 STRIP = @STRIP@
 VERSION = @VERSION@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 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@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 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@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = man
 bin_SCRIPTS = mkfontdir
 CLEANFILES = $(bin_SCRIPTS)
 EXTRA_DIST = $(bin_SCRIPTS:=.in)
 DIR_SUBSTS = -e 's|@bindir[@]|$(bindir)|g'
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 all: all-recursive
 .SUFFIXES:
 am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
 	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    echo ' $(SHELL) ./config.status'; \
 	    $(SHELL) ./config.status;; \
 	  *) \
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	$(am__cd) $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
 	done | \
 	sed -e 'p;s,.*/,,;n' \
 	    -e 'h;s|.*|.|' \
 	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
 	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
 	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
 	      if (++n[d] == $(am__install_max)) { \
 		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
 	    else { print "f", d "/" $$4, $$1 } } \
 	  END { for (d in files) print "f", d, files[d] }' | \
 	while read type dir files; do \
 	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
 	     test -z "$$files" || { \
 	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
 	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
 	     } \
 	; done
 uninstall-binSCRIPTS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
 	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
 # To change the values of 'make' variables: instead of editing Makefiles,
 # (1) if the variable is set in 'config.status', edit 'config.status'
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
 $(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
 	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
 	    *k*) failcom='fail=yes';; \
 	  esac; \
 	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
 	  *) list='$(SUBDIRS)' ;; \
 	esac; \
 	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
 	    local_target="$$target-am"; \
 	  else \
 	    local_target="$$target"; \
 	  fi; \
 	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 cscopelist-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
 	done
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
 	  empty_fix=.; \
 	else \
 	  include_option=--include; \
 	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  if test $$# -gt 0; then \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      "$$@" $$unique; \
 	  else \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      $$unique; \
 	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 cscope: cscope.files
 	test ! -s cscope.files \
 	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
 clean-cscope:
 	-rm -f cscope.files
 cscope.files: clean-cscope cscopelist-recursive cscopelist
 cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
 	list='$(SOURCES) $(HEADERS) $(LISP)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
 	esac; \
 	for i in $$list; do \
 	  if test -f "$$i"; then \
 	    echo "$(subdir)/$$i"; \
 	  else \
 	    echo "$$sdir/$$i"; \
 	  fi; \
 	done >> $(top_builddir)/cscope.files
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	  dist_files=`for file in $$list; do echo $$file; done | \
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d "$(distdir)/$$file"; then \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
 	    test -f "$(distdir)/$$file" \
 	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    $(am__make_dryrun) \
 	      || test -d "$(distdir)/$$subdir" \
 	      || $(MKDIR_P) "$(distdir)/$$subdir" \
 	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
 	    dir1=$$subdir; dir2="$(top_distdir)"; \
 	    $(am__relativize); \
 	    new_top_distdir=$$reldir; \
 	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
 	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
 	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$new_top_distdir" \
 	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
 		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
 	$(MAKE) $(AM_MAKEFLAGS) \
 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
 	  dist-hook
 	-test -n "$(am__skip_mode_fix)" \
 	|| find "$(distdir)" -type d ! -perm -755 \
 		-exec chmod u+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
 	$(am__post_remove_distdir)
 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__post_remove_distdir)
 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__post_remove_distdir)
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 dist-shar: distdir
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
 	$(am__post_remove_distdir)
 dist dist-all:
 	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
 	$(am__post_remove_distdir)
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
 # tarfile.
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
 	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
 	mkdir $(distdir)/_build $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
 	  && $(MAKE) $(AM_MAKEFLAGS) install \
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
 	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
 	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
 	        distuninstallcheck \
 	  && chmod -R a-w "$$dc_install_base" \
 	  && ({ \
 	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
 	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
 	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
 	  && rm -rf "$$dc_destdir" \
 	  && $(MAKE) $(AM_MAKEFLAGS) dist \
 	  && rm -rf $(DIST_ARCHIVES) \
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
 	$(am__post_remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
 	@test -n '$(distuninstallcheck_dir)' || { \
 	  echo 'ERROR: trying to run $@ with an empty' \
 	       '$$(distuninstallcheck_dir)' >&2; \
 	  exit 1; \
 	}; \
 	$(am__cd) '$(distuninstallcheck_dir)' || { \
 	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
 	  exit 1; \
 	}; \
 	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
 	        fi ; \
 	        $(distuninstallcheck_listfiles) ; \
 	        exit 1; } >&2
 distcleancheck: distclean
 	@if test '$(srcdir)' = . ; then \
 	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
 	  exit 1 ; \
 	fi
 	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
 	  || { echo "ERROR: files left in build directory after distclean:" ; \
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
 check-am: all-am
 check: check-recursive
 all-am: Makefile $(SCRIPTS)
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(bindir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
 uninstall: uninstall-recursive
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 installcheck: installcheck-recursive
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	      install; \
 	else \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
 clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 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-recursive
 clean-am: clean-generic mostlyclean-am
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -f Makefile
 distclean-am: clean-am distclean-generic distclean-tags
 dvi: dvi-recursive
 dvi-am:
 html: html-recursive
 html-am:
 info: info-recursive
 info-am:
 install-data-am:
 install-dvi: install-dvi-recursive
 install-dvi-am:
 install-exec-am: install-binSCRIPTS
 install-html: install-html-recursive
 install-html-am:
 install-info: install-info-recursive
 install-info-am:
 install-man:
 install-pdf: install-pdf-recursive
 install-pdf-am:
 install-ps: install-ps-recursive
 install-ps-am:
 installcheck-am:
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 mostlyclean: mostlyclean-recursive
 mostlyclean-am: mostlyclean-generic
 pdf: pdf-recursive
 pdf-am:
 ps: ps-recursive
 ps-am:
 uninstall-am: uninstall-binSCRIPTS
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
 	cscopelist-recursive ctags-recursive install-am install-strip \
 	tags-recursive
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-cscope \
 	clean-generic cscope cscopelist cscopelist-recursive ctags \
 	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \
 	dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \
 	distclean distclean-generic distclean-tags distcleancheck \
 	distdir distuninstallcheck dvi dvi-am html html-am info \
 	info-am install install-am install-binSCRIPTS install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
 	install-exec-am install-html install-html-am install-info \
 	install-info-am install-man install-pdf install-pdf-am \
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
 	uninstall-binSCRIPTS
 mkfontdir: mkfontdir.in
 	$(AM_V_GEN)$(SED) $(DIR_SUBSTS) < $(srcdir)/mkfontdir.in > $@
 .PHONY: ChangeLog INSTALL
 INSTALL:
 	$(INSTALL_CMD)
 ChangeLog:
 	$(CHANGELOG_CMD)
 dist-hook: ChangeLog INSTALL
 # 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:
--- a/app/mkfontdir/README
+++ b/app/mkfontdir/README
@ -1,27 +0,0 @@
 mkfontdir creates the fonts.dir files needed by the legacy X server
 core font system.   The current implementation is a simple wrapper script
 around the mkfontscale program, which must be built and installed first.
 All questions regarding this software should be directed at the
 Xorg mailing list:
        http://lists.freedesktop.org/mailman/listinfo/xorg
 Please submit bug reports to the Xorg bugzilla:
        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
 The master development code repository can be found at:
        git://anongit.freedesktop.org/git/xorg/app/mkfontdir
        http://cgit.freedesktop.org/xorg/app/mkfontdir
 For patch submission instructions, see:
 	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
 For more information on the git code manager, see:
        http://wiki.x.org/wiki/GitPage
--- a/app/mkfontdir/aclocal.m4
+++ b/app/mkfontdir/aclocal.m4
--- a/app/mkfontdir/config.guess
+++ b/app/mkfontdir/config.guess
--- a/app/mkfontdir/config.sub
+++ b/app/mkfontdir/config.sub
--- a/app/mkfontdir/configure
+++ b/app/mkfontdir/configure
--- a/app/mkfontdir/configure.ac
+++ b/app/mkfontdir/configure.ac
@ -1,42 +0,0 @@
 dnl  Copyright 2005 Red Hat, Inc.
 dnl 
 dnl  Permission to use, copy, modify, distribute, and sell this software
 dnl  and its documentation for any purpose is hereby granted without fee,
 dnl  provided that the above copyright notice appear in all copies and
 dnl  that both that copyright notice and this permission notice appear in
 dnl  supporting documentation, and that the name of Red Hat not be used in
 dnl  advertising or publicity pertaining to distribution of the software
 dnl  without specific, written prior permission.  Red Hat makes no
 dnl  representations about the suitability of this software for any
 dnl  purpose.  It is provided "as is" without express or implied warranty.
 dnl 
 dnl  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 dnl  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
 dnl  NO EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
 dnl  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
 dnl  OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 dnl  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
 dnl  USE OR PERFORMANCE OF THIS SOFTWARE.
 dnl
 dnl Process this file with autoconf to create configure.
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([mkfontdir], [1.0.7],
        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [mkfontdir])
 AC_CONFIG_SRCDIR([Makefile.am])
 # Initialize Automake
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
 m4_ifndef([XORG_MACROS_VERSION],
 	  [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
 XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 AC_CONFIG_FILES([
 	Makefile
 	man/Makefile])
 AC_OUTPUT
--- a/app/mkfontdir/install-sh
+++ b/app/mkfontdir/install-sh
@ -1,527 +0,0 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 scriptversion=2011-11-20.07; # UTC
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
 # following copyright and license.
 #
 # Copyright (C) 1994 X Consortium
 #
 # 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 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
 # 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 CONNEC-
 # TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 # 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 deal-
 # ings in this Software without prior written authorization from the X Consor-
 # tium.
 #
 #
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
 # 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
 # from scratch.
 nl='
 '
 IFS=" ""	$nl"
 # set DOITPROG to echo to test this script
 # Don't use :- since 4.3BSD and earlier shells don't like it.
 doit=${DOITPROG-}
 if test -z "$doit"; then
  doit_exec=exec
 else
  doit_exec=$doit
 fi
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
 chgrpprog=${CHGRPPROG-chgrp}
 chmodprog=${CHMODPROG-chmod}
 chownprog=${CHOWNPROG-chown}
 cmpprog=${CMPPROG-cmp}
 cpprog=${CPPROG-cp}
 mkdirprog=${MKDIRPROG-mkdir}
 mvprog=${MVPROG-mv}
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}
 posix_glob='?'
 initialize_posix_glob='
  test "$posix_glob" != "?" || {
    if (set -f) 2>/dev/null; then
      posix_glob=
    else
      posix_glob=:
    fi
  }
 '
 posix_mkdir=
 # Desired mode of installed file.
 mode=0755
 chgrpcmd=
 chmodcmd=$chmodprog
 chowncmd=
 mvcmd=$mvprog
 rmcmd="$rmprog -f"
 stripcmd=
 src=
 dst=
 dir_arg=
 dst_arg=
 copy_on_change=false
 no_target_directory=
 usage="\
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
   or: $0 [OPTION]... SRCFILES... DIRECTORY
   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
   or: $0 [OPTION]... -d DIRECTORIES...
 In the 1st form, copy SRCFILE to DSTFILE.
 In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
 In the 4th, create DIRECTORIES.
 Options:
     --help     display this help and exit.
     --version  display version info and exit.
  -c            (ignored)
  -C            install only if different (preserve the last data modification time)
  -d            create directories instead of installing files.
  -g GROUP      $chgrpprog installed files to GROUP.
  -m MODE       $chmodprog installed files to MODE.
  -o USER       $chownprog installed files to USER.
  -s            $stripprog installed files.
  -t DIRECTORY  install into DIRECTORY.
  -T            report an error if DSTFILE is a directory.
 Environment variables override the default commands:
  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
  RMPROG STRIPPROG
 "
 while test $# -ne 0; do
  case $1 in
    -c) ;;
    -C) copy_on_change=true;;
    -d) dir_arg=true;;
    -g) chgrpcmd="$chgrpprog $2"
 	shift;;
    --help) echo "$usage"; exit $?;;
    -m) mode=$2
 	case $mode in
 	  *' '* | *'	'* | *'
 '*	  | *'*'* | *'?'* | *'['*)
 	    echo "$0: invalid mode: $mode" >&2
 	    exit 1;;
 	esac
 	shift;;
    -o) chowncmd="$chownprog $2"
 	shift;;
    -s) stripcmd=$stripprog;;
    -t) dst_arg=$2
 	# Protect names problematic for 'test' and other utilities.
 	case $dst_arg in
 	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
 	esac
 	shift;;
    -T) no_target_directory=true;;
    --version) echo "$0 $scriptversion"; exit $?;;
    --)	shift
 	break;;
    -*)	echo "$0: invalid option: $1" >&2
 	exit 1;;
    *)  break;;
  esac
  shift
 done
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
  # When -d is used, all remaining arguments are directories to create.
  # When -t is used, the destination is already specified.
  # Otherwise, the last argument is the destination.  Remove it from $@.
  for arg
  do
    if test -n "$dst_arg"; then
      # $@ is not empty: it contains at least $arg.
      set fnord "$@" "$dst_arg"
      shift # fnord
    fi
    shift # arg
    dst_arg=$arg
    # Protect names problematic for 'test' and other utilities.
    case $dst_arg in
      -* | [=\(\)!]) dst_arg=./$dst_arg;;
    esac
  done
 fi
 if test $# -eq 0; then
  if test -z "$dir_arg"; then
    echo "$0: no input file specified." >&2
    exit 1
  fi
  # It's OK to call 'install-sh -d' without argument.
  # This can happen when creating conditional directories.
  exit 0
 fi
 if test -z "$dir_arg"; then
  do_exit='(exit $ret); exit $ret'
  trap "ret=129; $do_exit" 1
  trap "ret=130; $do_exit" 2
  trap "ret=141; $do_exit" 13
  trap "ret=143; $do_exit" 15
  # Set umask so as not to create temps with too-generous modes.
  # However, 'strip' requires both read and write access to temps.
  case $mode in
    # Optimize common cases.
    *644) cp_umask=133;;
    *755) cp_umask=22;;
    *[0-7])
      if test -z "$stripcmd"; then
 	u_plus_rw=
      else
 	u_plus_rw='% 200'
      fi
      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
    *)
      if test -z "$stripcmd"; then
 	u_plus_rw=
      else
 	u_plus_rw=,u+rw
      fi
      cp_umask=$mode$u_plus_rw;;
  esac
 fi
 for src
 do
  # Protect names problematic for 'test' and other utilities.
  case $src in
    -* | [=\(\)!]) src=./$src;;
  esac
  if test -n "$dir_arg"; then
    dst=$src
    dstdir=$dst
    test -d "$dstdir"
    dstdir_status=$?
  else
    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
    # might cause directories to be created, which would be especially bad
    # if $src (and thus $dsttmp) contains '*'.
    if test ! -f "$src" && test ! -d "$src"; then
      echo "$0: $src does not exist." >&2
      exit 1
    fi
    if test -z "$dst_arg"; then
      echo "$0: no destination specified." >&2
      exit 1
    fi
    dst=$dst_arg
    # If destination is a directory, append the input filename; won't work
    # if double slashes aren't ignored.
    if test -d "$dst"; then
      if test -n "$no_target_directory"; then
 	echo "$0: $dst_arg: Is a directory" >&2
 	exit 1
      fi
      dstdir=$dst
      dst=$dstdir/`basename "$src"`
      dstdir_status=0
    else
      # Prefer dirname, but fall back on a substitute if dirname fails.
      dstdir=`
 	(dirname "$dst") 2>/dev/null ||
 	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	     X"$dst" : 'X\(//\)[^/]' \| \
 	     X"$dst" : 'X\(//\)$' \| \
 	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
 	echo X"$dst" |
 	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\/\)[^/].*/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\/\)$/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\).*/{
 		   s//\1/
 		   q
 		 }
 		 s/.*/./; q'
      `
      test -d "$dstdir"
      dstdir_status=$?
    fi
  fi
  obsolete_mkdir_used=false
  if test $dstdir_status != 0; then
    case $posix_mkdir in
      '')
 	# Create intermediate dirs using mode 755 as modified by the umask.
 	# This is like FreeBSD 'install' as of 1997-10-28.
 	umask=`umask`
 	case $stripcmd.$umask in
 	  # Optimize common cases.
 	  *[2367][2367]) mkdir_umask=$umask;;
 	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
 	  *[0-7])
 	    mkdir_umask=`expr $umask + 22 \
 	      - $umask % 100 % 40 + $umask % 20 \
 	      - $umask % 10 % 4 + $umask % 2
 	    `;;
 	  *) mkdir_umask=$umask,go-w;;
 	esac
 	# With -d, create the new directory with the user-specified mode.
 	# Otherwise, rely on $mkdir_umask.
 	if test -n "$dir_arg"; then
 	  mkdir_mode=-m$mode
 	else
 	  mkdir_mode=
 	fi
 	posix_mkdir=false
 	case $umask in
 	  *[123567][0-7][0-7])
 	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
 	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
 	    ;;
 	  *)
 	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
 	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
 	    if (umask $mkdir_umask &&
 		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
 	    then
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
 		   # other-writable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
 		     d????-?r-*) different_mode=700;;
 		     d????-?--*) different_mode=755;;
 		     *) false;;
 		   esac &&
 		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
 		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
 		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
 		   }
 		 }
 	      then posix_mkdir=:
 	      fi
 	      rmdir "$tmpdir/d" "$tmpdir"
 	    else
 	      # Remove any dirs left behind by ancient mkdir implementations.
 	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
 	    fi
 	    trap '' 0;;
 	esac;;
    esac
    if
      $posix_mkdir && (
 	umask $mkdir_umask &&
 	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
      )
    then :
    else
      # The umask is ridiculous, or mkdir does not conform to POSIX,
      # or it failed possibly due to a race condition.  Create the
      # directory the slow way, step by step, checking for races as we go.
      case $dstdir in
 	/*) prefix='/';;
 	[-=\(\)!]*) prefix='./';;
 	*)  prefix='';;
      esac
      eval "$initialize_posix_glob"
      oIFS=$IFS
      IFS=/
      $posix_glob set -f
      set fnord $dstdir
      shift
      $posix_glob set +f
      IFS=$oIFS
      prefixes=
      for d
      do
 	test X"$d" = X && continue
 	prefix=$prefix$d
 	if test -d "$prefix"; then
 	  prefixes=
 	else
 	  if $posix_mkdir; then
 	    (umask=$mkdir_umask &&
 	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
 	    # Don't fail if two instances are running concurrently.
 	    test -d "$prefix" || exit 1
 	  else
 	    case $prefix in
 	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
 	      *) qprefix=$prefix;;
 	    esac
 	    prefixes="$prefixes '$qprefix'"
 	  fi
 	fi
 	prefix=$prefix/
      done
      if test -n "$prefixes"; then
 	# Don't fail if two instances are running concurrently.
 	(umask $mkdir_umask &&
 	 eval "\$doit_exec \$mkdirprog $prefixes") ||
 	  test -d "$dstdir" || exit 1
 	obsolete_mkdir_used=true
      fi
    fi
  fi
  if test -n "$dir_arg"; then
    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
  else
    # Make a couple of temp file names in the proper directory.
    dsttmp=$dstdir/_inst.$$_
    rmtmp=$dstdir/_rm.$$_
    # Trap to clean up those temp files at exit.
    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
    # Copy the file name to the temp name.
    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
    # and set any options; do chmod last to preserve setuid bits.
    #
    # If any of these fail, we abort the whole thing.  If we want to
    # ignore errors from any of these, just make sure not to ignore
    # errors from the above "$doit $cpprog $src $dsttmp" command.
    #
    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
    # If -C, don't bother to copy if it wouldn't change the file.
    if $copy_on_change &&
       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
       eval "$initialize_posix_glob" &&
       $posix_glob set -f &&
       set X $old && old=:$2:$4:$5:$6 &&
       set X $new && new=:$2:$4:$5:$6 &&
       $posix_glob set +f &&
       test "$old" = "$new" &&
       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
    then
      rm -f "$dsttmp"
    else
      # Rename the file to the real destination.
      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
      # The rename failed, perhaps because mv can't rename something else
      # to itself, or perhaps because mv is so ancient that it does not
      # support -f.
      {
 	# Now remove or move aside any old file at destination location.
 	# We try this two ways since rm can't unlink itself on some
 	# systems and the destination file might be busy for other
 	# reasons.  In this case, the final cleanup might fail but the new
 	# file should still install successfully.
 	{
 	  test ! -f "$dst" ||
 	  $doit $rmcmd -f "$dst" 2>/dev/null ||
 	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
 	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
 	  } ||
 	  { echo "$0: cannot unlink or rename $dst" >&2
 	    (exit 1); exit 1
 	  }
 	} &&
 	# Now rename the file to the real destination.
 	$doit $mvcmd "$dsttmp" "$dst"
      }
    fi || exit 1
    trap '' 0
  fi
 done
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:
--- a/app/mkfontdir/man/Makefile.am
+++ b/app/mkfontdir/man/Makefile.am
@ -1,12 +0,0 @@
 appmandir = $(APP_MAN_DIR)
 appman_PRE = mkfontdir.man
 appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
 EXTRA_DIST = $(appman_PRE)
 CLEANFILES = $(appman_DATA)
 SUFFIXES = .$(APP_MAN_SUFFIX) .man
 # String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
 .man.$(APP_MAN_SUFFIX):
 	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
--- a/app/mkfontdir/man/Makefile.in
+++ b/app/mkfontdir/man/Makefile.in
@ -1,454 +0,0 @@
 # Makefile.in generated by automake 1.12.6 from Makefile.am.
 # @configure_input@
 # Copyright (C) 1994-2012 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@
 VPATH = @srcdir@
 am__make_dryrun = \
  { \
    am__dry=no; \
    case $$MAKEFLAGS in \
      *\\[\ \	]*) \
        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
      *) \
        for am__flg in $$MAKEFLAGS; do \
          case $$am__flg in \
            *=*|--*) ;; \
            *n*) am__dry=yes; break;; \
          esac; \
        done;; \
    esac; \
    test $$am__dry = yes; \
  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 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@
 subdir = man
 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 = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
  case $$AM_UPDATE_INFO_DIR in \
    n|no|NO) false;; \
    *) (install-info --version) >/dev/null 2>&1;; \
  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
    *) f=$$p;; \
  esac;
 am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 am__install_max = 40
 am__nobase_strip_setup = \
  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 am__nobase_strip = \
  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 am__nobase_list = $(am__nobase_strip_setup); \
  for p in $$list; do echo "$$p $$p"; done | \
  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
    if (++n[$$2] == $(am__install_max)) \
      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
    END { for (dir in files) print dir, files[dir] }'
 am__base_list = \
  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__uninstall_files_from_dir = { \
  test -z "$$files" \
    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
         $(am__cd) "$$dir" && rm -f $$files; }; \
  }
 am__installdirs = "$(DESTDIR)$(appmandir)"
 DATA = $(appman_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASE_CFLAGS = @BASE_CFLAGS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
 INSTALL = @INSTALL@
 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@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MAN_SUBSTS = @MAN_SUBSTS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRICT_CFLAGS = @STRICT_CFLAGS@
 STRIP = @STRIP@
 VERSION = @VERSION@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 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@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 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@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 appmandir = $(APP_MAN_DIR)
 appman_PRE = mkfontdir.man
 appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
 EXTRA_DIST = $(appman_PRE)
 CLEANFILES = $(appman_DATA)
 SUFFIXES = .$(APP_MAN_SUFFIX) .man
 all: all-am
 .SUFFIXES:
 .SUFFIXES: .$(APP_MAN_SUFFIX) .man
 $(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 ) \
 	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign man/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
 $(am__aclocal_m4_deps):
 install-appmanDATA: $(appman_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(appman_DATA)'; test -n "$(appmandir)" || list=; \
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(appmandir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(appmandir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appmandir)'"; \
 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(appmandir)" || exit $$?; \
 	done
 uninstall-appmanDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(appman_DATA)'; test -n "$(appmandir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(appmandir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 ctags: CTAGS
 CTAGS:
 cscope cscopelist:
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	  dist_files=`for file in $$list; do echo $$file; done | \
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d "$(distdir)/$$file"; then \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    cp -fpR $$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:
 	for dir in "$(DESTDIR)$(appmandir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 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:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	      install; \
 	else \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
 clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_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 mostlyclean-am
 distclean: distclean-am
 	-rm -f Makefile
 distclean-am: clean-am distclean-generic
 dvi: dvi-am
 dvi-am:
 html: html-am
 html-am:
 info: info-am
 info-am:
 install-data-am: install-appmanDATA
 install-dvi: install-dvi-am
 install-dvi-am:
 install-exec-am:
 install-html: install-html-am
 install-html-am:
 install-info: install-info-am
 install-info-am:
 install-man:
 install-pdf: install-pdf-am
 install-pdf-am:
 install-ps: install-ps-am
 install-ps-am:
 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
 pdf: pdf-am
 pdf-am:
 ps: ps-am
 ps-am:
 uninstall-am: uninstall-appmanDATA
 .MAKE: install-am install-strip
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-appmanDATA install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
 	install-exec-am install-html install-html-am install-info \
 	install-info-am install-man install-pdf install-pdf-am \
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am uninstall uninstall-am uninstall-appmanDATA
 # String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
 .man.$(APP_MAN_SUFFIX):
 	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
 # 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:
--- a/app/mkfontdir/missing
+++ b/app/mkfontdir/missing
@ -1,330 +0,0 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 scriptversion=2012-01-06.18; # UTC
 # Copyright (C) 1996-2012 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2, or (at your option)
 # any later version.
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 if test $# -eq 0; then
  echo 1>&2 "Try '$0 --help' for more information"
  exit 1
 fi
 run=:
 sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
 sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
 # In the cases where this matters, 'missing' is being run in the
 # srcdir already.
 if test -f configure.ac; then
  configure_ac=configure.ac
 else
  configure_ac=configure.in
 fi
 msg="missing on your system"
 case $1 in
 --run)
  # Try to run requested program, and just exit if it succeeds.
  run=
  shift
  "$@" && exit 0
  # Exit code 63 means version mismatch.  This often happens
  # when the user try to use an ancient version of a tool on
  # a file that requires a minimum version.  In this case we
  # we should proceed has if the program had been absent, or
  # if --run hadn't been passed.
  if test $? = 63; then
    run=:
    msg="probably too old"
  fi
  ;;
  -h|--h|--he|--hel|--help)
    echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...
 Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
 error status if there is no known handling for PROGRAM.
 Options:
  -h, --help      display this help and exit
  -v, --version   output version information and exit
  --run           try to run the given command, and emulate it if it fails
 Supported PROGRAM values:
  aclocal      touch file 'aclocal.m4'
  autoconf     touch file 'configure'
  autoheader   touch file 'config.h.in'
  autom4te     touch the output file, or create a stub one
  automake     touch all 'Makefile.in' files
  bison        create 'y.tab.[ch]', if possible, from existing .[ch]
  flex         create 'lex.yy.c', if possible, from existing .c
  help2man     touch the output file
  lex          create 'lex.yy.c', if possible, from existing .c
  makeinfo     touch the output file
  yacc         create 'y.tab.[ch]', if possible, from existing .[ch]
 Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
 'g' are ignored when checking the name.
 Send bug reports to <bug-automake@gnu.org>."
    exit $?
    ;;
  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
    echo "missing $scriptversion (GNU Automake)"
    exit $?
    ;;
  -*)
    echo 1>&2 "$0: Unknown '$1' option"
    echo 1>&2 "Try '$0 --help' for more information"
    exit 1
    ;;
 esac
 # normalize program name to check for.
 program=`echo "$1" | sed '
  s/^gnu-//; t
  s/^gnu//; t
  s/^g//; t'`
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
 # the program).  This is about non-GNU programs, so use $1 not
 # $program.
 case $1 in
  lex*|yacc*)
    # Not GNU programs, they don't have --version.
    ;;
  *)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
       # Could not run --version or --help.  This is probably someone
       # running '$TOOL --version' or '$TOOL --help' to check whether
       # $TOOL exists and not knowing $TOOL uses missing.
       exit 1
    fi
    ;;
 esac
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
 case $program in
  aclocal*)
    echo 1>&2 "\
 WARNING: '$1' is $msg.  You should only need it if
         you modified 'acinclude.m4' or '${configure_ac}'.  You might want
         to install the Automake and Perl packages.  Grab them from
         any GNU archive site."
    touch aclocal.m4
    ;;
  autoconf*)
    echo 1>&2 "\
 WARNING: '$1' is $msg.  You should only need it if
         you modified '${configure_ac}'.  You might want to install the
         Autoconf and GNU m4 packages.  Grab them from any GNU
         archive site."
    touch configure
    ;;
  autoheader*)
    echo 1>&2 "\
 WARNING: '$1' is $msg.  You should only need it if
         you modified 'acconfig.h' or '${configure_ac}'.  You might want
         to install the Autoconf and GNU m4 packages.  Grab them
         from any GNU archive site."
    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
    test -z "$files" && files="config.h"
    touch_files=
    for f in $files; do
      case $f in
      *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
      *) touch_files="$touch_files $f.in";;
      esac
    done
    touch $touch_files
    ;;
  automake*)
    echo 1>&2 "\
 WARNING: '$1' is $msg.  You should only need it if
         you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'.
         You might want to install the Automake and Perl packages.
         Grab them from any GNU archive site."
    find . -type f -name Makefile.am -print |
 	   sed 's/\.am$/.in/' |
 	   while read f; do touch "$f"; done
    ;;
  autom4te*)
    echo 1>&2 "\
 WARNING: '$1' is needed, but is $msg.
         You might have modified some files without having the
         proper tools for further handling them.
         You can get '$1' as part of Autoconf from any GNU
         archive site."
    file=`echo "$*" | sed -n "$sed_output"`
    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
    if test -f "$file"; then
 	touch $file
    else
 	test -z "$file" || exec >$file
 	echo "#! /bin/sh"
 	echo "# Created by GNU Automake missing as a replacement of"
 	echo "#  $ $@"
 	echo "exit 0"
 	chmod +x $file
 	exit 1
    fi
    ;;
  bison*|yacc*)
    echo 1>&2 "\
 WARNING: '$1' $msg.  You should only need it if
         you modified a '.y' file.  You may need the Bison package
         in order for those modifications to take effect.  You can get
         Bison from any GNU archive site."
    rm -f y.tab.c y.tab.h
    if test $# -ne 1; then
        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
 	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
 	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
    fi
    if test ! -f y.tab.h; then
 	echo >y.tab.h
    fi
    if test ! -f y.tab.c; then
 	echo 'main() { return 0; }' >y.tab.c
    fi
    ;;
  lex*|flex*)
    echo 1>&2 "\
 WARNING: '$1' is $msg.  You should only need it if
         you modified a '.l' file.  You may need the Flex package
         in order for those modifications to take effect.  You can get
         Flex from any GNU archive site."
    rm -f lex.yy.c
    if test $# -ne 1; then
        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
 	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
    fi
    if test ! -f lex.yy.c; then
 	echo 'main() { return 0; }' >lex.yy.c
    fi
    ;;
  help2man*)
    echo 1>&2 "\
 WARNING: '$1' is $msg.  You should only need it if
 	 you modified a dependency of a manual page.  You may need the
 	 Help2man package in order for those modifications to take
 	 effect.  You can get Help2man from any GNU archive site."
    file=`echo "$*" | sed -n "$sed_output"`
    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
    if test -f "$file"; then
 	touch $file
    else
 	test -z "$file" || exec >$file
 	echo ".ab help2man is required to generate this page"
 	exit $?
    fi
    ;;
  makeinfo*)
    echo 1>&2 "\
 WARNING: '$1' is $msg.  You should only need it if
         you modified a '.texi' or '.texinfo' file, or any other file
         indirectly affecting the aspect of the manual.  The spurious
         call might also be the consequence of using a buggy 'make' (AIX,
         DU, IRIX).  You might want to install the Texinfo package or
         the GNU make package.  Grab either from any GNU archive site."
    # The file to touch is that specified with -o ...
    file=`echo "$*" | sed -n "$sed_output"`
    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
    if test -z "$file"; then
      # ... or it is the one specified with @setfilename ...
      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
      file=`sed -n '
 	/^@setfilename/{
 	  s/.* \([^ ]*\) *$/\1/
 	  p
 	  q
 	}' $infile`
      # ... or it is derived from the source name (dir/f.texi becomes f.info)
      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
    fi
    # If the file does not exist, the user really needs makeinfo;
    # let's fail without touching anything.
    test -f $file || exit 1
    touch $file
    ;;
  *)
    echo 1>&2 "\
 WARNING: '$1' is needed, and is $msg.
         You might have modified some files without having the
         proper tools for further handling them.  Check the 'README' file,
         it often tells you about the needed prerequisites for installing
         this package.  You may also peek at any GNU archive site, in case
         some other package would contain this missing '$1' program."
    exit 1
    ;;
 esac
 exit 0
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:
--- a/app/mkfontscale/COPYING
+++ b/app/mkfontscale/COPYING
@ -38,3 +38,51 @@ 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.
 -----------------------------------------------------------------------------
 Copyright 1993, 1994, 1998  The Open Group
 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.
 The above copyright notice and this permission notice 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 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.
 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 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.
--- a/app/mkfontscale/ChangeLog
+++ b/app/mkfontscale/ChangeLog
@ -1,3 +1,436 @@
 commit 79f686765238ddd0e4753f9d4ee62b5a5296610e
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Wed Mar 20 20:58:15 2019 -0700
    mkfontscale 1.2.1
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 29cab25240cf30f546671f265167a2eeadfd4c75
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Thu Mar 7 13:23:00 2019 -0800
    Revert "Use autoconf instead of sed to substitute @bindir@ in mkfontdir.in"
    This reverts commit 1f9d14bec07092d62da29a5a233cefbf84d47289.
    It caused https://gitlab.freedesktop.org/xorg/app/mkfontscale/issues/5
 commit 8fbafcfe7e5ef4a2030e3963f31143bba2c8786f
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Sat Mar 2 14:16:48 2019 -0800
    mkfontscale 1.2.0
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit bef1c614465f2c8546a7d946a75d8f10c5f3ca40
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Tue Feb 19 11:45:29 2019 -0800
    Add mkfontdir to .gitignore
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 1f9d14bec07092d62da29a5a233cefbf84d47289
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Mon Feb 18 18:27:31 2019 -0800
    Use autoconf instead of sed to substitute @bindir@ in mkfontdir.in
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit d3b0f267bd25ab888efc0417f62d525afa32208a
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Mon Feb 18 18:23:50 2019 -0800
    Add mkfontdir to README.md
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 270540bb11914ea92436e251b14bc39d6b5df589
 Author: Jeremy Huddleston <jeremyhu@apple.com>
 Date:   Thu Oct 6 10:29:42 2011 -0700
    mkfontdir: Fix issues where mkfontscale and mkfontdir are installed in different locations or bindir contains a space
    https://bugs.freedesktop.org/show_bug.cgi?id=24465
    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 commit cfbeaa0b99944ab887b4854baa63eadd4e5481f5
 Author: Jon TURNEY <jon.turney@dronecode.org.uk>
 Date:   Tue Mar 15 11:55:11 2011 +0000
    mkfontdir: Fix for non-srcdir builds
    Fix commit ad5fefcc7a0a0beb1c02270d9f28c8b28da61199 for non-srcdir builds
    Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 758df83c5825b77f338e44c1fcc4c5070d3c3516
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Fri Mar 11 14:10:19 2011 -0800
    mkfontdir: Make Makefile.am compatible with Solaris make
    Solaris make won't substitute $< in explicit rules, only implicit ones
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 8290027e067ffd0a3f37eeafbd27121e2884cea4
 Author: Gaetan Nadon <memsize@videotron.ca>
 Date:   Sat Jan 22 09:27:09 2011 -0500
    mkfontdir: config: substitute bindir in mkfontdir using Autoconf @bindir@
    Use the Autoconf recommended way of substituting bindir, see
    http://www.gnu.org/software/autoconf/manual/autoconf.html
    Use # sign for comment in script.
    Only sed is used, drop the cpp terminology.
    Reviewed-by: Rémi Cardona <remi@gentoo.org>
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
 commit 07d71396a502515a02bd12c5b01cdd98a7a30dab
 Author: Gaetan Nadon <memsize@videotron.ca>
 Date:   Wed Jan 19 10:06:55 2011 -0500
    mkfontdir: config: move man pages into their own directory
    Use services provided by XORG_MANPAGE_SECTIONS.
    Use standard Makefile for man pages.
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
 commit 91cae6761d1a1eb9e5e2eba9eea8d7be6e3993d1
 Author: Gaetan Nadon <memsize@videotron.ca>
 Date:   Thu Jan 13 11:15:47 2011 -0500
    mkfontdir: man: remove trailing spaces and tabs
    Using s/[ \t]*$//
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
 commit 7bb2d75a9f00546178f16fd536946fe1bdabdebb
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Sun Nov 7 11:14:14 2010 -0800
    mkfontdir: Drop CVS version tag from mkfontdir.cpp too
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit b1e80a29150c90c39915e5e758262815c2c4da05
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Sun Nov 7 11:10:09 2010 -0800
    mkfontdir: config: Remove unnecessary calls from configure.ac
    AC_PROG_SED & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit daee1aa67b7b11b2d4f9e38ddc39603e9206557a
 Author: Jesse Adkins <jesserayadkins@gmail.com>
 Date:   Tue Sep 28 13:29:49 2010 -0700
    mkfontdir: Purge cvs tags.
    Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
 commit 43d1aae1b0e1f9f759fe3439aa2079a88dab03af
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Sat Oct 10 22:47:09 2009 -0700
    mkfontdir: Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
 commit 2dac61a84d474e533df29b5874ce6ca5e68d4ddd
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Fri Jan 11 12:40:52 2008 -0800
    mkfontdir: Fix formatting of man page so ellipsis are shown with Solaris nroff
 commit 8609ad731b9c9c670a815c915055ae416d2396d8
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Fri Jan 11 12:39:00 2008 -0800
    mkfontdir: Fill in COPYING file with copyright/license notices
 commit 18654870df3e8c65abc4443a0f510abd46c5fbaa
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Mon Jan 7 14:16:07 2008 -0800
    mkfontdir: Add references to mkfontscale to man page
    Also convert (1) to (__appmansuffix__)
 commit 1d15009075c3d316bd54c5861ac2859330ab2e64
 Author: Matthieu Herrb <matthieu.herrb@laas.fr>
 Date:   Sun Mar 5 19:52:51 2006 +0000
    mkfontdir: Let BSD make find mkfontdir.cpp when building in a separate obj dir
 commit 1cb06c20467030fddf6a0a7be855f6849cadf7b4
 Author: Adam Jackson <ajax@nwnk.net>
 Date:   Tue Aug 2 01:58:09 2005 +0000
    mkfontdir: Find mkfontscale through @bindir@ rather than AC_PATH_PROG, since the one in the path could be from an old install that doesn't support all the needed flags.
 commit a8341c3f17050b253a9f55aba76f1d8437165c26
 Author: Matthieu Herrb <matthieu.herrb@laas.fr>
 Date:   Thu Jul 14 20:59:48 2005 +0000
    mkfontdir: build fix for non-GNU make
 commit fa554ab53809943cb141e07687c96364d91e3f9c
 Author: Kevin E Martin <kem@kem.org>
 Date:   Sat Jul 2 21:42:05 2005 +0000
    mkfontdir: Add build system for bdftopcf, mkfontdir and mkfontscale
 commit c40a94766668aad01ef57eea181752a370762cd0
 Author: Egbert Eich <eich@suse.de>
 Date:   Fri Apr 23 19:54:36 2004 +0000
    mkfontdir: Merging XORG-CURRENT into trunk
 commit 1a302e07687403c0be7452d865d20e4cb0761770
 Author: Egbert Eich <eich@suse.de>
 Date:   Sun Mar 14 08:34:54 2004 +0000
    mkfontdir: Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
 commit c01032201686db5622b4f997d5294d724800c694
 Author: Egbert Eich <eich@suse.de>
 Date:   Wed Mar 3 12:12:53 2004 +0000
    mkfontdir: Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
 commit 3a6aebdfeb88dd8501d715117990af646f687555
 Author: Egbert Eich <eich@suse.de>
 Date:   Thu Feb 26 13:36:15 2004 +0000
    mkfontdir: readding XFree86's cvs IDs
 commit fa75fa1a5d7c1599692d4e309c39fca34b2a0f84
 Author: Egbert Eich <eich@suse.de>
 Date:   Thu Feb 26 09:23:56 2004 +0000
    mkfontdir: Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
 commit 9b6d7d062c91a86e110eea7ed38d44e104463fba
 Author: Kaleb Keithley <kaleb@freedesktop.org>
 Date:   Tue Nov 25 19:29:02 2003 +0000
    mkfontdir: Initial revision
 commit 2247072a89b7b9da8ed22d0aaec100cef3adb62d
 Author: Kaleb Keithley <kaleb@freedesktop.org>
 Date:   Fri Nov 14 16:48:57 2003 +0000
    mkfontdir: XFree86 4.3.0.1
 commit 1b920768b5122bac7368860fd6fc7e4f5275ed8f
 Author: Kaleb Keithley <kaleb@freedesktop.org>
 Date:   Fri Nov 14 15:54:53 2003 +0000
    mkfontdir: R6.6 is the Xorg base-line
 commit 0a20abea3ec9742f0982e043e725cdadf0fc493e
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Sun Jan 6 14:26:00 2019 -0800
    Clear some -Wshorten-64-to-32 warnings from clang 6
    ident.c:84:13: warning: implicit conversion loses integer precision:
          'unsigned long' to 'int' [-Wshorten-64-to-32]
        int n = strlen(filename);
            ~   ^~~~~~~~~~~~~~~~
    ident.c:130:9: warning: implicit conversion loses integer precision:
          'off64_t' (aka 'long') to 'int' [-Wshorten-64-to-32]
            return gzseek(ff->f.gz, offset, whence);
            ~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    ident.c:140:17: warning: implicit conversion loses integer precision:
          'long' to 'int' [-Wshorten-64-to-32]
                n = offset - ff->pos;
                  ~ ~~~~~~~^~~~~~~~~
    ident.c:143:10: warning: implicit conversion loses integer precision:
          'off_t' (aka 'long') to 'int' [-Wshorten-64-to-32]
                n = offset;
                  ~ ^~~~~~
    ident.c:156:12: warning: implicit conversion loses integer precision:
          'off_t' (aka 'long') to 'unsigned int' [-Wshorten-64-to-32]
            ff->pos = offset;
                    ~ ^~~~~~
    ident.c:157:9: warning: implicit conversion loses integer precision:
          'off_t' (aka 'long') to 'int' [-Wshorten-64-to-32]
            return offset;
            ~~~~~~ ^~~~~~
    mkfontscale.c:704:13: warning: implicit conversion loses integer precision:
          'unsigned long' to 'int' [-Wshorten-64-to-32]
        int n = strlen(dirname);
            ~   ^~~~~~~~~~~~~~~
    mkfontscale.c:748:13: warning: implicit conversion loses integer precision:
          'unsigned long' to 'int' [-Wshorten-64-to-32]
        int n = strlen(filename);
            ~   ^~~~~~~~~~~~~~~~
    mkfontscale.c:794:14: warning: implicit conversion loses integer precision:
          'unsigned long' to 'int' [-Wshorten-64-to-32]
            xl = strlen (exclusionSuffix);
               ~ ^~~~~~~~~~~~~~~~~~~~~~~~
    mkfontscale.c:796:9: warning: implicit conversion loses integer precision:
          'unsigned long' to 'int' [-Wshorten-64-to-32]
        i = strlen(dirname_given);
          ~ ^~~~~~~~~~~~~~~~~~~~~
    mkfontscale.c:858:15: warning: implicit conversion loses integer precision:
          'unsigned long' to 'int' [-Wshorten-64-to-32]
                int dl = strlen (entry->d_name);
                    ~~   ^~~~~~~~~~~~~~~~~~~~~~
    mkfontscale.c:930:21: warning: implicit conversion loses integer precision:
          'unsigned long' to 'int' [-Wshorten-64-to-32]
                int l = strlen(xlfd_name);
                    ~   ^~~~~~~~~~~~~~~~~
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit a311033403730db56bbbd0c56977e6c49a6b5519
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Sun Jan 6 13:33:42 2019 -0800
    Clear some -Wsign-compare warnings from gcc 7
    mkfontscale.c: In function ‘getName’:
    mkfontscale.c:336:22: warning: comparison between signed and unsigned
       integer expressions [-Wsign-compare]
             for(i = 0; i < name.string_len / 2; i++) {
                          ^
    mkfontscale.c: In function ‘nameWidth’:
    mkfontscale.c:427:18: warning: comparison between signed and unsigned
       integer expressions [-Wsign-compare]
         for(i = 0; i < NUMWIDTHS; i++)
                      ^
    mkfontscale.c: In function ‘notice_foundry’:
    mkfontscale.c:1261:18: warning: comparison between signed and unsigned
       integer expressions [-Wsign-compare]
         for(i = 0; i < countof(notice_foundries); i++)
                      ^
    mkfontscale.c: In function ‘vendor_foundry’:
    mkfontscale.c:1285:18: warning: comparison between signed and unsigned
       integer expressions [-Wsign-compare]
         for(i = 0; i < countof(vendor_foundries); i++)
                      ^
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit d971bb62c6d2a35eccfdcd0c3c6c65c4f841f556
 Author: Thomas Klausner <wiz@NetBSD.org>
 Date:   Mon Jul 27 23:16:45 2015 +0200
    Add new ConstList functions and use them.
    Gets rid of lots of const warnings.
    Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
 commit bd8ff8a513d928878c877ea7b448baf7aee003a3
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Wed Nov 21 16:49:31 2018 -0800
    Update configure.ac bug URL for gitlab migration
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 17dec8c3c2805707767a2e416358db860b2b2427
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Fri Nov 16 20:25:32 2018 -0800
    Update README for gitlab migration
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit eac885fa5ebff24e0839144863872443a010d7c2
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Mon Oct 1 21:24:45 2018 -0700
    Stop shadowing 'found' in checkExtraEncoding()
    mkfontscale.c: In function ‘checkExtraEncoding’:
    mkfontscale.c:1220:17: warning: declaration of ‘found’ shadows a parameter [-Wshadow]
                 int found = 0;
                     ^~~~~
    mkfontscale.c:1214:59: note: shadowed declaration is here
     checkExtraEncoding(FT_Face face, char *encoding_name, int found)
                                                               ^~~~~
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 325621bd083236567bd861d41ff161313fc96e96
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Mon Oct 1 21:19:58 2018 -0700
    Rename variable 'n' to avoid shadowing another 'n' in doDirectory
    mkfontscale.c: In function ‘doDirectory’:
    mkfontscale.c:928:17: warning: declaration of ‘n’ shadows a previous local [-Wshadow]
                 int n = strlen(xlfd_name);
                     ^
    mkfontscale.c:788:12: note: shadowed declaration is here
         int i, n, dirn, diri, found, rc;
                ^
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 0faf882de6de6c1ec26aace9a9939914b40e7b89
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Mon Oct 1 21:10:59 2018 -0700
    Use vasprintf(), if available, to implement dsprintf()
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 3b747cc5d2981c44ff517f64c355e76d70194f24
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Mon Oct 1 20:52:18 2018 -0700
    Replace dsprintf("%s", s) with strdup(s)
    dsprintf is an allocating sprintf.  With a format string of "%s", it
    reduces to just being a more complicated version of strdup, so lets
    just use strdup instead to save time and reduce complexity.
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 65fe4ef6f5674b0b52e797924990b090dbbd52af
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Mon Oct 1 20:48:21 2018 -0700
    Remove last use of strcat
    If getcwd returned a string that exactly filled the prefix buffer,
    it could write the null terminator byte out of bounds.
    Instead, since the prefix is copied to a newly allocated string and
    never used again, just let the dsprintf() call take care of it.
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 commit 7b4203577af4b835ef069e0cd2bd9510b599789c
 Author: Bernhard M. Wiedemann <bwiedemann@suse.de>
 Date:   Mon Sep 10 10:17:52 2018 +0200
    Sort input file list
    so that openSUSE's installation-images builds in a reproducible way
    in spite of indeterministic filesystem readdir order
    See https://reproducible-builds.org/ for why this is good.
    Signed-off-by: Bernhard M. Wiedemann <bwiedemann@suse.de>
 commit 4b1d7d3af1c1bc1586b2e9a780aea0dee7df5a14
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Tue Mar 6 22:57:01 2018 -0800
--- a/app/mkfontscale/Makefile.am
+++ b/app/mkfontscale/Makefile.am
@ -21,12 +21,22 @@
 SUBDIRS = man
 bin_PROGRAMS = mkfontscale
 bin_SCRIPTS = mkfontdir
 CLEANFILES = $(bin_SCRIPTS)
 EXTRA_DIST = $(bin_SCRIPTS:=.in)
 DIR_SUBSTS = -e 's|@bindir[@]|$(bindir)|g'
 mkfontdir: mkfontdir.in
 	$(AM_V_GEN)$(SED) $(DIR_SUBSTS) < $(srcdir)/mkfontdir.in > $@
 AM_CPPFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE
 AM_CFLAGS = $(CWARNFLAGS)
 mkfontscale_LDADD  = @MKFONTSCALE_LIBS@
 mkfontscale_SOURCES = \
 	constlist.c \
 	constlist.h \
 	data.h \
 	hash.c \
 	hash.h \
@ -55,3 +65,5 @@ ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 lint:
 	$(LINT) $(ALL_LINT_FLAGS) $(mkfontscale_SOURCES)
 endif LINT
 EXTRA_DIST += README.md
--- a/app/mkfontscale/Makefile.in
+++ b/app/mkfontscale/Makefile.in
@ -35,6 +35,7 @@
 #  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 VPATH = @srcdir@
 am__make_dryrun = \
  { \
@ -73,7 +74,7 @@ build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = mkfontscale$(EXEEXT)
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure COPYING ChangeLog INSTALL compile \
 	config.guess config.sub depcomp install-sh missing
@ -87,12 +88,40 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
-am_mkfontscale_OBJECTS = hash.$(OBJEXT) ident.$(OBJEXT) list.$(OBJEXT) \
+am_mkfontscale_OBJECTS = constlist.$(OBJEXT) hash.$(OBJEXT) \
-	mkfontscale.$(OBJEXT)
+	ident.$(OBJEXT) list.$(OBJEXT) mkfontscale.$(OBJEXT)
 mkfontscale_OBJECTS = $(am_mkfontscale_OBJECTS)
 mkfontscale_DEPENDENCIES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
    *) f=$$p;; \
  esac;
 am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 am__install_max = 40
 am__nobase_strip_setup = \
  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 am__nobase_strip = \
  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 am__nobase_list = $(am__nobase_strip_setup); \
  for p in $$list; do echo "$$p $$p"; done | \
  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
    if (++n[$$2] == $(am__install_max)) \
      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
    END { for (dir in files) print dir, files[dir] }'
 am__base_list = \
  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__uninstall_files_from_dir = { \
  test -z "$$files" \
    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
         $(am__cd) "$$dir" && rm -f $$files; }; \
  }
 SCRIPTS = $(bin_SCRIPTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@ -312,10 +341,16 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = man
 bin_SCRIPTS = mkfontdir
 CLEANFILES = $(bin_SCRIPTS)
 EXTRA_DIST = $(bin_SCRIPTS:=.in) README.md
 DIR_SUBSTS = -e 's|@bindir[@]|$(bindir)|g'
 AM_CPPFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE
 AM_CFLAGS = $(CWARNFLAGS)
 mkfontscale_LDADD = @MKFONTSCALE_LIBS@
 mkfontscale_SOURCES = \
 	constlist.c \
 	constlist.h \
 	data.h \
 	hash.c \
 	hash.h \
@ -426,6 +461,41 @@ clean-binPROGRAMS:
 mkfontscale$(EXEEXT): $(mkfontscale_OBJECTS) $(mkfontscale_DEPENDENCIES) $(EXTRA_mkfontscale_DEPENDENCIES) 
 	@rm -f mkfontscale$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(mkfontscale_OBJECTS) $(mkfontscale_LDADD) $(LIBS)
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
 	done | \
 	sed -e 'p;s,.*/,,;n' \
 	    -e 'h;s|.*|.|' \
 	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
 	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
 	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
 	      if (++n[d] == $(am__install_max)) { \
 		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
 	    else { print "f", d "/" $$4, $$1 } } \
 	  END { for (d in files) print "f", d, files[d] }' | \
 	while read type dir files; do \
 	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
 	     test -z "$$files" || { \
 	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
 	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
 	     } \
 	; done
 uninstall-binSCRIPTS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
 	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@ -433,6 +503,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constlist.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ident.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@
@ -773,10 +844,10 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(PROGRAMS) config.h
+all-am: Makefile $(PROGRAMS) $(SCRIPTS) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(bindir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@ -801,6 +872,7 @@ install-strip:
 mostlyclean-generic:
 clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@ -839,7 +911,7 @@ install-dvi: install-dvi-recursive
 install-dvi-am:
-install-exec-am: install-binPROGRAMS
+install-exec-am: install-binPROGRAMS install-binSCRIPTS
 install-html: install-html-recursive
@ -880,7 +952,7 @@ ps: ps-recursive
 ps-am:
-uninstall-am: uninstall-binPROGRAMS
+uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
 	cscopelist-recursive ctags-recursive install-am install-strip \
@ -894,17 +966,21 @@ uninstall-am: uninstall-binPROGRAMS
 	dist-xz 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-binPROGRAMS install-data \
+	info-am install install-am install-binPROGRAMS \
-	install-data-am install-dvi install-dvi-am install-exec \
+	install-binSCRIPTS install-data install-data-am install-dvi \
-	install-exec-am install-html install-html-am install-info \
+	install-dvi-am install-exec install-exec-am install-html \
-	install-info-am install-man install-pdf install-pdf-am \
+	install-html-am install-info install-info-am install-man \
-	install-ps install-ps-am install-strip installcheck \
+	install-pdf install-pdf-am install-ps install-ps-am \
-	installcheck-am installdirs installdirs-am maintainer-clean \
+	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
-	uninstall uninstall-am uninstall-binPROGRAMS
+	ps ps-am tags tags-recursive uninstall uninstall-am \
 	uninstall-binPROGRAMS uninstall-binSCRIPTS
 mkfontdir: mkfontdir.in
 	$(AM_V_GEN)$(SED) $(DIR_SUBSTS) < $(srcdir)/mkfontdir.in > $@
 .PHONY: ChangeLog INSTALL
 INSTALL:
--- a/app/mkfontscale/README
+++ b/app/mkfontscale/README
@ -1,26 +0,0 @@
 mkfontscale creates the fonts.scale and fonts.dir index files used by the
 legacy X11 font system.
 All questions regarding this software should be directed at the
 Xorg mailing list:
 	http://lists.freedesktop.org/mailman/listinfo/xorg
 Please submit bug reports to the Xorg bugzilla:
 	https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
 The master development code repository can be found at:
 	git://anongit.freedesktop.org/git/xorg/app/mkfontscale
 	http://cgit.freedesktop.org/xorg/app/mkfontscale
 For patch submission instructions, see:
 	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
 For more information on the git code manager, see:
 	http://wiki.x.org/wiki/GitPage
--- a/app/mkfontscale/README.md
+++ b/app/mkfontscale/README.md
@ -0,0 +1,19 @@
 mkfontscale creates the fonts.scale and fonts.dir index files used by the
 legacy X11 font system.  It now includes the mkfontdir script previously
 distributed separately for compatibility with older X11 versions.
 All questions regarding this software should be directed at the
 Xorg mailing list:
  https://lists.x.org/mailman/listinfo/xorg
 The master development code repository can be found at:
  https://gitlab.freedesktop.org/xorg/app/mkfontscale
 Please submit bug reports and requests to merge patches there.
 For patch submission instructions, see:
  https://www.x.org/wiki/Development/Documentation/SubmittingPatches
--- a/app/mkfontscale/aclocal.m4
+++ b/app/mkfontscale/aclocal.m4
@ -19,32 +19,63 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
+dnl serial 11 (pkg-config-0.29.1)
-# 
+dnl
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
-# This program is free software; you can redistribute it and/or modify
+dnl
-# it under the terms of the GNU General Public License as published by
+dnl This program is free software; you can redistribute it and/or modify
-# the Free Software Foundation; either version 2 of the License, or
+dnl it under the terms of the GNU General Public License as published by
-# (at your option) any later version.
+dnl the Free Software Foundation; either version 2 of the License, or
-#
+dnl (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but
+dnl
-# WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl This program is distributed in the hope that it will be useful, but
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
-# General Public License for more details.
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#
+dnl General Public License for more details.
-# You should have received a copy of the GNU General Public License
+dnl
-# along with this program; if not, write to the Free Software
+dnl You should have received a copy of the GNU General Public License
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+dnl along with this program; if not, write to the Free Software
-#
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# As a special exception to the GNU General Public License, if you
+dnl 02111-1307, USA.
-# distribute this file as part of a program that contains a
+dnl
-# configuration script generated by Autoconf, you may include it under
+dnl As a special exception to the GNU General Public License, if you
-# the same distribution terms that you use for the rest of that program.
+dnl distribute this file as part of a program that contains a
 dnl configuration script generated by Autoconf, you may include it under
 dnl the same distribution terms that you use for the rest of that
 dnl program.
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl PKG_PREREQ(MIN-VERSION)
-# ----------------------------------
+dnl -----------------------
 dnl Since: 0.29
 dnl
 dnl Verify that the version of the pkg-config macros are at least
 dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
 dnl installed version of pkg-config, this checks the developer's version
 dnl of pkg.m4 when generating configure.
 dnl
 dnl To ensure that this macro is defined, also add:
 dnl m4_ifndef([PKG_PREREQ],
 dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
 dnl
 dnl See the "Since" comment for each macro you use to see what version
 dnl of the macros you require.
 m4_defun([PKG_PREREQ],
 [m4_define([PKG_MACROS_VERSION], [0.29.1])
 m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
 ])dnl PKG_PREREQ
 dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
 dnl ----------------------------------
 dnl Since: 0.16
 dnl
 dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
 dnl first found in the path. Checks that the version of pkg-config found
 dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
 dnl used since that's the first version where most current features of
 dnl pkg-config existed.
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@ -66,18 +97,19 @@ if test -n "$PKG_CONFIG"; then
 		PKG_CONFIG=""
 	fi
 fi[]dnl
-])# PKG_PROG_PKG_CONFIG
+])dnl PKG_PROG_PKG_CONFIG
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
+dnl -------------------------------------------------------------------
-# Check to see whether a particular set of modules exists.  Similar
+dnl Since: 0.18
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
-#
+dnl Check to see whether a particular set of modules exists. Similar to
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
-# only at the first occurence in configure.ac, so if the first place
+dnl
-# it's called might be skipped (such as if it is within an "if", you
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# have to call PKG_CHECK_EXISTS manually
+dnl only at the first occurence in configure.ac, so if the first place
-# --------------------------------------------------------------
+dnl it's called might be skipped (such as if it is within an "if", you
 dnl have to call PKG_CHECK_EXISTS manually
 AC_DEFUN([PKG_CHECK_EXISTS],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 if test -n "$PKG_CONFIG" && \
@ -87,8 +119,10 @@ m4_ifvaln([$3], [else
  $3])dnl
 fi])
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
+dnl ---------------------------------------------
 dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
 dnl pkg_failed based on the result.
 m4_define([_PKG_CONFIG],
 [if test -n "$$1"; then
    pkg_cv_[]$1="$$1"
@ -100,10 +134,11 @@ m4_define([_PKG_CONFIG],
 else
    pkg_failed=untried
 fi[]dnl
-])# _PKG_CONFIG
+])dnl _PKG_CONFIG
-# _PKG_SHORT_ERRORS_SUPPORTED
+dnl _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
+dnl ---------------------------
 dnl Internal check to see if pkg-config supports short errors.
 AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@ -111,19 +146,17 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 else
        _pkg_short_errors_supported=no
 fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
+dnl   [ACTION-IF-NOT-FOUND])
-#
+dnl --------------------------------------------------------------
-#
+dnl Since: 0.4.0
-# Note that if there is a possibility the first call to
+dnl
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl Note that if there is a possibility the first call to
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
-#
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
 #
 # --------------------------------------------------------------
 AC_DEFUN([PKG_CHECK_MODULES],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
@ -177,16 +210,40 @@ else
        AC_MSG_RESULT([yes])
 	$3
 fi[]dnl
-])# PKG_CHECK_MODULES
+])dnl PKG_CHECK_MODULES
-# PKG_INSTALLDIR(DIRECTORY)
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# -------------------------
+dnl   [ACTION-IF-NOT-FOUND])
-# Substitutes the variable pkgconfigdir as the location where a module
+dnl ---------------------------------------------------------------------
-# should install pkg-config .pc files. By default the directory is
+dnl Since: 0.29
-# $libdir/pkgconfig, but the default can be changed by passing
+dnl
-# DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl Checks for existence of MODULES and gathers its build flags with
-# parameter.
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
 dnl and VARIABLE-PREFIX_LIBS from --libs.
 dnl
 dnl Note that if there is a possibility the first call to
 dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
 dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
 dnl configure.ac.
 AC_DEFUN([PKG_CHECK_MODULES_STATIC],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 _save_PKG_CONFIG=$PKG_CONFIG
 PKG_CONFIG="$PKG_CONFIG --static"
 PKG_CHECK_MODULES($@)
 PKG_CONFIG=$_save_PKG_CONFIG[]dnl
 ])dnl PKG_CHECK_MODULES_STATIC
 dnl PKG_INSTALLDIR([DIRECTORY])
 dnl -------------------------
 dnl Since: 0.27
 dnl
 dnl Substitutes the variable pkgconfigdir as the location where a module
 dnl should install pkg-config .pc files. By default the directory is
 dnl $libdir/pkgconfig, but the default can be changed by passing
 dnl DIRECTORY. The user can override through the --with-pkgconfigdir
 dnl parameter.
 AC_DEFUN([PKG_INSTALLDIR],
 [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
 m4_pushdef([pkg_description],
@ -197,16 +254,18 @@ AC_ARG_WITH([pkgconfigdir],
 AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
 m4_popdef([pkg_default])
 m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
+])dnl PKG_INSTALLDIR
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
-# -------------------------
+dnl --------------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl Since: 0.27
-# module should install arch-independent pkg-config .pc files. By
+dnl
-# default the directory is $datadir/pkgconfig, but the default can be
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
-# changed by passing DIRECTORY. The user can override through the
+dnl module should install arch-independent pkg-config .pc files. By
-# --with-noarch-pkgconfigdir parameter.
+dnl default the directory is $datadir/pkgconfig, but the default can be
 dnl changed by passing DIRECTORY. The user can override through the
 dnl --with-noarch-pkgconfigdir parameter.
 AC_DEFUN([PKG_NOARCH_INSTALLDIR],
 [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
 m4_pushdef([pkg_description],
@ -217,7 +276,24 @@ AC_ARG_WITH([noarch-pkgconfigdir],
 AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
 m4_popdef([pkg_default])
 m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
+])dnl PKG_NOARCH_INSTALLDIR
 dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
 dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
 dnl -------------------------------------------
 dnl Since: 0.28
 dnl
 dnl Retrieves the value of the pkg-config variable for the given module.
 AC_DEFUN([PKG_CHECK_VAR],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
 _PKG_CONFIG([$1], [variable="][$3]["], [$2])
 AS_VAR_COPY([$1], [pkg_cv_][$1])
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
 ])dnl PKG_CHECK_VAR
 # Copyright (C) 2002-2012 Free Software Foundation, Inc.
 #
--- a/app/mkfontscale/config.h.in
+++ b/app/mkfontscale/config.h.in
@ -33,6 +33,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 /* Define to 1 if you have the `vasprintf' function. */
 #undef HAVE_VASPRINTF
 /* Name of package */
 #undef PACKAGE
--- a/app/mkfontscale/configure
+++ b/app/mkfontscale/configure
@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mkfontscale 1.1.3.
+# Generated by GNU Autoconf 2.69 for mkfontscale 1.2.1.
 #
-# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
+# Report bugs to <https://gitlab.freedesktop.org/xorg/app/mkfontscale/issues>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@ -267,7 +267,7 @@ fi
    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
  else
    $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+$0: https://gitlab.freedesktop.org/xorg/app/mkfontscale/issues
 $0: about your system, including any error possibly output
 $0: before this message. Then install a modern shell, or
 $0: manually run the script under such a shell if you do
@ -581,9 +581,9 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='mkfontscale'
 PACKAGE_TARNAME='mkfontscale'
-PACKAGE_VERSION='1.1.3'
+PACKAGE_VERSION='1.2.1'
-PACKAGE_STRING='mkfontscale 1.1.3'
+PACKAGE_STRING='mkfontscale 1.2.1'
-PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
+PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/mkfontscale/issues'
 PACKAGE_URL=''
 ac_unique_file="Makefile.am"
@ -1323,7 +1323,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 mkfontscale 1.1.3 to adapt to many kinds of systems.
+\`configure' configures mkfontscale 1.2.1 to adapt to many kinds of systems.
 Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1393,7 +1393,7 @@ fi
 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of mkfontscale 1.1.3:";;
+     short | recursive ) echo "Configuration of mkfontscale 1.2.1:";;
   esac
  cat <<\_ACEOF
@ -1450,7 +1450,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
-Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
+Report bugs to <https://gitlab.freedesktop.org/xorg/app/mkfontscale/issues>.
 _ACEOF
 ac_status=$?
 fi
@ -1513,7 +1513,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-mkfontscale configure 1.1.3
+mkfontscale configure 1.2.1
 generated by GNU Autoconf 2.69
 Copyright (C) 2012 Free Software Foundation, Inc.
@ -1672,9 +1672,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ---------------------------------------------------------------------- ##
+( $as_echo "## ------------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
+## Report this to https://gitlab.freedesktop.org/xorg/app/mkfontscale/issues ##
-## ---------------------------------------------------------------------- ##"
+## ------------------------------------------------------------------------- ##"
     ) | sed "s/^/$as_me: WARNING:     /" >&2
    ;;
 esac
@ -1857,11 +1857,78 @@ fi
  as_fn_set_status $ac_retval
 } # ac_fn_c_try_link
 # ac_fn_c_check_func LINENO FUNC VAR
 # ----------------------------------
 # Tests whether FUNC exists, setting the cache variable VAR accordingly
 ac_fn_c_check_func ()
 {
  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
 if eval \${$3+:} false; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Define $2 to an innocuous variant, in case <limits.h> declares $2.
   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 #define $2 innocuous_$2
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $2 (); below.
    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
    <limits.h> exists even on freestanding compilers.  */
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
 #undef $2
 /* Override any GCC internal prototype to avoid an error.
   Use char because int might match the return type of a GCC
   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
 char $2 ();
 /* The GNU C library defines this for functions which it implements
    to always fail with ENOSYS.  Some functions are actually named
    something starting with __ and the normal name is an alias.  */
 #if defined __stub_$2 || defined __stub___$2
 choke me
 #endif
 int
 main ()
 {
 return $2 ();
  ;
  return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
  eval "$3=yes"
 else
  eval "$3=no"
 fi
 rm -f core conftest.err conftest.$ac_objext \
    conftest$ac_exeext conftest.$ac_ext
 fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 } # ac_fn_c_check_func
 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 mkfontscale $as_me 1.1.3, which was
+It was created by mkfontscale $as_me 1.2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
  $ $0 $@
@ -4001,7 +4068,7 @@ fi
 # Define the identity of the package.
 PACKAGE='mkfontscale'
- VERSION='1.1.3'
+ VERSION='1.2.1'
 cat >>confdefs.h <<_ACEOF
@ -10682,6 +10749,19 @@ $as_echo "#define X_BZIP2_FONT_COMPRESSION 1" >>confdefs.h
 fi
 # Checks for system functions / libraries
 for ac_func in vasprintf
 do :
  ac_fn_c_check_func "$LINENO" "vasprintf" "ac_cv_func_vasprintf"
 if test "x$ac_cv_func_vasprintf" = xyes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_VASPRINTF 1
 _ACEOF
 fi
 done
 # Checks for pkg-config packages
 pkg_failed=no
@ -11508,7 +11588,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by mkfontscale $as_me 1.1.3, which was
+This file was extended by mkfontscale $as_me 1.2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
  CONFIG_FILES    = $CONFIG_FILES
@ -11568,13 +11648,13 @@ $config_headers
 Configuration commands:
 $config_commands
-Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>."
+Report bugs to <https://gitlab.freedesktop.org/xorg/app/mkfontscale/issues>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-mkfontscale config.status 1.1.3
+mkfontscale config.status 1.2.1
 configured by $0, generated by GNU Autoconf 2.69,
  with options \\"\$ac_cs_config\\"
--- a/app/mkfontscale/configure.ac
+++ b/app/mkfontscale/configure.ac
@ -22,8 +22,8 @@ dnl Process this file with autoconf to create configure.
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([mkfontscale], [1.1.3],
+AC_INIT([mkfontscale], [1.2.1],
-        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+        [https://gitlab.freedesktop.org/xorg/app/mkfontscale/issues],
        [mkfontscale])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
@ -51,6 +51,9 @@ if test "x$with_bzip2" = xyes; then
 	AC_DEFINE(X_BZIP2_FONT_COMPRESSION,1,[Support bzip2 for bitmap fonts])
 fi
 # Checks for system functions / libraries
 AC_CHECK_FUNCS([vasprintf])
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(MKFONTSCALE, fontenc freetype2)
 PKG_CHECK_MODULES(X11, [xproto >= 7.0.25])
--- a/app/mkfontscale/constlist.c
+++ b/app/mkfontscale/constlist.c
@ -0,0 +1,93 @@
 /*
  Copyright (c) 2002-2003 by Juliusz Chroboczek
  Copyright (c) 2015 by Thomas Klausner
  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 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.
 */
 #include <stdlib.h>
 #include "constlist.h"
 ConstListPtr
 appendConstList(ConstListPtr first, ConstListPtr second)
 {
    ConstListPtr current;
    if(second == NULL)
        return first;
    if(first == NULL)
        return second;
    for(current = first; current->next; current = current->next)
        ;
    current->next = second;
    return first;
 }
 ConstListPtr
 makeConstList(const char **a, int n, ConstListPtr old, int begin)
 {
    ConstListPtr first, current, next;
    int i;
    if(n == 0)
        return old;
    first = malloc(sizeof(ConstListRec));
    if(!first)
        return NULL;
    first->value = a[0];
    first->next = NULL;
    current = first;
    for(i = 1; i < n; i++) {
        next = malloc(sizeof(ConstListRec));
        if(!next) {
            destroyConstList(first);
            return NULL;
        }
        next->value = a[i];
        next->next = NULL;
        current->next = next;
        current = next;
    }
    if(begin) {
        current->next = old;
        return first;
    } else {
        return appendConstList(old, first);
    }
 }
 void
 destroyConstList(ConstListPtr old)
 {
    ConstListPtr next;
    if(!old)
        return;
    while(old) {
        next = old->next;
        free(old);
        old = next;
    }
 }
--- a/app/mkfontscale/constlist.h
+++ b/app/mkfontscale/constlist.h
@ -0,0 +1,35 @@
 /*
  Copyright (c) 2015 Thomas Klausner
  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 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.
 */
 #ifndef _MKS_CONSTLIST_H_
 #define _MKS_CONSTLIST_H_ 1
 typedef struct _ConstList {
    const char *value;
    struct _ConstList *next;
 } ConstListRec, *ConstListPtr;
 ConstListPtr appendConstList(ConstListPtr first, ConstListPtr second);
 ConstListPtr makeConstList(const char **a, int n, ConstListPtr old, int begin);
 void destroyConstList(ConstListPtr old);
 #endif /* _MKS_CONSTLIST_H_ */
--- a/app/mkfontscale/ident.c
+++ b/app/mkfontscale/ident.c
@ -76,12 +76,12 @@ typedef struct {
 	gzFile gz;
 	BZFILE *bz2;
    } f;
-    unsigned pos;
+    unsigned long pos;
 } fontFile;
 static inline void *
 fontFileOpen(fontFile *ff, const char *filename) {
-    int n = strlen(filename);
+    size_t n = strlen(filename);
    if (n > 4 && strcmp(filename + n - 4, ".bz2") == 0) {
 	ff->type = bz2FontFile;
@ -123,7 +123,7 @@ fontFileGetc(fontFile *ff)
    }
 }
-static int
+static long
 fontFileSeek(fontFile *ff, z_off_t offset, int whence)
 {
    if (ff->type == gzFontFile) {
@ -132,7 +132,7 @@ fontFileSeek(fontFile *ff, z_off_t offset, int whence)
 	/* bzlib has no easy equivalent so we have to fake it,
 	 * fortunately, we only have to handle a couple of cases
 	 */
-	int n;
+	z_off_t n;
 	char buf[BUFSIZ];
 	switch (whence) {
@ -151,7 +151,7 @@ fontFileSeek(fontFile *ff, z_off_t offset, int whence)
 		return -1;
 	    n -= BUFSIZ;
 	}
-	if (BZ2_bzread(ff->f.bz2, buf, n) != n)
+	if (BZ2_bzread(ff->f.bz2, buf, (int) n) != n)
 	    return -1;
 	ff->pos = offset;
 	return offset;
@ -247,7 +247,8 @@ pcfIdentify(fontFile *f, char **name)
 {
    int prop_position;
    PropPtr props = NULL;
-    int format, count, nprops, i, string_size, rc;
+    int format, count, nprops, i, string_size;
    long rc;
    char *strings = NULL, *s;
    count = getLSB32(f);
--- a/app/mkfontscale/list.c
+++ b/app/mkfontscale/list.c
@ -20,6 +20,8 @@
  THE SOFTWARE.
 */
 #include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
@ -63,6 +65,13 @@ dsprintf(const char *f, ...)
 {
    va_list args;
    char *string;
 #ifdef HAVE_VASPRINTF
    va_start(args, f);
    if (vasprintf(&string, f, args) == -1)
        string = NULL;
    va_end(args);
    return string;
 #else
    {
 	int n, size = 20;
 	while(1) {
@ -83,6 +92,7 @@ dsprintf(const char *f, ...)
 	    free(string);
 	}
    }
 #endif
 }
--- a/app/mkfontscale/man/Makefile.am
+++ b/app/mkfontscale/man/Makefile.am
@ -1,6 +1,6 @@
 appmandir = $(APP_MAN_DIR)
-appman_PRE = mkfontscale.man
+appman_PRE = mkfontdir.man mkfontscale.man
 appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
 EXTRA_DIST = $(appman_PRE)
--- a/app/mkfontscale/man/Makefile.in
+++ b/app/mkfontscale/man/Makefile.in
@ -235,7 +235,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 appmandir = $(APP_MAN_DIR)
-appman_PRE = mkfontscale.man
+appman_PRE = mkfontdir.man mkfontscale.man
 appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
 EXTRA_DIST = $(appman_PRE)
 CLEANFILES = $(appman_DATA)
--- a/app/mkfontscale/man/mkfontdir.man
+++ b/app/mkfontscale/man/mkfontdir.man
--- a/app/mkfontscale/mkfontdir.in
+++ b/app/mkfontscale/mkfontdir.in
--- a/app/mkfontscale/mkfontscale.c
+++ b/app/mkfontscale/mkfontscale.c
@ -48,6 +48,7 @@
 #include FT_XFREE86_H
 #include "list.h"
 #include "constlist.h"
 #include "hash.h"
 #include "data.h"
 #include "ident.h"
@ -88,14 +89,14 @@ static const char *encodings_array[] =
 static const char *extra_encodings_array[] =
    { "iso10646-1", "adobe-fontspecific", "microsoft-symbol" };
-static ListPtr encodings, extra_encodings;
+static ConstListPtr encodings, extra_encodings;
 static const char *outfilename;
 #define countof(_a) (sizeof(_a)/sizeof((_a)[0]))
 static int doDirectory(const char*, int, ListPtr);
-static int checkEncoding(FT_Face face, char *encoding_name);
+static int checkEncoding(FT_Face face, const char *encoding_name);
-static int checkExtraEncoding(FT_Face face, char *encoding_name, int found);
+static int checkExtraEncoding(FT_Face face, const char *encoding_name, int found);
 static int find_cmap(int type, int pid, int eid, FT_Face face);
 static const char* notice_foundry(const char *notice);
 static const char* vendor_foundry(const signed char *vendor);
@ -152,14 +153,15 @@ main(int argc, char **argv)
        exit(1);
    }
    if(prefix[strlen(prefix) - 1] != '/')
-        strcat(prefix, "/");
+        encodingPrefix = dsprintf("%s/", prefix);
-    encodingPrefix = dsprintf("%s", prefix);
+    else
        encodingPrefix = strdup(prefix);
    outfilename = NULL;
-    encodings = makeList(encodings_array, countof(encodings_array), NULL, 0);
+    encodings = makeConstList(encodings_array, countof(encodings_array), NULL, 0);
-    extra_encodings = makeList(extra_encodings_array,
+    extra_encodings = makeConstList(extra_encodings_array,
 				    countof(extra_encodings_array),
 				    NULL, 0);
    doBitmaps = 0;
@ -187,7 +189,7 @@ main(int argc, char **argv)
            if(argn >= argc - 1) {
                missing_arg("-a");
            }
-            makeList(&argv[argn + 1], 1, encodings, 0);
+            makeConstList((const char **)&argv[argn + 1], 1, encodings, 0);
            argn += 2;
        } else if(strcmp(argv[argn], "-p") == 0) {
            if(argn >= argc - 1) {
@ -199,7 +201,7 @@ main(int argc, char **argv)
                usage();
            }
            free(encodingPrefix);
-            encodingPrefix = dsprintf("%s", argv[argn + 1]);
+            encodingPrefix = strdup(argv[argn + 1]);
            argn += 2;
        } else if(strcmp(argv[argn], "-e") == 0) {
            if(argn >= argc - 1) {
@ -320,7 +322,7 @@ getName(FT_Face face, int nid)
 {
    FT_SfntName name;
    char *string;
-    int i;
+    unsigned int i;
    if(getNameHelper(face, nid,
                     TT_PLATFORM_MICROSOFT, TT_MS_ID_UNICODE_CS, &name) ||
@ -414,8 +416,8 @@ static const char*
 nameWidth(const char *name)
 {
    char buf[500];
-    int i;
+    unsigned int i;
-    int n = strlen(name);
+    size_t n = strlen(name);
    if(n >= 499) return NULL;
    for(i = 0; i < n; i++)
@ -699,7 +701,7 @@ makeXLFD(char *filename, FT_Face face, int isBitmap)
 static int
 readFontScale(HashTablePtr entries, char *dirname)
 {
-    int n = strlen(dirname);
+    size_t n = strlen(dirname);
    char *filename;
    FILE *in;
    int rc, count, i;
@ -743,7 +745,7 @@ readFontScale(HashTablePtr entries, char *dirname)
 static int
 filePrio(char *filename)
 {
-    int n = strlen(filename);
+    size_t n = strlen(filename);
    if(n < 4)
        return 0;
    if(strcmp(filename + n - 4, ".otf") == 0)
@ -778,26 +780,27 @@ doDirectory(const char *dirname_given, int numEncodings, ListPtr encodingsToDo)
 {
    char *dirname, *fontscale_name, *filename, *encdir;
    FILE *fontscale, *encfile;
-    DIR *dirp;
+    struct dirent** namelist;
    struct dirent *entry;
    FT_Error ftrc;
    FT_Face face;
-    ListPtr encoding, xlfd, lp;
+    ConstListPtr encoding;
    ListPtr xlfd, lp;
    HashTablePtr entries;
    HashBucketPtr *array;
-    int i, n, found, rc;
+    int i, n, dirn, diri, found, rc;
-    int isBitmap=0,xl=0;
+    int isBitmap=0;
    size_t d, xl=0;
    if (exclusionSuffix)
        xl = strlen (exclusionSuffix);
-    i = strlen(dirname_given);
+    d = strlen(dirname_given);
-    if(i == 0)
+    if(d == 0)
        dirname = dsprintf("./");
-    else if(dirname_given[i - 1] != '/')
+    else if(dirname_given[d - 1] != '/')
        dirname = dsprintf("%s/", dirname_given);
    else
-        dirname = dsprintf("%s", dirname_given);
+        dirname = strdup(dirname_given);
    if(dirname == NULL) {
        perror("dirname");
@ -816,7 +819,7 @@ doDirectory(const char *dirname_given, int numEncodings, ListPtr encodingsToDo)
        fontscale_name = NULL;
    else {
        if(outfilename[0] == '/')
-            fontscale_name = dsprintf("%s", outfilename);
+            fontscale_name = strdup(outfilename);
        else
            fontscale_name = dsprintf("%s%s", dirname, outfilename);
        if(fontscale_name == NULL) {
@ -825,10 +828,10 @@ doDirectory(const char *dirname_given, int numEncodings, ListPtr encodingsToDo)
        }
    }
-    dirp = opendir(dirname);
+    dirn = scandir(dirname, &namelist, NULL, alphasort);
-    if(dirp == NULL) {
+    if(dirn < 0) {
        fprintf(stderr, "%s: ", dirname);
-        perror("opendir");
+        perror("scandir");
        return 0;
    }
@ -843,7 +846,8 @@ doDirectory(const char *dirname_given, int numEncodings, ListPtr encodingsToDo)
        return 0;
    }
-    while((entry = readdir(dirp)) != NULL) {
+    for(diri = dirn - 1; diri >= 0; diri--) {
        struct dirent *entry = namelist[diri];
        int have_face = 0;
        char *xlfd_name = NULL;
 	struct stat f_stat;
@ -852,7 +856,7 @@ doDirectory(const char *dirname_given, int numEncodings, ListPtr encodingsToDo)
        xlfd = NULL;
 	if (xl) {
-	    int dl = strlen (entry->d_name);
+	    size_t dl = strlen (entry->d_name);
 	    if (strcmp (entry->d_name + dl - xl, exclusionSuffix) == 0)
 		continue;
 	}
@ -924,14 +928,14 @@ doDirectory(const char *dirname_given, int numEncodings, ListPtr encodingsToDo)
        if(xlfd_name) {
            /* We know it's a bitmap font, and we know its XLFD */
-            int n = strlen(xlfd_name);
+            size_t l = strlen(xlfd_name);
            if(reencodeLegacy &&
-               n >= 12 && strcasecmp(xlfd_name + n - 11, "-iso10646-1") == 0) {
+               l >= 12 && strcasecmp(xlfd_name + l - 11, "-iso10646-1") == 0) {
                char *s;
-                s = malloc(n - 10);
+                s = malloc(l - 10);
-                memcpy(s, xlfd_name, n - 11);
+                memcpy(s, xlfd_name, l - 11);
-                s[n - 11] = '\0';
+                s[l - 11] = '\0';
                xlfd = listCons(s, xlfd);
            } else {
                /* Not a reencodable font -- skip all the rest of the loop body */
@ -991,7 +995,9 @@ doDirectory(const char *dirname_given, int numEncodings, ListPtr encodingsToDo)
 #undef PRIO
    }
-    closedir(dirp);
+    while(dirn--)
        free(namelist[dirn]);
    free(namelist);
    n = hashElements(entries);
    fprintf(fontscale, "%d\n", n);
    array = hashArray(entries, 1);
@ -1036,7 +1042,7 @@ doDirectory(const char *dirname_given, int numEncodings, ListPtr encodingsToDo)
                         (c) == 0xAD || (c) == 0xF71B)
 static int
-checkEncoding(FT_Face face, char *encoding_name)
+checkEncoding(FT_Face face, const char *encoding_name)
 {
    FontEncPtr encoding;
    FontMapPtr mapping;
@ -1208,21 +1214,21 @@ find_cmap(int type, int pid, int eid, FT_Face face)
 }
 static int
-checkExtraEncoding(FT_Face face, char *encoding_name, int found)
+checkExtraEncoding(FT_Face face, const char *encoding_name, int found)
 {
    int c;
    if(strcasecmp(encoding_name, "iso10646-1") == 0) {
        if(doISO10646_1_encoding && find_cmap(FONT_ENCODING_UNICODE, -1, -1, face)) {
-            int found = 0;
+            int cfound = 0;
             /* Export as Unicode if there are at least 15 BMP
               characters that are not a space or ignored. */
            for(c = 0x21; c < 0x10000; c++) {
                if(CODE_IGNORED(c))
                    continue;
                if(FT_Get_Char_Index(face, c) > 0)
-                    found++;
+                    cfound++;
-                if(found >= 15)
+                if(cfound >= 15)
                    return 1;
            }
            return 0;
@ -1252,7 +1258,7 @@ checkExtraEncoding(FT_Face face, char *encoding_name, int found)
 static const char*
 notice_foundry(const char *notice)
 {
-    int i;
+    unsigned int i;
    for(i = 0; i < countof(notice_foundries); i++)
        if(notice && strstr(notice, notice_foundries[i][0]))
            return notice_foundries[i][1];
@ -1263,7 +1269,7 @@ static int
 vendor_match(const signed char *vendor, const char *vendor_string)
 {
    /* vendor is not necessarily NUL-terminated. */
-    int i, len;
+    size_t i, len;
    len = strlen(vendor_string);
    if(memcmp(vendor, vendor_string, len) != 0)
        return 0;
@ -1276,7 +1282,7 @@ vendor_match(const signed char *vendor, const char *vendor_string)
 static const char*
 vendor_foundry(const signed char *vendor)
 {
-    int i;
+    unsigned int i;
    for(i = 0; i < countof(vendor_foundries); i++)
        if(vendor_match(vendor, vendor_foundries[i][0]))
            return vendor_foundries[i][1];
		`@ -1,3 +0,0 @@`
			`# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:27:26 matthieu Exp $`

			`.include <bsd.xorg.mk>`