Index: head/benchmarks/netio/Makefile
===================================================================
--- head/benchmarks/netio/Makefile	(revision 491939)
+++ head/benchmarks/netio/Makefile	(revision 491940)
@@ -1,37 +1,38 @@
 # Created by: arved
 # $FreeBSD$
 
 PORTNAME=	netio
 PORTVERSION=	1.32
 CATEGORIES=	benchmarks net ipv6
 MASTER_SITES=	LOCAL/arved
 DISTNAME=	netio132
 
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	Network benchmark
 
-WRKSRC=		${WRKDIR}
 USES=		dos2unix gmake zip
 DOS2UNIX_FILES=	Makefile netio.c
+
+NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/netio
 
 CFLAGS+=	-DUNIX -DSOCKLEN_T
 LIBS+=		-pthread
-MAKE_ENV+=	OUT=-o
+MAKE_ENV=	OUT=-o
 
 OPTIONS_DEFINE=	IPV6
 IPV6_PLIST_FILES=	bin/netio6
 
 do-build:
 	@(cd ${WRKSRC} && \
 	${SETENV} ${MAKE_ENV} O=.o CFLAGS="${CFLAGS}" ${MAKE_CMD} all)
 do-build-IPV6-on:
 	@(cd ${WRKSRC} && \
 	${MAKE_ENV} O=.6o X=6 CFLAGS="${CFLAGS} -DUSE_IPV6" ${MAKE_CMD} all)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/netio ${STAGEDIR}${PREFIX}/bin
 do-install-IPV6-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/netio6 ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: head/benchmarks/scimark2/Makefile
===================================================================
--- head/benchmarks/scimark2/Makefile	(revision 491939)
+++ head/benchmarks/scimark2/Makefile	(revision 491940)
@@ -1,43 +1,42 @@
 # Created by: thierry@pompo.net
 # $FreeBSD$
 
 PORTNAME=	scimark2
 PORTVERSION=	2.0
 PORTREVISION=	2
 CATEGORIES=	benchmarks java
 MASTER_SITES=	http://math.nist.gov/scimark2/
 PKGNAMESUFFIX=	-java
 DISTNAME=	${PORTNAME}src
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Java benchmark for scientific and numerical computing
 
-WRKSRC=		${WRKDIR}
-
 USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NEED_JAVAC=	yes
 JAVAC_OPTS?=	-O
 
 LSMDIR=		share/java/scimark2
 SMDIR=		${PREFIX}/${LSMDIR}
 
 SMSH=		${PORTNAME}${PKGNAMESUFFIX}
 
+NO_WRKSUBDIR=	yes
 PLIST_SUB=	SMDIR=${LSMDIR}
 SUB_FILES=	pkg-message
 SUB_LIST=	SMSH=${SMSH}
 
 do-build:
 	cd ${WRKSRC} && ${JAVAC} ${JAVAC_OPTS} commandline.java
 	${CP} ${WRKSRC}/commandline.class ${WRKSRC}/jnt/scimark2
 
 do-install:
 	${MKDIR} ${STAGEDIR}${SMDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} jnt ${STAGEDIR}${SMDIR}/
 	${ECHO_CMD} "#! /bin/sh" > ${WRKSRC}/${SMSH}
 	${ECHO_CMD} "cd ${SMDIR} && ${JAVA} jnt.scimark2.commandline" '$$1' >> ${WRKSRC}/${SMSH}
 	${INSTALL_SCRIPT} ${WRKSRC}/${SMSH} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: head/benchmarks/scimark2c/Makefile
===================================================================
--- head/benchmarks/scimark2c/Makefile	(revision 491939)
+++ head/benchmarks/scimark2c/Makefile	(revision 491940)
@@ -1,21 +1,21 @@
 # Created by: thierry@pompo.net
 # $FreeBSD$
 
 PORTNAME=	scimark2c
 DISTVERSION=	2_1
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://math.nist.gov/scimark2/
 DISTNAME=	${PORTNAME:S/2/${DISTVERSION}/}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	ANSI C version of the SciMark2 benchmark
 
 USES=		zip
 
+NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/scimark2
-WRKSRC=		${WRKDIR}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/scimark2 ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>