author: Kirill Ponomarev <krion@FreeBSD.org> 2006-01-21 17:37:14 +0000
committer: Kirill Ponomarev <krion@FreeBSD.org> 2006-01-21 17:37:14 +0000
commit: 01c588a6357d8452a3e0af157e9c1250c067db2f (patch)
tree: fb26bf418ea8791ab4d308a7931c623124611c3c /mail
parent: f484c99df79f169bf954fc4b0ed83e59279a596a (diff)
39 files changed, 253 insertions, 276 deletions
diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index 83190a56855e..64fd2b987fbd 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ezmlm-idx
 PORTVERSION=	0.40
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ezmlm.org/pub/patches/ \
 		ftp://gd.tuwien.ac.at/infosys/mail/qmail/ezmlm-patches/ \
@@ -22,13 +22,10 @@ PATCHFILES=	ezmlm-cgi.patch
 MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	Improved version of the ezmlm mailing list manager
 
-RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
+USE_QMAIL_RUN=	yes
 
 CONFLICTS=	ezmlm-0.*
 
-# QMAIL_DIR is the directory where qmail is installed
-QMAIL_DIR?=	/var/qmail
-
 # LANGUAGE is the ISO code for the language to use in ezmlmrc
 LANGUAGE?=	en_US
 
@@ -91,7 +88,7 @@ post-patch:
 	@${ECHO_CMD} ${EXTRACT_LIB} > ${WRKSRC}/sub_pgsql/conf-sqlld
 .endif
 	@${ECHO_CMD} ${PREFIX}/man > ${WRKSRC}/conf-man
-	@${ECHO_CMD} ${QMAIL_DIR} > ${WRKSRC}/conf-qmail
+	@${ECHO_CMD} ${QMAIL_PREFIX} > ${WRKSRC}/conf-qmail
 	@${REINPLACE_CMD} -e 's,/etc/ezmlm/,${PREFIX}/etc/ezmlm/,' \
 		${WRKSRC}/idx.h
 
diff --git a/mail/ezmlm/Makefile b/mail/ezmlm/Makefile
index 81d90a8ff21c..84aed83d7e11 100644
--- a/mail/ezmlm/Makefile
+++ b/mail/ezmlm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ezmlm
 PORTVERSION=	0.53
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://cr.yp.to/software/ \
 		ftp://ftp.fu-berlin.de/unix/mail/qmail/ \
@@ -19,15 +20,12 @@ MASTER_SITES=	http://cr.yp.to/software/ \
 MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	An easy-to-use, high-speed mailing list manager for qmail
 
-RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
+USE_QMAIL_RUN=	yes
 
 CONFLICTS=	ezmlm-idx-*
 
 NO_PACKAGE=	Unsure of DJB license
 
-# QMAIL_DIR is the directory where qmail is installed
-QMAIL_DIR?=	/var/qmail
-
 ALL_TARGET=	it
 
 PROGRAMS=	ezmlm-make ezmlm-manage ezmlm-send ezmlm-reject ezmlm-return \
@@ -43,7 +41,7 @@ post-patch:
 	@${ECHO_CMD} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
 	@${ECHO_CMD} ${CC} -s > ${WRKSRC}/conf-ld
 	@${ECHO_CMD} ${PREFIX}/man > ${WRKSRC}/conf-man
-	@${ECHO_CMD} ${QMAIL_DIR} > ${WRKSRC}/conf-qmail
+	@${ECHO_CMD} ${QMAIL_PREFIX} > ${WRKSRC}/conf-qmail
 
 do-install:
 	cd ${WRKSRC} && \
diff --git a/mail/mailfront/Makefile b/mail/mailfront/Makefile
index 076b3a19411a..894389eef448 100644
--- a/mail/mailfront/Makefile
+++ b/mail/mailfront/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mailfront
 PORTVERSION=	0.97
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://untroubled.org/${PORTNAME}/ \
 		${MASTER_SITE_LOCAL}
@@ -18,6 +19,7 @@ COMMENT=	Mail server network protocol front-ends
 BUILD_DEPENDS=	${BGLIBS_LIB}/libbg.a:${PORTSDIR}/devel/bglibs \
 		${CVM_LIB}/libcvm-v2client.a:${PORTSDIR}/security/cvm
 
+WANT_QMAIL=	yes
 USE_GPG=	yes
 SIG_SUFFIX=	.sig
 QMAIL_PREFIX?=	/var/qmail
diff --git a/mail/mess822/Makefile b/mail/mess822/Makefile
index a163ee95fe8d..ff7273f4a5d3 100644
--- a/mail/mess822/Makefile
+++ b/mail/mess822/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mess822
 PORTVERSION=	0.58
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://cr.yp.to/software/ \
 		ftp://ftp.jp.qmail.org/qmail/ \
@@ -16,7 +17,7 @@ MASTER_SITES=	http://cr.yp.to/software/ \
 MAINTAINER=	drs@rucus.ru.ac.za
 COMMENT=	RFC 822 mail message parsing library and rewriting utilities
 
-RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
+USE_QMAIL_RUN=	yes
 
 NO_PACKAGE=	Violates djb\'s license
 USE_REINPLACE=	yes
@@ -31,17 +32,11 @@ MAN3=		mess822.3 mess822_addr.3 mess822_date.3 mess822_fold.3 \
 MAN5=		rewriting.5
 MAN8=		ofmipd.8 ofmipname.8
 
-.if exists(${PREFIX}/qmail/bin/qmail-send)
-QMAIL_DIR?=	${PREFIX}/qmail
-.else
-QMAIL_DIR?=	/var/qmail
-.endif
-
 NO_MTREE=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|-O2|${CFLAGS}|" ${WRKSRC}/conf-cc
