git: 1407e225ecb2 - main - java/jxgrabkey: support jdk21

The branch main has been updated by ronald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1407e225ecb29899f7e82abf978a36b8da0c6d9b

commit 1407e225ecb29899f7e82abf978a36b8da0c6d9b
Author:     Ronald Klop <ronald@FreeBSD.org>
AuthorDate: 2025-12-31 10:27:30 +0000
Commit:     Ronald Klop <ronald@FreeBSD.org>
CommitDate: 2026-01-17 20:41:29 +0000

    java/jxgrabkey: support jdk21
    
    Don't pin javac to source/target.
    
    Revert ports c0eef0ceec76f8e99a152aca04e938dcb12f7261 for this.
    
    PR:     292152
---
 java/jxgrabkey/Makefile                              |  4 +---
 .../patch-JXGrabKey_Java_nbproject_build-impl.xml    | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/java/jxgrabkey/Makefile b/java/jxgrabkey/Makefile
index 6db3918c613e..f418c688ccf3 100644
--- a/java/jxgrabkey/Makefile
+++ b/java/jxgrabkey/Makefile
@@ -21,12 +21,11 @@ TEST_BUILD_DEPENDS=	${JAVALIBDIR}/junit.jar:java/junit	\
 MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} OPSYS=${OPSYS}
 PLIST_FILES=	%%JAVAJARDIR%%/JXGrabKey.jar lib/libJXGrabKey.so
 USE_LDCONFIG=	yes
-ANT_ARGS=	-Djavac.source=1.7 -Djavac.target=1.7
 
 do-build:
 	${SETENV} ${MAKE_ENV} ${MAKE} -C ${WRKSRC}/JXGrabKey/C++	\
 		-f ${FILESDIR}/Makefile.JXGrabKey libJXGrabKey.so
-	cd ${WRKSRC}/JXGrabKey/Java && ${ANT} -verbose jar ${ANT_ARGS}
+	cd ${WRKSRC}/JXGrabKey/Java && ${ANT} -verbose jar
 
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/JXGrabKey/C++/libJXGrabKey.so ${STAGEDIR}${PREFIX}/lib/
@@ -38,7 +37,6 @@ do-test-TEST-on: build
 		${SETENV} CLASSPATH=${JAVALIBDIR}/junit.jar:${JAVALIBDIR}/hamcrest.jar	\
 		    LD_LIBRARY_PATH=${WRKSRC}/JXGrabKey/C++	\
 			${ANT} -Djavac.classpath=${JAVALIBDIR}/junit.jar \
-			    ${ANT_ARGS} \
 			    test
 
 .include <bsd.port.mk>
diff --git a/java/jxgrabkey/files/patch-JXGrabKey_Java_nbproject_build-impl.xml b/java/jxgrabkey/files/patch-JXGrabKey_Java_nbproject_build-impl.xml
new file mode 100644
index 000000000000..7042411c7acd
--- /dev/null
+++ b/java/jxgrabkey/files/patch-JXGrabKey_Java_nbproject_build-impl.xml
@@ -0,0 +1,20 @@
+--- JXGrabKey/Java/nbproject/build-impl.xml.orig	2025-12-29 19:23:44 UTC
++++ JXGrabKey/Java/nbproject/build-impl.xml
+@@ -165,7 +165,7 @@ is divided into following sections:
+             <sequential>
+                 <property location="${build.dir}/empty" name="empty.dir"/>
+                 <mkdir dir="${empty.dir}"/>
+-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
++                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" sourcepath="@{sourcepath}" srcdir="@{srcdir}">
+                     <src>
+                         <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                             <include name="*"/>
+@@ -537,7 +537,7 @@ is divided into following sections:
+             -->
+     <target depends="init" name="-javadoc-build">
+         <mkdir dir="${dist.javadoc.dir}"/>
+-        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
++        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+             <classpath>
+                 <path path="${javac.classpath}"/>
+             </classpath>