20 files changed, 117 insertions, 104 deletions

diff --git a/mail/Makefile b/mail/Makefile
index 654467aeeb91..0b9d8eb3bebb 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -446,6 +446,7 @@
     SUBDIR += postfix1
     SUBDIR += postfix21
     SUBDIR += postfix22
+    SUBDIR += postfix23
     SUBDIR += postfixadmin
     SUBDIR += postgrey
     SUBDIR += postilion
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 9603dacaaf4d..71faccb05b84 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION=	2.3.8
+PORTVERSION=	2.4.0
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -23,7 +23,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	vivek@khera.org
 COMMENT=	A secure alternative to widely-used Sendmail
 
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-24-9].* postfix-current-2.* \
+CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-35-9].* postfix-current-2.* \
 		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 
 USE_SUBMAKE=	yes
@@ -59,7 +59,8 @@ OPTIONS=	PCRE		"Perl Compatible Regular Expressions"			on \
 		TEST		"SMTP/LMTP test server and generator"			${STATUS_Test}
 
 MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
-	postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1
+	postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1 \
+	qshape.1
 
 MAN5=	access.5 aliases.5 bounce.5 canonical.5 cidr_table.5 generic.5 \
 	header_checks.5 ldap_table.5 master.5 mysql_table.5 nisplus_table.5 \
@@ -199,6 +200,7 @@ _REQUIRE+=		ypserv
 .endif
 
 .if defined(WITH_VDA)
+BROKEN=			Does not apply. Waiting to a new version
 PATCH_SITES+=		http://vda.sourceforge.net/VDA/
 PATCHFILES+=		postfix-2.3.7-vda.patch.gz
 PATCH_DIST_STRIP=	-p1
@@ -299,8 +301,11 @@ do-install:
 
 	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${PREFIX}/bin/rmail
 
+	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${PREFIX}/bin/qshape
+	${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${MANPREFIX}/man/man1
+
 .for f in ${BINTEST}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/bin
 .endfor
 .for f in ${MANTEST}
 	${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${MANPREFIX}/man/man1
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 302036412dfc..f51963247bb3 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,6 +1,6 @@
-MD5 (postfix/postfix-2.3.8.tar.gz) = a6c560657788fc7a5444fa9ea32f5513
-SHA256 (postfix/postfix-2.3.8.tar.gz) = f19c26646e19cc93bdb01b1118ad6bdc67c0ec506c7dc989370e117c8d43f3e6
-SIZE (postfix/postfix-2.3.8.tar.gz) = 2787761
+MD5 (postfix/postfix-2.4.0.tar.gz) = 45c56b112a6cd9ba08ac99dfd734ea9d
+SHA256 (postfix/postfix-2.4.0.tar.gz) = 7cbc4d8904512ac1792193c54a2989b481e6402447b82988b6a88b8091af6bbd
+SIZE (postfix/postfix-2.4.0.tar.gz) = 2931537
 MD5 (postfix/postfix-2.3.7-vda.patch.gz) = 93ad21258bcde55f39792b5b753aed4b
 SHA256 (postfix/postfix-2.3.7-vda.patch.gz) = b353c82ecb2b35a5edba38180b683a4ad08895c94e3def0d1a4eeac58ac91061
 SIZE (postfix/postfix-2.3.7-vda.patch.gz) = 8003
diff --git a/mail/postfix/pkg-plist b/mail/postfix/pkg-plist
index 7da191de5fb8..c7905343c5d5 100644
--- a/mail/postfix/pkg-plist
+++ b/mail/postfix/pkg-plist
@@ -63,11 +63,12 @@ sbin/postmap
 sbin/postqueue
 sbin/postsuper
 sbin/sendmail
-%%SUB_TEST%%sbin/qmqp-sink
-%%SUB_TEST%%sbin/qmqp-source
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
+%%SUB_TEST%%bin/qmqp-sink
+%%SUB_TEST%%bin/qmqp-source
+%%SUB_TEST%%bin/smtp-sink
+%%SUB_TEST%%bin/smtp-source
 bin/rmail
+bin/qshape
 bin/newaliases
 bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/AAAREADME
@@ -89,7 +90,6 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README
 %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DATABASE_README
 %%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DB_README
@@ -112,8 +112,6 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LINUX_README
 %%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
 %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
@@ -132,8 +130,6 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/PGSQL_README
 %%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README
 %%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
@@ -151,10 +147,11 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html
 %%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README
 %%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html
+%%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README
+%%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README.html
 %%PORTDOCS%%%%DOCSDIR%%/TUNING_README
 %%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README.html
 %%PORTDOCS%%%%DOCSDIR%%/UUCP_README
 %%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/VERP_README
diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile
index 9603dacaaf4d..7fba416cb363 100644
--- a/mail/postfix23/Makefile
+++ b/mail/postfix23/Makefile
@@ -19,13 +19,13 @@ MASTER_SITE_SUBDIR=	. old related/postfix
 DISTNAME=	postfix-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
-# blanket approval for version updates: mnag@FreeBSD.org
-MAINTAINER=	vivek@khera.org
+MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A secure alternative to widely-used Sendmail
 
 CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-24-9].* postfix-current-2.* \
 		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 
+NO_LATEST_LINK=	yes
 USE_SUBMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_RC_SUBR=	postfix.sh
diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
index 9603dacaaf4d..71faccb05b84 100644
--- a/mail/postfix24/Makefile
+++ b/mail/postfix24/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION=	2.3.8
+PORTVERSION=	2.4.0
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -23,7 +23,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	vivek@khera.org
 COMMENT=	A secure alternative to widely-used Sendmail
 
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-24-9].* postfix-current-2.* \
+CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-35-9].* postfix-current-2.* \
 		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 
 USE_SUBMAKE=	yes
