Update bogofilter to 1.2.2.

pkgsrc changes:
 * accept bdb3 and bdb5, rename db4 option to bdb.
 * accept tokyocabinet for db engine.
 * buildlink with libiconv for UNICODE support.
-------------------------------------------------------------------------------

1.2.2	2010-10-08 (released)

	2010-07-05
	* Use a better PRNG for random sleeps. That is arc4random() where
	  available, and drand48() elsewhere.

	* Assorted fixes for issues found with clang analyzer:
	  + Fix a potential NULL deference
	  + Fix a potential division by zero
	  + Remove dead assignments and increments

	* Update Doxyfile and source contrib/bogogrep.c for docs, too.

	2010-07-03

	* Security bugfix, CVE-2010-2494:
	  Fix a heap corruption in base64 decoder on invalid input.
	  Analysis and patch by Julius Plenz <plenz@cis.fu-berlin.de>.
	  Please see doc/bogofilter-SA-2010-01 for details.

	2010-04-07

	* Updated sendmail milter contrib/bogofilter-milter.pl to v1.??????
	  (thanks to Jonathan Kamens)

	2010-04-01

	* Bump supported/minimum SQLite3 versions and warning threshold.
	  See doc/README.sqlite for details.

	* Mark BerkeleyDB 4.8.26 and 5.0.21 supported.

	  Note that Berkeley DB 5.0's SQLite3 compatibility API is NOT
	  supported, it causes shifts in scores and write failures under
	  contention.  Bogofilter can use Berkeley DB 5.0's native interface,
	  and using that is more efficient than the added SQL shim layer.

	2010-03-06

	* Make t.maint more robust; ignore .ENCODING token. To fix test
	  failures on, for instance, FreeBSD with unicode enabled.

	2010-02-15

	* Fix several compiler warnings "array subscript has type 'char'", by
	  casting the arguments to unsigned char.
	     A security audit was conducted and showed that all affected
	  functions either received the relevant input from the user running
	  bogofilter, or the input had already been pre-validated by the token
	  lexer.

	2010-02-14

	* Split error messages for ENOENT and EINVAL into new function.
	* Avoid divison by zero in robx computation by checking if there are at
	  least one ham message and one spam message registered.

	2009-08-13

	* contrib/spamitarium.pl updated to version 0.4.0
	  (thanks to Tom Anderson)

	2009-08-05

	* Updated and integrated Ted Phelps's "Patch to prevent .ENCODING from
	  being discarded by bogoutil -m" (SourceForge Patch #1743984).
	  Thanks to Ted for debugging the issue and providing the patch (which
	  was for bogofilter v1.1.5).

	2009-09-15
	* Promoted to "stable"

1.2.1	2009-08-01 (released)

	2009-08-01

	* Update configure to use "host" rather than "target", to match the
	  newer autotools cross-build semantics. Untested.
	  Developers changing the build system and users who build from SVN
	  will now need automake 1.9 and autoconf 2.60.

	2009-07-31

	* Fix Christian Frommeyer's MIME decoding bug, Ubuntu/Launchpad Bug
	  #320829. As a side effect, also fixes misattribution of MIME bodies
	  as MIME headers with mime: tag.  Original bug report:
	  https://bugs.launchpad.net/ubuntu/+source/bogofilter/+bug/320829

	  Before this fix, bogofilter did not properly MIME-decode the first
	  line in a body. This was especially bad with Christian's samples
	  where the whole body was only one long base64 line.

	2009-05-28

	* Removed two scripts that are auto-built.

	* Added test case for Stephen Davies' Q-P EOL problem (see below).

	2009-05-25

	* Fixed EOL problem in quoted_printable text. Problem reported by
	  Stephen Davies and identified by Pavel Kankovsky.

	2009-03-28
	* Promoted to "stable"

