Major upgrade of a2ps. The feature that I liked most was the

automatic context sensitive font emphasis for software (pretty
printing).

3 files changed, 174 insertions, 57 deletions

diff --git a/print/a2ps-letter/Makefile b/print/a2ps-letter/Makefile
index db9e95479d0e..db1aaafc21fd 100644
--- a/print/a2ps-letter/Makefile
+++ b/print/a2ps-letter/Makefile
@@ -1,75 +1,71 @@
 # New ports collection makefile for:    a2ps
-# Version required:     4.3
-# Date created:         6 November 1994
-# Whom:                 jmz & David O'Brien (obrien@cs.ucdavis.edu)
+# Version required:     4.9.7
+# Date created:         18 August 1997
+# Whom:                 Chuck Robey (chuckr@freebsd.org)
 #
-# $Id: Makefile,v 1.7 1996/05/27 08:47:50 asami Exp $
+# $Id: Makefile,v 1.8 1996/11/17 08:44:16 obrien Exp $
 #
 
 DISTNAME=	a2ps
-PKGNAME=	a2ps-${PAPERSIZE}-4.3
+PKGNAME=	a2ps-${PAPERSIZE}-4.9.7
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.imag.fr/archive/postscript/format.translators/
-DISTFILES=	a2ps.V4.3.tar.gz
+MASTER_SITES=	http://www-inf.enst.fr/~demaille/ftp/a2ps/
+DISTFILES=	a2ps-4.9.7.tar.gz
 
-MAINTAINER=	jmz@FreeBSD.org
+MAINTAINER=	chuckr@FreeBSD.org
 
-MAKE_FLAGS?=	WIDTH=${WIDTH} HEIGHT=${HEIGHT} A4_PAPERSIZE=${A4_PAPERSIZE} -f
-NO_WRKSUBDIR=	yes
-MAN1=		a2ps.1
+WRKSRC=		$(WRKDIR)/$(DISTNAME)-4.9.7
+GNU_CONFIGURE=	yes
+MAN1=		a2ps.1 ogonkify.1
 
-letter::
-	${MAKE} PAPERSIZE=letter
-
-letter-install::
-	${MAKE} PAPERSIZE=letter install
+PAPERSIZE?=
+STRIP=
+CONFIGURE_ARGS=	--with-medium=$(PAPERSIZE)
 
-a4::
-	${MAKE} PAPERSIZE=a4
 
-a4-install::
-	${MAKE} PAPERSIZE=a4 install
+Letter::
+	$(MAKE) PAPERSIZE=Letter
 
+letter::
+	$(MAKE) PAPERSIZE=Letter
 
-.if !defined(PAPERSIZE)
-PAPERSIZE=a4
-WIDTH=8.27
-HEIGHT=11.64
-A4_PAPERSIZE=1
-PAPERSIZE_UNSPECIFIED=	yes
-.elif ${PAPERSIZE} == A4 || ${PAPERSIZE} == a4 
-PAPERSIZE=a4
-WIDTH=8.27
-HEIGHT=11.64
-A4_PAPERSIZE=1
-.elif ${PAPERSIZE} == letter || ${PAPERSIZE} == LETTER
-PAPERSIZE=letter
-WIDTH=8.5
-HEIGHT=11.0
-A4_PAPERSIZE=0
-.else
-PAPERSIZE_INVALID= yes
-.endif	# not defined PAPERSIZE
+Letterdj::
+	$(MAKE) PAPERSIZE=Letterdj
 
+letterdj::
+	$(MAKE) PAPERSIZE=Letterdj
 
-pre-fetch:
-.if defined(PAPERSIZE_UNSPECIFIED)
-	@echo "Defaulting to ${PAPERSIZE} sized paper."
-	@echo ""
-	@echo "Set the environment variable PAPERSIZE if you want to use other sizes."
-	@echo "Possible values are:  A4 (default) or letter"
-.elif defined(PAPERSIZE_INVALID)
-	@echo "Error: invalid value for PAPERSIZE: \"${PAPERSIZE}\"" 
-	@echo "Possible values are:  A4 (default) or letter"
-	@/usr/bin/false
-.endif
+A4::
+	$(MAKE) PAPERSIZE=A4
 
-pre-install:
-	@${MKDIR} ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/man/man1
-	@(cd ${WRKSRC}; make install.man)
+a4::
+	$(MAKE) PAPERSIZE=A4
 
-post-install:
-	strip ${PREFIX}/bin/a2ps
+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."
+	@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."
+	@false
+.endif
+	echo $(PAPERSIZE) > $(WRKDIR)/.media
 
 .include <bsd.port.mk>
