Updated mail/postfix-current to 2.4-20061015

* lots of bugfixes and cleanups

4 files changed, 20 insertions, 38 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 26f01c60e76..5d01a2899ad 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.66 2006/08/31 18:45:02 martti Exp $
+# $NetBSD: Makefile,v 1.67 2006/10/16 09:48:00 martti Exp $
 
-DISTNAME=	postfix-2.4-20060825
+DISTNAME=	postfix-2.4-20061015
 #PKGREVISION=	1
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
-		http://public.planetmirror.com.au/pub/postfix/experimental/
+MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.postfix.org/
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index 329b39a5f20..6901def8043 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.27 2006/08/31 18:45:02 martti Exp $
+$NetBSD: distinfo,v 1.28 2006/10/16 09:48:00 martti Exp $
 
-SHA1 (postfix/postfix-2.4-20060825.tar.gz) = b330df7ab4fe7cf033f0285d48c1c1e4afdb3c6f
-RMD160 (postfix/postfix-2.4-20060825.tar.gz) = 01b4b141cd0c3986973fbe47327d8b105f06c695
-Size (postfix/postfix-2.4-20060825.tar.gz) = 2811245 bytes
+SHA1 (postfix/postfix-2.4-20061015.tar.gz) = ef1dfb806025223eaf2c4bac9002a21c917717f4
+RMD160 (postfix/postfix-2.4-20061015.tar.gz) = fb27fa03459ea4c15bea6a8c99126e16ad32c77b
+Size (postfix/postfix-2.4-20061015.tar.gz) = 2816332 bytes
 SHA1 (patch-aa) = 3f45ca9b05bf080bd0f9ef3c9f8c24a1ef992edd
-SHA1 (patch-ag) = 642f6fdbc0d40cfe2786f6a141509e09b6cd4ebf
-SHA1 (patch-ai) = f6b1d506e1cbcfd899e66628ae15f53ebf841ccc
+SHA1 (patch-ag) = 8eb496390981c30842f2988c5dfdb17e8aa813ad
+SHA1 (patch-ai) = 7797f14838cf8278684139a287dcbdbb271641f6
diff --git a/mail/postfix-current/patches/patch-ag b/mail/postfix-current/patches/patch-ag
index 525664fab80..467aae7f1f1 100644
--- a/mail/postfix-current/patches/patch-ag
+++ b/mail/postfix-current/patches/patch-ag
@@ -1,16 +1,8 @@
-$NetBSD: patch-ag,v 1.14 2006/08/31 18:45:02 martti Exp $
+$NetBSD: patch-ag,v 1.15 2006/10/16 09:48:00 martti Exp $
 
---- src/util/sys_defs.h.orig	2006-07-31 13:04:29.000000000 +0000
-+++ src/util/sys_defs.h	2006-08-31 21:38:57.000000000 +0000
-@@ -28,6 +28,7 @@
-     || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
-     || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
-     || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
-+    || defined(NETBSD4) \
-     || defined(EKKOBSD1)
- #define SUPPORTED
- #include <sys/types.h>
-@@ -41,7 +42,9 @@
+--- src/util/sys_defs.h.orig	2006-10-16 12:39:27.000000000 +0000
++++ src/util/sys_defs.h	2006-10-16 12:40:30.000000000 +0000
+@@ -42,7 +42,9 @@
  #define DEF_MAILBOX_LOCK "flock"
  #define HAS_SUN_LEN
  #define HAS_FSYNC
diff --git a/mail/postfix-current/patches/patch-ai b/mail/postfix-current/patches/patch-ai
index e14d7da68ba..50b572e8670 100644
--- a/mail/postfix-current/patches/patch-ai
+++ b/mail/postfix-current/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.15 2006/08/31 18:45:02 martti Exp $
+$NetBSD: patch-ai,v 1.16 2006/10/16 09:48:00 martti Exp $
 
---- makedefs.orig	2006-07-31 13:04:00.000000000 +0000
-+++ makedefs	2006-08-31 21:39:40.000000000 +0000
+--- makedefs.orig	2006-08-26 16:02:51.000000000 +0000
++++ makedefs	2006-10-16 12:43:36.000000000 +0000
 @@ -118,6 +118,8 @@
  		;;
    FreeBSD.6*)	SYSTYPE=FREEBSD6
@@ -11,16 +11,7 @@ $NetBSD: patch-ai,v 1.15 2006/08/31 18:45:02 martti Exp $
    OpenBSD.2*)	SYSTYPE=OPENBSD2
  		;;
    OpenBSD.3*)	SYSTYPE=OPENBSD3
-@@ -132,6 +134,8 @@
- 		;;
-    NetBSD.3*)	SYSTYPE=NETBSD3
- 		;;
-+   NetBSD.4*)	SYSTYPE=NETBSD4
-+		;;
-    BSD/OS.2*)	SYSTYPE=BSDI2
- 		;;
-    BSD/OS.3*)	SYSTYPE=BSDI3
-@@ -182,13 +186,6 @@
+@@ -184,13 +186,6 @@
  		esac
  		;;
     ULTRIX.4*)	SYSTYPE=ULTRIX4
@@ -34,7 +25,7 @@ $NetBSD: patch-ai,v 1.15 2006/08/31 18:45:02 martti Exp $
  		for l in syslog resolv; do
  		    if [ -f /usr/local/lib/lib$l.a ]; then
  			SYSLIBS="$SYSLIBS -l$l"
-@@ -220,25 +217,8 @@
+@@ -222,25 +217,8 @@
  		esac;;
  		# Tested with RedHat 3.03 on 20020729.
      Linux.1*)	SYSTYPE=LINUX1
@@ -60,7 +51,7 @@ $NetBSD: patch-ai,v 1.15 2006/08/31 18:45:02 martti Exp $
  		# GDBM locks the DBM .pag file after open. This breaks postmap.
  		# if [ -f /usr/include/gdbm-ndbm.h ]
  		# then
-@@ -249,7 +229,6 @@
+@@ -251,7 +229,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/08/31 18:45:02 martti Exp $
  		for name in nsl resolv $GDBM_LIBS
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -277,25 +256,13 @@
+@@ -279,25 +256,13 @@
  HP-UX.A.09.*)	SYSTYPE=HPUX9
  		SYSLIBS=-ldbm
  		CCARGS="$CCARGS -DMISSING_USLEEP"