Update to 2.2.7 release. The 2.2 series of dbmail adds LDAP integration,

fast searches and sieve filtering. Users upgrading from an earlier
release will need to follow these upgrading instructions:
http://www.dbmail.org/dokuwiki/doku.php?id=upgrading_to_2.1

6 files changed, 63 insertions, 15 deletions

diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 88ae3547c36..c0946eafae0 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2007/03/19 12:51:56 ghen Exp $
+# $NetBSD: Makefile,v 1.14 2007/10/30 22:52:42 shannonjr Exp $
 #
 
-DISTNAME=		dbmail-2.0.11
+DISTNAME=		dbmail-2.2.7
 CATEGORIES=		mail
-MASTER_SITES=		http://www.dbmail.org/download/2.0/
-EXTRACT_SUFX=		.tgz
+MASTER_SITES=		http://www.dbmail.org/download/2.2/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.dbmail.org/
@@ -12,13 +11,14 @@ COMMENT=		Store and retrieve mail messages in a database
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-${SQLDB}
+CONFIGURE_ARGS+=	--with-pkglibdir=${PREFIX}/lib/dbmail
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
 EGDIR=			${PREFIX}/share/examples/dbmail
 CONF_FILES=		${EGDIR}/dbmail.conf ${PKG_SYSCONFDIR}/dbmail.conf
-RCD_SCRIPTS=		dbmail dbmailimapd dbmaillmtpd dbmailpop3d
+RCD_SCRIPTS=		dbmail dbmailimapd dbmaillmtpd dbmailpop3d dbmail-timsieved
 
 PLIST_SUBST+=		SQLDB=${SQLDB:Q}
 
@@ -34,7 +34,13 @@ INSTALLATION_DIRS=	lib man ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 sbin share/exampl
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/sql/mysql/migrate_from_2.0_to_2.2.mysql ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/sql/postgresql/migrate_from_2.0_to_2.2.pgsql ${EGDIR}
+
 
 .include "options.mk"
 
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../mail/gmime/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/dbmail/PLIST b/mail/dbmail/PLIST
index 1811e9f5118..8c982b29211 100644
--- a/mail/dbmail/PLIST
+++ b/mail/dbmail/PLIST
@@ -1,14 +1,18 @@
-@comment $NetBSD: PLIST,v 1.4 2005/05/03 15:36:38 wiz Exp $
-lib/dbmail/lib${SQLDB}dbmail.la
-lib/dbmail/libauthdbmail.la
-lib/dbmail/libsortdbmail.la
-lib/libdbmail.la
+@comment $NetBSD: PLIST,v 1.5 2007/10/30 22:52:43 shannonjr Exp $
+lib/dbmail/libauth_sql.la
+lib/dbmail/libdbmail.la
+lib/dbmail/libmysql.la
 man/man1/dbmail-smtp.1
 man/man8/dbmail-imapd.8
 man/man8/dbmail-lmtpd.8
 man/man8/dbmail-pop3d.8
 man/man8/dbmail-users.8
 man/man8/dbmail-util.8
+man/man1/dbmail.1
+man/man5/dbmail.conf.5
+man/man8/dbmail-export.8
+man/man8/dbmail-sievecmd.8
+man/man8/dbmail-timsieved.8
 sbin/dbmail-imapd
 sbin/dbmail-lmtpd
 sbin/dbmail-pop3d
@@ -16,9 +20,12 @@ sbin/dbmail-smtp
 sbin/dbmail-users
 sbin/dbmail-util
 share/examples/dbmail/dbmail.conf
+share/examples/dbmail/migrate_from_2.0_to_2.2.mysql
+share/examples/dbmail/migrate_from_2.0_to_2.2.pgsql
 share/examples/rc.d/dbmail
 share/examples/rc.d/dbmailimapd
 share/examples/rc.d/dbmaillmtpd
 share/examples/rc.d/dbmailpop3d
