Update to version 4.9.9 and portlint.

PR:		5756
Submitted by:	Brian Handy <handy@lambic.spasci.com>

3 files changed, 51 insertions, 29 deletions

diff --git a/print/a2ps-letter/Makefile b/print/a2ps-letter/Makefile
index 13d08724f587..3965a3527c7f 100644
--- a/print/a2ps-letter/Makefile
+++ b/print/a2ps-letter/Makefile
@@ -1,21 +1,19 @@
 # New ports collection makefile for:    a2ps
-# Version required:     4.9.7
+# Version required:     4.9.9
 # Date created:         18 August 1997
 # Whom:                 Chuck Robey (chuckr@freebsd.org)
 #
-# $Id: Makefile,v 1.10 1997/10/11 02:57:02 chuckr Exp $
+# $Id: Makefile,v 1.11 1997/11/10 11:23:14 asami Exp $
 #
 
-DISTNAME=	a2ps
-PKGNAME=	a2ps-${PAPERSIZE}-4.9.8
+DISTNAME=	a2ps-4.9.9
+PKGNAME=	a2ps-${PAPERSIZE}-4.9.9
 CATEGORIES=	print
 MASTER_SITES=	http://www-inf.enst.fr/~demaille/ftp/a2ps/
-DISTFILES=	a2ps-4.9.8.tar.gz
 
 MAINTAINER=	chuckr@FreeBSD.org
 
 MANUAL_PACKAGE_BUILD=	PAPERSIZE has to be set to Letter A4
-WRKSRC=		$(WRKDIR)/$(DISTNAME)-4.9.8
 GNU_CONFIGURE=	yes
 MAN1=		a2ps.1 ogonkify.1
 
@@ -23,7 +21,6 @@ PAPERSIZE?=
 STRIP=
 CONFIGURE_ARGS=	--with-medium=$(PAPERSIZE)
 
-
 Letter::
 	$(MAKE) PAPERSIZE=Letter
 
@@ -43,34 +40,34 @@ a4::
 	$(MAKE) PAPERSIZE=A4
 
 pre-build:
