3 files changed, 212 insertions, 171 deletions

diff --git a/print/a2ps-letter/Makefile b/print/a2ps-letter/Makefile
index ed3d24d8b818..6487aa62ff8c 100644
--- a/print/a2ps-letter/Makefile
+++ b/print/a2ps-letter/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:    a2ps
-# Version required:     4.9.9
-# Date created:         18 August 1997
+# Version required:     4.10.2
+# Date created:         17 May 1998
 # Whom:                 Chuck Robey (chuckr@freebsd.org)
 #
-# $Id: Makefile,v 1.14 1998/02/26 04:31:49 asami Exp $
+# $Id: Makefile,v 1.15 1998/04/19 03:39:04 itojun Exp $
 #
 
-DISTNAME=	a2ps-4.10
-PKGNAME=	a2ps-${PAPERSIZE}-4.10
+DISTNAME=	a2ps-4.10.2
+PKGNAME=	a2ps-${PAPERSIZE}-4.10.2
 CATEGORIES=	print
 MASTER_SITES=	http://www-inf.enst.fr/~demaille/ftp/a2ps/
 
@@ -46,6 +46,9 @@ pre-configure:
 post-install:
 	${LDCONFIG} -R ${PREFIX}/lib
 	strip ${PREFIX}/bin/a2ps
+	$(INSTALL_DATA) $(WRKSRC)/doc/a2ps.info* $(PREFIX)/info
+	$(INSTALL_MAN) $(WRKSRC)/doc/a2ps.1 $(PREFIX)/man/man1
+	-/usr/bin/install-info --info-dir=$(PREFIX)/info $(WRKSRC)/doc/a2ps.info
 
 .include <bsd.port.mk>
 
diff --git a/print/a2ps-letter/distinfo b/print/a2ps-letter/distinfo
index eb6f4de51a9e..d4bfa0db778d 100644
--- a/print/a2ps-letter/distinfo
+++ b/print/a2ps-letter/distinfo
@@ -1 +1 @@
-MD5 (a2ps-4.10.tar.gz) = d5c430a05b648e90f3294654538113eb
+MD5 (a2ps-4.10.2.tar.gz) = 85170689eb92c89adcdfe9909c8d0385
diff --git a/print/a2ps-letter/pkg-plist b/print/a2ps-letter/pkg-plist
index 83e56ccbc0aa..28aa4901ea8d 100644
--- a/print/a2ps-letter/pkg-plist
+++ b/print/a2ps-letter/pkg-plist
@@ -1,44 +1,165 @@
-bin/a2ps
-bin/composite
-bin/ogonkify
-bin/texi2dvi4a2ps
-etc/a2ps.cfg
-include/liba2ps.h
-@unexec install-info --delete %D/info/a2ps.info %D/info/dir
-@unexec install-info --delete %D/info/regex.info %D/info/dir
-info/a2ps.info
-info/a2ps.info-1
-info/a2ps.info-2
-info/a2ps.info-3
-info/a2ps.info-4
-info/ogonkify.info
-info/regex.info
-info/regex.info-1
-info/regex.info-2
-info/regex.info-3
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info %D/info/a2ps.info %D/info/dir
-@exec install-info %D/info/regex.info %D/info/dir
-lib/liba2ps.a
-lib/liba2ps.la
-lib/liba2ps.so.1.0
-@exec /sbin/ldconfig -R %B
-@unexec /sbin/ldconfig -R
-man/man1/a2ps.1.gz
-man/man1/ogonkify.1.gz
 share/a2ps/README
