4 files changed, 28 insertions, 19 deletions

diff --git a/mail/bogofilter-qdbm/Makefile b/mail/bogofilter-qdbm/Makefile
index 7ed2e9753241..2e46d3f88000 100644
--- a/mail/bogofilter-qdbm/Makefile
+++ b/mail/bogofilter-qdbm/Makefile
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	bogofilter
-PORTREVISION=	0
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-qdbm
 
@@ -14,7 +13,7 @@ MAINTAINER=	matthias.andree@gmx.de
 
 LIB_DEPENDS=	qdbm.11:${PORTSDIR}/databases/qdbm
 
-CONFLICTS=	bogofilter-[0-9]* bogofilter-tdb-[0-9]* [a-z][a-z]-bogofilter-[0-9]* bogofilter-sqlite-[0-9]*
+CONFLICTS=	bogofilter-[0-9]* [a-z][a-z]-bogofilter-[0-9]* bogofilter-sqlite-[0-9]*
 
 CONFIGURE_ARGS=	--with-database=qdbm
 BF_CPPFLAGS=	-I${LOCALBASE}/include
diff --git a/mail/bogofilter-sqlite/Makefile b/mail/bogofilter-sqlite/Makefile
index a818cb02d72c..d35321fd8483 100644
--- a/mail/bogofilter-sqlite/Makefile
+++ b/mail/bogofilter-sqlite/Makefile
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	bogofilter
-PORTREVISION=	0
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-sqlite
 
@@ -14,8 +13,7 @@ MAINTAINER=	matthias.andree@gmx.de
 
 LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3
 
-CONFLICTS=	bogofilter-[0-9]* bogofilter-qdbm-[0-9]* bogofilter-tdb-[0-9]* \
-		[a-z][a-z]-bogofilter-[0-9]* bogofilter-current-[0-9]*
+CONFLICTS=	bogofilter-[0-9]* bogofilter-qdbm-[0-9]* [a-z][a-z]-bogofilter-[0-9]*
 
 CONFIGURE_ARGS=	--with-database=sqlite
 BF_CPPFLAGS=	-I${LOCALBASE}/include
@@ -24,8 +22,4 @@ DESCR=		${PKGDIR}/pkg-descr
 
 MASTERDIR=	${.CURDIR}/../bogofilter
 
-pre-configure:
-	${REINPLACE_CMD} 's/^INTEGRITY_TESTS.*/INTEGRITY_TESTS=t.lock1/' \
-		${WRKSRC}/src/tests/Makefile.in
-
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index fd8365f807ef..7efd3bf3f92d 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bogofilter
 PORTVERSION=	0.96.2
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,7 +21,7 @@ OPTIONS+=	UNICODE "Normalize tokens to Unicode (UTF-8)" on
 
 LIB_DEPENDS?=	db-4.3:${PORTSDIR}/databases/db43
 
-CONFLICTS?=	bogofilter-sqlite-[0-9]* bogofilter-tdb-[0-9]* bogofilter-qdbm-[0-9]* [a-z][a-z]-bogofilter-[0-9]* bogofilter-sqlite-[0-9]*
+CONFLICTS?=	bogofilter-sqlite-[0-9]* bogofilter-qdbm-[0-9]* [a-z][a-z]-bogofilter-[0-9]*
 
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
@@ -72,15 +72,18 @@ post-patch:
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
+PLIST_SUB=	CONTRIB="@comment "
+.else
+PLIST_SUB=	CONTRIB=""
 .endif
 
 post-build::
 	cd ${WRKSRC} && make check SHELL=${SH}
 
 post-install::
+	@${MKDIR} ${DOCSDIR}/contrib
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for i in contrib html programmer xml
+.for i in html programmer xml
 	@${MKDIR} ${DOCSDIR}/${i}
 .endfor
 .for i in AUTHORS COPYING INSTALL NEWS README README.cvs \
@@ -93,19 +96,19 @@ post-install::
 	  ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/trio/AUTHORS ${DOCSDIR}/AUTHORS.trio
-.for i in contrib/bogo.R contrib/bogofilter-qfe \
-		contrib/mime.get.rfc822 contrib/printmaildir.pl \
-		contrib/bogominitrain.pl contrib/README.contrib
-	  ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DOCSDIR}/${i}
-.endfor
 .for i in contrib/dot-qmail-bogofilter-default
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/${i}
 .endfor
-	${INSTALL_PROGRAM} ${WRKSRC}/contrib/bogogrep ${DOCSDIR}/contrib/
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
 	${INSTALL_DATA} ${WRKSRC}/doc/*.xml ${DOCSDIR}/xml
 	${INSTALL_DATA} ${WRKSRC}/doc/programmer/README.freebsd ${DOCSDIR}/programmer
 .endif
+	${INSTALL_PROGRAM} ${WRKSRC}/contrib/bogogrep ${DOCSDIR}/contrib/
+.for i in contrib/bogo.R contrib/bogofilter-qfe \
+		contrib/mime.get.rfc822 contrib/printmaildir.pl \
+		contrib/bogominitrain.pl contrib/README.contrib
+	  ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DOCSDIR}/${i}
+.endfor
 .if !defined(WITHOUT_BASH)
 .for i in randomtrain scramble trainbogo.sh
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/${i} ${DOCSDIR}/contrib/
diff --git a/mail/bogofilter/pkg-plist b/mail/bogofilter/pkg-plist
index 1b85411b39c5..028908e2e35d 100644
--- a/mail/bogofilter/pkg-plist
+++ b/mail/bogofilter/pkg-plist
@@ -7,3 +7,16 @@ bin/bogotune
 bin/bogoutil
 bin/bogoupgrade
 etc/bogofilter.cf.example
+%%CONTRIB%%%%DOCSDIR%%/contrib/bogo.R
+%%CONTRIB%%%%DOCSDIR%%/contrib/bogofilter-qfe
+%%CONTRIB%%%%DOCSDIR%%/contrib/mime.get.rfc822
+%%CONTRIB%%%%DOCSDIR%%/contrib/printmaildir.pl
+%%CONTRIB%%%%DOCSDIR%%/contrib/bogominitrain.pl
+%%CONTRIB%%%%DOCSDIR%%/contrib/README.contrib
+%%CONTRIB%%%%DOCSDIR%%/contrib/bogogrep
+%%CONTRIB%%%%DOCSDIR%%/contrib/randomtrain
+%%CONTRIB%%%%DOCSDIR%%/contrib/scramble
+%%CONTRIB%%%%DOCSDIR%%/contrib/trainbogo.sh
+%%CONTRIB%%%%DOCSDIR%%/contrib/README.randomtrain
+%%CONTRIB%%@dirrm %%DOCSDIR%%/contrib
+%%CONTRIB%%@dirrm %%DOCSDIR%%