<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/25b12526e5d632ffc498ef47d839d0f0006019ae">https://github.com/macports/macports-ports/commit/25b12526e5d632ffc498ef47d839d0f0006019ae</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 25b12526e5d openjdk20: install files under ${prefix}
</span>25b12526e5d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 25b12526e5d632ffc498ef47d839d0f0006019ae
</span>Author: Nils Breunese <nils@breun.nl>
AuthorDate: Sat Aug 26 11:05:24 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> openjdk20: install files under ${prefix}
</span>---
java/openjdk20/Portfile | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk20/Portfile b/java/openjdk20/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 47903bd722d..84921f69370 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk20/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk20/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ name openjdk20
</span> # See https://github.com/openjdk/jdk20u/tags for the version and build number that matches the latest tag that ends with '-ga'
version 20.0.2
set build 9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories java devel
supported_archs x86_64 arm64
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,7 @@ pre-patch {
</span> reinplace "s|xmacosx|xwindows|g" ${worksrcpath}/make/autoconf/lib-freetype.m4
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set tpath /Library/Java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set tpath ${prefix}/Library/Java
</span> use_xcode yes
use_configure yes
configure.cmd ${prefix}/bin/bash configure
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,10 +132,17 @@ test.cmd ${bundle_dir}/Home/bin/java
</span> test.target --version
set pathb ${tpath}/JavaVirtualMachines/${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set jvms /Library/Java/JavaVirtualMachines
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set jdk ${jvms}/${name}
</span> destroot {
xinstall -m 755 -d ${destroot}${pathb}
copy ${worksrcpath}/${bundle_dir} ${destroot}${pathb}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # macOS Java tools expect to find Java virtual machines under /Library/Java/JavaVirtualMachines, so let's create a symlink there
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${jvms}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${pathb} ${destroot}${jdk}
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# macOS Java tools expect to find Java virtual machines under /Library/Java/JavaVirtualMachines, which is not under ${prefix}.
</span> destroot.violate_mtree yes
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,7 +151,7 @@ post-destroot {
</span>
notes "
If you want to make ${name} the default JDK, add this to shell profile:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-export JAVA_HOME=${pathb}/Contents/Home
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export JAVA_HOME=${jdk}/Contents/Home
</span> "
livecheck.type regex
</pre><pre style='margin:0'>
</pre>