<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/210a0fde4fc4569de60c94a285a3c559dbbfbf9c">https://github.com/macports/macports-ports/commit/210a0fde4fc4569de60c94a285a3c559dbbfbf9c</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 210a0fd cantera: Update to 2.3.0
</span>210a0fd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 210a0fde4fc4569de60c94a285a3c559dbbfbf9c
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Dec 20 09:48:04 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> cantera: Update to 2.3.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> cantera-devel: Update to 2.3.0b1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add patch to fix build with Cython 0.26.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add patch to fix build with fmt 4.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use sundials2 in sundials variant; cantera is not compatible with
</span><span style='display:block; white-space:pre;color:#404040;'> sundials 3.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Disable universal variant which never built universal software.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Don't rename shared library because nobody wants that.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix install_name of shared library.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No longer install setup_cantera with the execute bit because its
</span><span style='display:block; white-space:pre;color:#404040;'> intended use is to be sourced into your current shell environment,
</span><span style='display:block; white-space:pre;color:#404040;'> not run as a standalone script.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Move destroot commands out of the build phase and into the destroot
</span><span style='display:block; white-space:pre;color:#404040;'> phase where they belong.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/55300
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/55540
</span>---
science/cantera/Portfile | 73 ++++++++++++++++++++++------------
science/cantera/files/cython0.26.patch | 20 ++++++++++
science/cantera/files/fmt4.patch | 20 ++++++++++
3 files changed, 87 insertions(+), 26 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 1194d5f..cfeda6e 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,15 +1,15 @@
</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:#e0ffe0;'>+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.2.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup Cantera cantera 2.3.0 v
</span> conflicts cantera-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span>
subport cantera-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup Cantera cantera 2.2.0b1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup Cantera cantera 2.3.0b1 v
</span> conflicts cantera
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,45 +22,62 @@ description Cantera software package
</span> long_description Cantera is a suite of object-oriented software tools for \
problems involving chemical kinetics, thermodynamics, \
and/or transport processes. \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Fortran support is disabled by install using MacPorts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Fortran support is disabled by install using MacPorts.
</span>
homepage https://cantera.github.io/docs/sphinx/html/index.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 67cd0391329ce5acfcbb52725aa74c2b13ccb0a1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d5f2d3e193e18ed8cb568f6a43ef1d1a41f910f01a349b71a1f5c36e2d918797
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 010a4eafb7004aa8927d94002dd8f3abd4da252a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9d383f2d3d88a45a24ba5af12c047c0329f442980ccdb39925082c951f5c33b3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2474413
</span>
subport cantera-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 dd1c69ed614942e7900bce4303ddee7b6216c5b6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 25e6c3f2140bf8cc04c6559928dd4aa1bad0dc1a9cc437d3ea3f82ac1a54b393
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 1f4d2b090af841bf7314355a802f1c51fc9904f8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f80c64c85440c96ca4ece4c87c020284d9025bf60ae5c3a468fd53c9cc15413e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2471445
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version 27
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:py${python.version}-numpy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-cython
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:eigen3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtest \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libfmt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cython \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-numpy
</span>
depends_build-append port:scons
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles cython0.26.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fmt4.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+universal_variant no
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd ${prefix}/bin/scons install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd ${prefix}/bin/scons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target build
</span> build.args prefix=${prefix} \
CC=${configure.cc} \
CXX=${configure.cxx} \
f90_interface=n \
python_prefix=${python.prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- stage_dir=${destroot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set bindir ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file attributes ${bindir}/ck2cti -permissions ugo+x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file attributes ${bindir}/ctml_writer -permissions ugo+x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file attributes ${bindir}/setup_cantera -permissions ugo+x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ renamed_shared_libraries=n \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system_fmt=y \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system_googletest=y \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system_eigen=y \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extra_inc_dirs=${prefix}/include/eigen3:${prefix}/include/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # It would be better to fix the build system to use the -install_name flag
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # when building the dylib, but since I don't know where in the build system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to do that...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -id ${prefix}/lib/libcantera.dylib ${worksrcpath}/build/lib/libcantera.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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;'>+destroot.cmd ${build.cmd}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.target install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args {*}${build.args}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.destdir stage_dir=${destroot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> notes "
Cantera C++ demos are installed in:
${prefix}/share/cantera/samples
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +86,7 @@ ${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:#e0ffe0;'>+Try the following in python to find the equilibrium composition\
</span> of a stoichiometric methane/air mixture at 1000 K and 1 atm:
>>> import cantera as ct
>>> g = ct.Solution('gri30.xml')
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,10 +98,14 @@ Don't forget to set the appropriate python interpreter using
</span> sudo port select python
"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant sundials description {Build with sundials support (default)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:sundials
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant sundials description {Build with sundials support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:sundials2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The +accelerate and +openblas variants of sundials2 are broken.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://trac.macports.org/ticket/55553
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants sundials2 {atlas}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append use_sundials=y \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append system_sundials=y \
</span> sundials_include=${prefix}/include \
sundials_libdir=${prefix}/lib
}
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..662627f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/cantera/files/cython0.26.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build with Cython 0.26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/speth/cantera/commit/cb8da0b30602ce640529ff9fab1271fcdf5424f1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/Cantera/cantera/issues/465
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- interfaces/cython/cantera/utils.pyx.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ interfaces/cython/cantera/utils.pyx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,12 +58,12 @@ cdef Composition comp_map(X) except *:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # assume X is dict-like
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cdef Composition m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for species,value in X.items():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for species,value in (<object>X).items():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m[stringify(species)] = value
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cdef comp_map_to_dict(Composition m):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return {pystr(species):value for species,value in m.items()}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return {pystr(species):value for species,value in (<object>m).items()}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class CanteraError(RuntimeError):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..440c9f0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/cantera/files/fmt4.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build with fmt 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/Cantera/cantera/issues/470
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/Cantera/cantera/commit/ea69a014a54ac0fb5199c63b4b673af0b3eff23d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/cantera/base/fmt.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/cantera/base/fmt.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,8 +3,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if CT_USE_SYSTEM_FMT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "fmt/format.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if defined(FMT_VERSION) && FMT_VERSION >= 40000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include "fmt/printf.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "fmt/ostream.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "cantera/ext/fmt/format.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if defined(FMT_VERSION) && FMT_VERSION >= 40000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include "cantera/ext/fmt/printf.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "cantera/ext/fmt/ostream.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span></pre><pre style='margin:0'>
</pre>