Upgrade to 0.10.2.

PR:		ports/47922
Submitted by:	maintainer

8 files changed, 106 insertions, 48 deletions

diff --git a/mail/bogofilter-current/Makefile b/mail/bogofilter-current/Makefile
index a1a136f..567470a 100644
--- a/mail/bogofilter-current/Makefile
+++ b/mail/bogofilter-current/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bogofilter
-PORTVERSION=	0.9.1.2
+PORTVERSION=	0.10.2
 PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -22,29 +22,40 @@ GNU_CONFIGURE=	yes
 PATCH_STRIP=	-p1
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include/db4" \
 		LDFLAGS="-L${PREFIX}/lib"
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc
+CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc --with-db=defeat-guessing
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 MAN1=		bogofilter.1 bogoutil.1 bogoupgrade.1 bogolexer.1
 
 post-build:
 	cd ${WRKSRC} && make check SHELL=${SH}
 
 do-install:
-	cd ${WRKSRC} && make install prefix=${PREFIX}
+	cd ${WRKSRC} && make install-strip prefix=${PREFIX}
 
 .if !defined(NOPORTDOCS)
 post-install:
 	@${MKDIR} ${DOCSDIR}
-.for i in AUTHORS COPYING INSTALL NEWS README TODO UPGRADE \
-	doc/integrating-with-qmail contrib/README.unbase64 \
-	contrib/dot-qmail-bogofilter-default \
-	README.freebsd README.hp-ux README.dcdflib \
-	README.Robinson bogofilter-SA-2002-01 METHODS
+	@${MKDIR} ${DOCSDIR}/contrib
+	@${MKDIR} ${DOCSDIR}/html
+	@${MKDIR} ${DOCSDIR}/programmer
+	@${MKDIR} ${DOCSDIR}/xml
+.for i in AUTHORS CHANGES-0.10 COPYING INSTALL NEWS README README.cvs \
+	TODO UPGRADE \
+	doc/integrating-with-qmail \
+	doc/README.Robinson doc/bogofilter-SA-2002-01 METHODS
 	  ${INSTALL_MAN} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
-.for i in bogo.R contrib/bogofilter-qfe contrib/unbase64 \
-	contrib/bogopass
-	  ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DOCSDIR}
+.for i in contrib/bogo.R contrib/bogofilter-qfe \
+		contrib/randomtrain contrib/scramble
+	  ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DOCSDIR}/contrib
 .endfor
