Updated mail/postfix-current to 2.5-20070529

Lots of changes, see the HISTORY file for details.

5 files changed, 20 insertions, 17 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index e450ce912d0..5f18f6e89e1 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.81 2007/05/02 05:10:15 martti Exp $
+# $NetBSD: Makefile,v 1.82 2007/05/30 07:58:29 martti Exp $
 
-DISTNAME=	postfix-2.5-20070501
+DISTNAME=	postfix-2.5-20070529
 #PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/
@@ -157,5 +157,7 @@ do-install:
 		config_directory="${EXAMPLEDIR}"
 	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl \
 		${PREFIX}/sbin/qshape
+	${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 \
+		${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/postfix-current/PLIST b/mail/postfix-current/PLIST
index d4d8be4f97d..6f4b06ffae6 100644
--- a/mail/postfix-current/PLIST
+++ b/mail/postfix-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2007/04/03 07:35:46 martti Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/05/30 07:58:29 martti Exp $
 bin/mailq
 bin/newaliases
 libexec/postfix/anvil
@@ -39,6 +39,7 @@ man/man1/postlog.1
 man/man1/postmap.1
 man/man1/postqueue.1
 man/man1/postsuper.1
+man/man1/qshape.1
 man/man1/sendmail.1
 man/man5/access.5
 man/man5/aliases.5
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index 9c3cf471587..ba2bfc9b546 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.35 2007/05/02 05:10:15 martti Exp $
+$NetBSD: distinfo,v 1.36 2007/05/30 07:58:29 martti Exp $
 
-SHA1 (postfix/postfix-2.5-20070501.tar.gz) = 299ea60979b27b71763812004b21252daf27282e
-RMD160 (postfix/postfix-2.5-20070501.tar.gz) = ea4d1e9b0767c7f7725f3df4f86dc2b112018125
-Size (postfix/postfix-2.5-20070501.tar.gz) = 2955097 bytes
-SHA1 (patch-aa) = acd87c45baa4da2341e9609f2d6276ec013be198
+SHA1 (postfix/postfix-2.5-20070529.tar.gz) = c7f0dfa6d8ea7c7a2ff8697cc7a67676823bdf38
+RMD160 (postfix/postfix-2.5-20070529.tar.gz) = 1677a8a2b12a813e33128343d1c1883b0cd1e2c8
+Size (postfix/postfix-2.5-20070529.tar.gz) = 2957162 bytes
+SHA1 (patch-aa) = 60c51bfd1462f0553587b0ea9a5d496305e55648
 SHA1 (patch-ag) = 4d66026fe81dde97470bd01d529af191f1547228
-SHA1 (patch-ai) = 68201eac6b479ad733ba851741cc1cc2e56f7c9f
+SHA1 (patch-ai) = a51da9144023efc321ee4e7ad0cfcfcbd2e04400
diff --git a/mail/postfix-current/patches/patch-aa b/mail/postfix-current/patches/patch-aa
index d2c43b20ea7..380daee05c4 100644
--- a/mail/postfix-current/patches/patch-aa
+++ b/mail/postfix-current/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.16 2007/04/03 07:35:47 martti Exp $
+$NetBSD: patch-aa,v 1.17 2007/05/30 07:58:29 martti Exp $
 
---- postfix-install.orig	2007-03-25 23:44:02.000000000 +0300
-+++ postfix-install	2007-04-03 08:51:05.000000000 +0300
+--- postfix-install.orig	2007-04-02 20:14:37.000000000 +0300
++++ postfix-install	2007-05-30 10:48:41.000000000 +0300
 @@ -359,26 +359,6 @@
  : ${tempdir=`pwd`}
  : ${config_directory=`bin/postconf -h -d config_directory`}
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.16 2007/04/03 07:35:47 martti Exp $
  # In case some systems special-case pathnames beginning with //.
  
  case $install_root in
-@@ -729,10 +709,3 @@
+@@ -735,10 +715,3 @@
      "sample_directory = $sample_directory" \
      "readme_directory = $readme_directory" \
  || exit 1
diff --git a/mail/postfix-current/patches/patch-ai b/mail/postfix-current/patches/patch-ai
index 9a7fc268b46..42ad727161f 100644
--- a/mail/postfix-current/patches/patch-ai
+++ b/mail/postfix-current/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.17 2007/04/03 07:35:47 martti Exp $
+$NetBSD: patch-ai,v 1.18 2007/05/30 07:58:30 martti Exp $
 
---- makedefs.orig	2007-03-24 15:30:18.000000000 +0200
-+++ makedefs	2007-04-03 08:51:47.000000000 +0300
+--- makedefs.orig	2007-05-15 03:11:50.000000000 +0300
++++ makedefs	2007-05-30 10:49:06.000000000 +0300
 @@ -130,6 +130,8 @@
  		;;
    FreeBSD.6*)	SYSTYPE=FREEBSD6
@@ -59,7 +59,7 @@ $NetBSD: patch-ai,v 1.17 2007/04/03 07:35:47 martti Exp $
  		for name in nsl resolv $GDBM_LIBS
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -332,25 +309,13 @@
+@@ -358,25 +335,13 @@
  HP-UX.A.09.*)	SYSTYPE=HPUX9
  		SYSLIBS=-ldbm
  		CCARGS="$CCARGS -DMISSING_USLEEP"