Fix building with db5; revision bump for db4 update

15 files changed, 129 insertions, 83 deletions

diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index c8326a3f108..199da9cc7c6 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,23 +1,39 @@
-# $NetBSD: Makefile,v 1.56 2010/04/15 07:01:22 adam Exp $
+# $NetBSD: Makefile,v 1.57 2010/06/02 13:14:47 adam Exp $
 
-DISTNAME=		jabberd-2.2.9
-PKGREVISION=		2
-CATEGORIES=		chat
-MASTER_SITES=		http://codex.xiaoka.com/pub/jabberd2/releases/
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	jabberd-2.2.9
+PKGREVISION=	3
+CATEGORIES=	chat
+MASTER_SITES=	http://codex.xiaoka.com/pub/jabberd2/releases/
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		eric@cirr.com
-HOMEPAGE=		http://jabberd2.xiaoka.com/
-COMMENT=		XMPP (Jabber) instant messaging server
-LICENSE=		gnu-gpl-v2
+MAINTAINER=	eric@cirr.com
+HOMEPAGE=	http://jabberd2.xiaoka.com/
+COMMENT=	XMPP (Jabber) instant messaging server
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 CONFLICTS=		jabberd-[0-9]*
 
+BDB_ACCEPTED=		db4 db5
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
+USE_TOOLS+=		perl:run
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-anon
+CONFIGURE_ARGS+=	--enable-pipe
+CONFIGURE_ARGS+=	--enable-ssl
+CONFIGURE_ARGS+=	--enable-fs
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+
+.if (${MACHINE_ARCH} == alpha) || (${MACHINE_ARCH} == x86_64)
+CONFIGURE_ARGS+=	CXXFLAGS=${CXXFLAGS:M*:C/-O./-Os/:M*:Q}
+CONFIGURE_ENV+=		CXXFLAGS=${CXXFLAGS:M*:C/-O./-Os/:M*:Q}
+MAKE_ENV+=		CXXFLAGS=${CXXFLAGS:M*:C/-O./-Os/:M*:Q}
+CONFIGURE_ARGS+=	CFLAGS=${CFLAGS:M*:C/-O./-Os/:M*:Q}
+CONFIGURE_ENV+=		CFLAGS=${CFLAGS:M*:C/-O./-Os/:M*:Q}
+MAKE_ENV+=		CFLAGS=${CFLAGS:M*:C/-O./-Os/:M*:Q}
+.endif
 
 SUBST_CLASSES+=		path
 SUBST_STAGE.path=	post-patch
