Fix building with db5; revision bump for db4 update

19 files changed, 125 insertions, 133 deletions

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index afdcfc11acf..c8efc80782f 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2010/02/03 19:45:04 drochner Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/02 12:53:49 adam Exp $
+
+PKGREVISION=	1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 INSTALLATION_DIRS+=	${EGDIR}
@@ -17,7 +19,7 @@ USE_TOOLS+=		msgfmt
 PKGCONFIG_OVERRIDE+=	claws-mail.pc.in
 
 PKG_SYSCONFSUBDIR=	claws-mail
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -69,12 +71,11 @@ PLIST_SRC=	PLIST
 PLIST_SRC+=	PLIST.shred
 .endif
 
-.include "../../databases/db4/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 40defaab5e4..a2af24fa7a3 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2010/01/17 12:02:23 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2010/06/02 12:56:39 adam Exp $
 
 DISTNAME=	cyrus-imapd-2.2.13p1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
@@ -18,7 +18,7 @@ USE_TOOLS+=		perl
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 PERL5_CONFIGURE=	no
-BDB_ACCEPTED=		db4 db3
+BDB_ACCEPTED=		db3 db4 db5
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -30,12 +30,12 @@ CYRUS_GROUP?=		mail
 
 PKG_GROUPS_VARS+=	CYRUS_GROUP
 PKG_USERS_VARS+=	CYRUS_USER