-	/usr/bin/touch $(WRKSRC)/doc/*.info
-	/usr/bin/touch $(WRKSRC)/doc/*.dvi
+	${TOUCH} $(WRKSRC)/doc/*.info
+	${TOUCH} $(WRKSRC)/doc/*.dvi
 
 pre-configure:
 .if empty(PAPERSIZE)
-	@echo
-	@echo "PAPERSIZE not specified."
-	@echo
-	@echo "Must specify PAPERSIZE as one of A4, Letter, or Letterdj, either"
-	@echo "using setenv, or via Makefile targets of the same name.  Note"
-	@echo "that each PAPERSIZE has a leading capital letter, and Letterdj"
-	@echo "allows a slightly larger margins for DeskJets."
+	@${ECHO}
+	@${ECHO} "PAPERSIZE not specified."
+	@${ECHO}
+	@${ECHO} "Must specify PAPERSIZE as one of A4, Letter, or Letterdj, either"
+	@${ECHO} "using setenv, or via Makefile targets of the same name.  Note"
+	@${ECHO} "that each PAPERSIZE has a leading capital letter, and Letterdj"
+	@${ECHO} "allows a slightly larger margins for DeskJets."
 	@false
 .elif $(PAPERSIZE)!=A4 && $(PAPERSIZE)!=Letter && $(PAPERSIZE)!=Letterdj
-	@echo
-	@echo "PAPERSIZE incorrect value: $(PAPERSIZE)."
-	@echo
-	@echo "Must specify PAPERSIZE as one of A4, Letter, or Letterdj, either"
-	@echo "using setenv, or via Makefile targets of the same name.  Note"
-	@echo "that each PAPERSIZE has a leading capital letter, and Letterdj"
-	@echo "allows a slightly larger margins for DeskJets."
+	@${ECHO}
+	@${ECHO} "PAPERSIZE incorrect value: $(PAPERSIZE)."
+	@${ECHO}
+	@${ECHO} "Must specify PAPERSIZE as one of A4, Letter, or Letterdj, either"
+	@${ECHO} "using setenv, or via Makefile targets of the same name.  Note"
+	@${ECHO} "that each PAPERSIZE has a leading capital letter, and Letterdj"
+	@${ECHO} "allows a slightly larger margins for DeskJets."
 	@false
 .endif
-	echo $(PAPERSIZE) > $(WRKDIR)/.media
+	${ECHO} $(PAPERSIZE) > $(WRKDIR)/.media
 
 .include <bsd.port.mk>
 
 .if exists($(WRKDIR)/.media)
 PAPERSIZE=
-PAPERSIZE!=	cat $(WRKDIR)/.media
+PAPERSIZE!=	${CAT} $(WRKDIR)/.media
 .endif
diff --git a/print/a2ps-letter/distinfo b/print/a2ps-letter/distinfo
index 60fe777a76fd..3ce3b41f6f19 100644
--- a/print/a2ps-letter/distinfo
+++ b/print/a2ps-letter/distinfo
@@ -1 +1 @@
-MD5 (a2ps-4.9.8.tar.gz) = f03cbe4ce07942974279be125b2b9e02
+MD5 (a2ps-4.9.9.tar.gz) = 17e3d399d1ef6c05130ebe8e8414e2e6
diff --git a/print/a2ps-letter/pkg-plist b/print/a2ps-letter/pkg-plist
index 7187e17c164d..9712dc6af8f2 100644
--- a/print/a2ps-letter/pkg-plist
+++ b/print/a2ps-letter/pkg-plist
@@ -1,3 +1,4 @@
+share/a2ps/README
 share/a2ps/ps/base.ps
 share/a2ps/ps/bw.pro
 share/a2ps/ps/gray.pro
@@ -99,18 +100,24 @@ share/a2ps/sheets/a2psrc.ssh
 share/a2ps/sheets/ada.ssh
 share/a2ps/sheets/cpp.ssh
 share/a2ps/sheets/c.ssh
+share/a2ps/sheets/csh.ssh
 share/a2ps/sheets/caml.ssh
 share/a2ps/sheets/chlog.ssh
 share/a2ps/sheets/claire.ssh
 share/a2ps/sheets/clisp.ssh
 share/a2ps/sheets/coqv.ssh
 share/a2ps/sheets/eiffel.ssh
+share/a2ps/sheets/elisp.ssh
+share/a2ps/sheets/eps.ssh
+share/a2ps/sheets/gnuc.ssh
 share/a2ps/sheets/fortran.ssh
 share/a2ps/sheets/initora.ssh
 share/a2ps/sheets/java.ssh
 share/a2ps/sheets/lace.ssh
 share/a2ps/sheets/lex.ssh
+share/a2ps/sheets/make.ssh
 share/a2ps/sheets/mail.ssh
+share/a2ps/sheets/modula2.ssh
 share/a2ps/sheets/modula3.ssh
 share/a2ps/sheets/o2c.ssh
 share/a2ps/sheets/oberon.ssh
@@ -120,6 +127,7 @@ 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/prolog.ssh
@@ -132,6 +140,7 @@ share/a2ps/sheets/sh.ssh
 share/a2ps/sheets/sql.ssh
 share/a2ps/sheets/sql92.ssh
 share/a2ps/sheets/ssh.ssh
+share/a2ps/sheets/texinfo.ssh
 share/a2ps/sheets/tcl.ssh
 share/a2ps/sheets/tex.ssh
 share/a2ps/sheets/tk.ssh
@@ -155,23 +164,39 @@ share/a2ps/encoding/latin4.edf
 share/a2ps/encoding/latin5.edf
 share/a2ps/encoding/latin6.edf
 share/a2ps/encoding/mac.edf
-share/emacs/site-lisp/make-regexp.el
-share/emacs/site-lisp/a2ps.el
-lib/liba2ps.so.0.2
+share/a2ps/printers/README
+share/a2ps/printers/level1.ppd
+share/a2ps/printers/level2.ppd
+share/a2ps/printers/printers.map
+lib/liba2ps.so.0.3
 @exec /sbin/ldconfig -m %B
 lib/liba2ps.a
 etc/a2ps.cfg
 bin/ogonkify
 bin/a2ps
 bin/composite
+@unexec install-info --delete %D/info/a2ps.info %D/info/dir
+@unexec install-info --delete %D/info/ogonkify.info %D/info/dir
+@unexec install-info --delete %D/info/regex.info %D/info/dir
 info/a2ps.info
 info/ogonkify.info
 info/a2ps.info-1
 info/a2ps.info-2
 info/a2ps.info-3
+info/a2ps.info-4
 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/ogonkify.info %D/info/dir
+@exec install-info %D/info/regex.info %D/info/dir
 man/man1/a2ps.1.gz
 man/man1/ogonkify.1.gz
+@dirrm share/a2ps/afm
+@dirrm share/a2ps/encoding
+@dirrm share/a2ps/printers
+@dirrm share/a2ps/ps
+@dirrm share/a2ps/sheets
+@dirrm share/a2ps