Update to a2ps-4.10.3.

9 files changed, 133 insertions, 146 deletions

diff --git a/print/a2ps/patches/patch-aa b/print/a2ps/patches/patch-aa
index e7c8e9af4de..ce9dcaec778 100644
--- a/print/a2ps/patches/patch-aa
+++ b/print/a2ps/patches/patch-aa
@@ -1,37 +1,6 @@
---- doc/Makefile.in.orig        Tue Sep 30 12:06:45 1997
-+++ doc/Makefile.in     Fri Oct 10 19:19:27 1997
-@@ -147,7 +147,7 @@
- default: all
- 
- .SUFFIXES:
--.SUFFIXES: .dvi .info .ps .texi .texinfo
-+#.SUFFIXES: .dvi .info .ps .texi .texinfo
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile
-
---- Makefile.in	1998/02/16 15:03:30	1.1
-+++ Makefile.in	1998/02/16 15:04:32
-@@ -68,7 +68,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
- transform = @program_transform_name@
- 
- NORMAL_INSTALL = true
-@@ -411,7 +411,7 @@
- all: all-recursive all-am
- 
- install-strip:
--	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_SCRIPT)' install
- installdirs: installdirs-recursive
- 	$(mkinstalldirs)  $(bindir) $(afmdir) $(psdir)
- 
---- ogonkify/Makefile.in	1998/02/16 15:45:09	1.1
-+++ ogonkify/Makefile.in	1998/02/16 15:45:58
-@@ -68,7 +68,7 @@
+--- Makefile.in.orig	Thu Jun 25 16:23:49 1998
++++ Makefile.in	Wed Jul  1 22:14:36 1998
+@@ -74,7 +74,7 @@
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
@@ -39,104 +8,13 @@
 +INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
  transform = @program_transform_name@
  
- NORMAL_INSTALL = true
-@@ -411,7 +411,7 @@
- all: all-recursive all-am
+ NORMAL_INSTALL = :
+@@ -368,7 +368,7 @@
+ uninstall: uninstall-recursive
  
  install-strip:
 -	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 +	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_SCRIPT)' install
  installdirs: installdirs-recursive
- 	$(mkinstalldirs)  $(bindir) $(afmdir) $(psdir)
- 
---- afm/Makefile.in	1998/02/16 16:21:37	1.1
-+++ afm/Makefile.in	1998/02/16 16:22:17
-@@ -76,7 +76,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
- transform = @program_transform_name@
- 
- NORMAL_INSTALL = true
-@@ -257,7 +257,7 @@
- all: Makefile $(SCRIPTS) $(DATA)
- 
- install-strip:
--	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_SCRIPT)' install
- installdirs:
- 	$(mkinstalldirs)  $(afmdir) $(afmdir)
  
---- lib/Makefile.in	1998/02/16 16:22:56	1.1
-+++ lib/Makefile.in	1998/02/16 16:23:50
-@@ -48,7 +48,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
- transform = @program_transform_name@
- 
- NORMAL_INSTALL = true
-@@ -243,8 +243,8 @@
- 	$(mkinstalldirs) $(libdir)
- 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo "$(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(libdir)/$$p"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(libdir)/$$p; \
-+	    echo "$(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(libdir)/$$p"; \
-+	    $(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(libdir)/$$p; \
- 	  else :; fi; \
- 	done
- 
-@@ -630,7 +630,7 @@
- all: Makefile $(LTLIBRARIES) $(HEADERS)
- 
- install-strip:
--	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_SCRIPT)' install
- installdirs:
- 	$(mkinstalldirs)  $(libdir) $(includedir)
- 
---- contrib/emacs/Makefile.in	1998/02/16 17:01:34	1.1
-+++ contrib/emacs/Makefile.in	1998/02/16 17:01:58
-@@ -72,7 +72,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
- transform = @program_transform_name@
- 
- NORMAL_INSTALL = true
-@@ -221,7 +221,7 @@
- all: Makefile $(DATA)
- 
- install-strip:
--	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_SCRIPT)' install
- installdirs:
- 	$(mkinstalldirs)  $(lispdir)
- 
---- contrib/Makefile.in	1998/02/16 17:09:17	1.1
-+++ contrib/Makefile.in	1998/02/16 17:09:50
-@@ -72,7 +72,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
- transform = @program_transform_name@
- 
- NORMAL_INSTALL = true
-@@ -292,7 +292,7 @@
- all: all-recursive all-am
- 
- install-strip:
--	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_SCRIPT)' install
- installdirs: installdirs-recursive
- 	$(mkinstalldirs)  $(bindir)
  
