6 files changed, 24 insertions, 96 deletions

diff --git a/mail/bogofilter-current/Makefile b/mail/bogofilter-current/Makefile
index fd6555b9e506..8d1e98dfcc9c 100644
--- a/mail/bogofilter-current/Makefile
+++ b/mail/bogofilter-current/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bogofilter
-PORTVERSION=	0.11.1.8
+PORTVERSION=	0.11.1.9
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/bogofilter-current/distinfo b/mail/bogofilter-current/distinfo
index 4064e7657074..ad9cc6a000b6 100644
--- a/mail/bogofilter-current/distinfo
+++ b/mail/bogofilter-current/distinfo
@@ -1 +1 @@
-MD5 (bogofilter-0.11.1.8.tar.gz) = ff12f6e690435a5a8ff83ea318e0a732
+MD5 (bogofilter-0.11.1.9.tar.gz) = b9bae2985f61ac5e54979bc0f8d62f0b
diff --git a/mail/bogofilter-current/files/patch-aa b/mail/bogofilter-current/files/patch-aa
index c909a1c452e1..2f8ae81ac124 100644
--- a/mail/bogofilter-current/files/patch-aa
+++ b/mail/bogofilter-current/files/patch-aa
@@ -1,48 +1,12 @@
-Index: tests/bogofilter/t.robx
-===================================================================
-RCS file: /cvsroot/bogofilter/bogofilter/tests/bogofilter/Attic/t.robx,v
-retrieving revision 1.12
-diff -u -r1.12 t.robx
---- ./tests/bogofilter/t.robx	3 Feb 2003 13:44:21 -0000	1.12
-+++ ./tests/bogofilter/t.robx	3 Mar 2003 23:56:57 -0000
-@@ -12,6 +12,8 @@
- #	 robx.YYYYMMDD:
- #		tests   - directory containing individual output files
- 
-+set -x
-+
- : ${srcdir=.}
- relpath="`pwd`/../.."
- NODB=1 . ${srcdir}/../t.frame
-@@ -38,8 +40,8 @@
- stats_in_header=Y
- EOF
- 
--$BOGOFILTER -r -s < ${SYSTEST}/inputs/spam.mbx
--$BOGOFILTER -r -n < ${SYSTEST}/inputs/good.mbx
-+$BOGOFILTER -C -r -s < ${SYSTEST}/inputs/spam.mbx
-+$BOGOFILTER -C -r -n < ${SYSTEST}/inputs/good.mbx
- 
- if [ ! -z "$RUN_FROM_MAKE" ] ; then
-     $BOGOUTIL -R $TMPDIR
-@@ -52,7 +54,8 @@
- 
- [ ! -z "$BF_SAVEDIR" ] && . ${srcdir}/../t.save
- 
--RESULT=`$BOGOUTIL -w $TMPDIR .ROBX | $AWK '/.ROBX/ { print $2; }'`
-+PRINT="`$BOGOUTIL -w $TMPDIR .ROBX`"
-+RESULT=`echo "$PRINT" | $AWK '/.ROBX/ { print $2; }'`
- 
- WANT="252685"
- 
-@@ -62,4 +65,9 @@
- #   $BOGOFILTER -x ml -vvv -r -n < ${SYSTEST}/inputs/good.mbx > ${TMPDIR}/good.txt
+--- ./src/tests/bogofilter/t.bogodir~	Wed Apr  9 01:00:44 2003
++++ ./src/tests/bogofilter/t.bogodir	Sun Apr 13 17:08:32 2003
+@@ -22,6 +22,9 @@
+     verbose=1
  fi
  
