Remove LOOP_VAR and replace it with tiny Makefiles using MASTERDIR to

share most files. Repository copy the default to explicitly named directories to avoid any confusion. Greatly simplify the shared Makefiles, since we are now in different subdirectories, we don't need "a4-install" stuff. While I'm here, consistently name the variables. Here are the guidelines (master port is in brackets) DOCFORMAT: [html] pdf ps KONFONT: 14dot [16dot] PAPERSIZE: a4 [letter] letterdj RESOLUTION: 118 240 [300] 360 400 600 "math/r" has been copied to "R-a4" and "R-letter", to follow the spirit of the original port. "japanese/kon" is renamed to "kon2-*", since that seems to be the basename.
author: Satoshi Asami <asami@FreeBSD.org> 1998-11-20 04:15:15 +0000
committer: Satoshi Asami <asami@FreeBSD.org> 1998-11-20 04:15:15 +0000
commit: 751790b51ae4c1152e8944cbaf99d49b1377e95b (patch)
tree: 086c03d44a933a34d3f086e2ad7487d5d6b2872d
parent: (1) Remove LOOP_VAR and LOOP_OPTIONS. It's a hack and just too many things (diff)
33 files changed, 345 insertions, 357 deletions
diff --git a/graphics/Makefile b/graphics/Makefile
index 4f4ae83e1100..6c334a81dd4a 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.98 1998/11/18 10:07:49 flathill Exp $
+# $Id: Makefile,v 1.99 1998/11/19 17:01:31 vanilla Exp $
 #
 
     SUBDIR += 4va
@@ -25,7 +25,9 @@
     SUBDIR += gifmerge
     SUBDIR += giftool
     SUBDIR += giftrans
-    SUBDIR += gimp-manual
+    SUBDIR += gimp-manual-html
+    SUBDIR += gimp-manual-pdf
+    SUBDIR += gimp-manual-ps
     SUBDIR += gimp1
     SUBDIR += gplot
     SUBDIR += gqview
diff --git a/graphics/gimp-manual-html/Makefile b/graphics/gimp-manual-html/Makefile
index 0fe4f8f5f391..63703c499082 100644
--- a/graphics/gimp-manual-html/Makefile
+++ b/graphics/gimp-manual-html/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 June 1998
 # Whom:			Brett Taylor
 #
-# $Id: Makefile,v 1.3 1998/08/05 09:31:09 asami Exp $
+# $Id: Makefile,v 1.4 1998/10/30 11:21:54 asami Exp $
 #
 
 DISTNAME=	GimpUserManual-1.0.0
@@ -13,15 +13,14 @@ MASTER_SITES=	ftp://manual.gimp.org/pub/manual/
 
 MAINTAINER=	brett@peloton.physics.montana.edu
 
-LOOP_VAR=	DOCFORMAT
-LOOP_OPTIONS=	HTML PDF PS
-
 .if !defined(DOCFORMAT)
 DOCFORMAT=HTML
-DOCFORMAT_UNSPECIFIED=YES
 .else
 .if ${DOCFORMAT} != "HTML" && ${DOCFORMAT} != "PDF" && ${DOCFORMAT} != "PS"
-DOCFORMAT_INVALID=YES
+.BEGIN:
+	@${ECHO} "ERROR: invalid value for DOCFORMAT: \"${DOCFORMAT}\""
+	@${ECHO} "Possible values are:  HTML, PDF, PS."
+	@${FALSE}
 .endif
 .endif
 
@@ -34,16 +33,6 @@ pre-fetch:
 	@${ECHO} "the PDF version is 14 MB and the HTML tar-bzip'ed"
 	@${ECHO} "version is 16 MB (unpacks to 18.7 MB)."
 
-.if defined(DOCFORMAT_UNSPECIFIED)
-	@${ECHO} "(DOCFORMAT not specified: defaulting to HTML format.)"
-	@${ECHO} "To choose the one you want, type:"
-	@${ECHO} "     make DOCFORMAT={HTML,PDF,PS} [install]"
-.elif defined(DOCFORMAT_INVALID)
-	@echo "ERROR: invalid value for DOCFORMAT: \"${DOCFORMAT}\""
-	@echo "Possible values are:  HTML (default), PDF, PS."
-	@${FALSE}
-.endif
-
 .if ${DOCFORMAT} == "HTML"
 EXTRACT_SUFX=	-html.tar.bz2
 WRKSRC=		${WRKDIR}/GimpUserManaul_v1.0.0
diff --git a/graphics/gimp-manual-pdf/Makefile b/graphics/gimp-manual-pdf/Makefile
new file mode 100644
index 000000000000..a71bf69aa1fd
--- /dev/null
+++ b/graphics/gimp-manual-pdf/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	gimp-manual-1.0.0 (PDF)
+# Version required:	1.0.0
+# Date created:		5 June 1998
+# Whom:			Brett Taylor
+#
+# $Id$
+#
+
+DOCFORMAT=	PDF
+MASTERDIR=	${.CURDIR}/../gimp-manual-html
+
+.include "${MASTERDIR}/Makefile"
diff --git a/graphics/gimp-manual-ps/Makefile b/graphics/gimp-manual-ps/Makefile
new file mode 100644
index 000000000000..81fcabcfd1fb
--- /dev/null
+++ b/graphics/gimp-manual-ps/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	gimp-manual-1.0.0 (PS)
+# Version required:	1.0.0
+# Date created:		5 June 1998
+# Whom:			Brett Taylor
+#
+# $Id$
+#
+
+DOCFORMAT=	PS
+MASTERDIR=	${.CURDIR}/../gimp-manual-html
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/Makefile b/japanese/Makefile
index 9f4aa0996db1..93ec65d367d6 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.162 1998/11/19 08:49:04 asami Exp $
+# $Id: Makefile,v 1.163 1998/11/19 18:43:04 sada Exp $
 #
 
     SUBDIR += Canna
@@ -29,7 +29,10 @@
     SUBDIR += expect
     SUBDIR += gawk
     SUBDIR += gd
-    SUBDIR += ghostscript
+    SUBDIR += ghostscript118
+    SUBDIR += ghostscript240
+    SUBDIR += ghostscript300
+    SUBDIR += ghostscript400
     SUBDIR += gicq
     SUBDIR += gimp
     SUBDIR += gn-gnspool
@@ -77,7 +80,8 @@
     SUBDIR += kinput2-sj3+wnn6
     SUBDIR += kinput2-wnn4
     SUBDIR += kinput2-wnn6
