6 files changed, 28 insertions, 66 deletions

diff --git a/mail/bogofilter-current/Makefile b/mail/bogofilter-current/Makefile
index 72877b658ba7..eabc14c0cd25 100644
--- a/mail/bogofilter-current/Makefile
+++ b/mail/bogofilter-current/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	bogofilter
-PORTVERSION=	0.15.7
-PORTREVISION=	1
+PORTVERSION=	0.15.13
+PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,7 +21,7 @@ LIB_DEPENDS?=	db4.0:${PORTSDIR}/databases/db4
 
 LIB_DEPENDS+=	gsl.5:${PORTSDIR}/math/gsl
 
-CONFLICTS?=	bogofilter-tdb*
+CONFLICTS?=	bogofilter-tdb* bogofilter-qdbm*
 
 USE_REINPLACE=	yes
 USE_PERL5_RUN=	yes
@@ -31,11 +31,9 @@ CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc
 CONFIGURE_ENV?=	CPPFLAGS="-I${LOCALBASE}/include/db4" \
 		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-ldb4"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-MAN1=		bogofilter.1 bogoutil.1 bogoupgrade.1 bogolexer.1 \
-		bogol.1 bogotune.1
+MAN1=		bogofilter.1 bogoutil.1 bogoupgrade.1 bogolexer.1 bogotune.1
 
 post-patch:
-	${REINPLACE_CMD} -e 's/^@ENABLE_XMLTO_TRUE@//' ${WRKSRC}/doc/Makefile.in
 	${REINPLACE_CMD} -e "s|/bin/bash|${LOCALBASE}/bin/bash|" \
 		${WRKSRC}/contrib/randomtrain \
 		${WRKSRC}/contrib/scramble \
@@ -48,19 +46,14 @@ do-install:
 	cd ${WRKSRC} && make install-strip prefix=${PREFIX}
 
 post-install::
-.for i in bogol.1 bogotune.1
-	${INSTALL_MAN} ${WRKSRC}/tuning/${i} ${MAN1PREFIX}/man/man1/${i}
-.endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${MKDIR} ${DOCSDIR}/contrib
 	@${MKDIR} ${DOCSDIR}/html
 	@${MKDIR} ${DOCSDIR}/programmer
-	@${MKDIR} ${DOCSDIR}/tuning
-	@${MKDIR} ${DOCSDIR}/tuning/sample.output
 	@${MKDIR} ${DOCSDIR}/xml
 .for i in AUTHORS COPYING INSTALL NEWS README README.cvs \
-	TODO UPGRADE \
+	doc/README.validation TODO UPGRADE \
 	CHANGES-0.10 CHANGES-0.11 CHANGES-0.12 CHANGES-0.13 CHANGES-0.14 \
 	CHANGES-0.15 \
 	RELEASE.NOTES-0.11 RELEASE.NOTES-0.12 RELEASE.NOTES-0.13 \
@@ -71,20 +64,10 @@ post-install::
 	  ${INSTALL_MAN} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/trio/AUTHORS ${DOCSDIR}/AUTHORS.trio
-.for i in README.bogotune
-	${INSTALL_MAN} ${WRKSRC}/tuning/${i} ${DOCSDIR}/tuning/${i}
-.endfor
-.for i in bogolex.sh bogol bogotune
-	${INSTALL_SCRIPT} ${WRKSRC}/tuning/${i} ${DOCSDIR}/tuning/${i}
-.endfor
-.for i in tune.nochange tune.normal tune.verbose
-	${INSTALL_SCRIPT} ${WRKSRC}/tuning/sample.output/${i} \
-		${DOCSDIR}/tuning/sample.output/${i}
-.endfor
 .for i in contrib/bogo.R contrib/bogofilter-qfe \
 		contrib/randomtrain contrib/scramble \
 		contrib/mime.get.rfc822 contrib/printmaildir.pl \
