From nobody Thu Dec 2 03:20:56 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BC3D718C2FDD; Thu, 2 Dec 2021 03:20:57 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J4Lnj1kgPz3Jj2; Thu, 2 Dec 2021 03:20:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1266A161A1; Thu, 2 Dec 2021 03:20:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B23KuOe039037; Thu, 2 Dec 2021 03:20:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B23Ku15039036; Thu, 2 Dec 2021 03:20:56 GMT (envelope-from git) Date: Thu, 2 Dec 2021 03:20:56 GMT Message-Id: <202112020320.1B23Ku15039036@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adam Weinberger Subject: git: 9b869a4c17db - main - editors/neovim: Update to 0.6.0 and switch lua backend List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adamw X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b869a4c17db42729cdfaca02c5c9c5ab2d22976 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638415257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MxoycCwc8aA4aBobFm8f0YVtix0K7mJe+NNWji5QV9I=; b=HGY87OfE0Yw+nITjZjgBxPwQJBiXuMGdy12QttiMuNCgXWYQGVszrDm8Gqz5g74WCy7drX IyVvyXmbSvTCl3lqPGNsRaj4S7GckMloVgNiNNDAB3n7aUIKYcR71kKBWelPuGUr/j0FDU BCr7alSeS3js9ZBpxFOTV//WZ/ptNIMzCTFjjGubjcS5l/6JkNOvKqDgHiYQtXwo28sjXX YlnDgIdboPleTQUdWdDy8nRpyaTBirEKkvjSPNTJjSaKME7LeKi6rfc2y9qt6n7bmPHLNp pboS85JQC8WM9c8+4P2+4hGlvCpPk54BXudesGdV9Thc0CLpsLa9HXUPG21ygg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638415257; a=rsa-sha256; cv=none; b=Bg/KSmfJySXXx3uRhhdkwNv/f3gt2Pa2RapmDp9CYjx3W3qG4ahRjAu2Rjh6Xno4yKaKwN QcLzb3ITcGducgOwXBN3eA2yMPIy+VVwA/owb01UopVKiv7yT2xdOZTT/xUrE/wbsdNFym n3z6rdT//EaNmpniKt7ZzXuzRPeEAdnxkifknZx5O9Fe7C5CSBQZGbTicAD+wKUHFldQEC puCLhuKQ5t3fzkVB2I9ZZpDoj5cTFZ7SMMd/oOQQp4zshJqrF43CqYiHdnWT3CNwHjOkJt TxfFN28Ji+mNWuqGWLF5nRwUwEPtjqRqms0zFbuneM1quZ7ps+0cjlPOUJEdEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b869a4c17db42729cdfaca02c5c9c5ab2d22976 commit 9b869a4c17db42729cdfaca02c5c9c5ab2d22976 Author: Adam Weinberger AuthorDate: 2021-12-02 03:14:43 +0000 Commit: Adam Weinberger CommitDate: 2021-12-02 03:20:52 +0000 editors/neovim: Update to 0.6.0 and switch lua backend 0.6.0 is an interval update that refines and extends the major lua overhaul of 0.5.0. Instead of using options for luajit vs PUC (mainline) lua, use luajit-openresty unconditionally. devel/luv needs to use the same backend as NeoVIM, so this commit switches it too. NeoVIM is designed specifically to run on luajit rather than PUC; upstream essentially doesn't develop for PUC. However, luajit is largely unmaintained, locked in an older lua dialect, and unbuildable on many architectures. The luajit-openresty fork is faster, more modern, and should work in more places. It's unclear to me which FreeBSD archs it does or doesn't work on, so the fallout will have to be addressed once the builders have a whack at it. --- devel/luv/Makefile | 25 ++++--------------------- editors/neovim/Makefile | 20 +++++--------------- editors/neovim/distinfo | 6 +++--- 3 files changed, 12 insertions(+), 39 deletions(-) diff --git a/devel/luv/Makefile b/devel/luv/Makefile index 47dd6bd45690..d4823eb8b3a1 100644 --- a/devel/luv/Makefile +++ b/devel/luv/Makefile @@ -9,7 +9,8 @@ COMMENT= libuv bindings for lua LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -LIB_DEPENDS= libuv.so:devel/libuv +LIB_DEPENDS= libuv.so:devel/libuv \ + libluajit-5.1.so:lang/luajit-openresty \ USES= cmake USE_LDCONFIG= yes @@ -19,27 +20,9 @@ GH_PROJECT= luv lua-compat-5.3:compat GH_TAGNAME= bc91f40:compat GH_SUBDIR= deps/lua-compat-5.3:compat -OPTIONS_DEFINE= DOCS EXAMPLES LUAJIT -OPTIONS_DEFAULT_aarch64= LUAJIT -OPTIONS_DEFAULT_amd64= LUAJIT -OPTIONS_DEFAULT_i386= LUAJIT -OPTIONS_DEFAULT_powerpc= LUAJIT -OPTIONS_DEFAULT_powerpc64= LUAJIT -OPTIONS_DEFAULT_powerpc64le= LUAJIT +OPTIONS_DEFINE= DOCS EXAMPLES -LUAJIT_DESC= Use LuaJIT (instead of just Lua) -LUAJIT_LIB_DEPENDS= ${LUAJIT_LIB_DEPENDS_${ARCH}} -LUAJIT_LIB_DEPENDS_aarch64= libluajit-5.1.so:lang/luajit-openresty -LUAJIT_LIB_DEPENDS_amd64= libluajit-5.1.so:lang/luajit -LUAJIT_LIB_DEPENDS_i386= libluajit-5.1.so:lang/luajit -LUAJIT_LIB_DEPENDS_powerpc= libluajit-5.1.so:lang/luajit -LUAJIT_LIB_DEPENDS_powerpc64= libluajit-5.1.so:lang/luajit-openresty -LUAJIT_LIB_DEPENDS_powerpc64le= libluajit-5.1.so:lang/luajit-openresty -LUAJIT_CMAKE_ON= -DWITH_LUA_ENGINE=LuaJIT -LUAJIT_USES_OFF= lua -LUAJIT_CMAKE_OFF= -DWITH_LUA_ENGINE=Lua - -CMAKE_ON= BUILD_SHARED_LIBS WITH_SHARED_LIBUV +CMAKE_ON= BUILD_SHARED_LIBS WITH_LUA_ENGINE=LuaJIT WITH_SHARED_LIBUV CMAKE_OFF= BUILD_MODULE CMAKE_ARGS= -DLUA_BUILD_TYPE=System \ -DLUA_COMPAT53_DIR=deps/lua-compat-5.3 diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile index 5088f53b5deb..ab04cd1b5627 100644 --- a/editors/neovim/Makefile +++ b/editors/neovim/Makefile @@ -2,7 +2,7 @@ PORTNAME= neovim DISTVERSIONPREFIX= v -DISTVERSION= 0.5.1 +DISTVERSION= 0.6.0 CATEGORIES= editors MAINTAINER= adamw@FreeBSD.org @@ -13,7 +13,8 @@ LICENSE= APACHE20 BUILD_DEPENDS= gperf:devel/gperf \ ${LUA_MODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} \ ${LUA_MODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR} -LIB_DEPENDS= libluv.so:devel/luv \ +LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty \ + libluv.so:devel/luv \ libmsgpackc.so:devel/msgpack \ libtermkey.so:devel/libtermkey \ libtree-sitter.so:devel/tree-sitter \ @@ -25,7 +26,7 @@ TEST_DEPENDS= autoconf>=0:devel/autoconf \ gmake:devel/gmake \ libtool:devel/libtool -USES= cmake cpe iconv pathfix pkgconfig +USES= cmake cpe iconv lua:build pathfix pkgconfig USE_GITHUB= yes GH_TUPLE= libmpack:libmpack:1.0.5:libmpack \ libmpack:libmpack-lua:1.0.7:libmpack_lua @@ -38,21 +39,11 @@ CMAKE_ARGS= -DLUA_PRG:FILEPATH="${LUA_CMD}" \ DATADIR= ${PREFIX}/share/nvim PORTDATA= runtime -OPTIONS_DEFINE= LUAJIT NLS PYNVIM -OPTIONS_DEFAULT=LUAJIT -OPTIONS_EXCLUDE_aarch64=LUAJIT -OPTIONS_EXCLUDE_mips64= LUAJIT -OPTIONS_EXCLUDE_riscv64=LUAJIT -OPTIONS_EXCLUDE_sparc64=LUAJIT +OPTIONS_DEFINE= NLS PYNVIM OPTIONS_SUB= yes -LUAJIT_DESC= Use LuaJIT for faster Lua code PYNVIM_DESC= Enable support for plugins written in python -LUAJIT_CMAKE_OFF= -DPREFER_LUA:BOOL="ON" -LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit -LUAJIT_USES= lua:build -LUAJIT_USES_OFF= lua:52 NLS_CMAKE_BOOL= ENABLE_LIBINTL NLS_USES= gettext PYNVIM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pynvim>=0.3.0:editors/py-pynvim@${PY_FLAVOR} @@ -61,7 +52,6 @@ PYNVIM_USES= python:run .include .if ${ARCH:Mpowerpc64*} -LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty USES+= compiler:gcc-c++11-lib .endif diff --git a/editors/neovim/distinfo b/editors/neovim/distinfo index c6e2860e1b74..2a9b354679c0 100644 --- a/editors/neovim/distinfo +++ b/editors/neovim/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1632701733 -SHA256 (neovim-neovim-v0.5.1_GH0.tar.gz) = aa449795e5cc69bdd2eeed7095f20b9c086c6ecfcde0ab62ab97a9d04243ec84 -SIZE (neovim-neovim-v0.5.1_GH0.tar.gz) = 10349190 +TIMESTAMP = 1638413905 +SHA256 (neovim-neovim-v0.6.0_GH0.tar.gz) = 2cfd600cfa5bb57564cc22ffbbbcb2c91531053fc3de992df33656614384fa4c +SIZE (neovim-neovim-v0.6.0_GH0.tar.gz) = 10592213 SHA256 (libmpack-libmpack-1.0.5_GH0.tar.gz) = 4ce91395d81ccea97d3ad4cb962f8540d166e59d3e2ddce8a22979b49f108956 SIZE (libmpack-libmpack-1.0.5_GH0.tar.gz) = 32966 SHA256 (libmpack-libmpack-lua-1.0.7_GH0.tar.gz) = 2ebe9c8972c378040c9b8505f5fb40a0c64d990cd68be6a62989362b18294d0a