From a7a0b050f24a5bd17853673ef97e77c128cf20a7 Mon Sep 17 00:00:00 2001
From: hubertf <hubertf>
Date: Wed, 29 Jun 2005 00:06:51 +0000
Subject: Update spamprobe to 1.2a.

SpamProbe changes:
 - New email parsing implementation
 - New hash database, in addition to Berkeley DB (bdb/db4)
   (=> Hopefully no more "caught runtime exception: get: DB_PAGE_NOTFOUND:
       Requested page not found" on Linux every other day!)
 - And much more, check the ChangeLog for accurate information

pkgsrc changes:
 - Added db4 database backend to be optional (not requirement anymore)

Patches sent by the maintainer Ossi Herrala <oherrala@ee.oulu.fi>
in private mail.
---
 mail/spamprobe/Makefile   |  8 +++-----
 mail/spamprobe/distinfo   |  8 ++++----
 mail/spamprobe/options.mk | 14 ++++++++++++++
 3 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 mail/spamprobe/options.mk

(limited to 'mail/spamprobe')

diff --git a/mail/spamprobe/Makefile b/mail/spamprobe/Makefile
index 20b4dce12a4..481132b8560 100644
--- a/mail/spamprobe/Makefile
+++ b/mail/spamprobe/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2005/06/12 08:59:32 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/06/29 00:06:58 hubertf Exp $
 
-DISTNAME=	spamprobe-1.0a
+DISTNAME=	spamprobe-1.2a
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=spamprobe/}
 
@@ -14,9 +14,7 @@ USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	YES
 
 CONFIGURE_ARGS+= --enable-default-8bit
-CONFIGURE_ARGS+= --with-db=${BUILDLINK_PREFIX.db4}
 
-BUILDLINK_TRANSFORM+=	l:db:db4
+.include "options.mk"
 
-.include "../../databases/db4/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/spamprobe/distinfo b/mail/spamprobe/distinfo
index 3cfd93f958b..ffd77fbea51 100644
--- a/mail/spamprobe/distinfo
+++ b/mail/spamprobe/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 09:59:29 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/06/29 00:06:58 hubertf Exp $
 
-SHA1 (spamprobe-1.0a.tar.gz) = 4077b4b5280b29fa08b31b3131ee5cf005faefd7
-RMD160 (spamprobe-1.0a.tar.gz) = 8ce035880b88f69cee01f42fbd1a9a154e88d752
-Size (spamprobe-1.0a.tar.gz) = 165747 bytes
+SHA1 (spamprobe-1.2a.tar.gz) = 63470a74339faeb78c61a2d8a60e6d215bec47f2
+RMD160 (spamprobe-1.2a.tar.gz) = 036b78c096cb49598a2c68c72a7753d72baf5704
+Size (spamprobe-1.2a.tar.gz) = 189240 bytes
diff --git a/mail/spamprobe/options.mk b/mail/spamprobe/options.mk
new file mode 100644
index 00000000000..6073bde1d2a
--- /dev/null
+++ b/mail/spamprobe/options.mk
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2005/06/29 00:06:58 hubertf Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.spamprobe
+PKG_SUPPORTED_OPTIONS=		bdb
+PKG_SUGGESTED_OPTIONS=		bdb
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mbdb)
+BDB_ACCEPTED=           db4 # db3 db2 (not tested)
+.include "../../mk/bdb.buildlink3.mk"
+CONFIGURE_ARGS+=        --with-db=${BDBBASE}
+.endif
+
-- 
cgit v1.2.3