git: c03e6f5e9038 - main - devel/flexdock: unpin openjdk8

From: Ronald Klop <ronald_at_FreeBSD.org>
Date: Fri, 10 Jul 2026 07:07:14 UTC
The branch main has been updated by ronald:

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

commit c03e6f5e90384b94479881734fe5f31f21c22657
Author:     Ronald Klop <ronald@FreeBSD.org>
AuthorDate: 2026-07-10 06:58:39 +0000
Commit:     Ronald Klop <ronald@FreeBSD.org>
CommitDate: 2026-07-10 07:07:06 +0000

    devel/flexdock: unpin openjdk8
    
    Builds fine with modern JDK.
    Dependency math/scilab uses openjdk8 so this needs to generate
    Java 8 compatible class files.
    
    NB: I think upstream moved here: https://gitlab.com/scilab/forge/flexdock
    
    NB2: Remove java:run as it is a library. The final application will decide
    what JDK to run with, so no need to install multiple JDKs.
    
    Approved-by:    no maintainer
---
 devel/flexdock/Makefile              | 5 ++---
 devel/flexdock/files/patch-build.xml | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/devel/flexdock/Makefile b/devel/flexdock/Makefile
index 81d845c215f1..978ec740e5b5 100644
--- a/devel/flexdock/Makefile
+++ b/devel/flexdock/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	flexdock
 PORTVERSION=	1.2.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel java
 MASTER_SITES=	http://forge.scilab.org/index.php/p/${PORTNAME}/downloads/get/
 
@@ -11,8 +11,7 @@ WWW=		https://forge.scilab.org/index.php/p/flexdock/
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USES=		java:ant,run
-JAVA_VERSION=  8 # math/scilab needs java 8 compatible classes
+USES=		java:ant
 
 ALL_TARGET=	dist
 NO_ARCH=	yes
diff --git a/devel/flexdock/files/patch-build.xml b/devel/flexdock/files/patch-build.xml
index 34cb0d2df09e..7d3c1acd6559 100644
--- a/devel/flexdock/files/patch-build.xml
+++ b/devel/flexdock/files/patch-build.xml
@@ -5,7 +5,7 @@
     <target name="compile" depends="init, resources"
             description="Compile java sources for the framework, demos, and tests">
 -      <javac classpathref="javac.classpath" destdir="${bin.dir}" debug="true" source="1.5" target="1.5" includeAntRuntime="no">
-+      <javac classpathref="javac.classpath" destdir="${bin.dir}" debug="true" includeAntRuntime="no">
++      <javac classpathref="javac.classpath" destdir="${bin.dir}" debug="true" source="8" target="8" includeAntRuntime="no">
           <compilerarg value="-Xlint"/>
           <src path="${java.src.core}" />
           <!-- the next 3 are interdependent -->
@@ -15,8 +15,8 @@
        </javac>
 -      <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" debug="true" source="1.5" target="1.5" includeAntRuntime="no"/>
 -      <javac classpathref="javac.classpath.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" source="1.5" target="1.5"  includeAntRuntime="no"/>
-+      <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" debug="true" includeAntRuntime="no"/>
-+      <javac classpathref="javac.classpath.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" includeAntRuntime="no"/>
++      <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" debug="true" source="8" target="8" includeAntRuntime="no"/>
++      <javac classpathref="javac.classpath.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" source="8" target="8"  includeAntRuntime="no"/>
     </target>