-		contrib/bogominitrain.pl
+		contrib/bogominitrain.pl contrib/README.contrib
 	  ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DOCSDIR}/${i}
 .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 c20de1dc9a64..799aaf29f04b 100644
--- a/mail/bogofilter-current/distinfo
+++ b/mail/bogofilter-current/distinfo
@@ -1 +1 @@
-MD5 (bogofilter-0.15.7.tar.gz) = d0a9e131861a992518178415bbafe974
+MD5 (bogofilter-0.15.13.tar.gz) = ffc44abc9cb211ee6e52d19465c95947
diff --git a/mail/bogofilter-current/pkg-plist b/mail/bogofilter-current/pkg-plist
index f62808355357..56c6918feacf 100644
--- a/mail/bogofilter-current/pkg-plist
+++ b/mail/bogofilter-current/pkg-plist
@@ -1,5 +1,6 @@
 bin/bogofilter
 bin/bogolexer
+bin/bogotune
 bin/bogoutil
 bin/bogoupgrade
 etc/bogofilter.cf.example
@@ -19,6 +20,7 @@ etc/bogofilter.cf.example
 %%PORTDOCS%%%%DOCSDIR%%/bogofilter-tuning.HOWTO
 %%PORTDOCS%%%%DOCSDIR%%/README.cvs
 %%PORTDOCS%%%%DOCSDIR%%/README.tdb
+%%PORTDOCS%%%%DOCSDIR%%/README.validation
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.11
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.12
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.13
@@ -27,6 +29,7 @@ etc/bogofilter.cf.example
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADE
 %%PORTDOCS%%%%DOCSDIR%%/bogofilter-SA-2002-01
+%%PORTDOCS%%%%DOCSDIR%%/contrib/README.contrib
 %%PORTDOCS%%%%DOCSDIR%%/contrib/README.randomtrain
 %%PORTDOCS%%%%DOCSDIR%%/contrib/bogo.R
 %%PORTDOCS%%%%DOCSDIR%%/contrib/bogofilter-qfe
@@ -38,27 +41,22 @@ etc/bogofilter.cf.example
 %%PORTDOCS%%%%DOCSDIR%%/contrib/randomtrain
 %%PORTDOCS%%%%DOCSDIR%%/contrib/scramble
 %%PORTDOCS%%%%DOCSDIR%%/html/bogofilter-faq.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bogofilter-faq-fr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/bogofilter.html
 %%PORTDOCS%%%%DOCSDIR%%/html/bogolexer.html
 %%PORTDOCS%%%%DOCSDIR%%/html/bogoupgrade.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bogotune.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bogotune-faq.html
 %%PORTDOCS%%%%DOCSDIR%%/html/bogoutil.html
 %%PORTDOCS%%%%DOCSDIR%%/integrating-with-postfix
 %%PORTDOCS%%%%DOCSDIR%%/integrating-with-qmail
 %%PORTDOCS%%%%DOCSDIR%%/programmer/README.freebsd
-%%PORTDOCS%%%%DOCSDIR%%/tuning/README.bogotune
-%%PORTDOCS%%%%DOCSDIR%%/tuning/bogol
-%%PORTDOCS%%%%DOCSDIR%%/tuning/bogotune
-%%PORTDOCS%%%%DOCSDIR%%/tuning/bogolex.sh
-%%PORTDOCS%%%%DOCSDIR%%/tuning/sample.output/tune.nochange
-%%PORTDOCS%%%%DOCSDIR%%/tuning/sample.output/tune.normal
-%%PORTDOCS%%%%DOCSDIR%%/tuning/sample.output/tune.verbose
 %%PORTDOCS%%%%DOCSDIR%%/xml/bogofilter.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/bogolexer.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/bogoupgrade.xml