+.for i in contrib/README.randomtrain contrib/dot-qmail-bogofilter-default
+	${INSTALL_MAN} ${WRKSRC}/${i} ${DOCSDIR}/contrib
+.endfor
+	${INSTALL_PROGRAM} ${WRKSRC}/contrib/bogogrep ${DOCSDIR}/contrib
+	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
+	${INSTALL_MAN} ${WRKSRC}/doc/*.xml ${DOCSDIR}/xml
+	${INSTALL_MAN} ${WRKSRC}/doc/programmer/README.* ${DOCSDIR}/programmer
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/bogofilter-current/distinfo b/mail/bogofilter-current/distinfo
index bc0fddb..e4acf7d 100644
--- a/mail/bogofilter-current/distinfo
+++ b/mail/bogofilter-current/distinfo
@@ -1 +1 @@
-MD5 (bogofilter-0.9.1.2.tar.gz) = af65cc2a1dae5597762bc2144344075a
+MD5 (bogofilter-0.10.2.tar.gz) = 6e200a959f89d17685871a80834bfb1f
diff --git a/mail/bogofilter-current/pkg-descr b/mail/bogofilter-current/pkg-descr
index df478ae..7eabd41 100644
--- a/mail/bogofilter-current/pkg-descr
+++ b/mail/bogofilter-current/pkg-descr
@@ -1,5 +1,7 @@
-Bogofilter takes an email message or other text on standard input, does a
-statistical check against lists of "good" and "bad" words, and returns a status
-code indicating whether or not the message is spam.
+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"
+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.
 
 WWW: http://bogofilter.sourceforge.net/
diff --git a/mail/bogofilter-current/pkg-plist b/mail/bogofilter-current/pkg-plist
index c76d923..f2dfbcc 100644
--- a/mail/bogofilter-current/pkg-plist
+++ b/mail/bogofilter-current/pkg-plist
@@ -4,23 +4,39 @@ bin/bogoutil
 bin/bogoupgrade
 etc/bogofilter.cf.example
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.10
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/METHODS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.Robinson
-%%PORTDOCS%%%%DOCSDIR%%/README.dcdflib
-%%PORTDOCS%%%%DOCSDIR%%/README.freebsd
-%%PORTDOCS%%%%DOCSDIR%%/README.hp-ux
-%%PORTDOCS%%%%DOCSDIR%%/README.unbase64
+%%PORTDOCS%%%%DOCSDIR%%/README.cvs
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADE
-%%PORTDOCS%%%%DOCSDIR%%/bogo.R
 %%PORTDOCS%%%%DOCSDIR%%/bogofilter-SA-2002-01
-%%PORTDOCS%%%%DOCSDIR%%/bogofilter-qfe
-%%PORTDOCS%%%%DOCSDIR%%/bogopass
-%%PORTDOCS%%%%DOCSDIR%%/dot-qmail-bogofilter-default
+%%PORTDOCS%%%%DOCSDIR%%/contrib/README.randomtrain
+%%PORTDOCS%%%%DOCSDIR%%/contrib/bogo.R
+%%PORTDOCS%%%%DOCSDIR%%/contrib/bogofilter-qfe
+%%PORTDOCS%%%%DOCSDIR%%/contrib/bogogrep
+%%PORTDOCS%%%%DOCSDIR%%/contrib/dot-qmail-bogofilter-default
+%%PORTDOCS%%%%DOCSDIR%%/contrib/randomtrain
+%%PORTDOCS%%%%DOCSDIR%%/contrib/scramble
+%%PORTDOCS%%%%DOCSDIR%%/html/bogofilter-faq.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bogofilter.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bogolexer.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bogoupgrade.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bogoutil.html
 %%PORTDOCS%%%%DOCSDIR%%/integrating-with-qmail
-%%PORTDOCS%%%%DOCSDIR%%/unbase64
+%%PORTDOCS%%%%DOCSDIR%%/programmer/README.dcdflib
+%%PORTDOCS%%%%DOCSDIR%%/programmer/README.freebsd
+%%PORTDOCS%%%%DOCSDIR%%/programmer/README.hp-ux
+%%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%%/programmer
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index a1a136f..567470a 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bogofilter
-PORTVERSION=	0.9.1.2
+PORTVERSION=	0.10.2
 PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -22,29 +22,40 @@ GNU_CONFIGURE=	yes
 PATCH_STRIP=	-p1
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include/db4" \
 		LDFLAGS="-L${PREFIX}/lib"
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc
+CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc --with-db=defeat-guessing
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 MAN1=		bogofilter.1 bogoutil.1 bogoupgrade.1 bogolexer.1
 
 post-build:
 	cd ${WRKSRC} && make check SHELL=${SH}
 
 do-install:
-	cd ${WRKSRC} && make install prefix=${PREFIX}
+	cd ${WRKSRC} && make install-strip prefix=${PREFIX}
 
 .if !defined(NOPORTDOCS)
 post-install:
 	@${MKDIR} ${DOCSDIR}
-.for i in AUTHORS COPYING INSTALL NEWS README TODO UPGRADE \
-	doc/integrating-with-qmail contrib/README.unbase64 \
-	contrib/dot-qmail-bogofilter-default \
-	README.freebsd README.hp-ux README.dcdflib \
-	README.Robinson bogofilter-SA-2002-01 METHODS
+	@${MKDIR} ${DOCSDIR}/contrib
+	@${MKDIR} ${DOCSDIR}/html
+	@${MKDIR} ${DOCSDIR}/programmer
+	@${MKDIR} ${DOCSDIR}/xml
+.for i in AUTHORS CHANGES-0.10 COPYING INSTALL NEWS README README.cvs \
+	TODO UPGRADE \
+	doc/integrating-with-qmail \
+	doc/README.Robinson doc/bogofilter-SA-2002-01 METHODS
 	  ${INSTALL_MAN} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
-.for i in bogo.R contrib/bogofilter-qfe contrib/unbase64 \
-	contrib/bogopass
-	  ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DOCSDIR}
+.for i in contrib/bogo.R contrib/bogofilter-qfe \
+		contrib/randomtrain contrib/scramble
+	  ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DOCSDIR}/contrib
 .endfor
+.for i in contrib/README.randomtrain contrib/dot-qmail-bogofilter-default
+	${INSTALL_MAN} ${WRKSRC}/${i} ${DOCSDIR}/contrib
+.endfor
+	${INSTALL_PROGRAM} ${WRKSRC}/contrib/bogogrep ${DOCSDIR}/contrib
+	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
+	${INSTALL_MAN} ${WRKSRC}/doc/*.xml ${DOCSDIR}/xml
+	${INSTALL_MAN} ${WRKSRC}/doc/programmer/README.* ${DOCSDIR}/programmer
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/bogofilter/distinfo b/mail/bogofilter/distinfo
index bc0fddb..e4acf7d 100644
--- a/mail/bogofilter/distinfo
+++ b/mail/bogofilter/distinfo
@@ -1 +1 @@
-MD5 (bogofilter-0.9.1.2.tar.gz) = af65cc2a1dae5597762bc2144344075a
+MD5 (bogofilter-0.10.2.tar.gz) = 6e200a959f89d17685871a80834bfb1f
diff --git a/mail/bogofilter/pkg-descr b/mail/bogofilter/pkg-descr
index df478ae..7eabd41 100644
--- a/mail/bogofilter/pkg-descr
+++ b/mail/bogofilter/pkg-descr
@@ -1,5 +1,7 @@
-Bogofilter takes an email message or other text on standard input, does a
-statistical check against lists of "good" and "bad" words, and returns a status
-code indicating whether or not the message is spam.
+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"
+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.
 
 WWW: http://bogofilter.sourceforge.net/
diff --git a/mail/bogofilter/pkg-plist b/mail/bogofilter/pkg-plist
index c76d923..f2dfbcc 100644
--- a/mail/bogofilter/pkg-plist
+++ b/mail/bogofilter/pkg-plist
@@ -4,23 +4,39 @@ bin/bogoutil
 bin/bogoupgrade
 etc/bogofilter.cf.example
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.10
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/METHODS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.Robinson
-%%PORTDOCS%%%%DOCSDIR%%/README.dcdflib
-%%PORTDOCS%%%%DOCSDIR%%/README.freebsd
-%%PORTDOCS%%%%DOCSDIR%%/README.hp-ux
-%%PORTDOCS%%%%DOCSDIR%%/README.unbase64
+%%PORTDOCS%%%%DOCSDIR%%/README.cvs
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADE
-%%PORTDOCS%%%%DOCSDIR%%/bogo.R
 %%PORTDOCS%%%%DOCSDIR%%/bogofilter-SA-2002-01
-%%PORTDOCS%%%%DOCSDIR%%/bogofilter-qfe
-%%PORTDOCS%%%%DOCSDIR%%/bogopass
-%%PORTDOCS%%%%DOCSDIR%%/dot-qmail-bogofilter-default
+%%PORTDOCS%%%%DOCSDIR%%/contrib/README.randomtrain
+%%PORTDOCS%%%%DOCSDIR%%/contrib/bogo.R
+%%PORTDOCS%%%%DOCSDIR%%/contrib/bogofilter-qfe
+%%PORTDOCS%%%%DOCSDIR%%/contrib/bogogrep
+%%PORTDOCS%%%%DOCSDIR%%/contrib/dot-qmail-bogofilter-default
+%%PORTDOCS%%%%DOCSDIR%%/contrib/randomtrain
+%%PORTDOCS%%%%DOCSDIR%%/contrib/scramble
+%%PORTDOCS%%%%DOCSDIR%%/html/bogofilter-faq.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bogofilter.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bogolexer.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bogoupgrade.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bogoutil.html
 %%PORTDOCS%%%%DOCSDIR%%/integrating-with-qmail
-%%PORTDOCS%%%%DOCSDIR%%/unbase64
+%%PORTDOCS%%%%DOCSDIR%%/programmer/README.dcdflib
+%%PORTDOCS%%%%DOCSDIR%%/programmer/README.freebsd
+%%PORTDOCS%%%%DOCSDIR%%/programmer/README.hp-ux
+%%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%%/programmer
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib
 %%PORTDOCS%%@dirrm %%DOCSDIR%%