Updated mail/postfix-current to 2.4-20060711

This is the first development version after 2.3.0 release.

4 files changed, 16 insertions, 24 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 3b2b69d8ccd..12ebd815e79 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2006/05/01 02:57:03 jlam Exp $
+# $NetBSD: Makefile,v 1.64 2006/07/13 09:57:53 martti Exp $
 
-DISTNAME=	postfix-2.3-20060405
+DISTNAME=	postfix-2.4-20060711
 #PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
diff --git a/mail/postfix-current/PLIST b/mail/postfix-current/PLIST
index e2fea7707b9..3486cb4847c 100644
--- a/mail/postfix-current/PLIST
+++ b/mail/postfix-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2006/02/27 13:30:32 martti Exp $
+@comment $NetBSD: PLIST,v 1.11 2006/07/13 09:57:53 martti Exp $
 bin/mailq
 bin/newaliases
 libexec/postfix/anvil
@@ -122,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
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index 48f105307e7..f36f36c4700 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.24 2006/04/07 09:26:43 martti Exp $
+$NetBSD: distinfo,v 1.25 2006/07/13 09:57:53 martti Exp $
 
-SHA1 (postfix/postfix-2.3-20060405.tar.gz) = 3d13d7897472f48b7284e9f5e2cab7c59300eee7
-RMD160 (postfix/postfix-2.3-20060405.tar.gz) = 96f199312bd6d02eb5bf63afc2906b8f6f3648cc
-Size (postfix/postfix-2.3-20060405.tar.gz) = 2599464 bytes
+SHA1 (postfix/postfix-2.4-20060711.tar.gz) = f9b3de59414f1740a7c1d7ac54b18f100051ceb8
+RMD160 (postfix/postfix-2.4-20060711.tar.gz) = 0665e8d0da2fbdc3d0bc2af80db6744237dc60e9
+Size (postfix/postfix-2.4-20060711.tar.gz) = 2774624 bytes
 SHA1 (patch-aa) = 3f45ca9b05bf080bd0f9ef3c9f8c24a1ef992edd
-SHA1 (patch-ai) = 890ccf2d7f6c6e21f00a2bea9c71ef1e058ac826
+SHA1 (patch-ai) = 422028e9ef7821a0a1d8eaa94593c48bd08e86ae
diff --git a/mail/postfix-current/patches/patch-ai b/mail/postfix-current/patches/patch-ai
index d814ea7239c..34c3dc588b0 100644
--- a/mail/postfix-current/patches/patch-ai
+++ b/mail/postfix-current/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.12 2005/11/30 14:02:47 martti Exp $
+$NetBSD: patch-ai,v 1.13 2006/07/13 09:57:53 martti Exp $
 
---- makedefs.orig	2005-11-14 21:21:04.000000000 +0200
-+++ makedefs	2005-11-30 13:49:04.000000000 +0200
+--- makedefs.orig	2006-07-11 21:25:31.000000000 +0000
++++ makedefs	2006-07-13 11:22:55.000000000 +0000
 @@ -118,6 +118,8 @@
  		;;
    FreeBSD.6*)	SYSTYPE=FREEBSD6
@@ -11,16 +11,7 @@ $NetBSD: patch-ai,v 1.12 2005/11/30 14:02:47 martti Exp $
    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
- 		;;
-@@ -178,13 +180,6 @@
+@@ -180,13 +182,6 @@
  		esac
  		;;
     ULTRIX.4*)	SYSTYPE=ULTRIX4
@@ -34,7 +25,7 @@ $NetBSD: patch-ai,v 1.12 2005/11/30 14:02:47 martti Exp $
  		for l in syslog resolv; do
  		    if [ -f /usr/local/lib/lib$l.a ]; then
  			SYSLIBS="$SYSLIBS -l$l"
-@@ -216,25 +211,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.12 2005/11/30 14:02:47 martti Exp $
  		# GDBM locks the DBM .pag file after open. This breaks postmap.
  		# if [ -f /usr/include/gdbm-ndbm.h ]
  		# then
-@@ -245,7 +223,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.12 2005/11/30 14:02:47 martti Exp $
  		for name in nsl resolv $GDBM_LIBS
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -273,25 +250,13 @@
+@@ -275,25 +252,13 @@
  HP-UX.A.09.*)	SYSTYPE=HPUX9
  		SYSLIBS=-ldbm
  		CCARGS="$CCARGS -DMISSING_USLEEP"