From owner-svn-ports-all@freebsd.org Mon Jan 27 21:21:33 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2D78B22F4BF; Mon, 27 Jan 2020 21:21:33 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4862k50S1Qz4CsJ; Mon, 27 Jan 2020 21:21:33 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0A4A118616; Mon, 27 Jan 2020 21:21:33 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00RLLWIH054631; Mon, 27 Jan 2020 21:21:32 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00RLLWQ3054630; Mon, 27 Jan 2020 21:21:32 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202001272121.00RLLWQ3054630@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Mon, 27 Jan 2020 21:21:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r524446 - in head/mail: rspamd rspamd-devel X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/mail: rspamd rspamd-devel X-SVN-Commit-Revision: 524446 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jan 2020 21:21:33 -0000 Author: pkubaj Date: Mon Jan 27 21:21:32 2020 New Revision: 524446 URL: https://svnweb.freebsd.org/changeset/ports/524446 Log: mail/rspamd*: use luajit only on architectures where it's supported Otherwise use standard Lua. PR: 243051 Approved by: vsevolod (maintainer timeout) Modified: head/mail/rspamd-devel/Makefile head/mail/rspamd/Makefile Modified: head/mail/rspamd-devel/Makefile ============================================================================== --- head/mail/rspamd-devel/Makefile Mon Jan 27 20:57:06 2020 (r524445) +++ head/mail/rspamd-devel/Makefile Mon Jan 27 21:21:32 2020 (r524446) @@ -13,12 +13,7 @@ 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 @@ -33,14 +28,19 @@ 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 \ @@ -71,6 +71,9 @@ GPERF_LIB_DEPENDS= libprofiler.so:devel/google-perftoo 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 \ Modified: head/mail/rspamd/Makefile ============================================================================== --- head/mail/rspamd/Makefile Mon Jan 27 20:57:06 2020 (r524445) +++ head/mail/rspamd/Makefile Mon Jan 27 21:21:32 2020 (r524446) @@ -11,7 +11,6 @@ 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 @@ -28,14 +27,19 @@ 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 \ @@ -61,6 +65,9 @@ GPERF_LIB_DEPENDS= libprofiler.so:devel/google-perftoo 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 \