18 files changed, 34 insertions, 29 deletions

diff --git a/japanese/VTPSfont/Makefile b/japanese/VTPSfont/Makefile
index c92f55fe3ce2..d9efd8a6c9b9 100644
--- a/japanese/VTPSfont/Makefile
+++ b/japanese/VTPSfont/Makefile
@@ -18,8 +18,8 @@ NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
 do-extract:
-		@${RM} -rf ${WRKDIR}
-		@${MKDIR} ${WRKDIR}
+		@${RM} -rf ${WRKSRC}
+		@${MKDIR} ${WRKSRC}
 		@for file in ${DISTFILES}; do \
 			${CP} ${DISTDIR}/${DIST_SUBDIR}/$${file} ${WRKSRC}; \
 		done
diff --git a/japanese/a2ps/Makefile b/japanese/a2ps/Makefile
index e53bfa84802e..7f5d2ef493ec 100644
--- a/japanese/a2ps/Makefile
+++ b/japanese/a2ps/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	paperconf:${PORTSDIR}/print/libpaper
 
 USES=		perl5 shebangfix
 USE_PERL5=	run
-SHEBANG_FILES=	${WRKDIR}/a2ps-j
+SHEBANG_FILES=	${WRKSRC}/a2ps-j
 perl_OLD_CMD=	/usr/local/bin/perl
 PLIST_FILES=	bin/a2ps-j
 EXTRACT_CMD=	${INSTALL_SCRIPT}
@@ -29,9 +29,9 @@ NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
 post-patch:
