Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 29 May 2005 19:47:17 +0200
From:      Matthias Andree <matthias.andree@gmx.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/81627: [MAINTAINER] mail/bogofilter: update to 0.94.13
Message-ID:  <E1DcRsb-000Kh9-MC@libertas.emma.line.org>
Resent-Message-ID: <200505291750.j4THo2f0071754@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         81627
>Category:       ports
>Synopsis:       [MAINTAINER] mail/bogofilter: update to 0.94.13
>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:   Sun May 29 17:50:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Matthias Andree
>Release:        FreeBSD 4.11-RELEASE-p9 i386
>Organization:
>Environment:
System: FreeBSD libertas.emma.line.org 4.11-RELEASE-p9 FreeBSD 4.11-RELEASE-p9 #23: Sat May 21 14:15:04 CEST 2005
>Description:
- Update to 0.94.13
  * iconv/unicode bugfixes
  * sqlite3 interface much more CPU efficient and faster now
  * bogofilter -q option to suppress printing of statistics
  (see share/doc/bogofilter/NEWS for details)
- convert WITHOUT_*/pre-everything messaging stuff (GSL, BASH) to OPTIONS
- add an OPTIONS switch for ICONV (experimental, default off),
  suggested by Yar Tikhiy.
- revise pkg-install message

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

--- bogofilter-0.94.13.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/Makefile /usr/home/emma/ports/mail/bogofilter/Makefile
--- /usr/ports/mail/bogofilter/Makefile	Sun May 29 15:46:22 2005
+++ /usr/home/emma/ports/mail/bogofilter/Makefile	Sun May 29 19:14:22 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bogofilter
-PORTVERSION=	0.94.12
+PORTVERSION=	0.94.13
 PORTREVISION?=	0
 CATEGORIES?=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -15,13 +15,11 @@
 MAINTAINER?=	matthias.andree@gmx.de
 COMMENT=	Fast, teachable, learning spam detector
 
+OPTIONS=	BASH  "Install scripts that depend on the bash(1) shell" on
+OPTIONS+=	GSL   "Compile with system-wide GSL (recommended)" on
+OPTIONS+=	ICONV "Normalize tokens to Unicode (EXPERIMENTAL)" off
+
 LIB_DEPENDS?=	db-4.3:${PORTSDIR}/databases/db43
-.if !defined(WITHOUT_GSL)
-LIB_DEPENDS+=	gsl:${PORTSDIR}/math/gsl
-.endif
-.if !defined(WITHOUT_BASH)
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
-.endif
 
 CONFLICTS?=	bogofilter-sqlite-[0-9]* bogofilter-tdb-[0-9]* bogofilter-qdbm-[0-9]* [a-z][a-z]-bogofilter-[0-9]* bogofilter-sqlite-[0-9]*
 
@@ -30,12 +28,26 @@
 USE_PERL5_RUN=	yes
 GNU_CONFIGURE=	yes
 PATCH_STRIP=	-p1
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_BASH)
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+.endif
+
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc
-.if defined(WITHOUT_GSL)
+.if defined(WITH_ICONV)
+CONFIGURE_ARGS+=	--enable-iconv
+LIB_DEPENDS+=		iconv:${PORTSDIR}/converters/libiconv
+addlibs=		-liconv
+.endif
+.if defined(WITH_GSL)
+LIB_DEPENDS+=		gsl:${PORTSDIR}/math/gsl
+.else
 CONFIGURE_ARGS+=	--with-included-gsl
 .endif
 CONFIGURE_ENV?=	CPPFLAGS="-I${LOCALBASE}/include/db43" \
-		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-ldb-4.3"
+		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-ldb-4.3 ${addlibs}"
 CONFIGURE_ENV+=	PERL="${PERL}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALL_TARGET=	install-strip prefix=${PREFIX}
@@ -59,23 +71,6 @@
 PORTDOCS=	*
 .endif
 
-pre-everything::
-	@${ECHO_CMD} ""
-.if !defined(WITHOUT_BASH)
-	@${ECHO_CMD} "To install without bash dependency, you can use: make -DWITHOUT_BASH install"
-	@${ECHO_CMD} "Note that installing without bash dependency will mean that some of the"
-	@${ECHO_CMD} "${DOCSDIR}/contrib scripts will not be installed."
-	@${ECHO_CMD} ""
-.endif
-.if !defined(WITHOUT_GSL)
-	@${ECHO_CMD} "To have bogofilter link against its shipped GSL 1.4 statically,"
-	@${ECHO_CMD} "you can use: make -DWITHOUT_GSL && make -DWITHOUT_GSL install"
-.if !defined(WITHOUT_BASH)
-	@${ECHO_CMD} "or: make -DWITHOUT_GSL && make -DWITHOUT_GSL -DWITHOUT_BASH install"
-.endif
-	@${ECHO_CMD} ""
-.endif
-
 post-build::
 	cd ${WRKSRC} && make check SHELL=${SH}
 
@@ -109,7 +104,7 @@
 	${INSTALL_DATA} ${WRKSRC}/doc/programmer/README.freebsd ${DOCSDIR}/programmer
 	${INSTALL_DATA} ${FILESDIR}/ChangeLog.port ${DOCSDIR}
 .endif
-.if !defined(WITHOUT_BASH)
+.if defined(WITH_BASH)
 .for i in randomtrain scramble trainbogo.sh
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/${i} ${DOCSDIR}/contrib/
 .endfor
@@ -117,4 +112,4 @@
 .endif
 	${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.mk>
+.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 May 21 14:05:05 2005
+++ /usr/home/emma/ports/mail/bogofilter/distinfo	Sun May 29 16:22:21 2005
@@ -1,2 +1,2 @@
-MD5 (bogofilter-0.94.12.tar.bz2) = 489337defebff75d8e2b46350e946752
-SIZE (bogofilter-0.94.12.tar.bz2) = 723385
+MD5 (bogofilter-0.94.13.tar.bz2) = 1b3c6f192a361f0825a3decaa7f65e6b
+SIZE (bogofilter-0.94.13.tar.bz2) = 724255
diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/pkg-install /usr/home/emma/ports/mail/bogofilter/pkg-install
--- /usr/ports/mail/bogofilter/pkg-install	Sat Apr 10 01:54:16 2004
+++ /usr/home/emma/ports/mail/bogofilter/pkg-install	Sun May 29 19:18:32 2005
@@ -5,7 +5,10 @@
 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.
+See the RELEASE.NOTES file that shipped with bogofilter for details,
+particularly the sections with headings [Incompat ...] and [Major ...]!
+
+It is also advisable to check the README.* file for your database driver.
 --------------------------------------------------------------------------
 
 _EOF
--- bogofilter-0.94.13.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?E1DcRsb-000Kh9-MC>