-FILES_SUBST+=		CYRUS_USER=${CYRUS_USER:Q}
-FILES_SUBST+=		CYRUS_GROUP=${CYRUS_GROUP:Q}
+FILES_SUBST+=		CYRUS_USER=${CYRUS_USER}
+FILES_SUBST+=		CYRUS_GROUP=${CYRUS_GROUP}
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--with-cyrus-user=${CYRUS_USER:Q}
-CONFIGURE_ARGS+=	--with-cyrus-group=${CYRUS_GROUP:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-cyrus-user=${CYRUS_USER}
+CONFIGURE_ARGS+=	--with-cyrus-group=${CYRUS_GROUP}
 CONFIGURE_ARGS+=	--with-cyrus-prefix=${PREFIX}/cyrus
 CONFIGURE_ARGS+=	--with-statedir=${VARBASE}/run
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
@@ -67,7 +67,7 @@ CONFIGURE_ARGS+=	--with-krb=/usr
 .  endif
 .elif !empty(PKG_OPTIONS:Mgssapi)
 .  include "../../mk/krb5.buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-gssapi=${KRB5BASE:Q}
+CONFIGURE_ARGS+=	--enable-gssapi=${KRB5BASE}
 CONFIGURE_ARGS+=	--with-gss_impl=${GSSIMPL.${KRB5_TYPE}}
 GSSIMPL.heimdal=	heimdal
 GSSIMPL.mit-krb5=	mit
@@ -131,7 +131,7 @@ PERL5_PACKLIST= \
 .include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/bdb.buildlink3.mk"
 
-CONFIGURE_ENV+=	BDB_TYPE=${BDB_TYPE:Q}
+CONFIGURE_ENV+=	BDB_TYPE=${BDB_TYPE}
 
 # Only imap/mupdate needs to be build with pthreads support, so selectively
 # enable it via patches for just that one program.
diff --git a/mail/cyrus-imapd/distinfo b/mail/cyrus-imapd/distinfo
index 3c2defe3919..0ecaf8cfea2 100644
--- a/mail/cyrus-imapd/distinfo
+++ b/mail/cyrus-imapd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2009/09/10 05:13:56 obache Exp $
+$NetBSD: distinfo,v 1.31 2010/06/02 12:56:39 adam Exp $
 
 SHA1 (cyrus-imapd-2.2.13p1.tar.gz) = b9bc268c40fbb60aeb5253d61c4bfe5cffd3fb15
 RMD160 (cyrus-imapd-2.2.13p1.tar.gz) = 1604f07491d41f05563181bce46ff1b7a6e5f739
@@ -9,7 +9,7 @@ SHA1 (patch-ac) = 48557e05ef0d82413da18dd46d9c4baf802a771d
 SHA1 (patch-ad) = e99638a062b2695514c6859788eac3fd02cf5c1d
 SHA1 (patch-ae) = b1865b68a8f798a3766e53e60e9e68099df9bd54
 SHA1 (patch-af) = 2aaf1be5fcb102b047a57fe0a908b3e8f95037ea
-SHA1 (patch-ag) = 85d931a197d9185cbcff592efd67c2090724d7fd
+SHA1 (patch-ag) = e51020accbd2a259a9abe27e5d220e61c9ab314e
 SHA1 (patch-al) = d28a0e604f0ddcf22c6753be333216780558e05c
 SHA1 (patch-am) = 6e67366a0ad01cf075c23c5a32f1c9d456e1498f
 SHA1 (patch-ap) = 95b987e83ddd53065f7ffe503d0f07694f9bcd6b
diff --git a/mail/cyrus-imapd/patches/patch-ag b/mail/cyrus-imapd/patches/patch-ag
index fdb310870e6..e9f7b21a76b 100644
--- a/mail/cyrus-imapd/patches/patch-ag
+++ b/mail/cyrus-imapd/patches/patch-ag
@@ -1,7 +1,25 @@
-$NetBSD: patch-ag,v 1.4 2007/06/12 11:34:29 obache Exp $
+$NetBSD: patch-ag,v 1.5 2010/06/02 12:56:39 adam Exp $
 
 --- lib/cyrusdb_berkeley.c.orig	2006-03-17 16:12:32.000000000 +0000
 +++ lib/cyrusdb_berkeley.c
+@@ -104,7 +104,7 @@ static void db_panic(DB_ENV *dbenv __att
+     exit(EC_TEMPFAIL);
+ }
+ 
+-#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3)
++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
+ static void db_err(const DB_ENV *dbenv __attribute__((unused)),
+ 		   const char *db_prfx, const char *buffer)
+ #else
+@@ -160,7 +160,7 @@ static int init(const char *dbdir, int m
+ #endif
+     }
+ 
+-#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3)
++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
+     dbenv->set_msgcall(dbenv, db_msg);
+ #endif
+     dbenv->set_errcall(dbenv, db_err);
 @@ -173,7 +173,15 @@ static int init(const char *dbdir, int m
  	syslog(LOG_WARNING,
  	       "DBERROR: invalid berkeley_locks_max value, using internal default");
@@ -18,3 +36,30 @@ $NetBSD: patch-ag,v 1.4 2007/06/12 11:34:29 obache Exp $
  	if (r) {
  	    dbenv->err(dbenv, r, "set_lk_max");
  	    syslog(LOG_ERR, "DBERROR: set_lk_max(): %s", db_strerror(r));
+@@ -270,7 +278,7 @@ static int mysync(void)
+ 
+     assert(dbinit);
+ 
+-#if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
++#if !(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1))
+     do {
+ #endif
+ #if (DB_VERSION_MAJOR > 3) || ((DB_VERSION_MAJOR == 3) && (DB_VERSION_MINOR > 0))
+@@ -278,7 +286,7 @@ static int mysync(void)
+ #else
+ 	r = txn_checkpoint(dbenv, 0, 0);
+ #endif
+-#if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
++#if !(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1))
+     } while (r == DB_INCOMPLETE);  /* Never returned by BDB 4.1 */
+ #endif
+     if (r) {
+@@ -393,7 +401,7 @@ static int myopen(const char *fname, DBT
+     }
+     /* xxx set comparator! */
+ 
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
+     r = db->open(db, NULL, fname, NULL, type, dbflags | DB_AUTO_COMMIT, 0664);
+ #else
+     r = db->open(db, fname, NULL, type, dbflags, 0664);
diff --git a/mail/etpan/Makefile b/mail/etpan/Makefile
index abf49598725..079f9d230c5 100644
--- a/mail/etpan/Makefile
+++ b/mail/etpan/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/02/04 02:08:22 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.13 2010/06/02 12:57:48 adam Exp $
 
 DISTNAME=	etpan-ng-0.7.1
 PKGNAME=	${DISTNAME:S/-ng//}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libetpan/}
 
@@ -13,6 +12,7 @@ COMMENT=	Mail console client with S/MIME and PGP support
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+BDB_ACCEPTED=		db4 db5
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		perl:run yacc
 GNU_CONFIGURE=		yes
@@ -27,9 +27,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/CONFIG ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/INTERNAL ${DESTDIR}${DOCDIR}
 
-.include "../../databases/db4/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mail/libetpan/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index 95adaf3f539..5afe2e5127b 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.97 2010/04/13 16:22:47 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.98 2010/06/02 13:03:11 adam Exp $
 
 DISTNAME=	evolution-data-server-2.28.3.1
+PKGREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evolution-data-server/2.28/}
 EXTRACT_SUFX=	.tar.bz2
@@ -13,11 +13,12 @@ LICENSE=	gnu-lgpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=		YES
+BDB_ACCEPTED=		db4 db5
 USE_TOOLS+=		bison gmake intltool msgfmt pkg-config
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
+GNU_CONFIGURE=		YES
 
 PYTHON_FOR_BUILD_ONLY=	YES
 PYTHON_PATCH_SCRIPTS=	addressbook/libebook/gen-western-table.py
@@ -46,8 +47,7 @@ CONFIGURE_ARGS+=	--with-nspr-libs=${BUILDLINK_PREFIX.nspr}/lib
 CONFIGURE_ARGS+=	--with-nss-includes=${BUILDLINK_PREFIX.nss}/include/nss/nss
 CONFIGURE_ARGS+=	--with-nss-libs=${BUILDLINK_PREFIX.nss}/lib
 CONFIGURE_ARGS+=	--with-openldap
-CONFIGURE_ARGS+=	--with-libdb=${LOCALBASE}
-BUILDLINK_TRANSFORM+=	l:db:db4
+CONFIGURE_ARGS+=	--with-libdb=${BDBBASE}
 
 PKGCONFIG_OVERRIDE+=	addressbook/libebook/libebook.pc.in
 PKGCONFIG_OVERRIDE+=	addressbook/libedata-book/libedata-book.pc.in
@@ -60,11 +60,11 @@ PKGCONFIG_OVERRIDE+=	libedataserverui/libedataserverui.pc.in
 PKGCONFIG_OVERRIDE+=	servers/groupwise/libegroupwise.pc.in
 PKGCONFIG_OVERRIDE+=	evolution-data-server.pc.in
 
+BUILDLINK_TRANSFORM+=	l:db:${BDB_TYPE}
 BUILDLINK_TRANSFORM+=	rm:-ldl
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/openldap-client/buildlink3.mk"
-.include "../../databases/db4/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -81,5 +81,6 @@ BUILDLINK_TRANSFORM+=	rm:-ldl
 BUILDLINK_API_DEPENDS.libical+=	libical>=0.43
 .include "../../time/libical/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/evolution-data-server/buildlink3.mk b/mail/evolution-data-server/buildlink3.mk
index 884854ce394..c31fc121685 100644
--- a/mail/evolution-data-server/buildlink3.mk
+++ b/mail/evolution-data-server/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.31 2009/10/25 13:23:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.32 2010/06/02 13:03:11 adam Exp $
 
 BUILDLINK_TREE+=	evolution-data-server
 
@@ -6,18 +6,19 @@ BUILDLINK_TREE+=	evolution-data-server
 EVOLUTION_DATA_SERVER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.evolution-data-server+=	evolution-data-server>=1.8.0
-BUILDLINK_ABI_DEPENDS.evolution-data-server?=	evolution-data-server>=2.22.3nb1
+BUILDLINK_ABI_DEPENDS.evolution-data-server+=	evolution-data-server>=2.22.3nb1
 BUILDLINK_PKGSRCDIR.evolution-data-server?=	../../mail/evolution-data-server
 
+BDB_ACCEPTED?=		db4 db5
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
-.include "../../databases/db4/buildlink3.mk"
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../time/libical/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .endif # EVOLUTION_DATA_SERVER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-evolution-data-server
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 09106c572e3..1acc766d9c1 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.100 2010/01/31 21:06:29 heinz Exp $
+# $NetBSD: Makefile,v 1.101 2010/06/02 13:04:04 adam Exp $
 
 DISTNAME=	exim-4.71
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail net
 MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/ \
 	http://dl.ambiweb.de/mirrors/ftp.exim.org/exim/exim4/
diff --git a/mail/exim/options.mk b/mail/exim/options.mk
index cce6b7bef1a..c96eae1df76 100644
--- a/mail/exim/options.mk
+++ b/mail/exim/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2007/12/15 16:04:41 adam Exp $
+# $NetBSD: options.mk,v 1.16 2010/06/02 13:04:04 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.exim
 PKG_SUPPORTED_OPTIONS=	exim-appendfile-maildir exim-appendfile-mailstore
@@ -128,19 +128,13 @@ EXIM_INCLUDE=		-I${PREFIX}/include
 .else # use native or Berkeley DB as defined by BDB_DEFAULT and BDB_ACCEPTED
 .  include "../../mk/bdb.buildlink3.mk"
 EXIM_USE_DB_CONFIG=	USE_DB=yes	# the default
-.  if ${BDB_TYPE} == "db4"
-EXIM_DBMLIB=		DBMLIB=${LDFLAGS} ${BDB_LIBS}
-EXIM_INCLUDE=		-I${PREFIX}/${BUILDLINK_INCDIRS.db4}
-.  elif ${BDB_TYPE} == "db3"
-EXIM_DBMLIB=		DBMLIB=${LDFLAGS} ${BDB_LIBS}
-EXIM_INCLUDE=		-I${PREFIX}/${BUILDLINK_INCDIRS.db3}
-.  elif ${BDB_TYPE} == "db2"
-EXIM_DBMLIB=		DBMLIB=${LDFLAGS} ${BDB_LIBS}
-EXIM_INCLUDE=		-I${PREFIX}/${BUILDLINK_INCDIRS.db2}
-.  else # using native
+.  if ${BDB_TYPE} == "db1"
 EXIM_DBMLIB=		# empty so use defaults
 EXIM_USE_DB_CONFIG=	# empty so use defaults
 EXIM_INCLUDE=		-I/usr/${BUILDLINK_INCDIRS.db-native}
+.  else
+EXIM_DBMLIB=		DBMLIB=${LDFLAGS} ${BDB_LIBS}
+EXIM_INCLUDE=		-I${PREFIX}/${BUILDLINK_INCDIRS.${BDB_TYPE}}
 .  endif
 .endif
 
diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index 4678df6765c..d19cec2e1d1 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2010/01/17 12:02:24 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.27 2010/06/02 13:05:01 adam Exp $
 
 DISTNAME=	isync-1.0.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=isync/}
 
@@ -13,16 +12,14 @@ COMMENT=	Synchronize a maildir with an imap server
 LICENSE=	gnu-gpl-v2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
-INSTALLATION_DIRS+=	share/examples/isync
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=	YES
-
+BDB_ACCEPTED=		db4 db5
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_PREFIX.openssl}
 LDFLAGS+=		-lcrypto
 
-.include "../../security/openssl/buildlink3.mk"
-.include "../../databases/db4/buildlink3.mk"
+INSTALLATION_DIRS+=	share/examples/isync
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/mbsyncrc.sample \
@@ -30,4 +27,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/compat/isyncrc.sample \
 		${DESTDIR}${PREFIX}/share/examples/isync/isyncrc.sample
 
+BUILDLINK_TRANSFORM+=	l:db:${BDB_TYPE}
+.include "../../security/openssl/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/isync/distinfo b/mail/isync/distinfo
index ae28c30b9f0..402becca5ed 100644
--- a/mail/isync/distinfo
+++ b/mail/isync/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.9 2009/07/12 20:26:59 tonio Exp $
+$NetBSD: distinfo,v 1.10 2010/06/02 13:05:01 adam Exp $
 
 SHA1 (isync-1.0.4.tar.gz) = a327cc5b81946c7ccb3a26ddd971933e2e006ed3
 RMD160 (isync-1.0.4.tar.gz) = 23475533ff9848c38b95911eae6191ca03132185
 Size (isync-1.0.4.tar.gz) = 170264 bytes
-SHA1 (patch-aa) = 5ac207f7d7b634673e60ce34cc9a921846d205da
-SHA1 (patch-ab) = bee5b091f89a670b584b73ef58774ae992bb6637
-SHA1 (patch-ac) = d06d1444f66eaeab1fdf22e1aa2f1b9184abccfa
-SHA1 (patch-ad) = c4a86de19b3004752dc51da9453b702945fe6578
 SHA1 (patch-ae) = 2fddc575e8824ecbbb4b8c51a56193840b43d647
 SHA1 (patch-af) = 12fc0ec1b2292c422e7c3347b37167438866728d
diff --git a/mail/isync/patches/patch-aa b/mail/isync/patches/patch-aa
deleted file mode 100644
index fc564fe7b7e..00000000000
--- a/mail/isync/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/04/24 09:31:54 adrianp Exp $
-
---- src/Makefile.am.orig	2005-03-05 21:49:31.000000000 +0100
-+++ src/Makefile.am	2005-03-05 21:49:55.000000000 +0100
-@@ -6,11 +6,11 @@
- bin_PROGRAMS = mbsync mdconvert
- 
- mbsync_SOURCES = main.c sync.c config.c util.c drv_imap.c drv_maildir.c
--mbsync_LDADD = -ldb $(SSL_LIBS) $(SOCK_LIBS)
-+mbsync_LDADD = -ldb4 $(SSL_LIBS) $(SOCK_LIBS)
- noinst_HEADERS = isync.h
- 
- mdconvert_SOURCES = mdconvert.c
--mdconvert_LDADD = -ldb
-+mdconvert_LDADD = -ldb4
- 
- man_MANS = mbsync.1 mdconvert.1
- EXTRA_DIST = mbsyncrc.sample $(man_MANS)
diff --git a/mail/isync/patches/patch-ab b/mail/isync/patches/patch-ab
deleted file mode 100644
index 887a3258d45..00000000000
--- a/mail/isync/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/04/24 09:31:54 adrianp Exp $
-
---- src/Makefile.in.orig	2005-03-05 21:49:24.000000000 +0100
-+++ src/Makefile.in	2005-03-05 21:49:44.000000000 +0100
-@@ -165,10 +165,10 @@
- @with_compat_TRUE@compat_dir = compat
- SUBDIRS = $(compat_dir)
- mbsync_SOURCES = main.c sync.c config.c util.c drv_imap.c drv_maildir.c
--mbsync_LDADD = -ldb $(SSL_LIBS) $(SOCK_LIBS)
-+mbsync_LDADD = -ldb4 $(SSL_LIBS) $(SOCK_LIBS)
- noinst_HEADERS = isync.h
- mdconvert_SOURCES = mdconvert.c
--mdconvert_LDADD = -ldb
-+mdconvert_LDADD = -ldb4
- man_MANS = mbsync.1 mdconvert.1
- EXTRA_DIST = mbsyncrc.sample $(man_MANS)
- all: all-recursive
diff --git a/mail/isync/patches/patch-ac b/mail/isync/patches/patch-ac
deleted file mode 100644
index c478d0791de..00000000000
--- a/mail/isync/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/04/24 09:31:54 adrianp Exp $
-
---- src/compat/Makefile.am.orig	2005-03-05 21:50:09.000000000 +0100
-+++ src/compat/Makefile.am	2005-03-05 21:50:18.000000000 +0100
-@@ -1,7 +1,7 @@
- bin_PROGRAMS = isync
- 
- isync_SOURCES = main.c config.c convert.c util.c
--isync_LDADD = -ldb
-+isync_LDADD = -ldb4
- noinst_HEADERS = isync.h
- 
- man_MANS = isync.1
diff --git a/mail/isync/patches/patch-ad b/mail/isync/patches/patch-ad
deleted file mode 100644
index 50fbf687230..00000000000
--- a/mail/isync/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2005/04/24 09:31:54 adrianp Exp $
-
---- src/compat/Makefile.in.orig	2005-03-05 21:50:06.000000000 +0100
-+++ src/compat/Makefile.in	2005-03-05 21:50:33.000000000 +0100
-@@ -152,7 +152,7 @@
- with_compat_FALSE = @with_compat_FALSE@
- with_compat_TRUE = @with_compat_TRUE@
- isync_SOURCES = main.c config.c convert.c util.c
--isync_LDADD = -ldb
-+isync_LDADD = -ldb4
- noinst_HEADERS = isync.h
- man_MANS = isync.1
- EXTRA_DIST = isyncrc.sample $(man_MANS)
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index c56a3e1eab5..42a88059bf7 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.30 2010/05/17 17:54:25 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.31 2010/06/02 12:58:58 adam Exp $
 
-DISTNAME=		libetpan-1.0
-CATEGORIES=		mail
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libetpan/}
+DISTNAME=	libetpan-1.0
+PKGREVISION=	1
+CATEGORIES=	mail
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libetpan/}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://libetpan.sourceforge.net/
-COMMENT=		Really nice mail library
-LICENSE=		modified-bsd
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://libetpan.sourceforge.net/
+COMMENT=	Really nice mail library
+LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+BDB_ACCEPTED=		db3 db4 db5
+USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-USE_LANGUAGES+=		c++
-USE_LANGUAGES+=		c
 MAKE_JOBS_SAFE=		no
 
 SUBST_CLASSES+=		conf
