Update to postfix-2.3-20050726

6 files changed, 45 insertions, 20 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 84b2a703d58..d9c8dae36a9 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2005/07/31 03:58:45 grant Exp $
+# $NetBSD: Makefile,v 1.43 2005/08/14 21:51:02 christos Exp $
 
-DISTNAME=	postfix-2.2-20040628
-PKGREVISION=	1
+DISTNAME=	postfix-2.3-20050726
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
 		http://public.planetmirror.com.au/pub/postfix/experimental/
diff --git a/mail/postfix-current/PLIST b/mail/postfix-current/PLIST
index 0f8879d0731..4596c35fadc 100644
--- a/mail/postfix-current/PLIST
+++ b/mail/postfix-current/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.5 2005/05/02 20:34:00 reed Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/08/14 21:51:02 christos Exp $
 bin/mailq
 bin/newaliases
 libexec/postfix/anvil
 libexec/postfix/bounce
 libexec/postfix/cleanup
+libexec/postfix/discard
 libexec/postfix/error
 libexec/postfix/flush
 libexec/postfix/lmtp
@@ -16,6 +17,7 @@ libexec/postfix/pipe
 libexec/postfix/proxymap
 libexec/postfix/qmgr
 libexec/postfix/qmqpd
+libexec/postfix/scache
 libexec/postfix/showq
 libexec/postfix/smtp
 libexec/postfix/smtpd
@@ -130,11 +132,15 @@ share/doc/postfix/VERP_README
 share/doc/postfix/VIRTUAL_README
 share/doc/postfix/XCLIENT_README
 share/doc/postfix/XFORWARD_README
+share/doc/postfix/CDB_README
+share/doc/postfix/DSN_README
+share/doc/postfix/CONNECTION_CACHE_README
 share/examples/postfix/LICENSE
 share/examples/postfix/access
 share/examples/postfix/aliases
 share/examples/postfix/canonical
 share/examples/postfix/header_checks
+share/examples/postfix/generic
 share/examples/postfix/mailer.conf
 share/examples/postfix/main.cf
 share/examples/postfix/main.cf.default
diff --git a/mail/postfix-current/PLIST.tls b/mail/postfix-current/PLIST.tls
index 193af99804e..4c4adb7485d 100644
--- a/mail/postfix-current/PLIST.tls
+++ b/mail/postfix-current/PLIST.tls
@@ -1,3 +1,5 @@
-@comment $NetBSD: PLIST.tls,v 1.3 2004/08/07 17:08:26 jlam Exp $
+@comment $NetBSD: PLIST.tls,v 1.4 2005/08/14 21:51:02 christos Exp $
 libexec/postfix/tlsmgr
 man/man8/tlsmgr.8
+share/examples/postfix/TLS_LICENSE
+share/doc/postfix/TLS_README 
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index 7320338f6e3..4b4bd3b1629 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2005/02/24 09:59:26 agc Exp $
+$NetBSD: distinfo,v 1.11 2005/08/14 21:51:02 christos Exp $
 
-SHA1 (postfix/postfix-2.2-20040628.tar.gz) = f5fb9278cbcb86fd2d90ceea62e806894561a333
-RMD160 (postfix/postfix-2.2-20040628.tar.gz) = 14f3be042807547122e6b690b5ce33db041ad66f
-Size (postfix/postfix-2.2-20040628.tar.gz) = 2014579 bytes
+SHA1 (postfix/postfix-2.3-20050726.tar.gz) = 7b5c10f01a003b4764c6e4a672ae866ca53e793c
+RMD160 (postfix/postfix-2.3-20050726.tar.gz) = 4eecae72057e23c97f05280485ad2ce9d1df7973
+Size (postfix/postfix-2.2-20040628.tar.gz) = 2504873 bytes
 SHA1 (patch-aa) = 279b54f19289b56a423214716386c5aab79a57d5
-SHA1 (patch-ag) = 292b3b5d87f4688930fd654edfc5cb83ca8a2652
-SHA1 (patch-ai) = e7284d9b3d7b83def7994269867e443fc0394d40
+SHA1 (patch-ag) = 2982bb58df6e1a59c535e1a94c448421ee4d9bd7
+SHA1 (patch-ai) = f9ae7a455a4ac73b6a18882a31b0a5d02c0e317f
diff --git a/mail/postfix-current/patches/patch-ag b/mail/postfix-current/patches/patch-ag
index d49a39f69a1..2dedc3831ff 100644
--- a/mail/postfix-current/patches/patch-ag
+++ b/mail/postfix-current/patches/patch-ag
@@ -1,8 +1,17 @@
-$NetBSD: patch-ag,v 1.5 2004/07/02 08:03:04 martti Exp $
+$NetBSD: patch-ag,v 1.6 2005/08/14 21:51:02 christos Exp $
 
---- src/util/sys_defs.h.orig	2004-06-14 21:13:40.000000000 +0300
-+++ src/util/sys_defs.h	2004-06-20 11:40:54.000000000 +0300
-@@ -127,8 +127,13 @@
+--- src/util/sys_defs.h.orig	2005-07-14 17:28:33.000000000 -0400
++++ src/util/sys_defs.h	2005-08-14 17:26:40.000000000 -0400
+@@ -27,7 +27,7 @@
+     || defined(FREEBSD5) \
+     || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
+     || defined(OPENBSD2) || defined(OPENBSD3) \
+-    || defined(NETBSD1) || defined(NETBSD2) \
++    || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
+     || defined(EKKOBSD1)
+ #define SUPPORTED
+ #include <sys/types.h>
+@@ -156,8 +156,13 @@
  #define ALIAS_DB_MAP	"hash:/etc/aliases"
  #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
  #define ROOT_PATH	"/bin:/usr/bin:/sbin:/usr/sbin"
diff --git a/mail/postfix-current/patches/patch-ai b/mail/postfix-current/patches/patch-ai
index e3ec76951c7..3e62ffb28ab 100644
--- a/mail/postfix-current/patches/patch-ai
+++ b/mail/postfix-current/patches/patch-ai
@@ -1,8 +1,17 @@
-$NetBSD: patch-ai,v 1.7 2004/07/02 08:03:04 martti Exp $
+$NetBSD: patch-ai,v 1.8 2005/08/14 21:51:02 christos Exp $
 
---- makedefs.orig	2004-04-14 14:59:43.000000000 -0400
-+++ makedefs	2004-05-23 22:53:06.000000000 -0400
-@@ -182,22 +182,6 @@
+--- makedefs.orig	2005-07-16 19:51:31.000000000 -0400
++++ makedefs	2005-08-14 17:26:07.000000000 -0400
+@@ -126,6 +126,8 @@
+ 		;;
+    NetBSD.2*)	SYSTYPE=NETBSD2
+ 		;;
++   NetBSD.3*)	SYSTYPE=NETBSD3
++		;;
+    BSD/OS.2*)	SYSTYPE=BSDI2
+ 		;;
+    BSD/OS.3*)	SYSTYPE=BSDI3
+@@ -217,22 +219,6 @@
  		SYSLIBS="-ldb"
  		;;
      Linux.2*)	SYSTYPE=LINUX2
@@ -25,7 +34,7 @@ $NetBSD: patch-ai,v 1.7 2004/07/02 08:03:04 martti Exp $
  		# GDBM locks the DBM .pag file after open. This breaks postmap.
  		# if [ -f /usr/include/gdbm-ndbm.h ]
  		# then
-@@ -208,7 +192,6 @@
+@@ -243,7 +229,6 @@
  		#     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
  		#     GDBM_LIBS=gdbm
  		# fi