diff --git a/games/lwjgl3/Makefile b/games/lwjgl3/Makefile
index 62ec626bc982..9dc59b5a7edd 100644
--- a/games/lwjgl3/Makefile
+++ b/games/lwjgl3/Makefile
@@ -1,124 +1,122 @@
 PORTNAME=	lwjgl
 DISTVERSION=	3.3.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games java
 MASTER_SITES=	https://repo1.maven.org/:source1
 PKGNAMESUFFIX=	3
 DISTFILES=	maven2/com/beust/jcommander/1.78/jcommander-1.78.jar:source1 \
 		maven2/net/sf/jopt-simple/jopt-simple/5.0.4/jopt-simple-5.0.4.jar:source1 \
 		maven2/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar:source1 \
 		maven2/org/joml/joml/1.10.8/joml-1.10.8-sources.jar:source1 \
 		maven2/org/joml/joml/1.10.8/joml-1.10.8.jar:source1 \
 		maven2/org/jspecify/jspecify/1.0.0/jspecify-1.0.0-sources.jar:source1 \
 		maven2/org/jspecify/jspecify/1.0.0/jspecify-1.0.0.jar:source1 \
 		maven2/org/openjdk/jmh/jmh-core/1.37/jmh-core-1.37-sources.jar:source1 \
 		maven2/org/openjdk/jmh/jmh-core/1.37/jmh-core-1.37.jar:source1 \
 		maven2/org/openjdk/jmh/jmh-generator-annprocess/1.37/jmh-generator-annprocess-1.37.jar:source1 \
 		maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar:source1 \
 		maven2/org/slf4j/slf4j-jdk14/1.7.36/slf4j-jdk14-1.7.36.jar:source1 \
 		maven2/org/testng/testng/7.5/testng-7.5-sources.jar:source1 \
 		maven2/org/testng/testng/7.5/testng-7.5.jar:source1 \
 		maven2/org/webjars/jquery/3.5.1/jquery-3.5.1.jar:source1
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Lightweight Java Game Library
 WWW=		https://www.lwjgl.org
 
 LICENSE=	BSD3CLAUSE
 
 ONLY_FOR_ARCHS=		amd64
 ONLY_FOR_ARCHS_REASON=	Upstream support FreeBSD on amd64 only: https://github.com/LWJGL/lwjgl3/issues/421
 
 BUILD_DEPENDS=		${LOCALBASE}/openjdk8/bin/java:java/openjdk8 \
-			kotlinc-jvm:lang/kotlin
+			kotlinc-jvm:lang/kotlin22
 LIB_DEPENDS=		libdraco.so:archivers/draco \
 			libopenal.so:audio/openal-soft \
 			libopus.so:audio/opus \
 			libdbus-1.so:devel/dbus \
 			libhwloc.so:devel/hwloc2 \
 			libffi.so:devel/libffi \
 			libbgfx.so:graphics/bgfx \
 			libglfw.so:graphics/glfw \
 			libktx.so:graphics/khronos-texture \
 			libopenxr_loader.so:graphics/openxr \
 			libshaderc_shared.so:graphics/shaderc \
 			libspirv-cross-c-shared.so:graphics/spirv-cross \
 			libassimp.so:multimedia/assimp \
 			libfreetype.so:print/freetype2 \
 			libharfbuzz.so:print/harfbuzz
 
 USES=		gl gnome java:ant,run
-JAVA_VERSION=	17+
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME:tu}
 GH_PROJECT=	${PORTNAME}${PKGNAMESUFFIX}
 USE_GL=		gl
 USE_GNOME=	glib20 gtk30
