<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/08803881ba07a8b78a0cae410f3a44616b186725">https://github.com/macports/macports-ports/commit/08803881ba07a8b78a0cae410f3a44616b186725</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 08803881ba0 opencv4/opencv4-devel: reconcile with opencv3 python changes See: https://github.com/macports/macports-ports/pull/14877
</span>08803881ba0 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 08803881ba07a8b78a0cae410f3a44616b186725
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Thu May 19 16:35:09 2022 -0400

<span style='display:block; white-space:pre;color:#404040;'>    opencv4/opencv4-devel: reconcile with opencv3 python changes
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://github.com/macports/macports-ports/pull/14877
</span>---
 graphics/opencv4-devel/Portfile | 25 +++++++++++++++++++------
 graphics/opencv4/Portfile       | 25 +++++++++++++++++++------
 2 files changed, 38 insertions(+), 12 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 5e6738db50b..d538bab4092 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;'>@@ -57,7 +57,7 @@ if {${os.major} > 12} {
</span> 
 if {${opencv_latest}} {
     github.setup    opencv opencv 4.5.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision        2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision        3
</span>     epoch           1
 
     checksums-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +71,7 @@ if {${opencv_latest}} {
</span>     livecheck.regex {/archive/([0-9.]+)[a-z]?\.[tz]}
 } else {
     github.setup    opencv opencv 4.5.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision        3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision        4
</span> 
     checksums-append \
                     ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,6 +87,16 @@ distfiles           [lindex ${distfiles} 0]:${github.project}
</span> distname            ${my_name}-${version}
 dist_subdir         ${my_name}
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Python build support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set default_python_branch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set default_python_version \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    [join [lrange [split ${default_python_branch} .] 0 1] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set default_python_path \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ${prefix}/bin/python${default_python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #------------------------------------------------------------------------------
 # Subport name used for staging files, etc.
 #
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,7 +140,8 @@ depends_lib-append  \
</span>                     port:webp \
                     port:openexr \
                     port:ilmbase \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:ade
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:ade \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:python${default_python_version}
</span> 
 #------------------------------------------------------------------------------
 # CMake Variables
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -279,8 +290,8 @@ configure.args-append \
</span>                     -DBUILD_opencv_python2:BOOL=OFF \
                     -DBUILD_opencv_python3:BOOL=OFF \
                     -DOPENCV_PYTHON_SKIP_DETECTION:BOOL=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DPYTHON_DEFAULT_EXECUTABLE:FILEPATH=/usr/bin/python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON_EXECUTABLE:FILEPATH=${default_python_path} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON_DEFAULT_EXECUTABLE:FILEPATH=${default_python_path}
</span> 
 if {${name} eq ${subport}} {
     # generate pkg-config file
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -342,8 +353,10 @@ foreach python_branch ${python_branches} {
</span>     subport py${python_version}-${name} {
         depends_lib-append \
                     port:${name} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:python${python_version} \
</span>                     port:py${python_version}-numpy
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:python${default_python_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:python${python_version}
</span>         configure.args-replace \
                     -DBUILD_opencv_python3:BOOL=OFF \
                     -DBUILD_opencv_python3:BOOL=ON
<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 da38d1ca001..c56d02b075b 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;'>@@ -57,7 +57,7 @@ if {${os.major} > 12} {
</span> 
 if {${opencv_latest}} {
     github.setup    opencv opencv 4.5.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision        0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision        1
</span>     epoch           1
 
     checksums-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +71,7 @@ if {${opencv_latest}} {
</span>     livecheck.regex {/archive/([0-9.]+)[a-z]?\.[tz]}
 } else {
     github.setup    opencv opencv 4.5.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision        9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision        10
</span> 
     checksums-append \
                     ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,6 +87,16 @@ distfiles           [lindex ${distfiles} 0]:${github.project}
</span> distname            ${my_name}-${version}
 dist_subdir         ${my_name}
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Python build support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set default_python_branch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set default_python_version \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    [join [lrange [split ${default_python_branch} .] 0 1] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set default_python_path \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ${prefix}/bin/python${default_python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #------------------------------------------------------------------------------
 # Subport name used for staging files, etc.
 #
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,7 +140,8 @@ depends_lib-append  \
</span>                     port:webp \
                     port:openexr \
                     port:ilmbase \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:ade
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:ade \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:python${default_python_version}
</span> 
 #------------------------------------------------------------------------------
 # CMake Variables
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -279,8 +290,8 @@ configure.args-append \
</span>                     -DBUILD_opencv_python2:BOOL=OFF \
                     -DBUILD_opencv_python3:BOOL=OFF \
                     -DOPENCV_PYTHON_SKIP_DETECTION:BOOL=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DPYTHON_DEFAULT_EXECUTABLE:FILEPATH=/usr/bin/python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON_EXECUTABLE:FILEPATH=${default_python_path} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON_DEFAULT_EXECUTABLE:FILEPATH=${default_python_path}
</span> 
 if {${name} eq ${subport}} {
     # generate pkg-config file
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -342,8 +353,10 @@ foreach python_branch ${python_branches} {
</span>     subport py${python_version}-${name} {
         depends_lib-append \
                     port:${name} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:python${python_version} \
</span>                     port:py${python_version}-numpy
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:python${default_python_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:python${python_version}
</span>         configure.args-replace \
                     -DBUILD_opencv_python3:BOOL=OFF \
                     -DBUILD_opencv_python3:BOOL=ON
</pre><pre style='margin:0'>

</pre>