pkgsrc-Users archive

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

Re: Re: wip/neovim update and luajit



Hi Leonardo,

CC'ing pkgsrc-users@ for the record and in case someone else wants to
take care of this.

On Thu, May 23, 2024 at 11:12:15AM +0200, Leonardo Taccari wrote:
> Malte Dehling writes:
> > I just saw your changes to wip/neovim and the remarks in TODO.  I
> > updated wip/neovim-git and the required dependencies in wip a couple of
> > weeks ago - maybe it is helpful.
> >
> > The main issue I see is that neovim v0.10.0 requires LuaJIT v2.1 and we
> > only have a (very) old version of luaJIT v2.0 in pkgsrc.  As far as I
> > can tell, the only thing an update to v2.1 would break is support for
> > i386 without SSE2.  I wrote a message about this a few weeks ago:
> >
> > https://mail-index.netbsd.org/pkgsrc-users/2024/04/03/msg039279.html
> > [...]
>
> Oh, wow, that's great! Thank you very much!
> I am interested in newer LuaJIT2 also for aarch64.
>
> I hope to give a look this weekend and help if I can!

I had another look at what it would take to update lang/LuaJIT2 to
v2.1.x and it seems pretty simple, *if* we're okay with the SSE2
requirement on i386.  I've attached diffs for proposed updates in that
case.

These packages depend on luajit (ok means builds without changes):

devel/lua-ljsyscall     # ok
net/snort               # ok
sysutils/xplr           # ok

www/lua-resty-core      # patch attached
www/lua-resty-lrucache  # patch attached

These packages prefer luajit if supported but fall back on regular lua
on other platforms:

editors/neovim          # update to v0.10.0 attached
multimedia/obs-studio   # ok

And these ones have a luajit option:

devel/py-lupa           # ok
editors/vim*            # ok
games/love11            # ok
games/solarus           # not yet tested
games/love09            # patch attached
games/love010           # patch attached
www/luakit              # not yet tested
www/nginx               # patch attached
www/nginx-devel         # patch attached

Hope this helps!

Cheers,
-- 
Malte Dehling
Index: lang/LuaJIT2/DESCR
===================================================================
RCS file: /cvsroot/pkgsrc/lang/LuaJIT2/DESCR,v
retrieving revision 1.2
diff -u -r1.2 DESCR
--- lang/LuaJIT2/DESCR	31 Oct 2015 21:37:52 -0000	1.2
+++ lang/LuaJIT2/DESCR	24 May 2024 02:18:35 -0000
@@ -2,4 +2,4 @@
 Lua is a powerful, dynamic and light-weight programming language. It may
 be embedded or used as a general-purpose, stand-alone language.
 
-LuaJIT 2.0 is compatible with Lua 5.1.
+LuaJIT 2.1 is compatible with Lua 5.1.
Index: lang/LuaJIT2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/LuaJIT2/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- lang/LuaJIT2/Makefile	6 Nov 2020 12:15:53 -0000	1.16
+++ lang/LuaJIT2/Makefile	24 May 2024 02:18:35 -0000
@@ -1,28 +1,27 @@
-# $NetBSD: Makefile,v 1.16 2020/11/06 12:15:53 nia Exp $
-#
+# $NetBSD$
 
-DISTNAME=	LuaJIT-2.0.5
+DISTNAME=	LuaJIT-2.1.1713773202	# see .relver
 PKGNAME=	${DISTNAME:S/LuaJIT/LuaJIT2/}
-PKGREVISION=	2
 CATEGORIES=	lang lua
-MASTER_SITES=	http://luajit.org/download/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=LuaJIT/}
+GITHUB_PROJECT=	LuaJIT
+GITHUB_TAG=	5790d253972c9d78a0c2aece527eda5b134bbbf7
 
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=	mdehling%gmail.com@localhost
 HOMEPAGE=	https://luajit.org/
 COMMENT=	Just-In-Time Compiler for the Lua programming language
 LICENSE=	mit
 
 USE_TOOLS+=	gmake
 
-# LuaJIT 2.1.0 will support mips64 and aarch64.
-ONLY_FOR_PLATFORM+=	*-*-*arm*
-ONLY_FOR_PLATFORM+=	*-*-i386
-ONLY_FOR_PLATFORM+=	*-*-mipseb
-ONLY_FOR_PLATFORM+=	*-*-mipsel
+ONLY_FOR_PLATFORM+=	*-*-aarch64*
+ONLY_FOR_PLATFORM+=	*-*-*arm*	# ARMv5+, ARM9E+
+ONLY_FOR_PLATFORM+=	*-*-i386	# req SSE2
+ONLY_FOR_PLATFORM+=	*-*-mips*
 ONLY_FOR_PLATFORM+=	*-*-powerpc
 ONLY_FOR_PLATFORM+=	*-*-x86_64
 
-# Address pkg/47587 lua not linked to pthread causes issues with modules
+# pkg/47587: lua not linked to pthread causes issues with modules
 PTHREAD_OPTS+=		native
 PTHREAD_AUTO_VARS=	yes
 
Index: lang/LuaJIT2/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/lang/LuaJIT2/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- lang/LuaJIT2/PLIST	21 Jun 2016 16:40:10 -0000	1.3
+++ lang/LuaJIT2/PLIST	24 May 2024 02:18:35 -0000
@@ -1,28 +1,36 @@
-@comment $NetBSD: PLIST,v 1.3 2016/06/21 16:40:10 fhajny Exp $
+@comment $NetBSD$
 bin/luajit
 bin/luajit-${PKGVERSION}
-include/luajit-2.0/lauxlib.h
-include/luajit-2.0/lua.h
-include/luajit-2.0/lua.hpp
-include/luajit-2.0/luaconf.h
-include/luajit-2.0/luajit.h
-include/luajit-2.0/lualib.h
+include/luajit-2.1/lauxlib.h
+include/luajit-2.1/lua.h
+include/luajit-2.1/lua.hpp
+include/luajit-2.1/luaconf.h
+include/luajit-2.1/luajit.h
+include/luajit-2.1/lualib.h
 lib/libluajit-5.1.a
 ${PLIST.shared}lib/libluajit-5.1.so
 ${PLIST.shared}lib/libluajit-5.1.so.2
 ${PLIST.shared}lib/libluajit-5.1.so.${PKGVERSION}
 lib/pkgconfig/luajit.pc
-share/luajit-${PKGVERSION}/jit/bc.lua
-share/luajit-${PKGVERSION}/jit/bcsave.lua
-share/luajit-${PKGVERSION}/jit/dis_arm.lua
-share/luajit-${PKGVERSION}/jit/dis_mips.lua
-share/luajit-${PKGVERSION}/jit/dis_mipsel.lua
-share/luajit-${PKGVERSION}/jit/dis_ppc.lua
-share/luajit-${PKGVERSION}/jit/dis_x64.lua
-share/luajit-${PKGVERSION}/jit/dis_x86.lua
-share/luajit-${PKGVERSION}/jit/dump.lua
-share/luajit-${PKGVERSION}/jit/v.lua
-share/luajit-${PKGVERSION}/jit/vmdef.lua
 man/man1/luajit.1
+share/luajit-2.1/jit/bc.lua
+share/luajit-2.1/jit/bcsave.lua
+share/luajit-2.1/jit/dis_arm.lua
+share/luajit-2.1/jit/dis_arm64.lua
+share/luajit-2.1/jit/dis_arm64be.lua
+share/luajit-2.1/jit/dis_mips.lua
+share/luajit-2.1/jit/dis_mips64.lua
+share/luajit-2.1/jit/dis_mips64el.lua
+share/luajit-2.1/jit/dis_mips64r6.lua
+share/luajit-2.1/jit/dis_mips64r6el.lua
+share/luajit-2.1/jit/dis_mipsel.lua
+share/luajit-2.1/jit/dis_ppc.lua
+share/luajit-2.1/jit/dis_x64.lua
+share/luajit-2.1/jit/dis_x86.lua
+share/luajit-2.1/jit/dump.lua
+share/luajit-2.1/jit/p.lua
+share/luajit-2.1/jit/v.lua
+share/luajit-2.1/jit/vmdef.lua
+share/luajit-2.1/jit/zone.lua
 @pkgdir share/lua/5.1
 @pkgdir lib/lua/5.1
Index: lang/LuaJIT2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/LuaJIT2/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- lang/LuaJIT2/buildlink3.mk	26 Mar 2014 13:29:53 -0000	1.1
+++ lang/LuaJIT2/buildlink3.mk	24 May 2024 02:18:35 -0000
@@ -1,12 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/03/26 13:29:53 imil Exp $
+# $NetBSD$
 
 BUILDLINK_TREE+=	LuaJIT2
 
 .if !defined(LUAJIT2_BUILDLINK3_MK)
 LUAJIT2_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.LuaJIT2+=	LuaJIT2>=2.0.3
-BUILDLINK_PKGSRCDIR.LuaJIT2?=	../../lang/LuaJIT2
+BUILDLINK_API_DEPENDS.LuaJIT2+=		LuaJIT2>=2.1
+BUILDLINK_PKGSRCDIR.LuaJIT2?=		../../lang/LuaJIT2
+BUILDLINK_INCDIRS.LuaJIT2+=		include/luajit-2.1
+
 .endif	# LUAJIT2_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-LuaJIT2
Index: lang/LuaJIT2/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/LuaJIT2/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- lang/LuaJIT2/distinfo	26 Oct 2021 10:51:29 -0000	1.13
+++ lang/LuaJIT2/distinfo	24 May 2024 02:18:35 -0000
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 10:51:29 nia Exp $
+$NetBSD$
 