@@ -59,7 +59,8 @@ OPTIONS=	PCRE		"Perl Compatible Regular Expressions"			on \
 		TEST		"SMTP/LMTP test server and generator"			${STATUS_Test}
 
 MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
-	postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1
+	postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1 \
+	qshape.1
 
 MAN5=	access.5 aliases.5 bounce.5 canonical.5 cidr_table.5 generic.5 \
 	header_checks.5 ldap_table.5 master.5 mysql_table.5 nisplus_table.5 \
@@ -199,6 +200,7 @@ _REQUIRE+=		ypserv
 .endif
 
 .if defined(WITH_VDA)
+BROKEN=			Does not apply. Waiting to a new version
 PATCH_SITES+=		http://vda.sourceforge.net/VDA/
 PATCHFILES+=		postfix-2.3.7-vda.patch.gz
 PATCH_DIST_STRIP=	-p1
@@ -299,8 +301,11 @@ do-install:
 
 	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${PREFIX}/bin/rmail
 
+	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${PREFIX}/bin/qshape
+	${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${MANPREFIX}/man/man1
+
 .for f in ${BINTEST}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/bin
 .endfor
 .for f in ${MANTEST}
 	${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${MANPREFIX}/man/man1
diff --git a/mail/postfix24/distinfo b/mail/postfix24/distinfo
index 302036412dfc..f51963247bb3 100644
--- a/mail/postfix24/distinfo
+++ b/mail/postfix24/distinfo
@@ -1,6 +1,6 @@
-MD5 (postfix/postfix-2.3.8.tar.gz) = a6c560657788fc7a5444fa9ea32f5513
-SHA256 (postfix/postfix-2.3.8.tar.gz) = f19c26646e19cc93bdb01b1118ad6bdc67c0ec506c7dc989370e117c8d43f3e6
-SIZE (postfix/postfix-2.3.8.tar.gz) = 2787761
+MD5 (postfix/postfix-2.4.0.tar.gz) = 45c56b112a6cd9ba08ac99dfd734ea9d
+SHA256 (postfix/postfix-2.4.0.tar.gz) = 7cbc4d8904512ac1792193c54a2989b481e6402447b82988b6a88b8091af6bbd
+SIZE (postfix/postfix-2.4.0.tar.gz) = 2931537
 MD5 (postfix/postfix-2.3.7-vda.patch.gz) = 93ad21258bcde55f39792b5b753aed4b
 SHA256 (postfix/postfix-2.3.7-vda.patch.gz) = b353c82ecb2b35a5edba38180b683a4ad08895c94e3def0d1a4eeac58ac91061
 SIZE (postfix/postfix-2.3.7-vda.patch.gz) = 8003
diff --git a/mail/postfix24/pkg-plist b/mail/postfix24/pkg-plist
index 7da191de5fb8..c7905343c5d5 100644
--- a/mail/postfix24/pkg-plist
+++ b/mail/postfix24/pkg-plist
@@ -63,11 +63,12 @@ sbin/postmap
 sbin/postqueue
 sbin/postsuper
 sbin/sendmail
-%%SUB_TEST%%sbin/qmqp-sink
-%%SUB_TEST%%sbin/qmqp-source
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
+%%SUB_TEST%%bin/qmqp-sink
+%%SUB_TEST%%bin/qmqp-source
+%%SUB_TEST%%bin/smtp-sink
+%%SUB_TEST%%bin/smtp-source
 bin/rmail
+bin/qshape
 bin/newaliases
 bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/AAAREADME
@@ -89,7 +90,6 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README
 %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DATABASE_README
 %%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DB_README
@@ -112,8 +112,6 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LINUX_README
 %%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
 %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
@@ -132,8 +130,6 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/PGSQL_README
 %%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README
 %%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
@@ -151,10 +147,11 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html
 %%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README
 %%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html
+%%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README
+%%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README.html
 %%PORTDOCS%%%%DOCSDIR%%/TUNING_README
 %%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README.html
 %%PORTDOCS%%%%DOCSDIR%%/UUCP_README
 %%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/VERP_README
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
index 9603dacaaf4d..71faccb05b84 100644
--- a/mail/postfix25/Makefile
+++ b/mail/postfix25/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION=	2.3.8
+PORTVERSION=	2.4.0
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -23,7 +23,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	vivek@khera.org
 COMMENT=	A secure alternative to widely-used Sendmail
 
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-24-9].* postfix-current-2.* \
+CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-35-9].* postfix-current-2.* \
 		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 
 USE_SUBMAKE=	yes
