<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/0155bc26e4eeb0485d2a1bf9d1cb057b1400abfd">https://github.com/macports/macports-ports/commit/0155bc26e4eeb0485d2a1bf9d1cb057b1400abfd</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 0155bc26e4e opencv3{,-devel}: py subports: use correct python for build
</span>0155bc26e4e is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 0155bc26e4eeb0485d2a1bf9d1cb057b1400abfd
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Jan 5 10:42:29 2025 -0500

<span style='display:block; white-space:pre;color:#404040;'>    opencv3{,-devel}: py subports: use correct python for build
</span>---
 graphics/opencv3-devel/Portfile | 39 +++++++++++++++++++++++++++------------
 graphics/opencv3/Portfile       | 39 +++++++++++++++++++++++++++------------
 2 files changed, 54 insertions(+), 24 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 1a0e53f1670..a0638a86a70 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;'>@@ -352,7 +352,11 @@ if {${universal_possible} && [variant_isset universal]} {
</span> 
 # Python Bindings
 foreach python_branch {2.7} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set python_version [join [lrange [split ${python_branch} .] 0 1] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_version   [join [lrange [split ${python_branch} .] 0 1] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_path      ${prefix}/bin/python${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_framework ${frameworks_dir}/Python.framework/Versions/${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_lib       ${prefix}/lib/libpython${python_branch}.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     subport py${python_version}-${name} {
         # NOTE: Only rev-bump subports, for major changes/additions
         revision 5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -366,21 +370,27 @@ foreach python_branch {2.7} {
</span>                             port:${name} \
                             port:py${python_version}-numpy \
                             port:python${python_version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         configure.args-replace \
                             -DBUILD_opencv_python2=OFF \
                             -DBUILD_opencv_python2=ON
         configure.args-replace \
                             -DBUILD_opencv_apps=ON \
                             -DBUILD_opencv_apps=OFF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         configure.args-replace \
                             -DPYTHON_EXECUTABLE=${default_python_path} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON_EXECUTABLE=${prefix}/bin/python${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON_EXECUTABLE=${python_path}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON_DEFAULT_EXECUTABLE:FILEPATH=${default_python_path} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON_DEFAULT_EXECUTABLE:FILEPATH=${python_path}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON2_EXECUTABLE=${prefix}/bin/python${python_branch} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON_LIBRARIES=${prefix}/lib/libpython${python_branch}.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON2_LIBRARIES=${prefix}/lib/libpython${python_branch}.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON2_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/${python_branch}/Headers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON2_PACKAGES_PATH=${frameworks_dir}/Python.framework/Versions/${python_branch}/lib/python${python_branch}/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON2_EXECUTABLE=${python_path} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON_LIBRARIES=${python_lib} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON2_LIBRARIES=${python_lib} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON2_INCLUDE_DIR=${python_framework}/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON2_PACKAGES_PATH=${python_framework}/lib/python${python_branch}/site-packages
</span> 
         # Deconflict with parent port contents
         post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -394,7 +404,11 @@ foreach python_branch {2.7} {
</span> 
 set python_branches {3.9 3.10 3.11}
 foreach python_branch ${python_branches} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set python_version [join [lrange [split ${python_branch} .] 0 1] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_version   [join [lrange [split ${python_branch} .] 0 1] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_path      ${prefix}/bin/python${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_framework ${frameworks_dir}/Python.framework/Versions/${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_lib       ${prefix}/lib/libpython${python_branch}.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     subport py${python_version}-${name} {
         # NOTE: Only rev-bump subports, for major changes/additions
         revision 5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -410,6 +424,7 @@ foreach python_branch ${python_branches} {
</span>                             port:${name} \
                             port:py${python_version}-numpy \
                             port:python${python_version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         configure.args-replace \
                             -DBUILD_opencv_python3=OFF \
                             -DBUILD_opencv_python3=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -417,10 +432,10 @@ foreach python_branch ${python_branches} {
</span>                             -DBUILD_opencv_apps=ON \
                             -DBUILD_opencv_apps=OFF
         configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON3_EXECUTABLE=${prefix}/bin/python${python_branch} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON3_LIBRARY=${frameworks_dir}/Python.framework/Versions/${python_branch}/lib/libpython${python_branch}.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON3_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/${python_branch}/Headers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON3_PACKAGES_PATH=${frameworks_dir}/Python.framework/Versions/${python_branch}/lib/python${python_branch}/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON3_EXECUTABLE=${python_path} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON3_LIBRARY=${python_lib} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON3_INCLUDE_DIR=${python_framework}/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON3_PACKAGES_PATH=${python_framework}/lib/python${python_branch}/site-packages
</span> 
         # Deconflict with parent port contents
         post-destroot {
<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 4ed9aef0825..0cbb460884c 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;'>@@ -352,7 +352,11 @@ if {${universal_possible} && [variant_isset universal]} {
</span> 
 # Python Bindings
 foreach python_branch {2.7} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set python_version [join [lrange [split ${python_branch} .] 0 1] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_version   [join [lrange [split ${python_branch} .] 0 1] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_path      ${prefix}/bin/python${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_framework ${frameworks_dir}/Python.framework/Versions/${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_lib       ${prefix}/lib/libpython${python_branch}.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     subport py${python_version}-${name} {
         # NOTE: Only rev-bump subports, for major changes/additions
         revision 5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -366,21 +370,27 @@ foreach python_branch {2.7} {
</span>                             port:${name} \
                             port:py${python_version}-numpy \
                             port:python${python_version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         configure.args-replace \
                             -DBUILD_opencv_python2=OFF \
                             -DBUILD_opencv_python2=ON
         configure.args-replace \
                             -DBUILD_opencv_apps=ON \
                             -DBUILD_opencv_apps=OFF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         configure.args-replace \
                             -DPYTHON_EXECUTABLE=${default_python_path} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON_EXECUTABLE=${prefix}/bin/python${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON_EXECUTABLE=${python_path}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON_DEFAULT_EXECUTABLE:FILEPATH=${default_python_path} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON_DEFAULT_EXECUTABLE:FILEPATH=${python_path}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON2_EXECUTABLE=${prefix}/bin/python${python_branch} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON_LIBRARIES=${prefix}/lib/libpython${python_branch}.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON2_LIBRARIES=${prefix}/lib/libpython${python_branch}.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON2_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/${python_branch}/Headers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON2_PACKAGES_PATH=${frameworks_dir}/Python.framework/Versions/${python_branch}/lib/python${python_branch}/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON2_EXECUTABLE=${python_path} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON_LIBRARIES=${python_lib} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON2_LIBRARIES=${python_lib} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON2_INCLUDE_DIR=${python_framework}/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON2_PACKAGES_PATH=${python_framework}/lib/python${python_branch}/site-packages
</span> 
         # Deconflict with parent port contents
         post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -394,7 +404,11 @@ foreach python_branch {2.7} {
</span> 
 set python_branches {3.9 3.10 3.11}
 foreach python_branch ${python_branches} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set python_version [join [lrange [split ${python_branch} .] 0 1] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_version   [join [lrange [split ${python_branch} .] 0 1] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_path      ${prefix}/bin/python${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_framework ${frameworks_dir}/Python.framework/Versions/${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_lib       ${prefix}/lib/libpython${python_branch}.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     subport py${python_version}-${name} {
         # NOTE: Only rev-bump subports, for major changes/additions
         revision 5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -410,6 +424,7 @@ foreach python_branch ${python_branches} {
</span>                             port:${name} \
                             port:py${python_version}-numpy \
                             port:python${python_version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         configure.args-replace \
                             -DBUILD_opencv_python3=OFF \
                             -DBUILD_opencv_python3=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -417,10 +432,10 @@ foreach python_branch ${python_branches} {
</span>                             -DBUILD_opencv_apps=ON \
                             -DBUILD_opencv_apps=OFF
         configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON3_EXECUTABLE=${prefix}/bin/python${python_branch} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON3_LIBRARY=${frameworks_dir}/Python.framework/Versions/${python_branch}/lib/libpython${python_branch}.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON3_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/${python_branch}/Headers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON3_PACKAGES_PATH=${frameworks_dir}/Python.framework/Versions/${python_branch}/lib/python${python_branch}/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON3_EXECUTABLE=${python_path} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON3_LIBRARY=${python_lib} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON3_INCLUDE_DIR=${python_framework}/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON3_PACKAGES_PATH=${python_framework}/lib/python${python_branch}/site-packages
</span> 
         # Deconflict with parent port contents
         post-destroot {
</pre><pre style='margin:0'>

</pre>