<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/48abdfcfe1b6ec17317fa7b0465bdde40c479c9a">https://github.com/macports/macports-ports/commit/48abdfcfe1b6ec17317fa7b0465bdde40c479c9a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 48abdfcfe1b6ec17317fa7b0465bdde40c479c9a
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Mon Nov 29 17:19:11 2021 +0000

<span style='display:block; white-space:pre;color:#404040;'>    mariadb-10.{5,6,7}: Use openssl compiler wrap to avoid need for build conflict
</span>---
 databases/mariadb-10.5/Portfile | 6 +++---
 databases/mariadb-10.6/Portfile | 6 +++---
 databases/mariadb-10.7/Portfile | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/Portfile b/databases/mariadb-10.5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 93815408255..01b817f71c5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,6 @@ if {$subport eq $name} {
</span>     PortGroup           compiler_blacklist_versions 1.0
     PortGroup           boost 1.0
     PortGroup           openssl 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    PortGroup           conflicts_build 1.0
</span> 
     boost.version       1.71
     compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,8 +41,9 @@ if {$subport eq $name} {
</span>     # must come before any instance of
     #    -I/opt/local/include
     # Until the build configuration is fixed to avoid this (or the port is updated to be
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # compatible with openssl3) declare a build conflict against the openssl shim port.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    conflicts_build     openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # compatible with openssl3) use the openssl PG compiler wrap option to enforce the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # correct include order on the build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    openssl.configure-append compiler_wrap
</span> 
     # https://trac.macports.org/ticket/60805
     compiler.blacklist-append {clang < 900}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.6/Portfile b/databases/mariadb-10.6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a3ec3f4046c..b645606a7f6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,6 @@ if {$subport eq $name} {
</span>     PortGroup           compiler_blacklist_versions 1.0
     PortGroup           boost 1.0
     PortGroup           openssl 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    PortGroup           conflicts_build 1.0
</span> 
     boost.version       1.71
     compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,8 +41,9 @@ if {$subport eq $name} {
</span>     # must come before any instance of
     #    -I/opt/local/include
     # Until the build configuration is fixed to avoid this (or the port is updated to be
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # compatible with openssl3) declare a build conflict against the openssl shim port.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    conflicts_build     openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # compatible with openssl3) use the openssl PG compiler wrap option to enforce the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # correct include order on the build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    openssl.configure-append compiler_wrap
</span> 
     # https://trac.macports.org/ticket/60805
     compiler.blacklist-append {clang < 900}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.7/Portfile b/databases/mariadb-10.7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e9bf6356621..beb14e1ce8e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,6 @@ if {$subport eq $name} {
</span>     PortGroup           compiler_blacklist_versions 1.0
     PortGroup           boost 1.0
     PortGroup           openssl 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    PortGroup           conflicts_build 1.0
</span> 
     boost.version       1.71
     compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,8 +41,9 @@ if {$subport eq $name} {
</span>     # must come before any instance of
     #    -I/opt/local/include
     # Until the build configuration is fixed to avoid this (or the port is updated to be
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # compatible with openssl3) declare a build conflict against the openssl shim port.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    conflicts_build     openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # compatible with openssl3) use the openssl PG compiler wrap option to enforce the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # correct include order on the build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    openssl.configure-append compiler_wrap
</span> 
     # https://trac.macports.org/ticket/60805
     compiler.blacklist-append {clang < 900}
</pre><pre style='margin:0'>

</pre>