@@ -25,10 +25,10 @@ SUBST_SED.conf=		-e "s|@COMPILERFLAGS@|${COMPILER_RPATH_FLAG}|g"
 SUBST_MESSAGE.conf=	Fixing libetpan-config.
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../databases/db4/buildlink3.mk"
 .include "../../security/cyrus-sasl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/libetpan/buildlink3.mk b/mail/libetpan/buildlink3.mk
index ec1e79d8055..04308be7577 100644
--- a/mail/libetpan/buildlink3.mk
+++ b/mail/libetpan/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2010/05/17 17:54:25 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2010/06/02 12:58:58 adam Exp $
 
 BUILDLINK_TREE+=	libetpan
 
@@ -6,15 +6,16 @@ BUILDLINK_TREE+=	libetpan
 LIBETPAN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libetpan+=	libetpan>=1.0
-BUILDLINK_ABI_DEPENDS.libetpan?=	libetpan>=1.0
+BUILDLINK_ABI_DEPENDS.libetpan+=	libetpan>=1.0
 BUILDLINK_PKGSRCDIR.libetpan?=	../../mail/libetpan
 
+BDB_ACCEPTED?=	db4 db5
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../databases/db4/buildlink3.mk"
 .include "../../security/cyrus-sasl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .endif # LIBETPAN_BUILDLINK3_MK
 
