3 files changed, 119 insertions, 189 deletions

diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile
index 65cc167f79f9..eb9327f20bbe 100644
--- a/mail/qmail-ldap/Makefile
+++ b/mail/qmail-ldap/Makefile
@@ -13,43 +13,50 @@ PKGNAMESUFFIX=	-ldap
 
 PATCH_SITES=	http://www.nrg4u.com/qmail/:ldap
 PATCHFILES=	qmail-ldap-1.03-${LDAP_PATCH_DATE}.patch.gz:ldap
-PATCH_DIST_STRIP+=	-p1
-
-EXTRA_PATCHES+=	${QMAIL_PORT_PATCHDIR}/patch-ab ${QMAIL_PORT_PATCHDIR}/patch-ac
 
 MAINTAINER=	freebsd@galle.com.br
 COMMENT=	A SECURE, reliable, and FAST MTA for UNIX systems WITH LDAP support
 
-CONFLICTS=	nss-* emboss-* digest-*
+EXTRA_PATCHES+=	${QMAIL_PORT_PATCHDIR}/patch-ab ${QMAIL_PORT_PATCHDIR}/patch-ac
+PATCH_DIST_STRIP+=	-p1
+
+CONFLICTS=	nss-[0-9]* emboss-[0-9]* digest-[0-9]*
 
 USE_OPENLDAP=	yes
+USE_REINPLACE=	yes
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}2
 
 .if !defined(WITHOUT_TLS)
-PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-with_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_DNS_PATCH_BARRIER=			yes
 MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER=	yes
-MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER=	yes
+MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER=		yes
+MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER=			yes
 
 LDAP_PATCH_DATE=	20020901
 
 # Using default from master port, i.e., /var/qmail
 PREFIX?=	${QMAIL_PORT_PREFIX}
-#PREFIX=		/var/qmail-ldap
 
-.if !defined(PRE_MK_INCLUDED)
+.if !defined(_PREMKINCLUDED)
 .include <bsd.port.pre.mk>
 .endif
 
-#QMAIL_PORT=	${PORTSDIR}/mail/qmail
-QMAIL_PORT=	${.CURDIR}/../qmail
+# Local overrides
+MASTERDIR=	${.CURDIR}/../qmail
+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 ${QMAIL_PORT} && ${MAKE} -V PREFIX
-QMAIL_PORT_PATCHDIR!=	cd ${QMAIL_PORT} && ${MAKE} -V PATCHDIR
+QMAIL_PORT_PREFIX!=	cd ${MASTERDIR} && ${MAKE} -V PREFIX
+QMAIL_PORT_PATCHDIR!=	cd ${MASTERDIR} && ${MAKE} -V PATCHDIR
 
 DOCFILES+=	${WRKSRC}/QLDAPINSTALL ${WRKSRC}/QLDAPNEWS \
 		${WRKSRC}/POPBEFORESMTP \
@@ -71,32 +78,32 @@ qmail-ldap-pre-fetch:
 slaveport-post-patch: qmail-ldap-post-patch
 
 qmail-ldap-post-patch:
-	@${PERL} -pi -ne "s|LDAPLIBS=-L/usr/local/lib|LDAPLIBS=-L${LOCALBASE}/lib|;s|LDAPINCLUDES=-I/usr/local/include|LDAPINCLUDES=-I${LOCALBASE}/include|" ${WRKSRC}/Makefile
+	@${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)
-	@${PERL} -pi -ne "s|#TLSON=|TLSON=|; \
+	@${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)
-	@${PERL} -pi -ne "s|#LDAPFLAGS=-DQLDAP_CLUSTER\s+-DEXTERNAL_TODO|LDAPFLAGS\+=-DQLDAP_CLUSTER -DEXTERNAL_TODO#|" ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} "s|#LDAPFLAGS=-DQLDAP_CLUSTER\s+-DEXTERNAL_TODO|LDAPFLAGS\+=-DQLDAP_CLUSTER -DEXTERNAL_TODO#|" ${WRKSRC}/Makefile
 .endif # WITHOUT_LDAP_CLUSTER
 .if !defined(WITHOUT_AUTOMAILDIRMAKE)
