Updated mail/postfix-current to 2.5-20070402

This is a new development snapshot. Sync with Makefile with mail/postfix.

7 files changed, 38 insertions, 30 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 17b0d8c3434..5b0b15341e5 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.79 2007/04/03 07:18:59 martti Exp $
+# $NetBSD: Makefile,v 1.80 2007/04/03 07:35:46 martti Exp $
 
-DISTNAME=	postfix-2.4-20070214
+DISTNAME=	postfix-2.5-20070402
 #PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/
@@ -116,7 +116,7 @@ CONF_FILES_PERMS=	# empty
 CONF_FILES_PERMS+=	${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i} \
 			${ROOT_USER} ${ROOT_GROUP} 755
 .endfor
-.if !empty(PKG_OPTIONS:Msasl)
+.if !empty(PKG_OPTIONS:Msasl) || !empty(PKG_OPTIONS:Mdovecot-sasl)
 MAKE_DIRS+=		${SASLLIBDIR}
 CONF_FILES+=		${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf
 .endif
diff --git a/mail/postfix-current/PLIST b/mail/postfix-current/PLIST
index b62e4f9ba24..d4d8be4f97d 100644
--- a/mail/postfix-current/PLIST
+++ b/mail/postfix-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2007/02/15 06:38:13 martti Exp $
+@comment $NetBSD: PLIST,v 1.13 2007/04/03 07:35:46 martti Exp $
 bin/mailq
 bin/newaliases
 libexec/postfix/anvil
@@ -128,7 +128,6 @@ share/doc/postfix/OVERVIEW
 share/doc/postfix/PACKAGE_README
 share/doc/postfix/PCRE_README
 share/doc/postfix/PGSQL_README
-share/doc/postfix/QMQP_README
 share/doc/postfix/QSHAPE_README
 share/doc/postfix/RELEASE_NOTES
 share/doc/postfix/RESTRICTION_CLASS_README
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index cc6fcf94811..2206c69b842 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.33 2007/02/15 06:38:13 martti Exp $
+$NetBSD: distinfo,v 1.34 2007/04/03 07:35:46 martti Exp $
 
-SHA1 (postfix/postfix-2.4-20070214.tar.gz) = a50cde24a555c424b5366776fe802b19e8f05ad8
-RMD160 (postfix/postfix-2.4-20070214.tar.gz) = bbb542f8aca8100ff67271720bcef28762019af7
-Size (postfix/postfix-2.4-20070214.tar.gz) = 2909195 bytes
-SHA1 (patch-aa) = 3f45ca9b05bf080bd0f9ef3c9f8c24a1ef992edd
-SHA1 (patch-ag) = 8eb496390981c30842f2988c5dfdb17e8aa813ad
-SHA1 (patch-ai) = 7797f14838cf8278684139a287dcbdbb271641f6
+SHA1 (postfix/postfix-2.5-20070402.tar.gz) = db290a674ca372025f9129493fcd9f34f74f42ca
+RMD160 (postfix/postfix-2.5-20070402.tar.gz) = 9374bb658873c3c5056a04dec496b8c1f34c798a
+Size (postfix/postfix-2.5-20070402.tar.gz) = 2956875 bytes
+SHA1 (patch-aa) = acd87c45baa4da2341e9609f2d6276ec013be198
+SHA1 (patch-ag) = 4d66026fe81dde97470bd01d529af191f1547228
+SHA1 (patch-ai) = 68201eac6b479ad733ba851741cc1cc2e56f7c9f
diff --git a/mail/postfix-current/options.mk b/mail/postfix-current/options.mk
index e66c6d80119..d502dca69ea 100644
--- a/mail/postfix-current/options.mk
+++ b/mail/postfix-current/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.14 2006/05/31 18:22:24 ghen Exp $
+# $NetBSD: options.mk,v 1.15 2007/04/03 07:35:46 martti Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.postfix
-PKG_SUPPORTED_OPTIONS=	bdb ldap mysql mysql4 pcre pgsql sasl tls
+PKG_SUPPORTED_OPTIONS=	bdb ldap mysql mysql4 pcre pgsql sasl tls dovecot-sasl
 .include "../../mk/bsd.options.mk"
 
 ###
@@ -99,3 +99,12 @@ MESSAGE_SUBST+=	SASLLIBDIR=${SASLLIBDIR}
 .else
 PLIST_SUBST+=	SASL="@comment "
 .endif
+
+###
+### SASL support for SMTP authentication (via Dovecot).
+###
+.if !empty(PKG_OPTIONS:Mdovecot-sasl)
+DEPENDS+=	dovecot-[0-9]*:../../mail/dovecot
+
+CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\"dovecot\"
+.endif
diff --git a/mail/postfix-current/patches/patch-aa b/mail/postfix-current/patches/patch-aa
index dd6a159b4dc..d2c43b20ea7 100644
--- a/mail/postfix-current/patches/patch-aa
+++ b/mail/postfix-current/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.15 2005/09/30 06:04:32 martti Exp $
+$NetBSD: patch-aa,v 1.16 2007/04/03 07:35:47 martti Exp $
 
---- postfix-install.orig	2005-08-14 04:51:38.000000000 +0300
-+++ postfix-install	2005-09-30 05:48:14.000000000 +0300
+--- postfix-install.orig	2007-03-25 23:44:02.000000000 +0300
++++ postfix-install	2007-04-03 08:51:05.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.15 2005/09/30 06:04:32 martti Exp $
  # In case some systems special-case pathnames beginning with //.
  
  case $install_root in
-@@ -725,10 +705,3 @@
+@@ -729,10 +709,3 @@
      "sample_directory = $sample_directory" \
      "readme_directory = $readme_directory" \
  || exit 1
diff --git a/mail/postfix-current/patches/patch-ag b/mail/postfix-current/patches/patch-ag
index 467aae7f1f1..86419f9b085 100644
--- a/mail/postfix-current/patches/patch-ag
+++ b/mail/postfix-current/patches/patch-ag
@@ -1,9 +1,9 @@
-$NetBSD: patch-ag,v 1.15 2006/10/16 09:48:00 martti Exp $
+$NetBSD: patch-ag,v 1.16 2007/04/03 07:35:47 martti Exp $
 
---- 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
+--- src/util/sys_defs.h.orig	2007-03-25 00:45:33.000000000 +0200
++++ src/util/sys_defs.h	2007-04-03 08:51:26.000000000 +0300
 @@ -42,7 +42,9 @@
- #define DEF_MAILBOX_LOCK "flock"
+ #define DEF_MAILBOX_LOCK "flock, dotlock"
  #define HAS_SUN_LEN
  #define HAS_FSYNC
 +#ifndef HAS_DB
diff --git a/mail/postfix-current/patches/patch-ai b/mail/postfix-current/patches/patch-ai
index 50b572e8670..9a7fc268b46 100644
--- a/mail/postfix-current/patches/patch-ai
+++ b/mail/postfix-current/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.16 2006/10/16 09:48:00 martti Exp $
+$NetBSD: patch-ai,v 1.17 2007/04/03 07:35:47 martti Exp $
 
---- makedefs.orig	2006-08-26 16:02:51.000000000 +0000
-+++ makedefs	2006-10-16 12:43:36.000000000 +0000
-@@ -118,6 +118,8 @@
+--- makedefs.orig	2007-03-24 15:30:18.000000000 +0200
++++ makedefs	2007-04-03 08:51:47.000000000 +0300
+@@ -130,6 +130,8 @@
  		;;
    FreeBSD.6*)	SYSTYPE=FREEBSD6
  		;;
@@ -11,7 +11,7 @@ $NetBSD: patch-ai,v 1.16 2006/10/16 09:48:00 martti Exp $
    OpenBSD.2*)	SYSTYPE=OPENBSD2
  		;;
    OpenBSD.3*)	SYSTYPE=OPENBSD3
-@@ -184,13 +186,6 @@
+@@ -196,13 +198,6 @@
  		esac
  		;;
     ULTRIX.4*)	SYSTYPE=ULTRIX4
@@ -25,7 +25,7 @@ $NetBSD: patch-ai,v 1.16 2006/10/16 09:48:00 martti Exp $
  		for l in syslog resolv; do
  		    if [ -f /usr/local/lib/lib$l.a ]; then
  			SYSLIBS="$SYSLIBS -l$l"
-@@ -222,25 +217,8 @@
+@@ -234,25 +229,8 @@
  		esac;;
  		# Tested with RedHat 3.03 on 20020729.
      Linux.1*)	SYSTYPE=LINUX1
@@ -51,7 +51,7 @@ $NetBSD: patch-ai,v 1.16 2006/10/16 09:48:00 martti Exp $
  		# GDBM locks the DBM .pag file after open. This breaks postmap.
  		# if [ -f /usr/include/gdbm-ndbm.h ]
  		# then
-@@ -251,7 +229,6 @@
+@@ -263,7 +241,6 @@
  		#     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
  		#     GDBM_LIBS=gdbm
  		# fi
@@ -59,7 +59,7 @@ $NetBSD: patch-ai,v 1.16 2006/10/16 09:48:00 martti Exp $
  		for name in nsl resolv $GDBM_LIBS
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -279,25 +256,13 @@
+@@ -332,25 +309,13 @@
  HP-UX.A.09.*)	SYSTYPE=HPUX9
  		SYSLIBS=-ldbm
  		CCARGS="$CCARGS -DMISSING_USLEEP"