Re: update to Kakoune 2022.10.31

On Sun, Apr 30, 2023 at 03:23:40PM -0700, Nam Nguyen wrote:

[...]

> > Changes: https://github.com/mawww/kakoune/releases/tag/v2022.10.31
> >
> > `make test` results in partial failures:
> > Summary: 528 tests, 79 failures

[...]

> Adding LC_CTYPE="en_US.UTF-8" to MAKE_ENV allows `make test' to
> pass. There were some garbled characters in the test json output. I used
> textproc/jq to make sense of the test json output. Then, I saw that
> LC_CTYPE was defined in my environment but not in `env -i'.
>
> --8<---------------cut here---------------start------------->8---
> $ cd ${WRKSRC}/test
> $ env -i ./run highlight
> this fails.
> $ env -i LC_CTYPE="en_US.UTF-8" ./run highlight
> this passes.
> --8<---------------cut here---------------end--------------->8---

Thanks, this does it. I've added it to TEST_ENV which seems to be the
least intrusive way to fix this.

Updated diff below.
ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/kakoune/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 11 Mar 2022 18:58:30 -0000 1.6
+++ Makefile 1 May 2023 13:09:28 -0000
@@ -1,6 +1,6 @@
COMMENT = modal code editor with a focus on interactivity

-V = 2021.11.08
+V = 2022.10.31
DISTNAME = kakoune-${V}

CATEGORIES = editors
@@ -22,6 +22,8 @@ PERMIT_PACKAGE = Yes
COMPILER = base-clang ports-gcc
MAKE_ENV = CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" gzip_man=no
FAKE_FLAGS = PREFIX="${TRUEPREFIX}"
+# some tests fail without en_US.UTF-8
+TEST_ENV = LC_CTYPE="en_US.UTF-8"

USE_GMAKE = Yes

Index: distinfo
===================================================================
RCS file: /cvs/ports/editors/kakoune/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 25 Nov 2021 17:13:27 -0000 1.5
+++ distinfo 1 May 2023 13:09:28 -0000
@@ -1,2 +1,2 @@
-SHA256 (kakoune-2021.11.08.tar.bz2) = qjCInZ2hEzGiQ6j0D+T2qGGTIbGSF966yPVl4G7dtfQ=
-SIZE (kakoune-2021.11.08.tar.bz2) = 538466
+SHA256 (kakoune-2022.10.31.tar.bz2) = +zF7YskEjdx1Z/6D38QJwlLvhXeLJL0oY74nYtTk5Ys=
+SIZE (kakoune-2022.10.31.tar.bz2) = 556473
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/kakoune/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 11 Mar 2022 18:58:30 -0000 1.5
+++ pkg/PLIST 1 May 2023 13:09:28 -0000
@@ -8,6 +8,7 @@ share/kak/
share/kak/autoload
share/kak/colors/
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
@@ -61,6 +62,7 @@ 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
@@ -73,21 +75,25 @@ 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/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
@@ -147,6 +153,7 @@ 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
@@ -185,6 +192,7 @@ 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/x11.kak