Bug 58801 - [MAINTAINER] mail/bogofilter: update to 0.15.7
Summary: [MAINTAINER] mail/bogofilter: update to 0.15.7
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Sergei Kolobov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2003-11-01 12:10 UTC by matthias.andree
Modified: 2003-11-01 15:00 UTC (History)
0 users

See Also:


Attachments
bogofilter-0.15.7.patch (4.01 KB, patch)
2003-11-01 12:10 UTC, matthias.andree
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description matthias.andree 2003-11-01 12:10:17 UTC
- Update to 0.15.7 (new stable upstream release)
- Fix up NOPORTDOCS mode, install missing manual pages.

Generated with FreeBSD Port Tools 0.50
Comment 1 Sergei Kolobov freebsd_committer freebsd_triage 2003-11-01 12:43:53 UTC
Responsible Changed
From-To: freebsd-ports-bugs->sergei

I'll take it.
Comment 2 Oliver Braun freebsd_committer freebsd_triage 2003-11-01 12:53:48 UTC
Since bogofilter.html, bogolexer.html, bogoupgrade.html, bogoutil.html
are no longer in ${WRKSRC}/doc these files are not installed. So, we
have to remove them from the plist. New patch at:

   http://people.freebsd.org/~obraun/pending_ports/bogofilter.diff

Approved?

Regards,
         Olli
-- 
Oliver Braun -- obraun @ { unsane.org | FreeBSD.org | haskell.org }
Comment 3 Matthias Andree 2003-11-01 13:40:13 UTC
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Oliver Braun schrieb am 2003-11-01:

> Since bogofilter.html, bogolexer.html, bogoupgrade.html, bogoutil.html
> are no longer in ${WRKSRC}/doc these files are not installed. So, we
> have to remove them from the plist.

The .html files are generated by "make" or "make build" and are not in
the tarball (we need to replace some paths such as @sysconfdir@ to get
the .SH FILES sections of the manual pages right.

> New patch at:
> 
>    http://people.freebsd.org/~obraun/pending_ports/bogofilter.diff
> 
> Approved?

Rejected. Works for me.

Please try:

cd /where/you/have/unpacked/bogofilter
make configure
cd work/bogofilter-0.15.7/doc
make

This yields on my FreeBSD 4.9 machine (my line breaks) the following
output that accompanies the generation of the .html files. The
interesting part is that "make" should have complained about
non-generation, see the || { ... ; exit 1  } part.

What is your default shell? Do you override it in /etc/make.conf? My
shell is /bin/sh. My ports won't work with csh, for instance.

What is your OS version? Can you show build logs?

Here's the promised output:

sed -e "s|[@]sysconfdir@|/usr/local/etc|g"  -e
"s|[@]bindir@|/usr/local/bin|g" <bogofilter.1in >bogofilter.1  || { rm
- -f bogofilter.1 ; exit 1 ; }
sed -e "s|[@]sysconfdir@|/usr/local/etc|g"  -e
"s|[@]bindir@|/usr/local/bin|g" <bogoutil.1in >bogoutil.1  || { rm -f
bogoutil.1 ; exit 1 ; }
sed -e "s|[@]sysconfdir@|/usr/local/etc|g"  -e
"s|[@]bindir@|/usr/local/bin|g" <bogoupgrade.1in >bogoupgrade.1  || { rm
- -f bogoupgrade.1 ; exit 1 ; }
sed -e "s|[@]sysconfdir@|/usr/local/etc|g"  -e
"s|[@]bindir@|/usr/local/bin|g" <bogolexer.1in >bogolexer.1  || { rm -f
bogolexer.1 ; exit 1 ; }
sed -e "s|[@]sysconfdir@|/usr/local/etc|g"  -e
"s|[@]bindir@|/usr/local/bin|g" <bogofilter.htmlin >bogofilter.html  ||
{ rm -f bogofilter.html ; exit 1 ; }
sed -e "s|[@]sysconfdir@|/usr/local/etc|g"  -e
"s|[@]bindir@|/usr/local/bin|g" <bogoutil.htmlin >bogoutil.html  || { rm
- -f bogoutil.html ; exit 1 ; }
sed -e "s|[@]sysconfdir@|/usr/local/etc|g"  -e
"s|[@]bindir@|/usr/local/bin|g" <bogoupgrade.htmlin >bogoupgrade.html
|| { rm -f bogoupgrade.html ; exit 1 ; }
sed -e "s|[@]sysconfdir@|/usr/local/etc|g"  -e
"s|[@]bindir@|/usr/local/bin|g" <bogolexer.htmlin >bogolexer.html  || {
rm -f bogolexer.html ; exit 1 ; }
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)