-	@${REINPLACE_CMD} -e "s|.var.qmail|${QMAIL_DIR}|" ${WRKSRC}/conf-qmail
+	@${REINPLACE_CMD} -e "s|.var.qmail|${QMAIL_PREFIX}|" ${WRKSRC}/conf-qmail
 	@${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-home
 
 .include <bsd.port.mk>
diff --git a/mail/qmHandle/Makefile b/mail/qmHandle/Makefile
index 85f2e2a25258..26ae4608ef3e 100644
--- a/mail/qmHandle/Makefile
+++ b/mail/qmHandle/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qmHandle
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	qmhandle
@@ -16,18 +16,12 @@ DISTNAME=	qmhandle-${PORTVERSION}
 MAINTAINER=	petef@FreeBSD.org
 COMMENT=	Tool to view and manage a qmail queue
 
-RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-qstat:${PORTSDIR}/mail/qmail
+USE_QMAIL_RUN=	yes
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 USE_PERL5=	yes
 
-.if exists(${LOCALBASE}/qmail/bin/qmail-qstat)
-QMAIL_DIR?=	${LOCALBASE}/qmail
-.else
-QMAIL_DIR?=	/var/qmail
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500601
diff --git a/mail/qmail-activedir/Makefile b/mail/qmail-activedir/Makefile
index e745e6b1f980..21a43af819e0 100644
--- a/mail/qmail-activedir/Makefile
+++ b/mail/qmail-activedir/Makefile
@@ -7,20 +7,18 @@
 
 PORTNAME=	qmail-activedir
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://fo2k.com/qmail-activedir/
 
 MAINTAINER=	jmelo@freebsdbrasil.com.br
 COMMENT=	Programs to allow qmail to authenticate users through a MS ad
 
-BUILD_DEPENDS=	${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
+USE_QMAIL_RUN=	yes
 SUB_FILES=	pkg-message
 SUB_LIST+=	QMAIL_PREFIX=${QMAIL_PREFIX}
 USE_OPENLDAP=	yes
 USE_REINPLACE=	yes
-QMAIL_PREFIX?=	/var/qmail
 
 BINARIES=	checkadpassword qmail-adgetpw create_alias_files
 
diff --git a/mail/qmail-conf/Makefile b/mail/qmail-conf/Makefile
index 14ddb969b307..93bf63a5c39c 100644
--- a/mail/qmail-conf/Makefile
+++ b/mail/qmail-conf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qmail-conf
 PORTVERSION=	0.60
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.din.or.jp/~ushijima/qmail-conf/ \
 		http://cr.yp.to/djbdns/
@@ -18,14 +18,14 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	roam@FreeBSD.org
 COMMENT=	Configure various qmail services to run under daemontools
 
+WANT_QMAIL=	yes
+
 ALL_TARGET=	it
 INSTALL_TARGET=	setup check
 
 NO_PACKAGE=	"borrows code from djbdns, thus falls under the same restrictions as dns/djbdns"
 
-# Note: this MUST be the same as the directory qmail is installed in!
-QMAIL_DIR?=	/var/qmail
-PREFIX?=	${QMAIL_DIR}
+PREFIX?=	${QMAIL_PREFIX}
 
 NO_MTREE=	yes
 
@@ -33,11 +33,13 @@ DJBDNS_VER=	1.05
 DJBDNS_NAME=	djbdns-${DJBDNS_VER}
 DJBDNS_DIST=	${DJBDNS_NAME}${EXTRACT_SUFX}
 
+.include <bsd.port.pre.mk>
+
 post-extract:
 		@(cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DJBDNS_DIST} ${EXTRACT_AFTER_ARGS})
 
 post-patch:
-		@${ECHO_CMD} "${QMAIL_DIR}" > ${WRKSRC}/conf-qmail
+		@${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
@@ -45,4 +47,4 @@ post-patch:
 pre-build:
 		@(cd ${WRKSRC} && ${MAKE} djbdns=${DJBDNS_NAME} -f Makefile.ini)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/qmail-contrib/Makefile b/mail/qmail-contrib/Makefile
index f5a3dd507aa3..97d77813f0a1 100644
--- a/mail/qmail-contrib/Makefile
+++ b/mail/qmail-contrib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qmail-contrib
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.qmail.org/pub/software/ \
 		ftp://rucus.ru.ac.za/pub/mail/qmail/src/
@@ -16,7 +17,7 @@ DISTFILES=	dot-forward-${DF_VER}.tar.gz \
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Contributed programs for qmail
 
-RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
+USE_QMAIL_RUN=	yes
 
 NO_PACKAGE=	Unsure of djb\'s license
 
@@ -28,19 +29,7 @@ MAN1+=		newaliases.1 printmaillist.1 setmaillist.1 newinclude.1
 
 PLIST_SUB=	DOCDIR=${DOCDIR}
 
-.if exists(${PREFIX}/qmail/bin/qmail-send)
-QMAIL_DIR?=	${PREFIX}/qmail
-PREFIX?=	${PREFIX}/qmail
-.else
-QMAIL_DIR?=	/var/qmail
-PREFIX?=	/var/qmail
-.endif
-
-.if (${PREFIX} == ${LOCALBASE})
-DOCDIR=		share/doc/qmail
-.else
-DOCDIR=		doc
-.endif
+PREFIX?=	${QMAIL_PREFIX}
 
 FF_VER=		0.51
 DF_VER=		0.71
@@ -53,12 +42,19 @@ NO_MTREE=	yes
 
 USE_REINPLACE=	yes
 
+.include <bsd.port.pre.mk>
+
+.if (${PREFIX} == ${LOCALBASE})
+DOCDIR=		share/doc/qmail
+.else
+DOCDIR=		doc
+.endif
+
 pre-patch:
 	@cd ${WRKFF} \
 	&& ${PATCH} -s <${PATCHDIR}/extra-patch-newaliases
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|-O2|${CFLAGS}|" ${WRKFF}/conf-cc
 	@${REINPLACE_CMD} -e "s|.var.qmail|${QMAIL_DIR}|" ${WRKFF}/conf-qmail
 	@${REINPLACE_CMD} -e '/cat/d' ${WRKFF}/hier.c
 	@${REINPLACE_CMD} -e "s|-O2|${CFLAGS}|" ${WRKDF}/conf-cc
@@ -77,4 +73,4 @@ do-install:
 	@cd ${WRKDIR}/fastforward-${FF_VER} \
 	&& make ${INSTALL_TARGET}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile
index 76c695e8d47e..9aa8e5667502 100644
--- a/mail/qmail-ldap/Makefile
+++ b/mail/qmail-ldap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${LDAP_PATCH_DATE}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-ldap
 
diff --git a/mail/qmail-mysql/Makefile b/mail/qmail-mysql/Makefile
index 923ba468d284..464630cd474f 100644
--- a/mail/qmail-mysql/Makefile
+++ b/mail/qmail-mysql/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${MYSQL_PATCH_VERSION}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-mysql
 
diff --git a/mail/qmail-rblchk/Makefile b/mail/qmail-rblchk/Makefile
index 2cb8b6766034..f348b05436da 100644
--- a/mail/qmail-rblchk/Makefile
+++ b/mail/qmail-rblchk/Makefile
@@ -13,14 +13,13 @@ MASTER_SITES=	http://morettoni.net/qmail/
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A qmail RBL filter
 
-RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
+USE_QMAIL_RUN=	yes
 
 LDFLAGS?=	-s
 CFLAGS?=	-O2 -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized \
 		-Wshadow -Wcast-qual -Wcast-align -Wwrite-strings
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-QMAIL_DIR?=	/var/qmail
 
 ALL_TARGET=	default
 INSTALL_TARGET=	setup
diff --git a/mail/qmail-scanner/Makefile b/mail/qmail-scanner/Makefile
index 3ce416e540a2..caf6915735ca 100644
--- a/mail/qmail-scanner/Makefile
+++ b/mail/qmail-scanner/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qmail-scanner
 PORTVERSION=	1.25
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,14 +17,10 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	freebsd@simplerezo.com
 COMMENT=	Content/Anti-virus Scanner for qmail
 
-BUILD_DEPENDS=	${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail \
-		reformime:${PORTSDIR}/mail/maildrop \
+BUILD_DEPENDS=	reformime:${PORTSDIR}/mail/maildrop \
 		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
 
-# A normal qmail installation puts everything into /var/qmail/.
-# Must match your qmail installation
-QMAIL_DIR?=	/var/qmail
-QMAIL_QUEUE=	${QMAIL_DIR}/bin/qmail-queue
+QMAIL_QUEUE=	${QMAIL_PREFIX}/bin/qmail-queue
 
 USE_PERL5=	yes
 NO_BUILD=	yes
@@ -79,12 +75,14 @@ CONFIGURE_ARGS+=	--spams-tosuffix "${QMAILSCAN_SPAMSTOSUFFIX}"
 
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_QMAIL=	yes
+
 SPOOLDIR=	${PREFIX}/qmailscan
 PLIST_SUB=	SPOOLDIR="${SPOOLDIR:S,${PREFIX}/,,}"
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=	\
-		--qmaildir "${QMAIL_DIR}" --spooldir "${SPOOLDIR}" \
+		--qmaildir "${QMAIL_PREFIX}" --spooldir "${SPOOLDIR}" \
 		--bindir "${PREFIX}/bin" --qmail-queue-binary "${QMAIL_QUEUE}" \
 		--admin "${QMAILSCAN_ADMIN}" --notify "${QMAILSCAN_NOTIFY}" \
 		--silent-viruses "${QMAILSCAN_SILENTVIRUSES}" \
@@ -137,7 +135,7 @@ pre-configure:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} PRE-INSTALL
 	@if ! ${TEST} -f ${QMAIL_QUEUE}; then \
 		${ECHO_MSG} "Unable to found qmail-queue binary trying '${QMAIL_QUEUE}'.";  \
-		${ECHO_MSG} "Please set QMAIL_DIR to your qmail installation directory !"; \
+		${ECHO_MSG} "Please set QMAIL_PREFIX to your qmail installation directory !"; \
 		exit 1; \
 	fi
 
diff --git a/mail/qmail-scanner/pkg-plist b/mail/qmail-scanner/pkg-plist
index 4eaf88befb04..f7e3018df384 100644
--- a/mail/qmail-scanner/pkg-plist
+++ b/mail/qmail-scanner/pkg-plist
@@ -2,16 +2,22 @@
 bin/qmail-scanner-queue.pl
 bin/qs2mrtg.pl
 share/examples/qs2mrtg/mrtg-qmail-scanner.cfg
+@dirrm share/examples/qs2mrtg
+@unexec if cmp -s %D/%%SPOOLDIR%%/quarantine-attachments.txt %D/%%SPOOLDIR%%/quarantine-attachments.sample; then rm -f %D/%%SPOOLDIR%%/quarantine-attachments.txt && rm -f %D/%%SPOOLDIR%%/quarantine-attachments.db; fi
 %%SPOOLDIR%%/quarantine-attachments.sample
-@unexec if cmp -s %%SPOOLDIR%%/quarantine-attachments.txt %%SPOOLDIR%%/quarantine-attachments.sample; then rm -f %%SPOOLDIR%%/quarantine-attachments.txt; fi
-@unexec rmdir share/examples/qs2mrtg 2>/dev/null || true
-@unexec rmdir %%SPOOLDIR%%/archives/cur 2>/dev/null || true
-@unexec rmdir %%SPOOLDIR%%/archives/new 2>/dev/null || true
-@unexec rmdir %%SPOOLDIR%%/archives/tmp 2>/dev/null || true
-@unexec rmdir %%SPOOLDIR%%/archives 2>/dev/null || true
-@unexec rmdir %%SPOOLDIR%%/quarantine/cur 2>/dev/null || true
-@unexec rmdir %%SPOOLDIR%%/quarantine/new 2>/dev/null || true
-@unexec rmdir %%SPOOLDIR%%/quarantine/tmp 2>/dev/null || true
-@unexec rmdir %%SPOOLDIR%%/quarantine 2>/dev/null || true
-@unexec rmdir %%SPOOLDIR%%/tmp 2>/dev/null || true
-@unexec rmdir %%SPOOLDIR%% 2>/dev/null || true
+@exec [ ! -f %D/%%SPOOLDIR%%/quarantine-attachments.txt ] && cp %D/%%SPOOLDIR%%/quarantine-attachments.sample %D/%%SPOOLDIR%%/quarantine-attachments.txt
+%%SPOOLDIR%%/qmail-scanner-queue-version.txt
+@unexec rmdir %D/%%SPOOLDIR%%/archives/cur 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%%/archives/new 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%%/archives/tmp 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%%/archives 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%%/quarantine/cur 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%%/quarantine/new 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%%/quarantine/tmp 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%%/quarantine 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%%/working/cur 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%%/working/new 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%%/working/tmp 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%%/working 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%%/tmp 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%% 2>/dev/null || true
diff --git a/mail/qmail-scanner1/Makefile b/mail/qmail-scanner1/Makefile
index 3ce416e540a2..caf6915735ca 100644
--- a/mail/qmail-scanner1/Makefile
+++ b/mail/qmail-scanner1/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qmail-scanner
 PORTVERSION=	1.25
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,14 +17,10 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	freebsd@simplerezo.com
 COMMENT=	Content/Anti-virus Scanner for qmail
 
-BUILD_DEPENDS=	${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail \
-		reformime:${PORTSDIR}/mail/maildrop \
+BUILD_DEPENDS=	reformime:${PORTSDIR}/mail/maildrop \
 		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
 
-# A normal qmail installation puts everything into /var/qmail/.
-# Must match your qmail installation
-QMAIL_DIR?=	/var/qmail
-QMAIL_QUEUE=	${QMAIL_DIR}/bin/qmail-queue
+QMAIL_QUEUE=	${QMAIL_PREFIX}/bin/qmail-queue
 
 USE_PERL5=	yes
 NO_BUILD=	yes
@@ -79,12 +75,14 @@ CONFIGURE_ARGS+=	--spams-tosuffix "${QMAILSCAN_SPAMSTOSUFFIX}"
 
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_QMAIL=	yes
+
 SPOOLDIR=	${PREFIX}/qmailscan
 PLIST_SUB=	SPOOLDIR="${SPOOLDIR:S,${PREFIX}/,,}"
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=	\
-		--qmaildir "${QMAIL_DIR}" --spooldir "${SPOOLDIR}" \
+		--qmaildir "${QMAIL_PREFIX}" --spooldir "${SPOOLDIR}" \
 		--bindir "${PREFIX}/bin" --qmail-queue-binary "${QMAIL_QUEUE}" \
 		--admin "${QMAILSCAN_ADMIN}" --notify "${QMAILSCAN_NOTIFY}" \
 		--silent-viruses "${QMAILSCAN_SILENTVIRUSES}" \
@@ -137,7 +135,7 @@ pre-configure:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} PRE-INSTALL
 	@if ! ${TEST} -f ${QMAIL_QUEUE}; then \
 		${ECHO_MSG} "Unable to found qmail-queue binary trying '${QMAIL_QUEUE}'.";  \
-		${ECHO_MSG} "Please set QMAIL_DIR to your qmail installation directory !"; \
+		${ECHO_MSG} "Please set QMAIL_PREFIX to your qmail installation directory !"; \
 		exit 1; \
 	fi
 
diff --git a/mail/qmail-scanner1/pkg-plist b/mail/qmail-scanner1/pkg-plist
index 4eaf88befb04..f7e3018df384 100644
--- a/mail/qmail-scanner1/pkg-plist
+++ b/mail/qmail-scanner1/pkg-plist
@@ -2,16 +2,22 @@
 bin/qmail-scanner-queue.pl
 bin/qs2mrtg.pl
 share/examples/qs2mrtg/mrtg-qmail-scanner.cfg
+@dirrm share/examples/qs2mrtg
+@unexec if cmp -s %D/%%SPOOLDIR%%/quarantine-attachments.txt %D/%%SPOOLDIR%%/quarantine-attachments.sample; then rm -f %D/%%SPOOLDIR%%/quarantine-attachments.txt && rm -f %D/%%SPOOLDIR%%/quarantine-attachments.db; fi
 %%SPOOLDIR%%/quarantine-attachments.sample
-@unexec if cmp -s %%SPOOLDIR%%/quarantine-attachments.txt %%SPOOLDIR%%/quarantine-attachments.sample; then rm -f %%SPOOLDIR%%/quarantine-attachments.txt; fi
-@unexec rmdir share/examples/qs2mrtg 2>/dev/null || true
-@unexec rmdir %%SPOOLDIR%%/archives/cur 2>/dev/null || true
-@unexec rmdir %%SPOOLDIR%%/archives/new 2>/dev/null || true
-@unexec rmdir %%SPOOLDIR%%/archives/tmp 2>/dev/null || true
-@unexec rmdir %%SPOOLDIR%%/archives 2>/dev/null || true
-@unexec rmdir %%SPOOLDIR%%/quarantine/cur 2>/dev/null || true
-@unexec rmdir %%SPOOLDIR%%/quarantine/new 2>/dev/null || true
-@unexec rmdir %%SPOOLDIR%%/quarantine/tmp 2>/dev/null || true
-@unexec rmdir %%SPOOLDIR%%/quarantine 2>/dev/null || true
-@unexec rmdir %%SPOOLDIR%%/tmp 2>/dev/null || true
-@unexec rmdir %%SPOOLDIR%% 2>/dev/null || true
+@exec [ ! -f %D/%%SPOOLDIR%%/quarantine-attachments.txt ] && cp %D/%%SPOOLDIR%%/quarantine-attachments.sample %D/%%SPOOLDIR%%/quarantine-attachments.txt
+%%SPOOLDIR%%/qmail-scanner-queue-version.txt
+@unexec rmdir %D/%%SPOOLDIR%%/archives/cur 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%%/archives/new 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%%/archives/tmp 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%%/archives 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%%/quarantine/cur 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%%/quarantine/new 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%%/quarantine/tmp 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%%/quarantine 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%%/working/cur 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%%/working/new 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%%/working/tmp 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%%/working 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%%/tmp 2>/dev/null || true
+@unexec rmdir %D/%%SPOOLDIR%% 2>/dev/null || true
diff --git a/mail/qmail-spamcontrol/Makefile b/mail/qmail-spamcontrol/Makefile
index 9f2dd84faae8..0f73edf1d773 100644
--- a/mail/qmail-spamcontrol/Makefile
+++ b/mail/qmail-spamcontrol/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${SPAMCONTROL_VERSION}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES+=	http://www.fehcom.de/qmail/spamcontrol/:spamcontrol
 PKGNAMESUFFIX=	-spamcontrol
diff --git a/mail/qmail-tls/Makefile b/mail/qmail-tls/Makefile
index dbcd08dbb7ce..69e60da536d4 100644
--- a/mail/qmail-tls/Makefile
+++ b/mail/qmail-tls/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${TLS_PATCH_DATE}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-tls
 
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 55ac1bd239e9..0fa4474078d3 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qmail
 PORTVERSION?=	${QMAIL_VERSION}
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	mail
 MASTER_SITES+=	${MASTER_SITE_QMAIL}
 DISTNAME=	${PORTNAME}-${QMAIL_VERSION}
@@ -98,10 +98,7 @@ PATCH_SITE_SUBDIR+=	garga/qmail/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota
 NO_PACKAGE=	"djb\'s packaging license does not allow non-standard \
 		qmail binary distributions"
 
-# A normal qmail installation puts everything into /var/qmail/.
-# If you want to install to /usr/local/, then "/usr/local/qmail" is
-# suggested instead of "/usr/local", but both will work.
-PREFIX?=		/var/qmail
+PREFIX?=		${QMAIL_PREFIX}
 QMAIL_VERSION?=		1.03
 
 .if !defined(BARRIER_SMTP_AUTH_PATCH)
@@ -198,6 +195,10 @@ MAN8+=	qmail-local.8 qmail-lspawn.8 qmail-getpw.8 qmail-remote.8 \
 	qmail-tcpto.8 qmail-pop3d.8 qmail-popup.8 qmail-qmqpc.8 qmail-qmqpd.8 \
 	qmail-qmtpd.8 qmail-smtpd.8 qmail-command.8
 
+.if defined(SLAVE_MYSQL)
+PKGMESSAGE_SUFFIX=	mysql
+.endif
+
 .if defined(SLAVE_SPAMCONTROL)
 EXTRA_MAN8=	qmail-badloadertypes.8 qmail-badmimetypes.8 qmail-recipients.8
 ALL_TARGET+=	${EXTRA_MAN8}
@@ -211,7 +212,7 @@ PLIST_SUB+=	README_AUTH="@comment "
 .endif
 
 .if defined(SLAVE_LDAP)
-PKGMESSAGE_SUFFIX=	-ldap
+PKGMESSAGE_SUFFIX=	ldap
 PLIST_SUB+=	LDAP="" NOT_LDAP="@comment "
 .else
 PLIST_SUB+=	LDAP="@comment " NOT_LDAP=""
@@ -224,16 +225,27 @@ PLIST_SUB+=	SPAMCONTROL="@comment "
 .endif
 
 .if defined(SLAVE_TLS)
-PKGMESSAGE_SUFFIX=	-tls
+PKGMESSAGE_SUFFIX=	tls
 PLIST_SUB+=	TLS=""
 .else
 PLIST_SUB+=	TLS="@comment "
 .endif
 
-SUB_FILES+=	pkg-message${PKGMESSAGE_SUFFIX} mailer.conf.sample \
-		bootfiles.sed enable-qmail
+.if defined(PKGMESSAGE_SUFFIX)
+SLAVEPORT_LINE=	${PKGMESSAGE_SUFFIX}
+.elif defined(SLAVE_SPAMCONTROL)
+SLAVEPORT_LINE=	spamcontrol
+.endif
+
+SUB_FILES+=	mailer.conf.sample bootfiles.sed enable-qmail
 PKGINSTALL?=	${WRKDIR}/pkg-install
-PKGMESSAGE?=	${WRKDIR}/pkg-message${PKGMESSAGE_SUFFIX}
+
+.if defined(PKGMESSAGE_SUFFIX)
+SUB_FILES+=	pkg-message-${PKGMESSAGE_SUFFIX}
+PKGMESSAGE?=	${WRKDIR}/pkg-message-${PKGMESSAGE_SUFFIX}
+.else
+SUB_FILES+=	pkg-message
+.endif
 
 CSH?=	/bin/csh
 
@@ -291,6 +303,8 @@ CONFIGUREPROGS=	${WRKSRC}/install ${WRKSRC}/dnsfq ${WRKSRC}/hostname \
 		${WRKSRC}/dnsip ${WRKSRC}/ipmeprint ${WRKSRC}/dnsptr
 CONFIGUREFILES=	${WRKSRC}/config ${WRKSRC}/config-fast
 
+.include "${.CURDIR}/../../Mk/bsd.mail.mk"
+
 .if (${PREFIX} != ${LOCALBASE})
 DOCSDIR=	${PREFIX}/doc
 .endif
@@ -308,10 +322,8 @@ CFLAGS+=	-DDEBUG
 .endif
 
 .if defined(SLAVE_LDAP)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}2
 
 .if !defined(WITHOUT_TLS)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-with_tls
 # we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 .endif
@@ -469,6 +481,18 @@ pre-everything::
 	@${ECHO_MSG} ""
 .endif
 
+.if !defined(QMAIL_PREFIX)
+	@${ECHO_MSG} "QMAIL_PREFIX=PREFIX_PATH"
+	@${ECHO_MSG} "		(default PREFIX_PATH=${PREFIX})"
+	@${ECHO_MSG} "		A normal qmail installation puts"
+	@${ECHO_MSG} "		everything into /var/qmail/."
+	@${ECHO_MSG} "		If you want to install to ${LOCALBASE},"
+	@${ECHO_MSG} "		then \"${LOCALBASE}/qmail\" is suggested"
+	@${ECHO_MSG} "		instead of \"${LOCALBASE}\", but both will"
+	@${ECHO_MSG} "		work."
+ 	@${ECHO_MSG} ""
+.endif
+ 
 post-extract:
 .if defined(SLAVE_SPAMCONTROL)
 	@cd ${WRKSRC} && ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${SPAMCONTROL_DIST}
@@ -596,6 +620,17 @@ do-install:
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
+.if defined(SLAVEPORT_LINE)
+	@${ECHO_CMD} "============================================="
+	@${ECHO_CMD}
+	@${ECHO_CMD} "ATTENTION"
+	@${ECHO_CMD}
+	@${ECHO_CMD} "Add the following line to your /etc/make.conf"
+	@${ECHO_CMD} "QMAIL_SLAVEPORT=${SLAVEPORT_LINE}"
+	@${ECHO_CMD}
+	@${ECHO_CMD} "============================================="
+	@${ECHO_CMD}
+.endif
 
 certificate:
 .if defined(SLAVE_TLS) || defined(SLAVE_LDAP)
diff --git a/mail/qmailadmin-devel/Makefile b/mail/qmailadmin-devel/Makefile
index 49f61b707c86..2a476e5d3594 100644
--- a/mail/qmailadmin-devel/Makefile
+++ b/mail/qmailadmin-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qmailadmin
 PORTVERSION=	1.2.7
+PORTREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,11 +17,9 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT=	CGI program for administering Qmail with vchkpw/vpopmail
 
 BUILD_DEPENDS=	\
-	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
 	autorespond:${PORTSDIR}/mail/autorespond \
 	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail-devel
 RUN_DEPENDS=	\
-	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
 	autorespond:${PORTSDIR}/mail/autorespond \
 	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail-devel
 
@@ -36,6 +35,7 @@ CONFLICTS=	qmailadmin-1.*
 
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
+WANT_QMAIL=	yes
 
 #
 # User-configurable variables
@@ -73,20 +73,10 @@ PLIST_SUB+=	CGIBINDIR="${CGIBINDIR}" CGIBINSUBDIR="${CGIBINSUBDIR}" \
 
 .include <bsd.port.pre.mk>
 
-#
-# QMAIL_DIR     - location of qmail directory
-#
-
-.if exists(${LOCALBASE}/qmail/bin/qmail-send)
-QMAIL_DIR?=	${LOCALBASE}/qmail
-.else
-QMAIL_DIR?=	/var/qmail
-.endif
-
 # End of user-configurable variables
 
 CONFIGURE_ARGS+=	\
-	--enable-qmaildir=${QMAIL_DIR} \
+	--enable-qmaildir=${QMAIL_PREFIX} \
 	--enable-htmldir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \
 	--enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR}/images \
 	--enable-imageurl=${WEBDATAURL}/${WEBDATASUBDIR}/images \