diff --git a/print/a2ps/patches/patch-ab b/print/a2ps/patches/patch-ab
index 9cc6106ce61..fdbf77411a5 100644
--- a/print/a2ps/patches/patch-ab
+++ b/print/a2ps/patches/patch-ab
@@ -1,14 +1,14 @@
---- ogonkify/doc/ogonkify.texi.orig	Sat May  9 03:23:39 1998
-+++ ogonkify/doc/ogonkify.texi	Sat May  9 03:24:47 1998
-@@ -16,6 +16,11 @@
- @author Juliusz Chroboczek
- @end titlepage
+--- ogonkify/doc/ogonkify.info-orig	Wed Jul  1 22:43:04 1998
++++ ogonkify/doc/ogonkify.info	Wed Jul  1 22:44:02 1998
+@@ -1,6 +1,11 @@
+ Ceci est le fichier Info ogonkify.info, produit par Makeinfo version
+ 1.68ŕ partir du fichier d'entrée Ťogonkify.texiť.
  
-+@dircategory Internet support
-+@direntry
++INFO-DIR-SECTION Printing Tools
++START-INFO-DIR-ENTRY
 +* Ogonkify: (ogonkify).              Font creation and PostScript output.
-+@end direntry
++END-INFO-DIR-ENTRY
 +
+    This is the Ogonkify manual, by Juliusz Chroboczek
  
- @node Top, License, (dir), (dir)
- 
+ 
diff --git a/print/a2ps/patches/patch-ac b/print/a2ps/patches/patch-ac
index 0e790241dad..44a2e620d64 100644
--- a/print/a2ps/patches/patch-ac
+++ b/print/a2ps/patches/patch-ac
@@ -1,12 +1,10 @@
---- doc/a2ps.info-orig	Sat May  9 13:35:39 1998
-+++ doc/a2ps.info	Sat May  9 13:46:20 1998
-@@ -3,8 +3,7 @@
+--- doc/a2ps.info.orig	Tue Jun 23 10:24:50 1998
++++ doc/a2ps.info	Wed Jul  1 22:40:03 1998
+@@ -3,7 +3,6 @@
  
  INFO-DIR-SECTION Printing Tools
  START-INFO-DIR-ENTRY
 -* a2ps::                           PostScript Generating Utility