@@ -59,7 +59,8 @@ OPTIONS=	PCRE		"Perl Compatible Regular Expressions"			on \
 		TEST		"SMTP/LMTP test server and generator"			${STATUS_Test}
 
 MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
-	postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1
+	postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1 \
+	qshape.1
 
 MAN5=	access.5 aliases.5 bounce.5 canonical.5 cidr_table.5 generic.5 \
 	header_checks.5 ldap_table.5 master.5 mysql_table.5 nisplus_table.5 \
@@ -199,6 +200,7 @@ _REQUIRE+=		ypserv
 .endif
 
 .if defined(WITH_VDA)
+BROKEN=			Does not apply. Waiting to a new version
 PATCH_SITES+=		http://vda.sourceforge.net/VDA/
 PATCHFILES+=		postfix-2.3.7-vda.patch.gz
 PATCH_DIST_STRIP=	-p1
@@ -299,8 +301,11 @@ do-install:
 
 	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${PREFIX}/bin/rmail
 
+	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${PREFIX}/bin/qshape
+	${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${MANPREFIX}/man/man1
+
 .for f in ${BINTEST}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/bin
 .endfor
 .for f in ${MANTEST}
 	${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${MANPREFIX}/man/man1
diff --git a/mail/postfix25/distinfo b/mail/postfix25/distinfo
index 302036412dfc..f51963247bb3 100644
--- a/mail/postfix25/distinfo
+++ b/mail/postfix25/distinfo
@@ -1,6 +1,6 @@
-MD5 (postfix/postfix-2.3.8.tar.gz) = a6c560657788fc7a5444fa9ea32f5513
-SHA256 (postfix/postfix-2.3.8.tar.gz) = f19c26646e19cc93bdb01b1118ad6bdc67c0ec506c7dc989370e117c8d43f3e6
-SIZE (postfix/postfix-2.3.8.tar.gz) = 2787761
+MD5 (postfix/postfix-2.4.0.tar.gz) = 45c56b112a6cd9ba08ac99dfd734ea9d
+SHA256 (postfix/postfix-2.4.0.tar.gz) = 7cbc4d8904512ac1792193c54a2989b481e6402447b82988b6a88b8091af6bbd
+SIZE (postfix/postfix-2.4.0.tar.gz) = 2931537
 MD5 (postfix/postfix-2.3.7-vda.patch.gz) = 93ad21258bcde55f39792b5b753aed4b
 SHA256 (postfix/postfix-2.3.7-vda.patch.gz) = b353c82ecb2b35a5edba38180b683a4ad08895c94e3def0d1a4eeac58ac91061
 SIZE (postfix/postfix-2.3.7-vda.patch.gz) = 8003
diff --git a/mail/postfix25/pkg-plist b/mail/postfix25/pkg-plist
index 7da191de5fb8..c7905343c5d5 100644
--- a/mail/postfix25/pkg-plist
+++ b/mail/postfix25/pkg-plist
@@ -63,11 +63,12 @@ sbin/postmap
 sbin/postqueue
 sbin/postsuper
 sbin/sendmail
-%%SUB_TEST%%sbin/qmqp-sink
-%%SUB_TEST%%sbin/qmqp-source
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
+%%SUB_TEST%%bin/qmqp-sink
+%%SUB_TEST%%bin/qmqp-source
+%%SUB_TEST%%bin/smtp-sink
+%%SUB_TEST%%bin/smtp-source
 bin/rmail
+bin/qshape
 bin/newaliases
 bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/AAAREADME
@@ -89,7 +90,6 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README
 %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DATABASE_README
 %%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DB_README
@@ -112,8 +112,6 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LINUX_README
 %%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
 %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
@@ -132,8 +130,6 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/PGSQL_README
 %%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README
 %%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
@@ -151,10 +147,11 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html
 %%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README
 %%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html
+%%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README
+%%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README.html
 %%PORTDOCS%%%%DOCSDIR%%/TUNING_README
 %%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README.html
 %%PORTDOCS%%%%DOCSDIR%%/UUCP_README
 %%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/VERP_README
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index 9603dacaaf4d..71faccb05b84 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION=	2.3.8
+PORTVERSION=	2.4.0
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -23,7 +23,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	vivek@khera.org
 COMMENT=	A secure alternative to widely-used Sendmail
 
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-24-9].* postfix-current-2.* \
+CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-35-9].* postfix-current-2.* \
 		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 
 USE_SUBMAKE=	yes