diff --git a/mail/libetpan/distinfo b/mail/libetpan/distinfo
index baac4b08336..46ab4e6cbde 100644
--- a/mail/libetpan/distinfo
+++ b/mail/libetpan/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.13 2010/05/17 17:54:25 drochner Exp $
+$NetBSD: distinfo,v 1.14 2010/06/02 12:58:59 adam Exp $
 
 SHA1 (libetpan-1.0.tar.gz) = 8c1e8753359ad0ae7e537ef304d65f80c6ff0a19
 RMD160 (libetpan-1.0.tar.gz) = 1b57288f6d31cb410435ac6088090a3fc6651038
 Size (libetpan-1.0.tar.gz) = 1669965 bytes
 SHA1 (patch-aa) = e783adf544c9a63df584815ee4b033249cecf0ff
+SHA1 (patch-ab) = ca49f0ff4ed1236c4867071e8bc82d62983efeff
diff --git a/mail/libetpan/patches/patch-ab b/mail/libetpan/patches/patch-ab
new file mode 100644
index 00000000000..e7fbc968c7d
--- /dev/null
+++ b/mail/libetpan/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.7 2010/06/02 12:58:59 adam Exp $
+
+--- configure.orig	2010-06-01 13:01:01.000000000 +0000
++++ configure
+@@ -18447,7 +18447,7 @@ rm -f core conftest.err conftest.$ac_obj
+     3)
+     { echo "$as_me:$LINENO: result: version 3.x or above" >&5
+ echo "${ECHO_T}version 3.x or above" >&6; }
+-    for lib in db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db-3.2 db-3 db3 db; do
++    for lib in db5 db4 db3 db; do
+       if test "x$DBLINKED" = "x0"; then
+         { echo "$as_me:$LINENO: checking for db_create() in -l$lib" >&5
+ echo $ECHO_N "checking for db_create() in -l$lib... $ECHO_C" >&6; }