<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/2b680d6ec59ffb2731eeaebce6d0dc33f49b746f">https://github.com/macports/macports-ports/commit/2b680d6ec59ffb2731eeaebce6d0dc33f49b746f</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 2b680d6ec59 pymol: update to 3.1.0
</span>2b680d6ec59 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2b680d6ec59ffb2731eeaebce6d0dc33f49b746f
</span>Author: jwhowarth <howarth.mailing.lists@gmail.com>
AuthorDate: Wed Feb 5 22:24:51 2025 -0500
<span style='display:block; white-space:pre;color:#404040;'> pymol: update to 3.1.0
</span>---
science/pymol/Portfile | 19 +++++++++----------
science/pymol/files/setup.py.diff | 16 ++++++++--------
2 files changed, 17 insertions(+), 18 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 76f00d07916..9d13d851f6e 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;'>@@ -5,11 +5,10 @@ PortGroup python 1.0
</span> PortGroup github 1.0
PortGroup boost 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup schrodinger pymol-open-source 3.0.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Change github.tarball_from to 'releases' or 'archive' next update
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.tarball_from tarball
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup schrodinger pymol-open-source 3.1.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span> name pymol
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> conflicts pymol-devel
categories science chemistry
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,9 +23,9 @@ long_description PyMOL is a molecular graphics system with an embedded Python
</span>
homepage https://www.pymol.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d963b8704371db01d78cf75708b29f8f1c27829a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 27659a99d843c58c513bd9fd78cc67a717cef151b34a439213fbca8bffa2298f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 29508167
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0333aef1a1874cb7f8600923293a319c4090f4ce \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 54306d65060bd58ed8b3dab1a8af521aeb4fd417871f15f463ff05ccb4e121fe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 29550866
</span>
subport pymol-devel {
github.setup schrodinger pymol-open-source 71246845f77ecfa2e14f01887abd180c18ebfb55
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,8 +37,6 @@ subport pymol-devel {
</span> checksums rmd160 5700f99276e297cfd51c9e7ab5b0284f9cfa346a \
sha256 3c5e8ea2c6b2ee71d108b8a67471bab7de090d3809ec326cb9f537a7c272670a \
size 29559179
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:bin/cmake:cmake
</span> }
variant python39 conflicts python310 python311 python312 python313 description {Use Python 3.9} {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,7 +76,9 @@ variant openmp description {Enable OpenMP support} {
</span> }
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setuptools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/cmake:cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
depends_lib-append port:freetype \
port:glew \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/pymol/files/setup.py.diff b/science/pymol/files/setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9a9b3b23277..7568297fb11 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/pymol/files/setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/pymol/files/setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2021-05-10 14:38:37.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2021-05-14 11:35:43.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -92,7 +92,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- X11 = ['/usr/X11'] * (not options.osx_frameworks)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2025-01-24 23:19:47
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2025-02-03 14:29:29
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -257,7 +257,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ paths += ["usr/X11"]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if sys.platform == 'darwin':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for prefix in ['/sw', '/opt/local', '/usr/local']:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for prefix in ['@PREFIX@', '/usr/local']:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if MAC:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for prefix in ["/sw", "/opt/local", "/usr/local"]:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for prefix in ["@PREFIX@", "/usr/local"]:
</span> if sys.base_prefix.startswith(prefix):
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return [prefix] + X11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ paths += [prefix]
</span>
</pre><pre style='margin:0'>
</pre>