- Update to 2.9-20111219

- Modify pkg-install to handle situations in which
  /etc/mail/mailer.conf does not exist, e.g. when
  FreeBSD is built WITHOUT_MAILWRAPPER. [1]

Requested by:	miwi [1]

4 files changed, 10 insertions, 8 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index c4b3c2b014de..68056873ce98 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-DISTVERSION=	2.9-20111205
+DISTVERSION=	2.9-20111219
 PORTEPOCH=	4
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
@@ -74,9 +74,9 @@ MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.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 postfix-wrapper.5 regexp_table.5 \
-	relocated.5 sqlite_table.5 tcp_table.5 transport.5 virtual.5
+	header_checks.5 ldap_table.5 master.5 memcache_table.5 mysql_table.5 \
+	nisplus_table.5 pcre_table.5 pgsql_table.5 postconf.5 postfix-wrapper.5 \
+	regexp_table.5 relocated.5 sqlite_table.5 tcp_table.5 transport.5 virtual.5
 
 MAN8=	anvil.8 bounce.8 cleanup.8 discard.8 dnsblog.8 error.8 flush.8 local.8 master.8 \
 	oqmgr.8 pickup.8 pipe.8 postscreen.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 showq.8 \
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index f1ede9c17dff..a5fe82e23ce5 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,2 +1,2 @@
-SHA256 (postfix/postfix-2.9-20111205.tar.gz) = 6c76790f1c83f35de9567ad98d77968e90ad3fc103ed4b471dd865c41390952f
-SIZE (postfix/postfix-2.9-20111205.tar.gz) = 3727578
+SHA256 (postfix/postfix-2.9-20111219.tar.gz) = e3f5c3a1f102006468b6218a26d029fc29cd919d4f7ea6817e38fca28796bcd2
+SIZE (postfix/postfix-2.9-20111219.tar.gz) = 3754557
diff --git a/mail/postfix-current/files/pkg-install.in b/mail/postfix-current/files/pkg-install.in
index fe97be9f3cba..de71fede9e18 100644
--- a/mail/postfix-current/files/pkg-install.in
+++ b/mail/postfix-current/files/pkg-install.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$FreeBSD: /tmp/pcvs/ports/mail/postfix-current/files/pkg-install.in,v 1.3 2011-07-30 01:34:47 sahil Exp $
+#	$FreeBSD: /tmp/pcvs/ports/mail/postfix-current/files/pkg-install.in,v 1.4 2011-12-21 22:45:17 sahil Exp $
 #
 
 # If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
@@ -72,7 +72,7 @@ if [ "$2" = "POST-INSTALL" ]; then
 	upgrade-package
 fi
 
-if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" ]; then
+if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" -a -f "${MC}" ]; then
 	egrep -q "^sendmail.*${PREFIX}/sbin/sendmail"    ${MC} && \
 	egrep -q "^send-mail.*${PREFIX}/sbin/sendmail"   ${MC} && \
 	egrep -q "^mailq.*${PREFIX}/sbin/sendmail"       ${MC} && \
diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist
index 8b519972d9ec..6410fd58657a 100644
--- a/mail/postfix-current/pkg-plist
+++ b/mail/postfix-current/pkg-plist
@@ -99,6 +99,7 @@ sbin/sendmail
 %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
 %%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html
+%%PORTDOCS%%%%DOCSDIR%%/MEMCACHE_README
 %%PORTDOCS%%%%DOCSDIR%%/MILTER_README
 %%PORTDOCS%%%%DOCSDIR%%/MILTER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MULTI_INSTANCE_README
@@ -180,6 +181,7 @@ sbin/sendmail
 %%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
 %%PORTDOCS%%%%DOCSDIR%%/master.5.html
 %%PORTDOCS%%%%DOCSDIR%%/master.8.html
+%%PORTDOCS%%%%DOCSDIR%%/memcache_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
 %%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html