Updated to version 0.99.10rc2.

From MAINTAINER, Tom Hensel.

Changes:

- Dovecot may now be compiled with Cyrus-SASL2, specify
  USE_SASL2=YES for this to happen.
- use generic USE_OPENLDAP instead of DOVECOT_USE_LDAP
- minor cleanups

0.99.10rc2:
===========
- Minor bugs corrected, one possible crash when using hardlinks
  for copying fixed.
- Minor fix for the 'linebreak-problem' - should be history now
  even on non-i386.
- PostgreSQL server will be reconnected on failure.

This will be a stable 0.99.10 release if no new bugs popup.

2 files changed, 23 insertions, 22 deletions

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index d41676f3f42..22891a98c09 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2003/06/19 16:11:11 salo Exp $
+# $NetBSD: Makefile,v 1.4 2003/06/23 15:06:10 salo Exp $
 #
 
-DISTNAME=	dovecot-0.99.10-test14
-PKGNAME=	${DISTNAME:S/-test/beta/}
+DISTNAME=	dovecot-0.99.10-rc2
+PKGNAME=	${DISTNAME:S/-rc/rc/}
 CATEGORIES=	mail
 MASTER_SITES=	http://dovecot.procontrol.fi/	\
-		http://dovecot.procontrol.fi/test/
+		http://dovecot.procontrol.fi/rc/
 
 MAINTAINER=	tom@replic8.net
 HOMEPAGE=	http://dovecot.procontrol.fi/
@@ -22,7 +22,22 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--localstatedir=/var
 CONFIGURE_ARGS+=	--with-ssldir=/etc/openssl
 
-DOVECOT_USE_GNUTLS?=	NO
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(USE_OPENLDAP:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+=	--with-ldap
+.include "../../databases/openldap/buildlink2.mk"
+.endif
+
+.if defined(USE_SASL2) && !empty(USE_SASL2:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+=	--with-cyrus-sasl2
+.include "../../security/cyrus-sasl2/buildlink2.mk"
+.endif
+
+.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
+BUILD_DEFS+=		USE_INET6
+CONFIGURE_ARGS+=	--enable-ipv6
+.endif
 
 .if !empty(DOVECOT_USE_GNUTLS:M[Yy][Ee][Ss])
 CONFIGURE_ARGS+=	--enable-ssl=gnutls
@@ -32,26 +47,12 @@ CONFIGURE_ARGS+=        --enable-ssl=openssl
 .include "../../security/openssl/buildlink2.mk"
 .endif
 
-DOVECOT_USE_LDAP?=	NO
-
-.if !empty(DOVECOT_USE_LDAP:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--with-ldap
-.include "../../databases/openldap/buildlink2.mk"
-.endif
-
-DOVECOT_USE_PGSQL?=	NO
-
 .if !empty(DOVECOT_USE_PGSQL:M[Yy][Ee][Ss])
 CONFIGURE_ARGS+=	--with-pgsql
 CPPFLAGS=		-I${BUILDLINK_DIR}/include/pgsql
 .include "../../databases/postgresql-lib/buildlink2.mk"
 .endif
 
-.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
-BUILD_DEFS+=		USE_INET6
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
-
 RCD_SCRIPTS=	dovecot
 
 DOVECOT_USER?=	dovecot
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index e495e83e165..f7e2935568d 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2003/06/19 16:11:11 salo Exp $
+$NetBSD: distinfo,v 1.3 2003/06/23 15:06:10 salo Exp $
 
-SHA1 (dovecot-0.99.10-test14.tar.gz) = b7d62c20b52ccd3ad56be2f0f808c4fa9ad2d39b
-Size (dovecot-0.99.10-test14.tar.gz) = 729591 bytes
+SHA1 (dovecot-0.99.10-rc2.tar.gz) = 1bb46ce147adf460e834ea9abbff4a97957f5ac0
+Size (dovecot-0.99.10-rc2.tar.gz) = 733034 bytes
 SHA1 (patch-aa) = 6ed31ba47883903e5a7b2fcb715432e0c3e8947c
 SHA1 (patch-ab) = 26a487ef2d1987c9f74def95542030900646f7d5