@@ -59,7 +59,8 @@ OPTIONS=	PCRE		"Perl Compatible Regular Expressions"			on \
 		TEST		"SMTP/LMTP test server and generator"			${STATUS_Test}
 
 MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
-	postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1
+	postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1 \
+	qshape.1
 
 MAN5=	access.5 aliases.5 bounce.5 canonical.5 cidr_table.5 generic.5 \
 	header_checks.5 ldap_table.5 master.5 mysql_table.5 nisplus_table.5 \
@@ -199,6 +200,7 @@ _REQUIRE+=		ypserv
 .endif
 
 .if defined(WITH_VDA)
+BROKEN=			Does not apply. Waiting to a new version
 PATCH_SITES+=		http://vda.sourceforge.net/VDA/
 PATCHFILES+=		postfix-2.3.7-vda.patch.gz
 PATCH_DIST_STRIP=	-p1
@@ -299,8 +301,11 @@ do-install:
 
 	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${PREFIX}/bin/rmail
 
+	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${PREFIX}/bin/qshape
+	${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${MANPREFIX}/man/man1
+
 .for f in ${BINTEST}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/bin
 .endfor
 .for f in ${MANTEST}
 	${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${MANPREFIX}/man/man1
diff --git a/mail/postfix26/distinfo b/mail/postfix26/distinfo
index 302036412dfc..f51963247bb3 100644
--- a/mail/postfix26/distinfo
+++ b/mail/postfix26/distinfo
@@ -1,6 +1,6 @@
-MD5 (postfix/postfix-2.3.8.tar.gz) = a6c560657788fc7a5444fa9ea32f5513
-SHA256 (postfix/postfix-2.3.8.tar.gz) = f19c26646e19cc93bdb01b1118ad6bdc67c0ec506c7dc989370e117c8d43f3e6
-SIZE (postfix/postfix-2.3.8.tar.gz) = 2787761
+MD5 (postfix/postfix-2.4.0.tar.gz) = 45c56b112a6cd9ba08ac99dfd734ea9d
+SHA256 (postfix/postfix-2.4.0.tar.gz) = 7cbc4d8904512ac1792193c54a2989b481e6402447b82988b6a88b8091af6bbd
+SIZE (postfix/postfix-2.4.0.tar.gz) = 2931537
 MD5 (postfix/postfix-2.3.7-vda.patch.gz) = 93ad21258bcde55f39792b5b753aed4b
 SHA256 (postfix/postfix-2.3.7-vda.patch.gz) = b353c82ecb2b35a5edba38180b683a4ad08895c94e3def0d1a4eeac58ac91061
 SIZE (postfix/postfix-2.3.7-vda.patch.gz) = 8003
diff --git a/mail/postfix26/pkg-plist b/mail/postfix26/pkg-plist
index 7da191de5fb8..c7905343c5d5 100644
--- a/mail/postfix26/pkg-plist
+++ b/mail/postfix26/pkg-plist
@@ -63,11 +63,12 @@ sbin/postmap
 sbin/postqueue
 sbin/postsuper
 sbin/sendmail
-%%SUB_TEST%%sbin/qmqp-sink
-%%SUB_TEST%%sbin/qmqp-source
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
+%%SUB_TEST%%bin/qmqp-sink
+%%SUB_TEST%%bin/qmqp-source
+%%SUB_TEST%%bin/smtp-sink
+%%SUB_TEST%%bin/smtp-source
 bin/rmail
+bin/qshape
 bin/newaliases
 bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/AAAREADME
@@ -89,7 +90,6 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README
 %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DATABASE_README
 %%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DB_README
@@ -112,8 +112,6 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LINUX_README
 %%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
 %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
@@ -132,8 +130,6 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/PGSQL_README
 %%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README
 %%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
@@ -151,10 +147,11 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html
 %%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README
 %%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html
+%%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README
+%%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README.html
 %%PORTDOCS%%%%DOCSDIR%%/TUNING_README
 %%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README.html
 %%PORTDOCS%%%%DOCSDIR%%/UUCP_README
 %%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/VERP_README
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index 9603dacaaf4d..71faccb05b84 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION=	2.3.8
+PORTVERSION=	2.4.0
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -23,7 +23,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	vivek@khera.org
 COMMENT=	A secure alternative to widely-used Sendmail
 
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-24-9].* postfix-current-2.* \
+CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-35-9].* postfix-current-2.* \
 		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 
 USE_SUBMAKE=	yes
