<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c5f503348ed0ec60ea6772b20cb6dcc804332fdf">https://github.com/macports/macports-ports/commit/c5f503348ed0ec60ea6772b20cb6dcc804332fdf</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 c5f5033 dealii: update version 9.1.1->9.2.0
</span>c5f5033 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c5f503348ed0ec60ea6772b20cb6dcc804332fdf
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue May 26 21:11:53 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> dealii: update version 9.1.1->9.2.0
</span>---
math/deal.ii/Portfile | 15 +++++----------
math/deal.ii/files/patch-boost_python.diff | 27 +++++++++++++++++----------
math/deal.ii/files/patch-strict_cxx.diff | 23 -----------------------
3 files changed, 22 insertions(+), 43 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/deal.ii/Portfile b/math/deal.ii/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9050637..0069288 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/deal.ii/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/deal.ii/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup cmake 1.1
</span> PortGroup mpi 1.0
PortGroup linear_algebra 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup dealii dealii 9.1.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup dealii dealii 9.2.0 v
</span> name deal.ii
revision 9
categories math science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,15 +18,14 @@ long_description ${name} is ${description}.
</span>
homepage https://www.dealii.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 24ae505937cbe6534bfdd2a1b1fa69717e34531c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8c58efba9fc4a7b68812882b046915a2a31f8555b12071a0835ee565f27324b6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 19912517
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a7d2aa6072f8ca0d0fd42df2a5892d63d37ba148 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6c122d18c44c18331f28792059be892215c82e0749d2a5e213c002d32778596e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 24689336
</span>
mpi.setup require_fortran
veclibfort no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-boost_python.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-strict_cxx.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-boost_python.diff
</span>
if {[variant_isset debug]} {
cmake.build_type Debug
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,10 +127,6 @@ variant python description "install python bindings" {
</span> configure.args-append -DDEAL_II_COMPONENT_PYTHON_BINDINGS=ON \
-DPYTHON_EXECUTABLE=${prefix}/bin/python${python_branch} \
-DDEAL_II_PYTHON_RELDIR=${frameworks_dir}/Python.framework/Versions/${python_branch}/lib/python${python_branch}/site-packages/PyDealII
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__MACPORTS_PYTHON_VERSION__|${python_version}|g" ${worksrcpath}/contrib/python-bindings/source/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
# avoid release candidates
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/deal.ii/files/patch-boost_python.diff b/math/deal.ii/files/patch-boost_python.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 72e1148..4572f24 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/deal.ii/files/patch-boost_python.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/deal.ii/files/patch-boost_python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- contrib/python-bindings/source/CMakeLists.txt.orig 2019-05-26 19:07:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ contrib/python-bindings/source/CMakeLists.txt 2019-06-21 08:14:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,7 +35,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIST(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(Boost_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Use the low level _FIND_PACKAGE function instead of our wrapper
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--_FIND_PACKAGE(Boost 1.54 COMPONENTS python)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+_FIND_PACKAGE(Boost 1.54 COMPONENTS python__MACPORTS_PYTHON_VERSION__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- contrib/python-bindings/CMakeLists.txt.orig 2020-05-20 14:41:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ contrib/python-bindings/CMakeLists.txt 2020-05-26 20:38:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,11 +37,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # component manually.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNSET(Boost_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # On case-insensitive file systems FindBOOST.cmake and FindBoost.cmake are indistinguishable.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Make sure FindBoost.cmake from CMake installation is found.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIST(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(${BOOST_VERSION} VERSION_LESS 1.67)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _FIND_PACKAGE(Boost 1.59 COMPONENTS python REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _FIND_PACKAGE(Boost 1.67 COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR} REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(NOT Boost_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(NOT Boost_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MESSAGE(FATAL_ERROR
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/deal.ii/files/patch-strict_cxx.diff b/math/deal.ii/files/patch-strict_cxx.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7fd2068..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/deal.ii/files/patch-strict_cxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From adb1281b842d5bd9c89e0483e25e5922ed08fdef Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Matthew Russell <matthewjohnrussell@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 4 Nov 2019 16:19:15 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix compilation of gmsh support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Use std::ofstream rather than just ofstream.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- source/gmsh/utilities.cc | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/source/gmsh/utilities.cc b/source/gmsh/utilities.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d9abd324d49..18ea2ecb8cf 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- source/gmsh/utilities.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ source/gmsh/utilities.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -76,7 +76,7 @@ namespace Gmsh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dealii::OpenCASCADE::write_IGES(boundary, iges_file_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ofstream geofile;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::ofstream geofile;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- geofile.open(geo_file_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- geofile << "Merge \"" << iges_file_name << "\";" << std::endl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "Line Loop (2) = {1};" << std::endl
</span></pre><pre style='margin:0'>
</pre>