<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/6561890bf33c4391701989f1c2ee2ee5c871178d">https://github.com/macports/macports-ports/commit/6561890bf33c4391701989f1c2ee2ee5c871178d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6561890bf33c4391701989f1c2ee2ee5c871178d
</span>Author: usersxx <97012123+usersxx@users.noreply.github.com>
AuthorDate: Tue Mar 15 21:26:17 2022 +0530
<span style='display:block; white-space:pre;color:#404040;'> openjdk-source: switch to ga builds from ea builds
</span>---
java/openjdk-source/Portfile | 60 +++++++++++++++++++++++---------------------
1 file changed, 31 insertions(+), 29 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk-source/Portfile b/java/openjdk-source/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 837e2b24cd1..ff3dfa2178b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk-source/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk-source/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,9 +67,10 @@ subport openjdk8-adoption-boot {
</span>
subport openjdk8u {
# https://github.com/openjdk/jdk8u/tags
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove 'jdk' from tag and add to version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set u 332
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 8u${u}-b04
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use tags having '-ga' at end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove 'jdk' from begining of the tag, '-ga' from the end of the tag and add to it the version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set u 322
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 8u${u}
</span> revision 0
set jver 1.8.0_${u}
set tpath /Library/Java
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,10 +81,11 @@ subport openjdk8u {
</span> supported_archs x86_64
fetch.type git
git.url https://github.com/openjdk/jdk8u
<span style='display:block; white-space:pre;background:#ffe0e0;'>- git.branch jdk${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.branch jdk${version}-ga
</span> worksrcdir jdk8u
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove pre-patch phase after jdk8u341-ga tag
</span> pre-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|JDK_UPDATE_VERSION=|JDK_UPDATE_VERSION=332|g" ${worksrcpath}/common/autoconf/version-numbers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|JDK_UPDATE_VERSION=|JDK_UPDATE_VERSION=${u}|g" ${worksrcpath}/common/autoconf/version-numbers
</span> }
patchfiles patch-openjdk8u-xcode-configure1.diff \
patch-openjdk8u-xcode-configure2.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,11 +132,11 @@ subport openjdk11-boot {
</span>
subport openjdk11u {
# https://github.com/openjdk/jdk11u/tags
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove 'jdk-' from tag and add to version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 11.0.15+5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use tags having '-ga' at end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove 'jdk-' from the begining of the tag, '-ga' from the end of the tag and add to it the version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 11.0.14.1
</span> revision 0
set tpath /Library/Java
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set jver 11.0.15
</span> description Openjdk 11 updates
long_description Openjdk 11 updates of Openjdk, Open-Source implementation \
of the Java Platform, Standard Edition, and related projects.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,7 +155,7 @@ subport openjdk11u {
</span> --with-conf-name=openjdk${version}
fetch.type git
git.url https://github.com/openjdk/jdk11u
<span style='display:block; white-space:pre;background:#ffe0e0;'>- git.branch jdk-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.branch jdk-${version}-ga
</span> worksrcdir jdk11u
build.type gnu
build.target images
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -162,9 +164,9 @@ subport openjdk11u {
</span> depends_build port:autoconf \
port:gmake
depends_lib port:openjdk11-boot
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set jdkn jdk-${jver}.jdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set jdkn jdk-${version}.jdk
</span> set bundle_dir /build/openjdk${version}/images/jdk-bundle/${jdkn}/Contents
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set openjdkn openjdk-${version}.jdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set openjdkn open${jdkn}
</span> }
subport openjdk13-boot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -190,11 +192,11 @@ subport openjdk13-boot {
</span>
subport openjdk13u {
# https://github.com/openjdk/jdk13u/tags
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove 'jdk-' from tag and add to version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 13.0.11+2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use tags having '-ga' at end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove 'jdk-' from the begining of the tag, '-ga' from the end of the tag and add to it the version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 13.0.10
</span> revision 0
set tpath /Library/Java
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set jver 13.0.11
</span> description Openjdk 13 updates
long_description Openjdk 13 updates of Openjdk, Open-Source implementation \
of the Java Platform, Standard Edition, and related projects.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -213,7 +215,7 @@ subport openjdk13u {
</span> --with-conf-name=openjdk${version}
fetch.type git
git.url https://github.com/openjdk/jdk13u
<span style='display:block; white-space:pre;background:#ffe0e0;'>- git.branch jdk-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.branch jdk-${version}-ga
</span> worksrcdir jdk13u
build.type gnu
build.target images
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -222,9 +224,9 @@ subport openjdk13u {
</span> depends_build port:autoconf \
port:gmake
depends_lib port:openjdk13-boot
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set jdkn jdk-${jver}.jdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set jdkn jdk-${version}.jdk
</span> set bundle_dir /build/openjdk${version}/images/jdk-bundle/${jdkn}/Contents
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set openjdkn openjdk-${version}.jdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set openjdkn open${jdkn}
</span> }
subport openjdk15-boot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -250,11 +252,11 @@ subport openjdk15-boot {
</span>
subport openjdk15u {
# https://github.com/openjdk/jdk15u/tags
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove 'jdk-' from tag and add to version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 15.0.7+2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use tags having '-ga' at end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove 'jdk-' from the begining of the tag, '-ga' from the end of the tag and add to it the version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 15.0.6
</span> revision 0
set tpath /Library/Java
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set jver 15.0.7
</span> description Openjdk 15 updates
long_description Openjdk 15 updates of Openjdk, Open-Source implementation \
of the Java Platform, Standard Edition, and related projects.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -274,7 +276,7 @@ subport openjdk15u {
</span> --with-conf-name=openjdk${version}
fetch.type git
git.url https://github.com/openjdk/jdk15u
<span style='display:block; white-space:pre;background:#ffe0e0;'>- git.branch jdk-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.branch jdk-${version}-ga
</span> worksrcdir jdk15u
build.type gnu
build.target images
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -283,9 +285,9 @@ subport openjdk15u {
</span> depends_build port:autoconf \
port:gmake
depends_lib port:openjdk15-boot
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set jdkn jdk-${jver}.jdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set jdkn jdk-${version}.jdk
</span> set bundle_dir /build/openjdk${version}/images/jdk-bundle/${jdkn}/Contents
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set openjdkn openjdk-${version}.jdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set openjdkn open${jdkn}
</span> }
subport openjdk17-boot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -316,11 +318,11 @@ subport openjdk17-boot {
</span>
subport openjdk17u {
# https://github.com/openjdk/jdk17u/tags
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove 'jdk-' from tag and add to version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 17.0.3+4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use tags having '-ga' at end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove 'jdk-' from the begining of the tag, '-ga' from the end of the tag and add to it the version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 17.0.2
</span> revision 0
set tpath /Library/Java
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set jver 17.0.3
</span> description Openjdk 17 updates
long_description Openjdk 17 updates of Openjdk, Open-Source implementation \
of the Java Platform, Standard Edition, and related projects.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -340,7 +342,7 @@ subport openjdk17u {
</span> --with-conf-name=openjdk${version}
fetch.type git
git.url https://github.com/openjdk/jdk17u
<span style='display:block; white-space:pre;background:#ffe0e0;'>- git.branch jdk-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.branch jdk-${version}-ga
</span> worksrcdir jdk17u
build.type gnu
build.target images
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -349,9 +351,9 @@ subport openjdk17u {
</span> depends_build port:autoconf \
port:gmake
depends_lib port:openjdk17-boot
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set jdkn jdk-${jver}.jdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set jdkn jdk-${version}.jdk
</span> set bundle_dir /build/openjdk${version}/images/jdk-bundle/${jdkn}/Contents
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set openjdkn openjdk-${version}.jdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set openjdkn open${jdkn}
</span> }
if {[string match *-boot ${subport}]} {
</pre><pre style='margin:0'>
</pre>