<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/57091865f76da1a10d8f236e219a89a4c7b43034">https://github.com/macports/macports-ports/commit/57091865f76da1a10d8f236e219a89a4c7b43034</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 5709186 vigra: add support for Python 3.6
</span>5709186 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 57091865f76da1a10d8f236e219a89a4c7b43034
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Jul 13 22:03:48 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> vigra: add support for Python 3.6
</span>---
graphics/vigra/Portfile | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vigra/Portfile b/graphics/vigra/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 248482e..92c9fa9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vigra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/vigra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,7 +89,7 @@ if {[variant_isset valgrind]} {
</span> # remove on 2017/03/19
variant python26 requires python27 description {Legacy variant} {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python34 python35 description "Also build vigranumpy python27 bindings" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 conflicts python34 python35 python36 description "Also build vigranumpy python27 bindings" {
</span> configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7 \
-DPYTHON_SPHINX=${prefix}/bin/sphinx-build-2.7
depends_lib-append port:boost \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,7 +99,7 @@ variant python27 conflicts python34 python35 description "Also build vigranumpy
</span> require_active_variants boost python27
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python34 conflicts python27 python35 description "Also build vigranumpy python34 bindings" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python34 conflicts python27 python35 python36 description "Also build vigranumpy python34 bindings" {
</span> configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python3.4 \
-DPYTHON_SPHINX=${prefix}/bin/sphinx-build-3.4
depends_lib-append port:boost \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,7 +109,7 @@ variant python34 conflicts python27 python35 description "Also build vigranumpy
</span> require_active_variants boost python34
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python35 conflicts python27 python34 description "Also build vigranumpy python35 bindings" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python35 conflicts python27 python34 python36 description "Also build vigranumpy python35 bindings" {
</span> configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python3.5 \
-DPYTHON_SPHINX=${prefix}/bin/sphinx-build-3.5
depends_lib-append port:boost \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,11 +119,21 @@ variant python35 conflicts python27 python34 description "Also build vigranumpy
</span> require_active_variants boost python35
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python34] && ![variant_isset python35]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 conflicts python27 python34 python35 description "Also build vigranumpy python36 bindings" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python3.6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_SPHINX=${prefix}/bin/sphinx-build-3.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:boost \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python36 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py36-numpy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py36-sphinx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants boost python36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python34] && ![variant_isset python35] && ![variant_isset python36]} {
</span> default_variants +python27
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27] && ![variant_isset python34] && ![variant_isset python35]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python27] && ![variant_isset python34] && ![variant_isset python35] && ![variant_isset python36]} {
</span> configure.args-append -DWITH_VIGRANUMPY=NO
}
</pre><pre style='margin:0'>
</pre>