<pre style='margin:0'>
Aljaž Srebrnič (g5pw) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/00a4f52bcba6decfdb3ff9e0b5a69f81ccebf5fe">https://github.com/macports/macports-ports/commit/00a4f52bcba6decfdb3ff9e0b5a69f81ccebf5fe</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 00a4f52 science/pymol: update to 2.1.0 with QT interface
</span>00a4f52 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 00a4f52bcba6decfdb3ff9e0b5a69f81ccebf5fe
</span>Author: Aljaž "g5pw" Srebrnič <g5pw@macports.org>
AuthorDate: Tue Apr 24 00:02:07 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> science/pymol: update to 2.1.0 with QT interface
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes #56139
</span>---
science/pymol/Portfile | 40 ++++++++++++++++++++-----------
science/pymol/files/pmg_tk_platform.patch | 27 +++++++--------------
science/pymol/files/pymol_shell.diff | 2 +-
3 files changed, 36 insertions(+), 33 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 4213453..1c97e98 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,7 +6,7 @@ PortGroup active_variants 1.1
</span> PortGroup compilers 1.0
name pymol
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.8.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.1.0
</span> categories science chemistry
license PSF
maintainers {gmail.com:howarth.at.macports @jwhowarth} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,19 +22,23 @@ homepage http://www.pymol.org/
</span> master_sites sourceforge
fetch.type svn
svn.url http://svn.code.sf.net/p/pymol/code/trunk/pymol
<span style='display:block; white-space:pre;background:#ffe0e0;'>-svn.revision 4176
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+svn.revision 4187
</span> worksrcdir pymol
compilers.choose cc cxx
compilers.setup
<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:#ffe0e0;'>-variant python34 conflicts python27 python35 description {Use Python 3.4} {}
</span><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 python27 conflicts python34 python35 python36 description {Use Python 2.7} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python34 conflicts python27 python35 python36 description {Use Python 3.4} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python35 conflicts python27 python34 python36 description {Use Python 3.5} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 conflicts python27 python34 python35 description {Use Python 3.5} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[variant_isset python34]} {
python.default_version 34
} elseif {[variant_isset python35]} {
python.default_version 35
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {[variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.default_version 36
</span> } else {
default_variants +python27
python.default_version 27
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,6 +54,7 @@ depends_lib-append port:freeglut \
</span> port:msgpack1 \
port:py${python.version}-numpy \
port:py${python.version}-pmw \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyqt5 \
</span> port:py${python.version}-scipy \
port:py${python.version}-tkinter \
port:tcl \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,17 +66,14 @@ universal_variant no
</span>
patchfiles pymol_shell.diff \
pmg_tk_platform.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- apbs-psize.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} >= 12} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append pymol-use-glkit.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ apbs-psize.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdb2pqr.patch
</span>
require_active_variants tcl "" corefoundation
require_active_variants tk "" quartz
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/setup.py ${worksrcpath}/modules/pmg_tk/startup/apbs_tools.py
</span> reinplace "s|@@PYTHON_PKGDIR@@|${python.pkgd}|g" ${worksrcpath}/setup/pymol_macports
reinplace "s|@@PYTHON_BINARY@@|${python.bin}|g" ${worksrcpath}/setup/pymol_macports
reinplace "s|\"-O3\",|\"-O3\", \"-g\",|g" ${worksrcpath}/setup.py
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,6 +84,8 @@ use_parallel_build yes
</span>
build {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.cmd ${python.bin} setup.py --no-user-cfg --osx-frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-destroot {
destroot.env CC="${configure.cc}" CXX="${configure.cxx}" PREFIX_PATH="${prefix}"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,7 +93,15 @@ pre-destroot {
</span> post-destroot {
file copy ${worksrcpath}/setup/pymol_macports ${destroot}${prefix}/bin/pymol
file attributes ${destroot}${prefix}/bin/pymol -permissions a+x
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach d {data modules examples test scripts} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/${d} ${destroot}${python.pkgd}/pymol
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.cmd cd test && ${python.bin}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target run
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "Pymol can be started with the classic Tk GUI by appending the '-N pmg_tk' runtime option."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url ${svn.url}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.version ${svn.revision}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex {Revision (\d+):}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/pymol/files/pmg_tk_platform.patch b/science/pymol/files/pmg_tk_platform.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 4df1e8e..d51b488 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/pymol/files/pmg_tk_platform.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/pymol/files/pmg_tk_platform.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> Index: modules/pmg_tk/PMGApp.py
===================================================================
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/pmg_tk/PMGApp.py (revision 4106)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/pmg_tk/PMGApp.py (revision 4187)
</span> +++ modules/pmg_tk/PMGApp.py (working copy)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -210,7 +210,7 @@ class PMGApp(Pmw.MegaWidget):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -229,7 +229,7 @@
</span> self.fifo.put(cmmd)
def my_show(self,win,center=1):
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ Index: modules/pmg_tk/PMGApp.py
</span> win.show()
else: # autocenter, deiconify, and run mainloop
# this is a workaround for a bug in the
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -228,7 +228,7 @@ class PMGApp(Pmw.MegaWidget):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -247,7 +247,7 @@
</span> win.deiconify()
def my_withdraw(self,win):
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,23 +22,14 @@ Index: modules/pmg_tk/PMGApp.py
</span> win.destroy()
Index: modules/pmg_tk/skins/normal/__init__.py
===================================================================
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/pmg_tk/skins/normal/__init__.py (revision 4106)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/pmg_tk/skins/normal/__init__.py (revision 4187)
</span> +++ modules/pmg_tk/skins/normal/__init__.py (working copy)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -271,7 +271,7 @@ class Normal(PMGSkin):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.buttonArea.destroy()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def my_show(self,win,center=1):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if sys.platform!='linux2':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (sys.platform!='linux2') and (sys.platform!='darwin'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- win.show()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else: # autocenter, deiconify, and run mainloop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this is a workaround for a bug in the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -290,13 +290,13 @@ class Normal(PMGSkin):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # win.show()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -345,13 +345,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ win.show()
</span>
def my_withdraw(self,win):
- if sys.platform!='linux2':
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (sys.platform!='linux2') or (sys.platform!='darwin'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (sys.platform!='linux2') and (sys.platform!='darwin'):
</span> win.withdraw()
else:
win.destroy()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,12 +40,12 @@ Index: modules/pmg_tk/skins/normal/__init__.py
</span> win.activate()
else: # autocenter, deiconify, and run mainloop
# this is a workaround for a bug in the
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -317,7 +317,7 @@ class Normal(PMGSkin):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -372,7 +372,7 @@
</span> win.mainloop()
def my_deactivate(self,win):
- if sys.platform!='linux2':
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (sys.platform!='linux2') or (sys.platform!='darwin'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (sys.platform!='linux2') and (sys.platform!='darwin'):
</span> win.deactivate()
else: # autocenter, deiconify, and run mainloop
win.destroy()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/pymol/files/pymol_shell.diff b/science/pymol/files/pymol_shell.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4bbcbd5..4fb1d0a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/pymol/files/pymol_shell.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/pymol/files/pymol_shell.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@
</span> +# ==============================================================
+# Set PYMOL_PATH to point at the correct location on your system
+#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+PYMOL_PATH=@@PYTHON_PKGDIR@@/pymol
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PYMOL_PATH=@@PYTHON_PKGDIR@@/pymol/pymol_path
</span> +export PYMOL_PATH
+#
+# ==============================================================
</pre><pre style='margin:0'>
</pre>