<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a0946e5aa380bc1cc188a0e9c78454de0b055339">https://github.com/macports/macports-ports/commit/a0946e5aa380bc1cc188a0e9c78454de0b055339</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a0946e5aa380bc1cc188a0e9c78454de0b055339
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Feb 24 08:30:56 2023 +1100
<span style='display:block; white-space:pre;color:#404040;'> java pg: allow controlling dependency types
</span>---
_resources/port1.0/group/java-1.0.tcl | 7 +++++--
1 file changed, 5 insertions(+), 2 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 ca2ba9daea7..b519b684dee 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;'>@@ -18,11 +18,12 @@
</span> #
# If the required Java cannot be found, an error will be thrown at pre-fetch.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options java.version java.home java.fallback
</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 {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default java.deptypes lib
</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;'>@@ -125,7 +126,9 @@ namespace eval java {
</span> # Add dependency if required
if { ${java_version_not_found} && ${java.fallback} ne "" } {
ui_debug "Adding dependency on JDK fallback ${java.fallback}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${java.fallback}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach deptype [option java.deptypes] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_${deptype}-append port:${java.fallback}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
return $home_value
</pre><pre style='margin:0'>
</pre>