diff --git a/devel/lua-language-server/Makefile b/devel/lua-language-server/Makefile
index 10ec7a0699b5..b71c2a3ad865 100644
--- a/devel/lua-language-server/Makefile
+++ b/devel/lua-language-server/Makefile
@@ -1,63 +1,64 @@
 PORTNAME=	lua-language-server
-DISTVERSION=	3.6.7
+DISTVERSION=	3.6.8
 CATEGORIES=	devel
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Sumneko Lua development server and LSP client
 WWW=		https://github.com/sumneko/lua-language-server
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libinotify.so:devel/libinotify
 
 USES=		compiler:features dos2unix lua:build ninja:make
 USE_GITHUB=	yes
 GH_ACCOUNT=	sumneko
 GH_TUPLE=	actboy168:bee.lua:4da6416:bee/3rd/bee.lua \
-		actboy168:bee.lua:233296d:bee_luamake/3rd/luamake/3rd/bee.lua \
-		actboy168:luamake:d5e957c:luamake/3rd/luamake \
-		cppcxy:EmmyLuaCodeStyle:9ffcbcb:emmyluacodestyle/3rd/EmmyLuaCodeStyle \
-		bjornbytes:lovr-docs:d3645ab:lovr/3rd/lovr-api \
-		love2d-community:love-api:bb3267e:love/3rd/love-api \
-		sqmedeiros:lpeglabel:f3745e2:lpeglabel/3rd/lpeglabel
+		actboy168:bee.lua:4c24786:bee_luamake/3rd/luamake/3rd/bee.lua \
+		actboy168:json.lua:b5f5e7b:json/3rd/json.lua \
+		actboy168:luamake:65e789b:luamake/3rd/luamake \
+		cppcxy:EmmyLuaCodeStyle:66eeece:emmyluacodestyle/3rd/EmmyLuaCodeStyle \
+		bjornbytes:lovr-docs:8900d79:lovr/3rd/lovr-api \
+		love2d-community:love-api:495ecc7:love/3rd/love-api \
+		sqmedeiros:lpeglabel:e25eb35:lpeglabel/3rd/lpeglabel
 
 BINARY_ALIAS=	gcc=${CC}
 DOS2UNIX_FILES=	3rd/bee.lua/bee/thread/spinlock.h \
 		3rd/luamake/3rd/bee.lua/bee/thread/spinlock.h
 SUB_FILES=	lua-language-server
 PLIST_FILES=	bin/lua-language-server \
 		${DATADIR_REL}/bin/lua-language-server \
 		${DATADIR_REL}/bin/main.lua \
 		${DATADIR_REL}/debugger.lua \
 		${DATADIR_REL}/main.lua
 PORTDATA=	locale meta script
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 130
 BUILD_DEPENDS+=	llvm13>0:devel/llvm13
 CPP=		${LOCALBASE}/bin/clang-cpp13
 CC=		${LOCALBASE}/bin/clang13
 CXX=		${LOCALBASE}/bin/clang++13
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; s|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/3rd/luamake/compile/ninja/freebsd.ninja \
 		${WRKSRC}/3rd/bee.lua/compile/common.lua
 
 do-build:
 	${DO_MAKE_BUILD} -C ${WRKSRC}/3rd/luamake -f compile/ninja/freebsd.ninja
 	cd ${WRKSRC} && ${MAKE_ENV} ./3rd/luamake/luamake -v
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/bin
 	${INSTALL_SCRIPT} ${WRKDIR}/lua-language-server ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/lua-language-server ${STAGEDIR}${DATADIR}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/main.lua ${STAGEDIR}${DATADIR}/bin
 	${INSTALL_DATA} ${WRKSRC}/debugger.lua ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/main.lua ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "locale meta script" ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.post.mk>
diff --git a/devel/lua-language-server/distinfo b/devel/lua-language-server/distinfo
index da34af6378a5..4692616bdb56 100644
--- a/devel/lua-language-server/distinfo
+++ b/devel/lua-language-server/distinfo
@@ -1,17 +1,19 @@
-TIMESTAMP = 1674231801
-SHA256 (sumneko-lua-language-server-3.6.7_GH0.tar.gz) = 23813deabe59f105f440410b3c9a59b616d5bbbf5ae784617af4c95499848aae
-SIZE (sumneko-lua-language-server-3.6.7_GH0.tar.gz) = 3289636
+TIMESTAMP = 1675175044
+SHA256 (sumneko-lua-language-server-3.6.8_GH0.tar.gz) = 9328b4248f83d6372ca8339529fecb4219c274dab4890381cb18042735cecefd
+SIZE (sumneko-lua-language-server-3.6.8_GH0.tar.gz) = 3293519
 SHA256 (actboy168-bee.lua-4da6416_GH0.tar.gz) = 1c6d8f23528849bbbd05e314cc8d3db48b0fdc9ab27562697ef0012de094e7de
 SIZE (actboy168-bee.lua-4da6416_GH0.tar.gz) = 480036
