- Update to 2.6-20080221

4 files changed, 17 insertions, 18 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 2ec8d76d39d2..978b64097933 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -6,23 +6,22 @@
 #
 
 PORTNAME=	postfix
-DISTVERSION=	2.5-20080116
+DISTVERSION=	2.6-20080221
 PORTEPOCH=	4
 CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
-		ftp://postfix.mirrors.pair.com/official/ \
-		ftp://ftp.tux.org/pub/net/postfix/official/ \
-		http://mirrors.rootservices.net/postfix/official/ \
-		ftp://ftp.samurai.com/pub/postfix/official/ \
-		http://ftp.unicamp.br/pub/postfix/official/
+MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
+		ftp://postfix.mirrors.pair.com/experimental/ \
+		ftp://ftp.tux.org/pub/net/postfix/experimental/ \
+		http://mirrors.rootservices.net/postfix/experimental/ \
+		ftp://ftp.samurai.com/pub/postfix/experimental/ \
+		http://ftp.unicamp.br/pub/postfix/experimental/
 PKGNAMESUFFIX=	-current
-DISTNAME=	postfix-2.5.0-RC2
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A secure alternative to widely-used Sendmail
 
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.* postfix-current-2.[0-46-9]* \
+CONFLICTS=	courier-0.* postfix-1.* postfix-2.* postfix-current-2.[0-57-9]* \
 		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 
 USE_SUBMAKE=	yes
@@ -265,8 +264,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/postfix-current/distinfo b/mail/postfix-current/distinfo
index 62f66a9b702c..4f390029d8c6 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,3 +1,3 @@
-MD5 (postfix/postfix-2.5.0-RC2.tar.gz) = 5ff61333b257756cb6e4dd9c3af22348
-SHA256 (postfix/postfix-2.5.0-RC2.tar.gz) = cdccd1bce5f51d95c206e399a19334741462551bc050b78696343bc7599d40ce
-SIZE (postfix/postfix-2.5.0-RC2.tar.gz) = 3152038
+MD5 (postfix/postfix-2.6-20080221.tar.gz) = bfec2e9cbeeaef1a5d55fe8f4c654498
+SHA256 (postfix/postfix-2.6-20080221.tar.gz) = 5fc6afcf958fb3942dfa42648d03dbd4b2c83f099b872bce3f1d44e888b9cdc6
+SIZE (postfix/postfix-2.6-20080221.tar.gz) = 3141991
diff --git a/mail/postfix-current/pkg-install b/mail/postfix-current/pkg-install
index c9367b344499..7cfbc061ce52 100644
--- a/mail/postfix-current/pkg-install
+++ b/mail/postfix-current/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 \
 	daemon_directory=${PKG_PREFIX}/libexec/postfix \
 	command_directory=${PKG_PREFIX}/sbin \
diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist
index b0e26b6fe95b..6403e1604266 100644
--- a/mail/postfix-current/pkg-plist
+++ b/mail/postfix-current/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
@@ -39,6 +36,9 @@ 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/proxymap
 libexec/postfix/qmgr
 libexec/postfix/qmqpd