Date: Sun, 8 Sep 2019 21:46:13 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r511600 - in head/mail: . bogofilter bogofilter-kc bogofilter-lmdb bogofilter-sqlite bogofilter-tc Message-ID: <201909082146.x88LkDj2076481@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Sun Sep 8 21:46:13 2019 New Revision: 511600 URL: https://svnweb.freebsd.org/changeset/ports/511600 Log: Update bogofilter to 1.2.5.r1, add new database variants. There are now -kc and -lmdb slave ports that use KyotoCabinet and LMDB databases. Since KyotoCabinet is supposed to relieve TokyoCabinet from duty, sunset the -tc port some 15 months from now. Clean up CONFLICTS. Run self-tests in post-build. This reveals Berkeley DB issues on the various RISC architectures (mips64, aarch64). Added: head/mail/bogofilter-kc/ - copied from r511553, head/mail/bogofilter-tc/ head/mail/bogofilter-lmdb/ - copied from r511553, head/mail/bogofilter-tc/ Modified: head/mail/Makefile head/mail/bogofilter-kc/Makefile head/mail/bogofilter-lmdb/Makefile head/mail/bogofilter-sqlite/Makefile head/mail/bogofilter-tc/Makefile head/mail/bogofilter/Makefile head/mail/bogofilter/distinfo Modified: head/mail/Makefile ============================================================================== --- head/mail/Makefile Sun Sep 8 21:44:23 2019 (r511599) +++ head/mail/Makefile Sun Sep 8 21:46:13 2019 (r511600) @@ -36,6 +36,8 @@ SUBDIR += bincimap SUBDIR += bmf SUBDIR += bogofilter + SUBDIR += bogofilter-kc + SUBDIR += bogofilter-lmdb SUBDIR += bogofilter-sqlite SUBDIR += bogofilter-tc SUBDIR += bsfilter Modified: head/mail/bogofilter-kc/Makefile ============================================================================== --- head/mail/bogofilter-tc/Makefile Sun Sep 8 07:27:31 2019 (r511553) +++ head/mail/bogofilter-kc/Makefile Sun Sep 8 21:46:13 2019 (r511600) @@ -1,19 +1,17 @@ -# Created by: Zach Thompson <hideo@lastamericanempire.com> # $FreeBSD$ PORTNAME= bogofilter -PORTREVISION= 3 +PORTREVISION= 0 CATEGORIES= mail -PKGNAMESUFFIX= -tc +PKGNAMESUFFIX= -kc MAINTAINER= mandree@FreeBSD.org -# Blanket approval for changes by Zach Thompson (address above) -LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet +LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet -CONFLICTS_INSTALL= bogofilter-[0-9]* [a-z][a-z]-bogofilter-[1-9]* bogofilter-sqlite-[0-9]* bogofilter-qdbm-[0-9]* +CONFLICTS_INSTALL= bogofilter-[0-9]* bogofilter-lmdb-[0-9]* bogofilter-sqlite-[0-9]* bogofilter-tc-[0-9]* -CONFIGURE_ARGS= --with-database=tokyocabinet +CONFIGURE_ARGS= --with-database=kyotocabinet BF_CPPFLAGS= -I${LOCALBASE}/include BF_LIBS= DESCR= ${PKGDIR}/pkg-descr Modified: head/mail/bogofilter-lmdb/Makefile ============================================================================== --- head/mail/bogofilter-tc/Makefile Sun Sep 8 07:27:31 2019 (r511553) +++ head/mail/bogofilter-lmdb/Makefile Sun Sep 8 21:46:13 2019 (r511600) @@ -1,19 +1,17 @@ -# Created by: Zach Thompson <hideo@lastamericanempire.com> # $FreeBSD$ PORTNAME= bogofilter -PORTREVISION= 3 +PORTREVISION= 0 CATEGORIES= mail -PKGNAMESUFFIX= -tc +PKGNAMESUFFIX= -lmdb MAINTAINER= mandree@FreeBSD.org -# Blanket approval for changes by Zach Thompson (address above) -LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet +LIB_DEPENDS= liblmdb.so:databases/lmdb -CONFLICTS_INSTALL= bogofilter-[0-9]* [a-z][a-z]-bogofilter-[1-9]* bogofilter-sqlite-[0-9]* bogofilter-qdbm-[0-9]* +CONFLICTS_INSTALL= bogofilter-[0-9]* bogofilter-kc-[0-9]* bogofilter-sqlite-[0-9]* *bogofilter-tc-[0-9]* -CONFIGURE_ARGS= --with-database=tokyocabinet +CONFIGURE_ARGS= --with-database=lmdb BF_CPPFLAGS= -I${LOCALBASE}/include BF_LIBS= DESCR= ${PKGDIR}/pkg-descr Modified: head/mail/bogofilter-sqlite/Makefile ============================================================================== --- head/mail/bogofilter-sqlite/Makefile Sun Sep 8 21:44:23 2019 (r511599) +++ head/mail/bogofilter-sqlite/Makefile Sun Sep 8 21:46:13 2019 (r511600) @@ -2,14 +2,13 @@ # $FreeBSD$ PORTNAME= bogofilter -PORTREVISION= 4 CATEGORIES= mail PKGNAMESUFFIX= -sqlite MAINTAINER= mandree@FreeBSD.org USES= sqlite -CONFLICTS_INSTALL= bogofilter-[0-9]* bogofilter-qdbm-[0-9]* bogofilter-tc-[0-9]* [a-z][a-z]-bogofilter-[0-9]* +CONFLICTS_INSTALL= bogofilter-[0-9]* bogofilter-lmdb-[0-9]* bogofilter-kc-[0-9]* bogofilter-tc-[0-9]* CONFIGURE_ARGS= --with-database=sqlite BF_CPPFLAGS= -I${LOCALBASE}/include Modified: head/mail/bogofilter-tc/Makefile ============================================================================== --- head/mail/bogofilter-tc/Makefile Sun Sep 8 21:44:23 2019 (r511599) +++ head/mail/bogofilter-tc/Makefile Sun Sep 8 21:46:13 2019 (r511600) @@ -2,16 +2,18 @@ # $FreeBSD$ PORTNAME= bogofilter -PORTREVISION= 3 CATEGORIES= mail PKGNAMESUFFIX= -tc +DEPRECATED= TokyoCabinet is being phased out in favor of KyotoCabinet. +EXPIRATION_DATE=2020-12-31 + MAINTAINER= mandree@FreeBSD.org # Blanket approval for changes by Zach Thompson (address above) LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet -CONFLICTS_INSTALL= bogofilter-[0-9]* [a-z][a-z]-bogofilter-[1-9]* bogofilter-sqlite-[0-9]* bogofilter-qdbm-[0-9]* +CONFLICTS_INSTALL= bogofilter-[0-9]* bogofilter-sqlite-[0-9]* bogofilter-kc-[0-9]* bogofilter-lmdb-[0-9]* CONFIGURE_ARGS= --with-database=tokyocabinet BF_CPPFLAGS= -I${LOCALBASE}/include Modified: head/mail/bogofilter/Makefile ============================================================================== --- head/mail/bogofilter/Makefile Sun Sep 8 21:44:23 2019 (r511599) +++ head/mail/bogofilter/Makefile Sun Sep 8 21:46:13 2019 (r511600) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= bogofilter -PORTVERSION= 1.2.4 -PORTREVISION?= 8 +DISTVERSION= 1.2.5.rc1 +PORTREVISION?= 0 CATEGORIES?= mail -MASTER_SITES= SF/bogofilter/bogofilter-current/bogofilter-${PORTVERSION} +MASTER_SITES= SF/bogofilter/bogofilter-current/bogofilter-1.2.5/ MAINTAINER?= mandree@FreeBSD.org COMMENT= Fast, teachable, learning spam detector @@ -22,9 +22,13 @@ OPTIONS_DEFAULT= GSL UNICODE GSL_DESC= Link with system-wide GSL dynamically (recommended) UNICODE_DESC= Normalize tokens to Unicode (UTF-8) (recommended) -CONFLICTS_INSTALL?= bogofilter-sqlite-[0-9]* bogofilter-qdbm-[0-9]* bogofilter-tc-[0-9]* [a-z][a-z]-bogofilter-[0-9]* +CONFLICTS_INSTALL?= bogofilter-sqlite-[0-9]* bogofilter-tc-[0-9]* bogofilter-lmdb-[0-9]* \ + bogofilter-kc-[0-9]* -USES+= cpe perl5 shebangfix tar:bzip2 +# XXX FIXME: autoreconf:build should not be required, +# but something hoses timestamps on src/tests/Makefile.am +# but not src/tests/Makefile.in. +USES+= autoreconf:build cpe perl5 shebangfix tar:xz SHEBANG_FILES= contrib/randomtrain.sh contrib/scramble.sh \ src/tests/unsort.pl contrib/*.pl USE_PERL5= run @@ -59,16 +63,16 @@ post-patch: -e 's/ENVIRON_TESTS = t.abort/ENVIRON_TESTS =/' \ ${WRKSRC}/src/tests/Makefile.am -# XXX: disable self-tests until issue with automake-1.13 is sorted out -# post-build:: -# cd ${WRKSRC}/src && make check SHELL=${SH} +post-build: + cd ${WRKSRC}/src && ${SETENV} SHELL=${SH} ${MAKE_CMD} ${TEST_TARGET} ${_MAKE_JOBS} SHELL=${SH} \ + || { r=$$? ; head -n30000 ${WRKSRC}/src/tests/test-suite.log ; exit $$r ; } -post-install:: +post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR}/contrib .for i in html programmer xml @${MKDIR} ${STAGEDIR}${DOCSDIR}/${i} .endfor -.for i in AUTHORS COPYING INSTALL NEWS README README.svn \ +.for i in AUTHORS COPYING INSTALL NEWS README README.git \ doc/README.validation TODO GETTING.STARTED \ RELEASE.NOTES doc/README.db doc/README.sqlite \ doc/integrating-with-postfix doc/integrating-with-qmail \ Modified: head/mail/bogofilter/distinfo ============================================================================== --- head/mail/bogofilter/distinfo Sun Sep 8 21:44:23 2019 (r511599) +++ head/mail/bogofilter/distinfo Sun Sep 8 21:46:13 2019 (r511600) @@ -1,2 +1,3 @@ -SHA256 (bogofilter-1.2.4.tar.bz2) = e10287a58d135feaea26880ce7d4b9fa2841fb114a2154bf7da8da98aab0a6b4 -SIZE (bogofilter-1.2.4.tar.bz2) = 887848 +TIMESTAMP = 1567975270 +SHA256 (bogofilter-1.2.5.rc1.tar.xz) = 62a9a00ca575b1253bafd5ae308049cbf388816e5ef0a9a18ee8167cf6c42680 +SIZE (bogofilter-1.2.5.rc1.tar.xz) = 802008
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909082146.x88LkDj2076481>