<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/d2f606bee383d1eab2ae0c27f97a7ab0317f2c7c">https://github.com/macports/macports-ports/commit/d2f606bee383d1eab2ae0c27f97a7ab0317f2c7c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d2f606bee383d1eab2ae0c27f97a7ab0317f2c7c
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Jan 5 11:34:35 2025 -0500

<span style='display:block; white-space:pre;color:#404040;'>    opencv{3,4}{,-devel}: cleanup deconflict logic
</span>---
 graphics/opencv3-devel/Portfile | 4 ++--
 graphics/opencv3/Portfile       | 4 ++--
 graphics/opencv4-devel/Portfile | 2 +-
 graphics/opencv4/Portfile       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv3-devel/Portfile b/graphics/opencv3-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c85491fbd65..916753a366a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -395,7 +395,7 @@ foreach python_branch {2.7} {
</span>         # Deconflict with parent port contents
         post-destroot {
             ui_debug "${subport}: python subport: removing files unrelated to Python bindings"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            foreach f [exec port contents ${name}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            foreach f [exec port -q contents ${name}] {
</span>                 delete ${destroot}${f}
             }
         }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -448,7 +448,7 @@ foreach python_branch ${python_branches} {
</span>         # Deconflict with parent port contents
         post-destroot {
             ui_debug "${subport}: python subport: removing files unrelated to Python bindings"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            foreach f [exec port contents ${name}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            foreach f [exec port -q contents ${name}] {
</span>                 delete ${destroot}${f}
             }
         }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv3/Portfile b/graphics/opencv3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 351e6366b7f..66238d9b9ce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -395,7 +395,7 @@ foreach python_branch {2.7} {
</span>         # Deconflict with parent port contents
         post-destroot {
             ui_debug "${subport}: python subport: removing files unrelated to Python bindings"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            foreach f [exec port contents ${name}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            foreach f [exec port -q contents ${name}] {
</span>                 delete ${destroot}${f}
             }
         }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -448,7 +448,7 @@ foreach python_branch ${python_branches} {
</span>         # Deconflict with parent port contents
         post-destroot {
             ui_debug "${subport}: python subport: removing files unrelated to Python bindings"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            foreach f [exec port contents ${name}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            foreach f [exec port -q contents ${name}] {
</span>                 delete ${destroot}${f}
             }
         }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv4-devel/Portfile b/graphics/opencv4-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9e10387f3b9..5aacc278b30 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv4-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv4-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -400,7 +400,7 @@ foreach python_branch ${python_branches} {
</span>         # Deconflict with parent port contents
         post-destroot {
             ui_debug "${subport}: python subport: removing files unrelated to Python bindings"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            foreach f [exec port contents ${name}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            foreach f [exec port -q contents ${name}] {
</span>                 delete ${destroot}${f}
             }
         }
<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 c471ce6eebd..b48f48de699 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;'>@@ -449,7 +449,7 @@ foreach python_branch ${python_branches} {
</span>         # Deconflict with parent port contents
         post-destroot {
             ui_debug "${subport}: python subport: removing files unrelated to Python bindings"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            foreach f [exec port contents ${name}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            foreach f [exec port -q contents ${name}] {
</span>                 delete ${destroot}${f}
             }
         }
</pre><pre style='margin:0'>

</pre>