pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

neovim: Sync with editors/neovim



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Wed May 22 22:52:37 2024 +0200
Changeset:	776383d6de9b87c557a986c2cf79e391e85bfc72

Modified Files:
	neovim/Makefile
	neovim/PLIST
	neovim/distinfo

Log Message:
neovim: Sync with editors/neovim

Intended to be used as a sandbox to prepare update for neovim-0.10.0.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=776383d6de9b87c557a986c2cf79e391e85bfc72

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 neovim/Makefile | 33 ++++++++++++++++-----------------
 neovim/PLIST    | 27 ++++++++++++---------------
 neovim/distinfo |  8 ++++----
 3 files changed, 32 insertions(+), 36 deletions(-)

diffs:
diff --git a/neovim/Makefile b/neovim/Makefile
index 366aaa2564..dca9ec1102 100644
--- a/neovim/Makefile
+++ b/neovim/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2023/04/25 23:36:19 nikita Exp $
+# $NetBSD: Makefile,v 1.9 2024/04/30 18:30:52 wiz Exp $
 
-DISTNAME=	neovim-0.10.0.fa1baa9
+DISTNAME=	neovim-0.9.5
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GITHUB:=neovim/}
-GITHUB_TAG=	fa1baa9a47cdb3eed17d48b6011a164d4009d2ee
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/neovim/neovim/
@@ -15,8 +16,18 @@ USE_TOOLS+=	pkg-config xgettext
 
 USE_LANGUAGES=	c c++
 
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_VARS+=	notdarwin
+.if ${SHLIB_TYPE} == "dylib"
+SHLIB_EXT=	dylib
+.else
+SHLIB_EXT=	so
+PLIST.notdarwin=	yes
+.endif
+
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+=	-DLIBVTERM_LIBRARY=${BUILDLINK_PREFIX.libvterm03}/lib/libvterm03/libvterm.so
+CMAKE_ARGS+=	-DLIBVTERM_LIBRARY=${BUILDLINK_PREFIX.libvterm03}/lib/libvterm03/libvterm.${SHLIB_EXT}
 CMAKE_ARGS+=	-DLIBVTERM_INCLUDE_DIR=${BUILDLINK_PREFIX.libvterm03}/include/libvterm03
 
 CONFIGURE_DIRS=		${WRKDIR}/build
@@ -28,7 +39,7 @@ LDFLAGS.SunOS+=		-lrt
 LUA_VERSIONS_ACCEPTED=	51
 
 # https://github.com/neovim/neovim/issues/223#issuecomment-374763255
-# FORTIFY_SUPPORTED=	no
+FORTIFY_SUPPORTED=	no
 
 .include "../../lang/lua/luaversion.mk"
 
@@ -38,22 +49,10 @@ DEPENDS+=	${LUA_PKGPREFIX}-luv-[0-9]*:../../devel/lua-luv
 DEPENDS+=	${LUA_PKGPREFIX}-inspect-[0-9]*:../../devel/lua-inspect
 DEPENDS+=	${LUA_PKGPREFIX}-filesystem-[0-9]*:../../devel/lua-filesystem
 DEPENDS+=	${LUA_PKGPREFIX}-BitOp-[0-9]*:../../devel/lua-BitOp
-TOOL_DEPENDS+=	patchelf-[0-9]*:../../devel/patchelf
 
 post-extract:
 	${MKDIR} ${WRKDIR}/build
 
-post-install:
-	# https://github.com/neovim/neovim/issues/23395
-	# lpeg ends up as full path in NEEDED, rpath part
-	# of it is missing.
-	# official fix seems to be to build a vendored lpeg.
-	${PREFIX}/bin/patchelf --replace-needed \
-		"${PREFIX}/lib/lua/5.1/lpeg.so" lpeg.so \
-		${DESTDIR}${PREFIX}/bin/nvim
-	${PREFIX}/bin/patchelf ${DESTDIR}${PREFIX}/bin/nvim \
-		--add-rpath ${PREFIX}/lib/lua/5.1
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/gperf/buildlink3.mk"
diff --git a/neovim/PLIST b/neovim/PLIST
index bd1df79642..b4d540c376 100644
--- a/neovim/PLIST
+++ b/neovim/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.5 2024/02/02 16:24:45 tm Exp $
 bin/nvim
 man/man1/nvim.1
-share/applications/nvim.desktop
+${PLIST.notdarwin}share/applications/nvim.desktop
 share/icons/hicolor/128x128/apps/nvim.png
 share/locale/af/LC_MESSAGES/nvim.mo
 share/locale/ca/LC_MESSAGES/nvim.mo
@@ -50,6 +50,7 @@ share/nvim/runtime/autoload/gnat.vim
 share/nvim/runtime/autoload/gzip.vim
 share/nvim/runtime/autoload/haskellcomplete.vim
 share/nvim/runtime/autoload/health.vim