+JAVA_VERSION=	17+
 
 MAKE_ARGS=	-Dbuild.offline=true \
 		-Djavadoc.skip=true \
 		-Duse.libffi.so=true \
 		-Dlibffi.path=${LOCALBASE}/lib \
 		-Dlocal.kotlin=${LOCALBASE}/share/kotlin
 MAKE_ENV+=	JAVA8_HOME=${LOCALBASE}/openjdk8
 
 PLIST_SUB+=	MAJORVERSION=${PKGNAMESUFFIX}
 
 LIBSDIR=	${WRKSRC}/bin/libs/native/freebsd/*/org/lwjgl
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386
 MAKE_ENV+=	ANT_OPTS=-Xmx2G
 .endif
 
 post-extract:
 	${MKDIR} ${WRKSRC}/bin/libs/java
 	${LN} -s ${DISTDIR}/maven2/com/beust/jcommander/1.78/jcommander-1.78.jar \
 		${WRKSRC}/bin/libs/java/jcommander.jar
 	${LN} -s ${DISTDIR}/maven2/net/sf/jopt-simple/jopt-simple/5.0.4/jopt-simple-5.0.4.jar \
 		${WRKSRC}/bin/libs/java/jopt-simple.jar
 	${LN} -s ${DISTDIR}/maven2/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar \
 		${WRKSRC}/bin/libs/java/commons-math3.jar
 	${LN} -s ${DISTDIR}/maven2/org/joml/joml/1.10.8/joml-1.10.8-sources.jar \
 		${WRKSRC}/bin/libs/java/joml-sources.jar
 	${LN} -s ${DISTDIR}/maven2/org/joml/joml/1.10.8/joml-1.10.8.jar \
 		${WRKSRC}/bin/libs/java/joml.jar
 	${LN} -s ${DISTDIR}/maven2/org/jspecify/jspecify/1.0.0/jspecify-1.0.0-sources.jar \
 		${WRKSRC}/bin/libs/java/jspecify-sources.jar
 	${CP}    ${DISTDIR}/maven2/org/jspecify/jspecify/1.0.0/jspecify-1.0.0.jar \
 		${WRKSRC}/bin/libs/java/jspecify.jar
 	${LN} -s ${DISTDIR}/maven2/org/openjdk/jmh/jmh-core/1.37/jmh-core-1.37-sources.jar \
 		${WRKSRC}/bin/libs/java/jmh-core-sources.jar
 	${LN} -s ${DISTDIR}/maven2/org/openjdk/jmh/jmh-core/1.37/jmh-core-1.37.jar \
 		${WRKSRC}/bin/libs/java/jmh-core.jar
 	${LN} -s ${DISTDIR}/maven2/org/openjdk/jmh/jmh-generator-annprocess/1.37/jmh-generator-annprocess-1.37.jar \
 		${WRKSRC}/bin/libs/java/jmh-generator-annprocess.jar
 	${LN} -s ${DISTDIR}/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar \
 		${WRKSRC}/bin/libs/java/slf4j-api.jar
 	${LN} -s ${DISTDIR}/maven2/org/slf4j/slf4j-jdk14/1.7.36/slf4j-jdk14-1.7.36.jar \
 		${WRKSRC}/bin/libs/java/slf4j-jdk14.jar
 	${LN} -s ${DISTDIR}/maven2/org/testng/testng/7.5/testng-7.5-sources.jar \
 		${WRKSRC}/bin/libs/java/testng-sources.jar
 	${LN} -s ${DISTDIR}/maven2/org/testng/testng/7.5/testng-7.5.jar \
 		${WRKSRC}/bin/libs/java/testng.jar
 	${LN} -s ${DISTDIR}/maven2/org/webjars/jquery/3.5.1/jquery-3.5.1.jar \
 		${WRKSRC}/bin/libs/java/jquery.jar
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/config/freebsd/build.xml \
 		${WRKSRC}/modules/lwjgl/cuda/src/main/java/org/lwjgl/cuda/CUDA.java
 
 do-install:
 	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${ANT} release ${MAKE_ARGS}
-	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}${PKGNAMESUFFIX}
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX}
-.for x in ${WRKSRC}/bin/RELEASE/lwjgl*/*.jar
-	${INSTALL_DATA} ${WRKSRC}${x} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}${PKGNAMESUFFIX}/
-.endfor
-.for x in ${LIBSDIR}/liblwjgl.so ${LIBSDIR}/*/liblwjgl*.so
-	${INSTALL_LIB} ${WRKSRC}${x} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX}/
-.endfor
+	${MKDIR} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}${PKGNAMESUFFIX} \
+		 ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX}
+	${INSTALL_DATA} ${WRKSRC}/bin/RELEASE/lwjgl*/*.jar \
+		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}${PKGNAMESUFFIX}
+	${INSTALL_LIB} ${LIBSDIR}/liblwjgl.so ${LIBSDIR}/*/liblwjgl*.so \
+		${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX}
 
 .include <bsd.port.post.mk>
diff --git a/games/lwjgl3/files/patch-build.xml b/games/lwjgl3/files/patch-build.xml
new file mode 100644
index 000000000000..d828dd88ad87
--- /dev/null
+++ b/games/lwjgl3/files/patch-build.xml
@@ -0,0 +1,24 @@
+--- build.xml.orig	2025-01-04 19:11:17 UTC
++++ build.xml
+@@ -132,8 +132,8 @@
+         <echo message="Compiling Kotlin generator..." level="info" taskname="Generator" unless:set="generator-uptodate"/>
+         <mkdir dir="${bin.generator}"/>
+         <kotlinc moduleName="generator" output="${bin.generator}" printVersion="true" unless:set="generator-uptodate">
+-            <compilerarg line="-language-version 2.1"/>
+-            <compilerarg line="-api-version 2.1"/>
++            <compilerarg line="-language-version 2.2"/>
++            <compilerarg line="-api-version 2.2"/>
+             <compilerarg value="-progressive"/>
+             <compilerarg value="-Xno-call-assertions"/>
+             <compilerarg value="-Xno-param-assertions"/>
+@@ -200,8 +200,8 @@
+                 <pathelement location="${bin.generator}"/>
+             </classpath>
+ 
+-            <compilerarg line="-language-version 2.1"/>
+-            <compilerarg line="-api-version 2.1"/>
++            <compilerarg line="-language-version 2.2"/>
++            <compilerarg line="-api-version 2.2"/>
+             <compilerarg value="-progressive"/>
+             <compilerarg value="-Xno-call-assertions"/>
+             <compilerarg value="-Xno-param-assertions"/>
diff --git a/games/lwjgl3/files/patch-config_build-definitions.xml b/games/lwjgl3/files/patch-config_build-definitions.xml
index a8664fe7cb93..e915e119bd76 100644
--- a/games/lwjgl3/files/patch-config_build-definitions.xml
+++ b/games/lwjgl3/files/patch-config_build-definitions.xml
@@ -1,12 +1,12 @@
---- config/build-definitions.xml.orig	2023-12-18 14:22:59 UTC
+--- config/build-definitions.xml.orig	2025-01-04 19:11:17 UTC
 +++ config/build-definitions.xml
-@@ -100,7 +100,8 @@ This script is included in /build.xml and /config/upda
+@@ -121,7 +121,8 @@ -->
  
      <property name="lib" location="bin/libs" relative="true"/>
  
 -    <property name="kotlinc" location="${lib}/kotlinc" relative="true"/>
 +    <property name="kotlinc" location="${lib}/kotlinc" relative="true" unless:set="local.kotlin"/>
 +    <property name="kotlinc" location="${local.kotlin}" relative="false" if:set="local.kotlin"/>
  
      <property name="module.lwjgl" location="modules/lwjgl" relative="true"/>
  
diff --git a/games/lwjgl3/files/patch-config_freebsd_build.xml b/games/lwjgl3/files/patch-config_freebsd_build.xml
index 530d057d94a3..6e651e48968c 100644
--- a/games/lwjgl3/files/patch-config_freebsd_build.xml
+++ b/games/lwjgl3/files/patch-config_freebsd_build.xml
@@ -1,32 +1,32 @@
---- config/freebsd/build.xml.orig	2023-12-18 14:22:59 UTC
+--- config/freebsd/build.xml.orig	2025-01-04 19:11:17 UTC
 +++ config/freebsd/build.xml
-@@ -159,16 +159,18 @@
+@@ -158,16 +158,18 @@
                      <include name="${module.lwjgl}/jawt/src/generated/c/*.c" if:true="${binding.jawt}"/>
                  </fileset>
              </source>
 -            <beforeLink>
 +            <beforeLink unless:true="${use.libffi.so}">
                  <parallel threadsPerProcessor="2" failonany="true" unless:set="lib-dependencies-uptodate">
                      <update-dependency module="core" artifact="core/libffi.a"/>
                  </parallel>
              </beforeLink>
              <link>
 -                <fileset dir="${lib.native}/org/lwjgl">
 +                <fileset dir="${lib.native}/org/lwjgl" unless:true="${use.libffi.so}">
                      <include name="libffi.a"/>
                  </fileset>
                  <arg value="-ldl"/>
 +                <arg value="-lffi" if:true="${use.libffi.so}"/>
 +                <arg value="-L${libffi.path}" if:set="libffi.path"/>
              </link>
          </build>
  
-@@ -410,7 +412,7 @@
+@@ -424,7 +426,7 @@
          </build>
  
          <!-- zstd -->
 -        <build module="zstd" simple="true" if:true="${binding.zstd}">
 +        <build module="zstd" simple="true" flags="-Wno-deprecated-declarations" if:true="${binding.zstd}">
              <beforeCompile>
                  <compile flags="-DZSTD_MULTITHREAD">
                      <arg value="-I${module.lwjgl.rel}/xxhash/src/main/c"/>