1.2.0	2009-02-21 (released) 2009-03-28 (declared stable)

	2009-02-20
	* Flex-2.5.35 has fix for memory allocation problem in 2.5.4,
          2.5.31, and 2.5.33, making bogofilter's flex patch obsolete.

	2009-02-12

	* Bogofilter now uses listsort in place of qsort.

	2009-01-31

	* Added token-count=n, token-count-min=n, and token-count-max=n options.

	* Minor code cleanups.

	2009-01-21

	* spamitarium.pl updated to version 0.3.0
	  (thanks to Tom Anderson)

	2009-01-11

	* For compatibility with Sun's Sun Studio 12 compiler, provide
          a name for the anonymous union in typedef word_t.
	  Patch provided by Jack Bailey.

	2008-10-20

	* update bf_compact documentation by removing explicit Berkeley DB
	  references, as it has been fixed to work with other database drivers
	  in March 2008.

	2008-10-15

	* bf_compact, bf_copy and bf_tar now support transformed program names
	  (fixes Debian Bug#501947).

	* Update sqlite3 adaptor to take advantage of sqlite3_prepare_v2()
	  API function that appeared in SQLite 3.3.9. The new _v2 interface
	  allows for more specific error messages when executing SQL
	  statements.  Also enable extended result codes for more precise error
	  reporting.

	2008-07-21

	* Update doc/integrating-with-postfix: the script now suggests sendmail
	  -G -i (where -G will be ignored by Postfix before 2.3) to tell
	  Postfix it's a gateway submission, not an original injection; the
	  filter pipe(8) magic for master.cf now suggests flags=Rq (was
	  flags=R), as per Postfix's FILTER_README.

	2008-07-09

	* Drop support for systems that reverse setvbuf arguments. The last
	  systems to do that are reported to be shipped in 1987 by the autoconf
	  manual, so ditch them.

5 files changed, 26 insertions, 48 deletions

diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index aac1da5c113..1a5581e0320 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2008/10/15 12:15:40 martti Exp $
+# $NetBSD: Makefile,v 1.41 2010/07/24 09:33:09 obache Exp $
 
-DISTNAME=	bogofilter-1.1.7
-#PKGREVISION=	1
+DISTNAME=	bogofilter-1.2.2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bogofilter/}
 EXTRACT_SUFX=	.tar.bz2
@@ -15,15 +14,17 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	YES
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+
+INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples/bogofilter
 
 EGDIR=			${PREFIX}/share/examples/bogofilter
-CONF_FILES=		${EGDIR}/bogofilter.cf ${PKG_SYSCONFDIR}/bogofilter.cf
+CONF_FILES=		${EGDIR}/bogofilter.cf.example ${PKG_SYSCONFDIR}/bogofilter.cf
 
 USE_TOOLS+=		perl:run
-REPLACE_PERL=		src/bogoupgrade
 
 .include "options.mk"
 
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../math/gsl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/bogofilter/PLIST b/mail/bogofilter/PLIST
index 4a43dc5a677..016b545f6ea 100644
--- a/mail/bogofilter/PLIST
+++ b/mail/bogofilter/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:04:27 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2010/07/24 09:33:09 obache Exp $
 bin/bf_compact
 bin/bf_copy
 bin/bf_tar
@@ -16,4 +16,4 @@ man/man1/bogolexer.1
 man/man1/bogotune.1
 man/man1/bogoupgrade.1
 man/man1/bogoutil.1
-share/examples/bogofilter/bogofilter.cf
+share/examples/bogofilter/bogofilter.cf.example
diff --git a/mail/bogofilter/distinfo b/mail/bogofilter/distinfo
index 6e233a8a919..bfe1043d100 100644
--- a/mail/bogofilter/distinfo
+++ b/mail/bogofilter/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.19 2008/10/15 12:15:40 martti Exp $
+$NetBSD: distinfo,v 1.20 2010/07/24 09:33:09 obache Exp $
 
