5 files changed, 40 insertions, 16 deletions

diff --git a/mail/qmail-mysql/Makefile b/mail/qmail-mysql/Makefile
index 7f0f55b1f7c7..416414686707 100644
--- a/mail/qmail-mysql/Makefile
+++ b/mail/qmail-mysql/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${MYSQL_PATCH_VERSION}
-PORTREVISION=	6
+PORTREVISION=	0
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-mysql
 
diff --git a/mail/qmail-tls/Makefile b/mail/qmail-tls/Makefile
index 2041ce7a95a6..f749662bc835 100644
--- a/mail/qmail-tls/Makefile
+++ b/mail/qmail-tls/Makefile
@@ -22,4 +22,6 @@ MASTERDIR=	${.CURDIR}/../qmail
 DESCR=		${.CURDIR}/pkg-descr
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-qmail-local.c
+
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index bd9e4ecd033d..3b14bc6b6fb7 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,9 +1,9 @@
 # Created by: Mario S F Ferreira <lioux@linf.unb.br>
 # $FreeBSD$
 
-PORTNAME=	qmail
+PORTNAME=	${QMAIL_PORTNAME}
 PORTVERSION?=	${QMAIL_VERSION}
-PORTREVISION?=	11
+PORTREVISION?=	0
 CATEGORIES=	mail
 MASTER_SITES+=	${MASTER_SITE_QMAIL}
 DISTNAME=	${PORTNAME}-${QMAIL_VERSION}
@@ -32,9 +32,9 @@ NEED_ROOT=	yes
 
 USERS=		alias
 .for usersuffix in d l p q r s
-USERS+=		${PORTNAME}${usersuffix}
+USERS+=		qmail${usersuffix}
 .endfor
-GROUPS=		${PORTNAME} qnofiles
+GROUPS=		qmail qnofiles
 
 # Options description for qmail and all slave ports
 ALTQUEUE_DESC=			Run a QMAILQUEUE external queue
@@ -83,6 +83,24 @@ TLS_DEBUG_DESC=			Enable additional debug information
 XF_QUITASAP_DESC=		Close SMTP session ASAP (SMTPEXTFORK)
 
 .if defined(SLAVE_LDAP) || \
+    defined(SLAVE_SPAMCONTROL) || \
+    defined(SLAVE_TLS)
+_USE_NETQMAIL=			no
+.else
+_USE_NETQMAIL=			yes
+.endif
+
+.if ${_USE_NETQMAIL} == yes
+PORTNAME=			netqmail
+QMAIL_VERSION=			1.06
+BARRIER_SENDMAIL_F_PATCH=	yes
+BARRIER_QMAILQUEUE_PATCH=	yes
+.else
+PORTNAME=			qmail
+QMAIL_VERSION=			1.03
+.endif
+
+.if defined(SLAVE_LDAP) || \
     defined(SLAVE_MYSQL)
 BARRIER_MAILDIRQUOTA_PATCH=	yes
 BARRIER_SPF_PATCH=		yes
@@ -149,21 +167,19 @@ PATCH_SITES+=	http://www.nrg4u.com/qmail/:ldap
 PATCHFILES+=	qmail-ldap-1.03-${LDAP_PATCH_DATE}.patch.gz:ldap
 .elif defined(SLAVE_MYSQL)
 PATCH_SITES+=	http://iain.cx/unix/qmail/download/:mysql
-PATCHFILES+=	qmail-mysql-${MYSQL_PATCH_VERSION}.patch:mysql
+PATCHFILES+=	netqmail-mysql-${MYSQL_PATCH_VERSION}.patch:mysql
 .elif defined(SLAVE_TLS)
 PATCH_SITES+=	http://inoa.net/qmail-tls/:tls
 PATCHFILES+=	qmail-1.03-tls-${TLS_PATCH_DATE}-renato_v2.patch:tls
 .endif
 
 PATCH_SITES+=	${MASTER_SITE_LOCAL:S/$/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,localtime,qmtpc_outgoingip/}
-PATCH_SITE_SUBDIR+=	garga/qmail/:dns,sendmail_flagf,rfc2821,ldap,mysql,quota,blockexec,doublebounce,spf,localtime,qmtpc_outgoingip
+PATCH_SITE_SUBDIR+=	bdrewery/qmail/:dns,sendmail_flagf,rfc2821,ldap,mysql,quota,blockexec,doublebounce,spf,localtime,qmtpc_outgoingip
 PATCH_SITE_SUBDIR+=	bdrewery/qmail/:tls
 
-QMAIL_VERSION?=		1.03
-
 .if !defined(BARRIER_SMTP_AUTH_PATCH)
 SMTP_AUTH_VERSION=	0.31
-SMTP_AUTH_DIR=		${WRKDIR}/${PORTNAME}-smtpd-auth-${SMTP_AUTH_VERSION}
+SMTP_AUTH_DIR=		${WRKDIR}/qmail-smtpd-auth-${SMTP_AUTH_VERSION}
 
 OPTIONS_DEFINE+=SMTP_AUTH_PATCH
 .endif
@@ -360,6 +376,11 @@ NO_PREFIX_RMDIR=yes
 
 .include <bsd.port.options.mk>
 