-    SUBDIR += kon
+    SUBDIR += kon2-14dot
+    SUBDIR += kon2-16dot
     SUBDIR += kterm
     SUBDIR += less
     SUBDIR += libicq
@@ -181,15 +185,26 @@
     SUBDIR += vfghostscript5
     SUBDIR += vflib
     SUBDIR += vftool
-    SUBDIR += vftool-misc
-    SUBDIR += vfxdvi
+    SUBDIR += vftool-misc118
+    SUBDIR += vftool-misc240
+    SUBDIR += vftool-misc300
+    SUBDIR += vftool-misc400
+    SUBDIR += vfxdvi118
+    SUBDIR += vfxdvi240
+    SUBDIR += vfxdvi300
+    SUBDIR += vfxdvi360
+    SUBDIR += vfxdvi400
+    SUBDIR += vfxdvi600
     SUBDIR += vfxdvik
     SUBDIR += vje-trial
     SUBDIR += w3
     SUBDIR += weblint97
     SUBDIR += wine
     SUBDIR += x0212fonts
-    SUBDIR += xdvi
+    SUBDIR += xdvi118
+    SUBDIR += xdvi240
+    SUBDIR += xdvi300
+    SUBDIR += xdvi400
     SUBDIR += xemacs
     SUBDIR += xemacs-canna
     SUBDIR += xemacs-canna+wnn4
diff --git a/japanese/kon2-14dot/Makefile b/japanese/kon2-14dot/Makefile
new file mode 100644
index 000000000000..5eb244ad661d
--- /dev/null
+++ b/japanese/kon2-14dot/Makefile
@@ -0,0 +1,13 @@
+# New ports collection makefile for:	kon2 with 14dot font
+# Version required:     0.3
+# Date created:         11 Apr 1997
+# Whom:                 Makoto Matsushita <matusita@jp.freebsd.org>
+#
+# $Id$
+#
+
+KONFONT=	14dot
+
+MASTERDIR=	${.CURDIR}/../kon2-16dot
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/kon2-16dot/Makefile b/japanese/kon2-16dot/Makefile
index 0a5bdb0f5daa..d8d7ab88b411 100644
--- a/japanese/kon2-16dot/Makefile
+++ b/japanese/kon2-16dot/Makefile
@@ -1,9 +1,9 @@
-# New ports collection makefile for:	kon2
+# New ports collection makefile for:	kon2 with 16dot font
 # Version required:     0.3
 # Date created:         11 Apr 1997
 # Whom:                 Makoto Matsushita <matusita@jp.freebsd.org>
 #
-# $Id: Makefile,v 1.17 1998/11/07 14:30:29 kuriyama Exp $
+# $Id: Makefile,v 1.18 1998/11/08 00:49:29 asami Exp $
 #
 
 DISTNAME=	kon2-0.3
@@ -19,30 +19,21 @@ DISTFILES=	kon2-0.3.tar.gz \
 
 MAINTAINER=	shige@kuis.kyoto-u.ac.jp
 
-LOOP_VAR=	KONFONT
-LOOP_OPTIONS=	14dot 16dot
 MAN1=		kon.1
 MANLANG=	ja
 EXTRACT_ONLY=	kon2-0.3.tar.gz
 
 DOCDIR=		${PREFIX}/share/doc/kon2
 
-.if defined(KONFONT)
-.if (${KONFONT} == "16dot")
-KON16FONT=Startup
-.else if (${KONFONT} == "14dot")
-KON14FONT=Startup
-.endif
-.endif
-
-pre-fetch:
 .if !defined(KONFONT)
-	@${ECHO_MSG} "NOTE: You can select default kon font size."
-	@${ECHO_MSG} "by adding \"KONFONT=<Font Size>\" to argument of make."
-	@${ECHO_MSG} "<Font Size> must be \"16dot\" or \"14dot\"."
-	@${ECHO_MSG} "KONFONT defalut value is \"16dot\"."
 KONFONT=16dot
 KON16FONT=Startup
+.elif (${KONFONT} == "14dot")
+KON14FONT=Startup
+.elif (${KONFONT} != "16dot")
+.BEGIN:
+	@${ECHO} "Error: \$${KONFONT} (\"${KONFONT}\") should be either \"14dot\" or \"16dot\"."
+	@${FALSE}
 .endif
 
 pre-build:
diff --git a/japanese/vfxdvi118/Makefile b/japanese/vfxdvi118/Makefile
new file mode 100644
index 000000000000..2609edcc6659
--- /dev/null
+++ b/japanese/vfxdvi118/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for: xdvi-17miyu + patches + vector font library
+# Version required:	pl17
+# Date created:		8 Nov 1996
+# Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
+#
+# $Id$
+#
+
+RESOLUTION=	118
+MASTERDIR=	${.CURDIR}/../vfxdvi300
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/vfxdvi240/Makefile b/japanese/vfxdvi240/Makefile
new file mode 100644
index 000000000000..800d12eebc76
--- /dev/null
+++ b/japanese/vfxdvi240/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for: xdvi-17miyu + patches + vector font library
+# Version required:	pl17
+# Date created:		8 Nov 1996
+# Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
+#
+# $Id$
+#
+
+RESOLUTION=	240
+MASTERDIR=	${.CURDIR}/../vfxdvi300
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/vfxdvi300/Makefile b/japanese/vfxdvi300/Makefile
index 0aece2c4e887..828fa360c3f2 100644
--- a/japanese/vfxdvi300/Makefile
+++ b/japanese/vfxdvi300/Makefile
@@ -3,7 +3,7 @@
 # Date created:		8 Nov 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.12 1998/10/30 10:31:44 asami Exp $
+# $Id: Makefile,v 1.13 1998/11/07 10:49:47 asami Exp $
 #
 
 DISTNAME=	xdvi-17
@@ -23,8 +23,6 @@ MAINTAINER=	mita@jp.FreeBSD.org
 LIB_DEPENDS=	VFlib2.23:${PORTSDIR}/japanese/vflib
 RUN_DEPENDS=	${LOCALBASE}/lib/fonts/pk${RESOLUTION}:${PORTSDIR}/print/pkfonts${RESOLUTION}
 
-LOOP_VAR=	RESOLUTION
-LOOP_OPTIONS=	118 240 300 360 400 600
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	xdvi
 USE_IMAKE=      yes
@@ -33,26 +31,16 @@ EXTRACT_ONLY=	xdvi-17.tar.gz
 
 .if !defined(RESOLUTION)
 RESOLUTION=     300