-SHA1 (bogofilter-1.1.7.tar.bz2) = b34e2bf224a2139e080960fb44cf2abe1c35c9b3
-RMD160 (bogofilter-1.1.7.tar.bz2) = 799a375d54441c8fd6355921c468f33f7e65a46f
-Size (bogofilter-1.1.7.tar.bz2) = 839687 bytes
-SHA1 (patch-aa) = e45350ce0f2f74af949b6a298e98873da3798239
+SHA1 (bogofilter-1.2.2.tar.bz2) = 6d2860c1d919fe47a8efcfc7fd6de9433872f21d
+RMD160 (bogofilter-1.2.2.tar.bz2) = a522d0c7d2deae59d479c67f64e9bd9551b59096
+Size (bogofilter-1.2.2.tar.bz2) = 867043 bytes
 SHA1 (patch-ab) = f55a9956d82f56cef686a9125983ec5fd6942809
diff --git a/mail/bogofilter/options.mk b/mail/bogofilter/options.mk
index 0151420f270..d4378ca906f 100644
--- a/mail/bogofilter/options.mk
+++ b/mail/bogofilter/options.mk
@@ -1,16 +1,18 @@
-# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:03 jlam Exp $
+# $NetBSD: options.mk,v 1.4 2010/07/24 09:33:09 obache Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.bogofilter
 PKG_OPTIONS_REQUIRED_GROUPS=	database
-PKG_OPTIONS_GROUP.database=	db4 qdbm sqlite
-PKG_SUGGESTED_OPTIONS=		db4
+PKG_OPTIONS_GROUP.database=	bdb qdbm sqlite tokyocabinet
+PKG_SUGGESTED_OPTIONS=		bdb
+PKG_OPTIONS_LEGACY_OPTS+=	db4:bdb
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mdb4)
+.if !empty(PKG_OPTIONS:Mbdb)
 CONFIGURE_ARGS+=		--with-database=db
-.include "../../databases/db4/buildlink3.mk"
-BUILDLINK_TRANSFORM+=		l:db:db4
+BDB_ACCEPTED=			db3 db4 db5
+.include "../../mk/bdb.buildlink3.mk"
+BUILDLINK_TRANSFORM+=		l:db:${BDB_TYPE}
 .endif
 
 PLIST_VARS+=			qdbm
@@ -24,3 +26,8 @@ PLIST.qdbm=			yes
 CONFIGURE_ARGS+=		--with-database=sqlite3
 .include "../../databases/sqlite3/buildlink3.mk"
 .endif
+
+.if !empty(PKG_OPTIONS:Mtokyocabinet)
+CONFIGURE_ARGS+=		--with-database=tokyocabinet
+.include "../../databases/tokyocabinet/buildlink3.mk"
+.endif
diff --git a/mail/bogofilter/patches/patch-aa b/mail/bogofilter/patches/patch-aa
deleted file mode 100644
index d6fc5f1e750..00000000000
--- a/mail/bogofilter/patches/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2008/10/15 12:15:40 martti Exp $
-
---- Makefile.in.orig	2008-04-20 18:59:42.000000000 +0300
-+++ Makefile.in	2008-10-15 14:42:37.000000000 +0300
-@@ -246,6 +246,7 @@
- 
- # what to build
- sysconf_DATA = bogofilter.cf.example
-+egdir = $(prefix)/share/examples/bogofilter
- 
- # what to distribute
- EXTRA_DIST = autogen.sh gsl config.rpath bogofilter.cf.example \
-@@ -399,14 +400,8 @@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bogogrep.obj `if test -f 'contrib/bogogrep.c'; then $(CYGPATH_W) 'contrib/bogogrep.c'; else $(CYGPATH_W) '$(srcdir)/contrib/bogogrep.c'; fi`
- install-sysconfDATA: $(sysconf_DATA)
--	@$(NORMAL_INSTALL)
--	test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
--	@list='$(sysconf_DATA)'; for p in $$list; do \
--	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  f=$(am__strip_dir) \
--	  echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
--	  $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
--	done
-+	$(mkdir_p) $(DESTDIR)$(egdir)
-+	$(INSTALL_DATA) $(sysconf_DATA) $(DESTDIR)$(egdir)/bogofilter.cf
- 
- uninstall-sysconfDATA:
- 	@$(NORMAL_UNINSTALL)