<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/defbebe639cfdf1e4ce3504568835f4e00ac5f29">https://github.com/macports/macports-ports/commit/defbebe639cfdf1e4ce3504568835f4e00ac5f29</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 defbebe asymptote: replace python34 with python36 variant
</span>defbebe is described below
<span style='display:block; white-space:pre;color:#808000;'>commit defbebe639cfdf1e4ce3504568835f4e00ac5f29
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Thu Mar 9 20:14:13 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> asymptote: replace python34 with python36 variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also simplify dependency for python3: use just py-Pillow
</span><span style='display:block; white-space:pre;color:#404040;'> rather than path-based hack since py3x-pil doesn't exist anyway.
</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/53756
</span>---
graphics/asymptote/Portfile | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/asymptote/Portfile b/graphics/asymptote/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 370eaf2..dda0582 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/asymptote/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/asymptote/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,10 +84,10 @@ post-destroot {
</span> set python.branch ""
if {[variant_isset python27]} {
set python.branch 2.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[variant_isset python34]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.branch 3.4
</span> } elseif {[variant_isset python35]} {
set python.branch 3.5
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python.branch 3.6
</span> }
if {${python.branch} != ""} {
set python.bin ${prefix}/bin/python${python.branch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,29 +108,25 @@ post-deactivate {
</span>
# asymptote's GUI needs either pyXY-pil or pyXY-Pillow
# https://trac.macports.org/ticket/44284
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python34 python35 description {Enable xasy GUI using Python 2.7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 conflicts python35 python36 description {Enable xasy GUI using Python 2.7} {
</span> set python.version 27
set python.branch "[string range ${python.version} 0 end-1].[string index ${python.version} end]"
depends_lib-append port:py${python.version}-tkinter \
path:${frameworks_dir}/Python.framework/Versions/${python.branch}/lib/python${python.branch}/site-packages/PIL:py${python.version}-Pillow
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python34 conflicts python27 python35 description {Enable xasy GUI using Python 3.4} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.version 34
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.branch "[string range ${python.version} 0 end-1].[string index ${python.version} end]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python35 conflicts python27 python36 description {Enable xasy GUI using Python 3.5} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python.version 35
</span> depends_lib-append port:py${python.version}-tkinter \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:${frameworks_dir}/Python.framework/Versions/${python.branch}/lib/python${python.branch}/site-packages/PIL:py${python.version}-Pillow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-Pillow
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python35 conflicts python27 python34 description {Enable xasy GUI using Python 3.5} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.version 35
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python.branch "[string range ${python.version} 0 end-1].[string index ${python.version} end]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 conflicts python27 python35 description {Enable xasy GUI using Python 3.6} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python.version 36
</span> depends_lib-append port:py${python.version}-tkinter \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:${frameworks_dir}/Python.framework/Versions/${python.branch}/lib/python${python.branch}/site-packages/PIL:py${python.version}-Pillow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-Pillow
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27] && ![variant_isset python34]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python27] && ![variant_isset python36]} {
</span> default_variants +python35
}
</pre><pre style='margin:0'>
</pre>