<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4607e4d14b64fad56cadac9c243ddf84ba33a9f7">https://github.com/macports/macports-ports/commit/4607e4d14b64fad56cadac9c243ddf84ba33a9f7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4607e4d14b64fad56cadac9c243ddf84ba33a9f7
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Wed Jul 12 15:58:12 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> totem: add variant +python36 and make it the default
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Includes fix for broken variant +python35.
</span>---
gnome/totem/Portfile | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/totem/Portfile b/gnome/totem/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index da3b562..960b8af 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/totem/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/totem/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,7 +94,7 @@ variant nautilus description {Build nautilus properties page plugin} {
</span> depends_lib-append port:nautilus
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python34 python35 description {Use python 2.7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 conflicts python34 python35 python36 description {Use python 2.7} {
</span> configure.python ${prefix}/bin/python2.7
depends_lib-append port:py27-gobject3 port:py27-pylint
set python_framework ${frameworks_dir}/Python.framework/Versions/2.7
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,7 +103,7 @@ variant python27 conflicts python34 python35 description {Use python 2.7} {
</span> configure.args-replace --disable-python --enable-python
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python34 conflicts python27 python35 description {Use python 3.4} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python34 conflicts python27 python35 python36 description {Use python 3.4} {
</span> configure.python ${prefix}/bin/python3.4
depends_lib-append port:py34-gobject3 port:py34-pylint
set python_framework ${frameworks_dir}/Python.framework/Versions/3.4
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,17 +112,26 @@ variant python34 conflicts python27 python35 description {Use python 3.4} {
</span> configure.args-replace --disable-python --enable-python
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python35 conflicts python27 python34 description {Use python 3.5} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python35 conflicts python27 python34 python36 description {Use python 3.5} {
</span> configure.python ${prefix}/bin/python3.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py34-gobject3 port:py35-pylint
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_framework ${frameworks_dir}/Python.framework/Versions/3.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py35-gobject3 port:py35-pylint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_framework ${frameworks_dir}/Python.framework/Versions/3.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pkg_config_path ${python_framework}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env PATH=${python_framework}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-python --enable-python
</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;'>+variant python36 conflicts python27 python34 python35 description {Use python 3.6} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python3.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py36-gobject3 port:py36-pylint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_framework ${frameworks_dir}/Python.framework/Versions/3.6
</span> configure.pkg_config_path ${python_framework}/lib/pkgconfig
configure.env PATH=${python_framework}/bin:$env(PATH)
configure.args-replace --disable-python --enable-python
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27] && ![variant_isset python35]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python34
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python27] && ![variant_isset python34] && ![variant_isset python35]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python36
</span> }
post-activate {
</pre><pre style='margin:0'>
</pre>