Updated to 0.14.5.4.

While updating, make bogofilter use the bsd.pkg.install.mk
framework to install the configuration file into PKG_SYSCONFDIR.

Patch provided by Soren Jacobsen in PR pkg/22983.

Changes:

Changes:
0.14.5.4
* _Really_ fix defective printing in 'bogofilter -Q' output.
0.14.5.3
* Fix parser errors that can cause:
  1. Incorrect processing of html comments.
  2. "fatal flex scanner internal error--end of buffer missed",
     which kills bogofilter.
* Fix defective printing in 'bogofilter -Q' output.
* Compiles with TDB again.
0.14.5.2
* bogominitrain.pl - removed email 'cruft' and revised format
  of verbose output.
0.14.5.1
* Fixed parameter type error in dbh_print_names() that causes
  segfault.
* Enhanced verbose output of bogominitrain.pl
* Documented '-T' option in man page.
* Fixed parsing error that treated "^From " in encoded text as
  a message separator.
* Revised format for '-T'.
* Fixed defect in bogominitrain.pl's norepetition mode.
0.14.5
* Updated bogominitrain.pl to version 1.3.
* Corrected parsing error (in html code) that caused
  bogofilter to miss message separators.
* Added '-T' as terse mode (with fixed formatting).
* Revised processing of From and empty lines so that parsing
  works correctly with both flex-2.5.4 and flex-2.5.31.
0.14.4
* Revised database API so that there are 3 distinct layers
  (program, datastore, and database) with a clean interface
  between them.
* Correct exitcodes in bogoutil by using EX_ERROR.
* Fixed token registration bug in 0.14.x versions.
* Fixed seg fault caused by database lock contention.
0.14.3
* Fixed critical locking bug introduced into bogofilter 0.14.0
  with the combined-wordlist code: when working with separate
  wordlists, bogofilter would lock only the first one opened,
  rather than all.
* Documentation updates.
* %g formatting is now supported by bogofilter's formatting functions.
* Merged trio 1.10 (http://ctrio.sourceforge.net/) to support
  compilation on ancient systems (Solaris 2.5) that do not have
  [v]snprintf functions.
  Trio is Copyright (C) 1998-2000 Bjorn Reese and Daniel Stenberg.
* Various documentation updates, including the FAQ.
* The test suite was adjusted for older grep variants (Solaris
  2.5) that don't cope with long lines.
* Print database version in print_version().
* Postfix integration instructions have been upgraded.
* Debug output for wordlists and databases was enhanced.

4 files changed, 47 insertions, 11 deletions

diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index ab9a7b3abd2..7dd2af21444 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/08/05 04:31:40 itojun Exp $
+# $NetBSD: Makefile,v 1.9 2003/09/30 07:11:48 xtraeme Exp $
 #
 
-DISTNAME=	bogofilter-0.14.2
+DISTNAME=	bogofilter-0.14.5.4
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bogofilter/}
 
@@ -10,11 +10,16 @@ HOMEPAGE=	http://bogofilter.sourceforge.net
 COMMENT=	Bayesian spam filter written in C
 
 USE_BUILDLINK2=	YES
+USE_PKGINSTALL=	YES
 GNU_CONFIGURE=	YES
 
 CONFIGURE_ARGS+=	--with-db=${BUILDLINK_PREFIX.db4}/include/db4
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
-REPLACE_PERL=	src/bogoupgrade
+EGDIR=			${PREFIX}/share/examples/bogofilter
+CONF_FILES=		${EGDIR}/bogofilter.cf ${PKG_SYSCONFDIR}/bogofilter.cf
+
+REPLACE_PERL=		src/bogoupgrade
 
 .include "../../databases/db4/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/bogofilter/PLIST b/mail/bogofilter/PLIST
index 29c25db9efb..ec32435fbb5 100644
--- a/mail/bogofilter/PLIST
+++ b/mail/bogofilter/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/03 12:06:07 manu Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/09/30 07:11:48 xtraeme Exp $
 bin/bogofilter
-bin/bogoutil
 bin/bogolexer
 bin/bogoupgrade
-etc/bogofilter.cf.example
+bin/bogoutil
 man/man1/bogofilter.1
-man/man1/bogoutil.1
-man/man1/bogoupgrade.1
 man/man1/bogolexer.1
+man/man1/bogoupgrade.1
+man/man1/bogoutil.1
+share/examples/bogofilter/bogofilter.cf
+@dirrm share/examples/bogofilter
diff --git a/mail/bogofilter/distinfo b/mail/bogofilter/distinfo
index 41536b71598..71b4f995d09 100644
--- a/mail/bogofilter/distinfo
+++ b/mail/bogofilter/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.3 2003/08/05 04:31:40 itojun Exp $
+$NetBSD: distinfo,v 1.4 2003/09/30 07:11:48 xtraeme Exp $
 
-SHA1 (bogofilter-0.14.2.tar.gz) = 33ae905072b824005b6ea4d70c74f3c09f9dfce5
-Size (bogofilter-0.14.2.tar.gz) = 814380 bytes
+SHA1 (bogofilter-0.14.5.4.tar.gz) = fd2ce315aaa480a7aaf51e68ba113c6e25bb9b45
+Size (bogofilter-0.14.5.4.tar.gz) = 883395 bytes
+SHA1 (patch-aa) = 45b28c90c420cfdb80f974e1aebbcec3f1364076
diff --git a/mail/bogofilter/patches/patch-aa b/mail/bogofilter/patches/patch-aa
new file mode 100644
index 00000000000..8ed5d0aaecd
--- /dev/null
+++ b/mail/bogofilter/patches/patch-aa
@@ -0,0 +1,29 @@
+$NetBSD: patch-aa,v 1.1 2003/09/30 07:11:48 xtraeme 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 @@
+ 
+ # what to build
+ sysconf_DATA = bogofilter.cf.example
++egdir = $(prefix)/share/examples/bogofilter
+ 
+ # what to build that from
+ 
+@@ -205,14 +206,8 @@
+ uninstall-info-am:
+ sysconfDATA_INSTALL = $(INSTALL_DATA)
+ install-sysconfDATA: $(sysconf_DATA)
+-	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(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)
++	$(INSTALL_DATA) $(sysconf_DATA) $(egdir)/bogofilter.cf
+ 
+ uninstall-sysconfDATA:
+ 	@$(NORMAL_UNINSTALL)