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.)

6 files changed, 28 insertions, 30 deletions

diff --git a/chinese/FreeWnn-lib/Makefile b/chinese/FreeWnn-lib/Makefile
index 9582d86124a6..4fbfc0623ccc 100644
--- a/chinese/FreeWnn-lib/Makefile
+++ b/chinese/FreeWnn-lib/Makefile
@@ -3,7 +3,7 @@
 # Date created:		20 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.4 1997/09/10 06:51:44 asami Exp $
+# $Id: Makefile,v 1.5 1997/09/23 02:17:56 max Exp $
 #
 
 PKGNAME=	zh-Wnn-4.2
@@ -14,4 +14,6 @@ COMMENT=	${.CURDIR}/pkg/COMMENT
 DESCR=		${.CURDIR}/pkg/DESCR
 PLIST=		${.CURDIR}/pkg/PLIST
 
-.include "${.CURDIR}/../../japanese/Wnn/Makefile"
+MASTERDIR=	${.CURDIR}/../../japanese/Wnn
+
+.include "${MASTERDIR}/Makefile"
diff --git a/chinese/FreeWnn-server/Makefile b/chinese/FreeWnn-server/Makefile
index 9582d86124a6..4fbfc0623ccc 100644
--- a/chinese/FreeWnn-server/Makefile
+++ b/chinese/FreeWnn-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:		20 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.4 1997/09/10 06:51:44 asami Exp $
+# $Id: Makefile,v 1.5 1997/09/23 02:17:56 max Exp $
 #
 
 PKGNAME=	zh-Wnn-4.2
@@ -14,4 +14,6 @@ COMMENT=	${.CURDIR}/pkg/COMMENT
 DESCR=		${.CURDIR}/pkg/DESCR
 PLIST=		${.CURDIR}/pkg/PLIST
 
-.include "${.CURDIR}/../../japanese/Wnn/Makefile"
+MASTERDIR=	${.CURDIR}/../../japanese/Wnn
+
+.include "${MASTERDIR}/Makefile"
diff --git a/chinese/mule-freewnn/Makefile b/chinese/mule-freewnn/Makefile
index 23d132c8a126..f917efd89422 100644
--- a/chinese/mule-freewnn/Makefile
+++ b/chinese/mule-freewnn/Makefile
@@ -3,11 +3,14 @@
 # Date created:		20 July 1997
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.3 1998/09/27 00:01:11 steve Exp $
+# $Id: Makefile,v 1.4 1998/10/07 08:11:26 asami Exp $
 #
 
 PKGNAME=	zh-mule-wnn4-2.3
 CATEGORIES=	chinese editors
 CWNN4=		yes
 
-.include "${.CURDIR}/../../editors/mule/Makefile"
+MASTERDIR=	${.CURDIR}/../../editors/mule
+PKGDIR=		${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/chinese/nvi-big5/Makefile b/chinese/nvi-big5/Makefile
index 6c4b3687e8e1..8a12a211ebee 100644
--- a/chinese/nvi-big5/Makefile
+++ b/chinese/nvi-big5/Makefile
@@ -3,18 +3,15 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.11 1998/06/26 09:16:41 obrien Exp $
+# $Id: Makefile,v 1.12 1998/11/19 04:46:43 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
-COMMENT=	${.CURDIR}/pkg/COMMENT
-
 PKGNAME=	zh-nvi-big5-1.79.19981119
 
-.include <${.CURDIR}/../../editors/nvi-m17n/Makefile>
+MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
+COMMENT=	${.CURDIR}/pkg/COMMENT
+
+.include "${MASTERDIR}/Makefile"
 
 CATEGORIES=	chinese editors
 
diff --git a/chinese/nvi-euc-cn/Makefile b/chinese/nvi-euc-cn/Makefile
index ff8ef8b3a5c9..43084a099c42 100644
--- a/chinese/nvi-euc-cn/Makefile
+++ b/chinese/nvi-euc-cn/Makefile
@@ -3,18 +3,15 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.12 1998/06/26 09:16:43 obrien Exp $
+# $Id: Makefile,v 1.13 1998/11/19 04:46:43 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
-COMMENT=	${.CURDIR}/pkg/COMMENT
-
 PKGNAME=	zh-nvi-euccn-1.79.19981119
 
-.include <${.CURDIR}/../../editors/nvi-m17n/Makefile>
+MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
+COMMENT=	${.CURDIR}/pkg/COMMENT
+
+.include "${MASTERDIR}/Makefile"
 
 CATEGORIES=	chinese editors
 
diff --git a/chinese/nvi-euc-tw/Makefile b/chinese/nvi-euc-tw/Makefile
index 27ce7d65a794..846c5c57d1a2 100644
--- a/chinese/nvi-euc-tw/Makefile
+++ b/chinese/nvi-euc-tw/Makefile
@@ -3,18 +3,15 @@
 # Date created:		5 Apr 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.10 1998/06/26 09:16:49 obrien Exp $
+# $Id: Makefile,v 1.11 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
-COMMENT=	${.CURDIR}/pkg/COMMENT
-
 PKGNAME=	zh-nvi-euctw-1.79.19981119
 
-.include <${.CURDIR}/../../editors/nvi-m17n/Makefile>
+MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
+COMMENT=	${.CURDIR}/pkg/COMMENT
+
+.include "${MASTERDIR}/Makefile"
 
 CATEGORIES=	chinese editors