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

15 files changed, 71 insertions, 31 deletions

diff --git a/x11-servers/XttXF86srv-8514/Makefile b/x11-servers/XttXF86srv-8514/Makefile
index b686438f0447..100a287d1ec2 100644
--- a/x11-servers/XttXF86srv-8514/Makefile
+++ b/x11-servers/XttXF86srv-8514/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.2 1998/09/01 13:41:00 asami Exp $
+# $Id: Makefile,v 1.3 1998/10/10 04:21:58 steve Exp $
 #
 
 DISTNAME=	xc
@@ -16,4 +16,7 @@ RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
 SERVER=		XF86_8514
 
-.include "${.CURDIR}/../XttXF86srv-common/Makefile"
+MASTERDIR=	${.CURDIR}/../XttXF86srv-common
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-AGX/Makefile b/x11-servers/XttXF86srv-AGX/Makefile
index 459ae37aa3ed..fa59cf0eb225 100644
--- a/x11-servers/XttXF86srv-AGX/Makefile
+++ b/x11-servers/XttXF86srv-AGX/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.2 1998/09/01 13:41:03 asami Exp $
+# $Id: Makefile,v 1.3 1998/10/10 04:22:03 steve Exp $
 #
 
 DISTNAME=	xc
@@ -16,4 +16,7 @@ RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
 SERVER=		XF86_AGX
 
-.include "${.CURDIR}/../XttXF86srv-common/Makefile"
+MASTERDIR=	${.CURDIR}/../XttXF86srv-common
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-I128/Makefile b/x11-servers/XttXF86srv-I128/Makefile
index fc7e8f17a977..f0cb57fb3da2 100644
--- a/x11-servers/XttXF86srv-I128/Makefile
+++ b/x11-servers/XttXF86srv-I128/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.2 1998/09/01 13:41:04 asami Exp $
+# $Id: Makefile,v 1.3 1998/10/10 04:22:03 steve Exp $
 #
 
 DISTNAME=	xc
@@ -16,4 +16,7 @@ RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
 SERVER=		XF86_I128
 
-.include "${.CURDIR}/../XttXF86srv-common/Makefile"
+MASTERDIR=	${.CURDIR}/../XttXF86srv-common
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-Mach32/Makefile b/x11-servers/XttXF86srv-Mach32/Makefile
index 35fbbca99a8f..065b9a9b48e1 100644
--- a/x11-servers/XttXF86srv-Mach32/Makefile
+++ b/x11-servers/XttXF86srv-Mach32/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.2 1998/09/01 13:41:04 asami Exp $
+# $Id: Makefile,v 1.3 1998/10/10 04:22:04 steve Exp $
 #
 
 DISTNAME=	xc
@@ -16,4 +16,7 @@ RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
 SERVER=		XF86_Mach32
 
-.include "${.CURDIR}/../XttXF86srv-common/Makefile"
+MASTERDIR=	${.CURDIR}/../XttXF86srv-common
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-Mach64/Makefile b/x11-servers/XttXF86srv-Mach64/Makefile
index dfca98c85b14..70ec4d0b799e 100644
--- a/x11-servers/XttXF86srv-Mach64/Makefile
+++ b/x11-servers/XttXF86srv-Mach64/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.2 1998/09/01 13:41:05 asami Exp $
+# $Id: Makefile,v 1.3 1998/10/10 04:22:05 steve Exp $
 #
 
 DISTNAME=	xc
@@ -16,4 +16,7 @@ RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
 SERVER=		XF86_Mach64
 
-.include "${.CURDIR}/../XttXF86srv-common/Makefile"
+MASTERDIR=	${.CURDIR}/../XttXF86srv-common
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-Mach8/Makefile b/x11-servers/XttXF86srv-Mach8/Makefile
index 1e8295cd58c7..b5824ad9f156 100644
--- a/x11-servers/XttXF86srv-Mach8/Makefile
+++ b/x11-servers/XttXF86srv-Mach8/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.2 1998/09/01 13:41:06 asami Exp $
+# $Id: Makefile,v 1.3 1998/10/10 04:22:05 steve Exp $
 #
 
 DISTNAME=	xc
@@ -16,4 +16,7 @@ RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
 SERVER=		XF86_Mach8
 
-.include "${.CURDIR}/../XttXF86srv-common/Makefile"
+MASTERDIR=	${.CURDIR}/../XttXF86srv-common
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-Mono/Makefile b/x11-servers/XttXF86srv-Mono/Makefile
index cc88f8bf2a75..9f79d7c73678 100644
--- a/x11-servers/XttXF86srv-Mono/Makefile
+++ b/x11-servers/XttXF86srv-Mono/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.2 1998/09/01 13:41:06 asami Exp $
+# $Id: Makefile,v 1.3 1998/10/10 04:22:06 steve Exp $
 #
 
 DISTNAME=	xc
@@ -16,4 +16,7 @@ RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
 SERVER=		XF86_Mono
 
-.include "${.CURDIR}/../XttXF86srv-common/Makefile"
+MASTERDIR=	${.CURDIR}/../XttXF86srv-common
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-P9000/Makefile b/x11-servers/XttXF86srv-P9000/Makefile
index 59517d4c8dec..d7b23900f485 100644
--- a/x11-servers/XttXF86srv-P9000/Makefile
+++ b/x11-servers/XttXF86srv-P9000/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.2 1998/09/01 13:41:07 asami Exp $
+# $Id: Makefile,v 1.3 1998/10/10 04:22:06 steve Exp $
 #
 
 DISTNAME=	xc
@@ -16,4 +16,7 @@ RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
 SERVER=		XF86_P9000
 