-BLAKE2s (LuaJIT-2.0.5.tar.gz) = 54f7b86f27f588160895a8e076bb11d63eb60bdad87c9e573d627ae03ea5319d
-SHA512 (LuaJIT-2.0.5.tar.gz) = 2636675602b4a060b0571c05220db2061dd2f38568e35b2be346a0f5e3128d87057d11d3d0d7567d8cc4e0817b5e4cf2c52a17a48065520962b157816465a9fe
-Size (LuaJIT-2.0.5.tar.gz) = 849845 bytes
-SHA1 (patch-Makefile) = edea30d017c9d2938d951bfdee88020906945aee
-SHA1 (patch-src_Makefile) = d7236260dc17f470d7d6e41a57a22dcd3a501c28
-SHA1 (patch-src_lj__arch.h) = 4c34706db4c678b368bb3e38b07505abde01e590
-SHA1 (patch-src_lj__ccallback.c) = 8032bc451a504ae9538fb0ae4cc1ee729ede3a70
-SHA1 (patch-src_lj__mcode.c) = c150e0b07ab441e983ace21e0e813fd4334290b5
+BLAKE2s (LuaJIT-2.1.1713773202-5790d253972c9d78a0c2aece527eda5b134bbbf7.tar.gz) = dd16b550d8657a6e598e09a3180ffb6d51096b066ff3888551dd0b0815c6ed50
+SHA512 (LuaJIT-2.1.1713773202-5790d253972c9d78a0c2aece527eda5b134bbbf7.tar.gz) = 790c22d32424b7d7c79ebcd70485bc40ed6256b0bcc2a3591df90f471ff9935f33c32a86c239cd087b20580bbe7634d5a81bf9bb0cf32a66dd37339f5e9a8b4d
+Size (LuaJIT-2.1.1713773202-5790d253972c9d78a0c2aece527eda5b134bbbf7.tar.gz) = 1081581 bytes
+SHA1 (patch-Makefile) = 95218d5d1cffe5149eef6308486a189874667485
+SHA1 (patch-src_Makefile) = 68f9ce9e42070b0f24ddf35ced92c22746d8d206
Index: lang/LuaJIT2/platform.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/LuaJIT2/platform.mk,v
retrieving revision 1.1
diff -u -r1.1 platform.mk
--- lang/LuaJIT2/platform.mk	24 Jun 2020 11:16:00 -0000	1.1
+++ lang/LuaJIT2/platform.mk	24 May 2024 02:18:35 -0000
@@ -1,18 +1,18 @@
-# $NetBSD: platform.mk,v 1.1 2020/06/24 11:16:00 nia Exp $
+# $NetBSD$
 
 .include "../../mk/bsd.fast.prefs.mk"
 
 .if !defined(PLATFORM_SUPPORTS_LUAJIT)
 
-.  for _luajit_arch in *arm* i386 mipseb mipsel powerpc x86_64
-LUAJIT_PLATFORMS+=		*-*-${_luajit_arch}
+.  for luajit_arch in aarch64* *arm* i386 mips* powerpc x86_64
+LUAJIT_PLATFORMS+=		*-*-${luajit_arch}
 .  endfor
 
-.  for _luajit_platform in ${LUAJIT_PLATFORMS}
-.    if !empty(MACHINE_PLATFORM:M${_luajit_platform})
+.  for luajit_platform in ${LUAJIT_PLATFORMS}
+.    if !empty(MACHINE_PLATFORM:M${luajit_platform})
 PLATFORM_SUPPORTS_LUAJIT=	yes
 .    endif
 .  endfor
 PLATFORM_SUPPORTS_LUAJIT?=	no
 
-.endif # !defined(PLATFORM_SUPPORTS_LUAJIT)
+.endif	# !defined(PLATFORM_SUPPORTS_LUAJIT)
Index: lang/LuaJIT2/patches/patch-Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/LuaJIT2/patches/patch-Makefile,v
retrieving revision 1.6
diff -u -r1.6 patch-Makefile
--- lang/LuaJIT2/patches/patch-Makefile	29 May 2017 21:47:31 -0000	1.6
+++ lang/LuaJIT2/patches/patch-Makefile	24 May 2024 02:18:35 -0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile,v 1.6 2017/05/29 21:47:31 alnsn Exp $
+$NetBSD$
 
-Fix installation.
+fix install paths
 
---- Makefile.orig	2017-05-01 18:11:00.000000000 +0000
+--- Makefile.orig	2024-03-10 16:29:48.000000000 +0000
 +++ Makefile
-@@ -24,7 +24,6 @@ ABIVER=  5.1
+@@ -30,7 +30,6 @@ VERSION= $(MMVERSION).$(RELVER)
  # Change the installation path as needed. This automatically adjusts
  # the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path!
  #
@@ -12,21 +12,12 @@
  export MULTILIB= lib
  ##############################################################################
  
-@@ -40,7 +39,7 @@ INSTALL_LMODD= $(INSTALL_SHARE)/lua
+@@ -47,7 +46,7 @@ INSTALL_LMODD= $(INSTALL_SHARE)/lua
  INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
  INSTALL_CMODD= $(INSTALL_LIB)/lua
  INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER)
 -INSTALL_MAN= $(INSTALL_SHARE)/man/man1
-+INSTALL_MAN= $(DPREFIX)/${PKGMANDIR}/man1
++INSTALL_MAN= $(DPREFIX)/$(PKGMANDIR)/man1
  INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
  
  INSTALL_TNAME= luajit-$(VERSION)
-@@ -74,7 +73,7 @@ SYMLINK= ln -sf
- INSTALL_X= install -m 0755
- INSTALL_F= install -m 0644
- UNINSTALL= $(RM)
--LDCONFIG= ldconfig -n
-+LDCONFIG= true
- SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \
-             -e "s|^multilib=.*|multilib=$(MULTILIB)|"
- 
Index: lang/LuaJIT2/patches/patch-src_Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/LuaJIT2/patches/patch-src_Makefile,v
retrieving revision 1.2
diff -u -r1.2 patch-src_Makefile
--- lang/LuaJIT2/patches/patch-src_Makefile	29 May 2017 21:47:31 -0000	1.2
+++ lang/LuaJIT2/patches/patch-src_Makefile	24 May 2024 02:18:35 -0000
@@ -1,16 +1,16 @@
-$NetBSD: patch-src_Makefile,v 1.2 2017/05/29 21:47:31 alnsn Exp $
+$NetBSD$
 
-Fix building on OS X.
+fix building on darwin
 
---- src/Makefile.orig	2017-05-01 18:11:00.000000000 +0000
+--- src/Makefile.orig	2024-04-04 18:11:30.456080960 +0000
 +++ src/Makefile
-@@ -297,9 +297,6 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null
+@@ -315,9 +315,6 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null
    TARGET_XCFLAGS+= -fno-stack-protector
  endif
  ifeq (Darwin,$(TARGET_SYS))
 -  ifeq (,$(MACOSX_DEPLOYMENT_TARGET))
--    export MACOSX_DEPLOYMENT_TARGET=10.4
+-    $(error missing: export MACOSX_DEPLOYMENT_TARGET=XX.YY)
 -  endif
    TARGET_STRIP+= -x
+   TARGET_XCFLAGS+= -DLUAJIT_UNWIND_EXTERNAL
    TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
-   TARGET_DYNXLDOPTS=
Index: www/lua-resty-core/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/lua-resty-core/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- www/lua-resty-core/Makefile	3 Jul 2023 05:40:59 -0000	1.2
+++ www/lua-resty-core/Makefile	24 May 2024 02:19:00 -0000
@@ -12,8 +12,8 @@
 
 USE_LANGUAGES=	# none
 
-MAKE_ENV+=	LUA_INCLUDE_DIR=${PREFIX}/include/luajit-2.0
-MAKE_ENV+=	LUA_LIB_DIR=${PREFIX}/share/luajit-2.0.5
+MAKE_ENV+=	LUA_INCLUDE_DIR=${PREFIX}/include/luajit-2.1
+MAKE_ENV+=	LUA_LIB_DIR=${PREFIX}/share/luajit-2.1
 
 .include "../../lang/LuaJIT2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: www/lua-resty-core/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/www/lua-resty-core/PLIST,v
