13 files changed, 192 insertions, 344 deletions

diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index 388d9bc65c0..51a3c7b935c 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.22 1999/06/16 17:28:24 cgd Exp $
+# $NetBSD: Makefile,v 1.23 1999/06/20 15:53:28 tron Exp $
 # FreeBSD Id: Makefile,v 1.12 1998/02/15 21:24:42 steve Exp
 #
 
-DISTNAME=	a2ps-4.10.3
+DISTNAME=	a2ps-4.12
 CATEGORIES=	print
-MASTER_SITES=	http://www-inf.enst.fr/~demaille/ftp/a2ps/
+MASTER_SITES=	ftp://ftp.enst.fr/pub/unix/a2ps/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www-inf.enst.fr/~demaille/a2ps/
diff --git a/print/a2ps/files/md5 b/print/a2ps/files/md5
index 98711d4f119..924a7c5027c 100644
--- a/print/a2ps/files/md5
+++ b/print/a2ps/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/08/07 13:27:34 agc Exp $
+$NetBSD: md5,v 1.4 1999/06/20 15:53:28 tron Exp $
 
-MD5 (a2ps-4.10.3.tar.gz) = b40f0576821c3257a907736226117ee6
+MD5 (a2ps-4.12.tar.gz) = f9e8331f5834525a2178b267b14dfa57
diff --git a/print/a2ps/patches/patch-aa b/print/a2ps/patches/patch-aa
deleted file mode 100644
index ced52f2914b..00000000000
--- a/print/a2ps/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.4 1998/08/07 11:11:20 agc Exp $
-
---- 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@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
- transform = @program_transform_name@
- 
- 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
- 
- 
diff --git a/print/a2ps/patches/patch-ab b/print/a2ps/patches/patch-ab
deleted file mode 100644
index 293a301adb4..00000000000
--- a/print/a2ps/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.3 1998/08/07 11:11:20 agc Exp $
-
---- 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ť.
- 
-+INFO-DIR-SECTION Printing Tools
-+START-INFO-DIR-ENTRY
-+* Ogonkify: (ogonkify).              Font creation and PostScript output.
-+END-INFO-DIR-ENTRY
-+
-    This is the Ogonkify manual, by Juliusz Chroboczek
- 
- 
diff --git a/print/a2ps/patches/patch-ac b/print/a2ps/patches/patch-ac
deleted file mode 100644
index 00d49dd3cb8..00000000000
--- a/print/a2ps/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.3 1998/08/07 11:11:20 agc Exp $
-
---- 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
- * 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
deleted file mode 100644
index b8f60b83eee..00000000000
--- a/print/a2ps/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 11:11:21 agc Exp $
-
---- 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
deleted file mode 100644
index b897adaaaca..00000000000
--- a/print/a2ps/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 11:11:21 agc Exp $
-
---- 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
deleted file mode 100644
index 88780e6d91e..00000000000
--- a/print/a2ps/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 11:11:21 agc Exp $
-
---- 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
index 8ab5b582ed2..25cd3e15672 100644
--- a/print/a2ps/patches/patch-ag
+++ b/print/a2ps/patches/patch-ag
@@ -1,22 +1,13 @@
-$NetBSD: patch-ag,v 1.2 1998/08/07 11:11:21 agc Exp $
+$NetBSD: patch-ag,v 1.3 1999/06/20 15:53:29 tron Exp $
 
