Re: git: a2f29f52f700 - main - editors/neovim: Partially revert 9b869a4c17db42729cdfaca02c5c9c5ab2d22976

I’m a few hours from home. Please, commit it if you’d like!

# Adam


—
Adam Weinberger
adamw@adamw.org
https://www.adamw.org

> On Dec 2, 2021, at 11:30, Dima Panov <fluffy@freebsd.org> wrote:
> 
>   
> Moin!
> 
> 
> Please fore lua52 for the build with luajit. 
> 
> Neovim is unable to build with lua53+ as default
> 
> 
> diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile
> index 1888e9cfa09f..0a0429fe5453 100644
> --- a/editors/neovim/Makefile
> +++ b/editors/neovim/Makefile
> @@ -52,7 +52,7 @@ 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=           lua:52,build
>  LUAJIT_USES_OFF=       lua:52
>  NLS_CMAKE_BOOL=                ENABLE_LIBINTL
>  NLS_USES=              gettext
> 
> 
> --
> Dima. (desktop, kde, x11, office, ports-secteam)@FreeBSD team
> (fluffy@FreeBSD.org, https://t.me/dima_panov)
> 
> On Thursday, Dec 02, 2021 at 7:46 PM, Adam Weinberger <adamw@FreeBSD.org> wrote:
> The branch main has been updated by adamw: 
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=a2f29f52f70007ef491672e59a2d110ae2fc5218 
> 
> commit a2f29f52f70007ef491672e59a2d110ae2fc5218 
> Author: Adam Weinberger <adamw@FreeBSD.org> 
> AuthorDate: 2021-12-02 16:41:57 +0000 
> Commit: Adam Weinberger <adamw@FreeBSD.org> 
> CommitDate: 2021-12-02 16:41:57 +0000 
> 
> editors/neovim: Partially revert 9b869a4c17db42729cdfaca02c5c9c5ab2d22976 
> 
> luajit-openresty causes lua errors with many nvim plugins. I don't know 
> why, and until I have time to diagnose it, revert the switch to 
> hardcoded luajit-openresty. In the short term I'll likely switch to 
> hardcoding luajit and removing the PUC Lua option. 
> --- 
> devel/luv/Makefile | 26 +++++++++++++++++++++----- 
> editors/neovim/Makefile | 19 +++++++++++++++---- 
> 2 files changed, 36 insertions(+), 9 deletions(-) 
> 
> diff --git a/devel/luv/Makefile b/devel/luv/Makefile 
> index d4823eb8b3a1..cba39bbd4659 100644 
> --- a/devel/luv/Makefile 
> +++ b/devel/luv/Makefile 
> @@ -1,6 +1,6 @@ 
> PORTNAME= luv 
> DISTVERSION= 1.41.0-0 
> -PORTREVISION= 1 
> +PORTREVISION= 2 
> CATEGORIES= devel 
> 
> MAINTAINER= checo1705@secmail.pro 
> @@ -9,8 +9,7 @@ COMMENT= libuv bindings for lua 
> LICENSE= APACHE20 
> LICENSE_FILE= ${WRKSRC}/LICENSE.txt 
> 
> -LIB_DEPENDS= libuv.so:devel/libuv \ 
> - libluajit-5.1.so:lang/luajit-openresty \ 
> +LIB_DEPENDS= libuv.so:devel/libuv 
> 
> USES= cmake 
> USE_LDCONFIG= yes 
> @@ -20,9 +19,26 @@ GH_PROJECT= luv lua-compat-5.3:compat 
> GH_TAGNAME= bc91f40:compat 
> GH_SUBDIR= deps/lua-compat-5.3:compat 
> 
> -OPTIONS_DEFINE= DOCS EXAMPLES 
> +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 
> 
> -CMAKE_ON= BUILD_SHARED_LIBS WITH_LUA_ENGINE=LuaJIT WITH_SHARED_LIBUV 
> +LUAJIT_DESC= Use LuaJIT (instead of just Lua; recommended) 
> +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_CMAKE_OFF= -DWITH_LUA_ENGINE=Lua 
> +LUAJIT_USES_OFF= lua 
> +CMAKE_ON= BUILD_SHARED_LIBS 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 ab04cd1b5627..1888e9cfa09f 100644 
> --- a/editors/neovim/Makefile 
> +++ b/editors/neovim/Makefile 
> @@ -3,6 +3,7 @@ 
> PORTNAME= neovim 
> DISTVERSIONPREFIX= v 
> DISTVERSION= 0.6.0 
> +PORTREVISION= 1 
> CATEGORIES= editors 
> 
> MAINTAINER= adamw@FreeBSD.org 
> @@ -13,8 +14,7 @@ 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= libluajit-5.1.so:lang/luajit-openresty \ 
> - libluv.so:devel/luv \ 
> +LIB_DEPENDS= libluv.so:devel/luv \ 
> libmsgpackc.so:devel/msgpack \ 
> libtermkey.so:devel/libtermkey \ 
> libtree-sitter.so:devel/tree-sitter \ 
> @@ -26,7 +26,7 @@ TEST_DEPENDS= autoconf>=0:devel/autoconf \ 
> gmake:devel/gmake \ 
> libtool:devel/libtool 
> 
> -USES= cmake cpe iconv lua:build pathfix pkgconfig 
> +USES= cmake cpe iconv pathfix pkgconfig 
> USE_GITHUB= yes 
> GH_TUPLE= libmpack:libmpack:1.0.5:libmpack \ 
> libmpack:libmpack-lua:1.0.7:libmpack_lua 
> @@ -39,11 +39,21 @@ CMAKE_ARGS= -DLUA_PRG:FILEPATH="${LUA_CMD}" \ 
> DATADIR= ${PREFIX}/share/nvim 
> PORTDATA= runtime 
> 
> -OPTIONS_DEFINE= NLS PYNVIM 
> +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_SUB= yes 
> 
> +LUAJIT_DESC= Use LuaJIT for faster Lua code (recommended) 
> 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} 
> @@ -52,6 +62,7 @@ PYNVIM_USES= python:run 
> .include <bsd.port.options.mk> 
> 
> .if ${ARCH:Mpowerpc64*} 
> +LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty 
> USES+= compiler:gcc-c++11-lib 
> .endif 
>