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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bf3e4afada5d6e6a3c0dc6fa406265ad9176a45e">https://github.com/macports/macports-ports/commit/bf3e4afada5d6e6a3c0dc6fa406265ad9176a45e</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 bf3e4afada5 qt5-qtwebkit: clean up conflicts-build
</span>bf3e4afada5 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit bf3e4afada5d6e6a3c0dc6fa406265ad9176a45e
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sun Dec 25 09:00:07 2022 -0800

<span style='display:block; white-space:pre;color:#404040;'>    qt5-qtwebkit: clean up conflicts-build
</span>---
 aqua/qt5/Portfile | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7a39adfb030..d341b917875 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1613,15 +1613,8 @@ foreach {module module_info} [array get modules] {
</span> 
                 # Compile fails on case insensitve filesystems due to similar header files from other
                 # macports headers found on the include search path.  In particular event.h and archive.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                if {[file exists ${prefix}/include/event.h]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    conflicts_build-append libevent 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                # Ruby 30/31 also adds an event.h header
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    conflicts_build-append ruby30
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    conflicts_build-append ruby31
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                if {[file exists ${prefix}/include/archive.h]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    conflicts_build-append libarchive
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                conflicts_build-append libevent libarchive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>                 # use MacPorts icu
                 #
                 # qmake uses pkgconfig to look for icu
</pre><pre style='margin:0'>

</pre>