@@ -59,7 +59,8 @@ OPTIONS=	PCRE		"Perl Compatible Regular Expressions"			on \
 		TEST		"SMTP/LMTP test server and generator"			${STATUS_Test}
 
 MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
-	postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1
+	postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1 \
+	qshape.1
 
 MAN5=	access.5 aliases.5 bounce.5 canonical.5 cidr_table.5 generic.5 \
 	header_checks.5 ldap_table.5 master.5 mysql_table.5 nisplus_table.5 \
@@ -199,6 +200,7 @@ _REQUIRE+=		ypserv
 .endif
 
 .if defined(WITH_VDA)
+BROKEN=			Does not apply. Waiting to a new version
 PATCH_SITES+=		http://vda.sourceforge.net/VDA/
 PATCHFILES+=		postfix-2.3.7-vda.patch.gz
 PATCH_DIST_STRIP=	-p1
@@ -299,8 +301,11 @@ do-install:
 
 	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${PREFIX}/bin/rmail
 
+	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${PREFIX}/bin/qshape
+	${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${MANPREFIX}/man/man1
+
 .for f in ${BINTEST}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/bin
 .endfor
 .for f in ${MANTEST}
 	${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${MANPREFIX}/man/man1
diff --git a/mail/postfix27/distinfo b/mail/postfix27/distinfo
index 302036412dfc..f51963247bb3 100644
--- a/mail/postfix27/distinfo
+++ b/mail/postfix27/distinfo
@@ -1,6 +1,6 @@
-MD5 (postfix/postfix-2.3.8.tar.gz) = a6c560657788fc7a5444fa9ea32f5513
-SHA256 (postfix/postfix-2.3.8.tar.gz) = f19c26646e19cc93bdb01b1118ad6bdc67c0ec506c7dc989370e117c8d43f3e6
-SIZE (postfix/postfix-2.3.8.tar.gz) = 2787761
+MD5 (postfix/postfix-2.4.0.tar.gz) = 45c56b112a6cd9ba08ac99dfd734ea9d
+SHA256 (postfix/postfix-2.4.0.tar.gz) = 7cbc4d8904512ac1792193c54a2989b481e6402447b82988b6a88b8091af6bbd
+SIZE (postfix/postfix-2.4.0.tar.gz) = 2931537
 MD5 (postfix/postfix-2.3.7-vda.patch.gz) = 93ad21258bcde55f39792b5b753aed4b
 SHA256 (postfix/postfix-2.3.7-vda.patch.gz) = b353c82ecb2b35a5edba38180b683a4ad08895c94e3def0d1a4eeac58ac91061
 SIZE (postfix/postfix-2.3.7-vda.patch.gz) = 8003
diff --git a/mail/postfix27/pkg-plist b/mail/postfix27/pkg-plist
index 7da191de5fb8..c7905343c5d5 100644
--- a/mail/postfix27/pkg-plist
+++ b/mail/postfix27/pkg-plist
@@ -63,11 +63,12 @@ sbin/postmap
 sbin/postqueue
 sbin/postsuper
 sbin/sendmail
-%%SUB_TEST%%sbin/qmqp-sink
-%%SUB_TEST%%sbin/qmqp-source
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
+%%SUB_TEST%%bin/qmqp-sink
+%%SUB_TEST%%bin/qmqp-source
+%%SUB_TEST%%bin/smtp-sink
+%%SUB_TEST%%bin/smtp-source
 bin/rmail
+bin/qshape
 bin/newaliases
 bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/AAAREADME
@@ -89,7 +90,6 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README
 %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DATABASE_README
 %%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DB_README
@@ -112,8 +112,6 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LINUX_README
 %%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
 %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
@@ -132,8 +130,6 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/PGSQL_README
 %%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README
 %%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
@@ -151,10 +147,11 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html
 %%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README
 %%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html
+%%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README
+%%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README.html
 %%PORTDOCS%%%%DOCSDIR%%/TUNING_README
 %%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README.html
 %%PORTDOCS%%%%DOCSDIR%%/UUCP_README
 %%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/VERP_README
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index 9603dacaaf4d..71faccb05b84 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION=	2.3.8
+PORTVERSION=	2.4.0
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -23,7 +23,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	vivek@khera.org
 COMMENT=	A secure alternative to widely-used Sendmail
 
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-24-9].* postfix-current-2.* \
+CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-35-9].* postfix-current-2.* \
 		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 
 USE_SUBMAKE=	yes