diff --git a/mail/qmailadmin/Makefile b/mail/qmailadmin/Makefile
index 61f4ae68916b..10ca858ae3fc 100644
--- a/mail/qmailadmin/Makefile
+++ b/mail/qmailadmin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qmailadmin
 PORTVERSION=	1.2.7
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -43,6 +43,7 @@ CONFLICTS=	qmailadmin-devel-1.*
 
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
+WANT_QMAIL=	yes
 
 #
 # User-configurable variables
@@ -81,20 +82,10 @@ PLIST_SUB+=	CGIBINDIR="${CGIBINDIR}" CGIBINSUBDIR="${CGIBINSUBDIR}" \
 
 .include <bsd.port.pre.mk>
 
-#
-# QMAIL_DIR     - location of qmail directory
-#
-
-.if exists(${LOCALBASE}/qmail/bin/qmail-send)
-QMAIL_DIR?=	${LOCALBASE}/qmail
-.else
-QMAIL_DIR?=	/var/qmail
-.endif
-
 # End of user-configurable variables
 
 CONFIGURE_ARGS+=	\
-	--enable-qmaildir=${QMAIL_DIR} \
+	--enable-qmaildir=${QMAIL_PREFIX} \
 	--enable-htmldir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \
 	--enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR}/images \
 	--enable-imageurl=${WEBDATAURL}/${WEBDATASUBDIR}/images \
