Fix ports that confused the meaning of WRKDIR and WRKSRC.

PR: 204056 Submitted by: mat Reviewed by: bapt Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D2735
svn path=/head/; revision=400848
2015-11-05 12:36:25 +00:00 · 2015-11-05 12:36:25 +00:00 · 065c026fe5 · 2021-03-31 03:12:20 +00:00
commit 065c026fe5
parent 6d6314e20d
206 changed files with 532 additions and 577 deletions
--- a/archivers/paq/Makefile
+++ b/archivers/paq/Makefile
@ -17,7 +17,7 @@ LICENSE_COMB=	multi

 USES=		dos2unix zip:infozip

-EXTRACT_AFTER_ARGS=	-x *.bat *.exe readme.txt -d ${WRKDIR}
+EXTRACT_AFTER_ARGS=	-x *.bat *.exe readme.txt -d ${WRKSRC}
 NO_WRKSUBDIR=	yes
 OPTIONS_DEFINE=	OPENMP DOCS
 SUB_FILES=	pkg-message
--- a/archivers/szip/Makefile
+++ b/archivers/szip/Makefile
@ -28,8 +28,8 @@ post-patch:
 		${WRKSRC}/makefile

 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/*.txt ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${DOCSDIR}

 .include <bsd.port.mk>
--- a/archivers/undms/Makefile
+++ b/archivers/undms/Makefile
@ -16,8 +16,8 @@ NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/undms

 do-extract:
-	${MKDIR} ${WRKDIR}
-	${GZCAT} ${DISTDIR}/${DISTFILES} > ${WRKDIR}/${DISTNAME}
+	${MKDIR} ${WRKSRC}
+	${GZCAT} ${DISTDIR}/${DISTFILES} > ${WRKSRC}/${DISTNAME}

 do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} -o undms undms-1.3.c
--- a/astro/geographiclib/Makefile
+++ b/astro/geographiclib/Makefile
@ -19,8 +19,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ax_check_compile_flag.m4:${PORTSDIR}/devel/autoconf-archive

 USES=		autoreconf gmake libtool python
-WRKSRC=		${WRKDIR}/${DISTNAME}
-NO_WRKSUBDIR=	yes
 PORTDOCS=	*
 FETCH_ENV+=	HTTP_REFERER=
 GNU_CONFIGURE=	yes
--- a/audio/chordpack/Makefile
+++ b/audio/chordpack/Makefile
@ -19,12 +19,12 @@ NO_BUILD=	true
 OPTIONS_DEFINE=	DOCS

 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/chordpack ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/chordpack ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/emacs/site-lisp
-	${INSTALL_DATA} ${WRKDIR}/chordpro-mode.el  \
+	${INSTALL_DATA} ${WRKSRC}/chordpro-mode.el  \
 		${STAGEDIR}${PREFIX}/share/emacs/site-lisp
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${WRKDIR}/chordpack-documentation.html	\
+	${INSTALL_MAN} ${WRKSRC}/chordpack-documentation.html	\
 		${STAGEDIR}${DOCSDIR}

 .include <bsd.port.mk>
--- a/audio/cue2toc/Makefile
+++ b/audio/cue2toc/Makefile
@ -19,9 +19,9 @@ PLIST_FILES=	bin/cue2toc.pl
 SHEBANG_FILES=	cue2toc

 pre-patch:
-	@${REINPLACE_CMD} -e 's|use warnings;||' ${WRKDIR}/cue2toc
+	@${REINPLACE_CMD} -e 's|use warnings;||' ${WRKSRC}/cue2toc

 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/cue2toc ${STAGEDIR}${PREFIX}/bin/cue2toc.pl
+	${INSTALL_SCRIPT} ${WRKSRC}/cue2toc ${STAGEDIR}${PREFIX}/bin/cue2toc.pl

 .include <bsd.port.mk>
--- a/benchmarks/raidtest/Makefile
+++ b/benchmarks/raidtest/Makefile
@ -17,7 +17,7 @@ PLIST_FILES=	bin/raidtest
 do-fetch:

 do-extract:
-	${MKDIR} ${WRKDIR}
-	${LN} -sf ${FILESDIR}/${PORTNAME}.c ${FILESDIR}/Makefile ${WRKDIR}
+	${MKDIR} ${WRKSRC}
+	${LN} -sf ${FILESDIR}/${PORTNAME}.c ${FILESDIR}/Makefile ${WRKSRC}

 .include <bsd.port.mk>
--- a/benchmarks/stream/Makefile
+++ b/benchmarks/stream/Makefile
@ -17,7 +17,7 @@ NO_WRKSUBDIR=	yes

 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=	#
-EXTRACT_AFTER_ARGS=	${WRKDIR}
+EXTRACT_AFTER_ARGS=	${WRKSRC}

 PORTDOCS=	stream.c
 PLIST_FILES=	bin/stream_bench
--- a/biology/gff2ps/Makefile
+++ b/biology/gff2ps/Makefile
@ -32,11 +32,11 @@ DOCS_DISTFILES=	${GFF2PS_MAN}.gz:doc
 .include <bsd.port.options.mk>

 do-extract:
-	@${MKDIR} ${WRKDIR}
+	@${MKDIR} ${WRKSRC}
 	@${GZCAT} ${DISTDIR}/${PORTNAME}_v${PORTVERSION}.gz \
-		> ${WRKDIR}/${PORTNAME}
+		> ${WRKSRC}/${PORTNAME}
 do-extract-DOCS-on:
-	@${GZCAT} ${DISTDIR}/${GFF2PS_MAN}.gz > ${WRKDIR}/${GFF2PS_MAN}
+	@${GZCAT} ${DISTDIR}/${GFF2PS_MAN}.gz > ${WRKSRC}/${GFF2PS_MAN}

 post-patch:
 	@${REINPLACE_CMD} -e \
@ -44,9 +44,9 @@ post-patch:
 		 s|/usr/local/bin/gawk|${LOCALBASE}/bin/gawk|' ${WRKSRC}/gff2ps

 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/gff2ps ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/gff2ps ${STAGEDIR}${PREFIX}/bin
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/${GFF2PS_MAN} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${GFF2PS_MAN} ${STAGEDIR}${DOCSDIR}

 .include <bsd.port.mk>
--- a/chinese/CJKUnifonts/Makefile
+++ b/chinese/CJKUnifonts/Makefile
@ -23,8 +23,8 @@ TTF=		ukai.ttc uming.ttc

 do-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKDIR}/ukai.ttc ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKDIR}/uming.ttc ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/ukai.ttc ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/uming.ttc ${STAGEDIR}${FONTSDIR}

 .include "${.CURDIR}/../ttfm/Makefile.ttf"
 .include <bsd.port.mk>
--- a/chinese/xpdf/Makefile
+++ b/chinese/xpdf/Makefile
@ -47,7 +47,7 @@ do-install:
 	cd ${WRKSRC}/xpdf-chinese-traditional && \
 	    ${INSTALL_DATA} ${TRAD_FILES} \
 		${STAGEDIR}${DATADIR}/chinese-traditional
-	${INSTALL_DATA} ${WRKSRC}/dot.xpdfrc \
+	${INSTALL_DATA} ${WRKDIR}/dot.xpdfrc \
 	    ${STAGEDIR}${DATADIR}/chinese-traditional
 	${MKDIR} ${STAGEDIR}${DATADIR}/chinese-traditional/CMap
 	cd ${STAGEDIR}${DATADIR}/chinese-traditional/CMap && \
--- a/comms/cdr_read/Makefile
+++ b/comms/cdr_read/Makefile
@ -18,8 +18,8 @@ NO_WRKSUBDIR=	yes
 OPTIONS_DEFINE=	DOCS

 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/readme_eng.txt ${STAGEDIR}${DOCSDIR}/readme.txt
+	${INSTALL_DATA} ${WRKSRC}/readme_eng.txt ${STAGEDIR}${DOCSDIR}/readme.txt

 .include <bsd.port.mk>
--- a/converters/unix2dos/Makefile
+++ b/converters/unix2dos/Makefile
@ -14,9 +14,9 @@ PLIST_FILES=	bin/dos2unix bin/unix2dos \
 NO_WRKSUBDIR=	yes

 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/unix2dos ${STAGEDIR}${PREFIX}/bin/unix2dos
+	${INSTALL_PROGRAM} ${WRKSRC}/unix2dos ${STAGEDIR}${PREFIX}/bin/unix2dos
 	${LN} -f ${STAGEDIR}${PREFIX}/bin/unix2dos ${STAGEDIR}${PREFIX}/bin/dos2unix
-	${INSTALL_MAN} ${WRKDIR}/man1/unix2dos.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKDIR}/man1/dos2unix.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man1/unix2dos.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man1/dos2unix.1 ${STAGEDIR}${MANPREFIX}/man/man1

 .include <bsd.port.mk>
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@ -50,9 +50,11 @@ PGSQL_USES=		pgsql
 SQLITE_USE=		SQLITE=yes
 SSL_USE=		OPENSSL=yes

-NO_WRKSUBDIR=	yes
 APR_WRKDIR=	${WRKDIR}/apr-${APR_VERSION}
 APU_WRKDIR=	${WRKDIR}/apr-util-${APU_VERSION}
+WRKSRC=		${APR_WRKDIR}
+PATCH_WRKSRC=	${WRKDIR}
+PATHFIX_WRKSRC=	${WRKDIR}

 SHLIB_APR_MAJOR=${APR_VERSION:C/^1/0/}
 SHLIB_APU_MAJOR=${APU_VERSION:C/^1/0/}
--- a/devel/cvs2html/Makefile
+++ b/devel/cvs2html/Makefile
@ -34,6 +34,6 @@ do-extract:
 	@${CP} ${DISTDIR}/${PORTNAME} ${WRKSRC}

 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin

 .include <bsd.port.post.mk>
--- a/devel/cweb/Makefile
+++ b/devel/cweb/Makefile
@ -34,6 +34,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/cwebmac.tex \
 		${STAGEDIR}${PREFIX}/share/texmf/tex/generic/misc
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/cwebman.tex ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/cwebman.tex ${STAGEDIR}${DOCSDIR}

 .include <bsd.port.mk>
--- a/devel/easygit/Makefile
+++ b/devel/easygit/Makefile
@ -17,18 +17,18 @@ DISTREVISION=	0 # bump this if distfile is changed inplace

 DIST_SUBDIR=	eg/${PORTVERSION}_${DISTREVISION}
 USES=		perl5 shebangfix
-SHEBANG_FILES=	${WRKDIR}/eg
+SHEBANG_FILES=	${WRKSRC}/eg
 USE_PERL5=	run
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 PLIST_FILES=	bin/eg bin/easygit

 do-extract:
-	@${CP} ${_DISTDIR}/${DISTNAME} ${WRKDIR}
+	@${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}

 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKDIR}/eg ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/eg ${STAGEDIR}${PREFIX}/bin/
 	cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s ./eg ${STAGEDIR}${PREFIX}/bin/easygit

 .include <bsd.port.mk>
--- a/devel/libcii/Makefile
+++ b/devel/libcii/Makefile
@ -18,7 +18,7 @@ MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -DMAXALIGN=8 -Iinclude" \
 		LD="${CC}" LDFLAGS="" EXTRAS="" BUILDDIR=${PKGNAME}
 PLIST_SUB=	CIIMAJOR="${CIIMAJOR}"

-CIIBUILD=	${WRKDIR}/${PKGNAME}
+CIIBUILD=	${WRKSRC}/${PKGNAME}
 CIIMAJOR=	1
 CIIDEST=	${PREFIX}/lib/cii

@ -48,7 +48,7 @@ post-patch:
 pre-build:
 	@${MKDIR} ${CIIBUILD}
 	@${MKDIR} ${CIIBUILD}/include
-	@${CP} ${WRKDIR}/include/*.h ${CIIBUILD}/include
+	@${CP} ${WRKSRC}/include/*.h ${CIIBUILD}/include

 # ${PREFIX}/lib/cii/${CIIMAJOR}/
 # ${PREFIX}/lib/cii/${CIIMAJOR}/include
--- a/devel/libdlmalloc/Makefile
+++ b/devel/libdlmalloc/Makefile
@ -14,10 +14,10 @@ NO_WRKSUBDIR=	yes
 USE_LDCONFIG=	yes

 do-extract:
-	@${MKDIR} ${WRKDIR}
+	@${MKDIR} ${WRKSRC}
 .for f in ${DISTFILES}
-	${CP} -p ${DISTDIR}/${f} ${WRKDIR}
+	${CP} -p ${DISTDIR}/${f} ${WRKSRC}
 .endfor
-	${CP} -p ${FILESDIR}/Makefile ${WRKDIR}
+	${CP} -p ${FILESDIR}/Makefile ${WRKSRC}

 .include <bsd.port.mk>
--- a/devel/mingw32-bin-msvcrt/Makefile
+++ b/devel/mingw32-bin-msvcrt/Makefile
@ -26,6 +26,6 @@ NO_MTREE=	yes
 NO_WRKSUBDIR=	yes

 post-extract:
-	@${CP} ${FILESDIR}/Makefile ${WRKDIR}
+	@${CP} ${FILESDIR}/Makefile ${WRKSRC}

 .include <bsd.port.mk>
--- a/devel/py-json-py/Makefile
+++ b/devel/py-json-py/Makefile
@ -19,7 +19,7 @@ USES=		python zip

 do-build:
 	# compile python files
-	cd ${WRKDIR}; \
+	cd ${WRKSRC}; \
 	FILES=$$(${FIND} . -name "*.py" ); \
 	for FILE in $${FILES}; do \
 	    ${ECHO} import `basename $${FILE} .py` | ${PYTHON_CMD}; \
@ -27,7 +27,7 @@ do-build:

 do-install:
 	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
-	@cd ${WRKDIR}; \
+	@cd ${WRKSRC}; \
 	${FIND} . \( -name "*.py" -or -name "*.pyc" \) -exec ${INSTALL_SCRIPT} \{\} ${STAGEDIR}${PYTHON_SITELIBDIR} \;

 .include <bsd.port.mk>
--- a/devel/py-urlimport/Makefile
+++ b/devel/py-urlimport/Makefile
@ -18,8 +18,8 @@ USES=		python
 USE_PYTHON=	distutils autoplist

 do-extract:
-	${MKDIR} ${WRKDIR}
-	${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}/${PORTNAME}.py
+	${MKDIR} ${WRKSRC}
+	${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC}/${PORTNAME}.py
 	${SED} -e 's|%%PORTVERSION%%|${PORTVERSION}|g' ${FILESDIR}/setup.py \
 		> ${WRKSRC}/setup.py

--- a/devel/ruby-dialogs/Makefile
+++ b/devel/ruby-dialogs/Makefile
@ -21,9 +21,9 @@ OPTIONS_DEFINE=	DOCS

 do-install:
 	${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}
-	${INSTALL_DATA} ${WRKDIR}/dialogs.rb ${STAGEDIR}${RUBY_SITELIBDIR}/
+	${INSTALL_DATA} ${WRKSRC}/dialogs.rb ${STAGEDIR}${RUBY_SITELIBDIR}/
 	${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}
-	${INSTALL_DATA} ${WRKDIR}/dialogs.html ${STAGEDIR}${RUBY_MODDOCDIR}/
+	${INSTALL_DATA} ${WRKSRC}/dialogs.html ${STAGEDIR}${RUBY_MODDOCDIR}/


 .include <bsd.port.mk>
--- a/devel/sedsed/Makefile
+++ b/devel/sedsed/Makefile
@ -13,7 +13,7 @@ COMMENT=	Python script that masters SED scripts
 PLIST_FILES=	bin/sedsed
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=
-EXTRACT_AFTER_ARGS=	${WRKDIR}
+EXTRACT_AFTER_ARGS=	${WRKSRC}

 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
--- a/devel/sfio/Makefile
+++ b/devel/sfio/Makefile
@ -18,17 +18,17 @@ NO_WRKSUBDIR=	yes

 # Remove a test that's too clever for its own good
 post-extract:
-	@${MV} ${WRKDIR}/src/lib/sfio/Sfio_t/tmmap2read.c \
-		${WRKDIR}/src/lib/sfio/Sfio_t/.tmmap2read.c
+	@${MV} ${WRKSRC}/src/lib/sfio/Sfio_t/tmmap2read.c \
+		${WRKSRC}/src/lib/sfio/Sfio_t/.tmmap2read.c

 do-build:
-	@cd ${WRKDIR}/src/lib/sfio && ${MAKE} all -f makefile
+	@cd ${WRKSRC}/src/lib/sfio && ${MAKE} all -f makefile

 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/sfio
-	${INSTALL_DATA} ${WRKDIR}/include/* ${STAGEDIR}${PREFIX}/include/sfio
-	(cd ${WRKDIR}/lib && ${INSTALL_DATA} libsfio.a libstdio.a ${STAGEDIR}${PREFIX}/lib)
-	${INSTALL_MAN} ${WRKDIR}/man/man1/iffe.1 ${STAGEDIR}${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKDIR}/man/man3/sfio.3 ${STAGEDIR}${PREFIX}/man/man3
+	${INSTALL_DATA} ${WRKSRC}/include/* ${STAGEDIR}${PREFIX}/include/sfio
+	(cd ${WRKSRC}/lib && ${INSTALL_DATA} libsfio.a libstdio.a ${STAGEDIR}${PREFIX}/lib)
+	${INSTALL_MAN} ${WRKSRC}/man/man1/iffe.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/man3/sfio.3 ${STAGEDIR}${PREFIX}/man/man3

 .include <bsd.port.mk>
--- a/dns/dnswalk/Makefile
+++ b/dns/dnswalk/Makefile
@ -22,15 +22,15 @@ SHEBANG_FILES=	dnswalk makereports

 do-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/do-dnswalk \
-		${WRKDIR}/makereports \
-		${WRKDIR}/sendreports \
+	${INSTALL_SCRIPT} ${WRKSRC}/do-dnswalk \
+		${WRKSRC}/makereports \
+		${WRKSRC}/sendreports \
 		${STAGEDIR}${EXAMPLESDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/README \
-		${WRKDIR}/dnswalk.errors \
+	${INSTALL_DATA} ${WRKSRC}/README \
+		${WRKSRC}/dnswalk.errors \
 		${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${WRKDIR}/dnswalk.1 ${STAGEDIR}${PREFIX}/man/man1
-	${INSTALL_SCRIPT} ${WRKDIR}/dnswalk ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/dnswalk.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/dnswalk ${STAGEDIR}${PREFIX}/bin

 .include <bsd.port.mk>
--- a/dns/ipcheck/Makefile
+++ b/dns/ipcheck/Makefile
@ -25,9 +25,9 @@ do-patch:
 	@${SED} \
 		-e "s!/usr/bin/python!${LOCALBASE}/bin/python!" \
 		-e "s!ppp0!tun0!" \
-		${DISTDIR}/${DISTNAME} > ${WRKDIR}/${DISTNAME}
+		${DISTDIR}/${DISTNAME} > ${WRKSRC}/${DISTNAME}
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME} \
+	${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}.py

 .include <bsd.port.mk>
--- a/editors/omegaT/Makefile
+++ b/editors/omegaT/Makefile
@ -39,11 +39,11 @@ DESKTOP_ENTRIES="OmegaT" "Translation memory application" \
 		"omegaT" "Office;WordProcessor;Java;" \
 		false
 post-build:
-	@cd ${WRKDIR} && ${MV} 'dist' ${PORTNAME}
+	@cd ${WRKSRC} && ${MV} 'dist' ${PORTNAME}

 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}
-	@cd  ${WRKDIR} && ${COPYTREE_BIN} ${PORTNAME} ${STAGEDIR}${JAVASHAREDIR}
+	@cd  ${WRKSRC} && ${COPYTREE_BIN} ${PORTNAME} ${STAGEDIR}${JAVASHAREDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/omegat.prefs ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}
 	${INSTALL_SCRIPT} ${WRKDIR}/omegaT.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}

--- a/emulators/linux_base-c6/Makefile
+++ b/emulators/linux_base-c6/Makefile
@ -180,17 +180,17 @@ ARCH=			i386

 pre-extract:
 	@for file in ${PRE_BIN_DISTFILES}; do \
-	    if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\
+	    if ! (cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\
 	    then \
 	        exit 1; \
 	    fi; \
 	done
 	# now fix up broken permissions
 .	if defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_BASE_PORT} == "c6_64"
-	@${CHMOD} -R u+rwX ${WRKDIR}/lib64 ${WRKDIR}/usr/lib64
+	@${CHMOD} -R u+rwX ${WRKSRC}/lib64 ${WRKSRC}/usr/lib64
 .	endif
-	@${CHMOD} -R u+rwX ${WRKDIR}/bin ${WRKDIR}/lib ${WRKDIR}/sbin ${WRKDIR}/usr/bin ${WRKDIR}/usr/lib ${WRKDIR}/usr/sbin
-	@${CHMOD} 400 ${WRKDIR}/etc/*shadow
+	@${CHMOD} -R u+rwX ${WRKSRC}/bin ${WRKSRC}/lib ${WRKSRC}/sbin ${WRKSRC}/usr/bin ${WRKSRC}/usr/lib ${WRKSRC}/usr/sbin
+	@${CHMOD} 400 ${WRKSRC}/etc/*shadow

 do-build:
 	@for D in ${REMOVE_DIRS}; do \
@ -242,8 +242,8 @@ do-install:
 #
 # Do install without using linux rpm system
 #
-	@cd ${WRKSRC} && ${FIND} * ! -path "stage*" -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \;
-	@cd ${WRKSRC} && ${FIND} * ! -path "stage/*" ! -type d \
+	@cd ${WRKSRC} && ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \;
+	@cd ${WRKSRC} && ${FIND} * ! -type d \
 		| ${CPIO} -pm -R root:wheel ${STAGEDIR}${PREFIX}

 	@${LN} -sf /var/tmp ${STAGEDIR}${PREFIX}/usr/tmp
--- a/emulators/linux_base-f10/Makefile
+++ b/emulators/linux_base-f10/Makefile
@ -203,8 +203,8 @@ do-install:
 #
 # Do install without using linux rpm system
 #
-	@cd ${WRKSRC} && ${FIND} * ! -path "stage*" -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \;
-	@cd ${WRKSRC} && ${FIND} * ! -path "stage/*" ! -type d \
+	@cd ${WRKSRC} && ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \;
+	@cd ${WRKSRC} && ${FIND} * ! -type d \
 		| ${CPIO} -pm -R root:wheel ${STAGEDIR}${PREFIX}

 	@${LN} -sf /var/tmp ${STAGEDIR}${PREFIX}/usr/tmp
--- a/emulators/qmc2/Makefile
+++ b/emulators/qmc2/Makefile
@ -42,7 +42,7 @@ post-patch:
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
 	@(cd ${WRKSRC}/qmc2/inst; ${SED} -e 's|DATADIR|${PREFIX}/share|' \
 		< qmc2.ini.template > qmc2.ini)
-	@${REINPLACE_CMD} -e 's/bash/sh/' ${WRKDIR}/qmc2/scripts/sdl-libs.sh
+	@${REINPLACE_CMD} -e 's/bash/sh/' ${WRKSRC}/qmc2/scripts/sdl-libs.sh

 do-install:
 	(cd ${WRKSRC}/qmc2 && ${INSTALL_PROGRAM} qmc2-sdlmame \
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@ -39,14 +39,14 @@ post-patch:
 		's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/VAX/vax_sysdev.c

 do-install:
-	(cd ${WRKDIR}/BIN && ${INSTALL_PROGRAM} ${BIN_FILES} \
+	(cd ${WRKSRC}/BIN && ${INSTALL_PROGRAM} ${BIN_FILES} \
 		${STAGEDIR}${PREFIX}/bin)
 # eclipse conflicts with java/eclipse, install it as simh-eclipse
-	${INSTALL_PROGRAM} ${WRKDIR}/BIN/eclipse \
+	${INSTALL_PROGRAM} ${WRKSRC}/BIN/eclipse \
 		${STAGEDIR}${PREFIX}/bin/simh-eclipse
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKDIR}/VAX/ka655x.bin ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/VAX/ka655x.bin ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKDIR} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})

 .include <bsd.port.mk>
--- a/emulators/yape/Makefile
+++ b/emulators/yape/Makefile
@ -24,7 +24,7 @@ OPTIONS_DEFINE=	DOCS
 .include <bsd.port.pre.mk>

 post-extract:
-	@${FIND} -E ${WRKDIR} -type f -iregex ".*\.(c|cpp|h|txt)" -print0 | \
+	@${FIND} -E ${WRKSRC} -type f -iregex ".*\.(c|cpp|h|txt)" -print0 | \
 		${XARGS} -0 ${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//'
 	@${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//' ${WRKSRC}/Makefile

--- a/games/alephone-data/Makefile
+++ b/games/alephone-data/Makefile
@ -70,13 +70,13 @@ post-extract:

 pre-install:
 .for f in ${AO_PACKS}
-	@cd ${WRKSRC} && ${SED} -e 's|%%GAMEDIR%%|${f}|' wrapper > alephone-${f}
+	@cd ${WRKDIR} && ${SED} -e 's|%%GAMEDIR%%|${f}|' wrapper > alephone-${f}
 .endfor

 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for f in ${AO_PACKS}
-	${INSTALL_SCRIPT} ${WRKSRC}/alephone-${f} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/alephone-${f} ${STAGEDIR}${PREFIX}/bin
 	${CP} -R ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}
 .endfor

--- a/games/alephone-scenarios/Makefile
+++ b/games/alephone-scenarios/Makefile
@ -140,7 +140,7 @@ post-extract:

 pre-install:
 .for f in ${AO_PACKS}
-	@cd ${WRKSRC} && ${SED} -e 's|%%GAMEDIR%%|${f}|' wrapper > alephone-${f}
+	@cd ${WRKDIR} && ${SED} -e 's|%%GAMEDIR%%|${f}|' wrapper > alephone-${f}
 .endfor
 	@cd ${WRKSRC} && \
 		${FIND} . -type d -print0 | ${XARGS} -0 ${CHMOD} 755
--- a/games/arkanoidsb/Makefile
+++ b/games/arkanoidsb/Makefile
@ -13,7 +13,6 @@ COMMENT=	Arkanoid and space game
 WRKSRC=		${WRKDIR}/${PORTNAME}

 USES=		tar:bzip2
-NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 USE_LINUX=	yes
 USE_LINUX_APPS=	libogg sdlmixer sdlimage
--- a/games/bogged/Makefile
+++ b/games/bogged/Makefile
@ -15,7 +15,7 @@ RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84

 EXTRACT_CMD=	${GZIP_CMD}
 EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	> ${WRKDIR}/${PORTNAME}
+EXTRACT_AFTER_ARGS=	> ${WRKSRC}/${PORTNAME}

 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
--- a/games/crafty-open-enormous/Makefile
+++ b/games/crafty-open-enormous/Makefile
@ -25,10 +25,10 @@ do-build:
 	@${ECHO_MSG} '================================================================'
 	@${ECHO_MSG} 'Ignore warnings about illegal moves.  These warnings are normal.'
 	@${ECHO_MSG} '================================================================'
-	(cd ${WRKDIR} && crafty bookpath=. <${FILESDIR}/book-building)
+	(cd ${WRKSRC} && crafty bookpath=. <${FILESDIR}/book-building)

 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/crafty
-	${INSTALL_DATA} ${WRKDIR}/book.bin ${STAGEDIR}${PREFIX}/lib/crafty/book.bin
+	${INSTALL_DATA} ${WRKSRC}/book.bin ${STAGEDIR}${PREFIX}/lib/crafty/book.bin

 .include <bsd.port.mk>
--- a/games/crafty-open-large/Makefile
+++ b/games/crafty-open-large/Makefile
@ -20,17 +20,17 @@ NO_WRKSUBDIR=	yes
 CONFLICTS=	crafty-open-enormous-* crafty-open-medium-* crafty-open-default-*

 post-extract:
-	${CAT} ${WRKDIR}/Book1.pgn ${WRKDIR}/Book2.pgn ${WRKDIR}/Book3.pgn ${WRKDIR}/Book4.pgn >${WRKDIR}/Book.pgn
-	${RM} ${WRKDIR}/Book1.pgn ${WRKDIR}/Book2.pgn ${WRKDIR}/Book3.pgn ${WRKDIR}/Book4.pgn
+	${CAT} ${WRKSRC}/Book1.pgn ${WRKSRC}/Book2.pgn ${WRKSRC}/Book3.pgn ${WRKSRC}/Book4.pgn >${WRKSRC}/Book.pgn
+	${RM} ${WRKSRC}/Book1.pgn ${WRKSRC}/Book2.pgn ${WRKSRC}/Book3.pgn ${WRKSRC}/Book4.pgn

 do-build:
 	@${ECHO_MSG} '================================================================'
 	@${ECHO_MSG} 'Ignore warnings about illegal moves.  These warnings are normal.'
 	@${ECHO_MSG} '================================================================'
-	(cd ${WRKDIR} && crafty <${FILESDIR}/book-building)
+	(cd ${WRKSRC} && crafty <${FILESDIR}/book-building)

 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/crafty
-	${INSTALL_DATA} ${WRKDIR}/book.bin ${STAGEDIR}${PREFIX}/lib/crafty/book.bin
+	${INSTALL_DATA} ${WRKSRC}/book.bin ${STAGEDIR}${PREFIX}/lib/crafty/book.bin

 .include <bsd.port.mk>
--- a/games/crafty-open-medium/Makefile
+++ b/games/crafty-open-medium/Makefile
@ -23,11 +23,11 @@ do-build:
 	@${ECHO_MSG} '================================================================'
 	@${ECHO_MSG} 'Ignore warnings about illegal moves.  These warnings are normal.'
 	@${ECHO_MSG} '================================================================'
-	(cd ${WRKDIR} && crafty <${FILESDIR}/book-building)
+	(cd ${WRKSRC} && crafty <${FILESDIR}/book-building)

 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/crafty
-	${INSTALL_DATA} ${WRKDIR}/book.bin \
+	${INSTALL_DATA} ${WRKSRC}/book.bin \
 		${STAGEDIR}${PREFIX}/lib/crafty/book.bin

 .include <bsd.port.mk>
--- a/games/doom-data/Makefile
+++ b/games/doom-data/Makefile
@ -39,9 +39,9 @@ STRIFE_DISTFILES=	strife0.wad.bz2
 .include <bsd.port.options.mk>

 do-extract:
-	@${MKDIR} ${WRKDIR}
+	@${MKDIR} ${WRKSRC}
 .for f in ${DISTFILES}
-	@${BZIP2_CMD} -dc ${_DISTDIR}/${f} > ${WRKDIR}/${f:S/.bz2$//}
+	@${BZIP2_CMD} -dc ${_DISTDIR}/${f} > ${WRKSRC}/${f:S/.bz2$//}
 .endfor

 do-install:
--- a/games/doom-hacx/Makefile
+++ b/games/doom-hacx/Makefile
@ -26,9 +26,8 @@ PLIST_DIRS=	%%DATADIR%%
 .include <bsd.port.pre.mk>

 do-extract:
-	@${MKDIR} ${WRKDIR}
 	@${BZIP2_CMD} -dc ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > \
-		${WRKDIR}/${DISTNAME}
+		${WRKSRC}/${DISTNAME}

 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
--- a/games/doom-wolfendoom/Makefile
+++ b/games/doom-wolfendoom/Makefile
@ -22,9 +22,9 @@ DATADIR=	${DMDIR}/${PORTNAME}
 .include <bsd.port.pre.mk>

 do-install:
-	${FIND} ${WRKDIR}/${PORTNAME} ! -type d -exec ${CHMOD} 0644 {} \;
-	${FIND} ${WRKDIR}/${PORTNAME} -type d -exec ${CHMOD} 0755 {} \;
+	${FIND} ${WRKSRC}/${PORTNAME} ! -type d -exec ${CHMOD} 0644 {} +
+	${FIND} ${WRKSRC}/${PORTNAME} -type d -exec ${CHMOD} 0755 {} +
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${TAR} -cf - -C ${WRKDIR}/${PORTNAME} . | ${TAR} -xpvf - -C ${STAGEDIR}${DATADIR}
+	${TAR} -cf - -C ${WRKSRC}/${PORTNAME} . | ${TAR} -xpvf - -C ${STAGEDIR}${DATADIR}

 .include <bsd.port.post.mk>
--- a/games/legends/Makefile
+++ b/games/legends/Makefile
@ -32,7 +32,7 @@ PLIST_SUB=	MAP_PACK="${MAP_PACK}"
 OPTIONS_DEFINE=	DOCS

 post-extract:
-	@cd ${WRKDIR} && ${TAR} xf legends.tar
+	@cd ${WRKSRC} && ${TAR} xf legends.tar

 post-patch:
 	@${REINPLACE_CMD} -e 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|; \
--- a/games/linux-darwinia-demo/Makefile
+++ b/games/linux-darwinia-demo/Makefile
@ -34,8 +34,7 @@ USE_LINUX_APPS+=dri
 .endif

 do-extract:
-	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR} && ${TAIL} +376 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
+	@cd ${WRKSRC} && ${TAIL} +376 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
 		${TAR} zxf -

 do-build:
--- a/games/linux-doom3/Makefile
+++ b/games/linux-doom3/Makefile
@ -37,8 +37,8 @@ PLIST_SUB+=	NEW=""
 .endif

 do-extract:
-	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR} && ${TAIL} +374 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
+	@${MKDIR} ${WRKSRC}
+	@cd ${WRKSRC} && ${TAIL} +374 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
 		${TAR} zxf -

 .if empty(PORT_OPTIONS:MNO_CDKEY)
--- a/games/linux-quake3-demo/Makefile
+++ b/games/linux-quake3-demo/Makefile
@ -30,8 +30,7 @@ SUB_FILES=	q3demo
 OPTIONS_DEFINE=	DOCS

 do-extract:
-	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR} && ${TAIL} +165 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
+	@cd ${WRKSRC} && ${TAIL} +165 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
 		${TAR} zxf -

 do-install:
--- a/games/linux-quake3/Makefile
+++ b/games/linux-quake3/Makefile
@ -41,10 +41,9 @@ Q3DATAFILE=	linuxq3apoint-1.32b-3.x86.run
 Q3PATCHFILE=	quake3-${PORTVERSION}.zip

 do-extract:
-	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR} && ${TAIL} +356 ${_DISTDIR}/${Q3DATAFILE} | \
+	@cd ${WRKSRC} && ${TAIL} +356 ${_DISTDIR}/${Q3DATAFILE} | \
 		${TAR} zxf -
-	@${UNZIP_CMD} -qo ${_DISTDIR}/${Q3PATCHFILE} -d ${WRKDIR}
+	@${UNZIP_CMD} -qo ${_DISTDIR}/${Q3PATCHFILE} -d ${WRKSRC}

 post-extract:
 .for f in q3ded quake3.x86 quake3-smp.x86
--- a/games/linux-quake4-demo/Makefile
+++ b/games/linux-quake4-demo/Makefile
@ -23,9 +23,7 @@ Q4DIR=		lib/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 PLIST_SUB=	Q4DIR="${Q4DIR}"

 do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR} && ${TAIL} +376 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
+	@cd ${WRKSRC} && ${TAIL} +376 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
 		${TAR} zxf -

 do-build:
--- a/games/linux-quake4/Makefile
+++ b/games/linux-quake4/Makefile
@ -40,9 +40,7 @@ PLIST_SUB+=	THREADS="@comment "
 .endif

 do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR} && ${TAIL} +376 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
+	@cd ${WRKSRC} && ${TAIL} +376 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
 		${TAR} zxf -

 do-build:
--- a/games/linux-uplink-demo/Makefile
+++ b/games/linux-uplink-demo/Makefile
@ -38,8 +38,7 @@ USE_LINUX_APPS+=dri
 .endif

 do-extract:
-	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR} && ${TAIL} +376 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
+	@cd ${WRKSRC} && ${TAIL} +376 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
 		${TAR} zxf -

 do-build:
--- a/games/quake-dpmod/Makefile
+++ b/games/quake-dpmod/Makefile
@ -22,9 +22,9 @@ DATADIR=	${Q1DIR}/${PORTNAME}

 post-extract:
 # Remove CVS directories
-	@${FIND} ${WRKDIR} -type d -name CVS -print0 | ${XARGS} -0 ${RM} -rf
+	@${FIND} ${WRKSRC} -type d -name CVS -print0 | ${XARGS} -0 ${RM} -rf
 # Fix permissions
-	@${CHMOD} go-w ${WRKDIR}/dpmod/progs.dat
+	@${CHMOD} go-w ${WRKSRC}/dpmod/progs.dat

 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
--- a/games/quake2-data/Makefile
+++ b/games/quake2-data/Makefile
@ -55,18 +55,18 @@ SUB_FILES=	pkg-message
 .endif

 do-extract:
-	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR} && uncompress -c ${DISTDIR}/${Q2_SRC} | \
+	@${MKDIR} ${WRKSRC}
+	@cd ${WRKSRC} && uncompress -c ${DISTDIR}/${Q2_SRC} | \
 		${TAIL} +434 | ${SH}
-	@${UNZIP_CMD} -q -d ${WRKDIR} \
+	@${UNZIP_CMD} -q -d ${WRKSRC} \
 		${DISTDIR}/${Q2_UPDATE} baseq2/* -x *.dll
 .if ${PORT_OPTIONS:MMANUAL}
-	@${UNZIP_CMD} -ajq -d ${WRKDIR}/DOCS \
+	@${UNZIP_CMD} -ajq -d ${WRKSRC}/DOCS \
 		${DISTDIR}/${Q2_DEMO} Install/Data/DOCS/*
 .endif
 .if ${PORT_OPTIONS:MSHAREWARE}
-	@${RM} ${WRKDIR}/baseq2/pak[^0].pak
-	@${UNZIP_CMD} -jq -d ${WRKDIR}/baseq2 \
+	@${RM} ${WRKSRC}/baseq2/pak[^0].pak
+	@${UNZIP_CMD} -jq -d ${WRKSRC}/baseq2 \
 		${DISTDIR}/${Q2_DEMO} Install/Data/baseq2/pak0.pak
 .endif

--- a/games/quake2-rogue/Makefile
+++ b/games/quake2-rogue/Makefile
@ -19,8 +19,7 @@ PLIST_FILES=	%%Q2DIR%%/${PORTNAME}/game.so
 PLIST_DIRS=	%%Q2DIR%%/${PORTNAME}

 do-extract:
-	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR} && uncompress -c ${DISTDIR}/${DISTFILES} | \
+	@cd ${WRKSRC} && uncompress -c ${DISTDIR}/${DISTFILES} | \
 		${TAIL} +454 | ${SH}

 post-extract:
--- a/games/quake2-xatrix/Makefile
+++ b/games/quake2-xatrix/Makefile
@ -19,8 +19,8 @@ PLIST_FILES=	%%Q2DIR%%/${PORTNAME}/game.so
 PLIST_DIRS=	%%Q2DIR%%/${PORTNAME}

 do-extract:
-	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR} && uncompress -c ${DISTDIR}/${DISTFILES} | \
+	@${MKDIR} ${WRKSRC}
+	@cd ${WRKSRC} && uncompress -c ${DISTDIR}/${DISTFILES} | \
 		${TAIL} +441 | ${SH}

 post-extract:
--- a/games/quake3-data/Makefile
+++ b/games/quake3-data/Makefile
@ -30,10 +30,10 @@ TEAMARENA_DESC=		Install Quake III Team Arena data files
 .include <bsd.port.options.mk>

 do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
+	@${RM} -rf ${WRKSRC}
+	@${MKDIR} ${WRKSRC}
 	@${TAIL} +356 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
-		${TAR} xzf - -C ${WRKDIR}
+		${TAR} xzf - -C ${WRKSRC}

 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
--- a/games/rfksay/Makefile
+++ b/games/rfksay/Makefile
@ -17,8 +17,8 @@ NO_WRKSUBDIR=	yes
 SHEBANG_FILES=	rfksay kittensay robotsay

 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKDIR}/kittensay ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKDIR}/robotsay ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/kittensay ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/robotsay ${STAGEDIR}${PREFIX}/bin

 .include <bsd.port.mk>
--- a/games/robocode/Makefile
+++ b/games/robocode/Makefile
@ -31,7 +31,7 @@ SUB_FILES=	${PORTNAME}-MeleeRumble ${PORTNAME}-RoboRumble \
 		${PORTNAME}-TwinDuel pkg-deinstall pkg-message

 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-* \
+	cd ${WRKDIR} && ${INSTALL_SCRIPT} ${SUB_FILES:M${PORTNAME}*} \
 		${STAGEDIR}${PREFIX}/bin/

 .for d in battles compilers javadoc libs license roborumble robots \
--- a/games/thudboard/Makefile
+++ b/games/thudboard/Makefile
@ -21,7 +21,7 @@ OPTIONS_DEFINE=	DOCS

 post-patch:
 	${REINPLACE_CMD} -e 's|file:.*/docs|file://${DOCSDIR}|' \