+share/examples/rc.d/dbmail-timsieved
 @dirrm share/examples/dbmail
 @dirrm lib/dbmail
diff --git a/mail/dbmail/PLIST.sieve b/mail/dbmail/PLIST.sieve
new file mode 100644
index 00000000000..079998dd31d
--- /dev/null
+++ b/mail/dbmail/PLIST.sieve
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.sieve,v 1.1 2007/10/30 22:52:43 shannonjr Exp $
+lib/dbmail/libsort_sieve.la
+sbin/dbmail-export
+sbin/dbmail-sievecmd
+sbin/dbmail-timsieved
diff --git a/mail/dbmail/distinfo b/mail/dbmail/distinfo
index 13461bb369e..456ee3570e8 100644
--- a/mail/dbmail/distinfo
+++ b/mail/dbmail/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2007/03/19 12:51:56 ghen Exp $
+$NetBSD: distinfo,v 1.5 2007/10/30 22:52:43 shannonjr Exp $
 
-SHA1 (dbmail-2.0.11.tgz) = fc7c4a2f800f77cca95df99a46265daa5b1935ec
-RMD160 (dbmail-2.0.11.tgz) = 74a7dbb06a53b42d3afc37bfebfbb36d3db014ac
-Size (dbmail-2.0.11.tgz) = 649830 bytes
+SHA1 (dbmail-2.2.7.tar.gz) = 15d3bbd945ee09fdc36da6f988f2b4723bd1cc28
+RMD160 (dbmail-2.2.7.tar.gz) = aac1d5a7d049b7384455b37e8380d4e57eae5164
+Size (dbmail-2.2.7.tar.gz) = 895586 bytes
diff --git a/mail/dbmail/files/dbmail-timsieved.sh b/mail/dbmail/files/dbmail-timsieved.sh
new file mode 100644
index 00000000000..4775776806d
--- /dev/null
+++ b/mail/dbmail/files/dbmail-timsieved.sh
@@ -0,0 +1,18 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: dbmail-timsieved.sh,v 1.1 2007/10/30 22:52:44 shannonjr Exp $
+#
+
+# PROVIDE: timsieved
+# REQUIRE: 
+
+. /etc/rc.subr
+
+name="timsieved"
+rcvar=${name}
+required_files="@PKG_SYSCONFDIR@/dbmail.conf"
+command="@PREFIX@/sbin/dbmail-timsieved"
+pidfile="/var/run/dbmail-timsieved.pid"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/mail/dbmail/options.mk b/mail/dbmail/options.mk
index 5f037f4f214..4d0d5100bef 100644
--- a/mail/dbmail/options.mk
+++ b/mail/dbmail/options.mk
@@ -1,6 +1,7 @@
-# $NetBSD: options.mk,v 1.4 2006/01/13 21:43:54 schmonz Exp $
+# $NetBSD: options.mk,v 1.5 2007/10/30 22:52:44 shannonjr Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dbmail
+PKG_SUPPORTED_OPTIONS=	sieve
 PKG_OPTIONS_REQUIRED_GROUPS=	sql
 PKG_OPTIONS_GROUP.sql=	mysql pgsql
 PKG_SUGGESTED_OPTIONS=	mysql
@@ -22,3 +23,14 @@ SQLDB=			mysql
 .include "../../mk/pgsql.buildlink3.mk"
 SQLDB=			pgsql
 .endif
+
+###
+### libsieve support
+###
+PLIST_SRC=      ${.CURDIR}/PLIST
+.if !empty(PKG_OPTIONS:Msieve)
+CONFIGURE_ARGS+=	--with-sieve=${BUILDLINK_PREFIX.libsieve}
+PLIST_SRC+=		${.CURDIR}/PLIST.sieve
+.include "../../mail/libsieve/buildlink3.mk"
+.include "../../mail/gmime/buildlink3.mk"
+.endif