<pre style='margin:0'>
Marko Käning (mkae) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/26d39ec43c7d5d5c87b9384dbb8fb5c804b9cf34">https://github.com/macports/macports-ports/commit/26d39ec43c7d5d5c87b9384dbb8fb5c804b9cf34</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 26d39ec  opencv: fix broken variant handling
</span>26d39ec is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 26d39ec43c7d5d5c87b9384dbb8fb5c804b9cf34
</span>Author: Marko Käning <mk@macports.org>
AuthorDate: Sat Dec 10 22:39:07 2016 +0100

<span style='display:block; white-space:pre;color:#404040;'>    opencv: fix broken variant handling
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    revbump to force rebuild due to wrongly spelled configure option
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/53022
</span>---
 graphics/opencv/Portfile | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/Portfile b/graphics/opencv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 19a905e..3836d3d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup           compiler_blacklist_versions 1.0
</span> 
 name                opencv
 version             3.1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            7
</span> categories          graphics science
 platforms           darwin
 license             BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,9 +139,7 @@ configure.args-append \
</span>                     -DINSTALL_C_EXAMPLES=OFF \
                     -DINSTALL_PYTHON_EXAMPLES=OFF \
                     -DENABLE_PRECOMPILED_HEADERS=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DCMAKE_VERBOSE=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DENABLE_SSE3=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DENABLE_SSSE3=ON
</span> platform darwin {
     if {${os.major} >= 13} {
         configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -279,12 +277,16 @@ foreach pdv ${pythonversions} {
</span>         }
     }
     variant python${pv} conflicts ${conflist} description "Add bindings for Python ${pdv}" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append  port:python${pv} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:py${pv}-numpy
</span>         patchfiles-delete   patch-modules_python_CMakeLists.txt.diff
         configure.args-delete \
                             -DINSTALL_PYTHON_EXAMPLES=OFF \
                             -DBUILD_opencv_python3=OFF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # settings that depend on loop variables must be set in an appropriate if, not in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # variant declaration scope.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[variant_isset python${pv}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append  port:python${pv} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:py${pv}-numpy
</span>         if {![variant_isset python27]} {
             configure.args-replace \
                             -DPYTHON_EXECUTABLE=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -293,7 +295,7 @@ foreach pdv ${pythonversions} {
</span>         configure.args-append \
                             -DINSTALL_PYTHON_EXAMPLES=ON \
                             -DPYTHON3_EXECUTABLE=${prefix}/bin/python${pdv} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -DPYTHON3_LIBRARY=${prefix}/lib/libpython${pdv}.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DPYTHON3_LIBRARY=${frameworks_dir}/Python.framework/Versions/${pdv}/lib/libpython${pdv}.dylib \
</span>                             -DPYTHON3_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/${pdv}/Headers \
                             -DPYTHON3_PACKAGES_PATH=${frameworks_dir}/Python.framework/Versions/${pdv}/lib/python${pdv}/site-packages
     }
</pre><pre style='margin:0'>

</pre>