-SHA256 (actboy168-bee.lua-233296d_GH0.tar.gz) = 02418801ac67ec63ba69b2836b17ec1f123a205838cfce52a81fe1e8ebbed250
-SIZE (actboy168-bee.lua-233296d_GH0.tar.gz) = 479472
-SHA256 (actboy168-luamake-d5e957c_GH0.tar.gz) = 7eb311a4f17d097ea7e67a8244580db32af5459adb99df97fb635a420494ada1
-SIZE (actboy168-luamake-d5e957c_GH0.tar.gz) = 56278
-SHA256 (cppcxy-EmmyLuaCodeStyle-9ffcbcb_GH0.tar.gz) = 05ef9206730c32dae10eaaf354f010b45ab7f1709576438f1d2590024b8cf4d3
-SIZE (cppcxy-EmmyLuaCodeStyle-9ffcbcb_GH0.tar.gz) = 4243219
-SHA256 (bjornbytes-lovr-docs-d3645ab_GH0.tar.gz) = 2a50d6963a842f5c28f3bebb0a65c86c6aadffcbdc55802cb24cb86feebdf059
-SIZE (bjornbytes-lovr-docs-d3645ab_GH0.tar.gz) = 18070487
-SHA256 (love2d-community-love-api-bb3267e_GH0.tar.gz) = 512c5a1317cc21773f68583ac40937c6a09582e12ad4e9c7493914b0449213f3
-SIZE (love2d-community-love-api-bb3267e_GH0.tar.gz) = 151938
-SHA256 (sqmedeiros-lpeglabel-f3745e2_GH0.tar.gz) = e39cc61e39486c05a55b55a6e6c6a1a294afcfa029873ce55704cc116e5bab1c
-SIZE (sqmedeiros-lpeglabel-f3745e2_GH0.tar.gz) = 82984
+SHA256 (actboy168-bee.lua-4c24786_GH0.tar.gz) = 5a6914bf5d16e930641769287a5bc6ff97f5db5cae0f80dd48fc594fd84b2ec5
+SIZE (actboy168-bee.lua-4c24786_GH0.tar.gz) = 480322
+SHA256 (actboy168-json.lua-b5f5e7b_GH0.tar.gz) = ee05dd78a08105d2599c6c100c71301bde20633938a4c198495183bfb305910b
+SIZE (actboy168-json.lua-b5f5e7b_GH0.tar.gz) = 12660
+SHA256 (actboy168-luamake-65e789b_GH0.tar.gz) = db6e79fe13b33a6b16a95e919b1657876f039f76f40ca03b3afd7251d0a56342
+SIZE (actboy168-luamake-65e789b_GH0.tar.gz) = 56394
+SHA256 (cppcxy-EmmyLuaCodeStyle-66eeece_GH0.tar.gz) = 4b16eefc26dc70d124d14aef45bb7b6cb828ab6dd0228a4a365b4fac4487e598
+SIZE (cppcxy-EmmyLuaCodeStyle-66eeece_GH0.tar.gz) = 4243029
+SHA256 (bjornbytes-lovr-docs-8900d79_GH0.tar.gz) = 33b6ab2ec5dd7d26733bf2757d3a2b382174fbea2f18a06159ef753944c88239
+SIZE (bjornbytes-lovr-docs-8900d79_GH0.tar.gz) = 18070542
+SHA256 (love2d-community-love-api-495ecc7_GH0.tar.gz) = 9d63ae5a7a180d2f8db6bc52407900089c15e00b64e0cda65309e548369d06c2
+SIZE (love2d-community-love-api-495ecc7_GH0.tar.gz) = 152170
+SHA256 (sqmedeiros-lpeglabel-e25eb35_GH0.tar.gz) = 07b7771490d7dbd2a5aedc165e01bc4a33ef0e0b2e274182f20ac212a98c0620
+SIZE (sqmedeiros-lpeglabel-e25eb35_GH0.tar.gz) = 83005
diff --git a/devel/lua-language-server/files/patch-3rd_luamake_compile_ninja_freebsd.ninja b/devel/lua-language-server/files/patch-3rd_luamake_compile_ninja_freebsd.ninja
index 4d50b5458c8a..80e21ca065dc 100644
--- a/devel/lua-language-server/files/patch-3rd_luamake_compile_ninja_freebsd.ninja
+++ b/devel/lua-language-server/files/patch-3rd_luamake_compile_ninja_freebsd.ninja
@@ -1,54 +1,54 @@
---- 3rd/luamake/compile/ninja/freebsd.ninja.orig	2023-01-16 17:59:05 UTC
+--- 3rd/luamake/compile/ninja/freebsd.ninja.orig	2023-01-31 14:25:23 UTC
 +++ 3rd/luamake/compile/ninja/freebsd.ninja
 @@ -2,7 +2,7 @@ ninja_required_version = 1.7
  builddir = build/freebsd
  bin = $builddir/bin
  obj = $builddir/obj
 -cc = gcc
 +cc = %%CC%%
  luamake = luamake
  rule c_source_bee
    command = $cc -MMD -MT $out -MF $out.d  -O2 -Wall -Werror $