retrieving revision 1.1
diff -u -r1.1 PLIST
--- www/lua-resty-core/PLIST	29 Mar 2023 08:29:08 -0000	1.1
+++ www/lua-resty-core/PLIST	24 May 2024 02:19:00 -0000
@@ -1,35 +1,35 @@
-@comment $NetBSD: PLIST,v 1.1 2023/03/29 08:29:08 adam Exp $
-share/luajit-2.0.5/ngx/balancer.lua
-share/luajit-2.0.5/ngx/base64.lua
-share/luajit-2.0.5/ngx/errlog.lua
-share/luajit-2.0.5/ngx/ocsp.lua
-share/luajit-2.0.5/ngx/pipe.lua
-share/luajit-2.0.5/ngx/process.lua
-share/luajit-2.0.5/ngx/re.lua
-share/luajit-2.0.5/ngx/req.lua
-share/luajit-2.0.5/ngx/resp.lua
-share/luajit-2.0.5/ngx/semaphore.lua
-share/luajit-2.0.5/ngx/ssl.lua
-share/luajit-2.0.5/ngx/ssl/clienthello.lua
-share/luajit-2.0.5/ngx/ssl/session.lua
-share/luajit-2.0.5/resty/core.lua
-share/luajit-2.0.5/resty/core/base.lua
-share/luajit-2.0.5/resty/core/base64.lua
-share/luajit-2.0.5/resty/core/coroutine.lua
-share/luajit-2.0.5/resty/core/ctx.lua
-share/luajit-2.0.5/resty/core/exit.lua
-share/luajit-2.0.5/resty/core/hash.lua
-share/luajit-2.0.5/resty/core/misc.lua
-share/luajit-2.0.5/resty/core/ndk.lua
-share/luajit-2.0.5/resty/core/param.lua
-share/luajit-2.0.5/resty/core/phase.lua
-share/luajit-2.0.5/resty/core/regex.lua
-share/luajit-2.0.5/resty/core/request.lua
-share/luajit-2.0.5/resty/core/response.lua
-share/luajit-2.0.5/resty/core/shdict.lua
-share/luajit-2.0.5/resty/core/socket.lua
-share/luajit-2.0.5/resty/core/time.lua
-share/luajit-2.0.5/resty/core/uri.lua
-share/luajit-2.0.5/resty/core/utils.lua
-share/luajit-2.0.5/resty/core/var.lua
-share/luajit-2.0.5/resty/core/worker.lua
+@comment $NetBSD$
+share/luajit-2.1/ngx/balancer.lua
+share/luajit-2.1/ngx/base64.lua
+share/luajit-2.1/ngx/errlog.lua
+share/luajit-2.1/ngx/ocsp.lua
+share/luajit-2.1/ngx/pipe.lua
+share/luajit-2.1/ngx/process.lua
+share/luajit-2.1/ngx/re.lua
+share/luajit-2.1/ngx/req.lua
+share/luajit-2.1/ngx/resp.lua
+share/luajit-2.1/ngx/semaphore.lua
+share/luajit-2.1/ngx/ssl.lua
+share/luajit-2.1/ngx/ssl/clienthello.lua
+share/luajit-2.1/ngx/ssl/session.lua
+share/luajit-2.1/resty/core.lua
+share/luajit-2.1/resty/core/base.lua
+share/luajit-2.1/resty/core/base64.lua
+share/luajit-2.1/resty/core/coroutine.lua
+share/luajit-2.1/resty/core/ctx.lua
+share/luajit-2.1/resty/core/exit.lua
+share/luajit-2.1/resty/core/hash.lua
+share/luajit-2.1/resty/core/misc.lua
+share/luajit-2.1/resty/core/ndk.lua
+share/luajit-2.1/resty/core/param.lua
+share/luajit-2.1/resty/core/phase.lua
+share/luajit-2.1/resty/core/regex.lua
+share/luajit-2.1/resty/core/request.lua
+share/luajit-2.1/resty/core/response.lua
+share/luajit-2.1/resty/core/shdict.lua
+share/luajit-2.1/resty/core/socket.lua
+share/luajit-2.1/resty/core/time.lua
+share/luajit-2.1/resty/core/uri.lua
+share/luajit-2.1/resty/core/utils.lua
+share/luajit-2.1/resty/core/var.lua
+share/luajit-2.1/resty/core/worker.lua
Index: www/lua-resty-lrucache/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/lua-resty-lrucache/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- www/lua-resty-lrucache/Makefile	29 Mar 2023 08:29:57 -0000	1.1
+++ www/lua-resty-lrucache/Makefile	24 May 2024 02:19:14 -0000
@@ -12,11 +12,8 @@
 
 USE_LANGUAGES=	# none
 
-MAKE_ENV+=	LUA_INCLUDE_DIR=${PREFIX}/include/luajit-2.0
-MAKE_ENV+=	LUA_LIB_DIR=${PREFIX}/share/luajit-2.0.5
-#MAKE_ENV+=	LUA_INCLUDE_DIR=${PREFIX}/include/luajit-2.1
-#MAKE_ENV+=	LUA_LIB_DIR=${PREFIX}/share/luajit-2.1.0-beta3
+MAKE_ENV+=	LUA_INCLUDE_DIR=${PREFIX}/include/luajit-2.1
+MAKE_ENV+=	LUA_LIB_DIR=${PREFIX}/share/luajit-2.1
 
-#.include "../../lang/openresty-luajit2/buildlink3.mk"
 .include "../../lang/LuaJIT2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: www/lua-resty-lrucache/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/www/lua-resty-lrucache/PLIST,v
retrieving revision 1.1
diff -u -r1.1 PLIST
--- www/lua-resty-lrucache/PLIST	29 Mar 2023 08:29:57 -0000	1.1
+++ www/lua-resty-lrucache/PLIST	24 May 2024 02:19:14 -0000
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2023/03/29 08:29:57 adam Exp $
-share/luajit-2.0.5/resty/lrucache.lua
-share/luajit-2.0.5/resty/lrucache/pureffi.lua
+@comment $NetBSD$
+share/luajit-2.1/resty/lrucache.lua
+share/luajit-2.1/resty/lrucache/pureffi.lua
? editors/neovim/patches
Index: editors/neovim/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/neovim/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- editors/neovim/Makefile	30 Apr 2024 18:30:52 -0000	1.9
+++ editors/neovim/Makefile	24 May 2024 02:19:36 -0000
@@ -1,21 +1,19 @@
-# $NetBSD: Makefile,v 1.9 2024/04/30 18:30:52 wiz Exp $
+# $NetBSD$
 
-DISTNAME=	neovim-0.9.5
-PKGREVISION=	1
+DISTNAME=	neovim-0.10.0
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GITHUB:=neovim/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://github.com/neovim/neovim/
+HOMEPAGE=	https://neovim.org/
 COMMENT=	Vim fork focused on extensibility and usability
 LICENSE=	apache-2.0 AND vim-license
 
-USE_CMAKE=	yes
-USE_TOOLS+=	pkg-config xgettext
-
 USE_LANGUAGES=	c c++
 
+USE_TOOLS+=	pkg-config gettext
+
 .include "../../mk/bsd.prefs.mk"
 
 PLIST_VARS+=	notdarwin
@@ -26,12 +24,10 @@
 PLIST.notdarwin=	yes
 .endif
 
-CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
-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
-CMAKE_ARG_PATH=		${WRKSRC}
+CMAKE_CONFIGURE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+=	-DUSE_BUNDLED=OFF
+CMAKE_CONFIGURE_ARGS+=	-DLIBVTERM_LIBRARY=${BUILDLINK_PREFIX.libvterm03}/lib/libvterm03/libvterm.${SHLIB_EXT}
+CMAKE_CONFIGURE_ARGS+=	-DLIBVTERM_INCLUDE_DIR=${BUILDLINK_PREFIX.libvterm03}/include/libvterm03
 
 LDFLAGS.SunOS+=		-lrt
 
@@ -43,35 +39,40 @@
 
 .include "../../lang/lua/luaversion.mk"
 
+DEPENDS+=	${LUA_PKGPREFIX}-BitOp-[0-9]*:../../devel/lua-BitOp
+DEPENDS+=	${LUA_PKGPREFIX}-filesystem-[0-9]*:../../devel/lua-filesystem
+DEPENDS+=	${LUA_PKGPREFIX}-inspect-[0-9]*:../../devel/lua-inspect
 DEPENDS+=	${LUA_PKGPREFIX}-lpeg-[0-9]*:../../devel/lua-lpeg
 DEPENDS+=	${LUA_PKGPREFIX}-mpack-[0-9]*:../../devel/lua-mpack
-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
 
-post-extract:
-	${MKDIR} ${WRKDIR}/build
+TOOL_DEPENDS+=	patchelf-[0-9]*:../../devel/patchelf
+
+post-install:
+	${PREFIX}/bin/patchelf ${DESTDIR}${PREFIX}/bin/nvim \
+		--replace-needed ${PREFIX}/lib/lua/5.1/lpeg.so lpeg.so
+	${PREFIX}/bin/patchelf ${DESTDIR}${PREFIX}/bin/nvim \
+		--add-rpath ${PREFIX}/lib/lua/5.1
 
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/gperf/buildlink3.mk"
 .if ${OPSYS} == "SunOS"
 .  include "../../devel/libexecinfo/buildlink3.mk"
 .endif
-.include "../../devel/libtermkey/buildlink3.mk"
 .include "../../devel/libuv/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libvterm03+=	libvterm03>=0.3.3
 .include "../../devel/libvterm03/buildlink3.mk"
 .include "../../devel/lua-luv/buildlink3.mk"
 .include "../../devel/msgpack/buildlink3.mk"
 .include "../../devel/unibilium/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../lang/lua/luaversion.mk"
 .include "../../lang/LuaJIT2/platform.mk"
 .if ${PLATFORM_SUPPORTS_LUAJIT:tl} == "yes"
 .  include "../../lang/LuaJIT2/buildlink3.mk"
 .else
-CMAKE_ARGS+=	-DPREFER_LUA=ON
-.  include "../../lang/lua51/buildlink3.mk"
+CMAKE_CONFIGURE_ARGS+=	-DPREFER_LUA=ON
+.  include "../../lang/lua/buildlink3.mk"
 .endif
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/tree-sitter/buildlink3.mk"
Index: editors/neovim/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/editors/neovim/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- editors/neovim/PLIST	2 Feb 2024 16:24:45 -0000	1.5
+++ editors/neovim/PLIST	24 May 2024 02:19:36 -0000
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2024/02/02 16:24:45 tm Exp $
+@comment $NetBSD$
 bin/nvim
 man/man1/nvim.1
-${PLIST.notdarwin}share/applications/nvim.desktop
+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
@@ -38,6 +38,8 @@
 share/nvim/runtime/autoload/ada.vim
 share/nvim/runtime/autoload/adacomplete.vim
 share/nvim/runtime/autoload/bitbake.vim
+share/nvim/runtime/autoload/cargo.vim
+share/nvim/runtime/autoload/cargo/quickfix.vim
 share/nvim/runtime/autoload/ccomplete.lua
 share/nvim/runtime/autoload/ccomplete.vim
 share/nvim/runtime/autoload/clojurecomplete.vim
@@ -45,14 +47,15 @@
 share/nvim/runtime/autoload/contextcomplete.vim
 share/nvim/runtime/autoload/csscomplete.vim
 share/nvim/runtime/autoload/decada.vim
