Update to xfree86-type1-1.0.1.

7 files changed, 181 insertions, 35 deletions

diff --git a/font/xfree86-type1/COPYING b/font/xfree86-type1/COPYING
index faa695a47..7c0707d2f 100644
--- a/font/xfree86-type1/COPYING
+++ b/font/xfree86-type1/COPYING
@@ -1 +1,24 @@
-Copyright (c) 2000 XFree86, Inc.
+Copyright (C) 2000 The XFree86 Project, Inc.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is fur-
+nished 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, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project 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 XFree86
+Project.
+
diff --git a/font/xfree86-type1/ChangeLog b/font/xfree86-type1/ChangeLog
index b553c1a3e..84e0c983c 100644
--- a/font/xfree86-type1/ChangeLog
+++ b/font/xfree86-type1/ChangeLog
@@ -1,21 +1,122 @@
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 242c71c56d9c44ea00835ffc50d5ad22c7d40702
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu Mar 6 17:18:40 2008 -0800
 
-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
+    Version bump: 1.0.1
 
-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit bff00386a4f612211acf7592bac4eba5e3cc894e
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Feb 4 10:36:33 2008 -0800
 
-	* configure.ac:
-	Add m4 magic to allow AS_HELP_STRING to work with older versions
-	of autoconf 2.57.
+    Copy in XFree86 License 1.0 to COPYING file
 
-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 060919d3ef2a559aba0ff254d716ef02df720fc3
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Thu Dec 6 16:38:12 2007 -0500
 
-	* configure.ac:
-	Update package version number for X11R7 RC3 release.
+    Replace static ChangeLog with dist-hook to generate from git log
 
-2005-11-15  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit d45492c9e3cfa05dcf0013d55e5552e36f94a4d8
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Mon Sep 3 05:53:26 2007 -0400
 
-	* Makefile.am:
-	* configure.ac:
-	Add configure option to change the installed font dir.
+    Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 1ccfc3910544a221f26ad059d4fb93e894af033b
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Thu Aug 23 19:26:54 2007 -0400
+
+    Rename .cvsignore to .gitignore
+
+commit 2760cdf6588cb31512156c160b5bc6baaa8dd451
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 15 00:24:26 2005 +0000
+
+    Update package version number for final X11R7 release candidate.
+
+commit 5879f5b83b88ad7ec9226dcba93a0e4be122d66c
+Author: Kevin E Martin <kem@kem.org>
+Date:   Sat Dec 3 17:08:54 2005 +0000
+
+    Add m4 magic to allow AS_HELP_STRING to work with older versions of
+        autoconf 2.57.
+
+commit f20ba7224ac760e470290bb01fc210841a4c8d00
+Author: Kevin E Martin <kem@kem.org>
+Date:   Sat Dec 3 05:49:41 2005 +0000
+
+    Update package version number for X11R7 RC3 release.
+
+commit f0a168289dc72f3e104ed2d15e8845714d3c6aca
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Tue Nov 22 02:00:22 2005 +0000
+
+    Add .cvsignores for fonts.
+
+commit 5862795a77587055486b4d247bd609ae82747a37
+Author: Kevin E Martin <kem@kem.org>
+Date:   Tue Nov 15 08:29:20 2005 +0000
+
+    Add configure option to change the installed font dir.
+
+commit 7c5aebd7505781252ffba64accdd396a2e37096c
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Jul 29 21:22:49 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 af48fc0f4bc55701a1e9ffa31c8807b0f68484e9
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Jun 30 22:28:09 2005 +0000
+
+    Initial build system files for font module
+
+commit 97318d414db57d1efc9297767ff4f77263ac9ece
+Author: Egbert Eich <eich@suse.de>
+Date:   Fri Apr 23 18:43:05 2004 +0000
+
+    Merging XORG-CURRENT into trunk
+
+commit 134436cc44f4bc1287cccab4e6ac115cb76d1d6d
+Author: Egbert Eich <eich@suse.de>
+Date:   Sun Mar 14 08:31:31 2004 +0000
+
+    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 5efc1ec735de01f459c3ac0ed7654cd792901de0
+Author: Egbert Eich <eich@suse.de>
+Date:   Wed Mar 3 12:10:53 2004 +0000
+
+    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 18b5123176aedafa3bc97d4a0f4075f98c95b4aa
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 13:35:11 2004 +0000
+
+    readding XFree86's cvs IDs
+
+commit 1a6f962bf3b67a3ba0ca835147c30d9cb33ddf44
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 09:22:24 2004 +0000
+
+    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 6ef094436f181c6904338a4683238abf7d496106
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:42 2003 +0000
+
+    XFree86 4.3.0.1
+
+commit 33927d9a45faea054fc9b63990eb89a4b7e21298
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:42 2003 +0000
+
+    Initial revision
diff --git a/font/xfree86-type1/Makefile.am b/font/xfree86-type1/Makefile.am
index cfb27a4cc..c1e5f592f 100644
--- a/font/xfree86-type1/Makefile.am
+++ b/font/xfree86-type1/Makefile.am
@@ -36,3 +36,13 @@ install-data-hook:
 
 distuninstallcheck:
 	@:
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
diff --git a/font/xfree86-type1/Makefile.in b/font/xfree86-type1/Makefile.in
index 6b17e4bab..6de71e0e0 100644
--- a/font/xfree86-type1/Makefile.in
+++ b/font/xfree86-type1/Makefile.in
@@ -155,7 +155,8 @@ FONT_FILES = \
 
 fontdir = @FONTDIR@
 font_DATA = $(FONT_FILES)
