<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/970665cba9dba9138575b0e502fa2dae5e7984af">https://github.com/macports/macports-ports/commit/970665cba9dba9138575b0e502fa2dae5e7984af</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 970665cba9dba9138575b0e502fa2dae5e7984af
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Nov 7 15:15:11 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> sundials/sundials2: eliminate conflict
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/63631
</span>---
math/sundials/Portfile | 157 ++--------------------------------
math/sundials2/Portfile | 137 +++++++++++++++++++----------
math/{sundials => sundials5}/Portfile | 122 ++++++++++++++++++--------
3 files changed, 187 insertions(+), 229 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/sundials/Portfile b/math/sundials/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bd3bc5dc13d..48ac9834a8d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/sundials/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/sundials/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,154 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- 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
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup mpi 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup LLNL sundials 5.8.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 22866440a727c63ee187ac855852eda6c6b9c840 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d4ed403351f72434d347df592da6c91a69452071860525385b3339c824e8a213 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 24012815
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories math devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license BSD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description SUite of Nonlinear and DIfferential/ALgebraic equation Solvers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description SUNDIALS consists of the following five solvers: CVODE\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- solves initial value problems for ordinary differential\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- equation (ODE) systems. CVODES solves ODE systems and\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- includes sensitivity analysis capabilities (forward and\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- adjoint). IDA solves initial value problems for\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- differential-algebraic equation (DAE) systems. IDAS solves\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DAE systems and includes sensitivity analysis capabilities\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (forward and adjoint). KINSOL solves nonlinear algebraic\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- systems.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://computing.llnl.gov/projects/sundials
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts sundials2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:SuiteSparse_KLU
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-mpi.setup \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_fortran
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DEXAMPLES_ENABLE_C=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DEXAMPLES_ENABLE_CXX=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DEXAMPLES_ENABLE_F77=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DEXAMPLES_ENABLE_F90=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_LAPACK=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_KLU=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DKLU_LIBRARY_DIR=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DKLU_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMPI_ENABLE=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[mpi_variant_isset]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_MPI=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_MPI=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMPI_MPICC=${prefix}/bin/${mpi.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMPI_MPICXX=${prefix}/bin/${mpi.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMPI_MPIF77=${prefix}/bin/${mpi.f77} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMPI_MPIF90=${prefix}/bin/${mpi.f90} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMPI_RUN_COMMAND=${prefix}/bin/${mpi.exec}
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# without this, previously installed sundials headers are found first
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# this can cause problem when upgrading
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://cmake.org/cmake/help/latest/variable/CMAKE_INCLUDE_DIRECTORIES_BEFORE.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_INCLUDE_DIRECTORIES_BEFORE=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# cmake files (e.g. config/SundialsFortran.cmake) create CMakeLists.txt files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# to test for functionality (e.g. a Fortran compiler).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# CMAKE_OSX_SYSROOT is not passed to the functionality test.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Because CMAKE_OSX_DEPLOYMENT_TARGET is set as an environmental variable,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -isysroot is added to the compiler flags.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Only Apple Clang compilers support tbd files.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See https://trac.macports.org/ticket/53151
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See https://cmake.org/cmake/help/latest/variable/CMAKE_OSX_SYSROOT.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SDKROOT=/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant examples description {Install Examples} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set example_langs {C CXX F90 F77}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach lang ${example_langs} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DEXAMPLES_ENABLE_${lang}=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DEXAMPLES_ENABLE_${lang}=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DEXAMPLES_INSTALL_PATH=${prefix}/share/examples/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_parallel_build no
</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;'>-# from CMakeLists.txt:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# LAPACK is not compatible with INT64_T precision
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DSUNDIALS_INDEX_SIZE=32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant accelerate conflicts atlas openblas description {Use Apple Accelerate Libraries} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBLA_VENDOR=Apple
</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;'>-variant atlas conflicts accelerate openblas description {Use MacPorts ATLAS Libraries} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:atlas
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBLA_VENDOR=ATLAS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # FindBLAS.cmake and FindLAPACK.cmake do not seem to find MacPorts Atlas properly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBLAS_LIBRARIES=satlas \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLAPACK_LIBRARIES=satlas
</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;'>-variant openblas conflicts atlas accelerate description {Use MacPorts OpenBLAS Libraries} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libopenblas.dylib:OpenBLAS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants path:lib/libopenblas.dylib:OpenBLAS lapack
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBLA_VENDOR=OpenBLAS
</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;'>-if {![variant_isset accelerate] && ![variant_isset atlas] && ![variant_isset openblas]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +accelerate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset accelerate] && ![variant_isset openblas] && ![variant_isset atlas] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "You must select either the +accelerate, +atlas, or +openblas variant for linear algebra."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "No linear-algebra variant selected."
</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:#e0ffe0;'>+PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup stub 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant doc description {install pdf documentation} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy {*}[glob ${worksrcpath}/doc/*] ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "find ${destroot}${prefix}/share/doc -type f -exec chmod 644 {} \\;"
</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:#e0ffe0;'>+name sundials
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.8.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# LICENSE file is installed in a bad location
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/include/sundials/LICENSE ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories math
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url https://computing.llnl.gov/projects/sundials/sundials-software
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${name}-(\\d(?:\.\\d+)*)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+replaced_by sundials5
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/sundials2/Portfile b/math/sundials2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ccec8b93629..dac1ea07ebf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/sundials2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/sundials2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,16 +5,15 @@ PortGroup cmake 1.1
</span> PortGroup github 1.0
PortGroup mpi 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name sundials2
</span> github.setup LLNL sundials 2.7.0 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name sundials2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> categories math devel
license BSD
platforms darwin
maintainers nomaintainer
description SUite of Nonlinear and DIfferential/ALgebraic equation Solvers
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> long_description SUNDIALS consists of the following five solvers: CVODE\
solves initial value problems for ordinary differential\
equation (ODE) systems. CVODES solves ODE systems and\
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,50 +23,92 @@ long_description SUNDIALS consists of the following five solvers: CVODE\
</span> DAE systems and includes sensitivity analysis capabilities\
(forward and adjoint). KINSOL solves nonlinear algebraic\
systems.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> homepage https://computing.llnl.gov/projects/sundials
github.tarball_from releases
<span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir sundials
</span>
checksums rmd160 7bbbff19828c8235422497e11891d07fe02e4021 \
sha256 d39fcac7175d701398e4eb209f7e92a5b30a78358d4a0c0fcc23db23c11ba104 \
size 12258093
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts sundials
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Path-Related Variables - START
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The "install name," meaning, the subdirectory name for this port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Should correspond to the major version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_install_name \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Define all of our base paths up-front
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_install_prefix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/libexec/${port_install_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_install_cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${port_install_prefix}/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_install_include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${port_install_prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_install_lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${port_install_prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_install_doc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/share/doc/${port_install_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_install_examples \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/share/examples/${port_install_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Populate CMake options currently available
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.install_prefix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${port_install_prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake_share_module_dir \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${port_install_cmake}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.install_rpath \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${port_install_lib}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir sundials
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles sundials-${version}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir sundials-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_LIBEXECDIR=${port_install_prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_BINDIR=${port_install_prefix}/bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_SBINDIR=${port_install_prefix}/sbin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_SHAREDIR=${port_install_prefix}/share \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_INCLUDEDIR=${port_install_include} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_LIBDIR=${port_install_lib} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_NAME_DIR=${port_install_lib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Path-Related Variables - END
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#------------------------------------------------------------------------------
</span>
# use default cmake behavior to find Lapack
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-find_lapack.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:SuiteSparse_KLU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-find_lapack.diff
</span>
mpi.setup \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- require_fortran \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_fortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:SuiteSparse_KLU
</span>
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DEXAMPLES_ENABLE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMPI_ENABLE=OFF \
</span> -DCXX_ENABLE=ON \
-DF90_ENABLE=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLAPACK_ENABLE=ON \
</span> -DFCMIX_ENABLE=ON \
-DKLU_ENABLE=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DKLU_LIBRARY_DIR=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLAPACK_ENABLE=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DEXAMPLES_ENABLE=OFF \
</span> -DKLU_INCLUDE_DIR=${prefix}/include \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMPI_ENABLE=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DKLU_LIBRARY_DIR=${prefix}/lib
</span>
pre-configure {
if {[mpi_variant_isset]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DMPI_ENABLE=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DMPI_ENABLE=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMPI_MPICC=${prefix}/bin/${mpi.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMPI_MPICXX=${prefix}/bin/${mpi.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMPI_MPIF77=${prefix}/bin/${mpi.f77} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMPI_MPIF90=${prefix}/bin/${mpi.f90} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMPI_RUN_COMMAND=${prefix}/bin/${mpi.exec}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMPI_ENABLE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMPI_ENABLE=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMPI_MPICC=${prefix}/bin/${mpi.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMPI_MPICXX=${prefix}/bin/${mpi.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMPI_MPIF77=${prefix}/bin/${mpi.f77} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMPI_MPIF90=${prefix}/bin/${mpi.f90} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMPI_RUN_COMMAND=${prefix}/bin/${mpi.exec}
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,7 +116,7 @@ pre-configure {
</span> # this can cause problem when upgrading
# see https://cmake.org/cmake/help/latest/variable/CMAKE_INCLUDE_DIRECTORIES_BEFORE.html
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_INCLUDE_DIRECTORIES_BEFORE=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INCLUDE_DIRECTORIES_BEFORE=ON
</span>
# cmake files (e.g. config/SundialsFortran.cmake) create CMakeLists.txt files
# to test for functionality (e.g. a Fortran compiler).
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,38 +126,41 @@ configure.args-append \
</span> # Only Apple Clang compilers support tbd files.
# See https://trac.macports.org/ticket/53151
# See https://cmake.org/cmake/help/latest/variable/CMAKE_OSX_SYSROOT.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append SDKROOT=/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDKROOT=/
</span>
variant examples description {Install Examples} {
configure.args-replace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DEXAMPLES_ENABLE=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DEXAMPLES_ENABLE=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DEXAMPLES_ENABLE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DEXAMPLES_ENABLE=ON
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DEXAMPLES_INSTALL_PATH=${prefix}/share/examples/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DEXAMPLES_INSTALL_PATH=${port_install_examples}
</span> }
variant accelerate conflicts atlas openblas description {Use Apple Accelerate Libraries} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DBLA_VENDOR=Apple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBLA_VENDOR=Apple
</span> }
variant atlas conflicts accelerate openblas description {Use MacPorts ATLAS Libraries} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:atlas
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBLA_VENDOR=ATLAS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:atlas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBLA_VENDOR=ATLAS
</span>
# FindBLAS.cmake and FindLAPACK.cmake do not seem to find MacPorts Atlas properly
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBLAS_LIBRARIES=satlas \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLAPACK_LIBRARIES=satlas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBLAS_LIBRARIES=satlas \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLAPACK_LIBRARIES=satlas
</span> }
variant openblas conflicts atlas accelerate description {Use MacPorts OpenBLAS Libraries} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libopenblas.dylib:OpenBLAS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants path:lib/libopenblas.dylib:OpenBLAS lapack
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DBLA_VENDOR=OpenBLAS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libopenblas.dylib:OpenBLAS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libopenblas.dylib:OpenBLAS lapack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBLA_VENDOR=OpenBLAS
</span> }
if {![variant_isset accelerate] && ![variant_isset atlas] && ![variant_isset openblas]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,11 +173,14 @@ pre-fetch {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_doc_dir ${destroot}${port_install_doc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant doc description {install pdf documentation} {
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy {*}[glob ${worksrcpath}/doc/*] ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "find ${destroot}${prefix}/share/doc -type f -exec chmod 644 {} \\;"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${port_doc_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob ${worksrcpath}/doc/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${f} ${port_doc_dir}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/sundials/Portfile b/math/sundials5/Portfile
</span>similarity index 60%
copy from math/sundials/Portfile
copy to math/sundials5/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index bd3bc5dc13d..aa25ae17a44 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/sundials/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/sundials5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,17 +6,14 @@ PortGroup github 1.0
</span> PortGroup mpi 1.0
github.setup LLNL sundials 5.8.0 v
<span style='display:block; white-space:pre;background:#e0ffe0;'>+name sundials5
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 22866440a727c63ee187ac855852eda6c6b9c840 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d4ed403351f72434d347df592da6c91a69452071860525385b3339c824e8a213 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 24012815
</span>
categories math devel
license BSD
maintainers nomaintainer
description SUite of Nonlinear and DIfferential/ALgebraic equation Solvers
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> long_description SUNDIALS consists of the following five solvers: CVODE\
solves initial value problems for ordinary differential\
equation (ODE) systems. CVODES solves ODE systems and\
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,14 +23,58 @@ long_description SUNDIALS consists of the following five solvers: CVODE\
</span> DAE systems and includes sensitivity analysis capabilities\
(forward and adjoint). KINSOL solves nonlinear algebraic\
systems.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> homepage https://computing.llnl.gov/projects/sundials
github.tarball_from releases
<span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir sundials
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 22866440a727c63ee187ac855852eda6c6b9c840 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d4ed403351f72434d347df592da6c91a69452071860525385b3339c824e8a213 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 24012815
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts sundials2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Path-Related Variables - START
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The "install name," meaning, the subdirectory name for this port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Should correspond to the major version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_install_name \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Define all of our base paths up-front
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_install_prefix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/libexec/${port_install_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_install_cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${port_install_prefix}/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_install_include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${port_install_prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_install_lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${port_install_prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_install_doc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/share/doc/${port_install_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_install_examples \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/share/examples/${port_install_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Populate CMake options currently available
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.install_prefix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${port_install_prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake_share_module_dir \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${port_install_cmake}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.install_rpath \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${port_install_lib}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:SuiteSparse_KLU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_LIBEXECDIR=${port_install_prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_BINDIR=${port_install_prefix}/bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_SBINDIR=${port_install_prefix}/sbin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_SHAREDIR=${port_install_prefix}/share \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_INCLUDEDIR=${port_install_include} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_LIBDIR=${port_install_lib} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_NAME_DIR=${port_install_lib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Path-Related Variables - END
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#------------------------------------------------------------------------------
</span>
compiler.cxx_standard \
2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,23 +83,37 @@ mpi.setup \
</span> default \
require_fortran
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:SuiteSparse_KLU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMPI_ENABLE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_LAPACK=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_KLU=ON \
</span> -DEXAMPLES_ENABLE_C=OFF \
-DEXAMPLES_ENABLE_CXX=OFF \
-DEXAMPLES_ENABLE_F77=OFF \
-DEXAMPLES_ENABLE_F90=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_LAPACK=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_KLU=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DKLU_LIBRARY_DIR=${prefix}/lib \
</span> -DKLU_INCLUDE_DIR=${prefix}/include \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMPI_ENABLE=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DKLU_LIBRARY_DIR=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# from CMakeLists.txt:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# LAPACK is not compatible with INT64_T precision
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSUNDIALS_INDEX_SIZE=32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix file perms; tarball contents deny group and world read
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "find ${worksrcpath} -type d -print0 | xargs -0 chmod a+rx"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "find ${worksrcpath} -type f -print0 | xargs -0 chmod a+r"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
pre-configure {
if {[mpi_variant_isset]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_MPI=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_MPI=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_MPI=ON
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_MPI=ON \
</span> -DMPI_MPICC=${prefix}/bin/${mpi.cc} \
-DMPI_MPICXX=${prefix}/bin/${mpi.cxx} \
-DMPI_MPIF77=${prefix}/bin/${mpi.f77} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,41 +142,37 @@ configure.env-append \
</span> variant examples description {Install Examples} {
set example_langs {C CXX F90 F77}
foreach lang ${example_langs} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span> -DEXAMPLES_ENABLE_${lang}=OFF \
-DEXAMPLES_ENABLE_${lang}=ON
}
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DEXAMPLES_INSTALL_PATH=${prefix}/share/examples/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DEXAMPLES_INSTALL_PATH=${port_install_examples}
</span> use_parallel_build no
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# from CMakeLists.txt:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# LAPACK is not compatible with INT64_T precision
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DSUNDIALS_INDEX_SIZE=32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant accelerate conflicts atlas openblas description {Use Apple Accelerate Libraries} {
configure.args-append \
-DBLA_VENDOR=Apple
}
variant atlas conflicts accelerate openblas description {Use MacPorts ATLAS Libraries} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:atlas
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:atlas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span> -DBLA_VENDOR=ATLAS
# FindBLAS.cmake and FindLAPACK.cmake do not seem to find MacPorts Atlas properly
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBLAS_LIBRARIES=satlas \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBLAS_LIBRARIES=satlas \
</span> -DLAPACK_LIBRARIES=satlas
}
variant openblas conflicts atlas accelerate description {Use MacPorts OpenBLAS Libraries} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libopenblas.dylib:OpenBLAS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants path:lib/libopenblas.dylib:OpenBLAS lapack
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libopenblas.dylib:OpenBLAS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libopenblas.dylib:OpenBLAS lapack
</span> configure.args-append \
-DBLA_VENDOR=OpenBLAS
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,18 +187,21 @@ pre-fetch {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_doc_dir ${destroot}${port_install_doc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant doc description {install pdf documentation} {
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy {*}[glob ${worksrcpath}/doc/*] ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "find ${destroot}${prefix}/share/doc -type f -exec chmod 644 {} \\;"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${port_doc_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob ${worksrcpath}/doc/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${f} ${port_doc_dir}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
# LICENSE file is installed in a bad location
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/include/sundials/LICENSE ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${port_doc_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${port_install_include}/sundials/LICENSE ${port_doc_dir}/
</span> }
livecheck.url https://computing.llnl.gov/projects/sundials/sundials-software
</pre><pre style='margin:0'>
</pre>