math/sundials: Update 5.7.0 -> 6.2.0

6 files changed, 67 insertions, 66 deletions

diff --git a/math/deal.ii/Makefile b/math/deal.ii/Makefile
index 55b27f9a06ad..12ffd4698de7 100644
--- a/math/deal.ii/Makefile
+++ b/math/deal.ii/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	deal.II
 DISTVERSIONPREFIX=	v
 DISTVERSION=	9.3.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/math/mcsim/Makefile b/math/mcsim/Makefile
index 117486f6ce4f..aa6385da12b0 100644
--- a/math/mcsim/Makefile
+++ b/math/mcsim/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mcsim
 PORTVERSION=	6.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 782351cd4b61..1e6126abcac0 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	octave
 PORTVERSION=	${OCTAVE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
diff --git a/math/sundials/Makefile b/math/sundials/Makefile
index 68fa68b80cbf..2649cccb2c2d 100644
--- a/math/sundials/Makefile
+++ b/math/sundials/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	sundials
-DISTVERSION=	5.7.0
-PORTREVISION=	1
+DISTVERSION=	6.2.0
 CATEGORIES=	math
 MASTER_SITES=	https://github.com/LLNL/sundials/releases/download/v${DISTVERSION}/
 
@@ -10,17 +9,18 @@ COMMENT=	SUite of Nonlinear and DIfferential/ALgebraic Equation Solvers
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake:noninja fortran localbase:ldflags python:build # ninja doesn't support fortran
+USES=		cmake:testing fortran localbase:ldflags python:build
 USE_LDCONFIG=	yes
 
-CMAKE_ARGS=	-DENABLE_PTHREAD:BOOL=ON \
-		-DBUILD_STATIC_LIBS:BOOL=OFF
+CMAKE_ARGS=		-DENABLE_PTHREAD:BOOL=ON \
+			-DBUILD_STATIC_LIBS:BOOL=OFF
+CMAKE_OFF=		EXAMPLES_ENABLE_C EXAMPLES_ENABLE_CXX EXAMPLES_ENABLE_F77 EXAMPLES_ENABLE_F90
+CMAKE_TESTING_ON=	SUNDIALS_TEST_UNITTESTS \
+			EXAMPLES_ENABLE_C EXAMPLES_ENABLE_CXX EXAMPLES_ENABLE_F77 EXAMPLES_ENABLE_F90
 
 FCFLAGS:=	${FFLAGS} # project checks that these flags are equal
 
-TEST_TARGET=	test
-
-OPTIONS_DEFINE=		BLAS EXAMPLES LAPACK MPI # OPENMP detection is broken in cmake: https://gitlab.kitware.com/cmake/cmake/issues/17474
+OPTIONS_DEFINE=		BLAS LAPACK MPI # OPENMP detection is broken in cmake: https://gitlab.kitware.com/cmake/cmake/issues/17474; EXAMPLES are broken on some systems due to CLOCK_MONOTONIC
 #OPTIONS_DEFAULT=	LAPACK # LAPACK is broken
 OPTIONS_GROUP=		VECTORS
 OPTIONS_GROUP_VECTORS=	HYPRE PETSC
@@ -32,8 +32,9 @@ BLAS_CMAKE_BOOL=	BLAS_ENABLE
 BLAS_USES=		blaslapack:openblas
 BLAS_CMAKE_ON=		-DFREEBSD_GCC_DIR:STRING=${LOCALBASE}/lib/gcc${GCC_DEFAULT:S/.//} # assumes that fortran:gcc is used
 
-EXAMPLES_CMAKE_BOOL=	EXAMPLES_ENABLE_C EXAMPLES_ENABLE_CXX EXAMPLES_ENABLE_F77 EXAMPLES_ENABLE_F90
-EXAMPLES_CMAKE_ON=	-DEXAMPLES_INSTALL_PATH=${EXAMPLESDIR}
+#EXAMPLES_CMAKE_BOOL=	EXAMPLES_ENABLE_C EXAMPLES_ENABLE_CXX EXAMPLES_ENABLE_F77 EXAMPLES_ENABLE_F90
+#EXAMPLES_CMAKE_ON=	-DEXAMPLES_INSTALL_PATH=${EXAMPLESDIR}
+#PORTEXAMPLES=		*
 
 HYPRE_DESC=		HYPRE vectors support (also enables MPI)
 HYPRE_CMAKE_BOOL=	ENABLE_HYPRE
@@ -63,8 +64,6 @@ PETSC_IMPLIES=		MPI
 PETSC_PREVENTS=		LAPACK  # error: Incompatible sunindextype for LAPACK; disable LAPACK and rebuild
 PETSC_BROKEN=		ERROR: PETSc not functional due to index size mismatch: SUNDIALS_INDEX_SIZE=64, but PETSc was built with 32-bit indices
 
-PORTEXAMPLES=	*
-
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/include/sundials/LICENSE
 
diff --git a/math/sundials/distinfo b/math/sundials/distinfo
index a10e2e95c308..928e273fae9b 100644
--- a/math/sundials/distinfo
+++ b/math/sundials/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630044758
-SHA256 (sundials-5.7.0.tar.gz) = 48da7baa8152ddb22aed1b02d82d1dbb4fbfea22acf67634011aa0303a100a43
-SIZE (sundials-5.7.0.tar.gz) = 22612286
+TIMESTAMP = 1655680730
+SHA256 (sundials-6.2.0.tar.gz) = 195d5593772fc483f63f08794d79e4bab30c2ec58e6ce4b0fb6bcc0e0c48f31d
+SIZE (sundials-6.2.0.tar.gz) = 82410068
diff --git a/math/sundials/pkg-plist b/math/sundials/pkg-plist
index 0b3cc85473cc..87960a1f948c 100644
--- a/math/sundials/pkg-plist
+++ b/math/sundials/pkg-plist
@@ -22,6 +22,7 @@ include/cvodes/cvodes_bbdpre.h
 include/cvodes/cvodes_diag.h
 include/cvodes/cvodes_direct.h
 include/cvodes/cvodes_ls.h
+include/cvodes/cvodes_proj.h
 include/cvodes/cvodes_spils.h
 include/ida/ida.h
 include/ida/ida_bbdpre.h
@@ -49,21 +50,21 @@ include/nvector/nvector_serial.h
 include/sundials/NOTICE
 include/sundials/sundials_band.h
 include/sundials/sundials_config.h
+include/sundials/sundials_context.h
 include/sundials/sundials_dense.h
 include/sundials/sundials_direct.h
 include/sundials/sundials_export.h
-include/sundials/sundials_fconfig.h
-include/sundials/sundials_fnvector.h
-include/sundials/sundials_futils.h
 include/sundials/sundials_iterative.h
 %%LAPACK%%include/sundials/sundials_lapack.h
 include/sundials/sundials_linearsolver.h
+include/sundials/sundials_logger.h
 include/sundials/sundials_math.h
 include/sundials/sundials_matrix.h
 include/sundials/sundials_memory.h
 %%MPI%%include/sundials/sundials_mpi_types.h
 include/sundials/sundials_nonlinearsolver.h
 include/sundials/sundials_nvector.h
+include/sundials/sundials_profiler.h
 include/sundials/sundials_types.h
 include/sundials/sundials_version.h
 include/sunlinsol/sunlinsol_band.h
@@ -78,6 +79,7 @@ include/sunlinsol/sunlinsol_sptfqmr.h
 include/sunmatrix/sunmatrix_band.h
 include/sunmatrix/sunmatrix_dense.h
 include/sunmatrix/sunmatrix_sparse.h
+include/sunmemory/sunmemory_system.h
 include/sunnonlinsol/sunnonlinsol_fixedpoint.h
 include/sunnonlinsol/sunnonlinsol_newton.h
 lib/cmake/sundials/SUNDIALSConfig.cmake
@@ -85,54 +87,54 @@ lib/cmake/sundials/SUNDIALSConfigVersion.cmake
 lib/cmake/sundials/SUNDIALSTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/sundials/SUNDIALSTargets.cmake
 lib/libsundials_arkode.so
-lib/libsundials_arkode.so.4
-lib/libsundials_arkode.so.4.7.0
+lib/libsundials_arkode.so.5
+lib/libsundials_arkode.so.5.2.0
 lib/libsundials_cvode.so
-lib/libsundials_cvode.so.5
-lib/libsundials_cvode.so.5.7.0
+lib/libsundials_cvode.so.6
+lib/libsundials_cvode.so.6.2.0
 lib/libsundials_cvodes.so
-lib/libsundials_cvodes.so.5
-lib/libsundials_cvodes.so.5.7.0
+lib/libsundials_cvodes.so.6
+lib/libsundials_cvodes.so.6.2.0
 lib/libsundials_generic.so
-lib/libsundials_generic.so.5
-lib/libsundials_generic.so.5.7.0
+lib/libsundials_generic.so.6
+lib/libsundials_generic.so.6.2.0
 lib/libsundials_ida.so
-lib/libsundials_ida.so.5
-lib/libsundials_ida.so.5.7.0
+lib/libsundials_ida.so.6
+lib/libsundials_ida.so.6.2.0
 lib/libsundials_idas.so
-lib/libsundials_idas.so.4
-lib/libsundials_idas.so.4.7.0
+lib/libsundials_idas.so.5
+lib/libsundials_idas.so.5.2.0
 lib/libsundials_kinsol.so
-lib/libsundials_kinsol.so.5
-lib/libsundials_kinsol.so.5.7.0
+lib/libsundials_kinsol.so.6
+lib/libsundials_kinsol.so.6.2.0
 lib/libsundials_nvecmanyvector.so
-lib/libsundials_nvecmanyvector.so.5
-lib/libsundials_nvecmanyvector.so.5.7.0
+lib/libsundials_nvecmanyvector.so.6
+lib/libsundials_nvecmanyvector.so.6.2.0
 %%MPI%%lib/libsundials_nvecmpimanyvector.so
-%%MPI%%lib/libsundials_nvecmpimanyvector.so.5
-%%MPI%%lib/libsundials_nvecmpimanyvector.so.5.7.0
+%%MPI%%lib/libsundials_nvecmpimanyvector.so.6
+%%MPI%%lib/libsundials_nvecmpimanyvector.so.6.2.0
 %%MPI%%lib/libsundials_nvecmpiplusx.so
-%%MPI%%lib/libsundials_nvecmpiplusx.so.5
-%%MPI%%lib/libsundials_nvecmpiplusx.so.5.7.0
+%%MPI%%lib/libsundials_nvecmpiplusx.so.6
+%%MPI%%lib/libsundials_nvecmpiplusx.so.6.2.0
 %%MPI%%lib/libsundials_nvecparallel.so
-%%MPI%%lib/libsundials_nvecparallel.so.5
-%%MPI%%lib/libsundials_nvecparallel.so.5.7.0
+%%MPI%%lib/libsundials_nvecparallel.so.6
+%%MPI%%lib/libsundials_nvecparallel.so.6.2.0
 %%HYPRE%%lib/libsundials_nvecparhyp.so
-%%HYPRE%%lib/libsundials_nvecparhyp.so.5
-%%HYPRE%%lib/libsundials_nvecparhyp.so.5.7.0
+%%HYPRE%%lib/libsundials_nvecparhyp.so.6
+%%HYPRE%%lib/libsundials_nvecparhyp.so.6.2.0
 %%PETSC%%lib/libsundials_nvecpetsc.so
-%%PETSC%%lib/libsundials_nvecpetsc.so.3
-%%PETSC%%lib/libsundials_nvecpetsc.so.3.1.2
+%%PETSC%%lib/libsundials_nvecpetsc.so.6
+%%PETSC%%lib/libsundials_nvecpetsc.so.6.2.0
 lib/libsundials_nvecpthreads.so
-lib/libsundials_nvecpthreads.so.5
-lib/libsundials_nvecpthreads.so.5.7.0
+lib/libsundials_nvecpthreads.so.6
+lib/libsundials_nvecpthreads.so.6.2.0
 lib/libsundials_nvecserial.so
-lib/libsundials_nvecserial.so.5
-lib/libsundials_nvecserial.so.5.7.0
+lib/libsundials_nvecserial.so.6
+lib/libsundials_nvecserial.so.6.2.0
 lib/libsundials_sunlinsolband.so
-lib/libsundials_sunlinsolband.so.3.7.0
+lib/libsundials_sunlinsolband.so.4.2.0
 lib/libsundials_sunlinsoldense.so
-lib/libsundials_sunlinsoldense.so.3.7.0
+lib/libsundials_sunlinsoldense.so.4.2.0
 %%LAPACK%%lib/libsundials_sunlinsollapackband.so
 %%LAPACK%%lib/libsundials_sunlinsollapackband.so.%%SHLX1%%
 %%LAPACK%%lib/libsundials_sunlinsollapackband.so.%%SHLX3%%
@@ -140,25 +142,25 @@ lib/libsundials_sunlinsoldense.so.3.7.0
 %%LAPACK%%lib/libsundials_sunlinsollapackdense.so.%%SHLX1%%
 %%LAPACK%%lib/libsundials_sunlinsollapackdense.so.%%SHLX3%%
 lib/libsundials_sunlinsolpcg.so
-lib/libsundials_sunlinsolpcg.so.3.7.0
+lib/libsundials_sunlinsolpcg.so.4.2.0
 lib/libsundials_sunlinsolspbcgs.so
-lib/libsundials_sunlinsolspbcgs.so.3.7.0
+lib/libsundials_sunlinsolspbcgs.so.4.2.0
 lib/libsundials_sunlinsolspfgmr.so
-lib/libsundials_sunlinsolspfgmr.so.3.7.0
+lib/libsundials_sunlinsolspfgmr.so.4.2.0
 lib/libsundials_sunlinsolspgmr.so
-lib/libsundials_sunlinsolspgmr.so.3.7.0
+lib/libsundials_sunlinsolspgmr.so.4.2.0
 lib/libsundials_sunlinsolsptfqmr.so
-lib/libsundials_sunlinsolsptfqmr.so.3.7.0
+lib/libsundials_sunlinsolsptfqmr.so.4.2.0
 lib/libsundials_sunmatrixband.so
-lib/libsundials_sunmatrixband.so.3
-lib/libsundials_sunmatrixband.so.3.7.0
+lib/libsundials_sunmatrixband.so.4
+lib/libsundials_sunmatrixband.so.4.2.0
 lib/libsundials_sunmatrixdense.so
-lib/libsundials_sunmatrixdense.so.3
-lib/libsundials_sunmatrixdense.so.3.7.0
+lib/libsundials_sunmatrixdense.so.4
+lib/libsundials_sunmatrixdense.so.4.2.0
 lib/libsundials_sunmatrixsparse.so
-lib/libsundials_sunmatrixsparse.so.3
-lib/libsundials_sunmatrixsparse.so.3.7.0
+lib/libsundials_sunmatrixsparse.so.4
+lib/libsundials_sunmatrixsparse.so.4.2.0
 lib/libsundials_sunnonlinsolfixedpoint.so
-lib/libsundials_sunnonlinsolfixedpoint.so.2.7.0
+lib/libsundials_sunnonlinsolfixedpoint.so.3.2.0
 lib/libsundials_sunnonlinsolnewton.so
-lib/libsundials_sunnonlinsolnewton.so.2.7.0
+lib/libsundials_sunnonlinsolnewton.so.3.2.0