From ma@dt.e-technik.uni-dortmund.de  Thu Jan  1 20:14:16 2004
Return-Path: <ma@dt.e-technik.uni-dortmund.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 8955F16A4CE; Thu,  1 Jan 2004 20:14:16 -0800 (PST)
Received: from mail.dt.e-technik.uni-dortmund.de (mail.dt.E-Technik.Uni-Dortmund.DE [129.217.163.1])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id B4F1F43D2F; Thu,  1 Jan 2004 20:14:10 -0800 (PST)
	(envelope-from ma@dt.e-technik.uni-dortmund.de)
Received: from m2a2.dyndns.org (krusty.dt.e-technik.uni-dortmund.de [129.217.163.1])
	by mail.dt.e-technik.uni-dortmund.de (Postfix) with ESMTP id 6D61018E83;
	Fri,  2 Jan 2004 05:14:09 +0100 (CET)
Received: from sigma.emma.line.org (sigma.emma.line.org [192.168.0.49])
	by merlin.emma.line.org (Postfix) with ESMTP id C1FB597905;
	Fri,  2 Jan 2004 05:14:07 +0100 (CET)
Received: by sigma.emma.line.org (Postfix, from userid 500)
	id 64D215C30; Fri,  2 Jan 2004 05:14:07 +0100 (CET)
Message-Id: <20040102041407.64D215C30@sigma.emma.line.org>
Date: Fri,  2 Jan 2004 05:14:07 +0100 (CET)
From: Matthias Andree <matthias.andree@gmx.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: krion@freebsd.org
Subject: [MAINTAINER] mail/bogofilter: update to 0.15.13
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         60811
>Category:       ports
>Synopsis:       [MAINTAINER] mail/bogofilter: update to 0.15.13
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    krion
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 01 20:20:15 PST 2004
>Closed-Date:    Fri Jan 02 04:26:39 PST 2004
>Last-Modified:  Fri Jan 02 04:26:39 PST 2004
>Originator:     Matthias Andree
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD sigma.emma.line.org 5.2-CURRENT FreeBSD 5.2-CURRENT #2: Sun Dec 28 00:18:12 CET 2003
>Description:
- Update to 0.15.13
- Add conflicts for bogofilter-qdbm, for future port.

Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:

--- bogofilter-0.15.13.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/Makefile /root/bogofilter/Makefile
--- /usr/ports/mail/bogofilter/Makefile	Sun Nov 23 18:52:42 2003
+++ /root/bogofilter/Makefile	Fri Jan  2 05:03:12 2004
@@ -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+=	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_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 @@
 	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 @@
 	  ${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 -ruN --exclude=CVS /usr/ports/mail/bogofilter/distinfo /root/bogofilter/distinfo
--- /usr/ports/mail/bogofilter/distinfo	Sat Nov  1 16:27:32 2003
+++ /root/bogofilter/distinfo	Fri Jan  2 04:48:07 2004
@@ -1 +1 @@
-MD5 (bogofilter-0.15.7.tar.gz) = d0a9e131861a992518178415bbafe974
+MD5 (bogofilter-0.15.13.tar.gz) = ffc44abc9cb211ee6e52d19465c95947
diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/pkg-plist /root/bogofilter/pkg-plist
--- /usr/ports/mail/bogofilter/pkg-plist	Sat Nov  1 16:27:32 2003
+++ /root/bogofilter/pkg-plist	Fri Jan  2 05:05:53 2004
@@ -1,5 +1,6 @@
 bin/bogofilter
 bin/bogolexer
+bin/bogotune
 bin/bogoutil
 bin/bogoupgrade
 etc/bogofilter.cf.example
@@ -19,6 +20,7 @@
 %%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 @@
 %%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 @@
 %%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
--- bogofilter-0.15.13.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->krion 
Responsible-Changed-By: krion 
Responsible-Changed-When: Thu Jan 1 22:58:20 PST 2004 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=60811 
State-Changed-From-To: open->closed 
State-Changed-By: krion 
State-Changed-When: Fri Jan 2 04:26:33 PST 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=60811 
>Unformatted:
