<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/84b1391b7ffe3a630eef62defce27fd3c97af7f4">https://github.com/macports/macports-ports/commit/84b1391b7ffe3a630eef62defce27fd3c97af7f4</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 84b1391b7ff openjdk-distributions: move openjdk17-temurin to its own Portfile
</span>84b1391b7ff is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 84b1391b7ffe3a630eef62defce27fd3c97af7f4
</span>Author: Nils Breunese <nils@breun.nl>
AuthorDate: Sun Mar 27 16:41:21 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> openjdk-distributions: move openjdk17-temurin to its own Portfile
</span>---
java/openjdk-distributions/Portfile | 31 -------------
java/openjdk17-temurin/Portfile | 92 +++++++++++++++++++++++++++++++++++++
2 files changed, 92 insertions(+), 31 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 81d6acaae92..926babfda7e 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;'>@@ -517,37 +517,6 @@ subport openjdk17-sap {
</span> worksrcdir sapmachine-jdk-${version}.jdk
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport openjdk17-temurin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://adoptium.net/releases.html?variant=openjdk17&jvmVariant=hotspot
</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;'>- # Java 17 is the first Temurin release with arm64 support
</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 17.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set build 8
</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 Eclipse Temurin, based on OpenJDK 17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${long_description_temurin}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites https://github.com/adoptium/temurin17-binaries/releases/download/jdk-${version}%2B${build}/
</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 OpenJDK17U-jdk_x64_mac_hotspot_${version}_${build}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 90939e1b687b025674faf1f45b1274fe2e420109 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3630e21a571b7180876bf08f85d0aac0bdbb3267b2ae9bd242f4933b21f9be32 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 192611208
</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 OpenJDK17U-jdk_aarch64_mac_hotspot_${version}_${build}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 e4063da6a1139c137af930c8cf5c5988bb75354d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 157518e999d712b541b883c6c167f8faabbef1d590da9fe7233541b4adb21ea4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 182550014
</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 jdk-${version}+${build}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> subport openjdk17-zulu {
# https://www.azul.com/downloads/?version=java-17-lts&os=macos&package=jdk
supported_archs x86_64 arm64
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk17-temurin/Portfile b/java/openjdk17-temurin/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..03f93a1529f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk17-temurin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,92 @@
</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 openjdk17-temurin
</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://adoptium.net/releases.html?variant=openjdk17&jvmVariant=hotspot
</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 17.0.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set build 8
</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 Eclipse Temurin, based on OpenJDK 17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description Eclipse Temurin provides secure, TCK-tested and compliant, production-ready Java runtimes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://github.com/adoptium/temurin17-binaries/releases/download/jdk-${version}%2B${build}/
</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 OpenJDK17U-jdk_x64_mac_hotspot_${version}_${build}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 90939e1b687b025674faf1f45b1274fe2e420109 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3630e21a571b7180876bf08f85d0aac0bdbb3267b2ae9bd242f4933b21f9be32 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 192611208
</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 OpenJDK17U-jdk_aarch64_mac_hotspot_${version}_${build}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 e4063da6a1139c137af930c8cf5c5988bb75354d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 157518e999d712b541b883c6c167f8faabbef1d590da9fe7233541b4adb21ea4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 182550014
</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 jdk-${version}+${build}
</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} < 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://adoptium.net/supported_platforms.html
</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.12 Sierra 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://adoptium.net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type none
</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 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 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>