dist-git conversion

Fix typo that causes a failure to update the common directory. (releng
#2781)
2010-07-28 09:29:47 +00:00 · 2009-11-26 01:24:00 +00:00 · 2008-05-29 16:24:41 +00:00 · 2008-05-29 16:12:42 +00:00 · 2008-04-20 11:44:48 +00:00
20 changed files with 1740 additions and 789 deletions
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-# Makefile for source rpm: a2ps
-# $Id: Makefile,v 1.1 2004/09/09 02:51:00 cvsdist Exp $
-NAME := a2ps
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
--- a/a2ps-4.13-bison.patch
+++ b/a2ps-4.13-bison.patch
@ -1,29 +0,0 @@
--- a2ps-4.13/src/parsessh.y.bison	2004-01-06 10:27:42.352903527 +0000
-+++ a2ps-4.13/src/parsessh.y	2004-01-06 10:28:14.328105348 +0000
-@@ -242,7 +242,7 @@
- /*		Dealing with the inessential informations		*/
- /************************************************************************/
- requirement :
-	  tREQUIRES tA2PS tSTRING { $$ = $3 ; } ;
-+	  tREQUIRES tA2PS tSTRING { $$ = $3 ; }
- 	| tREQUIRES tA2PS tVERSION tSTRING { $$ = $4 ; } ;
- 
- documentation :
-@@ -267,7 +267,7 @@
- authors : tWRITTEN tBY tSTRING	{ $$ = $3 ; };
- 
- version :
-	  tVERSION tIS tSTRING 	{ $$ = $3 ; };
-+	  tVERSION tIS tSTRING 	{ $$ = $3 ; }
- 	| tVERSION tSTRING 	{ $$ = $2 ; };
- 
- /************************************************************************/
-@@ -717,7 +717,7 @@
- 	  /* Only one */
- 	  $$ = words_new ("Closing: Strings", "Closing: Regexps", 2, 2);
- 	  words_add_regex ($$, $1);
-	};
-+	}
- 	| tCLOSERS operators_def tCLOSERS
- 	{
- 	  /* Several, comma separated, between () */
--- a/a2ps-4.13-conf.patch
+++ b/a2ps-4.13-conf.patch
@ -1,7 +1,8 @@
--- a2ps-4.13/configure.config	Wed Feb  9 09:32:31 2000
-+++ a2ps-4.13/configure	Thu Apr 27 19:56:05 2000
-@@ -8433,9 +8433,13 @@
- echo "configure:8434: checking for PostScript fonts path" 1>&5
+diff -up a2ps-4.14/configure.conf a2ps-4.14/configure
+--- a2ps-4.14/configure.conf	2008-04-27 01:01:04.000000000 +0200
+++ a2ps-4.14/configure	2008-04-27 01:04:12.000000000 +0200
+@@ -30758,9 +30758,13 @@ fi
+ echo $ECHO_N "checking for PostScript fonts path... $ECHO_C" >&6; }
 # Try to find some PostScript fonts.
 # Find out if ghostscript is installed
 +# for ac_dir in /usr/local/ghostscript/fonts \
@ -11,14 +12,15 @@
 -  /usr/local/share/ghostscript/fonts;
 +for ac_dir in /usr/share/fonts/default/Type1 \
 +    /usr/share/fonts/default/ghostscript \
-+    /usr/share/fonts/afms/adobe \
-+    /usr/share/X11/fonts/Type1 ;
+    /usr/share/X11/fonts/Type1 \
+    /usr/share/fonts/culmus ;
 do
   if test "cd $ac_dir 2>/dev/null && echo *.afm"; then
     ac_psfont_path="$ac_psfont_path:$ac_dir";
