- Update to 2.6.0

- Transfer maintainership to the submitter

PR:		ports/134497
Submitted by:	Sahil Tandon <sahil@tandon.net>
Approved by:	Vick Khera <vivek@khera.org> (old maintainer)

5 files changed, 26 insertions, 31 deletions

diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
index 0d53f8bd4149..aeeab324d49c 100644
--- a/mail/postfix25/Makefile
+++ b/mail/postfix25/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION=	2.5.6
+PORTVERSION=	2.6.0
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -19,11 +19,10 @@ 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=	sahil@tandon.net
 COMMENT=	A secure alternative to widely-used Sendmail
 
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-46-9].* postfix-current-2.* \
+CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-57-9].* postfix-current-2.* \
 		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 
 USE_SUBMAKE=	yes
@@ -58,13 +57,13 @@ 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 \
-	qshape.1
+	postlock.1 postlog.1 postmap.1 postmulti.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 \
-	pcre_table.5 pgsql_table.5 postconf.5 regexp_table.5 relocated.5 \
-	tcp_table.5 transport.5 virtual.5
+	pcre_table.5 pgsql_table.5 postconf.5 postfix-wrapper.5 regexp_table.5 \
+	relocated.5 tcp_table.5 transport.5 virtual.5
 
 MAN8=	anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 local.8 master.8 \
 	oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 showq.8 \
@@ -184,6 +183,7 @@ _REQUIRE+=		ypserv
 .endif
 
 .if defined(WITH_VDA)
+IGNORE=			wait for a new VDA patch that works with 2.6.0
 PATCH_SITES+=		http://vda.sourceforge.net/VDA/
 PATCHFILES+=		postfix-2.5.6-vda-ng.patch.gz
 PATCH_DIST_STRIP=	-p1
@@ -298,8 +298,8 @@ do-install:
 post-install:
 	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 # Fix compressed man pages
-	@${REINPLACE_CMD} -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/etc/postfix/postfix-files
-	@${RM} -f ${PREFIX}/etc/postfix/postfix-files.bak
+	@${REINPLACE_CMD} -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/libexec/postfix/postfix-files
+	@${RM} -f ${PREFIX}/libexec/postfix/postfix-files.bak
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/mail/postfix25/distinfo b/mail/postfix25/distinfo
index fde186247ab3..b68d507d61d9 100644
--- a/mail/postfix25/distinfo
+++ b/mail/postfix25/distinfo
@@ -1,6 +1,3 @@
-MD5 (postfix/postfix-2.5.6.tar.gz) = ec2cb63b53f5f36c3ca91da8f3bc9407
-SHA256 (postfix/postfix-2.5.6.tar.gz) = 8e0178cc1540cb349ed341ae717f0f9ef663e85136db2889e6953bdcd5992abb
-SIZE (postfix/postfix-2.5.6.tar.gz) = 3157891
-MD5 (postfix/postfix-2.5.6-vda-ng.patch.gz) = 83e483795c616abb27fdee5d9886019c
-SHA256 (postfix/postfix-2.5.6-vda-ng.patch.gz) = c4e4ff3da5b6bfa2648dc41bbf7ee56c1ba2f62e2c77a7885bc8044a1131f531
-SIZE (postfix/postfix-2.5.6-vda-ng.patch.gz) = 12388
+MD5 (postfix/postfix-2.6.0.tar.gz) = 3674618dab2734f49182b8cba2f3186e
+SHA256 (postfix/postfix-2.6.0.tar.gz) = 8c323d200feba72121c302f15249d56c7521ade16cf5166fadf158e6818883bd
+SIZE (postfix/postfix-2.6.0.tar.gz) = 3324014
diff --git a/mail/postfix25/files/patch-conf__postfix-files b/mail/postfix25/files/patch-conf__postfix-files
deleted file mode 100644
index bbd19c09b38d..000000000000
--- a/mail/postfix25/files/patch-conf__postfix-files
+++ /dev/null
@@ -1,11 +0,0 @@
---- conf/postfix-files.orig	2008-01-24 00:13:49.000000000 +0000
-+++ conf/postfix-files	2008-02-29 20:53:24.000000000 +0000
-@@ -42,7 +42,7 @@
- # permissions, so that running "make install" fixes any glitches.
- #
- $config_directory:d:root:-:755:u
--$data_directory:d:$mail_owner:-:700:u
-+$data_directory:d:$mail_owner:-:700:uc
- $daemon_directory:d:root:-:755:u
- $queue_directory:d:root:-:755:uc
- $sample_directory:d:root:-:755:o
diff --git a/mail/postfix25/pkg-install b/mail/postfix25/pkg-install
index 4d847638d846..52e768d500cd 100644
--- a/mail/postfix25/pkg-install
+++ b/mail/postfix25/pkg-install
@@ -119,7 +119,7 @@ if [ x"$2" = xPOST-INSTALL ]; then
 		done
 	fi
 
-	/bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
+	/bin/sh ${PKG_PREFIX}/libexec/postfix/post-install tempdir=/tmp \
 	config_directory=${PKG_PREFIX}/etc/postfix \
 	data_directory=/var/db/postfix \
 	daemon_directory=${PKG_PREFIX}/libexec/postfix \
diff --git a/mail/postfix25/pkg-plist b/mail/postfix25/pkg-plist
index b0e26b6fe95b..a956a16ab2a3 100644
--- a/mail/postfix25/pkg-plist
+++ b/mail/postfix25/pkg-plist
@@ -13,9 +13,6 @@ etc/postfix/TLS_LICENSE
 etc/postfix/bounce.cf.default
 etc/postfix/main.cf.default
 etc/postfix/makedefs.out
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
 etc/postfix/dist/main.cf
 etc/postfix/dist/master.cf
 etc/postfix/dist/access
@@ -34,11 +31,18 @@ libexec/postfix/error
 libexec/postfix/flush
 libexec/postfix/lmtp
 libexec/postfix/local
+libexec/postfix/main.cf
 libexec/postfix/master
+libexec/postfix/master.cf
 libexec/postfix/nqmgr
 libexec/postfix/oqmgr
 libexec/postfix/pickup
 libexec/postfix/pipe
+libexec/postfix/post-install
+libexec/postfix/postfix-files
+libexec/postfix/postfix-script
+libexec/postfix/postfix-wrapper
+libexec/postfix/postmulti-script
 libexec/postfix/proxymap
 libexec/postfix/qmgr
 libexec/postfix/qmqpd
@@ -60,6 +64,7 @@ sbin/postkick
 sbin/postlock
 sbin/postlog
 sbin/postmap
+sbin/postmulti
 sbin/postqueue
 sbin/postsuper
 sbin/sendmail
@@ -118,6 +123,8 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MILTER_README
 %%PORTDOCS%%%%DOCSDIR%%/MILTER_README.html
+%%PORTDOCS%%%%DOCSDIR%%/MULTI_INSTANCE_README
+%%PORTDOCS%%%%DOCSDIR%%/MULTI_INSTANCE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
 %%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html
 %%PORTDOCS%%%%DOCSDIR%%/NFS_README
@@ -202,11 +209,13 @@ bin/mailq
 %%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg
 %%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html
 %%PORTDOCS%%%%DOCSDIR%%/postfix-power.png
+%%PORTDOCS%%%%DOCSDIR%%/postfix-wrapper.5.html
 %%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
+%%PORTDOCS%%%%DOCSDIR%%/postmulti.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
 %%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html