---- 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)
- 
+--- lib/Makefile.in.orig	Thu Feb 18 16:24:42 1999
++++ lib/Makefile.in	Sat Jun 19 17:57:58 1999
+@@ -202,7 +202,7 @@
+ signame$U.lo strverscmp$U.lo xmalloc$U.lo xstrdup$U.lo xstrtol$U.lo \
+ message$U.lo xstrrpl$U.lo getshline$U.lo pathwalk$U.lo darray$U.lo \
+ dstring$U.lo printlen$U.lo pair_ht$U.lo filtdir$U.lo str_ht$U.lo \
+-title$U.lo xbackupfile$U.lo getnum$U.lo tterm$U.lo lister$U.lo \
++title$U.lo xbackupfile$U.lo getnum$U.lo tterm$U.lo \
+ addext$U.lo basename$U.lo getopt1$U.lo isdir$U.lo xgetcwd$U.lo \
+ xgethostname$U.lo
+ LEXLIB = @LEXLIB@
diff --git a/print/a2ps/patches/patch-ah b/print/a2ps/patches/patch-ah
deleted file mode 100644
index fa308a71236..00000000000
--- a/print/a2ps/patches/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ah,v 1.2 1998/08/07 11:11:21 agc Exp $
-
---- 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
deleted file mode 100644
index d05fd5500dd..00000000000
--- a/print/a2ps/patches/patch-ai
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ai,v 1.3 1998/08/07 11:11:22 agc Exp $
-
---- contrib/Makefile.in.orig	Thu Jun 25 16:25:28 1998
-+++ contrib/Makefile.in	Thu Jul  9 13:34:49 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 = :
-@@ -161,7 +161,7 @@
- l = @l@
- lispdir = @lispdir@
- 
--SUBDIRS = sample emacs
-+SUBDIRS = sample
- 
- bin_SCRIPTS = texi2dvi4a2ps card psmandup fixps pdiff
- bin_PROGRAMS = fixnt
-@@ -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)
- 
diff --git a/print/a2ps/patches/patch-aj b/print/a2ps/patches/patch-aj
index bb6aac4daae..61145babec2 100644
--- a/print/a2ps/patches/patch-aj
+++ b/print/a2ps/patches/patch-aj
@@ -1,21 +1,33 @@
-$NetBSD: patch-aj,v 1.2 1998/08/07 11:11:22 agc Exp $
+$NetBSD: patch-aj,v 1.3 1999/06/20 15:53:29 tron Exp $
 