-	${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKDIR}/a2ps-j
+	${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/a2ps-j
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/a2ps-j ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/a2ps-j ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/japanese/bugzilla44/Makefile b/japanese/bugzilla44/Makefile
index 23b975c08bd3..322ac82f2c83 100644
--- a/japanese/bugzilla44/Makefile
+++ b/japanese/bugzilla44/Makefile
@@ -22,11 +22,11 @@ LANGDIR=	${WWWDIR}/template/ja
 
 do-install:
 	@-${MKDIR} ${STAGEDIR}${LANGDIR}/default
-	(cd ${WRKDIR}/default && ${COPYTREE_SHARE} . ${STAGEDIR}${LANGDIR}/default)
+	(cd ${WRKSRC}/default && ${COPYTREE_SHARE} . ${STAGEDIR}${LANGDIR}/default)
 
 # Maintainer
 plist: patch
-	@( cd ${WRKDIR}/ && ${FIND} default -type f | ${AWK} '{print "%%WWWDIR%%/template/ja/"$$1}' | ${SORT} > ${PLIST}.new )
+	@( cd ${WRKSRC}/ && ${FIND} default -type f | ${AWK} '{print "%%WWWDIR%%/template/ja/"$$1}' | ${SORT} > ${PLIST}.new )
 	@if ${DIFF} -u ${PLIST} ${PLIST}.new ; then \
 		${ECHO_MSG} no pkg-plist changes; \
 		${RM} ${PLIST}.new ; \
diff --git a/japanese/edict-utf-8/Makefile b/japanese/edict-utf-8/Makefile
index a5d78fd4acf9..b5b6d15a8bef 100644
--- a/japanese/edict-utf-8/Makefile
+++ b/japanese/edict-utf-8/Makefile
@@ -34,8 +34,8 @@ PLIST_SUB= 	OWNER="${SHAREOWN}" GROUP="${SHAREGRP}" MODE="${SHAREMODE}"
 NO_WRKSUBDIR=	yes
 
 do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
+	@${RM} -rf ${WRKSRC}
+	@${MKDIR} ${WRKSRC}
 	@for file in ${DICTFILES}; do \
 		${ECHO} "Extracting $$file"; \
 		case $$file in \
diff --git a/japanese/edict/Makefile b/japanese/edict/Makefile
index 0c55e21c7d4b..9a4010d8fc6c 100644
--- a/japanese/edict/Makefile
+++ b/japanese/edict/Makefile
@@ -56,7 +56,7 @@ post-patch:
 		-e '/argv/s/unsigned//'
 
 do-install:
-	(cd ${WRKDIR} && ${INSTALL_PROGRAM} ${BINFILES} ${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${BINFILES} ${STAGEDIR}${PREFIX}/bin)
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${CP} ${_DISTDIR}/edicth ${STAGEDIR}${DATADIR}
 .for f in edict enamdict compdic j_places kanjidic kanjd212 geodic
@@ -74,7 +74,7 @@ do-install:
 .endfor
 	${RM} -f ${STAGEDIR}${PREFIX}/bin/xjdic
 	${LN} -s ${PREFIX}/bin/xjdic_sa ${STAGEDIR}${PREFIX}/bin/xjdic
-	(cd ${WRKDIR} && ${INSTALL_DATA} radicals.tm radkfile kanjstroke \
+	(cd ${WRKSRC} && ${INSTALL_DATA} radicals.tm radkfile kanjstroke \
 		romkana.cnv vconj ${STAGEDIR}${DATADIR})
 	#
 	# Only 9 dictionaries can be enabled
diff --git a/japanese/font-ayu18/Makefile b/japanese/font-ayu18/Makefile
index 78be5980f06e..91781fc895fd 100644
--- a/japanese/font-ayu18/Makefile
+++ b/japanese/font-ayu18/Makefile
@@ -20,6 +20,7 @@ FONTNAME=	misc
 NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
 SUB_FILES=	Makefile
+MAKEFILE=	${WRKDIR}/Makefile
 PORTDOCS=	README.txt
 
 OPTIONS_DEFINE=	DOCS
diff --git a/japanese/font-ayu20/Makefile b/japanese/font-ayu20/Makefile
index 6b4dfd0b9a6d..6f308c15568b 100644
--- a/japanese/font-ayu20/Makefile
+++ b/japanese/font-ayu20/Makefile
@@ -24,6 +24,7 @@ SUB_LIST=	FONTSALIAS="${DATADIR}/fonts.alias"
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 PORTDOCS=	README.txt
+MAKEFILE=	${WRKDIR}/Makefile
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/japanese/font-elisa10/Makefile b/japanese/font-elisa10/Makefile
index 31dc56e89b3c..9a1692e78385 100644
--- a/japanese/font-elisa10/Makefile
+++ b/japanese/font-elisa10/Makefile
@@ -18,6 +18,7 @@ FONTNAME=	misc
 NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
 SUB_FILES=	Makefile pkg-install
+MAKEFILE=	${WRKDIR}/Makefile
 SUB_LIST=	BDFTOPCF_CMD="${LOCALBASE}/bin/bdftopcf" \
 		GZIP_CMD="${GZIP_CMD}" \
 		FONTSALIAS="${DATADIR}/fonts.alias"
@@ -36,7 +37,7 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 	cd ${STAGEDIR}${FONTSDIR} && \
 	    ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz .
-	${INSTALL_DATA} ${WRKDIR}/fonts.alias ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/fonts.alias ${STAGEDIR}${DATADIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/japanese/font-elisa8/Makefile b/japanese/font-elisa8/Makefile
index b035f39b2ea6..d5cf267aa916 100644
--- a/japanese/font-elisa8/Makefile
+++ b/japanese/font-elisa8/Makefile
@@ -19,6 +19,7 @@ FONTNAME=	misc
 NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
 SUB_FILES=	Makefile pkg-install
+MAKEFILE=	${WRKDIR}/Makefile
 SUB_LIST=	BDFTOPCF_CMD="${LOCALBASE}/bin/bdftopcf" \
 		GZIP_CMD="${GZIP_CMD}" \
 		FONTSALIAS="${DATADIR}/fonts.alias"
diff --git a/japanese/font-jisx0213/Makefile b/japanese/font-jisx0213/Makefile
index a1701cb74395..0caa5384744b 100644
--- a/japanese/font-jisx0213/Makefile
+++ b/japanese/font-jisx0213/Makefile
@@ -26,7 +26,7 @@ NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
 EXTRACT_CMD=	${GZCAT}
 EXTRACT_BEFORE_ARGS=
-EXTRACT_AFTER_ARGS=	> ${WRKDIR}/$${file%.gz}
+EXTRACT_AFTER_ARGS=	> ${WRKSRC}/$${file%.gz}
 MAKE_ENV=	FONTSDIR=${FONTSDIR}
 MAKEFILE=	${FILESDIR}/Makefile
 
diff --git a/japanese/font-kaname12/Makefile b/japanese/font-kaname12/Makefile
index 6602b8da826d..d28346fc44bb 100644
--- a/japanese/font-kaname12/Makefile
+++ b/japanese/font-kaname12/Makefile
@@ -39,6 +39,6 @@ post-install:
 	    ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz .
 
 post-install-DOCS-on:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} install-doc
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install-doc
 
 .include <bsd.port.mk>
diff --git a/japanese/font-kanji18/Makefile b/japanese/font-kanji18/Makefile
index 2ec3dd80673b..97960374f79b 100644
--- a/japanese/font-kanji18/Makefile
+++ b/japanese/font-kanji18/Makefile
@@ -24,9 +24,10 @@ NO_WRKSUBDIR=	yes
 EXTRACT_CMD=		${GZCAT}
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	| ${SED} '/bin\/sh/,/exit 0/!d' \
-			| (cd ${WRKDIR} && ${SH})
+			| (cd ${WRKSRC} && ${SH})
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
+MAKEFILE=	${WRKDIR}/Makefile
 SUB_FILES=	Makefile pkg-install
 SUB_LIST=	FONTSALIAS="${DATADIR}/fonts.alias.${PKGNAMESUFFIX}" \
 		SRCS="${SRCS}"
@@ -40,7 +41,7 @@ OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	cd ${WRKSRC} && ${CAT} ${DISTNAME}.?? | uudecode
-	${GUNZIP_CMD} ${WRKDIR}/*.Z
+	${GUNZIP_CMD} ${WRKSRC}/*.Z
 	${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${README_FILE} \
 	    | ${SED} '/bin\/sh/,/exit 0/d' \
 	    > ${WRKSRC}/README.${DISTNAME}
diff --git a/japanese/font-mona-ttf/Makefile b/japanese/font-mona-ttf/Makefile
index 1f9459e004aa..782b9124ff0a 100644
--- a/japanese/font-mona-ttf/Makefile
+++ b/japanese/font-mona-ttf/Makefile
@@ -28,7 +28,7 @@ PLIST_FILES=	%%DATADIR%%/fonts.dir \
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKDIR}/mona.ttf ${FILESDIR}/fonts.dir \
+	${INSTALL_DATA} ${WRKSRC}/mona.ttf ${FILESDIR}/fonts.dir \
 	    ${STAGEDIR}${DATADIR}
 
 post-install:
diff --git a/japanese/gskk/Makefile b/japanese/gskk/Makefile
index 3b21f1bd2a5e..9fe1d62f3f49 100644
--- a/japanese/gskk/Makefile
+++ b/japanese/gskk/Makefile
@@ -38,7 +38,7 @@ INSTALL_DIC=	${INSTALL} ${COPY} -m 664
 OPTIONS_DEFINE=	DOCS
 
 do-build:
-	cd ${WRKDIR} && mkbindic ${PORTNAME}.t
+	cd ${WRKSRC} && mkbindic ${PORTNAME}.t
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DICDIR}
diff --git a/japanese/jcode.pl/Makefile b/japanese/jcode.pl/Makefile
index ca84da635c38..a981665d7cfe 100644
--- a/japanese/jcode.pl/Makefile
+++ b/japanese/jcode.pl/Makefile
@@ -20,11 +20,11 @@ NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=	# none
-EXTRACT_AFTER_ARGS=	${WRKDIR}/${PORTNAME}
+EXTRACT_AFTER_ARGS=	${WRKSRC}/${PORTNAME}
 PLIST_FILES=	${SITE_PERL_REL}/${PORTNAME}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
 
 .include <bsd.port.mk>
diff --git a/japanese/skk-jisyo/Makefile b/japanese/skk-jisyo/Makefile
index 7d7f1a730d15..3fae0a2613ce 100644
--- a/japanese/skk-jisyo/Makefile
+++ b/japanese/skk-jisyo/Makefile
@@ -25,7 +25,7 @@ USES=		tar:bzip2
 NO_WRKSUBDIR=		yes
 EXTRACT_CMD=		${CP}
 EXTRACT_BEFORE_ARGS=	-p
-EXTRACT_AFTER_ARGS=	${WRKDIR}
+EXTRACT_AFTER_ARGS=	${WRKSRC}
 PLIST_SUB+=		SKKDIR=${SKKDIR}
 .for type in ${SKK_JISYO_TYPE}
 DISTFILES+=		SKK-JISYO.${type}.${PORTVERSION}.bz2
@@ -40,7 +40,7 @@ NO_BUILD=		yes
 .endif
 
 post-extract:
-	@(cd ${WRKDIR}; ${BZIP2_CMD} -d *.bz2)
+	@(cd ${WRKSRC}; ${BZIP2_CMD} -d *.bz2)
 
 .if defined(WITH_SKKJISYO_DELCOMMENTS)
 # Strip comments in transtation candidates list.
@@ -50,7 +50,7 @@ post-extract:
 do-patch:
 .for type in ${SKK_JISYO_TYPE}
 	${REINPLACE_CMD} -e '/^[^;]/s,;[^/]*/,/,g' -e '/^>/d' \
-		${WRKDIR}/SKK-JISYO.${type}.${PORTVERSION}
+		${WRKSRC}/SKK-JISYO.${type}.${PORTVERSION}
 .endfor
 .endif
 
@@ -68,9 +68,9 @@ do-build:
 		END { \
 			print ""; \
 		}' \
-		< ${WRKDIR}/SKK-JISYO.${type}.${PORTVERSION} | \
+		< ${WRKSRC}/SKK-JISYO.${type}.${PORTVERSION} | \
 	${LOCALBASE}/bin/cdb -c -t - \
-		${WRKDIR}/SKK-JISYO.${type}.${PORTVERSION}${CDBSUFFIX}
+		${WRKSRC}/SKK-JISYO.${type}.${PORTVERSION}${CDBSUFFIX}
 .endfor
 .endif
 
diff --git a/japanese/yc.el/Makefile b/japanese/yc.el/Makefile
index 7ea2d5065f1b..b972677d3888 100644
--- a/japanese/yc.el/Makefile
+++ b/japanese/yc.el/Makefile
@@ -29,12 +29,12 @@ ICANNA_DESC=	Enable icanna support
 ICANNA_RUN_DEPENDS=	icanna:${PORTSDIR}/japanese/icanna
 
 do-build:
-	@cd ${WRKDIR} && \
+	@cd ${WRKSRC} && \
 	${EMACS_CMD} -batch -f batch-byte-compile yc.el
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${YC_LISPDIR}
-	@cd ${WRKDIR} && \
+	@cd ${WRKSRC} && \
 	${INSTALL_SCRIPT} yc.el yc.elc ${STAGEDIR}${YC_LISPDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/zipcodes/Makefile b/japanese/zipcodes/Makefile
index 66c1a11fd25c..228a2769e8e7 100644
--- a/japanese/zipcodes/Makefile
+++ b/japanese/zipcodes/Makefile
@@ -20,8 +20,8 @@ PORTVERSION_K?=	${PORTVERSION}
 PORTVERSION_J?=	${PORTVERSION}
 
 post-extract:
-	@${CP} ${FILESDIR}/Makefile ${WRKDIR}
-	cd ${WRKDIR}; ${MV} KEN_ALL.CSV ken_all.csv; ${MV} JIGYOSYO.CSV jigyosyo.csv
+	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
+	cd ${WRKSRC}; ${MV} KEN_ALL.CSV ken_all.csv; ${MV} JIGYOSYO.CSV jigyosyo.csv
 
 # for maintenance.
 fetch1: