mail/rspamd-devel: update to the latest snapshot

* Pet portclippy
* Re-format Makefile with portfmt

PR:		259602
Reported by:	yasu

3 files changed, 46 insertions, 19 deletions

diff --git a/mail/rspamd-devel/Makefile b/mail/rspamd-devel/Makefile
index 26d13f70190c..4e94efac8139 100644
--- a/mail/rspamd-devel/Makefile
+++ b/mail/rspamd-devel/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	rspamd
-PORTVERSION=	2.8.a2.20210324
-PORTREVISION=	2
+PORTVERSION=	3.2.a1.20211101
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel
 
@@ -10,28 +9,49 @@ COMMENT=	Fast spam filtering system dev version
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-LIB_DEPENDS=	libpcre.so:devel/pcre \
-		libicui18n.so:devel/icu \
-		libsodium.so:security/libsodium
 BUILD_DEPENDS=	ragel:devel/ragel
+LIB_DEPENDS=	libicui18n.so:devel/icu \
+		libpcre.so:devel/pcre \
+		libsodium.so:security/libsodium
 RUN_DEPENDS=	ca_root_nss>=3.*:security/ca_root_nss
 
-USES=		cmake cpe gnome perl5 pkgconfig sqlite ssl compiler:c++17-lang
+USES=		cmake compiler:c++17-lang cpe gnome perl5 pkgconfig sqlite ssl
 CPE_VENDOR=	${PORTNAME}_project
+USE_GITHUB=	yes
+GH_TAGNAME=	9eaf2c53c
+USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 USE_PERL5=	build run
-USE_GNOME=	glib20
+USE_RC_SUBR=	rspamd
+
+CMAKE_ARGS+=	-DBUILD_PORT=yes \
+		-DCMAKE_INSTALL_PREFIX=${PREFIX} \
+		-DCONFDIR=${PREFIX}/etc/rspamd \
+		-DDBDIR=/var/db/rspamd \
+		-DDEBUG=ON \
+		-DGIT_ID=${GH_TAGNAME} \
+		-DLIBDIR=${PREFIX}/lib/rspamd \
+		-DLOGDIR=/var/log/rspamd \
+		-DMANDIR=${MANPREFIX}/man \
+		-DRUNDIR=/var/run/rspamd
+
+DEBUG_FLAGS=	-g -O0
 
 CONFLICTS_INSTALL=	rspamd
 
+SUB_FILES=	pkg-message rspamd.newsyslog.conf.sample
+
 USERS=		rspamd
 GROUPS=		rspamd
 
-OPTIONS_DEFINE=			BLAS CGP GPERF LUAJIT
-OPTIONS_DEFINE_amd64=		HYPERSCAN
-OPTIONS_DEFAULT_amd64=		LUAJIT
-OPTIONS_DEFAULT_armv7=		LUAJIT
-OPTIONS_DEFAULT_i386=		LUAJIT
+PLIST_SUB+=	ETCDIR=etc/rspamd \
+		RSPAMDVERSION=${PORTVERSION:C/^([^.]+\.[^.]+).*/\1/}
+
+OPTIONS_DEFINE=	BLAS CGP GPERF LUAJIT
+OPTIONS_DEFINE_amd64=	HYPERSCAN
+OPTIONS_DEFAULT_amd64=	LUAJIT
+OPTIONS_DEFAULT_armv7=	LUAJIT
+OPTIONS_DEFAULT_i386=	LUAJIT
 OPTIONS_DEFAULT_powerpc=	LUAJIT
 OPTIONS_DEFAULT_powerpc64=	LUAJIT
 OPTIONS_DEFAULT_powerpc64le=	LUAJIT
@@ -56,9 +76,6 @@ CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rspamd \
 		-DLIBDIR=${PREFIX}/lib/rspamd \
 		-DDEBUG=ON \
 		-DGIT_ID=${GH_TAGNAME}
-USE_GITHUB=	yes
-GH_TAGNAME=	f66453cf8
-
 DEBUG_FLAGS=	-g -O0
 
 USE_RC_SUBR=	rspamd
diff --git a/mail/rspamd-devel/distinfo b/mail/rspamd-devel/distinfo
index b2e4c7c02cad..38a9a555b79f 100644
--- a/mail/rspamd-devel/distinfo
+++ b/mail/rspamd-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616585626
-SHA256 (rspamd-rspamd-2.8.a2.20210324-f66453cf8_GH0.tar.gz) = 69b03ffd3a95747ab5501931b24f652c40b21c5049f1d867f14a9e410abb1756
-SIZE (rspamd-rspamd-2.8.a2.20210324-f66453cf8_GH0.tar.gz) = 5477366
+TIMESTAMP = 1635800888
+SHA256 (rspamd-rspamd-3.2.a1.20211101-9eaf2c53c_GH0.tar.gz) = 8d3bdcdc14563d4021c2205122c8cbb331d7896703a53f8c18e8c25aa1cda568
+SIZE (rspamd-rspamd-3.2.a1.20211101-9eaf2c53c_GH0.tar.gz) = 5567825
diff --git a/mail/rspamd-devel/pkg-plist b/mail/rspamd-devel/pkg-plist
index d7d25215659b..a6b71d7eb030 100644
--- a/mail/rspamd-devel/pkg-plist
+++ b/mail/rspamd-devel/pkg-plist
@@ -25,6 +25,7 @@ etc/newsyslog.conf.d/rspamd.newsyslog.conf
 %%ETCDIR%%/modules.d/antivirus.conf
 %%ETCDIR%%/modules.d/arc.conf
 %%ETCDIR%%/modules.d/asn.conf