-EXTRA_DIST = $(FONT_FILES) autogen.sh
+EXTRA_DIST = $(FONT_FILES) autogen.sh ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
 all: all-am
 
 .SUFFIXES:
@@ -246,6 +247,9 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -365,6 +369,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -417,10 +422,10 @@ ps-am:
 uninstall-am: uninstall-fontDATA uninstall-info-am
 
 .PHONY: all all-am am--refresh check check-am clean clean-generic dist \
-	dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
-	distcheck distclean distclean-generic distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
+	dist-all dist-bzip2 dist-gzip dist-hook dist-shar dist-tarZ \
+	dist-zip distcheck distclean distclean-generic distcleancheck \
+	distdir distuninstallcheck dvi dvi-am html html-am info \
+	info-am install install-am install-data install-data-am \
 	install-data-hook install-exec install-exec-am \
 	install-fontDATA install-info install-info-am install-man \
 	install-strip installcheck installcheck-am installdirs \
@@ -438,6 +443,13 @@ install-data-hook:
 
 distuninstallcheck:
 	@:
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/font/xfree86-type1/aclocal.m4 b/font/xfree86-type1/aclocal.m4
index df86b6b69..dfe9d70e6 100644
--- a/font/xfree86-type1/aclocal.m4
+++ b/font/xfree86-type1/aclocal.m4
@@ -595,14 +595,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
 	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
 		[`echo $PACKAGE_VERSION | cut -d . -f 1`],
 		[Major version of this package])
-	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
 	if test "x$PVM" = "x"; then
 		PVM="0"
 	fi
 	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
 		[$PVM],
 		[Minor version of this package])
-	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
 	if test "x$PVP" = "x"; then
 		PVP="0"
 	fi
diff --git a/font/xfree86-type1/configure b/font/xfree86-type1/configure
index c84082a6e..b4e7df5c3 100644
--- a/font/xfree86-type1/configure
+++ b/font/xfree86-type1/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for font-xfree86-type1 1.0.0.
+# Generated by GNU Autoconf 2.59 for font-xfree86-type1 1.0.1.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='font-xfree86-type1'
 PACKAGE_TARNAME='font-xfree86-type1'
-PACKAGE_VERSION='1.0.0'
-PACKAGE_STRING='font-xfree86-type1 1.0.0'
+PACKAGE_VERSION='1.0.1'
+PACKAGE_STRING='font-xfree86-type1 1.0.1'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT FONTDIR MKFONTSCALE MKFONTDIR FCCACHE LIBOBJS LTLIBOBJS'
@@ -722,7 +722,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 font-xfree86-type1 1.0.0 to adapt to many kinds of systems.
+\`configure' configures font-xfree86-type1 1.0.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -784,7 +784,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of font-xfree86-type1 1.0.0:";;
+     short | recursive ) echo "Configuration of font-xfree86-type1 1.0.1:";;
    esac
   cat <<\_ACEOF
 
@@ -897,7 +897,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-font-xfree86-type1 configure 1.0.0
+font-xfree86-type1 configure 1.0.1
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -911,7 +911,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by font-xfree86-type1 $as_me 1.0.0, which was
+It was created by font-xfree86-type1 $as_me 1.0.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1509,7 +1509,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='font-xfree86-type1'
- VERSION='1.0.0'
+ VERSION='1.0.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1895,7 +1895,7 @@ cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
 _ACEOF
 
-	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
 	if test "x$PVM" = "x"; then
 		PVM="0"
 	fi
@@ -1904,7 +1904,7 @@ cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION_MINOR $PVM
 _ACEOF
 
-	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
 	if test "x$PVP" = "x"; then
 		PVP="0"
 	fi
@@ -2316,7 +2316,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by font-xfree86-type1 $as_me 1.0.0, which was
+This file was extended by font-xfree86-type1 $as_me 1.0.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2371,7 +2371,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-font-xfree86-type1 config.status 1.0.0
+font-xfree86-type1 config.status 1.0.1
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/font/xfree86-type1/configure.ac b/font/xfree86-type1/configure.ac
index 55095594c..925242137 100644
--- a/font/xfree86-type1/configure.ac
+++ b/font/xfree86-type1/configure.ac
@@ -22,7 +22,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT(font-xfree86-type1, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-xfree86-type1)
+AC_INIT(font-xfree86-type1, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-xfree86-type1)
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE