From a51b9fe8ffa36a2d81ef0f41af3fc84509d4b194 Mon Sep 17 00:00:00 2001 From: vsevolod Date: Thu, 20 Sep 2018 18:05:05 +0000 Subject: - Add more rcorder conditions [2] - Move USES earlier [2] - Sort pkg-plist [2] PR: 228990 Submitted by: Johan Bergstrom [1], Alexander Moisseev [2] --- mail/rspamd/Makefile | 14 +++++++------- mail/rspamd/files/rspamd.in | 3 ++- mail/rspamd/pkg-plist | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) (limited to 'mail') diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile index e1c1ad2be046..b72569e47214 100644 --- a/mail/rspamd/Makefile +++ b/mail/rspamd/Makefile @@ -2,6 +2,7 @@ PORTNAME= rspamd PORTVERSION= 1.7.9 +PORTREVISION= 1 CATEGORIES= mail MAINTAINER= vsevolod@FreeBSD.org @@ -17,6 +18,12 @@ LIB_DEPENDS= libpcre.so:devel/pcre \ BUILD_DEPENDS= ragel:devel/ragel RUN_DEPENDS= ca_root_nss>=3.*:security/ca_root_nss +USES= cmake:outsource pkgconfig perl5 \ + compiler:c11 sqlite ssl +USE_LDCONFIG= yes +USE_PERL5= build run +USE_GNOME= glib20 + CONFLICTS_INSTALL= rspamd-devel OPTIONS_DEFINE= GPERF GD CGP TORCH_BLAS @@ -49,13 +56,6 @@ CMAKE_ARGS+= -DCONFDIR=${PREFIX}/etc/rspamd \ -DLIBDIR=${PREFIX}/lib/rspamd \ -DNO_SHARED=ON -USES= cmake:outsource pkgconfig perl5 \ - compiler:c11 sqlite ssl -USE_LDCONFIG= yes -USE_PERL5= build run - -USE_GNOME= glib20 - USE_GITHUB= yes GH_ACCOUNT= vstakhov diff --git a/mail/rspamd/files/rspamd.in b/mail/rspamd/files/rspamd.in index 945ba5b04d98..a594f0bda034 100644 --- a/mail/rspamd/files/rspamd.in +++ b/mail/rspamd/files/rspamd.in @@ -3,7 +3,8 @@ # $FreeBSD$ # # PROVIDE: rspamd -# REQUIRE: LOGIN +# REQUIRE: LOGIN redis +# BEFORE: mail # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable rspamd: diff --git a/mail/rspamd/pkg-plist b/mail/rspamd/pkg-plist index 27fa65619c88..e9e07d1a218d 100644 --- a/mail/rspamd/pkg-plist +++ b/mail/rspamd/pkg-plist @@ -170,6 +170,7 @@ man/man8/rspamd.8.gz %%DATADIR%%/lib/lua_meta.lua %%DATADIR%%/lib/lua_nn.lua %%DATADIR%%/lib/lua_redis.lua +%%DATADIR%%/lib/lua_squeeze_rules.lua %%DATADIR%%/lib/lua_stat.lua %%DATADIR%%/lib/lua_util.lua %%DATADIR%%/lib/plugins_stats.lua @@ -180,8 +181,8 @@ man/man8/rspamd.8.gz %%DATADIR%%/lib/rspamadm/fuzzy_convert.lua %%DATADIR%%/lib/rspamadm/fuzzy_stat.lua %%DATADIR%%/lib/rspamadm/grep.lua -%%DATADIR%%/lib/rspamadm/mime.lua %%DATADIR%%/lib/rspamadm/keypair.lua +%%DATADIR%%/lib/rspamadm/mime.lua %%DATADIR%%/lib/rspamadm/rescore.lua %%DATADIR%%/lib/rspamadm/stat_convert.lua %%TORCH%%%%DATADIR%%/lib/decisiontree/CartNode.lua @@ -436,7 +437,6 @@ man/man8/rspamd.8.gz %%TORCH%%%%DATADIR%%/lib/torch/init.lua %%TORCH%%%%DATADIR%%/lib/torch/paths.lua %%TORCH%%%%DATADIR%%/lib/torch/test.lua -%%DATADIR%%/lib/lua_squeeze_rules.lua %%DATADIR%%/lua/antivirus.lua %%DATADIR%%/lua/arc.lua %%DATADIR%%/lua/asn.lua -- cgit