---- configure.orig	Fri Jul 17 13:52:31 1998
-+++ configure	Fri Jul 17 13:53:03 1998
-@@ -1764,7 +1764,7 @@
- NM="$ac_cv_path_NM"
- echo "$ac_t""$NM" 1>&6
+--- configure.orig	Thu Feb 18 16:17:21 1999
++++ configure	Sat Jun 19 17:45:34 1999
+@@ -641,10 +641,12 @@
+ 
+ echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
+ echo "configure:644: checking whether build environment is sane" >&5
++if false; then
+ if test -n "`cd /`"; then
+   { echo "configure: error: Running cd is not silent as it should be.
+ Make sure to unset the environment variable CDPATH." 1>&2; exit 1; }
+ fi
++fi
+ # Just in case
+ sleep 1
+ echo timestamp > conftestfile
+@@ -2253,6 +2255,7 @@
+   ac_tool_prefix=
+ fi
  
--
 +if false; then
  # Always use our own libtool.
- LIBTOOL='$(top_builddir)/libtool'
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
-@@ -1814,6 +1814,7 @@
+@@ -2489,6 +2492,7 @@
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
  exec 5>>./config.log
 +fi
  
- for ac_prog in 'bison -y' byacc
- do
+ 
+ #########################################################################
diff --git a/print/a2ps/pkg/PLIST b/print/a2ps/pkg/PLIST
index 7997de74919..63f2f96ff0e 100644
--- a/print/a2ps/pkg/PLIST
+++ b/print/a2ps/pkg/PLIST
@@ -1,13 +1,15 @@
-@comment $NetBSD: PLIST,v 1.11 1999/02/11 19:17:33 tv Exp $
+@comment $NetBSD: PLIST,v 1.12 1999/06/20 15:53:29 tron Exp $
 bin/a2ps
 bin/card
-bin/compose
+bin/composeglyphs
 bin/fixnt
 bin/fixps
 bin/ogonkify
 bin/pdiff
 bin/psmandup
+bin/psset
 bin/texi2dvi4a2ps
+etc/a2ps-site.cfg
 etc/a2ps.cfg
 include/liba2ps.h
 @unexec install-info --delete %D/info/a2ps.info %D/info/dir
@@ -19,6 +21,7 @@ info/a2ps.info-2
 info/a2ps.info-3
 info/a2ps.info-4
 info/a2ps.info-5
+info/a2ps.info-6
 info/ogonkify.info
 info/regex.info
 info/regex.info-1
@@ -29,49 +32,21 @@ info/regex.info-3
 @exec install-info %D/info/regex.info %D/info/dir
 lib/liba2ps.a
 lib/liba2ps.so.1.0
-man/man1/a2ps.1
-man/man1/card.1
-man/man1/fixps.1
-man/man1/ogonkify.1
-man/man1/pdiff.1
-man/man1/psmandup.1
+man/man1/a2ps.1.gz
+man/man1/card.1.gz
+man/man1/fixps.1.gz
+man/man1/ogonkify.1.gz
+man/man1/pdiff.1.gz
+man/man1/psmandup.1.gz
+man/man1/psset.1.gz
 share/a2ps/README
-share/a2ps/ps/bw.pro
-share/a2ps/ps/bold.pro
-share/a2ps/ps/gray.pro
-share/a2ps/ps/color.pro
-share/a2ps/ps/gray2.pro
-share/a2ps/ps/matrix.pro
-share/a2ps/ps/diff.pro
-share/a2ps/ps/base.ps
-share/a2ps/ps/ehandler.ps
-share/a2ps/ps/a2ps.hdr
-share/a2ps/ps/color.hdr
-share/a2ps/afm/pcrr-o.afm
-share/a2ps/afm/pcrro-o.afm
-share/a2ps/afm/pcrb-o.afm
-share/a2ps/afm/pcrbo-o.afm
-share/a2ps/afm/ptmr-o.afm
-share/a2ps/afm/ptmri-o.afm
-share/a2ps/afm/ptmb-o.afm
-share/a2ps/afm/ptmbi-o.afm
-share/a2ps/afm/phvr-o.afm
-share/a2ps/afm/phvro-o.afm
-share/a2ps/afm/phvb-o.afm
-share/a2ps/afm/phvbo-o.afm
-share/a2ps/afm/make_fonts_map.sh
 share/a2ps/afm/fonts.map
-share/a2ps/afm/colle10.afm
-share/a2ps/afm/colle8.afm
-share/a2ps/afm/colle9.afm
-share/a2ps/afm/crr35__i.afm
-share/a2ps/afm/crr36__i.afm
-share/a2ps/afm/crr55__i.afm
-share/a2ps/afm/crr56__i.afm
+share/a2ps/afm/make_fonts_map.sh
 share/a2ps/afm/pbkd.afm
 share/a2ps/afm/pbkdi.afm
 share/a2ps/afm/pbkl.afm
 share/a2ps/afm/pbkli.afm
+share/a2ps/afm/pcfont.afm
 share/a2ps/afm/pcrb.afm
 share/a2ps/afm/pcrbo.afm
 share/a2ps/afm/pcrr.afm
@@ -99,149 +74,122 @@ share/a2ps/afm/ptmi.afm
 share/a2ps/afm/ptmr.afm
 share/a2ps/afm/pzcmi.afm
 share/a2ps/afm/pzdr.afm
-share/a2ps/afm/textb18.afm
-share/a2ps/afm/textb19.afm
-share/a2ps/afm/textb20.afm
-share/a2ps/fonts/pcrr-o.pfa
-share/a2ps/fonts/pcrro-o.pfa
-share/a2ps/fonts/pcrb-o.pfa
-share/a2ps/fonts/pcrbo-o.pfa
-share/a2ps/fonts/ptmr-o.pfa
-share/a2ps/fonts/ptmri-o.pfa
-share/a2ps/fonts/ptmb-o.pfa
-share/a2ps/fonts/ptmbi-o.pfa
-share/a2ps/fonts/phvr-o.pfa
-share/a2ps/fonts/phvro-o.pfa
-share/a2ps/fonts/phvb-o.pfa
-share/a2ps/fonts/phvbo-o.pfa
-share/a2ps/fonts/crr35__i.pfb
-share/a2ps/fonts/crr36__i.pfb
-share/a2ps/fonts/crr55__i.pfb
-share/a2ps/fonts/crr56__i.pfb
-share/a2ps/fonts/colle10.pfb
-share/a2ps/fonts/colle8.pfb
-share/a2ps/fonts/colle9.pfb
-share/a2ps/fonts/textb18.pfb
-share/a2ps/fonts/textb19.pfb
-share/a2ps/fonts/textb20.pfb
-share/a2ps/ogonkify/ascii.enc
-share/a2ps/ogonkify/adobe.enc
-share/a2ps/ogonkify/latin1.enc
-share/a2ps/ogonkify/latin2.enc
-share/a2ps/ogonkify/latin3.enc
-share/a2ps/ogonkify/latin4.enc
-share/a2ps/ogonkify/latin5.enc
-share/a2ps/ogonkify/latin6.enc
-share/a2ps/ogonkify/cp1250.enc
-share/a2ps/ogonkify/ogonki.enc
-share/a2ps/ogonkify/mac.enc
-share/a2ps/ogonkify/ibmpc.enc
-share/a2ps/ogonkify/hp.enc
-share/a2ps/ogonkify/pcrr-o.ps
-share/a2ps/ogonkify/pcrro-o.ps
-share/a2ps/ogonkify/pcrb-o.ps
-share/a2ps/ogonkify/pcrbo-o.ps
-share/a2ps/ogonkify/ptmr-o.ps
-share/a2ps/ogonkify/ptmri-o.ps
-share/a2ps/ogonkify/ptmb-o.ps
-share/a2ps/ogonkify/ptmbi-o.ps
-share/a2ps/ogonkify/phvr-o.ps
-share/a2ps/ogonkify/phvro-o.ps
-share/a2ps/ogonkify/phvb-o.ps
-share/a2ps/ogonkify/README
-share/a2ps/ogonkify/phvbo-o.ps
-share/a2ps/ogonkify/allchars.ps
-share/a2ps/ogonkify/compose.ps
-share/a2ps/ogonkify/helper.ps
-share/a2ps/ogonkify/printenc.ps
-share/a2ps/sheets/sheets.map
+share/a2ps/encoding/ascii.edf
+share/a2ps/encoding/encoding.map
+share/a2ps/encoding/hp.edf
+share/a2ps/encoding/ibm-cp437.edf
+share/a2ps/encoding/ibm-cp850.edf
+share/a2ps/encoding/iso1.edf
+share/a2ps/encoding/iso10.edf
+share/a2ps/encoding/iso15.edf
+share/a2ps/encoding/iso2.edf
+share/a2ps/encoding/iso3.edf
+share/a2ps/encoding/iso4.edf
+share/a2ps/encoding/iso5.edf
+share/a2ps/encoding/iso7.edf
+share/a2ps/encoding/iso9.edf
+share/a2ps/encoding/koi8.edf
+share/a2ps/encoding/mac.edf
+share/a2ps/encoding/ms-cp1250.edf
+share/a2ps/fonts/pcfont.pfa
+share/a2ps/ppd/README
+share/a2ps/ppd/level1.ppd
+share/a2ps/ppd/level2.ppd
+share/a2ps/ps/a2ps.hdr
+share/a2ps/ps/base.ps
+share/a2ps/ps/bold.pro
+share/a2ps/ps/bw.pro
+share/a2ps/ps/color.hdr
+share/a2ps/ps/color.pro
+share/a2ps/ps/diff.pro
+share/a2ps/ps/ehandler.ps
+share/a2ps/ps/gray.pro
+share/a2ps/ps/gray2.pro
+share/a2ps/ps/matrix.pro
+share/a2ps/sheets/68000.ssh
+share/a2ps/sheets/a2psrc.ssh
 share/a2ps/sheets/ada.ssh
 share/a2ps/sheets/c.ssh
 share/a2ps/sheets/caml.ssh
 share/a2ps/sheets/card.ssh
+share/a2ps/sheets/chlog.ssh
+share/a2ps/sheets/claire.ssh
 share/a2ps/sheets/clisp.ssh
+share/a2ps/sheets/coqv.ssh
 share/a2ps/sheets/cpp.ssh
 share/a2ps/sheets/csh.ssh
+share/a2ps/sheets/dc_shell.ssh
 share/a2ps/sheets/eiffel.ssh
 share/a2ps/sheets/elisp.ssh
+share/a2ps/sheets/eps.ssh
+share/a2ps/sheets/for-fixed.ssh
+share/a2ps/sheets/for-free.ssh
+share/a2ps/sheets/for77-fixed.ssh
+share/a2ps/sheets/for77-free.ssh
+share/a2ps/sheets/for77kwds.ssh
+share/a2ps/sheets/for90-fixed.ssh
+share/a2ps/sheets/for90-free.ssh
+share/a2ps/sheets/for90kwds.ssh
 share/a2ps/sheets/fortran.ssh
+share/a2ps/sheets/gmake.ssh
 share/a2ps/sheets/gnuc.ssh
 share/a2ps/sheets/html.ssh
+share/a2ps/sheets/idl.ssh
+share/a2ps/sheets/initora.ssh
+share/a2ps/sheets/is5rul.ssh
 share/a2ps/sheets/java.ssh
+share/a2ps/sheets/lace.ssh
 share/a2ps/sheets/lex.ssh
 share/a2ps/sheets/mail.ssh
 share/a2ps/sheets/make.ssh
+share/a2ps/sheets/matlab4.ssh
+share/a2ps/sheets/mib.ssh
 share/a2ps/sheets/modula2.ssh
 share/a2ps/sheets/modula3.ssh
+share/a2ps/sheets/o2c.ssh
 share/a2ps/sheets/oberon.ssh
 share/a2ps/sheets/objc.ssh
-share/a2ps/sheets/pascal.ssh
-share/a2ps/sheets/perl.ssh
-share/a2ps/sheets/pre.ssh
-share/a2ps/sheets/pretex.ssh
-share/a2ps/sheets/scheme.ssh
-share/a2ps/sheets/ssh.ssh
-share/a2ps/sheets/symbols.ssh
-share/a2ps/sheets/tcl.ssh
-share/a2ps/sheets/texscript.ssh
-share/a2ps/sheets/tk.ssh
-share/a2ps/sheets/udiff.ssh
-share/a2ps/sheets/wdiff.ssh
-share/a2ps/sheets/yacc.ssh
-share/a2ps/sheets/68000.ssh
-share/a2ps/sheets/a2psrc.ssh
-share/a2ps/sheets/chlog.ssh
-share/a2ps/sheets/claire.ssh
-share/a2ps/sheets/coqv.ssh
-share/a2ps/sheets/eps.ssh
-share/a2ps/sheets/idl.ssh
-share/a2ps/sheets/initora.ssh
-share/a2ps/sheets/is5rul.ssh
-share/a2ps/sheets/lace.ssh
-share/a2ps/sheets/matlab4.ssh
-share/a2ps/sheets/mib.ssh
-share/a2ps/sheets/o2c.ssh
 share/a2ps/sheets/octave.ssh
-share/a2ps/sheets/oldperl.ssh
 share/a2ps/sheets/oracle.ssh
+share/a2ps/sheets/pascal.ssh
+share/a2ps/sheets/perl.ssh
 share/a2ps/sheets/plsql.ssh
 share/a2ps/sheets/ppd.ssh
-share/a2ps/sheets/ps.ssh
+share/a2ps/sheets/pre.ssh
+share/a2ps/sheets/pretex.ssh
 share/a2ps/sheets/prolog.ssh
 share/a2ps/sheets/promela.ssh
+share/a2ps/sheets/ps.ssh
 share/a2ps/sheets/python.ssh
+share/a2ps/sheets/rexx.ssh
 share/a2ps/sheets/sather.ssh
+share/a2ps/sheets/scheme.ssh
 share/a2ps/sheets/sdl88.ssh
 share/a2ps/sheets/sh.ssh
+share/a2ps/sheets/sheets.map
 share/a2ps/sheets/sql.ssh
 share/a2ps/sheets/sql92.ssh
+share/a2ps/sheets/ssh.ssh
+share/a2ps/sheets/symbols.ssh
+share/a2ps/sheets/tcl.ssh
+share/a2ps/sheets/tclx.ssh
+share/a2ps/sheets/tcsh.ssh
 share/a2ps/sheets/tex.ssh
 share/a2ps/sheets/texinfo.ssh
+share/a2ps/sheets/texscript.ssh
+share/a2ps/sheets/tk.ssh
+share/a2ps/sheets/udiff.ssh
 share/a2ps/sheets/unity.ssh
 share/a2ps/sheets/verilog.ssh
 share/a2ps/sheets/vhdl.ssh
 share/a2ps/sheets/vrml.ssh
+share/a2ps/sheets/vtcl.ssh
+share/a2ps/sheets/wdiff.ssh
+share/a2ps/sheets/yacc.ssh
 share/a2ps/sheets/zsh.ssh
-share/a2ps/encoding/encoding.map
-share/a2ps/encoding/ascii.edf
-share/a2ps/encoding/cp1250.edf
-share/a2ps/encoding/hp.edf
-share/a2ps/encoding/ibmpc.edf
-share/a2ps/encoding/iso1.edf
-share/a2ps/encoding/iso2.edf
-share/a2ps/encoding/iso3.edf
-share/a2ps/encoding/iso4.edf
-share/a2ps/encoding/iso5.edf
-share/a2ps/encoding/iso7.edf
-share/a2ps/encoding/iso9.edf
-share/a2ps/encoding/iso10.edf
-share/a2ps/encoding/iso15.edf
-share/a2ps/encoding/koi8.edf
-share/a2ps/encoding/mac.edf
-share/a2ps/encoding/pcg.edf
-share/a2ps/ppd/README
-share/a2ps/ppd/level1.ppd
-share/a2ps/ppd/level2.ppd
+share/emacs/site-lisp/a2ps-print.el
+share/emacs/site-lisp/a2ps.el
+share/emacs/site-lisp/make-regexp.el
 share/locale/ca/LC_MESSAGES/a2ps.mo
 share/locale/cs/LC_MESSAGES/a2ps.mo
 share/locale/da/LC_MESSAGES/a2ps.mo
@@ -251,17 +199,74 @@ share/locale/fr/LC_MESSAGES/a2ps.mo
 share/locale/it/LC_MESSAGES/a2ps.mo
 share/locale/ko/LC_MESSAGES/a2ps.mo
 share/locale/nl/LC_MESSAGES/a2ps.mo
+share/locale/no/LC_MESSAGES/a2ps.mo
 share/locale/pl/LC_MESSAGES/a2ps.mo
 share/locale/pt/LC_MESSAGES/a2ps.mo
 share/locale/ru/LC_MESSAGES/a2ps.mo
 share/locale/sl/LC_MESSAGES/a2ps.mo
 share/locale/sv/LC_MESSAGES/a2ps.mo
 share/locale/tr/LC_MESSAGES/a2ps.mo
+share/ogonkify/README
+share/ogonkify/adobe.enc
+share/ogonkify/afm/pcrb-o.afm
+share/ogonkify/afm/pcrbo-o.afm
+share/ogonkify/afm/pcrr-o.afm
+share/ogonkify/afm/pcrro-o.afm
+share/ogonkify/afm/phvb-o.afm
+share/ogonkify/afm/phvbo-o.afm
+share/ogonkify/afm/phvr-o.afm
+share/ogonkify/afm/phvro-o.afm
+share/ogonkify/afm/ptmb-o.afm
+share/ogonkify/afm/ptmbi-o.afm
+share/ogonkify/afm/ptmr-o.afm
+share/ogonkify/afm/ptmri-o.afm
+share/ogonkify/allchars.ps
+share/ogonkify/ascii.enc
+share/ogonkify/compose.ps
+share/ogonkify/cp1250.enc
+share/ogonkify/fonts/pcrb-o.pfa
+share/ogonkify/fonts/pcrbo-o.pfa
+share/ogonkify/fonts/pcrr-o.pfa
+share/ogonkify/fonts/pcrro-o.pfa
+share/ogonkify/fonts/phvb-o.pfa
+share/ogonkify/fonts/phvbo-o.pfa
+share/ogonkify/fonts/phvr-o.pfa
+share/ogonkify/fonts/phvro-o.pfa
+share/ogonkify/fonts/ptmb-o.pfa
+share/ogonkify/fonts/ptmbi-o.pfa
+share/ogonkify/fonts/ptmr-o.pfa
+share/ogonkify/fonts/ptmri-o.pfa
+share/ogonkify/helper.ps
+share/ogonkify/hp.enc
+share/ogonkify/ibmpc.enc
+share/ogonkify/latin1.enc
+share/ogonkify/latin2.enc
+share/ogonkify/latin3.enc
+share/ogonkify/latin4.enc
+share/ogonkify/latin5.enc
+share/ogonkify/latin6.enc
+share/ogonkify/mac.enc
+share/ogonkify/ogonki.enc
+share/ogonkify/pcrb-o.ps
+share/ogonkify/pcrbo-o.ps
+share/ogonkify/pcrr-o.ps
+share/ogonkify/pcrro-o.ps
+share/ogonkify/phvb-o.ps
+share/ogonkify/phvbo-o.ps
+share/ogonkify/phvr-o.ps
+share/ogonkify/phvro-o.ps
+share/ogonkify/printenc.ps
+share/ogonkify/ptmb-o.ps
+share/ogonkify/ptmbi-o.ps
+share/ogonkify/ptmr-o.ps
+share/ogonkify/ptmri-o.ps
+@dirrm share/ogonkify/fonts
+@dirrm share/ogonkify/afm
+@dirrm share/ogonkify
+@dirrm share/a2ps/sheets
 @dirrm share/a2ps/ps
-@dirrm share/a2ps/afm
+@dirrm share/a2ps/ppd
 @dirrm share/a2ps/fonts
-@dirrm share/a2ps/ogonkify
-@dirrm share/a2ps/sheets
 @dirrm share/a2ps/encoding
-@dirrm share/a2ps/ppd
+@dirrm share/a2ps/afm
 @dirrm share/a2ps