git: dfa4f59983f6 - main - science/spheral: update 2025.12.0 → 2026.06.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Wed, 23 Sep 2026 07:26:04 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=dfa4f59983f6cecf47da65b345271c62c9f72015

commit dfa4f59983f6cecf47da65b345271c62c9f72015
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2026-09-23 07:24:07 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2026-09-23 07:25:55 +0000

    science/spheral: update 2025.12.0 → 2026.06.0
---
 science/spheral/Makefile                           |  3 +-
 science/spheral/distinfo                           |  6 ++--
 .../spheral/files/patch-cmake_InstallTPLs.cmake    | 32 ++++++++++++++++------
 .../spheral/files/patch-cmake_SetupSpheral.cmake   |  7 +++--
 .../spheral/files/patch-cmake_SpheralConfig.cmake  |  3 ++
 .../files/patch-cmake_spheral_SpheralAddLibs.cmake | 11 +++++---
 .../patch-cmake_spheral_SpheralHandleTPL.cmake     |  4 +--
 .../files/patch-cmake_spheral__cxx-config.cmake.in | 17 ++++++++++--
 science/spheral/files/patch-cmake_tpl_boost.cmake  |  7 -----
 science/spheral/pkg-plist                          | 26 +++++++++++++-----
 10 files changed, 78 insertions(+), 38 deletions(-)

diff --git a/science/spheral/Makefile b/science/spheral/Makefile
index c7a55b825dcd..0e9f476aa9d9 100644
--- a/science/spheral/Makefile
+++ b/science/spheral/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	spheral
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2025.12.0
-PORTREVISION=	1
+DISTVERSION=	2026.06.0
 CATEGORIES=	science # physics
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/science/spheral/distinfo b/science/spheral/distinfo
index 20f8527e07ed..290ca23f687b 100644
--- a/science/spheral/distinfo
+++ b/science/spheral/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1775028071
-SHA256 (LLNL-spheral-v2025.12.0_GH0.tar.gz) = d770750cf81e8f945976c157c3401cfb3c15a67c5291c78a9378e09c32103d11
-SIZE (LLNL-spheral-v2025.12.0_GH0.tar.gz) = 6709680
+TIMESTAMP = 1790144729
+SHA256 (LLNL-spheral-v2026.06.0_GH0.tar.gz) = 06ef78ba1d400250541b9a2fe66636e914ac5a00e23afd370c463d440369688b
+SIZE (LLNL-spheral-v2026.06.0_GH0.tar.gz) = 6762906
 SHA256 (LLNL-PolyClipper-e1fe47c_GH0.tar.gz) = 52b358f32f523e6030ed090411c90f0811db12046b6cb6fa8e4cafe4f8b3567e
 SIZE (LLNL-PolyClipper-e1fe47c_GH0.tar.gz) = 274184
 SHA256 (LLNL-PYB11Generator-7160812_GH0.tar.gz) = 9f257b9a5b2503aaacdba48d785bd349c95849a282e1e181ccee2c0f319135cb
diff --git a/science/spheral/files/patch-cmake_InstallTPLs.cmake b/science/spheral/files/patch-cmake_InstallTPLs.cmake
index 6e42e351f55d..40ee9160f868 100644
--- a/science/spheral/files/patch-cmake_InstallTPLs.cmake
+++ b/science/spheral/files/patch-cmake_InstallTPLs.cmake
@@ -1,4 +1,10 @@
---- cmake/InstallTPLs.cmake.orig	2025-12-18 23:27:24 UTC
+-- Adjust Spheral's third-party library discovery for FreeBSD packages.
+-- Upstream hard-codes NO_DEFAULT_PATH with per-project subdirectories, while
+-- FreeBSD installs CMake config files into standard prefix paths and provides
+-- shared SUNDIALS targets. Also make PolyClipper install under a subdirectory
+-- and set the correct Boost library variant flags.
+
+--- cmake/InstallTPLs.cmake.orig	2026-06-23 16:46:22 UTC
 +++ cmake/InstallTPLs.cmake
 @@ -73,7 +73,7 @@ if (NOT polyclipper_DIR)
    list(APPEND SPHERAL_BLT_DEPENDS PolyClipperAPI)
