Attachment #59088 for bug #88951

View | Details | Raw Unified | Return to bug 88951
Collapse All | Expand All

Lines 6-12 Link Here

(-)/usr/home/emma/ports/mail/bogofilter/Makefile (-3 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= bogofilter	8	PORTNAME= bogofilter
9	PORTVERSION= 0.96.5	9	PORTVERSION= 0.96.6
10	PORTREVISION?= 0	10	PORTREVISION?= 0
11	CATEGORIES?= mail	11	CATEGORIES?= mail
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
Lines 15-24 Link Here
15	MAINTAINER?= matthias.andree@gmx.de	15	MAINTAINER?= matthias.andree@gmx.de
16	COMMENT= Fast, teachable, learning spam detector	16	COMMENT= Fast, teachable, learning spam detector
17		17
		18	LIB_DEPENDS?= db-4.3:${PORTSDIR}/databases/db43
		19
18	OPTIONS= GSL "Link with system-wide GSL dynamically (recommended)" on	20	OPTIONS= GSL "Link with system-wide GSL dynamically (recommended)" on
19	OPTIONS+= UNICODE "Normalize tokens to Unicode (UTF-8)" on	21	OPTIONS+= UNICODE "Normalize tokens to Unicode (UTF-8)" on
20
21	LIB_DEPENDS?= db-4.3:${PORTSDIR}/databases/db43
22		22
23	CONFLICTS?= bogofilter-sqlite-[0-9]* bogofilter-qdbm-[0-9]* [a-z][a-z]-bogofilter-[0-9]*	23	CONFLICTS?= bogofilter-sqlite-[0-9]* bogofilter-qdbm-[0-9]* [a-z][a-z]-bogofilter-[0-9]*
24		24

Line 1 Link Here

(-)/usr/home/emma/ports/mail/bogofilter/distinfo (-1 / +3 lines)
1	MD5 (bogofilter-0.96.5.tar.bz2) = 77ec9fc84f51a183800a615b59c97da8	1	MD5 (bogofilter-0.96.6.tar.bz2) = 24ce45bac5dc7e8ec6bb2f68e5d64a73
		2	SHA256 (bogofilter-0.96.6.tar.bz2) = b74d6889fa11a1b5b9b59826de4f859cebe9088786728c630a74465da36831ab
		3	SIZE (bogofilter-0.96.6.tar.bz2) = 746286




--- ./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

Return to bug 88951

Line 0 Link Here

(-)/usr/home/emma/ports/mail/bogofilter/files/patch-tests-nolocalconfig (+68 lines)
		1	--- ./src/tests/t.maint 16 Sep 2005 20:57:29 -0000 1.32
		2	+++ ./src/tests/t.maint 13 Nov 2005 16:45:48 -0000 1.33
		3	@@ -36,10 +36,10 @@
		4	echo initial: `$BOGOUTIL -d $WORDLIST \| wc -l` > $OUT
		5
		6	for cnt in 0 1 2 3 ; do
		7	- $BOGOUTIL -c $cnt -m $WORDLIST
		8	- echo "count $cnt ->" `$BOGOUTIL -d $WORDLIST \| wc -l` >> $OUT
		9	+ $BOGOUTIL -C -c $cnt -m $WORDLIST
		10	+ echo "count $cnt ->" `$BOGOUTIL -C -d $WORDLIST \| wc -l` >> $OUT
		11	if [ $verbose -ne 0 ]; then
		12	- $BOGOUTIL -d $WORDLIST > $OUT.$cnt
		13	+ $BOGOUTIL -C -d $WORDLIST > $OUT.$cnt
		14	fi
		15	done
		16
		17	--- ./src/tests/t.regtest 16 Mar 2005 12:18:22 -0000 1.9
		18	+++ ./src/tests/t.regtest 13 Nov 2005 16:45:48 -0000 1.10
		19	@@ -30,10 +30,10 @@
		20	fi
		21
		22	if [ -f $BOGOFILTER_DIR/goodlist.${DB_EXT} ] ; then
		23	- g=`$BOGOUTIL -d $BOGOFILTER_DIR/goodlist.${DB_EXT} \| grep -v " 0 " \| tee $TMPDIR/good.$T.out \| wc -l`
		24	- s=`$BOGOUTIL -d $BOGOFILTER_DIR/spamlist.${DB_EXT} \| grep -v " 0 " \| tee $TMPDIR/spam.$T.out \| wc -l`
		25	+ g=`$BOGOUTIL -C -d $BOGOFILTER_DIR/goodlist.${DB_EXT} \| grep -v " 0 " \| tee $TMPDIR/good.$T.out \| wc -l`
		26	+ s=`$BOGOUTIL -C -d $BOGOFILTER_DIR/spamlist.${DB_EXT} \| grep -v " 0 " \| tee $TMPDIR/spam.$T.out \| wc -l`
		27	else
		28	- $BOGOUTIL -d $BOGOFILTER_DIR/wordlist.${DB_EXT} > $TMPDIR/word.$T.out
		29	+ $BOGOUTIL -C -d $BOGOFILTER_DIR/wordlist.${DB_EXT} > $TMPDIR/word.$T.out
		30	g=`grep -v " 0$" < $TMPDIR/word.$T.out \| tee $TMPDIR/good.$T.out \| wc -l`
		31	s=`grep -v " 0 " < $TMPDIR/word.$T.out \| tee $TMPDIR/spam.$T.out \| wc -l`
		32	fi
		33	--- ./src/tests/t.systest 16 Mar 2005 12:18:22 -0000 1.14
		34	+++ ./src/tests/t.systest 13 Nov 2005 16:45:48 -0000 1.15
		35	@@ -57,7 +57,7 @@
		36	$BOGOFILTER $OPTS -n < ${SYSTEST}/inputs/good.mbx
		37	for f in $BOGOFILTER_DIR/*.${DB_EXT} ; do
		38	n=`basename $f .${DB_EXT}`
		39	- $BOGOUTIL -d $BOGOFILTER_DIR/$n.${DB_EXT} > $BOGOFILTER_DIR/$n.txt
		40	+ $BOGOUTIL -C -d $BOGOFILTER_DIR/$n.${DB_EXT} > $BOGOFILTER_DIR/$n.txt
		41	done
		42	if [ $verbose -ne 0 ]; then
		43	ls -l $BOGOFILTER_DIR/*list.txt
		44	--- ./src/tests/t.MH 16 Mar 2005 12:18:22 -0000 1.12
		45	+++ ./src/tests/t.MH 13 Nov 2005 16:45:48 -0000 1.13
		46	@@ -24,7 +24,7 @@
		47	$BOGOFILTER -C -D -s $v -B $TMPDIR/spam
		48	wordlist=".MSG_COUNT Lotus Magazine Min Service connection more most set that unsubscribe"
		49
		50	-$BOGOUTIL -w $WORDLIST $wordlist >$OUT \|\| rm -f $OUT
		51	+$BOGOUTIL -C -w $WORDLIST $wordlist >$OUT \|\| rm -f $OUT
		52
		53	if [ $verbose -eq 0 ]; then
		54	cmp $CORRECT $OUT
		55	--- ./src/tests/t.bulkmode 29 Jun 2005 03:11:25 -0000 1.18
		56	+++ ./src/tests/t.bulkmode 13 Nov 2005 16:45:48 -0000 1.19
		57	@@ -27,9 +27,11 @@
		58	}
		59
		60	if [ -d $BOGOFILTER_DIR ] ; then rm -f $BOGOFILTER_DIR/* ; else : ; fi
		61	+
		62	mkdir -p $BOGOFILTER_DIR
		63	$BOGOFILTER -C -s < ${SYSTEST}/inputs/spam.mbx
		64	$BOGOFILTER -C -n < ${SYSTEST}/inputs/good.mbx
65	+
66	#for f in $BOGOFILTER_DIR/*.${DB_EXT} ; do
67	# o=`echo $f \| sed s@.${DB_EXT}@.txt@`
68	# $BOGOUTIL -d $f > $o