- Update to 0.9.0

- Modernize the plist infrastructure of the port
- Switch to luajit from plain lua

3 files changed, 24 insertions, 28 deletions

diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index 10680e34ca99..345b62943bcd 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	0.8.3
+PORTVERSION=	0.9.0
 CATEGORIES=	mail
 MASTER_SITES=	http://rspamd.com/downloads/
 
@@ -12,7 +12,8 @@ LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
 		libgmime-2.4.so:${PORTSDIR}/mail/gmime24 \
-		libevent.so:${PORTSDIR}/devel/libevent2
+		libevent.so:${PORTSDIR}/devel/libevent2 \
+		libluajit-5.1.so:${PORTSDIR}/lang/luajit
 
 OPTIONS_DEFINE=	GPERF REDIRECTOR
 GPERF_DESC=		google perf-tools profiling
@@ -23,17 +24,17 @@ USE_RC_SUBR=	rspamd
 PLIST_SUB+=	ETCDIR=etc/rspamd \
 		RSPAMDVERSION=${PORTVERSION}
 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 \
-				-DFORCE_GMIME24=yes \
-				-DLIBDIR=${PREFIX}/lib \
-				-DNO_SHARED=ON
+		-DLOGDIR=/var/log/rspamd \
+		-DDBDIR=/var/db/rspamd \
+		-DRUNDIR=/var/run/rspamd \
+		-DMANDIR=${MANPREFIX}/man \
+		-DCMAKE_INSTALL_PREFIX=${PREFIX} \
+		-DBUILD_PORT=yes \
+		-DFORCE_GMIME24=yes \
+		-DLIBDIR=${PREFIX}/lib/rspamd \
+		-DNO_SHARED=ON
 
-USES=		cmake:outsource gettext iconv pkgconfig lua:51+ tar:xz perl5
+USES=		cmake:outsource gettext iconv pkgconfig tar:xz perl5
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 
@@ -69,7 +70,7 @@ USE_SQLITE=	yes
  PLIST_SUB+=		REDIRECTOR="@comment "
 .endif
 
-post-install:
+post-stage:
 	${INSTALL} -d \
 		${STAGEDIR}/var/log/rspamd \
 		${STAGEDIR}/var/db/rspamd \
diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo
index 476ca41f314f..4df88ed2c5e5 100644
--- a/mail/rspamd/distinfo
+++ b/mail/rspamd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rspamd-0.8.3.tar.xz) = 20f788b08406fdaa8148d726e7ba18940108afff2d48b4f47726e3f2a6a88daf
-SIZE (rspamd-0.8.3.tar.xz) = 757676
+SHA256 (rspamd-0.9.0.tar.xz) = 1049580064844bb15002d67ea3cecdaa0500a579616a6aed4d474a3c58cdb918
+SIZE (rspamd-0.9.0.tar.xz) = 794664
diff --git a/mail/rspamd/pkg-plist b/mail/rspamd/pkg-plist
index 24f24aa91762..7837f51af5b2 100644
--- a/mail/rspamd/pkg-plist
+++ b/mail/rspamd/pkg-plist
@@ -10,6 +10,7 @@ bin/rspamc
 %%ETCDIR%%/lua/rspamd.classifiers.lua
 %%ETCDIR%%/lua/rspamd.lua
 %%ETCDIR%%/lua/hfilter.lua
+%%DATADIR%%/lua/dmarc.lua
 %%DATADIR%%/lua/emails.lua
 %%DATADIR%%/lua/forged_recipients.lua
 %%DATADIR%%/lua/fun.lua
@@ -21,7 +22,9 @@ bin/rspamc
 %%DATADIR%%/lua/ratelimit.lua
 %%DATADIR%%/lua/rbl.lua
 %%DATADIR%%/lua/settings.lua
+%%DATADIR%%/lua/spamassassin.lua
 %%DATADIR%%/lua/trie.lua
+%%DATADIR%%/effective_tld_names.dat
 %%DATADIR%%/www/index.html
 %%DATADIR%%/www/plugins.txt
 %%DATADIR%%/www/img/spinner.gif
@@ -32,6 +35,7 @@ bin/rspamc
 %%DATADIR%%/www/js/rspamd.js
 %%DATADIR%%/www/js/jquery.paginatetable.js
 %%DATADIR%%/www/css/rspamd.css
+lib/rspamd/librspamd-actrie.so
 @sample %%ETCDIR%%/common.conf.sample
 @sample %%ETCDIR%%/logging.inc.sample
 @sample %%ETCDIR%%/options.inc.sample
@@ -46,20 +50,11 @@ bin/rspamc
 @sample %%ETCDIR%%/surbl-whitelist.inc.sample
 man/man1/rspamc.1.gz
 man/man8/rspamd.8.gz
-@dirrmtry %%DATADIR%%/lua
-@dirrmtry %%DATADIR%%/www/js
-@dirrmtry %%DATADIR%%/www/css
-@dirrmtry %%DATADIR%%/www/img
-@dirrmtry %%DATADIR%%/www
-@dirrmtry %%DATADIR%%
-@dirrmtry %%ETCDIR%%/lua/regexp
-@dirrmtry %%ETCDIR%%/lua
-@dirrmtry %%ETCDIR%%
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
+@dir %%EXAMPLESDIR%%
 @owner nobody
 @group nobody
-@dirrmtry /var/db/rspamd
-@dirrmtry /var/log/rspamd
-@dirrm /var/run/rspamd
+@dir /var/db/rspamd
+@dir /var/log/rspamd
+@dir /var/run/rspamd
 @owner
 @group