Use MASTERDIR where appropriate. Also, add FILE_DEPENDS to denote

that the port otherwise uses files from another port.  (Note: support
for FILE_DEPENDS is not in bsd.port.mk yet, so it's a no-op for now.)

79 files changed, 384 insertions, 213 deletions

diff --git a/japanese/ewipe/Makefile b/japanese/ewipe/Makefile
index 1a513c6faabd..7016285e081d 100644
--- a/japanese/ewipe/Makefile
+++ b/japanese/ewipe/Makefile
@@ -3,19 +3,17 @@
 # Date created:		17 October 1997
 # Whom:			itojun@itojun.org
 #
-# $Id: Makefile,v 1.11 1998/03/04 06:18:54 itojun Exp $
+# $Id: Makefile,v 1.12 1998/04/12 02:22:02 itojun Exp $
 #
 
-# can't use PORTSDIR here, since we haven't included bsd.port.mk
-FILESDIR=	${.CURDIR}/../../misc/ewipe/files
-PKGDIR=		${.CURDIR}/../../misc/ewipe/pkg
-SCRIPTDIR=	${.CURDIR}/../../misc/ewipe/scripts
+MASTERDIR=	${.CURDIR}/../../misc/ewipe
+PATCHDIR=	${.CURDIR}/patches
 COMMENT=	${.CURDIR}/pkg/COMMENT
 
 PKGNAME=	ja-ewipe-1.0.0
 KANJI=		yes
 
-.include <${.CURDIR}/../../misc/ewipe/Makefile>
+.include "${MASTERDIR}/Makefile"
 
 CATEGORIES=	japanese misc tk42
 
diff --git a/japanese/gp/Makefile b/japanese/gp/Makefile
index 4061b9a6ba50..31c561c8cc48 100644
--- a/japanese/gp/Makefile
+++ b/japanese/gp/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 April 1997
 # Whom:			Kiriyama Kazuhiko<kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id: Makefile,v 1.7 1998/06/04 18:28:10 itojun Exp $
+# $Id: Makefile,v 1.8 1998/08/24 01:04:42 steve Exp $
 #
 
 PKGNAME=	ja-gp-2.5p2
@@ -11,4 +11,7 @@ CATEGORIES=	japanese print
 
 LANGUAGE=	Japanese
 
-.include "${.CURDIR}/../../print/gp/Makefile"
+MASTERDIR=	${.CURDIR}/../../print/gp
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/jtex209-ascii/Makefile b/japanese/jtex209-ascii/Makefile
index 7ff392c62756..6dbd6dfe797c 100644
--- a/japanese/jtex209-ascii/Makefile
+++ b/japanese/jtex209-ascii/Makefile
@@ -3,14 +3,15 @@
 # Date created:		4 Nov 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.2 1997/09/24 06:43:46 max Exp $
+# $Id: Makefile,v 1.3 1997/11/10 11:22:21 asami Exp $
 #
 
 DISTNAME=	ja-jlatex209-a17
-FILESDIR=	${.CURDIR}/../jtex209-both/files
-PATCHDIR=	${.CURDIR}/../jtex209-both/patches
 BATCH_TEX=	ASCII
 
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of jtex-*
 
-.include	<${.CURDIR}/../jtex209-both/Makefile>
+MASTERDIR=	${.CURDIR}/../jtex209-both/
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/jtex209-ntt/Makefile b/japanese/jtex209-ntt/Makefile
index fcb66c505d7a..6cc7a342d0c3 100644
--- a/japanese/jtex209-ntt/Makefile
+++ b/japanese/jtex209-ntt/Makefile
@@ -3,14 +3,15 @@
 # Date created:		4 Nov 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.2 1997/09/24 06:43:50 max Exp $
+# $Id: Makefile,v 1.3 1997/11/10 11:22:29 asami Exp $
 #
 
 DISTNAME=	ja-jlatex209-n152
-FILESDIR=	${.CURDIR}/../jtex209-both/files
-PATCHDIR=	${.CURDIR}/../jtex209-both/patches
 BATCH_TEX=	NTT
 
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of jtex-*
 
-.include	<${.CURDIR}/../jtex209-both/Makefile>
+MASTERDIR=	${.CURDIR}/../jtex209-both/
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/jvim-canna+freewnn/Makefile b/japanese/jvim-canna+freewnn/Makefile
index 6f03d2972b1b..689a3d3d0564 100644
--- a/japanese/jvim-canna+freewnn/Makefile
+++ b/japanese/jvim-canna+freewnn/Makefile
@@ -3,11 +3,14 @@
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/11 14:04:08 kuriyama Exp $
 #
 
 PKGNAME=	ja-jvim-canna+wnn4-2.0r
 CANNA=		yes
 WNN4=		yes
 
-.include "${.CURDIR}/../jvim/Makefile"
+MASTERDIR=	${.CURDIR}/../jvim
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/jvim-canna+wnn6/Makefile b/japanese/jvim-canna+wnn6/Makefile
index 1a75fb21a284..24f6d0bd8d7c 100644
--- a/japanese/jvim-canna+wnn6/Makefile
+++ b/japanese/jvim-canna+wnn6/Makefile
@@ -3,11 +3,14 @@
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/11 14:05:54 kuriyama Exp $
 #
 
 PKGNAME=	ja-jvim-canna+wnn6-2.0r
 CANNA=		yes
 WNN6=		yes
 
-.include "${.CURDIR}/../jvim/Makefile"
+MASTERDIR=	${.CURDIR}/../jvim
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/jvim-canna+wnn7/Makefile b/japanese/jvim-canna+wnn7/Makefile
index 1a75fb21a284..24f6d0bd8d7c 100644
--- a/japanese/jvim-canna+wnn7/Makefile
+++ b/japanese/jvim-canna+wnn7/Makefile
@@ -3,11 +3,14 @@
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/11 14:05:54 kuriyama Exp $
 #
 
 PKGNAME=	ja-jvim-canna+wnn6-2.0r
 CANNA=		yes
 WNN6=		yes
 
-.include "${.CURDIR}/../jvim/Makefile"
+MASTERDIR=	${.CURDIR}/../jvim
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/jvim-canna/Makefile b/japanese/jvim-canna/Makefile
index b4fd9b9f0e04..a5500e1f9cfc 100644
--- a/japanese/jvim-canna/Makefile
+++ b/japanese/jvim-canna/Makefile
@@ -3,10 +3,13 @@
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/11 14:02:11 kuriyama Exp $
 #
 
 PKGNAME=	ja-jvim-canna-2.0r
 CANNA=		yes
 
-.include "${.CURDIR}/../jvim/Makefile"
+MASTERDIR=	${.CURDIR}/../jvim
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/jvim-freewnn/Makefile b/japanese/jvim-freewnn/Makefile
index 986e1ca17ca3..f17f7aa1923e 100644
--- a/japanese/jvim-freewnn/Makefile
+++ b/japanese/jvim-freewnn/Makefile
@@ -3,10 +3,13 @@
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/10 14:07:36 kuriyama Exp $
 #
 
 PKGNAME=	ja-jvim-wnn4-2.0r
 WNN4=		yes
 
-.include "${.CURDIR}/../jvim/Makefile"
+MASTERDIR=	${.CURDIR}/../jvim
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/jvim-wnn6/Makefile b/japanese/jvim-wnn6/Makefile
index 2d665b0349a7..0785724789e7 100644
--- a/japanese/jvim-wnn6/Makefile
+++ b/japanese/jvim-wnn6/Makefile
@@ -3,10 +3,13 @@
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/11 00:33:12 kuriyama Exp $
 #
 
 PKGNAME=	ja-jvim-wnn6-2.0r
 WNN6=		yes
 
-.include "${.CURDIR}/../jvim/Makefile"
+MASTERDIR=	${.CURDIR}/../jvim
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/jvim-wnn7/Makefile b/japanese/jvim-wnn7/Makefile
index 2d665b0349a7..0785724789e7 100644
--- a/japanese/jvim-wnn7/Makefile
+++ b/japanese/jvim-wnn7/Makefile
@@ -3,10 +3,13 @@
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/11 00:33:12 kuriyama Exp $
 #
 
 PKGNAME=	ja-jvim-wnn6-2.0r
 WNN6=		yes
 
-.include "${.CURDIR}/../jvim/Makefile"
+MASTERDIR=	${.CURDIR}/../jvim
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/jvim3-canna+freewnn/Makefile b/japanese/jvim3-canna+freewnn/Makefile
index 8eaaf17f16f5..59d045fc4d6f 100644
--- a/japanese/jvim3-canna+freewnn/Makefile
+++ b/japanese/jvim3-canna+freewnn/Makefile
@@ -3,7 +3,7 @@
 # Date created:		98/11/17
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1998/10/20 15:52:55 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/11/24 19:47:55 sada Exp $
 #
 
 PKGNAME=	ja-jvim-canna+wnn4-3.0.1.3i
@@ -11,4 +11,7 @@ PKGNAME=	ja-jvim-canna+wnn4-3.0.1.3i
 CANNA=		yes
 WNN4=		yes
 
-.include "${.CURDIR}/../jvim3/Makefile"
+MASTERDIR=	${.CURDIR}/../jvim3
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/jvim3-canna+wnn6/Makefile b/japanese/jvim3-canna+wnn6/Makefile
index 30bfae3bac23..e8f9cf4cbc2e 100644
--- a/japanese/jvim3-canna+wnn6/Makefile
+++ b/japanese/jvim3-canna+wnn6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		98/11/17
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1998/10/20 15:52:55 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/11/24 19:47:57 sada Exp $
 #
 
 PKGNAME=	ja-jvim-canna+wnn6-3.0.1.3i
@@ -11,4 +11,7 @@ PKGNAME=	ja-jvim-canna+wnn6-3.0.1.3i
 CANNA=		yes
 WNN6=		yes
 
-.include "${.CURDIR}/../jvim3/Makefile"
+MASTERDIR=	${.CURDIR}/../jvim3
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/jvim3-canna+wnn7/Makefile b/japanese/jvim3-canna+wnn7/Makefile
index 30bfae3bac23..e8f9cf4cbc2e 100644
--- a/japanese/jvim3-canna+wnn7/Makefile
+++ b/japanese/jvim3-canna+wnn7/Makefile
@@ -3,7 +3,7 @@
 # Date created:		98/11/17
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1998/10/20 15:52:55 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/11/24 19:47:57 sada Exp $
 #
 
 PKGNAME=	ja-jvim-canna+wnn6-3.0.1.3i
@@ -11,4 +11,7 @@ PKGNAME=	ja-jvim-canna+wnn6-3.0.1.3i
 CANNA=		yes
 WNN6=		yes
 
-.include "${.CURDIR}/../jvim3/Makefile"
+MASTERDIR=	${.CURDIR}/../jvim3
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/jvim3-canna/Makefile b/japanese/jvim3-canna/Makefile
index bb7ba66d42aa..42e508db8bdd 100644
--- a/japanese/jvim3-canna/Makefile
+++ b/japanese/jvim3-canna/Makefile
@@ -3,11 +3,14 @@
 # Date created:		98/11/17
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1998/10/20 15:52:55 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/11/24 19:47:55 sada Exp $
 #
 
 PKGNAME=	ja-jvim-canna-3.0.1.3i
 
 CANNA=		yes
 
-.include "${.CURDIR}/../jvim3/Makefile"
+MASTERDIR=	${.CURDIR}/../jvim3
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/jvim3-direct_canna/Makefile b/japanese/jvim3-direct_canna/Makefile
index 4d255e28dff1..2433ee681d90 100644
--- a/japanese/jvim3-direct_canna/Makefile
+++ b/japanese/jvim3-direct_canna/Makefile
@@ -3,11 +3,14 @@
 # Date created:		98/11/17
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1998/10/20 15:52:55 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/11/24 19:47:58 sada Exp $
 #
 
 PKGNAME=	ja-jvim--direct_canna-3.0.1.3i
 
 DIRECT_CANNA=	yes
 
-.include "${.CURDIR}/../jvim3/Makefile"
+MASTERDIR=	${.CURDIR}/../jvim3
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/jvim3-freewnn/Makefile b/japanese/jvim3-freewnn/Makefile
index e7e4debfa867..021b515e2e2a 100644
--- a/japanese/jvim3-freewnn/Makefile
+++ b/japanese/jvim3-freewnn/Makefile
@@ -3,11 +3,14 @@
 # Date created:		98/11/17
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1998/10/20 15:52:55 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/11/24 19:47:59 sada Exp $
 #
 
 PKGNAME=	ja-jvim-wnn4-3.0.1.3i
 
 WNN4=		yes
 
-.include "${.CURDIR}/../jvim3/Makefile"
+MASTERDIR=	${.CURDIR}/../jvim3
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/jvim3-wnn6/Makefile b/japanese/jvim3-wnn6/Makefile
index ffb13cb71d28..39f35ec0239a 100644
--- a/japanese/jvim3-wnn6/Makefile
+++ b/japanese/jvim3-wnn6/Makefile
@@ -3,11 +3,14 @@
 # Date created:		98/11/17
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1998/10/20 15:52:55 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/11/24 19:47:59 sada Exp $
 #
 
 PKGNAME=	ja-jvim-wnn6-3.0.1.3i
 
 WNN6=		yes
 
-.include "${.CURDIR}/../jvim3/Makefile"
+MASTERDIR=	${.CURDIR}/../jvim3
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/jvim3-wnn7/Makefile b/japanese/jvim3-wnn7/Makefile
index ffb13cb71d28..39f35ec0239a 100644
--- a/japanese/jvim3-wnn7/Makefile
+++ b/japanese/jvim3-wnn7/Makefile
@@ -3,11 +3,14 @@
 # Date created:		98/11/17
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1998/10/20 15:52:55 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/11/24 19:47:59 sada Exp $
 #
 
 PKGNAME=	ja-jvim-wnn6-3.0.1.3i
 
 WNN6=		yes
 
-.include "${.CURDIR}/../jvim3/Makefile"
+MASTERDIR=	${.CURDIR}/../jvim3
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/kinput2-canna+freewnn+sj3/Makefile b/japanese/kinput2-canna+freewnn+sj3/Makefile
index 393935a1a704..f341a0a99ba0 100644
--- a/japanese/kinput2-canna+freewnn+sj3/Makefile
+++ b/japanese/kinput2-canna+freewnn+sj3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: $
+# $Id: Makefile,v 1.1.1.1 1998/06/28 01:05:38 kuriyama Exp $
 #
 
 PKGNAME=	ja-kinput2-canna+sj3+wnn4-2.0.4
@@ -11,4 +11,7 @@ CANNA=		yes
 SJ3=		yes
 WNN4=		yes
 
-.include "${.CURDIR}/../kinput2-wnn4/Makefile"
+MASTERDIR=	${.CURDIR}/../kinput2-wnn4/
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/kinput2-canna+freewnn/Makefile b/japanese/kinput2-canna+freewnn/Makefile
index 06219d2e5a11..ac4af17e4e13 100644
--- a/japanese/kinput2-canna+freewnn/Makefile
+++ b/japanese/kinput2-canna+freewnn/Makefile
@@ -3,11 +3,14 @@
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/06/28 14:22:23 kuriyama Exp $
 #
 
 PKGNAME=	ja-kinput2-canna+wnn4-2.0.4
 CANNA=		yes
 WNN4=		yes
 
-.include "${.CURDIR}/../kinput2-wnn4/Makefile"
+MASTERDIR=	${.CURDIR}/../kinput2-wnn4/
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/kinput2-canna+sj3+wnn6/Makefile b/japanese/kinput2-canna+sj3+wnn6/Makefile
index bf4396d8adf5..6230ef288e6b 100644
--- a/japanese/kinput2-canna+sj3+wnn6/Makefile
+++ b/japanese/kinput2-canna+sj3+wnn6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/06/28 08:25:18 kuriyama Exp $
 #
 
 PKGNAME=	ja-kinput2-canna+sj3+wnn6-2.0.4
@@ -11,4 +11,7 @@ CANNA=		yes
 SJ3=		yes
 WNN6=		yes
 
-.include "${.CURDIR}/../kinput2-wnn4/Makefile"
+MASTERDIR=	${.CURDIR}/../kinput2-wnn4/
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/kinput2-canna+sj3+wnn7/Makefile b/japanese/kinput2-canna+sj3+wnn7/Makefile
index bf4396d8adf5..6230ef288e6b 100644
--- a/japanese/kinput2-canna+sj3+wnn7/Makefile
+++ b/japanese/kinput2-canna+sj3+wnn7/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/06/28 08:25:18 kuriyama Exp $
 #
 
 PKGNAME=	ja-kinput2-canna+sj3+wnn6-2.0.4
@@ -11,4 +11,7 @@ CANNA=		yes
 SJ3=		yes
 WNN6=		yes
 
-.include "${.CURDIR}/../kinput2-wnn4/Makefile"
+MASTERDIR=	${.CURDIR}/../kinput2-wnn4/
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/kinput2-canna+sj3/Makefile b/japanese/kinput2-canna+sj3/Makefile
index b116134b5604..d87886f9563f 100644
--- a/japanese/kinput2-canna+sj3/Makefile
+++ b/japanese/kinput2-canna+sj3/Makefile
@@ -3,11 +3,14 @@
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.3 1997/09/14 21:34:45 max Exp $
+# $Id: Makefile,v 1.4 1998/06/30 14:13:44 kuriyama Exp $
 #
 
 PKGNAME=	ja-kinput2-canna+sj3-2.0.4
 CANNA=		yes
 SJ3=		yes
 
-.include "${.CURDIR}/../kinput2-wnn4/Makefile"
+MASTERDIR=	${.CURDIR}/../kinput2-wnn4/
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/kinput2-canna+wnn6/Makefile b/japanese/kinput2-canna+wnn6/Makefile
index cdbff3e48390..1b3449229e28 100644
--- a/japanese/kinput2-canna+wnn6/Makefile
+++ b/japanese/kinput2-canna+wnn6/Makefile
@@ -3,11 +3,14 @@
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/06/28 22:01:05 kuriyama Exp $
 #
 
 PKGNAME=	ja-kinput2-canna+wnn6-2.0.4
 CANNA=		yes
 WNN6=		yes
 
-.include "${.CURDIR}/../kinput2-wnn4/Makefile"
+MASTERDIR=	${.CURDIR}/../kinput2-wnn4/
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/kinput2-canna+wnn7/Makefile b/japanese/kinput2-canna+wnn7/Makefile
index cdbff3e48390..1b3449229e28 100644
--- a/japanese/kinput2-canna+wnn7/Makefile
+++ b/japanese/kinput2-canna+wnn7/Makefile
@@ -3,11 +3,14 @@
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/06/28 22:01:05 kuriyama Exp $
 #
 
 PKGNAME=	ja-kinput2-canna+wnn6-2.0.4
 CANNA=		yes
 WNN6=		yes
 
-.include "${.CURDIR}/../kinput2-wnn4/Makefile"
+MASTERDIR=	${.CURDIR}/../kinput2-wnn4/
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/kinput2-canna/Makefile b/japanese/kinput2-canna/Makefile
index 29e7cf780b16..cf6bce4a6309 100644
--- a/japanese/kinput2-canna/Makefile
+++ b/japanese/kinput2-canna/Makefile
@@ -3,10 +3,13 @@
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.5 1997/12/25 22:29:37 asami Exp $
+# $Id: Makefile,v 1.6 1998/06/30 14:13:42 kuriyama Exp $
 #
 
 PKGNAME=	ja-kinput2-canna-2.0.4
 CANNA=		yes
 
-.include "${.CURDIR}/../kinput2-wnn4/Makefile"
+MASTERDIR=	${.CURDIR}/../kinput2-wnn4/
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/kinput2-freewnn+sj3/Makefile b/japanese/kinput2-freewnn+sj3/Makefile
index e89c48dfaa95..4d41aafdb504 100644
--- a/japanese/kinput2-freewnn+sj3/Makefile
+++ b/japanese/kinput2-freewnn+sj3/Makefile
@@ -3,11 +3,14 @@
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/06/29 14:16:18 kuriyama Exp $
 #
 
 PKGNAME=	ja-kinput2-sj3+wnn4-2.0.4
 SJ3=		yes
 WNN4=		yes
 
-.include "${.CURDIR}/../kinput2-wnn4/Makefile"
+MASTERDIR=	${.CURDIR}/../kinput2-wnn4/
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/kinput2-sj3+wnn6/Makefile b/japanese/kinput2-sj3+wnn6/Makefile
index 5c6304ef1dbc..304bbf659c92 100644
--- a/japanese/kinput2-sj3+wnn6/Makefile
+++ b/japanese/kinput2-sj3+wnn6/Makefile
@@ -3,11 +3,14 @@
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/06/29 14:19:02 kuriyama Exp $
 #
 
 PKGNAME=	ja-kinput2-sj3+wnn6-2.0.4
 SJ3=		yes
 WNN6=		yes
 
-.include "${.CURDIR}/../kinput2-wnn4/Makefile"
+MASTERDIR=	${.CURDIR}/../kinput2-wnn4/
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/kinput2-sj3+wnn7/Makefile b/japanese/kinput2-sj3+wnn7/Makefile
index 5c6304ef1dbc..304bbf659c92 100644
--- a/japanese/kinput2-sj3+wnn7/Makefile
+++ b/japanese/kinput2-sj3+wnn7/Makefile
@@ -3,11 +3,14 @@
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/06/29 14:19:02 kuriyama Exp $
 #
 
 PKGNAME=	ja-kinput2-sj3+wnn6-2.0.4
 SJ3=		yes
 WNN6=		yes
 
-.include "${.CURDIR}/../kinput2-wnn4/Makefile"
+MASTERDIR=	${.CURDIR}/../kinput2-wnn4/
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/kinput2-sj3/Makefile b/japanese/kinput2-sj3/Makefile
index a9c4a614fde8..e538f423ac51 100644
--- a/japanese/kinput2-sj3/Makefile
+++ b/japanese/kinput2-sj3/Makefile
@@ -3,10 +3,13 @@
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.3 1997/09/14 21:34:48 max Exp $
+# $Id: Makefile,v 1.4 1998/06/30 14:13:59 kuriyama Exp $
 #
 
 PKGNAME=	ja-kinput2-sj3-2.0.4
 SJ3=		yes
 
-.include "${.CURDIR}/../kinput2-wnn4/Makefile"
+MASTERDIR=	${.CURDIR}/../kinput2-wnn4/
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/kinput2-wnn6/Makefile b/japanese/kinput2-wnn6/Makefile
index 210c15d67eb7..cc7048ef0320 100644
--- a/japanese/kinput2-wnn6/Makefile
+++ b/japanese/kinput2-wnn6/Makefile
@@ -3,10 +3,13 @@
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/06/27 15:54:46 kuriyama Exp $
 #
 
 PKGNAME=	ja-kinput2-wnn6-2.0.4
 WNN6=		yes
 
-.include "${.CURDIR}/../kinput2-wnn4/Makefile"
+MASTERDIR=	${.CURDIR}/../kinput2-wnn4/
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/kinput2-wnn7/Makefile b/japanese/kinput2-wnn7/Makefile
index 210c15d67eb7..cc7048ef0320 100644
--- a/japanese/kinput2-wnn7/Makefile
+++ b/japanese/kinput2-wnn7/Makefile
@@ -3,10 +3,13 @@
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/06/27 15:54:46 kuriyama Exp $
 #
 
 PKGNAME=	ja-kinput2-wnn6-2.0.4
 WNN6=		yes
 
-.include "${.CURDIR}/../kinput2-wnn4/Makefile"
+MASTERDIR=	${.CURDIR}/../kinput2-wnn4/
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/magicpoint/Makefile b/japanese/magicpoint/Makefile
index a371d32f027a..7ae5aa1e7fc5 100644
--- a/japanese/magicpoint/Makefile
+++ b/japanese/magicpoint/Makefile
@@ -3,20 +3,17 @@
 # Date created:		25 Dec 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.4 1998/09/06 13:48:20 itojun Exp $
+# $Id: Makefile,v 1.5 1998/10/07 06:11:41 asami Exp $
 #
 
-# can't use PORTSDIR here, since we haven't included bsd.port.mk
-FILESDIR=	${.CURDIR}/../../misc/magicpoint/files
-PATCHDIR=	${.CURDIR}/../../misc/magicpoint/patches
-PKGDIR=		${.CURDIR}/../../misc/magicpoint/pkg
+MASTERDIR=	${.CURDIR}/../../misc/magicpoint
 COMMENT=	${.CURDIR}/pkg/COMMENT
 
 LIB_DEPENDS=	VFlib2.23:${PORTSDIR}/japanese/vflib
 
 PKGNAME=	ja-magicpoint-1.04a
 
-.include <${.CURDIR}/../../misc/magicpoint/Makefile>
+.include "${MASTERDIR}/Makefile"
 
 CATEGORIES=	japanese misc
 
diff --git a/japanese/mnews-gnspool/Makefile b/japanese/mnews-gnspool/Makefile
index e8563254c3a3..5d48050fe2b5 100644
--- a/japanese/mnews-gnspool/Makefile
+++ b/japanese/mnews-gnspool/Makefile
@@ -3,17 +3,16 @@
 # Date created:			23 Sep 1996
 # Whom:				Masafumi NAKANE <max@FreeBSD.ORG>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/08/24 01:33:16 steve Exp $
 #
 
 PKGNAME=	ja-mnews-gnspool-1.21
 
 RUN_DEPENDS=	gnspool:${PORTSDIR}/japanese/gn-gnspool
 
-FILESDIR=	${.CURDIR}/../mnews/files
-PKGDIR=		${.CURDIR}/../mnews/pkg
+MASTERDIR=	${.CURDIR}/../mnews
 COMMENT=	${.CURDIR}/pkg/COMMENT
 
 GNSPOOL=	1
 
-.include "../mnews/Makefile"
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/mule-canna+freewnn+sj3/Makefile b/japanese/mule-canna+freewnn+sj3/Makefile
index 9e0b73252b8b..b7fa29ba340c 100644
--- a/japanese/mule-canna+freewnn+sj3/Makefile
+++ b/japanese/mule-canna+freewnn+sj3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1997/09/14 21:35:07 max Exp $
+# $Id: Makefile,v 1.3 1998/10/07 08:11:35 asami Exp $
 #
 
 PKGNAME=	ja-mule-canna+sj3+wnn4-2.3
@@ -13,4 +13,7 @@ CANNA=		yes
 SJ3=		yes
 WNN4=		yes
 
-.include "${.CURDIR}/../../editors/mule/Makefile"
+MASTERDIR=	${.CURDIR}/../../editors/mule
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/mule-canna+freewnn/Makefile b/japanese/mule-canna+freewnn/Makefile
index bec9f37ce176..5437e3e8b8cb 100644
--- a/japanese/mule-canna+freewnn/Makefile
+++ b/japanese/mule-canna+freewnn/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1997/09/14 21:35:10 max Exp $
+# $Id: Makefile,v 1.3 1998/10/07 08:11:37 asami Exp $
 #
 
 PKGNAME=	ja-mule-canna+wnn4-2.3
@@ -12,4 +12,7 @@ CATEGORIES=	japanese editors
 CANNA=		yes
 WNN4=		yes
 
-.include "${.CURDIR}/../../editors/mule/Makefile"
+MASTERDIR=	${.CURDIR}/../../editors/mule
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/mule-canna+sj3+wnn6/Makefile b/japanese/mule-canna+sj3+wnn6/Makefile
index 43069bc5e13f..44b2e2c413bf 100644
--- a/japanese/mule-canna+sj3+wnn6/Makefile
+++ b/japanese/mule-canna+sj3+wnn6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.3 1998/10/07 08:11:36 asami Exp $
+# $Id: Makefile,v 1.4 1998/12/01 01:05:15 asami Exp $
 #
 
 PKGNAME=	ja-mule-canna+sj3+wnn6-2.3
@@ -13,4 +13,7 @@ CANNA=		yes
 SJ3=		yes
 WNN6=		yes
 
-.include "${.CURDIR}/../../editors/mule/Makefile"
+MASTERDIR=	${.CURDIR}/../../editors/mule
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/mule-canna+sj3+wnn7/Makefile b/japanese/mule-canna+sj3+wnn7/Makefile
index 43069bc5e13f..44b2e2c413bf 100644
--- a/japanese/mule-canna+sj3+wnn7/Makefile
+++ b/japanese/mule-canna+sj3+wnn7/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.3 1998/10/07 08:11:36 asami Exp $
+# $Id: Makefile,v 1.4 1998/12/01 01:05:15 asami Exp $
 #
 
 PKGNAME=	ja-mule-canna+sj3+wnn6-2.3
@@ -13,4 +13,7 @@ CANNA=		yes
 SJ3=		yes
 WNN6=		yes
 
-.include "${.CURDIR}/../../editors/mule/Makefile"
+MASTERDIR=	${.CURDIR}/../../editors/mule
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/mule-canna+sj3/Makefile b/japanese/mule-canna+sj3/Makefile
index f6ef74e48547..a12fa09b2195 100644
--- a/japanese/mule-canna+sj3/Makefile
+++ b/japanese/mule-canna+sj3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1997/09/14 21:35:05 max Exp $
+# $Id: Makefile,v 1.3 1998/10/07 08:11:34 asami Exp $
 #
 
 PKGNAME=	ja-mule-canna+sj3-2.3
@@ -12,4 +12,7 @@ CATEGORIES=	japanese editors
 CANNA=		yes
 SJ3=		yes
 
-.include "${.CURDIR}/../../editors/mule/Makefile"
+MASTERDIR=	${.CURDIR}/../../editors/mule
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/mule-canna+wnn6/Makefile b/japanese/mule-canna+wnn6/Makefile
index c91819dd3c63..b400da533f50 100644
--- a/japanese/mule-canna+wnn6/Makefile
+++ b/japanese/mule-canna+wnn6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.3 1998/10/07 08:11:37 asami Exp $
+# $Id: Makefile,v 1.4 1998/12/01 01:05:15 asami Exp $
 #
 
 PKGNAME=	ja-mule-canna+wnn6-2.3
@@ -12,4 +12,7 @@ CATEGORIES=	japanese editors
 CANNA=		yes
 WNN6=		yes
 
-.include "${.CURDIR}/../../editors/mule/Makefile"
+MASTERDIR=	${.CURDIR}/../../editors/mule
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/mule-canna+wnn7/Makefile b/japanese/mule-canna+wnn7/Makefile
index c91819dd3c63..b400da533f50 100644
--- a/japanese/mule-canna+wnn7/Makefile
+++ b/japanese/mule-canna+wnn7/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.3 1998/10/07 08:11:37 asami Exp $
+# $Id: Makefile,v 1.4 1998/12/01 01:05:15 asami Exp $
 #
 
 PKGNAME=	ja-mule-canna+wnn6-2.3
@@ -12,4 +12,7 @@ CATEGORIES=	japanese editors
 CANNA=		yes
 WNN6=		yes
 
-.include "${.CURDIR}/../../editors/mule/Makefile"
+MASTERDIR=	${.CURDIR}/../../editors/mule
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/mule-canna/Makefile b/japanese/mule-canna/Makefile
index d67118123eeb..44fafdd77b19 100644
--- a/japanese/mule-canna/Makefile
+++ b/japanese/mule-canna/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.31 1997/09/14 21:35:04 max Exp $
+# $Id: Makefile,v 1.32 1998/10/07 08:11:33 asami Exp $
 #
 
 PKGNAME=	ja-mule-canna-2.3
@@ -11,4 +11,7 @@ CATEGORIES=	japanese editors
 
 CANNA=		yes
 
-.include "${.CURDIR}/../../editors/mule/Makefile"
+MASTERDIR=	${.CURDIR}/../../editors/mule
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/mule-freewnn+sj3/Makefile b/japanese/mule-freewnn+sj3/Makefile
index 52907d56f441..57b9cc6e704f 100644
--- a/japanese/mule-freewnn+sj3/Makefile
+++ b/japanese/mule-freewnn+sj3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1997/09/14 21:35:14 max Exp $
+# $Id: Makefile,v 1.3 1998/10/07 08:11:39 asami Exp $
 #
 
 PKGNAME=	ja-mule-sj3+wnn4-2.3
@@ -12,4 +12,7 @@ CATEGORIES=	japanese editors
 SJ3=		yes
 WNN4=		yes
 
-.include "${.CURDIR}/../../editors/mule/Makefile"
+MASTERDIR=	${.CURDIR}/../../editors/mule
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/mule-freewnn/Makefile b/japanese/mule-freewnn/Makefile
index 885d1d6d73b3..114d16dfa55d 100644
--- a/japanese/mule-freewnn/Makefile
+++ b/japanese/mule-freewnn/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.31 1997/09/14 21:35:18 max Exp $
+# $Id: Makefile,v 1.32 1998/10/07 08:11:40 asami Exp $
 #
 
 PKGNAME=	ja-mule-wnn4-2.3
@@ -11,4 +11,7 @@ CATEGORIES=	japanese editors
 
 WNN4=		yes
 
-.include "${.CURDIR}/../../editors/mule/Makefile"
+MASTERDIR=	${.CURDIR}/../../editors/mule
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/mule-sj3+wnn6/Makefile b/japanese/mule-sj3+wnn6/Makefile
index 18b82e381fea..553921b997e3 100644
--- a/japanese/mule-sj3+wnn6/Makefile
+++ b/japanese/mule-sj3+wnn6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.3 1998/10/07 08:11:40 asami Exp $
+# $Id: Makefile,v 1.4 1998/12/01 01:05:16 asami Exp $
 #
 
 PKGNAME=	ja-mule-sj3+wnn6-2.3
@@ -12,4 +12,7 @@ CATEGORIES=	japanese editors
 SJ3=		yes
 WNN6=		yes
 
-.include "${.CURDIR}/../../editors/mule/Makefile"
+MASTERDIR=	${.CURDIR}/../../editors/mule
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/mule-sj3+wnn7/Makefile b/japanese/mule-sj3+wnn7/Makefile
index 18b82e381fea..553921b997e3 100644
--- a/japanese/mule-sj3+wnn7/Makefile
+++ b/japanese/mule-sj3+wnn7/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.3 1998/10/07 08:11:40 asami Exp $
+# $Id: Makefile,v 1.4 1998/12/01 01:05:16 asami Exp $
 #
 
 PKGNAME=	ja-mule-sj3+wnn6-2.3
@@ -12,4 +12,7 @@ CATEGORIES=	japanese editors
 SJ3=		yes
 WNN6=		yes
 
-.include "${.CURDIR}/../../editors/mule/Makefile"
+MASTERDIR=	${.CURDIR}/../../editors/mule
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/mule-sj3/Makefile b/japanese/mule-sj3/Makefile
index ac26c85d14dd..a46a265b1bba 100644
--- a/japanese/mule-sj3/Makefile
+++ b/japanese/mule-sj3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.8 1997/09/14 21:35:13 max Exp $
+# $Id: Makefile,v 1.9 1998/10/07 08:11:38 asami Exp $
 #
 
 PKGNAME=	ja-mule-sj3-2.3
@@ -11,4 +11,7 @@ CATEGORIES=	japanese editors
 
 SJ3=		yes
 
-.include "${.CURDIR}/../../editors/mule/Makefile"
+MASTERDIR=	${.CURDIR}/../../editors/mule
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/mule-wnn6/Makefile b/japanese/mule-wnn6/Makefile
index aed63584507d..d0c2b4cecaf5 100644
--- a/japanese/mule-wnn6/Makefile
+++ b/japanese/mule-wnn6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.32 1998/10/07 08:11:41 asami Exp $
+# $Id: Makefile,v 1.33 1998/12/01 01:05:16 asami Exp $
 #
 
 PKGNAME=	ja-mule-wnn6-2.3
@@ -11,4 +11,7 @@ CATEGORIES=	japanese editors
 
 WNN6=		yes
 
-.include "${.CURDIR}/../../editors/mule/Makefile"
+MASTERDIR=	${.CURDIR}/../../editors/mule
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/mule-wnn7/Makefile b/japanese/mule-wnn7/Makefile
index aed63584507d..d0c2b4cecaf5 100644
--- a/japanese/mule-wnn7/Makefile
+++ b/japanese/mule-wnn7/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.32 1998/10/07 08:11:41 asami Exp $
+# $Id: Makefile,v 1.33 1998/12/01 01:05:16 asami Exp $
 #
 
 PKGNAME=	ja-mule-wnn6-2.3
@@ -11,4 +11,7 @@ CATEGORIES=	japanese editors
 
 WNN6=		yes
 
-.include "${.CURDIR}/../../editors/mule/Makefile"
+MASTERDIR=	${.CURDIR}/../../editors/mule
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/netscape4-navigator/Makefile b/japanese/netscape4-navigator/Makefile
index 69e11d3156bd..0c70da6c6910 100644
--- a/japanese/netscape4-navigator/Makefile
+++ b/japanese/netscape4-navigator/Makefile
@@ -3,16 +3,15 @@
 # Date created:		13 Mar 1998
 # Whom:			sada
 #
-# $Id: Makefile,v 1.5 1998/10/09 04:22:20 asami Exp $
+# $Id: Makefile,v 1.6 1998/10/09 22:27:52 asami Exp $
 #
 
 MAINTAINER=	sada@e-mail.ne.jp
 
-FILESDIR=	${MASTER_DIR}/files
-PATCHDIR=	${MASTER_DIR}/patches
+MASTERDIR=	${.CURDIR}/../netscape4-communicator
+PKGDIR=		${.CURDIR}/pkg
 
 BROWSER_NAME=	navigator
 MANFILE=	${.CURDIR}/files/${MAN1}
-MASTER_DIR=	${.CURDIR}/../netscape4-communicator
 
-.include "${MASTER_DIR}/Makefile"
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/nvi-euc-jp/Makefile b/japanese/nvi-euc-jp/Makefile
index 7eabcee059b9..cba6d76b210a 100644
--- a/japanese/nvi-euc-jp/Makefile
+++ b/japanese/nvi-euc-jp/Makefile
@@ -3,20 +3,17 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.13 1998/09/21 22:33:24 steve Exp $
+# $Id: Makefile,v 1.14 1998/11/19 04:46:44 itojun Exp $
 #
 
-# can't use PORTSDIR here, since we haven't included bsd.port.mk
-FILESDIR=	${.CURDIR}/../../editors/nvi-m17n/files
-PATCHDIR=	${.CURDIR}/../../editors/nvi-m17n/patches
-PKGDIR=		${.CURDIR}/../../editors/nvi-m17n/pkg
+PKGNAME=	ja-nvi-eucjp-1.79.19981119
+
+MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
 COMMENT=	${.CURDIR}/pkg/COMMENT
 
 LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
 
-PKGNAME=	ja-nvi-eucjp-1.79.19981119
-
-.include <${.CURDIR}/../../editors/nvi-m17n/Makefile>
+.include	"${MASTERDIR}/Makefile"
 
 CATEGORIES=	japanese editors
 
diff --git a/japanese/nvi-iso-2022-jp/Makefile b/japanese/nvi-iso-2022-jp/Makefile
index 2b28a78c0781..e78aabab75cf 100644
--- a/japanese/nvi-iso-2022-jp/Makefile
+++ b/japanese/nvi-iso-2022-jp/Makefile
@@ -3,20 +3,17 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.13 1998/09/21 22:33:25 steve Exp $
+# $Id: Makefile,v 1.14 1998/11/19 04:46:45 itojun Exp $
 #
 
-# can't use PORTSDIR here, since we haven't included bsd.port.mk
-FILESDIR=	${.CURDIR}/../../editors/nvi-m17n/files
-PATCHDIR=	${.CURDIR}/../../editors/nvi-m17n/patches
-PKGDIR=		${.CURDIR}/../../editors/nvi-m17n/pkg
+PKGNAME=	ja-nvi-iso2022jp-1.79.19981119
+
+MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
 COMMENT=	${.CURDIR}/pkg/COMMENT
 
 LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
 
-PKGNAME=	ja-nvi-iso2022jp-1.79.19981119
-
-.include <${.CURDIR}/../../editors/nvi-m17n/Makefile>
+.include	"${MASTERDIR}/Makefile"
 
 CATEGORIES=	japanese editors
 
diff --git a/japanese/nvi-sjis/Makefile b/japanese/nvi-sjis/Makefile
index 9ed4070e4a94..e0e3fda44120 100644
--- a/japanese/nvi-sjis/Makefile
+++ b/japanese/nvi-sjis/Makefile
@@ -3,20 +3,17 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.13 1998/09/21 22:33:25 steve Exp $
+# $Id: Makefile,v 1.14 1998/11/19 04:46:45 itojun Exp $
 #
 
-# can't use PORTSDIR here, since we haven't included bsd.port.mk
-FILESDIR=	${.CURDIR}/../../editors/nvi-m17n/files
-PATCHDIR=	${.CURDIR}/../../editors/nvi-m17n/patches
-PKGDIR=		${.CURDIR}/../../editors/nvi-m17n/pkg
+PKGNAME=	ja-nvi-sjis-1.79.19981119
+
+MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
 COMMENT=	${.CURDIR}/pkg/COMMENT
 
 LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
 
-PKGNAME=	ja-nvi-sjis-1.79.19981119
-
-.include <${.CURDIR}/../../editors/nvi-m17n/Makefile>
+.include	"${MASTERDIR}/Makefile"
 
 CATEGORIES=	japanese editors
 
diff --git a/japanese/onew-canna+freewnn/Makefile b/japanese/onew-canna+freewnn/Makefile
index 4767c13368eb..c384e98e1f17 100644
--- a/japanese/onew-canna+freewnn/Makefile
+++ b/japanese/onew-canna+freewnn/Makefile
@@ -3,11 +3,13 @@
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/09 14:33:46 kuriyama Exp $
 #
 
 PKGNAME=	ja-onew-canna+wnn4-2.2.10
 CANNA=		yes
 WNN4=		yes
 
-.include "${.CURDIR}/../onew-wnn4/Makefile"
+MASTERDIR=	${.CURDIR}/../onew-wnn4
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/onew-canna+wnn6/Makefile b/japanese/onew-canna+wnn6/Makefile
index fdd9c3ec36e2..6a4d5f09d143 100644
--- a/japanese/onew-canna+wnn6/Makefile
+++ b/japanese/onew-canna+wnn6/Makefile
@@ -3,11 +3,13 @@
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/09 22:06:33 kuriyama Exp $
 #
 
 PKGNAME=	ja-onew-canna+wnn6-2.2.10
 CANNA=		yes
 WNN6=		yes
 
-.include "${.CURDIR}/../onew-wnn4/Makefile"
+MASTERDIR=	${.CURDIR}/../onew-wnn4
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/onew-canna+wnn7/Makefile b/japanese/onew-canna+wnn7/Makefile
index fdd9c3ec36e2..6a4d5f09d143 100644
--- a/japanese/onew-canna+wnn7/Makefile
+++ b/japanese/onew-canna+wnn7/Makefile
@@ -3,11 +3,13 @@
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/09 22:06:33 kuriyama Exp $
 #
 
 PKGNAME=	ja-onew-canna+wnn6-2.2.10
 CANNA=		yes
 WNN6=		yes
 
-.include "${.CURDIR}/../onew-wnn4/Makefile"
+MASTERDIR=	${.CURDIR}/../onew-wnn4
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/onew-canna/Makefile b/japanese/onew-canna/Makefile
index ae0b6545827c..8ac9113d4c42 100644
--- a/japanese/onew-canna/Makefile
+++ b/japanese/onew-canna/Makefile
@@ -3,10 +3,12 @@
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/10 14:03:02 kuriyama Exp $
 #
 
 PKGNAME=	ja-onew-canna-2.2.10
 CANNA=		yes
 
-.include "${.CURDIR}/../onew-wnn4/Makefile"
+MASTERDIR=	${.CURDIR}/../onew-wnn4
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/onew-wnn6/Makefile b/japanese/onew-wnn6/Makefile
index 78e58abd09ef..df7947765aa7 100644
--- a/japanese/onew-wnn6/Makefile
+++ b/japanese/onew-wnn6/Makefile
@@ -3,10 +3,12 @@
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/08 22:05:47 kuriyama Exp $
 #
 
 PKGNAME=	ja-onew-wnn6-2.2.10
 WNN6=		yes
 
-.include "${.CURDIR}/../onew-wnn4/Makefile"
+MASTERDIR=	${.CURDIR}/../onew-wnn4
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/onew-wnn7/Makefile b/japanese/onew-wnn7/Makefile
index 78e58abd09ef..df7947765aa7 100644
--- a/japanese/onew-wnn7/Makefile
+++ b/japanese/onew-wnn7/Makefile
@@ -3,10 +3,12 @@
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/07/08 22:05:47 kuriyama Exp $
 #
 
 PKGNAME=	ja-onew-wnn6-2.2.10
 WNN6=		yes
 
-.include "${.CURDIR}/../onew-wnn4/Makefile"
+MASTERDIR=	${.CURDIR}/../onew-wnn4
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/plan/Makefile b/japanese/plan/Makefile
index 29052be48cb5..c642c9217c04 100644
--- a/japanese/plan/Makefile
+++ b/japanese/plan/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Sat Jan 31, 1998
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.2 1998/04/17 18:08:35 obrien Exp $
+# $Id: Makefile,v 1.3 1998/08/08 00:20:20 asami Exp $
 #
 
 #BROKEN=		"need JIS libraries in print.c that I do not have"
@@ -11,20 +11,16 @@ BROKEN=		"doesn't build properly from version 1.7.1"
 
 MAKE_ENV+=	JAPANESE=yes
 
-.include	"${.CURDIR}/../../deskutils/plan/Makefile"
+MASTERDIR=	${.CURDIR}/../../deskutils/plan
+
+.include	"${MASTERDIR}/Makefile"
 
 PKGNAME=	ja-${DISTNAME}
 
 MAINTAINER=     obrien@FreeBSD.org
 
-FILESDIR=	${.CURDIR}/../../deskutils/plan/files
-PATCHDIR=	${.CURDIR}/../../deskutils/plan/patches
-PKGDIR=		${.CURDIR}/../../deskutils/plan/pkg
+PLIST=		${WRKDIR}/PLIST
 
 pre-install:
-	${ECHO}	"share/doc/plan/plan_calSJ.ps" > ${PKGDIR}/PLIST
-	${CAT}	${.CURDIR}/../../deskutils/plan/pkg/PLIST \
-		>> ${PKGDIR}/PLIST
-	${CP} ${.CURDIR}/../../deskutils/plan/pkg/DESCR  \
-		${.CURDIR}/../../deskutils/plan/pkg/COMMENT  \
-		${PKGDIR}/PLIST
+	${ECHO}	"share/doc/plan/plan_calSJ.ps" > ${PLIST}
+	${CAT}	${PKGDIR}/PLIST >> ${PLIST}
diff --git a/japanese/tcsh-nls-asuka/Makefile b/japanese/tcsh-nls-asuka/Makefile
index dbdb51201a67..d5c46b665752 100644
--- a/japanese/tcsh-nls-asuka/Makefile
+++ b/japanese/tcsh-nls-asuka/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 August 1998
 # Whom:			Issei Suzuki <issei@jp.FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/30 21:27:34 max Exp $
+# $Id: Makefile,v 1.2 1998/10/10 03:57:28 steve Exp $
 #
 
 DISTNAME=	tcsh-6.08.00.add
@@ -13,7 +13,9 @@ MASTER_SITES=	http://www2.wbs.ne.jp/~znc/tcsh/
 
 MAINTAINER=	issei@jp.FreeBSD.ORG
 
-PLIST=		../tcsh-nls-generic/pkg/PLIST
+MASTERDIR=	${.CURDIR}/../tcsh-nls-generic
+PKGDIR=		${.CURDIR}/pkg
+PLIST=		${MASTERDIR}/pkg/PLIST
 NLSSRC=		${DISTNAME}/nls/ja.asuka
 
-.include "../tcsh-nls-generic/Makefile"
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/tcsh-nls-ayanami/Makefile b/japanese/tcsh-nls-ayanami/Makefile
index 5822c8467f5b..3999f56dc5d6 100644
--- a/japanese/tcsh-nls-ayanami/Makefile
+++ b/japanese/tcsh-nls-ayanami/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 August 1998
 # Whom:			Issei Suzuki <issei@jp.FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/30 21:28:42 max Exp $
+# $Id: Makefile,v 1.2 1998/10/10 03:57:29 steve Exp $
 #
 
 DISTNAME=	tcsh-6.08.00.add
@@ -13,7 +13,9 @@ MASTER_SITES=	http://www2.wbs.ne.jp/~znc/tcsh/
 
 MAINTAINER=	issei@jp.FreeBSD.ORG
 
-PLIST=		../tcsh-nls-generic/pkg/PLIST
+MASTERDIR=	${.CURDIR}/../tcsh-nls-generic
+PKGDIR=		${.CURDIR}/pkg
+PLIST=		${MASTERDIR}/pkg/PLIST
 NLSSRC=		${DISTNAME}/nls/ja.ayanami
 
-.include "../tcsh-nls-generic/Makefile"
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/tcsh-nls-koshiki/Makefile b/japanese/tcsh-nls-koshiki/Makefile
index c7203234fc09..f37cc4dc2a13 100644
--- a/japanese/tcsh-nls-koshiki/Makefile
+++ b/japanese/tcsh-nls-koshiki/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 August 1998
 # Whom:			Issei Suzuki <issei@jp.FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/30 21:27:34 max Exp $
+# $Id: Makefile,v 1.2 1998/10/10 03:57:30 steve Exp $
 #
 
 DISTNAME=	tcsh-6.08.00.add
@@ -13,7 +13,9 @@ MASTER_SITES=	http://www2.wbs.ne.jp/~znc/tcsh/
 
 MAINTAINER=	issei@jp.FreeBSD.ORG
 
-PLIST=		../tcsh-nls-generic/pkg/PLIST
+MASTERDIR=	${.CURDIR}/../tcsh-nls-generic
+PKGDIR=		${.CURDIR}/pkg
+PLIST=		${MASTERDIR}/pkg/PLIST
 NLSSRC=		${DISTNAME}/nls/ja.koshiki
 
-.include "../tcsh-nls-generic/Makefile"
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/tcsh-nls-multi/Makefile b/japanese/tcsh-nls-multi/Makefile
index 35276325fb85..732c1ec800cf 100644
--- a/japanese/tcsh-nls-multi/Makefile
+++ b/japanese/tcsh-nls-multi/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 August 1998
 # Whom:			Issei Suzuki <issei@jp.FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/30 21:30:41 max Exp $
+# $Id: Makefile,v 1.2 1998/10/10 03:57:31 steve Exp $
 #
 
 DISTNAME=	tcsh-6.08.00.add
@@ -13,7 +13,9 @@ MASTER_SITES=	http://www2.wbs.ne.jp/~znc/tcsh/
 
 MAINTAINER=	issei@jp.FreeBSD.ORG
 
-PLIST=		../tcsh-nls-generic/pkg/PLIST
+MASTERDIR=	${.CURDIR}/../tcsh-nls-generic
+PKGDIR=		${.CURDIR}/pkg
+PLIST=		${MASTERDIR}/pkg/PLIST
 NLSSRC=		${DISTNAME}/nls/ja.multi
 
-.include "../tcsh-nls-generic/Makefile"
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/tcsh-nls-roomi/Makefile b/japanese/tcsh-nls-roomi/Makefile
index bef330391f79..3fb8b8ae9620 100644
--- a/japanese/tcsh-nls-roomi/Makefile
+++ b/japanese/tcsh-nls-roomi/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 August 1998
 # Whom:			Issei Suzuki <issei@jp.FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/30 21:27:34 max Exp $
+# $Id: Makefile,v 1.2 1998/10/10 03:57:32 steve Exp $
 #
 
 DISTNAME=	tcsh-6.08.00.add
@@ -13,7 +13,9 @@ MASTER_SITES=	http://www2.wbs.ne.jp/~znc/tcsh/
 
 MAINTAINER=	issei@jp.FreeBSD.ORG
 
-PLIST=		../tcsh-nls-generic/pkg/PLIST
+MASTERDIR=	${.CURDIR}/../tcsh-nls-generic
+PKGDIR=		${.CURDIR}/pkg
+PLIST=		${MASTERDIR}/pkg/PLIST
 NLSSRC=		${DISTNAME}/nls/ja.roomi
 
-.include "../tcsh-nls-generic/Makefile"
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/tcsh-nls-ruri2/Makefile b/japanese/tcsh-nls-ruri2/Makefile
index 74cddb842fa3..7f4cf823adc4 100644
--- a/japanese/tcsh-nls-ruri2/Makefile
+++ b/japanese/tcsh-nls-ruri2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 August 1998
 # Whom:			Issei Suzuki <issei@jp.FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/30 21:32:43 max Exp $
+# $Id: Makefile,v 1.2 1998/10/10 03:57:33 steve Exp $
 #
 
 DISTNAME=	tcsh-6.08.00.add
@@ -13,7 +13,9 @@ MASTER_SITES=	http://www2.wbs.ne.jp/~znc/tcsh/
 
 MAINTAINER=	issei@jp.FreeBSD.ORG
 
-PLIST=		../tcsh-nls-generic/pkg/PLIST
+MASTERDIR=	${.CURDIR}/../tcsh-nls-generic
+PKGDIR=		${.CURDIR}/pkg
+PLIST=		${MASTERDIR}/pkg/PLIST
 NLSSRC=		${DISTNAME}/nls/ja.ruri2
 
-.include "../tcsh-nls-generic/Makefile"
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/w3/Makefile b/japanese/w3/Makefile
index 05fdfbb4895f..f8ba7238964e 100644
--- a/japanese/w3/Makefile
+++ b/japanese/w3/Makefile
@@ -3,13 +3,11 @@
 # Date created:		31 December 1996
 # Whom:			MITA Yoshio <mita@ee.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.5 1997/09/14 21:36:20 max Exp $
+# $Id: Makefile,v 1.6 1998/11/14 02:18:26 kuriyama Exp $
 #
 
 PKGNAME=	ja-w3-2.2.26
 CATEGORIES=	www japanese elisp
-FILESDIR=	${.CURDIR}/../../www/w3/files
-PATCHDIR=	${.CURDIR}/../../www/w3/patches
 
 # Don't RUN_DEPENDS on mule because we don't know which version the
 # user would want.  We can't omit the BUILD_DEPENDS because it needs
@@ -20,4 +18,7 @@ RUN_DEPENDS=
 EMACSCMD=	mule
 ELISPDIR=	${PREFIX}/lib/mule/site-lisp
 
-.include "${.CURDIR}/../../www/w3/Makefile"
+MASTERDIR=	${.CURDIR}/../../www/w3
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-canna+freewnn/Makefile b/japanese/xemacs21-canna+freewnn/Makefile
index 46f5cca87c16..18c8bdfb19db 100644
--- a/japanese/xemacs21-canna+freewnn/Makefile
+++ b/japanese/xemacs21-canna+freewnn/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 Dec 1997
 # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/05/26 15:07:13 kuriyama Exp $
 #
 
 PKGNAME=	ja-xemacs-canna+wnn4-20.4
@@ -11,4 +11,7 @@ PKGNAME=	ja-xemacs-canna+wnn4-20.4
 CANNA=		yes
 WNN4=		yes
 
-.include "${.CURDIR}/../../japanese/xemacs/Makefile"
+MASTERDIR=	${.CURDIR}/../../japanese/xemacs
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-canna+wnn6/Makefile b/japanese/xemacs21-canna+wnn6/Makefile
index 76c1e0357c4c..5abe306cc1bf 100644
--- a/japanese/xemacs21-canna+wnn6/Makefile
+++ b/japanese/xemacs21-canna+wnn6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 Dec 1997
 # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1998/05/26 15:08:23 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/10/10 12:38:59 kuriyama Exp $
 #
 
 PKGNAME=	ja-xemacs-canna+wnn6-20.4
@@ -13,4 +13,7 @@ BROKEN_ELF=	Wnn6 has not yet corresponded to ELF
 CANNA=		yes
 WNN6=		yes
 
-.include "${.CURDIR}/../../japanese/xemacs/Makefile"
+MASTERDIR=	${.CURDIR}/../../japanese/xemacs
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-canna/Makefile b/japanese/xemacs21-canna/Makefile
index 0aa2c0ab5dae..a7472e8c7c7f 100644
--- a/japanese/xemacs21-canna/Makefile
+++ b/japanese/xemacs21-canna/Makefile
@@ -3,11 +3,14 @@
 # Date created:		5 Dec 1997
 # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/05/26 15:06:06 kuriyama Exp $
 #
 
 PKGNAME?=	ja-xemacs-canna-20.4
 
 CANNA=		yes
 
-.include "${.CURDIR}/../../japanese/xemacs/Makefile"
+MASTERDIR=	${.CURDIR}/../../japanese/xemacs
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-freewnn/Makefile b/japanese/xemacs21-freewnn/Makefile
index 4208ec665bb6..09efa20c1048 100644
--- a/japanese/xemacs21-freewnn/Makefile
+++ b/japanese/xemacs21-freewnn/Makefile
@@ -3,11 +3,14 @@
 # Date created:		25 January 1998
 # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/05/26 15:09:11 kuriyama Exp $
 #
 
 PKGNAME=	ja-xemacs-wnn4-20.4
 
 WNN4=		yes
 
-.include "${.CURDIR}/../../japanese/xemacs/Makefile"
+MASTERDIR=	${.CURDIR}/../../japanese/xemacs
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-sumo-canna+freewnn/Makefile b/japanese/xemacs21-sumo-canna+freewnn/Makefile
index 46f5cca87c16..18c8bdfb19db 100644
--- a/japanese/xemacs21-sumo-canna+freewnn/Makefile
+++ b/japanese/xemacs21-sumo-canna+freewnn/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 Dec 1997
 # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/05/26 15:07:13 kuriyama Exp $
 #
 
 PKGNAME=	ja-xemacs-canna+wnn4-20.4
@@ -11,4 +11,7 @@ PKGNAME=	ja-xemacs-canna+wnn4-20.4
 CANNA=		yes
 WNN4=		yes
 
-.include "${.CURDIR}/../../japanese/xemacs/Makefile"
+MASTERDIR=	${.CURDIR}/../../japanese/xemacs
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-sumo-canna+wnn6/Makefile b/japanese/xemacs21-sumo-canna+wnn6/Makefile
index 76c1e0357c4c..5abe306cc1bf 100644
--- a/japanese/xemacs21-sumo-canna+wnn6/Makefile
+++ b/japanese/xemacs21-sumo-canna+wnn6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 Dec 1997
 # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1998/05/26 15:08:23 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/10/10 12:38:59 kuriyama Exp $
 #
 
 PKGNAME=	ja-xemacs-canna+wnn6-20.4
@@ -13,4 +13,7 @@ BROKEN_ELF=	Wnn6 has not yet corresponded to ELF
 CANNA=		yes
 WNN6=		yes
 
-.include "${.CURDIR}/../../japanese/xemacs/Makefile"
+MASTERDIR=	${.CURDIR}/../../japanese/xemacs
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-sumo-canna/Makefile b/japanese/xemacs21-sumo-canna/Makefile
index 0aa2c0ab5dae..a7472e8c7c7f 100644
--- a/japanese/xemacs21-sumo-canna/Makefile
+++ b/japanese/xemacs21-sumo-canna/Makefile
@@ -3,11 +3,14 @@
 # Date created:		5 Dec 1997
 # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/05/26 15:06:06 kuriyama Exp $
 #
 
 PKGNAME?=	ja-xemacs-canna-20.4
 
 CANNA=		yes
 
-.include "${.CURDIR}/../../japanese/xemacs/Makefile"
+MASTERDIR=	${.CURDIR}/../../japanese/xemacs
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-sumo-freewnn/Makefile b/japanese/xemacs21-sumo-freewnn/Makefile
index 4208ec665bb6..09efa20c1048 100644
--- a/japanese/xemacs21-sumo-freewnn/Makefile
+++ b/japanese/xemacs21-sumo-freewnn/Makefile
@@ -3,11 +3,14 @@
 # Date created:		25 January 1998
 # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/05/26 15:09:11 kuriyama Exp $
 #
 
 PKGNAME=	ja-xemacs-wnn4-20.4
 
 WNN4=		yes
 
-.include "${.CURDIR}/../../japanese/xemacs/Makefile"
+MASTERDIR=	${.CURDIR}/../../japanese/xemacs
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-sumo-wnn6/Makefile b/japanese/xemacs21-sumo-wnn6/Makefile
index 5331efe083d0..976421cdbf18 100644
--- a/japanese/xemacs21-sumo-wnn6/Makefile
+++ b/japanese/xemacs21-sumo-wnn6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		25 January 1998
 # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1998/05/26 15:10:15 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/10/10 12:39:13 kuriyama Exp $
 #
 
 PKGNAME=	ja-xemacs-wnn6-20.4
@@ -12,4 +12,7 @@ BROKEN_ELF=	Wnn6 has not yet corresponded to ELF
 
 WNN6=		yes
 
-.include "${.CURDIR}/../../japanese/xemacs/Makefile"
+MASTERDIR=	${.CURDIR}/../../japanese/xemacs
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-wnn6/Makefile b/japanese/xemacs21-wnn6/Makefile
index 5331efe083d0..976421cdbf18 100644
--- a/japanese/xemacs21-wnn6/Makefile
+++ b/japanese/xemacs21-wnn6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		25 January 1998
 # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1998/05/26 15:10:15 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/10/10 12:39:13 kuriyama Exp $
 #
 
 PKGNAME=	ja-xemacs-wnn6-20.4
@@ -12,4 +12,7 @@ BROKEN_ELF=	Wnn6 has not yet corresponded to ELF
 
 WNN6=		yes
 
-.include "${.CURDIR}/../../japanese/xemacs/Makefile"
+MASTERDIR=	${.CURDIR}/../../japanese/xemacs
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xv/Makefile b/japanese/xv/Makefile
index 48f18c4e7cf1..2639829f9cd3 100644
--- a/japanese/xv/Makefile
+++ b/japanese/xv/Makefile
@@ -3,7 +3,7 @@
 # Date created:		07 Oct 1998
 # Whom:			Shigeyuki FUKUSHIMA (shige@kuis.kyoto-u.ac.jp)
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/10/27 22:06:53 kuriyama Exp $
 #
 
 PKGNAME=	ja-xv-3.10a
@@ -11,9 +11,8 @@ CATEGORIES=	japanese graphics
 
 MAINTAINER=	shige@kuis.kyoto-u.ac.jp
 
-# can't use PORTSDIR here, since we haven't included bsd.port.mk
-FILESDIR=	${.CURDIR}/../../graphics/xv/files
-PATCHDIR=	${.CURDIR}/../../graphics/xv/patches
+MASTERDIR=	${.CURDIR}/../../graphics/xv
+PKGDIR=		${.CURDIR}/pkg
 
 MAKE_ENV=	LOCALE_EXTENSION=-DTV_L10N
 
@@ -30,4 +29,4 @@ do-install:
 	fi
 	@${LN} -sf ${PREFIX}/bin/ja-xv ${PREFIX}/bin/xv
 
-.include <${.CURDIR}/../../graphics/xv/Makefile>
+.include "${MASTERDIR}/Makefile"