git: 778d41561345 - main - science/axom: update 0.13.0 → 0.15.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 04 Oct 2026 09:21:14 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=778d41561345ac4efe7c1cb8b0aac4933756b542
commit 778d41561345ac4efe7c1cb8b0aac4933756b542
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2026-10-03 21:56:56 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2026-10-04 09:20:47 +0000
science/axom: update 0.13.0 → 0.15.0
---
science/axom/Makefile | 29 +++++-------
science/axom/distinfo | 14 +++---
.../axom/files/patch-cmake_axom-config.cmake.in | 21 +++++++++
...atch-cmake_blt_cmake_BLTInstallableMacros.cmake | 33 +++++++++++++
.../files/patch-cmake_thirdparty_FindLUA.cmake | 21 +++++++++
science/axom/pkg-plist | 55 +++++++++++++++++++---
science/spheral/Makefile | 3 +-
7 files changed, 145 insertions(+), 31 deletions(-)
diff --git a/science/axom/Makefile b/science/axom/Makefile
index eb99ef12c1a3..e8e41902d2af 100644
--- a/science/axom/Makefile
+++ b/science/axom/Makefile
@@ -1,7 +1,6 @@
PORTNAME= axom
DISTVERSIONPREFIX= v
-DISTVERSION= 0.13.0
-PORTREVISION= 3
+DISTVERSION= 0.15.0
CATEGORIES= science
MAINTAINER= yuri@FreeBSD.org
@@ -17,44 +16,41 @@ BROKEN_i386= use of overloaded operator '[]' is ambiguous, see https://github.co
BROKEN_powerpc= use of overloaded operator '[]' is ambiguous, see https://github.com/LLNL/axom/issues/743
LIB_DEPENDS= libconduit.so:science/conduit \
- libgcc_s.so.1:lang/gcc14 \
libhdf5.so:science/hdf5 \
libHYPRE.so:science/hypre \
libmetis.so:math/metis \
+ libopenblas.so:math/openblas \
libsiloh5.so:science/silo
RUN_DEPENDS= sparsehash>0:devel/sparsehash
-USES= cmake:testing,noninja compiler:c++17-lang
+USES= cmake:testing,noninja compiler:c++20-lang
USE_GITHUB= yes
GH_ACCOUNT= LLNL
-GH_TUPLE= LLNL:axom_data:34b0dae:axom_data/../data \
- LLNL:blt:ccd6d31:blt/cmake/blt \
+GH_TUPLE= LLNL:axom_data:8ac544a:axom_data/../data \
+ LLNL:blt:f08f95e:blt/cmake/blt \
LLNL:uberenv:bec05e2:uberenv/../scripts/uberenv
CMAKE_OFF= AXOM_ENABLE_DOCS AXOM_ENABLE_EXAMPLES AXOM_ENABLE_TESTS AXOM_ENABLE_EXAMPLES
CMAKE_ON= BUILD_SHARED_LIBS
-CMAKE_TESTING_ON= AXOM_ENABLE_TESTS AXOM_ENABLE_EXAMPLES
+CMAKE_TESTING_ON= AXOM_ENABLE_TESTS AXOM_ENABLE_EXAMPLES ENABLE_TESTS
CMAKE_TESTING_TARGET= all test
CMAKE_ARGS= -DCONDUIT_DIR=${LOCALBASE} \
-DHDF5_DIR=${LOCALBASE} \
- -DBLT_CXX_STD=c++17 # BLT_CXX_STD=c++17 is required for LLNL/serac
+ -DBLT_CXX_STD=c++20
LDFLAGS+= -lexecinfo
WRKSRC_SUBDIR= src
-CONFLICTS_INSTALL= libfmt # bundles and installs an incompatible libfmt version: https://github.com/LLNL/axom/issues/561, axom headers include fmt unnecessarily
-
OPTIONS_DEFINE= LUA MFEM OPENMP
OPTIONS_SINGLE= MPI
OPTIONS_SINGLE_MPI= NOMPI MPICH OPENMPI
-OPTIONS_DEFAULT= LUA MFEM MPICH #OPENMP LUA,MFEM,MPI are required for LLNL/serac
+OPTIONS_DEFAULT= LUA MFEM MPICH OPENMP # LUA,MFEM,MPICH are required for LLNL/smith
OPTIONS_SUB= yes
-LUA_USES= lua:54
+LUA_USES= lua:53
LUA_CMAKE_ON= -DLUA_DIR=${LUA_BASE} \
- -DFREEBSD_LUA_VER_STR=${LUA_VER_STR} \
-DFREEBSD_LUA_VER=${LUA_VER}
MFEM_DESC= Use mfem - library for finite element methods
@@ -71,12 +67,13 @@ OPENMPI_USES= mpi:openmpi
OPENMPI_CMAKE_ON= -DENABLE_MPI=ON
OPENMP_CMAKE_BOOL= ENABLE_OPENMP
-OPENMP_BROKEN= https://github.com/LLNL/axom/issues/911
+#OPENMP_BROKEN= https://github.com/LLNL/axom/issues/911
post-install: # installs headers of a third party library sparsehash: https://github.com/LLNL/axom/issues/365
@${RM} -r ${STAGEDIR}${PREFIX}/include/sparsehash
-# 2 tests are known to fail, see https://github.com/LLNL/axom/issues/912
-# tests don't run in newer revisions, see https://github.com/LLNL/axom/issues/1492
+# tests as of 0.15.0: 99% tests passed, 2 tests failed out of 374 (slic_macros_parallel,
+# primal_solid_angle are all floating-point-precision-sensitive failures with sub-ULP/tiny
+# tolerance differences, or an MPI message-ordering race in the parallel logging test; not logic errors)
.include <bsd.port.mk>
diff --git a/science/axom/distinfo b/science/axom/distinfo
index c38d3935480e..a4d49fe5a069 100644
--- a/science/axom/distinfo
+++ b/science/axom/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1774907845
-SHA256 (LLNL-axom-v0.13.0_GH0.tar.gz) = f1803ff513fa8ea53a5b96d26073ce0e684638ef55dbf8a564414ee184e29546
-SIZE (LLNL-axom-v0.13.0_GH0.tar.gz) = 17549287
-SHA256 (LLNL-axom_data-34b0dae_GH0.tar.gz) = 03b69ddb78866bbfa091602a53d28e6bdbfb1de955f2bc3c0997f2dc2e6aa120
-SIZE (LLNL-axom_data-34b0dae_GH0.tar.gz) = 48951877
-SHA256 (LLNL-blt-ccd6d31_GH0.tar.gz) = ce61a5acf93e0dc9845c50845b3a88c0807183a3af50f065c808fb53001f65e6
-SIZE (LLNL-blt-ccd6d31_GH0.tar.gz) = 1342913
+TIMESTAMP = 1790871982
+SHA256 (LLNL-axom-v0.15.0_GH0.tar.gz) = deeeb7a4b60303b1b8523d61ba6884d30dea113e56263b12de6395c31250687b
+SIZE (LLNL-axom-v0.15.0_GH0.tar.gz) = 17910431
+SHA256 (LLNL-axom_data-8ac544a_GH0.tar.gz) = ad6b4e3c4ee5d52eb2161fe845bc7ac58035bb809a0ca6e508a0c4b146c7dc46
+SIZE (LLNL-axom_data-8ac544a_GH0.tar.gz) = 52678702
+SHA256 (LLNL-blt-f08f95e_GH0.tar.gz) = db3abd93c8da33ae479af47b06375a1dc87c12f0b3d79fb9d5a365023cc1ccad
+SIZE (LLNL-blt-f08f95e_GH0.tar.gz) = 1343782
SHA256 (LLNL-uberenv-bec05e2_GH0.tar.gz) = 1454e4a7caf5639b46997734544f5285d905b66e195bc5d1389a7b016a9e423f
SIZE (LLNL-uberenv-bec05e2_GH0.tar.gz) = 43471
diff --git a/science/axom/files/patch-cmake_axom-config.cmake.in b/science/axom/files/patch-cmake_axom-config.cmake.in
new file mode 100644
index 000000000000..5a11e3017466
--- /dev/null
+++ b/science/axom/files/patch-cmake_axom-config.cmake.in
@@ -0,0 +1,21 @@
+-- Skip ALIAS targets when stripping nonexistent include dirs from axom's
+-- dependency targets in the exported CMake config, since CMake disallows
+-- set_target_properties() on ALIAS targets (e.g. Kokkos::all_libs, pulled
+-- in transitively when a downstream consumer like science/smith also links
+-- devel/kokkos); without this guard, any downstream project's CMake
+-- configure step fails with "set_target_properties can not be used on an
+-- ALIAS target".
+
+--- cmake/axom-config.cmake.in.orig 2026-10-01 18:57:13 UTC
++++ cmake/axom-config.cmake.in
+@@ -328,6 +328,10 @@ if(NOT AXOM_FOUND)
+
+ foreach(_target ${_deps})
+ if(TARGET ${_target})
++ get_target_property(_is_alias ${_target} ALIASED_TARGET)
++ if(_is_alias)
++ continue()
++ endif()
+ get_target_property(_dirs ${_target} INTERFACE_INCLUDE_DIRECTORIES)
+ set(_existing_dirs)
+ foreach(_dir ${_dirs})
diff --git a/science/axom/files/patch-cmake_blt_cmake_BLTInstallableMacros.cmake b/science/axom/files/patch-cmake_blt_cmake_BLTInstallableMacros.cmake
new file mode 100644
index 000000000000..43fc5a23c5b4
--- /dev/null
+++ b/science/axom/files/patch-cmake_blt_cmake_BLTInstallableMacros.cmake
@@ -0,0 +1,33 @@
+-- Make blt_patch_target() use the INTERFACE keyword (instead of PUBLIC) when
+-- patching real (non-BLT-created) IMPORTED targets, not just INTERFACE_LIBRARY
+-- targets.
+-- Needed because axom's SetupAxomThirdParty.cmake calls
+-- blt_patch_target(NAME mfem DEPENDS_ON mpi) on the "mfem" target that is now a
+-- genuine CMake IMPORTED target exported directly by math/mfem's own
+-- MFEMConfig.cmake (rather than one created via blt_import_library()). CMake
+-- unconditionally rejects any target_link_libraries() keyword other than
+-- INTERFACE for IMPORTED targets, so the unpatched macro aborts configure with:
+-- "IMPORTED library can only be used with the INTERFACE keyword of
+-- target_link_libraries"
+-- See https://github.com/LLNL/axom/issues (no upstream issue number found yet
+-- for this specific BLT/MFEM CMake-config interaction as of axom 0.15.0).
+
+--- cmake/blt/cmake/BLTInstallableMacros.cmake.orig 2026-10-01 16:29:17 UTC
++++ cmake/blt/cmake/BLTInstallableMacros.cmake
+@@ -627,10 +627,14 @@ macro(blt_patch_target)
+ message(FATAL_ERROR "blt_patch_target() NAME argument must be a native CMake target")
+ endif()
+
+- # Default to public scope, unless it's an interface library
++ # Default to public scope, unless it's an interface library.
++ # Real (non-BLT-created) IMPORTED targets also require the INTERFACE
++ # keyword: CMake forbids any other keyword (PUBLIC/PRIVATE) on
++ # target_link_libraries() for IMPORTED targets.
+ set(_scope PUBLIC)
+ get_target_property(_target_type ${arg_NAME} TYPE)
+- if("${_target_type}" STREQUAL "INTERFACE_LIBRARY")
++ get_target_property(_target_imported ${arg_NAME} IMPORTED)
++ if("${_target_type}" STREQUAL "INTERFACE_LIBRARY" OR _target_imported)
+ set(_scope INTERFACE)
+ endif()
+
diff --git a/science/axom/files/patch-cmake_thirdparty_FindLUA.cmake b/science/axom/files/patch-cmake_thirdparty_FindLUA.cmake
new file mode 100644
index 000000000000..80676883c3ed
--- /dev/null
+++ b/science/axom/files/patch-cmake_thirdparty_FindLUA.cmake
@@ -0,0 +1,21 @@
+-- remove vague and wrong code discovering Lua,
+-- in order to find the Lua version that we've set in the port's Makefile
+
+--- cmake/thirdparty/FindLUA.cmake.orig 2026-08-28 22:06:10 UTC
++++ cmake/thirdparty/FindLUA.cmake
+@@ -24,14 +24,7 @@ set(ENV{LUA_DIR} ${LUA_DIR})
+ # Uncomment the following for more debug output in FindLUA
+ #set(LUA_Debug TRUE)
+
+-# HACK: Workaround for lua@5.4 and older versions of cmake (e.g. 3.16)
+-# which did not account for versions of lua beyond 5.3
+-string(FIND ${LUA_DIR} lua-5.4 _is_lua_5_4)
+-if(NOT ${_is_lua_5_4} EQUAL -1)
+- find_package(Lua 5.4 EXACT REQUIRED)
+-else()
+- find_package(Lua REQUIRED)
+-endif()
++find_package(Lua ${FREEBSD_LUA_VER} EXACT REQUIRED)
+
+ if(NOT LUA_FOUND)
+ message(FATAL_ERROR "LUA_DIR is not a path to a valid Lua install")
diff --git a/science/axom/pkg-plist b/science/axom/pkg-plist
index 29971e3b9d5c..bddd06f59658 100644
--- a/science/axom/pkg-plist
+++ b/science/axom/pkg-plist
@@ -1,5 +1,5 @@
bin/convert_sidre_protocol
-bin/data_collection_util
+%%MFEM%%bin/data_collection_util
bin/mesh_converter
bin/mesh_tester
examples/axom/radiuss_tutorial/CMakeLists.txt
@@ -35,6 +35,7 @@ examples/axom/shaping_tutorial/lesson_02/invalid_input.inpt
examples/axom/shaping_tutorial/lesson_02/validated_inlet_metadata.cpp
examples/axom/shaping_tutorial/lesson_03/README.md
examples/axom/shaping_tutorial/lesson_03/cone.svg
+examples/axom/shaping_tutorial/lesson_03/ice_cream.lua
examples/axom/shaping_tutorial/lesson_03/ice_cream.svg
examples/axom/shaping_tutorial/lesson_03/ice_cream.yaml
examples/axom/shaping_tutorial/lesson_03/ice_cream_visit.png
@@ -72,6 +73,7 @@ examples/axom/shaping_tutorial/lesson_04/visit_plot_ice_cream.py
include/axom/CLI11.hpp
include/axom/bump.hpp
include/axom/bump/BlendData.hpp
+include/axom/bump/ComputeMeasure.hpp
include/axom/bump/CoordsetBlender.hpp
include/axom/bump/CoordsetExtents.hpp
include/axom/bump/CoordsetSlicer.hpp
@@ -80,14 +82,17 @@ include/axom/bump/ExtractZonesAndMatsetPolyhedral.hpp
include/axom/bump/ExtrudeMesh.hpp
include/axom/bump/FieldBlender.hpp
include/axom/bump/FieldSlicer.hpp
+include/axom/bump/GenerateQuadratureMesh.hpp
include/axom/bump/HashNaming.hpp
include/axom/bump/IndexingPolicies.hpp
+include/axom/bump/MakeExplicitCoordset.hpp
include/axom/bump/MakePointMesh.hpp
include/axom/bump/MakePolyhedralTopology.hpp
include/axom/bump/MakeUnstructured.hpp
include/axom/bump/MakeZoneCenters.hpp
include/axom/bump/MakeZoneVolumes.hpp
include/axom/bump/MapBasedNaming.hpp
+include/axom/bump/MappedZoneUtilities.hpp
include/axom/bump/MatsetSlicer.hpp
include/axom/bump/MergeCoordsetPoints.hpp
include/axom/bump/MergeMeshes.hpp
@@ -121,12 +126,14 @@ include/axom/bump/extraction/tables/clipping/ClipCases.h
include/axom/bump/extraction/tables/cutting/CutCases.hpp
include/axom/bump/io/save.hpp
include/axom/bump/utilities/blueprint_utilities.hpp
+include/axom/bump/utilities/conduit_array_view.hpp
include/axom/bump/utilities/conduit_memory.hpp
include/axom/bump/utilities/conduit_traits.hpp
include/axom/bump/utilities/utilities.hpp
include/axom/bump/views/BasicIndexing.hpp
include/axom/bump/views/ExplicitCoordsetView.hpp
include/axom/bump/views/MaterialView.hpp
+include/axom/bump/views/MixedFieldView.hpp
include/axom/bump/views/NodeArrayView.hpp
include/axom/bump/views/RectilinearCoordsetView.hpp
include/axom/bump/views/Shapes.hpp
@@ -139,6 +146,7 @@ include/axom/bump/views/UnstructuredTopologyPolyhedralView.hpp
include/axom/bump/views/UnstructuredTopologySingleShapeView.hpp
include/axom/bump/views/dispatch_coordset.hpp
include/axom/bump/views/dispatch_material.hpp
+include/axom/bump/views/dispatch_material_field.hpp
include/axom/bump/views/dispatch_rectilinear_topology.hpp
include/axom/bump/views/dispatch_structured_topology.hpp
include/axom/bump/views/dispatch_topology.hpp
@@ -187,6 +195,7 @@ include/axom/core/execution/runtime_policy.hpp
include/axom/core/execution/scans.hpp
include/axom/core/execution/sorts.hpp
include/axom/core/execution/synchronize.hpp
+include/axom/core/execution/timed_for_all.hpp
include/axom/core/memory_management.hpp
include/axom/core/numerics/Determinants.hpp
include/axom/core/numerics/LU.hpp
@@ -201,16 +210,20 @@ include/axom/core/numerics/matvecops.hpp
include/axom/core/numerics/polynomial_solvers.hpp
include/axom/core/numerics/quadrature.hpp
include/axom/core/numerics/transforms.hpp
+include/axom/core/utilities/Abort.hpp
include/axom/core/utilities/About.hpp
include/axom/core/utilities/Annotations.hpp
include/axom/core/utilities/BitUtilities.hpp
+include/axom/core/utilities/Checksum.hpp
include/axom/core/utilities/CommandLineUtilities.hpp
+include/axom/core/utilities/ConstexprAssert.hpp
include/axom/core/utilities/FileUtilities.hpp
include/axom/core/utilities/RAII.hpp
include/axom/core/utilities/Sorting.hpp
include/axom/core/utilities/StringUtilities.hpp
include/axom/core/utilities/System.hpp
include/axom/core/utilities/Timer.hpp
+include/axom/core/utilities/Units.hpp
include/axom/core/utilities/Utilities.hpp
include/axom/export/bump.h
include/axom/export/core.h
@@ -251,17 +264,19 @@ include/axom/inlet/Inlet.hpp
include/axom/inlet/InletVector.hpp
include/axom/inlet/JSONReader.hpp
include/axom/inlet/JSONSchemaWriter.hpp
-include/axom/inlet/LuaReader.hpp
+%%LUA%%include/axom/inlet/LuaReader.hpp
include/axom/inlet/Proxy.hpp
include/axom/inlet/Reader.hpp
include/axom/inlet/SphinxWriter.hpp
include/axom/inlet/VariantKey.hpp
+include/axom/inlet/VariantValue.hpp
include/axom/inlet/Verifiable.hpp
include/axom/inlet/VerifiableScalar.hpp
include/axom/inlet/Writer.hpp
include/axom/inlet/YAMLReader.hpp
include/axom/inlet/inlet_utils.hpp
include/axom/klee.hpp
+include/axom/klee/AffineMatrixVisitor.hpp
include/axom/klee/Dimensions.hpp
include/axom/klee/Geometry.hpp
include/axom/klee/GeometryOperators.hpp
@@ -352,6 +367,7 @@ include/axom/primal.hpp
include/axom/primal/constants.hpp
include/axom/primal/geometry/BezierCurve.hpp
include/axom/primal/geometry/BezierPatch.hpp
+include/axom/primal/geometry/BezierTriangle.hpp
include/axom/primal/geometry/BoundingBox.hpp
include/axom/primal/geometry/Cone.hpp
include/axom/primal/geometry/CoordinateTransformer.hpp
@@ -376,24 +392,32 @@ include/axom/primal/geometry/Tetrahedron.hpp
include/axom/primal/geometry/Triangle.hpp
include/axom/primal/geometry/Vector.hpp
include/axom/primal/geometry/construct.hpp
+include/axom/primal/geometry/detail/analytic_test_surfaces.hpp
include/axom/primal/operators/clip.hpp
include/axom/primal/operators/closest_point.hpp
include/axom/primal/operators/compute_bounding_box.hpp
include/axom/primal/operators/compute_moments.hpp
+include/axom/primal/operators/curvature.hpp
include/axom/primal/operators/detail/clip_impl.hpp
include/axom/primal/operators/detail/compute_moments_impl.hpp
+include/axom/primal/operators/detail/evaluate_integral_curve_impl.hpp
include/axom/primal/operators/detail/evaluate_integral_impl.hpp
+include/axom/primal/operators/detail/evaluate_integral_surface_impl.hpp
include/axom/primal/operators/detail/fuzzy_comparators.hpp
include/axom/primal/operators/detail/intersect_bezier_impl.hpp
include/axom/primal/operators/detail/intersect_bounding_box_impl.hpp
include/axom/primal/operators/detail/intersect_impl.hpp
include/axom/primal/operators/detail/intersect_patch_impl.hpp
include/axom/primal/operators/detail/intersect_ray_impl.hpp
+include/axom/primal/operators/detail/predicate_determinants.hpp
+include/axom/primal/operators/detail/slice_impl.hpp
include/axom/primal/operators/detail/winding_number_2d_impl.hpp
include/axom/primal/operators/detail/winding_number_2d_memoization.hpp
include/axom/primal/operators/detail/winding_number_3d_impl.hpp
include/axom/primal/operators/detail/winding_number_3d_memoization.hpp
include/axom/primal/operators/evaluate_integral.hpp
+include/axom/primal/operators/evaluate_integral_curve.hpp
+include/axom/primal/operators/evaluate_integral_surface.hpp
include/axom/primal/operators/in_curved_polygon.hpp
include/axom/primal/operators/in_polygon.hpp
include/axom/primal/operators/in_polyhedron.hpp
@@ -402,6 +426,7 @@ include/axom/primal/operators/intersect.hpp
include/axom/primal/operators/intersection_volume.hpp
include/axom/primal/operators/is_convex.hpp
include/axom/primal/operators/orientation.hpp
+include/axom/primal/operators/slice.hpp
include/axom/primal/operators/split.hpp
include/axom/primal/operators/squared_distance.hpp
include/axom/primal/operators/winding_number.hpp
@@ -416,6 +441,8 @@ include/axom/quest/Delaunay.hpp
include/axom/quest/DiscreteShape.hpp
include/axom/quest/Discretize.hpp
include/axom/quest/DistributedClosestPoint.hpp
+include/axom/quest/FastApproximateGWN.hpp
+%%MFEM%%include/axom/quest/GWNMethods.hpp
include/axom/quest/InOutOctree.hpp
include/axom/quest/IntersectionShaper.hpp
include/axom/quest/LinearizeCurves.hpp
@@ -428,6 +455,11 @@ include/axom/quest/ScatteredInterpolation.hpp
include/axom/quest/Shaper.hpp
include/axom/quest/SignedDistance.hpp
include/axom/quest/detail/AllNearestNeighbors_detail.hpp
+include/axom/quest/detail/DelaunayElementFinder.hpp
+include/axom/quest/detail/DelaunayImpl.hpp
+include/axom/quest/detail/DelaunayInsertionHelper.hpp
+include/axom/quest/detail/DelaunayPointLocation.hpp
+include/axom/quest/detail/DelaunayValidation.hpp
include/axom/quest/detail/Discretize_detail.hpp
include/axom/quest/detail/DistributedClosestPointImpl.hpp
include/axom/quest/detail/MarchingCubesImpl.hpp
@@ -444,11 +476,12 @@ include/axom/quest/detail/shaping/InOutSampler.hpp
include/axom/quest/detail/shaping/PrimitiveSampler.hpp
include/axom/quest/detail/shaping/WindingNumberSampler.hpp
include/axom/quest/detail/shaping/shaping_helpers.hpp
+include/axom/quest/detail/shaping/shaping_helpers_blueprint.hpp
+%%MFEM%%include/axom/quest/detail/shaping/shaping_helpers_mfem.hpp
include/axom/quest/interface/inout.hpp
include/axom/quest/interface/internal/QuestHelpers.hpp
-include/axom/quest/interface/internal/mpicomm_wrapper.hpp
include/axom/quest/interface/signed_distance.hpp
-include/axom/quest/io/MFEMReader.hpp
+%%MFEM%%include/axom/quest/io/MFEMReader.hpp
include/axom/quest/io/PProEReader.hpp
include/axom/quest/io/PSTLReader.hpp
include/axom/quest/io/ProEReader.hpp
@@ -463,7 +496,7 @@ include/axom/sidre/core/Buffer.hpp
include/axom/sidre/core/ConduitMemory.hpp
include/axom/sidre/core/DataStore.hpp
include/axom/sidre/core/Group.hpp
-include/axom/sidre/core/MFEMSidreDataCollection.hpp
+%%MFEM%%include/axom/sidre/core/MFEMSidreDataCollection.hpp
include/axom/sidre/core/SidreDataTypeIds.h
include/axom/sidre/core/SidreTypes.hpp
include/axom/sidre/core/View.hpp
@@ -482,6 +515,7 @@ include/axom/sina/core/Record.hpp
include/axom/sina/core/Relationship.hpp
include/axom/sina/core/Run.hpp
include/axom/slam.hpp
+include/axom/slam/Aliases.hpp
include/axom/slam/BitSet.hpp
include/axom/slam/BivariateMap.hpp
include/axom/slam/BivariateSet.hpp
@@ -493,19 +527,24 @@ include/axom/slam/FieldRegistry.hpp
include/axom/slam/IndirectionSet.hpp
include/axom/slam/Map.hpp
include/axom/slam/MapBase.hpp
+include/axom/slam/MapBuilders.hpp
include/axom/slam/ModularInt.hpp
include/axom/slam/NullSet.hpp
include/axom/slam/OrderedSet.hpp
include/axom/slam/ProductSet.hpp
include/axom/slam/RangeSet.hpp
include/axom/slam/Relation.hpp
+include/axom/slam/RelationBuilders.hpp
include/axom/slam/RelationSet.hpp
include/axom/slam/Set.hpp
+include/axom/slam/SetBuilders.hpp
include/axom/slam/StaticRelation.hpp
include/axom/slam/SubMap.hpp
+include/axom/slam/Traits.hpp
include/axom/slam/Utilities.hpp
include/axom/slam/mesh_struct/IA.hpp
include/axom/slam/mesh_struct/IA_impl.hpp
+include/axom/slam/mesh_struct/detail/FacetPairingMap.hpp
include/axom/slam/policies/BivariateSetInterfacePolicies.hpp
include/axom/slam/policies/CardinalityPolicies.hpp
include/axom/slam/policies/IndirectionPolicies.hpp
@@ -517,6 +556,7 @@ include/axom/slam/policies/SetInterfacePolicies.hpp
include/axom/slam/policies/SizePolicies.hpp
include/axom/slam/policies/StridePolicies.hpp
include/axom/slam/policies/SubsettingPolicies.hpp
+include/axom/slam/policies/ValuePolicies.hpp
include/axom/slic.hpp
include/axom/slic/core/LogStream.hpp
include/axom/slic/core/LogStreamStatusMonitor.hpp
@@ -529,8 +569,8 @@ include/axom/slic/internal/stacktrace.hpp
include/axom/slic/streams/GenericOutputStream.hpp
include/axom/slic/streams/LumberjackStream.hpp
include/axom/slic/streams/SynchronizedStream.hpp
-include/axom/sol.hpp
-include/axom/sol_forward.hpp
+%%LUA%%include/axom/sol.hpp
+%%LUA%%include/axom/sol_forward.hpp
include/axom/sparsehash/README
include/axom/sparsehash/dense_hash_map
include/axom/sparsehash/dense_hash_set
@@ -572,6 +612,7 @@ lib/cmake/axom-config.cmake
lib/cmake/axom-targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/axom-targets.cmake
lib/cmake/thirdparty/BLTSetupMPI.cmake
+%%OPENMP%%lib/cmake/thirdparty/BLTSetupOpenMP.cmake
lib/libaxom_bump.so
lib/libaxom_core.so
lib/libaxom_inlet.so
diff --git a/science/spheral/Makefile b/science/spheral/Makefile
index 4219d7e88e44..177d518626ac 100644
--- a/science/spheral/Makefile
+++ b/science/spheral/Makefile
@@ -1,7 +1,7 @@
PORTNAME= spheral
DISTVERSIONPREFIX= v
DISTVERSION= 2026.06.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= science # physics
MAINTAINER= yuri@FreeBSD.org
@@ -71,6 +71,7 @@ CMAKE_ON= SPHERAL_ENABLE_SHARED \
CMAKE_TESTING_ON= SPHERAL_ENABLE_TESTS # tests fail to build, see https://github.com/LLNL/spheral/issues/230
CXXFLAGS+= -I${LOCALBASE}/include/eigen3
+LDFLAGS+= -Wl,--allow-multiple-definition # workaround for the duplicate symbols problem in axom, https://github.com/LLNL/axom/issues/1983
BINARY_ALIAS= git=false python=${PYTHON_CMD} python3=${PYTHON_CMD}