--- a2ps-4.13/configure.in.conf	2000-02-24 17:53:03.000000000 +0000
-+++ a2ps-4.13/configure.in	2004-12-09 16:25:14.984961138 +0000
-@@ -197,8 +197,10 @@
+diff -up a2ps-4.14/configure.in.conf a2ps-4.14/configure.in
+--- a2ps-4.14/configure.in.conf	2008-04-27 01:00:54.000000000 +0200
+++ a2ps-4.14/configure.in	2008-04-27 01:03:52.000000000 +0200
+@@ -207,8 +207,10 @@ AC_MSG_CHECKING(for PostScript fonts pat
 # Try to find some PostScript fonts.
 # Find out if ghostscript is installed
 ac_psfont_path=
@ -26,8 +28,8 @@
 -  /usr/local/share/ghostscript/fonts;
 +for ac_dir in /usr/share/fonts/default/Type1 \
 +    /usr/share/fonts/default/ghostscript \
-+    /usr/share/fonts/afms/adobe \
-+    /usr/share/X11/fonts/Type1 ;
+    /usr/share/X11/fonts/Type1 \
+    /usr/share/fonts/culmus ;
 do
   if test "cd $ac_dir 2>/dev/null && echo *.afm"; then
     ac_psfont_path="$ac_psfont_path:$ac_dir";
--- a/a2ps-4.13-etc.patch
+++ b/a2ps-4.13-etc.patch
@ -1,27 +1,17 @@
--- a2ps-4.13/etc/Makefile.in.etc	Wed Feb  9 09:32:55 2000
-+++ a2ps-4.13/etc/Makefile.in	Thu Apr 27 22:45:03 2000
-@@ -132,7 +132,7 @@
+diff -up a2ps-4.14/etc/a2ps_cfg.in.etc a2ps-4.14/etc/a2ps_cfg.in
+--- a2ps-4.14/etc/a2ps_cfg.in.etc	2007-12-29 02:38:58.000000000 +0100
+++ a2ps-4.14/etc/a2ps_cfg.in	2008-04-27 01:27:55.000000000 +0200
+@@ -73,6 +73,7 @@ LibraryPath: @libpath@
+ # It may be useful to extend it so that a2ps can see some
+ # TeX or X11 resources: it likes AFM files and PF[AB] files.
+ #AppendLibraryPath: foo
+AppendLibraryPath: @apppath@
 
 
- ogonkifydir = $(datadir)/ogonkify
-libpath = $(pkgdatadir)/sheets:$(pkgdatadir)/ps:$(pkgdatadir)/encoding:$(pkgdatadir)/afm:$(ogonkifydir)/afm:$(pkgdatadir)/ppd:$(pkgdatadir)/fonts:$(ogonkifydir)/fonts:$(pkgdatadir)
-+libpath = $(sysconfdir)/$(PACKAGE):$(pkgdatadir)/sheets:$(pkgdatadir)/ps:$(pkgdatadir)/encoding:$(pkgdatadir)/afm:$(ogonkifydir)/afm:$(pkgdatadir)/ppd:$(pkgdatadir)/fonts:$(ogonkifydir)/fonts:$(pkgdatadir)
- 
- pkgdata_DATA = README
- 
-@@ -297,7 +297,9 @@
- 
- # Building the correct a2ps.cfg
- a2ps.cfg: a2ps_cfg Makefile
-	sed "s!@libpath@!$(libpath)!" a2ps_cfg > a2ps.cfg
-+	sed -e "s!@libpath@!$(libpath)!" \
-+	    -e "s!@apppath@!$(PSFONT_PATH)!" \
-+	    a2ps_cfg > a2ps.cfg
- 
- # Building a time stamp to know the version.
- README: README.in Makefile
--- a2ps-4.13/etc/Makefile.am.etc	1999-11-30 09:20:09.000000000 +0100
-+++ a2ps-4.13/etc/Makefile.am	2007-03-09 11:05:43.000000000 +0100
+ #################################################################
+diff -up a2ps-4.14/etc/Makefile.am.etc a2ps-4.14/etc/Makefile.am
+--- a2ps-4.14/etc/Makefile.am.etc	2002-07-19 14:07:27.000000000 +0200
+++ a2ps-4.14/etc/Makefile.am	2008-04-27 01:27:55.000000000 +0200
@@ -2,7 +2,7 @@
 ## Makefile for a2ps' etc library directory.
 
@ -31,7 +21,7 @@
 
 pkgdata_DATA = README
 
-@@ -40,7 +40,9 @@
+@@ -40,7 +40,9 @@ DISTCLEANFILES = a2ps.cfg README
 
 # Building the correct a2ps.cfg
 a2ps.cfg: a2ps_cfg Makefile
@ -42,13 +32,28 @@
 
 # Building a time stamp to know the version.
 README: README.in Makefile
--- a2ps-4.13/etc/a2ps_cfg.in.etc	Tue Feb  8 03:24:03 2000
-+++ a2ps-4.13/etc/a2ps_cfg.in	Thu Apr 27 20:49:04 2000
-@@ -73,6 +73,7 @@
- # It may be useful to extend it so that a2ps can see some
- # TeX or X11 resources: it likes AFM files and PF[AB] files.
- #AppendLibraryPath: foo
-+AppendLibraryPath: @apppath@
+diff -up a2ps-4.14/etc/Makefile.in.etc a2ps-4.14/etc/Makefile.in
+--- a2ps-4.14/etc/Makefile.in.etc	2007-12-29 04:28:07.000000000 +0100
+++ a2ps-4.14/etc/Makefile.in	2008-04-27 01:30:55.000000000 +0200
+@@ -262,7 +262,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ tex = @tex@
+ ogonkifydir = $(datadir)/ogonkify
+-libpath = $(pkgdatadir)/sheets:$(pkgdatadir)/ps:$(pkgdatadir)/encoding:$(pkgdatadir)/afm:$(ogonkifydir)/afm:$(pkgdatadir)/ppd:$(pkgdatadir)/fonts:$(ogonkifydir)/fonts:$(pkgdatadir)
+libpath = $(sysconfdir)/$(PACKAGE):$(pkgdatadir)/sheets:$(pkgdatadir)/ps:$(pkgdatadir)/encoding:$(pkgdatadir)/afm:$(ogonkifydir)/afm:$(pkgdatadir)/ppd:$(pkgdatadir)/fonts:$(ogonkifydir)/fonts:$(pkgdatadir)
+ pkgdata_DATA = README
+ dsysconf = $(DESTDIR)$(sysconfdir)
+ EXTRA_DIST = README.in
+@@ -482,7 +482,9 @@ uninstall-local:
 
+ # Building the correct a2ps.cfg
+ a2ps.cfg: a2ps_cfg Makefile
+-	sed "s!@libpath@!$(libpath)!" a2ps_cfg > a2ps.cfg
+	sed -e "s!@libpath@!$(libpath)!" \
+	    -e "s!@apppath@!$(PSFONT_PATH)!" \
+	    a2ps_cfg > a2ps.cfg
 
- #################################################################
+ # Building a time stamp to know the version.
+ README: README.in Makefile
+diff -up a2ps-4.14/Makefile.am.etc a2ps-4.14/Makefile.am
+diff -up a2ps-4.14/Makefile.in.etc a2ps-4.14/Makefile.in
--- a/a2ps-4.13-eucjp.patch
+++ b/a2ps-4.13-eucjp.patch
--- a/a2ps-4.13-euckr.patch
+++ b/a2ps-4.13-euckr.patch
@ -1,27 +1,22 @@
--- a2ps-4.13/encoding/Makefile.am.orig	2003-01-09 17:45:41.000000000 +0900
-+++ a2ps-4.13/encoding/Makefile.am	2003-01-09 17:45:50.000000000 +0900
-@@ -16,7 +16,7 @@
- minor_encodings = \
- ms-cp1250.edf hp.edf mac.edf ibm-cp437.edf ibm-cp850.edf iso2.edf	\
- iso3.edf iso4.edf iso5.edf iso7.edf iso9.edf iso10.edf iso13.edf	\
-iso15.edf koi8.edf euc-jp.edf
-+iso15.edf koi8.edf euc-jp.edf euc-kr.edf
+diff -up a2ps-4.14/encoding/encoding.map.euckr a2ps-4.14/encoding/encoding.map
+--- a2ps-4.14/encoding/encoding.map.euckr	2008-04-27 01:46:59.000000000 +0200
+++ a2ps-4.14/encoding/encoding.map	2008-04-27 01:46:59.000000000 +0200
+@@ -100,6 +100,12 @@ japanese		euc-jp
+ ja			euc-jp
+ jp			euc-jp
 
- if EXTENSIONS
- encodings_DATA = encoding.map $(major_encodings) $(minor_encodings)
--- a2ps-4.13/encoding/Makefile.in.orig	2003-01-09 17:46:09.000000000 +0900
-+++ a2ps-4.13/encoding/Makefile.in	2003-01-09 17:46:14.000000000 +0900
-@@ -141,7 +141,7 @@
- minor_encodings = \
- ms-cp1250.edf hp.edf mac.edf ibm-cp437.edf ibm-cp850.edf iso2.edf	\
- iso3.edf iso4.edf iso5.edf iso7.edf iso9.edf iso10.edf iso13.edf	\
-iso15.edf koi8.edf euc-jp.edf
-+iso15.edf koi8.edf euc-jp.edf euc-kr.edf
- 
- @EXTENSIONS_TRUE@encodings_DATA = @EXTENSIONS_TRUE@encoding.map $(major_encodings) $(minor_encodings)
- @EXTENSIONS_FALSE@encodings_DATA = @EXTENSIONS_FALSE@encoding.map $(major_encodings)
--- a2ps-4.13/encoding/euc-kr.edf.orig	2003-01-09 17:46:22.000000000 +0900
-+++ a2ps-4.13/encoding/euc-kr.edf	2003-01-09 17:47:34.000000000 +0900
+euc-kr			euc-kr
+euc-kr			euc-kr
+korean			euc-kr
+ko			euc-kr
+kr			euc-kr
+
+ ########################################################################
+ # Some architectures specific char sets
+ ########################################################################
+diff -up /dev/null a2ps-4.14/encoding/euc-kr.edf
+--- /dev/null	2008-04-26 20:48:40.298012400 +0200
+++ a2ps-4.14/encoding/euc-kr.edf	2008-04-27 01:46:59.000000000 +0200
@@ -0,0 +1,104 @@
 +# Description of the EUC-KR encoding
 +# Copyright (c) 1988, 89, 90, 91, 92, 93 Miguel Santana
@ -127,18 +122,27 @@
 +egrave eacute ecircumflex edieresis igrave iacute icircumflex idieresis
 +eth ntilde ograve oacute ocircumflex otilde odieresis divide
 +oslash ugrave uacute ucircumflex udieresis yacute thorn ydieresis
--- a2ps-4.13/encoding/encoding.map.orig	2003-01-09 17:46:50.000000000 +0900
-+++ a2ps-4.13/encoding/encoding.map	2003-01-09 17:46:57.000000000 +0900
-@@ -100,6 +100,12 @@
- ja			euc-jp
- jp			euc-jp
+diff -up a2ps-4.14/encoding/Makefile.am.euckr a2ps-4.14/encoding/Makefile.am
+--- a2ps-4.14/encoding/Makefile.am.euckr	2008-04-27 01:46:59.000000000 +0200
+++ a2ps-4.14/encoding/Makefile.am	2008-04-27 01:47:58.000000000 +0200
+@@ -16,7 +16,7 @@ major_encodings = ascii.edf iso1.edf
+ minor_encodings = \
+ ms-cp1250.edf hp.edf mac.edf ibm-cp437.edf ibm-cp850.edf iso2.edf	\
+ iso3.edf iso4.edf iso5.edf iso7.edf iso9.edf iso10.edf iso13.edf	\
+-iso15.edf koi8.edf ms-cp1251.edf euc-jp.edf
+iso15.edf koi8.edf ms-cp1251.edf euc-jp.edf euc-kr.edf
 
-+euc-kr			euc-kr
-+euc-kr			euc-kr
-+korean			euc-kr
-+ko			euc-kr
-+kr			euc-kr
-+
- ########################################################################
- # Some architectures specific char sets
- ########################################################################
+ if EXTENSIONS
+ encodings_DATA = encoding.map $(major_encodings) $(minor_encodings)
+diff -up a2ps-4.14/encoding/Makefile.in.euckr a2ps-4.14/encoding/Makefile.in
+--- a2ps-4.14/encoding/Makefile.in.euckr	2008-04-27 01:46:59.000000000 +0200
+++ a2ps-4.14/encoding/Makefile.in	2008-04-27 01:48:09.000000000 +0200
+@@ -270,7 +270,7 @@ major_encodings = ascii.edf iso1.edf
+ minor_encodings = \
+ ms-cp1250.edf hp.edf mac.edf ibm-cp437.edf ibm-cp850.edf iso2.edf	\
+ iso3.edf iso4.edf iso5.edf iso7.edf iso9.edf iso10.edf iso13.edf	\
+-iso15.edf koi8.edf ms-cp1251.edf euc-jp.edf
+iso15.edf koi8.edf ms-cp1251.edf euc-jp.edf euc-kr.edf
+ 
+ @EXTENSIONS_FALSE@encodings_DATA = encoding.map $(major_encodings)
+ @EXTENSIONS_TRUE@encodings_DATA = encoding.map $(major_encodings) $(minor_encodings)
--- a/a2ps-4.13-flex.patch
+++ b/a2ps-4.13-flex.patch
@ -1,73 +0,0 @@
--- a2ps-4.13/lib/Makefile.in.flex	Wed Feb  9 09:33:01 2000
-+++ a2ps-4.13/lib/Makefile.in	Thu Apr 27 19:00:20 2000
-@@ -100,7 +100,7 @@
- INTLDEPS = @INTLDEPS@
- INTLLIBS = @INTLLIBS@
- INTLOBJS = @INTLOBJS@
-LEX = @LEX@
-+LEX = @LEX@ -CFe
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBOBJS = @LIBOBJS@
- LIBTOOL = @LIBTOOL@
--- a2ps-4.13/lib/fonts.l.flex	Wed Dec 15 18:27:01 1999
-+++ a2ps-4.13/lib/fonts.l	Thu Apr 27 19:00:20 2000
-@@ -178,7 +178,7 @@
- 
- %}
- 
-%option yylineno
-+/* %option yylineno */
- %option prefix="afm"
- %option outfile="lex.yy.c"
- 
-@@ -524,7 +524,7 @@
-   const char * filename;
-   FILE * stream;
- 
-  yylineno = 0;
-+  /* yylineno = 0; */
- 
-   /* Find its AFM file: first resolve its font file name */
-   filename = fonts_map_resolve_alias (job->fonts_map, font->key);
--- a2ps-4.13/src/Makefile.in.flex	Wed Feb  9 09:34:18 2000
-+++ a2ps-4.13/src/Makefile.in	Thu Apr 27 19:00:20 2000
-@@ -100,7 +100,7 @@
- INTLDEPS = @INTLDEPS@
- INTLLIBS = @INTLLIBS@
- INTLOBJS = @INTLOBJS@
-LEX = @LEX@
-+LEX = @LEX@ -CFe
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBOBJS = @LIBOBJS@
- LIBTOOL = @LIBTOOL@
-@@ -154,7 +154,7 @@
- BUILT_SOURCES = parsessh.h
- 
- YFLAGS = -dtv
-LEX = @LEX@
-+LEX = @LEX@ -CFe
- # I don't really understand why I have to put srcdir here, but
- # it is needed for yacc and lex files (seems related to #line, but
- # I really don't understand why)...
--- a2ps-4.13/src/lexps.l.flex	Mon Feb  7 17:05:43 2000
-+++ a2ps-4.13/src/lexps.l	Thu Apr 27 19:00:20 2000
-@@ -35,7 +35,7 @@
- void pslex_initialize PARAMS ((void));
- %}
- 
-%option yylineno
-+/* %option yylineno */
- %option prefix="ps"
- %option outfile="lex.yy.c"
- 
--- a2ps-4.13/Makefile.in.flex	Wed Feb  9 09:32:25 2000
-+++ a2ps-4.13/Makefile.in	Thu Apr 27 19:00:20 2000
-@@ -100,7 +100,7 @@
- INTLDEPS = @INTLDEPS@
- INTLLIBS = @INTLLIBS@
- INTLOBJS = @INTLOBJS@
-LEX = @LEX@
-+LEX = @LEX@ -CFe
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBOBJS = @LIBOBJS@
- LIBTOOL = @LIBTOOL@
--- a/a2ps-4.13-hebrew.patch
+++ b/a2ps-4.13-hebrew.patch
@ -1,18 +1,19 @@
--- a2ps-4.13/configure.hebrew	2004-01-09 15:29:44.000000000 +0200
-+++ a2ps-4.13/configure	2004-01-09 15:44:14.000000000 +0200
-@@ -8454,7 +8454,9 @@
- for ac_dir in /usr/share/fonts/default/Type1 \
-     /usr/share/fonts/default/ghostscript \
-     /usr/share/fonts/afms/adobe \
-    /usr/share/X11/fonts/Type1 ;
-+    /usr/share/X11/fonts/Type1 \
-+    /usr/share/fonts/hebrew \
-+    /usr/share/fonts/he/Type1 ;
- do
-   if test "cd $ac_dir 2>/dev/null && echo *.afm"; then
-     ac_psfont_path="$ac_psfont_path:$ac_dir";
--- a2ps-4.13/encoding/iso8.edf.hebrew	2004-01-09 15:44:03.000000000 +0200
-+++ a2ps-4.13/encoding/iso8.edf	2004-01-09 15:44:03.000000000 +0200
+diff -up a2ps-4.14/encoding/encoding.map.hebrew a2ps-4.14/encoding/encoding.map
+--- a2ps-4.14/encoding/encoding.map.hebrew	2008-04-27 01:50:14.000000000 +0200
+++ a2ps-4.14/encoding/encoding.map	2008-04-27 01:50:14.000000000 +0200
+@@ -65,6 +65,9 @@ iso-8859-5		iso5
+ iso7			iso7
+ iso-8859-7		iso7
+ 
+iso8			iso8
+iso-8859-8		iso8
+
+ # The following lines _are_not_an_error_.
+ # This is the right correspondance between ISO-8859 names
+ # and the Latin n nick name.
+diff -up /dev/null a2ps-4.14/encoding/iso8.edf
+--- /dev/null	2008-04-26 20:48:40.298012400 +0200
+++ a2ps-4.14/encoding/iso8.edf	2008-04-27 01:50:14.000000000 +0200
@@ -0,0 +1,77 @@
 +# Description of the ISO-8859-8 encoding
 +# Copyright (c) 1988, 89, 90, 91, 92, 93 Miguel Santana
