summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz>2002-02-28 13:22:50 +0000
committerwiz <wiz>2002-02-28 13:22:50 +0000
commit06fb0f888999710d61ee68e36229a20d4400fbbc (patch)
treeef6b94bf1821b1cef69d146b2f9358c45b174e47
parentcfc3c57b26af983a24c185cafdb2108db1731395 (diff)
downloadpkgsrc-06fb0f888999710d61ee68e36229a20d4400fbbc.tar.gz
Expand a variable to silence pkglint.
-rw-r--r--japanese/canna-server/Makefile7
-rw-r--r--japanese/freewnn-lib/Makefile9
-rw-r--r--japanese/freewnn-server/Makefile9
-rw-r--r--japanese/sj3-server/Makefile7
4 files changed, 14 insertions, 18 deletions
diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index 866302070eb..c86070f7a53 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/03/16 18:16:39 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2002/02/28 13:26:03 wiz Exp $
DISTNAME= Canna35b2
PKGNAME= Canna-server-3.5b2
@@ -16,9 +16,8 @@ COMMENT= Kana-Kanji conversion system (server)
DEPENDS+= Canna-lib-3.5b2:../../japanese/canna-lib
-MASTERDIR= ${.CURDIR}/../../japanese/canna-lib
-FILESDIR= ${MASTERDIR}/files
-PATCHDIR= ${MASTERDIR}/patches
+FILESDIR= ${.CURDIR}/../../japanese/canna-lib/files
+PATCHDIR= ${.CURDIR}/../../japanese/canna-lib/patches
BUILD_DEFS+= USE_INET6
diff --git a/japanese/freewnn-lib/Makefile b/japanese/freewnn-lib/Makefile
index 0801b51949d..3ffeac4c8a6 100644
--- a/japanese/freewnn-lib/Makefile
+++ b/japanese/freewnn-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 15:25:15 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2002/02/28 13:25:25 wiz Exp $
#
PKGNAME= ja-FreeWnn-lib-1.10
@@ -10,8 +10,7 @@ WNNDIR= Wnn
WNN_TARGET= LIBRARY
WNN_LANG= ja_JP
-MASTERDIR= ${.CURDIR}/../../misc/freewnn-common
-FILESDIR= ${MASTERDIR}/files
-PATCHDIR= ${MASTERDIR}/patches
+FILESDIR= ${.CURDIR}/../../misc/freewnn-common/files
+PATCHDIR= ${.CURDIR}/../../misc/freewnn-common/patches
-.include "${MASTERDIR}/Makefile"
+.include "../../misc/freewnn-common/Makefile"
diff --git a/japanese/freewnn-server/Makefile b/japanese/freewnn-server/Makefile
index f66913f4ef5..a726ab7ddbf 100644
--- a/japanese/freewnn-server/Makefile
+++ b/japanese/freewnn-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/03/16 18:32:47 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/02/28 13:22:50 wiz Exp $
#
PKGNAME= ja-FreeWnn-server-1.10
@@ -11,8 +11,7 @@ WNNDIR= Wnn
WNN_TARGET= SERVER
WNN_LANG= ja_JP
-MASTERDIR= ${.CURDIR}/../../misc/freewnn-common
-FILESDIR= ${MASTERDIR}/files
-PATCHDIR= ${MASTERDIR}/patches
+FILESDIR= ${.CURDIR}/../../misc/freewnn-common/files
+PATCHDIR= ${.CURDIR}/../../misc/freewnn-common/patches
-.include "${MASTERDIR}/Makefile"
+.include "../../misc/freewnn-common/Makefile"
diff --git a/japanese/sj3-server/Makefile b/japanese/sj3-server/Makefile
index 1448cc02165..6672657a2cc 100644
--- a/japanese/sj3-server/Makefile
+++ b/japanese/sj3-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/03/11 16:19:46 tron Exp $
+# $NetBSD: Makefile,v 1.8 2002/02/28 13:29:46 wiz Exp $
#
DISTNAME= sj3-2.0.1.20
@@ -12,9 +12,8 @@ COMMENT= Japanese input method (server)
DEPENDS+= sj3-lib-2.0.1.20:../../japanese/sj3-lib
-MASTERDIR= ${.CURDIR}/../../japanese/sj3-lib
-FILESDIR= ${MASTERDIR}/files
-PATCHDIR= ${MASTERDIR}/patches
+FILESDIR= ${.CURDIR}/../../japanese/sj3-lib/files
+PATCHDIR= ${.CURDIR}/../../japanese/sj3-lib/patches
.include "../../mk/bsd.prefs.mk"
SJ3OWNER?= daemon