<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/372d5d239febf857b582426af7109aed7ee452f8">https://github.com/macports/macports-ports/commit/372d5d239febf857b582426af7109aed7ee452f8</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 372d5d239fe openjdk17-graalvm: fix subport pollution (#20056)
</span>372d5d239fe is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 372d5d239febf857b582426af7109aed7ee452f8
</span>Author: Nils Breunese <nils@breun.nl>
AuthorDate: Mon Aug 21 01:33:51 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> openjdk17-graalvm: fix subport pollution (#20056)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Co-authored-by: Christopher Nielsen <62156882+mascguy@users.noreply.github.com>
</span>---
java/openjdk17-graalvm/Portfile | 127 ++++++++++++++++++++--------------------
1 file changed, 63 insertions(+), 64 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk17-graalvm/Portfile b/java/openjdk17-graalvm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ba90aa0d45e..0726446f492 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk17-graalvm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk17-graalvm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,29 +15,11 @@ universal_variant no
</span> supported_archs x86_64 arm64
version 17.0.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description GraalVM Community Edition based on OpenJDK 17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description GraalVM is a universal virtual machine for running applications written in JavaScript, Python, Ruby, R,\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- JVM-based languages like Java, Scala, Groovy, Kotlin, Clojure, and LLVM-based languages such as C and C++.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> master_sites https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${version}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${configure.build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname graalvm-community-jdk-${version}_macos-x64_bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 26e3d0b7238a6c7fbe10afeae0c4b0e8740b268a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cf4bb646018da8bf93f67e5cdae0f583b276d278d0b667d779a68d11d3b6873d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 283915786
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {${configure.build_arch} eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname graalvm-community-jdk-${version}_macos-aarch64_bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 858b540bd9d1ecaef6e89d6f4bb6893a21d6881c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 89209bbf8346d8dd0847d431bd8654db7d4ff634745207f20af2045c4869fb49 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 279784572
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir graalvm-community-openjdk-${version}+7.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> homepage https://www.graalvm.org
livecheck.type none
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,68 +27,85 @@ livecheck.type none
</span> use_configure no
build {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant Applets \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description { Advertise the JVM capability "Applets".} {}
</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;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description GraalVM Community Edition based on OpenJDK 17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description GraalVM is a universal virtual machine for running applications written in JavaScript, Python, Ruby, R,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JVM-based languages like Java, Scala, Groovy, Kotlin, Clojure, and LLVM-based languages such as C and C++.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname graalvm-community-jdk-${version}_macos-x64_bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 26e3d0b7238a6c7fbe10afeae0c4b0e8740b268a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cf4bb646018da8bf93f67e5cdae0f583b276d278d0b667d779a68d11d3b6873d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 283915786
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${configure.build_arch} eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname graalvm-community-jdk-${version}_macos-aarch64_bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 858b540bd9d1ecaef6e89d6f4bb6893a21d6881c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 89209bbf8346d8dd0847d431bd8654db7d4ff634745207f20af2045c4869fb49 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 279784572
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir graalvm-community-openjdk-${version}+7.1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant BundledApp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description { Advertise the JVM capability "BundledApp". This is required by some java-based app bundles to recognize and use the JVM.} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant Applets \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description { Advertise the JVM capability "Applets".} {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant JNI \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description { Advertise the JVM capability "JNI". This is required by some java-based app bundles to recognize and use the JVM.} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant BundledApp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description { Advertise the JVM capability "BundledApp". This is required by some java-based app bundles to recognize and use the JVM.} {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant WebStart \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description { Advertise the JVM capability "WebStart".} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant JNI \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description { Advertise the JVM capability "JNI". This is required by some java-based app bundles to recognize and use the JVM.} {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach var { Applets BundledApp JNI WebStart } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset ${var}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|^(\[\[:space:\]\]*<string>)CommandLine(</string>)|\\1${var}\\2\\\n\\1CommandLine\\2|" ${worksrcpath}/Contents/Info.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant WebStart \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description { Advertise the JVM capability "WebStart".} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach var { Applets BundledApp JNI WebStart } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset ${var}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|^(\[\[:space:\]\]*<string>)CommandLine(</string>)|\\1${var}\\2\\\n\\1CommandLine\\2|" ${worksrcpath}/Contents/Info.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.run yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.cmd Contents/Home/bin/java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.args -version
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# macOS Java tools expect to find Java virtual machines under /Library/Java/JavaVirtualMachines, which is not under ${prefix}.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.violate_mtree yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.cmd Contents/Home/bin/java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.args -version
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set jvms /Library/Java/JavaVirtualMachines
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set jdk ${jvms}/${name}
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.violate_mtree yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-install {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Clean up previous installations, 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:#ffe0e0;'>- # Don't remove before 2024-08-20
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${jdk}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</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 installations, 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>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}${jdk}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/Contents ${destroot}${prefix}${jdk}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</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:#ffe0e0;'>- # 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:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${jvms}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}${jdk} ${destroot}${jdk}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-If you have more than one JDK installed you can make ${name} the default\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-by adding the following line to your shell profile:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ If you have more than one JDK installed you can make ${name} the default\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ by adding the following line to your shell profile:
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- export JAVA_HOME=${jdk}/Contents/Home
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export JAVA_HOME=${jdk}/Contents/Home
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
subport ${name}-native-image {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup stub 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ license Permissive
</span> description Former Native Image component for GraalVM
long_description Native Image support is now included in ${name}. Please uninstall ${subport}.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.violate_mtree no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${destroot}${prefix}/share/doc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo ${long_description} > ${destroot}${prefix}/share/doc/README.${subport}.txt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> notes "${long_description}"
}
</pre><pre style='margin:0'>
</pre>