<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/813439bb3f2580a8e8e7c228afdd789fda95a628">https://github.com/macports/macports-ports/commit/813439bb3f2580a8e8e7c228afdd789fda95a628</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 813439bb3f2 opencv3/opencv3-devel: cleanup python path copy-pasta
</span>813439bb3f2 is described below

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

<span style='display:block; white-space:pre;color:#404040;'>    opencv3/opencv3-devel: cleanup python path copy-pasta
</span>---
 graphics/opencv3-devel/Portfile | 21 ++++++++++++++-------
 graphics/opencv3/Portfile       | 21 ++++++++++++++-------
 2 files changed, 28 insertions(+), 14 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 0553917c496..486623b29b7 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;'>@@ -52,9 +52,6 @@ distname            ${version}
</span> distfiles           ${distname}${extract.suffix}:opencv
 dist_subdir         ${my_name}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set default_python_branch   3.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set default_python_version [join [lrange [split ${default_python_branch} .] 0 1] ""]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # don't forget to also update the checksums under the contrib variant.
 checksums-append \
                     ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,6 +73,16 @@ platform macosx {
</span>     }
 }
 
<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;'>@@ -276,8 +283,8 @@ configure.args-append \
</span>                     -DBUILD_opencv_python2=OFF \
                     -DBUILD_opencv_python3=OFF \
                     -DOPENCV_PYTHON_SKIP_DETECTION=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DPYTHON_EXECUTABLE=${prefix}/bin/python${default_python_branch} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DPYTHON_DEFAULT_EXECUTABLE=${prefix}/bin/python${default_python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON_EXECUTABLE=${default_python_path} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON_DEFAULT_EXECUTABLE=${default_python_path}
</span> 
 if {![info exists universal_possible]} {
     set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -366,7 +373,7 @@ foreach python_branch {2.7} {
</span>                             -DBUILD_opencv_apps=ON \
                             -DBUILD_opencv_apps=OFF
         configure.args-replace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON_EXECUTABLE=${prefix}/bin/python${default_python_branch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON_EXECUTABLE=${default_python_path} \
</span>                             -DPYTHON_EXECUTABLE=${prefix}/bin/python${python_branch}
         configure.args-append \
                             -DPYTHON2_EXECUTABLE=${prefix}/bin/python${python_branch} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -521,7 +528,7 @@ if {${name} eq ${subport}} {
</span>     if {[variant_isset java] && ![variant_isset python27]} {
         configure.args-replace \
                             -DPYTHON_EXECUTABLE=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON_EXECUTABLE=${prefix}/bin/python${default_python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON_EXECUTABLE=${default_python_path}
</span>         configure.args-delete \
                             -DBUILD_opencv_python2=OFF
     }
<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 88e391052bb..1bd1bb72ee9 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;'>@@ -52,9 +52,6 @@ distname            ${version}
</span> distfiles           ${distname}${extract.suffix}:opencv
 dist_subdir         ${my_name}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set default_python_branch   3.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set default_python_version [join [lrange [split ${default_python_branch} .] 0 1] ""]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # don't forget to also update the checksums under the contrib variant.
 checksums-append \
                     ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,6 +73,16 @@ platform macosx {
</span>     }
 }
 
<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;'>@@ -276,8 +283,8 @@ configure.args-append \
</span>                     -DBUILD_opencv_python2=OFF \
                     -DBUILD_opencv_python3=OFF \
                     -DOPENCV_PYTHON_SKIP_DETECTION=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DPYTHON_EXECUTABLE=${prefix}/bin/python${default_python_branch} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DPYTHON_DEFAULT_EXECUTABLE=${prefix}/bin/python${default_python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON_EXECUTABLE=${default_python_path} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON_DEFAULT_EXECUTABLE=${default_python_path}
</span> 
 if {![info exists universal_possible]} {
     set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -366,7 +373,7 @@ foreach python_branch {2.7} {
</span>                             -DBUILD_opencv_apps=ON \
                             -DBUILD_opencv_apps=OFF
         configure.args-replace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON_EXECUTABLE=${prefix}/bin/python${default_python_branch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON_EXECUTABLE=${default_python_path} \
</span>                             -DPYTHON_EXECUTABLE=${prefix}/bin/python${python_branch}
         configure.args-append \
                             -DPYTHON2_EXECUTABLE=${prefix}/bin/python${python_branch} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -521,7 +528,7 @@ if {${name} eq ${subport}} {
</span>     if {[variant_isset java] && ![variant_isset python27]} {
         configure.args-replace \
                             -DPYTHON_EXECUTABLE=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON_EXECUTABLE=${prefix}/bin/python${default_python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON_EXECUTABLE=${default_python_path}
</span>         configure.args-delete \
                             -DBUILD_opencv_python2=OFF
     }
</pre><pre style='margin:0'>

</pre>