From nobody Sat May 25 21:44:55 2024 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 4VmwRr1wLlz5LjF2; Sat, 25 May 2024 21:44:56 +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 4VmwRr0f1vz40rn; Sat, 25 May 2024 21:44:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716673496; 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=fboqsK5BMd5pa3asbPjH5adtD4VTzUUAyPs9VhvIHfY=; b=OSgtm7ZGWxmrhHfmpHnvKtITl903OuQnufm8ZsXdrn0WusAZBTcRQl+cvef83hdTZ0tzmM 2EMrYfPAyakkjGTav8/rTIE1YpQCSoY2QrRkrc1oPjvWOdKBYxBUqlFb07UUUUuJxoKBT4 eHXLrRh8JdgyCQsENP4YbcT2rGrEmCB/nw0isrxihS9XMya+ompHJvEAmw+CTpxTMVANDJ k+gBS6/psv0o5lzvmyUs9o2drUsHfJZHU+OeSk3M3+mTrTKLH3WfT+mPHaM2gU9OTG/YVQ egJExjxKe1LngCveXvu+twLPpzNIGtuALa1tFUHL4gpzZYtVAm+2Mf6kti1VLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716673496; a=rsa-sha256; cv=none; b=d1UAhLKi5uMJFFI04EBjLwLxsS4/kP2/1lhVuYkkhmUIv8arLfyEW+UFzLXSGIgMLGUYt9 wU6bRG2nle8sRj8dzdgD7hRBbNQHlUwYIWhL86h9xI+PqJSxoh63mjmJqYJ3nChkqAzdIP EPcedjXUXZVm4IgLH9894uw0UOM6Tyjivee1UeSt4yhFEhTf/Iu0SCHj+FgJDn7xpg3ou+ oe1HJy5iSuYMNOLYRCyG12RF6D4bN+tnQrgrMUqXyqo7HQkPjI7150Z+qHb0amug72AwzN d6bBgqv58oOegf+xm/OPm/aCg0la/jWyqy8hp6A8caeF8mCu+EOvLb5LVICFyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716673496; 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=fboqsK5BMd5pa3asbPjH5adtD4VTzUUAyPs9VhvIHfY=; b=GRYrXntKFkCYqQcRHHDaE08LIPHuttksjpvtSDb0ylo4cYILSGacx6w+LeMZUI6JPHsKHH YU8stRbho4w4sIaqF6R5QNg4lXgzgrLX3BvUZ9W4d+1C/yPWBiSxojw2/0mMoeEemfXx20 SDFU1nK+eEgbT0Xi68hm2H1JiOFsRiZP3khfb1s03FxRVOtvfXW1aiaHfw5U7AlZbg67Mq 1AhgWHAWutfpqSBoS2IUPO6EkHZx3sxgAO+zr63QaCgPBF3UmGHGfgcl1RYCSSQSXuUFxy EC3//cQ6696HlKuYdl+BBE0KmzBWOZszqN9oVK/nVYwMf/o7d/QoAVkLAGCFZg== 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 4VmwRq5xQLzYr5; Sat, 25 May 2024 21:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44PLitQZ066195; Sat, 25 May 2024 21:44:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44PLitvg066192; Sat, 25 May 2024 21:44:55 GMT (envelope-from git) Date: Sat, 25 May 2024 21:44:55 GMT Message-Id: <202405252144.44PLitvg066192@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: 92df04ca7d17 - main - editors/neovim: Include tree-sitter parsers 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 92df04ca7d17b7083d05f5305b4b9f7088a66a91 Auto-Submitted: auto-generated The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=92df04ca7d17b7083d05f5305b4b9f7088a66a91 commit 92df04ca7d17b7083d05f5305b4b9f7088a66a91 Author: Adam Weinberger AuthorDate: 2024-05-25 21:39:53 +0000 Commit: Adam Weinberger CommitDate: 2024-05-25 21:39:53 +0000 editors/neovim: Include tree-sitter parsers Neovim now expects a number of tree-sitter parsers to be included in a base installation, but they must be fetched, built, and installed separately. Without the parsers, things like `:help [...]` produces warnings but still technically works. PR: 279293 Submitted by: Laurent Chardon --- editors/neovim/Makefile | 43 +++++++++++++++++++++++++++++++++++-------- editors/neovim/distinfo | 22 +++++++++++++++++----- editors/neovim/pkg-plist | 10 +++++++++- 3 files changed, 61 insertions(+), 14 deletions(-) diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile index 8664aa3ee4eb..303fb63b9ffd 100644 --- a/editors/neovim/Makefile +++ b/editors/neovim/Makefile @@ -1,7 +1,7 @@ PORTNAME= neovim DISTVERSIONPREFIX= v DISTVERSION= 0.10.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MAINTAINER= adamw@FreeBSD.org @@ -10,29 +10,35 @@ WWW= https://neovim.io/ LICENSE= APACHE20 -BUILD_DEPENDS= gperf:devel/gperf \ - ${LUA_REFMODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} \ +BUILD_DEPENDS= ${LUA_REFMODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} \ + ${LUA_REFMODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR} +RUN_DEPENDS= ${LUA_REFMODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} \ ${LUA_REFMODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR} LIB_DEPENDS= libluv.so:devel/luv \ libmsgpack-c.so:devel/msgpack-c \ - libtermkey.so:devel/libtermkey \ libtree-sitter.so:devel/tree-sitter \ libunibilium.so:devel/unibilium \ libuv.so:devel/libuv \ libvterm.so:devel/libvterm -RUN_DEPENDS= ${LUA_REFMODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} \ - ${LUA_REFMODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR} USES= cmake cpe gettext iconv lua:51,build luajit \ pathfix pkgconfig + USE_GITHUB= yes -GH_TUPLE= libmpack:libmpack:1.0.5:libmpack \ - libmpack:libmpack-lua:1.0.12:libmpack_lua +GH_TUPLE= tree-sitter:tree-sitter-c:v0.21.0:treesitter_c \ + neovim:tree-sitter-vim:v0.4.0:treesitter_vim \ + neovim:tree-sitter-vimdoc:v2.5.1:treesitter_vimdoc \ + tree-sitter-grammars:tree-sitter-query:v0.3.0:treesitter_query \ + tree-sitter:tree-sitter-python:v0.21.0:treesitter_python \ + tree-sitter:tree-sitter-bash:v0.21.0:treesitter_bash \ + MDeiml:tree-sitter-markdown:v0.2.3:treesitter_markdown \ + tree-sitter-grammars:tree-sitter-lua:v0.1.0:treesitter_lua CMAKE_ARGS= -DLUA_PRG:FILEPATH="${LUA_CMD}" \ -DCMAKE_INSTALL_MANDIR:PATH="${PREFIX}/share/man" \ -DDEPS_PREFIX:PATH="${LOCALBASE}" \ -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib/lua/${LUA_VER}" + CFLAGS+= -I${LOCALBASE}/include DATADIR= ${PREFIX}/share/nvim @@ -49,4 +55,25 @@ NLS_CMAKE_BOOL= ENABLE_LIBINTL PYNVIM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pynvim>=0.3.0:editors/py-pynvim@${PY_FLAVOR} PYNVIM_USES= python:run +post-configure: + ${MKDIR} ${BUILD_WRKSRC}/.deps/build/src + ${MV} ${WRKSRC_treesitter_c} ${BUILD_WRKSRC}/.deps/build/src/treesitter_c + ${MV} ${WRKSRC_treesitter_vim} ${BUILD_WRKSRC}/.deps/build/src/treesitter_vim + ${MV} ${WRKSRC_treesitter_vimdoc} ${BUILD_WRKSRC}/.deps/build/src/treesitter_vimdoc + ${MV} ${WRKSRC_treesitter_query} ${BUILD_WRKSRC}/.deps/build/src/treesitter_query + ${MV} ${WRKSRC_treesitter_python} ${BUILD_WRKSRC}/.deps/build/src/treesitter_python + ${MV} ${WRKSRC_treesitter_bash} ${BUILD_WRKSRC}/.deps/build/src/treesitter_bash + ${MV} ${WRKSRC_treesitter_markdown} ${BUILD_WRKSRC}/.deps/build/src/treesitter_markdown + ${MV} ${WRKSRC_treesitter_lua} ${BUILD_WRKSRC}/.deps/build/src/treesitter_lua + ${MAKE_ENV} ${CMAKE_BIN} -S ${WRKSRC}/cmake.deps -B ${BUILD_WRKSRC}/.deps ${CMAKE_ARGS} \ + -DUSE_BUNDLED:BOOL=OFF -DUSE_BUNDLED_TS_PARSERS:BOOL=ON \ + -DUSE_EXISTING_SRC_DIR:BOOL=ON + +post-build: + ${CMAKE_BIN} --build ${BUILD_WRKSRC}/.deps + +post-stage: + cd ${BUILD_WRKSRC}/.deps/usr/lib/nvim && ${COPYTREE_SHARE} parser ${STAGEDIR}${PREFIX}/lib/nvim + ${FIND} ${STAGEDIR}${PREFIX}/lib/nvim -name "*.so" -exec ${STRIP_CMD} {} + + .include diff --git a/editors/neovim/distinfo b/editors/neovim/distinfo index b420957ace97..9079c48dc993 100644 --- a/editors/neovim/distinfo +++ b/editors/neovim/distinfo @@ -1,7 +1,19 @@ -TIMESTAMP = 1716160663 +TIMESTAMP = 1716623992 SHA256 (neovim-neovim-v0.10.0_GH0.tar.gz) = 372ea2584b0ea2a5a765844d95206bda9e4a57eaa1a2412a9a0726bab750f828 SIZE (neovim-neovim-v0.10.0_GH0.tar.gz) = 12792034 -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.12_GH0.tar.gz) = 7c3f0a5fcd0d7c169fd7bc95978412628d8f59eb9da1d32cf3e8a864b741ec92 -SIZE (libmpack-libmpack-lua-1.0.12_GH0.tar.gz) = 16524 +SHA256 (tree-sitter-tree-sitter-c-v0.21.0_GH0.tar.gz) = 6f0f5d1b71cf8ffd8a37fb638c6022fa1245bd630150b538547d52128ce0ea7e +SIZE (tree-sitter-tree-sitter-c-v0.21.0_GH0.tar.gz) = 426566 +SHA256 (neovim-tree-sitter-vim-v0.4.0_GH0.tar.gz) = 9f856f8b4a10ab43348550fa2d3cb2846ae3d8e60f45887200549c051c66f9d5 +SIZE (neovim-tree-sitter-vim-v0.4.0_GH0.tar.gz) = 356704 +SHA256 (neovim-tree-sitter-vimdoc-v2.5.1_GH0.tar.gz) = 063645096504b21603585507c41c6d8718ff3c11b2150c5bfc31e8f3ee9afea3 +SIZE (neovim-tree-sitter-vimdoc-v2.5.1_GH0.tar.gz) = 57430 +SHA256 (tree-sitter-grammars-tree-sitter-query-v0.3.0_GH0.tar.gz) = f878ff37abcb83250e31a6569e997546f3dbab74dcb26683cb2d613f7568cfc0 +SIZE (tree-sitter-grammars-tree-sitter-query-v0.3.0_GH0.tar.gz) = 43274 +SHA256 (tree-sitter-tree-sitter-python-v0.21.0_GH0.tar.gz) = 720304a603271fa89e4430a14d6a81a023d6d7d1171b1533e49c0ab44f1e1c13 +SIZE (tree-sitter-tree-sitter-python-v0.21.0_GH0.tar.gz) = 275770 +SHA256 (tree-sitter-tree-sitter-bash-v0.21.0_GH0.tar.gz) = f0515efda839cfede851adb24ac154227fbc0dfb60c6c11595ecfa9087d43ceb +SIZE (tree-sitter-tree-sitter-bash-v0.21.0_GH0.tar.gz) = 557096 +SHA256 (MDeiml-tree-sitter-markdown-v0.2.3_GH0.tar.gz) = 4909d6023643f1afc3ab219585d4035b7403f3a17849782ab803c5f73c8a31d5 +SIZE (MDeiml-tree-sitter-markdown-v0.2.3_GH0.tar.gz) = 418293 +SHA256 (tree-sitter-grammars-tree-sitter-lua-v0.1.0_GH0.tar.gz) = 230cfcbfa74ed1f7b8149e9a1f34c2efc4c589a71fe0f5dc8560622f8020d722 +SIZE (tree-sitter-grammars-tree-sitter-lua-v0.1.0_GH0.tar.gz) = 56812 diff --git a/editors/neovim/pkg-plist b/editors/neovim/pkg-plist index 4a26bab98363..2caaf6126823 100644 --- a/editors/neovim/pkg-plist +++ b/editors/neovim/pkg-plist @@ -1,4 +1,13 @@ bin/nvim +lib/nvim/parser/bash.so +lib/nvim/parser/c.so +lib/nvim/parser/lua.so +lib/nvim/parser/markdown.so +lib/nvim/parser/markdown_inline.so +lib/nvim/parser/python.so +lib/nvim/parser/query.so +lib/nvim/parser/vim.so +lib/nvim/parser/vimdoc.so share/man/man1/nvim.1.gz share/applications/nvim.desktop share/icons/hicolor/128x128/apps/nvim.png @@ -32,4 +41,3 @@ share/icons/hicolor/128x128/apps/nvim.png %%NLS%%share/locale/vi/LC_MESSAGES/nvim.mo %%NLS%%share/locale/zh_CN.UTF-8/LC_MESSAGES/nvim.mo %%NLS%%share/locale/zh_TW.UTF-8/LC_MESSAGES/nvim.mo -@dir lib/nvim