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.

9 files changed, 107 insertions, 40 deletions

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"