<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/a7a67eded933310681dc2e7cc96ada1d19884987">https://github.com/macports/macports-ports/commit/a7a67eded933310681dc2e7cc96ada1d19884987</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a7a67eded933310681dc2e7cc96ada1d19884987
</span>Author: Julien Salort <julien.salort@ens-lyon.fr>
AuthorDate: Thu May 19 11:02:50 2022 +0200

<span style='display:block; white-space:pre;color:#404040;'>    opencv3: remove duplicate dependency and use variable for default python version
</span>---
 graphics/opencv3/Portfile | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

<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 b721794855b..88e391052bb 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,6 +52,9 @@ distname            ${version}
</span> distfiles           ${distname}${extract.suffix}:opencv
 dist_subdir         ${my_name}
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set default_python_branch   3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set default_python_version [join [lrange [split ${default_python_branch} .] 0 1] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>@@ -111,7 +114,7 @@ depends_lib-append  \
</span>                     port:webp \
                     port:ilmbase \
                     port:openexr \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:python310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:python${default_python_version}
</span> 
 # only search for openexr in ${prefix}
 patchfiles-append   patch-find-openexr.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -273,8 +276,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/python3.10 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DPYTHON_DEFAULT_EXECUTABLE=${prefix}/bin/python3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON_EXECUTABLE=${prefix}/bin/python${default_python_branch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON_DEFAULT_EXECUTABLE=${prefix}/bin/python${default_python_branch}
</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;'>@@ -352,8 +355,10 @@ foreach python_branch {2.7} {
</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_python2=OFF \
                             -DBUILD_opencv_python2=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -361,7 +366,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/python3.10 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON_EXECUTABLE=${prefix}/bin/python${default_python_branch} \
</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;'>@@ -386,8 +391,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=OFF \
                             -DBUILD_opencv_python3=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -514,7 +521,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/python3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON_EXECUTABLE=${prefix}/bin/python${default_python_branch}
</span>         configure.args-delete \
                             -DBUILD_opencv_python2=OFF
     }
</pre><pre style='margin:0'>

</pre>