Index: head/mail/rspamd/Makefile =================================================================== --- head/mail/rspamd/Makefile (revision 524445) +++ head/mail/rspamd/Makefile (revision 524446) @@ -1,88 +1,95 @@ # $FreeBSD$ PORTNAME= rspamd PORTVERSION= 2.2 CATEGORIES= mail MAINTAINER= vsevolod@FreeBSD.org COMMENT= Fast spam filtering system LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.md LIB_DEPENDS= libpcre.so:devel/pcre \ - libluajit-5.1.so:lang/luajit \ libicui18n.so:devel/icu \ libsodium.so:security/libsodium BUILD_DEPENDS= ragel:devel/ragel RUN_DEPENDS= ca_root_nss>=3.*:security/ca_root_nss USES= cmake compiler:c11 gnome perl5 pkgconfig \ sqlite ssl USE_LDCONFIG= yes USE_PERL5= build run USE_GNOME= glib20 CONFLICTS_INSTALL= rspamd-devel USERS= rspamd GROUPS= rspamd -OPTIONS_DEFINE= BLAS CGP GPERF +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_SUB= yes BLAS_DESC= Use OpenBLAS to accelerate KANN CGP_DESC= Install Communigate Pro(tm) helper 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} 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 USE_GITHUB= yes USE_RC_SUBR= rspamd BLAS_CMAKE_ON= -DENABLE_BLAS=ON BLAS_USES= blaslapack:openblas GPERF_CMAKE_ON= -DENABLE_GPERF_TOOLS=ON GPERF_LIB_DEPENDS= libprofiler.so:devel/google-perftools HYPERSCAN_CMAKE_ON= -DENABLE_HYPERSCAN=ON HYPERSCAN_LIB_DEPENDS= libhs.so:devel/hyperscan + +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 post-install: @${MKDIR} \ ${STAGEDIR}/var/log/rspamd \ ${STAGEDIR}/var/db/rspamd \ ${STAGEDIR}/var/run/rspamd ${RM} ${STAGEDIR}/${ETCDIR}/rspamd.conf.sample # Linux specific ${RM} ${STAGEDIR}/${ETCDIR}/rspamd.systemd.conf ${RM} ${STAGEDIR}/${ETCDIR}/rspamd.sysvinit.conf # No examples installed by the port ${RMDIR} ${STAGEDIR}/${EXAMPLESDIR} ${INSTALL_DATA} ${WRKDIR}/rspamd.newsyslog.conf.sample ${STAGEDIR}${ETCDIR} @${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d ${LN} -s ${ETCDIR}/rspamd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d post-install-CGP-on: ${INSTALL_SCRIPT} ${WRKSRC}/utils/cgp_rspamd.pl ${STAGEDIR}${PREFIX}/bin/rspamd-cgp-helper .include Index: head/mail/rspamd-devel/Makefile =================================================================== --- head/mail/rspamd-devel/Makefile (revision 524445) +++ head/mail/rspamd-devel/Makefile (revision 524446) @@ -1,98 +1,101 @@ # $FreeBSD$ PORTNAME= rspamd PORTVERSION= 2.3.a1.20191120 CATEGORIES= mail PKGNAMESUFFIX= -devel MAINTAINER= vsevolod@FreeBSD.org 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 \ - ${LIB_DEPENDS_${ARCH}} -LIB_DEPENDS_amd64= libluajit-5.1.so:lang/luajit -LIB_DEPENDS_armv7= libluajit-5.1.so:lang/luajit -LIB_DEPENDS_i386= libluajit-5.1.so:lang/luajit -LIB_DEPENDS_powerpc= libluajit-5.1.so:lang/luajit + libsodium.so:security/libsodium BUILD_DEPENDS= ragel:devel/ragel RUN_DEPENDS= ca_root_nss>=3.*:security/ca_root_nss USES= cmake compiler:c11 gnome perl5 pkgconfig \ sqlite ssl USE_LDCONFIG= yes USE_PERL5= build run USE_GNOME= glib20 CONFLICTS_INSTALL= rspamd USERS= rspamd GROUPS= rspamd -OPTIONS_DEFINE= BLAS CGP GPERF +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_SUB= yes BLAS_DESC= Use OpenBLAS to accelerate KANN CGP_DESC= Install Communigate Pro(tm) helper 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} USE_GITHUB= yes GH_TAGNAME= b30c5df DEBUG_FLAGS= -g -O0 WITH_DEBUG= yes USE_RC_SUBR= rspamd BLAS_CMAKE_ON= -DENABLE_BLAS=ON BLAS_USES= blaslapack:openblas GPERF_CMAKE_ON= -DENABLE_GPERF_TOOLS=ON GPERF_LIB_DEPENDS= libprofiler.so:devel/google-perftools HYPERSCAN_CMAKE_ON= -DENABLE_HYPERSCAN=ON HYPERSCAN_LIB_DEPENDS= libhs.so:devel/hyperscan + +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 post-install: @${MKDIR} \ ${STAGEDIR}/var/log/rspamd \ ${STAGEDIR}/var/db/rspamd \ ${STAGEDIR}/var/run/rspamd ${RM} ${STAGEDIR}/${ETCDIR}/rspamd.conf.sample # Linux specific ${RM} ${STAGEDIR}/${ETCDIR}/rspamd.systemd.conf ${RM} ${STAGEDIR}/${ETCDIR}/rspamd.sysvinit.conf # No examples installed by the port ${RMDIR} ${STAGEDIR}/${EXAMPLESDIR} ${INSTALL_DATA} ${WRKDIR}/rspamd.newsyslog.conf.sample ${STAGEDIR}${ETCDIR} @${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d ${LN} -s ${ETCDIR}/rspamd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d post-install-CGP-on: ${INSTALL_SCRIPT} ${WRKSRC}/utils/cgp_rspamd.pl ${STAGEDIR}${PREFIX}/bin/rspamd-cgp-helper .include