neovim: 0.8.0 -> 0.8.1

4 files changed, 28 insertions, 17 deletions

diff --git a/neovim/.footprint b/neovim/.footprint
index e02789e64..a501d4af4 100644
--- a/neovim/.footprint
+++ b/neovim/.footprint
@@ -3,11 +3,6 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/nvim
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/nvim/
-drwxr-xr-x	root/root	usr/lib/nvim/parser/
--rwxr-xr-x	root/root	usr/lib/nvim/parser/c.so
--rwxr-xr-x	root/root	usr/lib/nvim/parser/help.so
--rwxr-xr-x	root/root	usr/lib/nvim/parser/lua.so
--rwxr-xr-x	root/root	usr/lib/nvim/parser/vim.so
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/nvim.desktop
@@ -265,8 +260,6 @@ drwxr-xr-x	root/root	usr/share/nvim/runtime/doc/
 -rw-r--r--	root/root	usr/share/nvim/runtime/doc/lua.txt
 -rw-r--r--	root/root	usr/share/nvim/runtime/doc/luaref.txt
 -rw-r--r--	root/root	usr/share/nvim/runtime/doc/luvref.txt
--rwxr-xr-x	root/root	usr/share/nvim/runtime/doc/makehtml.awk
--rwxr-xr-x	root/root	usr/share/nvim/runtime/doc/maketags.awk
 -rw-r--r--	root/root	usr/share/nvim/runtime/doc/map.txt
 -rw-r--r--	root/root	usr/share/nvim/runtime/doc/mbyte.txt
 -rw-r--r--	root/root	usr/share/nvim/runtime/doc/message.txt
@@ -874,6 +867,8 @@ drwxr-xr-x	root/root	usr/share/nvim/runtime/keymap/
 drwxr-xr-x	root/root	usr/share/nvim/runtime/lua/
 -rw-r--r--	root/root	usr/share/nvim/runtime/lua/health.lua
 -rw-r--r--	root/root	usr/share/nvim/runtime/lua/man.lua
+drwxr-xr-x	root/root	usr/share/nvim/runtime/lua/man/
+-rw-r--r--	root/root	usr/share/nvim/runtime/lua/man/health.lua
 drwxr-xr-x	root/root	usr/share/nvim/runtime/lua/vim/
 -rw-r--r--	root/root	usr/share/nvim/runtime/lua/vim/F.lua
 -rw-r--r--	root/root	usr/share/nvim/runtime/lua/vim/_editor.lua
diff --git a/neovim/.signature b/neovim/.signature
index fe2ae697c..b3ea4950f 100644
--- a/neovim/.signature
+++ b/neovim/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/egrim+Eldk0cId+ismAyA13P+IHRfyXx2encS4CbEAobqepiUp1Oy/RmEIPDTTf7i1QsLJcJHwvWWJDPvZ7zw4=
-SHA256 (Pkgfile) = 54780eb1cb0c178f0cad5be85375db31e4fd83dc24011b0eb3aa578169ce164e
-SHA256 (.footprint) = b8372b20d6101fa6f3292287bf9c2a274cd41d5e7dada520b542f20e698d55c4
-SHA256 (neovim-0.8.0.tar.gz) = 505e3dfb71e2f73495c737c034a416911c260c0ba9fd2092c6be296655be4d18
+RWSE3ohX2g5d/UMXqOX8Q3jvcUozqAr2BbqXdyUC9Uz3WqUROGjU/4qDZCIR4gMK7QM7NE0cwsooZ8OKjQ8cdSSu6rwcEnXv9gI=
+SHA256 (Pkgfile) = 04bf368943ba0f5a2c69df75463a4073cdab041d7f494e323a2323694d43ef00
+SHA256 (.footprint) = 94a9328ab9435366574e907c6a0c7d1bdf971adb445f8bc86acf1105ce4f2cc1
+SHA256 (neovim-0.8.1.tar.gz) = b4484e130aa962457189f3dee34b8481943c1e395d2d684c6f8b91598494d9ec
diff --git a/neovim/Pkgfile b/neovim/Pkgfile
index d0721d753..efe887f39 100644
--- a/neovim/Pkgfile
+++ b/neovim/Pkgfile
@@ -1,11 +1,11 @@
 # Description: Vim-fork focused on extensibility and usability
 # URL: https://neovim.io/
 # Maintainer: Tim Biermann, tbier at posteo dot de
