Index: head/games/crafty/Makefile
===================================================================
--- head/games/crafty/Makefile	(revision 491936)
+++ head/games/crafty/Makefile	(revision 491937)
@@ -1,66 +1,65 @@
 # Created by: Stefan Eggers <seggers@semyam.dinoco.de>
 # $FreeBSD$
 
 PORTNAME=	crafty
 PORTVERSION=	25.2
 PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.craftychess.com/downloads/source/:src \
 		http://www.craftychess.com/downloads/book/:data
 DISTFILES=	crafty-${PORTVERSION}.zip:src \
 		book.bin:data \
 		start.pgn.gz:data
 DIST_SUBDIR=	crafty
 EXTRACT_ONLY=	crafty-${PORTVERSION}.zip
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Chess program for playing and analyzing games
 
 BROKEN_aarch64=		fails to compile: invokes x86 assembler
 BROKEN_armv6=		fails to compile: invokes x86 assembler
 BROKEN_armv7=		fails to compile: invokes x86 assembler
 BROKEN_mips=		fails to compile: unrecognized command line option "-mpopcnt"
 BROKEN_mips64=		fails to compile: unrecognized command line option "-mpopcnt"
 
-WRKSRC=		${WRKDIR}
-
 USES=		gmake zip
 
 ALL_TARGET=	unix-gcc
+NO_WRKSUBDIR=	yes
 
 WITH_BOOKDIR?=	${PREFIX}/lib/crafty
 WITH_LOGDIR?=	/tmp
 WITH_RCDIR?=	~/
 WITH_TBDIR?=	${PREFIX}/lib/crafty/TB
 WITH_PERSDIR?=	${PREFIX}/lib/crafty/cpf
 
 OPT=		-DHASHSTATS -DTRACE -DBOOKDIR=\\\"${WITH_BOOKDIR}\\\" \
 		-DLOGDIR=\\\"${WITH_LOGDIR}\\\" \
 		-DRCDIR=\\\"${WITH_RCDIR}\\\" \
 		-DTBDIR=\\\"${WITH_TBDIR}\\\" \
 		-DPERSDIR=\\\"${WITH_PERSDIR}\\\" -DSKILL
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64 || ${ARCH} == i386
 OPT+=		-DCPUS=4
 .else
 OPT+=		-DCPUS=1 # disables x86 assembler
 .endif
 
 MAKE_ENV+=	opt="${OPT}" target=${OPSYS} CXFLAGS="${CXXFLAGS}"
 
 post-extract:
 	cd ${DISTDIR}/${DIST_SUBDIR} && ${CP} book.bin start.pgn.gz ${WRKSRC}
 	${GUNZIP_CMD} ${WRKSRC}/start.pgn.gz
 
 post-build:
 	(cd ${WRKSRC}; ./crafty bookpath=. <${FILESDIR}/books-building)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/crafty ${STAGEDIR}${PREFIX}/bin/crafty
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/crafty/cpf
 	${INSTALL_DATA} ${WRKSRC}/book.bin ${WRKSRC}/books.bin ${WRKSRC}/crafty.hlp \
 		${STAGEDIR}${PREFIX}/lib/crafty
 
 .include <bsd.port.post.mk>
Index: head/games/minecraft-client/Makefile
===================================================================
--- head/games/minecraft-client/Makefile	(revision 491936)
+++ head/games/minecraft-client/Makefile	(revision 491937)
@@ -1,51 +1,53 @@
 # Created by: Martin Kropfinger
 # $FreeBSD$
 
 PORTNAME=	minecraft-client
 PORTVERSION=	1.7.9
 PORTREVISION=	4
 CATEGORIES=	games java
 MASTER_SITES=	http://s3.amazonaws.com/Minecraft.Download/launcher/:minecraft \
 		http://media-mcw.cursecdn.com/c/c5/:icon
 DISTFILES=	Minecraft.jar:minecraft \
 		Grass.png:icon
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 EXTRACT_ONLY=
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Client for the block building game
 
 RUN_DEPENDS=	${JAVALIBDIR}/lwjgl/lwjgl.jar:games/lwjgl
 
-WRKSRC=		${WRKDIR}
 USES=		openal
-NO_ARCH=	yes
-NO_BUILD=	yes
 USE_JAVA=	yes
 JAVA_OS=	native
 JAVA_VENDOR=	openjdk
 JAVA_VERSION=	1.8+
+
 DESKTOP_ENTRIES="Minecraft" \
 		"Block building game" \
 		"${PREFIX}/share/pixmaps/minecraft-client.png" \
 		"${PORTNAME}" \
 		"Game;Java;" \
 		false
+
+NO_ARCH=	yes
+NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Minecraft.jar \
 		${STAGEDIR}${DATADIR}/Minecraft.jar
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Grass.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/minecraft-client.png
 	${SED}  -e 's|=JAVA_HOME|=${JAVA_HOME}|' \
 		-e 's|PREFIX|${PREFIX}|' \
 		-e 's|JAVA_CMD|${JAVA}|' ${FILESDIR}/minecraft-client \
 		> ${WRKDIR}/minecraft-client
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|' ${FILESDIR}/Notifier.java \
 		> ${WRKDIR}/Notifier.java
 	${INSTALL_SCRIPT} ${WRKDIR}/minecraft-client ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${FILESDIR}/minecraft-runtime ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/Notifier.java ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
Index: head/games/tuxfighter/Makefile
===================================================================
--- head/games/tuxfighter/Makefile	(revision 491936)
+++ head/games/tuxfighter/Makefile	(revision 491937)
@@ -1,65 +1,65 @@
 # Created by: Rusmir Dusko <nemysis@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	tuxfighter
 PORTVERSION=	54
 PORTREVISION=	8
 CATEGORIES=	games python
 MASTER_SITES=	SF/pygamebook/TuxFighter/TuxFighter${PORTVERSION}_source/ \
 		SF/nemysisfreebsdp/games/:icons
 DISTFILES=	TuxFighter${DISTVERSION}.tar.gz \
 		${PORTNAME}_icons.tar.gz:icons
 DIST_SUBDIR=	python
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Little Asteroids-like Shooter game
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/GPL.txt
 
 RUN_DEPENDS=	${PYGAME}
 
-WRKSRC=		${WRKDIR}
-
 USES=		python:2.7 shebangfix
 SHEBANG_FILES=	TuxFighter54.py
 
 PORTDOCS=	readme_TuxFighter54.txt
 
 INSTALLS_ICONS=	yes
 ICON_SIZES=	48x48 64x64 72x72 96x96
 
 SUB_FILES=	${PORTNAME} pkg-message
 
 DESKTOP_ENTRIES="TuxFighter" "" "${PORTNAME}" \
 		"${PORTNAME}" "Game;ArcadeGame;" ""
+
+NO_WRKSUBDIR=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}
 	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 
 do-install:
 	@${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' \
 		${WRKDIR}/${PORTNAME}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} data ${STAGEDIR}${DATADIR})
 .for f in *.py *.pyc *.pyo
 	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 
 .for s in ${ICON_SIZES}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
 .endfor
 	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>