From owner-svn-ports-head@freebsd.org Tue May 28 14:04:36 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 28A8B1598AAC; Tue, 28 May 2019 14:04:36 +0000 (UTC) (envelope-from adamw@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 C0BB48297F; Tue, 28 May 2019 14:04:35 +0000 (UTC) (envelope-from adamw@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 96AE71B5C3; Tue, 28 May 2019 14:04:35 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4SE4ZP5067203; Tue, 28 May 2019 14:04:35 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4SE4ZW1067202; Tue, 28 May 2019 14:04:35 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201905281404.x4SE4ZW1067202@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Tue, 28 May 2019 14:04:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r502895 - head/editors/neovim X-SVN-Group: ports-head X-SVN-Commit-Author: adamw X-SVN-Commit-Paths: head/editors/neovim X-SVN-Commit-Revision: 502895 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C0BB48297F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.97)[-0.972,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 May 2019 14:04:36 -0000 Author: adamw Date: Tue May 28 14:04:35 2019 New Revision: 502895 URL: https://svnweb.freebsd.org/changeset/ports/502895 Log: Disable LuaJIT on non-x86 architectures The version of LuaJIT in port doesn't work well (or at all) for neovim on non-x86 architectures. Plus, some users (at least the submitter, who made a good argument for it) may not want LuaJIT at all. So, make LuaJIT an OPTION. Enable it by default, and exclude it from all the archs that LuaJIT+neovim doesn't work on. Fall back instead on normal Lua. PR: 238079 Submitted by: Greg V MFH: 2019Q2 Modified: head/editors/neovim/Makefile Modified: head/editors/neovim/Makefile ============================================================================== --- head/editors/neovim/Makefile Tue May 28 13:46:14 2019 (r502894) +++ head/editors/neovim/Makefile Tue May 28 14:04:35 2019 (r502895) @@ -4,6 +4,7 @@ PORTNAME= neovim DISTVERSIONPREFIX= v DISTVERSION= 0.3.5 +PORTREVISION= 1 CATEGORIES= editors MAINTAINER= adamw@FreeBSD.org @@ -14,8 +15,7 @@ LICENSE= APACHE20 BUILD_DEPENDS= gperf:devel/gperf \ ${LUA_MODLIBDIR}/bit.so:devel/lua-bitop \ ${LUA_MODLIBDIR}/lpeg.so:devel/lua-lpeg -LIB_DEPENDS= libluajit-5.1.so:lang/luajit \ - libmsgpackc.so:devel/msgpack \ +LIB_DEPENDS= libmsgpackc.so:devel/msgpack \ libtermkey.so:devel/libtermkey \ libunibilium.so:devel/unibilium \ libuv.so:devel/libuv \ @@ -25,7 +25,7 @@ TEST_DEPENDS= autoconf>=0:devel/autoconf \ gmake:devel/gmake \ libtool:devel/libtool -USES= cmake iconv lua:build pathfix pkgconfig +USES= cmake iconv pathfix pkgconfig USE_GITHUB= yes GH_TUPLE= libmpack:libmpack:1.0.5:libmpack \ libmpack:libmpack-lua:1.0.7:libmpack_lua @@ -34,8 +34,20 @@ CMAKE_ARGS= -DLUA_PRG:FILEPATH="${LUA_CMD}" \ -DCMAKE_INSTALL_MANDIR:PATH="${MANPREFIX}/man" \ -DDEPS_PREFIX:PATH="${LOCALBASE}" -OPTIONS_DEFINE= NLS PYNVIM +OPTIONS_DEFINE= LUAJIT NLS PYNVIM +OPTIONS_DEFAULT=LUAJIT +OPTIONS_EXCLUDE_aarch64=LUAJIT +OPTIONS_EXCLUDE_mips64= LUAJIT +OPTIONS_EXCLUDE_powerpc64= LUAJIT +OPTIONS_EXCLUDE_riscv= LUAJIT +OPTIONS_EXCLUDE_sparc64=LUAJIT OPTIONS_SUB= yes + +LUAJIT_DESC= Use LuaJIT for faster Lua code +LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit +LUAJIT_USES= lua:build +LUAJIT_CMAKE_OFF= -DPREFER_LUA:BOOL="ON" +LUAJIT_USES_OFF= lua:52 NLS_CMAKE_BOOL= ENABLE_LIBINTL NLS_USES= gettext PYNVIM_DESC= Enable support for plugins written in python