Date: Fri, 9 Apr 2004 16:52:34 +0200 (CEST) From: Matthias Andree <matthias.andree@gmx.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/65362: [MAINTAINER] mail/bogofilter: update to 0.17.5 Message-ID: <20040409145234.2D0495C5E@sigma.emma.line.org> Resent-Message-ID: <200404091500.i39F0bDQ043927@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 65362
>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 08:00:37 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 #6: Wed Apr 7 11:16:03 CEST
>Description:
- Update to 0.17.5
- Try to derive the DB dependency from an installed version of the port.
- Support DB 4.1.
- NEW FILE: pkg-install
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 Fri Apr 9 12:46:04 2004
@@ -6,7 +6,7 @@
#
PORTNAME= bogofilter
-PORTVERSION= 0.16.4
+PORTVERSION= 0.17.5
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,10 +16,29 @@
-# There is a sibling port, bogofilter-tdb, which presets different
+# There are sibling ports, bogofilter-*, which preset different
# values for some of our variables
-WITH_DB_VER?= 4
+
+USE_BZIP2= yes
+USE_REINPLACE= yes
+USE_PERL5_RUN= yes
+GNU_CONFIGURE= yes
+PATCH_STRIP= -p1
+
+.include <bsd.port.pre.mk>
+
+# Guess previous DB dependency in order to not break existing
+# installs.
+PREVIOUS_DB_VER!= pkg_info -qr bogofilter* 2>/dev/null | ${GREP} '^@pkgdep db' | ${SED} 's/^@pkgdep db\([0-9]\.*[0-9]*\)-.*/\1/;'
+.if ${PREVIOUS_DB_VER} != ""
+WITH_DB_VER?= ${PREVIOUS_DB_VER}
+.endif
+
+WITH_DB_VER?= 42
.if ${WITH_DB_VER} == 42
LIB_DEPENDS?= db-4.2:${PORTSDIR}/databases/db42
libs= -ldb-4.2
+.elif ${WITH_DB_VER} == 41
+LIB_DEPENDS?= db-4.1:${PORTSDIR}/databases/db41
+libs= -ldb41
.else
WITH_DB_VER= 4
LIB_DEPENDS?= db4.0:${PORTSDIR}/databases/db4
@@ -30,11 +49,6 @@
CONFLICTS?= bogofilter-tdb* bogofilter-qdbm*
-USE_BZIP2= yes
-USE_REINPLACE= yes
-USE_PERL5_RUN= yes
-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}"
@@ -43,8 +57,6 @@
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
@@ -55,10 +67,19 @@
${WRKSRC}/contrib/scramble \
${WRKSRC}/contrib/trainbogo.sh
-.if !defined(PKGNAMESUFFIX) && ${WITH_DB_VER} != 42
+.if !defined(PKGNAMESUFFIX)
pre-everything::
@${ECHO} ""
- @${ECHO} "Use -DWITH_DB_VER=42 to link against db42 instead of the default db4"
+ @${ECHO} "----------------------------------------------------------------------"
+ @${ECHO} "Use WITH_DB_VER=42, WITH_DB_VER=41 or WITH_DB_VER=4 to force the"
+ @${ECHO} "Berkeley DB version bogofilter should link against."
+ @${ECHO} ""
+ @${ECHO} "- For UPGRADES, we will use whichever Berkeley DB version the previous"
+ @${ECHO} " installation had used."
+ @${ECHO} "- For FRESH INSTALLS, we will default to WITH_DB_VER=42."
+ @${ECHO} "----------------------------------------------------------------------"
+ @${ECHO} "WITH_DB_VER=${WITH_DB_VER} is in effect now."
+ @${ECHO} "----------------------------------------------------------------------"
@${ECHO} ""
.endif
@@ -99,5 +120,6 @@
${INSTALL_MAN} ${WRKSRC}/doc/*.xml ${DOCSDIR}/xml
${INSTALL_MAN} ${WRKSRC}/doc/programmer/README.freebsd ${DOCSDIR}/programmer
.endif
+ ${ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.post.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?20040409145234.2D0495C5E>