- 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>

4 files changed, 6 insertions, 413 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-message b/mail/qmail-ldap/pkg-message
deleted file mode 100644
index cef569209b97..000000000000
--- a/mail/qmail-ldap/pkg-message
+++ /dev/null
@@ -1,32 +0,0 @@
-	ATTENTIONATTENTION:
-
-Please make sure that you read /var/qmail/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)
-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
-for some antispam control measures.
-
-You can enable qmail as your default mailer executing:
-> /var/qmail/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 :
-
-# makes a self-signed certificate
-3) do "make certificate"
-
-# makes a certificate request
-4) do "make certificate-req"
-
-=====><=====
-
-Now, you need to use it. Check a little FreeBSD specific how-to at
-http://freebsd.cg.nu/postfixqmail-ldap.html
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