<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/823badaa0a39fc1cb31129d8445f8ffed71a5cfb">https://github.com/macports/macports-ports/commit/823badaa0a39fc1cb31129d8445f8ffed71a5cfb</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 823badaa0a3 openjdk-distributions: move openjdk15-zulu to its own Portfile
</span>823badaa0a3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 823badaa0a39fc1cb31129d8445f8ffed71a5cfb
</span>Author: Nils Breunese <nils@breun.nl>
AuthorDate: Tue Apr 5 21:05:30 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> openjdk-distributions: move openjdk15-zulu to its own Portfile
</span>---
java/openjdk-distributions/Portfile | 29 ----------
java/openjdk15-zulu/Portfile | 102 ++++++++++++++++++++++++++++++++++++
2 files changed, 102 insertions(+), 29 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 74dc833f1b7..3fc9a9f1287 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;'>@@ -372,35 +372,6 @@ subport openjdk13-zulu {
</span> worksrcdir ${distname}/zulu-13.jdk
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport openjdk15-zulu {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://www.azul.com/downloads/?version=java-15-mts&os=macos&package=jdk
</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 15.38.17
</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;'>- set openjdk_version 15.0.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description Azul Zulu Community OpenJDK 15 (Medium Term Support)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${long_description_zulu}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites https://cdn.azul.com/zulu/bin/
</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 zulu${version}-ca-jdk${openjdk_version}-macosx_x64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 3a46d9f2b822667113a3fe400300dcd56466f218 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 59a2e0fac951fb48ccd11a39d16752bf7e375871d5fe92d3a63f032ddfbe8b44 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 202445259
</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 zulu${version}-ca-jdk${openjdk_version}-macosx_aarch64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 5f413443e65273dc53b059cea7965b2e6f8ed95b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3a0b2e6b36af26d996b5ec73418203e462be233da021f41c1834196e3bc2e60d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 176748838
</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 ${distname}/zulu-15.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-09-14
subport openjdk16 {
version 16.0.2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk15-zulu/Portfile b/java/openjdk15-zulu/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..765e9924b89
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk15-zulu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,102 @@
</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 openjdk15-zulu
</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://www.azul.com/downloads/?version=java-15-mts&os=macos&package=jdk
</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 15.38.17
</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;'>+set openjdk_version 15.0.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Azul Zulu Community OpenJDK 15 (Medium Term Support)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description AzulĀ® ZuluĀ® is a Java Development Kit (JDK), and a compliant implementation of the Java Standard Edition (SE)\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ specification that contains all the Java components needed to build and run Java SE applications. Zulu has been\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ verified by passing all tests of the OpenJDK Community Technology Compatibility Kit (TCK) as available for each\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ respective Java SE version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://cdn.azul.com/zulu/bin/
</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 zulu${version}-ca-jdk${openjdk_version}-macosx_x64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 3a46d9f2b822667113a3fe400300dcd56466f218 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 59a2e0fac951fb48ccd11a39d16752bf7e375871d5fe92d3a63f032ddfbe8b44 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 202445259
</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 zulu${version}-ca-jdk${openjdk_version}-macosx_aarch64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 5f413443e65273dc53b059cea7965b2e6f8ed95b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3a0b2e6b36af26d996b5ec73418203e462be233da021f41c1834196e3bc2e60d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 176748838
</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 ${distname}/zulu-15.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} < 18} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://www.azul.com/downloads/?version=java-15-mts&os=macos&package=jdk
</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.14 Mojave 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://www.azul.com/downloads/
</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 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>