git: 0e73709c572b - main - games/lwjgl3: Unbreak after update lang/kotlin to 2.3.0

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0e73709c572b05f47abca16f6cc3dd197d614f22

commit 0e73709c572b05f47abca16f6cc3dd197d614f22
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2026-01-01 21:04:52 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-01-01 21:10:01 +0000

    games/lwjgl3: Unbreak after update lang/kotlin to 2.3.0
    
    Since Kotlin 2.3.0, Ant support has been removed, but lwjgl3 has complex
    long ongoing migration story from Ant to Gradle.
    Depends on new port lang/kotlin22 with Kotlin 2.2.21. Hopefully after
    migration the port may be removed.
    
    While here improve port:
    - Fix warnings from portclippy.
    - Optimize do-install goal.
    - Refresh patches.
    
    PR:     292099
---
 games/lwjgl3/Makefile                              | 20 ++++++++----------
 games/lwjgl3/files/patch-build.xml                 | 24 ++++++++++++++++++++++
 .../files/patch-config_build-definitions.xml       |  4 ++--
 games/lwjgl3/files/patch-config_freebsd_build.xml  |  6 +++---
 4 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/games/lwjgl3/Makefile b/games/lwjgl3/Makefile
index 62ec626bc982..9dc59b5a7edd 100644
--- a/games/lwjgl3/Makefile
+++ b/games/lwjgl3/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	lwjgl
 DISTVERSION=	3.3.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games java
 MASTER_SITES=	https://repo1.maven.org/:source1
 PKGNAMESUFFIX=	3
@@ -31,7 +31,7 @@ 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 \
@@ -49,12 +49,12 @@ LIB_DEPENDS=		libdraco.so:archivers/draco \
 			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 \
@@ -112,13 +112,11 @@ post-patch:
 
 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,6 +1,6 @@
---- 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"/>
  
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,6 +1,6 @@
---- 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>
@@ -21,7 +21,7 @@
              </link>
          </build>
  
-@@ -410,7 +412,7 @@
+@@ -424,7 +426,7 @@
          </build>
  
          <!-- zstd -->