--- Makefile	(revision 480445)
+++ Makefile	(working copy)
@@ -1,8 +1,7 @@ 
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	1.7.9
-PORTREVISION=	1
+PORTVERSION=	1.8.0
 CATEGORIES=	mail
 
 MAINTAINER=	vsevolod@FreeBSD.org
@@ -9,7 +8,7 @@ 
 COMMENT=	Fast spam filtering system
 
 LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libevent.so:devel/libevent \
@@ -18,8 +17,8 @@ 
 BUILD_DEPENDS=	ragel:devel/ragel
 RUN_DEPENDS=	ca_root_nss>=3.*:security/ca_root_nss
 
-USES=		cmake:outsource pkgconfig perl5 \
-		compiler:c11 sqlite ssl
+USES=		cmake:outsource compiler:c11 gnome perl5 pkgconfig \
+		sqlite ssl
 USE_LDCONFIG=	yes
 USE_PERL5=	build run
 USE_GNOME=	glib20
--- distinfo	(revision 480445)
+++ distinfo	(working copy)
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1533239067
-SHA256 (vstakhov-rspamd-1.7.9_GH0.tar.gz) = 70941726253c585799e2c4670743650472be13f85e9d31bfe23bdc13c9e9bae4
-SIZE (vstakhov-rspamd-1.7.9_GH0.tar.gz) = 4557492
+TIMESTAMP = 1537810481
+SHA256 (vstakhov-rspamd-1.8.0_GH0.tar.gz) = 3d83fbe240c61cf457bbbd74b9fee68c74ed5edd3480e6da358b0db7d4f732be
+SIZE (vstakhov-rspamd-1.8.0_GH0.tar.gz) = 4261319
--- files/patch-CMakeLists.txt	(revision 480445)
+++ files/patch-CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@ 
---- CMakeLists.txt.orig	2018-05-18 14:14:33 UTC
+--- CMakeLists.txt.orig	2018-09-24 13:53:53 UTC
 +++ CMakeLists.txt
-@@ -1309,6 +1309,27 @@ ENDFOREACH(CONF_FILE)
+@@ -1320,6 +1320,28 @@ ENDFOREACH(CONF_FILE)
  SET(MAIN_CONF "conf/rspamd.conf")
  IF(BUILD_PORT)
  	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" ".sample")
