mail/rspamd-devel: Update to 3.2.a1.20211113

Obtained from: Alexander Moissev

3 files changed, 20 insertions, 34 deletions

diff --git a/mail/rspamd-devel/Makefile b/mail/rspamd-devel/Makefile
index 4e94efac8139..2c165abb665e 100644
--- a/mail/rspamd-devel/Makefile
+++ b/mail/rspamd-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	rspamd
-PORTVERSION=	3.2.a1.20211101
+PORTVERSION=	3.2.a1.20211113
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel
 
@@ -18,7 +18,7 @@ RUN_DEPENDS=	ca_root_nss>=3.*:security/ca_root_nss
 USES=		cmake compiler:c++17-lang cpe gnome perl5 pkgconfig sqlite ssl
 CPE_VENDOR=	${PORTNAME}_project
 USE_GITHUB=	yes
-GH_TAGNAME=	9eaf2c53c
+GH_TAGNAME=	6e83edb
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 USE_PERL5=	build run
@@ -63,48 +63,31 @@ GPERF_DESC=	Google perf-tools profiling
 HYPERSCAN_DESC=	Use hyperscan optimizations (amd64 only)
 LUAJIT_DESC=	Use LuaJIT instead of standard Lua
 
-SUB_FILES=	pkg-message rspamd.newsyslog.conf.sample
-PLIST_SUB+=	ETCDIR=etc/rspamd \
-		RSPAMDVERSION=${PORTVERSION:C/^([^.]+\.[^.]+).*/\1/}
-CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rspamd \
-		-DLOGDIR=/var/log/rspamd \
-		-DDBDIR=/var/db/rspamd \
-		-DRUNDIR=/var/run/rspamd \
-		-DMANDIR=${MANPREFIX}/man \
-		-DCMAKE_INSTALL_PREFIX=${PREFIX} \
-		-DBUILD_PORT=yes \
-		-DLIBDIR=${PREFIX}/lib/rspamd \
-		-DDEBUG=ON \
-		-DGIT_ID=${GH_TAGNAME}
-DEBUG_FLAGS=	-g -O0
-
-USE_RC_SUBR=	rspamd
+BLAS_LIB_DEPENDS=	libblis.so:math/blis \
+			liblapack.so:math/lapack
+BLAS_USES=		blaslapack:openblas
+BLAS_CMAKE_ON=		-DENABLE_BLAS=ON
 
-BLAS_CMAKE_ON=	-DENABLE_BLAS=ON
-BLAS_LIB_DEPENDS=	libblis.so:math/blis liblapack.so:math/lapack
-BLAS_USES=	blaslapack:openblas
+CGP_RUN_DEPENDS+=	p5-AnyEvent-HTTP>=0:www/p5-AnyEvent-HTTP \
+			p5-AnyEvent>=0:devel/p5-AnyEvent \
+			p5-EV>=0:devel/p5-EV \
+			p5-JSON-XS>=0:converters/p5-JSON-XS
 
-GPERF_CMAKE_ON=	-DENABLE_GPERF_TOOLS=ON
 GPERF_LIB_DEPENDS=	libprofiler.so:devel/google-perftools
+GPERF_CMAKE_ON=		-DENABLE_GPERF_TOOLS=ON
 
-HYPERSCAN_CMAKE_ON=	-DENABLE_HYPERSCAN=ON
 HYPERSCAN_LIB_DEPENDS=	libhs.so:devel/hyperscan
+HYPERSCAN_CMAKE_ON=	-DENABLE_HYPERSCAN=ON
 
-LUAJIT_CMAKE_OFF=	-DENABLE_LUAJIT=OFF
 LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 LUAJIT_USES_OFF=	lua:51+
-
-CGP_RUN_DEPENDS+=	\
-	p5-AnyEvent-HTTP>=0:www/p5-AnyEvent-HTTP \
-	p5-AnyEvent>=0:devel/p5-AnyEvent \
-	p5-EV>=0:devel/p5-EV \
-	p5-JSON-XS>=0:converters/p5-JSON-XS
+LUAJIT_CMAKE_OFF=	-DENABLE_LUAJIT=OFF
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH:Mpowerpc64*}
 LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit-openresty
-USES+=		compiler:gcc-c++11-lib
+USES+=			compiler:gcc-c++11-lib
 .endif
 
 post-install:
diff --git a/mail/rspamd-devel/distinfo b/mail/rspamd-devel/distinfo
index 38a9a555b79f..91bdd42d0c8b 100644
--- a/mail/rspamd-devel/distinfo
+++ b/mail/rspamd-devel/distinfo
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1636784689
+SHA256 (rspamd-rspamd-3.2.a1.20211113-6e83edb_GH0.tar.gz) = d5b4c7323c532ac8dad628ac239cb4808916934335cfd83529ad4c03d434ec4d
+SIZE (rspamd-rspamd-3.2.a1.20211113-6e83edb_GH0.tar.gz) = 5576127
diff --git a/mail/rspamd-devel/pkg-plist b/mail/rspamd-devel/pkg-plist
index a6b71d7eb030..6f27dfc42025 100644
--- a/mail/rspamd-devel/pkg-plist
+++ b/mail/rspamd-devel/pkg-plist
@@ -26,6 +26,7 @@ etc/newsyslog.conf.d/rspamd.newsyslog.conf
 %%ETCDIR%%/modules.d/arc.conf
 %%ETCDIR%%/modules.d/asn.conf
 %%ETCDIR%%/modules.d/aws_s3.conf
+%%ETCDIR%%/modules.d/bimi.conf
 %%ETCDIR%%/modules.d/chartable.conf
 %%ETCDIR%%/modules.d/clickhouse.conf
 %%ETCDIR%%/modules.d/dcc.conf
@@ -183,6 +184,7 @@ man/man8/rspamd.8.gz
 %%DATADIR%%/lualib/lua_redis.lua
 %%DATADIR%%/lualib/lua_scanners/avast.lua
 %%DATADIR%%/lualib/lua_scanners/clamav.lua
+%%DATADIR%%/lualib/lua_scanners/cloudmark.lua
 %%DATADIR%%/lualib/lua_scanners/common.lua
 %%DATADIR%%/lualib/lua_scanners/dcc.lua
 %%DATADIR%%/lualib/lua_scanners/fprot.lua
@@ -242,6 +244,7 @@ man/man8/rspamd.8.gz
 %%DATADIR%%/plugins/asn.lua
 %%DATADIR%%/plugins/aws_s3.lua
 %%DATADIR%%/plugins/bayes_expiry.lua
+%%DATADIR%%/plugins/bimi.lua
 %%DATADIR%%/plugins/clickhouse.lua
 %%DATADIR%%/plugins/clustering.lua
 %%DATADIR%%/plugins/dcc.lua