@ -91,41 +92,27 @@
 +afii57672 afii57673 afii57674 afii57675 afii57676 afii57677 afii57678 afii57679 
 +afii57680 afii57681 afii57682 afii57683 afii57684 afii57685 afii57686 afii57687 
 +afii57688 afii57689 afii57690 .notdef .notdef .notdef .notdef .notdef 
--- a2ps-4.13/encoding/encoding.map.hebrew
-+++ a2ps-4.13/encoding/encoding.map
-@@ -65,6 +65,9 @@
- iso7			iso7
- iso-8859-7		iso7
- 
-+iso8			iso8
-+iso-8859-8		iso8
-+
- # The following lines _are_not_an_error_.
- # This is the right correspondance between ISO-8859 names
- # and the Latin n nick name.
--- a2ps-4.13/encoding/Makefile.in.hebrew
-+++ a2ps-4.13/encoding/Makefile.in
-@@ -140,8 +140,8 @@
+diff -up a2ps-4.14/encoding/Makefile.am.hebrew a2ps-4.14/encoding/Makefile.am
+--- a2ps-4.14/encoding/Makefile.am.hebrew	2008-04-27 01:51:14.000000000 +0200
+++ a2ps-4.14/encoding/Makefile.am	2008-04-27 01:52:11.000000000 +0200
+@@ -15,7 +15,7 @@ encodingsdir = $(pkgdatadir)/encoding
 major_encodings = ascii.edf iso1.edf
 minor_encodings = \
 ms-cp1250.edf hp.edf mac.edf ibm-cp437.edf ibm-cp850.edf iso2.edf	\
 -iso3.edf iso4.edf iso5.edf iso7.edf iso9.edf iso10.edf iso13.edf	\
-iso15.edf koi8.edf euc-jp.edf euc-kr.edf
-+iso3.edf iso4.edf iso5.edf iso7.edf iso8.edf iso9.edf iso10.edf	\
-+iso13.edf iso15.edf koi8.edf euc-jp.edf euc-kr.edf
+iso3.edf iso4.edf iso5.edf iso7.edf iso8.edf iso9.edf iso10.edf iso13.edf	\
+ iso15.edf koi8.edf ms-cp1251.edf euc-jp.edf euc-kr.edf
 
