<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/85b59e633e507a6fb57102f00c6af181c5e5fe5f">https://github.com/macports/macports-ports/commit/85b59e633e507a6fb57102f00c6af181c5e5fe5f</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 85b59e633e5 openjdk-distributions: move openjdk8-corretto to its own Portfile
</span>85b59e633e5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 85b59e633e507a6fb57102f00c6af181c5e5fe5f
</span>Author: Nils Breunese <nils@breun.nl>
AuthorDate: Thu Aug 25 16:13:22 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> openjdk-distributions: move openjdk8-corretto to its own Portfile
</span>---
java/openjdk-distributions/Portfile | 32 ------------
java/openjdk8-corretto/Portfile | 99 +++++++++++++++++++++++++++++++++++++
2 files changed, 99 insertions(+), 32 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk-distributions/Portfile b/java/openjdk-distributions/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4c841ad1a3c..853191b545c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk-distributions/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk-distributions/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,9 +15,6 @@ universal_variant no
</span> version 1.0
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set long_description_corretto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "No-cost, multiplatform, production-ready distribution of OpenJDK."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set long_description_temurin \
"Eclipse Temurin provides secure, TCK-tested and compliant, production-ready Java runtimes."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,33 +69,6 @@ subport openjdk7-zulu {
</span> replaced_by openjdk8-zulu
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport openjdk8-corretto {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/corretto/corretto-8/releases
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs x86_64 arm64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 8.342.07.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description Amazon Corretto OpenJDK 8 (Long Term Support)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${long_description_corretto}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites https://corretto.aws/downloads/resources/${version}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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 amazon-corretto-${version}-macosx-x64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 966b129d1ae0255d7d9cbfd202c2f9511af048e1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ab4db316b4c5bb886355bbe192a71a5328e43609631477857a1992ca80975fcf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 118790575
</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 amazon-corretto-${version}-macosx-aarch64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 192cf91d72d450cbaf229e5e0981365e40a4b5b8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cb29f72976f9e9be525c8ec58edc8bfc20a24f3ec13c5c7259cf1ded3a921eeb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 104196362
</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 amazon-corretto-8.jdk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Remove after 2022-10-19
subport openjdk8-graalvm {
version 21.0.0.2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,8 +141,6 @@ if {[string match *-graalvm ${subport}]} {
</span> homepage https://www.graalvm.org
} elseif {[string match *-temurin ${subport}]} {
homepage https://adoptium.net
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {[string match *-corretto ${subport}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- homepage https://aws.amazon.com/corretto/
</span> }
livecheck.type none
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8-corretto/Portfile b/java/openjdk8-corretto/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7679a693e1e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8-corretto/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,99 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name openjdk8-corretto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories java devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {breun.nl:nils @breun} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This port uses prebuilt binaries; 'NoMirror' makes sure MacPorts doesn't mirror/distribute these third-party binaries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2 NoMirror
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This port uses prebuilt binaries for a particular architecture; they are not universal binaries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+universal_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/corretto/corretto-8/releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs x86_64 arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.342.07.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Amazon Corretto OpenJDK 8 (Long Term Support)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description No-cost, multiplatform, production-ready distribution of OpenJDK from Amazon.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://corretto.aws/downloads/resources/${version}/
</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 amazon-corretto-${version}-macosx-x64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 966b129d1ae0255d7d9cbfd202c2f9511af048e1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ab4db316b4c5bb886355bbe192a71a5328e43609631477857a1992ca80975fcf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 118790575
</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 amazon-corretto-${version}-macosx-aarch64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 192cf91d72d450cbaf229e5e0981365e40a4b5b8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cb29f72976f9e9be525c8ec58edc8bfc20a24f3ec13c5c7259cf1ded3a921eeb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 104196362
</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 amazon-corretto-8.jdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/wiki/PortfileRecipes#compare-osx-darwin-version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 19} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://github.com/corretto/corretto-8/blob/release-8.342.07.3/CHANGELOG.md
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${name} ${version} is only supported on macOS 10.15 Catalina or later."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://aws.amazon.com/corretto/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://github.com/corretto/corretto-8/releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex amazon-corretto-(8\.\[0-9\.\]+)-macosx-.*\.tar\.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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:#e0ffe0;'>+
</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:#e0ffe0;'>+
</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:#e0ffe0;'>+
</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:#e0ffe0;'>+ }
</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;'>+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:#e0ffe0;'>+
</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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set target /Library/Java/JavaVirtualMachines/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set destroot_target ${destroot}${target}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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_target}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/Contents ${destroot_target}
</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;'>+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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export JAVA_HOME=${target}/Contents/Home
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span></pre><pre style='margin:0'>
</pre>