Date: Sat, 10 Apr 2004 01:30:02 +0200 (CEST) From: Matthias Andree <matthias.andree@gmx.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Kirill Ponomarew <krion@FreeBSD.org> Subject: ports/65382: [MAINTAINER] mail/bogofilter: update to 0.17.5 Message-ID: <20040409233002.B6AF95C32@sigma.emma.line.org> Resent-Message-ID: <200404092340.i39NeHj3024776@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 65382
>Category: ports
>Synopsis: [MAINTAINER] mail/bogofilter: update to 0.17.5
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Apr 09 16:40:16 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: Matthias Andree
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD sigma.emma.line.org 5.2-CURRENT FreeBSD 5.2-CURRENT #7: Fri Apr 9 17:48:23 CEST
>Description:
- Update to 0.17.5
Changes over previous PR:
- will only use DB 4.2, no configuration possible
As we don't use the Berkeley DB environment stuff (for concurrent or
transactional libdb use - __db.NNN and log.NNNNNNNNNN files),
DB 4.2 will deal with DB 4.0-created data base files just fine.
This is a migration aid for future bogofilter versions that depend on
DB 4.1 or newer.
-> no more broken DB version guesswork
- fix ENV to SETENV so pkg-install will work from the port
- removed alpha FreeBSD 5 IGNORE, as no logs have been shown that prove
the problem and no proper bug report exists. reverted to bsd.port.mk.
- INSTALL_MAN -> INSTALL_DATA
- ECHO -> ECHO_MSG
- added RUN_DEPENDS bash2 for some of the contrib stuff
- added REINPLACE_CMD for Perl path in shebang lines (#!) in contrib stuff
- export PERL to CONFIGURE_ENV
Thanks to Kirill Ponomarew for his input and good ideas
with getting this port upgraded properly.
Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:
--- bogofilter-0.17.5.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/Makefile /usr/home/emma/ports/mail/bogofilter/Makefile
--- /usr/ports/mail/bogofilter/Makefile Tue Feb 24 16:25:37 2004
+++ /usr/home/emma/ports/mail/bogofilter/Makefile Sat Apr 10 01:26:18 2004
@@ -1,12 +1,12 @@
# ports collection Makefile for: bogofilter
-# Whom: Matthias Andree <matthias.andree@web.de>
+# Whom: Matthias Andree <matthias.andree@gmx.de>
# Date created: 2002-10-17
#
# $FreeBSD: ports/mail/bogofilter/Makefile,v 1.34 2004/02/23 12:15:59 kris Exp $
#
PORTNAME= bogofilter
-PORTVERSION= 0.16.4
+PORTVERSION= 0.17.5
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,19 +14,9 @@
MAINTAINER= matthias.andree@gmx.de
COMMENT= "Fast, teachable, learning spam detector"
-# There is a sibling port, bogofilter-tdb, which presets different
-# values for some of our variables
-WITH_DB_VER?= 4
-.if ${WITH_DB_VER} == 42
LIB_DEPENDS?= db-4.2:${PORTSDIR}/databases/db42
-libs= -ldb-4.2
-.else
-WITH_DB_VER= 4
-LIB_DEPENDS?= db4.0:${PORTSDIR}/databases/db4
-libs= -ldb4
-.endif
-
LIB_DEPENDS+= gsl.5:${PORTSDIR}/math/gsl
+RUN_DEPENDS= bash:${PORTSDIR}/shells/bash2
CONFLICTS?= bogofilter-tdb* bogofilter-qdbm*
@@ -36,31 +26,25 @@
GNU_CONFIGURE= yes
PATCH_STRIP= -p1
CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc
-CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include/db${WITH_DB_VER}" \
- LDFLAGS="-L${LOCALBASE}/lib" LIBS="${libs}"
+CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include/db42" \
+ LDFLAGS="-L${LOCALBASE}/lib" LIBS="-ldb-4.2"
+CONFIGURE_ENV+= PERL="${PERL}"
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALL_TARGET= install-strip prefix=${PREFIX}
MAN1= bogofilter.1 bogoutil.1 bogoupgrade.1 bogolexer.1 bogotune.1
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "alpha" && ${OSVERSION} >= 502102
-IGNORE= "Does not compile on alpha 5.x \(infinite loop in build\)"
-.endif
-
post-patch:
${REINPLACE_CMD} -e "s|/bin/bash|${LOCALBASE}/bin/bash|" \
${WRKSRC}/contrib/randomtrain \
${WRKSRC}/contrib/scramble \
${WRKSRC}/contrib/trainbogo.sh
-
-.if !defined(PKGNAMESUFFIX) && ${WITH_DB_VER} != 42
-pre-everything::
- @${ECHO} ""
- @${ECHO} "Use -DWITH_DB_VER=42 to link against db42 instead of the default db4"
- @${ECHO} ""
-.endif
+ ${REINPLACE_CMD} -e 's|^#!.*perl|#! ${PERL}|' \
+ ${WRKSRC}/src/tests/unsort.pl \
+ ${WRKSRC}/contrib/bogofilter-milter.pl \
+ ${WRKSRC}/contrib/bogominitrain.pl \
+ ${WRKSRC}/contrib/mime.get.rfc822 \
+ ${WRKSRC}/contrib/printmaildir.pl
.if !defined(NOPORTDOCS)
PORTDOCS= *
@@ -72,19 +56,18 @@
post-install::
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
- @${MKDIR} ${DOCSDIR}/contrib
- @${MKDIR} ${DOCSDIR}/html
- @${MKDIR} ${DOCSDIR}/programmer
- @${MKDIR} ${DOCSDIR}/xml
+.for i in contrib html programmer xml
+ @${MKDIR} ${DOCSDIR}/${i}
+.endfor
.for i in AUTHORS COPYING INSTALL NEWS README README.cvs \
doc/README.validation TODO \
CHANGES-* RELEASE.NOTES-* \
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}
+ ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
.endfor
- ${INSTALL_MAN} ${WRKSRC}/trio/AUTHORS ${DOCSDIR}/AUTHORS.trio
+ ${INSTALL_DATA} ${WRKSRC}/trio/AUTHORS ${DOCSDIR}/AUTHORS.trio
.for i in contrib/bogo.R contrib/bogofilter-qfe \
contrib/randomtrain contrib/scramble \
contrib/mime.get.rfc822 contrib/printmaildir.pl \
@@ -92,12 +75,13 @@
${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DOCSDIR}/${i}
.endfor
.for i in contrib/README.randomtrain contrib/dot-qmail-bogofilter-default
- ${INSTALL_MAN} ${WRKSRC}/${i} ${DOCSDIR}/${i}
+ ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/${i}
.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.freebsd ${DOCSDIR}/programmer
+ ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
+ ${INSTALL_DATA} ${WRKSRC}/doc/*.xml ${DOCSDIR}/xml
+ ${INSTALL_DATA} ${WRKSRC}/doc/programmer/README.freebsd ${DOCSDIR}/programmer
.endif
+ ${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/distinfo /usr/home/emma/ports/mail/bogofilter/distinfo
--- /usr/ports/mail/bogofilter/distinfo Sat Feb 7 18:41:32 2004
+++ /usr/home/emma/ports/mail/bogofilter/distinfo Fri Apr 9 11:14:43 2004
@@ -1,2 +1,2 @@
-MD5 (bogofilter-0.16.4.tar.bz2) = eafe4d23e3c2a01f72f854c90afb31ea
-SIZE (bogofilter-0.16.4.tar.bz2) = 614298
+MD5 (bogofilter-0.17.5.tar.bz2) = 9cdeebc3bb9edf9ef09a1b3f0bd09c42
+SIZE (bogofilter-0.17.5.tar.bz2) = 620413
diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/pkg-install /usr/home/emma/ports/mail/bogofilter/pkg-install
--- /usr/ports/mail/bogofilter/pkg-install Thu Jan 1 01:00:00 1970
+++ /usr/home/emma/ports/mail/bogofilter/pkg-install Fri Apr 9 12:47:34 2004
@@ -0,0 +1,12 @@
+if [ "$2" = "POST-INSTALL" ] && [ -e ${PKG_PREFIX}/etc/bogofilter.cf ] ; then
+cat - <<_EOF
+
+--------------------------------------------------------------------------
+The recent bogofilter versions have undergone substantial changes that can
+affect compatibility and may require that you change your configuration.
+
+See the RELEASE.NOTES-* files that shipped with bogofilter for details.
+--------------------------------------------------------------------------
+
+_EOF
+fi
--- bogofilter-0.17.5.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040409233002.B6AF95C32>