<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/165df57e574c8184140138ec7db1e728080104b3">https://github.com/macports/macports-ports/commit/165df57e574c8184140138ec7db1e728080104b3</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 165df57e574 openjdk11-graalvm: clean up old files before installation, install files under ${prefix}
</span>165df57e574 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 165df57e574c8184140138ec7db1e728080104b3
</span>Author: Nils Breunese <nils@breun.nl>
AuthorDate: Sun Aug 20 16:56:46 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> openjdk11-graalvm: clean up old files before installation, install files under ${prefix}
</span>---
java/openjdk11-graalvm/Portfile | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk11-graalvm/Portfile b/java/openjdk11-graalvm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ccb28a3aa97..de2a9eddf01 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk11-graalvm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk11-graalvm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,7 @@ if {${configure.build_arch} eq "arm64"} {
</span> version 22.3.3
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
description GraalVM Community Edition based on OpenJDK 11
long_description GraalVM is a universal virtual machine for running applications written in JavaScript, Python, Ruby, R,\
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,19 +78,29 @@ test.args -version
</span> # macOS Java tools expect to find Java virtual machines under /Library/Java/JavaVirtualMachines, which is not under ${prefix}.
destroot.violate_mtree yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set target /Library/Java/JavaVirtualMachines/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set destroot_target ${destroot}${target}
</span><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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-install {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Clean up previous installation, because some old subport files may have been left behind (https://trac.macports.org/ticket/67935)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Don't remove before 2024-08-20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${jdk}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot_target}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/Contents ${destroot_target}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}${jdk}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/Contents ${destroot}${prefix}${jdk}
</span><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 ${prefix}${jdk} ${destroot}${jdk}
</span> }
notes "
If you have more than one JDK installed you can make ${name} the default\
by adding the following line to your shell profile:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- export JAVA_HOME=${target}/Contents/Home
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export JAVA_HOME=${jdk}/Contents/Home
</span> "
subport ${name}-native-image {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,7 +122,7 @@ subport ${name}-native-image {
</span> size 28504616
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set java_home ${target}/Contents/Home
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set java_home ${prefix}${jdk}/Contents/Home
</span>
extract {}
</pre><pre style='margin:0'>
</pre>