-# Depends on: cmake git unzip
-# Optional: ninja tree-sitter
+# Depends on: git unzip
+# Optional: libluv libtermkey libuv libvterm lua51-lpeg lua51-mpack luajit luarocks msgpack-c tree-sitter tree-sitter-c tree-sitter-lua tree-sitter-vimdoc tree-sitter-viml unibilium
 
 name=neovim
-version=0.8.0
+version=0.8.1
 release=1
 source=(https://github.com/neovim/neovim/archive/v$version/$name-$version.tar.gz)
 
@@ -17,15 +17,25 @@ build() {
     export AR=llvm-ar NM=llvm-nm RANLIB=llvm-ranlib && \
     export LDFLAGS+=' -fuse-ld=lld -flto=thin'
 
-  prt-get isinst ninja && PKGMK_NEOVIM+=' -G Ninja'
-  cmake -S neovim-$version/cmake.deps -B neovim-$version/.deps $PKGMK_NEOVIM \
+  prt-get isinst libtermkey && PKGMK_NEOVIM_DEPS+=' -D USE_BUNDLED_LIBTERMKEY=OFF'
+  prt-get isinst libuv && PKGMK_NEOVIM_DEPS+=' -D USE_BUNDLED_LIBUV=OFF'
+  prt-get isinst libvterm && PKGMK_NEOVIM_DEPS+=' -D USE_BUNDLED_LIBVTERM=OFF'
+  prt-get isinst luajit lua51-lpeg lua51-mpack && PKGMK_NEOVIM_DEPS+=' -D USE_BUNDLED_LUAJIT=OFF'
+  prt-get isinst luarocks lua51-lpeg lua51-mpack && PKGMK_NEOVIM_DEPS+=' -D USE_BUNDLED_LUAROCKS=OFF'
+  prt-get isinst libluv && PKGMK_NEOVIM_DEPS+=' -D USE_BUNDLED_LUV=OFF'
+  prt-get isinst msgpack-c && PKGMK_NEOVIM_DEPS+=' -D USE_BUNDLED_MSGPACK=OFF'
+  prt-get isinst tree-sitter && PKGMK_NEOVIM_DEPS+=' -D USE_BUNDLED_TS=OFF'
+  prt-get isinst tree-sitter-c tree-sitter-lua tree-sitter-vimdoc tree-sitter-viml && PKGMK_NEOVIM_DEPS+=' -D USE_BUNDLED_TS_PARSERS=OFF'
+  prt-get isinst unibilium && PKGMK_NEOVIM_DEPS+=' -D USE_BUNDLED_UNIBILIUM=OFF'
+
+  cmake -S neovim-$version/cmake.deps -B neovim-$version/.deps -G Ninja $PKGMK_NEOVIM_DEPS \
     -D CMAKE_BUILD_TYPE=Release \
     -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
     -D CMAKE_CXX_FLAGS_RELEASE="$CFLAGS" \
     -Wno-dev
   cmake --build neovim-$version/.deps
 
-  cmake -S neovim-$version -B build $PKGMK_NEOVIM \
+  cmake -S neovim-$version -B build -G Ninja $PKGMK_NEOVIM \
     -D CMAKE_INSTALL_PREFIX=/usr \
     -D CMAKE_INSTALL_LIBDIR=lib \
     -D CMAKE_BUILD_TYPE=Release \
@@ -37,5 +47,6 @@ build() {
 
   install -Dm644 neovim-$version/runtime/nvim.desktop $PKG/usr/share/applications/nvim.desktop
   install -Dm644 neovim-$version/runtime/nvim.png $PKG/usr/share/pixmaps/nvim.png
+
   rm -r $PKG/usr/share/locale
 }
diff --git a/neovim/maintainer_clean_footprint b/neovim/maintainer_clean_footprint
new file mode 100755
index 000000000..20a977f24
--- /dev/null
+++ b/neovim/maintainer_clean_footprint
@@ -0,0 +1,5 @@
+#!/bin/sh
+rm -f footprint.in
+mv .footprint footprint.in
+sed '/usr\/lib\/nvim\/parser\//d' footprint.in > .footprint
+rm -f footprint.in