@@ -59,7 +59,8 @@ OPTIONS=	PCRE		"Perl Compatible Regular Expressions"			on \
 		TEST		"SMTP/LMTP test server and generator"			${STATUS_Test}
 
 MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
-	postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1
+	postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1 \
+	qshape.1
 
 MAN5=	access.5 aliases.5 bounce.5 canonical.5 cidr_table.5 generic.5 \
 	header_checks.5 ldap_table.5 master.5 mysql_table.5 nisplus_table.5 \
@@ -199,6 +200,7 @@ _REQUIRE+=		ypserv
 .endif
 
 .if defined(WITH_VDA)
+BROKEN=			Does not apply. Waiting to a new version
 PATCH_SITES+=		http://vda.sourceforge.net/VDA/
 PATCHFILES+=		postfix-2.3.7-vda.patch.gz
 PATCH_DIST_STRIP=	-p1
@@ -299,8 +301,11 @@ do-install:
 
 	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${PREFIX}/bin/rmail
 
+	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${PREFIX}/bin/qshape
+	${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${MANPREFIX}/man/man1
+
 .for f in ${BINTEST}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/bin
 .endfor
 .for f in ${MANTEST}
 	${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${MANPREFIX}/man/man1
diff --git a/mail/postfix28/distinfo b/mail/postfix28/distinfo
index 302036412dfc..f51963247bb3 100644
--- a/mail/postfix28/distinfo
+++ b/mail/postfix28/distinfo
@@ -1,6 +1,6 @@
-MD5 (postfix/postfix-2.3.8.tar.gz) = a6c560657788fc7a5444fa9ea32f5513
-SHA256 (postfix/postfix-2.3.8.tar.gz) = f19c26646e19cc93bdb01b1118ad6bdc67c0ec506c7dc989370e117c8d43f3e6
-SIZE (postfix/postfix-2.3.8.tar.gz) = 2787761
+MD5 (postfix/postfix-2.4.0.tar.gz) = 45c56b112a6cd9ba08ac99dfd734ea9d
+SHA256 (postfix/postfix-2.4.0.tar.gz) = 7cbc4d8904512ac1792193c54a2989b481e6402447b82988b6a88b8091af6bbd
+SIZE (postfix/postfix-2.4.0.tar.gz) = 2931537
 MD5 (postfix/postfix-2.3.7-vda.patch.gz) = 93ad21258bcde55f39792b5b753aed4b
 SHA256 (postfix/postfix-2.3.7-vda.patch.gz) = b353c82ecb2b35a5edba38180b683a4ad08895c94e3def0d1a4eeac58ac91061
 SIZE (postfix/postfix-2.3.7-vda.patch.gz) = 8003
diff --git a/mail/postfix28/pkg-plist b/mail/postfix28/pkg-plist
index 7da191de5fb8..c7905343c5d5 100644
--- a/mail/postfix28/pkg-plist
+++ b/mail/postfix28/pkg-plist
@@ -63,11 +63,12 @@ sbin/postmap
 sbin/postqueue
 sbin/postsuper
 sbin/sendmail
-%%SUB_TEST%%sbin/qmqp-sink
-%%SUB_TEST%%sbin/qmqp-source
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
+%%SUB_TEST%%bin/qmqp-sink
+%%SUB_TEST%%bin/qmqp-source
+%%SUB_TEST%%bin/smtp-sink
+%%SUB_TEST%%bin/smtp-source
 bin/rmail
+bin/qshape
 bin/newaliases
 bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/AAAREADME
@@ -89,7 +90,6 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README
 %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DATABASE_README
 %%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DB_README
@@ -112,8 +112,6 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LINUX_README
 %%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
 %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
@@ -132,8 +130,6 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/PGSQL_README
 %%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README
 %%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
@@ -151,10 +147,11 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html
 %%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README
 %%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html
+%%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README
+%%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README.html
 %%PORTDOCS%%%%DOCSDIR%%/TUNING_README
 %%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README.html
 %%PORTDOCS%%%%DOCSDIR%%/UUCP_README
 %%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/VERP_README