diff --git a/mail/qmailanalog/Makefile b/mail/qmailanalog/Makefile
index 6fc29071352a..d2b0b233c28c 100644
--- a/mail/qmailanalog/Makefile
+++ b/mail/qmailanalog/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	qmailanalog
 PORTVERSION=	0.70
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://cr.yp.to/software/
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	A collection of tools to analyze qmail-send's activity
 
-RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
+USE_QMAIL_RUN=	yes
 
 ALL_TARGET=	it
 INSTALL_TARGET=	setup
@@ -24,19 +24,13 @@ MAN1=		matchup.1 xqp.1 xsender.1 xrecipient.1 columnt.1
 
 PLIST_SUB+=	MYSUBDIR=${MYSUBDIR}
 
-.if exists(${PREFIX}/qmail/bin/qmail-send)
-QMAIL_DIR?=	${PREFIX}/qmail
-.else
-QMAIL_DIR?=	/var/qmail
-.endif
-
 .if !defined(NOSUBDIR)
 MYSUBDIR?=	qmailanalog/
 .else
 MYSUBDIR?=
 .endif
 
-PREFIX?=	${QMAIL_DIR}
+PREFIX?=	${QMAIL_PREFIX}
 QMPREFIX?=	${PREFIX}/${MYSUBDIR}
 
 NO_MTREE=	yes
