From 2883572960ea3accd41c46bf032ab9c51318efec Mon Sep 17 00:00:00 2001
From: jakob <jakob@openbsd.org>
Date: Thu, 25 May 2006 16:36:49 +0000
Subject: [PATCH] upgrade to snapshot 2.3-20060518 add Dovecot SASL
 authentication flavour

---
 mail/postfix/snapshot/Makefile  | 14 ++++++++++++--
 mail/postfix/snapshot/distinfo  |  8 ++++----
 mail/postfix/snapshot/pkg/DESCR |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/mail/postfix/snapshot/Makefile b/mail/postfix/snapshot/Makefile
index 79244bead54..59dbcc30baf 100644
--- a/mail/postfix/snapshot/Makefile
+++ b/mail/postfix/snapshot/Makefile
@@ -1,13 +1,23 @@
-# $OpenBSD: Makefile,v 1.129 2006/05/18 03:04:15 brad Exp $
+# $OpenBSD: Makefile,v 1.130 2006/05/25 16:36:49 jakob Exp $
 
-VERSION=	2.3-20060517
+VERSION=	2.3-20060518
 
 MASTER_SITES=	${MASTER_SITE_POSTFIX:=experimental/}
 
 MAKE_CCARGS+=	-DUSE_SASL_AUTH
 
+FLAVORS+=	dovecot 
 FLAVOR?=
 
+.if ${FLAVOR:L:Msasl2} && ${FLAVOR:L:Mdovecot}
+ERRORS+=	"Fatal: Choose only one flavor: sasl2 or dovecot"
+.endif
+
+.if ${FLAVOR:L:Mdovecot}
+RUN_DEPENDS+=	::mail/dovecot
+MAKE_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SASL_SERVER="dovecot"
+.endif
+
 .if ${FLAVOR:L:Msasl2}
 MAKE_CCARGS+=	-DUSE_CYRUS_SASL
 .endif
diff --git a/mail/postfix/snapshot/distinfo b/mail/postfix/snapshot/distinfo
index 5a0d41e9091..f7c0223e09b 100644
--- a/mail/postfix/snapshot/distinfo
+++ b/mail/postfix/snapshot/distinfo
@@ -1,4 +1,4 @@
-MD5 (postfix/postfix-2.3-20060517.tar.gz) = 0bafafd2674b92673a49c87dc86af6eb
-RMD160 (postfix/postfix-2.3-20060517.tar.gz) = 1154f4adefede95f8786f2b8f3543e0e394d2d82
-SHA1 (postfix/postfix-2.3-20060517.tar.gz) = 39e8e9fc8435ff62e06fff03a545ac854aed40fe
-SIZE (postfix/postfix-2.3-20060517.tar.gz) = 2602286
+MD5 (postfix/postfix-2.3-20060518.tar.gz) = ddc34558f573632f19853942c9722976
+RMD160 (postfix/postfix-2.3-20060518.tar.gz) = 36a76d126cb0335d23d9c69f294fb760c2082c86
+SHA1 (postfix/postfix-2.3-20060518.tar.gz) = 96c3aa6acc5919744f8e0d9702984210914a499d
+SIZE (postfix/postfix-2.3-20060518.tar.gz) = 2602305
diff --git a/mail/postfix/snapshot/pkg/DESCR b/mail/postfix/snapshot/pkg/DESCR
index a916461a07f..2117eabb276 100644
--- a/mail/postfix/snapshot/pkg/DESCR
+++ b/mail/postfix/snapshot/pkg/DESCR
@@ -9,5 +9,5 @@ Extra features always included:
 
 Optional features included using flavors:
 
-- authenticated SMTP using Cyrus SASL v2
+- authenticated SMTP using Cyrus SASL v2 or Dovecot SASL
 - table lookups using LDAP, MySQL and PostgreSQL