+
+.if exists($(WRKDIR)/.media)
+PAPERSIZE=
+PAPERSIZE!=	cat $(WRKDIR)/.media
+.endif
diff --git a/print/a2ps-letter/distinfo b/print/a2ps-letter/distinfo
index ae227f43edf0..f482893a5d8a 100644
--- a/print/a2ps-letter/distinfo
+++ b/print/a2ps-letter/distinfo
@@ -1 +1 @@
-MD5 (a2ps.V4.3.tar.gz) = d3ae591323f0ece28bf3f3bc35f5799f
+MD5 (a2ps-4.9.7.tar.gz) = e367d56d5e3f50ffbfd306b402441a90
diff --git a/print/a2ps-letter/pkg-plist b/print/a2ps-letter/pkg-plist
index 89c69615c441..acb090df2cc1 100644
--- a/print/a2ps-letter/pkg-plist
+++ b/print/a2ps-letter/pkg-plist
@@ -1,2 +1,123 @@
+share/a2ps/ps/ascii.ps
+share/a2ps/ps/latin1.ps
+share/a2ps/ps/latin2.ps
+share/a2ps/ps/latin3.ps
+share/a2ps/ps/latin4.ps
+share/a2ps/ps/latin5.ps
+share/a2ps/ps/latin6.ps
+share/a2ps/ps/pcg.ps
+share/a2ps/ps/ibmpc.ps
+share/a2ps/ps/hp.ps
+share/a2ps/ps/mac.ps
+share/a2ps/ps/cp1250.ps
+share/a2ps/ps/base.ps
+share/a2ps/ps/bw.pro
+share/a2ps/ps/gray.pro
+share/a2ps/ps/color.pro
+share/a2ps/ps/gray2.pro
+share/a2ps/ps/report.pre
+share/a2ps/ps/ehandler.ps
+etc/a2ps.cfg
+info/ogonkify.info
+man/man1/ogonkify.1.gz
+bin/ogonkify
+bin/composite
+share/a2ps/ps/composite.ps
+share/a2ps/ps/Courier-Ogonki.ps
+share/a2ps/ps/Courier-Oblique-Ogonki.ps
+share/a2ps/ps/Courier-Bold-Ogonki.ps
+share/a2ps/ps/Courier-BoldOblique-Ogonki.ps
+share/a2ps/ps/Times-Roman-Ogonki.ps
+share/a2ps/ps/Times-Italic-Ogonki.ps
+share/a2ps/ps/Times-Bold-Ogonki.ps
+share/a2ps/ps/Times-BoldItalic-Ogonki.ps
+share/a2ps/ps/Helvetica-Ogonki.ps
+share/a2ps/ps/Helvetica-Oblique-Ogonki.ps
+share/a2ps/ps/Helvetica-Bold-Ogonki.ps
+share/a2ps/ps/Helvetica-BoldOblique-Ogonki.ps
+share/a2ps/ps/adobe.enc
+share/a2ps/ps/ogonki.enc
+share/a2ps/ps/latin2.enc
+share/a2ps/ps/latin4.enc
+share/a2ps/ps/latin6.enc
+share/a2ps/ps/cp1250.enc
+share/a2ps/ps/latin1.enc
+share/a2ps/ps/latin3.enc
+share/a2ps/ps/latin5.enc
+share/a2ps/ps/macintosh.enc
+share/a2ps/ps/ibmpc.enc
+share/a2ps/ps/hp.enc
+share/a2ps/ps/ascii.enc
+lib/liba2ps.so.0.0
+@exec /sbin/ldconfig -m %B
+lib/liba2ps.a
 bin/a2ps
+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
+share/a2ps/sheets/sheets.map
+share/a2ps/sheets/68000.ssh
+share/a2ps/sheets/a2psrc.ssh
+share/a2ps/sheets/ada.ssh
+share/a2ps/sheets/cpp.ssh
+share/a2ps/sheets/c.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/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/mail.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/oracle.ssh
+share/a2ps/sheets/pascal.ssh
+share/a2ps/sheets/perl.ssh
+share/a2ps/sheets/plsql.ssh
+share/a2ps/sheets/ps.ssh
+share/a2ps/sheets/pre.ssh
+share/a2ps/sheets/prolog.ssh
+share/a2ps/sheets/promela.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/sql.ssh
+share/a2ps/sheets/sql92.ssh
+share/a2ps/sheets/ssh.ssh
+share/a2ps/sheets/tcl.ssh
+share/a2ps/sheets/tex.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
+info/a2ps.info
+info/a2ps.info-1
+info/a2ps.info-2
+info/a2ps.info-3
+info/regex.info
+info/regex.info-1
+info/regex.info-2
+info/regex.info-3
 man/man1/a2ps.1.gz
+share/emacs/site-lisp/make-regexp.el
+share/emacs/site-lisp/a2ps.el