+share/nvim/runtime/autoload/health/provider.vim
 share/nvim/runtime/autoload/htmlcomplete.vim
 share/nvim/runtime/autoload/javascriptcomplete.vim
 share/nvim/runtime/autoload/msgpack.vim
@@ -100,6 +101,7 @@ share/nvim/runtime/autoload/xmlcomplete.vim
 share/nvim/runtime/autoload/xmlformat.vim
 share/nvim/runtime/autoload/zig/fmt.vim
 share/nvim/runtime/autoload/zip.vim
+share/nvim/runtime/bugreport.vim
 share/nvim/runtime/colors/README.txt
 share/nvim/runtime/colors/blue.vim
 share/nvim/runtime/colors/darkblue.vim
@@ -117,14 +119,10 @@ share/nvim/runtime/colors/murphy.vim
 share/nvim/runtime/colors/pablo.vim
 share/nvim/runtime/colors/peachpuff.vim
 share/nvim/runtime/colors/quiet.vim
-share/nvim/runtime/colors/retrobox.vim
 share/nvim/runtime/colors/ron.vim
 share/nvim/runtime/colors/shine.vim
 share/nvim/runtime/colors/slate.vim
-share/nvim/runtime/colors/sorbet.vim
 share/nvim/runtime/colors/torte.vim
-share/nvim/runtime/colors/wildcharm.vim
-share/nvim/runtime/colors/zaibatsu.vim
 share/nvim/runtime/colors/zellner.vim
 share/nvim/runtime/compiler/README.txt
 share/nvim/runtime/compiler/ant.vim
@@ -273,6 +271,7 @@ share/nvim/runtime/doc/index.txt
 share/nvim/runtime/doc/insert.txt
 share/nvim/runtime/doc/intro.txt
 share/nvim/runtime/doc/job_control.txt
+share/nvim/runtime/doc/lsp-extension.txt
 share/nvim/runtime/doc/lsp.txt
 share/nvim/runtime/doc/lua-guide.txt
 share/nvim/runtime/doc/lua.txt
@@ -283,7 +282,6 @@ share/nvim/runtime/doc/mbyte.txt
 share/nvim/runtime/doc/message.txt
 share/nvim/runtime/doc/mlang.txt
 share/nvim/runtime/doc/motion.txt
-share/nvim/runtime/doc/news-0.9.txt
 share/nvim/runtime/doc/news.txt
 share/nvim/runtime/doc/nvim.txt
 share/nvim/runtime/doc/nvim_terminal_emulator.txt
@@ -416,6 +414,7 @@ share/nvim/runtime/ftplugin/css.lua
 share/nvim/runtime/ftplugin/css.vim
 share/nvim/runtime/ftplugin/cucumber.vim
 share/nvim/runtime/ftplugin/cvsrc.vim
+share/nvim/runtime/ftplugin/d.lua
 share/nvim/runtime/ftplugin/debchangelog.vim
 share/nvim/runtime/ftplugin/debcontrol.vim
 share/nvim/runtime/ftplugin/denyhosts.vim
@@ -501,7 +500,6 @@ share/nvim/runtime/ftplugin/libao.vim
 share/nvim/runtime/ftplugin/limits.vim
 share/nvim/runtime/ftplugin/liquid.vim
 share/nvim/runtime/ftplugin/lisp.vim
-share/nvim/runtime/ftplugin/livebook.vim
 share/nvim/runtime/ftplugin/logcheck.vim
 share/nvim/runtime/ftplugin/loginaccess.vim
 share/nvim/runtime/ftplugin/logindefs.vim
@@ -739,7 +737,6 @@ share/nvim/runtime/indent/less.vim
 share/nvim/runtime/indent/lifelines.vim
 share/nvim/runtime/indent/liquid.vim
 share/nvim/runtime/indent/lisp.vim
-share/nvim/runtime/indent/livebook.vim
 share/nvim/runtime/indent/logtalk.vim
 share/nvim/runtime/indent/lua.vim
 share/nvim/runtime/indent/mail.vim
@@ -930,12 +927,11 @@ share/nvim/runtime/lua/_vim9script.lua
 share/nvim/runtime/lua/editorconfig.lua
 share/nvim/runtime/lua/man.lua
 share/nvim/runtime/lua/nvim/health.lua
-share/nvim/runtime/lua/provider/health.lua
 share/nvim/runtime/lua/vim/F.lua
 share/nvim/runtime/lua/vim/_editor.lua
 share/nvim/runtime/lua/vim/_init_packages.lua
 share/nvim/runtime/lua/vim/_inspector.lua
-share/nvim/runtime/lua/vim/_meta.lua
+share/nvim/runtime/lua/vim/_options.lua
 share/nvim/runtime/lua/vim/_watch.lua
 share/nvim/runtime/lua/vim/diagnostic.lua
 share/nvim/runtime/lua/vim/filetype.lua
