<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/9675c52e11a0835bcce762c1874448b31551d236">https://github.com/macports/macports-ports/commit/9675c52e11a0835bcce762c1874448b31551d236</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 9675c52e11a opencv4*: py subports: add conflicts
</span>9675c52e11a is described below

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

<span style='display:block; white-space:pre;color:#404040;'>    opencv4*: py subports: add conflicts
</span>---
 graphics/opencv4-devel/Portfile | 26 ++++++++++++++------------
 graphics/opencv4/Portfile       | 27 ++++++++++++++-------------
 2 files changed, 28 insertions(+), 25 deletions(-)

<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 ad4a7554168..def141a6d8d 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;'>@@ -55,6 +55,7 @@ if {${os.major} > 12} {
</span>     set opencv_latest no
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# NOTE: Separate revisions maintained for Python subports, later in portfile
</span> if {${opencv_latest}} {
     github.setup    opencv opencv 4.6.0
     revision        3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -346,13 +347,22 @@ platform darwin {
</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> set python_branches {3.7 3.8 3.9 3.10}
 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;'>+        if {${opencv_latest}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            revision 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</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}-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;'>+
</span>         depends_build-delete \
                     port:python${default_python_version}
         depends_lib-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -446,15 +456,7 @@ if {${name} eq ${subport}} {
</span>                     -DOPENNI_LIB_DIR:PATH=${prefix}/lib
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Respect legacy variant name 'opencv_contrib', and replace with 'contrib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {[variant_isset opencv_contrib]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ui_debug "Legacy variant 'opencv_contrib' set; enabling 'contrib'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        default_variants-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    +contrib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    variant contrib description {Build OpenCV with extra modules (untested)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    variant contrib description {Build OpenCV with extra modules} {
</span>         master_sites-append \
                     https://github.com/${github.author}/${github.project}_contrib/tarball/${version}:${github.project}_contrib
         distfiles-append \
<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 ecdc86143f4..01e57c1e9d6 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;'>@@ -55,6 +55,7 @@ if {${os.major} > 12} {
</span>     set opencv_latest no
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# NOTE: Separate revisions maintained for Python subports, later in portfile
</span> if {${opencv_latest}} {
     github.setup    opencv opencv 4.5.5
     revision        5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -344,13 +345,22 @@ platform darwin {
</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> set python_branches {3.7 3.8 3.9 3.10}
 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;'>+        if {${opencv_latest}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            revision 14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</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}-opencv3-devel \
</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;background:#e0e0e0;'>@@ -444,15 +454,7 @@ if {${name} eq ${subport}} {
</span>                     -DOPENNI_LIB_DIR:PATH=${prefix}/lib
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Respect legacy variant name 'opencv_contrib', and replace with 'contrib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {[variant_isset opencv_contrib]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ui_debug "Legacy variant 'opencv_contrib' set; enabling 'contrib'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        default_variants-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    +contrib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    variant contrib description {Build OpenCV with extra modules (untested)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    variant contrib description {Build OpenCV with extra modules} {
</span>         master_sites-append \
                     https://github.com/${github.author}/${github.project}_contrib/tarball/${version}:${github.project}_contrib
         distfiles-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -464,7 +466,6 @@ if {${name} eq ${subport}} {
</span>                     rmd160  6ef9bfd367d221febb40de67b40ec599db3b16fa \
                     sha256  519b88933c59498648b22c56f41c272b3622252f07b9a80872e6fde55c095f55 \
                     size    60565191
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>         } else {
             checksums-append \
                     ${github.project}_contrib-${version}${extract.suffix} \
</pre><pre style='margin:0'>

</pre>