<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/4a92db09e2840ee1eda5203f7923d4f7d137d7e2">https://github.com/macports/macports-ports/commit/4a92db09e2840ee1eda5203f7923d4f7d137d7e2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4a92db09e2840ee1eda5203f7923d4f7d137d7e2
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sat May 8 08:18:36 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    pymol-devel: add as new subport to pymol
</span>---
 science/pymol/Portfile                        | 27 ++++++++++++++++++++++++++-
 science/pymol/files/patch-devel-setup.py.diff | 11 +++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

<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 95fb912e2ee..4bf755919de 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;'>@@ -7,6 +7,7 @@ PortGroup           github 1.0
</span> 
 github.setup        schrodinger pymol-open-source 2.4.0 v
 name                pymol
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts           pymol-devel
</span> revision            2
 
 categories          science chemistry
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,6 +27,17 @@ checksums           rmd160  e7a962473732172b370e6c7a880384e7a1ffa62e \
</span>                     sha256  b0af15082c44c92c285cab341506da50407619f5dee09d98fdf2802e356219fd \
                     size    10552074
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+subport pymol-devel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    github.setup    schrodinger pymol-open-source 4a3c72ace1f8e39e80db4026d45222f8b7a44169
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    version         20210428-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    conflicts       pymol
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision        0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    maintainers     {reneeotten @reneeotten} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums       rmd160  b8f596935a043a3ecde7b8f0e1c914b74277d1d0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  92f39021487fa1c3da1840721c7ad4c3992dfcb54d73fef27fb30842828425a8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    10469954
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant python27 conflicts python36 python37 python38 python39 description {Use Python 2.7} {}
 variant python36 conflicts python27 python37 python38 python39 description {Use Python 3.6} {}
 variant python37 conflicts python27 python36 python38 python39 description {Use Python 3.7} {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,8 +103,21 @@ patchfiles          pymol_shell.diff \
</span>                     pdb2pqr.patch \
                     setup.py.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "pymol-devel"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    apbs-psize.patch  \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    python_string_split.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    pdb2pqr.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    setup.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-devel-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace  "s|@PREFIX@|${prefix}|g" ${worksrcpath}/setup.py ${worksrcpath}/modules/pmg_tk/startup/apbs_tools.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace  "s|@PREFIX@|${prefix}|g" ${worksrcpath}/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if { [ file exists ${worksrcpath}/modules/pmg_tk/startup/apbs_tools.py ] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace  "s|@PREFIX@|${prefix}|g" ${worksrcpath}/modules/pmg_tk/startup/apbs_tools.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</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|cxx + ' ' + cxxflags|'${configure.cxx} ' + cxxflags|g" ${worksrcpath}/monkeypatch_distutils.py
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/pymol/files/patch-devel-setup.py.diff b/science/pymol/files/patch-devel-setup.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..18fc0d90ff8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/pymol/files/patch-devel-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig  2020-07-06 11:00:54.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py       2020-07-06 11:01:23.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -86,7 +86,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     X11 = ['/usr/X11'] * (not options.osx_frameworks)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if sys.platform == 'darwin':
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+             if sys.base_prefix.startswith(prefix):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 return [prefix] + X11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span></pre><pre style='margin:0'>

</pre>