<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4ff4d3cd617dc77eff3a667747990c9561bf6598">https://github.com/macports/macports-ports/commit/4ff4d3cd617dc77eff3a667747990c9561bf6598</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 4ff4d3cd617 openjdk: add subport for Eclipse Temurin, make openjdk8 a meta port
</span>4ff4d3cd617 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4ff4d3cd617dc77eff3a667747990c9561bf6598
</span>Author: Nils Breunese <nils@breun.nl>
AuthorDate: Tue Aug 3 20:09:32 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> openjdk: add subport for Eclipse Temurin, make openjdk8 a meta port
</span>---
java/openjdk/Portfile | 140 +++++++++++++++++++++++++++++++-------------------
1 file changed, 87 insertions(+), 53 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk/Portfile b/java/openjdk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2a481ca2231..db41d212266 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,6 +35,9 @@ set long_description_adoptopenjdk_openj9xl \
</span> "${long_description_adoptopenjdk_openj9} This version uses non-compressed references and should be used for\
applications which require heaps that are over ~57 GB."
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set long_description_temurin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Eclipse Temurin provides secure, TCK-tested and compliant, production-ready Java runtimes."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set long_description_graalvm \
"GraalVM is a universal virtual machine for running applications written in JavaScript, Python, Ruby, R,\
JVM-based languages like Java, Scala, Groovy, Kotlin, Clojure, and LLVM-based languages such as C and C++."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,23 +103,25 @@ subport openjdk7-zulu {
</span> }
subport openjdk8 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 8u292
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 8u302
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set build 10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description Open Java Development Kit 8 (AdoptOpenJDK) with HotSpot VM
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${long_description_adoptopenjdk_hotspot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set meta true
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk${version}-b${build}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname OpenJDK8U-jdk_x64_mac_hotspot_${version}b${build}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- worksrcdir jdk${version}-b${build}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Open Java Development Kit 8 meta port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description Open Java Development Kit 8 meta port
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx_stdlib libstdc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${destroot}${prefix}/share/doc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo ${long_description} > ${destroot}${prefix}/share/doc/README.${subport}.txt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 680c91c140f50774e20efabe58c9780a9a62b94a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5646fbe9e4138c902c910bb7014d41463976598097ad03919e4848634c7e8007 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 103785976
</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;'>+ depends_run-append port:openjdk8-temurin
</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;'>+ depends_run-append port:openjdk8-zulu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
subport openjdk8-graalvm {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,7 +134,7 @@ subport openjdk8-graalvm {
</span> master_sites https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/
distname graalvm-ce-java8-darwin-amd64-${version}
worksrcdir graalvm-ce-java8-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> checksums rmd160 2fc5f23a1558b5e125ef91ad137270fe4f2b4d0c \
sha256 25a653a44b3ad63479d7ae35d921c8d39282ff1849243f1afc0ffddd443e9079 \
size 349277690
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,6 +147,8 @@ subport openjdk8-openj9 {
</span> set build 10
set openj9_version 0.26.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ homepage https://adoptopenjdk.net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description Open Java Development Kit 8 (AdoptOpenJDK) with Eclipse OpenJ9 VM
long_description ${long_description_adoptopenjdk_openj9}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,6 +161,24 @@ subport openjdk8-openj9 {
</span> size 118492789
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+subport openjdk8-temurin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 8u302
</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 build 08
</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 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description ${long_description_temurin}
</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/temurin8-binaries/releases/download/jdk${version}-b${build}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname OpenJDK8U-jdk_x64_mac_hotspot_${version}b${build}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir jdk${version}-b${build}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 69c845bcdea22bb8f5fb74a3fe1b248e0116c43a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6205fefca28342d99938b3933ed839784835ed1de6ed9ba034ce772377f74061 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 107303398
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> subport openjdk8-zulu {
if {${configure.build_arch} eq "x86_64"} {
version 8.56.0.21
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -206,6 +231,8 @@ subport openjdk11 {
</span>
set build 9
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ homepage https://adoptopenjdk.net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description Open Java Development Kit 11 (AdoptOpenJDK) with HotSpot VM
long_description ${long_description_adoptopenjdk_hotspot}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -228,7 +255,7 @@ subport openjdk11-graalvm {
</span> master_sites https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/
distname graalvm-ce-java11-darwin-amd64-${version}
worksrcdir graalvm-ce-java11-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> checksums rmd160 7a1f0185f67022ad7f9ba5540a438580edd10792 \
sha256 f62cdc44a031731aa221426724a55eb09c79d6b2e9275ae3ca7003da5884ca36 \
size 399511612
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -241,6 +268,8 @@ subport openjdk11-openj9 {
</span> set build 9
set openj9_version 0.26.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ homepage https://adoptopenjdk.net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description Open Java Development Kit 11 (AdoptOpenJDK) with Eclipse OpenJ9 VM
long_description ${long_description_adoptopenjdk_openj9}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -428,6 +457,8 @@ subport openjdk16 {
</span>
set build 9
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ homepage https://adoptopenjdk.net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description Open Java Development Kit 16 (AdoptOpenJDK) with HotSpot VM
long_description ${long_description_adoptopenjdk_hotspot}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -463,6 +494,8 @@ subport openjdk16-openj9 {
</span> set build 9
set openj9_version 0.26.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ homepage https://adoptopenjdk.net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description Open Java Development Kit 16 (AdoptOpenJDK) with Eclipse OpenJ9 VM
long_description ${long_description_adoptopenjdk_openj9}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -522,60 +555,61 @@ if {[string match *-graalvm ${subport}]} {
</span> homepage https://www.graalvm.org
} elseif {[string match *-zulu ${subport}]} {
homepage https://www.azul.com/downloads/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- homepage https://adoptopenjdk.net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {[string match *-temurin ${subport}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ homepage https://adoptium.net
</span> }
livecheck.type none
<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;'>+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;'>+if {![info exists meta]} {
</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 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 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 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 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;'>-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 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:#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;'>+ 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;'>-use_configure no
</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;'>-build {}
</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;'>-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:#e0ffe0;'>+ set target /Library/Java/JavaVirtualMachines/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set destroot_target ${destroot}${target}
</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;'>+ 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:#ffe0e0;'>-set target /Library/Java/JavaVirtualMachines/${subport}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set destroot_target ${destroot}${target}
</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_target}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/Contents ${destroot_target}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq "openjdk7-zulu"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # MacPorts reports this file as broken
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot_target}/Contents/Home/jre/lib/xawt/libmawt.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq "openjdk7-zulu"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # MacPorts reports this file as broken
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot_target}/Contents/Home/jre/lib/xawt/libmawt.dylib
</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;'>-notes "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-If you have more than one JDK installed you can make ${subport} 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 ${subport} 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=${target}/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=${target}/Contents/Home
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span></pre><pre style='margin:0'>
</pre>