-share/a2ps/afm/Courier-Bold-Ogonki.afm
-share/a2ps/afm/Courier-BoldOblique-Ogonki.afm
-share/a2ps/afm/Courier-Oblique-Ogonki.afm
-share/a2ps/afm/Courier-Ogonki.afm
-share/a2ps/afm/Helvetica-Bold-Ogonki.afm
-share/a2ps/afm/Helvetica-BoldOblique-Ogonki.afm
-share/a2ps/afm/Helvetica-Oblique-Ogonki.afm
-share/a2ps/afm/Helvetica-Ogonki.afm
-share/a2ps/afm/Times-Bold-Ogonki.afm
-share/a2ps/afm/Times-BoldItalic-Ogonki.afm
-share/a2ps/afm/Times-Italic-Ogonki.afm
-share/a2ps/afm/Times-Roman-Ogonki.afm
+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/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/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/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/ogonkify/README
+share/locale/ca/LC_MESSAGES/a2ps.mo
+share/locale/cs/LC_MESSAGES/a2ps.mo
+share/locale/da/LC_MESSAGES/a2ps.mo
+share/locale/de/LC_MESSAGES/a2ps.mo
+share/locale/es/LC_MESSAGES/a2ps.mo
+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/pl/LC_MESSAGES/a2ps.mo
+share/locale/pt/LC_MESSAGES/a2ps.mo
+share/locale/tr/LC_MESSAGES/a2ps.mo
+share/locale/sl/LC_MESSAGES/a2ps.mo
+share/locale/sv/LC_MESSAGES/a2ps.mo
+share/a2ps/sheets/sheets.map
+share/a2ps/sheets/ada.ssh
+share/a2ps/sheets/c.ssh
+share/a2ps/sheets/caml.ssh
+share/a2ps/sheets/card.ssh
+share/a2ps/sheets/clisp.ssh
+share/a2ps/sheets/cpp.ssh
+share/a2ps/sheets/csh.ssh
+share/a2ps/sheets/eiffel.ssh
+share/a2ps/sheets/elisp.ssh
+share/a2ps/sheets/fortran.ssh
+share/a2ps/sheets/gnuc.ssh
+share/a2ps/sheets/java.ssh
+share/a2ps/sheets/lex.ssh
+share/a2ps/sheets/mail.ssh
+share/a2ps/sheets/make.ssh
+share/a2ps/sheets/modula2.ssh
+share/a2ps/sheets/modula3.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/o2c.ssh
+share/a2ps/sheets/octave.ssh
+share/a2ps/sheets/oldperl.ssh
+share/a2ps/sheets/oracle.ssh
+share/a2ps/sheets/plsql.ssh
+share/a2ps/sheets/ppd.ssh
+share/a2ps/sheets/ps.ssh
+share/a2ps/sheets/prolog.ssh
+share/a2ps/sheets/promela.ssh
+share/a2ps/sheets/python.ssh
+share/a2ps/sheets/sather.ssh
+share/a2ps/sheets/sdl88.ssh
+share/a2ps/sheets/sh.ssh
+share/a2ps/sheets/sql.ssh
+share/a2ps/sheets/sql92.ssh
+share/a2ps/sheets/tex.ssh
+share/a2ps/sheets/texinfo.ssh
+share/a2ps/sheets/unity.ssh
+share/a2ps/sheets/verilog.ssh
+share/a2ps/sheets/vhdl.ssh
+share/a2ps/sheets/vrml.ssh
+share/a2ps/sheets/zsh.ssh
+share/a2ps/encoding/encoding.map
+share/a2ps/encoding/ascii.edf
+share/a2ps/encoding/hp.edf
+share/a2ps/encoding/iso5.edf
+share/a2ps/encoding/latin1.edf
+share/a2ps/encoding/latin3.edf
+share/a2ps/encoding/latin5.edf
+share/a2ps/encoding/mac.edf
+share/a2ps/encoding/cp1250.edf
+share/a2ps/encoding/ibmpc.edf
+share/a2ps/encoding/koi8.edf
+share/a2ps/encoding/latin2.edf
+share/a2ps/encoding/latin4.edf
+share/a2ps/encoding/latin6.edf
+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
@@ -46,8 +167,6 @@ 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/fonts.map
-share/a2ps/afm/make_fonts_map.sh
 share/a2ps/afm/pbkd.afm
 share/a2ps/afm/pbkdi.afm
 share/a2ps/afm/pbkl.afm
@@ -82,131 +201,50 @@ share/a2ps/afm/pzdr.afm
 share/a2ps/afm/textb18.afm
 share/a2ps/afm/textb19.afm
 share/a2ps/afm/textb20.afm
-share/a2ps/encoding/ascii.edf
-share/a2ps/encoding/cp1250.edf
-share/a2ps/encoding/encoding.map
-share/a2ps/encoding/hp.edf
-share/a2ps/encoding/ibmpc.edf
-share/a2ps/encoding/iso5.edf
-share/a2ps/encoding/koi8.edf
-share/a2ps/encoding/latin1.edf
-share/a2ps/encoding/latin2.edf
-share/a2ps/encoding/latin3.edf
-share/a2ps/encoding/latin4.edf
-share/a2ps/encoding/latin5.edf
-share/a2ps/encoding/latin6.edf
-share/a2ps/encoding/mac.edf
+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/ppd/README
 share/a2ps/ppd/level1.ppd
 share/a2ps/ppd/level2.ppd