+share/nvim/runtime/autoload/dist/vim.vim
 share/nvim/runtime/autoload/freebasic.vim
 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/modula2.vim
 share/nvim/runtime/autoload/msgpack.vim
 share/nvim/runtime/autoload/netrw.vim
 share/nvim/runtime/autoload/netrwFileHandlers.vim
@@ -65,7 +68,6 @@
 share/nvim/runtime/autoload/provider/node.vim
 share/nvim/runtime/autoload/provider/perl.vim
 share/nvim/runtime/autoload/provider/python3.vim
-share/nvim/runtime/autoload/provider/pythonx.vim
 share/nvim/runtime/autoload/provider/ruby.vim
 share/nvim/runtime/autoload/provider/script_host.rb
 share/nvim/runtime/autoload/python.vim
@@ -75,13 +77,13 @@
 share/nvim/runtime/autoload/remote/host.vim
 share/nvim/runtime/autoload/rubycomplete.vim
 share/nvim/runtime/autoload/rust.vim
+share/nvim/runtime/autoload/rust/debugging.vim
 share/nvim/runtime/autoload/rustfmt.vim
 share/nvim/runtime/autoload/shada.vim
 share/nvim/runtime/autoload/spellfile.vim
 share/nvim/runtime/autoload/sqlcomplete.vim
 share/nvim/runtime/autoload/syntaxcomplete.vim
 share/nvim/runtime/autoload/tar.vim
-share/nvim/runtime/autoload/tohtml.vim
 share/nvim/runtime/autoload/tutor.vim
 share/nvim/runtime/autoload/vimexpect.vim
 share/nvim/runtime/autoload/xml/html32.vim
@@ -101,7 +103,6 @@
 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
@@ -119,10 +120,15 @@
 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/vim.lua
+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
@@ -161,6 +167,7 @@
 share/nvim/runtime/compiler/gfortran.vim
 share/nvim/runtime/compiler/ghc.vim
 share/nvim/runtime/compiler/gjs.vim
+share/nvim/runtime/compiler/gm2.vim
 share/nvim/runtime/compiler/gnat.vim
 share/nvim/runtime/compiler/go.vim
 share/nvim/runtime/compiler/haml.vim
@@ -176,6 +183,7 @@
 share/nvim/runtime/compiler/jest.vim
 share/nvim/runtime/compiler/jikes.vim
 share/nvim/runtime/compiler/jjs.vim
+share/nvim/runtime/compiler/jq.vim
 share/nvim/runtime/compiler/jshint.vim
 share/nvim/runtime/compiler/jsonlint.vim
 share/nvim/runtime/compiler/mcs.vim
@@ -188,10 +196,12 @@
 share/nvim/runtime/compiler/neato.vim
 share/nvim/runtime/compiler/ocaml.vim
 share/nvim/runtime/compiler/onsgmls.vim
+share/nvim/runtime/compiler/pandoc.vim
 share/nvim/runtime/compiler/pbx.vim
 share/nvim/runtime/compiler/perl.vim
 share/nvim/runtime/compiler/perlcritic.vim
 share/nvim/runtime/compiler/php.vim
+share/nvim/runtime/compiler/pip_compile.vim
 share/nvim/runtime/compiler/podchecker.vim
 share/nvim/runtime/compiler/powershell.vim
 share/nvim/runtime/compiler/pylint.vim
@@ -202,6 +212,7 @@
 share/nvim/runtime/compiler/racotest.vim
 share/nvim/runtime/compiler/rake.vim
 share/nvim/runtime/compiler/rhino.vim
+share/nvim/runtime/compiler/rime_deployer.vim
 share/nvim/runtime/compiler/rspec.vim
 share/nvim/runtime/compiler/rst.vim
 share/nvim/runtime/compiler/rubocop.vim
@@ -224,6 +235,7 @@
 share/nvim/runtime/compiler/ts-node.vim
 share/nvim/runtime/compiler/tsc.vim
 share/nvim/runtime/compiler/typedoc.vim
+share/nvim/runtime/compiler/vimdoc.vim
 share/nvim/runtime/compiler/xbuild.vim
 share/nvim/runtime/compiler/xmllint.vim
 share/nvim/runtime/compiler/xmlwf.vim
@@ -238,6 +250,7 @@
 share/nvim/runtime/doc/api.txt
 share/nvim/runtime/doc/arabic.txt
 share/nvim/runtime/doc/autocmd.txt
+share/nvim/runtime/doc/backers.txt
 share/nvim/runtime/doc/builtin.txt
 share/nvim/runtime/doc/change.txt
 share/nvim/runtime/doc/channel.txt
@@ -245,6 +258,9 @@
 share/nvim/runtime/doc/debug.txt
 share/nvim/runtime/doc/deprecated.txt
 share/nvim/runtime/doc/dev_style.txt
+share/nvim/runtime/doc/dev_theme.txt
+share/nvim/runtime/doc/dev_tools.txt
+share/nvim/runtime/doc/dev_vimpatch.txt
 share/nvim/runtime/doc/develop.txt
 share/nvim/runtime/doc/diagnostic.txt
 share/nvim/runtime/doc/diff.txt
@@ -252,6 +268,7 @@
 share/nvim/runtime/doc/editing.txt
 share/nvim/runtime/doc/editorconfig.txt
 share/nvim/runtime/doc/eval.txt
+share/nvim/runtime/doc/faq.txt
 share/nvim/runtime/doc/filetype.txt
 share/nvim/runtime/doc/fold.txt
 share/nvim/runtime/doc/ft_ada.txt
@@ -271,7 +288,6 @@
 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
@@ -282,6 +298,7 @@
 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
@@ -358,6 +375,7 @@
 share/nvim/runtime/doc/vi_diff.txt
 share/nvim/runtime/doc/vim_diff.txt
 share/nvim/runtime/doc/visual.txt
+share/nvim/runtime/doc/vvars.txt
 share/nvim/runtime/doc/windows.txt
 share/nvim/runtime/filetype.lua
 share/nvim/runtime/ftoff.vim
@@ -374,14 +392,17 @@
 share/nvim/runtime/ftplugin/apache.vim
 share/nvim/runtime/ftplugin/arch.vim
 share/nvim/runtime/ftplugin/art.vim
+share/nvim/runtime/ftplugin/asciidoc.vim
 share/nvim/runtime/ftplugin/asm.vim
 share/nvim/runtime/ftplugin/aspvbs.vim
+share/nvim/runtime/ftplugin/astro.vim
 share/nvim/runtime/ftplugin/automake.vim
 share/nvim/runtime/ftplugin/awk.vim
 share/nvim/runtime/ftplugin/bash.vim
 share/nvim/runtime/ftplugin/basic.vim
 share/nvim/runtime/ftplugin/bdf.vim
 share/nvim/runtime/ftplugin/bitbake.vim
+share/nvim/runtime/ftplugin/bp.vim
 share/nvim/runtime/ftplugin/bst.vim
 share/nvim/runtime/ftplugin/btm.vim
 share/nvim/runtime/ftplugin/bzl.vim
@@ -391,6 +412,7 @@
 share/nvim/runtime/ftplugin/calender.lua
 share/nvim/runtime/ftplugin/cdrdaoconf.vim
 share/nvim/runtime/ftplugin/cfg.vim
+share/nvim/runtime/ftplugin/cgdbrc.vim
 share/nvim/runtime/ftplugin/ch.vim
 share/nvim/runtime/ftplugin/changelog.vim
 share/nvim/runtime/ftplugin/chatito.vim
@@ -403,6 +425,7 @@
 share/nvim/runtime/ftplugin/config.vim
 share/nvim/runtime/ftplugin/confini.vim
 share/nvim/runtime/ftplugin/context.vim
+share/nvim/runtime/ftplugin/corn.vim
 share/nvim/runtime/ftplugin/cpp.vim
 share/nvim/runtime/ftplugin/crm.vim
 share/nvim/runtime/ftplugin/crontab.vim
@@ -415,8 +438,10 @@
 share/nvim/runtime/ftplugin/cucumber.vim
 share/nvim/runtime/ftplugin/cvsrc.vim
 share/nvim/runtime/ftplugin/d.lua
+share/nvim/runtime/ftplugin/deb822sources.vim
 share/nvim/runtime/ftplugin/debchangelog.vim
 share/nvim/runtime/ftplugin/debcontrol.vim
+share/nvim/runtime/ftplugin/debsources.vim
 share/nvim/runtime/ftplugin/denyhosts.vim
 share/nvim/runtime/ftplugin/desktop.vim
 share/nvim/runtime/ftplugin/dictconf.vim
@@ -429,6 +454,7 @@
 share/nvim/runtime/ftplugin/dosini.vim
 share/nvim/runtime/ftplugin/dtd.vim
 share/nvim/runtime/ftplugin/dtrace.vim
+share/nvim/runtime/ftplugin/dts.vim
 share/nvim/runtime/ftplugin/dune.vim
 share/nvim/runtime/ftplugin/eiffel.vim
 share/nvim/runtime/ftplugin/elinks.vim
@@ -443,6 +469,7 @@
 share/nvim/runtime/ftplugin/fetchmail.vim
 share/nvim/runtime/ftplugin/fish.vim
 share/nvim/runtime/ftplugin/flexwiki.vim
+share/nvim/runtime/ftplugin/forth.vim
 share/nvim/runtime/ftplugin/fortran.vim
 share/nvim/runtime/ftplugin/fpcmake.vim
 share/nvim/runtime/ftplugin/framescript.vim
@@ -450,6 +477,9 @@
 share/nvim/runtime/ftplugin/fstab.vim
 share/nvim/runtime/ftplugin/fvwm.vim
 share/nvim/runtime/ftplugin/gdb.vim
