Fix building with db5; revision bump for db4 update

2 files changed, 11 insertions, 9 deletions

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