+%%PORTDOCS%%%%DOCSDIR%%/xml/bogotune.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/bogoutil.xml
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/xml
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tuning/sample.output
-%%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 72877b658ba7..eabc14c0cd25 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	bogofilter
-PORTVERSION=	0.15.7
-PORTREVISION=	1
+PORTVERSION=	0.15.13
+PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,7 +21,7 @@ LIB_DEPENDS?=	db4.0:${PORTSDIR}/databases/db4
 
 LIB_DEPENDS+=	gsl.5:${PORTSDIR}/math/gsl
 
-CONFLICTS?=	bogofilter-tdb*
+CONFLICTS?=	bogofilter-tdb* bogofilter-qdbm*
 
 USE_REINPLACE=	yes
 USE_PERL5_RUN=	yes
@@ -31,11 +31,9 @@ CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc
 CONFIGURE_ENV?=	CPPFLAGS="-I${LOCALBASE}/include/db4" \
 		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-ldb4"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-MAN1=		bogofilter.1 bogoutil.1 bogoupgrade.1 bogolexer.1 \
-		bogol.1 bogotune.1
+MAN1=		bogofilter.1 bogoutil.1 bogoupgrade.1 bogolexer.1 bogotune.1
 
 post-patch:
-	${REINPLACE_CMD} -e 's/^@ENABLE_XMLTO_TRUE@//' ${WRKSRC}/doc/Makefile.in
 	${REINPLACE_CMD} -e "s|/bin/bash|${LOCALBASE}/bin/bash|" \
 		${WRKSRC}/contrib/randomtrain \
 		${WRKSRC}/contrib/scramble \
@@ -48,19 +46,14 @@ do-install:
 	cd ${WRKSRC} && make install-strip prefix=${PREFIX}
 
 post-install::
-.for i in bogol.1 bogotune.1
-	${INSTALL_MAN} ${WRKSRC}/tuning/${i} ${MAN1PREFIX}/man/man1/${i}
-.endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${MKDIR} ${DOCSDIR}/contrib
 	@${MKDIR} ${DOCSDIR}/html
 	@${MKDIR} ${DOCSDIR}/programmer
-	@${MKDIR} ${DOCSDIR}/tuning
-	@${MKDIR} ${DOCSDIR}/tuning/sample.output
 	@${MKDIR} ${DOCSDIR}/xml
 .for i in AUTHORS COPYING INSTALL NEWS README README.cvs \
-	TODO UPGRADE \
+	doc/README.validation TODO UPGRADE \
 	CHANGES-0.10 CHANGES-0.11 CHANGES-0.12 CHANGES-0.13 CHANGES-0.14 \
 	CHANGES-0.15 \
 	RELEASE.NOTES-0.11 RELEASE.NOTES-0.12 RELEASE.NOTES-0.13 \
@@ -71,20 +64,10 @@ post-install::
 	  ${INSTALL_MAN} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/trio/AUTHORS ${DOCSDIR}/AUTHORS.trio
-.for i in README.bogotune
-	${INSTALL_MAN} ${WRKSRC}/tuning/${i} ${DOCSDIR}/tuning/${i}
-.endfor
-.for i in bogolex.sh bogol bogotune
-	${INSTALL_SCRIPT} ${WRKSRC}/tuning/${i} ${DOCSDIR}/tuning/${i}
-.endfor
-.for i in tune.nochange tune.normal tune.verbose
-	${INSTALL_SCRIPT} ${WRKSRC}/tuning/sample.output/${i} \
-		${DOCSDIR}/tuning/sample.output/${i}
-.endfor
 .for i in contrib/bogo.R contrib/bogofilter-qfe \
 		contrib/randomtrain contrib/scramble \
 		contrib/mime.get.rfc822 contrib/printmaildir.pl \
-		contrib/bogominitrain.pl
+		contrib/bogominitrain.pl contrib/README.contrib
 	  ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DOCSDIR}/${i}
 .endfor
 .for i in contrib/README.randomtrain contrib/dot-qmail-bogofilter-default
