28 files changed, 51 insertions, 62 deletions

diff --git a/games/alephone-data/Makefile b/games/alephone-data/Makefile
index 30eaa6826b69..bebd23e4d07c 100644
--- 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
 
diff --git a/games/alephone-scenarios/Makefile b/games/alephone-scenarios/Makefile
index 993240016d31..e738e1a357cb 100644
--- 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
diff --git a/games/arkanoidsb/Makefile b/games/arkanoidsb/Makefile
index 315e05064b7e..5287bc0b2ef1 100644
--- 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
diff --git a/games/bogged/Makefile b/games/bogged/Makefile
index 328fb5348e09..c8e557fe0575 100644
--- 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
diff --git a/games/crafty-open-enormous/Makefile b/games/crafty-open-enormous/Makefile
index e9e3c65cd4fd..b9e635ba70dd 100644
--- 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>
diff --git a/games/crafty-open-large/Makefile b/games/crafty-open-large/Makefile
index 190939664a82..9d5ba8195819 100644
--- 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>
diff --git a/games/crafty-open-medium/Makefile b/games/crafty-open-medium/Makefile
index 65d5909c63f7..e4c0dd263fac 100644
--- 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>
diff --git a/games/doom-data/Makefile b/games/doom-data/Makefile
index 8022fa1762f0..c8eebccc058c 100644
--- 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:
diff --git a/games/doom-hacx/Makefile b/games/doom-hacx/Makefile
index 9dc24c5bef95..99f199698fbd 100644
--- 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}
diff --git a/games/doom-wolfendoom/Makefile b/games/doom-wolfendoom/Makefile
index d7042e38539b..d56ec97e3a22 100644
--- 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>
diff --git a/games/legends/Makefile b/games/legends/Makefile
index 9c25caa0f8f5..b0ac7c2cf29c 100644
--- 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|; \
diff --git a/games/linux-darwinia-demo/Makefile b/games/linux-darwinia-demo/Makefile
index e3e57bf88b7d..92482928bfce 100644
--- 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:
diff --git a/games/linux-doom3/Makefile b/games/linux-doom3/Makefile
index 4f538f87c4c2..a463e9db1251 100644
--- 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)
diff --git a/games/linux-quake3-demo/Makefile b/games/linux-quake3-demo/Makefile
index 64091054c5bc..bfa45bd269cc 100644
--- 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:
diff --git a/games/linux-quake3/Makefile b/games/linux-quake3/Makefile
index a60eb0f28405..3e9e3b5a825f 100644
--- 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
diff --git a/games/linux-quake4-demo/Makefile b/games/linux-quake4-demo/Makefile
index 78185c8b537a..6236828b5873 100644
--- 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:
diff --git a/games/linux-quake4/Makefile b/games/linux-quake4/Makefile
index 1d6e65129944..776baeb2a1b7 100644
--- 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:
diff --git a/games/linux-uplink-demo/Makefile b/games/linux-uplink-demo/Makefile
index b8de12080ef9..1f552565b974 100644
--- 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:
diff --git a/games/quake-dpmod/Makefile b/games/quake-dpmod/Makefile
index 74f9e6368b80..e33797dc466f 100644
--- 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}
diff --git a/games/quake2-data/Makefile b/games/quake2-data/Makefile
index 907a12852171..6375dea94868 100644
--- 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
 
diff --git a/games/quake2-rogue/Makefile b/games/quake2-rogue/Makefile
index 52476622005f..c1930458ef59 100644
--- 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:
diff --git a/games/quake2-xatrix/Makefile b/games/quake2-xatrix/Makefile
index b10ff66b5d5b..bf15f0bfe225 100644
--- 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:
diff --git a/games/quake3-data/Makefile b/games/quake3-data/Makefile
index 708e80ef22e5..bb3bb05dc5cd 100644
--- 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}
diff --git a/games/rfksay/Makefile b/games/rfksay/Makefile
index bf6d6a0e304f..8c40a19e6b2f 100644
--- 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>
diff --git a/games/robocode/Makefile b/games/robocode/Makefile
index a1e2fb3fd252..de1d810452c8 100644
--- 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 \
diff --git a/games/thudboard/Makefile b/games/thudboard/Makefile
index 00403401f036..396003113454 100644
--- 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>
diff --git a/games/traindirector/Makefile b/games/traindirector/Makefile
index 926f5f64cb9c..b036783d8eb4 100644
--- 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>
diff --git a/games/xasteroids/Makefile b/games/xasteroids/Makefile
index 5e9441bc518a..7b1485f81eef 100644
--- 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