svn commit: r480186 - in head/mail/rspamd: . files

[Vsevolod Stakhov]

Author: vsevolod
Date: Thu Sep 20 18:05:05 2018
New Revision: 480186
URL: https://svnweb.freebsd.org/changeset/ports/480186

Log:
  - Add more rcorder conditions [2]
  - Move USES earlier [2]
  - Sort pkg-plist [2]
  
  PR:             228990
  Submitted by:   Johan Bergstrom <bugs at bergstroem.nu> [1], Alexander Moisseev [2]

Modified:
  head/mail/rspamd/Makefile
  head/mail/rspamd/files/rspamd.in
  head/mail/rspamd/pkg-plist

Modified: head/mail/rspamd/Makefile
==============================================================================
--- head/mail/rspamd/Makefile	Thu Sep 20 18:01:29 2018	(r480185)
+++ head/mail/rspamd/Makefile	Thu Sep 20 18:05:05 2018	(r480186)
@@ -2,6 +2,7 @@
 
 PORTNAME=	rspamd
 PORTVERSION=	1.7.9
+PORTREVISION=	1
 CATEGORIES=	mail
 
 MAINTAINER=	vsevolod at 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
@@ -48,13 +55,6 @@ CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rspamd \
 		-DBUILD_PORT=yes \
 		-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

Modified: head/mail/rspamd/files/rspamd.in
==============================================================================
--- head/mail/rspamd/files/rspamd.in	Thu Sep 20 18:01:29 2018	(r480185)
+++ head/mail/rspamd/files/rspamd.in	Thu Sep 20 18:05:05 2018	(r480186)
@@ -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:

Modified: head/mail/rspamd/pkg-plist
==============================================================================
--- head/mail/rspamd/pkg-plist	Thu Sep 20 18:01:29 2018	(r480185)
+++ head/mail/rspamd/pkg-plist	Thu Sep 20 18:05:05 2018	(r480186)
@@ -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