-share/a2ps/ps/Courier-Bold-Ogonki.pfa
-share/a2ps/ps/Courier-BoldOblique-Ogonki.pfa
-share/a2ps/ps/Courier-Oblique-Ogonki.pfa
-share/a2ps/ps/Courier-Ogonki.pfa
-share/a2ps/ps/Helvetica-Bold-Ogonki.pfa
-share/a2ps/ps/Helvetica-BoldOblique-Ogonki.pfa
-share/a2ps/ps/Helvetica-Oblique-Ogonki.pfa
-share/a2ps/ps/Helvetica-Ogonki.pfa
-share/a2ps/ps/Times-Bold-Ogonki.pfa
-share/a2ps/ps/Times-BoldItalic-Ogonki.pfa
-share/a2ps/ps/Times-Italic-Ogonki.pfa
-share/a2ps/ps/Times-Roman-Ogonki.pfa
-share/a2ps/ps/a2ps.hdr
-share/a2ps/ps/base.ps
-share/a2ps/ps/bw.pro
-share/a2ps/ps/colle10.pfb
-share/a2ps/ps/colle8.pfb
-share/a2ps/ps/colle9.pfb
-share/a2ps/ps/color.hdr
-share/a2ps/ps/color.pro
-share/a2ps/ps/crr35__i.pfb
-share/a2ps/ps/crr36__i.pfb
-share/a2ps/ps/crr55__i.pfb
-share/a2ps/ps/crr56__i.pfb
-share/a2ps/ps/ehandler.ps
-share/a2ps/ps/gray.pro
-share/a2ps/ps/gray2.pro
-share/a2ps/ps/matrix.pro
-share/a2ps/ps/textb18.pfb
-share/a2ps/ps/textb19.pfb
-share/a2ps/ps/textb20.pfb
-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/eiffel.ssh
-share/a2ps/sheets/elisp.ssh
-share/a2ps/sheets/eps.ssh
-share/a2ps/sheets/fortran.ssh
-share/a2ps/sheets/gnuc.ssh
-share/a2ps/sheets/initora.ssh
-share/a2ps/sheets/idl.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/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/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/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/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/tex.ssh
-share/a2ps/sheets/texinfo.ssh
-share/a2ps/sheets/texscript.ssh
-share/a2ps/sheets/tk.ssh
-share/a2ps/sheets/unity.ssh
-share/a2ps/sheets/verilog.ssh
-share/a2ps/sheets/vhdl.ssh
-share/a2ps/sheets/vrml.ssh
-share/a2ps/sheets/yacc.ssh
-share/a2ps/sheets/zsh.ssh
-share/locale/ca/LC_MESSAGES/a2ps.mo
-share/locale/cs/LC_MESSAGES/a2ps.mo
-share/locale/de/LC_MESSAGES/a2ps.mo
-share/locale/es/LC_MESSAGES/a2ps.mo
-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/pl/LC_MESSAGES/a2ps.mo
-share/locale/tr/LC_MESSAGES/a2ps.mo
-@dirrm share/a2ps/afm
-@dirrm share/a2ps/encoding
-@dirrm share/a2ps/ppd
+share/emacs/site-lisp/make-regexp.el
+share/emacs/site-lisp/a2ps.el
+bin/a2ps
+bin/texi2dvi4a2ps
+bin/card
+bin/psmandup
+bin/fixps
+bin/pdiff
+bin/ogonkify
+bin/compose
+@unexec install-info --info-dir=%D/info %D/info/a2ps.info --delete
+@unexec install-info --info-dir=%D/info %D/info/ogonkify.info --delete
+info/ogonkify.info
+info/a2ps.info
+info/a2ps.info-1
+info/a2ps.info-2
+info/a2ps.info-3
+info/a2ps.info-4
+info/a2ps.info-5
+@exec install-info --info-dir=%D/info %D/info/a2ps.info
+@exec install-info --info-dir=%D/info %D/info/ogonkify.info
+man/man1/a2ps.1.gz
+man/man1/ogonkify.1.gz
+include/liba2ps.h
+lib/liba2ps.la
+lib/liba2ps.so.1.0
+lib/liba2ps.a
+@exec /bin/ldconfig -m %D/lib
 @dirrm share/a2ps/ps
+@dirrm share/a2ps/afm
+@dirrm share/a2ps/fonts
+@dirrm share/a2ps/ogonkify
 @dirrm share/a2ps/sheets
-@dirrm share/a2ps
+@dirrm share/a2ps/encoding