<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/961e4409aa51872e64d443297dd90f790db20044">https://github.com/macports/macports-ports/commit/961e4409aa51872e64d443297dd90f790db20044</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 961e4409aa5 opencv4: fix self conflict for python subports
</span>961e4409aa5 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 961e4409aa51872e64d443297dd90f790db20044
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri Jun 28 17:33:32 2024 -0400

<span style='display:block; white-space:pre;color:#404040;'>    opencv4: fix self conflict for python subports
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/69987
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/70307
</span>---
 graphics/opencv4/Portfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv4/Portfile b/graphics/opencv4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d906e5beb2a..8c6c3b3b4f2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -363,7 +363,7 @@ foreach python_branch ${python_branches} {
</span>         conflicts-append \
                     py${python_version}-opencv3 \
                     py${python_version}-opencv3-devel \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    py${python_version}-opencv4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    py${python_version}-opencv4-devel
</span> 
         depends_build-delete \
                     port:python${default_python_version}
</pre><pre style='margin:0'>

</pre>