aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSatoshi Asami <asami@FreeBSD.org>1998-12-01 03:06:49 +0000
committerSatoshi Asami <asami@FreeBSD.org>1998-12-01 03:06:49 +0000
commit555a3ebe6cdf7d9691773cd13c13503ad2fdffae (patch)
tree8b731a32ebffa1cf00831def0cd323e7ac45f8c5
parentb84358bd6074f63917e478c7ba7a1f10f37db466 (diff)
downloadports-555a3ebe6cdf7d9691773cd13c13503ad2fdffae.tar.gz
ports-555a3ebe6cdf7d9691773cd13c13503ad2fdffae.zip
Notes
-rw-r--r--chinese/FreeWnn-lib/Makefile6
-rw-r--r--chinese/FreeWnn-server/Makefile6
-rw-r--r--chinese/mule-freewnn/Makefile7
-rw-r--r--chinese/nvi-big5/Makefile13
-rw-r--r--chinese/nvi-euc-cn/Makefile13
-rw-r--r--chinese/nvi-euc-tw/Makefile13
-rw-r--r--graphics/xv-m17n/Makefile9
-rw-r--r--japanese/ewipe/Makefile10
-rw-r--r--japanese/gp/Makefile7
-rw-r--r--japanese/jtex209-ascii/Makefile9
-rw-r--r--japanese/jtex209-ntt/Makefile9
-rw-r--r--japanese/jvim-canna+freewnn/Makefile7
-rw-r--r--japanese/jvim-canna+wnn6/Makefile7
-rw-r--r--japanese/jvim-canna+wnn7/Makefile7
-rw-r--r--japanese/jvim-canna/Makefile7
-rw-r--r--japanese/jvim-freewnn/Makefile7
-rw-r--r--japanese/jvim-wnn6/Makefile7
-rw-r--r--japanese/jvim-wnn7/Makefile7
-rw-r--r--japanese/jvim3-canna+freewnn/Makefile7
-rw-r--r--japanese/jvim3-canna+wnn6/Makefile7
-rw-r--r--japanese/jvim3-canna+wnn7/Makefile7
-rw-r--r--japanese/jvim3-canna/Makefile7
-rw-r--r--japanese/jvim3-direct_canna/Makefile7
-rw-r--r--japanese/jvim3-freewnn/Makefile7
-rw-r--r--japanese/jvim3-wnn6/Makefile7
-rw-r--r--japanese/jvim3-wnn7/Makefile7
-rw-r--r--japanese/kinput2-canna+freewnn+sj3/Makefile7
-rw-r--r--japanese/kinput2-canna+freewnn/Makefile7
-rw-r--r--japanese/kinput2-canna+sj3+wnn6/Makefile7
-rw-r--r--japanese/kinput2-canna+sj3+wnn7/Makefile7
-rw-r--r--japanese/kinput2-canna+sj3/Makefile7
-rw-r--r--japanese/kinput2-canna+wnn6/Makefile7
-rw-r--r--japanese/kinput2-canna+wnn7/Makefile7
-rw-r--r--japanese/kinput2-canna/Makefile7
-rw-r--r--japanese/kinput2-freewnn+sj3/Makefile7
-rw-r--r--japanese/kinput2-sj3+wnn6/Makefile7
-rw-r--r--japanese/kinput2-sj3+wnn7/Makefile7
-rw-r--r--japanese/kinput2-sj3/Makefile7
-rw-r--r--japanese/kinput2-wnn6/Makefile7
-rw-r--r--japanese/kinput2-wnn7/Makefile7
-rw-r--r--japanese/magicpoint/Makefile9
-rw-r--r--japanese/mnews-gnspool/Makefile7
-rw-r--r--japanese/mule-canna+freewnn+sj3/Makefile7
-rw-r--r--japanese/mule-canna+freewnn/Makefile7
-rw-r--r--japanese/mule-canna+sj3+wnn6/Makefile7
-rw-r--r--japanese/mule-canna+sj3+wnn7/Makefile7
-rw-r--r--japanese/mule-canna+sj3/Makefile7
-rw-r--r--japanese/mule-canna+wnn6/Makefile7
-rw-r--r--japanese/mule-canna+wnn7/Makefile7
-rw-r--r--japanese/mule-canna/Makefile7
-rw-r--r--japanese/mule-freewnn+sj3/Makefile7
-rw-r--r--japanese/mule-freewnn/Makefile7
-rw-r--r--japanese/mule-sj3+wnn6/Makefile7
-rw-r--r--japanese/mule-sj3+wnn7/Makefile7
-rw-r--r--japanese/mule-sj3/Makefile7
-rw-r--r--japanese/mule-wnn6/Makefile7
-rw-r--r--japanese/mule-wnn7/Makefile7
-rw-r--r--japanese/netscape4-navigator/Makefile9
-rw-r--r--japanese/nvi-euc-jp/Makefile13
-rw-r--r--japanese/nvi-iso-2022-jp/Makefile13
-rw-r--r--japanese/nvi-sjis/Makefile13
-rw-r--r--japanese/onew-canna+freewnn/Makefile6
-rw-r--r--japanese/onew-canna+wnn6/Makefile6
-rw-r--r--japanese/onew-canna+wnn7/Makefile6
-rw-r--r--japanese/onew-canna/Makefile6
-rw-r--r--japanese/onew-wnn6/Makefile6
-rw-r--r--japanese/onew-wnn7/Makefile6
-rw-r--r--japanese/plan/Makefile18
-rw-r--r--japanese/tcsh-nls-asuka/Makefile8
-rw-r--r--japanese/tcsh-nls-ayanami/Makefile8
-rw-r--r--japanese/tcsh-nls-koshiki/Makefile8
-rw-r--r--japanese/tcsh-nls-multi/Makefile8
-rw-r--r--japanese/tcsh-nls-roomi/Makefile8
-rw-r--r--japanese/tcsh-nls-ruri2/Makefile8
-rw-r--r--japanese/w3/Makefile9
-rw-r--r--japanese/xemacs21-canna+freewnn/Makefile7
-rw-r--r--japanese/xemacs21-canna+wnn6/Makefile7
-rw-r--r--japanese/xemacs21-canna/Makefile7
-rw-r--r--japanese/xemacs21-freewnn/Makefile7
-rw-r--r--japanese/xemacs21-sumo-canna+freewnn/Makefile7
-rw-r--r--japanese/xemacs21-sumo-canna+wnn6/Makefile7
-rw-r--r--japanese/xemacs21-sumo-canna/Makefile7
-rw-r--r--japanese/xemacs21-sumo-freewnn/Makefile7
-rw-r--r--japanese/xemacs21-sumo-wnn6/Makefile7
-rw-r--r--japanese/xemacs21-wnn6/Makefile7
-rw-r--r--japanese/xv/Makefile9
-rw-r--r--korean/FreeWnn-lib/Makefile5
-rw-r--r--korean/FreeWnn-server/Makefile5
-rw-r--r--korean/mule-freewnn/Makefile7
-rw-r--r--korean/nvi-euc-kr/Makefile13
-rw-r--r--korean/nvi-iso-2022-kr/Makefile13
-rw-r--r--lang/tcl82/Makefile4
-rw-r--r--lang/tcl83/Makefile4
-rw-r--r--lang/tcl84/Makefile4
-rw-r--r--lang/tclX/Makefile4
-rw-r--r--lang/tclX80/Makefile4
-rw-r--r--lang/tclX82/Makefile4
-rw-r--r--mail/mew-emacs20/Makefile7
-rw-r--r--mail/mew-mule/Makefile7
-rw-r--r--mail/mew-xemacs/Makefile7
-rw-r--r--mail/mew-xemacs20/Makefile7
-rw-r--r--mail/mew-xemacs21-mule/Makefile7
-rw-r--r--mail/mew-xemacs21/Makefile7
-rw-r--r--mail/mew/Makefile7
-rw-r--r--mail/xpbiff-youbin/Makefile11
-rw-r--r--print/pkfonts118/Makefile7
-rw-r--r--print/pkfonts240/Makefile7
-rw-r--r--print/pkfonts360/Makefile7
-rw-r--r--print/pkfonts400/Makefile7
-rw-r--r--print/pkfonts600/Makefile7
-rw-r--r--print/yatex-mule/Makefile7
-rw-r--r--print/yatex-xemacs-mule/Makefile7
-rw-r--r--print/yatex-xemacs/Makefile7
-rw-r--r--print/yatex/Makefile6
-rw-r--r--x11-servers/XttXF86srv-8514/Makefile7
-rw-r--r--x11-servers/XttXF86srv-AGX/Makefile7
-rw-r--r--x11-servers/XttXF86srv-I128/Makefile7
-rw-r--r--x11-servers/XttXF86srv-Mach32/Makefile7
-rw-r--r--x11-servers/XttXF86srv-Mach64/Makefile7
-rw-r--r--x11-servers/XttXF86srv-Mach8/Makefile7
-rw-r--r--x11-servers/XttXF86srv-Mono/Makefile7
-rw-r--r--x11-servers/XttXF86srv-P9000/Makefile7
-rw-r--r--x11-servers/XttXF86srv-S3/Makefile7
-rw-r--r--x11-servers/XttXF86srv-S3V/Makefile7
-rw-r--r--x11-servers/XttXF86srv-SVGA/Makefile7
-rw-r--r--x11-servers/XttXF86srv-VGA16/Makefile7
-rw-r--r--x11-servers/XttXF86srv-W32/Makefile7
-rw-r--r--x11-servers/XttXF86srv-common/Makefile4
-rw-r--r--x11-servers/XttXF86srv-xfs/Makefile7
-rw-r--r--x11-toolkits/tk82/Makefile5
-rw-r--r--x11-toolkits/tk83/Makefile5
-rw-r--r--x11-toolkits/tk84/Makefile5
-rw-r--r--x11-toolkits/tkstep80/Makefile3
133 files changed, 609 insertions, 364 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
diff --git a/graphics/xv-m17n/Makefile b/graphics/xv-m17n/Makefile
index 508990e30c39..7e62157bd841 100644
--- a/graphics/xv-m17n/Makefile
+++ b/graphics/xv-m17n/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/28 14:39:15 kuriyama Exp $
#
PKGNAME= xv-m17n-3.10a
@@ -11,9 +11,8 @@ CATEGORIES= 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_MULTILINGUAL
@@ -30,4 +29,4 @@ do-install:
fi
@${LN} -sf ${PREFIX}/bin/xv-m17n ${PREFIX}/bin/xv
-.include <${.CURDIR}/../../graphics/xv/Makefile>
+.include "${MASTERDIR}/Makefile"
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"
diff --git a/korean/FreeWnn-lib/Makefile b/korean/FreeWnn-lib/Makefile
index 40491351e597..95384ba425c4 100644
--- a/korean/FreeWnn-lib/Makefile
+++ b/korean/FreeWnn-lib/Makefile
@@ -3,15 +3,16 @@
# Date created: 20 July 1997
# Whom: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
#
-# $Id: Makefile,v 1.4 1997/09/10 06:51:59 asami Exp $
+# $Id: Makefile,v 1.5 1997/09/23 02:18:00 max Exp $
#
PKGNAME= ko-Wnn-4.2
CATEGORIES= korean
## COMMENT, DESCR, PLIST is used in a local 'pkg' directory
+MASTERDIR= ${.CURDIR}/../../japanese/Wnn
COMMENT= ${.CURDIR}/pkg/COMMENT
DESCR= ${.CURDIR}/pkg/DESCR
PLIST= ${.CURDIR}/pkg/PLIST
-.include "${.CURDIR}/../../japanese/Wnn/Makefile"
+.include "${MASTERDIR}/Makefile"
diff --git a/korean/FreeWnn-server/Makefile b/korean/FreeWnn-server/Makefile
index 40491351e597..95384ba425c4 100644
--- a/korean/FreeWnn-server/Makefile
+++ b/korean/FreeWnn-server/Makefile
@@ -3,15 +3,16 @@
# Date created: 20 July 1997
# Whom: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
#
-# $Id: Makefile,v 1.4 1997/09/10 06:51:59 asami Exp $
+# $Id: Makefile,v 1.5 1997/09/23 02:18:00 max Exp $
#
PKGNAME= ko-Wnn-4.2
CATEGORIES= korean
## COMMENT, DESCR, PLIST is used in a local 'pkg' directory
+MASTERDIR= ${.CURDIR}/../../japanese/Wnn
COMMENT= ${.CURDIR}/pkg/COMMENT
DESCR= ${.CURDIR}/pkg/DESCR
PLIST= ${.CURDIR}/pkg/PLIST
-.include "${.CURDIR}/../../japanese/Wnn/Makefile"
+.include "${MASTERDIR}/Makefile"
diff --git a/korean/mule-freewnn/Makefile b/korean/mule-freewnn/Makefile
index 1117768000b6..fe9be596ed7c 100644
--- a/korean/mule-freewnn/Makefile
+++ b/korean/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.2 1997/09/22 16:22:06 max Exp $
+# $Id: Makefile,v 1.3 1998/10/07 08:11:41 asami Exp $
#
PKGNAME= ko-mule-wnn4-2.3
CATEGORIES= korean editors
KWNN4= yes
-.include "${.CURDIR}/../../editors/mule/Makefile"
+MASTERDIR= ${.CURDIR}/../../editors/mule
+PKGDIR= ${.CURDIR}/pkg
+
+.include "${MASTERDIR}/Makefile"
diff --git a/korean/nvi-euc-kr/Makefile b/korean/nvi-euc-kr/Makefile
index fbf50664ba16..659e19a0b18b 100644
--- a/korean/nvi-euc-kr/Makefile
+++ b/korean/nvi-euc-kr/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:36 obrien Exp $
+# $Id: Makefile,v 1.12 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
-COMMENT= ${.CURDIR}/pkg/COMMENT
-
PKGNAME= ko-nvi-euckr-1.79.19981119
-.include <${.CURDIR}/../../editors/nvi-m17n/Makefile>
+MASTERDIR= ${.CURDIR}/../../editors/nvi-m17n
+COMMENT= ${.CURDIR}/pkg/COMMENT
+
+.include "${MASTERDIR}/Makefile"
CATEGORIES= korean editors
diff --git a/korean/nvi-iso-2022-kr/Makefile b/korean/nvi-iso-2022-kr/Makefile
index 0e28a9832047..f62dae007070 100644
--- a/korean/nvi-iso-2022-kr/Makefile
+++ b/korean/nvi-iso-2022-kr/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:39 obrien Exp $
+# $Id: Makefile,v 1.12 1998/11/19 04:46:46 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= ko-nvi-iso2022kr-1.79.19981119
-.include <${.CURDIR}/../../editors/nvi-m17n/Makefile>
+MASTERDIR= ${.CURDIR}/../../editors/nvi-m17n
+COMMENT= ${.CURDIR}/pkg/COMMENT
+
+.include "${MASTERDIR}/Makefile"
CATEGORIES= korean editors
diff --git a/lang/tcl82/Makefile b/lang/tcl82/Makefile
index 0d05e180f88b..c1aa4152a1e8 100644
--- a/lang/tcl82/Makefile
+++ b/lang/tcl82/Makefile
@@ -3,7 +3,7 @@
# Date created: 19 August 1997
# Whom: jkh
#
-# $Id: Makefile,v 1.10 1998/07/27 21:14:50 hoek Exp $
+# $Id: Makefile,v 1.11 1998/10/03 21:35:20 steve Exp $
#
DISTNAME= tcl8.1a2
@@ -13,6 +13,8 @@ MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
MAINTAINER= jseger@FreeBSD.ORG
+FILE_DEPENDS= ${PORTSDIR}/lang/tcl80
+
NO_LATEST_LINK= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/unix
GNU_CONFIGURE= yes
diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile
index 0d05e180f88b..c1aa4152a1e8 100644
--- a/lang/tcl83/Makefile
+++ b/lang/tcl83/Makefile
@@ -3,7 +3,7 @@
# Date created: 19 August 1997
# Whom: jkh
#
-# $Id: Makefile,v 1.10 1998/07/27 21:14:50 hoek Exp $
+# $Id: Makefile,v 1.11 1998/10/03 21:35:20 steve Exp $
#
DISTNAME= tcl8.1a2
@@ -13,6 +13,8 @@ MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
MAINTAINER= jseger@FreeBSD.ORG
+FILE_DEPENDS= ${PORTSDIR}/lang/tcl80
+
NO_LATEST_LINK= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/unix
GNU_CONFIGURE= yes
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index 0d05e180f88b..c1aa4152a1e8 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -3,7 +3,7 @@
# Date created: 19 August 1997
# Whom: jkh
#
-# $Id: Makefile,v 1.10 1998/07/27 21:14:50 hoek Exp $
+# $Id: Makefile,v 1.11 1998/10/03 21:35:20 steve Exp $
#
DISTNAME= tcl8.1a2
@@ -13,6 +13,8 @@ MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
MAINTAINER= jseger@FreeBSD.ORG
+FILE_DEPENDS= ${PORTSDIR}/lang/tcl80
+
NO_LATEST_LINK= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/unix
GNU_CONFIGURE= yes
diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile
index f29f9e1f99ba..e487a958c228 100644
--- a/lang/tclX/Makefile
+++ b/lang/tclX/Makefile
@@ -3,7 +3,7 @@
# Date created: 6 February 1996
# Whom: jkh
#
-# $Id: Makefile,v 1.24 1998/09/25 10:05:08 asami Exp $
+# $Id: Makefile,v 1.25 1998/10/11 19:51:36 smace Exp $
#
DISTNAME= tclX8.0.2
@@ -15,6 +15,8 @@ MAINTAINER= jseger@FreeBSD.ORG
LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+FILE_DEPENDS= ${PORTSDIR}/x11-toolkits/tk80
+
WRKSRC= ${WRKDIR}/${DISTNAME}/unix
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared --with-tk
diff --git a/lang/tclX80/Makefile b/lang/tclX80/Makefile
index f29f9e1f99ba..e487a958c228 100644
--- a/lang/tclX80/Makefile
+++ b/lang/tclX80/Makefile
@@ -3,7 +3,7 @@
# Date created: 6 February 1996
# Whom: jkh
#
-# $Id: Makefile,v 1.24 1998/09/25 10:05:08 asami Exp $
+# $Id: Makefile,v 1.25 1998/10/11 19:51:36 smace Exp $
#
DISTNAME= tclX8.0.2
@@ -15,6 +15,8 @@ MAINTAINER= jseger@FreeBSD.ORG
LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+FILE_DEPENDS= ${PORTSDIR}/x11-toolkits/tk80
+
WRKSRC= ${WRKDIR}/${DISTNAME}/unix
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared --with-tk
diff --git a/lang/tclX82/Makefile b/lang/tclX82/Makefile
index f29f9e1f99ba..e487a958c228 100644
--- a/lang/tclX82/Makefile
+++ b/lang/tclX82/Makefile
@@ -3,7 +3,7 @@
# Date created: 6 February 1996
# Whom: jkh
#
-# $Id: Makefile,v 1.24 1998/09/25 10:05:08 asami Exp $
+# $Id: Makefile,v 1.25 1998/10/11 19:51:36 smace Exp $
#
DISTNAME= tclX8.0.2
@@ -15,6 +15,8 @@ MAINTAINER= jseger@FreeBSD.ORG
LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
+FILE_DEPENDS= ${PORTSDIR}/x11-toolkits/tk80
+
WRKSRC= ${WRKDIR}/${DISTNAME}/unix
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared --with-tk
diff --git a/mail/mew-emacs20/Makefile b/mail/mew-emacs20/Makefile
index c74d442f271a..1e8fc09ae8aa 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 7b1b406a9092..6e8e2f0fabf0 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 eb0020e68447..de4abd54f18d 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 218825ab0156..f66cc6522193 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 4aaa4d8c353d..0e2bf5ea7c80 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 218825ab0156..f66cc6522193 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 07d0fd29a316..a4220b419b6d 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 10c7f7893f64..d67f67933549 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"
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 \
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"
diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile
index 150f14faabb3..53c47fdab23e 100644
--- a/x11-toolkits/tk82/Makefile
+++ b/x11-toolkits/tk82/Makefile
@@ -1,9 +1,9 @@
-# New ports collection makefile for: tk8.0
+# New ports collection makefile for: tk8.1
# Version required: 8.1a2
# Date created: 19 August 1997
# Whom: jkh
#
-# $Id: Makefile,v 1.17 1998/10/03 22:05:46 steve Exp $
+# $Id: Makefile,v 1.18 1998/11/11 02:02:14 asami Exp $
#
DISTNAME= tk8.1a2
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
MAINTAINER= jseger@FreeBSD.ORG
LIB_DEPENDS= tcl81.1:${PORTSDIR}/lang/tcl81
+FILE_DEPENDS= ${PORTSDIR}/x11-toolkits/tk80
USE_XLIB= yes
NO_LATEST_LINK= yes
diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index 150f14faabb3..53c47fdab23e 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -1,9 +1,9 @@
-# New ports collection makefile for: tk8.0
+# New ports collection makefile for: tk8.1
# Version required: 8.1a2
# Date created: 19 August 1997
# Whom: jkh
#
-# $Id: Makefile,v 1.17 1998/10/03 22:05:46 steve Exp $
+# $Id: Makefile,v 1.18 1998/11/11 02:02:14 asami Exp $
#
DISTNAME= tk8.1a2
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
MAINTAINER= jseger@FreeBSD.ORG
LIB_DEPENDS= tcl81.1:${PORTSDIR}/lang/tcl81
+FILE_DEPENDS= ${PORTSDIR}/x11-toolkits/tk80
USE_XLIB= yes
NO_LATEST_LINK= yes
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index 150f14faabb3..53c47fdab23e 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -1,9 +1,9 @@
-# New ports collection makefile for: tk8.0
+# New ports collection makefile for: tk8.1
# Version required: 8.1a2
# Date created: 19 August 1997
# Whom: jkh
#
-# $Id: Makefile,v 1.17 1998/10/03 22:05:46 steve Exp $
+# $Id: Makefile,v 1.18 1998/11/11 02:02:14 asami Exp $
#
DISTNAME= tk8.1a2
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
MAINTAINER= jseger@FreeBSD.ORG
LIB_DEPENDS= tcl81.1:${PORTSDIR}/lang/tcl81
+FILE_DEPENDS= ${PORTSDIR}/x11-toolkits/tk80
USE_XLIB= yes
NO_LATEST_LINK= yes
diff --git a/x11-toolkits/tkstep80/Makefile b/x11-toolkits/tkstep80/Makefile
index 830c4269b636..4a70b44a1780 100644
--- a/x11-toolkits/tkstep80/Makefile
+++ b/x11-toolkits/tkstep80/Makefile
@@ -3,7 +3,7 @@
# Date created: 06 November 1997
# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.17 1998/11/25 05:06:25 jseger Exp $
+# $Id: Makefile,v 1.18 1998/11/25 09:01:22 asami Exp $
#
DISTNAME= tk8.0p2
@@ -21,6 +21,7 @@ LIB_DEPENDS= tcl80.1:${PORTSDIR}/lang/tcl80 \
Xpm.4:${PORTSDIR}/graphics/xpm \
jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff34
+FILE_DEPENDS= ${PORTSDIR}/x11-toolkits/tk80
FETCH_BEFORE_ARGS= -b
PATCH_DIST_ARGS= -p1 -d ${WRKDIR}/tk8.0 -E --quiet