+share/nvim/runtime/ftplugin/gdscript.vim
+share/nvim/runtime/ftplugin/gdshader.vim
+share/nvim/runtime/ftplugin/git.vim
 share/nvim/runtime/ftplugin/gitattributes.vim
 share/nvim/runtime/ftplugin/gitcommit.vim
 share/nvim/runtime/ftplugin/gitconfig.vim
@@ -468,6 +498,7 @@
 share/nvim/runtime/ftplugin/hare.vim
 share/nvim/runtime/ftplugin/haskell.vim
 share/nvim/runtime/ftplugin/heex.vim
+share/nvim/runtime/ftplugin/help.lua
 share/nvim/runtime/ftplugin/help.vim
 share/nvim/runtime/ftplugin/hgcommit.vim
 share/nvim/runtime/ftplugin/hog.vim
@@ -475,6 +506,7 @@
 share/nvim/runtime/ftplugin/hostsaccess.vim
 share/nvim/runtime/ftplugin/html.vim
 share/nvim/runtime/ftplugin/htmldjango.vim
+share/nvim/runtime/ftplugin/hurl.vim
 share/nvim/runtime/ftplugin/i3config.vim
 share/nvim/runtime/ftplugin/icon.vim
 share/nvim/runtime/ftplugin/indent.lua
@@ -485,13 +517,17 @@
 share/nvim/runtime/ftplugin/java.vim
 share/nvim/runtime/ftplugin/javascript.vim
 share/nvim/runtime/ftplugin/javascriptreact.vim
+share/nvim/runtime/ftplugin/jj.vim
 share/nvim/runtime/ftplugin/jproperties.vim
+share/nvim/runtime/ftplugin/jq.vim
 share/nvim/runtime/ftplugin/json.vim
+share/nvim/runtime/ftplugin/json5.vim
 share/nvim/runtime/ftplugin/jsonc.vim
 share/nvim/runtime/ftplugin/jsonnet.vim
 share/nvim/runtime/ftplugin/jsp.vim
 share/nvim/runtime/ftplugin/julia.vim
 share/nvim/runtime/ftplugin/kconfig.vim
+share/nvim/runtime/ftplugin/kotlin.vim
 share/nvim/runtime/ftplugin/kwt.vim
 share/nvim/runtime/ftplugin/ld.vim
 share/nvim/runtime/ftplugin/less.vim
@@ -500,13 +536,16 @@
 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
 share/nvim/runtime/ftplugin/logtalk.dict
 share/nvim/runtime/ftplugin/logtalk.vim
 share/nvim/runtime/ftplugin/lprolog.vim
+share/nvim/runtime/ftplugin/lua.lua
 share/nvim/runtime/ftplugin/lua.vim
+share/nvim/runtime/ftplugin/luau.vim
 share/nvim/runtime/ftplugin/lynx.vim
 share/nvim/runtime/ftplugin/m3build.vim
 share/nvim/runtime/ftplugin/m3quake.vim
@@ -536,13 +575,17 @@
 share/nvim/runtime/ftplugin/neomuttrc.vim
 share/nvim/runtime/ftplugin/netrc.vim
 share/nvim/runtime/ftplugin/nginx.vim
+share/nvim/runtime/ftplugin/nix.vim
 share/nvim/runtime/ftplugin/nroff.vim
 share/nvim/runtime/ftplugin/nsis.vim
 share/nvim/runtime/ftplugin/objc.vim
+share/nvim/runtime/ftplugin/objdump.vim
 share/nvim/runtime/ftplugin/obse.vim
 share/nvim/runtime/ftplugin/ocaml.vim
 share/nvim/runtime/ftplugin/occam.vim
 share/nvim/runtime/ftplugin/octave.vim
+share/nvim/runtime/ftplugin/odin.vim
+share/nvim/runtime/ftplugin/ondir.vim
 share/nvim/runtime/ftplugin/openvpn.vim
 share/nvim/runtime/ftplugin/pamconf.vim
 share/nvim/runtime/ftplugin/pascal.vim
@@ -562,10 +605,12 @@
 share/nvim/runtime/ftplugin/protocols.vim
 share/nvim/runtime/ftplugin/ps1.vim
 share/nvim/runtime/ftplugin/ps1xml.vim
+share/nvim/runtime/ftplugin/pymanifest.vim
 share/nvim/runtime/ftplugin/pyrex.vim
 share/nvim/runtime/ftplugin/python.vim
 share/nvim/runtime/ftplugin/qb64.vim
 share/nvim/runtime/ftplugin/qf.vim
+share/nvim/runtime/ftplugin/qml.vim
 share/nvim/runtime/ftplugin/quake.vim
 share/nvim/runtime/ftplugin/quarto.vim
 share/nvim/runtime/ftplugin/query.lua
@@ -575,11 +620,13 @@
 share/nvim/runtime/ftplugin/raku.vim
 share/nvim/runtime/ftplugin/readline.vim
 share/nvim/runtime/ftplugin/registry.vim
+share/nvim/runtime/ftplugin/requirements.vim
 share/nvim/runtime/ftplugin/reva.vim
 share/nvim/runtime/ftplugin/rhelp.vim
 share/nvim/runtime/ftplugin/rmd.vim
 share/nvim/runtime/ftplugin/rnc.vim
 share/nvim/runtime/ftplugin/rnoweb.vim
+share/nvim/runtime/ftplugin/roc.vim
 share/nvim/runtime/ftplugin/routeros.vim
 share/nvim/runtime/ftplugin/rpl.vim
 share/nvim/runtime/ftplugin/rrst.vim
@@ -593,6 +640,7 @@
 share/nvim/runtime/ftplugin/scheme.vim
 share/nvim/runtime/ftplugin/screen.vim
 share/nvim/runtime/ftplugin/scss.vim
+share/nvim/runtime/ftplugin/sed.vim
 share/nvim/runtime/ftplugin/sensors.vim
 share/nvim/runtime/ftplugin/services.vim
 share/nvim/runtime/ftplugin/setserial.vim
@@ -604,16 +652,19 @@
 share/nvim/runtime/ftplugin/slpconf.vim
 share/nvim/runtime/ftplugin/slpreg.vim
 share/nvim/runtime/ftplugin/slpspi.vim
+share/nvim/runtime/ftplugin/solidity.vim
 share/nvim/runtime/ftplugin/solution.vim
 share/nvim/runtime/ftplugin/spec.vim
 share/nvim/runtime/ftplugin/sql.vim
 share/nvim/runtime/ftplugin/ssa.vim
 share/nvim/runtime/ftplugin/sshconfig.vim
+share/nvim/runtime/ftplugin/stylus.vim
 share/nvim/runtime/ftplugin/sudoers.vim
 share/nvim/runtime/ftplugin/svg.vim
 share/nvim/runtime/ftplugin/swayconfig.vim
 share/nvim/runtime/ftplugin/swift.vim
 share/nvim/runtime/ftplugin/swiftgyb.vim
+share/nvim/runtime/ftplugin/swig.vim
 share/nvim/runtime/ftplugin/sysctl.vim
 share/nvim/runtime/ftplugin/systemd.vim
 share/nvim/runtime/ftplugin/systemverilog.vim
@@ -631,10 +682,14 @@
 share/nvim/runtime/ftplugin/tutor.vim
 share/nvim/runtime/ftplugin/typescript.vim
 share/nvim/runtime/ftplugin/typescriptreact.vim
+share/nvim/runtime/ftplugin/uci.vim
 share/nvim/runtime/ftplugin/udevconf.vim
 share/nvim/runtime/ftplugin/udevperm.vim
 share/nvim/runtime/ftplugin/udevrules.vim
+share/nvim/runtime/ftplugin/unison.vim
 share/nvim/runtime/ftplugin/updatedb.vim
+share/nvim/runtime/ftplugin/urlshortcut.vim
+share/nvim/runtime/ftplugin/usd.vim
 share/nvim/runtime/ftplugin/vb.vim
 share/nvim/runtime/ftplugin/vdf.vim
 share/nvim/runtime/ftplugin/verilog.vim
@@ -642,9 +697,10 @@
 share/nvim/runtime/ftplugin/vim.vim
 share/nvim/runtime/ftplugin/vroom.vim
 share/nvim/runtime/ftplugin/vue.vim
-share/nvim/runtime/ftplugin/wast.vim
+share/nvim/runtime/ftplugin/wat.vim
 share/nvim/runtime/ftplugin/wget.vim
 share/nvim/runtime/ftplugin/wget2.vim
+share/nvim/runtime/ftplugin/xcompose.vim
 share/nvim/runtime/ftplugin/xdefaults.lua
 share/nvim/runtime/ftplugin/xdefaults.vim
 share/nvim/runtime/ftplugin/xf86conf.vim
@@ -656,6 +712,7 @@
 share/nvim/runtime/ftplugin/xsd.vim
 share/nvim/runtime/ftplugin/xslt.vim
 share/nvim/runtime/ftplugin/yaml.vim
+share/nvim/runtime/ftplugin/zathurarc.vim
 share/nvim/runtime/ftplugin/zig.vim
 share/nvim/runtime/ftplugin/zimbu.vim
 share/nvim/runtime/ftplugin/zsh.vim
@@ -666,6 +723,8 @@
 share/nvim/runtime/indent/aap.vim
 share/nvim/runtime/indent/ada.vim
 share/nvim/runtime/indent/ant.vim
+share/nvim/runtime/indent/asm.vim
+share/nvim/runtime/indent/astro.vim
 share/nvim/runtime/indent/automake.vim
 share/nvim/runtime/indent/awk.vim
 share/nvim/runtime/indent/bash.vim
@@ -697,6 +756,7 @@
 share/nvim/runtime/indent/dosbatch.vim
 share/nvim/runtime/indent/dtd.vim
 share/nvim/runtime/indent/dtrace.vim
