<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/2fd08a21f3008e8d8f6a2901bf74da1a4471cf05">https://github.com/macports/macports-ports/commit/2fd08a21f3008e8d8f6a2901bf74da1a4471cf05</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2fd08a21f3008e8d8f6a2901bf74da1a4471cf05
</span>Author: usersxx <97012123+usersxx@users.noreply.github.com>
AuthorDate: Sun May 15 21:34:46 2022 +0530

<span style='display:block; white-space:pre;color:#404040;'>    openjdkXX: fix builds
</span>---
 java/openjdk18-bootstrap/Portfile | 2 +-
 java/openjdk18/Portfile           | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk18-bootstrap/Portfile b/java/openjdk18-bootstrap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2dda0e82955..1e87c474599 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk18-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk18-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@
</span> 
 PortSystem          1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name                openjdk17-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name                openjdk18-bootstrap
</span> version             18
 set build           36
 categories          java devel
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk18/Portfile b/java/openjdk18/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7e76b1cb00c..1f5ac3ef2c6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk18/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk18/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,8 @@ checksums           rmd160  16ac99fc5cfa368ec27613dfd90d56650026921f \
</span> depends_lib         port:freetype
 depends_build       port:openjdk18-bootstrap \
                     port:autoconf \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:gmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:bash
</span> 
 pre-patch {
     reinplace "s|libffi.so.?|libffi.?.dylib|g" ${worksrcpath}/make/autoconf/lib-ffi.m4
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +37,7 @@ pre-patch {
</span> set tpath /Library/Java
 use_xcode           yes
 use_configure    yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd       sh configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd       ${prefix}/bin/bash configure
</span> configure.pre_args  --prefix=${tpath}
 set bug_url "https://trac.macports.org/newticket?port=${name}"
 # default configure args 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,6 +49,9 @@ configure.args      --with-debug-level=release \
</span>                     --with-extra-cxxflags="${configure.cxxflags}" \
                     --with-extra-ldflags="${configure.ldflags}" \
                     --with-boot-jdk=/Library/Java/JavaVirtualMachines/openjdk18-bootstrap/Contents/Home \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --with-freetype=system \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --with-freetype-include=${prefix}/include/freetype2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --with-freetype-lib=${prefix}/lib \
</span>                     --disable-warnings-as-errors \
                     --disable-precompiled-headers \
                     --with-vendor-name="OpenJDK Porters Group" \
</pre><pre style='margin:0'>

</pre>