@@ -41,7 +47,7 @@
  if(POLYTOPE_FOUND)
    list(APPEND SPHERAL_BLT_DEPENDS polytope)
    list(APPEND SPHERAL_FP_TPLS polytope)
-@@ -144,7 +148,7 @@ if (SPHERAL_ENABLE_TIMERS)
+@@ -149,7 +153,7 @@ if (SPHERAL_ENABLE_TIMERS)
      # Only save if it does not exists already
      set(CONFIG_CALIPER_DIR "${caliper_DIR}" CACHE PATH "Configuration Caliper directory")
    endif()
@@ -50,16 +56,16 @@
    if(caliper_FOUND)
      list(APPEND SPHERAL_BLT_DEPENDS caliper)
      list(APPEND SPHERAL_FP_TPLS caliper)
-@@ -164,7 +168,7 @@ if(NOT ENABLE_STATIC_TPL)
+@@ -162,7 +166,7 @@ if(NOT SPHERAL_EXTERNAL_INSTALL)
+ # HDF5
  
- 
- if(NOT ENABLE_STATIC_TPL)
+ if(NOT SPHERAL_EXTERNAL_INSTALL)
 -  find_package(hdf5 REQUIRED NO_DEFAULT_PATH PATHS ${hdf5_DIR})
 +  find_package(hdf5 REQUIRED)
    message("Found HDF5 External Package.")
    list(APPEND SPHERAL_FP_TPLS hdf5)
    list(APPEND SPHERAL_FP_DIRS ${hdf5_DIR})
