Fix building with db5; revision bump for db4 update

4 files changed, 31 insertions, 16 deletions

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; }