Index: head/misc/amanda-perl-wrapper/Makefile
===================================================================
--- head/misc/amanda-perl-wrapper/Makefile	(revision 491929)
+++ head/misc/amanda-perl-wrapper/Makefile	(revision 491930)
@@ -1,35 +1,36 @@
 # $FreeBSD$
 
 PORTNAME=	amanda-perl-wrapper
 PORTVERSION=	1.01
 CATEGORIES=	misc perl5
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl wrapper to use with Amanda (with libthr.so.* linked)
 
 USES=		perl5
 USE_PERL5=	run
+
+NO_WRKSUBDIR=	yes
 SUB_FILES=	perl-amanda.c
 SUB_LIST=	PREFIX=${LOCALBASE}
 PLIST_FILES=	bin/perl-amanda
-WRKSRC=		${WRKDIR}
 
 do-fetch:
 	@${DO_NADA}
 
 pre-build: apply-slist
 
 do-build:
 	cd ${WRKSRC} && ${CC} -o perl-amanda perl-amanda.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/perl-amanda ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.pre.mk>
 
 LIBTHR!=	${LS} /lib/libthr.so.* | ${TAIL} -1
 SUB_LIST+=	LIBTHR=${LIBTHR}
 
 .include <bsd.port.post.mk>
Index: head/misc/ini_file_manager/Makefile
===================================================================
--- head/misc/ini_file_manager/Makefile	(revision 491929)
+++ head/misc/ini_file_manager/Makefile	(revision 491930)
@@ -1,55 +1,57 @@
 # Created by: John Marino <marino@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	ini_file_manager
 PORTVERSION=	03
 PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	http://sourceforge.net/projects/${SFPATH}/
 DISTNAME=	ini-files-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ini configuration file reader and manipulator package for Ada
 
 LICENSE=	MIT
 
 USES=		ada zip dos2unix
+
+NO_WRKSUBDIR=	yes
+
 SFPATH=		ini-files/files/ini-files/ini-files-${PORTVERSION}
-WRKSRC=		${WRKDIR}
 PORTDOCS=	ini_file_manager.txt
 PORTEXAMPLES=	example.gpr test_config.adb runme.sh
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-extract:
 	${CP} ${FILESDIR}/construct.gpr ${WRKSRC}
 	${MKDIR} ${WRKSRC}/src
 	${MV} ${WRKSRC}/config.ad[bs] ${WRKSRC}/src
 	${SED} -e "s,@PREFIX@,${LOCALBASE},g" ${FILESDIR}/runme.sh.in \
 		> ${WRKSRC}/runme.sh
 
 do-build:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -p -Pconstruct)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
 		${STAGEDIR}${PREFIX}/lib/ini_file_manager \
 		${STAGEDIR}${PREFIX}/include/ini_file_manager
 	${INSTALL_DATA} ${FILESDIR}/ini_file_manager.gpr \
 		${STAGEDIR}${PREFIX}/lib/gnat
 	${INSTALL_DATA} ${WRKSRC}/src/* \
 		${STAGEDIR}${PREFIX}/include/ini_file_manager
 	${INSTALL_DATA} ${WRKSRC}/lib/*  \
 		${STAGEDIR}${PREFIX}/lib/ini_file_manager
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/ini_file_manager.txt ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/runme.sh ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/test_config.adb \
 		${FILESDIR}/example.gpr ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/misc/nsf/Makefile
===================================================================
--- head/misc/nsf/Makefile	(revision 491929)
+++ head/misc/nsf/Makefile	(revision 491930)
@@ -1,22 +1,23 @@
 # Created by: kaz
 # $FreeBSD$
 
 PORTNAME=	nsf
 PORTVERSION=	1.0
 CATEGORIES=	misc
 MASTER_SITES=	LOCAL/will
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NAKAMURA's Shell Form input
 
 USES=		ncurses
-WRKSRC=		${WRKDIR}
+
 MAKE_ARGS=	LIBS="${LDFLAGS} -lncurses"
+NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/nsf man/man1/nsf.1.gz
 ALL_TARGET=
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/nsf ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKDIR}/nsf.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>
Index: head/misc/tkregexp/Makefile
===================================================================
--- head/misc/tkregexp/Makefile	(revision 491929)
+++ head/misc/tkregexp/Makefile	(revision 491930)
@@ -1,31 +1,31 @@
 # Created by: Patrick Seal <patseal@hyperhost.net>
 # $FreeBSD$
 
 PORTNAME=	tkregexp
 PORTVERSION=	3.1
 CATEGORIES=	misc tk
 MASTER_SITES=	http://laurent.riesterer.free.fr/regexp/
 DISTNAME=	visual_regexp-${PORTVERSION}
 EXTRACT_SUFX=	.tcl
 EXTRACT_ONLY=
 
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Interactive regexp design tool
 
-USES+=		dos2unix tk
+USES=		dos2unix tk
 DOS2UNIX_FILES=	visual_regexp-${PORTVERSION}.tcl
+
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/tkregexp
-
-WRKSRC=		${WRKDIR}
 
 post-extract:
 	${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}
 
 post-patch:
 	${REINPLACE_CMD} -e "1s|^\(.*\)|#!${WISH}|; 2d" ${WRKDIR}/visual_regexp-${PORTVERSION}.tcl
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/visual_regexp-${PORTVERSION}.tcl ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>