<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ced951b8189f446673290e297d320856199e7ebd">https://github.com/macports/macports-ports/commit/ced951b8189f446673290e297d320856199e7ebd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ced951b8189f446673290e297d320856199e7ebd
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Feb 5 02:48:47 2023 -0600
<span style='display:block; white-space:pre;color:#404040;'> php-mbstring: Fix conflict with oniguruma6
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/66824
</span>---
lang/php/Portfile | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/Portfile b/lang/php/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dbef35f7d35..697e04799da 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1322,15 +1322,15 @@ subport ${php}-ldap {
</span>
subport ${php}-mbstring {
switch -- ${version} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.2.17 {revision 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.3.29 {revision 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.4.45 {revision 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.5.38 {revision 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.6.40 {revision 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.0.33 {revision 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.1.33 {revision 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.2.34 {revision 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.33 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.2.17 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.3.29 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.4.45 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.5.38 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.6.40 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.0.33 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.1.33 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.2.34 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.33 {revision 1}
</span> 7.4.33 {revision 0}
8.0.27 {revision 0}
8.1.14 {revision 0}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1344,10 +1344,12 @@ subport ${php}-mbstring {
</span>
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${branch} 7.4] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} >= 7.4]} {
</span> depends_build-append port:pkgconfig
depends_lib-append port:oniguruma6
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-replace -I${prefix}/include -isystem${prefix}/include
</span> }
}
</pre><pre style='margin:0'>
</pre>