@@ -44,8 +38,8 @@ USE_REINPLACE=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${PREFIX} != ${QMAIL_DIR}
-BROKEN=	"Cannot Make and Install with different PREFIX or QMAIL_DIR"
+.if ${PREFIX} != ${QMAIL_PREFIX}
+BROKEN=	"Cannot Make and Install with different PREFIX or QMAIL_PREFIX"
 .endif
 
 post-patch:
diff --git a/mail/qmailmrtg7/Makefile b/mail/qmailmrtg7/Makefile
index d66de2663568..21f098a14111 100644
--- a/mail/qmailmrtg7/Makefile
+++ b/mail/qmailmrtg7/Makefile
@@ -7,29 +7,23 @@
 
 PORTNAME=	qmailmrtg7
 PORTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	mail net-mgmt
 MASTER_SITES=	http://www.inter7.com/qmailmrtg7/
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	A program to create mrtg graphs for qmail activity
 
-BUILD_DEPENDS=	${QMAIL_DIR}/bin/qmail-queue:${PORTSDIR}/mail/qmail
-RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-queue:${PORTSDIR}/mail/qmail \
-		mrtg:${PORTSDIR}/net-mgmt/mrtg
+RUN_DEPENDS=	mrtg:${PORTSDIR}/net-mgmt/mrtg
+USE_QMAIL=	yes
 
 USE_REINPLACE=	yes
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/qmail/bin/qmail-queue)
-QMAIL_DIR?=	${LOCALBASE}/qmail
-.else
-QMAIL_DIR?=	/var/qmail
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} "s|cc|${CC}|g;s|-s -O|${CFLAGS}|g" ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} "s|/usr/local|${PREFIX}|g;s|/var/qmail|${QMAIL_DIR}|g" \
+	@${REINPLACE_CMD} "s|/usr/local|${PREFIX}|g;s|/var/qmail|${QMAIL_PREFIX}|g" \
 		${WRKSRC}/checkq.c ${WRKSRC}/qmail.mrtg.cfg
 
 do-install:
diff --git a/mail/qmhandle/Makefile b/mail/qmhandle/Makefile
index 85f2e2a25258..26ae4608ef3e 100644
--- a/mail/qmhandle/Makefile
+++ b/mail/qmhandle/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qmHandle
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	qmhandle
@@ -16,18 +16,12 @@ DISTNAME=	qmhandle-${PORTVERSION}
 MAINTAINER=	petef@FreeBSD.org
 COMMENT=	Tool to view and manage a qmail queue
 
-RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-qstat:${PORTSDIR}/mail/qmail
+USE_QMAIL_RUN=	yes
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 USE_PERL5=	yes
 
-.if exists(${LOCALBASE}/qmail/bin/qmail-qstat)
-QMAIL_DIR?=	${LOCALBASE}/qmail
-.else
-QMAIL_DIR?=	/var/qmail
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500601
diff --git a/mail/qscan/Makefile b/mail/qscan/Makefile
index 0cbcabf95c0b..7245986c1e72 100644
--- a/mail/qscan/Makefile
+++ b/mail/qscan/Makefile
@@ -7,28 +7,24 @@
 
 PORTNAME=	qscan
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	mail security
 MASTER_SITES=	ftp://ftp.c9x.org/qscan/
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	A mail filter for Qmail that scans messages with ClamAV
 
-RUN_DEPENDS=	${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail \
-		clamdscan:${PORTSDIR}/security/clamav \
+RUN_DEPENDS=	clamdscan:${PORTSDIR}/security/clamav \
 		ripmime:${PORTSDIR}/mail/ripmime
+USE_QMAIL_RUN=	yes
 
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/qmail/bin/qmail-queue)
-QMAIL_DIR?=	${LOCALBASE}/qmail
-.else
-QMAIL_DIR?=	/var/qmail
-.endif
-QMAIL_QUEUE=	${QMAIL_DIR}/bin/qmail-queue
-QSCAN_VAR?=	${QMAIL_DIR}/${PORTNAME}
+QMAIL_QUEUE=	${QMAIL_PREFIX}/bin/qmail-queue
+QSCAN_VAR?=	${QMAIL_PREFIX}/${PORTNAME}
 PLIST_SUB+=	QSCAN_VAR="${QSCAN_VAR}" \
 		QMAIL_QUEUE="${QMAIL_QUEUE}"
 
diff --git a/mail/qsheff/Makefile b/mail/qsheff/Makefile
index 24cf4cfced35..5a00cd4f8d0d 100644
--- a/mail/qsheff/Makefile
+++ b/mail/qsheff/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qsheff
 PORTVERSION=	1.0.r4
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.enderunix.org/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -16,9 +17,9 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-r/}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A qmail-queue replacement to filter mail traffic
 
-BUILD_DEPENDS=	${QMAIL_DIR}/bin/qmail-queue:${PORTSDIR}/mail/qmail \
-		${LOCALBASE}/bin/ripmime:${PORTSDIR}/mail/ripmime
+BUILD_DEPENDS=	${LOCALBASE}/bin/ripmime:${PORTSDIR}/mail/ripmime
 RUN_DEPENDS=	${BUILD_DEPENDS}
+USE_QMAIL=	yes
 
 USE_REINPLACE=	YES
 GNU_CONFIGURE=	YES
@@ -29,13 +30,7 @@ PORTDOCS=	spamass-qsheff.en.html README COPYING AUTHORS ChangeLog \
 
 OPTIONS=	CLAMAV "Integrate with Clam AntiVirus" on
 
