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

9 files changed, 31 insertions, 31 deletions

diff --git a/print/pkfonts118/Makefile b/print/pkfonts118/Makefile
index c9754b3d1a29..ee6c3a00bab3 100644
--- a/print/pkfonts118/Makefile
+++ b/print/pkfonts118/Makefile
@@ -3,11 +3,10 @@
 # Date created:		06 Nov 1998
 # Whom:			Satoshi Asami <asami@freebsd.org>
 #
-# $Id: Makefile,v 1.1 1998/11/07 10:50:00 asami Exp $
+# $Id: Makefile,v 1.2 1998/11/08 09:36:46 asami Exp $
 #
 
 RESOLUTION=	118
-FILESDIR=	${.CURDIR}/../pkfonts300/files
-PKGDIR=		${.CURDIR}/../pkfonts300/pkg
+MASTERDIR=	${.CURDIR}/../pkfonts300
 
-.include "${.CURDIR}/../pkfonts300/Makefile"
+.include	"${MASTERDIR}/Makefile"
diff --git a/print/pkfonts240/Makefile b/print/pkfonts240/Makefile
index b070e820085f..f65e783c30d6 100644
--- a/print/pkfonts240/Makefile
+++ b/print/pkfonts240/Makefile
@@ -3,11 +3,10 @@
 # Date created:		06 Nov 1998
 # Whom:			Satoshi Asami <asami@freebsd.org>
 #
-# $Id: Makefile,v 1.1 1998/11/07 10:50:01 asami Exp $
+# $Id: Makefile,v 1.2 1998/11/08 09:36:50 asami Exp $
 #
 
 RESOLUTION=	240
-FILESDIR=	${.CURDIR}/../pkfonts300/files
-PKGDIR=		${.CURDIR}/../pkfonts300/pkg
+MASTERDIR=	${.CURDIR}/../pkfonts300
 
-.include "${.CURDIR}/../pkfonts300/Makefile"
+.include	"${MASTERDIR}/Makefile"
diff --git a/print/pkfonts360/Makefile b/print/pkfonts360/Makefile
index aadff7d16f6a..30ed640d1383 100644
--- a/print/pkfonts360/Makefile
+++ b/print/pkfonts360/Makefile
@@ -3,11 +3,10 @@
 # Date created:		06 Nov 1998
 # Whom:			Satoshi Asami <asami@freebsd.org>
 #
-# $Id: Makefile,v 1.1 1998/11/07 10:50:03 asami Exp $
+# $Id: Makefile,v 1.2 1998/11/08 09:37:03 asami Exp $
 #
 
 RESOLUTION=	360
-FILESDIR=	${.CURDIR}/../pkfonts300/files
-PKGDIR=		${.CURDIR}/../pkfonts300/pkg
+MASTERDIR=	${.CURDIR}/../pkfonts300
 
-.include "${.CURDIR}/../pkfonts300/Makefile"
+.include	"${MASTERDIR}/Makefile"
diff --git a/print/pkfonts400/Makefile b/print/pkfonts400/Makefile
index 9600356ff0cf..871a20dc24a3 100644
--- a/print/pkfonts400/Makefile
+++ b/print/pkfonts400/Makefile
@@ -3,11 +3,10 @@
 # Date created:		06 Nov 1998
 # Whom:			Satoshi Asami <asami@freebsd.org>
 #
-# $Id: Makefile,v 1.1 1998/11/07 10:50:03 asami Exp $
+# $Id: Makefile,v 1.2 1998/11/08 09:37:05 asami Exp $
 #
 
 RESOLUTION=	400
-FILESDIR=	${.CURDIR}/../pkfonts300/files
-PKGDIR=		${.CURDIR}/../pkfonts300/pkg
+MASTERDIR=	${.CURDIR}/../pkfonts300
 
-.include "${.CURDIR}/../pkfonts300/Makefile"
+.include	"${MASTERDIR}/Makefile"
diff --git a/print/pkfonts600/Makefile b/print/pkfonts600/Makefile
index 17032d315412..5d65649c89d6 100644
--- a/print/pkfonts600/Makefile
+++ b/print/pkfonts600/Makefile
@@ -3,11 +3,10 @@
 # Date created:		06 Nov 1998
 # Whom:			Satoshi Asami <asami@freebsd.org>
 #
