* TDB is now supported (will be filed as a separate

  bogofilter-tdb port)
* bogofilter now supports a (faster) "combined data base"
* (single file) for
  fresh installs, but continues to support the former "separate
  data base" (two files) format.
* WARNING: the exit code for "error" has changed from 2 to 3
  Update your scripts to use -T or to use the new exit codes.
* bugfixes
* new -T fixed-formatting terse mode for scripts
* documentation updates (FAQ)
* bogofilter can now degenerate tokens before looking them up
* support for encoded tokens was enhanced
* bogoutil error reporting improved
* new bogominitrain.pl script

PR:		55660
Submitted by:	maintainer

3 files changed, 17 insertions, 8 deletions

diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 9cfc4da..f480c86 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bogofilter
-PORTVERSION=	0.13.7.2
+PORTVERSION=	0.14.5
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,14 +14,16 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	matthias.andree@web.de
 COMMENT=	"Fast, teachable, learning spam detector"
 
-LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4
+# There is a sibling port, bogofilter-tdb, which presets different
+# values for some of our variables
+LIB_DEPENDS?=	db4.0:${PORTSDIR}/databases/db4
 
 USE_PERL5_RUN=	yes
 GNU_CONFIGURE=	yes
 PATCH_STRIP=	-p1
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/db4" \
+CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc
+CONFIGURE_ENV?=	CPPFLAGS="-I${LOCALBASE}/include/db4" \
 		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-ldb4"
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 MAN1=		bogofilter.1 bogoutil.1 bogoupgrade.1 bogolexer.1 \
 		bogol.1 bogotune.1
@@ -43,10 +45,12 @@ post-install::
 	@${MKDIR} ${DOCSDIR}/xml
 .for i in AUTHORS COPYING INSTALL NEWS README README.cvs \
 	TODO UPGRADE \
-	CHANGES-0.10 CHANGES-0.11 CHANGES-0.12 CHANGES-0.13 \
+	CHANGES-0.10 CHANGES-0.11 CHANGES-0.12 CHANGES-0.13 CHANGES-0.14 \
 	RELEASE.NOTES-0.11 RELEASE.NOTES-0.12 RELEASE.NOTES-0.13 \
+	RELEASE.NOTES-0.14 \
 	doc/integrating-with-postfix doc/integrating-with-qmail \
-	doc/bogofilter-tuning.HOWTO doc/bogofilter-SA-2002-01 METHODS
+	doc/bogofilter-tuning.HOWTO doc/bogofilter-SA-2002-01 METHODS \
+	doc/README.tdb
 	  ${INSTALL_MAN} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .for i in README.bogotune
@@ -64,7 +68,8 @@ post-install::
 .endfor
 .for i in contrib/bogo.R contrib/bogofilter-qfe \
 		contrib/randomtrain contrib/scramble \
-		contrib/mime.get.rfc822 contrib/printmaildir.pl
+		contrib/mime.get.rfc822 contrib/printmaildir.pl \
+		contrib/bogominitrain.pl
 	  ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DOCSDIR}/${i}
 .endfor
 .for i in contrib/README.randomtrain contrib/dot-qmail-bogofilter-default
diff --git a/mail/bogofilter/distinfo b/mail/bogofilter/distinfo
index 89142ad..6fc1fb3 100644
--- a/mail/bogofilter/distinfo
+++ b/mail/bogofilter/distinfo
@@ -1 +1 @@
-MD5 (bogofilter-0.13.7.2.tar.gz) = 77dee50af4eb37a3099345fc6ccb530a
+MD5 (bogofilter-0.14.5.tar.gz) = 170b44951c0135cb8f70734e18d6a3f1
diff --git a/mail/bogofilter/pkg-plist b/mail/bogofilter/pkg-plist
index b391335..08209cc 100644
--- a/mail/bogofilter/pkg-plist
+++ b/mail/bogofilter/pkg-plist
@@ -8,6 +8,7 @@ etc/bogofilter.cf.example
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.11
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.12
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.13
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.14
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/METHODS
@@ -15,9 +16,11 @@ etc/bogofilter.cf.example
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/bogofilter-tuning.HOWTO
 %%PORTDOCS%%%%DOCSDIR%%/README.cvs
+%%PORTDOCS%%%%DOCSDIR%%/README.tdb
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.11
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.12
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.13
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.14
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADE
 %%PORTDOCS%%%%DOCSDIR%%/bogofilter-SA-2002-01
@@ -25,6 +28,7 @@ etc/bogofilter.cf.example
 %%PORTDOCS%%%%DOCSDIR%%/contrib/bogo.R
 %%PORTDOCS%%%%DOCSDIR%%/contrib/bogofilter-qfe
 %%PORTDOCS%%%%DOCSDIR%%/contrib/bogogrep
+%%PORTDOCS%%%%DOCSDIR%%/contrib/bogominitrain.pl
 %%PORTDOCS%%%%DOCSDIR%%/contrib/dot-qmail-bogofilter-default
 %%PORTDOCS%%%%DOCSDIR%%/contrib/mime.get.rfc822
 %%PORTDOCS%%%%DOCSDIR%%/contrib/printmaildir.pl