-		${WRKDIR}/thud.py
+		${WRKSRC}/thud.py

 do-build:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC} 2>/dev/null
@ -32,10 +32,10 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/*.py ${STAGEDIR}${DATADIR}
 	@${INSTALL_DATA} ${WRKSRC}/*.pyc ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@(cd ${WRKDIR}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+	@(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 .	for d in koomvalley img
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${d}
-	@(cd ${WRKDIR}/${d} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${d})
+	@(cd ${WRKSRC}/${d} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${d})
 .	endfor

 .include <bsd.port.mk>
--- a/games/traindirector/Makefile
+++ b/games/traindirector/Makefile
@ -29,6 +29,6 @@ PLIST_FILES=	bin/traindir3
 MAKEFILE=	Makefile.fc9

 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/traindir3 ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/traindir3 ${STAGEDIR}${PREFIX}/bin

 .include <bsd.port.mk>
--- a/games/xasteroids/Makefile
+++ b/games/xasteroids/Makefile
@ -12,7 +12,7 @@ EXTRACT_SUFX=	.sh.Z
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 based asteroids style arcade game

-EXTRACT_CMD=	( cd ${WRKDIR}; zcat | ${SH} -s )
+EXTRACT_CMD=	( cd ${WRKSRC}; zcat | ${SH} -s )
 EXTRACT_BEFORE_ARGS=	<
 EXTRACT_AFTER_ARGS=	# empty

--- a/graphics/fujiplay/Makefile
+++ b/graphics/fujiplay/Makefile
@ -23,10 +23,10 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|^\(CC[^g]*\)gcc$$|\1${CC}|' ${WRKSRC}/Makefile

 do-install:
-	(cd ${WRKDIR}; ${INSTALL_PROGRAM} fujiplay yycc2ppm ${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC}; ${INSTALL_PROGRAM} fujiplay yycc2ppm ${STAGEDIR}${PREFIX}/bin)
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/fujiplay
 .for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKDIR}/${f} ${STAGEDIR}${PREFIX}/share/doc/fujiplay
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/share/doc/fujiplay
 .endfor

 .include <bsd.port.mk>
--- a/graphics/geoapi/Makefile
+++ b/graphics/geoapi/Makefile
@ -23,12 +23,12 @@ OPTIONS_DEFINE=	DOCS

 do-install:
 .for jar in ${JARFILES}
-	${INSTALL_DATA} ${WRKDIR}/${jar}.jar ${STAGEDIR}${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKSRC}/${jar}.jar ${STAGEDIR}${JAVAJARDIR}
 .endfor

 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKDIR}/javadoc \
+	cd ${WRKSRC}/javadoc \
 		&& ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/\{} \; \
 		&& ${FIND} . -type f -exec ${INSTALL_DATA} \{} ${STAGEDIR}${DOCSDIR}/\{} \;

--- a/graphics/gimp-jagged-border-script/Makefile
+++ b/graphics/gimp-jagged-border-script/Makefile
@ -33,6 +33,6 @@ post-extract:

 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${GIMP_SCRIPTS_DIR}
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME} ${STAGEDIR}${PREFIX}/${GIMP_SCRIPTS_DIR}/
+	${INSTALL_DATA} ${WRKSRC}/${DISTNAME} ${STAGEDIR}${PREFIX}/${GIMP_SCRIPTS_DIR}/

 .include <bsd.port.mk>
--- a/graphics/mapyrus/Makefile
+++ b/graphics/mapyrus/Makefile
@ -32,12 +32,12 @@ USE_JAVA=	yes

 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKDIR}/${MAPYRUSJAR} ${STAGEDIR}${DATADIR}/${MAPYRUSJAR}
+	${INSTALL_DATA} ${WRKSRC}/${MAPYRUSJAR} ${STAGEDIR}${DATADIR}/${MAPYRUSJAR}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/${MAPYRUSDOCS} ${STAGEDIR}${DOCSDIR}/${MAPYRUSDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${MAPYRUSDOCS} ${STAGEDIR}${DOCSDIR}/${MAPYRUSDOCS}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKDIR}/userdoc && \
+	cd ${WRKSRC}/userdoc && \
 	${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} \
 		"-type f -not -iname copying -and -not -iname *\.tex"

--- a/graphics/openjump/Makefile
+++ b/graphics/openjump/Makefile
@ -44,7 +44,6 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 USES=		zip
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-r${PLUS_REV}-PLUS
 PLUS_REV=	4164

--- a/graphics/pstoepsi/Makefile
+++ b/graphics/pstoepsi/Makefile
@ -19,17 +19,17 @@ USES=		ghostscript:run
 NO_WRKSUBDIR=	yes

 pre-patch:
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/pstoepsi ${WRKDIR}/pstoepsi.prefix
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/README.this-site ${WRKDIR}
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/pstoepsi ${WRKSRC}/pstoepsi.prefix
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/README.this-site ${WRKSRC}

 do-build:
-	${SED} -e "s+%%PREFIX%%+${PREFIX}+g" ${WRKDIR}/pstoepsi.prefix > \
-						${WRKDIR}/pstoepsi
-	${GZIP_CMD} ${WRKDIR}/README.this-site
+	${SED} -e "s+%%PREFIX%%+${PREFIX}+g" ${WRKSRC}/pstoepsi.prefix > \
+						${WRKSRC}/pstoepsi
+	${GZIP_CMD} ${WRKSRC}/README.this-site

 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/pstoepsi ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/pstoepsi ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/README.this-site.gz ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.this-site.gz ${STAGEDIR}${DOCSDIR}

 .include <bsd.port.mk>
--- a/graphics/springgraph/Makefile
+++ b/graphics/springgraph/Makefile
@ -19,7 +19,7 @@ CONFLICTS_INSTALL=signing-party-[0-9]*
 PLIST_FILES=	bin/springgraph
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=
-EXTRACT_AFTER_ARGS=	${WRKDIR}
+EXTRACT_AFTER_ARGS=	${WRKSRC}
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 USES=		shebangfix perl5
--- a/irc/irssi-dcc_send_limiter/Makefile
+++ b/irc/irssi-dcc_send_limiter/Makefile
@ -29,12 +29,12 @@ PLIST_FILES=	lib/irssi/modules/lib/${DISTNAME}.so
 CFLAGS+=	-shared -fPIC -I${LOCALBASE}/include/irssi -I${LOCALBASE}/include/irssi/src -I${LOCALBASE}/include/irssi/src/core -I${LOCALBASE}/include/irssi/src/irc/core -I${LOCALBASE}/include/irssi/src/irc/dcc `pkg-config --cflags glib-2.0`

 do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
-	@${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}
+	@${RM} -rf ${WRKSRC}
+	@${MKDIR} ${WRKSRC}
+	@${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC}

 do-build:
-	${CC} ${CFLAGS} -o ${WRKDIR}/${DISTNAME}.so ${WRKDIR}/${DISTFILES}
+	${CC} ${CFLAGS} -o ${WRKSRC}/${DISTNAME}.so ${WRKSRC}/${DISTFILES}

 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/irssi/modules/lib
--- 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
--- 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>
--- 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 ; \
--- 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 \
--- 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
--- 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
--- 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

--- 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}
--- 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"
--- 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

--- 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>
--- 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}
--- 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:
--- 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}
--- 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>
--- 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

--- 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>
--- 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:
--- a/java/eclipse-ecj/Makefile
+++ b/java/eclipse-ecj/Makefile
@ -16,7 +16,7 @@ LICENSE=	EPL

 EXTRACT_CMD=	${TAR}
 EXTRACT_BEFORE_ARGS=	xf
-EXTRACT_AFTER_ARGS=	-C ${WRKDIR}
+EXTRACT_AFTER_ARGS=	-C ${WRKSRC}

 USE_ANT=	yes
 USE_JAVA=	yes
@ -31,7 +31,7 @@ PLIST_FILES=	bin/${PORTNAME}.sh \

 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}-${PORTVERSION}.jar
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}-${PORTVERSION}.jar
 	${INSTALL_SCRIPT} ${WRKDIR}/ecj.sh ${STAGEDIR}/${PREFIX}/bin

 .include <bsd.port.mk>
--- a/java/eclipse-pydev/Makefile
+++ b/java/eclipse-pydev/Makefile
@ -37,10 +37,10 @@ RUN_DEPENDS+=	jython:${PORTSDIR}/lang/jython

 pre-install:
 	@${ECHO_MSG} "===>   Creating bundles.info"
-	@PLUGINS=$$(ls -1 ${WRKDIR}/plugins); \
+	@PLUGINS=$$(ls -1 ${WRKSRC}/plugins); \
 	for d in $${PLUGINS}; do \
 	    (${ECHO_CMD} "$${d},../../${PLUGINDIR}/$${d}/,4,false" | \
-	    ${SED} -e 's/_\([0-9]\)/,\1/1' -e '/templates/d') >> ${WRKDIR}/plugins/bundles.info; \
+	    ${SED} -e 's/_\([0-9]\)/,\1/1' -e '/templates/d') >> ${WRKSRC}/plugins/bundles.info; \
 	done
 	@# ignore javashell.py file, because there is a syntax error
 	@# see http://goo.gl/E4epH
--- a/java/javavmwrapper/Makefile
+++ b/java/javavmwrapper/Makefile
@ -25,7 +25,7 @@ do-configure:
 .for _script in ${SCRIPTS}
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|;' \
 	       -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|;' \
-		${SRC}/${_script}.sh >${WRKDIR}/${_script}.sh
+		${SRC}/${_script}.sh >${WRKSRC}/${_script}.sh
 .endfor
 	${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|;' \
 		${FILESDIR}/pkg-install.in > ${PKGINSTALL}
@ -33,20 +33,20 @@ do-configure:
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|;' \
 	       -e 's|%%LOCALBASE%%|${LOCALBASE}|;' \
 	       -e 's|%%PORTSDIR%%|${PORTSDIR}|;' \
-	       ${SRC}/${_man} > ${WRKDIR}/${_man}
+	       ${SRC}/${_man} > ${WRKSRC}/${_man}
 .endfor

 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/classpath.sh ${STAGEDIR}${PREFIX}/bin/classpath
-	${INSTALL_SCRIPT} ${WRKDIR}/javavmwrapper.sh ${STAGEDIR}${PREFIX}/bin/javavm
+	${INSTALL_SCRIPT} ${WRKSRC}/classpath.sh ${STAGEDIR}${PREFIX}/bin/classpath
+	${INSTALL_SCRIPT} ${WRKSRC}/javavmwrapper.sh ${STAGEDIR}${PREFIX}/bin/javavm
 	${LN} -sf javavm ${STAGEDIR}${PREFIX}/bin/checkvms
 	${LN} -sf javavm ${STAGEDIR}${PREFIX}/bin/manvm
 	${LN} -sf javavm ${STAGEDIR}${PREFIX}/bin/registervm
 	${LN} -sf javavm ${STAGEDIR}${PREFIX}/bin/unregistervm
-	${INSTALL_MAN} ${WRKDIR}/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKDIR}/registervm.1 \
+	${INSTALL_MAN} ${WRKSRC}/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/registervm.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1/unregistervm.1
-	${INSTALL_MAN} ${WRKDIR}/*.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/*.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
 	${INSTALL_DATA} ${FILESDIR}/javavm_opts.conf.dist \
 		${STAGEDIR}${PREFIX}/etc/javavm_opts.conf.dist

--- a/java/jtiger/Makefile
+++ b/java/jtiger/Makefile
@ -18,14 +18,14 @@ SRCFILES=	src test-src
 OPTIONS_DEFINE=	DOCS EXAMPLES

 do-install:
-	${INSTALL_DATA} ${WRKDIR}/jtiger.jar ${STAGEDIR}${JAVAJARDIR}/jtiger.jar
+	${INSTALL_DATA} ${WRKSRC}/jtiger.jar ${STAGEDIR}${JAVAJARDIR}/jtiger.jar
 	${MKDIR} ${STAGEDIR}${DATADIR}
-	cd ${WRKDIR} && ${COPYTREE_SHARE} "${SRCFILES}" ${STAGEDIR}${DATADIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "${SRCFILES}" ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKDIR}/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC}/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/changes.html ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/cpl-v10.html ${STAGEDIR}${DOCSDIR}
-	cd ${WRKDIR}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/changes.html ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/cpl-v10.html ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}

 .include <bsd.port.mk>
--- a/korean/kaistfonts/Makefile
+++ b/korean/kaistfonts/Makefile
@ -23,9 +23,9 @@ NO_WRKSUBDIR=	yes
 MAKE_ENV=	DISTDIR=${DISTDIR} DISTFILES="${DISTFILES}" FONTSDIR="${FONTSDIR}"

 do-extract:
-	@${RM} -fr ${WRKDIR} && \
-	${MKDIR} ${WRKDIR} && \
-	cd ${WRKDIR} && \
+	@${RM} -fr ${WRKSRC} && \
+	${MKDIR} ${WRKSRC} && \
+	cd ${WRKSRC} && \
 	for file in ${DISTFILES}; do \
 		${GUNZIP_CMD} -c < ${_DISTDIR}/$$file > `${ECHO_CMD} $$file | ${SED} -e 's/\.Z//' -e 's/\.gz//'`; \
 	done
--- a/korean/ko.TeX-fonts-base/Makefile
+++ b/korean/ko.TeX-fonts-base/Makefile
@ -33,7 +33,7 @@ OPTIONS_DEFINE=	DOCS
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKDIR}/fonts && ${COPYTREE_SHARE} . ${STAGEDIR}${TEXMF_FONTS})
-	(cd ${WRKDIR}/tex && ${COPYTREE_SHARE} . ${STAGEDIR}${TEXMF_TEX})
+	(cd ${WRKSRC}/fonts && ${COPYTREE_SHARE} . ${STAGEDIR}${TEXMF_FONTS})
+	(cd ${WRKSRC}/tex && ${COPYTREE_SHARE} . ${STAGEDIR}${TEXMF_TEX})

 .include <bsd.port.mk>
--- a/korean/ko.TeX-fonts-extra/Makefile
+++ b/korean/ko.TeX-fonts-extra/Makefile
@ -31,8 +31,8 @@ OPTIONS_DEFINE=	DOCS

 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKDIR}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
-	(cd ${WRKDIR}/fonts && ${COPYTREE_SHARE} . ${STAGEDIR}${TEXMF_FONTS})
-	(cd ${WRKDIR}/tex && ${COPYTREE_SHARE} . ${STAGEDIR}${TEXMF_TEX})
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+	(cd ${WRKSRC}/fonts && ${COPYTREE_SHARE} . ${STAGEDIR}${TEXMF_FONTS})
+	(cd ${WRKSRC}/tex && ${COPYTREE_SHARE} . ${STAGEDIR}${TEXMF_TEX})

 .include <bsd.port.mk>
--- a/korean/ko.TeX/Makefile
+++ b/korean/ko.TeX/Makefile
@ -39,41 +39,41 @@ DOCS=		ChangLog INSTALL LICENSE VERSION manifest.txt news-0.1.0.txt \
 OPTIONS_DEFINE=	DOCS

 do-build:
-	@${MKDIR} ${WRKDIR}/build
-	@${CC} ${CFLAGS} -o ${WRKDIR}/build/hbibtex \
-		${WRKDIR}/util/hbibtex.c
-	@${CC} ${CFLAGS} -o ${WRKDIR}/build/hmakeindex \
-		${WRKDIR}/util/hmakeindex.c
+	@${MKDIR} ${WRKSRC}/build
+	@${CC} ${CFLAGS} -o ${WRKSRC}/build/hbibtex \
+		${WRKSRC}/util/hbibtex.c
+	@${CC} ${CFLAGS} -o ${WRKSRC}/build/hmakeindex \
+		${WRKSRC}/util/hmakeindex.c

-	@${RM} -rf ${WRKDIR}/latex/euc/unfonts
-	@${RM} -rf ${WRKDIR}/latex/utf/unfonts
+	@${RM} -rf ${WRKSRC}/latex/euc/unfonts
+	@${RM} -rf ${WRKSRC}/latex/utf/unfonts

 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${KOTEX_DOC}
-	(cd ${WRKDIR}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_DOC})
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_DOC})

 	@${MKDIR} ${STAGEDIR}${KOTEX_BIBTEX}
-	(cd ${WRKDIR}/bibtex && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_BIBTEX})
+	(cd ${WRKSRC}/bibtex && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_BIBTEX})

 	@${MKDIR} ${STAGEDIR}${KOTEX_LATEX}
-	(cd ${WRKDIR}/latex && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_LATEX})
+	(cd ${WRKSRC}/latex && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_LATEX})

 	@${MKDIR} ${STAGEDIR}${KOTEX_MKIDX}
-	(cd ${WRKDIR}/makeindex && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_MKIDX})
+	(cd ${WRKSRC}/makeindex && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_MKIDX})

 	@${MKDIR} ${STAGEDIR}${KOTEX_PLAIN}
-	(cd ${WRKDIR}/plain && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_PLAIN})
+	(cd ${WRKSRC}/plain && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_PLAIN})

 	@${MKDIR} ${STAGEDIR}${KOTEX_SFD}
-	(cd ${WRKDIR}/sfd && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_SFD})
+	(cd ${WRKSRC}/sfd && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_SFD})

 	@${MKDIR} ${STAGEDIR}${KOTEX_UTIL}
-	@${INSTALL_SCRIPT} ${WRKDIR}/util/*.pl ${STAGEDIR}${KOTEX_UTIL}
-	@${INSTALL_PROGRAM} ${WRKDIR}/build/* ${STAGEDIR}${PREFIX}/bin
+	@${INSTALL_SCRIPT} ${WRKSRC}/util/*.pl ${STAGEDIR}${KOTEX_UTIL}
+	@${INSTALL_PROGRAM} ${WRKSRC}/build/* ${STAGEDIR}${PREFIX}/bin

-	@${CHMOD} a+x ${WRKDIR}/util/*.pl
-	@${INSTALL_SCRIPT} ${WRKDIR}/util/*.pl ${STAGEDIR}${PREFIX}/bin
+	@${CHMOD} a+x ${WRKSRC}/util/*.pl
+	@${INSTALL_SCRIPT} ${WRKSRC}/util/*.pl ${STAGEDIR}${PREFIX}/bin

 .include <bsd.port.mk>
--- a/lang/cmucl-extra/Makefile
+++ b/lang/cmucl-extra/Makefile
@ -23,7 +23,7 @@ NO_WRKSUBDIR=	yes
 NO_BUILD=	yes

 do-install:
-	(cd ${WRKDIR} && ${COPYTREE_SHARE} lib ${STAGEDIR}${PREFIX})
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} lib ${STAGEDIR}${PREFIX})
 	${CHMOD} u+w ${STAGEDIR}${PREFIX}/lib/cmucl/lib/motifd
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/cmucl/lib/motifd
 	${CHMOD} u-w ${STAGEDIR}${PREFIX}/lib/cmucl/lib/motifd
--- a/lang/cmucl/Makefile
+++ b/lang/cmucl/Makefile
@ -29,11 +29,11 @@ PLIST_SUB=	VER=${PORTVERSION}
 OPTIONS_DEFINE=	DOCS

 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/bin/lisp ${STAGEDIR}${PREFIX}/bin
-	(cd ${WRKDIR} && ${COPYTREE_SHARE} lib ${STAGEDIR}${PREFIX})
-	${INSTALL_MAN} ${WRKDIR}/man/man1/cmucl.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKDIR}/man/man1/lisp.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/lisp ${STAGEDIR}${PREFIX}/bin
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} lib ${STAGEDIR}${PREFIX})
+	${INSTALL_MAN} ${WRKSRC}/man/man1/cmucl.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/man1/lisp.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/doc/cmucl/* ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/cmucl/* ${STAGEDIR}${DOCSDIR}

 .include <bsd.port.mk>
--- a/lang/linux-j/Makefile
+++ b/lang/linux-j/Makefile
@ -31,8 +31,8 @@ SUB_FILES=	j-jconsole.sh jw.sh
 SUB_LIST=	PORTVERSION=${PORTVERSION:S/b//g}

 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/j-jconsole.sh ${STAGEDIR}${PREFIX}/bin/j-jconsole
-	${INSTALL_SCRIPT} ${WRKSRC}/jw.sh ${STAGEDIR}${PREFIX}/bin/jw
+	${INSTALL_SCRIPT} ${WRKDIR}/j-jconsole.sh ${STAGEDIR}${PREFIX}/bin/j-jconsole
+	${INSTALL_SCRIPT} ${WRKDIR}/jw.sh ${STAGEDIR}${PREFIX}/bin/jw
 	${INSTALL_MAN} ${WRKSRC}/j${PORTVERSION:S/b//g}/system/extras/help/man/jconsole.1 ${STAGEDIR}${PREFIX}/man/man1/${MAN1}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/j
 	cd ${WRKSRC}/j${PORTVERSION:S/b//g} && \
--- a/lang/smlnj/Makefile
+++ b/lang/smlnj/Makefile
@ -139,7 +139,7 @@ pre-fetch:
 # make symlinks to the dist files

 post-extract:
-	cd ${WRKDIR} && ${LN} -sf ${_DISTDIR}/* .
+	cd ${WRKSRC} && ${LN} -sf ${_DISTDIR}/* .

 # Configuring is done by uncommenting the appropriate #request
 # lines of config/targets. Dependency details are handled by
@ -152,7 +152,7 @@ do-configure:
 .for t in ${MLTARGETS}
 	${ECHO_CMD} '/^#request[ 	]+${t}$$/s/^#//' >> "${WRKDIR}/.tmp.sed"
 .endfor
-	${SED} -i .default -E -f "${WRKDIR}/.tmp.sed" "${WRKDIR}/config/targets"
+	${SED} -i .default -E -f "${WRKDIR}/.tmp.sed" "${WRKSRC}/config/targets"
 .endif
 # Recompilation requires ml-lex and ml-yacc. All requested targets
 # will be built later using the recompiled core system after
@ -162,7 +162,7 @@ do-configure:
 	  ${ECHO_CMD} "request	ml-lex" && \
 	  ${ECHO_CMD} "request	ml-lex-mllex-tool" && \
 	  ${ECHO_CMD} "request	src-smlnj" ) \
-	> "${WRKDIR}/config/targets.customized"
+	> "${WRKSRC}/config/targets.customized"
 .endif

 # The build target patches, builds, and installs the system within WRKDIR.
@ -203,7 +203,7 @@ MLSOURCEPATCHES_CMD=	${TRUE}
 .endif

 do-build:
-	cd ${WRKDIR} && unset PWD && \
+	cd ${WRKSRC} && unset PWD && \
 	FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="${PATCH_ARGS}" \
 	MLNORUNTIMECLEAN=yes \
 	MLRUNTIMEPATCHES=`${MLRUNTIMEPATCHES_CMD}` \
@ -213,26 +213,26 @@ do-build:
 	CFLAGS='${CFLAGS}' AS='${AS}' EXTRA_DEFS='${EXTRA_DEFS}' \
 	./config/install.sh
 .if defined(ML_RECOMPILE)
-	-${RM} ${WRKDIR}/config/targets.customized
+	-${RM} ${WRKSRC}/config/targets.customized
 	@${ECHO} '(* Recompiling the core system: *)'
-	cd ${WRKDIR}/${RECOMPILEDIR} && ( \
+	cd ${WRKSRC}/${RECOMPILEDIR} && ( \
 	${ECHO_CMD} 'CM.autoload "$$smlnj/cmb.cm";' ; \
 	${ECHO_CMD} ${CMB_COMMAND} ; \
 	${ECHO_CMD} 'CMB.make ();' ) | \
 	../../bin/sml
 	@${ECHO} '(* Building the recompiled heap: *)'
-	cd ${WRKDIR}/${RECOMPILEDIR} && \
+	cd ${WRKSRC}/${RECOMPILEDIR} && \
 	./makeml
 	@${ECHO} '(* Removing old libs and heaps: *)'
-	cd ${WRKDIR}/${RECOMPILEDIR} && \
+	cd ${WRKSRC}/${RECOMPILEDIR} && \
 	${RM} -rf ../../lib && ${MKDIR} ../../lib && \
 	${FIND} ../../bin/.heap -name '*.${MLARCH}-bsd' \
 	\! -name 'sml.${MLARCH}-bsd' -delete -print
 	@${ECHO} '(* Installing the recompiled libs and heap: *)'
-	cd ${WRKDIR}/${RECOMPILEDIR} && \
+	cd ${WRKSRC}/${RECOMPILEDIR} && \
 	./installml
 	@${ECHO} '(* Building requested targets: *)'
-	cd ${WRKDIR} && unset PWD && \
+	cd ${WRKSRC} && unset PWD && \
 	FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="${PATCH_ARGS}" \
 	MLNORUNTIMECLEAN=yes RECOMPILEDIR="${RECOMPILEDIR}" \
 	CFLAGS='${CFLAGS}' AS='${AS}' EXTRA_DEFS='${EXTRA_DEFS}' \
@ -243,14 +243,14 @@ do-build:
 # then we have to remove them at several points during the
 # installation process. This is no longer necessary with FreeBSD 10
 # as it uses libarchive 3.x (via bsdtar), but earlier versions
-# don't ignore such resource files and hence WRKDIR and STAGEDIR
+# don't ignore such resource files and hence WRKSRC and STAGEDIR
 # are full of them. Once FreeBSD 9 will be out of service, all
 # lines in this Makefile can be removed which contain a pattern
 # for the prefix "._" of the resource files. Background information:
 # <https://github.com/libarchive/libarchive/wiki/TarExtendedAttributes#Apple_tar>

 post-build:
-	${FIND} ${WRKDIR} -type f -name '\._*' -delete
+	${FIND} ${WRKSRC} -type f -name '\._*' -delete

 # Nowadays PLIST has to be computed before installation. We do it in
 # "pre-install" because source extraction happens during "build".
@ -273,7 +273,7 @@ MLPATCHPATHREGEX=	-E -e 's%(^|[^_])_([^_]|$$)%\1/\2%g' \
 pre-install:
 .if defined(ML_EVERYTHING)
 	@${ECHO} -n '(* Computing package list ...'
-	@${TAR} -tzf ${WRKDIR}/runtime.tgz | \
+	@${TAR} -tzf ${WRKSRC}/runtime.tgz | \
 	${GREP} -E -v '(^|/)\._.*' | \
 	${SED} -E -n -e 's%^(.*[^/])$$%${MLROOTRELATIVE}/base/\1%p' \
 	> ${MLRUNTIMEPLIST}
@ -288,7 +288,7 @@ pre-install:
 	${SED} ${MLPATCHPATHREGEX} | \
 	${SED} -E -e 's%^(do|extra)-patch-(base/.*)%${MLROOTRELATIVE}/\2.orig%' \
 	>> ${MLRUNTIMEPLIST}
-	@cd "${WRKDIR}" && ( \
+	@cd "${WRKSRC}" && ( \
 	( ${FIND} -s -d ${MLSRCDIRS} \! -type d | \
 	${AWK} '{ print "${MLROOTRELATIVE}/" $$0 }' ) ; \
 	( ${FIND} -s -d ${MLSRCDIRS} -type d -empty | \
@ -333,7 +333,7 @@ MLSRCEXCLUDES+=	--exclude "${excl}"
 do-install:
 	${MKDIR} "${STAGEDIR}${MLROOT}"
 .if ! defined(ML_RECOMPILE)
-	cd ${WRKDIR} && unset PWD && \
+	cd ${WRKSRC} && unset PWD && \
 	FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="${PATCH_ARGS}" \
 	STAGEDIR="${STAGEDIR}" MLLIB="${MLLIB}" \
 	INSTALLDIR="${STAGEDIR}${MLROOT}" \
@ -341,16 +341,16 @@ do-install:
 	./config/install.sh
 .else
 	@${ECHO} '(* Rebuilding the recompiled libs: *)'
-	cd ${WRKDIR}/${RECOMPILEDIR} && ( \
+	cd ${WRKSRC}/${RECOMPILEDIR} && ( \
 	${ECHO_CMD} 'CM.autoload "$$smlnj/cmb.cm";' ; \
 	${ECHO_CMD} ${CMB_COMMAND} ; \
 	${ECHO_CMD} 'CMB.make ();' ) | \
 	../../bin/sml
 	@${ECHO} '(* Rebuilding the recompiled heap: *)'
-	cd ${WRKDIR}/${RECOMPILEDIR} && \
+	cd ${WRKSRC}/${RECOMPILEDIR} && \
 	./makeml
 	@${ECHO} '(* Installing into ${MLROOT}: *)'
-	cd ${WRKDIR} && unset PWD && \
+	cd ${WRKSRC} && unset PWD && \
 	FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="${PATCH_ARGS}" \
 	STAGEDIR="${STAGEDIR}" MLLIB="${MLLIB}" \
 	INSTALLDIR="${STAGEDIR}${MLROOT}" RECOMPILEDIR="${RECOMPILEDIR}" \
@ -361,8 +361,8 @@ do-install:
 	${FIND} ${STAGEDIR} -type f -name '\._*' -delete
 	@${ECHO} '(* Installing man pages. *)'
 .for mansect in 1 2 3 4 5 6 7 8 9
-	@[ ! -d ${WRKDIR}/doc/man/man${mansect} ] || \
-	{ cd ${WRKDIR}/doc/man/man${mansect} && ls *.${mansect} | \
+	@[ ! -d ${WRKSRC}/doc/man/man${mansect} ] || \
+	{ cd ${WRKSRC}/doc/man/man${mansect} && ls *.${mansect} | \
 	  ${XARGS} -J % \
 	    ${INSTALL_MAN} % ${STAGEDIR}${MANPREFIX}/man/man${mansect} ; }
 .endfor
@ -373,9 +373,9 @@ do-install:
 	  "${STAGEDIR}${MLBIN}/.run/run.$${ARCH}-$${OPSYS}.so" )
 .if defined(ML_EVERYTHING)
 	@${ECHO} '(* Cleaning base/runtime: *)'
-	cd ${WRKDIR}/base/runtime/objs && ${MAKE_CMD} clean
+	cd ${WRKSRC}/base/runtime/objs && ${MAKE_CMD} clean
 	@${ECHO} -n '(* Installing sources into ${STAGEDIR}${MLROOT} ...'
-	@cd ${WRKDIR} && ${TAR} -cf - ${MLSRCEXCLUDES} ${MLSRCDIRS} | \
+	@cd ${WRKSRC} && ${TAR} -cf - ${MLSRCEXCLUDES} ${MLSRCDIRS} | \
 	${TAR} -xf - -C "${STAGEDIR}${MLROOT}"
 	@${ECHO} ' done. *)'
 .endif
--- a/lang/tcl-manual/Makefile
+++ b/lang/tcl-manual/Makefile
@ -30,16 +30,16 @@ post-patch:
 	    s|/usr/local/bin/wish|${PREFIX}/bin/wish${v:R}|g' \
 	    ${WRKSRC}/tcl${v}/html/UserCmd/wish.htm
 	@${REINPLACE_CMD} -e 's|tcl\.h|tcl${v:R}/tcl.h|g' \
-		${WRKDIR}/tcl${v}/html/TclLib/*
+		${WRKSRC}/tcl${v}/html/TclLib/*
 	@${REINPLACE_CMD} -e 's|tk\.h|tk${v:R}/tk.h|g' \
-		${WRKDIR}/tcl${v}/html/TkLib/*
+		${WRKSRC}/tcl${v}/html/TkLib/*
 	@${FIND} ${WRKSRC} -name "*.bak" -delete
 .endfor

 do-install:
 .for v in ${VERSIONS}
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/tcl${v:R:S/.//}
-	${CP} -R ${WRKDIR}/tcl${v}/html/* ${STAGEDIR}${PREFIX}/share/doc/tcl${v:R:S/.//}
+	${CP} -R ${WRKSRC}/tcl${v}/html/* ${STAGEDIR}${PREFIX}/share/doc/tcl${v:R:S/.//}
 .endfor

 .include <bsd.port.mk>
--- a/Show more
+++ b/Show more