<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b416643272956bdb0361988cdaed0d94d1484aea">https://github.com/macports/macports-ports/commit/b416643272956bdb0361988cdaed0d94d1484aea</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b416643272956bdb0361988cdaed0d94d1484aea
</span>Author: jwhowarth <howarth.mailing.lists@gmail.com>
AuthorDate: Sat Jul 28 10:16:14 2018 -0400

<span style='display:block; white-space:pre;color:#404040;'>    Update pymol to 2.2.0, add py37 and use git
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    This update to the pymol packaging
</span><span style='display:block; white-space:pre;color:#404040;'>    1) builds the current 2.2.0 release
</span><span style='display:block; white-space:pre;color:#404040;'>    2) adds support for the py37 variant
</span><span style='display:block; white-space:pre;color:#404040;'>    3) adds the new glm port dependency
</span><span style='display:block; white-space:pre;color:#404040;'>    4) switches the mode of fetching sources since upstream has moved from svn to git.
</span><span style='display:block; white-space:pre;color:#404040;'>    5) Revises the setup.py.diff to reflect the last hunk being present now upstream
</span>---
 science/pymol/Portfile | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 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 5a0c7ba..557ad08 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;'>@@ -6,8 +6,7 @@ PortGroup           active_variants 1.1
</span> PortGroup           compilers 1.0
 
 name                pymol
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             2.1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             2.2.0
</span> categories          science chemistry
 license             PSF
 maintainers         {gmail.com:howarth.at.macports @jwhowarth} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,18 +20,19 @@ platforms           darwin
</span> homepage            http://www.pymol.org/
 
 master_sites        sourceforge
<span style='display:block; white-space:pre;background:#ffe0e0;'>-fetch.type          svn
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-svn.url             https://svn.code.sf.net/p/pymol/code/trunk/pymol
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-svn.revision        4187
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fetch.type          git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+git.url             https://github.com/schrodinger/pymol-open-source.git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+git.branch          d4685bd052d409b6a9381132093ad5c9cdada989
</span> worksrcdir          pymol
 
 compilers.choose    cc cxx
 compilers.setup
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python34 python35 python36 description {Use Python 2.7} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python34 conflicts python27 python35 python36 description {Use Python 3.4} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python35 conflicts python27 python34 python36 description {Use Python 3.5} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 conflicts python27 python34 python35 description {Use Python 3.6} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 conflicts python34 python35 python36 python37 description {Use Python 2.7} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python34 conflicts python27 python35 python36 python37 description {Use Python 3.4} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python35 conflicts python27 python34 python36 python37 description {Use Python 3.5} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 conflicts python27 python34 python35 python37 description {Use Python 3.6} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 conflicts python27 python34 python35 python36 description {Use Python 3.7} {}
</span> 
 if {[variant_isset python34]} {
     python.default_version 34
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +40,8 @@ if {[variant_isset python34]} {
</span>     python.default_version 35
 } elseif {[variant_isset python36]} {
     python.default_version 36
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {[variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    python.default_version 37
</span> } else {
     default_variants +python27
     python.default_version 27
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,6 +51,7 @@ python.link_binaries no
</span> depends_lib-append  port:freeglut \
                     port:freetype \
                     port:glew \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:glm \
</span>                     port:libpng \
                     port:libGLU \
                     port:mesa \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,7 +106,4 @@ test.target         run
</span> 
 notes "Pymol can be started with the classic Tk GUI by appending the '-N pmg_tk' runtime option."
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type  regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url   ${svn.url}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.version  ${svn.revision}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {Revision (\d+):}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type none
</span></pre><pre style='margin:0'>

</pre>