git: 4e73a1fd32da - main - science/cantera: Update 2.5.1-611 -> 2.6.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 02 May 2022 16:24:26 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4e73a1fd32da46003d7070527b56b69bd3e1e6d8
commit 4e73a1fd32da46003d7070527b56b69bd3e1e6d8
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-05-02 16:23:50 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-05-02 16:24:24 +0000
science/cantera: Update 2.5.1-611 -> 2.6.0
Reported by: portscout
---
science/cantera/Makefile | 12 +++----
science/cantera/distinfo | 10 ++----
science/cantera/files/patch-SConstruct | 62 ++++++++++++----------------------
science/cantera/pkg-plist | 23 +++++++++++--
4 files changed, 49 insertions(+), 58 deletions(-)
diff --git a/science/cantera/Makefile b/science/cantera/Makefile
index e187a1157252..8afdca022e34 100644
--- a/science/cantera/Makefile
+++ b/science/cantera/Makefile
@@ -1,14 +1,8 @@
PORTNAME= cantera
DISTVERSIONPREFIX= v
-DISTVERSION= 2.5.1-611
-PORTREVISION= 2
-DISTVERSIONSUFFIX= -gc4d6ecc15
+DISTVERSION= 2.6.0
CATEGORIES= science # chemistry physics
-PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
-PATCHFILES= 5720ff659f4bd8dad33d32891fe7d4ae44c72697.patch:-p1 \
- 36e7019cab8e9d9e8388715b5680fea924ce6f52.patch:-p1 # fix "Fix stage directory from appearing in setup_cantera", https://github.com/Cantera/cantera/pull/1102
-
MAINTAINER= yuri@FreeBSD.org
COMMENT= Chemical kinetics, thermodynamics, and transport tool suite
@@ -43,7 +37,7 @@ ALL_TARGET= build
TEST_TARGET= test # some tests fail, see https://github.com/Cantera/cantera/issues/1095
OPTIONS_DEFINE= OCTAVE PYTHON
-OPTIONS_DEFAULT= PYTHON # OCTAVE is off by default because Octave interface is not as frequently requested feature
+OPTIONS_DEFAULT= # PYTHON is broken; OCTAVE is off by default because Octave interface is not as frequently requested feature
OPTIONS_SUB= yes
OCTAVE_DESC= Octave support
@@ -51,6 +45,7 @@ OCTAVE_MAKE_ARGS= matlab_toolbox=y matlab_path=${LOCALBASE}
OCTAVE_CXXFLAGS= -I${LOCALBASE}/include/octave-6.4.0/octave
OCTAVE_LIB_DEPENDS= liboctave.so:math/octave
OCTAVE_SUB_FILES= pkg-message-octave
+OCTAVE_BROKEN= Path set for 'matlab_path' is not correct. (https://github.com/Cantera/cantera/issues/1270)
PYTHON_USES= python:3.6+
PYTHON_USE= PYTHON=cython
@@ -63,6 +58,7 @@ PYTHON_RUN_DEPENDS= ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}ruamel.yaml>0:devel/py-ruamel.yaml@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
+PYTHON_BROKEN= https://github.com/Cantera/cantera/issues/1269
do-install:
cd ${WRKSRC} && \
diff --git a/science/cantera/distinfo b/science/cantera/distinfo
index cfedf982c859..cee52c83d2f5 100644
--- a/science/cantera/distinfo
+++ b/science/cantera/distinfo
@@ -1,9 +1,5 @@
-TIMESTAMP = 1639773651
-SHA256 (Cantera-cantera-v2.5.1-611-gc4d6ecc15_GH0.tar.gz) = 73fb300d3bc4eecf4d33cac98fae00bb3830e456fd04dc21211c814e93343ad9
-SIZE (Cantera-cantera-v2.5.1-611-gc4d6ecc15_GH0.tar.gz) = 2472507
+TIMESTAMP = 1651506700
+SHA256 (Cantera-cantera-v2.6.0_GH0.tar.gz) = 7273622ea76a53373cee820f939613b15eea3dd83db6e1b127c5ed043f77dc5b
+SIZE (Cantera-cantera-v2.6.0_GH0.tar.gz) = 2586243
SHA256 (LLNL-sundials-887af43_GH0.tar.gz) = 147919c4887c93157c9975f195e8d45903285b61303d42f9dfdee251468abdb7
SIZE (LLNL-sundials-887af43_GH0.tar.gz) = 18888776
-SHA256 (5720ff659f4bd8dad33d32891fe7d4ae44c72697.patch) = b7e324f7deedeb9767126f6e39fd1100ec0033e134325773351d61f0c944943e
-SIZE (5720ff659f4bd8dad33d32891fe7d4ae44c72697.patch) = 1349
-SHA256 (36e7019cab8e9d9e8388715b5680fea924ce6f52.patch) = 697dcb3499fa1ba37442dd01bbe60d8f080aa87b8d447a3f5da7bf9e865bdd6d
-SIZE (36e7019cab8e9d9e8388715b5680fea924ce6f52.patch) = 3758
diff --git a/science/cantera/files/patch-SConstruct b/science/cantera/files/patch-SConstruct
index bf8725632bb8..0a31558a42b2 100644
--- a/science/cantera/files/patch-SConstruct
+++ b/science/cantera/files/patch-SConstruct
@@ -1,45 +1,27 @@
---- SConstruct.orig 2021-12-18 00:39:36 UTC
+--- SConstruct.orig 2022-05-01 15:31:54 UTC
+++ SConstruct
-@@ -312,7 +312,7 @@ elif 'icc' in env.subst('$CC'):
- defaults.warningFlags = '-Wcheck'
- env['openmp_flag'] = ['-openmp']
+@@ -805,6 +805,9 @@ elif "icx" in env.subst("$CC"):
+ elif "clang" in env.subst("$CC"):
+ config.select("clang")
--elif 'clang' in env.subst('$CC'):
-+elif 'clang' in env.subst('$CC') or 'cc' in env.subst('$CC'):
- defaults.ccFlags = '-fcolor-diagnostics'
- defaults.cxxFlags = '-std=c++11'
- defaults.buildPch = True
-@@ -719,17 +719,18 @@ valid_arguments = (set(opt[0] for opt in windows_compi
- for arg in ARGUMENTS:
- if arg not in valid_arguments:
- print('Encountered unexpected command line argument: %r' % arg)
-- sys.exit(1)
-+ #sys.exit(1)
-
- env["cantera_version"] = "2.6.0a3"
- # For use where pre-release tags are not permitted (MSI, sonames)
- env['cantera_pure_version'] = re.match(r'(\d+\.\d+\.\d+)', env['cantera_version']).group(0)
- env['cantera_short_version'] = re.match(r'(\d+\.\d+)', env['cantera_version']).group(0)
++elif "cc" in env.subst("$CC"):
++ config.select("clang")
++
+ else:
+ print(f"WARNING: Unrecognized C compiler '{env['CC']}'")
--try:
-- env["git_commit"] = get_command_output("git", "rev-parse", "--short", "HEAD")
--except subprocess.CalledProcessError:
-- env["git_commit"] = "unknown"
-+#try:
-+# env["git_commit"] = get_command_output("git", "rev-parse", "--short", "HEAD")
-+#except subprocess.CalledProcessError:
-+# env["git_commit"] = "unknown"
-+env["git_commit"] = "unknown"
+@@ -869,10 +872,10 @@ if "sdist" in COMMAND_LINE_TARGETS:
+ logger.info("'sdist' target was specified. Setting 'use_pch' to False.")
+ env["use_pch"] = False
- # Print values of all build options:
- print("Configuration variables read from 'cantera.conf' and command line:")
-@@ -1440,8 +1441,7 @@ if env['matlab_toolbox'] == 'y':
- 'SUNDIALS libraries and skip building the Matlab toolbox.')
- sys.exit(1)
+-for arg in ARGUMENTS:
+- if arg not in config:
+- logger.error(f"Encountered unexpected command line option: '{arg}'")
+- sys.exit(1)
++#for arg in ARGUMENTS:
++# if arg not in config:
++# logger.error(f"Encountered unexpected command line option: '{arg}'")
++# sys.exit(1)
-- if not (os.path.isdir(matPath) and
-- os.path.isdir(pjoin(matPath, 'extern'))):
-+ if not (os.path.isdir(matPath)):
- print("""ERROR: Path set for 'matlab_path' is not correct.""")
- print("""ERROR: Path was: '%s'""" % matPath)
- sys.exit(1)
+ env["cantera_version"] = "2.6.0"
+ # For use where pre-release tags are not permitted (MSI, sonames)
diff --git a/science/cantera/pkg-plist b/science/cantera/pkg-plist
index 57b14f72a113..a5aecda50a5f 100644
--- a/science/cantera/pkg-plist
+++ b/science/cantera/pkg-plist
@@ -9,7 +9,10 @@ include/cantera/Cantera.mak
include/cantera/base/AnyMap.h
include/cantera/base/AnyMap.inl.h
include/cantera/base/Array.h
+include/cantera/base/Delegator.h
include/cantera/base/FactoryBase.h
+include/cantera/base/Interface.h
+include/cantera/base/NoExitLogger.h
include/cantera/base/Solution.h
include/cantera/base/Units.h
include/cantera/base/ValueCache.h
@@ -114,7 +117,11 @@ include/cantera/ext/sunnonlinsol/sunnonlinsol_fixedpoint.h
include/cantera/ext/sunnonlinsol/sunnonlinsol_newton.h
include/cantera/ext/sunnonlinsol/sunnonlinsol_petscsnes.h
include/cantera/kinetics.h
+include/cantera/kinetics/Arrhenius.h
+include/cantera/kinetics/BlowersMaselRate.h
include/cantera/kinetics/BulkKinetics.h
+include/cantera/kinetics/ChebyshevRate.h
+include/cantera/kinetics/Custom.h
include/cantera/kinetics/EdgeKinetics.h
include/cantera/kinetics/Falloff.h
include/cantera/kinetics/FalloffFactory.h
@@ -123,19 +130,22 @@ include/cantera/kinetics/GasKinetics.h
include/cantera/kinetics/Group.h
include/cantera/kinetics/ImplicitSurfChem.h
include/cantera/kinetics/InterfaceKinetics.h
+include/cantera/kinetics/InterfaceRate.h
include/cantera/kinetics/Kinetics.h
include/cantera/kinetics/KineticsFactory.h
include/cantera/kinetics/MultiRate.h
+include/cantera/kinetics/MultiRateBase.h
+include/cantera/kinetics/PlogRate.h
include/cantera/kinetics/RateCoeffMgr.h
include/cantera/kinetics/Reaction.h
include/cantera/kinetics/ReactionData.h
-include/cantera/kinetics/ReactionFactory.h
include/cantera/kinetics/ReactionPath.h
include/cantera/kinetics/ReactionRate.h
include/cantera/kinetics/ReactionRateFactory.h
include/cantera/kinetics/RxnRates.h
include/cantera/kinetics/StoichManager.h
include/cantera/kinetics/ThirdBodyCalc.h
+include/cantera/kinetics/TwoTempPlasmaRate.h
include/cantera/kinetics/importKinetics.h
include/cantera/kinetics/reaction_defs.h
include/cantera/kinetics/solveSP.h
@@ -150,6 +160,7 @@ include/cantera/numerics/IDA_Solver.h
include/cantera/numerics/Integrator.h
include/cantera/numerics/ResidEval.h
include/cantera/numerics/ResidJacEval.h
+include/cantera/numerics/SundialsContext.h
include/cantera/numerics/ctlapack.h
include/cantera/numerics/eigen_dense.h
include/cantera/numerics/eigen_sparse.h
@@ -204,6 +215,7 @@ include/cantera/thermo/PDSS_SSVol.h
include/cantera/thermo/PDSS_Water.h
include/cantera/thermo/PengRobinson.h
include/cantera/thermo/Phase.h
+include/cantera/thermo/PlasmaPhase.h
include/cantera/thermo/PureFluidPhase.h
include/cantera/thermo/RedlichKisterVPSSTP.h
include/cantera/thermo/RedlichKwongMFTP.h
@@ -245,6 +257,7 @@ include/cantera/zeroD/IdealGasConstPressureReactor.h
include/cantera/zeroD/IdealGasReactor.h
include/cantera/zeroD/Reactor.h
include/cantera/zeroD/ReactorBase.h
+include/cantera/zeroD/ReactorDelegator.h
include/cantera/zeroD/ReactorFactory.h
include/cantera/zeroD/ReactorNet.h
include/cantera/zeroD/ReactorSurface.h
@@ -982,10 +995,11 @@ libdata/pkgconfig/cantera.pc
%%DATADIR%%/data/airNASA9.yaml
%%DATADIR%%/data/argon.cti
%%DATADIR%%/data/argon.xml
-%%DATADIR%%/data/critProperties.xml
+%%DATADIR%%/data/critical-properties.yaml
%%DATADIR%%/data/diamond.cti
%%DATADIR%%/data/diamond.xml
%%DATADIR%%/data/diamond.yaml
+%%DATADIR%%/data/element-standard-entropies.yaml
%%DATADIR%%/data/elements.xml
%%DATADIR%%/data/graphite.cti
%%DATADIR%%/data/graphite.xml
@@ -1028,7 +1042,6 @@ libdata/pkgconfig/cantera.pc
%%DATADIR%%/data/ptcombust.cti
%%DATADIR%%/data/ptcombust.xml
%%DATADIR%%/data/ptcombust.yaml
-%%DATADIR%%/data/sample-data/LiC6_electrodebulk.yaml
%%DATADIR%%/data/silane.cti
%%DATADIR%%/data/silane.xml
%%DATADIR%%/data/silane.yaml
@@ -1074,6 +1087,10 @@ libdata/pkgconfig/cantera.pc
%%DATADIR%%/samples/cxx/gas_transport/Makefile
%%DATADIR%%/samples/cxx/gas_transport/SConstruct
%%DATADIR%%/samples/cxx/gas_transport/gas_transport.cpp
+%%DATADIR%%/samples/cxx/jacobian/CMakeLists.txt
+%%DATADIR%%/samples/cxx/jacobian/Makefile
+%%DATADIR%%/samples/cxx/jacobian/SConstruct
+%%DATADIR%%/samples/cxx/jacobian/derivative_speed.cpp
%%DATADIR%%/samples/cxx/kinetics1/CMakeLists.txt
%%DATADIR%%/samples/cxx/kinetics1/Makefile
%%DATADIR%%/samples/cxx/kinetics1/SConstruct