--* PreScript: (a2ps) PreScript      Input language for a2ps
-+* PreScript: (a2ps).		 PreScript Input language for a2ps
- END-INFO-DIR-ENTRY
- 
-    This document describes `a2ps' 4.9.9, a converter from various
+ * PreScript: (a2ps) PreScript      Input language for a2ps
+ * Card: (a2ps) Card                Print Reference Card of Programs
+ * psmandup: (a2ps) psmandup        Printing Duplex on Simplex Printers
diff --git a/print/a2ps/patches/patch-ad b/print/a2ps/patches/patch-ad
new file mode 100644
index 00000000000..e9a656f3a8f
--- /dev/null
+++ b/print/a2ps/patches/patch-ad
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig	Thu Jun 25 16:25:37 1998
++++ doc/Makefile.in	Wed Jul  1 22:20:37 1998
+@@ -171,7 +171,7 @@
+ all: Makefile $(INFO_DEPS) $(MANS)
+ 
+ .SUFFIXES:
+-.SUFFIXES: .dvi .info .ps .texi .texinfo .txi
++#.SUFFIXES: .dvi .info .ps .texi .texinfo .txi
+ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile
+ 
diff --git a/print/a2ps/patches/patch-ae b/print/a2ps/patches/patch-ae
new file mode 100644
index 00000000000..09cc49592e8
--- /dev/null
+++ b/print/a2ps/patches/patch-ae
@@ -0,0 +1,20 @@
+--- ogonkify/Makefile.in.orig	Thu Jun 25 16:24:03 1998
++++ ogonkify/Makefile.in	Wed Jul  1 22:14:36 1998
+@@ -70,7 +70,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
+ transform = @program_transform_name@
+ 
+ NORMAL_INSTALL = :
+@@ -437,7 +437,7 @@
+ uninstall: uninstall-recursive uninstall-am
+ 
+ install-strip:
+-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
++	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_SCRIPT)' install
+ installdirs: installdirs-recursive
+ 	$(mkinstalldirs)  $(DATADIR)$(bindir) $(DATADIR)$(afmdir) \
+ 		$(DATADIR)$(fontsdir) $(DATADIR)$(ogonkifydir)
diff --git a/print/a2ps/patches/patch-af b/print/a2ps/patches/patch-af
new file mode 100644
index 00000000000..3ac997debed
--- /dev/null
+++ b/print/a2ps/patches/patch-af
@@ -0,0 +1,20 @@
+--- afm/Makefile.in.orig	Thu Jun 25 16:25:16 1998
++++ afm/Makefile.in	Wed Jul  1 22:14:37 1998
+@@ -78,7 +78,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
+ transform = @program_transform_name@
+ 
+ NORMAL_INSTALL = :
+@@ -274,7 +274,7 @@
+ uninstall: uninstall-afmSCRIPTS uninstall-afmDATA
+ 
+ install-strip:
+-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
++	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_SCRIPT)' install
+ installdirs:
+ 	$(mkinstalldirs)  $(DATADIR)$(afmdir) $(DATADIR)$(afmdir)
+ 
diff --git a/print/a2ps/patches/patch-ag b/print/a2ps/patches/patch-ag
new file mode 100644
index 00000000000..e15b159407f
--- /dev/null
+++ b/print/a2ps/patches/patch-ag
@@ -0,0 +1,20 @@
+--- lib/Makefile.in.orig	Thu Jun 25 16:24:21 1998
++++ lib/Makefile.in	Wed Jul  1 22:14:37 1998
+@@ -50,7 +50,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
+ transform = @program_transform_name@
+ 
+ NORMAL_INSTALL = :
+@@ -733,7 +733,7 @@
+ uninstall: uninstall-libLTLIBRARIES uninstall-includeHEADERS
+ 
+ install-strip:
+-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
++	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_SCRIPT)' install
+ installdirs:
+ 	$(mkinstalldirs)  $(DATADIR)$(libdir) $(DATADIR)$(includedir)
+ 
diff --git a/print/a2ps/patches/patch-ah b/print/a2ps/patches/patch-ah
new file mode 100644
index 00000000000..ba760da945d
--- /dev/null
+++ b/print/a2ps/patches/patch-ah
@@ -0,0 +1,20 @@
+--- contrib/emacs/Makefile.in.orig	Thu Jun 25 16:25:34 1998
++++ contrib/emacs/Makefile.in	Wed Jul  1 22:14:38 1998
+@@ -74,7 +74,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
+ transform = @program_transform_name@
+ 
+ NORMAL_INSTALL = :
+@@ -236,7 +236,7 @@
+ uninstall: uninstall-lispDATA
+ 
+ install-strip:
+-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
++	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_SCRIPT)' install
+ installdirs:
+ 	$(mkinstalldirs)  $(DATADIR)$(lispdir)
+ 
diff --git a/print/a2ps/patches/patch-ai b/print/a2ps/patches/patch-ai
new file mode 100644
index 00000000000..d3486f77fd0
--- /dev/null
+++ b/print/a2ps/patches/patch-ai
@@ -0,0 +1,20 @@
+--- contrib/Makefile.in.orig	Thu Jun 25 16:25:28 1998
++++ contrib/Makefile.in	Wed Jul  1 22:14:38 1998
+@@ -74,7 +74,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
+ transform = @program_transform_name@
+ 
+ NORMAL_INSTALL = :
+@@ -418,7 +418,7 @@
+ uninstall: uninstall-recursive uninstall-am
+ 
+ install-strip:
+-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
++	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_SCRIPT)' install
+ installdirs: installdirs-recursive
+ 	$(mkinstalldirs)  $(DATADIR)$(bindir) $(DATADIR)$(bindir)
+