Updated mail/postfix to 2.3.0

This is the first version in the 2.3.x series, please see the release notes
for full list of changes since 2.2.x before upgrading your current
installation.

6 files changed, 28 insertions, 55 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index b87ce215fb7..2f9e9a3438a 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.182 2006/06/27 04:40:49 jlam Exp $
+# $NetBSD: Makefile,v 1.183 2006/07/13 09:57:51 martti Exp $
 
-DISTNAME=	postfix-2.2.10
-PKGREVISION=	1
+DISTNAME=	postfix-2.3.0
+#PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 
diff --git a/mail/postfix/PLIST b/mail/postfix/PLIST
index 2d995dfd878..47a9b66cbeb 100644
--- a/mail/postfix/PLIST
+++ b/mail/postfix/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2006/02/27 07:10:59 martti Exp $
+@comment $NetBSD: PLIST,v 1.16 2006/07/13 09:57:51 martti Exp $
 bin/mailq
 bin/newaliases
 libexec/postfix/anvil
@@ -43,6 +43,7 @@ man/man1/sendmail.1
 man/man5/access.5
 man/man5/aliases.5
 man/man5/body_checks.5
+man/man5/bounce.5
 man/man5/canonical.5
 man/man5/cidr_table.5
 man/man5/generic.5
@@ -56,6 +57,7 @@ man/man5/pgsql_table.5
 man/man5/postconf.5
 man/man5/regexp_table.5
 man/man5/relocated.5
+man/man5/tcp_table.5
 man/man5/transport.5
 man/man5/virtual.5
 man/man8/anvil.8
@@ -110,6 +112,7 @@ share/doc/postfix/CONTENT_INSPECTION_README
 share/doc/postfix/DATABASE_README
 share/doc/postfix/DB_README
 share/doc/postfix/DEBUG_README
+share/doc/postfix/DSN_README
 share/doc/postfix/ETRN_README
 share/doc/postfix/FILTER_README
 share/doc/postfix/INSTALL
@@ -119,6 +122,7 @@ share/doc/postfix/LINUX_README
 share/doc/postfix/LMTP_README
 share/doc/postfix/LOCAL_RECIPIENT_README
 share/doc/postfix/MAILDROP_README
+share/doc/postfix/MILTER_README
 share/doc/postfix/MYSQL_README
 share/doc/postfix/NFS_README
 share/doc/postfix/OVERVIEW
@@ -147,6 +151,7 @@ share/examples/postfix/LICENSE
 share/examples/postfix/TLS_LICENSE
 share/examples/postfix/access
 share/examples/postfix/aliases
+share/examples/postfix/bounce.cf.default
 share/examples/postfix/canonical
 share/examples/postfix/generic
 share/examples/postfix/header_checks
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index a1c5f85d25e..04030257b73 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.98 2006/06/27 04:40:50 jlam Exp $
+$NetBSD: distinfo,v 1.99 2006/07/13 09:57:51 martti Exp $
 
-SHA1 (postfix/postfix-2.2.10.tar.gz) = a432bd45f0c7098482394dd7b9c97100e8a040e1
-RMD160 (postfix/postfix-2.2.10.tar.gz) = 12376298eef12cbe127687328ebfb9166cfee5d6
-Size (postfix/postfix-2.2.10.tar.gz) = 2443513 bytes
-SHA1 (patch-aa) = 49d2bf6c7e5bbe5aac4d950ac69c7b6b32a98ef3
-SHA1 (patch-ae) = eec6e9c9eb0a979d06ff2c62e7a1f66cb8274c84
-SHA1 (patch-ai) = 80db725720eb46083f69785ce3616b7a461e850a
+SHA1 (postfix/postfix-2.3.0.tar.gz) = fd29896f054c530c6e19a60b3379a277ce90c9b2
+RMD160 (postfix/postfix-2.3.0.tar.gz) = 41a0f3ea81189dfa2225d22475510e65449c7bef
+Size (postfix/postfix-2.3.0.tar.gz) = 2770810 bytes
+SHA1 (patch-aa) = e53bc6644c2b7898b73f4604489021cb85514610
+SHA1 (patch-ai) = 1781a172d8213706e4811386f42e486a520f0ab6
diff --git a/mail/postfix/patches/patch-aa b/mail/postfix/patches/patch-aa
index 0e40d270009..a6e11bd9b5f 100644
--- a/mail/postfix/patches/patch-aa
+++ b/mail/postfix/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.16 2005/04/04 18:13:32 martti Exp $
+$NetBSD: patch-aa,v 1.17 2006/07/13 09:57:51 martti Exp $
 
---- postfix-install.orig	2005-02-02 23:39:36.000000000 +0200
-+++ postfix-install	2005-04-04 21:05:58.000000000 +0300
-@@ -356,26 +356,6 @@
+--- postfix-install.orig	2005-08-14 01:51:38.000000000 +0000
++++ postfix-install	2006-07-13 12:37:24.000000000 +0000
+@@ -359,26 +359,6 @@
  : ${tempdir=`pwd`}
  : ${config_directory=`bin/postconf -h -d config_directory`}
  
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.16 2005/04/04 18:13:32 martti Exp $
  # In case some systems special-case pathnames beginning with //.
  
  case $install_root in