- @EXTENSIONS_TRUE@encodings_DATA = @EXTENSIONS_TRUE@encoding.map $(major_encodings) $(minor_encodings)
- @EXTENSIONS_FALSE@encodings_DATA = @EXTENSIONS_FALSE@encoding.map $(major_encodings)
--- a2ps-4.13/configure.in.hebrew	2007-01-22 18:19:04.000000000 +0000
-+++ a2ps-4.13/configure.in	2007-01-22 18:19:16.000000000 +0000
-@@ -200,7 +200,9 @@
- for ac_dir in /usr/share/fonts/default/Type1 \
-     /usr/share/fonts/default/ghostscript \
-     /usr/share/fonts/afms/adobe \
-    /usr/share/X11/fonts/Type1 ;
-+    /usr/share/X11/fonts/Type1 \
-+    /usr/share/fonts/hebrew \
-+    /usr/share/fonts/he/Type1 ;
- do
-   if test "cd $ac_dir 2>/dev/null && echo *.afm"; then
-     ac_psfont_path="$ac_psfont_path:$ac_dir";
+ if EXTENSIONS
+diff -up a2ps-4.14/encoding/Makefile.in.hebrew a2ps-4.14/encoding/Makefile.in
+--- a2ps-4.14/encoding/Makefile.in.hebrew	2008-04-27 01:50:14.000000000 +0200
+++ a2ps-4.14/encoding/Makefile.in	2008-04-27 01:52:01.000000000 +0200
+@@ -269,7 +269,7 @@ encodingsdir = $(pkgdatadir)/encoding
+ major_encodings = ascii.edf iso1.edf
+ minor_encodings = \
+ ms-cp1250.edf hp.edf mac.edf ibm-cp437.edf ibm-cp850.edf iso2.edf	\
+-iso3.edf iso4.edf iso5.edf iso7.edf iso9.edf iso10.edf iso13.edf	\
+iso3.edf iso4.edf iso5.edf iso7.edf iso8.edf iso9.edf iso10.edf iso13.edf	\
+ iso15.edf koi8.edf ms-cp1251.edf euc-jp.edf euc-kr.edf
+ 
+ @EXTENSIONS_FALSE@encodings_DATA = encoding.map $(major_encodings)
--- a/a2ps-4.13-malloc.patch
+++ b/a2ps-4.13-malloc.patch
@ -1,11 +0,0 @@
--- a2ps-4.13/lib/path-concat.c.malloc	2004-03-02 11:27:49.000000000 +0000
-+++ a2ps-4.13/lib/path-concat.c	2004-03-02 11:28:14.000000000 +0000
-@@ -31,7 +31,7 @@
- #endif
- #include <sys/types.h>
- 
-char *malloc ();
-+#include <stdlib.h>
- 
- #ifndef DIRECTORY_SEPARATOR
- # define DIRECTORY_SEPARATOR '/'
--- a/a2ps-4.13-varargs.patch
+++ b/a2ps-4.13-varargs.patch
@ -1,45 +0,0 @@
--- a2ps-4.13/lib/printlen.c.orig	Fri Jun  1 16:38:21 2001
-+++ a2ps-4.13/lib/printlen.c	Fri Jun  1 16:38:28 2001
-@@ -28,14 +28,15 @@
- unsigned long strtoul ();
- 
- static int
-int_printflen (const char *format, va_list *args)
-+int_printflen (const char *format, va_list args)
- {
-   const char *cp;
-   int total_width = 0;
-   int width = 0;
-   va_list ap;
- 
-  memcpy (&ap, args, sizeof (va_list));
-+  __va_copy(ap, args);
-+  /* memcpy (&ap, args, sizeof (va_list)); */
- 
-   for (cp = format ; *cp ; cp++)
-     {
-@@ -99,7 +100,7 @@
- int
- vprintflen (const char *format,  va_list args)
- {
-  return int_printflen (format, &args);
-+  return int_printflen (format, args);
- }
- 
- int
--- a2ps-4.13/lib/title.c.orig	Fri Jun  1 16:19:04 2001
-+++ a2ps-4.13/lib/title.c	Fri Jun  1 16:20:16 2001
-@@ -83,11 +83,13 @@
-   VA_START (args, format);
- 
-   len = vprintflen (format, args);
-+  va_end(args);
-   if (format [strlen (format) - 1] == '\n')
-     len --;
-   if (center_p)
-     for (padding = 0 ; padding < 79 - len ; padding += 2)
-       putc (' ', stream);
-+  VA_START (args, format);
- # if HAVE_VPRINTF || _LIBC
-   vfprintf (stream, format, args);
- # else
--- a/a2ps-4.14-texinfo-nodes.patch
+++ b/a2ps-4.14-texinfo-nodes.patch
@ -0,0 +1,128 @@
+diff -up a2ps-4.14/doc/regex.texi_old a2ps-4.14/doc/regex.texi
+--- a2ps-4.14/doc/regex.texi_old	2002-03-04 19:46:24.000000000 +0100
+++ a2ps-4.14/doc/regex.texi	2008-05-16 11:34:42.000000000 +0200
+@@ -121,7 +121,7 @@ Regular Expression Syntax
+ 
+ * Syntax Bits::
+ * Predefined Syntaxes::
+-* Collating Elements vs. Characters::
+* Collating Elements vs Characters::
+ * The Backslash Character::
+ 
+ Common Operators
+@@ -305,7 +305,7 @@ In the following sections, we describe t
+ @menu
+ * Syntax Bits::
+ * Predefined Syntaxes::
+-* Collating Elements vs. Characters::
+* Collating Elements vs Characters::
+ * The Backslash Character::
+ @end menu
+ 
+@@ -470,7 +470,7 @@ operator (based on how @code{RE_NO_BK_PA
+ @end table
+ 
+ 
+-@node Predefined Syntaxes, Collating Elements vs. Characters, Syntax Bits, Regular Expression Syntax
+@node Predefined Syntaxes, Collating Elements vs Characters, Syntax Bits, Regular Expression Syntax
+ @section Predefined Syntaxes
+ 
+ If you're programming with Regex, you can set a pattern buffer's
+@@ -552,8 +552,8 @@ The predefined syntaxes--taken directly 
+    | RE_NO_BK_VBAR          | RE_UNMATCHED_RIGHT_PAREN_ORD)
+ @end example
+ 
+-@node Collating Elements vs. Characters, The Backslash Character, Predefined Syntaxes, Regular Expression Syntax
+-@section Collating Elements vs.@: Characters
+@node Collating Elements vs Characters, The Backslash Character, Predefined Syntaxes, Regular Expression Syntax
+@section Collating Elements vs@: Characters
+ 
+ @sc{posix} generalizes the notion of a character to that of a
+ collating element.  It defines a @dfn{collating element} to be ``a
+@@ -577,7 +577,7 @@ collating element.  For example, the Spa
+ Since @sc{posix}'s ``collating element'' preserves the essential idea of
+ a ``character,'' we use the latter, more familiar, term in this document.
+ 
+-@node The Backslash Character,  , Collating Elements vs. Characters, Regular Expression Syntax
+@node The Backslash Character,  , Collating Elements vs Characters, Regular Expression Syntax
+ @section The Backslash Character
+ 
+ @cindex @samp{\}
+diff -up a2ps-4.14/doc/a2ps.texi_old a2ps-4.14/doc/a2ps.texi
+--- a2ps-4.14/doc/a2ps.texi_old	2008-05-16 11:34:21.000000000 +0200
+++ a2ps-4.14/doc/a2ps.texi	2008-05-16 11:42:11.000000000 +0200
+@@ -371,11 +371,11 @@ Contributions
+ 
+ Frequently asked questions
+ 
+-* Why Does ...?::               Questions on Error
+-* How Can I ...?::              a2ps' How-To
+-* Please tell me...::           Existential Questions on a2ps
+* Why Does?::                   Questions on Error
+* How Can I?::                  a2ps' How-To
+* Please tell me::              Existential Questions on a2ps
+ 
+-Why Does...?
+Why Does?
+ 
+ * It Prints Nothing::           The printer issues nothing
+ * It Prints in Simplex::        While I asked for Duplex
+@@ -385,7 +385,7 @@ Why Does...?
+ * It Says my File is Binary::   And refuses to print it
+ * It Refuses to Change the Font Size::
+ 
+-How Can I ...?
+How Can I?
+ 
+ * Leave Room for Binding::      Specifying Margins
+ * Print stdin::                 Using a2ps in a pipe chain
+@@ -395,7 +395,7 @@ How Can I ...?
+ * Non PostScript Printers::     Using GhostScript
+ * Man Pages with Underlines::   Now it Prints With Italics
+ 
+-Please tell me...
+Please tell me
+ 
+ * Is a2ps Y2K compliant?::      Printing dates in short format
+ * The Options Have Changed::    Respect The Users
+@@ -6198,13 +6198,13 @@ question about the options, etc.  It has
+ suggestions, not to contact the authors.
+ 
+ @menu
+-* Why Does ...?::               Questions on Error
+-* How Can I ...?::              a2ps' How-To
+-* Please tell me...::           Existential Questions on a2ps
+* Why Does?::                   Questions on Error
+* How Can I?::                  a2ps' How-To
+* Please tell me::              Existential Questions on a2ps
+ @end menu
+ 
+-@node Why Does ...?
+-@section Why Does...?
+@node Why Does?
+@section Why Does?
+ 
+ Error related questions.
+ 
+@@ -6426,8 +6426,8 @@ Note that the `pure' options (no side-ef
+ virtual pages are @samp{--columns} and @samp{--rows}.
+ 
+ @c -----------------------------How can I ? ------------------------------
+-@node How Can I ...?
+-@section How Can I ...?
+@node How Can I?
+@section How Can I?
+ 
+ A mini how-to on @pack{}.
+ 
+@@ -6561,8 +6561,8 @@ Use @samp{a2ps --pro=ul}.
+ 
+ 
+ @c -------------------------- Please Tell me ? ------------------------------
+-@node Please tell me...
+-@section Please tell me...
+@node Please tell me
+@section Please tell me
+ 
+ Wondering something?
+ 
--- a/a2ps-generate-tarball.sh
+++ b/a2ps-generate-tarball.sh
@ -1,20 +0,0 @@
-#!/bin/sh
-VERSION=$1
-
-TMPDIR=tarball-arena
-rm -rf "$TMPDIR" a2ps-$VERSION-GPL.tar.gz
-mkdir "$TMPDIR"
-tar zxf a2ps-$VERSION.tar.gz -C "$TMPDIR"
-cd "$TMPDIR"
-for f in \
-	tests/gps-ref/Converter.ps \
-	tests/gps-ref/fasttrig.ps \
-	tests/ps-ref/Converter.ps \
-	tests/ps-ref/fasttrig.ps \
-	tests/tstfiles/Converter.java \
-	tests/tstfiles/fasttrig.pas
-do
-  rm -f a2ps-*/"$f"
-done
-
-tar zcf ../a2ps-$VERSION-GPL.tar.gz a2ps-*
--- a/a2ps-includes.patch
+++ b/a2ps-includes.patch
@ -1,61 +0,0 @@
--- a2ps-4.13/src/sheets-map.l.includes	2000-02-04 21:07:47.000000000 +0000
-+++ a2ps-4.13/src/sheets-map.l	2004-09-07 16:06:27.575891868 +0100
-@@ -40,6 +40,7 @@
- 
- #define MAX_INCLUDE_DEPTH 10
- static YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH];
-+static int lineno_stack[MAX_INCLUDE_DEPTH];
- static char *filename_stack[MAX_INCLUDE_DEPTH];
- static int include_stack_ptr;
- static char *yyfilename;
-@@ -93,7 +94,7 @@
- white         [[:space:]]+
- key           [-a-zA-Z0-9_]+:
- comment       #.*
-include       include([^)]+)
-+include       include\([^)]+\)
- %%
- 
- {key}         token_val = xstrndup (yytext, yyleng - 1); return tKEY;
-@@ -102,7 +103,7 @@
- {white}       ;
- {comment}     ;
- {include}     {	/* Kill the closing paren and pass the file name. */
-                yytext[yyleng] = '\0';
-+                yytext[yyleng-1] = '\0';
-                 yy_include_push (yytext + strlen ("include("));
-               }
- 
-@@ -210,11 +211,13 @@
-     error (1, 0, _("too many includes"));
- 
-   include_stack[include_stack_ptr] = YY_CURRENT_BUFFER;
-  filename_stack[include_stack_ptr++] = file;
-+  lineno_stack[include_stack_ptr] = yylineno;
-+  filename_stack[include_stack_ptr++] = yyfilename;
- 
-   message (msg_file, (stderr, "%s:%d: includes %s\n",
- 		      yyfilename, yylineno, file));
- 
-+  yyfilename = file;
-   yyin = xrfopen (yyfilename);
- 
-   yy_switch_to_buffer (yy_create_buffer (yyin, YY_BUF_SIZE));
-@@ -227,8 +230,8 @@
- {
-   fclose (yyin);
-   yy_delete_buffer (YY_CURRENT_BUFFER);
-  free (yyfilename);
-   yyfilename = filename_stack[include_stack_ptr];
-+  yylineno = lineno_stack[include_stack_ptr];
-   yy_switch_to_buffer (include_stack[include_stack_ptr]);
-   message (msg_file, (stderr, "Back to file `%s'.\n", yyfilename));
- }
-@@ -254,6 +257,7 @@
- yy_close (void)
- {
-   fclose (yyin);
-+  free (yyfilename);
- }
- 
- int
--- a/a2ps-netscape.patch
+++ b/a2ps-netscape.patch
@ -1,31 +0,0 @@
--- a2ps-4.13/etc/a2ps_cfg.in.netscape	2005-02-02 16:22:36.000000000 +0000
-+++ a2ps-4.13/etc/a2ps_cfg.in	2005-02-02 16:40:06.431499603 +0000
-@@ -265,7 +265,8 @@
- @COM_PSUTILS@@COM_dvips@   fi
- 
- ########## HTML files
-# Pass HTML to Netscape, hoping that there is an Netscape running...
-+# Pass HTML to Mozilla, hoping that there is a Mozilla running...
-+# (Previously had used Netscape.  Following comments refer to Netscape:)
- # Tricks:
- # 1. Netscape can't output on stdout, hence use a tmp file (#f0)
- # 2. openfile refuses relative paths, so prepend cwd (%d) when relative
-@@ -274,14 +275,14 @@
- #    loaded page (not that of openfile).  So run Netscape twice.
- # 4. It asks the user if s/he wants to replace an existing output file,
- #    so rm before.
-@COM_PSUTILS@Delegation: Netscape html:ps    \
-+@COM_PSUTILS@Delegation: Mozilla html:ps    \
- @COM_PSUTILS@  rm -f #f0; \
- @COM_PSUTILS@  if echo '$f' | grep '^/' >/dev/null 2>&1; then \
-@COM_PSUTILS@    ${NETSCAPE:-netscape} -noraise -remote 'openfile($f)'; \
-+@COM_PSUTILS@    ${MOZILLA:-mozilla} -noraise -remote 'openfile($f)'; \
- @COM_PSUTILS@  else \
-@COM_PSUTILS@    ${NETSCAPE:-netscape} -noraise -remote 'openfile(%d/$f)'; \
-+@COM_PSUTILS@    ${MOZILLA:-mozilla} -noraise -remote 'openfile(%d/$f)'; \
- @COM_PSUTILS@  fi && \
-@COM_PSUTILS@  ${NETSCAPE:-netscape} -noraise -remote 'saveas(#f0,postscript)' && \
-+@COM_PSUTILS@  ${MOZILLA:-mozilla} -noraise -remote 'saveas(#f0,postscript)' && \
- @COM_PSUTILS@  #{del.psselect} #f0 | #{del.psnup}
- 
- ########## MetaFont / MetaPost files
--- a/a2ps-psset.patch
+++ b/a2ps-psset.patch
@ -1,11 +0,0 @@
--- a2ps-4.13/contrib/psset.in.psset	2006-10-06 13:12:03.000000000 +0100
-+++ a2ps-4.13/contrib/psset.in	2006-10-06 13:12:09.000000000 +0100
-@@ -241,7 +241,7 @@
- # spaces with a `\' too...
- pspagedevicelen=`echo "$pspagedevice" | wc -l`
- pspagedevice=`echo "$pspagedevice" | \
- sed -e "$pspagedevicelen!s/\$/\\\\\\/;s/^/\\\\\\/"`
-+ sed -e "$pspagedevicelen!s/\$/\\\\\\/;s/^ /\\\\\\ /"`
- 
- case $at in
-   0) # Insert last in the Setup, so that we win over other requests.
--- a/a2ps-shell.patch
+++ b/a2ps-shell.patch
@ -1,15 +0,0 @@
--- a2ps-4.13/src/select.c.shell	2004-07-29 16:43:08.178940204 +0100
-+++ a2ps-4.13/src/select.c	2004-07-29 16:43:09.328722698 +0100
-@@ -148,8 +148,10 @@
-   command = ALLOCA (char, (2
- 			   + strlen (job->file_command)
- 			   + ustrlen (filename)));
-  sprintf (command, "%s %s", job->file_command, (const char *) filename);
-  message (msg_tool, (stderr, "Reading pipe: `%s'\n", command));
-+  setenv ("filename", (const char *) filename, 1);
-+  sprintf (command, "%s \"${filename}\"", job->file_command);
-+  message (msg_tool, (stderr, "Reading pipe: `%s' [filename=%s]\n", command,
-+	   (const char *) filename));
-   file_out = popen (command, "r");
- 
-   /* Check for failure */
--- a/a2ps-tmpdir.patch
+++ b/a2ps-tmpdir.patch
@ -1,58 +0,0 @@
--- a2ps-4.13/contrib/psmandup.in.tmpdir	1999-10-24 14:06:42.000000000 +0100
-+++ a2ps-4.13/contrib/psmandup.in	2006-08-08 14:52:22.000000000 +0100
-@@ -36,7 +36,7 @@
- message=
- psselect=${PSSELECT:-psselect}
- psset=${PSSET:-psset}
-tmpdir=/tmp/$program.$$
-+tmpdir=$(mktemp -d /tmp/$program.XXXXXX)
- 
- # These two must be kept in synch.  They are opposed.
- verbose=echo
--- a2ps-4.13/contrib/fixps.in.tmpdir	2000-02-21 08:16:15.000000000 +0000
-+++ a2ps-4.13/contrib/fixps.in	2006-08-08 14:53:36.000000000 +0100
-@@ -38,7 +38,6 @@
- run_gs=0
- # What action to perform: fixps, cat, check, and gs
- task=fixps
-tmpdir=/tmp/$program.$$
- verbose=echo
- 
- # The version/usage strings
-@@ -183,6 +182,7 @@
-       exit 1;;
- esac
- 
-+tmpdir=$(mktemp -d /tmp/$program.XXXXXX)
- if test -n "$debug"; then
-   # Set -x now if debugging
-   set -x
-@@ -191,7 +191,6 @@
-   trap "/bin/rm -rf $tmpdir" 0 1 2 3 13 15
- fi
- 
-mkdir $tmpdir
- fixps_sed=$tmpdir/fixps.sed
- 
- # If printing from stdin, save into a tmp file
--- a2ps-4.13/contrib/pdiff.in.tmpdir	1999-10-24 16:07:51.000000000 +0100
-+++ a2ps-4.13/contrib/pdiff.in	2006-08-08 14:52:22.000000000 +0100
-@@ -34,7 +34,7 @@
- diff_options='-u'
- file=
- output=
-tmpdir=/tmp/$program.$$
-+tmpdir=$(mktemp -d /tmp/$program.XXXXXX)
- verbose=echo
- wdiff_prog=${WDIFF:-wdiff}
- wdiff_options='-w[wd- -x-wd] -y{wd+ -z+wd}'
--- a2ps-4.13/contrib/pdiff.in.tmpdir	1999-10-24 16:07:51.000000000 +0100
-+++ a2ps-4.13/contrib/pdiff.in	2007-02-28 13:30:36.000000000 +0000
-@@ -67,6 +67,7 @@
- 
- help="Try \`$program --help' for more information."
- 
-+trap "/bin/rm -rf $tmpdir" 0 1 2 3 13 15
- 
- # Parse command line arguments.
- option_without_arguments='vhsqDlw'
--- a/a2ps-underquoted.patch
+++ b/a2ps-underquoted.patch
@ -1,208 +0,0 @@
--- a2ps-4.13/m4/c-bs-a.m4.underquoted	2004-12-07 15:48:56.317799029 +0000
-+++ a2ps-4.13/m4/c-bs-a.m4	2004-12-07 15:49:09.240315913 +0000
-@@ -2,7 +2,7 @@
- 
- dnl From Paul Eggert.
- 
-AC_DEFUN(AC_C_BACKSLASH_A,
-+AC_DEFUN([AC_C_BACKSLASH_A],
- [
-   AC_CACHE_CHECK([whether backslash-a works in strings], ac_cv_c_backslash_a,
-    [AC_TRY_COMPILE([],
-@@ -22,7 +22,7 @@
-   fi
- ])
- 
-AC_DEFUN(jm_PREREQ_QUOTEARG,
-+AC_DEFUN([jm_PREREQ_QUOTEARG],
- [
-   AC_CHECK_FUNCS(isascii mbrtowc)
-   AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h)
--- a2ps-4.13/m4/error.m4.underquoted	2004-12-07 15:49:21.559948942 +0000
-+++ a2ps-4.13/m4/error.m4	2004-12-07 15:49:28.235666455 +0000
-@@ -1,7 +1,7 @@
- dnl From Jim Meyering.  Use this if you use the GNU error.[ch].
- dnl FIXME: Migrate into libit
- 
-AC_DEFUN(AM_FUNC_ERROR_AT_LINE,
-+AC_DEFUN([AM_FUNC_ERROR_AT_LINE],
- [AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
-  [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
-               am_cv_lib_error_at_line=yes,
--- a2ps-4.13/m4/obstack.m4.underquoted	2004-12-07 15:49:39.826439920 +0000
-+++ a2ps-4.13/m4/obstack.m4	2004-12-07 15:49:49.827518954 +0000
-@@ -1,7 +1,7 @@
- dnl From Jim Meyering.
- dnl FIXME: migrate into libit.
- 
-AC_DEFUN(AM_FUNC_OBSTACK,
-+AC_DEFUN([AM_FUNC_OBSTACK],
- [AC_CACHE_CHECK([for obstacks], am_cv_func_obstack,
-  [AC_TRY_LINK([#include "obstack.h"],
- 	      [struct obstack *mem;obstack_free(mem,(char *) 0)],
--- a2ps-4.13/m4/libtool.m4.underquoted	2004-12-07 15:50:24.793804138 +0000
-+++ a2ps-4.13/m4/libtool.m4	2004-12-07 15:52:28.530057547 +0000
-@@ -22,7 +22,7 @@
- ## the same distribution terms that you use for the rest of that program.
- 
- # serial 40 AC_PROG_LIBTOOL
-AC_DEFUN(AC_PROG_LIBTOOL,
-+AC_DEFUN([AC_PROG_LIBTOOL],
- [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
- 
- # Save cache, so that ltconfig can load it
-@@ -52,7 +52,7 @@
- exec 5>>./config.log
- ])
- 
-AC_DEFUN(AC_LIBTOOL_SETUP,
-+AC_DEFUN([AC_LIBTOOL_SETUP],
- [AC_PREREQ(2.13)dnl
- AC_REQUIRE([AC_ENABLE_SHARED])dnl
- AC_REQUIRE([AC_ENABLE_STATIC])dnl
-@@ -132,16 +132,16 @@
- ])
- 
- # AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
-+AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
- 
- # AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
-+AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
- 
- # AC_ENABLE_SHARED - implement the --enable-shared flag
- # Usage: AC_ENABLE_SHARED[(DEFAULT)]
- #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
- #   `yes'.
-AC_DEFUN(AC_ENABLE_SHARED, [dnl
-+AC_DEFUN([AC_ENABLE_SHARED], [dnl
- define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
- AC_ARG_ENABLE(shared,
- changequote(<<, >>)dnl
-@@ -167,14 +167,14 @@
- ])
- 
- # AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
- AC_ENABLE_SHARED(no)])
- 
- # AC_ENABLE_STATIC - implement the --enable-static flag
- # Usage: AC_ENABLE_STATIC[(DEFAULT)]
- #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
- #   `yes'.
-AC_DEFUN(AC_ENABLE_STATIC, [dnl
-+AC_DEFUN([AC_ENABLE_STATIC], [dnl
- define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
- AC_ARG_ENABLE(static,
- changequote(<<, >>)dnl
-@@ -200,7 +200,7 @@
- ])
- 
- # AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_DEFUN([AC_DISABLE_STATIC], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
- AC_ENABLE_STATIC(no)])
- 
- 
-@@ -208,7 +208,7 @@
- # Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
- #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
- #   `yes'.
-AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
-+AC_DEFUN([AC_ENABLE_FAST_INSTALL], [dnl
- define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
- AC_ARG_ENABLE(fast-install,
- changequote(<<, >>)dnl
-@@ -234,11 +234,11 @@
- ])
- 
- # AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_DEFUN([AC_DISABLE_FAST_INSTALL], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
- AC_ENABLE_FAST_INSTALL(no)])
- 
- # AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN(AC_PROG_LD,
-+AC_DEFUN([AC_PROG_LD],
- [AC_ARG_WITH(gnu-ld,
- [  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
- test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-@@ -308,7 +308,7 @@
- AC_PROG_LD_GNU
- ])
- 
-AC_DEFUN(AC_PROG_LD_GNU,
-+AC_DEFUN([AC_PROG_LD_GNU],
- [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
- [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
- if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-@@ -319,7 +319,7 @@
- ])
- 
- # AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN(AC_PROG_NM,
-+AC_DEFUN([AC_PROG_NM],
- [AC_MSG_CHECKING([for BSD-compatible nm])
- AC_CACHE_VAL(ac_cv_path_NM,
- [if test -n "$NM"; then
-@@ -353,7 +353,7 @@
- ])
- 
- # AC_CHECK_LIBM - check for math library
-AC_DEFUN(AC_CHECK_LIBM,
-+AC_DEFUN([AC_CHECK_LIBM],
- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
- LIBM=
- case "$lt_target" in
-@@ -378,7 +378,7 @@
- # '${top_builddir}/' (note the single quotes!) if your package is not
- # flat, and, if you're not using automake, define top_builddir as
- # appropriate in the Makefiles.
-AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-   case "$enable_ltdl_convenience" in
-   no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-   "") enable_ltdl_convenience=yes
-@@ -397,7 +397,7 @@
- # flat, and, if you're not using automake, define top_builddir as
- # appropriate in the Makefiles.
- # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-   AC_CHECK_LIB(ltdl, main,
-   [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-   [if test x"$enable_ltdl_install" = xno; then
-@@ -418,13 +418,13 @@
- ])
- 
- dnl old names
-AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
-AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
-AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
-AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
-AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
-AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
-AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
-+AC_DEFUN([AM_PROG_LIBTOOL], [indir([AC_PROG_LIBTOOL])])dnl
-+AC_DEFUN([AM_ENABLE_SHARED], [indir([AC_ENABLE_SHARED], $@)])dnl
-+AC_DEFUN([AM_ENABLE_STATIC], [indir([AC_ENABLE_STATIC], $@)])dnl
-+AC_DEFUN([AM_DISABLE_SHARED], [indir([AC_DISABLE_SHARED], $@)])dnl
-+AC_DEFUN([AM_DISABLE_STATIC], [indir([AC_DISABLE_STATIC], $@)])dnl
-+AC_DEFUN([AM_PROG_LD], [indir([AC_PROG_LD])])dnl
-+AC_DEFUN([AM_PROG_NM], [indir([AC_PROG_NM])])dnl
- 
- dnl This is just to silence aclocal about the macro not being used
- ifelse([AC_DISABLE_FAST_INSTALL])dnl
--- a2ps-4.13/m4/lex.m4.underquoted	2004-12-07 15:53:11.815755409 +0000
-+++ a2ps-4.13/m4/lex.m4	2004-12-07 15:53:20.523085631 +0000
-@@ -3,7 +3,7 @@
- 
- dnl AM_PROG_LEX
- dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
-AC_DEFUN(AM_PROG_LEX,
-+AC_DEFUN([AM_PROG_LEX],
- [AC_REQUIRE([AM_MISSING_HAS_RUN])
- AC_CHECK_PROGS(LEX, flex lex, [${am_missing_run}flex])
- AC_PROG_LEX
--- a/a2ps.spec
+++ b/a2ps.spec
@ -12,31 +12,21 @@

 Summary: Converts text and other types of files to PostScript(TM)
 Name: a2ps
-Version: 4.13b
-Release: 71%{?dist}
-License: GPLv2+
+Version: 4.14
+Release: 5%{?dist}
+License: GPLv3+
 Group: Applications/Publishing
-#Source0: ftp://ftp.enst.fr/pub/unix/a2ps/%{name}-%{version}.tar.gz 
-Source0: %{name}-%{version}-GPL.tar.gz 
+Source0: http://ftp.gnu.org/gnu/a2ps/%{name}-%{version}.tar.gz
 Source1: ftp://ftp.enst.fr/pub/unix/a2ps/i18n-fonts-0.1.tar.gz
-# a2ps contains code that we cannot ship due to its license.
-# Therefore we use this script to remove the code in question before
-# shipping it. Download the upstream tarball and invoke this script
-# while in the same directory as the tarball:
-# ./generate-tarball.sh 4.13b
-Source2: a2ps-generate-tarball.sh
 Patch0: a2ps-4.13-conf.patch
 Patch1: a2ps-4.13-etc.patch
-Patch2: a2ps-4.13-flex.patch
 Patch3: a2ps-4.13-security.patch
 Patch4: a2ps-4.13-glibcpaper.patch
-Patch5: a2ps-4.13-varargs.patch
-Patch6: a2ps-tmpdir.patch
 Patch7: a2ps-sort.patch
 Patch8: a2ps-iso5-minus.patch
 Patch9: a2ps-perl.patch
 # EUC-JP support
-Patch10: a2ps-4.13-eucjp.patch.bz2
+Patch10: a2ps-4.13-eucjp.patch
 Patch11: a2ps-4.13-autoenc.patch
 Patch12: a2ps-4.13b-attr.patch
 Patch13: a2ps-4.13b-numeric.patch
@ -44,37 +34,35 @@ Patch14: a2ps-4.13b-encoding.patch
 Patch15: a2ps-4.13b-tilde.patch
 Patch17: a2ps-4.13-euckr.patch
 Patch18: a2ps-4.13-gnusource.patch
-Patch19: a2ps-4.13-bison.patch
 Patch20: a2ps-4.13-hebrew.patch
-Patch21: a2ps-4.13-malloc.patch
-Patch22: a2ps-shell.patch
-Patch23: a2ps-includes.patch
-Patch24: a2ps-underquoted.patch
 Patch26: a2ps-make-fonts-map.patch
-Patch27: a2ps-netscape.patch
 Patch28: a2ps-wdiff.patch
 Patch29: a2ps-U.patch
-Patch30: a2ps-psset.patch
 Patch31: a2ps-mb.patch
 Patch34: a2ps-external-libtool.patch
+Patch35: a2ps-4.14-texinfo-nodes.patch
 Requires: fileutils sh-utils info
+BuildRequires: gperf
 BuildRequires: emacs, emacs-el, flex, libtool, texinfo, groff
 BuildRequires: ImageMagick
 BuildRequires: groff-perl
 BuildRequires: cups
 BuildRequires: gettext, bison
-BuildRequires: psutils, tetex-dvips, texinfo, tetex-latex
-# Uncomment this after Extras merge:
+BuildRequires: psutils, tetex-dvips, texinfo, tetex-latex, html2ps
+# instead of gv, xdg-open should certainly be used
 #BuildRequires: gv
-Url: http://www.inf.enst.fr/~demaille/a2ps/
+Url: http://www.gnu.org/software/a2ps/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: psutils, ImageMagick, texinfo-tex, gzip, bzip2, groff-perl
-Requires: tetex-dvips, tetex-latex, tetex-fonts, file
+Requires: tetex-dvips, tetex-latex, tetex-fonts, file, html2ps
+# for hebrew support, path set. 
+# culmus-fonts
+# And certainly other font sets for other languages may be needed
 Requires(post): coreutils
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Obsoletes: a2ps-i18n <= 0.1-1
-Provides: a2ps-i18n = 0.1-1
+Provides: a2ps-i18n = 0.1-2


 %package -n emacs-%{name}
@ -108,18 +96,16 @@ the emacs-%{name} package to use emacs-%{name} with GNU Emacs.


 %prep
-%setup -q -n %{name}-4.13 -a 1
+%setup -q -a 1

-# use __timestamp_configure.in to hold the configure.in timestamp
-touch -r configure.in __timestamp_configure.in
+# use fedora postscript font paths
+%patch0 -p1 -b .conf
+
+# add /etc/a2ps in directories searched for config files
+%patch1 -p1 -b .etc 

-%patch0 -p1
-%patch1 -p1 -b .etc
-%patch2 -p1
 %patch3 -p1 -b .security
 %patch4 -p1 -b .glibcpaper
-%patch5 -p1
-%patch6 -p1 -b .tmpdir
 %patch7 -p1 -b .sort
 %patch8 -p1 -b .iso5-minus
 %patch9 -p1 -b .perl
@ -143,24 +129,9 @@ touch -r configure.in __timestamp_configure.in
 # Prevent strsignal segfaulting (bug #104970).
 %patch18 -p1 -b .gnusource

-# Fix problems in .y file spotted by stricter bison.
-%patch19 -p1 -b .bison
-
 # Hebrew support (bug #113191).
 %patch20 -p1 -b .hebrew

-# Prevent "error: conflicting types for 'malloc'".
-%patch21 -p1 -b .malloc
-
-# Use environment variable to pass filenames to shell (bug #128647).
-%patch22 -p1 -b .shell
-
-# Apply patch from bug #122699 to fix "too many includes" error.
-%patch23 -p1 -b .includes
-
-# Fixed m4 files.
-%patch24 -p1 -b .underquoted
-
 # Use external libtool (bug #225235).
 %patch34 -p1 -b .external-libtool

@ -168,21 +139,24 @@ touch -r configure.in __timestamp_configure.in
 # Michal Jaegermann.
 %patch26 -p1 -b .make-fonts-map

-# Don't try to run netscape.  Run mozilla instead (bug #121393).
-%patch27 -p1 -b .netscape
-
 # Make pdiff default to not requiring wdiff (bug #68537).
 %patch28 -p1 -b .wdiff

 # Make pdiff use diff(1) properly (bug #156916).
 %patch29 -p1 -b .U

-# Fixed psset sed expression (bug #209613).
-%patch30 -p1 -b .psset
-
 # Fixed multibyte handling (bug #212154).
 %patch31 -p1 -b .mb

+# Remove dots in node names, patch from Vitezslav Crhonek (Bug #445971)
+%patch35 -p1 -b .nodes
+
+for file in AUTHORS ChangeLog; do
+  iconv -f latin1 -t UTF-8 < $file > $file.utf8
+  touch -c -r $file $file.utf8
+  mv $file.utf8 $file
+done
+
 mv doc/encoding.texi doc/encoding.texi.utf8
 iconv -f KOI-8 -t UTF-8 doc/encoding.texi.utf8 -o doc/encoding.texi

@ -192,22 +166,23 @@ sed -i -e "s,/usr/local/bin,%{_bindir}," contrib/emacs/a2ps.el
 chmod -x lib/basename.c lib/xmalloc.c

 # restore timestamps of patched files
-touch -r __timestamp_configure.in configure.in
-rm __timestamp_configure.in
-touch -r config.h.in.euc config.h.in
-touch -r configure.orig configure Makefile.in
-touch -r src/Makefile.am.euc src/Makefile.am
-touch -r etc/Makefile.am.etc etc/Makefile.am
-touch -r fonts/Makefile.in src/Makefile.in etc/Makefile.in lib/Makefile.in
+touch -c -r configure.in.conf configure.in
+touch -c -r config.h.in.euc config.h.in
+touch -c -r configure.conf configure
+touch -c -r src/Makefile.am.euc src/Makefile.am
+touch -c -r etc/Makefile.am.etc etc/Makefile.am
+#touch -c -r fonts/Makefile.in src/Makefile.in lib/Makefile.in
+touch -c -r etc/Makefile.in.etc etc/Makefile.in
+
+chmod 644 encoding/iso8.edf.hebrew
+chmod 644 encoding/euc-kr.edf.euckr

 %build
 # preset the date in README.in to avoid the timestamp of the build time
 sed -e "s!@date@!`date -r NEWS`!" etc/README.in > etc/README.in.tmp
-touch -r etc/README.in etc/README.in.tmp
+touch -c -r etc/README.in etc/README.in.tmp
 mv etc/README.in.tmp etc/README.in

-chmod 644 {po/ja.po,encoding/euc-jp.edf,README.eucJP}.euc
-chmod 644 encoding/euc-kr.edf.euckr
 EMACS=emacs %configure \
  --with-medium=_glibc \
  --enable-kanji
@ -217,15 +192,15 @@ find . -name "*.info*" -exec rm -f {} \;
 # force rebuilding scanners by flex - patched or not
 find src lib -name '*.l' -exec touch {} \;
 # these scanners use 'lineno' - incompatible with -CFe flex flags
-(
-    cd src
-    /bin/sh ../auxdir/ylwrap "flex" sheets-map.l lex.yy.c sheets-map.c --
-    /bin/sh ../auxdir/ylwrap "flex" lexssh.l lex.yy.c lexssh.c --
-    cd ../lib
-    /bin/sh ../auxdir/ylwrap "flex" lexppd.l lex.yy.c lexppd.c --
-)
+#(
+#    cd src
+#    /bin/sh ../auxdir/ylwrap "flex" sheets-map.l lex.yy.c sheets-map.c --
+#    /bin/sh ../auxdir/ylwrap "flex" lexssh.l lex.yy.c lexssh.c --
+#    cd ../lib
+#    /bin/sh ../auxdir/ylwrap "flex" lexppd.l lex.yy.c lexppd.c --
+#)

-make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make %{?_smp_mflags}

 %install
 rm -rf %{buildroot}
@ -245,8 +220,8 @@ popd
 popd

 # Don't ship the library file or header (bug #203536).
-rm -f %{buildroot}%{_libdir}/*.{so,a,la}
-rm -f %{buildroot}%{_includedir}/*
+rm %{buildroot}%{_libdir}/*.{so,a,la}
+rm %{buildroot}%{_includedir}/*

 rm -f %{buildroot}%{_infodir}/dir

@ -289,7 +264,8 @@ exit 0
 %{_infodir}/ogonkify.info*
 %{_infodir}/regex.info*
 %{_mandir}/*/*
-%{_datadir}/a2ps/afm/fonts.map
+# automatically regenerated at install and update time
+%verify(not size mtime md5) %{_datadir}/a2ps/afm/fonts.map
 %{_datadir}/a2ps/afm/*.afm
 %{_datadir}/a2ps/afm/make_fonts_map.sh
 %{_datadir}/a2ps/README
@ -312,6 +288,22 @@ exit 0
 %{emacs_lispdir}/*.el

 %changelog
+* Thu May 29 2008 Tim Waugh <twaugh@redhat.com> 4.14-5
+- Removed old patches.
+
+* Sun May 18 2008 Patrice Dumas <pertusus@free.fr> 4.14-4
+- remove dots in node names, patch from Vitezslav Crhonek (bug #445971)
+
+* Wed May 14 2008 Patrice Dumas <pertusus@free.fr> 4.14-3
+- %%{_datadir}/a2ps/afm/fonts.map is dynamically generated, mark it
+  as such in %%files (bug #70919)
+
+* Sun Apr 27 2008 Patrice Dumas <pertusus@free.fr> 4.14-2
+- update to 4.14
+- don't obsolete the provided version of a2ps-i18n
+- use html2ps for the html delegation
+- BuildRequires gperf
+
 * Tue Feb 12 2008 Patrice Dumas <pertusus@free.fr> 4.13b-71
 - use a predictable stamp inside the etc/README file
 - follow emacs packaging guidelines
--- a/3
+++ b/3
@ -1,3 +1,2 @@
-8e6a684611da92c9de2a42e7803aa8f0  a2ps-4.13-eucjp.patch.bz2
+781ac3d9b213fa3e1ed0d79f986dc8c7  a2ps-4.14.tar.gz
 fee1456d0e6e94af4fc5b5a1bb9687b7  i18n-fonts-0.1.tar.gz
-4c7efbbbb03558e3c900d2b3b4e3fbf0  a2ps-4.13b-GPL.tar.gz
Author	SHA1	Message	Date
Fedora Release Engineering	97bd7073fe	dist-git conversion	2010-07-28 09:29:47 +00:00
Bill Nottingham	4d1d98962d	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:24:00 +00:00
Tim Waugh	6e9294f100	Sync to devel.	2008-05-29 16:24:41 +00:00
Tim Waugh	e8bcfd35bd	No longer used.	2008-05-29 16:12:42 +00:00
Jesse Keating	68555f62a5	Initialize branch F-9 for a2ps	2008-04-20 11:44:48 +00:00