<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/cfed6a06534d5f04be096582280b77d5237d5d77">https://github.com/macports/macports-ports/commit/cfed6a06534d5f04be096582280b77d5237d5d77</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cfed6a06534d5f04be096582280b77d5237d5d77
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sun May 24 11:00:17 2020 -0400

<span style='display:block; white-space:pre;color:#404040;'>    pymol: move some code inside the x11 variant
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - use build.args
</span><span style='display:block; white-space:pre;color:#404040;'>    - remove duplicated py-tkinter dependency
</span><span style='display:block; white-space:pre;color:#404040;'>    - remove the pyqt5 dependency within the variant
</span><span style='display:block; white-space:pre;color:#404040;'>    - remove default setting for use_parallel_build
</span>---
 science/pymol/Portfile | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 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 9460f7f..87b638a 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;'>@@ -65,23 +65,23 @@ depends_lib-append  port:freetype \
</span>                     port:msgpack \
                     port:mmtf-cpp \
                     port:netcdf \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py${python.version}-numpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append  port:py${python.version}-pyqt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:py${python.version}-numpy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:py${python.version}-pyqt5
</span> 
 variant x11 {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-delete  port:py${python.version}-pyqt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     depends_lib-append  port:freeglut \
                         port:mesa \
                         port:py${python.version}-pmw \
                         port:py${python.version}-tkinter \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:py${python.version}-tkinter \
</span>                         port:tcl \
                         port:tk
 
     require_active_variants tcl "" corefoundation
     require_active_variants tk "" quartz
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    build.args-append   --glut --no-osx-frameworks
</span> }
 
 patchfiles          pymol_shell.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,11 +98,6 @@ post-patch {
</span>     reinplace  "s|cxx + ' ' + cxxflags|'${configure.cxx} ' + cxxflags|g" ${worksrcpath}/monkeypatch_distutils.py
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    build.cmd ${python.bin} setup.py --no-user-cfg --no-osx-frameworks --glut
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> 
 post-destroot {
      file copy ${worksrcpath}/setup/pymol_macports ${destroot}${prefix}/bin/pymol
</pre><pre style='margin:0'>

</pre>