- Add configuration file sample for proxy worker [1]

- Add LICENSE_FILE [1]
- Sort pkg-plist [1]
- Fix homepage URI [1]
- Update to 1.6.1

Submitted by:	Alexander Moisseev <moisseev at mezonplus.ru> [1]

5 files changed, 19 insertions, 17 deletions

diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index f797bd3fa714..af9544ee8f91 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,13 +1,14 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	1.6.0
+PORTVERSION=	1.6.1
 CATEGORIES=	mail
 
 MAINTAINER=	vsevolod@FreeBSD.org
 COMMENT=	Fast spam filtering system
 
 LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libevent.so:devel/libevent \
diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo
index 47419cf2e7a7..c5fdeeac940f 100644
--- a/mail/rspamd/distinfo
+++ b/mail/rspamd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497338753
-SHA256 (vstakhov-rspamd-1.6.0_GH0.tar.gz) = 8a4df7115193fce8c8147495ef6b25961acd0f9758a12c6c5f6617f227f7153e
-SIZE (vstakhov-rspamd-1.6.0_GH0.tar.gz) = 2461626
+TIMESTAMP = 1497454959
+SHA256 (vstakhov-rspamd-1.6.1_GH0.tar.gz) = c992f1063bc59c9cbe36db4d6a74fb382049528b7310ae30e79da75d460e761e
+SIZE (vstakhov-rspamd-1.6.1_GH0.tar.gz) = 2462565
diff --git a/mail/rspamd/files/patch-CMakeLists.txt b/mail/rspamd/files/patch-CMakeLists.txt
index cf757f0ba225..740b2f5fbf61 100644
--- a/mail/rspamd/files/patch-CMakeLists.txt
+++ b/mail/rspamd/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2017-01-17 14:11:25 UTC
+--- CMakeLists.txt.orig	2017-06-06 15:07:59 UTC
 +++ CMakeLists.txt
-@@ -1286,6 +1286,23 @@ ELSE(WANT_SYSTEMD_UNITS MATCHES "ON")
+@@ -1302,6 +1302,24 @@ ELSE(WANT_SYSTEMD_UNITS MATCHES "ON")
  ENDIF(WANT_SYSTEMD_UNITS MATCHES "ON")
  IF(BUILD_PORT)
  	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" ".sample")
@@ -10,6 +10,7 @@
 +	INSTALL_IF_NOT_EXISTS("conf/worker-controller.inc" ${CONFDIR} "worker-controller.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/worker-fuzzy.inc" ${CONFDIR} "worker-fuzzy.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/worker-normal.inc" ${CONFDIR} "worker-normal.inc" ".sample")
++	INSTALL_IF_NOT_EXISTS("conf/worker-proxy.inc" ${CONFDIR} "worker-proxy.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/2tld.inc" ${CONFDIR} "2tld.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/mime_types.inc" ${CONFDIR} "mime_types.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/composites.conf" ${CONFDIR} "composites.conf" ".sample")
diff --git a/mail/rspamd/pkg-descr b/mail/rspamd/pkg-descr
index 2c0a0a7754a5..2e6aa7fa8fad 100644
--- a/mail/rspamd/pkg-descr
+++ b/mail/rspamd/pkg-descr
@@ -2,4 +2,4 @@ Rspamd is fast, modular and lightweight spam filter. It is designed to work
 with big ammount of mail and can be easily extended with own filters written in
 lua.
 
-WWW: https://rspamd.com
+WWW: https://rspamd.com/
diff --git a/mail/rspamd/pkg-plist b/mail/rspamd/pkg-plist
index b1b5ca0b082c..82d888aadbd2 100644
--- a/mail/rspamd/pkg-plist
+++ b/mail/rspamd/pkg-plist
@@ -17,8 +17,8 @@ bin/rspamc
 @sample %%ETCDIR%%/mid.inc.sample
 @sample %%ETCDIR%%/modules.conf.sample
 %%ETCDIR%%/modules.d/antivirus.conf
-%%ETCDIR%%/modules.d/asn.conf
 %%ETCDIR%%/modules.d/arc.conf
+%%ETCDIR%%/modules.d/asn.conf
 %%ETCDIR%%/modules.d/chartable.conf
 %%ETCDIR%%/modules.d/clickhouse.conf
 %%ETCDIR%%/modules.d/dcc.conf
@@ -68,11 +68,19 @@ bin/rspamc
 @sample %%ETCDIR%%/worker-controller.inc.sample
 @sample %%ETCDIR%%/worker-fuzzy.inc.sample
 @sample %%ETCDIR%%/worker-normal.inc.sample
+@sample %%ETCDIR%%/worker-proxy.inc.sample
 @sample %%ETCDIR%%/rspamd.newsyslog.conf.sample
-%%ETCDIR%%/worker-proxy.inc
 etc/newsyslog.conf.d/rspamd.newsyslog.conf
 lib/rspamd/librspamd-actrie.so
 %%DATADIR%%/effective_tld_names.dat
+%%DATADIR%%/lib/auth_results.lua
+%%DATADIR%%/lib/dkim_sign_tools.lua
+%%DATADIR%%/lib/fun.lua
+%%DATADIR%%/lib/global_functions.lua
+%%DATADIR%%/lib/lua_redis.lua
+%%DATADIR%%/lib/lua_util.lua
+%%DATADIR%%/lib/maps.lua
+%%DATADIR%%/lib/meta_functions.lua
 %%DATADIR%%/lua/antivirus.lua
 %%DATADIR%%/lua/arc.lua
 %%DATADIR%%/lua/asn.lua
@@ -115,14 +123,6 @@ lib/rspamd/librspamd-actrie.so
 %%DATADIR%%/lua/trie.lua
 %%DATADIR%%/lua/url_reputation.lua
 %%DATADIR%%/lua/whitelist.lua
-%%DATADIR%%/lib/auth_results.lua
-%%DATADIR%%/lib/dkim_sign_tools.lua
-%%DATADIR%%/lib/global_functions.lua
-%%DATADIR%%/lib/lua_redis.lua
-%%DATADIR%%/lib/lua_util.lua
-%%DATADIR%%/lib/maps.lua
-%%DATADIR%%/lib/meta_functions.lua
-%%DATADIR%%/lib/fun.lua
 %%DATADIR%%/rules/forwarding.lua
 %%DATADIR%%/rules/headers_checks.lua
 %%DATADIR%%/rules/html.lua