+%%ETCDIR%%/modules.d/aws_s3.conf
 %%ETCDIR%%/modules.d/chartable.conf
 %%ETCDIR%%/modules.d/clickhouse.conf
 %%ETCDIR%%/modules.d/dcc.conf
@@ -33,6 +34,7 @@ etc/newsyslog.conf.d/rspamd.newsyslog.conf
 %%ETCDIR%%/modules.d/dmarc.conf
 %%ETCDIR%%/modules.d/elastic.conf
 %%ETCDIR%%/modules.d/emails.conf
+%%ETCDIR%%/modules.d/external_relay.conf
 %%ETCDIR%%/modules.d/external_services.conf
 %%ETCDIR%%/modules.d/force_actions.conf
 %%ETCDIR%%/modules.d/forged_recipients.conf
@@ -153,6 +155,7 @@ man/man8/rspamd.8.gz
 %%DATADIR%%/lualib/global_functions.lua
 %%DATADIR%%/lualib/lpegre.lua
 %%DATADIR%%/lualib/lua_auth_results.lua
+%%DATADIR%%/lualib/lua_aws.lua
 %%DATADIR%%/lualib/lua_bayes_learn.lua
 %%DATADIR%%/lualib/lua_cfg_transform.lua
 %%DATADIR%%/lualib/lua_clickhouse.lua
@@ -189,6 +192,7 @@ man/man8/rspamd.8.gz
 %%DATADIR%%/lualib/lua_scanners/kaspersky_se.lua
 %%DATADIR%%/lualib/lua_scanners/oletools.lua
 %%DATADIR%%/lualib/lua_scanners/p0f.lua
+%%DATADIR%%/lualib/lua_scanners/pyzor.lua
 %%DATADIR%%/lualib/lua_scanners/razor.lua
 %%DATADIR%%/lualib/lua_scanners/savapi.lua
 %%DATADIR%%/lualib/lua_scanners/sophos.lua
@@ -208,6 +212,7 @@ man/man8/rspamd.8.gz
 %%DATADIR%%/lualib/lua_util.lua
 %%DATADIR%%/lualib/lua_verdict.lua
 %%DATADIR%%/lualib/lupa.lua
+%%DATADIR%%/lualib/plugins/dmarc.lua
 %%DATADIR%%/lualib/plugins/neural.lua
 %%DATADIR%%/lualib/plugins/rbl.lua
 %%DATADIR%%/lualib/plugins_stats.lua
@@ -218,20 +223,24 @@ man/man8/rspamd.8.gz
 %%DATADIR%%/lualib/rspamadm/configwizard.lua
 %%DATADIR%%/lualib/rspamadm/cookie.lua
 %%DATADIR%%/lualib/rspamadm/corpus_test.lua
+%%DATADIR%%/lualib/rspamadm/dmarc_report.lua
 %%DATADIR%%/lualib/rspamadm/dns_tool.lua
 %%DATADIR%%/lualib/rspamadm/fuzzy_convert.lua
 %%DATADIR%%/lualib/rspamadm/fuzzy_stat.lua
 %%DATADIR%%/lualib/rspamadm/grep.lua
 %%DATADIR%%/lualib/rspamadm/keypair.lua
 %%DATADIR%%/lualib/rspamadm/mime.lua
+%%DATADIR%%/lualib/rspamadm/neural_test.lua
 %%DATADIR%%/lualib/rspamadm/rescore.lua
 %%DATADIR%%/lualib/rspamadm/stat_convert.lua
+%%DATADIR%%/lualib/rspamadm/statistics_dump.lua
 %%DATADIR%%/lualib/rspamadm/template.lua
 %%DATADIR%%/lualib/rspamadm/vault.lua
 %%DATADIR%%/lualib/tableshape.lua
 %%DATADIR%%/plugins/antivirus.lua
 %%DATADIR%%/plugins/arc.lua
 %%DATADIR%%/plugins/asn.lua
+%%DATADIR%%/plugins/aws_s3.lua
 %%DATADIR%%/plugins/bayes_expiry.lua
 %%DATADIR%%/plugins/clickhouse.lua
 %%DATADIR%%/plugins/clustering.lua
@@ -241,6 +250,7 @@ man/man8/rspamd.8.gz
 %%DATADIR%%/plugins/dynamic_conf.lua
 %%DATADIR%%/plugins/elastic.lua
 %%DATADIR%%/plugins/emails.lua
+%%DATADIR%%/plugins/external_relay.lua
 %%DATADIR%%/plugins/external_services.lua
 %%DATADIR%%/plugins/force_actions.lua
 %%DATADIR%%/plugins/forged_recipients.lua
@@ -330,7 +340,7 @@ man/man8/rspamd.8.gz
 %%DATADIR%%/www/js/lib/d3pie.min.js
 %%DATADIR%%/www/js/lib/fontawesome.min.js
 %%DATADIR%%/www/js/lib/footable.min.js
-%%DATADIR%%/www/js/lib/jquery-3.5.1.min.js
+%%DATADIR%%/www/js/lib/jquery-3.6.0.min.js
 %%DATADIR%%/www/js/lib/jquery.stickytabs.min.js
 %%DATADIR%%/www/js/lib/linenumbers.min.js
 %%DATADIR%%/www/js/lib/nprogress.min.js