+share/nvim/runtime/indent/dts.vim
 share/nvim/runtime/indent/dune.vim
 share/nvim/runtime/indent/dylan.vim
 share/nvim/runtime/indent/eiffel.vim
@@ -711,6 +771,7 @@
 share/nvim/runtime/indent/fortran.vim
 share/nvim/runtime/indent/framescript.vim
 share/nvim/runtime/indent/freebasic.vim
+share/nvim/runtime/indent/gdscript.vim
 share/nvim/runtime/indent/gitconfig.vim
 share/nvim/runtime/indent/gitolite.vim
 share/nvim/runtime/indent/go.vim
@@ -728,17 +789,21 @@
 share/nvim/runtime/indent/javascript.vim
 share/nvim/runtime/indent/javascriptreact.vim
 share/nvim/runtime/indent/json.vim
+share/nvim/runtime/indent/json5.vim
 share/nvim/runtime/indent/jsonc.vim
 share/nvim/runtime/indent/jsp.vim
 share/nvim/runtime/indent/julia.vim
+share/nvim/runtime/indent/kotlin.vim
 share/nvim/runtime/indent/krl.vim
 share/nvim/runtime/indent/ld.vim
 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/luau.vim
 share/nvim/runtime/indent/mail.vim
 share/nvim/runtime/indent/make.vim
 share/nvim/runtime/indent/matlab.vim
@@ -752,6 +817,7 @@
 share/nvim/runtime/indent/obse.vim
 share/nvim/runtime/indent/ocaml.vim
 share/nvim/runtime/indent/occam.vim
+share/nvim/runtime/indent/odin.vim
 share/nvim/runtime/indent/pascal.vim
 share/nvim/runtime/indent/perl.vim
 share/nvim/runtime/indent/php.vim
@@ -762,12 +828,14 @@
 share/nvim/runtime/indent/pyrex.vim
 share/nvim/runtime/indent/python.vim
 share/nvim/runtime/indent/qb64.vim
+share/nvim/runtime/indent/qml.vim
 share/nvim/runtime/indent/quarto.vim
 share/nvim/runtime/indent/query.lua
 share/nvim/runtime/indent/r.vim
 share/nvim/runtime/indent/racket.vim
 share/nvim/runtime/indent/raku.vim
 share/nvim/runtime/indent/raml.vim
+share/nvim/runtime/indent/rapid.vim
 share/nvim/runtime/indent/readline.vim
 share/nvim/runtime/indent/rhelp.vim
 share/nvim/runtime/indent/rmd.vim
@@ -789,6 +857,7 @@
 share/nvim/runtime/indent/sql.vim
 share/nvim/runtime/indent/sqlanywhere.vim
 share/nvim/runtime/indent/sshconfig.vim
+share/nvim/runtime/indent/stylus.vim
 share/nvim/runtime/indent/systemverilog.vim
 share/nvim/runtime/indent/tcl.vim
 share/nvim/runtime/indent/tcsh.vim
@@ -796,6 +865,8 @@
 share/nvim/runtime/indent/testdir/README.txt
 share/nvim/runtime/indent/testdir/bitbake.in
 share/nvim/runtime/indent/testdir/bitbake.ok
+share/nvim/runtime/indent/testdir/dts.in
+share/nvim/runtime/indent/testdir/dts.ok
 share/nvim/runtime/indent/testdir/html.in
 share/nvim/runtime/indent/testdir/html.ok
 share/nvim/runtime/indent/testdir/krl.in
@@ -804,6 +875,8 @@
 share/nvim/runtime/indent/testdir/matlab.ok
 share/nvim/runtime/indent/testdir/python.in
 share/nvim/runtime/indent/testdir/python.ok
+share/nvim/runtime/indent/testdir/rapid.in
+share/nvim/runtime/indent/testdir/rapid.ok
 share/nvim/runtime/indent/testdir/runtest.vim
 share/nvim/runtime/indent/testdir/sshconfig.in
 share/nvim/runtime/indent/testdir/sshconfig.ok
@@ -822,13 +895,14 @@
 share/nvim/runtime/indent/tilde.vim
 share/nvim/runtime/indent/treetop.vim
 share/nvim/runtime/indent/typescript.vim
+share/nvim/runtime/indent/typescriptreact.vim
 share/nvim/runtime/indent/vb.vim
 share/nvim/runtime/indent/verilog.vim
 share/nvim/runtime/indent/vhdl.vim
 share/nvim/runtime/indent/vim.vim
 share/nvim/runtime/indent/vroom.vim
 share/nvim/runtime/indent/vue.vim
-share/nvim/runtime/indent/wast.vim
+share/nvim/runtime/indent/wat.vim
 share/nvim/runtime/indent/xf86conf.vim
 share/nvim/runtime/indent/xhtml.vim
 share/nvim/runtime/indent/xinetd.vim
@@ -924,56 +998,105 @@
 share/nvim/runtime/keymap/vietnamese-viqr_utf-8.vim
 share/nvim/runtime/keymap/vietnamese-vni_utf-8.vim
 share/nvim/runtime/lua/_vim9script.lua
+share/nvim/runtime/lua/coxpcall.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/clipboard/health.lua
+share/nvim/runtime/lua/provider/node/health.lua
+share/nvim/runtime/lua/provider/perl/health.lua
+share/nvim/runtime/lua/provider/python/health.lua
+share/nvim/runtime/lua/provider/ruby/health.lua
+share/nvim/runtime/lua/tohtml.lua
 share/nvim/runtime/lua/vim/F.lua
+share/nvim/runtime/lua/vim/_comment.lua
+share/nvim/runtime/lua/vim/_defaults.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/_meta/api.lua
+share/nvim/runtime/lua/vim/_meta/api_keysets.lua
+share/nvim/runtime/lua/vim/_meta/api_keysets_extra.lua
+share/nvim/runtime/lua/vim/_meta/base64.lua
+share/nvim/runtime/lua/vim/_meta/builtin.lua
+share/nvim/runtime/lua/vim/_meta/builtin_types.lua
+share/nvim/runtime/lua/vim/_meta/diff.lua
+share/nvim/runtime/lua/vim/_meta/json.lua
+share/nvim/runtime/lua/vim/_meta/lpeg.lua
+share/nvim/runtime/lua/vim/_meta/misc.lua
+share/nvim/runtime/lua/vim/_meta/mpack.lua
+share/nvim/runtime/lua/vim/_meta/options.lua
+share/nvim/runtime/lua/vim/_meta/re.lua
+share/nvim/runtime/lua/vim/_meta/regex.lua
+share/nvim/runtime/lua/vim/_meta/spell.lua
+share/nvim/runtime/lua/vim/_meta/vimfn.lua
+share/nvim/runtime/lua/vim/_meta/vvars.lua
 share/nvim/runtime/lua/vim/_options.lua
+share/nvim/runtime/lua/vim/_system.lua
 share/nvim/runtime/lua/vim/_watch.lua
 share/nvim/runtime/lua/vim/diagnostic.lua
 share/nvim/runtime/lua/vim/filetype.lua
 share/nvim/runtime/lua/vim/filetype/detect.lua
 share/nvim/runtime/lua/vim/filetype/options.lua
 share/nvim/runtime/lua/vim/fs.lua
+share/nvim/runtime/lua/vim/func.lua
+share/nvim/runtime/lua/vim/func/_memoize.lua
+share/nvim/runtime/lua/vim/glob.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
-share/nvim/runtime/lua/vim/lsp/_snippet.lua
+share/nvim/runtime/lua/vim/lsp/_changetracking.lua
+share/nvim/runtime/lua/vim/lsp/_completion.lua
+share/nvim/runtime/lua/vim/lsp/_dynamic.lua
+share/nvim/runtime/lua/vim/lsp/_meta.lua
+share/nvim/runtime/lua/vim/lsp/_meta/protocol.lua
+share/nvim/runtime/lua/vim/lsp/_snippet_grammar.lua
+share/nvim/runtime/lua/vim/lsp/_tagfunc.lua
 share/nvim/runtime/lua/vim/lsp/_watchfiles.lua
 share/nvim/runtime/lua/vim/lsp/buf.lua
+share/nvim/runtime/lua/vim/lsp/client.lua
 share/nvim/runtime/lua/vim/lsp/codelens.lua
 share/nvim/runtime/lua/vim/lsp/diagnostic.lua
 share/nvim/runtime/lua/vim/lsp/handlers.lua
 share/nvim/runtime/lua/vim/lsp/health.lua
+share/nvim/runtime/lua/vim/lsp/inlay_hint.lua
 share/nvim/runtime/lua/vim/lsp/log.lua
 share/nvim/runtime/lua/vim/lsp/protocol.lua
 share/nvim/runtime/lua/vim/lsp/rpc.lua
 share/nvim/runtime/lua/vim/lsp/semantic_tokens.lua
 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/provider.lua
+share/nvim/runtime/lua/vim/provider/perl.lua
+share/nvim/runtime/lua/vim/provider/python.lua
+share/nvim/runtime/lua/vim/provider/ruby.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/snippet.lua
+share/nvim/runtime/lua/vim/termcap.lua
+share/nvim/runtime/lua/vim/text.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/dev.lua
 share/nvim/runtime/lua/vim/treesitter/health.lua
 share/nvim/runtime/lua/vim/treesitter/highlighter.lua
 share/nvim/runtime/lua/vim/treesitter/language.lua
 share/nvim/runtime/lua/vim/treesitter/languagetree.lua
-share/nvim/runtime/lua/vim/treesitter/playground.lua
 share/nvim/runtime/lua/vim/treesitter/query.lua
 share/nvim/runtime/lua/vim/ui.lua
+share/nvim/runtime/lua/vim/ui/clipboard/osc52.lua
 share/nvim/runtime/lua/vim/uri.lua
 share/nvim/runtime/lua/vim/version.lua
