Upgrade to 0.13.0.

PR:		ports/52554
Submitted by:	maintainer

8 files changed, 96 insertions, 20 deletions

diff --git a/mail/bogofilter-current/Makefile b/mail/bogofilter-current/Makefile
index 2012b78c00a8..e55ae7a4ec63 100644
--- a/mail/bogofilter-current/Makefile
+++ b/mail/bogofilter-current/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bogofilter
-PORTVERSION=	0.11.2
+PORTVERSION=	0.13.0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,8 +19,8 @@ LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4
 USE_PERL5_RUN=	yes
 GNU_CONFIGURE=	yes
 PATCH_STRIP=	-p1
-CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include/db4" \
-		LDFLAGS="-L${PREFIX}/lib" LIBS="-ldb4"
+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
@@ -37,16 +37,25 @@ post-install::
 	@${MKDIR} ${DOCSDIR}/contrib
 	@${MKDIR} ${DOCSDIR}/html
 	@${MKDIR} ${DOCSDIR}/programmer
+	@${MKDIR} ${DOCSDIR}/tuning
 	@${MKDIR} ${DOCSDIR}/xml
-.for i in AUTHORS CHANGES-0.10 COPYING INSTALL NEWS README README.cvs \
-	TODO UPGRADE CHANGES-0.11 \
-	doc/integrating-with-qmail \
-	doc/README.Robinson doc/bogofilter-SA-2002-01 METHODS
+.for i in AUTHORS COPYING INSTALL NEWS README README.cvs \
+	TODO UPGRADE \
+	CHANGES-0.10 CHANGES-0.11 CHANGES-0.12 CHANGES-0.13 \
+	RELEASE.NOTES-0.11 RELEASE.NOTES-0.12 RELEASE.NOTES-0.13 \
+	doc/integrating-with-postfix doc/integrating-with-qmail \
+	doc/bogofilter-tuning.HOWTO doc/bogofilter-SA-2002-01 METHODS
 	  ${INSTALL_MAN} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
+.for i in README setR smindev.R
+	${INSTALL_MAN} ${WRKSRC}/tuning/${i} ${DOCSDIR}/tuning/
+.endfor
+.for i in bogolex.sh distrib mkdb sizes smindev.sh
+	${INSTALL_SCRIPT} ${WRKSRC}/tuning/${i} ${DOCSDIR}/tuning/
+.endfor
 .for i in contrib/bogo.R contrib/bogofilter-qfe \
 		contrib/randomtrain contrib/scramble \
-		contrib/printmaildir.pl
+		contrib/mime.get.rfc822 contrib/printmaildir.pl
 	  ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DOCSDIR}/contrib
 .endfor
 .for i in contrib/README.randomtrain contrib/dot-qmail-bogofilter-default
diff --git a/mail/bogofilter-current/distinfo b/mail/bogofilter-current/distinfo
index fd466ef7205e..66b01d26a053 100644
--- a/mail/bogofilter-current/distinfo
+++ b/mail/bogofilter-current/distinfo
@@ -1 +1 @@
-MD5 (bogofilter-0.11.2.tar.gz) = c0410b4378db01f77a133e6087fb69ef
+MD5 (bogofilter-0.13.0.tar.gz) = cb3c397520d6001985deaba6d2e788de
diff --git a/mail/bogofilter-current/files/patch-aa b/mail/bogofilter-current/files/patch-aa
new file mode 100644
index 000000000000..14ac4b513380
--- /dev/null
+++ b/mail/bogofilter-current/files/patch-aa
@@ -0,0 +1,13 @@
+diff -u -r1.8 t.frame
+--- ./src/tests/t.frame	19 May 2003 22:05:24 -0000	1.8
++++ ./src/tests/t.frame	22 May 2003 03:14:17 -0000
+@@ -99,5 +99,7 @@
+     export EF_ALIGNMENT
+ fi
+ 
+-DIFF_BRIEF=""
+-[ "`uname -s`" = "Linux" ] && DIFF_BRIEF="--brief -s"
++case `uname -s` in
++    Linux)  DIFF_BRIEF="--brief -s" ;;
++    *)      DIFF_BRIEF="" ;;
++esac
diff --git a/mail/bogofilter-current/pkg-plist b/mail/bogofilter-current/pkg-plist
index 7a6106a35a58..183d918e5d0a 100644
--- a/mail/bogofilter-current/pkg-plist
+++ b/mail/bogofilter-current/pkg-plist
@@ -6,13 +6,18 @@ etc/bogofilter.cf.example
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.10
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.11
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.12
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.13
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/METHODS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.Robinson
+%%PORTDOCS%%%%DOCSDIR%%/bogofilter-tuning.HOWTO
 %%PORTDOCS%%%%DOCSDIR%%/README.cvs
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.11
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.12
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.13
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADE
 %%PORTDOCS%%%%DOCSDIR%%/bogofilter-SA-2002-01