-@@ -24,7 +24,7 @@ build $obj/source_bee/format.obj: cxx_source_bee $
+@@ -25,7 +25,7 @@ build $obj/source_bee/format.obj: cxx_source_bee $
  build $obj/source_bee/os.obj: cxx_source_bee 3rd/bee.lua/bee/nonstd/fmt/os.cc
  rule cxx_source_bee_1
-   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $
--    -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -o $out -c $in
-+    -fvisibility=hidden -I3rd/bee.lua -I%%LOCALBASE%%/include -DNDEBUG -o $out -c $in
+   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+-    -Werror -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -o $out -c $in
++    -Werror -fvisibility=hidden -I3rd/bee.lua -I%%LOCALBASE%%/include -DNDEBUG -o $out -c $in
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -50,7 +50,7 @@ build $obj/source_bee/path_helper.obj: cxx_source_bee_
+@@ -51,7 +51,7 @@ build $obj/source_bee/path_helper.obj: cxx_source_bee_
  rule cxx_source_bee_2
-   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall -Werror $
-     -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I3rd/bee.lua $
+   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+     -Werror -fvisibility=hidden -I3rd/bee.lua/3rd/lua-seri -I3rd/bee.lua $
 -    -Itools/lua54 -DBEE_STATIC -DNDEBUG -o $out -c $in
 +    -Itools/lua54 -I%%LOCALBASE%%/include -DBEE_STATIC -DNDEBUG -o $out -c $in
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -80,7 +80,7 @@ build $obj/source_lua/utf8_crt.obj: c_source_lua $
+@@ -81,7 +81,7 @@ build $obj/source_lua/utf8_crt.obj: c_source_lua $
      3rd/bee.lua/3rd/lua/utf8_crt.c
  rule c_source_lua_1
    command = $cc -MMD -MT $out -MF $out.d  -O2 -Wall -Werror -DMAKE_LIB $
 -    -DLUA_USE_LINUX -DNDEBUG -Wno-maybe-uninitialized -o $out -c $in
 +    -DLUA_USE_LINUX -DNDEBUG -Wno-uninitialized -o $out -c $in
    description = Compile C   $out
    deps = gcc
    depfile = $out.d
-@@ -98,8 +98,7 @@ build $obj/source_bootstrap/main.obj: cxx_source_boots
+@@ -99,8 +99,7 @@ build $obj/source_bootstrap/main.obj: cxx_source_boots
  build $obj/source_bootstrap/progdir.obj: cxx_source_bootstrap $
      3rd/bee.lua/bootstrap/progdir.cpp
  rule link_luamake
 -  command = $cc $in -o $out -lm -Wl,-E -linotify -pthread -Wl,-Bstatic $
 -    -lstdc++ -Wl,-Bdynamic -static-libgcc -s
 +  command = $cc $in -o $out -lm -L%%LOCALBASE%%/lib -linotify -pthread -lstdc++ -s
    description = Link    Exe $out
  build $bin/luamake: link_luamake $obj/source_bootstrap/main.obj $
      $obj/source_bootstrap/progdir.obj $obj/source_bee/lua-seri.obj $
-@@ -142,4 +141,4 @@ build copy_script: phony $bin/main.lua
+@@ -143,4 +142,4 @@ build copy_script: phony $bin/main.lua
  build test: phony $obj/test.stamp
  build copy_luamake: phony luamake
  build notest: phony copy_luamake
 -default test notest
 +default notest