Upgrade a2ps to version 4.10.4

3 files changed, 22 insertions, 14 deletions

diff --git a/print/a2ps-letter/Makefile b/print/a2ps-letter/Makefile
index e1b700f3a347..cd44bde83f1a 100644
--- a/print/a2ps-letter/Makefile
+++ b/print/a2ps-letter/Makefile
@@ -3,17 +3,19 @@
 # Date created:         15 July 1998
 # Whom:                 Chuck Robey (chuckr@freebsd.org)
 #
-# $Id: Makefile,v 1.22 1998/11/20 04:15:00 asami Exp $
+# $Id: Makefile,v 1.23 1998/11/22 01:56:20 obrien Exp $
 #
 
-DISTNAME=	a2ps-4.10.3
-PKGNAME=	a2ps-${PAPERSIZE}-4.10.3
+DISTNAME=	a2ps-4.10.4
+PKGNAME=	a2ps-${PAPERSIZE}-4.10.4
 CATEGORIES=	print
 MASTER_SITES=	http://www-inf.enst.fr/~demaille/ftp/a2ps/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} sheets.map.fixed
 
 MAINTAINER=	chuckr@FreeBSD.org
 
 GNU_CONFIGURE=	yes
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAN1=		a2ps.1 ogonkify.1 card.1 psmandup.1 fixps.1 pdiff.1
 
 PAPERSIZE?=	letter
@@ -31,9 +33,13 @@ CONFIGURE_ARGS=	--with-medium=${PAPERSIZECNF}
 	@${FALSE}
 .endif
 
+post-extract:
+	$(CP) $(DISTDIR)/sheets.map.fixed $(WRKSRC)/sheets/sheets.map
+
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 	strip ${PREFIX}/bin/a2ps
 	(cd ${WRKSRC}/doc; ${MAKE} install)
+	$(RM) -f $(PREFIX)/lib/liba2ps.la
 
 .include <bsd.port.mk>
diff --git a/print/a2ps-letter/distinfo b/print/a2ps-letter/distinfo
index d2e9f976acdd..4b4586e901e3 100644
--- a/print/a2ps-letter/distinfo
+++ b/print/a2ps-letter/distinfo
@@ -1 +1,2 @@
-MD5 (a2ps-4.10.3.tar.gz) = b40f0576821c3257a907736226117ee6
+MD5 (a2ps-4.10.4.tar.gz) = e976c3502e347d323164a5d40c03f17a
+MD5 (sheets.map.fixed) = d9abef250f395791e934bf788f5fe6d1
diff --git a/print/a2ps-letter/pkg-plist b/print/a2ps-letter/pkg-plist
index 50770352214c..788538239b2a 100644
--- a/print/a2ps-letter/pkg-plist
+++ b/print/a2ps-letter/pkg-plist
@@ -23,6 +23,8 @@ 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/pcfont.afm
+share/a2ps/fonts/pcfont.pfa
 share/a2ps/fonts/pcrr-o.pfa
 share/a2ps/fonts/pcrro-o.pfa
 share/a2ps/fonts/pcrb-o.pfa
@@ -150,9 +152,10 @@ share/a2ps/sheets/vrml.ssh
 share/a2ps/sheets/zsh.ssh
 share/a2ps/encoding/encoding.map
 share/a2ps/encoding/ascii.edf
-share/a2ps/encoding/cp1250.edf
+share/a2ps/encoding/ms-cp1250.edf
 share/a2ps/encoding/hp.edf
-share/a2ps/encoding/ibmpc.edf
+share/a2ps/encoding/ibm-cp437.edf
+share/a2ps/encoding/ibm-cp850.edf
 share/a2ps/encoding/iso1.edf
 share/a2ps/encoding/iso2.edf
 share/a2ps/encoding/iso3.edf
@@ -164,7 +167,6 @@ 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/afm/make_fonts_map.sh
 share/a2ps/afm/fonts.map
 share/a2ps/afm/colle10.afm
@@ -226,15 +228,15 @@ share/emacs/site-lisp/a2ps.el
 share/emacs/site-lisp/a2ps-print.el
 bin/a2ps
 bin/ogonkify
-bin/compose
+bin/composeglyphs
 bin/fixnt
 bin/texi2dvi4a2ps
 bin/card
 bin/psmandup
 bin/fixps
 bin/pdiff
-@unexec install-info --info-dir=%D/info %D/info/a2ps.info --delete
-@unexec install-info --info-dir=%D/info %D/info/ogonkify.info --delete
+@unexec install-info --delete --info-dir=%D/info %D/info/a2ps.info
+@unexec install-info --delete --info-dir=%D/info %D/info/ogonkify.info
 info/ogonkify.info
 info/a2ps.info
 info/a2ps.info-1
@@ -252,12 +254,11 @@ include/liba2ps.h
 lib/liba2ps.so.1
 lib/liba2ps.so
 lib/liba2ps.a
-lib/liba2ps.la
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @dirrm share/a2ps/ps
-@dirrm share/a2ps/afm  
-@dirrm share/a2ps/fonts 
+@dirrm share/a2ps/afm
+@dirrm share/a2ps/fonts
 @dirrm share/a2ps/ogonkify
-@dirrm share/a2ps/sheets  
+@dirrm share/a2ps/sheets
 @dirrm share/a2ps/encoding