-# $Id: Makefile,v 1.1 1998/11/07 10:50:04 asami Exp $
+# $Id: Makefile,v 1.2 1998/11/08 09:37:11 asami Exp $
 #
 
 RESOLUTION=	600
-FILESDIR=	${.CURDIR}/../pkfonts300/files
-PKGDIR=		${.CURDIR}/../pkfonts300/pkg
+MASTERDIR=	${.CURDIR}/../pkfonts300
 
-.include "${.CURDIR}/../pkfonts300/Makefile"
+.include	"${MASTERDIR}/Makefile"
diff --git a/print/yatex-mule/Makefile b/print/yatex-mule/Makefile
index e97bbe7ad5ce..452391afb404 100644
--- a/print/yatex-mule/Makefile
+++ b/print/yatex-mule/Makefile
@@ -3,7 +3,7 @@
 # Date created:		98/11/17
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.3 1998/11/15 12:21:55 kuriyama Exp $
+# $Id: Makefile,v 1.4 1998/11/20 18:19:09 itojun Exp $
 #
 
 PKGNAME=	ja-yatex-1.66
@@ -11,4 +11,7 @@ CATEGORIES=	japanese print elisp
 
 MULE=		yes
 
-.include "${.CURDIR}/../../print/yatex/Makefile"
+MASTERDIR=	${.CURDIR}/../../print/yatex
+PLIST=		${.CURDIR}/pkg/PLIST
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/print/yatex-xemacs-mule/Makefile b/print/yatex-xemacs-mule/Makefile
index 212839876bbd..36dc84d924ef 100644
--- a/print/yatex-xemacs-mule/Makefile
+++ b/print/yatex-xemacs-mule/Makefile
@@ -3,7 +3,7 @@
 # Date created:		98/11/17
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.3 1998/11/15 12:21:56 kuriyama Exp $
+# $Id: Makefile,v 1.4 1998/11/20 18:19:09 itojun Exp $
 #
 
 PKGNAME=	ja-yatex-xemacs-1.66
@@ -11,4 +11,7 @@ CATEGORIES=	japanese print elisp
 
 XEMACS-MULE=	yes
 
-.include "${.CURDIR}/../../print/yatex/Makefile"
+MASTERDIR=	${.CURDIR}/../../print/yatex
+PLIST=		${.CURDIR}/pkg/PLIST
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/print/yatex-xemacs/Makefile b/print/yatex-xemacs/Makefile
index e97bbe7ad5ce..452391afb404 100644
--- a/print/yatex-xemacs/Makefile
+++ b/print/yatex-xemacs/Makefile
@@ -3,7 +3,7 @@
 # Date created:		98/11/17
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.3 1998/11/15 12:21:55 kuriyama Exp $
+# $Id: Makefile,v 1.4 1998/11/20 18:19:09 itojun Exp $
 #
 
 PKGNAME=	ja-yatex-1.66
@@ -11,4 +11,7 @@ CATEGORIES=	japanese print elisp
 
 MULE=		yes
 
-.include "${.CURDIR}/../../print/yatex/Makefile"
+MASTERDIR=	${.CURDIR}/../../print/yatex
+PLIST=		${.CURDIR}/pkg/PLIST
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/print/yatex/Makefile b/print/yatex/Makefile
index bcc0a53a84fb..acb004af698e 100644
--- a/print/yatex/Makefile
+++ b/print/yatex/Makefile
@@ -3,7 +3,7 @@
 # Date created:		98/11/17
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.4 1998/11/15 12:21:56 kuriyama Exp $
+# $Id: Makefile,v 1.5 1998/11/20 18:19:09 itojun Exp $
 #
 
 DISTNAME=	yatex1.66
@@ -14,10 +14,6 @@ MASTER_SITES=	http://www.comp.ae.keio.ac.jp/~yuuji/yatex/ \
 
 MAINTAINER=	taoka@infonets.hiroshima-u.ac.jp
 
-PATCHDIR=	${.CURDIR}/../../print/yatex/patches
-FILESDIR=	${.CURDIR}/../../print/yatex/files
-PKGDIR=		${.CURDIR}/../../print/yatex/pkg
-PLIST=		${.CURDIR}/pkg/PLIST
 WRKSRC=		${WRKDIR}/yatex${VERSION}
 .if defined(XEMACS-MULE)
 BUILD_DEPENDS=	xemacs:${PORTSDIR}/editors/xemacs-mule \