<pre style='margin:0'>
Sean Farley (seanfarley) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/be6cba710346110214b39095237ad7edcd4e3334">https://github.com/macports/macports-ports/commit/be6cba710346110214b39095237ad7edcd4e3334</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit be6cba710346110214b39095237ad7edcd4e3334
</span>Author: Sean Farley <sean@macports.org>
AuthorDate: Mon Apr 2 21:28:33 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> dolfin: update to 2017.2.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This changes dolfin (and all other fenices project ports) to python3 since
</span><span style='display:block; white-space:pre;color:#404040;'> that is what upstream has done. Also, since VTK support has been ripped out in
</span><span style='display:block; white-space:pre;color:#404040;'> favor of matplotlib, this closes the vtk tickets.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/51485
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/54148
</span>---
math/dolfin/Portfile | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/dolfin/Portfile b/math/dolfin/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f0fbd2a..5ca2679 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/dolfin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/dolfin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,8 @@ PortGroup bitbucket 1.0
</span> PortGroup cmake 1.0
PortGroup mpi 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-bitbucket.setup fenics-project dolfin 2016.1.0 dolfin-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bitbucket.setup fenics-project dolfin 2017.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories math
license LGPL-3+
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,17 +15,16 @@ maintainers sean openmaintainer
</span> description DOLFIN is a part of FEniCS
long_description DOLFIN is a library that functions as the main user interface of FEniCS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4a8f9c21a947b204338c9cf17f2cbe642f64190e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0db95c8f193fd56d741cb90682e0a6a21e366c4f48d33e1eb501d2f98aa1a05b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8e51f28623ea0d6f1f0fad01f3c1cf0a81a25bc5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 90f77796372eed63f529bafa7c05afa3d5bfeb5f378d3e4e9d53959c0c06bbe7
</span>
mpi.setup require
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE:FILEPATH=${prefix}/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE:FILEPATH=${prefix}/bin/python3.6 \
</span> -DPYTHON_INCLUDE_DIR:PATH=${frameworks_dir}/Python.framework/Headers \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_LIBRARY:FILEPATH=${prefix}/lib/libpython2.7.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DDOLFIN_INSTALL_PYTHON_MODULE_DIR=${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DDOLFIN_INSTALL_PYTHON_PURE_MODULE_DIR=${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDOLFIN_INSTALL_PYTHON_MODULE_DIR=${frameworks_dir}/Python.framework/Versions/3.6/lib/python3.6/site-packages \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDOLFIN_INSTALL_PYTHON_PURE_MODULE_DIR=${frameworks_dir}/Python.framework/Versions/3.6/lib/python3.6/site-packages \
</span> -DDOLFIN_ENABLE_CGAL:BOOL=OFF \
-DDOLFIN_ENABLE_DOCS:BOOL=OFF \
-DDOLFIN_ENABLE_HDF5:BOOL=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,11 +44,10 @@ configure.args-append \
</span> depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:python27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-ply \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:python36 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py36-ply \
</span> port:armadillo \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-ffc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:vtk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py36-ffc \
</span> port:eigen3
configure.post_args ..
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +62,7 @@ post-patch {
</span> reinplace "s,add_subdirectory(cmake/post-install),," ${worksrcpath}/CMakeLists.txt
# we also need to find and replace all instances of '/usr/bin/env python'
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "find . -type f -exec /usr/bin/perl -pi -e 's,/usr/bin/env python,${prefix}/bin/python2.7,' {} +"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "find . -type f -exec /usr/bin/perl -pi -e 's,/usr/bin/env python,${prefix}/bin/python3.6,' {} +"
</span> }
# dolfin's configure seems to be too good at find default compilers so we
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,12 +86,12 @@ variant cgal description {Build with CGAL interface} {
</span> }
variant docs description {Build documentation} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py27-sphinx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py36-sphinx
</span> configure.args-delete -DDOLFIN_ENABLE_DOCS:BOOL=OFF \
-DDOLFIN_ENABLE_SPHINX:BOOL=OFF
configure.args-append -DDOLFIN_ENABLE_DOCS:BOOL=ON \
-DDOLFIN_ENABLE_SPHINX:BOOL=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DSPHINX_EXECUTABLE:FILEPATH=${prefix}/bin/sphinx-build-2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSPHINX_EXECUTABLE:FILEPATH=${prefix}/bin/sphinx-build-3.6
</span> }
variant hdf5 description {Build with HDF5 interface} {
</pre><pre style='margin:0'>
</pre>