-	@${PERL} -pi -ne "s|#MDIRMAKE=-DAUTOMAILDIRMAKE|MDIRMAKE=-DAUTOMAILDIRMAKE|" ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} "s|#MDIRMAKE=-DAUTOMAILDIRMAKE|MDIRMAKE=-DAUTOMAILDIRMAKE|" ${WRKSRC}/Makefile
 .endif # WITHOUT_AUTOMAILDIRMAKE
 .if !defined(WITHOUT_AUTOHOMEDIRMAKE)
-	@${PERL} -pi -ne "s|#HDIRMAKE=-DAUTOHOMEDIRMAKE|HDIRMAKE=-DAUTOHOMEDIRMAKE|" ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} "s|#HDIRMAKE=-DAUTOHOMEDIRMAKE|HDIRMAKE=-DAUTOHOMEDIRMAKE|" ${WRKSRC}/Makefile
 .endif # WITHOUT_AUTOHOMEDIRMAKE
 .if defined(WITH_LDAP_DEBUG)
-	@${PERL} -pi -ne "s|#DEBUG=-DDEBUG|DEBUG=-DDEBUG|" ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} "s|#DEBUG=-DDEBUG|DEBUG=-DDEBUG|" ${WRKSRC}/Makefile
 .endif # WITH_LDAP_DEBUG
 .if defined(WITH_CLEARTEXTPASSWD)
-	@${PERL} -pi -ne "s|^#\s*-DCLEARTEXTPASSWD.*$$|LDAPFLAGS\+=-DCLEARTEXTPASSWD|" \
+	@${REINPLACE_CMD} "s|^#\s*-DCLEARTEXTPASSWD.*$$|LDAPFLAGS\+=-DCLEARTEXTPASSWD|" \
 		${WRKSRC}/Makefile
 .endif # WITH_CLEARTEXTPASSWD
 .if defined(WITH_DASH_EXT)
-	@${PERL} -pi -ne "s|^# -DDASH_EXT.*$$|LDAPFLAGS\+=-DDASH_EXT|" \
+	@${REINPLACE_CMD} "s|^# -DDASH_EXT.*$$|LDAPFLAGS\+=-DDASH_EXT|" \
 		${WRKSRC}/Makefile
 .endif # WITH_DASH_EXT
 
@@ -106,14 +113,4 @@ certificate:
 certificate-req:
 	@cd ${QMAIL_TLS_PORT} && ${MAKE} $@ clean
 
-# Local overrides
-MASTERDIR=	${QMAIL_PORT}
-PATCHDIR=	${.CURDIR}/files
-PKGDIR_LOCAL=	${.CURDIR}
-DESCR=		${PKGDIR_LOCAL}/pkg-descr
-PKGMESSAGE=	${PKGDIR_LOCAL}/pkg-message
-PLIST=		${PKGDIR_LOCAL}/pkg-plist
-
-PRE_MK_INCLUDED=	yes
-
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/qmail-ldap/pkg-message b/mail/qmail-ldap/pkg-message
index 5c31de056c83..cef569209b97 100644
--- a/mail/qmail-ldap/pkg-message
+++ b/mail/qmail-ldap/pkg-message
@@ -11,13 +11,8 @@ 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:
-
-# this will disable the default MTA
-1) do "make disable-sendmail"
-
-# enable qmail as your default MTA
-2) do "make enable-qmail"
+You can enable qmail as your default mailer executing:
+> /var/qmail/scripts/enable-qmail
 
 =====><=====
 