-RESOLUTION_UNSPECIFIED= yes
 .else
 .if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
 	${RESOLUTION} != 300 && ${RESOLUTION} != 360 && \
 	${RESOLUTION} != 400  && ${RESOLUTION} != 600
-RESOLUTION_INVALID=     yes
-.endif
-.endif
-
-pre-fetch:
-.if defined(RESOLUTION_UNSPECIFIED)
-	@echo "Building xdvi with ${RESOLUTION}dpi fonts."
-	@echo "Set the environment variable RESOLUTION if you want"
-	@echo "it to use other resolutions."
-	@echo "Possible values are: 118, 240, 300 (default), 360, 400 and 600."
-.elif defined(RESOLUTION_INVALID)
-	@echo "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
-	@echo "Possible values are: 118, 240, 300 (default), 360, 400 and 600."
+.BEGIN:
+	@${ECHO} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
+	@${ECHO} "Possible values are: 118, 240, 300, 360, 400 and 600."
 	@${FALSE}
 .endif
+.endif
 
 pre-patch:
 	@(cd ${WRKDIR} ; \
diff --git a/japanese/vfxdvi360/Makefile b/japanese/vfxdvi360/Makefile
new file mode 100644
index 000000000000..ae77bb7f9153
--- /dev/null
+++ b/japanese/vfxdvi360/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for: xdvi-17miyu + patches + vector font library
+# Version required:	pl17
+# Date created:		8 Nov 1996
+# Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
+#
+# $Id$
+#
+
+RESOLUTION=	360
+MASTERDIR=	${.CURDIR}/../vfxdvi300
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/vfxdvi400/Makefile b/japanese/vfxdvi400/Makefile
new file mode 100644
index 000000000000..33d5a9705556
--- /dev/null
+++ b/japanese/vfxdvi400/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for: xdvi-17miyu + patches + vector font library
+# Version required:	pl17
+# Date created:		8 Nov 1996
+# Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
+#
+# $Id$
+#
+
+RESOLUTION=	400
+MASTERDIR=	${.CURDIR}/../vfxdvi300
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/vfxdvi600/Makefile b/japanese/vfxdvi600/Makefile
new file mode 100644
index 000000000000..71a79bf750d9
--- /dev/null
+++ b/japanese/vfxdvi600/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for: xdvi-17miyu + patches + vector font library
+# Version required:	pl17
+# Date created:		8 Nov 1996
+# Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
+#
+# $Id$
+#
+
+RESOLUTION=	600
+MASTERDIR=	${.CURDIR}/../vfxdvi300
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/math/Makefile b/math/Makefile
index 6a89dc2351b6..6587ded9ec3b 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -1,6 +1,8 @@
-# $Id: Makefile,v 1.50 1998/08/30 18:30:51 steve Exp $
+# $Id: Makefile,v 1.51 1998/10/26 11:59:39 vanilla Exp $
 #
 
+    SUBDIR += R-a4
+    SUBDIR += R-letter
     SUBDIR += Scilab
     SUBDIR += add
     SUBDIR += apc
@@ -28,7 +30,6 @@
     SUBDIR += pari
     SUBDIR += plplot
     SUBDIR += pygist
-    SUBDIR += r
     SUBDIR += rng
     SUBDIR += sc
     SUBDIR += siag
diff --git a/math/R-a4/Makefile b/math/R-a4/Makefile
new file mode 100644
index 000000000000..dd26db4cc423
--- /dev/null
+++ b/math/R-a4/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:   R (a4)
+# Version required:    R-0.62.2
+# Date created:                Tue Jun 23 07:36:55 EST 1998
+# Whom:                        Maurice Castro <maurice@serc.rmit.edu.au>
+#
+# $Id: Makefile,v 1.7 1998/11/18 11:40:41 asami Exp $
+#
+
+PAPERSIZE=	a4
+MASTERDIR=	${.CURDIR}/../R-letter
+
+.include "${MASTERDIR}/Makefile"
diff --git a/math/R-letter/Makefile b/math/R-letter/Makefile
index f576872464a3..ce6ef7085c0c 100644
--- a/math/R-letter/Makefile
+++ b/math/R-letter/Makefile
@@ -1,13 +1,13 @@
-# New ports collection makefile for:   R
+# New ports collection makefile for:   R (letter)
 # Version required:    R-0.62.2
 # Date created:                Tue Jun 23 07:36:55 EST 1998
 # Whom:                        Maurice Castro <maurice@serc.rmit.edu.au>
 #
-# $Id: Makefile,v 1.6 1998/08/20 10:21:20 asami Exp $
+# $Id: Makefile,v 1.7 1998/11/18 11:40:41 asami Exp $
 #
 
 DISTNAME=	R-0.62.2
-PKGNAME=	R-${PAPERSIZE:S/A4/a4/:S/LETTER/letter/:S/Letter/letter/}-0.62.2
+PKGNAME=	R-${PAPERSIZE}-0.62.2
 CATEGORIES=	math
 MASTER_SITES=	http://lib.stat.cmu.edu/R/CRAN/src/base/ \
 		ftp://ftp.biostat.washington.edu/mirrors/R/CRAN/src/base/ \
@@ -27,31 +27,20 @@ BROKEN=		package
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 
-LOOP_VAR=	PAPERSIZE
-LOOP_OPTIONS=	letter a4
 CONFIGURE_ENV=		R_PAPERSIZE=${PAPERSIZE}
 
-.if !defined(PAPERSIZE)
-PAPERSIZE=a4
-.elif ${PAPERSIZE} == LETTER || ${PAPERSIZE} == Letter
-PAPERSIZE=letter
-.elif ${PAPERSIZE} == A4
-PAPERSIZE=a4
-.elif ${PAPERSIZE} != a4 && ${PAPERSIZE} != letter
-PAPERSIZE_INVALID=yes
+PAPERSIZE?=	letter
+.if ${PAPERSIZE} != letter && ${PAPERSIZE} != a4
+.BEGIN:
+	@${ECHO} "Invalid value for PAPERSIZE: \"${PAPERSIZE}\""
+	@${ECHO} "Possible values are:  a4 and letter."
+	@${FALSE}
 .endif
 
 ALL_TARGET=all help html
 
 MAN1=	R.1 Rdconv.1
 
-pre-fetch:
-.if defined(PAPERSIZE_INVALID)
-	@${ECHO} "Invalid value for PAPERSIZE: \"${PAPERSIZE}\""
-	@${ECHO} "Possible values are:  A4 (default), and Letter."
-	@${FALSE}
-.endif
-
 test:
 	@(cd ${WRKSRC}; make test-All)
 
diff --git a/math/R-project/Makefile b/math/R-project/Makefile
index f576872464a3..ce6ef7085c0c 100644
--- a/math/R-project/Makefile
+++ b/math/R-project/Makefile
@@ -1,13 +1,13 @@
-# New ports collection makefile for:   R
+# New ports collection makefile for:   R (letter)
 # Version required:    R-0.62.2
 # Date created:                Tue Jun 23 07:36:55 EST 1998
 # Whom:                        Maurice Castro <maurice@serc.rmit.edu.au>
 #
-# $Id: Makefile,v 1.6 1998/08/20 10:21:20 asami Exp $
+# $Id: Makefile,v 1.7 1998/11/18 11:40:41 asami Exp $
 #
 
 DISTNAME=	R-0.62.2
-PKGNAME=	R-${PAPERSIZE:S/A4/a4/:S/LETTER/letter/:S/Letter/letter/}-0.62.2
+PKGNAME=	R-${PAPERSIZE}-0.62.2
 CATEGORIES=	math
 MASTER_SITES=	http://lib.stat.cmu.edu/R/CRAN/src/base/ \
 		ftp://ftp.biostat.washington.edu/mirrors/R/CRAN/src/base/ \
@@ -27,31 +27,20 @@ BROKEN=		package
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 
-LOOP_VAR=	PAPERSIZE
-LOOP_OPTIONS=	letter a4
 CONFIGURE_ENV=		R_PAPERSIZE=${PAPERSIZE}
 
-.if !defined(PAPERSIZE)
-PAPERSIZE=a4
-.elif ${PAPERSIZE} == LETTER || ${PAPERSIZE} == Letter
-PAPERSIZE=letter
-.elif ${PAPERSIZE} == A4
-PAPERSIZE=a4
-.elif ${PAPERSIZE} != a4 && ${PAPERSIZE} != letter
-PAPERSIZE_INVALID=yes
+PAPERSIZE?=	letter
+.if ${PAPERSIZE} != letter && ${PAPERSIZE} != a4
+.BEGIN:
+	@${ECHO} "Invalid value for PAPERSIZE: \"${PAPERSIZE}\""
+	@${ECHO} "Possible values are:  a4 and letter."
+	@${FALSE}
 .endif
 
 ALL_TARGET=all help html
 
 MAN1=	R.1 Rdconv.1
 
-pre-fetch:
-.if defined(PAPERSIZE_INVALID)
-	@${ECHO} "Invalid value for PAPERSIZE: \"${PAPERSIZE}\""
-	@${ECHO} "Possible values are:  A4 (default), and Letter."
-	@${FALSE}
-.endif
-
 test:
 	@(cd ${WRKSRC}; make test-All)
 
diff --git a/math/R/Makefile b/math/R/Makefile
index f576872464a3..ce6ef7085c0c 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,13 +1,13 @@
-# New ports collection makefile for:   R
+# New ports collection makefile for:   R (letter)
 # Version required:    R-0.62.2
 # Date created:                Tue Jun 23 07:36:55 EST 1998
 # Whom:                        Maurice Castro <maurice@serc.rmit.edu.au>
 #
-# $Id: Makefile,v 1.6 1998/08/20 10:21:20 asami Exp $
+# $Id: Makefile,v 1.7 1998/11/18 11:40:41 asami Exp $
 #
 
 DISTNAME=	R-0.62.2
-PKGNAME=	R-${PAPERSIZE:S/A4/a4/:S/LETTER/letter/:S/Letter/letter/}-0.62.2
+PKGNAME=	R-${PAPERSIZE}-0.62.2
 CATEGORIES=	math
 MASTER_SITES=	http://lib.stat.cmu.edu/R/CRAN/src/base/ \
 		ftp://ftp.biostat.washington.edu/mirrors/R/CRAN/src/base/ \
@@ -27,31 +27,20 @@ BROKEN=		package
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 
-LOOP_VAR=	PAPERSIZE
-LOOP_OPTIONS=	letter a4
 CONFIGURE_ENV=		R_PAPERSIZE=${PAPERSIZE}
 
-.if !defined(PAPERSIZE)
-PAPERSIZE=a4
-.elif ${PAPERSIZE} == LETTER || ${PAPERSIZE} == Letter
-PAPERSIZE=letter
-.elif ${PAPERSIZE} == A4
-PAPERSIZE=a4
-.elif ${PAPERSIZE} != a4 && ${PAPERSIZE} != letter
-PAPERSIZE_INVALID=yes
+PAPERSIZE?=	letter
+.if ${PAPERSIZE} != letter && ${PAPERSIZE} != a4
+.BEGIN:
+	@${ECHO} "Invalid value for PAPERSIZE: \"${PAPERSIZE}\""
+	@${ECHO} "Possible values are:  a4 and letter."
+	@${FALSE}
 .endif
 
 ALL_TARGET=all help html
 
 MAN1=	R.1 Rdconv.1
 
-pre-fetch:
-.if defined(PAPERSIZE_INVALID)
-	@${ECHO} "Invalid value for PAPERSIZE: \"${PAPERSIZE}\""
-	@${ECHO} "Possible values are:  A4 (default), and Letter."
-	@${FALSE}
-.endif
-
 test:
 	@(cd ${WRKSRC}; make test-All)
 
diff --git a/print/Makefile b/print/Makefile
index ff4c188ce346..77e104fc9e7d 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -1,22 +1,28 @@
-# $Id: Makefile,v 1.71 1998/11/18 15:52:38 smace Exp $
+# $Id: Makefile,v 1.72 1998/11/18 15:54:20 smace Exp $
 #
 
-    SUBDIR += a2ps
-    SUBDIR += a2ps43
+    SUBDIR += a2ps-a4
+    SUBDIR += a2ps-letter
+    SUBDIR += a2ps-letterdj
+    SUBDIR += a2ps43-a4
+    SUBDIR += a2ps43-letter
     SUBDIR += acroread
     SUBDIR += afm
     SUBDIR += apsfilter
     SUBDIR += asprint
     SUBDIR += bibcard
     SUBDIR += bibview
-    SUBDIR += c2ps
+    SUBDIR += c2ps-a4
+    SUBDIR += c2ps-letter
     SUBDIR += detex
     SUBDIR += dvi2tty
     SUBDIR += dvi2xx
     SUBDIR += dvips
     SUBDIR += dvips2ascii
     SUBDIR += dviselect
-    SUBDIR += enscript
+    SUBDIR += enscript-a4
+    SUBDIR += enscript-letter
+    SUBDIR += enscript-letterdj
     SUBDIR += enscriptfonts
     SUBDIR += freetype
     SUBDIR += ggv
@@ -31,11 +37,13 @@
     SUBDIR += klyx
     SUBDIR += latex
     SUBDIR += lout
-    SUBDIR += lprps
+    SUBDIR += lprps-a4
+    SUBDIR += lprps-letter
     SUBDIR += lyx
     SUBDIR += makeindex
     SUBDIR += mgv
-    SUBDIR += mp
+    SUBDIR += mp-a4
+    SUBDIR += mp-letter
     SUBDIR += mpage
     SUBDIR += musixtex
     SUBDIR += offix-printer
@@ -48,7 +56,8 @@
     SUBDIR += pkfonts360
     SUBDIR += pkfonts400
     SUBDIR += pkfonts600
-    SUBDIR += psutils
+    SUBDIR += psutils-a4
+    SUBDIR += psutils-letter
     SUBDIR += rtf2latex
     SUBDIR += teTeX
     SUBDIR += teTeX-beta
diff --git a/print/a2ps-a4/Makefile b/print/a2ps-a4/Makefile
new file mode 100644
index 000000000000..912e36af4b08
--- /dev/null
+++ b/print/a2ps-a4/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:    a2ps (a4)
+# Version required:     4.10.3
+# Date created:         15 July 1998
+# Whom:                 Chuck Robey (chuckr@freebsd.org)
+#
+# $Id$
+#
+
+PAPERSIZE=	a4
+MASTERDIR=	${.CURDIR}/../a2ps-letter
+
+.include "${MASTERDIR}/Makefile"
diff --git a/print/a2ps-letter/Makefile b/print/a2ps-letter/Makefile
index 47a73d7b9910..22468adade2e 100644
--- a/print/a2ps-letter/Makefile
+++ b/print/a2ps-letter/Makefile
@@ -1,9 +1,9 @@
-# New ports collection makefile for:    a2ps
+# New ports collection makefile for:    a2ps (letter)
 # Version required:     4.10.3
 # Date created:         15 July 1998
 # Whom:                 Chuck Robey (chuckr@freebsd.org)
 #
-# $Id: Makefile,v 1.20 1998/09/19 16:38:36 smace Exp $
+# $Id: Makefile,v 1.21 1998/10/30 08:35:22 asami Exp $
 #
 
 DISTNAME=	a2ps-4.10.3
@@ -13,36 +13,23 @@ MASTER_SITES=	http://www-inf.enst.fr/~demaille/ftp/a2ps/
 
 MAINTAINER=	chuckr@FreeBSD.org
 
-LOOP_VAR=	PAPERSIZE
-LOOP_OPTIONS=	Letter A4
 GNU_CONFIGURE=	yes
 MAN1=		a2ps.1 ogonkify.1 card.1 psmandup.1 fixps.1 pdiff.1
 
-PAPERSIZE?=	Letter
+PAPERSIZE?=	letter
+PS!=		echo ${PAPERSIZE} | tr l L | tr a A
 STRIP=
-CONFIGURE_ARGS=	--with-medium=${PAPERSIZE}
+CONFIGURE_ARGS=	--with-medium=${PS}
 
-Letter letter:
-	${MAKE} PAPERSIZE=Letter
-
-Letterdj letterdj:
-	${MAKE} PAPERSIZE=Letterdj
-
-A4 a4:
-	${MAKE} PAPERSIZE=A4
-
-pre-configure:
-.if ${PAPERSIZE} != A4 && ${PAPERSIZE} != Letter && ${PAPERSIZE} != Letterdj
+.if ${PAPERSIZE} != a4 && ${PAPERSIZE} != letter && ${PAPERSIZE} != letterdj
+.BEGIN:
 	@${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
+	@${ECHO} "Must specify PAPERSIZE as one of a4, letter, or letterdj."
+	@${ECHO} "letterdj allows a slightly larger margins for DeskJets."
+	@${FALSE}
 .endif
-	${ECHO} ${PAPERSIZE} > ${WRKDIR}/.media
 
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
@@ -50,8 +37,3 @@ post-install:
 	(cd ${WRKSRC}/doc; ${MAKE} install)
 
 .include <bsd.port.mk>
-
-.if exists(${WRKDIR}/.media)
-PAPERSIZE=
-PAPERSIZE!=	${CAT} ${WRKDIR}/.media
-.endif
diff --git a/print/a2ps43-a4/Makefile b/print/a2ps43-a4/Makefile
new file mode 100644
index 000000000000..5e815c3627eb
--- /dev/null
+++ b/print/a2ps43-a4/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:    a2ps (a4)
+# Version required:     4.3
+# Date created:         6 November 1994
+# Whom:                 jmz & David O'Brien (obrien@cs.ucdavis.edu)
+#
+# $Id$
+#
+
+PAPERSIZE=	a4
+MASTERDIR=	${.CURDIR}/../a2ps43-letter
+
+.include "${MASTERDIR}/Makefile"
diff --git a/print/a2ps43-letter/Makefile b/print/a2ps43-letter/Makefile
index 57a12177af36..90e0a2e69725 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.16 1998/04/04 07:36:44 asami Exp $
+# $Id: Makefile,v 1.17 1998/10/30 08:35:29 asami Exp $
 #
 
 DISTNAME=	a2ps
@@ -15,55 +15,25 @@ DISTFILES=	a2ps.V4.3.tar.gz
 MAINTAINER=	obrien@FreeBSD.org
 
 NO_LATEST_LINK=	yes
-LOOP_VAR=	PAPERSIZE
-LOOP_OPTIONS=	letter a4
 MAKE_FLAGS?=	WIDTH=${WIDTH} HEIGHT=${HEIGHT} A4_PAPERSIZE=${A4_PAPERSIZE} -f
 NO_WRKSUBDIR=	yes
 MAN1=		a2ps.1
 
-letter::
-	${MAKE} PAPERSIZE=letter
+PAPERSIZE?=	letter
 
-letter-install::
-	${MAKE} PAPERSIZE=letter install
-
-a4::
-	${MAKE} PAPERSIZE=a4
-
-a4-install::
-	${MAKE} PAPERSIZE=a4 install
-
-
-.if !defined(PAPERSIZE)
-PAPERSIZE_UNSPECIFIED=	yes
-PAPERSIZE=letter
-.endif
-
-.if ${PAPERSIZE} == letter || ${PAPERSIZE} == LETTER || ${PAPERSIZE} == Letter
-PAPERSIZE=letter
+.if ${PAPERSIZE} == letter
 WIDTH=8.5
 HEIGHT=11.0
 A4_PAPERSIZE=0
-.elif ${PAPERSIZE} == A4 || ${PAPERSIZE} == a4 
-PAPERSIZE=a4
+.elif ${PAPERSIZE} == a4
 WIDTH=8.27
 HEIGHT=11.64
 A4_PAPERSIZE=1
 .else
-PAPERSIZE_INVALID= yes
-.endif
-
-
-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 or letter (default)"
-.elif defined(PAPERSIZE_INVALID)
-	@echo "Error: invalid value for PAPERSIZE: \"${PAPERSIZE}\"" 
-	@echo "Possible values are:  A4 or letter (default)"
-	@/usr/bin/false
+.BEGIN:
+	@${ECHO} "Error: invalid value for PAPERSIZE: \"${PAPERSIZE}\"" 
+	@${ECHO} "Possible values are:  a4 or letter"
+	@${FALSE}
 .endif
 
 pre-install:
diff --git a/print/c2ps-letter/Makefile b/print/c2ps-letter/Makefile
index 2a925298fd65..aae94eb01480 100644
--- a/print/c2ps-letter/Makefile
+++ b/print/c2ps-letter/Makefile
@@ -1,37 +1,27 @@
-# New ports collection makefile for:   c2ps
+# New ports collection makefile for:   c2ps (letter)
 # Version required:    4.0
 # Date created:        19 March 1997
 # Whom:                Matthew Hunt <mph@pobox.com>
 #
-# $Id: Makefile,v 1.5 1998/04/17 23:26:29 mph Exp $
+# $Id: Makefile,v 1.6 1998/10/30 08:35:31 asami Exp $
 #
 
 DISTNAME=	c2ps-4.0
-PKGNAME=	c2ps-${PAPERSIZE:S/A4/a4/:S/LETTER/letter/:S/Letter/letter/}-4.0
+PKGNAME=	c2ps-${PAPERSIZE}-4.0
 CATEGORIES=	print
 MASTER_SITES=	http://www.cs.technion.ac.il/users/c2ps/
 
 MAINTAINER=	mph@freebsd.org
 
-LOOP_VAR=	PAPERSIZE
-LOOP_OPTIONS=	letter a4
 MAN1=		c2ps.1
-MAKE_ENV=	DEFAULT_PAPER_TYPE=${PAPERSIZE}
+MAKE_ENV=	DEFAULT_PAPER_TYPE=${PS}
 
-.if !defined(PAPERSIZE)
-PAPERSIZE=A4
-.elif ${PAPERSIZE} == letter || ${PAPERSIZE} == Letter
-PAPERSIZE=LETTER
-.elif ${PAPERSIZE} == a4
-PAPERSIZE=A4
-.elif ${PAPERSIZE} != A4 && ${PAPERSIZE} != LETTER
-PAPERSIZE_INVALID=yes
-.endif
-
-pre-fetch:
-.if defined(PAPERSIZE_INVALID)
+PAPERSIZE?=	letter
+PS!=		echo ${PAPERSIZE} | awk '{print toupper($$1)}'
+.if ${PAPERSIZE} != a4 && ${PAPERSIZE} != letter
+.BEGIN:
 	@${ECHO} "Invalid value for PAPERSIZE: \"${PAPERSIZE}\""
-	@${ECHO} "Possible values are:  A4 (default), and Letter."
+	@${ECHO} "Possible values are:  a4, and letter."
 	@${FALSE}
 .endif
 
diff --git a/print/enscript-a4/Makefile b/print/enscript-a4/Makefile
new file mode 100644
index 000000000000..e097e39f9a83
--- /dev/null
+++ b/print/enscript-a4/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	enscript (a4)
+# Version required:     	1.6.1
+# Date created:			24 Jul, 1997
+# Whom:				kline
+#
+# $Id$
+#
+
+PAPERSIZE=	a4
+MASTERDIR=	${.CURDIR}/../enscript-letter
+
+.include "${MASTERDIR}/Makefile"
diff --git a/print/enscript-letter/Makefile b/print/enscript-letter/Makefile
index d17a739a96e2..0d69f1c1501e 100644
--- a/print/enscript-letter/Makefile
+++ b/print/enscript-letter/Makefile
@@ -1,9 +1,9 @@
-# New ports collection makefile for:	enscript
+# New ports collection makefile for:	enscript (letter)
 # Version required:     	1.6.1
 # Date created:			24 Jul, 1997
 # Whom:				kline
 #
-# $Id: Makefile,v 1.5 1998/10/30 08:35:33 asami Exp $
+# $Id: Makefile,v 1.6 1998/11/09 01:14:51 steve Exp $
 #
 
 DISTNAME=       enscript-1.6.1
@@ -13,11 +13,9 @@ MASTER_SITES=   ${MASTER_SITE_GNU}
 
 MAINTAINER=	kline@thought.org
 
-LOOP_VAR=	PAPERSIZE
-LOOP_OPTIONS=	A4 Letter Letterdj
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--disable-nls --with-media=${PAPERSIZE}
+CONFIGURE_ARGS=	--disable-nls --with-media=${PS}
 MAKE_FLAGS=     WIDTH=${WIDTH} HEIGHT=${HEIGHT} A4_PAPERSIZE=${A4_PAPERSIZE} -f
 
 MAN1=		diffpp.1 enscript.1 sliceprint.1 states.1
@@ -26,83 +24,23 @@ STRIP=
 # If you want to build a static binary, uncomment the following line
 #LDFLAGS+=-static
 
-.if !defined(PAPERSIZE)
-PAPERSIZE=A4     # set default
-WIDTH=8.27
-HEIGHT=11.64
-A4_PAPERSIZE=1
-PAPERSIZE_UNSPECIFIED=  yes
-.elif ${PAPERSIZE} == A4 || ${PAPERSIZE} == a4
-PAPERSIZE=A4
+PAPERSIZE?=	letter
+PS!=		echo ${PAPERSIZE} | tr l L | tr a A
+
+.if ${PAPERSIZE} == a4
 WIDTH=8.27
 HEIGHT=11.64
 A4_PAPERSIZE=1
-.elif ${PAPERSIZE} == letter || ${PAPERSIZE} == LETTER || ${PAPERSIZE} == Letter
-PAPERSIZE=Letter
+.elif ${PAPERSIZE} == letter
 WIDTH=8.5
 HEIGHT=11.0
 A4_PAPERSIZE=0
-.elif ${PAPERSIZE} == Letterdj
-.else
-PAPERSIZE_INVALID= yes
-.endif  # not defined PAPERSIZE
-
-pre-fetch:
-.if defined(PAPERSIZE_UNSPECIFIED)
-	@echo ""
-	@echo "This port builds the default A4 paper size."
-	@echo "If you want to select the LETTER papersize for enscript,"
-	@echo "type a ^C now.  Then type:"
-	@echo ""
-	@echo "  % make letter "
-	@echo ""
-	@echo "Install your port by typing:"
-	@echo ""
-	@echo "make letter-install  {or} % make a4-install"
-	@echo ""
-	@echo "You can also set the environment variable PAPERSIZE to A4 or"
-	@echo "letter to configure enscript for these paper sizes"
-	@sleep 5
-.elif defined(PAPERSIZE_INVALID)
-	@echo "Error: invalid value for PAPERSIZE: \"${PAPERSIZE}\""
-	@echo "Possible values are:  A4 (default) or letter"
+.elif ${PAPERSIZE} != letterdj
+.BEGIN:
+	@${EHCO} "Error: invalid value for PAPERSIZE: \"${PAPERSIZE}\""
+	@${EHCO} "Possible values are:  a4 or letter or letterdj"
 	@${FALSE}
 .endif
-letter::
-	${MAKE} PAPERSIZE=Letter
-
-Letter::
-	${MAKE} PAPERSIZE=Letter
-
-letter-install::
-	${MAKE} PAPERSIZE=Letter install
-
-Letter-install::
-	${MAKE} PAPERSIZE=Letter install
-
-a4::
-	${MAKE} PAPERSIZE=A4
-
-A4::
-	${MAKE} PAPERSIZE=A4
-
-Letterdj::
-	${MAKE} PAPERSIZE=Letterdj
-
-letterdj::
-	${MAKE} PAPERSIZE=Letterdj
-
-Letterdj-install::
-	${MAKE} PAPERSIZE=Letterdj install
-
-letterdj-install::
-	${MAKE} PAPERSIZE=Letterdj install
-
-a4-install::
-	${MAKE} PAPERSIZE=a4 install
-
-A4-install::
-	${MAKE} PAPERSIZE=a4 install
 
 post-install:
 .for file in enscript mkafmmap states
diff --git a/print/enscript-letterdj/Makefile b/print/enscript-letterdj/Makefile
new file mode 100644
index 000000000000..39db991179c3
--- /dev/null
+++ b/print/enscript-letterdj/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	enscript (letterdj)
+# Version required:     	1.6.1
+# Date created:			24 Jul, 1997
+# Whom:				kline
+#
+# $Id$
+#
+
+PAPERSIZE=	letterdj
+MASTERDIR=	${.CURDIR}/../enscript-letter
+
+.include "${MASTERDIR}/Makefile"
diff --git a/print/lprps-a4/Makefile b/print/lprps-a4/Makefile
new file mode 100644
index 000000000000..4f3660199390
--- /dev/null
+++ b/print/lprps-a4/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:    lprps (a4)
+# Version required:     2.50
+# Date created:         Sat Aug 3, 1996
+# Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
+#
+# $Id$
+#
+
+PAPERSIZE=	a4
+MASTERDIR=	${.CURDIR}/../lprps-letter
+
+.include "${MASTERDIR}/Makefile"
diff --git a/print/lprps-letter/Makefile b/print/lprps-letter/Makefile
index 1c05c5d3a40d..0fd234094675 100644
--- a/print/lprps-letter/Makefile
+++ b/print/lprps-letter/Makefile
@@ -1,10 +1,10 @@
 # ex:ts=8
-# New ports collection makefile for:    lprps
+# New ports collection makefile for:    lprps (letter)
 # Version required:     2.50
 # Date created:         Sat Aug 3, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.4 1997/11/10 11:23:26 asami Exp $
+# $Id: Makefile,v 1.5 1998/10/30 08:35:36 asami Exp $
 #
 
 DISTNAME=	lprps-2.5
@@ -15,47 +15,19 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=     obrien@FreeBSD.org
 
-LOOP_VAR=	PAPERSIZE
-LOOP_OPTIONS=	letter a4
-MAKE_FLAGS?=	PAPERSIZE=${PAPERSIZE} -f
+MAKE_FLAGS?=	PAPERSIZE=${PS} -f
 MAN1=		psrev.1 textps.1
 MAN8=		lprps.8 psif.8 psof.8
 
 
-letter::
-	${MAKE} PAPERSIZE=letter
+PAPERSIZE?=	letter
+PS!=		echo ${PAPERSIZE} | awk '{print toupper($$1)}'
 
-letter-install::
-	${MAKE} PAPERSIZE=letter install
-
-a4::
-	${MAKE} PAPERSIZE=a4
-
-a4-install::
-	${MAKE} PAPERSIZE=a4 install
-
-
-.if !defined(PAPERSIZE)
-PAPERSIZE=LETTER
-PAPERSIZE_UNSPECIFIED=	yes
-.elif ${PAPERSIZE} == A4 || ${PAPERSIZE} == a4
-PAPERSIZE=A4
-.elif ${PAPERSIZE} == letter || ${PAPERSIZE} == LETTER
-PAPERSIZE=LETTER
-.else
-PAPERSIZE_INVALID= yes
-.endif	# not defined PAPERSIZE
-
-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 or letter (default)"
-.elif defined(PAPERSIZE_INVALID)
-	@echo "Error: invalid value for PAPERSIZE: \"${PAPERSIZE}\"" 
-	@echo "Possible values are:  A4 or letter (default)"
-	@/usr/bin/false
+.if ${PAPERSIZE} != a4 && ${PAPERSIZE} != letter
+.BEGIN:
+	@${ECHO} "Error: invalid value for PAPERSIZE: \"${PAPERSIZE}\"" 
+	@${ECHO} "Possible values are:  a4 or letter"
+	@${FALSE}
 .endif
 
 do-install:
diff --git a/print/mp-a4/Makefile b/print/mp-a4/Makefile
new file mode 100644
index 000000000000..e3a01579fb3a
--- /dev/null
+++ b/print/mp-a4/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:    mp (a4)
+# Version required:     3.0.1
+# Date created:         11 July 1996
+# Whom:                 David O'Brien <obrien@cs.ucdavis.edu>
+#
+# $Id$
+#
+
+PAPERSIZE=	a4
+MASTERDIR=	${.CURDIR}/../mp-letter
+
+.include "${MASTERDIR}/Makefile"
diff --git a/print/mp-letter/Makefile b/print/mp-letter/Makefile
index 684ad73f476d..cf01e60f958a 100644
--- a/print/mp-letter/Makefile
+++ b/print/mp-letter/Makefile
@@ -1,9 +1,9 @@
-# New ports collection makefile for:    mp
+# New ports collection makefile for:    mp (letter)
 # Version required:     3.0.1
 # Date created:         11 July 1996
 # Whom:                 David O'Brien <obrien@cs.ucdavis.edu>
 #
-# $Id: Makefile,v 1.8 1998/09/19 01:40:37 hoek Exp $
+# $Id: Makefile,v 1.9 1998/10/30 08:35:37 asami Exp $
 #
 
 DISTNAME=	mp-3.0.1
@@ -14,17 +14,14 @@ MASTER_SITES=	ftp://ftp.NUXI.com/pub/misc/ \
 
 MAINTAINER=	obrien@FreeBSD.org
 
-LOOP_VAR=	PAPERSIZE
-LOOP_OPTIONS=	letter a4
 WRKSRC=		${WRKDIR}/mp
 MAN1=		mp.1
 MLINKS=		mp.1 digestp.1	- filep.1	- filofaxp.1 \
 		- franklinp.1	- mailp.1	- newsp.1 \
 		- timemanp.1	- timesysp.1
 
-.if !defined(PAPERSIZE)
-PAPERSIZE=letter
-.elif ${PAPERSIZE} == A4 || ${PAPERSIZE} == a4
+PAPERSIZE?=	letter
+.if ${PAPERSIZE} == a4
 INSTALL_TARGET= install-a4
 .endif
 
diff --git a/print/psutils-a4/Makefile b/print/psutils-a4/Makefile
new file mode 100644
index 000000000000..c369416b430c
--- /dev/null
+++ b/print/psutils-a4/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:    psutils (a4)
+# Version required:     1.16
+# Date created:         21 September 1994
+# Whom:                 jmz & David O'Brien (obrien@cs.ucdavis.edu)
+#
+# $Id$
+#
+
+PAPERSIZE=	a4
+MASTERDIR=	${.CURDIR}/../psutils-letter
+
+.include "${MASTERDIR}/Makefile"
diff --git a/print/psutils-letter/Makefile b/print/psutils-letter/Makefile
index a85c1dde9629..4843ac0aa213 100644
--- a/print/psutils-letter/Makefile
+++ b/print/psutils-letter/Makefile
@@ -1,9 +1,9 @@
-# New ports collection makefile for:    psutils
+# New ports collection makefile for:    psutils (letter)
 # Version required:     1.16
 # Date created:         21 September 1994
 # Whom:                 jmz & David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.16 1998/03/12 16:12:09 jmz Exp $
+# $Id: Makefile,v 1.17 1998/10/30 08:35:38 asami Exp $
 #
 
 DISTNAME=	psutils-p17
@@ -13,8 +13,6 @@ MASTER_SITES=	ftp://ftp.dcs.ed.ac.uk/pub/ajcd/
 
 MAINTAINER=	jmz@FreeBSD.org
 
-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 \
@@ -22,21 +20,8 @@ MAN1=		psbook.1 psselect.1 pstops.1 epsffit.1 psnup.1 psresize.1 \
 		fixpspps.1 fixtpps.1 fixwfwps.1 fixwpps.1 fixwwps.1 \
 		extractres.1 includeres.1 fixscribeps.1 psmerge.1
 
-
-##package::	letter  a4
-
-letter::
-	${MAKE} PAPERSIZE=letter
-
-letter-install::
-	${MAKE} PAPERSIZE=letter install
-
-a4::
-	${MAKE} PAPERSIZE=a4
-
-
 .if !defined(PAPERSIZE)
-PAPERSIZE=a4
+PAPERSIZE=letter
 PAPERSIZE_UNSPECIFIED=	yes
 .else
 .if ${PAPERSIZE} != A3 && ${PAPERSIZE} != a3 && ${PAPERSIZE} != A4 \
@@ -46,7 +31,11 @@ PAPERSIZE_UNSPECIFIED=	yes
 	&& ${PAPERSIZE} != ledger && ${PAPERSIZE} != tabloid \
 	&& ${PAPERSIZE} != statement && ${PAPERSIZE} != executive \
 	&& ${PAPERSIZE} != folio && ${PAPERSIZE} != quarto && ${PAPERSIZE} != 10x14
-PAPERSIZE_INVALID= yes
+.BEGIN:
+	@${ECHO} "Error: invalid value for PAPERSIZE: \"${PAPERSIZE}\""
+	@${ECHO} "Possible values are:  A3, A4 (default), A5, B5, letter, legal,"
+	@${ECHO} "   ledger, tabloid, statement, executive, folio, quarto, and 10x14."
+	@${FALSE}
 .endif
 .endif
 
@@ -55,13 +44,8 @@ pre-fetch:
 	@echo "Defaulting to ${PAPERSIZE} sized paper."
 	@echo ""
 	@echo "Set the environment variable PAPERSIZE if you want to use other sizes."
-	@echo "Possible values are:  A3, A4 (default), A5, B5, letter, legal,"
+	@echo "Possible values are:  A3, A4, A5, B5, letter, legal,"
 	@echo "   ledger, tabloid, statement, executive, folio, quarto, and 10x14."
-.elif defined(PAPERSIZE_INVALID)
-	@echo "Error: invalid value for PAPERSIZE: \"${PAPERSIZE}\""
-	@echo "Possible values are:  A3, A4 (default), A5, B5, letter, legal,"
-	@echo "   ledger, tabloid, statement, executive, folio, quarto, and 10x14."
-	@${FALSE}
 .endif
 
 .include <bsd.port.mk>
author	Satoshi Asami <asami@FreeBSD.org>	1998-11-20 04:15:15 +0000
committer	Satoshi Asami <asami@FreeBSD.org>	1998-11-20 04:15:15 +0000
commit	751790b51ae4c1152e8944cbaf99d49b1377e95b (patch)
tree	086c03d44a933a34d3f086e2ad7487d5d6b2872d
parent	(1) Remove LOOP_VAR and LOOP_OPTIONS. It's a hack and just too many things (diff)