+share/nvim/runtime/lua/vim/vimhelp.lua
 share/nvim/runtime/macmap.vim
 share/nvim/runtime/macros/editexisting.vim
 share/nvim/runtime/macros/justify.vim
@@ -997,31 +1120,36 @@
 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
 share/nvim/runtime/plugin/netrwPlugin.vim
-share/nvim/runtime/plugin/nvim.lua
+share/nvim/runtime/plugin/osc52.lua
 share/nvim/runtime/plugin/rplugin.vim
 share/nvim/runtime/plugin/shada.vim
 share/nvim/runtime/plugin/spellfile.vim
 share/nvim/runtime/plugin/tarPlugin.vim
-share/nvim/runtime/plugin/tohtml.vim
+share/nvim/runtime/plugin/tohtml.lua
 share/nvim/runtime/plugin/tutor.vim
 share/nvim/runtime/plugin/zipPlugin.vim
+share/nvim/runtime/queries/bash/folds.scm
+share/nvim/runtime/queries/bash/highlights.scm
+share/nvim/runtime/queries/bash/injections.scm
 share/nvim/runtime/queries/c/folds.scm
 share/nvim/runtime/queries/c/highlights.scm
 share/nvim/runtime/queries/c/injections.scm
 share/nvim/runtime/queries/lua/folds.scm
 share/nvim/runtime/queries/lua/highlights.scm
 share/nvim/runtime/queries/lua/injections.scm
+share/nvim/runtime/queries/markdown/folds.scm
+share/nvim/runtime/queries/markdown/highlights.scm
+share/nvim/runtime/queries/markdown/injections.scm
+share/nvim/runtime/queries/markdown_inline/highlights.scm
+share/nvim/runtime/queries/markdown_inline/injections.scm
+share/nvim/runtime/queries/python/folds.scm
+share/nvim/runtime/queries/python/highlights.scm
 share/nvim/runtime/queries/query/folds.scm
 share/nvim/runtime/queries/query/highlights.scm
 share/nvim/runtime/queries/vim/folds.scm
@@ -1032,7 +1160,6 @@
 share/nvim/runtime/spell/cleanadd.vim
 share/nvim/runtime/spell/en.utf-8.spl
 share/nvim/runtime/synmenu.vim
-share/nvim/runtime/syntax/2html.vim
 share/nvim/runtime/syntax/8th.vim
 share/nvim/runtime/syntax/README.txt
 share/nvim/runtime/syntax/a2ps.vim
@@ -1068,6 +1195,7 @@
 share/nvim/runtime/syntax/aspvbs.vim
 share/nvim/runtime/syntax/asterisk.vim
 share/nvim/runtime/syntax/asteriskvm.vim
+share/nvim/runtime/syntax/astro.vim
 share/nvim/runtime/syntax/atlas.vim
 share/nvim/runtime/syntax/autodoc.vim
 share/nvim/runtime/syntax/autohotkey.vim
@@ -1103,6 +1231,7 @@
 share/nvim/runtime/syntax/cdrtoc.vim
 share/nvim/runtime/syntax/cf.vim
 share/nvim/runtime/syntax/cfg.vim
+share/nvim/runtime/syntax/cgdbrc.vim
 share/nvim/runtime/syntax/ch.vim
 share/nvim/runtime/syntax/chaiscript.vim
 share/nvim/runtime/syntax/change.vim
@@ -1114,11 +1243,13 @@
 share/nvim/runtime/syntax/chicken.vim
 share/nvim/runtime/syntax/chill.vim
 share/nvim/runtime/syntax/chordpro.vim
+share/nvim/runtime/syntax/chuck.vim
 share/nvim/runtime/syntax/cl.vim
 share/nvim/runtime/syntax/clean.vim
 share/nvim/runtime/syntax/clipper.vim
 share/nvim/runtime/syntax/clojure.vim
 share/nvim/runtime/syntax/cmake.vim
+share/nvim/runtime/syntax/cmakecache.vim
 share/nvim/runtime/syntax/cmod.vim
 share/nvim/runtime/syntax/cmusrc.vim
 share/nvim/runtime/syntax/cobol.vim
@@ -1154,6 +1285,7 @@
 share/nvim/runtime/syntax/datascript.vim
 share/nvim/runtime/syntax/dcd.vim
 share/nvim/runtime/syntax/dcl.vim
+share/nvim/runtime/syntax/deb822sources.vim
 share/nvim/runtime/syntax/debchangelog.vim
 share/nvim/runtime/syntax/debcontrol.vim
 share/nvim/runtime/syntax/debcopyright.vim
@@ -1312,15 +1444,19 @@
 share/nvim/runtime/syntax/javascriptreact.vim
 share/nvim/runtime/syntax/jess.vim
 share/nvim/runtime/syntax/jgraph.vim
+share/nvim/runtime/syntax/jj.vim
 share/nvim/runtime/syntax/jovial.vim
 share/nvim/runtime/syntax/jproperties.vim
+share/nvim/runtime/syntax/jq.vim
 share/nvim/runtime/syntax/json.vim
+share/nvim/runtime/syntax/json5.vim
 share/nvim/runtime/syntax/jsonc.vim
 share/nvim/runtime/syntax/jsp.vim
 share/nvim/runtime/syntax/julia.vim
 share/nvim/runtime/syntax/kconfig.vim
 share/nvim/runtime/syntax/kivy.vim
 share/nvim/runtime/syntax/kix.vim
+share/nvim/runtime/syntax/kotlin.vim
 share/nvim/runtime/syntax/krl.vim
 share/nvim/runtime/syntax/kscript.vim
 share/nvim/runtime/syntax/kwt.vim
@@ -1342,6 +1478,7 @@
 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
@@ -1354,6 +1491,7 @@
 share/nvim/runtime/syntax/lsp_markdown.vim
 share/nvim/runtime/syntax/lss.vim
 share/nvim/runtime/syntax/lua.vim
+share/nvim/runtime/syntax/luau.vim
 share/nvim/runtime/syntax/lynx.vim
 share/nvim/runtime/syntax/lyrics.vim
 share/nvim/runtime/syntax/m3build.vim
@@ -1390,7 +1528,11 @@
 share/nvim/runtime/syntax/model.vim
 share/nvim/runtime/syntax/modsim3.vim
 share/nvim/runtime/syntax/modula2.vim
+share/nvim/runtime/syntax/modula2/opt/iso.vim
+share/nvim/runtime/syntax/modula2/opt/pim.vim
+share/nvim/runtime/syntax/modula2/opt/r10.vim
 share/nvim/runtime/syntax/modula3.vim
+share/nvim/runtime/syntax/mojo.vim
 share/nvim/runtime/syntax/monk.vim
 share/nvim/runtime/syntax/moo.vim
 share/nvim/runtime/syntax/mp.vim
@@ -1427,15 +1569,19 @@
 share/nvim/runtime/syntax/obse.vim
 share/nvim/runtime/syntax/ocaml.vim
 share/nvim/runtime/syntax/occam.vim
+share/nvim/runtime/syntax/odin.vim
 share/nvim/runtime/syntax/omnimark.vim
+share/nvim/runtime/syntax/ondir.vim
 share/nvim/runtime/syntax/opam.vim
 share/nvim/runtime/syntax/openroad.vim
 share/nvim/runtime/syntax/openscad.vim
 share/nvim/runtime/syntax/openvpn.vim
 share/nvim/runtime/syntax/opl.vim
 share/nvim/runtime/syntax/ora.vim
+share/nvim/runtime/syntax/pacmanlog.vim
 share/nvim/runtime/syntax/pamconf.vim
 share/nvim/runtime/syntax/pamenv.vim
+share/nvim/runtime/syntax/pandoc.vim
 share/nvim/runtime/syntax/papp.vim
 share/nvim/runtime/syntax/pascal.vim
 share/nvim/runtime/syntax/passwd.vim
@@ -1481,11 +1627,13 @@
 share/nvim/runtime/syntax/psl.vim
 share/nvim/runtime/syntax/ptcap.vim
 share/nvim/runtime/syntax/purifylog.vim
+share/nvim/runtime/syntax/pymanifest.vim
 share/nvim/runtime/syntax/pyrex.vim
 share/nvim/runtime/syntax/python.vim
 share/nvim/runtime/syntax/python2.vim
 share/nvim/runtime/syntax/qb64.vim
 share/nvim/runtime/syntax/qf.vim
+share/nvim/runtime/syntax/qml.vim
 share/nvim/runtime/syntax/quake.vim
 share/nvim/runtime/syntax/quarto.vim
 share/nvim/runtime/syntax/query.lua
@@ -1495,6 +1643,7 @@
 share/nvim/runtime/syntax/radiance.vim
 share/nvim/runtime/syntax/raku.vim
 share/nvim/runtime/syntax/raml.vim
+share/nvim/runtime/syntax/rapid.vim
 share/nvim/runtime/syntax/ratpoison.vim
 share/nvim/runtime/syntax/rc.vim
 share/nvim/runtime/syntax/rcs.vim
@@ -1505,6 +1654,7 @@
 share/nvim/runtime/syntax/registry.vim
 share/nvim/runtime/syntax/rego.vim
 share/nvim/runtime/syntax/remind.vim
+share/nvim/runtime/syntax/requirements.vim
 share/nvim/runtime/syntax/resolv.vim
 share/nvim/runtime/syntax/reva.vim
 share/nvim/runtime/syntax/rexx.vim
@@ -1549,6 +1699,7 @@
 share/nvim/runtime/syntax/sh.vim
 share/nvim/runtime/syntax/shada.vim
 share/nvim/runtime/syntax/shared/README.txt
+share/nvim/runtime/syntax/shared/debversions.vim
 share/nvim/runtime/syntax/shared/hgcommitDiff.vim
 share/nvim/runtime/syntax/shared/typescriptcommon.vim
 share/nvim/runtime/syntax/sicad.vim