iD8DBQE/o7e5vmGDOQUufZURAqacAJ49gE5733/36F6RqPUiZ09brj7VIgCgrmcq
rbYK9bLhCb0JjAenhwHU0w0=
=dC7l
-----END PGP SIGNATURE-----
Comment 4 Oliver Braun freebsd_committer freebsd_triage 2003-11-01 14:01:31 UTC
> cd /where/you/have/unpacked/bogofilter
> make configure
> cd work/bogofilter-0.15.7/doc
> make


Making all in doc
sed -e "s|[@]sysconfdir@|/usr/local/etc|g"  -e "s|[@]bindir@|/usr/local/bin|g" <bogofilter.1in >bogofilter.1  || { rm -f bogofilter.1 ; exit 1 ; }
sed -e "s|[@]sysconfdir@|/usr/local/etc|g"  -e "s|[@]bindir@|/usr/local/bin|g" <bogoutil.1in >bogoutil.1  || { rm -f bogoutil.1 ; exit 1 ; }
sed -e "s|[@]sysconfdir@|/usr/local/etc|g"  -e "s|[@]bindir@|/usr/local/bin|g" <bogoupgrade.1in >bogoupgrade.1  || { rm -f bogoupgrade.1 ; exit 1 ; }
sed -e "s|[@]sysconfdir@|/usr/local/etc|g"  -e "s|[@]bindir@|/usr/local/bin|g" <bogolexer.1in >bogolexer.1  || { rm -f bogolexer.1 ; exit 1 ; }

Interesting:

# grep html_MANS doc/Makefile
#html_MANS = bogofilter.html bogoutil.html bogoupgrade.html bogolexer.html
CLEANFILES = $(man_MANS) $(html_MANS)
all: $(man_MANS) $(html_MANS)

This should be the problem!

> What is your default shell?

/bin/sh

> Do you override it in /etc/make.conf?

No.

> What is your OS version?


FreeBSD 4.9-STABLE #0: Wed Oct 29 15:33:29 CET 2003

> Can you show build logs?


http://people.freebsd.org/~obraun/bogofilter.log

Regards,
         Olli
-- 
Oliver Braun -- obraun @ { unsane.org | FreeBSD.org | haskell.org }
Comment 5 Matthias Andree 2003-11-01 14:25:49 UTC
Oops, some part believes it requires xmlto when it can proceed without.
(Olli, you can take the bogofilter build log offline now, I don't need
it any longer.)

Here's a new patch (with newly added post-patch: section that
unconditionally enables HTML rebuilding) that should work regardless of
xmlto.

diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/Makefile /root/bogofilter/Makefile
--- /usr/ports/mail/bogofilter/Makefile	Wed Sep  3 17:22:01 2003
+++ /root/bogofilter/Makefile	Sat Nov  1 15:20:52 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bogofilter
-PORTVERSION=	0.14.5.4
+PORTVERSION=	0.15.7
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,8 +18,11 @@
 # values for some of our variables
 LIB_DEPENDS?=	db4.0:${PORTSDIR}/databases/db4
 
+LIB_DEPENDS+=	gsl.5:${PORTSDIR}/math/gsl
+
 CONFLICTS?=	bogofilter-tdb*
 
+USE_REINPLACE=	yes
 USE_PERL5_RUN=	yes
 GNU_CONFIGURE=	yes
 PATCH_STRIP=	-p1
@@ -30,14 +33,20 @@
 MAN1=		bogofilter.1 bogoutil.1 bogoupgrade.1 bogolexer.1 \
 		bogol.1 bogotune.1
 
+post-patch:
+	${REINPLACE_CMD} -e 's/^@ENABLE_XMLTO_TRUE@//' ${WRKSRC}/doc/Makefile.in
+
 post-build::
 	cd ${WRKSRC} && make check SHELL=${SH}
 
 do-install:
 	cd ${WRKSRC} && make install-strip prefix=${PREFIX}
 
-.if !defined(NOPORTDOCS)
 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
@@ -48,22 +57,21 @@
 .for i in AUTHORS COPYING INSTALL NEWS README README.cvs \
 	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 \