+# XXX Not needed with spamcontrol-2730
+.if ( ${ARCH} == "amd64" || ${ARCH} == "ia64" ) && !defined(SLAVE_LDAP)
+EXTRA_PATCHES+=			${FILESDIR}/extra-patch-amd64
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${PREFIX} != ${LOCALBASE}
@@ -422,7 +443,7 @@ DISTFILES+=	${AUTH_PATCH}:smtp_auth
 
 .if ${PORT_OPTIONS:MMAILDIRQUOTA_PATCH}
 PATCH_SITES+=	http://www.alexdupre.com/qmail/:quota
-PATCHFILES+=	qmail-maildir++.patch:quota
+PATCHFILES+=	${PORTNAME}-maildir++.patch:quota
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-maildir++
 .endif
 
@@ -796,9 +817,6 @@ post-patch:
 			   s!QUEUE_EXTRALEN 0!QUEUE_EXTRALEN 5!g' \
 			   ${WRKSRC}/extra.h
 .endif
-.if ( ${ARCH} == "amd64" || ${ARCH} == "ia64" ) && !defined(SLAVE_LDAP)
-	@${PATCH} -d ${WRKSRC} < ${FILESDIR}/extra-patch-amd64
-.endif
 	@${REINPLACE_CMD} -e "s/void *main/int main/g" ${WRKSRC}/*.c
 	@${REINPLACE_CMD} -e "/int main/ s/argc, *argv/int argc, char **argv/" ${WRKSRC}/install.c
 	@${ECHO_CMD} "MANPATH ${MANPREFIX}/man" > ${WRKDIR}/qmail.conf
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
index 8425ea089f23..637aab19f3ad 100644
--- a/mail/qmail/distinfo
+++ b/mail/qmail/distinfo
@@ -1,5 +1,7 @@
 SHA256 (qmail/qmail-1.03.tar.gz) = 21ed6c562cbb55092a66197c35c8222b84115d1acab0854fdb1ad1f301626f88
 SIZE (qmail/qmail-1.03.tar.gz) = 220668
+SHA256 (qmail/netqmail-1.06.tar.gz) = 8e7d98d15211fc9f9c28109e942e2268f42a6672d68df92a42f2afa90ff00532
+SIZE (qmail/netqmail-1.06.tar.gz) = 260941
 SHA256 (qmail/qmail-103.patch) = 4cad53c7a6628a600c74c36bfee327db5052ca24c222d4013e4dfcd7f427653d
 SIZE (qmail/qmail-103.patch) = 2104
 SHA256 (qmail/qmailqueue-patch) = 52e82aaa34e9f1308b063cc986a701f67e161662e9f789bb12af03a381530f94
@@ -24,6 +26,8 @@ SHA256 (qmail/qmail-1.03-qmtpc_outgoingip_20090630.patch) = a5b521d3f35aa0842ea3
 SIZE (qmail/qmail-1.03-qmtpc_outgoingip_20090630.patch) = 10364
 SHA256 (qmail/qmail-maildir++.patch) = 79e3f1f8f95b58b6d17e5469f125d873fe212d0a5a6d19b538ad57176fbafb52
 SIZE (qmail/qmail-maildir++.patch) = 38088
+SHA256 (qmail/netqmail-maildir++.patch) = 9633cf9366e6e703395a7fc3d15f9634f5bb1f49cbdbec53616507308fae0f14
+SIZE (qmail/netqmail-maildir++.patch) = 37162
 SHA256 (qmail/qmail-block-executables.patch) = 97512624eb02db51e10ab6d0dd834a8797a238d0e006bd1c6c94a183d291b456
 SIZE (qmail/qmail-block-executables.patch) = 5070
 SHA256 (qmail/qmail-discard-double-bounces.patch) = 14489eefd9908f60af13fadd574d0e9bb936e5d1b706690ce52efef68529a8d8
@@ -36,8 +40,8 @@ SHA256 (qmail/qmail-spf-rc5.patch-auth-tls) = 16fe99894938c30ed1928a61dabf0a598e
 SIZE (qmail/qmail-spf-rc5.patch-auth-tls) = 63752
 SHA256 (qmail/qmail-ldap-1.03-20060201.patch.gz) = 92ba895df1957109ad856cc1d1554ece4d25d59017e77127dd52d76afd05525a
 SIZE (qmail/qmail-ldap-1.03-20060201.patch.gz) = 270788
-SHA256 (qmail/qmail-mysql-1.1.15.patch) = 3d2b6a08fb149d6c9fe6c8250e87edd6c4d4b2b0417f03adf5cf4202bbadc53f
-SIZE (qmail/qmail-mysql-1.1.15.patch) = 67602
+SHA256 (qmail/netqmail-mysql-1.1.15.patch) = 656d2366c1b4749f0ffdaf68b30f10d469c67d7c2c5710190e12b2c6ca85b18a
+SIZE (qmail/netqmail-mysql-1.1.15.patch) = 61635
 SHA256 (qmail/spamcontrol-2624_tgz.bin) = ab9454c777218b0958ca005d4bf44ae922a2f6d20a52a71da6ebec74b2de2d01
 SIZE (qmail/spamcontrol-2624_tgz.bin) = 167802
 SHA256 (qmail/qmail-1.03-tls-20021228-renato_v2.patch) = 7ec34f3d6feeb85f603accfbca22d6cb7471d4ee03bd9a6686c35737ba13ccf7
diff --git a/mail/qmail/files/patch-qmail-local.c b/mail/qmail/files/extra-patch-qmail-local.c
index ee0709db5b8f..ee0709db5b8f 100644
--- a/mail/qmail/files/patch-qmail-local.c
+++ b/mail/qmail/files/extra-patch-qmail-local.c