Update Postfix to 2.9.6.

Changes from 2.8.14 are too many to write here, please refer RELEASE_NOTES.

4 files changed, 18 insertions, 17 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 76991ad5586..9331b7949b5 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.260 2013/02/06 23:22:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.261 2013/02/13 14:31:31 taca Exp $
 
-DISTNAME=	postfix-2.8.14
-PKGREVISION=	1
+DISTNAME=	postfix-2.9.6
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 MASTER_SITES+=	http://postfix.it-austria.net/releases/official/
diff --git a/mail/postfix/PLIST b/mail/postfix/PLIST
index 883c4554769..b2003bf82e0 100644
--- a/mail/postfix/PLIST
+++ b/mail/postfix/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.25 2011/02/26 08:58:59 tron Exp $
+@comment $NetBSD: PLIST,v 1.26 2013/02/13 14:31:31 taca Exp $
 bin/mailq
 bin/newaliases
 libexec/postfix/anvil
 libexec/postfix/bounce
 libexec/postfix/cleanup
-libexec/postfix/dnsblog
 libexec/postfix/discard
+libexec/postfix/dnsblog
 libexec/postfix/error
 libexec/postfix/flush
 libexec/postfix/lmtp
@@ -62,6 +62,7 @@ man/man5/generic.5
 man/man5/header_checks.5
 man/man5/ldap_table.5
 man/man5/master.5
+man/man5/memcache_table.5
 man/man5/mysql_table.5
 man/man5/nisplus_table.5
 man/man5/pcre_table.5
@@ -86,9 +87,9 @@ man/man8/lmtp.8
 man/man8/local.8
 man/man8/master.8
 man/man8/oqmgr.8
-man/man8/postscreen.8
 man/man8/pickup.8
 man/man8/pipe.8
+man/man8/postscreen.8
 man/man8/proxymap.8
 man/man8/qmgr.8
 man/man8/qmqpd.8
@@ -139,6 +140,7 @@ share/doc/postfix/LDAP_README
 share/doc/postfix/LINUX_README
 share/doc/postfix/LOCAL_RECIPIENT_README
 share/doc/postfix/MAILDROP_README
+share/doc/postfix/MEMCACHE_README
 share/doc/postfix/MILTER_README
 share/doc/postfix/MULTI_INSTANCE_README
 share/doc/postfix/MYSQL_README
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index b58a202d2b2..c827db7da72 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.147 2013/02/05 15:58:38 taca Exp $
+$NetBSD: distinfo,v 1.148 2013/02/13 14:31:31 taca Exp $
 
-SHA1 (postfix-2.8.14.tar.gz) = e7961c0f430fe99a0f4250f187150aca157449e3
-RMD160 (postfix-2.8.14.tar.gz) = 96da39315a740112b8fddeb4a30bbbbb5d11809c
-Size (postfix-2.8.14.tar.gz) = 3641913 bytes
-SHA1 (patch-aa) = 5b4923402c80957e47b8a4e16c897287b88544bb
+SHA1 (postfix-2.9.6.tar.gz) = 9d7af8670fd13fd5e5290ff2e3f00d724178f0fb
+RMD160 (postfix-2.9.6.tar.gz) = e3148a42f246c4f54c82cf387b7467805edcd2cd
+Size (postfix-2.9.6.tar.gz) = 3767309 bytes
+SHA1 (patch-aa) = 2115fd7af5776a14fdbfc88a5ad3bc668a6762db
 SHA1 (patch-ag) = 60d752b6c8db971d92ca0017c63329ad446209c5
 SHA1 (patch-ai) = 1bd3682b74de11e5d420e453f3df088d965452d6
diff --git a/mail/postfix/patches/patch-aa b/mail/postfix/patches/patch-aa
index 3fb9ca5fe8c..fbf81c88f76 100644
--- a/mail/postfix/patches/patch-aa
+++ b/mail/postfix/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.21 2008/09/04 08:25:20 martti Exp $
+$NetBSD: patch-aa,v 1.22 2013/02/13 14:31:31 taca Exp $
 
 Make this pkgsrc friendly.
 
---- postfix-install.orig	2007-12-05 02:16:40.000000000 +0200
-+++ postfix-install	2008-01-17 15:59:23.000000000 +0200
-@@ -365,26 +365,6 @@
+--- postfix-install.orig	2011-11-19 23:09:16.000000000 +0000
++++ postfix-install
+@@ -365,26 +365,6 @@ HTML files. Specify \"no\" if you do not
  : ${tempdir=`pwd`}
- : ${config_directory=`bin/postconf -h -d config_directory`}
+ : ${config_directory=`bin/postconf -c conf -h -d config_directory`}
  
 -# Find out the location of installed configuration files.
 -
@@ -31,7 +31,7 @@ Make this pkgsrc friendly.
  # In case some systems special-case pathnames beginning with //.
  
  case $install_root in
-@@ -739,10 +719,3 @@
+@@ -739,10 +719,3 @@ bin/postconf -c $CONFIG_DIRECTORY -e \
      "sample_directory = $sample_directory" \
      "readme_directory = $readme_directory" \
  || exit 1