- Update to 1.0.0

- Skip t.lock3 which is prone to run out of retries on busy machines
- Revise pkg-descr
- Nuke files/patch-tests-nolocalconfig (merged upstream)

PR:		89823
Submitted by:	Matthias Andree <matthias.andree@gmx.de> (maintainer)

4 files changed, 10 insertions, 74 deletions

diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 9d7b7d8cbec7..f71ba1c637db 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bogofilter
-PORTVERSION=	0.96.6
+PORTVERSION=	1.0.0
 PORTREVISION?=	0
 CATEGORIES?=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -55,7 +55,7 @@ post-patch:
 	${REINPLACE_CMD} -e 's|^#!.*perl|#! ${PERL}|' \
 		${WRKSRC}/src/tests/unsort.pl \
 		${WRKSRC}/contrib/*.pl
-	${REINPLACE_CMD} -e 's/INTEGRITY_TESTS = t.lock1 t.lock3 t.valgrind/INTEGRITY_TESTS = t.lock1 t.lock3/' \
+	${REINPLACE_CMD} -e 's/INTEGRITY_TESTS = t.lock1 t.lock3 t.valgrind/INTEGRITY_TESTS = t.lock1/' \
 		${WRKSRC}/src/tests/Makefile.in
 
 .if !defined(NOPORTDOCS)
diff --git a/mail/bogofilter/distinfo b/mail/bogofilter/distinfo
index 8ca521ef0008..f28c43a7252f 100644
--- a/mail/bogofilter/distinfo
+++ b/mail/bogofilter/distinfo
@@ -1,3 +1,3 @@
-MD5 (bogofilter-0.96.6.tar.bz2) = 24ce45bac5dc7e8ec6bb2f68e5d64a73
-SHA256 (bogofilter-0.96.6.tar.bz2) = b74d6889fa11a1b5b9b59826de4f859cebe9088786728c630a74465da36831ab
-SIZE (bogofilter-0.96.6.tar.bz2) = 746286
+MD5 (bogofilter-1.0.0.tar.bz2) = de008f94c6a4e8e0b145bbf1fb381dde
+SHA256 (bogofilter-1.0.0.tar.bz2) = 1e855b2007f5407c51ba36ef284bba6165f6894243002493fc8da3a375ebdb27
+SIZE (bogofilter-1.0.0.tar.bz2) = 746592
diff --git a/mail/bogofilter/files/patch-tests-nolocalconfig b/mail/bogofilter/files/patch-tests-nolocalconfig
deleted file mode 100644
index 8551c6e96aa8..000000000000
--- a/mail/bogofilter/files/patch-tests-nolocalconfig
+++ /dev/null
@@ -1,68 +0,0 @@
---- ./src/tests/t.maint	16 Sep 2005 20:57:29 -0000	1.32
-+++ ./src/tests/t.maint	13 Nov 2005 16:45:48 -0000	1.33
-@@ -36,10 +36,10 @@
- echo initial: `$BOGOUTIL -d $WORDLIST | wc -l` > $OUT
- 
- for cnt in 0 1 2 3 ; do
--    $BOGOUTIL -c $cnt -m $WORDLIST
--    echo "count $cnt ->" `$BOGOUTIL -d $WORDLIST | wc -l` >> $OUT
-+    $BOGOUTIL -C -c $cnt -m $WORDLIST
-+    echo "count $cnt ->" `$BOGOUTIL -C -d $WORDLIST | wc -l` >> $OUT
-     if  [ $verbose -ne 0 ]; then
--	$BOGOUTIL -d $WORDLIST > $OUT.$cnt
-+	$BOGOUTIL -C -d $WORDLIST > $OUT.$cnt
-     fi
- done
- 
---- ./src/tests/t.regtest	16 Mar 2005 12:18:22 -0000	1.9
-+++ ./src/tests/t.regtest	13 Nov 2005 16:45:48 -0000	1.10
-@@ -30,10 +30,10 @@
-     fi
- 
-     if [ -f  $BOGOFILTER_DIR/goodlist.${DB_EXT} ] ; then
--	g=`$BOGOUTIL -d $BOGOFILTER_DIR/goodlist.${DB_EXT} | grep -v " 0 " | tee $TMPDIR/good.$T.out | wc -l`
--	s=`$BOGOUTIL -d $BOGOFILTER_DIR/spamlist.${DB_EXT} | grep -v " 0 " | tee $TMPDIR/spam.$T.out | wc -l`
-+	g=`$BOGOUTIL -C -d $BOGOFILTER_DIR/goodlist.${DB_EXT} | grep -v " 0 " | tee $TMPDIR/good.$T.out | wc -l`
-+	s=`$BOGOUTIL -C -d $BOGOFILTER_DIR/spamlist.${DB_EXT} | grep -v " 0 " | tee $TMPDIR/spam.$T.out | wc -l`
-     else
--	$BOGOUTIL -d $BOGOFILTER_DIR/wordlist.${DB_EXT} > $TMPDIR/word.$T.out
-+	$BOGOUTIL -C -d $BOGOFILTER_DIR/wordlist.${DB_EXT} > $TMPDIR/word.$T.out
- 	g=`grep -v " 0$" < $TMPDIR/word.$T.out | tee $TMPDIR/good.$T.out | wc -l`
- 	s=`grep -v " 0 " < $TMPDIR/word.$T.out | tee $TMPDIR/spam.$T.out | wc -l`
-     fi
---- ./src/tests/t.systest	16 Mar 2005 12:18:22 -0000	1.14
-+++ ./src/tests/t.systest	13 Nov 2005 16:45:48 -0000	1.15
-@@ -57,7 +57,7 @@
- $BOGOFILTER $OPTS -n < ${SYSTEST}/inputs/good.mbx
- for f in $BOGOFILTER_DIR/*.${DB_EXT} ; do
-     n=`basename $f .${DB_EXT}`
--    $BOGOUTIL -d $BOGOFILTER_DIR/$n.${DB_EXT} > $BOGOFILTER_DIR/$n.txt
-+    $BOGOUTIL -C -d $BOGOFILTER_DIR/$n.${DB_EXT} > $BOGOFILTER_DIR/$n.txt
- done
- if  [ $verbose -ne 0 ]; then
-     ls -l $BOGOFILTER_DIR/*list.txt
---- ./src/tests/t.MH	16 Mar 2005 12:18:22 -0000	1.12
-+++ ./src/tests/t.MH	13 Nov 2005 16:45:48 -0000	1.13
-@@ -24,7 +24,7 @@
- $BOGOFILTER -C -D -s $v -B $TMPDIR/spam
- wordlist=".MSG_COUNT Lotus Magazine Min Service connection more most set that unsubscribe"
- 
--$BOGOUTIL -w $WORDLIST $wordlist >$OUT || rm -f $OUT
-+$BOGOUTIL -C -w $WORDLIST $wordlist >$OUT || rm -f $OUT
- 
- if  [ $verbose -eq 0 ]; then
-     cmp $CORRECT $OUT
---- ./src/tests/t.bulkmode	29 Jun 2005 03:11:25 -0000	1.18
-+++ ./src/tests/t.bulkmode	13 Nov 2005 16:45:48 -0000	1.19
-@@ -27,9 +27,11 @@
- }
- 
- if [ -d $BOGOFILTER_DIR ] ; then rm -f $BOGOFILTER_DIR/* ; else : ; fi
-+
- mkdir -p $BOGOFILTER_DIR
- $BOGOFILTER -C -s < ${SYSTEST}/inputs/spam.mbx
- $BOGOFILTER -C -n < ${SYSTEST}/inputs/good.mbx
-+
- #for f in $BOGOFILTER_DIR/*.${DB_EXT} ; do
- #    o=`echo $f | sed s@.${DB_EXT}@.txt@`
- #    $BOGOUTIL -d $f > $o
diff --git a/mail/bogofilter/pkg-descr b/mail/bogofilter/pkg-descr
index dfbd62a10800..85c44c78d7b9 100644
--- a/mail/bogofilter/pkg-descr
+++ b/mail/bogofilter/pkg-descr
@@ -1,7 +1,11 @@
+Bogofilter is a trainable email spam detector.
+
 Bogofilter takes an email message or other text on standard input, parses it
-into words, does a statistical check against data bases of "good" and "bad"
+into words, does a statistical check against databases of "good" and "bad"
 words, and returns a status code indicating whether or not the message is spam.
 Bogofilter decodes base64 or quoted-printable encoded texts and ignores non-text
 attachments and HTML comments.
 
+The supported database backends are Berkeley DB, QDBM and SQLite3.
+
 WWW: http://bogofilter.sourceforge.net/