--test $RESULT = "$WANT"
-+if test $RESULT = "$WANT" ; then
-+    :
-+else
-+    echo "ROBX difference: got $RESULT, wanted $WANT"
-+    exit 1
-+fi
++HOME="${TMPDIR}/home"
++mkdir $HOME
++export HOME
+ BOGOFILTER="$VAL ${relpath}/bogofilter"
+ LOG="${TMPDIR}/bogodir.log"
+ cat /dev/null > $LOG
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index fd6555b9e506..8d1e98dfcc9c 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bogofilter
-PORTVERSION=	0.11.1.8
+PORTVERSION=	0.11.1.9
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/bogofilter/distinfo b/mail/bogofilter/distinfo
index 4064e7657074..ad9cc6a000b6 100644
--- a/mail/bogofilter/distinfo
+++ b/mail/bogofilter/distinfo
@@ -1 +1 @@
-MD5 (bogofilter-0.11.1.8.tar.gz) = ff12f6e690435a5a8ff83ea318e0a732
+MD5 (bogofilter-0.11.1.9.tar.gz) = b9bae2985f61ac5e54979bc0f8d62f0b
diff --git a/mail/bogofilter/files/patch-aa b/mail/bogofilter/files/patch-aa
index c909a1c452e1..2f8ae81ac124 100644
--- a/mail/bogofilter/files/patch-aa
+++ b/mail/bogofilter/files/patch-aa
@@ -1,48 +1,12 @@
-Index: tests/bogofilter/t.robx
-===================================================================
-RCS file: /cvsroot/bogofilter/bogofilter/tests/bogofilter/Attic/t.robx,v
-retrieving revision 1.12
-diff -u -r1.12 t.robx
---- ./tests/bogofilter/t.robx	3 Feb 2003 13:44:21 -0000	1.12
-+++ ./tests/bogofilter/t.robx	3 Mar 2003 23:56:57 -0000
-@@ -12,6 +12,8 @@
- #	 robx.YYYYMMDD:
- #		tests   - directory containing individual output files
- 
-+set -x
-+
- : ${srcdir=.}
- relpath="`pwd`/../.."
- NODB=1 . ${srcdir}/../t.frame
-@@ -38,8 +40,8 @@
- stats_in_header=Y
- EOF
- 
--$BOGOFILTER -r -s < ${SYSTEST}/inputs/spam.mbx
--$BOGOFILTER -r -n < ${SYSTEST}/inputs/good.mbx
-+$BOGOFILTER -C -r -s < ${SYSTEST}/inputs/spam.mbx
-+$BOGOFILTER -C -r -n < ${SYSTEST}/inputs/good.mbx
- 
- if [ ! -z "$RUN_FROM_MAKE" ] ; then
-     $BOGOUTIL -R $TMPDIR
-@@ -52,7 +54,8 @@
- 
- [ ! -z "$BF_SAVEDIR" ] && . ${srcdir}/../t.save
- 
--RESULT=`$BOGOUTIL -w $TMPDIR .ROBX | $AWK '/.ROBX/ { print $2; }'`
-+PRINT="`$BOGOUTIL -w $TMPDIR .ROBX`"
-+RESULT=`echo "$PRINT" | $AWK '/.ROBX/ { print $2; }'`
- 
- WANT="252685"
- 
-@@ -62,4 +65,9 @@
- #   $BOGOFILTER -x ml -vvv -r -n < ${SYSTEST}/inputs/good.mbx > ${TMPDIR}/good.txt
+--- ./src/tests/bogofilter/t.bogodir~	Wed Apr  9 01:00:44 2003
++++ ./src/tests/bogofilter/t.bogodir	Sun Apr 13 17:08:32 2003
+@@ -22,6 +22,9 @@
+     verbose=1
  fi
  
--test $RESULT = "$WANT"
-+if test $RESULT = "$WANT" ; then
-+    :
-+else
-+    echo "ROBX difference: got $RESULT, wanted $WANT"
-+    exit 1
-+fi
++HOME="${TMPDIR}/home"
++mkdir $HOME
++export HOME
+ BOGOFILTER="$VAL ${relpath}/bogofilter"
+ LOG="${TMPDIR}/bogodir.log"
+ cat /dev/null > $LOG