<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5d2d93bd3afeb44e347c562d0a113333c2bd43ab">https://github.com/macports/macports-ports/commit/5d2d93bd3afeb44e347c562d0a113333c2bd43ab</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 5d2d93bd3af openjdk21-temurin: new submission
</span>5d2d93bd3af is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5d2d93bd3afeb44e347c562d0a113333c2bd43ab
</span>Author: Nils Breunese <nils@breun.nl>
AuthorDate: Tue Oct 17 22:42:41 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> openjdk21-temurin: new submission
</span>---
java/openjdk20-temurin/Portfile | 96 ++--------------------
.../Portfile | 39 +++++----
2 files changed, 28 insertions(+), 107 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk20-temurin/Portfile b/java/openjdk20-temurin/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index de7ece4556b..061c7986a65 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk20-temurin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk20-temurin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,89 +1,11 @@
</span> # -*- 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 style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name openjdk20-temurin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories java devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {breun.nl:nils @breun} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See https://adoptium.net/supported-platforms/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms {darwin any} {darwin >= 16}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 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:#ffe0e0;'>-license GPL-2 NoMirror
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This port uses prebuilt binaries for a particular architecture; they are not universal binaries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://adoptium.net/temurin/releases/?version=20
</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 20.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set build 9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</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 20
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Eclipse Temurin provides secure, TCK-tested and compliant, production-ready Java runtimes.
</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/temurin20-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 OpenJDK20U-jdk_x64_mac_hotspot_${version}_${build}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 a5defd42d992ae97a136edebdf3495df859ef873 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bdeb37322a7c9292434e417d4db9f5debd7477cf413335d3a653a4e5e50a2473 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 197502362
</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 OpenJDK20U-jdk_aarch64_mac_hotspot_${version}_${build}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 382a90eb6a9580d316f10e843f51341a0b91de17 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6ef42b63581c0265c5a6b734e203bb922ee720571a8de46532ecca50a804c596 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 186697641
</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;'>-homepage https://adoptium.net
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url https://github.com/adoptium/temurin20-binaries/releases
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex OpenJDK20U-.*_mac_hotspot_(20\[0-9\.\]*)_\[0-9\]+.tar.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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:#ffe0e0;'>-
</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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach var { Applets 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:#ffe0e0;'>- }
</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;'>-
</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;'>-
</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:#ffe0e0;'>-
</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}/jdk-20-eclipse-temurin.jdk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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:#ffe0e0;'>-
</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:#ffe0e0;'>-
</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:#ffe0e0;'>-
</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;'>+# Remove after 2024-04-18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name openjdk20-temurin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories java devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20.0.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+replaced_by openjdk21-temurin
</span>\ No newline at end of file
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk20-temurin/Portfile b/java/openjdk21-temurin/Portfile
</span>similarity index 67%
copy from java/openjdk20-temurin/Portfile
copy to java/openjdk21-temurin/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index de7ece4556b..cff381b5b51 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk20-temurin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk21-temurin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,38 +2,37 @@
</span>
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name openjdk20-temurin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name openjdk21-temurin
</span> categories java devel
maintainers {breun.nl:nils @breun} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# See https://adoptium.net/supported-platforms/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms {darwin any} {darwin >= 16}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {darwin any}
</span> # This port uses prebuilt binaries; 'NoMirror' makes sure MacPorts doesn't mirror/distribute these third-party binaries
license GPL-2 NoMirror
# This port uses prebuilt binaries for a particular architecture; they are not universal binaries
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://adoptium.net/temurin/releases/?version=20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://adoptium.net/temurin/releases/
</span> supported_archs x86_64 arm64
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set build 9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 21.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set build 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description Eclipse Temurin, based on OpenJDK 20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Eclipse Temurin, based on OpenJDK 21
</span> long_description Eclipse Temurin provides secure, TCK-tested and compliant, production-ready Java runtimes.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://github.com/adoptium/temurin20-binaries/releases/download/jdk-${version}%2B${build}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://github.com/adoptium/temurin21-binaries/releases/download/jdk-${version}%2B${build}/
</span>
if {${configure.build_arch} eq "x86_64"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- distname OpenJDK20U-jdk_x64_mac_hotspot_${version}_${build}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 a5defd42d992ae97a136edebdf3495df859ef873 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bdeb37322a7c9292434e417d4db9f5debd7477cf413335d3a653a4e5e50a2473 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 197502362
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname OpenJDK21U-jdk_x64_mac_hotspot_${version}_${build}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 4a820fe6cfd7077e32c3d8224f0ca6a00d3c0d85 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 35f3cbc86d7ff0a01facefd741d5cfb675867e0a5ec137f62ba071d2511a45c9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 194340703
</span> } elseif {${configure.build_arch} eq "arm64"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- distname OpenJDK20U-jdk_aarch64_mac_hotspot_${version}_${build}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 382a90eb6a9580d316f10e843f51341a0b91de17 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6ef42b63581c0265c5a6b734e203bb922ee720571a8de46532ecca50a804c596 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 186697641
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname OpenJDK21U-jdk_aarch64_mac_hotspot_${version}_${build}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 41fa00ef620467e55ce56d06b942845c5ea7b8ff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0d29257c9bcb5f20f5c4643ef9437f36b10376863eddaf6248d09093796c6b30 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 191704753
</span> }
worksrcdir jdk-${version}+${build}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,8 +40,8 @@ worksrcdir jdk-${version}+${build}
</span> homepage https://adoptium.net
livecheck.type regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url https://github.com/adoptium/temurin20-binaries/releases
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex OpenJDK20U-.*_mac_hotspot_(20\[0-9\.\]*)_\[0-9\]+.tar.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://github.com/adoptium/temurin21-binaries/releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex OpenJDK21U-jdk_.*_mac_hotspot_(\[0-9\.\]+)_\[0-9\]+.tar.gz
</span>
use_configure no
build {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +69,7 @@ test.args -version
</span> destroot.violate_mtree yes
set jvms /Library/Java/JavaVirtualMachines
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set jdk ${jvms}/jdk-20-eclipse-temurin.jdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set jdk ${jvms}/jdk-21-eclipse-temurin.jdk
</span>
destroot {
xinstall -m 755 -d ${destroot}${prefix}${jdk}
</pre><pre style='margin:0'>
</pre>