pkg/58893: editors/kakoune: update to v2024.05.18

[db7%mini.fritz.box@localhost]

>Number:         58893
>Category:       pkg
>Synopsis:       update kakoune editor to version 2024.05.18
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Dec 11 12:55:00 +0000 2024
>Originator:     db7%sdf.org@localhost
>Release:        Darwin 24.1.0
>Organization:
>Environment:
System: Darwin mini.local 24.1.0 Darwin Kernel Version 24.1.0: Thu Oct 10 21:05:14 PDT 2024; root:xnu-11215.41.3~2/RELEASE_ARM64_T8103 arm64


>Description:
	Update kakoune editor to a more recent version. Current version in
	pkgsrc is 4 years old.

>How-To-Repeat:
	
>Fix:

commit 2301f0cc6f4ff98e501306bbb72f3da90c162c10
Author: db7%sdf.org@localhost
Date:   Sat Dec 7 14:57:36 2024 +0100

    editors/kakoune: update to v2024.05.18

    Kakoune 2024.05.18

    * Fixed tests on Alpine Linux and *BSD

    Kakoune 2024.05.09

    * `flag-lines -after` switch to display text after the line

    * `shell-script-candidates` completion now runs the script asynchronously
      while displaying and updating results live.

    * `%val{window_range}` elements are now emitted as different strings

    * `+` only duplicates identical selections a single time to avoid surprising
      and slow exponential growth in the number of selections.

    * `daemonize-session` command makes it possible to convert the current session
      to a daemon one (which will not exit on last client disconnecting)

    * View mode commands and mouse scrolling no longer change selections when those go off-screen.

    * New commands `git apply`, `git blame-jump`, `git edit` and `git grep`.

    * `git blame` now also works in `git-diff` and `git-log` buffers.

    * Completions provided via `shell-script-candidates` or `completers` are no longer sorted if the typed text is empty.

    * The `terminal` alias has been replaced with a command that selects terminal program and placement based on windowing options.

    * `local` scopes in `commands` and `evaluate-commands`.

    Kakoune 2023.08.08

    * Fix compilation errors on FreeBSD and MacOS using clang

    Kakoune 2023.07.29

    * `<a-u>` and `<a-U>` now undo/redo selection changes; the previous meaning
      of moving in history tree has been moved to `<c-j>` and `<c-k>`

    * `%exp{...}` expansions provide flexible quoting for expanded strings
      (as double quoted strings)

    * `<c-g>` cancels the current operation and goes back to the main event
      loop, this provides an escape hatch when Kakoune seems to hang due to
      a costly operation

    * `show-matching -previous` highlighter will fall back onto the character
      preceeding the cursor

    Kakoune 2022.10.31

    * `complete-command` (See <<commands#configuring-command-completion,`:doc commands configuring-command-completion`>>)

    * `p`, `P`, `!` and `<a-!>` commands now select the inserted text

    * `x` now just extends the selection to contain full lines (as `<a-x>` did)
      `<a-x>` trims partial lines from the selection (as `<a-X>` did)

    * User mappings is now bound to `<space>` while keeping/removing main selection
      moved to `,` and `<a-,>`

    * Prompt history registers `%reg{colon}`, `%reg{slash}` and `%reg{pipe}` now
      have reverse chronological order

    * Executing user mode mappings no longer adds to prompt history registers.

    Kakoune 2021.11.07

    * Support for curly and separately colored underlines (undocumented in 2021.10.28)

    * Fixes for terminal flickering

    * Fixes for command and response fifo corner cases

    Kakoune 2021.10.28

    * `g` and `v` do not auto lower case the next key, so `GL` needs to be
      manually mapped to `Gl` for example.

    Kakoune 2021.08.28

    * command and response fifo support
      (See <<expansions#command-and-response-fifo,`:doc expansions command-and-response-fifo`>>)

    * Shell expansions only trim the last trailing newline instead of all of
      them to make is possible to losslessly pass text through `%sh{...}`.

    * `set-option -remove` support for subtracting/removing from option values

    * Menu completions such as command name completion are now auto-inserted on
      space

    * `write -atomic` was replaced with `write -method [replace|overwrite]` to
      make both write methods available explicitly

    * `write <filename>` will fail if the given filename already exists and is
      a regular file. Use the `-force` switch to override that behaviour.

    Kakoune 2020.09.01

    * The `repl` and `send-text` aliases have been renamed respectively into
      `repl-new` and `repl-send-text`.

    * Daemon mode (`-d` switch) does not fork anymore.

    * Replace NCursesUI with a custom terminal UI implementation

    Kakoune 2020.08.04

    * Introduce `User` hook support.

    * The `bold` and `italic` faces are no longer built-in. Highlighters
      are expected to use face attributes (`+b` and `+i`, respectively) to
      decorate text.

    * The `lint-enable` command no longer needs to be called to display
      linting errors. The `lint-disable` command was renamed into
      `lint-hide-diagnostics`.

    * The `+<length>` part of a `range-specs` highlighter consistently
      refers to the length of the target range.

    * clients stdin is transferred to the server, making it possible
      to pipe into `kak -c <session>`

    * Faces can have an alpha channel, specified using the
      `rgba:RRGGBBAA` format.

    * replace-ranges highlighter now support empty and multi-lines ranges

    * `%val{...}` now expands to list of strings, `$kak_quoted_...` now work
      as expected with these.

    * `*SetOption` hooks filter string will contain a value only for options
      of int/str/bool types to avoid performance issue with generating those
      on more complex option types.

diff --git a/doc/CHANGES-2024 b/doc/CHANGES-2024
index ce7d66c148c..42431d6ca62 100644
--- a/doc/CHANGES-2024
+++ b/doc/CHANGES-2024
@@ -6054,7 +6054,7 @@ Changes to the packages collection and infrastructure in 2024:
 	Updated security/py-certbot-nginx to 2.11.0 [adam 2024-06-06]
 	Updated wm/icewm to 3.5.0 [ktnb 2024-06-06]
 	Removed wm/icewm13 [ktnb 2024-06-06]
-	Removed wm/icewm14 [ktnb 2024-06-06]
+	Removed wm/icewm14 [ktnb 2024-06-06]
 	Removed wm/icewm-imlib [ktnb 2024-06-06]
 	Updated devel/py-pyobjc to 10.3 [adam 2024-06-06]
 	Updated www/py-uwsgi to 2.0.26 [adam 2024-06-06]
@@ -11370,3 +11370,4 @@ Changes to the packages collection and infrastructure in 2024:
 	Updated devel/py-dulwich to 0.22.6 [adam 2024-12-11]
 	Updated devel/py-pkginfo to 1.12.0 [adam 2024-12-11]
 	Updated devel/py-poetry to 1.8.5 [adam 2024-12-11]
+	Updated editors/kakoune to 2024.05.18nb1 [db7 2024-12-11]
diff --git a/editors/kakoune/Makefile b/editors/kakoune/Makefile
index 95a6ce9c906..09c6e7d1383 100644
--- a/editors/kakoune/Makefile
+++ b/editors/kakoune/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.8 2024/05/06 08:40:24 jperkin Exp $

-DISTNAME=	kakoune-2020.01.16
+DISTNAME=	kakoune-2024.05.18
 PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mawww/}
@@ -12,15 +12,12 @@ HOMEPAGE=	https://kakoune.org/
 COMMENT=	Experimental modal code editor
 LICENSE=	unlicense

-BUILD_DIRS=	src
-USE_TOOLS+=	gmake pkg-config
+USE_TOOLS+=	make pkg-config
 USE_LANGUAGES=	c c++

-USE_CXX_FEATURES+=	c++17
+USE_CXX_FEATURES+=	c++20

-CXXFLAGS+=	-D'KAK_BIN_PATH="${PREFIX}/bin/kak"'
-MAKE_FLAGS+=	mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-MAKE_FLAGS+=	gzip_man=no
+MAKE_FLAGS+=	PREFIX=${PREFIX}

 LDFLAGS.SunOS+=	-lsocket -lnsl

diff --git a/editors/kakoune/PLIST b/editors/kakoune/PLIST
index bf4862a43a9..43d45d19685 100644
--- a/editors/kakoune/PLIST
+++ b/editors/kakoune/PLIST
@@ -1,14 +1,17 @@
-@comment $NetBSD: PLIST,v 1.2 2020/03/22 10:35:44 nia Exp $
+@comment $NetBSD$
 bin/kak
+libexec/kak/kak
 man/man1/kak.1
 share/doc/kak/README.asciidoc
 share/kak/autoload
 share/kak/colors/base16.kak
+share/kak/colors/black-on-white.kak
 share/kak/colors/default.kak
 share/kak/colors/desertex.kak
 share/kak/colors/github.kak
 share/kak/colors/greyscale.kak
-share/kak/colors/gruvbox.kak
+share/kak/colors/gruvbox-dark.kak
+share/kak/colors/gruvbox-light.kak
 share/kak/colors/kaleidoscope-dark.kak
 share/kak/colors/kaleidoscope-light.kak
 share/kak/colors/lucius.kak
@@ -44,6 +47,7 @@ share/kak/kakrc
 share/kak/rc/detection/editorconfig.kak
 share/kak/rc/detection/file.kak
 share/kak/rc/detection/modeline.kak
+share/kak/rc/filetype/apl.kak
 share/kak/rc/filetype/arch-linux.kak
 share/kak/rc/filetype/asciidoc.kak
 share/kak/rc/filetype/awk.kak
@@ -52,30 +56,47 @@ share/kak/rc/filetype/cabal.kak
 share/kak/rc/filetype/clojure.kak
 share/kak/rc/filetype/cmake.kak
 share/kak/rc/filetype/coffee.kak
+share/kak/rc/filetype/conf.kak
+share/kak/rc/filetype/coq.kak
 share/kak/rc/filetype/crystal.kak
 share/kak/rc/filetype/css.kak
 share/kak/rc/filetype/cucumber.kak
+share/kak/rc/filetype/cue.kak
 share/kak/rc/filetype/d.kak
 share/kak/rc/filetype/dart.kak
 share/kak/rc/filetype/dhall.kak
+share/kak/rc/filetype/diff-parse.pl
 share/kak/rc/filetype/diff.kak
 share/kak/rc/filetype/dockerfile.kak
 share/kak/rc/filetype/elixir.kak
 share/kak/rc/filetype/elm.kak
+share/kak/rc/filetype/elvish.kak
+share/kak/rc/filetype/erlang.kak
+share/kak/rc/filetype/eruby.kak
 share/kak/rc/filetype/etc.kak
 share/kak/rc/filetype/exherbo.kak
+share/kak/rc/filetype/fennel.kak
+share/kak/rc/filetype/fidl.kak
 share/kak/rc/filetype/fish.kak
 share/kak/rc/filetype/fsharp.kak
 share/kak/rc/filetype/gas.kak
+share/kak/rc/filetype/gdscript.kak
+share/kak/rc/filetype/gentoo-linux.kak
 share/kak/rc/filetype/git.kak
+share/kak/rc/filetype/github.kak
 share/kak/rc/filetype/gluon.kak
 share/kak/rc/filetype/go.kak
+share/kak/rc/filetype/graphql.kak
+share/kak/rc/filetype/gren.kak
+share/kak/rc/filetype/groovy.kak
 share/kak/rc/filetype/haml.kak
+share/kak/rc/filetype/hare.kak
 share/kak/rc/filetype/haskell.kak
 share/kak/rc/filetype/hbs.kak
 share/kak/rc/filetype/html.kak
 share/kak/rc/filetype/i3.kak
 share/kak/rc/filetype/ini.kak
+share/kak/rc/filetype/janet.kak
 share/kak/rc/filetype/java.kak
 share/kak/rc/filetype/javascript.kak
 share/kak/rc/filetype/jinja.kak
@@ -84,6 +105,7 @@ share/kak/rc/filetype/julia.kak
 share/kak/rc/filetype/just.kak
 share/kak/rc/filetype/kakrc.kak
 share/kak/rc/filetype/kickstart.kak
+share/kak/rc/filetype/kotlin.kak
 share/kak/rc/filetype/latex.kak
 share/kak/rc/filetype/ledger.kak
 share/kak/rc/filetype/lisp.kak
@@ -92,15 +114,23 @@ share/kak/rc/filetype/mail.kak
 share/kak/rc/filetype/makefile.kak
 share/kak/rc/filetype/markdown.kak
 share/kak/rc/filetype/mercurial.kak
+share/kak/rc/filetype/mercury.kak
+share/kak/rc/filetype/meson.kak
+share/kak/rc/filetype/mlb.kak
 share/kak/rc/filetype/moon.kak
 share/kak/rc/filetype/nim.kak
+share/kak/rc/filetype/ninja.kak
 share/kak/rc/filetype/nix.kak
 share/kak/rc/filetype/ocaml.kak
+share/kak/rc/filetype/odin.kak
+share/kak/rc/filetype/pascal.kak
 share/kak/rc/filetype/perl.kak
 share/kak/rc/filetype/php.kak
 share/kak/rc/filetype/pony.kak
+share/kak/rc/filetype/prolog.kak
 share/kak/rc/filetype/protobuf.kak
 share/kak/rc/filetype/pug.kak
+share/kak/rc/filetype/purescript.kak
 share/kak/rc/filetype/python.kak
 share/kak/rc/filetype/r.kak
 share/kak/rc/filetype/ragel.kak
@@ -112,37 +142,58 @@ share/kak/rc/filetype/scala.kak
 share/kak/rc/filetype/scheme.kak
 share/kak/rc/filetype/scss.kak
 share/kak/rc/filetype/sh.kak
+share/kak/rc/filetype/sml.kak
 share/kak/rc/filetype/sql.kak
+share/kak/rc/filetype/svelte.kak
 share/kak/rc/filetype/swift.kak
 share/kak/rc/filetype/systemd.kak
 share/kak/rc/filetype/taskpaper.kak
+share/kak/rc/filetype/tcl.kak
 share/kak/rc/filetype/terraform.kak
 share/kak/rc/filetype/toml.kak
 share/kak/rc/filetype/troff.kak
 share/kak/rc/filetype/tupfile.kak
+share/kak/rc/filetype/twig.kak
+share/kak/rc/filetype/vhdl.kak
 share/kak/rc/filetype/void-linux.kak
 share/kak/rc/filetype/yaml.kak
+share/kak/rc/filetype/zig.kak
+share/kak/rc/tools/autorestore.asciidoc
 share/kak/rc/tools/autorestore.kak
 share/kak/rc/tools/autowrap.kak
 share/kak/rc/tools/clang.kak
 share/kak/rc/tools/comment.kak
 share/kak/rc/tools/ctags.kak
+share/kak/rc/tools/doc.asciidoc
 share/kak/rc/tools/doc.kak
 share/kak/rc/tools/format.kak
 share/kak/rc/tools/git.kak
-share/kak/rc/tools/go/go-tools.kak
+share/kak/rc/tools/go/gopls.kak
 share/kak/rc/tools/grep.kak
+share/kak/rc/tools/jump.kak
+share/kak/rc/tools/lint.asciidoc
 share/kak/rc/tools/lint.kak
 share/kak/rc/tools/make.kak
 share/kak/rc/tools/man.kak
+share/kak/rc/tools/menu.kak
+share/kak/rc/tools/patch-range.pl
+share/kak/rc/tools/patch.kak
 share/kak/rc/tools/python/jedi.kak
 share/kak/rc/tools/rust/racer.kak
 share/kak/rc/tools/spell.kak
+share/kak/rc/windowing/appleterminal.kak
+share/kak/rc/windowing/detection.kak
 share/kak/rc/windowing/iterm.kak
 share/kak/rc/windowing/kitty.kak
 share/kak/rc/windowing/new-client.kak
+share/kak/rc/windowing/repl/dtach.kak
+share/kak/rc/windowing/repl/kitty.kak
 share/kak/rc/windowing/repl/tmux.kak
 share/kak/rc/windowing/repl/x11.kak
 share/kak/rc/windowing/screen.kak
+share/kak/rc/windowing/sway.kak
 share/kak/rc/windowing/tmux.kak
+share/kak/rc/windowing/wayland.kak
+share/kak/rc/windowing/wezterm.kak
 share/kak/rc/windowing/x11.kak
+share/kak/rc/windowing/zellij.kak
diff --git a/editors/kakoune/distinfo b/editors/kakoune/distinfo
index a3417b9662c..51980a5ee17 100644
--- a/editors/kakoune/distinfo
+++ b/editors/kakoune/distinfo
@@ -1,12 +1,6 @@
 $NetBSD: distinfo,v 1.7 2021/10/26 10:21:31 nia Exp $

-BLAKE2s (kakoune-2020.01.16.tar.bz2) = 16a8ed602ec08af24cddbc42a26a2fe9846c8693c478a48d5aa8dadeb96db487
-SHA512 (kakoune-2020.01.16.tar.bz2) = c7b5b2790f3ecaf3a94b72e1d2f75fbbde8a7e8d3696f8a633439eb39a7331809d7fc13290bc781350fd6efe4cd823625438fe719f99bf18cfaff8a9a5773156
-Size (kakoune-2020.01.16.tar.bz2) = 478509 bytes
-SHA1 (patch-src_Makefile) = efdae51f3ae0389c1d6ce39dfe35c95c890ad0be
-SHA1 (patch-src_commands.cc) = 0904deb1b4d14ffc73d4182a61c12f0de82186fa
-SHA1 (patch-src_event__manager.cc) = 8666702d13d416fdb7b7cbaf55615b736f7b09a8
-SHA1 (patch-src_file.cc) = 490872503d1f5b73281095aa7552f6c8819a7969
-SHA1 (patch-src_insert__completer.cc) = 993dc13309483d9a7191f0d9f0cb7e76d6429a2b
-SHA1 (patch-src_normal.cc) = ca7fc93d78bd85614a905a0b945a4bbb7c45ab69
-SHA1 (patch-src_string__utils.cc) = f232d13f3e39124058354c6f9d20ff2936f58ba9
+BLAKE2s (kakoune-2024.05.18.tar.bz2) = 53df8c13b713f0235479b57ad404ed91ed995967625b0c307eced570833fe2db
+SHA512 (kakoune-2024.05.18.tar.bz2) = 4feba6b9a75fd16c1c8151139ac5a98d113f2ab1a5c9e7d03ac194d9d6d67d7dfa25b4e6073546b8dafa241de5db4ddbce4405faa42d710bbc9200f3fab12e4b
+Size (kakoune-2024.05.18.tar.bz2) = 588347 bytes
+SHA1 (patch-Makefile) = 9631c27b0c187fb7a93f4f3aa123763d711f8038
diff --git a/editors/kakoune/patches/patch-Makefile b/editors/kakoune/patches/patch-Makefile
new file mode 100644
index 00000000000..f4a5d6be593
--- /dev/null
+++ b/editors/kakoune/patches/patch-Makefile
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Change man installation path to the pkgsrc standard.
+
+--- Makefile.orig	2024-12-11 11:59:33.506278551 +0000
++++ Makefile
+@@ -40,7 +40,7 @@ bindir = $(DESTDIR)$(PREFIX)/bin
+ libexecdir = $(DESTDIR)$(PREFIX)/libexec/kak
+ sharedir = $(DESTDIR)$(PREFIX)/share/kak
+ docdir = $(DESTDIR)$(PREFIX)/share/doc/kak
+-mandir = $(DESTDIR)$(PREFIX)/share/man/man1
++mandir = $(DESTDIR)$(PREFIX)/man/man1
+
+ # Both Cygwin and MSYS2 have "_NT" in their uname.
+ os = $(shell uname | sed 's/.*_NT.*/Windows/')
diff --git a/editors/kakoune/patches/patch-src_Makefile b/editors/kakoune/patches/patch-src_Makefile
deleted file mode 100644
index ceac2da0914..00000000000
--- a/editors/kakoune/patches/patch-src_Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-src_Makefile,v 1.3 2020/05/14 19:06:55 joerg Exp $
-
-Do not force -O3 or -g.
-
---- src/Makefile.orig	2020-01-16 09:52:20.000000000 +0000
-+++ src/Makefile
-@@ -16,7 +16,6 @@ ifeq ($(debug),yes)
-     suffix := .debug
- else
-     ifeq ($(debug),no)
--        CXXFLAGS += -O3
-         suffix := .opt
-     else
-         $(error debug should be either yes or no)
-@@ -90,11 +89,11 @@ else
-     LDFLAGS += -rdynamic
- endif
-
--CXXFLAGS += -pedantic -std=c++17 -g -Wall -Wextra -Wno-unused-parameter -Wno-sign-compare -Wno-address
-+CXXFLAGS += -pedantic -std=c++17 -Wall -Wextra -Wno-unused-parameter -Wno-sign-compare -Wno-address
-
- compiler := $(shell $(CXX) --version)
- ifneq (,$(findstring clang,$(compiler)))
--    CXXFLAGS += -frelaxed-template-template-args
-+#    CXXFLAGS += -frelaxed-template-template-args
- else ifneq (,$(findstring GCC,$(compiler)))
-     CXXFLAGS += -Wno-init-list-lifetime
- endif
diff --git a/editors/kakoune/patches/patch-src_commands.cc b/editors/kakoune/patches/patch-src_commands.cc
deleted file mode 100644
index 17429c637eb..00000000000
--- a/editors/kakoune/patches/patch-src_commands.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_commands.cc,v 1.1 2020/05/14 19:06:55 joerg Exp $
-
---- src/commands.cc.orig	2020-05-11 00:38:19.003563913 +0000
-+++ src/commands.cc
-@@ -1962,7 +1962,7 @@ const CommandDesc eval_string_cmd = {
-             ScopedSetBool disable_hoooks(context.hooks_disabled(), no_hooks);
-
-             if (parser.get_switch("verbatim"))
--                CommandManager::instance().execute_single_command(parser | gather<Vector>(), context, shell_context);
-+                CommandManager::instance().execute_single_command(parser | gather<Vector<String>>(), context, shell_context);
-             else
-                 CommandManager::instance().execute(join(parser, ' ', false), context, shell_context);
-         });
diff --git a/editors/kakoune/patches/patch-src_event__manager.cc b/editors/kakoune/patches/patch-src_event__manager.cc
deleted file mode 100644
index e06c01709b4..00000000000
--- a/editors/kakoune/patches/patch-src_event__manager.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_event__manager.cc,v 1.1 2019/07/25 15:34:48 nia Exp $
-
-Include string.h for the benefit of FD_ZERO's memcpy needs on illumos.
-
---- src/event_manager.cc.orig	2019-07-01 12:07:29.000000000 +0000
-+++ src/event_manager.cc
-@@ -3,6 +3,7 @@
- #include "flags.hh"
- #include "ranges.hh"
-
-+#include <string.h>
- #include <unistd.h>
-
- namespace Kakoune
diff --git a/editors/kakoune/patches/patch-src_file.cc b/editors/kakoune/patches/patch-src_file.cc
deleted file mode 100644
index 2103e700653..00000000000
--- a/editors/kakoune/patches/patch-src_file.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-src_file.cc,v 1.3 2020/03/22 10:45:10 nia Exp $
-
-Allow KAK_BIN_PATH to be used as a fallback for finding the executable
-path on more platforms.
-
-Note: the author of kakoune rejected making this fully portable.
-
---- src/file.cc.orig	2020-01-16 09:52:20.000000000 +0000
-+++ src/file.cc
-@@ -21,7 +21,7 @@
- #include <sys/select.h>
- #include <unistd.h>
-
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #include <sys/sysctl.h>
- #endif
-
-@@ -624,7 +624,7 @@ String get_kak_binary_path()
-     kak_assert(res != -1);
-     buffer[res] = '\0';
-     return buffer;
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__)
-     int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
-     size_t res = sizeof(buffer);
-     sysctl(mib, 4, buffer, &res, NULL, 0);
-@@ -648,10 +648,8 @@ String get_kak_binary_path()
-     kak_assert(res != -1);
-     buffer[res] = '\0';
-     return buffer;
--#elif defined(__OpenBSD__)
--    return KAK_BIN_PATH;
- #else
--# error "finding executable path is not implemented on this platform"
-+    return KAK_BIN_PATH;
- #endif
- }
-
diff --git a/editors/kakoune/patches/patch-src_insert__completer.cc b/editors/kakoune/patches/patch-src_insert__completer.cc
deleted file mode 100644
index 7517502b165..00000000000
--- a/editors/kakoune/patches/patch-src_insert__completer.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_insert__completer.cc,v 1.1 2020/05/14 19:06:55 joerg Exp $
-
---- src/insert_completer.cc.orig	2020-05-11 00:26:58.591197327 +0000
-+++ src/insert_completer.cc
-@@ -15,7 +15,7 @@
- #include "option_types.hh"
- #include "utf8_iterator.hh"
- #include "user_interface.hh"
--
-+#include "ranges.hh"
- #include <numeric>
- #include <utility>
-
-@@ -119,7 +119,7 @@ InsertCompletion complete_word(const Sel
-     auto& word_db = get_word_db(buffer);
-     Vector<RankedMatchAndBuffer> matches = word_db.find_matching(prefix)
-                                          | transform([&](auto& m) { return RankedMatchAndBuffer{m, &buffer}; })
--                                         | gather<Vector>();
-+                                         | gather<Vector<RankedMatchAndBuffer>>();
-     // Remove words that are being edited
-     for (auto& word_count : sel_word_counts)
-     {
diff --git a/editors/kakoune/patches/patch-src_normal.cc b/editors/kakoune/patches/patch-src_normal.cc
deleted file mode 100644
index 21d8d260385..00000000000
--- a/editors/kakoune/patches/patch-src_normal.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_normal.cc,v 1.1 2020/05/14 19:06:55 joerg Exp $
-
---- src/normal.cc.orig	2020-05-11 00:48:13.234212710 +0000
-+++ src/normal.cc
-@@ -646,7 +646,7 @@ void insert_output(Context& context, Nor
-                 return ShellManager::instance().eval(
-                     cmdline, context, content(context.buffer(), sel),
-                     ShellManager::Flags::WaitForStdout).first;
--            }) | gather<Vector>();
-+            }) | gather<Vector<String>>();
-
-             selections.set_main_index(old_main);
-             selections.insert(ins, mode);
diff --git a/editors/kakoune/patches/patch-src_string__utils.cc b/editors/kakoune/patches/patch-src_string__utils.cc
deleted file mode 100644
index c18ebdf7d1d..00000000000
--- a/editors/kakoune/patches/patch-src_string__utils.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_string__utils.cc,v 1.1 2020/05/14 19:06:55 joerg Exp $
-
---- src/string_utils.cc.orig	2020-05-11 00:59:12.075369477 +0000
-+++ src/string_utils.cc
-@@ -381,7 +381,7 @@ UnitTest test_string{[]()
- {
-     kak_assert(String("youpi ") + "matin" == "youpi matin");
-
--    auto wrapped = "wrap this paragraph\n respecting whitespaces and much_too_long_words" | wrap_at(16) | gather<Vector>();
-+    auto wrapped = "wrap this paragraph\n respecting whitespaces and much_too_long_words" | wrap_at(16) | gather<Vector<String>>();
-     kak_assert(wrapped.size() == 6);
-     kak_assert(wrapped[0] == "wrap this");
-     kak_assert(wrapped[1] == "paragraph");
-@@ -390,7 +390,7 @@ UnitTest test_string{[]()
-     kak_assert(wrapped[4] == "much_too_long_wo");
-     kak_assert(wrapped[5] == "rds");
-
--    auto wrapped2 = "error: unknown type" | wrap_at(7) | gather<Vector>();
-+    auto wrapped2 = "error: unknown type" | wrap_at(7) | gather<Vector<String>>();
-     kak_assert(wrapped2.size() == 3);
-     kak_assert(wrapped2[0] == "error:");
-     kak_assert(wrapped2[1] == "unknown");