diff --git a/mail/qmail-ldap/pkg-plist b/mail/qmail-ldap/pkg-plist
index 1ed9eb1a8a42..6798bf6a649d 100644
--- a/mail/qmail-ldap/pkg-plist
+++ b/mail/qmail-ldap/pkg-plist
@@ -1,184 +1,122 @@
-%%PORTDOCS%%%%DOCDIR%%/FAQ
-%%PORTDOCS%%%%DOCDIR%%/UPGRADE
-%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
-%%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%%/TEST.deliver
-%%PORTDOCS%%%%DOCDIR%%/TEST.receive
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
-%%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%%/QLDAPINSTALL
-%%PORTDOCS%%%%DOCDIR%%/QLDAPNEWS
-%%PORTDOCS%%%%DOCDIR%%/QLDAPTODO
-%%PORTDOCS%%%%DOCDIR%%/QLDAPPICTURE
-boot/home
-boot/home+df
-boot/proc
-boot/proc+df
-boot/binm1
-boot/binm1+df
-boot/binm2
-boot/binm2+df
-boot/binm3
-boot/binm3+df
-
-@group qmail
-@mode 04711
-@comment *** NOTE different owner
-@owner qmailq
-bin/qmail-queue
-@owner
-@mode 0700
-bin/qmail-lspawn
-@mode 0700
-bin/qmail-start
-@mode 0711
-bin/qmail-getpw
-@mode 0711
-bin/qmail-local
-@mode 0711
-bin/qmail-remote
-@mode 0711
-bin/qmail-rspawn
-@mode 0711
-bin/qmail-clean
-@mode 0711
-bin/qmail-send
-@mode 0711
-bin/splogger
-@mode 0700
-bin/qmail-newu
-@mode 0700
-bin/qmail-newmrh
-@mode 0711
-bin/qmail-pw2u
-@mode 0755
-bin/qmail-inject
-@mode 0755
-bin/predate
-@mode 0755
+bin/auth_imap
+bin/auth_pop
+bin/bouncesaying
+bin/condredirect
 bin/datemail
-@mode 0755
 bin/digest
-@mode 0755
+bin/elq
+bin/except
+bin/forward
+bin/maildir2mbox
+bin/maildirmake
+bin/maildirwatch
 bin/mailsubj
-@mode 0755
 bin/pbsadd
-@mode 0755
 bin/pbscheck
-@mode 0755
 bin/pbsdbd
-@mode 0755
-bin/qmail-showctl
-@mode 0755
-bin/qmail-qread
-@mode 0755
-bin/qmail-qstat
-@mode 0755
-bin/qmail-tcpto
-@mode 0755
-bin/qmail-tcpok
-@mode 0755
+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
-@mode 0711
 bin/qmail-popup
-@mode 0755
+bin/qmail-pw2u
 bin/qmail-qmqpc
-@mode 0755
 bin/qmail-qmqpd
-@mode 0755
 bin/qmail-qmtpd
-@mode 0755
+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
-@mode 0755
-bin/qmail-todo
-@mode 0755
-bin/sendmail
-@mode 0755
-bin/tcp-env
-@mode 0755
+bin/qmail-start
+bin/qmail-tcpok
+bin/qmail-tcpto
 bin/qreceipt
-@mode 0755
 bin/qsmhook
-@mode 0755
-bin/qbiff
-@mode 0755
-bin/forward
-@mode 0755
-bin/preline
-@mode 0755
-bin/condredirect
-@mode 0755
-bin/bouncesaying
-@mode 0755
-bin/except
-@mode 0755
-bin/maildirmake
-@mode 0755
-bin/maildir2mbox
-@mode 0755
-bin/maildirwatch
-@mode 0755
-bin/qail
-@mode 0755
-bin/elq
-@mode 0755
-bin/pinq
-@mode 0755
-bin/qmail-reply
-@mode 0755
-bin/qmail-quotawarn
-@mode 0700
-bin/auth_pop
-@mode 0700
-bin/auth_imap
-@mode 0700
-bin/qmail-ldaplookup
-
-@group
-@owner
-@mode
-
+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/install
 configure/config
 configure/config-fast
 configure/dnsfq
-configure/hostname
 configure/dnsip
-configure/ipmeprint
 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%%/SECURITY
-%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
+%%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%%%%DOCDIR%%/mkaliasdir
-boot/maildir
 %%PORTDOCS%%@dirrm %%DOCDIR%%
+@dirrm scripts
 @dirrm configure
 @dirrm boot
 @dirrm bin
-
-@unexec echo "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 "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