-.include "${.CURDIR}/../XttXF86srv-common/Makefile"
+MASTERDIR=	${.CURDIR}/../XttXF86srv-common
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-S3/Makefile b/x11-servers/XttXF86srv-S3/Makefile
index c18738e07c27..42c036bfa1f4 100644
--- a/x11-servers/XttXF86srv-S3/Makefile
+++ b/x11-servers/XttXF86srv-S3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.2 1998/09/01 13:41:07 asami Exp $
+# $Id: Makefile,v 1.3 1998/10/10 04:22:07 steve Exp $
 #
 
 DISTNAME=	xc
@@ -16,4 +16,7 @@ RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
 SERVER=		XF86_S3
 
-.include "${.CURDIR}/../XttXF86srv-common/Makefile"
+MASTERDIR=	${.CURDIR}/../XttXF86srv-common
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-S3V/Makefile b/x11-servers/XttXF86srv-S3V/Makefile
index 873078c90090..c79c1f1cf9fe 100644
--- a/x11-servers/XttXF86srv-S3V/Makefile
+++ b/x11-servers/XttXF86srv-S3V/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.2 1998/09/01 13:41:08 asami Exp $
+# $Id: Makefile,v 1.3 1998/10/10 04:22:07 steve Exp $
 #
 
 DISTNAME=	xc
@@ -16,4 +16,7 @@ RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
 SERVER=		XF86_S3V
 
-.include "${.CURDIR}/../XttXF86srv-common/Makefile"
+MASTERDIR=	${.CURDIR}/../XttXF86srv-common
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-SVGA/Makefile b/x11-servers/XttXF86srv-SVGA/Makefile
index 8e89d7a5554d..b3c5b4cff05f 100644
--- a/x11-servers/XttXF86srv-SVGA/Makefile
+++ b/x11-servers/XttXF86srv-SVGA/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.2 1998/09/01 13:41:08 asami Exp $
+# $Id: Makefile,v 1.3 1998/10/10 04:22:08 steve Exp $
 #
 
 DISTNAME=	xc
@@ -16,5 +16,8 @@ RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
 SERVER=		XF86_SVGA
 
-.include "${.CURDIR}/../XttXF86srv-common/Makefile"
+MASTERDIR=	${.CURDIR}/../XttXF86srv-common
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
 
diff --git a/x11-servers/XttXF86srv-VGA16/Makefile b/x11-servers/XttXF86srv-VGA16/Makefile
index 7d4baad1f91c..335e2014b2b0 100644
--- a/x11-servers/XttXF86srv-VGA16/Makefile
+++ b/x11-servers/XttXF86srv-VGA16/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.2 1998/09/01 13:41:09 asami Exp $
+# $Id: Makefile,v 1.3 1998/10/10 04:22:08 steve Exp $
 #
 
 DISTNAME=	xc
@@ -16,4 +16,7 @@ RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
 SERVER=		XF86_VGA16
 
-.include "${.CURDIR}/../XttXF86srv-common/Makefile"
+MASTERDIR=	${.CURDIR}/../XttXF86srv-common
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-W32/Makefile b/x11-servers/XttXF86srv-W32/Makefile
index f16b1f180373..6b8c0eda60f1 100644
--- a/x11-servers/XttXF86srv-W32/Makefile
+++ b/x11-servers/XttXF86srv-W32/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.2 1998/09/01 13:41:09 asami Exp $
+# $Id: Makefile,v 1.3 1998/10/10 04:22:09 steve Exp $
 #
 
 DISTNAME=	xc
@@ -16,4 +16,7 @@ RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
 SERVER=		XF86_W32
 
-.include "${.CURDIR}/../XttXF86srv-common/Makefile"
+MASTERDIR=	${.CURDIR}/../XttXF86srv-common
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/x11-servers/XttXF86srv-common/Makefile b/x11-servers/XttXF86srv-common/Makefile
index ff4a2f76c3a8..ffab493507ba 100644
--- a/x11-servers/XttXF86srv-common/Makefile
+++ b/x11-servers/XttXF86srv-common/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.7 1998/10/22 00:25:53 steve Exp $
+# $Id: Makefile,v 1.8 1998/11/14 09:43:38 asami Exp $
 #
 
 DISTNAME=	xc
@@ -41,8 +41,6 @@ PREFIX=		${X11BASE}
 MTREE_FILE=	/etc/mtree/BSD.x11.dist
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/../XttXF86srv-common/work
 WRKSRC=		${WRKDIR}/xc
-PATCHDIR=	${.CURDIR}/../XttXF86srv-common/patches
-FILESDIR=	${.CURDIR}/../XttXF86srv-common/files
 XTTDIR=		${WRKDIR}/xtt-1.0
 DOCDIR=		${PREFIX}/share/doc/Xtt
 DIST_SUBDIR=		xc
diff --git a/x11-servers/XttXF86srv-xfs/Makefile b/x11-servers/XttXF86srv-xfs/Makefile
index 3223f5c54e95..949dccf34324 100644
--- a/x11-servers/XttXF86srv-xfs/Makefile
+++ b/x11-servers/XttXF86srv-xfs/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.2 1998/09/01 13:41:11 asami Exp $
+# $Id: Makefile,v 1.3 1998/10/10 04:22:12 steve Exp $
 #
 
 DISTNAME=	xc
@@ -16,4 +16,7 @@ RUN_DEPENDS=	mkfontdir.pl:${.CURDIR}/../XttXF86srv-common
 
 SERVER=		xfs
 
-.include "${.CURDIR}/../XttXF86srv-common/Makefile"
+MASTERDIR=	${.CURDIR}/../XttXF86srv-common
+PKGDIR=		${.CURDIR}/pkg
+
+.include	"${MASTERDIR}/Makefile"