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

8 files changed, 41 insertions, 19 deletions

diff --git a/mail/mew-emacs20/Makefile b/mail/mew-emacs20/Makefile
index c74d442f271..1e8fc09ae8a 100644
--- a/mail/mew-emacs20/Makefile
+++ b/mail/mew-emacs20/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17 January 1998
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/11/05 22:10:45 kuriyama Exp $
 #
 
 PKGNAME=	mew-emacs20-1.93
@@ -12,4 +12,7 @@ EMACS_NAME=	Emacs-20.3
 DIRENTRY=	"* Mew: (mew).	Messaging in the Emacs World."
 INFOFILE=	mew.info
 
-.include "${.CURDIR}/../../mail/mew-common/Makefile"
+MASTERDIR=	${.CURDIR}/../../mail/mew-common
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/mail/mew-mule/Makefile b/mail/mew-mule/Makefile
index 7b1b406a909..6e8e2f0fabf 100644
--- a/mail/mew-mule/Makefile
+++ b/mail/mew-mule/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17 January 1998
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id: Makefile,v 1.4 1998/10/08 12:26:42 kiri Exp $
+# $Id: Makefile,v 1.3 1998/11/05 14:32:15 kuriyama Exp $
 #
 
 PKGNAME=	mew-mule-1.93
@@ -14,4 +14,7 @@ DIRENTRY=	"* Mew: (mew).	Messaging in the Emacs World (English)." \
 INFOFILE=	mew.info \
 		mew.jis.info
 
-.include "${.CURDIR}/../../mail/mew-common/Makefile"
+MASTERDIR=	${.CURDIR}/../../mail/mew-common
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/mail/mew-xemacs/Makefile b/mail/mew-xemacs/Makefile
index eb0020e6844..de4abd54f18 100644
--- a/mail/mew-xemacs/Makefile
+++ b/mail/mew-xemacs/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17 January 1998
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id: Makefile,v 1.3 1998/10/08 12:26:44 kiri Exp $
+# $Id: Makefile,v 1.2 1998/11/05 14:32:54 kuriyama Exp $
 #
 
 PKGNAME=	mew-xemacs-1.93
@@ -12,4 +12,7 @@ EMACS_NAME=	XEmacs-19.16
 DIRENTRY=	"* Mew::		Messaging in the Emacs World."
 INFOFILE=	mew.info
 
-.include "${.CURDIR}/../../mail/mew-common/Makefile"
+MASTERDIR=	${.CURDIR}/../../mail/mew-common
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/mail/mew-xemacs20/Makefile b/mail/mew-xemacs20/Makefile
index 218825ab015..f66cc652219 100644
--- a/mail/mew-xemacs20/Makefile
+++ b/mail/mew-xemacs20/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17 January 1998
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/11/05 22:13:27 kuriyama Exp $
 #
 
 PKGNAME=	mew-xemacs20-1.93
@@ -13,4 +13,7 @@ DIRSECTION=	Local Packages:
 DIRENTRY=	"* Mew::		Messaging in the Emacs World."
 INFOFILE=	mew.info
 
-.include "${.CURDIR}/../../mail/mew-common/Makefile"
+MASTERDIR=	${.CURDIR}/../../mail/mew-common
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/mail/mew-xemacs21-mule/Makefile b/mail/mew-xemacs21-mule/Makefile
index 4aaa4d8c353..0e2bf5ea7c8 100644
--- a/mail/mew-xemacs21-mule/Makefile
+++ b/mail/mew-xemacs21-mule/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17 January 1998
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/11/05 22:11:54 kuriyama Exp $
 #
 
 PKGNAME=	mew-xemacs-mule-1.93
@@ -15,4 +15,7 @@ DIRENTRY=	"* Mew::		Messaging in the Emacs World (English)." \
 INFOFILE=	mew.info \
 		mew.jis.info
 
-.include "${.CURDIR}/../../mail/mew-common/Makefile"
+MASTERDIR=	${.CURDIR}/../../mail/mew-common
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/mail/mew-xemacs21/Makefile b/mail/mew-xemacs21/Makefile
index 218825ab015..f66cc652219 100644
--- a/mail/mew-xemacs21/Makefile
+++ b/mail/mew-xemacs21/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17 January 1998
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/11/05 22:13:27 kuriyama Exp $
 #
 
 PKGNAME=	mew-xemacs20-1.93
@@ -13,4 +13,7 @@ DIRSECTION=	Local Packages:
 DIRENTRY=	"* Mew::		Messaging in the Emacs World."
 INFOFILE=	mew.info
 
-.include "${.CURDIR}/../../mail/mew-common/Makefile"
+MASTERDIR=	${.CURDIR}/../../mail/mew-common
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index 07d0fd29a31..a4220b419b6 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17 January 1998
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id: Makefile,v 1.3 1998/10/08 12:26:38 kiri Exp $
+# $Id: Makefile,v 1.8 1998/11/05 14:31:57 kuriyama Exp $
 #
 
 PKGNAME=	mew-emacs-1.93
@@ -12,4 +12,7 @@ EMACS_NAME=	Emacs-19.34b
 DIRENTRY=	"* Mew: (mew).	Messaging in the Emacs World."
 INFOFILE=	mew.info
 
-.include "${.CURDIR}/../../mail/mew-common/Makefile"
+MASTERDIR=	${.CURDIR}/../../mail/mew-common
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/mail/xpbiff-youbin/Makefile b/mail/xpbiff-youbin/Makefile
index 10c7f7893f6..d67f6793354 100644
--- a/mail/xpbiff-youbin/Makefile
+++ b/mail/xpbiff-youbin/Makefile
@@ -3,7 +3,7 @@
 # Date created:         7 April 1997
 # Whom:                 Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/08/24 15:46:06 itojun Exp $
 #
 
 # can't use PORTSDIR here, since we haven't included bsd.port.mk
@@ -12,10 +12,11 @@ PKGNAME=	xpbiff-youbin-1.27
 MAINTAINER=	sanpei@yy.cs.keio.ac.jp
 
 YOUBIN=		yes
-FILESDIR=	${.CURDIR}/../xpbiff/files
-PATCHDIR=	${.CURDIR}/../xpbiff/patches
-PLIST=		${.CURDIR}/../xpbiff/pkg/PLIST
+MASTERDIR=	${.CURDIR}/../xpbiff
+PKGDIR=		${.CURDIR}/pkg
+PLIST=		${MASTERDIR/pkg/PLIST
 
 RUN_DEPENDS=	youbin:${PORTSDIR}/mail/youbin
 
-.include "${.CURDIR}/../xpbiff/Makefile"
+
+.include	"${MASTERDIR}/Makefile"