<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/92361107b3e617929681505a6a3442649387e0af">https://github.com/macports/macports-ports/commit/92361107b3e617929681505a6a3442649387e0af</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 92361107b3e java 1.0 portgroup: remove java.enforce option
</span>92361107b3e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 92361107b3e617929681505a6a3442649387e0af
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Fri Oct 13 07:33:50 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> java 1.0 portgroup: remove java.enforce option
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/68449
</span>---
_resources/port1.0/group/java-1.0.tcl | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/java-1.0.tcl b/_resources/port1.0/group/java-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 05ef778644d..8e5112b6f6d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/java-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/java-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,17 +17,13 @@
</span> # - "+" and "*" wildcards are supported
#
# If the required Java cannot be found, an error will be thrown at pre-fetch.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Sometimes a port hard code inside produces scripts and other files used JVM,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# then its true use java.enforce to enforce dependency.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options java.version java.home java.fallback java.deptypes java.enforce
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options java.version java.home java.fallback java.deptypes
</span>
default java.version {}
default java.home {}
default java.fallback {[java::java_get_default_fallback]}
default java.deptypes lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default java.enforce no
</span>
# allow PortGroup to be used inside a variant (e.g. octave)
global java_version_not_found
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,7 +124,7 @@ namespace eval java {
</span> }
# Add dependency if required
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { (${java_version_not_found} || [option java.enforce]) && ${java.fallback} ne "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${java_version_not_found} && ${java.fallback} ne "" } {
</span> ui_debug "Adding dependency on JDK fallback ${java.fallback}"
foreach deptype [option java.deptypes] {
depends_${deptype}-append port:${java.fallback}
</pre><pre style='margin:0'>
</pre>