Re: net/i2p, java/tanukiwrapper: jdk 11+ build problems

On Thu, 31 Jul 2025 18:52:17 +0200,
Stuart Henderson <stu@spacehopper.org> wrote:
>
> If someone is interested in i2p, can you please take a look at getting
> tanukiwrapper to build with MODJAVA_VER set to 11 or 11+? Currently with
> that, it fails with
>
> [javac] error: Source option 1.4 is no longer supported. Use 6 or later.
> [javac] error: Target option 1.4 is no longer supported. Use 1.6 or later.
>

Well, because fix of this issue is quite trivial, here a diff which fixes
building on jdk11 and jdk21.

Diff contains changes after make update-pathces.

Ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/java/tanukiwrapper/Makefile,v
diff -u -p -r1.27 Makefile
--- Makefile 26 Sep 2023 11:47:58 -0000 1.27
+++ Makefile 1 Aug 2025 16:34:46 -0000
@@ -1,7 +1,7 @@
COMMENT= Tanuki Java Service Wrapper

V= 3.5.49
-REVISION= 0
+REVISION= 1
DISTNAME= wrapper_${V}_src
PKGNAME= java-tanukiwrapper-${V}
CATEGORIES= java
@@ -14,7 +14,7 @@ SITES= https://download.tanukisoftware.
PERMIT_PACKAGE= Yes

MODULES= java
-MODJAVA_VER= 1.8
+MODJAVA_VER= 11+
MODJAVA_BUILD= ant

.if ${MACHINE_ARCH} == "i386"
Index: patches/patch-build_xml
===================================================================
RCS file: /cvs/ports/java/tanukiwrapper/patches/patch-build_xml,v
diff -u -p -r1.7 patch-build_xml
--- patches/patch-build_xml 8 Mar 2022 00:55:14 -0000 1.7
+++ patches/patch-build_xml 1 Aug 2025 16:34:46 -0000
@@ -29,7 +29,7 @@ Index: build.xml
<isset property="is.solaris"/>
</or>
</condition>
-@@ -1846,6 +1851,10 @@ wrapper.filter.action.999=NONE]]></replacevalue>
+@@ -1844,6 +1849,10 @@ wrapper.filter.action.999=NONE]]></replacevalue>
<release-delta-extract-platform osname="linux" osarch="armel" bits="32" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
<release-delta-extract-platform osname="linux" osarch="armhf" bits="32" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
<release-delta-extract-platform osname="linux" osarch="arm" bits="64" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
Index: patches/patch-default_properties
===================================================================
RCS file: patches/patch-default_properties
diff -N patches/patch-default_properties
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-default_properties 1 Aug 2025 16:34:46 -0000
@@ -0,0 +1,14 @@
+Compatibilty with JDK11+
+
+Index: default.properties
+--- default.properties.orig
++++ default.properties
+@@ -28,7 +28,7 @@ build.compress = false
+ junit.failonerror = true
+
+ # Minimum version of Java required to build the Wrapper
+-javac.target.version=1.4
++javac.target.version=1.8
+
+ # Location of java to build the pre-release
+ javac.dir=E:\\j2sdk1.4.2_19
Index: patches/patch-src_c_wrapper_c
===================================================================
RCS file: /cvs/ports/java/tanukiwrapper/patches/patch-src_c_wrapper_c,v
diff -u -p -r1.6 patch-src_c_wrapper_c
--- patches/patch-src_c_wrapper_c 8 Mar 2022 00:55:14 -0000 1.6
+++ patches/patch-src_c_wrapper_c 1 Aug 2025 16:34:46 -0000
@@ -12,7 +12,7 @@ Index: src/c/wrapper.c
#include <sys/param.h>
#include <errno.h>
#else /* LINUX */
-@@ -5886,7 +5886,7 @@ int wrapperRunCommonInner() {
+@@ -5895,7 +5895,7 @@ int wrapperRunCommonInner() {
tz1 = tzname[0];
tz2 = tzname[1];