From owner-svn-ports-all@FreeBSD.ORG Mon Dec 2 16:07:54 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DFF2D668; Mon, 2 Dec 2013 16:07:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C0A751FBB; Mon, 2 Dec 2013 16:07:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB2G7sRD042000; Mon, 2 Dec 2013 16:07:54 GMT (envelope-from vsevolod@svn.freebsd.org) Received: (from vsevolod@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rB2G7rAe041995; Mon, 2 Dec 2013 16:07:53 GMT (envelope-from vsevolod@svn.freebsd.org) Message-Id: <201312021607.rB2G7rAe041995@svn.freebsd.org> From: Vsevolod Stakhov Date: Mon, 2 Dec 2013 16:07:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335506 - head/mail/rspamd X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Dec 2013 16:07:54 -0000 Author: vsevolod Date: Mon Dec 2 16:07:53 2013 New Revision: 335506 URL: http://svnweb.freebsd.org/changeset/ports/335506 Log: - Update to 0.6.1; - Rework port structure for staging support; - Update www line. Modified: head/mail/rspamd/Makefile head/mail/rspamd/distinfo head/mail/rspamd/pkg-descr head/mail/rspamd/pkg-plist Modified: head/mail/rspamd/Makefile ============================================================================== --- head/mail/rspamd/Makefile Mon Dec 2 16:06:17 2013 (r335505) +++ head/mail/rspamd/Makefile Mon Dec 2 16:07:53 2013 (r335506) @@ -1,18 +1,23 @@ # $FreeBSD$ PORTNAME= rspamd -PORTVERSION= 0.5.6 +PORTVERSION= 0.6.1 CATEGORIES= mail -MASTER_SITES= http://cdn.bitbucket.org/vstakhov/rspamd/downloads/ MAINTAINER= vsevolod@FreeBSD.org COMMENT= Fast spam filtering system LICENSE= BSD -LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre \ - gmime-2:${PORTSDIR}/mail/gmime2 \ - event-1:${PORTSDIR}/devel/libevent +LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre \ + libgmime-2.4.so:${PORTSDIR}/mail/gmime24 \ + libevent.so:${PORTSDIR}/devel/libevent + +USE_GITHUB= yes +GH_ACCOUNT= vstakhov +GH_PROJECT= ${PORTNAME} +GH_TAG= ${PORTVERSION} +GH_COMMIT= b5fc214 OPTIONS_DEFINE= GPERF JUDY REDIRECTOR GPERF_DESC= google perf-tools profiling @@ -23,21 +28,23 @@ USE_RC_SUBR= rspamd PLIST_SUB+= ETCDIR=etc/rspamd \ RSPAMDVERSION=${PORTVERSION} -CMAKE_ARGS+= -DETC_PREFIX=${PREFIX}/etc -DPREFIX=${PREFIX} \ - -DBUILD_PORT=yes -DNO_SHARED=ON +CMAKE_ARGS+= -DCONFDIR=${PREFIX}/etc/rspamd \ + -DLOGDIR=/var/log/rspamd \ + -DDBDIR=/var/lib/rspamd \ + -DRUNDIR=/var/run/rspamd \ + -DMANDIR=${MANPREFIX}/man \ + -DCMAKE_INSTALL_PREFIX=${PREFIX} \ + -DBUILD_PORT=yes \ + -DLIBDIR=${PREFIX}/lib \ + -DNO_SHARED=ON USES= cmake gettext iconv pkgconfig USE_LDCONFIG= yes USE_GNOME= glib20 USE_LUA= 5.1- -USE_SQLITE= yes USE_OPENSSL= yes -MAN8= rspamd.8 -MAN1= rspamc.1 - -NO_STAGE= yes .include .if ${PORT_OPTIONS:MGPERF} Modified: head/mail/rspamd/distinfo ============================================================================== --- head/mail/rspamd/distinfo Mon Dec 2 16:06:17 2013 (r335505) +++ head/mail/rspamd/distinfo Mon Dec 2 16:07:53 2013 (r335506) @@ -1,2 +1,2 @@ -SHA256 (rspamd-0.5.6.tar.gz) = 95e6337ec568f017ed1037c7de39ded82f642c3f2c82d0c10bc69e2be48f6ae4 -SIZE (rspamd-0.5.6.tar.gz) = 992005 +SHA256 (rspamd-0.6.1.tar.gz) = a642484d7cb1aaa3ca28a006aaf047fde61d291d2ad3f2248d4d75d73307820f +SIZE (rspamd-0.6.1.tar.gz) = 2879117 Modified: head/mail/rspamd/pkg-descr ============================================================================== --- head/mail/rspamd/pkg-descr Mon Dec 2 16:06:17 2013 (r335505) +++ head/mail/rspamd/pkg-descr Mon Dec 2 16:07:53 2013 (r335506) @@ -2,4 +2,4 @@ Rspamd is fast, modular and lightweight with big ammount of mail and can be easily extended with own filters written in lua. -WWW: http://bitbucket.org/vstakhov/rspamd/wiki/Home +WWW: https://rspamd.com Modified: head/mail/rspamd/pkg-plist ============================================================================== --- head/mail/rspamd/pkg-plist Mon Dec 2 16:06:17 2013 (r335505) +++ head/mail/rspamd/pkg-plist Mon Dec 2 16:07:53 2013 (r335506) @@ -3,34 +3,68 @@ bin/rspamd bin/rspamc-%%RSPAMDVERSION%% bin/rspamc %%REDIRECTOR%%bin/rspamd-redirector -etc/rspamd.xml.sample -%%ETCDIR%%/2tld.inc -%%ETCDIR%%/surbl-whitelist.inc -%%ETCDIR%%/plugins/lua/forged_recipients.lua -%%ETCDIR%%/plugins/lua/maillist.lua -%%ETCDIR%%/plugins/lua/multimap.lua -%%ETCDIR%%/plugins/lua/once_received.lua -%%ETCDIR%%/plugins/lua/received_rbl.lua -%%ETCDIR%%/plugins/lua/ratelimit.lua -%%ETCDIR%%/plugins/lua/whitelist.lua -%%ETCDIR%%/plugins/lua/phishing.lua -%%ETCDIR%%/plugins/lua/trie.lua -%%ETCDIR%%/plugins/lua/emails.lua -%%ETCDIR%%/plugins/lua/ip_score.lua -%%ETCDIR%%/lua/regexp/drugs.lua -%%ETCDIR%%/lua/regexp/fraud.lua -%%ETCDIR%%/lua/regexp/headers.lua -%%ETCDIR%%/lua/regexp/lotto.lua -%%ETCDIR%%/lua/rspamd.lua -%%ETCDIR%%/lua/rspamd.classifiers.lua -lib/rspamd/librspamdclient.so.%%RSPAMDVERSION%% -lib/rspamd/librspamdclient.so -lib/rspamd/librspamdclient_static.a +lib/librspamdclient.so.%%RSPAMDVERSION%% +lib/librspamdclient.so +lib/librspamdclient_static.a include/rspamd/librspamdclient.h -@dirrmtry %%ETCDIR%%/plugins/lua -@dirrmtry %%ETCDIR%%/plugins/ -@dirrmtry %%ETCDIR%%/lua/regexp -@dirrmtry %%ETCDIR%%/lua/ -@dirrmtry %%ETCDIR%% -@dirrmtry lib/rspamd + +etc/rspamd/lua/regexp/drugs.lua +etc/rspamd/lua/regexp/fraud.lua +etc/rspamd/lua/regexp/headers.lua +etc/rspamd/lua/regexp/lotto.lua +etc/rspamd/lua/rspamd.classifiers.lua +etc/rspamd/lua/rspamd.lua +%%DATADIR%%/lua/emails.lua +%%DATADIR%%/lua/forged_recipients.lua +%%DATADIR%%/lua/ip_score.lua +%%DATADIR%%/lua/maillist.lua +%%DATADIR%%/lua/multimap.lua +%%DATADIR%%/lua/once_received.lua +%%DATADIR%%/lua/phishing.lua +%%DATADIR%%/lua/ratelimit.lua +%%DATADIR%%/lua/rbl.lua +%%DATADIR%%/lua/trie.lua +%%DATADIR%%/lua/whitelist.lua + +@unexec if cmp -s %D/etc/rspamd/rspamd.conf %D/etc/rspamd/rspamd.conf.sample ; then rm -f %D/etc/rspamd/rspamd.conf ; fi +etc/rspamd/rspamd.conf.sample +@exec if [ ! -f %D/etc/rspamd/rspamd.conf ]; then cp -p %D/%F %B/rspamd.conf; fi +@unexec if cmp -s %D/etc/rspamd/2tld.inc %D/etc/rspamd/2tld.inc.sample ; then rm -f %D/etc/rspamd/2tld.inc ; fi +etc/rspamd/2tld.inc.sample +@exec if [ ! -f %D/etc/rspamd/2tld.inc ]; then cp -p %D/%F %B/2tld.inc; fi +@unexec if cmp -s %D/etc/rspamd/composites.conf %D/etc/rspamd/composites.conf.sample ; then rm -f %D/etc/rspamd/composites.conf ; fi +etc/rspamd/composites.conf.sample +@exec if [ ! -f %D/etc/rspamd/composites.conf ]; then cp -p %D/%F %B/composites.conf; fi +@unexec if cmp -s %D/etc/rspamd/logging.conf %D/etc/rspamd/logging.conf.sample ; then rm -f %D/etc/rspamd/logging.conf ; fi +etc/rspamd/logging.conf.sample +@exec if [ ! -f %D/etc/rspamd/logging.conf ]; then cp -p %D/%F %B/logging.conf; fi +@unexec if cmp -s %D/etc/rspamd/metrics.conf %D/etc/rspamd/metrics.conf.sample ; then rm -f %D/etc/rspamd/metrics.conf ; fi +etc/rspamd/metrics.conf.sample +@exec if [ ! -f %D/etc/rspamd/metrics.conf ]; then cp -p %D/%F %B/metrics.conf; fi +@unexec if cmp -s %D/etc/rspamd/modules.conf %D/etc/rspamd/modules.conf.sample ; then rm -f %D/etc/rspamd/modules.conf ; fi +etc/rspamd/modules.conf.sample +@exec if [ ! -f %D/etc/rspamd/modules.conf ]; then cp -p %D/%F %B/modules.conf; fi +@unexec if cmp -s %D/etc/rspamd/options.conf %D/etc/rspamd/options.conf.sample ; then rm -f %D/etc/rspamd/options.conf ; fi +etc/rspamd/options.conf.sample +@exec if [ ! -f %D/etc/rspamd/options.conf ]; then cp -p %D/%F %B/options.conf; fi +@unexec if cmp -s %D/etc/rspamd/statistic.conf %D/etc/rspamd/statistic.conf.sample ; then rm -f %D/etc/rspamd/statistic.conf ; fi +etc/rspamd/statistic.conf.sample +@exec if [ ! -f %D/etc/rspamd/statistic.conf ]; then cp -p %D/%F %B/statistic.conf; fi +@unexec if cmp -s %D/etc/rspamd/surbl-whitelist.inc %D/etc/rspamd/surbl-whitelist.inc.sample ; then rm -f %D/etc/rspamd/surbl-whitelist.inc ; fi +etc/rspamd/surbl-whitelist.inc.sample +@exec if [ ! -f %D/etc/rspamd/surbl-whitelist.inc ]; then cp -p %D/%F %B/surbl-whitelist.inc; fi +@unexec if cmp -s %D/etc/rspamd/workers.conf %D/etc/rspamd/workers.conf.sample ; then rm -f %D/etc/rspamd/workers.conf ; fi +etc/rspamd/workers.conf.sample +@exec if [ ! -f %D/etc/rspamd/workers.conf ]; then cp -p %D/%F %B/workers.conf; fi + +man/man1/rspamc.1.gz +man/man8/rspamd.8.gz + + +@dirrmtry %%DATADIR%%/lua +@dirrmtry %%DATADIR%% +@dirrmtry etc/rspamd/lua/regexp +@dirrmtry etc/rspamd/lua +@dirrmtry etc/rspamd @dirrmtry include/rspamd +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%