@@ -21,6 +26,7 @@ etc/bogofilter.cf.example
 %%PORTDOCS%%%%DOCSDIR%%/contrib/bogofilter-qfe
 %%PORTDOCS%%%%DOCSDIR%%/contrib/bogogrep
 %%PORTDOCS%%%%DOCSDIR%%/contrib/dot-qmail-bogofilter-default
+%%PORTDOCS%%%%DOCSDIR%%/contrib/mime.get.rfc822
 %%PORTDOCS%%%%DOCSDIR%%/contrib/printmaildir.pl
 %%PORTDOCS%%%%DOCSDIR%%/contrib/randomtrain
 %%PORTDOCS%%%%DOCSDIR%%/contrib/scramble
@@ -29,15 +35,25 @@ etc/bogofilter.cf.example
 %%PORTDOCS%%%%DOCSDIR%%/html/bogolexer.html
 %%PORTDOCS%%%%DOCSDIR%%/html/bogoupgrade.html
 %%PORTDOCS%%%%DOCSDIR%%/html/bogoutil.html
+%%PORTDOCS%%%%DOCSDIR%%/integrating-with-postfix
 %%PORTDOCS%%%%DOCSDIR%%/integrating-with-qmail
 %%PORTDOCS%%%%DOCSDIR%%/programmer/README.dcdflib
 %%PORTDOCS%%%%DOCSDIR%%/programmer/README.freebsd
 %%PORTDOCS%%%%DOCSDIR%%/programmer/README.hp-ux
+%%PORTDOCS%%%%DOCSDIR%%/tuning/README
+%%PORTDOCS%%%%DOCSDIR%%/tuning/bogolex.sh
+%%PORTDOCS%%%%DOCSDIR%%/tuning/distrib
+%%PORTDOCS%%%%DOCSDIR%%/tuning/mkdb
+%%PORTDOCS%%%%DOCSDIR%%/tuning/setR
+%%PORTDOCS%%%%DOCSDIR%%/tuning/sizes
+%%PORTDOCS%%%%DOCSDIR%%/tuning/smindev.R
+%%PORTDOCS%%%%DOCSDIR%%/tuning/smindev.sh
 %%PORTDOCS%%%%DOCSDIR%%/xml/bogofilter.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/bogolexer.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/bogoupgrade.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/bogoutil.xml
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/xml
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/tuning
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/programmer
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 2012b78c00a8..e55ae7a4ec63 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bogofilter
-PORTVERSION=	0.11.2
+PORTVERSION=	0.13.0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,8 +19,8 @@ LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4
 USE_PERL5_RUN=	yes
 GNU_CONFIGURE=	yes
 PATCH_STRIP=	-p1
-CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include/db4" \
-		LDFLAGS="-L${PREFIX}/lib" LIBS="-ldb4"
+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
@@ -37,16 +37,25 @@ post-install::
 	@${MKDIR} ${DOCSDIR}/contrib
 	@${MKDIR} ${DOCSDIR}/html
 	@${MKDIR} ${DOCSDIR}/programmer
+	@${MKDIR} ${DOCSDIR}/tuning
 	@${MKDIR} ${DOCSDIR}/xml
-.for i in AUTHORS CHANGES-0.10 COPYING INSTALL NEWS README README.cvs \
-	TODO UPGRADE CHANGES-0.11 \
-	doc/integrating-with-qmail \
-	doc/README.Robinson doc/bogofilter-SA-2002-01 METHODS
+.for i in AUTHORS COPYING INSTALL NEWS README README.cvs \
+	TODO UPGRADE \
+	CHANGES-0.10 CHANGES-0.11 CHANGES-0.12 CHANGES-0.13 \
+	RELEASE.NOTES-0.11 RELEASE.NOTES-0.12 RELEASE.NOTES-0.13 \
+	doc/integrating-with-postfix doc/integrating-with-qmail \
+	doc/bogofilter-tuning.HOWTO doc/bogofilter-SA-2002-01 METHODS
 	  ${INSTALL_MAN} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
+.for i in README setR smindev.R
+	${INSTALL_MAN} ${WRKSRC}/tuning/${i} ${DOCSDIR}/tuning/
+.endfor
+.for i in bogolex.sh distrib mkdb sizes smindev.sh
+	${INSTALL_SCRIPT} ${WRKSRC}/tuning/${i} ${DOCSDIR}/tuning/
+.endfor
 .for i in contrib/bogo.R contrib/bogofilter-qfe \
 		contrib/randomtrain contrib/scramble \
