From 8cc82991495ff6aa00dcea88a6b1fcb2ee89f119 Mon Sep 17 00:00:00 2001 From: Christopher Chavez Date: Fri, 13 Oct 2023 07:33:50 -0500 Subject: [PATCH] java 1.0 portgroup: remove java.enforce option Closes: https://trac.macports.org/ticket/68449 --- _resources/port1.0/group/java-1.0.tcl | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/_resources/port1.0/group/java-1.0.tcl b/_resources/port1.0/group/java-1.0.tcl index 05ef778644d06..8e5112b6f6d4d 100644 --- a/_resources/port1.0/group/java-1.0.tcl +++ b/_resources/port1.0/group/java-1.0.tcl @@ -17,17 +17,13 @@ # - "+" and "*" wildcards are supported # # If the required Java cannot be found, an error will be thrown at pre-fetch. -# -# Sometimes a port hard code inside produces scripts and other files used JVM, -# then its true use java.enforce to enforce dependency. -options java.version java.home java.fallback java.deptypes java.enforce +options java.version java.home java.fallback java.deptypes default java.version {} default java.home {} default java.fallback {[java::java_get_default_fallback]} default java.deptypes lib -default java.enforce no # allow PortGroup to be used inside a variant (e.g. octave) global java_version_not_found @@ -128,7 +124,7 @@ namespace eval java { } # Add dependency if required - if { (${java_version_not_found} || [option java.enforce]) && ${java.fallback} ne "" } { + if { ${java_version_not_found} && ${java.fallback} ne "" } { ui_debug "Adding dependency on JDK fallback ${java.fallback}" foreach deptype [option java.deptypes] { depends_${deptype}-append port:${java.fallback}