<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4afd46dc6023fa8167c3188b693ad67348b59a10">https://github.com/macports/macports-ports/commit/4afd46dc6023fa8167c3188b693ad67348b59a10</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4afd46dc6023fa8167c3188b693ad67348b59a10
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jan 7 13:35:40 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> cantera: Update to 2.5.1
</span>---
science/cantera/Portfile | 77 +++++++++++++++-------------------
science/cantera/files/cython0.26.patch | 20 ---------
science/cantera/files/fmt4.patch | 20 ---------
3 files changed, 34 insertions(+), 83 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/cantera/Portfile b/science/cantera/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 644a4e23bb1..60f368d4331 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/cantera/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/cantera/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +1,17 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span> PortGroup github 1.0
PortGroup python 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup Cantera cantera 2.3.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts cantera-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport cantera-devel {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup Cantera cantera 2.3.0b1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts cantera
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup Cantera cantera 2.5.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e26fa93268a8e1108de31140cf6382c5014a4bf4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 59f673cec686bc9b1eeccc1b1c9158a3978a3abe7491d00e8b355908c1c3be0a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2492422
</span>
categories science
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers thomasfiala.de:macports openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {thomasfiala.de:macports @thomasfiala} openmaintainer
</span> license BSD
description Cantera software package
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,30 +20,21 @@ long_description Cantera is a suite of object-oriented software tools for
</span> and/or transport processes. \
Fortran support is disabled by install using MacPorts.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://cantera.github.io/docs/sphinx/html/index.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://cantera.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 010a4eafb7004aa8927d94002dd8f3abd4da252a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9d383f2d3d88a45a24ba5af12c047c0329f442980ccdb39925082c951f5c33b3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2474413
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version 310
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport cantera-devel {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 1f4d2b090af841bf7314355a802f1c51fc9904f8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f80c64c85440c96ca4ece4c87c020284d9025bf60ae5c3a468fd53c9cc15413e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2471445
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:gtest \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:scons
</span>
depends_lib-append port:eigen3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtest \
</span> port:libfmt \
port:py${python.version}-cython \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-numpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:scons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-numpy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:yaml-cpp
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles cython0.26.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fmt4.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append port:py${python.version}-ruamel-yaml
</span>
use_configure no
universal_variant no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,21 +45,24 @@ build.args prefix=${prefix} \
</span> CC=${configure.cc} \
CXX=${configure.cxx} \
f90_interface=n \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ googletest=system \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python_cmd=${python.bin} \
</span> python_package=full \
python_prefix=${python.prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- python3_package=n \
</span> renamed_shared_libraries=n \
system_fmt=y \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system_googletest=y \
</span> system_eigen=y \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ system_yamlcpp=y \
</span> extra_inc_dirs=${prefix}/include/eigen3:${prefix}/include/
post-build {
# It would be better to fix the build system to use the -install_name flag
# when building the dylib, but since I don't know where in the build system
# to do that...
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -id ${prefix}/lib/libcantera.dylib ${worksrcpath}/build/lib/libcantera.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -change build/lib/libcantera.dylib ${prefix}/lib/libcantera.dylib ${worksrcpath}/build/python2/cantera/_cantera.so"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set old build/lib/libcantera.${version}.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set new ${prefix}/lib/libcantera.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -id ${new} ${worksrcpath}/${old}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change ${old} ${new} ${worksrcpath}/build/python/cantera/_cantera.cpython-${python.version}-darwin.so"
</span> }
destroot.cmd ${build.cmd}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,24 +78,18 @@ ${python.pkgd}/cantera/examples
</span> Cantera data files are installed in:
${prefix}/share/cantera/data
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Try the following in python to find the equilibrium composition\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-of a stoichiometric methane/air mixture at 1000 K and 1 atm:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Try running the following in python${python.branch} to find the equilibrium\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+composition of a stoichiometric methane/air mixture at 1000 K and 1 atm:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> >>> import cantera as ct
>>> g = ct.Solution('gri30.xml')
>>> g.TPX = 1000, ct.one_atm, 'CH4:1, O2:2, N2:8'
>>> g.equilibrate('TP')
>>> g()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Don't forget to set the appropriate python interpreter using
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-sudo port select python
</span> "
variant sundials description {Build with sundials support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:sundials2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The +accelerate and +openblas variants of sundials2 are broken.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See https://trac.macports.org/ticket/55553
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants sundials2 {atlas}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:sundials
</span>
build.args-append system_sundials=y \
sundials_include=${prefix}/include \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,3 +97,12 @@ variant sundials description {Build with sundials support} {
</span> }
default_variants +sundials
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove after January 2023.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-devel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/cantera/files/cython0.26.patch b/science/cantera/files/cython0.26.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 662627fd1e4..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/cantera/files/cython0.26.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build with Cython 0.26
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/speth/cantera/commit/cb8da0b30602ce640529ff9fab1271fcdf5424f1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/Cantera/cantera/issues/465
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- interfaces/cython/cantera/utils.pyx.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ interfaces/cython/cantera/utils.pyx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,12 +58,12 @@ cdef Composition comp_map(X) except *:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # assume X is dict-like
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cdef Composition m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for species,value in X.items():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for species,value in (<object>X).items():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m[stringify(species)] = value
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cdef comp_map_to_dict(Composition m):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return {pystr(species):value for species,value in m.items()}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return {pystr(species):value for species,value in (<object>m).items()}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class CanteraError(RuntimeError):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pass
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/cantera/files/fmt4.patch b/science/cantera/files/fmt4.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 440c9f0e51c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/cantera/files/fmt4.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build with fmt 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/Cantera/cantera/issues/470
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/Cantera/cantera/commit/ea69a014a54ac0fb5199c63b4b673af0b3eff23d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/cantera/base/fmt.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/cantera/base/fmt.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,8 +3,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if CT_USE_SYSTEM_FMT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "fmt/format.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if defined(FMT_VERSION) && FMT_VERSION >= 40000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #include "fmt/printf.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "fmt/ostream.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "cantera/ext/fmt/format.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if defined(FMT_VERSION) && FMT_VERSION >= 40000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #include "cantera/ext/fmt/printf.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "cantera/ext/fmt/ostream.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span></pre><pre style='margin:0'>
</pre>