Fix building with db5; revision bump for db4 update

6 files changed, 39 insertions, 26 deletions

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