diff options
| author | adam <adam> | 2010-06-02 13:14:47 +0000 |
|---|---|---|
| committer | adam <adam> | 2010-06-02 13:14:47 +0000 |
| commit | 6f060bdbcc6f85533a3f31031a80f1cbb3fa7cf6 (patch) | |
| tree | 67b3e0570f90708d3283ac9230d0d2d9777800d5 /mail/spamprobe | |
| parent | bd7503a8496882a777a07359af2ebc675464aa8f (diff) | |
| download | pkgsrc-6f060bdbcc6f85533a3f31031a80f1cbb3fa7cf6.tar.gz | |
Fix building with db5; revision bump for db4 update
Diffstat (limited to 'mail/spamprobe')
| -rw-r--r-- | mail/spamprobe/Makefile | 11 | ||||
| -rw-r--r-- | mail/spamprobe/distinfo | 3 | ||||
| -rw-r--r-- | mail/spamprobe/options.mk | 7 | ||||
| -rw-r--r-- | mail/spamprobe/patches/patch-aa | 13 |
4 files changed, 24 insertions, 10 deletions
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); |