Hi Stuart,

On Tue, Apr 15, 2025 at 08:29:34PM +0100, Stuart Henderson wrote:
> > I see that FreeBSD's netsurf port (same netsurf version as ours) uses a
> > plain (updated) port of https://github.com/JuliaStrings/utf8proc rather
> > than netsurf's outdated fork of that same library.
> > 
> > Here's a diff to do the same here.

LGTM. And the following diff makes neovim work with it. Thankfully the build
system picks it up without any additional effort.

If you are OK with this, I suggest you commit the utf8proc change first, then I
can do this one.


Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/neovim/Makefile,v
diff -u -p -r1.55 Makefile
--- Makefile	15 Apr 2025 18:53:25 -0000	1.55
+++ Makefile	17 Apr 2025 15:15:21 -0000
@@ -12,6 +12,7 @@ EMBED_LUAJIT =	No
 COMMENT =	continuation and extension of Vim
 
 DIST_TUPLE =	github neovim neovim v0.11.0 .
+REVISION =	0
 
 # embedded luajit
 USE_NOBTCFI =	Yes
@@ -39,8 +40,6 @@ DIST_TUPLE +=	github tree-sitter-grammar
  		${STATIC_DEPS_WRKSRC}/parsers/treesitter_query
 DIST_TUPLE +=	github MDeiml tree-sitter-markdown v0.4.1 \
  		${STATIC_DEPS_WRKSRC}/parsers/treesitter_markdown
-DIST_TUPLE +=	github JuliaStrings utf8proc v2.10.0 \
-		${STATIC_DEPS_WRKSRC}/utf8proc
 
 # Neovim: Apache 2.0 + Vim License
 # LuaJIT: MIT + public domain
@@ -50,7 +49,7 @@ PERMIT_PACKAGE =	Yes
 DEBUG_PACKAGES =	${BUILD_PACKAGES}
 
 WANTLIB += c iconv intl m pthread
-WANTLIB += tree-sitter unibilium util uv
+WANTLIB += tree-sitter unibilium util utf8proc uv
 
 .if ${EMBED_LUAJIT} != "Yes"
 WANTLIB += ${MODLUA_WANTLIB}
@@ -76,6 +75,7 @@ BUILD_DEPENDS =		${RUN_DEPENDS} \
 LIB_DEPENDS =		devel/gettext,-runtime \
 			devel/libuv \
 			devel/unibilium \
+			textproc/libutf8proc \
 			textproc/tree-sitter>=0.25.3
 
 RUN_DEPENDS +=		devel/libmpack/lua \
@@ -88,9 +88,8 @@ RUN_DEPENDS +=		devel/libmpack/lua \
 SEPARATE_BUILD =	Yes
 CONFIGURE_ARGS +=	-DUSE_BUNDLED=OFF \
 			-DLUV_INCLUDE_DIR=${STATIC_DEPS_INST}/include \
-			-DLUV_LIBRARY=${STATIC_DEPS_INST}/lib/libluv.a \
-			-DUTF8PROC_LIBRARY=${STATIC_DEPS_INST}/lib/libutf8proc.a \
-			-DUTF8PROC_INCLUDE_DIR=${STATIC_DEPS_INST}/include/utf8proc
+			-DLUV_LIBRARY=${STATIC_DEPS_INST}/lib/libluv.a
+
 .if ${EMBED_LUAJIT} == "Yes"
 CONFIGURE_ARGS +=	-DLUA_PRG=${STATIC_DEPS_INST}/bin/luajit \
 			-DLUAJIT_INCLUDE_DIR=${STATIC_DEPS_INST}/include/luajit-2.1 \
@@ -199,19 +198,6 @@ pre-configure:
 	mkdir -p ${WRKBUILD}/lib/nvim/parser
 	cp -r ${PARSERS_WRKBUILD}/usr/lib/nvim/parser/*.so \
 		${WRKBUILD}/lib/nvim/parser/
-
-	# Build utf8proc.
-	mkdir -p ${STATIC_DEPS_WRKBUILD}/utf8proc
-	${MAKE_ENV} ${LOCALBASE}/bin/cmake -S ${STATIC_DEPS_WRKSRC}/utf8proc \
-		-B ${STATIC_DEPS_WRKBUILD}/utf8proc
-	${MAKE_ENV} ${LOCALBASE}/bin/cmake --build \
-		${STATIC_DEPS_WRKBUILD}/utf8proc -- VERBOSE=1
-
-	mkdir -p ${STATIC_DEPS_INST}/lib
-	cp ${STATIC_DEPS_WRKBUILD}/utf8proc/libutf8proc.a ${STATIC_DEPS_INST}/lib/
-	mkdir -p ${STATIC_DEPS_INST}/include/utf8proc
-	cp ${STATIC_DEPS_WRKSRC}/utf8proc/utf8proc.h \
-		${STATIC_DEPS_INST}/include/utf8proc
 
 # These are the "old tests". There is also a new suite, but we would need the
 # "busted" test suite for Lua, which is not yet ported.
Index: distinfo
===================================================================
RCS file: /cvs/ports/editors/neovim/distinfo,v
diff -u -p -r1.31 distinfo
--- distinfo	15 Apr 2025 18:53:25 -0000	1.31
+++ distinfo	17 Apr 2025 12:51:22 -0000
@@ -1,4 +1,3 @@
-SHA256 (JuliaStrings-utf8proc-v2.10.0.tar.gz) = b08bY52qbcqfgLxdsSM+nLqjGmd5CIcQYWCzPvdD8TY=
 SHA256 (LuaJIT-LuaJIT-538a82133ad6fddfd0ca64de167c4aca3bc1a2da.tar.gz) = esvDa+jyEHJCLrml5fxGjQ6qVb7BtwJg1lHoRWhGIeI=
 SHA256 (MDeiml-tree-sitter-markdown-v0.4.1.tar.gz) = 4P2y3KHrMGOUASLhR1ycKwaQYqY4yVk543TFQn7d7p8=
 SHA256 (keplerproject-lua-compat-5.3-v0.13.tar.gz) = 9dww57H9qFbuTTkr5FdkLB8MJZJkqbm/vLaAMCzoj8I=
@@ -9,7 +8,6 @@ SHA256 (neovim-tree-sitter-vimdoc-v3.0.1
 SHA256 (tree-sitter-grammars-tree-sitter-lua-v0.3.0.tar.gz) = o0zHCr/Y0tSw+r8BQD6gX4SOGkvDfYpL/qcWRlezXTE=
 SHA256 (tree-sitter-grammars-tree-sitter-query-v0.5.1.tar.gz) = /oxxKIClKdRUNHzUxYM2rC2yIkO65QVb21hE+z6lYZI=
 SHA256 (tree-sitter-tree-sitter-c-v0.23.4.tar.gz) = tmxQQ+JthOXxegWa9xsVe88gIiEGntIgqhaW19HSino=
-SIZE (JuliaStrings-utf8proc-v2.10.0.tar.gz) = 199045
 SIZE (LuaJIT-LuaJIT-538a82133ad6fddfd0ca64de167c4aca3bc1a2da.tar.gz) = 1083676
 SIZE (MDeiml-tree-sitter-markdown-v0.4.1.tar.gz) = 419261
 SIZE (keplerproject-lua-compat-5.3-v0.13.tar.gz) = 60960

-- 
Best Regards
Edd Barrett

https://www.theunixzoo.co.uk