<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/20202cf7fbc6fa03c2dd98c7218fed8c61a4239d">https://github.com/macports/macports-ports/commit/20202cf7fbc6fa03c2dd98c7218fed8c61a4239d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 20202cf7fbc6fa03c2dd98c7218fed8c61a4239d
</span>Author: Marius Schamschula <mschamschula@gmail.com>
AuthorDate: Wed Mar 8 19:59:12 2023 -0600

<span style='display:block; white-space:pre;color:#404040;'>    dolfin: update to 2019.1.0
</span>---
 math/dolfin/Portfile                         | 39 +++++++++++++++-------------
 math/dolfin/files/patch-EigenLUSolver.h.diff | 14 ----------
 math/dolfin/files/patch-VTK.diff             | 22 ++++++++++++++++
 3 files changed, 43 insertions(+), 32 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 74b1f6ea28b..a3c11fcb3f4 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.1
 PortGroup           mpi 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-bitbucket.setup     fenics-project dolfin 2018.1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bitbucket.setup     fenics-project dolfin 2019.1.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,20 +15,23 @@ maintainers         nomaintainer
</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  9b1c8b3c54368d7cda0cc615d5ca16070adbbde0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  2afb54e2f8a2c7be5a89e4ef224b68ae514c32168c9a94b1921d62339f8decd4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    4835222
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  ce75ed93b3f111364444e2e337add3408b81fa4c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  42b30031ea77089304b2d986212b4fab54b3dc216041bda4b7a946a9bd6e10a1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    6542964
</span> 
 mpi.setup           require
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# avoid "error: 'EigenLUImplBase' is a private member of 'dolfin::EigenLUSolver'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append   patch-EigenLUSolver.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python.version  311
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python.branch   [string index ${python.version} 0].[string range ${python.version} 1 end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch-VTK.diff
</span> 
 configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DPYTHON_EXECUTABLE:FILEPATH=${prefix}/bin/python3.6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DBOOST_ROOT=${prefix}/libexec/boost/1.76 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON_EXECUTABLE:FILEPATH=${prefix}/bin/python${python.branch} \
</span>                     -DPYTHON_INCLUDE_DIR:PATH=${frameworks_dir}/Python.framework/Headers \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -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:#ffe0e0;'>-                    -DDOLFIN_INSTALL_PYTHON_PURE_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_MODULE_DIR=${frameworks_dir}/Python.framework/Versions/${python.branch}/lib/python${python.branch}/site-packages \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DDOLFIN_INSTALL_PYTHON_PURE_MODULE_DIR=${frameworks_dir}/Python.framework/Versions/${python.branch}/lib/python${python.branch}/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;'>@@ -49,11 +52,11 @@ configure.args-append \
</span> depends_build-append \
                     port:pkgconfig
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append  port:python36 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py36-ply \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append  port:boost176 \
</span>                     port:armadillo \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py36-ffc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:eigen3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:eigen3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:py${python.version}-ffc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:py${python.version}-ply
</span> 
 configure.post_args ..
 configure.dir       ${worksrcpath}/build
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,12 +94,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:py36-sphinx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append    port:py${python.version}-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-3.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                          -DSPHINX_EXECUTABLE:FILEPATH=${prefix}/bin/sphinx-build-${python.branch}
</span> }
 
 variant hdf5 description {Build with HDF5 interface} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,7 +142,7 @@ variant petsc description {Build with PETSc interface} {
</span> }
 
 variant petsc4py description {Build with PETSc4py interface} requires petsc {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append    port:py27-petsc4py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append    port:py${python.version}-petsc4py
</span>     configure.args-delete -DDOLFIN_ENABLE_PETSC4PY:BOOL=OFF
     configure.args-append -DDOLFIN_ENABLE_PETSC4PY:BOOL=ON
 }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -152,7 +155,7 @@ variant slepc description {Build with SLEPc interface} requires petsc {
</span> }
 
 variant slepc4py description {Build with SLEPc4py interface} requires slepc {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append    port:py27-slepc4py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append    port:py${python.version}-slepc4py
</span>     configure.args-delete -DDOLFIN_ENABLE_SLEPC4PY:BOOL=OFF
     configure.args-append -DDOLFIN_ENABLE_SLEPC4PY:BOOL=ON
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/dolfin/files/patch-EigenLUSolver.h.diff b/math/dolfin/files/patch-EigenLUSolver.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5899430f01e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/dolfin/files/patch-EigenLUSolver.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dolfin/la/EigenLUSolver.h.orig 2018-07-31 23:33:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dolfin/la/EigenLUSolver.h      2018-07-31 23:45:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,9 +83,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     std::string parameter_type() const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     { return "lu_solver"; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    class EigenLUImplBase;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     // Eigen LU implementation class
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    class EigenLUImplBase;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     std::unique_ptr<EigenLUImplBase> _impl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     // Available LU solvers and descriptions
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/dolfin/files/patch-VTK.diff b/math/dolfin/files/patch-VTK.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f5e430f8b9f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/dolfin/files/patch-VTK.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dolfin/io/VTKFile.cpp.orig     2023-03-08 16:27:32.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dolfin/io/VTKFile.cpp  2023-03-08 16:32:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <vector>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iomanip>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <boost/cstdint.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <boost/detail/endian.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <boost/spirit/home/support/detail/endian.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "pugixml.hpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dolfin/io/VTKWriter.cpp.orig   2023-03-08 16:32:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dolfin/io/VTKWriter.cpp        2023-03-08 16:57:14.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sstream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <vector>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iomanip>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <boost/detail/endian.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <boost/spirit/home/support/detail/endian.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <dolfin/fem/GenericDofMap.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <dolfin/fem/FiniteElement.h>
</span></pre><pre style='margin:0'>

</pre>