- Transfer all work to MASTER port and make slave ports easier

- Use only one pkg-plist and use PLIST_SUB
- Use DOCSDIR intead of DOCDIR
- OPTIONS'ify
- Remove WITH_PRESERVE_CONFIG_FILES knob and detect automatically when is need
  to create it.
- Add $FreeBSD$ tag to pkg-plist and pkg-install
- Fix error on enable-qmail script
- Remove MASTER_SITE_QMAIL definition from Makefile since it's defined on
  bsd.sites.mk
- Add a new option to don't create rc.d/qmail.sh
- Add rc.d/qmail.sh to pkg-plist when necessary

PR:		ports/80833
Submitted by:	maintainer
Thanks to:	novel, Joao Ricardo P. Mendes <joao@redepegasus.com.br>

27 files changed, 577 insertions, 1514 deletions

diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile
index eb9327f20bbe..d9514fd4d6d7 100644
--- a/mail/qmail-ldap/Makefile
+++ b/mail/qmail-ldap/Makefile
@@ -7,110 +7,32 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${LDAP_PATCH_DATE}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-ldap
 
-PATCH_SITES=	http://www.nrg4u.com/qmail/:ldap
-PATCHFILES=	qmail-ldap-1.03-${LDAP_PATCH_DATE}.patch.gz:ldap
-
 MAINTAINER=	freebsd@galle.com.br
 COMMENT=	A SECURE, reliable, and FAST MTA for UNIX systems WITH LDAP support
 
-EXTRA_PATCHES+=	${QMAIL_PORT_PATCHDIR}/patch-ab ${QMAIL_PORT_PATCHDIR}/patch-ac
+EXTRA_PATCHES+=	${MASTERDIR}/files/patch-install.c
 PATCH_DIST_STRIP+=	-p1
 
 CONFLICTS=	nss-[0-9]* emboss-[0-9]* digest-[0-9]*
 
 USE_OPENLDAP=	yes
-USE_REINPLACE=	yes
+SLAVE_LDAP=	yes
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}2
 
 .if !defined(WITHOUT_TLS)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-with_tls
 USE_OPENSSL=	yes
-.endif # WITHOUT_TLS
-
-# Patches from the main qmail port are not wanted
-MAIN_QMAIL_PORT_DNS_PATCH_BARRIER=			yes
-MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER=	yes
-MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER=		yes
-MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER=			yes
+.endif
 
 LDAP_PATCH_DATE=	20020901
 
-# Using default from master port, i.e., /var/qmail
-PREFIX?=	${QMAIL_PORT_PREFIX}
-
-.if !defined(_PREMKINCLUDED)
-.include <bsd.port.pre.mk>
-.endif
-
-# Local overrides
 MASTERDIR=	${.CURDIR}/../qmail
+DESCR=		${.CURDIR}/pkg-descr
 PATCHDIR=	${.CURDIR}/files
