aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authoryar <yar@FreeBSD.org>2005-05-30 18:48:24 +0800
committeryar <yar@FreeBSD.org>2005-05-30 18:48:24 +0800
commit47f9e0519cd2136ffe8a502b8d97ee64971ed9b2 (patch)
tree9364f80887108b6f6ef45165bbb76af523419d0d /mail
parent5a42d59332f91db49365c7b9d72251566e08eb03 (diff)
downloadfreebsd-ports-gnome-47f9e0519cd2136ffe8a502b8d97ee64971ed9b2.tar.gz
freebsd-ports-gnome-47f9e0519cd2136ffe8a502b8d97ee64971ed9b2.tar.zst
freebsd-ports-gnome-47f9e0519cd2136ffe8a502b8d97ee64971ed9b2.zip
- 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 - use a more suitable LIBS/CPPFLAGS passing for sibling ports or when GSL=off ICONV=on is used. - change wording of GSL OPTION. - reset -qdbm PORTREVISION - remove obsoleted bogofilter-qdbm/files/* patches - deprecate bogofilter-tdb effective 2005-11-30 Removed files: - bogofilter-qdbm/files/patch-pathcycle PR: ports/81642 Submitted by: maintainer
Diffstat (limited to 'mail')
-rw-r--r--mail/bogofilter-qdbm/Makefile6
-rw-r--r--mail/bogofilter-qdbm/files/patch-pathcycle32
-rw-r--r--mail/bogofilter-sqlite/Makefile4
-rw-r--r--mail/bogofilter-tdb/Makefile7
-rw-r--r--mail/bogofilter/Makefile56
-rw-r--r--mail/bogofilter/distinfo4
-rw-r--r--mail/bogofilter/pkg-install5
7 files changed, 42 insertions, 72 deletions
diff --git a/mail/bogofilter-qdbm/Makefile b/mail/bogofilter-qdbm/Makefile
index 0f2fdbef251d..3e2c874e2ebc 100644
--- a/mail/bogofilter-qdbm/Makefile
+++ b/mail/bogofilter-qdbm/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= bogofilter
-PORTREVISION= 5
+PORTREVISION= 0
CATEGORIES= mail
PKGNAMESUFFIX= -qdbm
@@ -17,8 +17,8 @@ LIB_DEPENDS= qdbm.10:${PORTSDIR}/databases/qdbm
CONFLICTS= bogofilter-[0-9]* bogofilter-tdb-[0-9]* [a-z][a-z]-bogofilter-[0-9]* bogofilter-sqlite-[0-9]*
CONFIGURE_ARGS= --with-database=qdbm
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+BF_CPPFLAGS= -I${LOCALBASE}/include
+BF_LIBS=
DESCR= ${PKGDIR}/pkg-descr
PLIST_FILES= bin/bogoQDBMupgrade
diff --git a/mail/bogofilter-qdbm/files/patch-pathcycle b/mail/bogofilter-qdbm/files/patch-pathcycle
deleted file mode 100644
index 057a161f1158..000000000000
--- a/mail/bogofilter-qdbm/files/patch-pathcycle
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/src/Makefile.in Sun May 22 12:43:51 2005
-+++ b/src/Makefile.in Sun May 22 12:42:22 2005
-@@ -132,9 +132,8 @@
- xatof.c xatoi.c datastore_db.h mysetvbuf.c mysetvbuf.h \
- datastore_db.c datastore_db_trad.c datastore_db_trans.c \
- datastore_opthelp_dummies.c datastore_sqlite.c \
-- datastore_dummies.c datastore_qdbm.h datastore_qdbm.c \
-- datastore_qdbm_cmpkey.c datastore_txn_dummies.c \
-- datastore_tdb.c
-+ datastore_dummies.c datastore_qdbm.c datastore_qdbm_cmpkey.c \
-+ datastore_txn_dummies.c datastore_tdb.c
- @ENABLE_ICONV_FALSE@am__objects_1 = charset.$(OBJEXT)
- @ENABLE_ICONV_TRUE@am__objects_1 = charset_iconv.$(OBJEXT) \
- @ENABLE_ICONV_TRUE@ iconvert.$(OBJEXT)
-@@ -574,7 +575,7 @@
- @ENABLE_QDBM_DATASTORE_FALSE@@ENABLE_SQLITE_DATASTORE_TRUE@@ENABLE_TDB_DATASTORE_FALSE@datastore_SOURCE = datastore_sqlite.c datastore_opthelp_dummies.c \
- @ENABLE_QDBM_DATASTORE_FALSE@@ENABLE_SQLITE_DATASTORE_TRUE@@ENABLE_TDB_DATASTORE_FALSE@ datastore_dummies.c
-
--@ENABLE_QDBM_DATASTORE_TRUE@@ENABLE_TDB_DATASTORE_FALSE@datastore_SOURCE = datastore_qdbm.h datastore_qdbm.c datastore_qdbm_cmpkey.c \
-+@ENABLE_QDBM_DATASTORE_TRUE@@ENABLE_TDB_DATASTORE_FALSE@datastore_SOURCE = datastore_qdbm.c datastore_qdbm_cmpkey.c \
- @ENABLE_QDBM_DATASTORE_TRUE@@ENABLE_TDB_DATASTORE_FALSE@ datastore_txn_dummies.c datastore_opthelp_dummies.c \
- @ENABLE_QDBM_DATASTORE_TRUE@@ENABLE_TDB_DATASTORE_FALSE@ datastore_dummies.c
-
-@@ -589,7 +588,7 @@
- datastore_db_trans.c \
- datastore_opthelp_dummies.c \
- datastore_txn_dummies.c \
-- datastore_qdbm.c \
-+ datastore_qdbm.h datastore_qdbm.c \
- datastore_tdb.c \
- datastore_sqlite.c
-
diff --git a/mail/bogofilter-sqlite/Makefile b/mail/bogofilter-sqlite/Makefile
index 99e160676745..b284758fa302 100644
--- a/mail/bogofilter-sqlite/Makefile
+++ b/mail/bogofilter-sqlite/Makefile
@@ -18,8 +18,8 @@ CONFLICTS= bogofilter-[0-9]* bogofilter-qdbm-[0-9]* bogofilter-tdb-[0-9]* \
[a-z][a-z]-bogofilter-[0-9]* bogofilter-current-[0-9]*
CONFIGURE_ARGS= --with-database=sqlite
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+BF_CPPFLAGS= -I${LOCALBASE}/include
+BF_LIBS=
DESCR= ${PKGDIR}/pkg-descr
MASTERDIR= ${.CURDIR}/../bogofilter
diff --git a/mail/bogofilter-tdb/Makefile b/mail/bogofilter-tdb/Makefile
index 10ee3ae0dca3..f4d2e73fabca 100644
--- a/mail/bogofilter-tdb/Makefile
+++ b/mail/bogofilter-tdb/Makefile
@@ -15,9 +15,12 @@ LIB_DEPENDS= tdb.1:${PORTSDIR}/databases/tdb
CONFLICTS= bogofilter-[0-9]* bogofilter-qdbm-[0-9]* [a-z][a-z]-bogofilter-[0-9]* bogofilter-sqlite-[0-9]*
+DEPRECATED= TDB is inefficient and unmaintained - use -qdbm or -sqlite
+EXPIRES= 2005-11-30
+
CONFIGURE_ARGS= --with-database=tdb
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+BF_CPPFLAGS= -I${LOCALBASE}/include
+BF_LIBS=
DESCR= ${PKGDIR}/pkg-descr
MASTERDIR= ${.CURDIR}/../bogofilter
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 3b479002fdb6..76859a1a92ed 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -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 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
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 "Link with system-wide GSL dynamically (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,13 +28,28 @@ USE_REINPLACE= yes
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
+
+BF_LIBS?= -ldb-4.3
+BF_CPPFLAGS?= -I${LOCALBASE}/include/db43 -I${LOCALBASE}/include
CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc
-.if defined(WITHOUT_GSL)
+.if defined(WITH_ICONV)
+CONFIGURE_ARGS+= --enable-iconv
+USE_ICONV= yes
+BF_LIBS+= -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"
-CONFIGURE_ENV+= PERL="${PERL}"
+CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" LIBS="${BF_LIBS}" \
+ PERL="${PERL}" CPPFLAGS="${BF_CPPFLAGS}"
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
INSTALL_TARGET= install-strip prefix=${PREFIX}
@@ -59,23 +72,6 @@ post-patch:
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 +105,7 @@ post-install::
${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 +113,4 @@ post-install::
.endif
${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/bogofilter/distinfo b/mail/bogofilter/distinfo
index 0604b07f8577..4b1e7cd83464 100644
--- a/mail/bogofilter/distinfo
+++ b/mail/bogofilter/distinfo
@@ -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 --git a/mail/bogofilter/pkg-install b/mail/bogofilter/pkg-install
index c1fe0fc37f03..8da3d8915d7e 100644
--- a/mail/bogofilter/pkg-install
+++ b/mail/bogofilter/pkg-install
@@ -5,7 +5,10 @@ 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.
+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