<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/7b55213cbe3fc9fe8bd24e3e5c0a24dfdf432349">https://github.com/macports/macports-ports/commit/7b55213cbe3fc9fe8bd24e3e5c0a24dfdf432349</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 7b55213cbe3 opencv3*: py subports: add conflicts
</span>7b55213cbe3 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 7b55213cbe3fc9fe8bd24e3e5c0a24dfdf432349
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri Sep 9 11:14:16 2022 -0400

<span style='display:block; white-space:pre;color:#404040;'>    opencv3*: py subports: add conflicts
</span>---
 graphics/opencv3-devel/Portfile | 18 +++++++++++++++---
 graphics/opencv3/Portfile       | 18 +++++++++++++++---
 2 files changed, 30 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 2ec6466373e..eea981681c0 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;'>@@ -26,6 +26,7 @@ name                opencv3-devel
</span> conflicts           opencv3
 set my_name         opencv3
 version             3.4.16
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# NOTE: Separate revisions maintained for Python subports, later in portfile
</span> revision            5
 categories          graphics science
 platforms           darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -354,12 +355,15 @@ if {${universal_possible} && [variant_isset universal]} {
</span> }
 
 # Python Bindings
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Name consistency with ${python.branch} and ${python.version} in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ${prefix}/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/_resources/port1.0/group/python-1.0.tcl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> foreach python_branch {2.7} {
     set python_version [join [lrange [split ${python_branch} .] 0 1] ""]
     subport py${python_version}-${name} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        # NOTE: Only rev-bump subports, for major changes/additions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        conflicts-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            py${python_version}-opencv3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         depends_build-delete \
                             port:python${default_python_version}
         depends_lib-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -396,6 +400,14 @@ set python_branches {3.7 3.8 3.9 3.10}
</span> foreach python_branch ${python_branches} {
     set python_version [join [lrange [split ${python_branch} .] 0 1] ""]
     subport py${python_version}-${name} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        # NOTE: Only rev-bump subports, for major changes/additions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        conflicts-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            py${python_version}-opencv3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            py${python_version}-opencv4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            py${python_version}-opencv4-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         depends_build-delete \
                             port:python${default_python_version}
         depends_lib-append \
<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 1e7a6816270..c429bedc663 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;'>@@ -26,6 +26,7 @@ name                opencv3
</span> conflicts           opencv3-devel
 set my_name         opencv3
 version             3.4.16
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# NOTE: Separate revisions maintained for Python subports, later in portfile
</span> revision            5
 categories          graphics science
 platforms           darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -354,12 +355,15 @@ if {${universal_possible} && [variant_isset universal]} {
</span> }
 
 # Python Bindings
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Name consistency with ${python.branch} and ${python.version} in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ${prefix}/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/_resources/port1.0/group/python-1.0.tcl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> foreach python_branch {2.7} {
     set python_version [join [lrange [split ${python_branch} .] 0 1] ""]
     subport py${python_version}-${name} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        # NOTE: Only rev-bump subports, for major changes/additions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        conflicts-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            py${python_version}-opencv3-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         depends_build-delete \
                             port:python${default_python_version}
         depends_lib-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -396,6 +400,14 @@ set python_branches {3.7 3.8 3.9 3.10}
</span> foreach python_branch ${python_branches} {
     set python_version [join [lrange [split ${python_branch} .] 0 1] ""]
     subport py${python_version}-${name} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        # NOTE: Only rev-bump subports, for major changes/additions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        conflicts-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            py${python_version}-opencv3-devel \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            py${python_version}-opencv4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            py${python_version}-opencv4-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         depends_build-delete \
                             port:python${default_python_version}
         depends_lib-append \
</pre><pre style='margin:0'>

</pre>