From c8db35a95be5240a1a36a1c0f2e0d726111c8dcb Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Fri, 14 Jan 2005 18:20:33 +0000
Subject: bogofilter seems to require db4, so include db4/buildlink3.mk
 directly instead of indirectly via bdb.buildlink3.mk.  Also, fix compilation
 to account for differences beteween db-4.3.x and db-4.2.x.  This should fix
 PR pkg/28949.

---
 mail/bogofilter/Makefile         |  7 +++----
 mail/bogofilter/distinfo         |  3 ++-
 mail/bogofilter/patches/patch-ac | 16 ++++++++++++++++
 3 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 mail/bogofilter/patches/patch-ac

(limited to 'mail/bogofilter')

diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 5091add303c..89560860fbf 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/11/15 17:54:49 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/01/14 18:20:33 jlam Exp $
 
 DISTNAME=	bogofilter-0.92.8
 CATEGORIES=	mail
@@ -22,8 +22,7 @@ CONF_FILES=		${EGDIR}/bogofilter.cf ${PKG_SYSCONFDIR}/bogofilter.cf
 
 REPLACE_PERL=		src/bogoupgrade
 
-USE_DB185=		YES
-BDB_ACCEPTED=		db4
+BUILDLINK_TRANSFORM+=	l:db:db4
 
-.include "../../mk/bdb.buildlink3.mk"
+.include "../../databases/db4/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/bogofilter/distinfo b/mail/bogofilter/distinfo
index 5c82b43cd50..65bf1c5ecbc 100644
--- a/mail/bogofilter/distinfo
+++ b/mail/bogofilter/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.12 2004/10/26 05:41:41 snj Exp $
+$NetBSD: distinfo,v 1.13 2005/01/14 18:20:33 jlam Exp $
 
 SHA1 (bogofilter-0.92.8.tar.bz2) = ffaf181f71dfee7d4475d5c20fed4a8f50a3e7c4
 Size (bogofilter-0.92.8.tar.bz2) = 637420 bytes
 SHA1 (patch-aa) = 2ce311616845a75aa978f96f5792db65b66539d5
 SHA1 (patch-ab) = f55a9956d82f56cef686a9125983ec5fd6942809
+SHA1 (patch-ac) = cf17329aee9120b24d6206d8259c249d1021cf9a
diff --git a/mail/bogofilter/patches/patch-ac b/mail/bogofilter/patches/patch-ac
new file mode 100644
index 00000000000..92509d0ab25
--- /dev/null
+++ b/mail/bogofilter/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.1 2005/01/14 18:20:33 jlam Exp $
+
+--- src/datastore_db.c.orig	2004-09-28 23:28:04.000000000 -0400
++++ src/datastore_db.c
+@@ -237,7 +237,11 @@ static uint32_t get_psize(DB *dbp)
+     uint32_t ret, pagesize;
+     DB_BTREE_STAT *dbstat = NULL;
+ 
++#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3)
++    ret = dbp->stat(dbp, &dbstat, NULL, DB_FAST_STAT);
++#else
+     ret = dbp->stat(dbp, &dbstat, DB_FAST_STAT);
++#endif
+     if (ret) {
+ 	dbp->err (dbp, ret, "%s (db) DB->stat", progname);
+ 	return 0xffffffff;
-- 
cgit v1.2.3