@@ -945,7 +941,6 @@ share/nvim/runtime/lua/vim/fs.lua
 share/nvim/runtime/lua/vim/health.lua
 share/nvim/runtime/lua/vim/highlight.lua
 share/nvim/runtime/lua/vim/inspect.lua
-share/nvim/runtime/lua/vim/iter.lua
 share/nvim/runtime/lua/vim/keymap.lua
 share/nvim/runtime/lua/vim/loader.lua
 share/nvim/runtime/lua/vim/lsp.lua
@@ -964,13 +959,11 @@ share/nvim/runtime/lua/vim/lsp/sync.lua
 share/nvim/runtime/lua/vim/lsp/tagfunc.lua
 share/nvim/runtime/lua/vim/lsp/types.lua
 share/nvim/runtime/lua/vim/lsp/util.lua
-share/nvim/runtime/lua/vim/re.lua
 share/nvim/runtime/lua/vim/secure.lua
 share/nvim/runtime/lua/vim/shared.lua
 share/nvim/runtime/lua/vim/treesitter.lua
 share/nvim/runtime/lua/vim/treesitter/_fold.lua
 share/nvim/runtime/lua/vim/treesitter/_meta.lua
-share/nvim/runtime/lua/vim/treesitter/_query_linter.lua
 share/nvim/runtime/lua/vim/treesitter/_range.lua
 share/nvim/runtime/lua/vim/treesitter/health.lua
 share/nvim/runtime/lua/vim/treesitter/highlighter.lua
@@ -1004,8 +997,13 @@ share/nvim/runtime/pack/dist/opt/matchit/plugin/matchit.vim
 share/nvim/runtime/pack/dist/opt/shellmenu/plugin/shellmenu.vim
 share/nvim/runtime/pack/dist/opt/swapmouse/plugin/swapmouse.vim
 share/nvim/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+share/nvim/runtime/pack/dist/opt/vimball/autoload/vimball.vim
+share/nvim/runtime/pack/dist/opt/vimball/doc/tags
+share/nvim/runtime/pack/dist/opt/vimball/doc/vimball.txt
+share/nvim/runtime/pack/dist/opt/vimball/plugin/vimballPlugin.vim
 share/nvim/runtime/plugin/editorconfig.lua
 share/nvim/runtime/plugin/gzip.vim
+share/nvim/runtime/plugin/health.vim
 share/nvim/runtime/plugin/man.lua
 share/nvim/runtime/plugin/matchit.vim
 share/nvim/runtime/plugin/matchparen.vim
@@ -1344,7 +1342,6 @@ share/nvim/runtime/syntax/liquid.vim
 share/nvim/runtime/syntax/lisp.vim
 share/nvim/runtime/syntax/lite.vim
 share/nvim/runtime/syntax/litestep.vim
-share/nvim/runtime/syntax/livebook.vim
 share/nvim/runtime/syntax/loginaccess.vim
 share/nvim/runtime/syntax/logindefs.vim
 share/nvim/runtime/syntax/logtalk.vim
diff --git a/neovim/distinfo b/neovim/distinfo
index bfa63fdc6f..0507011a9c 100644
--- a/neovim/distinfo
+++ b/neovim/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2023/04/25 23:36:19 nikita Exp $
+$NetBSD: distinfo,v 1.7 2024/02/02 16:24:45 tm Exp $
 
-BLAKE2s (neovim-0.10.0.fa1baa9-fa1baa9a47cdb3eed17d48b6011a164d4009d2ee.tar.gz) = 9f6d57e6534ffa26924651c0e984db3fe0662bf077b5b2648fe92e3b27c5371f
-SHA512 (neovim-0.10.0.fa1baa9-fa1baa9a47cdb3eed17d48b6011a164d4009d2ee.tar.gz) = 4875508833b5bb93c26135ddf2e650c38bd1642852e85c3f4e27a7f82482333103ba11d585f2633efa8df2b7081d86e3a4e82579126538598082b011bc9bc032
-Size (neovim-0.10.0.fa1baa9-fa1baa9a47cdb3eed17d48b6011a164d4009d2ee.tar.gz) = 11655056 bytes
+BLAKE2s (neovim-0.9.5.tar.gz) = 9e81c35d888ff72462d9d8c4b0737b58d031f04a5ba247f44fcb0fe5b496ccfb
+SHA512 (neovim-0.9.5.tar.gz) = 6e20d0a1d506dc292dd68dabe4b5635f86c019ca832f9927e907377e6d21fe7765b3010f5bba644bb2d7a76c178d55b290af24856a7e3c4083a1aa60bc496775
+Size (neovim-0.9.5.tar.gz) = 11590180 bytes


Home | Main Index | Thread Index | Old Index