-PKGDIR_LOCAL=	${.CURDIR}
-DESCR=		${PKGDIR_LOCAL}/pkg-descr
-PKGMESSAGE=	${PKGDIR_LOCAL}/pkg-message
-PLIST=		${PKGDIR_LOCAL}/pkg-plist
-
-QMAIL_TLS_PORT=	${.CURDIR}/../qmail-tls
-QMAIL_PORT_PREFIX!=	cd ${MASTERDIR} && ${MAKE} -V PREFIX
-QMAIL_PORT_PATCHDIR!=	cd ${MASTERDIR} && ${MAKE} -V PATCHDIR
-
-DOCFILES+=	${WRKSRC}/QLDAPINSTALL ${WRKSRC}/QLDAPNEWS \
-		${WRKSRC}/POPBEFORESMTP \
-		${WRKSRC}/QLDAPTODO ${WRKSRC}/QLDAPPICTURE
-
-slaveport-pre-fetch: qmail-ldap-pre-fetch
-
-qmail-ldap-pre-fetch:
-	@${ECHO_MSG} "WITHOUT_TLS=yes			disable SMTP TLS support"
-	@${ECHO_MSG} "WITHOUT_LDAP_CLUSTER=yes		disable cluster support"
-	@${ECHO_MSG} "WITHOUT_AUTOMAILDIRMAKE=yes	disable the auto-maildir-make feature"
-	@${ECHO_MSG} "WITHOUT_AUTOHOMEDIRMAKE=yes	disable the auto-homedir-make feature"
-	@${ECHO_MSG} "WITH_LDAP_DEBUG=yes		enable the possibility to log and"
-	@${ECHO_MSG} "				debug imap and pop"
-	@${ECHO_MSG} "WITH_CLEARTEXTPASSWD=yes	use cleartext passwords"
-	@${ECHO_MSG} "WITH_DASH_EXT=yes		enable dash_ext extended mail addresses"
-	@${ECHO_MSG} "				add"
-
-slaveport-post-patch: qmail-ldap-post-patch
-
-qmail-ldap-post-patch:
-	@${REINPLACE_CMD} "s|LDAPLIBS=-L/usr/local/lib|LDAPLIBS=-L${LOCALBASE}/lib|;s|LDAPINCLUDES=-I/usr/local/include|LDAPINCLUDES=-I${LOCALBASE}/include|" ${WRKSRC}/Makefile
-.if !defined(WITHOUT_TLS)
-	@${REINPLACE_CMD} "s|#TLSON=|TLSON=|; \
-		s|#TLSINCLUDES=-I/usr/local/include|TLSINCLUDES=-I${OPENSSLBASE}/include|; \
-		s|#TLSLIBS=-L/usr/local/lib|TLSLIBS=-L${OPENSSLBASE}/lib|; \
-		s|#OPENSSLBIN=/usr/local/bin/openssl|OPENSSLBIN=${OPENSSLBASE}/bin/openssl|" \
-			${WRKSRC}/Makefile
-.endif # !WITHOUT_TLS
-.if !defined(WITHOUT_LDAP_CLUSTER)
-	@${REINPLACE_CMD} "s|#LDAPFLAGS=-DQLDAP_CLUSTER\s+-DEXTERNAL_TODO|LDAPFLAGS\+=-DQLDAP_CLUSTER -DEXTERNAL_TODO#|" ${WRKSRC}/Makefile
-.endif # WITHOUT_LDAP_CLUSTER
-.if !defined(WITHOUT_AUTOMAILDIRMAKE)
-	@${REINPLACE_CMD} "s|#MDIRMAKE=-DAUTOMAILDIRMAKE|MDIRMAKE=-DAUTOMAILDIRMAKE|" ${WRKSRC}/Makefile
-.endif # WITHOUT_AUTOMAILDIRMAKE
-.if !defined(WITHOUT_AUTOHOMEDIRMAKE)
-	@${REINPLACE_CMD} "s|#HDIRMAKE=-DAUTOHOMEDIRMAKE|HDIRMAKE=-DAUTOHOMEDIRMAKE|" ${WRKSRC}/Makefile
-.endif # WITHOUT_AUTOHOMEDIRMAKE
-.if defined(WITH_LDAP_DEBUG)
-	@${REINPLACE_CMD} "s|#DEBUG=-DDEBUG|DEBUG=-DDEBUG|" ${WRKSRC}/Makefile
-.endif # WITH_LDAP_DEBUG
-.if defined(WITH_CLEARTEXTPASSWD)
-	@${REINPLACE_CMD} "s|^#\s*-DCLEARTEXTPASSWD.*$$|LDAPFLAGS\+=-DCLEARTEXTPASSWD|" \
-		${WRKSRC}/Makefile
-.endif # WITH_CLEARTEXTPASSWD
-.if defined(WITH_DASH_EXT)
-	@${REINPLACE_CMD} "s|^# -DDASH_EXT.*$$|LDAPFLAGS\+=-DDASH_EXT|" \
-		${WRKSRC}/Makefile
-.endif # WITH_DASH_EXT
-
-certificate:
-	@cd ${QMAIL_TLS_PORT} && ${MAKE} $@ clean
-
-certificate-req:
-	@cd ${QMAIL_TLS_PORT} && ${MAKE} $@ clean
+LATEST_LINK=	${PORTNAME}-ldap
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/qmail-ldap/files/patch-aa b/mail/qmail-ldap/files/patch-aa
deleted file mode 100644
index 84096c5322f8..000000000000
--- a/mail/qmail-ldap/files/patch-aa
+++ /dev/null
@@ -1,175 +0,0 @@
---- hier.c.orig	Mon May 20 19:53:10 2002
-+++ hier.c	Mon May 20 19:55:14 2002
-@@ -35,16 +35,6 @@
-   d(auto_qmail,"users",auto_uido,auto_gidq,0755);
-   d(auto_qmail,"bin",auto_uido,auto_gidq,0755);
-   d(auto_qmail,"boot",auto_uido,auto_gidq,0755);
--  d(auto_qmail,"doc",auto_uido,auto_gidq,0755);
--  d(auto_qmail,"man",auto_uido,auto_gidq,0755);
--  d(auto_qmail,"man/cat1",auto_uido,auto_gidq,0755);
--  d(auto_qmail,"man/cat5",auto_uido,auto_gidq,0755);
--  d(auto_qmail,"man/cat7",auto_uido,auto_gidq,0755);
--  d(auto_qmail,"man/cat8",auto_uido,auto_gidq,0755);
--  d(auto_qmail,"man/man1",auto_uido,auto_gidq,0755);
--  d(auto_qmail,"man/man5",auto_uido,auto_gidq,0755);
--  d(auto_qmail,"man/man7",auto_uido,auto_gidq,0755);
--  d(auto_qmail,"man/man8",auto_uido,auto_gidq,0755);
- 
-   d(auto_qmail,"alias",auto_uida,auto_gidq,02755);
- 
-@@ -64,44 +54,7 @@
-   z(auto_qmail,"queue/lock/sendmutex",0,auto_uids,auto_gidq,0600);
-   p(auto_qmail,"queue/lock/trigger",auto_uids,auto_gidq,0622);
- 
--  c(auto_qmail,"boot","home",auto_uido,auto_gidq,0755);
--  c(auto_qmail,"boot","home+df",auto_uido,auto_gidq,0755);
--  c(auto_qmail,"boot","proc",auto_uido,auto_gidq,0755);
--  c(auto_qmail,"boot","proc+df",auto_uido,auto_gidq,0755);
--  c(auto_qmail,"boot","binm1",auto_uido,auto_gidq,0755);
--  c(auto_qmail,"boot","binm1+df",auto_uido,auto_gidq,0755);
--  c(auto_qmail,"boot","binm2",auto_uido,auto_gidq,0755);
--  c(auto_qmail,"boot","binm2+df",auto_uido,auto_gidq,0755);
--  c(auto_qmail,"boot","binm3",auto_uido,auto_gidq,0755);
--  c(auto_qmail,"boot","binm3+df",auto_uido,auto_gidq,0755);
--
--  c(auto_qmail,"doc","FAQ",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","UPGRADE",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","SENDMAIL",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","INSTALL",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","INSTALL.alias",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","INSTALL.ctl",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","INSTALL.ids",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","INSTALL.maildir",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","INSTALL.mbox",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","INSTALL.vsm",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","TEST.deliver",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","TEST.receive",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","REMOVE.sendmail",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","REMOVE.binmail",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","PIC.local2alias",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","PIC.local2ext",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","PIC.local2local",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","PIC.local2rem",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","PIC.local2virt",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","PIC.nullclient",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","PIC.relaybad",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","PIC.relaygood",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","PIC.rem2local",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","QLDAPINSTALL",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","QLDAPNEWS",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","QLDAPTODO",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"doc","QLDAPPICTURE",auto_uido,auto_gidq,0644);
-+
- 
-   c(auto_qmail,"bin","qmail-queue",auto_uidq,auto_gidq,04711);
-   c(auto_qmail,"bin","qmail-lspawn",auto_uido,auto_gidq,0700);
-@@ -160,109 +113,4 @@
-   c(auto_qmail,"bin","pbscheck",auto_uido,auto_gidq,0755);
-   c(auto_qmail,"bin","pbsdbd",auto_uido,auto_gidq,0755);
- 
--  c(auto_qmail,"man/man5","addresses.5",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat5","addresses.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man5","envelopes.5",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat5","envelopes.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man5","maildir.5",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat5","maildir.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man5","mbox.5",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat5","mbox.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man5","dot-qmail.5",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat5","dot-qmail.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man5","qmail-control.5",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat5","qmail-control.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man5","qmail-header.5",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat5","qmail-header.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man5","qmail-log.5",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat5","qmail-log.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man5","qmail-users.5",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat5","qmail-users.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man5","tcp-environ.5",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat5","tcp-environ.0",auto_uido,auto_gidq,0644);
--
--  c(auto_qmail,"man/man7","forgeries.7",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat7","forgeries.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man7","qmail-limits.7",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat7","qmail-limits.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man7","qmail.7",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat7","qmail.0",auto_uido,auto_gidq,0644);
--
--  c(auto_qmail,"man/man1","forward.1",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat1","forward.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man1","condredirect.1",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat1","condredirect.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man1","bouncesaying.1",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat1","bouncesaying.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man1","except.1",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat1","except.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man1","maildirmake.1",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat1","maildirmake.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man1","maildir2mbox.1",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat1","maildir2mbox.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man1","maildirwatch.1",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat1","maildirwatch.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man1","mailsubj.1",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat1","mailsubj.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man1","qreceipt.1",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat1","qreceipt.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man1","qbiff.1",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat1","qbiff.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man1","preline.1",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat1","preline.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man1","tcp-env.1",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat1","tcp-env.0",auto_uido,auto_gidq,0644);
--
--  c(auto_qmail,"man/man8","qmail-local.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-local.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","qmail-lspawn.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-lspawn.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","qmail-getpw.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-getpw.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","qmail-remote.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-remote.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","qmail-rspawn.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-rspawn.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","qmail-clean.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-clean.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","qmail-send.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-send.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","qmail-start.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-start.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","splogger.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","splogger.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","qmail-queue.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-queue.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","qmail-inject.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-inject.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","qmail-showctl.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-showctl.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","qmail-newmrh.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-newmrh.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","qmail-newu.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-newu.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","qmail-pw2u.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-pw2u.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","qmail-qread.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-qread.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","qmail-qstat.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-qstat.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","qmail-tcpok.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-tcpok.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","qmail-tcpto.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-tcpto.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","qmail-pop3d.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-pop3d.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","qmail-popup.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-popup.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","qmail-qmqpc.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-qmqpc.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","qmail-qmqpd.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-qmqpd.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","qmail-qmtpd.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-qmtpd.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","qmail-smtpd.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-smtpd.0",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/man8","qmail-command.8",auto_uido,auto_gidq,0644);
--  c(auto_qmail,"man/cat8","qmail-command.0",auto_uido,auto_gidq,0644);
- }
diff --git a/mail/qmail-ldap/pkg-plist b/mail/qmail-ldap/pkg-plist
deleted file mode 100644
index 6798bf6a649d..000000000000
--- a/mail/qmail-ldap/pkg-plist
+++ /dev/null
@@ -1,122 +0,0 @@
-bin/auth_imap
-bin/auth_pop
-bin/bouncesaying
-bin/condredirect
-bin/datemail
-bin/digest
-bin/elq
-bin/except
-bin/forward
-bin/maildir2mbox
-bin/maildirmake
-bin/maildirwatch
-bin/mailsubj
-bin/pbsadd
-bin/pbscheck
-bin/pbsdbd
-bin/pinq
-bin/predate
-bin/preline
-bin/qail
-bin/qbiff
-bin/qmail-clean
-bin/qmail-getpw
-bin/qmail-inject
-bin/qmail-ldaplookup
-bin/qmail-local
-bin/qmail-lspawn
-bin/qmail-newmrh
-bin/qmail-newu
-bin/qmail-pop3d
-bin/qmail-popup
-bin/qmail-pw2u
-bin/qmail-qmqpc
-bin/qmail-qmqpd
-bin/qmail-qmtpd
-bin/qmail-qread
-bin/qmail-qstat
-bin/qmail-queue
-bin/qmail-quotawarn
-bin/qmail-remote
-bin/qmail-reply
-bin/qmail-rspawn
-bin/qmail-send
-bin/qmail-showctl
-bin/qmail-smtpd
-bin/qmail-start
-bin/qmail-tcpok
-bin/qmail-tcpto
-bin/qreceipt
-bin/qsmhook
-bin/sendmail
-bin/splogger
-bin/tcp-env
-boot/binm1
-boot/binm1+df
-boot/binm2
-boot/binm2+df
-boot/binm3
-boot/binm3+df
-boot/home
-boot/home+df
-boot/maildir
-boot/proc
-boot/proc+df
-@comment This port installs the following manually (ie. not through qmail-hier)
-configure/config
-configure/config-fast
-configure/dnsfq
-configure/dnsip
-configure/dnsptr
-configure/hostname
-configure/install
-configure/ipmeprint
-scripts/enable-qmail
-scripts/mkaliasdir
-%%PORTDOCS%%%%DOCDIR%%/BLURB
-%%PORTDOCS%%%%DOCDIR%%/BLURB2
-%%PORTDOCS%%%%DOCDIR%%/BLURB3
-%%PORTDOCS%%%%DOCDIR%%/BLURB4
-%%PORTDOCS%%%%DOCDIR%%/FAQ
-%%PORTDOCS%%%%DOCDIR%%/INSTALL
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
-%%PORTDOCS%%%%DOCDIR%%/INTERNALS
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
-%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
-%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
-%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
-%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
-%%PORTDOCS%%%%DOCDIR%%/POPBEFORESMTP
-%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES
-%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE
-%%PORTDOCS%%%%DOCDIR%%/QLDAPINSTALL
-%%PORTDOCS%%%%DOCDIR%%/QLDAPNEWS
-%%PORTDOCS%%%%DOCDIR%%/QLDAPTODO
-%%PORTDOCS%%%%DOCDIR%%/QLDAPPICTURE
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
-%%PORTDOCS%%%%DOCDIR%%/SECURITY
-%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
-%%PORTDOCS%%%%DOCDIR%%/SYSDEPS
-%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
-%%PORTDOCS%%%%DOCDIR%%/TEST.receive
-%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
-%%PORTDOCS%%%%DOCDIR%%/UPGRADE
-%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample
-%%PORTDOCS%%@dirrm %%DOCDIR%%
-@dirrm scripts
-@dirrm configure
-@dirrm boot
-@dirrm bin
-@unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." | /usr/bin/fmt
-@unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." | /usr/bin/fmt
-@unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. You can do it just executing 'echo sendmail_enable=\"YES\" >> /etc/rc.conf" | /usr/bin/fmt
diff --git a/mail/qmail-mysql/Makefile b/mail/qmail-mysql/Makefile
index 981ce9cc1702..550c00a3bdce 100644
--- a/mail/qmail-mysql/Makefile
+++ b/mail/qmail-mysql/Makefile
@@ -7,45 +7,21 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${MYSQL_PATCH_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-mysql
 
-PATCH_SITES+=	http://iain.cx/unix/qmail/download/:mysql
-PATCHFILES+=	qmail-mysql-${MYSQL_PATCH_VERSION}.patch:mysql
-
 MAINTAINER=	freebsd@galle.com.br
 COMMENT=	A SECURE, reliable, and FAST MTA for UNIX systems WITH MySQL support
 
-USE_MYSQL=	yes
-USE_REINPLACE=	yes
-
-# patches from the master port that brake this one are now allowed
-MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER=	yes
-
 MYSQL_PATCH_VERSION=	1.1.8
 
-# Using default from master port, i.e., /var/qmail
-PREFIX?=	${QMAIL_PORT_PREFIX}
+SLAVE_MYSQL=	yes
 
-.if !defined(_PREMKINCLUDED)
-.include <bsd.port.pre.mk>
-.endif
+USE_MYSQL=	yes
 
-# Local overrides
 MASTERDIR=	${.CURDIR}/../qmail
-PKGDIR_LOCAL=	${.CURDIR}
-DESCR=		${PKGDIR_LOCAL}/pkg-descr
-PKGMESSAGE=	${PKGDIR_LOCAL}/pkg-message
-
-QMAIL_PORT_PREFIX!=	cd ${MASTERDIR} && ${MAKE} -V PREFIX
-
-# Yet anther ugly hack (works due to code inside the main qmail port)
-slaveport-post-patch: qmail-mysql-post-patch
-
-qmail-mysql-post-patch:
-	@${REINPLACE_CMD} \
-		 's|/opt/mysql|${LOCALBASE}|' \
-			${WRKSRC}/Makefile
+DESCR=		${.CURDIR}/pkg-descr
+LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/qmail-smtp_auth+tls/Makefile b/mail/qmail-smtp_auth+tls/Makefile
index 357a61c84445..c4e3b7b2c9ee 100644
--- a/mail/qmail-smtp_auth+tls/Makefile
+++ b/mail/qmail-smtp_auth+tls/Makefile
@@ -7,102 +7,25 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${SMTP_AUTH-TLS_PATCH_DATE}
+PORTREVISION=	1
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-smtp_auth+tls
 
-PATCH_SITES+=	http://students.imsa.edu/~ngroot/:smtp_auth_tls
-PATCHFILES+=	qmail-1.03-starttls-smtp-auth.patch:smtp_auth_tls
-
 MAINTAINER=	freebsd@galle.com.br
 COMMENT=	A SECURE, reliable, and FAST MTA for UNIX systems WITH SMTP_AUTH+TLS
 
 # not type-safe
 ONLY_FOR_ARCHS=	i386
 
-USE_OPENSSL=	YES
-USE_REINPLACE=	yes
+USE_OPENSSL=	yes
 
-# Patches from the main qmail port are not wanted
-MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER=	yes
-MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER=		yes
+SLAVE_SMTP_AUTH_TLS=	yes
 
 SMTP_AUTH-TLS_PATCH_DATE=	20020519
 
-# Using default from master port, i.e., /var/qmail
-PREFIX?=	${QMAIL_PORT_PREFIX}
-
-.if !defined(_PREMKINCLUDED)
-.include <bsd.port.pre.mk>
-.endif
-
-CFLAGS+=	-I${OPENSSLBASE}/include -L${OPENSSLBASE}/lib -DTLS
-
-.if defined(WITH_TLS_DEBUG)
-CFLAGS+=	-DDEBUG
-.endif # WITH_TLS_DEBUG
-
 # Local overrides
 MASTERDIR=	${.CURDIR}/../qmail
-PKGDIR_LOCAL=	${.CURDIR}
-DESCR=		${PKGDIR_LOCAL}/pkg-descr
-PKGMESSAGE=	${PKGDIR_LOCAL}/pkg-message
-PLIST=		${PKGDIR_LOCAL}/pkg-plist
-
-QMAIL_PORT_PREFIX!=	cd ${MASTERDIR} && ${MAKE} -V PREFIX
-
-DOCFILES+=	${WRKDIR}/SMTP_AUTH+TLS.readme \
-		${WRKSRC}/README.auth
-
-slaveport-pre-fetch: qmail-smtp_auth+tls-pre-fetch
-
-qmail-smtp_auth+tls-pre-fetch:
-	@${ECHO_MSG} "WITH_TLS_DEBUG=yes		enable additional debug information"
-
-slaveport-post-patch: qmail-smtp_auth+tls-post-patch
-
-qmail-smtp_auth+tls-post-patch:
-	@${HEAD} -6 ${DISTDIR}/qmail-1.03-starttls-smtp-auth.patch \
-		| ${TAIL} -5 \
-		> ${WRKDIR}/SMTP_AUTH+TLS.readme
-	@${REINPLACE_CMD} "s|/usr/local/ssl|${OPENSSLBASE}|" ${WRKSRC}/Makefile
-
-# Primary Ugh... ;-)
-# idea stolen from www/apache13-ssl, a target written by adam@algroup.co.uk
-# internal code ripped from tls.patch guts ;-) written by Frederik Vermeulen <jos-tls@kotnet.org>
-
-certificate:
-	@if [ -f ${OPENSSLDIR}/openssl.cnf ]; \
-	then \
-		if [ ! -d ${WRKDIR} ]; \
-		then \
-			${MKDIR} ${WRKDIR} ; \
-		fi ; \
-		${OPENSSLBASE}/bin/openssl req -new -x509 -nodes \
-			-out ${WRKDIR}/servercert.pem -days 366 \
-			-keyout ${WRKDIR}/servercert.pem ; \
-		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/servercert.pem ${PREFIX}/control/servercert.pem ; \
-		${ECHO_MSG} "===> Do not forget to do 'make clean' to clean up temporary files" ; \
-	else \
-		${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
-	fi
-
-certificate-req:
-	@if [ -f ${OPENSSLDIR}/openssl.cnf ]; \
-	then \
-		if [ ! -d ${WRKDIR} ]; \
-		then \
-			${MKDIR} ${WRKDIR} ; \
-		fi ; \
-		${OPENSSLBASE}/bin/openssl req -new -nodes \
-			-out ${WRKDIR}/req.pem \
-			-keyout ${WRKDIR}/servercert.pem ; \
-		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/servercert.pem ${PREFIX}/control/servercert.pem ; \
-		${ECHO_MSG} ; \
-		${ECHO_MSG} "===> Do not forget to do 'make clean' to clean up temporary files" ; \
-		${ECHO_MSG} "===> Send ${WRKDIR}/req.pem to your CA to obtain signed_req.pem, and do:" ; \
-		${ECHO_MSG} "===> cat signed_req.pem >> ${PREFIX}/control/servercert.pem" ; \
-	else \
-		${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
-	fi
+DESCR=		${.CURDIR}/pkg-descr
+LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/qmail-smtp_auth+tls/pkg-plist b/mail/qmail-smtp_auth+tls/pkg-plist
deleted file mode 100644
index 77266d0b9c83..000000000000
--- a/mail/qmail-smtp_auth+tls/pkg-plist
+++ /dev/null
@@ -1,110 +0,0 @@
-bin/bouncesaying
-bin/condredirect
-bin/datemail
-bin/elq
-bin/except
-bin/forward
-bin/maildir2mbox
-bin/maildirmake
-bin/maildirwatch
-bin/mailsubj
-bin/pinq
-bin/predate
-bin/preline
-bin/qail
-bin/qbiff
-bin/qmail-clean
-bin/qmail-getpw
-bin/qmail-inject
-bin/qmail-local
-bin/qmail-lspawn
-bin/qmail-newmrh
-bin/qmail-newu
-bin/qmail-pop3d
-bin/qmail-popup
-bin/qmail-pw2u
-bin/qmail-qmqpc
-bin/qmail-qmqpd
-bin/qmail-qmtpd
-bin/qmail-qread
-bin/qmail-qstat
-bin/qmail-queue
-bin/qmail-remote
-bin/qmail-rspawn
-bin/qmail-send
-bin/qmail-showctl
-bin/qmail-smtpd
-bin/qmail-start
-bin/qmail-tcpok
-bin/qmail-tcpto
-bin/qreceipt
-bin/qsmhook
-bin/sendmail
-bin/splogger
-bin/tcp-env
-boot/binm1
-boot/binm1+df
-boot/binm2
-boot/binm2+df
-boot/binm3
-boot/binm3+df
-boot/home
-boot/home+df
-boot/maildir
-boot/proc
-boot/proc+df
-@comment This port installs the following manually (ie. not through qmail-hier)
-configure/config
-configure/config-fast
-configure/dnsfq
-configure/dnsip
-configure/dnsptr
-configure/hostname
-configure/install
-configure/ipmeprint
-scripts/enable-qmail
-scripts/mkaliasdir
-%%PORTDOCS%%%%DOCDIR%%/BLURB
-%%PORTDOCS%%%%DOCDIR%%/BLURB2
-%%PORTDOCS%%%%DOCDIR%%/BLURB3
-%%PORTDOCS%%%%DOCDIR%%/BLURB4
-%%PORTDOCS%%%%DOCDIR%%/FAQ
-%%PORTDOCS%%%%DOCDIR%%/INSTALL
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
-%%PORTDOCS%%%%DOCDIR%%/INTERNALS
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
-%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
-%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
-%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
-%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
-%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES
-%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE
-%%PORTDOCS%%%%DOCDIR%%/README.auth
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
-%%PORTDOCS%%%%DOCDIR%%/SECURITY
-%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
-%%PORTDOCS%%%%DOCDIR%%/SMTP_AUTH+TLS.readme
-%%PORTDOCS%%%%DOCDIR%%/SYSDEPS
-%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
-%%PORTDOCS%%%%DOCDIR%%/TEST.receive
-%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
-%%PORTDOCS%%%%DOCDIR%%/UPGRADE
-%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample
-%%PORTDOCS%%@dirrm %%DOCDIR%%
-@dirrm scripts
-@dirrm configure
-@dirrm boot
-@dirrm bin
-@unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." | /usr/bin/fmt
-@unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." | /usr/bin/fmt
-@unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. You can do it just executing 'echo sendmail_enable=\"YES\" >> /etc/rc.conf" | /usr/bin/fmt
diff --git a/mail/qmail-spamcontrol/Makefile b/mail/qmail-spamcontrol/Makefile
index 04df5aa02274..381442143d1e 100644
--- a/mail/qmail-spamcontrol/Makefile
+++ b/mail/qmail-spamcontrol/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${SPAMCONTROL_VERSION}
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES+=	http://www.fehcom.de/qmail/spamcontrol/:spamcontrol
 PKGNAMESUFFIX=	-spamcontrol
@@ -16,138 +17,19 @@ EXTRACT_ONLY=	${QMAIL_DIST}
 MAINTAINER=	freebsd@galle.com.br
 COMMENT=	Qmail MTA with SpamControl patches
 
-EXTRA_PATCHES+=	${QMAIL_PORT_PATCHDIR}/patch-aa ${QMAIL_PORT_PATCHDIR}/patch-ab \
-		${QMAIL_PORT_PATCHDIR}/patch-ac
+EXTRA_PATCHES+=	${MASTERDIR}/files/patch-install.c
 
 # Distfiles
 QMAIL_DIST=		${PORTNAME}-${QMAIL_VERSION}${EXTRACT_SUFX}
 SPAMCONTROL_DIST=	spamcontrol-${SPAMCONTROL_VERSION}_tgz.bin
 SPAMCONTROL_VERSION=	2313
-PREFIX?=		${QMAIL_PORT_PREFIX}
 LATEST_LINK=		${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
-OPTIONS=	RELAYMAILFROM	"Open relay based on mailfrom" off \
-		QUITASAP	"Close session in case of a filter condition" off \
-		REQBRACKETS	"Require brackets in <addresses>" on \
-		VERP		"VERP addresses for recipients" on \
-		RECIPIENTS550	"Get a 550 reply instead of a deferred bounce" off \
-		LOCALMFREQAUTH	"Require auth when from is @ your domains" off \
-		AUTHCRAM	"Aditional CRAM-MD5 support" off \
-		MOREIPME	"Additional control files moreipme & notipme" off \
-		BIGTODO		"Bruce Guenter's BigToDo patch" off
-
-.if !defined(_PREMKINCLUDED)
-.include <bsd.port.pre.mk>
-.endif
+SLAVE_SPAMCONTROL=	yes
 
+# Local overrides
 MASTERDIR=	${.CURDIR}/../qmail
 PATCHDIR=	${.CURDIR}/files
-# Using default from master port, i.e., /var/qmail
-QMAIL_PORT_PREFIX!=	cd ${MASTERDIR} && ${MAKE} -V PREFIX
-QMAIL_PORT_PATCHDIR!=	cd ${MASTERDIR} && ${MAKE} -V PATCHDIR
-
-# Block some patches because SpamControl contain the same patches inside
-MAIN_QMAIL_PORT_DNS_PATCH_BARRIER=			yes
-MAIN_QMAIL_PORT_SENDMAIL_F_PATCH_BARRIER=		yes
-MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER=	yes
-MAIN_QMAIL_PORT_WITH_BIG_TODO_PATCH_BARRIER=		yes
-MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER=		yes
-MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER=		yes
-MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER=			yes
-
-ALL_TARGET+=	${EXTRA_MAN8}
-
-# Local overrides
 DESCR=		${.CURDIR}/pkg-descr
-PLIST=		${.CURDIR}/pkg-plist
-MD5_FILE=	${.CURDIR}/distinfo
-
-EXTRA_MAN8=	qmail-badloadertypes.8 qmail-badmimetypes.8 qmail-recipients.8
-MAN8+=		${EXTRA_MAN8}
-DOCFILES+=	${WRKDIR}/doc/FILES.spamcontrol ${WRKDIR}/doc/HISTORY.spamcontrol \
-		${WRKDIR}/doc/INSTALL.spamcontrol ${WRKDIR}/doc/LICENSE.spamcontrol \
-		${WRKDIR}/doc/LOGGING.spamcontrol ${WRKDIR}/doc/Makefile.djbdns \
-		${WRKDIR}/doc/README.auth ${WRKDIR}/doc/README.bigtodo \
-		${WRKDIR}/doc/README.bouncemaxbytes ${WRKDIR}/doc/README.djbdns \
-		${WRKDIR}/doc/README.doublebouncetrim ${WRKDIR}/doc/README.moreipme \
-		${WRKDIR}/doc/README.qmailqueue ${WRKDIR}/doc/README.recipients \
-		${WRKDIR}/doc/README.spamcontrol ${WRKDIR}/doc/README.wildmat \
-		${WRKDIR}/doc/README_spamcontrol.html \
-		${WRKDIR}/doc/RELEASE_22.spamcontrol \
-		${WRKDIR}/doc/RELEASE_23.spamcontrol \
-		${WRKDIR}/doc/SMTPREPLY.spamcontrol ${WRKDIR}/doc/TESTING.spamcontrol \
-		${WRKDIR}/doc/TODO.spamcontrol ${WRKDIR}/doc/badloadertypes \
-		${WRKDIR}/doc/badmailfrom ${WRKDIR}/doc/badmimetypes \
-		${WRKDIR}/doc/badrcptto ${WRKDIR}/doc/conf-spamcontrol \
-		${WRKDIR}/doc/install_spamcontrol.sh ${WRKDIR}/doc/tarpitcount
-SCRIPTS+=	qmail-alias2recipients qmail-pwd2recipients \
-		qmail-users2recipients qmail-vpopmail2recipients
-
-# Fill SELECTED_OPTIONS with options to write conf-spamcontrol
-.if defined(WITH_RELAYMAILFROM)
-SELECTED_OPTIONS+=	relaymailfrom=yes
-.else
-SELECTED_OPTIONS+=	relaymailfrom=no
-.endif
-
-.if defined(WITH_QUITASAP)
-SELECTED_OPTIONS+=	quitasap=yes
-.else
-SELECTED_OPTIONS+=	quitasap=no
-.endif
-
-.if !defined(WITHOUT_REQBRACKETS)
-SELECTED_OPTIONS+=	reqbrackets=yes
-.else
-SELECTED_OPTIONS+=	reqbrackets=no
-.endif
-
-.if !defined(WITHOUT_VERP)
-SELECTED_OPTIONS+=	verp=yes
-.else
-SELECTED_OPTIONS+=	verp=no
-.endif
-
-.if defined(WITH_RECIPIENTS550)
-SELECTED_OPTIONS+=	recipients550=yes
-.else
-SELECTED_OPTIONS+=	recipients550=no
-.endif
-
-.if defined(WITH_LOCALMFREQAUTH)
-SELECTED_OPTIONS+=	localmfreqauth=yes
-.else
-SELECTED_OPTIONS+=	localmfreqauth=no
-.endif
-
-.if defined(WITH_AUTHCRAM)
-SELECTED_OPTIONS+=	authcram=yes
-.else
-SELECTED_OPTIONS+=	authcram=no
-.endif
-
-.if defined(WITH_MOREIPME)
-SELECTED_OPTIONS+=	moreipme=yes
-.else
-SELECTED_OPTIONS+=	moreipme=no
-.endif
-
-.if defined(WITH_BIGTODO)
-SELECTED_OPTIONS+=	bigtodo=yes
-.else
-SELECTED_OPTIONS+=	bigtodo=no
-.endif
-
-post-extract:
-	@cd ${WRKSRC} && ${TAR} -xzf ${DISTDIR}/${SPAMCONTROL_DIST}
-
-pre-configure:
-	@${ECHO_CMD} ${WRKDIR} > ${WRKSRC}/conf-qmail
-	@${ECHO_CMD} "# Generated by qmail-spamcontrol FreeBSD port" \
-		> ${WRKSRC}/conf-spamcontrol
-.for option in ${SELECTED_OPTIONS}
-	@${ECHO_CMD} ${option} >> ${WRKSRC}/conf-spamcontrol
-.endfor
-	@cd ${WRKSRC} && ./install_spamcontrol.sh
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/qmail-spamcontrol/distinfo b/mail/qmail-spamcontrol/distinfo
deleted file mode 100644
index 309efaab60b5..000000000000
--- a/mail/qmail-spamcontrol/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 (qmail-1.03.tar.gz) = 622f65f982e380dbe86e6574f3abcb7c
-SIZE (qmail-1.03.tar.gz) = 220668
-MD5 (spamcontrol-2313_tgz.bin) = a8ad350699dfd6110c3e8a8784f55ad4
-SIZE (spamcontrol-2313_tgz.bin) = 116888
diff --git a/mail/qmail-spamcontrol/pkg-plist b/mail/qmail-spamcontrol/pkg-plist
deleted file mode 100644
index b0058288972b..000000000000
--- a/mail/qmail-spamcontrol/pkg-plist
+++ /dev/null
@@ -1,144 +0,0 @@
-bin/bouncesaying
-bin/condredirect
-bin/datemail
-bin/elq
-bin/except
-bin/forward
-bin/maildir2mbox
-bin/maildirmake
-bin/maildirwatch
-bin/mailsubj
-bin/pinq
-bin/predate
-bin/preline
-bin/qail
-bin/qbiff
-bin/qmail-badloadertypes
-bin/qmail-badmimetypes
-bin/qmail-clean
-bin/qmail-getpw
-bin/qmail-inject
-bin/qmail-local
-bin/qmail-lspawn
-bin/qmail-newmrh
-bin/qmail-newu
-bin/qmail-pop3d
-bin/qmail-popup
-bin/qmail-pw2u
-bin/qmail-qmqpc
-bin/qmail-qmqpd
-bin/qmail-qmtpd
-bin/qmail-qread
-bin/qmail-qstat
-bin/qmail-queue
-bin/qmail-recipients
-bin/qmail-remote
-bin/qmail-rspawn
-bin/qmail-send
-bin/qmail-showctl
-bin/qmail-smtpd
-bin/qmail-start
-bin/qmail-tcpok
-bin/qmail-tcpto
-bin/qreceipt
-bin/qsmhook
-bin/sendmail
-bin/splogger
-bin/tcp-env
-boot/binm1
-boot/binm1+df
-boot/binm2
-boot/binm2+df
-boot/binm3
-boot/binm3+df
-boot/home
-boot/home+df
-boot/maildir
-boot/proc
-boot/proc+df
-@comment This port installs the following manually (ie. not through qmail-hier)
-configure/config
-configure/config-fast
-configure/dnsfq
-configure/dnsip
-configure/dnsptr
-configure/hostname
-configure/install
-configure/ipmeprint
-scripts/enable-qmail
-scripts/mkaliasdir
-scripts/qmail-alias2recipients
-scripts/qmail-pwd2recipients
-scripts/qmail-users2recipients
-scripts/qmail-vpopmail2recipients
-%%PORTDOCS%%%%DOCDIR%%/BLURB
-%%PORTDOCS%%%%DOCDIR%%/BLURB2
-%%PORTDOCS%%%%DOCDIR%%/BLURB3
-%%PORTDOCS%%%%DOCDIR%%/BLURB4
-%%PORTDOCS%%%%DOCDIR%%/FAQ
-%%PORTDOCS%%%%DOCDIR%%/FILES.spamcontrol
-%%PORTDOCS%%%%DOCDIR%%/HISTORY.spamcontrol
-%%PORTDOCS%%%%DOCDIR%%/INSTALL
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.spamcontrol
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
-%%PORTDOCS%%%%DOCDIR%%/INTERNALS
-%%PORTDOCS%%%%DOCDIR%%/LICENSE.spamcontrol
-%%PORTDOCS%%%%DOCDIR%%/LOGGING.spamcontrol
-%%PORTDOCS%%%%DOCDIR%%/Makefile.djbdns
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
-%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
-%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
-%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
-%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
-%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES
-%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE
-%%PORTDOCS%%%%DOCDIR%%/README.auth
-%%PORTDOCS%%%%DOCDIR%%/README.bigtodo
-%%PORTDOCS%%%%DOCDIR%%/README.bouncemaxbytes
-%%PORTDOCS%%%%DOCDIR%%/README.djbdns
-%%PORTDOCS%%%%DOCDIR%%/README.doublebouncetrim
-%%PORTDOCS%%%%DOCDIR%%/README.moreipme
-%%PORTDOCS%%%%DOCDIR%%/README.qmailqueue
-%%PORTDOCS%%%%DOCDIR%%/README.recipients
-%%PORTDOCS%%%%DOCDIR%%/README.spamcontrol
-%%PORTDOCS%%%%DOCDIR%%/README.wildmat
-%%PORTDOCS%%%%DOCDIR%%/README_spamcontrol.html
-%%PORTDOCS%%%%DOCDIR%%/RELEASE_22.spamcontrol
-%%PORTDOCS%%%%DOCDIR%%/RELEASE_23.spamcontrol
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
-%%PORTDOCS%%%%DOCDIR%%/SECURITY
-%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
-%%PORTDOCS%%%%DOCDIR%%/SMTPREPLY.spamcontrol
-%%PORTDOCS%%%%DOCDIR%%/SYSDEPS
-%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
-%%PORTDOCS%%%%DOCDIR%%/TEST.receive
-%%PORTDOCS%%%%DOCDIR%%/TESTING.spamcontrol
-%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
-%%PORTDOCS%%%%DOCDIR%%/TODO.spamcontrol
-%%PORTDOCS%%%%DOCDIR%%/UPGRADE
-%%PORTDOCS%%%%DOCDIR%%/badloadertypes
-%%PORTDOCS%%%%DOCDIR%%/badmailfrom
-%%PORTDOCS%%%%DOCDIR%%/badmimetypes
-%%PORTDOCS%%%%DOCDIR%%/badrcptto
-%%PORTDOCS%%%%DOCDIR%%/conf-spamcontrol
-%%PORTDOCS%%%%DOCDIR%%/install_spamcontrol.sh
-%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample
-%%PORTDOCS%%%%DOCDIR%%/tarpitcount
-%%PORTDOCS%%@dirrm %%DOCDIR%%
-@dirrm scripts
-@dirrm configure
-@dirrm boot
-@dirrm bin
-@unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." | /usr/bin/fmt
-@unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." | /usr/bin/fmt
-@unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. You can do it just executing 'echo sendmail_enable=\"YES\" >> /etc/rc.conf" | /usr/bin/fmt
diff --git a/mail/qmail-tls/Makefile b/mail/qmail-tls/Makefile
index c62f6e000b40..9f142befdd69 100644
--- a/mail/qmail-tls/Makefile
+++ b/mail/qmail-tls/Makefile
@@ -7,97 +7,22 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${TLS_PATCH_DATE}
+PORTREVISION=	1
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-tls
 
-PATCH_SITES+=	http://www.esat.kuleuven.ac.be/~vermeule/qmail/:tls
-PATCHFILES+=	tls.patch:tls
-PATCH_DIST_STRIP+=	-p1
-
 MAINTAINER=	freebsd@galle.com.br
 COMMENT=	A SECURE, reliable, and FAST MTA for UNIX systems WITH TLS support
 
-USE_OPENSSL=	YES
-USE_REINPLACE=	yes
-
-# Patches from the main qmail port are not wanted
-MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER=	yes
-MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER=		yes
+SLAVE_TLS=	yes
 
 TLS_PATCH_DATE=	20020825
 
-# Using default from master port, i.e., /var/qmail
-PREFIX?=	${QMAIL_PORT_PREFIX}
-
-.if !defined(_PREMKINCLUDED)
-.include <bsd.port.pre.mk>
-.endif
-
-CFLAGS+=	-I${OPENSSLBASE}/include -L${OPENSSLBASE}/lib -DTLS
-
-.if defined(WITH_TLS_DEBUG)
-CFLAGS+=	-DDEBUG
-.endif # WITH_TLS_DEBUG
+USE_OPENSSL=	yes
 
 # Local overrides
 MASTERDIR=	${.CURDIR}/../qmail
-PKGDIR_LOCAL=	${.CURDIR}
-DESCR=		${PKGDIR_LOCAL}/pkg-descr
-PKGMESSAGE=	${PKGDIR_LOCAL}/pkg-message
-PLIST=		${PKGDIR_LOCAL}/pkg-plist
-
-QMAIL_PORT_PREFIX!=	cd ${MASTERDIR} && ${MAKE} -V PREFIX
-
-DOCFILES+=	${WRKDIR}/TLS.readme
-
-slaveport-pre-fetch: qmail-tls-pre-fetch
-
-qmail-tls-pre-fetch:
-	@${ECHO_MSG} "WITH_TLS_DEBUG=yes		enable additional debug information"
-
-slaveport-post-patch: qmail-tls-post-patch
-
-qmail-tls-post-patch:
-	@${HEAD} -74 ${DISTDIR}/tls.patch > ${WRKDIR}/TLS.readme
-	@${REINPLACE_CMD} "s|/usr/local/ssl|${OPENSSLBASE}|" ${WRKSRC}/Makefile
-
-# Primary Ugh... ;-)
-# idea stolen from www/apache13-ssl, a target written by adam@algroup.co.uk
-# internal code ripped from tls.patch guts ;-) written by Frederik Vermeulen <jos-tls@kotnet.org>
-
-certificate:
-	@if [ -f ${OPENSSLDIR}/openssl.cnf ]; \
-	then \
-		if [ ! -d ${WRKDIR} ]; \
-		then \
-			${MKDIR} ${WRKDIR} ; \
-		fi ; \
-		${OPENSSLBASE}/bin/openssl req -new -x509 -nodes \
-			-out ${WRKDIR}/servercert.pem -days 366 \
-			-keyout ${WRKDIR}/servercert.pem ; \
-		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/servercert.pem ${PREFIX}/control/servercert.pem ; \
-		${ECHO_MSG} "===> Do not forget to do 'make clean' to clean up temporary files" ; \
-	else \
-		${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
-	fi
-
-certificate-req:
-	@if [ -f ${OPENSSLDIR}/openssl.cnf ]; \
-	then \
-		if [ ! -d ${WRKDIR} ]; \
-		then \
-			${MKDIR} ${WRKDIR} ; \
-		fi ; \
-		${OPENSSLBASE}/bin/openssl req -new -nodes \
-			-out ${WRKDIR}/req.pem \
-			-keyout ${WRKDIR}/servercert.pem ; \
-		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/servercert.pem ${PREFIX}/control/servercert.pem ; \
-		${ECHO_MSG} ; \
-		${ECHO_MSG} "===> Do not forget to do 'make clean' to clean up temporary files" ; \
-		${ECHO_MSG} "===> Send ${WRKDIR}/req.pem to your CA to obtain signed_req.pem, and do:" ; \
-		${ECHO_MSG} "===> cat signed_req.pem >> ${PREFIX}/control/servercert.pem" ; \
-	else \
-		${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
-	fi
+DESCR=		${.CURDIR}/pkg-descr
+LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/qmail-tls/pkg-plist b/mail/qmail-tls/pkg-plist
deleted file mode 100644
index 20f793d9ac77..000000000000
--- a/mail/qmail-tls/pkg-plist
+++ /dev/null
@@ -1,109 +0,0 @@
-bin/bouncesaying
-bin/condredirect
-bin/datemail
-bin/elq
-bin/except
-bin/forward
-bin/maildir2mbox
-bin/maildirmake
-bin/maildirwatch
-bin/mailsubj
-bin/pinq
-bin/predate
-bin/preline
-bin/qail
-bin/qbiff
-bin/qmail-clean
-bin/qmail-getpw
-bin/qmail-inject
-bin/qmail-local
-bin/qmail-lspawn
-bin/qmail-newmrh
-bin/qmail-newu
-bin/qmail-pop3d
-bin/qmail-popup
-bin/qmail-pw2u
-bin/qmail-qmqpc
-bin/qmail-qmqpd
-bin/qmail-qmtpd
-bin/qmail-qread
-bin/qmail-qstat
-bin/qmail-queue
-bin/qmail-remote
-bin/qmail-rspawn
-bin/qmail-send
-bin/qmail-showctl
-bin/qmail-smtpd
-bin/qmail-start
-bin/qmail-tcpok
-bin/qmail-tcpto
-bin/qreceipt
-bin/qsmhook
-bin/sendmail
-bin/splogger
-bin/tcp-env
-boot/binm1
-boot/binm1+df
-boot/binm2
-boot/binm2+df
-boot/binm3
-boot/binm3+df
-boot/home
-boot/home+df
-boot/maildir
-boot/proc
-boot/proc+df
-@comment This port installs the following manually (ie. not through qmail-hier)
-configure/config
-configure/config-fast
-configure/dnsfq
-configure/dnsip
-configure/dnsptr
-configure/hostname
-configure/install
-configure/ipmeprint
-scripts/enable-qmail
-scripts/mkaliasdir
-%%PORTDOCS%%%%DOCDIR%%/BLURB
-%%PORTDOCS%%%%DOCDIR%%/BLURB2
-%%PORTDOCS%%%%DOCDIR%%/BLURB3
-%%PORTDOCS%%%%DOCDIR%%/BLURB4
-%%PORTDOCS%%%%DOCDIR%%/FAQ
-%%PORTDOCS%%%%DOCDIR%%/INSTALL
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
-%%PORTDOCS%%%%DOCDIR%%/INTERNALS
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
-%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
-%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
-%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
-%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
-%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES
-%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
-%%PORTDOCS%%%%DOCDIR%%/SECURITY
-%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
-%%PORTDOCS%%%%DOCDIR%%/SYSDEPS
-%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
-%%PORTDOCS%%%%DOCDIR%%/TEST.receive
-%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
-%%PORTDOCS%%%%DOCDIR%%/TLS.readme
-%%PORTDOCS%%%%DOCDIR%%/UPGRADE
-%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample
-%%PORTDOCS%%@dirrm %%DOCDIR%%
-@dirrm scripts
-@dirrm configure
-@dirrm boot
-@dirrm bin
-@unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." | /usr/bin/fmt
-@unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." | /usr/bin/fmt
-@unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. You can do it just executing 'echo sendmail_enable=\"YES\" >> /etc/rc.conf" | /usr/bin/fmt
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 057387bb7e49..cab13c179a34 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -7,20 +7,34 @@
 
 PORTNAME=	qmail
 PORTVERSION?=	${QMAIL_VERSION}
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES=	mail
-MASTER_SITES+=	http://cr.yp.to/software/ \
-		ftp://ftp.ntnu.no/pub/unix/mail/qmail/ \
-		ftp://ftp.jp.qmail.org/qmail/ \
-		ftp://ftp.net.ohio-state.edu/pub/networking/mail/qmail/ \
-		${MASTER_SITE_QMAIL}
+MASTER_SITES+=	${MASTER_SITE_QMAIL}
 DISTNAME=	${PORTNAME}-${QMAIL_VERSION}
 
 MAINTAINER?=	freebsd@galle.com.br
 COMMENT?=	A secure, reliable, efficient, simple, and fast MTA
 
-# qmail-* skeleton ports including this port may not want
-# its patches
+.if defined(SLAVE_LDAP) || defined(SLAVE_SPAMCONTROL)
+MAIN_QMAIL_PORT_DNS_PATCH_BARRIER=yes
+MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER=yes
+.endif
+
+.if defined(SLAVE_LDAP) || defined(SLAVE_SMTP_AUTH_TLS) || \
+    defined(SLAVE_SPAMCONTROL) || defined(SLAVE_TLS)
+MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER=yes
+MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER=yes
+.endif
+
+.if defined(SLAVE_MYSQL) || defined(SLAVE_SPAMCONTROL)
+MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER=yes
+.endif
+
+.if defined(SLAVE_SPAMCONTROL)
+MAIN_QMAIL_PORT_SENDMAIL_F_PATCH_BARRIER=yes
+MAIN_QMAIL_PORT_WITH_BIG_TODO_PATCH_BARRIER=yes
+.endif
+
 .if !defined(MAIN_QMAIL_PORT_DNS_PATCH_BARRIER)
 # Patch necessary to cope with non-RFC >512 dns entries
 # Since AOL has been using those, the problem has skyrocketed from minor to
@@ -28,14 +42,14 @@ COMMENT?=	A secure, reliable, efficient, simple, and fast MTA
 PATCH_SITES+=	http://www.ckdhr.com/ckd/:dns
 PATCHFILES+=	qmail-103.patch:dns
 PATCH_DIST_STRIP+=	-p1
-.endif # MAIN_QMAIL_PORT_DNS_PATCH_BARRIER
+.endif
 
 .if !defined(MAIN_QMAIL_PORT_SENDMAIL_F_PATCH_BARRIER)
 # David Phillips noticed that sendmail's -f option sets a default
 # From: header, and so should qmail's emulation.
 PATCH_SITES+=	http://david.acz.org/software/:sendmail_flagf
 PATCHFILES+=	sendmail-flagf.patch:sendmail_flagf
-.endif # MAIN_QMAIL_PORT_SENDMAIL_F_PATCH_BARRIER
+.endif
 
 .if !defined(MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER)
 # This patch changes qmail-remote to skip over MX servers that greet with
@@ -44,102 +58,28 @@ PATCHFILES+=	sendmail-flagf.patch:sendmail_flagf
 # Created by Matthias Andree
 PATCH_SITES+=	http://www-dt.e-technik.uni-dortmund.de/~ma/qmail/:rfc2821
 PATCHFILES+=	patch-qmail-1.03-rfc2821.diff:rfc2821
-.endif # MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER
-
-PATCH_SITES+=	${MASTER_SITE_LOCAL:S/$/:local,dns,ldap,mysql,smtp_auth_tls,tls/}
-PATCH_SITE_SUBDIR+=	lioux/:local,dns,ldap,mysql,smtp_auth_tls,tls
-
-MASTER_SITE_QMAIL+=	\
-	http://qmail.geto.net/%SUBDIR%/ \
-	http://qmail.palomine.net/%SUBDIR%/ \
-	http://qmail.mirrors.summersault.com/%SUBDIR%/ \
-	http://qmail.cdsinet.net/%SUBDIR%/ \
-	http://qmail.fidnet.com/%SUBDIR%/ \
-	http://qmail.mscnetworks.com/%SUBDIR%/ \
-	http://qmail.teleglobe.net/%SUBDIR%/ \
-	http://qmail.homegrownhost.net/%SUBDIR%/ \
-	http://qmail.webmast.com/%SUBDIR%/ \
-	http://qmail.glasswings.com.au/%SUBDIR%/ \
-	http://qmail.planetmirror.com/%SUBDIR%/ \
-	http://qmail.404-not-found.net/%SUBDIR%/ \
-	http://qmail.hostlink.com.hk/%SUBDIR%/ \
-	http://qmail.cbn.net.id/%SUBDIR%/ \
-	http://www9.jp.qmail.org/%SUBDIR%/ \
-	http://qmailorg.data-hotel.net/%SUBDIR%/ \
-	http://qmail.manic.co.kr/%SUBDIR%/ \
-	http://qmail.psshee.com/%SUBDIR%/ \
-	http://qmail.soa.co.nz/%SUBDIR%/ \
-	http://d2.nctu.edu.tw/qmail/%SUBDIR%/ \
-	http://mirrors.kangaroot.net/qmail/%SUBDIR%/ \
-	http://qmail.ssi.bg/%SUBDIR%/ \
-	http://mirrors.sunsite.dk/qmailwww/%SUBDIR%/ \
-	http://qmail.xinus.net/%SUBDIR%/ \
-	http://qmail.lightwerk.com/%SUBDIR%/ \
-	http://qmail.mirrors.Space.Net/%SUBDIR%/ \
-	http://qmail-mirror.hoermann-rawema.de/%SUBDIR%/ \
-	http://www.ntua.gr/qmail/%SUBDIR%/ \
-	http://www.agria.hu/qmail/%SUBDIR%/ \
-	http://qmail-mirror.naplopok.hu/%SUBDIR%/ \
-	http://qmail.hu/%SUBDIR%/ \
-	http://qmail.rhnet.is/%SUBDIR%/ \
-	http://qmail.netsoc.ucd.ie/%SUBDIR%/ \
-	http://complanet.ath.cx/qmail/%SUBDIR%/ \
-	http://mirrors.dataloss.nl/www.qmail.org/%SUBDIR%/ \
-	http://qmail.basefreak.nl/%SUBDIR%/ \
-	http://www.math.ntnu.no/mirror/www.qmail.org/%SUBDIR%/ \
-	http://qmail.obeer.com/%SUBDIR%/ \
-	http://qmail.konnekt.org/%SUBDIR%/ \
-	http://qmail.smux.net/%SUBDIR%/ \
-	http://qmail.netvisao.pt/%SUBDIR%/ \
-	http://qmail.ssc.nsu.ru/%SUBDIR%/ \
-	http://qmail.tps.sk/%SUBDIR%/ \
-	http://qmail.ipg.sk/%SUBDIR%/ \
-	http://qmail.imasd.elmundo.es/%SUBDIR%/ \
-	http://qmail.x42.com/%SUBDIR%/ \
-	http://qmail.netrogenic.com/%SUBDIR%/ \
-	http://qmail.omnis.ch/%SUBDIR%/ \
-	http://qmail.asylog.net/%SUBDIR%/ \
-	http://qmail.humourengine.com/%SUBDIR%/ \
-	http://qmail.softflare.com/%SUBDIR%/ \
-	http://qmail.blueyonder.co.uk/%SUBDIR%/ \
-	http://qmail.usp.br/%SUBDIR%/ \
-	http://qmail.matrix.com.br/%SUBDIR%/ \
-	http://madhaus.utcs.utoronto.ca/qmail/%SUBDIR%/ \
-	http://qmail.freezer-burn.org/%SUBDIR%/ \
-	http://qmail.unam.mx/%SUBDIR%/ \
-	http://qmail.ru.ac.za/%SUBDIR%/ \
-	http://www.qmail.org/%SUBDIR%/
+.endif
 
-.if !defined(MAIN_QMAIL_PORT_DNS_PATCH_BARRIER) \
- 	||(defined(WITH_QMAILQUEUE_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER)) \
-	||(defined(WITH_BIG_TODO_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_BIG_TODO_PATCH_BARRIER)) \
-	||(defined(WITH_BIG_CONCURRENCY_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER)) \
-	||(defined(WITH_OUTGOINGIP_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER))
-PATCH_SITES+=	${MASTER_SITE_QMAIL}
+.if defined(SLAVE_LDAP)
+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
+.elif defined(SLAVE_SMTP_AUTH_TLS)
+PATCH_SITES+=	http://students.imsa.edu/~ngroot/:smtp_auth_tls
+PATCHFILES+=	qmail-1.03-starttls-smtp-auth.patch:smtp_auth_tls
+.elif defined(SLAVE_TLS)
+PATCH_SITES+=	http://www.esat.kuleuven.ac.be/~vermeule/qmail/:tls
+PATCHFILES+=	tls.patch:tls
+PATCH_DIST_STRIP+=	-p1
 .endif
 
-# qmail-* skeleton ports including this port may not want
-# its patches
-# MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER
-# MAIN_QMAIL_PORT_WITH_BIG_TODO_PATCH_BARRIER
-# MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER
-# MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER
-#
-.if defined(WITH_QMAILQUEUE_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER)
-PATCHFILES+=	qmailqueue-patch
-.endif # WITH_QMAILQUEUE_PATCH && !MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER
-.if defined(WITH_BIG_TODO_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_BIG_TODO_PATCH_BARRIER)
-PATCHFILES+=	big-todo.103.patch
-.endif # WITH_BIG_TODO_PATCH && !MAIN_QMAIL_PORT_WITH_BIG_TODO_PATCH_BARRIER
-.if defined(WITH_BIG_CONCURRENCY_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER)
-PATCHFILES+=	big-concurrency.patch
-.endif # WITH_BIG_CONCURRENCY_PATCH && !MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER
-.if defined(WITH_OUTGOINGIP_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER)
-PATCHFILES+=	outgoingip.patch
-.endif # WITH_OUTGOINGIP_PATCH && !MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER
+PATCH_SITES+=	${MASTER_SITE_LOCAL:S/$/:local,dns,ldap,mysql,smtp_auth_tls,tls/}
+PATCH_SITE_SUBDIR+=	lioux/:local,dns,ldap,mysql,smtp_auth_tls,tls
 
-NO_PACKAGE=	djb's packaging license does not allow non-standard\
-		qmail binary distributions
+#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
@@ -147,10 +87,47 @@ NO_PACKAGE=	djb's packaging license does not allow non-standard\
 PREFIX?=		/var/qmail
 QMAIL_VERSION?=		1.03
 
-# Some default values, these can be modified by make command line
-.if defined(WITH_BIG_CONCURRENCY_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER)
-WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT?=	509
-.endif # WITH_BIG_CONCURRENCY_PATCH && !MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER
+.if defined(SLAVE_SMTP_AUTH_TLS) || defined(SLAVE_TLS)
+CFLAGS+=	-I${OPENSSLBASE}/include -L${OPENSSLBASE}/lib -DTLS
+.if defined(WITH_TLS_DEBUG)
+CFLAGS+=	-DDEBUG
+.endif
+.endif
+
+.if !defined(MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER)
+OPTIONS+=	QMAILQUEUE_PATCH "run a QMAILQUEUE program" off
+.endif
+.if !defined(MAIN_QMAIL_PORT_WITH_BIG_TODO_PATCH_BARRIER)
+OPTIONS+=	BIG_TODO_PATCH "enable big_todo qmail patch" off
+.endif
+.if !defined(MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER)
+OPTIONS+=	BIG_CONCURRENCY_PATCH "use a concurrency greater than 240" off
+.endif
+.if !defined(MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER)
+OPTIONS+=	OUTGOINGIP_PATCH "set the IP address to send messages" off
+.endif
+.if defined(SLAVE_TLS) || defined(SLAVE_SMTP_AUTH_TLS)
+OPTIONS+=	TLS_DEBUG "enable additional debug information" off
+.elif defined(SLAVE_LDAP)
+OPTIONS+=	TLS "SMTP TLS support" on \
+		LDAP_CLUSTER "cluster support" on \
+		AUTOMAILDIRMAKE "the auto-maildir-make feature" on \
+		AUTOHOMEDIRMAKE "auto-homedir-make feature" on \
+		LDAP_DEBUG "possibility to log and debug imap/pop" off \
+		CLEARTEXTPASSWD "use cleartext passwords" off \
+		DASH_EXT "dash_ext extended mail addresses add" off
+.elif defined(SLAVE_SPAMCONTROL)
+OPTIONS+=	RELAYMAILFROM	"Open relay based on mailfrom" off \
+		QUITASAP	"Close session in case of a filter condition" off \
+		REQBRACKETS	"Require brackets in <addresses>" on \
+		VERP		"VERP addresses for recipients" on \
+		RECIPIENTS550	"Get a 550 reply instead of a deferred bounce" off \
+		LOCALMFREQAUTH	"Require auth when from is @ your domains" off \
+		AUTHCRAM	"Aditional CRAM-MD5 support" off \
+		MOREIPME	"Additional control files moreipme & notipme" off \
+		BIGTODO		"Bruce Guenter's BigToDo patch" off
+.endif
+OPTIONS+=	RCDLINK "create rc.d/qmail.sh" on
 
 ALL_TARGET+=	default dot-qmail.5 qmail-control.5 qmail-getpw.8 \
 		qmail-limits.7 qmail-newmrh.8 qmail-newu.8 qmail-pw2u.8 \
@@ -169,16 +146,55 @@ 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
 
-PLIST_SUB=	DOCDIR=${DOCDIR}
+.if defined(SLAVE_SPAMCONTROL)
+EXTRA_MAN8=	qmail-badloadertypes.8 qmail-badmimetypes.8 qmail-recipients.8
+ALL_TARGET+=	${EXTRA_MAN8}
+MAN8+=		${EXTRA_MAN8}
+.endif
+
+.if defined(SLAVE_SPAMCONTROL) || defined(SLAVE_SMTP_AUTH_TLS)
+PLIST_SUB+=	README_AUTH=""
+.else
+PLIST_SUB+=	README_AUTH="@comment "
+.endif
+
+.if defined(SLAVE_LDAP)
+PKGMESSAGE_SUFFIX=	-ldap
+PLIST_SUB+=	LDAP=""
+.else
+PLIST_SUB+=	LDAP="@comment "
+.endif
+
+.if defined(SLAVE_SMTP_AUTH_TLS)
+PKGMESSAGE_SUFFIX=	-smtp_auth+tls
+PLIST_SUB+=	SMTP_AUTH_TLS=""
+.else
+PLIST_SUB+=	SMTP_AUTH_TLS="@comment "
+.endif
+
+.if defined(SLAVE_SPAMCONTROL)
+PLIST_SUB+=	SPAMCONTROL=""
+.else
+PLIST_SUB+=	SPAMCONTROL="@comment "
+.endif
+
+.if defined(SLAVE_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
+PKGMESSAGE?=	${WRKDIR}/pkg-message${PKGMESSAGE_SUFFIX}
 
 DOCFILES+=	${WRKSRC}/BLURB ${WRKSRC}/BLURB2 ${WRKSRC}/BLURB3 \
 		${WRKSRC}/BLURB4 ${WRKSRC}/INTERNALS ${WRKSRC}/SECURITY \
 		${WRKSRC}/THOUGHTS ${FILESDIR}/PORT_NOTES \
 		${FILESDIR}/PORT_NOTES_FreeBSD_40-RELEASE \
-		${WRKDIR}/mailer.conf.sample
-
-# The following docfiles are normally installed with qmail-hier
-DOCFILES+=	${WRKSRC}/FAQ ${WRKSRC}/UPGRADE ${WRKSRC}/SENDMAIL \
+		${WRKDIR}/mailer.conf.sample \
+		${WRKSRC}/FAQ ${WRKSRC}/UPGRADE ${WRKSRC}/SENDMAIL \
 		${WRKSRC}/INSTALL ${WRKSRC}/INSTALL.alias \
 		${WRKSRC}/INSTALL.ctl ${WRKSRC}/INSTALL.ids \
 		${WRKSRC}/INSTALL.maildir ${WRKSRC}/INSTALL.mbox \
@@ -190,109 +206,223 @@ DOCFILES+=	${WRKSRC}/FAQ ${WRKSRC}/UPGRADE ${WRKSRC}/SENDMAIL \
 		${WRKSRC}/PIC.nullclient ${WRKSRC}/PIC.relaybad \
 		${WRKSRC}/PIC.relaygood ${WRKSRC}/PIC.rem2local
 
-# More files normally installed with from hier.c
-BOOTFILES=	home home+df proc proc+df binm1 binm1+df \
-		binm2 binm2+df binm3 binm3+df
-
-# Supplied by Stuart Henderson <stuart@internationalschool.co.uk>
-BOOTFILES+=	maildir
+.if defined(SLAVE_LDAP)
+DOCFILES+=	${WRKSRC}/QLDAPINSTALL ${WRKSRC}/QLDAPNEWS \
+		${WRKSRC}/POPBEFORESMTP ${WRKSRC}/QLDAPTODO \
+		${WRKSRC}/QLDAPPICTURE
+.elif defined(SLAVE_SMTP_AUTH_TLS)
+DOCFILES+=	${WRKDIR}/SMTP_AUTH+TLS.readme \
+		${WRKSRC}/README.auth
+.elif defined(SLAVE_TLS)
+DOCFILES+=	${WRKDIR}/TLS.readme
+.elif defined(SLAVE_SPAMCONTROL)
+DOCFILES+=	${WRKDIR}/doc/FILES.spamcontrol ${WRKDIR}/doc/HISTORY.spamcontrol \
+		${WRKDIR}/doc/INSTALL.spamcontrol ${WRKDIR}/doc/LICENSE.spamcontrol \
+		${WRKDIR}/doc/LOGGING.spamcontrol ${WRKDIR}/doc/Makefile.djbdns \
+		${WRKDIR}/doc/README.auth ${WRKDIR}/doc/README.bigtodo \
+		${WRKDIR}/doc/README.bouncemaxbytes ${WRKDIR}/doc/README.djbdns \
+		${WRKDIR}/doc/README.doublebouncetrim ${WRKDIR}/doc/README.moreipme \
+		${WRKDIR}/doc/README.qmailqueue ${WRKDIR}/doc/README.recipients \
+		${WRKDIR}/doc/README.spamcontrol ${WRKDIR}/doc/README.wildmat \
+		${WRKDIR}/doc/README_spamcontrol.html \
+		${WRKDIR}/doc/RELEASE_22.spamcontrol \
+		${WRKDIR}/doc/RELEASE_23.spamcontrol \
+		${WRKDIR}/doc/SMTPREPLY.spamcontrol ${WRKDIR}/doc/TESTING.spamcontrol \
+		${WRKDIR}/doc/TODO.spamcontrol ${WRKDIR}/doc/badloadertypes \
+		${WRKDIR}/doc/badmailfrom ${WRKDIR}/doc/badmimetypes \
+		${WRKDIR}/doc/badrcptto ${WRKDIR}/doc/conf-spamcontrol \
+		${WRKDIR}/doc/install_spamcontrol.sh ${WRKDIR}/doc/tarpitcount
+SCRIPTS+=	qmail-alias2recipients qmail-pwd2recipients \
+		qmail-users2recipients qmail-vpopmail2recipients
+.endif
 
-SCRIPTS+=	enable-qmail
+BOOTFILES=	home home+df proc proc+df binm1 binm1+df \
+		binm2 binm2+df binm3 binm3+df maildir
 
 CONFIGUREPROGS=	${WRKSRC}/install ${WRKSRC}/dnsfq ${WRKSRC}/hostname \
 		${WRKSRC}/dnsip ${WRKSRC}/ipmeprint ${WRKSRC}/dnsptr
 CONFIGUREFILES=	${WRKSRC}/config ${WRKSRC}/config-fast
 
-.if (${PREFIX} == ${LOCALBASE})
-DOCDIR=	share/doc/qmail
-.else
-DOCDIR=	doc
+.if (${PREFIX} != ${LOCALBASE})
+DOCSDIR=	${PREFIX}/doc
 .endif
 
 NO_MTREE=	yes
 USE_REINPLACE=	yes
 
-.if !defined(_PREMKINCLUDED)
 .include <bsd.port.pre.mk>
+
+.if !defined(MAIN_QMAIL_PORT_DNS_PATCH_BARRIER) \
+ 	||(defined(WITH_QMAILQUEUE_PATCH)     && !defined(MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER)) \
+	||(defined(WITH_BIG_TODO_PATCH)       && !defined(MAIN_QMAIL_PORT_WITH_BIG_TODO_PATCH_BARRIER)) \
+	||(defined(WITH_BIG_CONCURRENCY_PATCH)&& !defined(MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER)) \
+	||(defined(WITH_OUTGOINGIP_PATCH)     && !defined(MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER))
+PATCH_SITES+=	${MASTER_SITE_QMAIL}
 .endif
 
-pre-fetch: pre-pre-fetch slaveport-pre-fetch post-pre-fetch
+.if defined(WITH_QMAILQUEUE_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER)
+PATCHFILES+=	qmailqueue-patch
+.endif
+.if defined(WITH_BIG_TODO_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_BIG_TODO_PATCH_BARRIER)
+PATCHFILES+=	big-todo.103.patch
+.endif
+.if defined(WITH_BIG_CONCURRENCY_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER)
+PATCHFILES+=	big-concurrency.patch
+.endif
+.if defined(WITH_OUTGOINGIP_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER)
+PATCHFILES+=	outgoingip.patch
+.endif
+
+# Some default values, these can be modified by make command line
+.if defined(WITH_BIG_CONCURRENCY_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER)
+WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT?=	509
+.endif
+
+.if defined(WITH_RCDLINK)
+PLIST_SUB+=	RCDLINK=""
+.else
+PLIST_SUB+=	RCDLINK="@comment "
+.endif
+
+# Fill SELECTED_OPTIONS with options to write conf-spamcontrol
+.if defined(SLAVE_SPAMCONTROL)
+.if defined(WITH_RELAYMAILFROM)
+SELECTED_OPTIONS+=	relaymailfrom=yes
+.else
+SELECTED_OPTIONS+=	relaymailfrom=no
+.endif
+
+.if defined(WITH_QUITASAP)
+SELECTED_OPTIONS+=	quitasap=yes
+.else
+SELECTED_OPTIONS+=	quitasap=no
+.endif
+
+.if !defined(WITHOUT_REQBRACKETS)
+SELECTED_OPTIONS+=	reqbrackets=yes
+.else
+SELECTED_OPTIONS+=	reqbrackets=no
+.endif
+
+.if !defined(WITHOUT_VERP)
+SELECTED_OPTIONS+=	verp=yes
+.else
+SELECTED_OPTIONS+=	verp=no
+.endif
+
+.if defined(WITH_RECIPIENTS550)
+SELECTED_OPTIONS+=	recipients550=yes
+.else
+SELECTED_OPTIONS+=	recipients550=no
+.endif
+
+.if defined(WITH_LOCALMFREQAUTH)
+SELECTED_OPTIONS+=	localmfreqauth=yes
+.else
+SELECTED_OPTIONS+=	localmfreqauth=no
+.endif
+
+.if defined(WITH_AUTHCRAM)
+SELECTED_OPTIONS+=	authcram=yes
+.else
+SELECTED_OPTIONS+=	authcram=no
+.endif
 
-pre-pre-fetch:
-.if !defined(MAIN_QMAIL_PORT_BUILD_WITH_OPTIONS_ADVERTISE_BARRIER)
+.if defined(WITH_MOREIPME)
+SELECTED_OPTIONS+=	moreipme=yes
+.else
+SELECTED_OPTIONS+=	moreipme=no
+.endif
+
+.if defined(WITH_BIGTODO)
+SELECTED_OPTIONS+=	bigtodo=yes
+.else
+SELECTED_OPTIONS+=	bigtodo=no
+.endif
+.endif
+
+pre-everything::
+.if !defined(MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER)
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "You may use the following build options:"
 	@${ECHO_MSG} ""
-.if !defined(MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER)
-	@${ECHO_MSG} "WITH_QMAILQUEUE_PATCH=yes	enable patch to qmail to run a QMAILQUEUE"
-	@${ECHO_MSG} "				program instead of bin/qmail-queue"
-.endif # MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER
-.if !defined(MAIN_QMAIL_PORT_WITH_BIG_TODO_PATCH_BARRIER)
-	@${ECHO_MSG} "WITH_BIG_TODO_PATCH=yes		enable big_todo qmail patch"
-.endif # MAIN_QMAIL_PORT_WITH_BIG_TODO_PATCH_BARRIER
-.if !defined(MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER)
-	@${ECHO_MSG} "WITH_BIG_CONCURRENCY_PATCH=yes	enable patch to qmail to"
-	@${ECHO_MSG} "				use a concurrency greater than 240"
 	@${ECHO_MSG} "WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT=NUMBER"
 	@${ECHO_MSG} "				(default NUMBER=${WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT})"
 	@${ECHO_MSG} "				set this to a value reasonable for"
 	@${ECHO_MSG} "				your system if you use the patch"
-.endif # MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER
-.if !defined(MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER)
-	@${ECHO_MSG} "WITH_OUTGOINGIP_PATCH=yes	enable patch to qmail to"
-	@${ECHO_MSG} "				allow setting the IP address"
-	@${ECHO_MSG} "				used by qmail when sending"
-	@${ECHO_MSG} "				outgoing messages"
-.endif # MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER
-.if !defined(MAIN_QMAIL_PORT_WITH_PRESERVE_CONFIG_FILES_BARRIER)
-	@${ECHO_MSG} "WITH_PRESERVE_CONFIG_FILES=yes	do not run automatic config"
-	@${ECHO_MSG} "				to preserve your config files"
-.endif # MAIN_QMAIL_PORT_WITH_PRESERVE_CONFIG_FILES_BARRIER
-	@${ECHO_MSG} "#"
-.endif # MAIN_QMAIL_PORT_BUILD_WITH_OPTIONS_ADVERTISE_BARRIER
-
-# Yet anther ugly hack (used by qmail-* skeleton ports)
-# Permits them to define local targets without braking everything
-# The ugly target name hopefully will avoid name clashing
-.if !target(slaveport-pre-fetch)
-slaveport-pre-fetch:
-.endif
-
-post-pre-fetch:
-.if !defined(MAIN_QMAIL_PORT_BUILD_WITH_OPTIONS_ADVERTISE_BARRIER)
 	@${ECHO_MSG} ""
 .endif
 
-post-patch: slaveport-post-patch post-post-patch
-
-# Yet anther ugly hack (used by qmail-* skeleton ports)
-# Permits them to define local targets without braking everything
-# The ugly target name hopefully will avoid name clashing
-.if !target(slaveport-post-patch)
-slaveport-post-patch:
+post-extract:
+.if defined(SLAVE_SPAMCONTROL)
+	@cd ${WRKSRC} && ${TAR} -xzf ${DISTDIR}/${SPAMCONTROL_DIST}
 .endif
 
-post-post-patch:
-	@${SED} 's!%%PREFIX%%!${PREFIX}!g; \
-	         s!%%ECHO_CMD%%!${ECHO_CMD}!g' \
-	         ${FILESDIR}/bootfiles.sed.in > \
-	         ${WRKDIR}/bootfiles.sed
-.for i in ${BOOTFILES}
-	@if  [ -f ${WRKSRC}/${i}.sh ] ; \
-	then \
-		${SED} -f ${WRKDIR}/bootfiles.sed ${WRKSRC}/$i.sh > ${WRKDIR}/${i} ; \
-	elif [ -f ${FILESDIR}/${i} ] ; \
-	then \
-		${SED} -f ${WRKDIR}/bootfiles.sed ${FILESDIR}/$i > ${WRKDIR}/${i} ; \
-	fi
+post-patch:
+.if defined(SLAVE_MYSQL)
+	@${REINPLACE_CMD} 's|/opt/mysql|${LOCALBASE}|' \
+		${WRKSRC}/Makefile
+.elif defined(SLAVE_SMTP_AUTH_TLS)
+	@${HEAD} -6 ${DISTDIR}/qmail-1.03-starttls-smtp-auth.patch \
+		| ${TAIL} -5 \
+		> ${WRKDIR}/SMTP_AUTH+TLS.readme
+	@${REINPLACE_CMD} "s|/usr/local/ssl|${OPENSSLBASE}|" ${WRKSRC}/Makefile
+.elif defined(SLAVE_SPAMCONTROL)
+	@${ECHO_CMD} ${WRKDIR} > ${WRKSRC}/conf-qmail
+	@${ECHO_CMD} "# Generated by qmail-spamcontrol FreeBSD port" \
+		> ${WRKSRC}/conf-spamcontrol
+.for option in ${SELECTED_OPTIONS}
+	@${ECHO_CMD} ${option} >> ${WRKSRC}/conf-spamcontrol
 .endfor
-	@${MKDIR} ${WRKDIR}/scripts
-	@${SED} "s!%%PREFIX%%!${PREFIX}!g; s!%%DOCDIR%%!${DOCDIR}!g" \
-		${FILESDIR}/enable-qmail.in > \
-		${WRKDIR}/scripts/enable-qmail
-	@${SED} s!/var/qmail/!${PREFIX}/!g ${FILESDIR}/mailer.conf.sample > \
-		${WRKDIR}/mailer.conf.sample
-	@${REINPLACE_CMD} "s!/var/qmail!${PREFIX}!;s!/usr/local/!${LOCALBASE}/!" ${WRKSRC}/Makefile
+	@cd ${WRKSRC} && ./install_spamcontrol.sh
+.elif defined(SLAVE_TLS)
+	@${HEAD} -74 ${DISTDIR}/tls.patch > ${WRKDIR}/TLS.readme
+	@${REINPLACE_CMD} "s|/usr/local/ssl|${OPENSSLBASE}|" \
+		${WRKSRC}/Makefile
+.elif defined(SLAVE_LDAP)
+	@${REINPLACE_CMD} "s|LDAPLIBS=-L/usr/local/lib|LDAPLIBS=-L${LOCALBASE}/lib|; \
+			   s|LDAPINCLUDES=-I/usr/local/include|LDAPINCLUDES=-I${LOCALBASE}/include|" \
+		${WRKSRC}/Makefile
+.if !defined(WITHOUT_TLS)
+	@${REINPLACE_CMD} "s|#TLSON=|TLSON=|; \
+			   s|#TLSINCLUDES=-I/usr/local/include|TLSINCLUDES=-I${OPENSSLBASE}/include|; \
+			   s|#TLSLIBS=-L/usr/local/lib|TLSLIBS=-L${OPENSSLBASE}/lib|; \
+			   s|#OPENSSLBIN=/usr/local/bin/openssl|OPENSSLBIN=${OPENSSLBASE}/bin/openssl|" \
+		${WRKSRC}/Makefile
+.endif
+.if !defined(WITHOUT_LDAP_CLUSTER)
+	@${REINPLACE_CMD} "s|#LDAPFLAGS=-DQLDAP_CLUSTER\s+-DEXTERNAL_TODO|LDAPFLAGS\+=-DQLDAP_CLUSTER -DEXTERNAL_TODO#|" \
+		${WRKSRC}/Makefile
+.endif
+.if !defined(WITHOUT_AUTOMAILDIRMAKE)
+	@${REINPLACE_CMD} "s|#MDIRMAKE=-DAUTOMAILDIRMAKE|MDIRMAKE=-DAUTOMAILDIRMAKE|" \
+		${WRKSRC}/Makefile
+.endif
+.if !defined(WITHOUT_AUTOHOMEDIRMAKE)
+	@${REINPLACE_CMD} "s|#HDIRMAKE=-DAUTOHOMEDIRMAKE|HDIRMAKE=-DAUTOHOMEDIRMAKE|" \
+		${WRKSRC}/Makefile
+.endif
+.if defined(WITH_LDAP_DEBUG)
+	@${REINPLACE_CMD} "s|#DEBUG=-DDEBUG|DEBUG=-DDEBUG|" \
+		${WRKSRC}/Makefile
+.endif
+.if defined(WITH_CLEARTEXTPASSWD)
+	@${REINPLACE_CMD} "s|^#\s*-DCLEARTEXTPASSWD.*$$|LDAPFLAGS\+=-DCLEARTEXTPASSWD|" \
+		${WRKSRC}/Makefile
+.endif
+.if defined(WITH_DASH_EXT)
+	@${REINPLACE_CMD} "s|^# -DDASH_EXT.*$$|LDAPFLAGS\+=-DDASH_EXT|" \
+		${WRKSRC}/Makefile
+.endif
+.endif
+	@${REINPLACE_CMD} 's!/var/qmail!${PREFIX}!; \
+			   s!/usr/local/!${LOCALBASE}/!' \
+		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} 's!nofiles!qnofiles!g' \
+		${WRKSRC}/conf-groups
+	@${REINPLACE_CMD} '/"man"/d; /man\/man/d; /man\/cat/d; \
+			   /"doc"/d; /"boot","/d' \
+		${WRKSRC}/hier.c
 
 # If you want to change the qmail users, they must be changed in both
 # work/*/conf-users and pkg/INSTALL.
@@ -305,17 +435,23 @@ do-configure:
 .if defined(WITH_BIG_CONCURRENCY_PATCH) \
 	&& !defined(MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER) \
 	&& defined(WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT)
-	@if [ ${WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT} -gt 0 ]; \
-	then \
+	@if [ ${WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT} -gt 0 ]; then \
 		${ECHO_CMD} "${WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT}" \
 			> ${WRKSRC}/conf-spawn ; \
 	fi
-.endif # MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER
+.endif
 
 do-install:
+.for i in ${BOOTFILES}
+	@if  [ -f ${WRKSRC}/${i}.sh ] ; then \
+		${SED} -f ${WRKDIR}/bootfiles.sed ${WRKSRC}/$i.sh > ${WRKDIR}/${i} ; \
+	elif [ -f ${FILESDIR}/${i} ] ; then \
+		${SED} -f ${WRKDIR}/bootfiles.sed ${FILESDIR}/$i > ${WRKDIR}/${i} ; \
+	fi
+.endfor
 	@# Check again, just in case (ideally should error if not found)
 	@PKG_PREFIX=${PREFIX} ${PKGINSTALL}
-	@${MKDIR} ${PREFIX}/${DOCDIR} ${PREFIX}/configure
+	@${MKDIR} ${DOCSDIR} ${PREFIX}/configure
 	@cd ${WRKSRC} ; ./install
 	${INSTALL_PROGRAM} ${CONFIGUREPROGS} ${PREFIX}/configure
 	${INSTALL_SCRIPT} ${CONFIGUREFILES} ${PREFIX}/configure
@@ -329,31 +465,69 @@ do-install:
 .endfor
 .endfor
 .if !defined(NOPORTDOCS)
-	${INSTALL_DATA} ${DOCFILES} ${PREFIX}/${DOCDIR}
+	${INSTALL_DATA} ${DOCFILES} ${DOCSDIR}
 .endif
+	@${MKDIR} ${PREFIX}/scripts
+	${INSTALL_SCRIPT} ${FILESDIR}/mkaliasdir ${PREFIX}/scripts
+	${INSTALL_SCRIPT} ${WRKDIR}/enable-qmail ${PREFIX}/scripts
+.for script in ${SCRIPTS}
+	${INSTALL_SCRIPT} ${WRKDIR}/scripts/${script} ${PREFIX}/scripts
+.endfor
 .if defined(PACKAGE_BUILDING)
 	@${ECHO_CMD} "FreeBSD Binary package qmail installation" \
-		> ${PREFIX}/${DOCDIR}/SYSDEPS
+		> ${DOCSDIR}/SYSDEPS
 .else
 	@cd ${WRKSRC} && ${CAT} `${CAT} SYSDEPS` \
-		> ${PREFIX}/${DOCDIR}/SYSDEPS
+		> ${DOCSDIR}/SYSDEPS
 .endif
 .for i in root postmaster mailer-daemon
 	@${TOUCH} ${PREFIX}/alias/.qmail-${i}
 .endfor
 	@# This is not part of qmail proper, hence the 2nd class citizenship
-.if !defined(WITH_PRESERVE_CONFIG_FILES)
-	@cd ${PREFIX}/configure ; ./config
-.endif
-	@${MKDIR} ${PREFIX}/scripts
-	${INSTALL_SCRIPT} ${FILESDIR}/mkaliasdir ${PREFIX}/scripts
-.for script in ${SCRIPTS}
-	${INSTALL_SCRIPT} ${WRKDIR}/scripts/${script} ${PREFIX}/scripts
-.endfor
+	@if [ ! -e ${PREFIX}/control/me ]; then \
+		cd ${PREFIX}/configure ; ./config ; \
+	fi
+.if !defined(WITHOUT_RCDLINK)
 	@${MKDIR} ${LOCALBASE}/etc/rc.d
 	@${LN} -sf ${PREFIX}/rc ${LOCALBASE}/etc/rc.d/qmail.sh
+.endif
 	@${ECHO_CMD}
-	@${SED} s!/var/qmail!${PREFIX}!g ${PKGMESSAGE} | ${FMT}
+	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
+certificate:
+.if defined(SLAVE_TLS) || defined(SLAVE_SMTP_AUTH_TLS) || defined(SLAVE_LDAP)
+	@if [ -f ${OPENSSLDIR}/openssl.cnf ]; then \
+		if [ ! -d ${WRKDIR} ]; then \
+			${MKDIR} ${WRKDIR} ; \
+		fi ; \
+		${OPENSSLBASE}/bin/openssl req -new -x509 -nodes \
+			-out ${WRKDIR}/servercert.pem -days 366 \
+			-keyout ${WRKDIR}/servercert.pem ; \
+		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/servercert.pem ${PREFIX}/control/servercert.pem ; \
+		${ECHO_MSG} "===> Do not forget to do 'make clean' to clean up temporary files" ; \
+	else \
+		${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
+	fi
+.endif
+
+certificate-req:
+.if defined(SLAVE_TLS) || defined(SLAVE_SMTP_AUTH_TLS) || defined(SLAVE_LDAP)
+	@if [ -f ${OPENSSLDIR}/openssl.cnf ]; then \
+		if [ ! -d ${WRKDIR} ]; then \
+			${MKDIR} ${WRKDIR} ; \
+		fi ; \
+		${OPENSSLBASE}/bin/openssl req -new -nodes \
+			-out ${WRKDIR}/req.pem \
+			-keyout ${WRKDIR}/servercert.pem ; \
+		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/servercert.pem ${PREFIX}/control/servercert.pem ; \
+		${ECHO_MSG} ; \
+		${ECHO_MSG} "===> Do not forget to do 'make clean' to clean up temporary files" ; \
+		${ECHO_MSG} "===> Send ${WRKDIR}/req.pem to your CA to obtain signed_req.pem, and do:" ; \
+		${ECHO_MSG} "===> cat signed_req.pem >> ${PREFIX}/control/servercert.pem" ; \
+	else \
+		${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
+	fi
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
index 76a041cc5fec..6b41bbbbc6c5 100644
--- a/mail/qmail/distinfo
+++ b/mail/qmail/distinfo
@@ -22,3 +22,5 @@ MD5 (sendmail-flagf.patch) = 4e1f2d8315e7e2a5482798c9d19fac4d
 SIZE (sendmail-flagf.patch) = 863
 MD5 (patch-qmail-1.03-rfc2821.diff) = 1b85f233ab5b9d7ec1a8da1188bf10ef
 SIZE (patch-qmail-1.03-rfc2821.diff) = 2564
+MD5 (spamcontrol-2313_tgz.bin) = a8ad350699dfd6110c3e8a8784f55ad4
+SIZE (spamcontrol-2313_tgz.bin) = 116888
diff --git a/mail/qmail/files/enable-qmail.in b/mail/qmail/files/enable-qmail.in
index 34124af89354..a864dd93c97e 100644
--- a/mail/qmail/files/enable-qmail.in
+++ b/mail/qmail/files/enable-qmail.in
@@ -15,13 +15,13 @@ disable_sendmail() {
 enable_qmail() {
 	if [ -f ${MAILER_CONF_FILE} ]; then
 		cp ${MAILER_CONF_FILE} ${MAILER_CONF_FILE}.bak && \
-		cp %%PREFIX%%/%%DOCDIR%%/mailer.conf.sample ${MAILER_CONF_FILE}
+		cp %%DOCSDIR%%/mailer.conf.sample ${MAILER_CONF_FILE}
 	else
 		echo "===> ERROR: YOU DO NOT HAVE A VALID ${MAILER_CONF_FILE}"
 		echo "===> FIX this and try again"
 		echo "===> or, run \"$0 --force\" if you are sure"
 		echo "===> you want this port replacing some binaries"
-		echo "===> IF THIS FEELS UNEASY, read %%PREFIX%%/%%DOCDIR%%/REMOVE.sendmail and do it manually"
+		echo "===> IF THIS FEELS UNEASY, read %%DOCSDIR%%/REMOVE.sendmail and do it manually"
 		echo ""
 		echo "=======> VERY IMPORTANT <======="
 		echo "===> One side issue is that if you do replace them,"
@@ -79,7 +79,7 @@ NEWALIASES=/usr/bin/newaliases
 
 disable_sendmail
 
-if [ "$1" = "--force"]; then
+if [ "$1" = "--force" ]; then
   force_enable_qmail
 else
   enable_qmail
diff --git a/mail/qmail/files/mailer.conf.sample b/mail/qmail/files/mailer.conf.sample
deleted file mode 100644
index 849116726651..000000000000
--- a/mail/qmail/files/mailer.conf.sample
+++ /dev/null
@@ -1,10 +0,0 @@
-# Configuration for mailwrapper is kept in /etc/mail/mailer.conf.
-# Replace that file with this one to enable qmail under a sendmail
-# disguise. Very useful.
-
-sendmail	/var/qmail/bin/sendmail
-send-mail	/var/qmail/bin/sendmail
-mailq		/var/qmail/bin/qmail-qread
-newaliases	/var/qmail/bin/newaliases
-hoststat	/var/qmail/bin/qmail-tcpto
-purgestat	/var/qmail/bin/qmail-tcpok
diff --git a/mail/qmail/files/mailer.conf.sample.in b/mail/qmail/files/mailer.conf.sample.in
new file mode 100644
index 000000000000..08a3ceb57ce7
--- /dev/null
+++ b/mail/qmail/files/mailer.conf.sample.in
@@ -0,0 +1,10 @@
+# Configuration for mailwrapper is kept in /etc/mail/mailer.conf.
+# Replace that file with this one to enable qmail under a sendmail
+# disguise. Very useful.
+
+sendmail	%%PREFIX%%/bin/sendmail
+send-mail	%%PREFIX%%/bin/sendmail
+mailq		%%PREFIX%%/bin/qmail-qread
+newaliases	%%PREFIX%%/bin/newaliases
+hoststat	%%PREFIX%%/bin/qmail-tcpto
+purgestat	%%PREFIX%%/bin/qmail-tcpok
diff --git a/mail/qmail/files/patch-aa b/mail/qmail/files/patch-aa
deleted file mode 100644
index 55171d44ad09..000000000000
--- a/mail/qmail/files/patch-aa
+++ /dev/null
@@ -1,155 +0,0 @@
-+++ hier.c
-38,47d37
-<   d(auto_qmail,"doc",auto_uido,auto_gidq,0755);
-<   d(auto_qmail,"man",auto_uido,auto_gidq,0755);
-<   d(auto_qmail,"man/cat1",auto_uido,auto_gidq,0755);
-<   d(auto_qmail,"man/cat5",auto_uido,auto_gidq,0755);
-<   d(auto_qmail,"man/cat7",auto_uido,auto_gidq,0755);
-<   d(auto_qmail,"man/cat8",auto_uido,auto_gidq,0755);
-<   d(auto_qmail,"man/man1",auto_uido,auto_gidq,0755);
-<   d(auto_qmail,"man/man5",auto_uido,auto_gidq,0755);
-<   d(auto_qmail,"man/man7",auto_uido,auto_gidq,0755);
-<   d(auto_qmail,"man/man8",auto_uido,auto_gidq,0755);
-67,101d56
-<   c(auto_qmail,"boot","home",auto_uido,auto_gidq,0755);
-<   c(auto_qmail,"boot","home+df",auto_uido,auto_gidq,0755);
-<   c(auto_qmail,"boot","proc",auto_uido,auto_gidq,0755);
-<   c(auto_qmail,"boot","proc+df",auto_uido,auto_gidq,0755);
-<   c(auto_qmail,"boot","binm1",auto_uido,auto_gidq,0755);
-<   c(auto_qmail,"boot","binm1+df",auto_uido,auto_gidq,0755);
-<   c(auto_qmail,"boot","binm2",auto_uido,auto_gidq,0755);
-<   c(auto_qmail,"boot","binm2+df",auto_uido,auto_gidq,0755);
-<   c(auto_qmail,"boot","binm3",auto_uido,auto_gidq,0755);
-<   c(auto_qmail,"boot","binm3+df",auto_uido,auto_gidq,0755);
-< 
-<   c(auto_qmail,"doc","FAQ",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"doc","UPGRADE",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"doc","SENDMAIL",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"doc","INSTALL",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"doc","INSTALL.alias",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"doc","INSTALL.ctl",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"doc","INSTALL.ids",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"doc","INSTALL.maildir",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"doc","INSTALL.mbox",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"doc","INSTALL.vsm",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"doc","TEST.deliver",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"doc","TEST.receive",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"doc","REMOVE.sendmail",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"doc","REMOVE.binmail",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"doc","PIC.local2alias",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"doc","PIC.local2ext",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"doc","PIC.local2local",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"doc","PIC.local2rem",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"doc","PIC.local2virt",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"doc","PIC.nullclient",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"doc","PIC.relaybad",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"doc","PIC.relaygood",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"doc","PIC.rem2local",auto_uido,auto_gidq,0644);
-< 
-146,251d100
-< 
-<   c(auto_qmail,"man/man5","addresses.5",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat5","addresses.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man5","envelopes.5",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat5","envelopes.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man5","maildir.5",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat5","maildir.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man5","mbox.5",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat5","mbox.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man5","dot-qmail.5",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat5","dot-qmail.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man5","qmail-control.5",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat5","qmail-control.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man5","qmail-header.5",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat5","qmail-header.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man5","qmail-log.5",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat5","qmail-log.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man5","qmail-users.5",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat5","qmail-users.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man5","tcp-environ.5",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat5","tcp-environ.0",auto_uido,auto_gidq,0644);
-< 
-<   c(auto_qmail,"man/man7","forgeries.7",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat7","forgeries.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man7","qmail-limits.7",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat7","qmail-limits.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man7","qmail.7",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat7","qmail.0",auto_uido,auto_gidq,0644);
-< 
-<   c(auto_qmail,"man/man1","forward.1",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat1","forward.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man1","condredirect.1",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat1","condredirect.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man1","bouncesaying.1",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat1","bouncesaying.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man1","except.1",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat1","except.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man1","maildirmake.1",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat1","maildirmake.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man1","maildir2mbox.1",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat1","maildir2mbox.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man1","maildirwatch.1",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat1","maildirwatch.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man1","mailsubj.1",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat1","mailsubj.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man1","qreceipt.1",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat1","qreceipt.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man1","qbiff.1",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat1","qbiff.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man1","preline.1",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat1","preline.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man1","tcp-env.1",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat1","tcp-env.0",auto_uido,auto_gidq,0644);
-< 
-<   c(auto_qmail,"man/man8","qmail-local.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-local.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","qmail-lspawn.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-lspawn.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","qmail-getpw.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-getpw.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","qmail-remote.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-remote.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","qmail-rspawn.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-rspawn.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","qmail-clean.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-clean.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","qmail-send.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-send.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","qmail-start.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-start.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","splogger.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","splogger.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","qmail-queue.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-queue.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","qmail-inject.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-inject.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","qmail-showctl.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-showctl.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","qmail-newmrh.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-newmrh.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","qmail-newu.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-newu.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","qmail-pw2u.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-pw2u.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","qmail-qread.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-qread.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","qmail-qstat.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-qstat.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","qmail-tcpok.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-tcpok.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","qmail-tcpto.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-tcpto.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","qmail-pop3d.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-pop3d.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","qmail-popup.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-popup.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","qmail-qmqpc.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-qmqpc.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","qmail-qmqpd.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-qmqpd.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","qmail-qmtpd.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-qmtpd.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","qmail-smtpd.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-smtpd.0",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/man8","qmail-command.8",auto_uido,auto_gidq,0644);
-<   c(auto_qmail,"man/cat8","qmail-command.0",auto_uido,auto_gidq,0644);
diff --git a/mail/qmail/files/patch-ab b/mail/qmail/files/patch-ab
deleted file mode 100644
index 43a507a3444e..000000000000
--- a/mail/qmail/files/patch-ab
+++ /dev/null
@@ -1,5 +0,0 @@
-+++ conf-groups
-2c2
-< nofiles
----
-> qnofiles
diff --git a/mail/qmail/files/patch-ac b/mail/qmail/files/patch-ac
deleted file mode 100644
index ded116611683..000000000000
--- a/mail/qmail/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-+++ install.c
-12a13
-> noc;  /* hack for bin package install -- see port pkg/INSTALL */
-77a79
->  if (!noc) {
-117a120
->  }
-155c158
-< void main()
----
-> void main(argc, argv)
-156a160
->   noc=--argc;
diff --git a/mail/qmail/files/patch-install.c b/mail/qmail/files/patch-install.c
new file mode 100644
index 000000000000..97780f9f61fd
--- /dev/null
+++ b/mail/qmail/files/patch-install.c
@@ -0,0 +1,37 @@
+--- install.c.orig	Mon Jun 15 07:53:16 1998
++++ install.c	Fri May  6 09:30:15 2005
+@@ -10,6 +10,7 @@
+ #define FATAL "install: fatal: "
+ 
+ int fdsourcedir = -1;
++noc;  /* hack for bin package install -- see port pkg/INSTALL */
+ 
+ void h(home,uid,gid,mode)
+ char *home;
+@@ -75,6 +76,7 @@
+ int gid;
+ int mode;
+ {
++ if (!noc) {
+   int fdin;
+   int fdout;
+ 
+@@ -115,6 +117,7 @@
+     strerr_die6sys(111,FATAL,"unable to chown .../",subdir,"/",file,": ");
+   if (chmod(file,mode) == -1)
+     strerr_die6sys(111,FATAL,"unable to chmod .../",subdir,"/",file,": ");
++ }
+ }
+ 
+ void z(home,file,len,uid,gid,mode)
+@@ -152,8 +155,9 @@
+     strerr_die6sys(111,FATAL,"unable to chmod ",home,"/",file,": ");
+ }
+ 
+-void main()
++void main(argc, argv)
+ {
++  noc=--argc;
+   fdsourcedir = open_read(".");
+   if (fdsourcedir == -1)
+     strerr_die2sys(111,FATAL,"unable to open current directory: ");
diff --git a/mail/qmail-ldap/pkg-message b/mail/qmail/files/pkg-message-ldap.in
index cef569209b97..68cb3911f745 100644
--- a/mail/qmail-ldap/pkg-message
+++ b/mail/qmail/files/pkg-message-ldap.in
@@ -1,24 +1,24 @@
-	ATTENTIONATTENTION:
+	ATTENTION:
 
-Please make sure that you read /var/qmail/doc/PORT_NOTES.
+Please make sure that you read %%PREFIX%%/doc/PORT_NOTES.
 It contains important information about testing and configuring
 qmail, and finally replacing sendmail with qmail.
 
-You should also add /var/qmail/man to your MANPATH (see manpath(1)
+You should also add %%PREFIX%%/man to your MANPATH (see manpath(1)
 or login.conf(5)).
 
-Do not forget to read /var/qmail/doc/QLDAPINSTALL. After all,
-this is NOT our old stock qmail. And, /var/qmail/doc/ANTISPAM
+Do not forget to read %%PREFIX%%/doc/QLDAPINSTALL. After all,
+this is NOT our old stock qmail. And, %%PREFIX%%/doc/ANTISPAM
 for some antispam control measures.
 
 You can enable qmail as your default mailer executing:
-> /var/qmail/scripts/enable-qmail
+> %%PREFIX%%/scripts/enable-qmail
 
 =====><=====
 
 If you've built this port with TLS support (WITH_TLS=yes)
 
-==> You will need to provide a working certificate in /var/qmail/control/cert.pem :
+==> You will need to provide a working certificate in %%PREFIX%%/control/cert.pem :
 
 # makes a self-signed certificate
 3) do "make certificate"
diff --git a/mail/qmail-mysql/pkg-message b/mail/qmail/files/pkg-message-mysql.in
index 51ce1aa835ac..355e80886f39 100644
--- a/mail/qmail-mysql/pkg-message
+++ b/mail/qmail/files/pkg-message-mysql.in
@@ -1,14 +1,14 @@
-	ATTENTIONATTENTION:
+	ATTENTION:
 
-Please make sure that you read /var/qmail/doc/PORT_NOTES.
+Please make sure that you read %%PREFIX%%/doc/PORT_NOTES.
 It contains important information about testing and configuring
 qmail, and finally replacing sendmail with qmail.
 
-You should also add /var/qmail/man to your MANPATH (see manpath(1)
+You should also add %%PREFIX%%/man to your MANPATH (see manpath(1)
 or login.conf(5)).
 
 Do not forget to read http://iain.cx/unix/qmail/mysql.php. After all,
 this is NOT our old stock qmail.
 
 You can enable qmail as your default mailer executing:
-> /var/qmail/scripts/enable-qmail
+> %%PREFIX%%/scripts/enable-qmail
diff --git a/mail/qmail-smtp_auth+tls/pkg-message b/mail/qmail/files/pkg-message-smtp_auth+tls.in
index 0ab9666d73c5..0cfad0d4cd50 100644
--- a/mail/qmail-smtp_auth+tls/pkg-message
+++ b/mail/qmail/files/pkg-message-smtp_auth+tls.in
@@ -1,14 +1,14 @@
-	ATTENTIONATTENTION:
+	ATTENTION:
 
-Please make sure that you read /var/qmail/doc/PORT_NOTES.
+Please make sure that you read %%PREFIX%%/doc/PORT_NOTES.
 It contains important information about testing and configuring
 qmail, and finally replacing sendmail with qmail.
 
-You should also add /var/qmail/man to your MANPATH (see manpath(1)
+You should also add %%PREFIX%%/man to your MANPATH (see manpath(1)
 or login.conf(5)).
 
-Do not forget to read both /var/qmail/doc/SMTP_AUTH+TLS.readme AND
-/var/qmail/doc/README.auth.  After all, this is NOT our old stock
+Do not forget to read both %%PREFIX%%/doc/SMTP_AUTH+TLS.readme AND
+%%PREFIX%%/doc/README.auth.  After all, this is NOT our old stock
 qmail.
 
 ==> You can enable qmail as your default mailer:
@@ -19,7 +19,7 @@ qmail.
 # enable qmail as your default MTA
 2) do "make enable-qmail"
 
-==> As you need to provide a working certificate in /var/qmail/control/cert.pem :
+==> As you need to provide a working certificate in %%PREFIX%%/control/cert.pem :
 
 # makes a self-signed certificate
 3) do "make certificate"
diff --git a/mail/qmail-tls/pkg-message b/mail/qmail/files/pkg-message-tls.in
index 48b6d844ca57..33dbe050f14b 100644
--- a/mail/qmail-tls/pkg-message
+++ b/mail/qmail/files/pkg-message-tls.in
@@ -1,13 +1,13 @@
-	ATTENTIONATTENTION:
+	ATTENTION:
 
-Please make sure that you read /var/qmail/doc/PORT_NOTES.
+Please make sure that you read %%PREFIX%%/doc/PORT_NOTES.
 It contains important information about testing and configuring
 qmail, and finally replacing sendmail with qmail.
 
-You should also add /var/qmail/man to your MANPATH (see manpath(1)
+You should also add %%PREFIX%%/man to your MANPATH (see manpath(1)
 or login.conf(5)).
 
-Do not forget to read /var/qmail/doc/TLS.readme. After all,
+Do not forget to read %%PREFIX%%/doc/TLS.readme. After all,
 this is NOT our old stock qmail.
 
 ==> You can enable qmail as your default mailer:
@@ -18,7 +18,7 @@ this is NOT our old stock qmail.
 # enable qmail as your default MTA
 2) do "make enable-qmail"
 
-==> As you need to provide a working certificate in /var/qmail/control/cert.pem :
+==> As you need to provide a working certificate in %%PREFIX%%/control/cert.pem :
 
 # makes a self-signed certificate
 3) do "make certificate"
diff --git a/mail/qmail/pkg-message b/mail/qmail/files/pkg-message.in
index cc390a0cc875..f3736f9b333e 100644
--- a/mail/qmail/pkg-message
+++ b/mail/qmail/files/pkg-message.in
@@ -1,11 +1,11 @@
-	ATTENTIONATTENTION:
+	ATTENTION:
 
-Please make sure that you read /var/qmail/doc/PORT_NOTES.
+Please make sure that you read %%PREFIX%%/doc/PORT_NOTES.
 It contains important information about testing and configuring
 qmail, and finally replacing sendmail with qmail.
 
-You should also add /var/qmail/man to your MANPATH (see manpath(1)
+You should also add %%PREFIX%%/man to your MANPATH (see manpath(1)
 or login.conf(5)).
 
 You can enable qmail as your default mailer executing:
-> /var/qmail/scripts/enable-qmail
+> %%PREFIX%%/scripts/enable-qmail
diff --git a/mail/qmail/pkg-install b/mail/qmail/pkg-install
index de8522e0a9bf..fad5b011b617 100644
--- a/mail/qmail/pkg-install
+++ b/mail/qmail/pkg-install
@@ -1,4 +1,7 @@
 #!/bin/csh -f
+#
+# $FreeBSD$
+#
 
 # Author : Marcos Tischer Vallim
 # E-Mail : tischer@gmail.com
@@ -38,7 +41,9 @@ set doguid  = 0;
 if ($#argv) then
 	if ($argv[1] == "POST-INSTALL") then
 		${PKG_PREFIX}/configure/install x;
-		cd ${PKG_PREFIX}/configure && ./config;
+		if ( ! `filetest -e ${PKG_PREFIX}/control/me` ) then
+			cd ${PKG_PREFIX}/configure && ./config;
+		endif
 
 		$touch "${PKG_PREFIX}/alias/.{qmail-postmaster,qmail-root,qmail-mailer-daemon}";
 
diff --git a/mail/qmail/pkg-plist b/mail/qmail/pkg-plist
index 07830242e0f8..507104aa4a23 100644
--- a/mail/qmail/pkg-plist
+++ b/mail/qmail/pkg-plist
@@ -1,6 +1,11 @@
+@comment $FreeBSD$
+%%RCDLINK%%@unexec rm -f %%LOCALBASE%%/etc/rc.d/qmail.sh
+%%LDAP%%bin/auth_imap
+%%LDAP%%bin/auth_pop
 bin/bouncesaying
 bin/condredirect
 bin/datemail
+%%LDAP%%bin/digest
 bin/elq
 bin/except
 bin/forward
@@ -8,14 +13,20 @@ bin/maildir2mbox
 bin/maildirmake
 bin/maildirwatch
 bin/mailsubj
+%%LDAP%%bin/pbsadd
+%%LDAP%%bin/pbscheck
+%%LDAP%%bin/pbsdbd
 bin/pinq
 bin/predate
 bin/preline
 bin/qail
 bin/qbiff
+%%SPAMCONTROL%%bin/qmail-badloadertypes
+%%SPAMCONTROL%%bin/qmail-badmimetypes
 bin/qmail-clean
 bin/qmail-getpw
 bin/qmail-inject
+%%LDAP%%bin/qmail-ldaplookup
 bin/qmail-local
 bin/qmail-lspawn
 bin/qmail-newmrh
@@ -29,7 +40,10 @@ bin/qmail-qmtpd
 bin/qmail-qread
 bin/qmail-qstat
 bin/qmail-queue
+%%LDAP%%bin/qmail-quotawarn
+%%SPAMCONTROL%%bin/qmail-recipients
 bin/qmail-remote
+%%LDAP%%bin/qmail-reply
 bin/qmail-rspawn
 bin/qmail-send
 bin/qmail-showctl
@@ -64,45 +78,85 @@ configure/install
 configure/ipmeprint
 scripts/enable-qmail
 scripts/mkaliasdir
-%%PORTDOCS%%%%DOCDIR%%/BLURB
-%%PORTDOCS%%%%DOCDIR%%/BLURB2
-%%PORTDOCS%%%%DOCDIR%%/BLURB3
-%%PORTDOCS%%%%DOCDIR%%/BLURB4
-%%PORTDOCS%%%%DOCDIR%%/FAQ
-%%PORTDOCS%%%%DOCDIR%%/INSTALL
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
-%%PORTDOCS%%%%DOCDIR%%/INTERNALS
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
-%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
-%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
-%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
-%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
-%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES
-%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
-%%PORTDOCS%%%%DOCDIR%%/SECURITY
-%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
-%%PORTDOCS%%%%DOCDIR%%/SYSDEPS
-%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
-%%PORTDOCS%%%%DOCDIR%%/TEST.receive
-%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
-%%PORTDOCS%%%%DOCDIR%%/UPGRADE
-%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample
-%%PORTDOCS%%@dirrm %%DOCDIR%%
-@dirrm scripts
-@dirrm configure
-@dirrm boot
+%%SPAMCONTROL%%scripts/qmail-alias2recipients
+%%SPAMCONTROL%%scripts/qmail-pwd2recipients
+%%SPAMCONTROL%%scripts/qmail-users2recipients
+%%SPAMCONTROL%%scripts/qmail-vpopmail2recipients
+%%PORTDOCS%%%%DOCSDIR%%/BLURB
+%%PORTDOCS%%%%DOCSDIR%%/BLURB2
+%%PORTDOCS%%%%DOCSDIR%%/BLURB3
+%%PORTDOCS%%%%DOCSDIR%%/BLURB4
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/FILES.spamcontrol
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/HISTORY.spamcontrol
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.alias
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.ctl
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.ids
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.maildir
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.mbox
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/INSTALL.spamcontrol
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.vsm
+%%PORTDOCS%%%%DOCSDIR%%/INTERNALS
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/LICENSE.spamcontrol
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/LOGGING.spamcontrol
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/Makefile.djbdns
+%%PORTDOCS%%%%DOCSDIR%%/PIC.local2alias
+%%PORTDOCS%%%%DOCSDIR%%/PIC.local2ext
+%%PORTDOCS%%%%DOCSDIR%%/PIC.local2local
+%%PORTDOCS%%%%DOCSDIR%%/PIC.local2rem
+%%PORTDOCS%%%%DOCSDIR%%/PIC.local2virt
+%%PORTDOCS%%%%DOCSDIR%%/PIC.nullclient
+%%PORTDOCS%%%%DOCSDIR%%/PIC.relaybad
+%%PORTDOCS%%%%DOCSDIR%%/PIC.relaygood
+%%PORTDOCS%%%%DOCSDIR%%/PIC.rem2local
+%%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/POPBEFORESMTP
+%%PORTDOCS%%%%DOCSDIR%%/PORT_NOTES
+%%PORTDOCS%%%%DOCSDIR%%/PORT_NOTES_FreeBSD_40-RELEASE
+%%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/QLDAPINSTALL
+%%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/QLDAPNEWS
+%%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/QLDAPPICTURE
+%%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/QLDAPTODO
+%%README_AUTH%%%%PORTDOCS%%%%DOCSDIR%%/README.auth
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/README.bigtodo
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/README.bouncemaxbytes
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/README.djbdns
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/README.doublebouncetrim
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/README.moreipme
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/README.qmailqueue
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/README.recipients
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/README.spamcontrol
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/README.wildmat
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/README_spamcontrol.html
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/RELEASE_22.spamcontrol
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/RELEASE_23.spamcontrol
+%%PORTDOCS%%%%DOCSDIR%%/REMOVE.binmail
+%%PORTDOCS%%%%DOCSDIR%%/REMOVE.sendmail
+%%PORTDOCS%%%%DOCSDIR%%/SECURITY
+%%PORTDOCS%%%%DOCSDIR%%/SENDMAIL
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/SMTPREPLY.spamcontrol
+%%SMTP_AUTH_TLS%%%%PORTDOCS%%%%DOCSDIR%%/SMTP_AUTH+TLS.readme
+%%PORTDOCS%%%%DOCSDIR%%/SYSDEPS
+%%PORTDOCS%%%%DOCSDIR%%/TEST.deliver
+%%PORTDOCS%%%%DOCSDIR%%/TEST.receive
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/TESTING.spamcontrol
+%%PORTDOCS%%%%DOCSDIR%%/THOUGHTS
+%%TLS%%%%PORTDOCS%%%%DOCSDIR%%/TLS.readme
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/TODO.spamcontrol
+%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/badloadertypes
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/badmailfrom
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/badmimetypes
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/badrcptto
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/conf-spamcontrol
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/install_spamcontrol.sh
+%%PORTDOCS%%%%DOCSDIR%%/mailer.conf.sample
+%%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/tarpitcount
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm bin
+@dirrm boot
+@dirrm configure
+@dirrm scripts
 @unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." | /usr/bin/fmt
 @unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." | /usr/bin/fmt
 @unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. You can do it just executing 'echo sendmail_enable=\"YES\" >> /etc/rc.conf" | /usr/bin/fmt