Update to 2.0.7. Bugs fixed, from the changelog:

2.0.2:
* Bug 115: MAX_LINESIZE consistency.
* Bug 119: Memory leak in dbmail-lmtpd.
* Bug 131: Determine DBMail version (for now, only via command line -V).
* Bug 132: dbmail-util had a few incorrect stdout/stderr messages.
* Bug 135: Delivery chain fails to set is_header on header rows.
* Bug 143: Sort.c compiles without CFLAGS.
* Bug 142: Merge preforking with the 2.0 codebase.
* Bug 118: dbmail-users -c username -W does not prompt for password
    on FreeBSD. WORKAROUND: Use -W "" (double quotes) to fool getopt
    and prompt for a password.
* Bug 91: Infinite loops in both imapd and pop3d.

2.0.4:
* Bug 163: dbmail-users -l nonexistantuser should return non-zero value
* Bug 153: dbmail-util cannot remove unconnected mailboxes.
* Bug 118: dbmail-users -c username -W does not prompt for password on FreeBSD.
* Bug 131: determine dbmail version only shows major.minor, not micro.
* Bug 159: alias bug: if user exists, auth_check_user is skipped.
* Bug 149: Improved imap search performance using weighted search lists.
* Bug 171: max() is indexable in mysql but not in postgresql causing
    extreme slowness
* Bug 134: Some MySQL tweaks to be applied.
* Bug 180: dbmail-user -e someuser does not clear the mailboxes
* improved performance on postgresql when opening mailboxes (imapd)
    by avoiding SUM() calls.
* Bug 177: compile fails on FreeBSDs getopt.h
* Bug 164: No more mailbox full. Mail bounced with user unknown.
* Bug 181: Error in SQL using SuSE Linux 9, max value for int8 is
    exceeded, PostgreSQL 8 + Postfix

2.0.5:
* bug 177: compile fails on FreeBSDs getopt.h
* bug 182: compile fails on FreeBSDs sort.c
* bug 158: a sig term to the root process e.g. the pid from the
    pidfile doesn't shutdown imapd/pop3d
* bug 154: dbmail-util outputing "-r" error when -r is no longer valid
* bug 201: Unix socket support for lmtpd
* bug 199: spare child creates zombie
* bug 190: huge load if database crash
* bug 145: LMTP loses return-path
* bug 162: dbmail-pop3d zombies galore..
* bug 213: pop3d sends SIGKILL to init's process group
* bug 185: segfault if user is over-quota in lmtp delivery
* bug 189: if alias == deliver_to, dbmail-smtp hogs mem until killed
    by oom or queue gives up

2.0.6:
* corrected reported version (closes #247)
* fixes fatal error in process pool

2.0.7:
* Removed all unsafe code from the signal handlers. This should
    mostly benefit FreeBSD users which may have suffered from
    unreliable behaviour in the process pool code.
* Added 'ON UPDATE CASCADE' to all foreign key restraints in the
    MySQL (InnoDB) and Postgresql create_table files.
* POP3 AUTH command no longer returns list of supported authentication
    mechanisms when issued without arguments.

3 files changed, 10 insertions, 12 deletions

diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 2f463112448..e8228a74144 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.7 2006/01/10 12:39:03 ghen Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/13 21:43:54 schmonz Exp $
 #
 
-DISTNAME=		dbmail-2.0.1
-PKGREVISION=		2
+DISTNAME=		dbmail-2.0.7
 CATEGORIES=		mail
-MASTER_SITES=		http://www.dbmail.org/download/
-EXTRACT_SUFX=		.tgz
+MASTER_SITES=		http://www.dbmail.org/download/2.0/
 
 MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		http://www.dbmail.org/
 COMMENT=		Store and retrieve mail messages in a database
 
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-${SQLDB}
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
@@ -31,6 +30,7 @@ SUBST_SED.sysconf=	-e 's|/etc/dbmail\.conf|${PKG_SYSCONFDIR}/dbmail.conf|g'
 SUBST_MESSAGE.sysconf=	"Fixing sysconf paths."
 
 INSTALLATION_DIRS=	lib man man/man1 man/man8 sbin share/examples/dbmail
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${EGDIR}
 
diff --git a/mail/dbmail/distinfo b/mail/dbmail/distinfo
index 70dbf5ec843..ff59efab140 100644
--- a/mail/dbmail/distinfo
+++ b/mail/dbmail/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:21 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/01/13 21:43:54 schmonz Exp $
 
-SHA1 (dbmail-2.0.1.tgz) = fbe5e0b2ab13257a78e9226e5e416b7d745d3c2c
-RMD160 (dbmail-2.0.1.tgz) = 8710480ada52d3ae131adb8b2785cd352a55aba2
-Size (dbmail-2.0.1.tgz) = 537346 bytes
+SHA1 (dbmail-2.0.7.tar.gz) = 36736997c259900e060dd48c6972ff2cb1dd6590
+RMD160 (dbmail-2.0.7.tar.gz) = f23d83c5adeb47f84d366ea147a4ce7f654f0508
+Size (dbmail-2.0.7.tar.gz) = 584457 bytes
diff --git a/mail/dbmail/options.mk b/mail/dbmail/options.mk
index 1bb933d6edb..5f037f4f214 100644
--- a/mail/dbmail/options.mk
+++ b/mail/dbmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2006/01/10 12:39:04 ghen Exp $
+# $NetBSD: options.mk,v 1.4 2006/01/13 21:43:54 schmonz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dbmail
 PKG_OPTIONS_REQUIRED_GROUPS=	sql
@@ -12,7 +12,6 @@ PKG_SUGGESTED_OPTIONS=	mysql
 ###
 .if !empty(PKG_OPTIONS:Mmysql)
 .include "../../mk/mysql.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-mysql
 SQLDB=			mysql
 .endif
 
@@ -21,6 +20,5 @@ SQLDB=			mysql
 ###
 .if !empty(PKG_OPTIONS:Mpgsql)
 .include "../../mk/pgsql.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-pgsql
 SQLDB=			pgsql
 .endif