@@ -1605,12 +1756,14 @@
 share/nvim/runtime/syntax/stp.vim
 share/nvim/runtime/syntax/strace.vim
 share/nvim/runtime/syntax/structurizr.vim
+share/nvim/runtime/syntax/stylus.vim
 share/nvim/runtime/syntax/sudoers.vim
 share/nvim/runtime/syntax/svg.vim
 share/nvim/runtime/syntax/svn.vim
 share/nvim/runtime/syntax/swayconfig.vim
 share/nvim/runtime/syntax/swift.vim
 share/nvim/runtime/syntax/swiftgyb.vim
+share/nvim/runtime/syntax/swig.vim
 share/nvim/runtime/syntax/synload.vim
 share/nvim/runtime/syntax/syntax.vim
 share/nvim/runtime/syntax/sysctl.vim
@@ -1655,16 +1808,19 @@
 share/nvim/runtime/syntax/typescript.vim
 share/nvim/runtime/syntax/typescriptreact.vim
 share/nvim/runtime/syntax/uc.vim
+share/nvim/runtime/syntax/uci.vim
 share/nvim/runtime/syntax/udevconf.vim
 share/nvim/runtime/syntax/udevperm.vim
 share/nvim/runtime/syntax/udevrules.vim
 share/nvim/runtime/syntax/uil.vim
+share/nvim/runtime/syntax/unison.vim
 share/nvim/runtime/syntax/updatedb.vim
 share/nvim/runtime/syntax/upstart.vim
 share/nvim/runtime/syntax/upstreamdat.vim
 share/nvim/runtime/syntax/upstreaminstalllog.vim
 share/nvim/runtime/syntax/upstreamlog.vim
 share/nvim/runtime/syntax/upstreamrpt.vim
+share/nvim/runtime/syntax/urlshortcut.vim
 share/nvim/runtime/syntax/usserverlog.vim
 share/nvim/runtime/syntax/usw2kagtlog.vim
 share/nvim/runtime/syntax/valgrind.vim
@@ -1686,7 +1842,7 @@
 share/nvim/runtime/syntax/vroom.vim
 share/nvim/runtime/syntax/vsejcl.vim
 share/nvim/runtime/syntax/vue.vim
-share/nvim/runtime/syntax/wast.vim
+share/nvim/runtime/syntax/wat.vim
 share/nvim/runtime/syntax/wdiff.vim
 share/nvim/runtime/syntax/wdl.vim
 share/nvim/runtime/syntax/web.vim
@@ -1700,6 +1856,7 @@
 share/nvim/runtime/syntax/wsml.vim
 share/nvim/runtime/syntax/wvdial.vim
 share/nvim/runtime/syntax/xbl.vim
+share/nvim/runtime/syntax/xcompose.vim
 share/nvim/runtime/syntax/xdefaults.vim
 share/nvim/runtime/syntax/xf86conf.vim
 share/nvim/runtime/syntax/xhtml.vim
@@ -1718,14 +1875,18 @@
 share/nvim/runtime/syntax/yacc.vim
 share/nvim/runtime/syntax/yaml.vim
 share/nvim/runtime/syntax/z8a.vim
+share/nvim/runtime/syntax/zathurarc.vim
 share/nvim/runtime/syntax/zig.vim
 share/nvim/runtime/syntax/zimbu.vim
 share/nvim/runtime/syntax/zir.vim
+share/nvim/runtime/syntax/zserio.vim
 share/nvim/runtime/syntax/zsh.vim
 share/nvim/runtime/tools/check_colors.vim
 share/nvim/runtime/tools/emoji_list.vim
 share/nvim/runtime/tutor/en/vim-01-beginner.tutor
 share/nvim/runtime/tutor/en/vim-01-beginner.tutor.json
+share/nvim/runtime/tutor/ja/vim-01-beginner.tutor
+share/nvim/runtime/tutor/ja/vim-01-beginner.tutor.json
 share/nvim/runtime/tutor/tutor.tutor
 share/nvim/runtime/tutor/tutor.tutor.json
 @pkgdir lib/nvim
Index: editors/neovim/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/editors/neovim/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- editors/neovim/distinfo	2 Feb 2024 16:24:45 -0000	1.7
+++ editors/neovim/distinfo	24 May 2024 02:19:36 -0000
@@ -1,5 +1,7 @@
 $NetBSD: distinfo,v 1.7 2024/02/02 16:24:45 tm Exp $
 
-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
+BLAKE2s (neovim-0.10.0.tar.gz) = e3603b22541b0097e035996ba5fae18282b34957e6befe200ab4e6f2e9c4ff7f
+SHA512 (neovim-0.10.0.tar.gz) = 878cb58729a18179b38303bd9cf79e38997c87946665ac4e7b76d87e15f5d001028fd1454ce30b20773b20a4fe929dfa399fc2ec7f6db0774a4e864c9e8586c1
+Size (neovim-0.10.0.tar.gz) = 12792034 bytes
+SHA1 (patch-src_nvim_api_vim.c) = 1639756cb7d3831af4c049060fd9e9d5f033a12c
+SHA1 (patch-src_nvim_math.c) = 6dc85846a11156e6df419ffe45f7e6356a990712
Index: www/nginx/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/nginx/options.mk,v
retrieving revision 1.102
diff -u -r1.102 options.mk
--- www/nginx/options.mk	7 May 2024 14:15:29 -0000	1.102
+++ www/nginx/options.mk	24 May 2024 02:19:58 -0000
@@ -161,7 +161,7 @@
 DEPENDS+=		lua-resty-core>=0.1.27:../../www/lua-resty-core
 DEPENDS+=		lua-resty-lrucache>=0.13:../../www/lua-resty-lrucache
 CONFIGURE_ENV+=		LUAJIT_LIB=${PREFIX}/lib
-CONFIGURE_ENV+=		LUAJIT_INC=${PREFIX}/include/luajit-2.0
+CONFIGURE_ENV+=		LUAJIT_INC=${PREFIX}/include/luajit-2.1
 DSO_EXTMODS+=		lua
 PLIST.lua=		yes
 .endif
Index: www/nginx-devel/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/nginx-devel/options.mk,v
retrieving revision 1.29
diff -u -r1.29 options.mk
--- www/nginx-devel/options.mk	7 May 2024 13:43:55 -0000	1.29
+++ www/nginx-devel/options.mk	24 May 2024 02:20:15 -0000
@@ -161,7 +161,7 @@
 DEPENDS+=		lua-resty-core>=0.1.27:../../www/lua-resty-core
 DEPENDS+=		lua-resty-lrucache>=0.13:../../www/lua-resty-lrucache
 CONFIGURE_ENV+=		LUAJIT_LIB=${PREFIX}/lib
-CONFIGURE_ENV+=		LUAJIT_INC=${PREFIX}/include/luajit-2.0
+CONFIGURE_ENV+=		LUAJIT_INC=${PREFIX}/include/luajit-2.1
 DSO_EXTMODS+=		lua
 PLIST.lua=		yes
 .endif
Index: games/love09/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/love09/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- games/love09/Makefile	6 Apr 2024 08:05:33 -0000	1.23
+++ games/love09/Makefile	24 May 2024 18:00:05 -0000
@@ -23,6 +23,17 @@
 BUILDLINK_PASSTHRU_DIRS+=	${PREFIX}/love0.9/lib
 BUILDLINK_PASSTHRU_RPATHDIRS+=	${PREFIX}/love0.9/lib
 
+SUBST_CLASSES+=		lj
+.for f in auxiliar.c auxiliar.h buffer.c except.c inet.c luasocket.c	\
+	mime.c options.c select.c tcp.c timeout.c udp.c unix.c
+SUBST_FILES.lj+=	src/libraries/luasocket/libluasocket/${f}
+.endfor
+SUBST_MESSAGE.lj=	Substituting deprecated symbols.
+SUBST_STAGE.lj=		pre-configure
+SUBST_SED.lj=		-e 's/luaL_reg/luaL_Reg/g'
+SUBST_SED.lj+=		-e 's/luaL_putchar/luaL_addchar/g'
+SUBST_SED.lj+=		-e 's/luaL_typerror/luax_typerror/g'
+
 INSTALLATION_DIRS+=	bin
 post-install:
 	${LN} -sf ../love0.9/bin/love ${DESTDIR}${PREFIX}/bin/love0.9
Index: games/love010/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/love010/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- games/love010/Makefile	6 Apr 2024 08:05:33 -0000	1.23
+++ games/love010/Makefile	24 May 2024 18:00:16 -0000
@@ -23,6 +23,17 @@
 BUILDLINK_PASSTHRU_DIRS+=	${PREFIX}/love0.10/lib
 BUILDLINK_PASSTHRU_RPATHDIRS+=	${PREFIX}/love0.10/lib
 
+SUBST_CLASSES+=		lj
+.for f in auxiliar.c auxiliar.h buffer.c except.c inet.c luasocket.c	\
+	mime.c options.c select.c tcp.c timeout.c udp.c unix.c
+SUBST_FILES.lj+=	src/libraries/luasocket/libluasocket/${f}
+.endfor
+SUBST_MESSAGE.lj=	Substituting deprecated symbols.
+SUBST_STAGE.lj=		pre-configure
+SUBST_SED.lj=		-e 's/luaL_reg/luaL_Reg/g'
+SUBST_SED.lj+=		-e 's/luaL_putchar/luaL_addchar/g'
+SUBST_SED.lj+=		-e 's/luaL_typerror/luax_typerror/g'
+
 INSTALLATION_DIRS+=	bin
 post-install:
 	${LN} -sf ../love0.10/bin/love ${DESTDIR}${PREFIX}/bin/love0.10

Attachment: signature.asc
Description: PGP signature



Home | Main Index | Thread Index | Old Index