From nobody Sat Jan 29 12:39:51 2022 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 A2C4419909B8; Sat, 29 Jan 2022 12:39:51 +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 4JmDRq47sXz3tWY; Sat, 29 Jan 2022 12:39:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643459991; 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=pg2zLymoQm3vpxSoH6Upx/CY2e2MftqHIFnQWQOVCys=; b=rjNrPRhoS4vQSufwe02X4CWn2fZX/wCl31HmJ2HK501zdxyQpEcmhv8W3wXK1bLyDS8e3t x6lhHPdJXW5XaRVWPHsWif0T0Ru1R4y/GCtuIDuy9gPR7SdzwYfeXTyANm3gCewXpx9BF6 +aACrZd84W+t1Xbm6GUnkrwE6DBKH6wuGRo2PBQ7EblhdxjQgi+yBcAotG0Siq+6QS8c4R RavVZGGw0aQEMIyac2ySUYp7LKkaHFJdfl7ENXFulJAPx09xATi/YgrWu7mC0Gw+7RGU+F MB14emzs2cQFKyTwLN7qWFLfPiFDg6oCt5usNSIOIxBRcYFyL4J558tn6dGXew== 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 6E19F156FC; Sat, 29 Jan 2022 12:39:51 +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 20TCdpk0051800; Sat, 29 Jan 2022 12:39:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20TCdpLM051799; Sat, 29 Jan 2022 12:39:51 GMT (envelope-from git) Date: Sat, 29 Jan 2022 12:39:51 GMT Message-Id: <202201291239.20TCdpLM051799@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: 390b480773f0 - main - editors/vim, devel/luv: Use luajit-openresty as the 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: 390b480773f0bdf76f9695776a061a5a89818a0b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643459991; 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=pg2zLymoQm3vpxSoH6Upx/CY2e2MftqHIFnQWQOVCys=; b=WfoMBpmHJTo7oFtSeltFygu8u85ZVZOz3nhhY2csFGKZXmm77bGp8fuIuadOFT/mZG0eII 9zXE6Yr4dYafC/fhitnshWFIhoJZ+uzKYXw4qqSDZSwl0MsMM3+thSc8YeEwhEioKH83um CrmIkr9Y9MBzQJMDFTGfdJVuVgcFVEA92dxuvVpEs3jCsso7usCt1lpQ2WY7ZiB77GN0Z+ HVOdpSXilPHSXR4UYlg5uze7WEU/WRjytC3SPx77ak7WYZfUN2Mlb0NIXyGxcwtv4p69Pl T++VK3bdW18/F4+gl+aT2Yd9LDa40VbL7NztBaTOyVMFaThdWx7vk5xDUcaTBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643459991; a=rsa-sha256; cv=none; b=esLMmtoV+TUgrBH9GlmgYG6FYBDvUvVza/NFFZDxPlmvTkKvc/HpcKHc+fy7kqxocbhyAb QvkMHwt/GV9GFtyaKxpmHcCpz3hxdH5TzHnEbohRWM0Lp63XExpRzKZbynoK2Iu1p4+bZ8 HINE2ScyGOMCvUtye/Xw0Tn40WEnTRPT6i+YKyMTkr3uPZPxFDHEcjDcib+i5Mxf4iNa6L KpJArZSCDbqSvkNpCY1GHr8szaKduTHJ2tS7MXXjNUcOYSv6heRJ4e5mMKRjh8uBMOLIB6 FlPFO4P8MFpvIcI+lFzLWsYMOGfNPSgzhRj/e8tnMD1e1ZCFKSZMj0kfsJJfjA== 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=390b480773f0bdf76f9695776a061a5a89818a0b commit 390b480773f0bdf76f9695776a061a5a89818a0b Author: Adam Weinberger AuthorDate: 2022-01-29 12:33:56 +0000 Commit: Adam Weinberger CommitDate: 2022-01-29 12:39:24 +0000 editors/vim, devel/luv: Use luajit-openresty as the Lua backend After a failed attempt a few months ago, re-enable luajit-openresty as the default luv backend, and the only neovim backend. I suspect that it's safe to switch luv unconditionally as well, but I'm taking a more conservative route at this time and just switching amd64 and i386 to it. NeoVim is designed specifically for luajit. While it runs on PUC lua, PUC is not used by upstream and no attempts are made to build for it. However, luajit is largely a stalled project and is unlikely to ever see new releases. The OpenResty fork, however, is actively-developed. It is also the standard neovim lua backend on macOS Homebrew and most Linux distributions. --- devel/luv/Makefile | 6 +++--- editors/neovim/Makefile | 26 +++++--------------------- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/devel/luv/Makefile b/devel/luv/Makefile index cba39bbd4659..b3d932b7c892 100644 --- a/devel/luv/Makefile +++ b/devel/luv/Makefile @@ -1,6 +1,6 @@ PORTNAME= luv DISTVERSION= 1.41.0-0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MAINTAINER= checo1705@secmail.pro @@ -30,8 +30,8 @@ OPTIONS_DEFAULT_powerpc64le= LUAJIT 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_amd64= libluajit-5.1.so:lang/luajit-openresty +LUAJIT_LIB_DEPENDS_i386= libluajit-5.1.so:lang/luajit-openresty 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 diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile index c90474274515..d76e26b504f8 100644 --- a/editors/neovim/Makefile +++ b/editors/neovim/Makefile @@ -3,6 +3,7 @@ PORTNAME= neovim DISTVERSIONPREFIX= v DISTVERSION= 0.6.1 +PORTREVISION= 1 CATEGORIES= editors MAINTAINER= adamw@FreeBSD.org @@ -13,19 +14,16 @@ 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 \ libunibilium.so:devel/unibilium \ libuv.so:devel/libuv \ libvterm.so:devel/libvterm -TEST_DEPENDS= autoconf>=0:devel/autoconf \ - aclocal:devel/automake \ - gmake:devel/gmake \ - libtool:devel/libtool -USES= cmake cpe iconv pathfix pkgconfig +USES= cmake cpe iconv lua:52,build pathfix pkgconfig USE_GITHUB= yes GH_TUPLE= libmpack:libmpack:1.0.5:libmpack \ libmpack:libmpack-lua:1.0.7:libmpack_lua @@ -38,21 +36,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 (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:52,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} @@ -60,10 +48,6 @@ PYNVIM_USES= python:run .include -.if ${ARCH:Mpowerpc64*} -LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty -.endif - .if ${ARCH} == powerpc64 USES+= compiler:gcc-c++11-lib .endif