-		contrib/printmaildir.pl
+		contrib/mime.get.rfc822 contrib/printmaildir.pl
 	  ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DOCSDIR}/contrib
 .endfor
 .for i in contrib/README.randomtrain contrib/dot-qmail-bogofilter-default
diff --git a/mail/bogofilter/distinfo b/mail/bogofilter/distinfo
index fd466ef7205e..66b01d26a053 100644
--- a/mail/bogofilter/distinfo
+++ b/mail/bogofilter/distinfo
@@ -1 +1 @@
-MD5 (bogofilter-0.11.2.tar.gz) = c0410b4378db01f77a133e6087fb69ef
+MD5 (bogofilter-0.13.0.tar.gz) = cb3c397520d6001985deaba6d2e788de
diff --git a/mail/bogofilter/files/patch-aa b/mail/bogofilter/files/patch-aa
new file mode 100644
index 000000000000..14ac4b513380
--- /dev/null
+++ b/mail/bogofilter/files/patch-aa
@@ -0,0 +1,13 @@
+diff -u -r1.8 t.frame
+--- ./src/tests/t.frame	19 May 2003 22:05:24 -0000	1.8
++++ ./src/tests/t.frame	22 May 2003 03:14:17 -0000
+@@ -99,5 +99,7 @@
+     export EF_ALIGNMENT
+ fi
+ 
+-DIFF_BRIEF=""
+-[ "`uname -s`" = "Linux" ] && DIFF_BRIEF="--brief -s"
++case `uname -s` in
++    Linux)  DIFF_BRIEF="--brief -s" ;;
++    *)      DIFF_BRIEF="" ;;
++esac
diff --git a/mail/bogofilter/pkg-plist b/mail/bogofilter/pkg-plist
index 7a6106a35a58..183d918e5d0a 100644
--- a/mail/bogofilter/pkg-plist
+++ b/mail/bogofilter/pkg-plist
@@ -6,13 +6,18 @@ etc/bogofilter.cf.example
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.10
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.11
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.12
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.13
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/METHODS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.Robinson
+%%PORTDOCS%%%%DOCSDIR%%/bogofilter-tuning.HOWTO
 %%PORTDOCS%%%%DOCSDIR%%/README.cvs
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.11
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.12
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.13
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADE
 %%PORTDOCS%%%%DOCSDIR%%/bogofilter-SA-2002-01
@@ -21,6 +26,7 @@ etc/bogofilter.cf.example
 %%PORTDOCS%%%%DOCSDIR%%/contrib/bogofilter-qfe
 %%PORTDOCS%%%%DOCSDIR%%/contrib/bogogrep
 %%PORTDOCS%%%%DOCSDIR%%/contrib/dot-qmail-bogofilter-default
+%%PORTDOCS%%%%DOCSDIR%%/contrib/mime.get.rfc822
 %%PORTDOCS%%%%DOCSDIR%%/contrib/printmaildir.pl
 %%PORTDOCS%%%%DOCSDIR%%/contrib/randomtrain
 %%PORTDOCS%%%%DOCSDIR%%/contrib/scramble
@@ -29,15 +35,25 @@ etc/bogofilter.cf.example
 %%PORTDOCS%%%%DOCSDIR%%/html/bogolexer.html
 %%PORTDOCS%%%%DOCSDIR%%/html/bogoupgrade.html
 %%PORTDOCS%%%%DOCSDIR%%/html/bogoutil.html
+%%PORTDOCS%%%%DOCSDIR%%/integrating-with-postfix
 %%PORTDOCS%%%%DOCSDIR%%/integrating-with-qmail
 %%PORTDOCS%%%%DOCSDIR%%/programmer/README.dcdflib
 %%PORTDOCS%%%%DOCSDIR%%/programmer/README.freebsd
 %%PORTDOCS%%%%DOCSDIR%%/programmer/README.hp-ux
+%%PORTDOCS%%%%DOCSDIR%%/tuning/README
+%%PORTDOCS%%%%DOCSDIR%%/tuning/bogolex.sh
+%%PORTDOCS%%%%DOCSDIR%%/tuning/distrib
+%%PORTDOCS%%%%DOCSDIR%%/tuning/mkdb
+%%PORTDOCS%%%%DOCSDIR%%/tuning/setR
+%%PORTDOCS%%%%DOCSDIR%%/tuning/sizes
+%%PORTDOCS%%%%DOCSDIR%%/tuning/smindev.R
+%%PORTDOCS%%%%DOCSDIR%%/tuning/smindev.sh
 %%PORTDOCS%%%%DOCSDIR%%/xml/bogofilter.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/bogolexer.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/bogoupgrade.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/bogoutil.xml
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/xml
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/tuning
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/programmer
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib