Make thise ports use LOOP_VAR and LOOP_OPTIONS for PAPERSIZE. While

I'm here, make a2ps43's Makefile detect the missing PAPERSIZE
correctly, and add -${PAPERSIZE} in lprps's PKGNAME.

8 files changed, 32 insertions, 19 deletions

diff --git a/print/a2ps-letter/Makefile b/print/a2ps-letter/Makefile
index 80b3d22e8143..47a73d7b9910 100644
--- a/print/a2ps-letter/Makefile
+++ b/print/a2ps-letter/Makefile
@@ -3,7 +3,7 @@
 # Date created:         15 July 1998
 # Whom:                 Chuck Robey (chuckr@freebsd.org)
 #
-# $Id: Makefile,v 1.19 1998/07/21 13:48:19 asami Exp $
+# $Id: Makefile,v 1.20 1998/09/19 16:38:36 smace Exp $
 #
 
 DISTNAME=	a2ps-4.10.3
@@ -13,7 +13,8 @@ MASTER_SITES=	http://www-inf.enst.fr/~demaille/ftp/a2ps/
 
 MAINTAINER=	chuckr@FreeBSD.org
 
-MANUAL_PACKAGE_BUILD=  PAPERSIZE has to be set to Letter A4
+LOOP_VAR=	PAPERSIZE
+LOOP_OPTIONS=	Letter A4
 GNU_CONFIGURE=	yes
 MAN1=		a2ps.1 ogonkify.1 card.1 psmandup.1 fixps.1 pdiff.1
 
diff --git a/print/a2ps43-letter/Makefile b/print/a2ps43-letter/Makefile
index 404e66e3eb14..57a12177af36 100644
--- a/print/a2ps43-letter/Makefile
+++ b/print/a2ps43-letter/Makefile
@@ -3,7 +3,7 @@
 # Date created:         6 November 1994
 # Whom:                 jmz & David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.15 1998/02/25 02:35:23 obrien Exp $
+# $Id: Makefile,v 1.16 1998/04/04 07:36:44 asami Exp $
 #
 
 DISTNAME=	a2ps
@@ -15,7 +15,8 @@ DISTFILES=	a2ps.V4.3.tar.gz
 MAINTAINER=	obrien@FreeBSD.org
 
 NO_LATEST_LINK=	yes
-MANUAL_PACKAGE_BUILD=	PAPERSIZE has to be set to Letter A4
+LOOP_VAR=	PAPERSIZE
+LOOP_OPTIONS=	letter a4
 MAKE_FLAGS?=	WIDTH=${WIDTH} HEIGHT=${HEIGHT} A4_PAPERSIZE=${A4_PAPERSIZE} -f
 NO_WRKSUBDIR=	yes
 MAN1=		a2ps.1
@@ -33,12 +34,16 @@ a4-install::
 	${MAKE} PAPERSIZE=a4 install
 
 
-.if !defined(PAPERSIZE) || ${PAPERSIZE} == letter || ${PAPERSIZE} == LETTER || ${PAPERSIZE} == Letter
+.if !defined(PAPERSIZE)
+PAPERSIZE_UNSPECIFIED=	yes
+PAPERSIZE=letter
+.endif
+
+.if ${PAPERSIZE} == letter || ${PAPERSIZE} == LETTER || ${PAPERSIZE} == Letter
 PAPERSIZE=letter
 WIDTH=8.5
 HEIGHT=11.0
 A4_PAPERSIZE=0
-PAPERSIZE_UNSPECIFIED=	yes
 .elif ${PAPERSIZE} == A4 || ${PAPERSIZE} == a4 
 PAPERSIZE=a4
 WIDTH=8.27
@@ -46,7 +51,7 @@ HEIGHT=11.64
 A4_PAPERSIZE=1
 .else
 PAPERSIZE_INVALID= yes
-.endif	# not defined PAPERSIZE
+.endif
 
 
 pre-fetch:
diff --git a/print/c2ps-letter/Makefile b/print/c2ps-letter/Makefile
index c627f255bf25..2a925298fd65 100644
--- a/print/c2ps-letter/Makefile
+++ b/print/c2ps-letter/Makefile
@@ -3,7 +3,7 @@
 # Date created:        19 March 1997
 # Whom:                Matthew Hunt <mph@pobox.com>
 #
-# $Id: Makefile,v 1.4 1998/02/26 04:32:17 asami Exp $
+# $Id: Makefile,v 1.5 1998/04/17 23:26:29 mph Exp $
 #
 
 DISTNAME=	c2ps-4.0
@@ -13,7 +13,8 @@ MASTER_SITES=	http://www.cs.technion.ac.il/users/c2ps/
 
 MAINTAINER=	mph@freebsd.org
 
-MANUAL_PACKAGE_BUILD=  PAPERSIZE has to be set to Letter A4
+LOOP_VAR=	PAPERSIZE
+LOOP_OPTIONS=	letter a4
 MAN1=		c2ps.1
 MAKE_ENV=	DEFAULT_PAPER_TYPE=${PAPERSIZE}
 
diff --git a/print/enscript-letter/Makefile b/print/enscript-letter/Makefile
index 443ca832c7e8..6bdc290da242 100644
--- a/print/enscript-letter/Makefile
+++ b/print/enscript-letter/Makefile
@@ -3,7 +3,7 @@
 # Date created:			24 Jul, 1997
 # Whom:				kline
 #
-# $Id: Makefile,v 1.3 1997/11/10 11:23:19 asami Exp $
+# $Id: Makefile,v 1.4 1997/11/27 08:10:30 tg Exp $
 #
 
 DISTNAME=       enscript-1.5.0
@@ -13,7 +13,8 @@ MASTER_SITES=   ${MASTER_SITE_GNU}
 
 MAINTAINER=	kline@thought.org
 
-MANUAL_PACKAGE_BUILD=	PAPERSIZE has to be set to Letter A4
+LOOP_VAR=	PAPERSIZE
+LOOP_OPTIONS=	A4 Letter Letterdj
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--disable-nls --with-media=${PAPERSIZE}
diff --git a/print/lprps-letter/Makefile b/print/lprps-letter/Makefile
index 30f28eb2eefb..1c05c5d3a40d 100644
--- a/print/lprps-letter/Makefile
+++ b/print/lprps-letter/Makefile
@@ -4,17 +4,19 @@
 # Date created:         Sat Aug 3, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.3 1997/10/10 06:53:28 obrien Exp $
+# $Id: Makefile,v 1.4 1997/11/10 11:23:26 asami Exp $
 #
 
 DISTNAME=	lprps-2.5
+PKGNAME=	lprps-${PAPERSIZE}-2.5
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.jclark.com/pub/lprps/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=     obrien@FreeBSD.org
 
-MANUAL_PACKAGE_BUILD=	PAPERSIZE has to be set to letter a4
+LOOP_VAR=	PAPERSIZE
+LOOP_OPTIONS=	letter a4
 MAKE_FLAGS?=	PAPERSIZE=${PAPERSIZE} -f
 MAN1=		psrev.1 textps.1
 MAN8=		lprps.8 psif.8 psof.8
diff --git a/print/mp-letter/Makefile b/print/mp-letter/Makefile
index 2c2c601df630..684ad73f476d 100644
--- a/print/mp-letter/Makefile
+++ b/print/mp-letter/Makefile
@@ -3,7 +3,7 @@
 # Date created:         11 July 1996
 # Whom:                 David O'Brien <obrien@cs.ucdavis.edu>
 #
-# $Id: Makefile,v 1.7 1998/07/30 04:36:46 obrien Exp $
+# $Id: Makefile,v 1.8 1998/09/19 01:40:37 hoek Exp $
 #
 
 DISTNAME=	mp-3.0.1
@@ -14,7 +14,8 @@ MASTER_SITES=	ftp://ftp.NUXI.com/pub/misc/ \
 
 MAINTAINER=	obrien@FreeBSD.org
 
-MANUAL_PACKAGE_BUILD=	PAPERSIZE has to be set to letter a4
+LOOP_VAR=	PAPERSIZE
+LOOP_OPTIONS=	letter a4
 WRKSRC=		${WRKDIR}/mp
 MAN1=		mp.1
 MLINKS=		mp.1 digestp.1	- filep.1	- filofaxp.1 \
diff --git a/print/pkfonts300/Makefile b/print/pkfonts300/Makefile
index 6c5c15784115..697a477a935f 100644
--- a/print/pkfonts300/Makefile
+++ b/print/pkfonts300/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 Mar 1996
 # Whom:			Hideaki Ohmon <ohmon@tom.sfc.keio.ac.jp>
 #
-# $Id: Makefile,v 1.8 1998/02/07 16:33:22 max Exp $
+# $Id: Makefile,v 1.9 1998/08/10 12:14:50 steve Exp $
 #
 
 DISTNAME=	pkfonts
@@ -15,7 +15,8 @@ MASTER_SITES=	ftp://ftp.univ-evry.fr/.04/system/OpenBSD/distfiles/pkfonts/ \
 DISTFILES=	pk${RESOLUTION}.tar.gz
 # see below for RESOLUTION definition
 
-MANUAL_PACKAGE_BUILD=	RESOLUTION has to be set to 118 240 300 360 400 600
+LOOP_VAR=	RESOLUTION
+LOOP_OPTIONS=	118 240 300 360 400 600
 DIST_SUBDIR=	pkfonts
 EXTRACT_CMD=	/usr/bin/true # extracted directly in install target
 NO_BUILD=	yes
diff --git a/print/psutils-letter/Makefile b/print/psutils-letter/Makefile
index c76a1738cf57..a85c1dde9629 100644
--- a/print/psutils-letter/Makefile
+++ b/print/psutils-letter/Makefile
@@ -3,7 +3,7 @@
 # Date created:         21 September 1994
 # Whom:                 jmz & David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.15 1998/01/08 18:52:13 fenner Exp $
+# $Id: Makefile,v 1.16 1998/03/12 16:12:09 jmz Exp $
 #
 
 DISTNAME=	psutils-p17
@@ -13,7 +13,8 @@ MASTER_SITES=	ftp://ftp.dcs.ed.ac.uk/pub/ajcd/
 
 MAINTAINER=	jmz@FreeBSD.org
 
-MANUAL_PACKAGE_BUILD=	PAPERSIZE has to be set to letter a4
+LOOP_VAR=	PAPERSIZE
+LOOP_OPTIONS=	letter a4
 WRKSRC=		${WRKDIR}/psutils
 MAKE_FLAGS?=	PAPER=${PAPERSIZE} -f
 MAN1=		psbook.1 psselect.1 pstops.1 epsffit.1 psnup.1 psresize.1 \