-@@ -722,10 +702,3 @@
+@@ -725,10 +705,3 @@
      "sample_directory = $sample_directory" \
      "readme_directory = $readme_directory" \
  || exit 1
diff --git a/mail/postfix/patches/patch-ae b/mail/postfix/patches/patch-ae
deleted file mode 100644
index 74bb637a217..00000000000
--- a/mail/postfix/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.11 2006/06/27 04:40:50 jlam Exp $
-
---- src/global/mail_params.h.orig	2006-02-03 11:06:52.000000000 -0500
-+++ src/global/mail_params.h
-@@ -1186,7 +1186,7 @@ extern char *var_smtpd_sasl_opts;
- extern char *var_smtpd_sasl_appname;
- 
- #define VAR_SMTPD_SASL_TLS_OPTS	"smtpd_sasl_tls_security_options"
--#define DEF_SMTPD_SASL_TLS_OPTS	"$smtpd_sasl_security_options"
-+#define DEF_SMTPD_SASL_TLS_OPTS	"$" VAR_SMTPD_SASL_OPTS
- extern char *var_smtpd_sasl_tls_opts;
- 
- #define VAR_SMTPD_SASL_REALM	"smtpd_sasl_local_domain"
-@@ -1227,7 +1227,7 @@ extern char *var_smtp_sasl_opts;
- extern char *var_smtp_sasl_mechs;
- 
- #define VAR_SMTP_SASL_TLS_OPTS	"smtp_sasl_tls_security_options"
--#define DEF_SMTP_SASL_TLS_OPTS	"$var_smtp_sasl_opts"
-+#define DEF_SMTP_SASL_TLS_OPTS	"$" VAR_SMTP_SASL_OPTS
- extern char *var_smtp_sasl_tls_opts;
- 
-  /*
diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai
index f3075588e44..8ffa2691794 100644
--- a/mail/postfix/patches/patch-ai
+++ b/mail/postfix/patches/patch-ai
@@ -1,26 +1,17 @@
-$NetBSD: patch-ai,v 1.15 2006/01/10 06:38:15 martti Exp $
+$NetBSD: patch-ai,v 1.16 2006/07/13 09:57:51 martti Exp $
 
---- makedefs.orig	2006-01-03 23:50:25.000000000 +0200
-+++ makedefs	2006-01-09 08:11:32.000000000 +0200
+--- makedefs.orig	2006-07-03 20:30:00.000000000 +0000
++++ makedefs	2006-07-13 12:40:49.000000000 +0000
 @@ -118,6 +118,8 @@
  		;;
    FreeBSD.6*)	SYSTYPE=FREEBSD6
  		;;
-+  DragonFly.1*) SYSTYPE=FREEBSD4
++  DragonFly.1*)	SYSTYPE=FREEBSD4
 +		;;
    OpenBSD.2*)	SYSTYPE=OPENBSD2
  		;;
    OpenBSD.3*)	SYSTYPE=OPENBSD3
-@@ -126,7 +128,7 @@
- 		;;
-    NetBSD.1*)	SYSTYPE=NETBSD1
- 		;;
--   NetBSD.2*)	SYSTYPE=NETBSD2
-+   NetBSD.[23]*)SYSTYPE=NETBSD2
- 		;;
-    BSD/OS.2*)	SYSTYPE=BSDI2
- 		;;
-@@ -177,13 +179,6 @@
+@@ -180,13 +182,6 @@
  		esac
  		;;
     ULTRIX.4*)	SYSTYPE=ULTRIX4
@@ -34,7 +25,7 @@ $NetBSD: patch-ai,v 1.15 2006/01/10 06:38:15 martti Exp $
  		for l in syslog resolv; do
  		    if [ -f /usr/local/lib/lib$l.a ]; then
  			SYSLIBS="$SYSLIBS -l$l"
-@@ -215,25 +210,8 @@
+@@ -218,25 +213,8 @@
  		esac;;
  		# Tested with RedHat 3.03 on 20020729.
      Linux.1*)	SYSTYPE=LINUX1
@@ -60,7 +51,7 @@ $NetBSD: patch-ai,v 1.15 2006/01/10 06:38:15 martti Exp $
  		# GDBM locks the DBM .pag file after open. This breaks postmap.
  		# if [ -f /usr/include/gdbm-ndbm.h ]
  		# then
-@@ -244,7 +222,6 @@
+@@ -247,7 +225,6 @@
  		#     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
  		#     GDBM_LIBS=gdbm
  		# fi
@@ -68,7 +59,7 @@ $NetBSD: patch-ai,v 1.15 2006/01/10 06:38:15 martti Exp $
  		for name in nsl resolv $GDBM_LIBS
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -272,25 +249,13 @@
+@@ -275,25 +252,13 @@
  HP-UX.A.09.*)	SYSTYPE=HPUX9
  		SYSLIBS=-ldbm
  		CCARGS="$CCARGS -DMISSING_USLEEP"