@@ -26,22 +42,6 @@ SUBST_MESSAGE.path=	Fixing configure script.
 SUBST_SED.path=		-e "s,/usr/local,${PREFIX},g"
 SUBST_SED.path+=	-e "s,\$$sysconfdir/jabberd,\$$sysconfdir,g"
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--enable-pipe
-CONFIGURE_ARGS+=	--enable-anon
-CONFIGURE_ARGS+=	--enable-ssl
-CONFIGURE_ARGS+=	--enable-fs
-
-.if (${MACHINE_ARCH} == alpha) || (${MACHINE_ARCH} == x86_64)
-CONFIGURE_ARGS+=	CXXFLAGS=${CXXFLAGS:M*:C/-O./-Os/:Q}
-CONFIGURE_ENV+=		CXXFLAGS=${CXXFLAGS:M*:C/-O./-Os/:Q}
-MAKE_ENV+=		CXXFLAGS=${CXXFLAGS:M*:C/-O./-Os/:Q}
-CONFIGURE_ARGS+=	CFLAGS=${CFLAGS:M*:C/-O./-Os/:Q}
-CONFIGURE_ENV+=		CFLAGS=${CFLAGS:M*:C/-O./-Os/:Q}
-MAKE_ENV+=		CFLAGS=${CFLAGS:M*:C/-O./-Os/:Q}
-.endif
-
-USE_TOOLS+=		perl:run
 REPLACE_PERL+=		tools/*.pl
 
 .include "../../mk/bsd.prefs.mk"
@@ -55,10 +55,10 @@ PKG_SYSCONFSUBDIR=	jabberd
 RCD_SCRIPTS=		jabberd c2s sm router s2s
 JABBERD_USER?=		jabberd
 JABBERD_GROUP?=		jabberd
-FILES_SUBST+=		JABBERD_USER=${JABBERD_USER:Q}
-FILES_SUBST+=		JABBERD_GROUP=${JABBERD_GROUP:Q}
-FILES_SUBST+=		JABBERD_PIDDIR=${JABBERD_PIDDIR:Q}
-FILES_SUBST+=		JABBERD_LOGDIR=${JABBERD_LOGDIR:Q}
+FILES_SUBST+=		JABBERD_USER=${JABBERD_USER}
+FILES_SUBST+=		JABBERD_GROUP=${JABBERD_GROUP}
+FILES_SUBST+=		JABBERD_PIDDIR=${JABBERD_PIDDIR}
+FILES_SUBST+=		JABBERD_LOGDIR=${JABBERD_LOGDIR}
 PKG_USERS_VARS+=	JABBERD_USER
 PKG_GROUPS_VARS+=	JABBERD_GROUP
 PKG_GROUPS=		${JABBERD_GROUP}
@@ -95,8 +95,7 @@ post-extract:
 
 pre-configure:
 .for f in ${FILES}
-	sed								\
-		-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"		\
+	sed	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"		\
 		-e "s|@PIDDIR@|${JABBERD_PIDDIR}|g"			\
 		-e "s|@LOGDIR@|${JABBERD_LOGDIR}|g"			\
 		-e "s|@SSLCERTS@|${SSLCERTS}|g"				\
@@ -121,9 +120,9 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}
 .endfor
 
-.include "../../net/udns/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
+.include "../../net/udns/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/jabberd2/PLIST b/chat/jabberd2/PLIST
index 99ab35d2ffb..807eee65246 100644
--- a/chat/jabberd2/PLIST
+++ b/chat/jabberd2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/08/21 02:28:12 schnoebe Exp $
+@comment $NetBSD: PLIST,v 1.12 2010/06/02 13:14:47 adam Exp $
 bin/c2s
 bin/jabberd
 bin/migrate.pl
@@ -32,8 +32,8 @@ lib/jabberd/mod_iq-version.la
 lib/jabberd/mod_offline.la
 lib/jabberd/mod_presence.la
 lib/jabberd/mod_privacy.la
-lib/jabberd/mod_roster.la
 lib/jabberd/mod_roster-publish.la
+lib/jabberd/mod_roster.la
 lib/jabberd/mod_session.la
 lib/jabberd/mod_status.la
 lib/jabberd/mod_template-roster.la
@@ -50,10 +50,10 @@ man/man8/jabberd.8
 man/man8/router.8
 man/man8/s2s.8
 man/man8/sm.8
+share/doc/jabberd/ChangeLog
 share/doc/jabberd/README
 share/doc/jabberd/README.protocol
 share/doc/jabberd/UPGRADE
-share/doc/jabberd/ChangeLog
 share/examples/jabberd/c2s.xml
 share/examples/jabberd/db-jd14-2-jd2.sql
 share/examples/jabberd/db-setup.mysql
diff --git a/chat/jabberd2/options.mk b/chat/jabberd2/options.mk
index 14d49033563..703c2003491 100644
--- a/chat/jabberd2/options.mk
+++ b/chat/jabberd2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.23 2009/09/06 04:18:11 schnoebe Exp $
+# $NetBSD: options.mk,v 1.24 2010/06/02 13:14:47 adam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.jabberd2
 PKG_OPTIONS_REQUIRED_GROUPS=	auth storage sasl mio
@@ -35,9 +35,8 @@ CONFIGURE_ARGS+=	--with-sasl=gsasl
 .if !empty(PKG_OPTIONS:Mauth-db) || !empty(PKG_OPTIONS:Mstorage-db)
 CONFIGURE_ARGS+=	--enable-db
 PLIST.db=		yes
-BDB_ACCEPTED=		db4
-BUILDLINK_TRANSFORM+=	l:db:db4
-.  include "../../databases/db4/buildlink3.mk"
+BUILDLINK_TRANSFORM+=	l:db:${BDB_TYPE}
+.  include "../../mk/bdb.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-db
 .endif
diff --git a/databases/p5-BDB/Makefile b/databases/p5-BDB/Makefile
index ca160393f4a..fae01775a88 100644
--- a/databases/p5-BDB/Makefile
+++ b/databases/p5-BDB/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/04/17 09:35:40 seb Exp $
-#
+# $NetBSD: Makefile,v 1.2 2010/06/02 13:21:03 adam Exp $
 
 DISTNAME=	BDB-1.88
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 SVR4_PKGNAME=	p5bdb
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/M/ML/MLEHMANN/}
@@ -14,7 +14,7 @@ LICENSE=	${PERL5_LICENSE}
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-BDB_ACCEPTED=		db4 db3 db2
+BDB_ACCEPTED=		db5 db4 db3 db2
 PERL5_PACKLIST=		auto/BDB/.packlist
 
 MAKE_PARAMS+=	INC=-I${BDBBASE:Q}/${BUILDLINK_INCDIRS.${BDB_TYPE}:Q}
@@ -22,6 +22,6 @@ PERL5_LDFLAGS+=	-L${BUILDLINK_PREFIX.${BDB_TYPE}} ${BDB_LIBS}
 
 DEPENDS+=	p5-common-sense-[0-9]*:../../devel/p5-common-sense
 
-.include "../../mk/bdb.buildlink3.mk"
 .include "../../lang/perl5/module.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/p5-BDB/distinfo b/databases/p5-BDB/distinfo
index f0753b75e48..9172a50015f 100644
--- a/databases/p5-BDB/distinfo
+++ b/databases/p5-BDB/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/04/17 09:35:40 seb Exp $
+$NetBSD: distinfo,v 1.2 2010/06/02 13:21:03 adam Exp $
 
 SHA1 (BDB-1.88.tar.gz) = 75f1701d0e768755a7789e4329ac8f8dc6c6c788
 RMD160 (BDB-1.88.tar.gz) = 0140f02283726f29c69cae66af5b2fe43155a55d
 Size (BDB-1.88.tar.gz) = 35879 bytes
+SHA1 (patch-aa) = 8f86278fa8496dc982d779293da798b5eeb0d990
diff --git a/databases/p5-BDB/patches/patch-aa b/databases/p5-BDB/patches/patch-aa
new file mode 100644
index 00000000000..747bf4c0237
--- /dev/null
+++ b/databases/p5-BDB/patches/patch-aa
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.1 2010/06/02 13:21:03 adam Exp $
+
+--- BDB.xs.orig	2010-06-01 07:59:05.000000000 +0000
++++ BDB.xs
+@@ -33,7 +33,7 @@
+ 
+ #include <db.h>
+ 
+-#if DB_VERSION_MAJOR != 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 3)
++#if DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 3)
+ # error you need Berkeley DB 4.3 or a newer 4.x version installed
+ #endif
+ 
+@@ -1228,7 +1228,7 @@ BOOT:
+           const_iv (WRITECURSOR)
+           const_iv (YIELDCPU)
+           const_iv (ENCRYPT_AES)
+-#if DB_VERSION_MINOR < 8
++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 8)
+           const_iv (XA_CREATE)
+ #endif
+           const_iv (BTREE)
+@@ -1382,7 +1382,7 @@ BOOT:
+           const_iv (PRIORITY_VERY_HIGH)
+           const_iv (IGNORE_LEASE)
+ #endif
+-#if DB_VERSION_MINOR >= 7
++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 7)
+           //const_iv (MULTIPLE_KEY)
+           const_iv (LOG_DIRECT)
+           const_iv (LOG_DSYNC)
diff --git a/devel/apr-util/Makefile b/devel/apr-util/Makefile
index 866473fe45d..6d7fc5fb3b4 100644
--- a/devel/apr-util/Makefile
+++ b/devel/apr-util/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2009/08/07 10:39:23 tron Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/02 13:19:43 adam Exp $
 
 DISTNAME=	apr-util-1.3.9
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE:=apr/}
 
@@ -13,16 +14,16 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=		yes
+USE_TOOLS+=		pkg-config
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-apr=${BUILDLINK_PREFIX.apr}/bin/apr-1-config
 CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_PREFIX.expat}
 CONFIGURE_ARGS+=	--without-gdbm
 CONFIGURE_ARGS+=	--without-sqlite2
 PKGCONFIG_OVERRIDE+=	apr-util.pc.in
 
-MAKE_ENV+=	WRAPPER_DIR=${WRAPPER_DIR:Q}
+MAKE_ENV+=	WRAPPER_DIR=${WRAPPER_DIR}
 
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
diff --git a/devel/apr-util/buildlink3.mk b/devel/apr-util/buildlink3.mk
index ba3db22eb0d..3d4a2a963ac 100644
--- a/devel/apr-util/buildlink3.mk
+++ b/devel/apr-util/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2010/01/17 12:02:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2010/06/02 13:19:43 adam Exp $
 
 BUILDLINK_TREE+=	apr-util
 
@@ -23,7 +23,8 @@ pkgbase := apr-util
 .include "../../mk/pkg-build-options.mk"
 
 .if !empty(PKG_BUILD_OPTIONS.apr-util:Mdb4)
-.  include "../../databases/db4/buildlink3.mk"
+BDB_ACCEPTED?=		db4 db5
+.  include "../../mk/bdb.buildlink3.mk"
 .endif
 
 .if !empty(PKG_BUILD_OPTIONS.apr-util:Mldap)
diff --git a/devel/apr-util/options.mk b/devel/apr-util/options.mk
index 5ea69db5ab8..82b07d253c8 100644
--- a/devel/apr-util/options.mk
+++ b/devel/apr-util/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2009/11/23 22:57:52 rillig Exp $
+# $NetBSD: options.mk,v 1.6 2010/06/02 13:19:43 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.apr-util
 PKG_SUPPORTED_OPTIONS=	db4 ldap mysql pgsql sqlite3
@@ -8,10 +8,11 @@ PKG_SUPPORTED_OPTIONS=	db4 ldap mysql pgsql sqlite3
 PLIST_VARS+=		ldap mysql pgsql sqlite3 db4
 
 .if !empty(PKG_OPTIONS:Mdb4)
-CONFIGURE_ARGS+=	\
-	--with-berkeley-db=${BUILDLINK_PREFIX.db4}/include:${LOCALBASE}
-PLIST.db4=	yes
-.  include "../../databases/db4/buildlink3.mk"
+BDB_ACCEPTED=		db4 db5
+BUILDLINK_TRANSFORM+=	l:db4:${BDB_TYPE}
+CONFIGURE_ARGS+=	--with-berkeley-db=${BDBBASE}/include:${LOCALBASE}
+PLIST.db4=		yes
+.  include "../../mk/bdb.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--with-dbm=sdbm
 .endif
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index cf0e4668c42..b8aa3f044b0 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.77 2009/09/13 22:47:30 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2010/06/02 13:15:48 adam Exp $
 
 DISTNAME=		mutt-1.5.20
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		mail
 MUTT_SITES=		ftp://ftp.mutt.org/mutt/ \
 			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
@@ -20,14 +20,13 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		msgfmt
-
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}		\
-			--with-docdir=${PREFIX}/share/doc/mutt		\
-			--without-included-gettext			\
-			--enable-external-dotlock			\
-			--enable-pop					\
-			--enable-imap
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/mutt
+CONFIGURE_ARGS+=	--without-included-gettext
+CONFIGURE_ARGS+=	--enable-external-dotlock
+CONFIGURE_ARGS+=	--enable-pop
+CONFIGURE_ARGS+=	--enable-imap
 
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
 # Force sendmail to /usr/sbin to avoid postfix's
diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk
index 9418b0dd989..2283e06135d 100644
--- a/mail/mutt-devel/options.mk
+++ b/mail/mutt-devel/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.39 2010/04/15 19:36:32 tonio Exp $
+# $NetBSD: options.mk,v 1.40 2010/06/02 13:15:48 adam Exp $
 
 # Global and legacy options
 
@@ -87,16 +87,16 @@ CONFIGURE_ARGS+=	--disable-smime
 ### Header cache
 ###
 .if !empty(PKG_OPTIONS:Mmutt-hcache)
-.  include "../../databases/db4/buildlink3.mk"
+BDB_ACCEPTED=		db4 db5
+BUILDLINK_TRANSFORM+=	l:db:${BDB_TYPE}
+.  include "../../mk/bdb.buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-hcache
 CONFIGURE_ARGS+=	--without-gdbm
-#
 # BDB_INCLUDE_DIR_ and BDB_LIB_DIR don't have to be particularly accurate
 # since the real -I and -L flags are added by buildlink already.
-#
-CONFIGURE_ENV+=		BDB_INCLUDE_DIR=${BUILDLINK_PREFIX.db4}/include
-CONFIGURE_ENV+=		BDB_LIB_DIR=${BUILDLINK_PREFIX.db4}/lib
-CONFIGURE_ENV+=		BDB_LIB=${BUILDLINK_LDADD.db4:S/^-l//:Q}
+CONFIGURE_ENV+=		BDB_INCLUDE_DIR=${BDBBASE}/include
+CONFIGURE_ENV+=		BDB_LIB_DIR=${BDBBASE}/lib
+CONFIGURE_ENV+=		BDB_LIB=${BDB_LIBS:S/^-l//:Q}
 .else
 CONFIGURE_ARGS+=	--disable-hcache
 .endif
diff --git a/mail/spamprobe/Makefile b/mail/spamprobe/Makefile
index b269944f41e..672262fb319 100644
--- a/mail/spamprobe/Makefile
+++ b/mail/spamprobe/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2010/01/24 13:26:11 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/02 13:17:22 adam Exp $
 
 DISTNAME=	spamprobe-1.4d
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=spamprobe/}
 
@@ -12,10 +12,9 @@ COMMENT=	Spam detector using Bayesian analysis of word counts
 PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES= overwrite pkgviews
 
-USE_LANGUAGES=	c c++
-GNU_CONFIGURE=	YES
-
-CONFIGURE_ARGS+= --enable-default-8bit
+USE_LANGUAGES=		c c++
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-default-8bit
 
 .include "options.mk"
 
diff --git a/mail/spamprobe/distinfo b/mail/spamprobe/distinfo
index d155bd32b76..0d2af4626fc 100644
--- a/mail/spamprobe/distinfo
+++ b/mail/spamprobe/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.12 2007/10/25 16:00:05 ghen Exp $
+$NetBSD: distinfo,v 1.13 2010/06/02 13:17:22 adam Exp $
 
 SHA1 (spamprobe-1.4d.tar.gz) = fbcd65eb21097cd860d5e5ee2c4c2524c717a237
 RMD160 (spamprobe-1.4d.tar.gz) = 4a9e098b92e6900d8b03d7ed5e8d052f2b2e8c56
 Size (spamprobe-1.4d.tar.gz) = 262761 bytes
+SHA1 (patch-aa) = 1a139882a9913537663a0d03b645e014b488ecbe
diff --git a/mail/spamprobe/options.mk b/mail/spamprobe/options.mk
index 14e8310b138..60359657c6b 100644
--- a/mail/spamprobe/options.mk
+++ b/mail/spamprobe/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2007/10/25 21:45:42 ghen Exp $
+# $NetBSD: options.mk,v 1.7 2010/06/02 13:17:22 adam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.spamprobe
 PKG_SUPPORTED_OPTIONS=		bdb gif png jpeg
@@ -7,9 +7,10 @@ PKG_SUGGESTED_OPTIONS=		gif png jpeg
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mbdb)
-BDB_ACCEPTED=		db4 # db3 db2 (not tested)
+BDB_ACCEPTED=		db4 db5 # db3 db2 (not tested)
+BUILDLINK_TRANSFORM+=	l:db:${BDB_TYPE}
 .include "../../mk/bdb.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-db=${BDBBASE:Q}
+CONFIGURE_ARGS+=	--with-db=${BDBBASE}
 .endif
 
 .if !empty(PKG_OPTIONS:Mgif)
diff --git a/mail/spamprobe/patches/patch-aa b/mail/spamprobe/patches/patch-aa
new file mode 100644
index 00000000000..d156078af2a
--- /dev/null
+++ b/mail/spamprobe/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.5 2010/06/02 13:17:22 adam Exp $
+
+--- src/database/FrequencyDBImpl_bdb.cc.orig	2010-06-02 08:31:38.000000000 +0000
++++ src/database/FrequencyDBImpl_bdb.cc
+@@ -155,7 +155,7 @@ bool FrequencyDBImpl_bdb::openDatabase(c
+   // hideous ifdefs into my code.
+   string filename(m_env ? db_file.getName() : db_file.getPath());
+   int flags = read_only ? DB_RDONLY : DB_CREATE;
+-#if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1)
+   ret = m_file->open(m_file, NULL, filename.c_str(), NULL, DB_BTREE, flags, create_mode);
+ #else
+   ret = m_file->open(m_file, filename.c_str(), NULL, DB_BTREE, flags, create_mode);