Index: head/security/fprint_demo/Makefile
===================================================================
--- head/security/fprint_demo/Makefile	(revision 491924)
+++ head/security/fprint_demo/Makefile	(revision 491925)
@@ -1,27 +1,28 @@
 # Created by: barner
 # $FreeBSD$
 
 PORTNAME=	fprint_demo
 PORTVERSION=	20080303
 PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	DEBIAN/pool/main/f/${PORTNAME:C/_/-/}
 DISTNAME=	${PORTNAME:C/_/-/}_${PORTVERSION}git.orig
 
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Demo and test application for libfprint
 
 LIB_DEPENDS=	libfprint.so:security/libfprint
 
-GNU_CONFIGURE=	yes
 USES=		autoreconf pkgconfig desktop-file-utils
 USE_GNOME=	atk glib20 gtk20 pango
 INSTALLS_ICONS=	yes
 
-WRKSRC=	${WRKDIR}
+NO_WRKSUBDIR=	yes
 
-CONFIGURE_ENV+=	CRYPTO_CFLAGS=-I${OPENSSLINC} \
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CRYPTO_CFLAGS=-I${OPENSSLINC} \
 		CRYPTO_LIBS=-lcrypto
+
 CFLAGS+=	-DHAVE_MEMMEM
 
 .include <bsd.port.mk>
Index: head/security/pscan/Makefile
===================================================================
--- head/security/pscan/Makefile	(revision 491924)
+++ head/security/pscan/Makefile	(revision 491925)
@@ -1,23 +1,23 @@
 # Created by: Kris Kennaway <kris@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	pscan
 PORTVERSION=	1.3
 CATEGORIES=	security devel
 MASTER_SITES=	http://deployingradius.com/pscan/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Security C code scanner for misuse of format strings
 
 ALL_TARGET=	#empty
-WRKSRC=		${WRKDIR}
+NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	bin/pscan bin/find_formats
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pscan ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/find_formats.sh \
 		${STAGEDIR}${PREFIX}/bin/find_formats
 
 .include <bsd.port.mk>
Index: head/security/pure-sfv/Makefile
===================================================================
--- head/security/pure-sfv/Makefile	(revision 491924)
+++ head/security/pure-sfv/Makefile	(revision 491925)
@@ -1,33 +1,32 @@
 # Created by: Emanuel Haupt <ehaupt@critical.ch>
 # $FreeBSD$
 
 PORTNAME=	pure-sfv
 PORTVERSION=	0.3
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}_src
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Utility to test and create .sfv files
 
 LICENSE=	GPLv2
 
 USES=		gmake
 
-WRKSRC=		${WRKDIR}
-
+NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/pure-sfv
 PORTDOCS=	ReadMe.txt
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -E 's/^(CFLAGS|CC)[ +=]*/\1?=/' \
 		${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/security/pvk/Makefile
===================================================================
--- head/security/pvk/Makefile	(revision 491924)
+++ head/security/pvk/Makefile	(revision 491925)
@@ -1,28 +1,29 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	pvk
 PORTVERSION=	20070406
 CATEGORIES=	security
 MASTER_SITES=	http://www.drh-consultancy.demon.co.uk/
 DISTNAME=	pvksrc
 EXTRACT_SUFX=	.tgz.bin
 
 MAINTAINER=	sobomax@FreeBSD.org
 COMMENT=	Tool to convert a RSA key in PEM format into a PVK file and vice versa
 
 USES=		ssl
-WRKSRC=		${WRKDIR}
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
+
+NO_WRKSUBDIR=	yes
 
 post-patch:
 	${REINPLACE_CMD} -e 's|\(-lcrypto\)|$$(LDFLAGS) \1|g' \
 		${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pvk ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>