Update to bogofilter-0.16.4, bl3ify, tidy up DESCR. Okayed by jmmv and wiz.

Changes since 0.15.7:
* Perl 5.6 fixes in bogoupgrade
* Install bogotune and bogotune man page
* The -q and -F flags (both unused) were removed
* Alpha/SH(3?) portability fixes
* Gobs and gobs of bugfixes
* The Graham and Robinson algorithms were removed
* Support for old style (separate good/bad) wordlists was removed
* Support for ignore lists was removed

5 files changed, 29 insertions, 27 deletions

diff --git a/mail/bogofilter/DESCR b/mail/bogofilter/DESCR
index ee797f5cdc1..84449ce0906 100644
--- a/mail/bogofilter/DESCR
+++ b/mail/bogofilter/DESCR
@@ -1,7 +1,7 @@
 Bogofilter is a mail filter that classifies mail as spam or ham
 (non-spam) by a statistical analysis of the message's header and
-content (body).  The program is able to learn from the user's
-classifications and corrections.
+content (body).  It is able to learn from the user's classifications
+and corrections.
 
 The statistical technique is known as the Bayesian technique and
 its use for spam was first described by Paul Graham in his article
@@ -12,9 +12,6 @@ Fisher inverse chi-square technique that he describes.
 
 Bogofilter is run by an MDA script to classify an incoming message
 as spam or ham (using wordlists stored by BerkeleyDB).  Bogofilter
-provides processing for plain text and html.  It supports multi-part
+provides processing for plain text and HTML.  It supports multi-part
 mime message with decoding of base64, quoted-printable, and
 uuencoded text and ignores attachments, such as images.
-
-Bogofilter is written in C.  Supported platforms: Linux, FreeBSD,
-Solaris, OS X, HP-UX, AIX, ...
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 1c043fea869..a136326a241 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2004/01/15 07:58:39 manu Exp $
+# $NetBSD: Makefile,v 1.14 2004/02/09 00:59:06 snj Exp $
 #
 
-DISTNAME=	bogofilter-0.15.7
-PKGREVISION=	1
+DISTNAME=	bogofilter-0.16.4
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bogofilter/}
 
@@ -10,11 +9,13 @@ MAINTAINER=	manu@NetBSD.org
 HOMEPAGE=	http://bogofilter.sourceforge.net/
 COMMENT=	Bayesian spam filter written in C
 
-USE_BUILDLINK2=	YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 GNU_CONFIGURE=	YES
 
-CONFIGURE_ARGS+=	--with-db=${BUILDLINK_PREFIX.db4}/include/db4
+CONFIGURE_ARGS+=	--with-libdb-prefix=${BUILDLINK_PREFIX.db4}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 EGDIR=			${PREFIX}/share/examples/bogofilter
@@ -22,5 +23,7 @@ CONF_FILES=		${EGDIR}/bogofilter.cf ${PKG_SYSCONFDIR}/bogofilter.cf
 
 REPLACE_PERL=		src/bogoupgrade
 
-.include "../../databases/db4/buildlink2.mk"
+BUILDLINK_TRANSFORM+=	l:db:db4
+
+.include "../../databases/db4/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/bogofilter/PLIST b/mail/bogofilter/PLIST
index ec32435fbb5..5e59c472ebb 100644
--- a/mail/bogofilter/PLIST
+++ b/mail/bogofilter/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2003/09/30 07:11:48 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/02/09 00:59:06 snj Exp $
 bin/bogofilter
 bin/bogolexer
+bin/bogotune
 bin/bogoupgrade
 bin/bogoutil
 man/man1/bogofilter.1
 man/man1/bogolexer.1
+man/man1/bogotune.1
 man/man1/bogoupgrade.1
 man/man1/bogoutil.1
 share/examples/bogofilter/bogofilter.cf
diff --git a/mail/bogofilter/distinfo b/mail/bogofilter/distinfo
index bc244a24625..c48e1d1c0fd 100644
--- a/mail/bogofilter/distinfo
+++ b/mail/bogofilter/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2004/01/14 20:16:39 manu Exp $
+$NetBSD: distinfo,v 1.7 2004/02/09 00:59:06 snj Exp $
 
-SHA1 (bogofilter-0.15.7.tar.gz) = cbcd85d870c0ff23070f3ffd77aea2028030df8a
-Size (bogofilter-0.15.7.tar.gz) = 924015 bytes
-SHA1 (patch-aa) = 45b28c90c420cfdb80f974e1aebbcec3f1364076
+SHA1 (bogofilter-0.16.4.tar.gz) = 2a6ff25cb6e01573e4bff231e8f82b8220e967c4
+Size (bogofilter-0.16.4.tar.gz) = 725732 bytes
+SHA1 (patch-aa) = 3d8b44dbd8751a5c3f7000fe4bb3a53c2947213f
 SHA1 (patch-ab) = f3085cdbb85e33e61116cb00737c8bd1031c35b1
diff --git a/mail/bogofilter/patches/patch-aa b/mail/bogofilter/patches/patch-aa
index 8ed5d0aaecd..0c2d538d350 100644
--- a/mail/bogofilter/patches/patch-aa
+++ b/mail/bogofilter/patches/patch-aa
@@ -1,28 +1,28 @@
-$NetBSD: patch-aa,v 1.1 2003/09/30 07:11:48 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2004/02/09 00:59:06 snj Exp $
 
---- Makefile.in.orig	2003-09-30 08:55:28.000000000 +0200
-+++ Makefile.in	2003-09-30 08:56:15.000000000 +0200
-@@ -148,6 +148,7 @@
+--- Makefile.in.orig	2004-01-23 14:35:06.000000000 -0800
++++ Makefile.in	2004-01-24 00:50:28.000000000 -0800
+@@ -204,6 +204,7 @@
  
  # what to build
  sysconf_DATA = bogofilter.cf.example
 +egdir = $(prefix)/share/examples/bogofilter
  
- # what to build that from
- 
-@@ -205,14 +206,8 @@
+ # what to distribute
+ EXTRA_DIST = autogen.sh gsl config.rpath \
+@@ -257,14 +258,8 @@
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
  uninstall-info-am:
- sysconfDATA_INSTALL = $(INSTALL_DATA)
  install-sysconfDATA: $(sysconf_DATA)
 -	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+-	$(mkdir_p) $(DESTDIR)$(sysconfdir)
 -	@list='$(sysconf_DATA)'; for p in $$list; do \
 -	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 -	  f="`echo $$p | sed -e 's|^.*/||'`"; \
 -	  echo " $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \
 -	  $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \
 -	done
-+	$(mkinstalldirs) $(egdir)
++	$(mkdir_p) $(egdir)
 +	$(INSTALL_DATA) $(sysconf_DATA) $(egdir)/bogofilter.cf
  
  uninstall-sysconfDATA: