Update to Postfix 2.10 Snapshot 20121031 and document

incompatible changes in UPDATING.  Also, revise the
PKGINSTALL script to distinguish upgrades from fresh
installs.

Feature safe:	yes

4 files changed, 24 insertions, 8 deletions

diff --git a/UPDATING b/UPDATING
index 46ccf693e198..151a7c055683 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,18 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20121105:
+  AFFECTS: users of mail/postfix-current
+  AUTHOR: sahil@FreeBSD.org
+
+  With this version of Postfix, the default master.cf now uses "unix"
+  instead of "fifo" for the pickup and qmgr services.  In addition, a
+  new smtpd_relay_restrictions feature has been introduced for mail
+  relay control.  For sites that do not define this parameter in
+  main.cf, the upgrade process will add an entry to main.cf.  Please
+  read the RELEASE_NOTES to understand this new feature, how it may
+  affect your site, and backwards compatibility options.
+
 20121104:
   AFFECTS: users of lang/perl5.16
   AUTHOR: az@FreeBSD.org
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index d0c4fae526bb..06787864635d 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-DISTVERSION=	2.10-20120801
+DISTVERSION=	2.10-20121031
 PORTEPOCH=	4
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index f751b9676e37..fa797a67082d 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,4 +1,4 @@
-SHA256 (postfix/postfix-2.10-20120801.tar.gz) = b0f076e0fae9faaa7302f66e693f1485a2d6c47c6174f697f64df37821756bd6
-SIZE (postfix/postfix-2.10-20120801.tar.gz) = 3784702
+SHA256 (postfix/postfix-2.10-20121031.tar.gz) = 665a707181b7a32848c96f0609d1c450bd0aefeb4246a70bdb69975e33dd06c5
+SIZE (postfix/postfix-2.10-20121031.tar.gz) = 3814909
 SHA256 (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = e5c38e5bc226cab109c02a4e530ab1aefd3bb06f2169f3e052bdf83d2727aacc
 SIZE (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = 8191
diff --git a/mail/postfix-current/files/pkg-install.in b/mail/postfix-current/files/pkg-install.in
index de71fede9e18..239363f04308 100644
--- a/mail/postfix-current/files/pkg-install.in
+++ b/mail/postfix-current/files/pkg-install.in
@@ -65,11 +65,15 @@ if [ "$2" = "POST-INSTALL" ]; then
 		fi
 	done
 
-      /bin/sh ${DAEMONDIR}/post-install tempdir=/tmp \
-	daemon_directory=${DAEMONDIR} \
-	html_directory=${READMEDIR} \
-	readme_directory=${READMEDIR} \
-	upgrade-package
+        cmp ${DAEMONDIR}/main.cf ${ETCDIR}/main.cf >/dev/null 2>&1 \
+	 && POSTARG="set-permissions" \
+	 || POSTARG="upgrade-package"
+
+	/bin/sh ${DAEMONDIR}/post-install tempdir=/tmp \
+	 daemon_directory=${DAEMONDIR} \
+	 html_directory=${READMEDIR} \
+	 readme_directory=${READMEDIR} \
+	 ${POSTARG}
 fi
 
 if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" -a -f "${MC}" ]; then