<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/39c8f59d39a51900ccc375b804afd281bdb800d8">https://github.com/macports/macports-ports/commit/39c8f59d39a51900ccc375b804afd281bdb800d8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 39c8f59d39a51900ccc375b804afd281bdb800d8
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Thu Oct 7 11:45:13 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    pymol-devel: update to 20211007-a37118f6
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - depend only on msgpack-cpp
</span><span style='display:block; white-space:pre;color:#404040;'>    - add boost as a build dependency, add specify include directory
</span>---
 science/pymol/Portfile                       | 20 +++++++++++++-------
 science/pymol/files/patch-boost-include.diff | 13 +++++++++++++
 2 files changed, 26 insertions(+), 7 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 9289d62b51e..c38358fbec1 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;'>@@ -3,8 +3,10 @@
</span> PortSystem          1.0
 PortGroup           python 1.0
 PortGroup           github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           boost 1.0
</span> 
 github.setup        schrodinger pymol-open-source 2.5.0 v
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> name                pymol
 conflicts           pymol-devel
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,14 +28,14 @@ checksums           rmd160  6432d47616aee1e5d9d40cc2a74425b33159d7a0 \
</span>                     size    10471287
 
 subport pymol-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    github.setup    schrodinger pymol-open-source c6479cd122932e3647679e3ee785b69401582019
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    version         20210914-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    github.setup    schrodinger pymol-open-source a37118f6780dd9f76cf0a89155801e54cdb2e14d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    version         20211007-[string range ${github.version} 0 7]
</span>     conflicts       pymol
     revision        0
     maintainers     {reneeotten @reneeotten} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums       rmd160  f8e80c9ebf9517dc5873b147b9c4ecd2e96f13fa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  5ce959d17f510f2c94b181c2d2e4151224f6a33bddef3094d841a8c77c668346 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    10479345
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums       rmd160  b26414cc661313746968679be2a1789b083ae65e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  6c65f7969b703f67049841078a7f42eec2d15ac8b53fefc814b9500e642d1989 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    10479135
</span> }
 
 variant python36 conflicts python37 python38 python39 description {Use Python 3.6} {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +55,8 @@ if {[variant_isset python36]} {
</span> }
 python.link_binaries no
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+boost.depends_type build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.cxx_standard 2011
 
 variant vtkm description {Use VTK-m for isosurface generation} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,7 +70,7 @@ depends_lib-append  port:freetype \
</span>                     port:libpng \
                     port:libGLU \
                     port:libxml2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:msgpack \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:msgpack-cpp \
</span>                     port:mmtf-cpp \
                     port:netcdf \
                     port:py${python.version}-numpy
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,10 +78,12 @@ depends_lib-append  port:freetype \
</span> depends_run-append  port:py${python.version}-pyqt5
 
 patchfiles          pymol_shell.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    setup.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-boost-include.diff
</span> 
 post-patch {
     reinplace  "s|@PREFIX@|${prefix}|g" ${worksrcpath}/setup.py
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace  "s|@@BOOST_INC_DIR@@|[boost::include_dir]|g" ${worksrcpath}/setup.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|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-boost-include.diff b/science/pymol/files/patch-boost-include.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d8db29f1f9c
</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-boost-include.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig  2021-10-07 16:20:45.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py       2021-10-07 16:43:37.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -480,6 +480,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if sys.platform == 'darwin':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         ext_comp_args += ["-fno-strict-aliasing"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# MacPorts; need to include the BOOST include directory since msgpack-cpp v4.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# needs those and we install them in a non-default location
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++inc_dirs += ['@@BOOST_INC_DIR@@',]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def get_pymol_version():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     return re.findall(r'_PyMOL_VERSION "(.*)"', open('layer0/Version.h').read())[0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>

</pre>