-@@ -178,22 +182,24 @@ message("---------------------------------------------
+@@ -172,22 +176,24 @@ message("---------------------------------------------
  endif()
  
  message("-----------------------------------------------------------------------------")
@@ -89,7 +95,7 @@
  endif()
  
  list(APPEND SPHERAL_BLT_DEPENDS chai camp RAJA umpire)
-@@ -204,13 +210,12 @@ if (SPHERAL_ENABLE_SUNDIALS)
+@@ -198,13 +204,12 @@ if (SPHERAL_ENABLE_SUNDIALS)
  # Use find_package to get Sundials
  if (SPHERAL_ENABLE_SUNDIALS)
    set(SUNDIALS_DIR "${sundials_DIR}")
@@ -106,7 +112,17 @@
      endforeach()
      list(APPEND SPHERAL_FP_TPLS SUNDIALS)
      list(APPEND SPHERAL_FP_DIRS ${sundials_DIR})
-@@ -238,7 +243,11 @@ endforeach()
+@@ -214,6 +219,9 @@ if(NOT SPHERAL_EXTERNAL_INSTALL)
+ 
+ message("-----------------------------------------------------------------------------")
+ if(NOT SPHERAL_EXTERNAL_INSTALL)
++  set(Boost_USE_DEBUG_RUNTIME OFF)
++  set(Boost_USE_STATIC_LIBS OFF)
++  set(Boost_USE_MULTITHREADED ON)
+   find_package(Boost REQUIRED NO_DEFAULT_PATH COMPONENTS filesystem PATHS ${boost_DIR})
+   if(Boost_FOUND)
+     list(APPEND SPHERAL_BLT_DEPENDS Boost::filesystem)
+@@ -244,7 +252,11 @@ endforeach()
    endif()
    list(APPEND SPHERAL_BLT_DEPENDS ${lib})
  endforeach()
diff --git a/science/spheral/files/patch-cmake_SetupSpheral.cmake b/science/spheral/files/patch-cmake_SetupSpheral.cmake
index 3e210340fa15..8b2e7a8d303f 100644
--- a/science/spheral/files/patch-cmake_SetupSpheral.cmake
+++ b/science/spheral/files/patch-cmake_SetupSpheral.cmake
@@ -1,8 +1,9 @@
-- eliminate the need to use git
+-- Do not hard-code a Python interpreter under ${python_DIR}; the port uses
+-- BINARY_ALIAS and Python_EXECUTABLE arguments to control Python discovery.
 
---- cmake/SetupSpheral.cmake.orig	2026-04-01 07:49:10 UTC
+--- cmake/SetupSpheral.cmake.orig	2026-06-23 16:46:22 UTC
 +++ cmake/SetupSpheral.cmake
-@@ -28,8 +28,8 @@ include(Compilers)
+@@ -33,8 +33,8 @@ include(Compilers)
  #-------------------------------------------------------------------------------
  
  # Need to define Python paths here as BLT finds it's own Python package.
diff --git a/science/spheral/files/patch-cmake_SpheralConfig.cmake b/science/spheral/files/patch-cmake_SpheralConfig.cmake
index 0daaec512ee8..3cc7f1af0623 100644
--- a/science/spheral/files/patch-cmake_SpheralConfig.cmake
+++ b/science/spheral/files/patch-cmake_SpheralConfig.cmake
@@ -1,3 +1,6 @@
+-- Keep the spheral_cxx CMake module directory under a package-specific path
+-- consistent with the SpheralAddLibs change.
+
 --- cmake/SpheralConfig.cmake.orig	2026-04-01 08:49:15 UTC
 +++ cmake/SpheralConfig.cmake
 @@ -5,7 +5,7 @@ set(SPHERAL_INSTALL_BIN_DIR "bin" CACHE STRING "")
diff --git a/science/spheral/files/patch-cmake_spheral_SpheralAddLibs.cmake b/science/spheral/files/patch-cmake_spheral_SpheralAddLibs.cmake
index e3f72f0cc217..73e6de0814c2 100644
--- a/science/spheral/files/patch-cmake_spheral_SpheralAddLibs.cmake
+++ b/science/spheral/files/patch-cmake_spheral_SpheralAddLibs.cmake
@@ -1,11 +1,14 @@
---- cmake/spheral/SpheralAddLibs.cmake.orig	2026-04-01 08:49:15 UTC
+-- Install the spheral_cxx CMake export files under a package-specific
+-- subdirectory to avoid conflicts with other ports.
+
+--- cmake/spheral/SpheralAddLibs.cmake.orig	2026-06-23 16:46:22 UTC
 +++ cmake/spheral/SpheralAddLibs.cmake
-@@ -138,7 +138,7 @@ function(spheral_add_cxx_library package_name _cxx_obj
+@@ -146,7 +146,7 @@ function(spheral_add_cxx_library package_name _cxx_obj
      EXPORT        ${export_target_name})
  
    # Export Spheral target
 -  install(EXPORT ${export_target_name} DESTINATION lib/cmake)
 +  install(EXPORT ${export_target_name} DESTINATION lib/cmake/spheral_cxx)
+ endfunction()
  
-   # Set the r-path of the C++ lib such that it is independent of the build dir when installed
-   set_target_properties(Spheral_${package_name} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+ #----------------------------------------------------------------------------------------
diff --git a/science/spheral/files/patch-cmake_spheral_SpheralHandleTPL.cmake b/science/spheral/files/patch-cmake_spheral_SpheralHandleTPL.cmake
index 8ac696c63481..770569448898 100644
--- a/science/spheral/files/patch-cmake_spheral_SpheralHandleTPL.cmake
+++ b/science/spheral/files/patch-cmake_spheral_SpheralHandleTPL.cmake
@@ -1,6 +1,6 @@
---- cmake/spheral/SpheralHandleTPL.cmake.orig	2026-04-01 08:49:15 UTC
+--- cmake/spheral/SpheralHandleTPL.cmake.orig	2026-06-23 16:46:22 UTC
 +++ cmake/spheral/SpheralHandleTPL.cmake
-@@ -95,7 +95,7 @@ function(Spheral_Handle_TPL lib_name TPL_CMAKE_DIR)
+@@ -97,7 +97,7 @@ function(Spheral_Handle_TPL lib_name TPL_CMAKE_DIR)
    if(NOT ${_is_imported})
      install(TARGETS ${lib_name}
        EXPORT spheral_cxx-targets
diff --git a/science/spheral/files/patch-cmake_spheral__cxx-config.cmake.in b/science/spheral/files/patch-cmake_spheral__cxx-config.cmake.in
index 02433092e09b..f8fe0e50ff94 100644
--- a/science/spheral/files/patch-cmake_spheral__cxx-config.cmake.in
+++ b/science/spheral/files/patch-cmake_spheral__cxx-config.cmake.in
@@ -1,6 +1,19 @@
---- cmake/spheral_cxx-config.cmake.in.orig	2026-04-01 08:49:15 UTC
+-- Match the Boost variant flags in the installed config file so downstream
+-- find_package(spheral_cxx) also locates the shared FreeBSD Boost build.
+
+--- cmake/spheral_cxx-config.cmake.in.orig	2026-06-23 16:46:22 UTC
 +++ cmake/spheral_cxx-config.cmake.in
-@@ -45,8 +45,8 @@ if(NOT SPHERAL_FOUND)
+@@ -31,6 +31,9 @@ if(NOT SPHERAL_FOUND)
+     set(PYTHON_EXE ${Python3_EXECUTABLE})
+   endif()
+   if(NOT SPHERAL_EXTERNAL_INSTALL)
++    set(Boost_USE_DEBUG_RUNTIME OFF)
++    set(Boost_USE_STATIC_LIBS OFF)
++    set(Boost_USE_MULTITHREADED ON)
+     find_package(Boost REQUIRED QUIET NO_DEFAULT_PATH COMPONENTS filesystem PATHS ${Boost_DIR})
+   endif()
+   # Loop over TPLs that use find_package
+@@ -52,8 +55,8 @@ if(NOT SPHERAL_FOUND)
        set(MPI_Fortran_COMPILER "@MPI_Fortran_COMPILER@" CACHE PATH "")
      endif()
    endif()
diff --git a/science/spheral/files/patch-cmake_tpl_boost.cmake b/science/spheral/files/patch-cmake_tpl_boost.cmake
deleted file mode 100644
index 521cfe62b4b8..000000000000
--- a/science/spheral/files/patch-cmake_tpl_boost.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
---- cmake/tpl/boost.cmake.orig	2025-10-30 22:36:06 UTC
-+++ cmake/tpl/boost.cmake
-@@ -1,3 +1,3 @@ if (NOT BOOST_HEADER_ONLY)
- if (NOT BOOST_HEADER_ONLY)
--  set(${lib_name}_libs libboost_filesystem.so libboost_system.so)
-+  set(${lib_name}_libs libboost_filesystem.so)
- endif()
diff --git a/science/spheral/pkg-plist b/science/spheral/pkg-plist
index 7fb296e37408..44b59cd30df7 100644
--- a/science/spheral/pkg-plist
+++ b/science/spheral/pkg-plist
@@ -1,19 +1,25 @@
 include/ArtificialConduction/ArtificialConduction.hh
 include/ArtificialConduction/ArtificialConductionPolicy.hh
 include/ArtificialViscosity/ArtificialViscosity.hh
-include/ArtificialViscosity/ArtificialViscosityHandle.hh
-include/ArtificialViscosity/ArtificialViscosityHandleInline.hh
+include/ArtificialViscosity/ArtificialViscosityBase.hh
+include/ArtificialViscosity/ArtificialViscosityBaseInline.hh
+include/ArtificialViscosity/ArtificialViscosityView.hh
 include/ArtificialViscosity/CullenDehnenViscosity.hh
 include/ArtificialViscosity/FiniteVolumeViscosity.hh
+include/ArtificialViscosity/FiniteVolumeViscosityView.hh
+include/ArtificialViscosity/FiniteVolumeViscosityViewInline.hh
 include/ArtificialViscosity/IncrementCullenMultipliers.hh
 include/ArtificialViscosity/LimitedMonaghanGingoldViscosity.hh
-include/ArtificialViscosity/LimitedMonaghanGingoldViscosityRZ.hh
+include/ArtificialViscosity/LimitedMonaghanGingoldViscosityView.hh
+include/ArtificialViscosity/LimitedMonaghanGingoldViscosityViewInline.hh
 include/ArtificialViscosity/MonaghanGingoldViscosity.hh
-include/ArtificialViscosity/MonaghanGingoldViscosityGSRZ.hh
-include/ArtificialViscosity/MonaghanGingoldViscosityRZ.hh
+include/ArtificialViscosity/MonaghanGingoldViscosityView.hh
+include/ArtificialViscosity/MonaghanGingoldViscosityViewInline.hh
 include/ArtificialViscosity/MorrisMonaghanReducingViscosity.hh
 include/ArtificialViscosity/TensorCRKSPHViscosity.hh
 include/ArtificialViscosity/TensorMonaghanGingoldViscosity.hh
+include/ArtificialViscosity/TensorMonaghanGingoldViscosityView.hh
+include/ArtificialViscosity/TensorMonaghanGingoldViscosityViewInline.hh
 include/ArtificialViscosity/TensorSVPHViscosity.hh
 include/Boundary/AxisBoundaryRZ.hh
 include/Boundary/Boundary.hh
@@ -315,6 +321,7 @@ include/Geometry/GeomVector.hh
 include/Geometry/GeomVectorBase.hh
 include/Geometry/GeomVectorInline.hh
 include/Geometry/GeomVector_fwd.hh
+include/Geometry/GeometricUtilities.hh
 include/Geometry/GeometryRegistrar.hh
 include/Geometry/Jacobi.hh
 include/Geometry/Jacobi2.hh
@@ -341,6 +348,7 @@ include/Gravity/PolyGravity.hh
 include/Gravity/Tree.hh
 include/Gravity/TreeGravity.hh
 include/Gravity/TreeGravityInline.hh
+include/Hydro/AxisymmetricMassDensityPolicy.hh
 include/Hydro/CompatibleDifferenceSpecificThermalEnergyPolicy.hh
 include/Hydro/EntropyPolicy.hh
 include/Hydro/GammaPolicy.hh
@@ -474,6 +482,7 @@ include/Neighbor/NodePairListView.hh
 include/Neighbor/PairwiseField.hh
 include/Neighbor/PairwiseFieldElementAccessor.hh
 include/Neighbor/PairwiseFieldInline.hh
+include/Neighbor/PairwiseFieldView.hh
 include/Neighbor/TreeNeighbor.hh
 include/NodeGenerators/centroidalRelaxNodesImpl.hh
 include/NodeGenerators/chooseRandomNonoverlappingCenter.hh
@@ -527,8 +536,11 @@ include/SPH/PSPH.hh
 include/SPH/SPH.hh
 include/SPH/SPHBase.hh
 include/SPH/SPHRZ.hh
+include/SPH/SPHRZUtilities.hh
+include/SPH/SPH_RAJA.hh
 include/SPH/SolidSPH.hh
 include/SPH/SolidSPHRZ.hh
+include/SPH/SolidSPH_RAJA.hh
 include/SPH/SolidSphericalSPH.hh
 include/SPH/SphericalSPH.hh
 include/SPH/computeHydrostaticEquilibriumPressure.hh
@@ -606,7 +618,6 @@ include/Utilities/BiLinearInterpolatorInline.hh
 include/Utilities/BiQuadraticInterpolator.hh
 include/Utilities/BiQuadraticInterpolatorInline.hh
 include/Utilities/BuildData.hh
-include/Utilities/CHAI_MA_wrapper.hh
 include/Utilities/CounterClockwiseComparator.hh
 include/Utilities/CubicHermiteInterpolator.hh
 include/Utilities/CubicHermiteInterpolatorInline.hh
@@ -619,7 +630,7 @@ include/Utilities/DomainNodeInline.hh
 include/Utilities/FastMath.hh
 include/Utilities/FieldDataTypeTraits.hh
 include/Utilities/Functors.hh
-include/Utilities/GeometricUtilities.hh
+include/Utilities/GPUUtils.hh
 include/Utilities/Hashes.hh
 include/Utilities/KeyTraits.hh
 include/Utilities/LinearInterpolator.hh
@@ -661,6 +672,7 @@ include/Utilities/erff.hh
 include/Utilities/globalBoundingVolumes.hh
 include/Utilities/globalNodeIDs.hh
 include/Utilities/globalNodeIDsInline.hh
+include/Utilities/initializeAdiak.hh
 include/Utilities/initializeAxom.hh
 include/Utilities/initializeTau.hh
 include/Utilities/integrateThroughMeshAlongSegment.hh