-.if exists(${LOCALBASE}/qmail/bin/qmail-queue)
-QMAIL_DIR?=	${LOCALBASE}/qmail
-.else
-QMAIL_DIR?=	/var/qmail
-.endif
-
-CONFIGURE_ARGS+=	--with-qmaildir=${QMAIL_DIR}
+CONFIGURE_ARGS+=	--with-qmaildir=${QMAIL_PREFIX}
 
 .include <bsd.port.pre.mk>
 
diff --git a/mail/qtools/Makefile b/mail/qtools/Makefile
index 9dc33ceb6193..171e9a5433ef 100644
--- a/mail/qtools/Makefile
+++ b/mail/qtools/Makefile
@@ -7,27 +7,32 @@
 
 PORTNAME=	qtools
 PORTVERSION=	0.56
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.superscript.com/qtools/
 
 MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	Tools to use in .qmail files
 
-RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
-		${EZMLM_DIR}/bin/ezmlm-weed:${PORTSDIR}/mail/ezmlm
+RUN_DEPENDS=	${EZMLM_DIR}/bin/ezmlm-weed:${PORTSDIR}/mail/ezmlm
+
+WANT_QMAIL=	yes
 
 ALL_TARGET=	it
 INSTALL_TARGET=	setup check
 
-QMAIL_DIR?=	/var/qmail
 EZMLM_DIR?=	${LOCALBASE}
 
+USE_REINPLACE=	yes
+
+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_DIR}" > ${WRKSRC}/conf-qmail
+	@${ECHO_CMD} "${QMAIL_PREFIX}" > ${WRKSRC}/conf-qmail
 	@${ECHO_CMD} "${EZMLM_DIR}/bin/ezmlm" > ${WRKSRC}/conf-ezmlm
 
 .include <bsd.port.mk>
diff --git a/mail/queue-fix/Makefile b/mail/queue-fix/Makefile
index c58dfaaf7e6f..ccee49575a4b 100644
--- a/mail/queue-fix/Makefile
+++ b/mail/queue-fix/Makefile
@@ -7,16 +7,16 @@
 
 PORTNAME=	queue-fix
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.netmeridian.com/e-huss/
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Repairs or generates a qmail queue structure
 
-RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
+USE_QMAIL_RUN=	yes
 
-QMAIL_DIR?=	/var/qmail
-PREFIX?=	${QMAIL_DIR}
+PREFIX?=	${QMAIL_PREFIX}
 
 OPTIONS=	BIG_TODO "Use big_todo patch" off
 
@@ -31,14 +31,14 @@ PLIST_FILES+=	%%DOCDIR%%/README
 PLIST_DIRS+=	%%DOCDIR%%
 .endif
 
+.include <bsd.port.pre.mk>
+
 .if (${PREFIX} == ${LOCALBASE})
 DOCDIR=	share/doc/qmail/queue-fix
 .else
 DOCDIR=	doc/queue-fix
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if defined(WITH_BIG_TODO)
 PATCH_SITES+=		http://www.qmail.org/
 PATCHFILES+=		queue-fix-todo.patch
diff --git a/mail/queue-repair/Makefile b/mail/queue-repair/Makefile
index 1b7ee01ef942..b070c43f7e36 100644
--- a/mail/queue-repair/Makefile
+++ b/mail/queue-repair/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	queue-repair
 PORTVERSION=	0.9.0
+PORTREVISION=	1
 CATEGORIES=	mail python
 MASTER_SITES=	http://pyropus.ca/software/${PORTNAME}/
 
@@ -14,8 +15,7 @@ MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	A qmail queue diagnostic and repair tool
 
 .if !defined(WITHOUT_QMAIL_PORT)
-RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
-QMAIL_DIR?=	/var/qmail
+USE_QMAIL_RUN=	yes
 .endif
 
 USE_PYTHON=	yes
diff --git a/mail/serialmail/Makefile b/mail/serialmail/Makefile
index 7bd3442e0a28..bff5b844bf24 100644
--- a/mail/serialmail/Makefile
+++ b/mail/serialmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	serialmail
 PORTVERSION=	0.75
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://cr.yp.to/software/ \
 		ftp://ftp.gbnet.net/pub/qmail/ \
@@ -17,11 +17,8 @@ MASTER_SITES=	http://cr.yp.to/software/ \
 MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	Tools for passing mail across serial links
 