@@ -21,6 +21,7 @@ 
 +	INSTALL_IF_NOT_EXISTS("conf/metrics.conf" ${CONFDIR} "metrics.conf" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/mid.inc" ${CONFDIR} "mid.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/modules.conf" ${CONFDIR} "modules.conf" ".sample")
++	INSTALL_IF_NOT_EXISTS("conf/settings.conf" ${CONFDIR} "settings.conf" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/statistic.conf" ${CONFDIR} "statistic.conf" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/surbl-whitelist.inc" ${CONFDIR} "surbl-whitelist.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/dmarc_whitelist.inc" ${CONFDIR} "dmarc_whitelist.inc" ".sample")
--- pkg-plist	(revision 480445)
+++ pkg-plist	(working copy)
@@ -80,6 +80,7 @@ 
 %%ETCDIR%%/scores.d/statistics_group.conf
 %%ETCDIR%%/scores.d/subject_group.conf
 %%ETCDIR%%/scores.d/surbl_group.conf
+@sample %%ETCDIR%%/settings.conf.sample
 @sample %%ETCDIR%%/spf_dkim_whitelist.inc.sample
 @sample %%ETCDIR%%/statistic.conf.sample
 @sample %%ETCDIR%%/surbl-whitelist.inc.sample
@@ -109,7 +110,6 @@ 
 %%DATADIR%%/languages/cy.json
 %%DATADIR%%/languages/da.json
 %%DATADIR%%/languages/de.json
-%%DATADIR%%/languages/el.json
 %%DATADIR%%/languages/en.json
 %%DATADIR%%/languages/es.json
 %%DATADIR%%/languages/et.json
@@ -118,9 +118,6 @@ 
 %%DATADIR%%/languages/fi.json
 %%DATADIR%%/languages/fr.json
 %%DATADIR%%/languages/ga.json
-%%DATADIR%%/languages/gl.json
-%%DATADIR%%/languages/gu.json
-%%DATADIR%%/languages/he.json
 %%DATADIR%%/languages/hi.json
 %%DATADIR%%/languages/hr.json
 %%DATADIR%%/languages/hu.json
@@ -127,13 +124,8 @@ 
 %%DATADIR%%/languages/id.json
 %%DATADIR%%/languages/is.json
 %%DATADIR%%/languages/it.json
-%%DATADIR%%/languages/ja.json
-%%DATADIR%%/languages/km.json
-%%DATADIR%%/languages/kn.json
-%%DATADIR%%/languages/ko.json
 %%DATADIR%%/languages/lt.json
 %%DATADIR%%/languages/lv.json
-%%DATADIR%%/languages/ml.json
 %%DATADIR%%/languages/mr.json
 %%DATADIR%%/languages/ms.json
 %%DATADIR%%/languages/ne.json
@@ -148,17 +140,13 @@ 
 %%DATADIR%%/languages/so.json
 %%DATADIR%%/languages/sq.json
 %%DATADIR%%/languages/sr.json
+%%DATADIR%%/languages/stop_words
 %%DATADIR%%/languages/sv.json
 %%DATADIR%%/languages/sw.json
-%%DATADIR%%/languages/ta.json
-%%DATADIR%%/languages/te.json
-%%DATADIR%%/languages/th.json
 %%DATADIR%%/languages/tr.json
 %%DATADIR%%/languages/uk.json
 %%DATADIR%%/languages/ur.json
 %%DATADIR%%/languages/vi.json
-%%DATADIR%%/languages/yi.json
-%%DATADIR%%/languages/zh-CN.json
 %%DATADIR%%/lib/ansicolors.lua
 %%DATADIR%%/lib/argparse.lua
 %%DATADIR%%/lib/fun.lua
@@ -165,13 +153,16 @@ 
 %%DATADIR%%/lib/global_functions.lua
 %%DATADIR%%/lib/lua_auth_results.lua
 %%DATADIR%%/lib/lua_cfg_transform.lua
+%%DATADIR%%/lib/lua_clickhouse.lua
 %%DATADIR%%/lib/lua_dkim_tools.lua
 %%DATADIR%%/lib/lua_maps.lua
 %%DATADIR%%/lib/lua_meta.lua
 %%DATADIR%%/lib/lua_nn.lua
 %%DATADIR%%/lib/lua_redis.lua
+%%DATADIR%%/lib/lua_selectors.lua
 %%DATADIR%%/lib/lua_squeeze_rules.lua
 %%DATADIR%%/lib/lua_stat.lua
+%%DATADIR%%/lib/lua_tcp_sync.lua
 %%DATADIR%%/lib/lua_util.lua
 %%DATADIR%%/lib/plugins_stats.lua
 %%DATADIR%%/lib/rescore_utility.lua
@@ -185,6 +176,7 @@ 
 %%DATADIR%%/lib/rspamadm/mime.lua
 %%DATADIR%%/lib/rspamadm/rescore.lua
 %%DATADIR%%/lib/rspamadm/stat_convert.lua
+%%DATADIR%%/lib/tableshape.lua
 %%TORCH%%%%DATADIR%%/lib/decisiontree/CartNode.lua
 %%TORCH%%%%DATADIR%%/lib/decisiontree/CartTrainer.lua
 %%TORCH%%%%DATADIR%%/lib/decisiontree/CartTree.lua
@@ -497,6 +489,7 @@ 
 %%DATADIR%%/www/css/bootstrap.min.css
 %%DATADIR%%/www/css/d3evolution.css
 %%DATADIR%%/www/css/footable.bootstrap.min.css
+%%DATADIR%%/www/css/nprogress.css
 %%DATADIR%%/www/css/rspamd.css
 %%DATADIR%%/www/favicon.ico
 %%DATADIR%%/www/fonts/glyphicons-halflings-regular.ttf
@@ -521,6 +514,7 @@ 
 %%DATADIR%%/www/js/lib/footable.min.js
 %%DATADIR%%/www/js/lib/humanize.min.js
 %%DATADIR%%/www/js/lib/jquery-3.3.1.min.js
+%%DATADIR%%/www/js/lib/nprogress.min.js
 %%DATADIR%%/www/js/lib/require.min.js
 %%DATADIR%%/www/js/lib/visibility.min.js
 %%DATADIR%%/www/js/main.js