-	RELEASE.NOTES-0.14 \
+	RELEASE.NOTES-0.14 RELEASE.NOTES-0.15 \
 	doc/integrating-with-postfix doc/integrating-with-qmail \
 	doc/bogofilter-tuning.HOWTO doc/bogofilter-SA-2002-01 METHODS \
 	doc/README.tdb
 	  ${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 bogol.1 bogotune.1
-	${INSTALL_MAN} ${WRKSRC}/tuning/${i} ${MAN1PREFIX}/man/man1/${i}
-.endfor
 .for i in tune.nochange tune.normal tune.verbose
 	${INSTALL_SCRIPT} ${WRKSRC}/tuning/sample.output/${i} \
 		${DOCSDIR}/tuning/sample.output/${i}
@@ -80,7 +88,7 @@
 	${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
+	${INSTALL_MAN} ${WRKSRC}/doc/programmer/README.freebsd ${DOCSDIR}/programmer
 .endif
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/distinfo /root/bogofilter/distinfo
--- /usr/ports/mail/bogofilter/distinfo	Wed Sep  3 17:22:01 2003
+++ /root/bogofilter/distinfo	Sat Nov  1 11:29:44 2003
@@ -1 +1 @@
-MD5 (bogofilter-0.14.5.4.tar.gz) = 33064f40fe7b250f9ca45fddaa33af64
+MD5 (bogofilter-0.15.7.tar.gz) = d0a9e131861a992518178415bbafe974
diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/pkg-plist /root/bogofilter/pkg-plist
--- /usr/ports/mail/bogofilter/pkg-plist	Sat Aug 23 22:13:33 2003
+++ /root/bogofilter/pkg-plist	Sat Nov  1 12:35:39 2003
@@ -4,11 +4,13 @@
 bin/bogoupgrade
 etc/bogofilter.cf.example
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.trio
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.10
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.11
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.12
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.13
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.14
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.15
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/METHODS
@@ -21,6 +23,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.12
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.13
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.14
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.15
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADE
 %%PORTDOCS%%%%DOCSDIR%%/bogofilter-SA-2002-01
@@ -41,9 +44,7 @@
 %%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.bogotune
 %%PORTDOCS%%%%DOCSDIR%%/tuning/bogol
 %%PORTDOCS%%%%DOCSDIR%%/tuning/bogotune
Comment 6 Sergei Kolobov freebsd_committer freebsd_triage 2003-11-01 14:30:17 UTC
On 2003-11-01 at 05:50 -0800, Matthias Andree wrote:
>  Oliver Braun schrieb am 2003-11-01:
>  
>  > Since bogofilter.html, bogolexer.html, bogoupgrade.html, bogoutil.html
>  > are no longer in ${WRKSRC}/doc these files are not installed. So, we
>  > have to remove them from the plist.
>  
>  The .html files are generated by "make" or "make build" and are not in
>  the tarball (we need to replace some paths such as @sysconfdir@ to get
>  the .SH FILES sections of the manual pages right.

Olli, I can also confirm that those files get properly installed and
packaged. A problem with your build environment, perhaps?

Sergei
Comment 7 Sergei Kolobov freebsd_committer freebsd_triage 2003-11-01 14:33:03 UTC
State Changed
From-To: open->closed

Committed, thanks!
Comment 8 Matthias Andree 2003-11-01 14:49:18 UTC
On Sat, 01 Nov 2003, Sergei Kolobov wrote:

> Olli, I can also confirm that those files get properly installed and
> packaged. A problem with your build environment, perhaps?

The upstream package would disable transforming .htmlin to .html when
xmlto was missing, which is bogus. It should instead disable
translforming .xml to .htmlin, and the CVS version of bogofilter does
that now.

I've followed up with a fix (three lines in the port's Makefile, using
REINPLACE), so it was a problem with the tarball that was invisible on
your and my machines.

-- 
Matthias Andree

Encrypt your mail: my GnuPG key ID is 0x052E7D95
Comment 9 Oliver Braun freebsd_committer freebsd_triage 2003-11-01 14:54:20 UTC
On Sat, 01 Nov 2003, Sergei Kolobov wrote:

> Olli, I can also confirm that those files get properly installed and
> packaged. A problem with your build environment, perhaps?


It works now! Thanks.

Regards,
         Olli
-- 
Oliver Braun -- obraun @ { unsane.org | FreeBSD.org | haskell.org }