-RUN_DEPENDS=	tcpserver:${PORTSDIR}/sysutils/ucspi-tcp \
-		${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
-
-# QMAIL_DIR is the directory where qmail is installed
-QMAIL_DIR?=	/var/qmail
+RUN_DEPENDS=	tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
+USE_QMAIL_RUN=	yes
 
 NO_PACKAGE=	Unsure of DJB license
 
@@ -65,7 +62,7 @@ post-configure:
 	@${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-home
 	@${ECHO_CMD} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
 	@${ECHO_CMD} ${CC} -s > ${WRKSRC}/conf-ld
-	@${ECHO_CMD} ${QMAIL_DIR} > ${WRKSRC}/conf-qmail
+	@${ECHO_CMD} ${QMAIL_PREFIX} > ${WRKSRC}/conf-qmail
 
 do-install:
 	cd ${WRKSRC} && \
diff --git a/mail/simscan/Makefile b/mail/simscan/Makefile
index cd26374ee85f..68e2cc2773d4 100644
--- a/mail/simscan/Makefile
+++ b/mail/simscan/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	simscan
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	mail security
 MASTER_SITES=	http://www.inter7.com/simscan/
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,17 +16,14 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
 MAINTAINER=	toxa@toxahost.ru
 COMMENT=	Fast Content/Anti-virus Scanner for qmail Written in C
 
-BUILD_DEPENDS=	${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail
+USE_QMAIL_BUILD=	yes
 
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
-# A normal qmail installation puts everything into /var/qmail/.
-# Must match your qmail installation
-QMAIL_DIR?=	/var/qmail
-WORKDIR?=	${QMAIL_DIR}/${PORTNAME}
-QMAIL_QUEUE=	${QMAIL_DIR}/bin/qmail-queue
-PLIST_SUB=	QMAIL_DIR=${QMAIL_DIR} \
+WORKDIR?=	${QMAIL_PREFIX}/${PORTNAME}
+QMAIL_QUEUE=	${QMAIL_PREFIX}/bin/qmail-queue
+PLIST_SUB=	QMAIL_PREFIX=${QMAIL_PREFIX} \
 		SIMSCAN_DIR=${PORTNAME}
 
 OPTIONS=	CLAMAV "Support for ClamAV Virus Scanning" on \
@@ -41,7 +39,7 @@ OPTIONS=	CLAMAV "Support for ClamAV Virus Scanning" on \
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS=--enable-clamavdb-path=/var/db/clamav \
-		--enable-qmaildir=${QMAIL_DIR} \
+		--enable-qmaildir=${QMAIL_PREFIX} \
 	  	--enable-spamc-user=n \
 		--enable-workdir=${WORKDIR} \
 		--enable-user=nobody
@@ -109,7 +107,7 @@ PORTDOCS=	AUTHORS ChangeLog README TODO
 
 if ! ${TEST} -f ${QMAIL_QUEUE}; then \
 	${ECHO_MSG} "Unable to found qmail-queue binary trying '${QMAIL_QUEUE}'.";  \
-	${ECHO_MSG} "Please set QMAIL_DIR to your qmail installation directory !"; \
+	${ECHO_MSG} "Please set QMAIL_PREFIX to your qmail installation directory !"; \
 	exit 1; \
 fi
 
@@ -118,7 +116,7 @@ pre-configure:
 	@${ECHO_MSG} "=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~="
 	@${ECHO_MSG} "You may also use the following build options:"
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "QMAIL_DIR		Base qmail directory. Default is /var/qmail"
+	@${ECHO_MSG} "QMAIL_PREFIX		Base qmail directory. Default is /var/qmail"
 	@${ECHO_MSG} "WORKDIR		Directory to unpack emails. Default is /var/qmail/simscan"
 	@${ECHO_MSG} "QMAIL_QUEUE		Define full path and name of the qmail-queue program"
 	@${ECHO_MSG} "			Incoming mail is passed to this program after being"
diff --git a/mail/simscan/pkg-plist b/mail/simscan/pkg-plist
index 38fa642f64cf..5b806f15f2f3 100644
--- a/mail/simscan/pkg-plist
+++ b/mail/simscan/pkg-plist
@@ -1,7 +1,7 @@
-@cwd %%QMAIL_DIR%%
+@cwd %%QMAIL_PREFIX%%
 bin/simscanmk
 bin/simscan
-@unexec rmdir %%QMAIL_DIR%%/%%SIMSCAN_DIR%% || true
+@unexec rmdir %%QMAIL_PREFIX%%/%%SIMSCAN_DIR%% || true
 @unexec echo ""
-@unexec echo "If you're not updating this port, you can delete %%QMAIL_DIR%%/%%SIMSCAN_DIR%% directory"
+@unexec echo "If you're not updating this port, you can delete %%QMAIL_PREFIX%%/%%SIMSCAN_DIR%% directory"
 @unexec echo ""
diff --git a/mail/usendmail/Makefile b/mail/usendmail/Makefile
index 7b66dc2edde7..b4959f1126ef 100644
--- a/mail/usendmail/Makefile
+++ b/mail/usendmail/Makefile
@@ -4,20 +4,17 @@
 #
 # $FreeBSD$
 #
-# Tunables: QMAIL_DIR: Where qmail resides (default: /var/qmail)
 
 PORTNAME=	usendmail
 PORTVERSION=	0.1.6
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.ohse.de/uwe/usendmail/
 
 MAINTAINER=	tmseck@netcologne.de
 COMMENT=	A replacement for qmail's sendmail drop-in
 
-BUILD_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
-RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
-
-QMAIL_DIR?=	/var/qmail
+USE_QMAIL=	yes
 
 NO_SIZE=	yes
 USE_REINPLACE=	yes
@@ -26,10 +23,10 @@ WRKSRC=		${WRKDIR}/mail/${DISTNAME}
 PLIST_FILES=	sbin/usendmail
 PORTDOCS=	NEWS README
 SUB_FILES=	pkg-message
-SUB_LIST=	QMAIL_DIR=${QMAIL_DIR}
+SUB_LIST=	QMAIL_PREFIX=${QMAIL_PREFIX}
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,/var/qmail,${QMAIL_DIR},' \
+	@${REINPLACE_CMD} -e 's,/var/qmail,${QMAIL_PREFIX},' \
 	    ${WRKSRC}/src/usendmail.c
 	@${REINPLACE_CMD} -e 's,^CC=,CC\?=,' \
 	    ${WRKSRC}/src/Makefile
diff --git a/mail/vmailmgr/Makefile b/mail/vmailmgr/Makefile
index 200c2ca27600..148518e95a1f 100644
--- a/mail/vmailmgr/Makefile
+++ b/mail/vmailmgr/Makefile
@@ -7,26 +7,36 @@
 
 PORTNAME=	vmailmgr
 PORTVERSION=	0.96.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.vmailmgr.org/archive/
 
 MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	Virtual MAIL ManaGeR for virtual mailboxes and domains
 
-RUN_DEPENDS=	/var/qmail/bin/qmail-start:${PORTSDIR}/mail/qmail \
-		unixserver:${PORTSDIR}/sysutils/ucspi-unix
+USE_APACHE=	yes
+USE_QMAIL_RUN=	yes
 
-HAS_CONFIGURE=yes
+HAS_CONFIGURE=	yes
+USE_REINPLACE=	yes
 
-SVC_DIR=	"/var/qmail/service/vmailmgrd"
+SVC_DIR=	"${QMAIL_PREFIX}/service/vmailmgrd"
+PHP_DIR=	${PREFIX}/www/data-dist/${PORTNAME}
+CGI_DIR=	${PREFIX}/www/cgi-bin-dist
+
+PLIST_SUB+=	PHP_DIR=${PHP_DIR} CGI_DIR=${CGI_DIR}
 
 MAN1=		checkvpw.1 vauthenticate.1 vpasswd2cdb.1 vrehash.1 \
 		listvdomain.1 vadduser.1 vchattr.1 vchforwards.1 \
-		vcheckquota.1 vdeliver.1 vdeluser.1 vpasswd.1
+		vcheckquota.1 vdeliver.1 vdeluser.1 vpasswd.1 \
+		vpasswd2db.1 vpasswds.1 vpopbull.1 vsetup.1
 MAN7=		vmailmgr.7
 MAN8=		vmailmgrd.8
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|phpdir=".home.httpd.php"|phpdir="${PHP_DIR}"|g' \
+			  -e 's|cgidir=...prefix./cgi-bin.|cgidir="${CGI_DIR}"|g' \
+		${WRKSRC}/configure ${WRKSRC}/configure.in
 post-install:
 	${MKDIR} ${PREFIX}/etc/vmailmgr
 	${CP} ${WRKSRC}/scripts/autoresponder.sh ${PREFIX}/etc/vmailmgr/vdeliver-postdeliver
diff --git a/mail/vmailmgr/pkg-plist b/mail/vmailmgr/pkg-plist
index 22574e15fb92..5d0922cb1ac9 100644
--- a/mail/vmailmgr/pkg-plist
+++ b/mail/vmailmgr/pkg-plist
@@ -19,18 +19,24 @@ bin/vconf2dir
 bin/vauthenticate
 bin/checkvpw
 bin/showvconfig
-cgi-bin/vpasswd
-cgi-bin/vadduser
-cgi-bin/vdeluser
-cgi-bin/vaddalias
-cgi-bin/vchattr
-cgi-bin/vchforwards
-cgi-bin/listvdomain
+%%CGI_DIR%%/vpasswd
+%%CGI_DIR%%/vadduser
+%%CGI_DIR%%/vdeluser
+%%CGI_DIR%%/vaddalias
+%%CGI_DIR%%/vchattr
+%%CGI_DIR%%/vchforwards
+%%CGI_DIR%%/listvdomain
+@unexec rmdir %D/%%CGI_DIR%% 2>/dev/null || true
 etc/vmailmgr/default-username
 etc/vmailmgr/vdeliver-postdeliver
 lib/courier-imap/libexec/authlib/authvmailmgr
+@dirrm lib/courier-imap/libexec/authlib
+@dirrm lib/courier-imap/libexec
+@dirrm lib/courier-imap
 sbin/vmailmgrd
 @dirrm etc/vmailmgr
+%%PHP_DIR%%/vmail.inc
+@dirrm %%PHP_DIR%%
 @cwd /var/qmail/service
 vmailmgrd/log/run
 vmailmgrd/run
diff --git a/mail/vpopmail-devel/Makefile b/mail/vpopmail-devel/Makefile
index e4dab9ec5028..baefa5e5f2c1 100644
--- a/mail/vpopmail-devel/Makefile
+++ b/mail/vpopmail-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vpopmail
 PORTVERSION=	5.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,23 +16,22 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Easy virtual domain and authentication package for use with qmail
 
-BUILD_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
-		${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
-RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
-		${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
+BUILD_DEPENDS=	${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
+RUN_DEPENDS=	${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
+USE_QMAIL=	yes
 
 CONFLICTS=	vpopmail-5.*
 
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 USE_REINPLACE=	YES
-USE_PERL5_BUILD=	YES
+USE_PERL5=	YES
 
 VCFGDIR?=	${WRKDIR}/vcfg
 VCFGFILES?=	inc_deps lib_deps tcp.smtp
 
 CONFIGURE_ENV+=	VCFGDIR="${VCFGDIR}"
-CONFIGURE_ARGS=	--enable-qmaildir=${QMAIL_DIR} \
+CONFIGURE_ARGS=	--enable-qmaildir=${QMAIL_PREFIX} \
 		--enable-tcprules-prog=${LOCALBASE}/bin/tcprules \
 		--enable-tcpserver-file=${PREFIX}/vpopmail/etc/tcp.smtp
 
@@ -74,7 +73,7 @@ CONFIGURE_ARGS=	--enable-qmaildir=${QMAIL_DIR} \
 # WITHOUT_AUTH_LOG - disables authentication logging
 # WITH_MYSQL_LOG - enable logging to a MySQL database
 # WITH_PGSQL_LOG - enable logging to a PostgreSQL database
-# QMAIL_DIR     - location of qmail directory
+# QMAIL_PREFIX   - location of qmail directory
 # PREFIX	- installation area for vpopmail (see comment below)
 # VCHKPW_GID	- the group ID of the new vchkpw group (89)
 # VPOPMAIL_UID	- the user ID of the new vpopmail user (89)
@@ -170,12 +169,6 @@ CONFIGURE_ARGS+=	--enable-pgsql-logging
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/qmail/bin/qmail-send)
-QMAIL_DIR?=	${LOCALBASE}/qmail
-.else
-QMAIL_DIR?=	/var/qmail
-.endif
-
 # Uncomment this, or set PREFIX to /home if you have an existing
 # vpopmail install with the vpopmail users' home directory set to
 # /home/vpopmail - package rules dictate we default to /usr/local/vpopmail
@@ -327,10 +320,11 @@ post-install:
 	${MKDIR} ${PREFIX}/vpopmail/etc
 	if [ ! -e "${PREFIX}/vpopmail/etc/tcp.smtp" ]; then \
 		if [ -e "${VCFGDIR}/tcp.smtp" ]; then \
-			${INSTALL_DATA} ${VCFGDIR}/tcp.smtp ${PREFIX}/vpopmail/etc/; \
+			${INSTALL_DATA} ${VCFGDIR}/tcp.smtp ${PREFIX}/vpopmail/etc/tcp.smtp-dist; \
 		else \
-			${TOUCH} ${PREFIX}/vpopmail/etc/tcp.smtp; \
+			${TOUCH} ${PREFIX}/vpopmail/etc/tcp.smtp-dist; \
 		fi; \
+		${CP} -p ${PREFIX}/vpopmail/etc/tcp.smtp-dist ${PREFIX}/vpopmail/etc/tcp.smtp; \
 	fi
 .if defined(DEFAULT_DOMAIN)
 	${ECHO_CMD} ${DEFAULT_DOMAIN} > ${PREFIX}/vpopmail/etc/defaultdomain
diff --git a/mail/vpopmail-devel/pkg-plist b/mail/vpopmail-devel/pkg-plist
index 2f113a2e8d2d..98ff8626c947 100644
--- a/mail/vpopmail-devel/pkg-plist
+++ b/mail/vpopmail-devel/pkg-plist
@@ -41,7 +41,9 @@ vpopmail/doc/man_html/vsetuserquota.html
 @unexec if [ -f %D/vpopmail/etc/defaultdomain ]; then rm -f %D/vpopmail/etc/defaultdomain; fi
 vpopmail/etc/inc_deps
 vpopmail/etc/lib_deps
-@unexec if [ -f %D/vpopmail/etc/tcp.smtp -a ! -s %D/vpopmail/etc/tcp.smtp ]; then rm -f %D/vpopmail/etc/tcp.smtp; fi
+@unexec if cmp -s %D/vpopmail/etc/tcp.smtp %D/vpopmail/etc/tcp.smtp-dist; then rm -f %D/vpopmail/etc/tcp.smtp; fi
+vpopmail/etc/tcp.smtp-dist
+@exec if [ ! -f %D/vpopmail/etc/tcp.smtp ] ; then cp -p %D/%F %B/tcp.smtp; fi
 @unexec if cmp -s %D/vpopmail/etc/vlimits.default %D/vpopmail/etc/vlimits.default-dist; then rm -f %D/vpopmail/etc/vlimits.default; fi
 vpopmail/etc/vlimits.default-dist
 @unexec if [ -f %D/vpopmail/etc/vpopmail.mysql ]; then rm -f %D/vpopmail/etc/vpopmail.mysql; fi
diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile
index 537b99c05f42..b22e149d8ddb 100644
--- a/mail/vpopmail/Makefile
+++ b/mail/vpopmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vpopmail
 PORTVERSION=	5.4.10
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,10 +15,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	roam@FreeBSD.org
 COMMENT=	Easy virtual domain and authentication package for use with qmail
 
-BUILD_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
-		${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
-RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
-		${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
+BUILD_DEPENDS=	${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
+RUN_DEPENDS=	${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
+USE_QMAIL=	yes
 
 CONFLICTS=	vpopmail-devel-5.*
 
@@ -31,7 +30,7 @@ VCFGDIR?=	${WRKDIR}/vcfg
 VCFGFILES?=	inc_deps lib_deps tcp.smtp
 
 CONFIGURE_ENV+=	VCFGDIR="${VCFGDIR}"
-CONFIGURE_ARGS=	--enable-qmaildir=${QMAIL_DIR} \
+CONFIGURE_ARGS=	--enable-qmaildir=${QMAIL_PREFIX} \
 		--enable-tcprules-prog=${LOCALBASE}/bin/tcprules \
 		--enable-tcpserver-file=${PREFIX}/vpopmail/etc/tcp.smtp
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -79,7 +78,7 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 # WITH_MYSQL_LOG - enable auth logging to a MySQL database [deprecateed]
 # WITH_PGSQL_LOG - enable auth logging to a PostgreSQL database [deprecated]
 # WITH_SQL_LOG  - enable auth logging to the selected SQL database
-# QMAIL_DIR     - location of qmail directory
+# QMAIL_PREFIX  - location of qmail directory
 # PREFIX	- installation area for vpopmail (see comment below)
 # VCHKPW_GID	- the group ID of the new vchkpw group (89)
 # VPOPMAIL_UID	- the user ID of the new vpopmail user (89)
@@ -198,12 +197,6 @@ EXTRA_PATCHES+=	${FILESDIR}/vchkpw-smtp-auth.patch
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/qmail/bin/qmail-send)
-QMAIL_DIR?=	${LOCALBASE}/qmail
-.else
-QMAIL_DIR?=	/var/qmail
-.endif
-
 .if !defined(WITHOUT_FPIC) && ${ARCH} == "amd64"
 CFLAGS+=	-fPIC
 .endif
diff --git a/mail/vqadmin/Makefile b/mail/vqadmin/Makefile
index fd2358437d41..d84bc5b1b9ab 100644
--- a/mail/vqadmin/Makefile
+++ b/mail/vqadmin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vqadmin
 PORTVERSION=	2.3.6
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	vqadmin
@@ -21,14 +22,14 @@ RUN_DEPENDS=	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
 GNU_CONFIGURE=	YES
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	YES
+WANT_QMAIL=	yes
 
 CGIBINDIR?=	www/cgi-bin-dist
 WEBDATADIR?=	www/data-dist
-QMAIL_DIR?=	/var/qmail
 
 CONFIGURE_ARGS=	--enable-cgibindir=${PREFIX}/${CGIBINDIR} \
 		--enable-htmldir=${PREFIX}/${WEBDATADIR} \
-		--enable-qmaildir=${QMAIL_DIR}
+		--enable-qmaildir=${QMAIL_PREFIX}
 
 .include <bsd.port.pre.mk>
 
diff --git a/mail/zabit/Makefile b/mail/zabit/Makefile
index 5eddcb30c39d..c0282e4de4b6 100644
--- a/mail/zabit/Makefile
+++ b/mail/zabit/Makefile
@@ -7,24 +7,20 @@
 
 PORTNAME=	zabit
 PORTVERSION=	0.7.1
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.enderunix.org/zabit/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Zabit is a content/attachment filter for qmail
 
-RUN_DEPENDS=	${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail
+USE_QMAIL_RUN=	yes
 
 HAS_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/qmail/bin/qmail-queue)
-QMAIL_DIR?=     ${LOCALBASE}/qmail
-.else
-QMAIL_DIR?=     /var/qmail
-.endif
-QMAIL_QUEUE=    ${QMAIL_DIR}/bin/qmail-queue
+QMAIL_QUEUE=    ${QMAIL_PREFIX}/bin/qmail-queue
 
 pre-build:
 .if !defined(BATCH)
author	Kirill Ponomarev <krion@FreeBSD.org>	2006-01-21 17:37:14 +0000
committer	Kirill Ponomarev <krion@FreeBSD.org>	2006-01-21 17:37:14 +0000
commit	01c588a6357d8452a3e0af157e9c1250c067db2f (patch)
tree	fb26bf418ea8791ab4d308a7931c623124611c3c /mail
parent	f484c99df79f169bf954fc4b0ed83e59279a596a (diff)