<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/19fd0b9a21ca4e63d71fc02459311fa4c2d71e0a">https://github.com/macports/macports-ports/commit/19fd0b9a21ca4e63d71fc02459311fa4c2d71e0a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 19fd0b9a21ca4e63d71fc02459311fa4c2d71e0a
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sun May 24 10:53:06 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> pymol: fix variant selection
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - it should be possible to install with only selecting +python27 or
</span><span style='display:block; white-space:pre;color:#404040;'> with +x11 +python38
</span>---
science/pymol/Portfile | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/pymol/Portfile b/science/pymol/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 05fe927..9460f7f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/pymol/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/pymol/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,9 @@ variant python36 conflicts python27 python35 python37 python38 description {Use
</span> variant python37 conflicts python27 python35 python36 python38 description {Use Python 3.7} {}
variant python38 conflicts python27 python35 python36 python37 description {Use Python 3.8} {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset python35]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.default_version 27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {[variant_isset python35]} {
</span> python.default_version 35
} elseif {[variant_isset python36]} {
python.default_version 36
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,8 +46,7 @@ if {[variant_isset python35]} {
</span> python.default_version 38
} else {
if {[variant_isset x11]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # The APBS Tools plugin requires pdb2pqr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # which can't be run under python3 yet
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The APBS Tools plugin requires pdb2pqr, which can't be run under python3 yet
</span> default_variants +python27
python.default_version 27
} else {
</pre><pre style='margin:0'>
</pre>