Index: head/mail/postfinger/Makefile
===================================================================
--- head/mail/postfinger/Makefile	(revision 491930)
+++ head/mail/postfinger/Makefile	(revision 491931)
@@ -1,33 +1,33 @@
 # Created by: Andrew J. Caines <A.J.Caines@halplant.com>
 # $FreeBSD$
 
 PORTNAME=	postfinger
 PORTVERSION=	1.30
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.wl0.org/ftp.wl0.org/postfinger/
 DISTFILES=	${DISTNAME} README
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	A.J.Caines@halplant.com
 COMMENT=	Postfix Configuration Summary Reporter
 
 EXTRACT_CMD=		${CP}
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	${WRKDIR}
 NO_BUILD=		yes
-WRKSRC=			${WRKDIR}
+NO_WRKSUBDIR=		yes
 
 PLIST_FILES=	bin/postfinger
 PORTDOCS=	README
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: head/mail/smtp-cli/Makefile
===================================================================
--- head/mail/smtp-cli/Makefile	(revision 491930)
+++ head/mail/smtp-cli/Makefile	(revision 491931)
@@ -1,37 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	smtp
 PORTVERSION=	3.6
 CATEGORIES=	mail perl5
 MASTER_SITES=	http://www.logix.cz/michal/devel/smtp-cli/
 PKGNAMESUFFIX=	-cli
 DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}
 EXTRACT_SUFX=	-${PORTVERSION}
 
 MAINTAINER=	fw@moov.de
 COMMENT=	Powerful SMTP command line client
 
 LICENSE=	GPLv3
 
 USES=		shebangfix
 
 RUN_DEPENDS=	p5-Digest-HMAC>0:security/p5-Digest-HMAC \
 		p5-File-LibMagic>0:devel/p5-File-LibMagic \
 		p5-IO-Socket-SSL>0:security/p5-IO-Socket-SSL \
 		p5-MIME-Lite>0:mail/p5-MIME-Lite \
 		p5-Term-ReadKey>0:devel/p5-Term-ReadKey
 
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}
+NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	bin/smtp-cli
 SHEBANG_FILES=	smtp-cli
 
 do-extract:
 	@${MKDIR} ${WRKSRC}/
 	@${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC}/${DISTNAME}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
Index: head/mail/vrfy/Makefile
===================================================================
--- head/mail/vrfy/Makefile	(revision 491930)
+++ head/mail/vrfy/Makefile	(revision 491931)
@@ -1,21 +1,21 @@
 # Created by: kaz
 # $FreeBSD$
 
 PORTNAME=	vrfy
 PORTVERSION=	1.0
 PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://jadawin.tuxaco.net/freebsd/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	Verify mail address
 
-WRKSRC=		${WRKDIR}
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" RES=""
+NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/vrfy
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/vrfy ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>