diff --git a/mail/bogofilter/distinfo b/mail/bogofilter/distinfo
index c20de1dc9a64..799aaf29f04b 100644
--- a/mail/bogofilter/distinfo
+++ b/mail/bogofilter/distinfo
@@ -1 +1 @@
-MD5 (bogofilter-0.15.7.tar.gz) = d0a9e131861a992518178415bbafe974
+MD5 (bogofilter-0.15.13.tar.gz) = ffc44abc9cb211ee6e52d19465c95947
diff --git a/mail/bogofilter/pkg-plist b/mail/bogofilter/pkg-plist
index f62808355357..56c6918feacf 100644
--- a/mail/bogofilter/pkg-plist
+++ b/mail/bogofilter/pkg-plist
@@ -1,5 +1,6 @@
 bin/bogofilter
 bin/bogolexer
+bin/bogotune
 bin/bogoutil
 bin/bogoupgrade
 etc/bogofilter.cf.example
@@ -19,6 +20,7 @@ etc/bogofilter.cf.example
 %%PORTDOCS%%%%DOCSDIR%%/bogofilter-tuning.HOWTO
 %%PORTDOCS%%%%DOCSDIR%%/README.cvs
 %%PORTDOCS%%%%DOCSDIR%%/README.tdb
+%%PORTDOCS%%%%DOCSDIR%%/README.validation
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.11
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.12
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.13
@@ -27,6 +29,7 @@ etc/bogofilter.cf.example
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADE
 %%PORTDOCS%%%%DOCSDIR%%/bogofilter-SA-2002-01
+%%PORTDOCS%%%%DOCSDIR%%/contrib/README.contrib
 %%PORTDOCS%%%%DOCSDIR%%/contrib/README.randomtrain
 %%PORTDOCS%%%%DOCSDIR%%/contrib/bogo.R
 %%PORTDOCS%%%%DOCSDIR%%/contrib/bogofilter-qfe
@@ -38,27 +41,22 @@ etc/bogofilter.cf.example
 %%PORTDOCS%%%%DOCSDIR%%/contrib/randomtrain
 %%PORTDOCS%%%%DOCSDIR%%/contrib/scramble
 %%PORTDOCS%%%%DOCSDIR%%/html/bogofilter-faq.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bogofilter-faq-fr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/bogofilter.html
 %%PORTDOCS%%%%DOCSDIR%%/html/bogolexer.html
 %%PORTDOCS%%%%DOCSDIR%%/html/bogoupgrade.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bogotune.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bogotune-faq.html
 %%PORTDOCS%%%%DOCSDIR%%/html/bogoutil.html
 %%PORTDOCS%%%%DOCSDIR%%/integrating-with-postfix
 %%PORTDOCS%%%%DOCSDIR%%/integrating-with-qmail
 %%PORTDOCS%%%%DOCSDIR%%/programmer/README.freebsd
-%%PORTDOCS%%%%DOCSDIR%%/tuning/README.bogotune
-%%PORTDOCS%%%%DOCSDIR%%/tuning/bogol
-%%PORTDOCS%%%%DOCSDIR%%/tuning/bogotune
-%%PORTDOCS%%%%DOCSDIR%%/tuning/bogolex.sh
-%%PORTDOCS%%%%DOCSDIR%%/tuning/sample.output/tune.nochange
-%%PORTDOCS%%%%DOCSDIR%%/tuning/sample.output/tune.normal
-%%PORTDOCS%%%%DOCSDIR%%/tuning/sample.output/tune.verbose
 %%PORTDOCS%%%%DOCSDIR%%/xml/bogofilter.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/bogolexer.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/bogoupgrade.xml
+%%PORTDOCS%%%%DOCSDIR%%/xml/bogotune.xml
 %%PORTDOCS%%%%DOCSDIR%%/xml/bogoutil.xml
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/xml
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tuning/sample.output
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tuning
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/programmer
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib