diff --git a/dns/djbdns/Makefile b/dns/djbdns/Makefile
index 0f82d569299c..56cd0c5ef94c 100644
--- a/dns/djbdns/Makefile
+++ b/dns/djbdns/Makefile
@@ -1,148 +1,149 @@
 # Created by: Neil Blakey-Milner
 # $FreeBSD$
 
 PORTNAME?=	djbdns
 PORTVERSION?=	${DJBDNS_VER}
-PORTREVISION?=	18
+PORTREVISION?=	19
 PORTEPOCH?=	1
 CATEGORIES?=	dns
 MASTER_SITES=	http://cr.yp.to/djbdns/ \
 		ftp://cr.yp.to/djbdns/
 DISTNAME=	djbdns-${DJBDNS_VER}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	lx@FreeBSD.org
 COMMENT?=	Collection of secure and reliable DNS tools
 
 RUN_DEPENDS=	setuidgid:${PORTSDIR}/sysutils/daemontools \
 		tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
 
 CONFLICTS=	djbdns-tools-[0-9]*
 LEGAL_TEXT=	No license -- see http://cr.yp.to/softwarelaw.html
 
 OPTIONS_DEFINE=	DUMPCACHE IP6 IGNOREIP JUMBO MAN PERSISTENT_MMAP SRV DNSCURVE ADD_USERS
 OPTIONS_DEFAULT=	MAN
 OPTIONS_SUB=	yes
 
 DUMPCACHE_DESC=	persistent cache for dnscache
 IP6_DESC=	IPv6 support by Felix von Leitner
 IGNOREIP_DESC=	ignoreip2 patch by Russell Nelson
 JUMBO_DESC=	jumbo patch by Claudiu Costin
 MAN_DESC=	manual pages by Gerritt Pape
 PERSISTENT_MMAP_DESC=	persistent mmap patch by Lennert Buytenhek
 SRV_DESC=	SRV record patch by Michael Handler
 DNSCURVE_DESC=	DNSCurve support by Matthew Dempsky
 ADD_USERS_DESC=	Add dnscache, tinydns and dnslog users/groups
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MADD_USERS}
 USERS?=	dnscache tinydns dnslog
 GROUPS?=dnscache tinydns dnslog
 .endif
 
 .if ${PORT_OPTIONS:MJUMBO}
 .if ${PORT_OPTIONS:MIP6} || ${PORT_OPTIONS:MIGNOREIP} || ${PORT_OPTIONS:MSRV} || \
 	${PORT_OPTIONS:MDNSCURVE}
 BROKEN=		The jumbo patch currently conflicts with the IPv6, ignoreip2, SRV and DNSCURVE patches
 .endif
 
 PATCH_SITES+=	http://people.FreeBSD.org/~roam/ports/dns/djbdns/:jumbo \
 		${MASTER_SITE_LOCAL:S/%SUBDIR%\//roam\/dns\/djbdns\/:jumbo/}
 PATCHFILES+=	jumbo-p13.patch.gz:jumbo
 PATCH_DIST_STRIP=	-p1
 .if ${PORT_OPTIONS:MDUMPCACHE}
 CFLAGS+=	-DDUMPCACHE
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MMAN}
 MANDATE=	-20031023
 MASTER_SITES+=	http://smarden.org/pape/djb/manpages/:manpages
 DISTFILES+=	${DISTNAME}-man${MANDATE}.tar.gz:manpages
 .endif
 
 .if ${PORT_OPTIONS:MIP6}
 PKGNAMESUFFIX=	-ipv6
 PORTVERSION=	${DJBDNS_VER}.${DJBDNS_V6_VER:S/test/b/:S/diff//}
 PATCH_SITES+=	http://www.fefe.de/dns/:ipv6
 PATCHFILES+=	${PORTNAME}-${DJBDNS_VER}-${DJBDNS_V6_VER}.diff.bz2:ipv6
 PATCH_DIST_STRIP=	-p1
 EXTRA_PATCHES+=	${FILESDIR}/uint32.patch ${FILESDIR}/djbdns-ipv6-ooyama.patch
 .endif
 
 .if ${PORT_OPTIONS:MDUMPCACHE} && ! ${PORT_OPTIONS:MJUMBO}
 .if ${PORT_OPTIONS:MIP6}
 BROKEN=		The IPv6 and dnscache-dumpcache patches are currently in conflict
 .endif
 PATCH_SITES+=	http://efge.free.fr/djbdns/:dumpcache
 PATCHFILES+=	patch-dnscache-dumpcache-v4.txt:dumpcache
 PATCH_DIST_STRIP=	-p1
 CFLAGS+=	-DDUMPCACHE
 .endif
 
 .if ${PORT_OPTIONS:MIGNOREIP}
 .if ${PORT_OPTIONS:MIP6}
 BROKEN=		The IPv6 patch already includes the ignoreip2 functionality
 .endif
 PATCH_SITES+=	http://tinydns.org/:ignoreip
 PATCHFILES+=	djbdns-1.05-ignoreip2.patch:ignoreip
 PATCH_DIST_STRIP=	-p1
 .endif
 
 .if ${PORT_OPTIONS:MPERSISTENT_MMAP}
 PATCH_SITES+=	http://people.FreeBSD.org/~roam/ports/patches/dns/:persistent
 PATCHFILES+=	tinydns-persistmmap-20040418.patch:persistent
 PATCH_DIST_STRIP=	-p1
 .endif
 
 .if ${PORT_OPTIONS:MSRV}
 PATCH_SITES+=	http://tinydns.org/:srv
 PATCHFILES+=	srv-patch:srv
 PATCH_DIST_STRIP=	-p1
 .endif
 
 .if ${PORT_OPTIONS:MDNSCURVE}
 .if ${PORT_OPTIONS:MIP6}
 BROKEN=	The IPv6 and DNSCurve patches are currently in conflict
 .endif
 PATCH_SITES+=	http://shinobi.dempsky.org/~matthew/patches/:dnscurve
 PATCHFILES+=	djbdns-dnscurve-20090602.patch:dnscurve
 PATCH_DIST_STRIP=	-p1
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 LDFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 BUILD_DEPENDS+=	nacl-sha256:${PORTSDIR}/security/nacl
 .endif
 
 DJBDNS_VER=	1.05
 DJBDNS_V6_VER=	test23
 
 ALL_TARGET=	prog
 INSTALL_TARGET=	setup check
 
 .if ${PORT_OPTIONS:MIP6}
 PLIST_SUB+=	WITH_IP6=""
 .else
 PLIST_SUB+=	WITH_IP6="@comment "
 .endif
 
 post-patch:
 	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 	@${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
 	@${ECHO_CMD} "${PREFIX}" > ${WRKSRC}/conf-home
 
-pre-install:
+post-build:
+	@${ECHO_MSG} "===> Rebuilding DJB installer to respect STAGEDIR"
 	@${MV} -f ${WRKSRC}/conf-home ${WRKSRC}/conf-home.sav
 	@${ECHO_CMD} "${STAGEDIR}${PREFIX}" > ${WRKSRC}/conf-home
-	@cd ${WRKSRC} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_home.o
+	@cd ${WRKSRC} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_home.o auto_home.c
 	@cd ${WRKSRC} ; ${MAKE_CMD} install instcheck
 	@${TOUCH} ${WRKSRC}/*-conf
 	@${MV} -f ${WRKSRC}/conf-home.sav ${WRKSRC}/conf-home
 
 .if ${PORT_OPTIONS:MMAN}
 post-install:
 	@${INSTALL_MAN} ${WRKDIR}/djbdns-man/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
 	@${INSTALL_MAN} ${WRKDIR}/djbdns-man/*.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/qmail-conf/Makefile b/mail/qmail-conf/Makefile
index 650346fc42fe..b8b228314ca8 100644
--- a/mail/qmail-conf/Makefile
+++ b/mail/qmail-conf/Makefile
@@ -1,55 +1,56 @@
 # Created by: roam@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	qmail-conf
 PORTVERSION=	0.60
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.din.or.jp/~ushijima/qmail-conf/ \
 		http://cr.yp.to/djbdns/
 DISTFILES=	${DISTNAME}.tar.gz \
 		${DJBDNS_DIST}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Configure various qmail services to run under daemontools
 
 USES=		qmail:run
 
 ALL_TARGET=	prog
 INSTALL_TARGET=	setup check
 
 LEGAL_TEXT=	No license -- see http://cr.yp.to/softwarelaw.html
 
 PREFIX?=	${QMAIL_PREFIX}
 NO_PREFIX_RMDIR=yes
 
 NO_MTREE=	yes
 
 DJBDNS_VER=	1.05
 DJBDNS_NAME=	djbdns-${DJBDNS_VER}
 DJBDNS_DIST=	${DJBDNS_NAME}${EXTRACT_SUFX}
 
 post-extract:
 		@(cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DJBDNS_DIST} ${EXTRACT_AFTER_ARGS})
 
 post-patch:
 		@${ECHO_CMD} "${QMAIL_PREFIX}" > ${WRKSRC}/conf-qmail
 		@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 		@${ECHO_CMD} "${CC} ${CFLAGS} ${STRIP}" > ${WRKSRC}/conf-ld
 		@${ECHO_CMD} "${LOCALBASE}" > ${WRKSRC}/conf-ucspi-tcp
 
 pre-build:
 		@(cd ${WRKSRC} && ${MAKE} djbdns=${DJBDNS_NAME} -f Makefile.ini)
 
 # Do a dance to stage and keep out of resulting binaries (see r346769
 # and r349241)
-pre-install:
+post-build:
+	@${ECHO_MSG} "===> Rebuilding DJB installer to respect STAGEDIR"
 	@${MV} -f ${WRKSRC}/conf-qmail ${WRKSRC}/conf-qmail.sav
 	@${ECHO_CMD} "${STAGEDIR}${QMAIL_PREFIX}" > ${WRKSRC}/conf-qmail
-	@cd ${WRKSRC} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_home.o
+	@cd ${WRKSRC} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_qmail.o auto_qmail.c
 	@cd ${WRKSRC} ; ${MAKE_CMD} install instcheck
 	@${TOUCH} ${WRKSRC}/*-conf
 	@${MV} -f ${WRKSRC}/conf-qmail.sav ${WRKSRC}/conf-qmail
 
 .include <bsd.port.mk>
diff --git a/mail/qmail-contrib/Makefile b/mail/qmail-contrib/Makefile
index 977a88e886d9..e632da8f6951 100644
--- a/mail/qmail-contrib/Makefile
+++ b/mail/qmail-contrib/Makefile
@@ -1,86 +1,87 @@
 # Created by: Neil Blakey-Milner <nbm@rucus.ru.ac.za>
 # $FreeBSD$
 
 PORTNAME=	qmail-contrib
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://cr.yp.to/software/ \
 		${MASTER_SITE_GENTOO}
 MASTER_SITE_SUBDIR=	distfiles
 DISTFILES=	dot-forward-${DF_VER}.tar.gz \
 		fastforward-${FF_VER}.tar.gz
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Contributed programs for qmail
 
 OPTIONS_DEFINE=	DOCS
 
 USES=		qmail:run
 
 ALL_TARGET=	prog
 INSTALL_TARGET=	setup
 
 PREFIX?=	${QMAIL_PREFIX}
 NO_PREFIX_RMDIR=yes
 
 FF_VER=		0.51
 DF_VER=		0.71
 QCK_VER=	0.1
 
 # XXX: This port should be split into sub-packages/ports
 WRKFF=		${WRKDIR}/fastforward-${FF_VER}
 WRKDF=		${WRKDIR}/dot-forward-${DF_VER}
 
 NO_MTREE=	yes
 
 PORTDOCS=	ALIASES
 DOCSDIR=	doc/${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
 pre-patch:
 	@${PATCH} -d ${WRKFF} -s <${PATCHDIR}/extra-patch-newaliases
 
 post-patch:
 	@${ECHO_CMD} "${QMAIL_PREFIX}" > ${WRKFF}/conf-qmail
 	@${ECHO_CMD} "${QMAIL_PREFIX}" > ${WRKDF}/conf-qmail
 	@${REINPLACE_CMD} -e '/cat/d; s|doc/fastforward|${DOCSDIR}|g' \
 		${WRKFF}/hier.c \
 		${WRKDF}/hier.c
 .if !${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -E 's|^(.*${DOCSDIR})|// \1|g' \
 		${WRKFF}/hier.c
 .endif
 	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKFF}/conf-cc
 	@${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKFF}/conf-ld
 	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKDF}/conf-cc
 	@${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKDF}/conf-ld
 
 do-build:
 	@${MAKE} -C ${WRKDIR}/dot-forward-${DF_VER} ${ALL_TARGET}
 	@${MAKE} -C ${WRKDIR}/fastforward-${FF_VER} ${ALL_TARGET}
 
 # Do a dance to stage and keep out of resulting binaries (see r346769
 # and r349241)
-pre-install:
-	${MKDIR} ${STAGEDIR}${QMAIL_PREFIX}/${DOCSDIR}
+post-build:
+	@${ECHO_MSG} "===> Rebuilding DJB installer to respect STAGEDIR"
 	@${MV} -f ${WRKFF}/conf-qmail ${WRKFF}/conf-qmail.sav
 	@${ECHO_CMD} "${STAGEDIR}${QMAIL_PREFIX}" > ${WRKFF}/conf-qmail
-	@cd ${WRKFF} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_home.o
+	@cd ${WRKFF} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_qmail.o auto_qmail.c
 	@cd ${WRKFF} ; ${MAKE_CMD} install instcheck
 	@${TOUCH} ${WRKFF}/newaliases ${WRKFF}/fastforward ${WRKFF}/newinclude
 	@${MV} -f ${WRKFF}/conf-qmail.sav ${WRKFF}/conf-qmail
 
 	@${MV} -f ${WRKDF}/conf-qmail ${WRKDF}/conf-qmail.sav
 	@${ECHO_CMD} "${STAGEDIR}${QMAIL_PREFIX}" > ${WRKDF}/conf-qmail
-	@cd ${WRKDF} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_home.o
+	@cd ${WRKDF} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_qmail.o auto_qmail.c
 	@cd ${WRKDF} ; ${MAKE_CMD} install instcheck
 	@${TOUCH} ${WRKDF}/dot-forward
 	@${MV} -f ${WRKDF}/conf-qmail.sav ${WRKDF}/conf-qmail
 
 do-install:
+	@${MKDIR} ${STAGEDIR}${QMAIL_PREFIX}/${DOCSDIR}
 	@${MAKE} -C ${WRKDIR}/dot-forward-${DF_VER} ${INSTALL_TARGET}
 	@${MAKE} -C ${WRKDIR}/fastforward-${FF_VER} ${INSTALL_TARGET}
 
 .include <bsd.port.post.mk>
diff --git a/mail/qmailanalog/Makefile b/mail/qmailanalog/Makefile
index d32d9a25f680..b2e2417df8b3 100644
--- a/mail/qmailanalog/Makefile
+++ b/mail/qmailanalog/Makefile
@@ -1,61 +1,62 @@
 # Created by: Neil Blakey-Milner <nbm@rucus.ru.ac.za>
 # $FreeBSD$
 
 PORTNAME=	qmailanalog
 PORTVERSION=	0.70
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://cr.yp.to/software/ \
 		http://www.emaillab.org/djb/qmailanalog/
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Tools to analyze qmail-send activity
 
 USES=		qmail:run
 
 ALL_TARGET=	prog
 INSTALL_TARGET=	setup
 
 MANPREFIX=	${QMPREFIX}
 
 PLIST_SUB+=	MYSUBDIR=${MYSUBDIR}
 
 .if !defined(NOSUBDIR)
 MYSUBDIR?=	qmailanalog/
 .else
 MYSUBDIR?=
 .endif
 
 PREFIX?=	${QMAIL_PREFIX}
 NO_PREFIX_RMDIR=yes
 QMPREFIX?=	${PREFIX}/${MYSUBDIR}
 
 NO_MTREE=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${PREFIX} != ${QMAIL_PREFIX}
 BROKEN=	Cannot Make and Install with different PREFIX or QMAIL_PREFIX
 .endif
 
 post-patch:
 	@${ECHO_CMD} "${QMPREFIX}" > ${WRKSRC}/conf-home
 	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 	@${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
 	@${REINPLACE_CMD} 's|02755|0755|g; /cat/d' ${WRKSRC}/hier.c
 	@${REINPLACE_CMD} 's|^man prog|prog|g' ${WRKSRC}/Makefile
 
 # Do a dance to stage and keep out of resulting binaries (see r346769
 # and r349241)
-pre-install:
-	@${MKDIR} ${STAGEDIR}${QMPREFIX}
+post-build:
+	@${ECHO_MSG} "===> Rebuilding DJB installer to respect STAGEDIR"
 	@${MV} -f ${WRKSRC}/conf-home ${WRKSRC}/conf-home.sav
 	@${ECHO_CMD} "${STAGEDIR}${QMPREFIX}" > ${WRKSRC}/conf-home
-	@cd ${WRKSRC} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_home.o
+	@cd ${WRKSRC} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_home.o auto_home.c
 	@cd ${WRKSRC} ; ${MAKE_CMD} install instcheck
 	@${MV} -f ${WRKSRC}/conf-home.sav ${WRKSRC}/conf-home
 
 post-install:
+	@${MKDIR} ${STAGEDIR}${QMPREFIX}
 	${INSTALL_MAN} ${WRKSRC}/*.1 ${STAGEDIR}${MANPREFIX}/man/man1/
 
 .include <bsd.port.post.mk>
diff --git a/mail/qtools/Makefile b/mail/qtools/Makefile
index 03d490618524..5b46725e0e87 100644
--- a/mail/qtools/Makefile
+++ b/mail/qtools/Makefile
@@ -1,44 +1,45 @@
 # Created by: petef@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	qtools
 PORTVERSION=	0.56
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.superscript.com/qtools/
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Tools to use in .qmail files
 
 RUN_DEPENDS=	${EZMLM_DIR}/bin/ezmlm-weed:${PORTSDIR}/mail/ezmlm
 
 USES=		qmail:vars
 
 ALL_TARGET=	prog
 INSTALL_TARGET=	setup check
 
 LEGAL_TEXT=	No license -- see http://cr.yp.to/softwarelaw.html
 
 EZMLM_DIR?=	${LOCALBASE}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|02755|0755|g' ${WRKSRC}/hier.c
 
 do-configure:
 	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 	@${ECHO_CMD} "${CC} ${STRIP}" > ${WRKSRC}/conf-ld
 	@${ECHO_CMD} "${PREFIX}" > ${WRKSRC}/conf-home
 	@${ECHO_CMD} "${QMAIL_PREFIX}" > ${WRKSRC}/conf-qmail
 	@${ECHO_CMD} "${EZMLM_DIR}/bin/ezmlm" > ${WRKSRC}/conf-ezmlm
 
 # Do a dance to stage and keep out of resulting binaries (see r346769
 # and r349241)
-pre-install:
+post-build:
+	@${ECHO_MSG} "===> Rebuilding DJB installer to respect STAGEDIR"
 	@${MV} -f ${WRKSRC}/conf-home ${WRKSRC}/conf-home.sav
 	@${ECHO_CMD} "${STAGEDIR}${PREFIX}" > ${WRKSRC}/conf-home
-	@cd ${WRKSRC} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_home.o
+	@cd ${WRKSRC} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_home.o auto_home.c
 	@cd ${WRKSRC} ; ${MAKE_CMD} install instcheck
 	@${TOUCH} ${WRKSRC}/replier-config
 	@${MV} -f ${WRKSRC}/conf-home.sav ${WRKSRC}/conf-home
 
 .include <bsd.port.mk>