diff --git a/science/axom/Makefile b/science/axom/Makefile
index 0d9a1c76c253..70a50525793a 100644
--- a/science/axom/Makefile
+++ b/science/axom/Makefile
@@ -1,69 +1,78 @@
 PORTNAME=	axom
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.1-1671
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g88cac2607
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Infrastructure for development of multi-physics applications and tools
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 BROKEN_armv7=	use of overloaded operator '[]' is ambiguous, see https://github.com/LLNL/axom/issues/743
 BROKEN_i386=	use of overloaded operator '[]' is ambiguous, see https://github.com/LLNL/axom/issues/743
 BROKEN_powerpc=	use of overloaded operator '[]' is ambiguous, see https://github.com/LLNL/axom/issues/743
 
 LIB_DEPENDS=	libconduit.so:science/conduit \
 		libhdf5.so:science/hdf5 \
 		libsiloh5.so:science/silo \
 		libsz.so:science/libaec
 RUN_DEPENDS=	sparsehash>0:devel/sparsehash
 
 USES=		cmake:testing compiler:c++11-lang
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	LLNL
 GH_TUPLE=	LLNL:axom_data:b3d8e6f:axom_data/../data \
 		LLNL:blt:ddd5a0c:blt/cmake/blt \
 		LLNL:uberenv:a121a45: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
 CMAKE_ARGS=	-DCONDUIT_DIR=${LOCALBASE} \
 		-DHDF5_DIR=${LOCALBASE} \
 		-DBLT_CXX_STD=c++14 # BLT_CXX_STD=c++14 is required for LLNL/serac
 
 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 MPI OPENMP
-OPTIONS_DEFAULT=	LUA MFEM MPI #OPENMP     LUA,MFEM,MPI are required for LLNL/serac
+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_SUB=		yes
 
 LUA_USES=		lua:54
 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
 MFEM_CMAKE_ON=		-DMFEM_DIR=${LOCALBASE}
 MFEM_LIB_DEPENDS=	libmfem.so:math/mfem
 
-MPI_CMAKE_BOOL=		ENABLE_MPI
-MPI_BUILD_DEPENDS=	openmpi>0:net/openmpi
-MPI_RUN_DEPENDS=	openmpi>0:net/openmpi
+NOMPI_DESC=		Build without parallel processing support
+NOMPI_BROKEN=		https://github.com/LLNL/axom/issues/913
+
+MPICH_USES=		mpi:mpich
+MPICH_CMAKE_ON=		-DENABLE_MPI=ON
+
+OPENMPI_USES=		mpi:openmopi
+OPENMPI_CMAKE_ON=	-DENABLE_MPI=ON
 
 OPENMP_CMAKE_BOOL=	ENABLE_OPENMP
 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/915
 
 .include <bsd.port.mk>
diff --git a/science/axom/pkg-plist b/science/axom/pkg-plist
index f7c862e272f9..7259d01e6201 100644
--- a/science/axom/pkg-plist
+++ b/science/axom/pkg-plist
@@ -1,325 +1,325 @@
-%%MPI%%bin/convert_sidre_protocol
+%%NO_NOMPI%%bin/convert_sidre_protocol
 %%MFEM%%bin/data_collection_util
 bin/mesh_tester
 include/axom/CLI11.hpp
 include/axom/config.hpp
 include/axom/core.hpp
 include/axom/core/Array.hpp
 include/axom/core/ArrayBase.hpp
 include/axom/core/ArrayIteratorBase.hpp
 include/axom/core/ArrayView.hpp
 include/axom/core/IteratorBase.hpp
 include/axom/core/Macros.hpp
 include/axom/core/Map.hpp
 include/axom/core/Path.hpp
 include/axom/core/StackArray.hpp
 include/axom/core/Types.hpp
 include/axom/core/execution/execution_space.hpp
 include/axom/core/execution/for_all.hpp
 include/axom/core/execution/internal/cuda_exec.hpp
 include/axom/core/execution/internal/hip_exec.hpp
 include/axom/core/execution/internal/omp_exec.hpp
 include/axom/core/execution/internal/seq_exec.hpp
 include/axom/core/execution/synchronize.hpp
 include/axom/core/memory_management.hpp
 include/axom/core/numerics/Determinants.hpp
 include/axom/core/numerics/LU.hpp
 include/axom/core/numerics/Matrix.hpp
 include/axom/core/numerics/eigen_solve.hpp
 include/axom/core/numerics/eigen_sort.hpp
 include/axom/core/numerics/floating_point_limits.hpp
 include/axom/core/numerics/internal/matrix_norms.hpp
 include/axom/core/numerics/jacobi_eigensolve.hpp
 include/axom/core/numerics/linear_solve.hpp
 include/axom/core/numerics/matvecops.hpp
 include/axom/core/numerics/polynomial_solvers.hpp
 include/axom/core/utilities/About.hpp
 include/axom/core/utilities/AnnotationMacros.hpp
 include/axom/core/utilities/BitUtilities.hpp
 include/axom/core/utilities/FileUtilities.hpp
 include/axom/core/utilities/StringUtilities.hpp
 include/axom/core/utilities/System.hpp
 include/axom/core/utilities/Timer.hpp
 include/axom/core/utilities/Utilities.hpp
 include/axom/core/utilities/nvtx/Macros.hpp
 include/axom/core/utilities/nvtx/Range.hpp
 include/axom/core/utilities/nvtx/interface.hpp
 include/axom/fmt.hpp
 include/axom/fmt/LICENSE.rst
 include/axom/fmt/README
 include/axom/fmt/args.h
 include/axom/fmt/chrono.h
 include/axom/fmt/color.h
 include/axom/fmt/compile.h
 include/axom/fmt/compile.h.patch
 include/axom/fmt/core.h
 include/axom/fmt/format-inl.h
 include/axom/fmt/format.h
 include/axom/fmt/locale.h
 include/axom/fmt/os.h
 include/axom/fmt/ostream.h
 include/axom/fmt/printf.h
 include/axom/fmt/ranges.h
 include/axom/inlet.hpp
 include/axom/inlet/ConduitReader.hpp
 include/axom/inlet/Container.hpp
 include/axom/inlet/Field.hpp
 include/axom/inlet/Function.hpp
 include/axom/inlet/Inlet.hpp
 include/axom/inlet/InletVector.hpp
 include/axom/inlet/JSONReader.hpp
 include/axom/inlet/JSONSchemaWriter.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/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/Dimensions.hpp
 include/axom/klee/Geometry.hpp
 include/axom/klee/GeometryOperators.hpp
 include/axom/klee/IO.hpp
 include/axom/klee/KleeError.hpp
 include/axom/klee/Shape.hpp
 include/axom/klee/ShapeSet.hpp
 include/axom/klee/Units.hpp
-%%MPI%%include/axom/lumberjack.hpp
-%%MPI%%include/axom/lumberjack/BinaryTreeCommunicator.hpp
-%%MPI%%include/axom/lumberjack/Combiner.hpp
-%%MPI%%include/axom/lumberjack/Communicator.hpp
-%%MPI%%include/axom/lumberjack/Lumberjack.hpp
-%%MPI%%include/axom/lumberjack/MPIUtility.hpp
-%%MPI%%include/axom/lumberjack/Message.hpp
-%%MPI%%include/axom/lumberjack/RootCommunicator.hpp
-%%MPI%%include/axom/lumberjack/TextEqualityCombiner.hpp
+%%NO_NOMPI%%include/axom/lumberjack.hpp
+%%NO_NOMPI%%include/axom/lumberjack/BinaryTreeCommunicator.hpp
+%%NO_NOMPI%%include/axom/lumberjack/Combiner.hpp
+%%NO_NOMPI%%include/axom/lumberjack/Communicator.hpp
+%%NO_NOMPI%%include/axom/lumberjack/Lumberjack.hpp
+%%NO_NOMPI%%include/axom/lumberjack/MPIUtility.hpp
+%%NO_NOMPI%%include/axom/lumberjack/Message.hpp
+%%NO_NOMPI%%include/axom/lumberjack/RootCommunicator.hpp
+%%NO_NOMPI%%include/axom/lumberjack/TextEqualityCombiner.hpp
 include/axom/mint.hpp
 include/axom/mint/config.hpp
 include/axom/mint/deprecated/MCArray.hpp
 include/axom/mint/deprecated/SidreMCArray.hpp
 include/axom/mint/execution/interface.hpp
 include/axom/mint/execution/internal/for_all_cells.hpp
 include/axom/mint/execution/internal/for_all_faces.hpp
 include/axom/mint/execution/internal/for_all_nodes.hpp
 include/axom/mint/execution/internal/helpers.hpp
 include/axom/mint/execution/internal/structured_exec.hpp
 include/axom/mint/execution/xargs.hpp
 include/axom/mint/fem/FEBasis.hpp
 include/axom/mint/fem/FEBasisTypes.hpp
 include/axom/mint/fem/FiniteElement.hpp
 include/axom/mint/fem/shape_functions/Lagrange.hpp
 include/axom/mint/fem/shape_functions/ShapeFunction.hpp
 include/axom/mint/fem/shape_functions/lagrange/lagrange_hexa_27.hpp
 include/axom/mint/fem/shape_functions/lagrange/lagrange_hexa_8.hpp
 include/axom/mint/fem/shape_functions/lagrange/lagrange_prism_6.hpp
 include/axom/mint/fem/shape_functions/lagrange/lagrange_pyra_5.hpp
 include/axom/mint/fem/shape_functions/lagrange/lagrange_quad_4.hpp
 include/axom/mint/fem/shape_functions/lagrange/lagrange_quad_9.hpp
 include/axom/mint/fem/shape_functions/lagrange/lagrange_tetra_4.hpp
 include/axom/mint/fem/shape_functions/lagrange/lagrange_tri_3.hpp
 include/axom/mint/mesh/CellTypes.hpp
 include/axom/mint/mesh/ConnectivityArray.hpp
 include/axom/mint/mesh/CurvilinearMesh.hpp
 include/axom/mint/mesh/Field.hpp
 include/axom/mint/mesh/FieldAssociation.hpp
 include/axom/mint/mesh/FieldData.hpp
 include/axom/mint/mesh/FieldTypes.hpp
 include/axom/mint/mesh/FieldVariable.hpp
 include/axom/mint/mesh/Mesh.hpp
 include/axom/mint/mesh/MeshCoordinates.hpp
 include/axom/mint/mesh/MeshTypes.hpp
 include/axom/mint/mesh/ParticleMesh.hpp
 include/axom/mint/mesh/RectilinearMesh.hpp
 include/axom/mint/mesh/StructuredMesh.hpp
 include/axom/mint/mesh/UniformMesh.hpp
 include/axom/mint/mesh/UnstructuredMesh.hpp
 include/axom/mint/mesh/blueprint.hpp
 include/axom/mint/mesh/internal/ConnectivityArrayHelpers.hpp
 include/axom/mint/mesh/internal/ConnectivityArray_typed_indirection.hpp
 include/axom/mint/mesh/internal/MeshHelpers.hpp
 include/axom/mint/utils/ExternalArray.hpp
 include/axom/mint/utils/su2_utils.hpp
 include/axom/mint/utils/vtk_utils.hpp
 include/axom/multimat.hpp
 include/axom/multimat/mmfield.hpp
 include/axom/multimat/mmsubfield.hpp
 include/axom/multimat/multimat.hpp
 include/axom/primal.hpp
 include/axom/primal/constants.hpp
 include/axom/primal/geometry/BezierCurve.hpp
 include/axom/primal/geometry/BoundingBox.hpp
 include/axom/primal/geometry/CurvedPolygon.hpp
 include/axom/primal/geometry/NumericArray.hpp
 include/axom/primal/geometry/Octahedron.hpp
 include/axom/primal/geometry/OrientationResult.hpp
 include/axom/primal/geometry/OrientedBoundingBox.hpp
 include/axom/primal/geometry/Plane.hpp
 include/axom/primal/geometry/Point.hpp
 include/axom/primal/geometry/Polygon.hpp
 include/axom/primal/geometry/Polyhedron.hpp
 include/axom/primal/geometry/Ray.hpp
 include/axom/primal/geometry/Segment.hpp
 include/axom/primal/geometry/Sphere.hpp
 include/axom/primal/geometry/Tetrahedron.hpp
 include/axom/primal/geometry/Triangle.hpp
 include/axom/primal/geometry/Vector.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/detail/clip_impl.hpp
 include/axom/primal/operators/detail/compute_moments_impl.hpp
 %%MFEM%%include/axom/primal/operators/detail/evaluate_integral_impl.hpp
 include/axom/primal/operators/detail/in_curved_polygon_impl.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_ray_impl.hpp
 %%MFEM%%include/axom/primal/operators/evaluate_integral.hpp
 include/axom/primal/operators/in_curved_polygon.hpp
 include/axom/primal/operators/in_polygon.hpp
 include/axom/primal/operators/in_sphere.hpp
 include/axom/primal/operators/intersect.hpp
 include/axom/primal/operators/is_convex.hpp
 include/axom/primal/operators/orientation.hpp
 include/axom/primal/operators/split.hpp
 include/axom/primal/operators/squared_distance.hpp
 include/axom/primal/utils/ZipBoundingBox.hpp
 include/axom/primal/utils/ZipIndexable.hpp
 include/axom/primal/utils/ZipPoint.hpp
 include/axom/primal/utils/ZipRay.hpp
 include/axom/primal/utils/ZipVector.hpp
 include/axom/quest.hpp
 include/axom/quest/AllNearestNeighbors.hpp
 include/axom/quest/Delaunay.hpp
 include/axom/quest/Discretize.hpp
-%%MPI%%include/axom/quest/DistributedClosestPoint.hpp
+%%NO_NOMPI%%include/axom/quest/DistributedClosestPoint.hpp
 include/axom/quest/InOutOctree.hpp
 %%MFEM%%include/axom/quest/IntersectionShaper.hpp
 include/axom/quest/MeshTester.hpp
 include/axom/quest/PointInCell.hpp
 %%MFEM%%include/axom/quest/SamplingShaper.hpp
 include/axom/quest/ScatteredInterpolation.hpp
 %%MFEM%%include/axom/quest/Shaper.hpp
 include/axom/quest/SignedDistance.hpp
 include/axom/quest/detail/AllNearestNeighbors_detail.hpp
 include/axom/quest/detail/Discretize_detail.hpp
 include/axom/quest/detail/MeshTester_detail.hpp
 include/axom/quest/detail/PointFinder.hpp
 include/axom/quest/detail/PointInCellMeshWrapper_mfem.hpp
 include/axom/quest/detail/inout/BlockData.hpp
 include/axom/quest/detail/inout/InOutOctreeMeshDumper.hpp
 include/axom/quest/detail/inout/InOutOctreeStats.hpp
 include/axom/quest/detail/inout/InOutOctreeValidator.hpp
 include/axom/quest/detail/inout/MeshWrapper.hpp
 %%MFEM%%include/axom/quest/detail/shaping/shaping_helpers.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
-%%MPI%%include/axom/quest/readers/PSTLReader.hpp
+%%NO_NOMPI%%include/axom/quest/readers/PSTLReader.hpp
 include/axom/quest/readers/STLReader.hpp
 include/axom/sidre.hpp
 include/axom/sidre/core/Array.hpp
 include/axom/sidre/core/AttrValues.hpp
 include/axom/sidre/core/Attribute.hpp
 include/axom/sidre/core/Buffer.hpp
 include/axom/sidre/core/DataStore.hpp
 include/axom/sidre/core/Group.hpp
 include/axom/sidre/core/IndexedCollection.hpp
 include/axom/sidre/core/ItemCollection.hpp
 include/axom/sidre/core/ListCollection.hpp
 %%MFEM%%include/axom/sidre/core/MFEMSidreDataCollection.hpp
 include/axom/sidre/core/MapCollection.hpp
 include/axom/sidre/core/SidreDataTypeIds.h
 include/axom/sidre/core/SidreTypes.hpp
 include/axom/sidre/core/View.hpp
-%%MPI%%include/axom/sidre/spio/IOBaton.hpp
-%%MPI%%include/axom/sidre/spio/IOManager.hpp
+%%NO_NOMPI%%include/axom/sidre/spio/IOBaton.hpp
+%%NO_NOMPI%%include/axom/sidre/spio/IOManager.hpp
 include/axom/slam.hpp
 include/axom/slam/BitSet.hpp
 include/axom/slam/BivariateMap.hpp
 include/axom/slam/BivariateSet.hpp
 include/axom/slam/DynamicConstantRelation.hpp
 include/axom/slam/DynamicMap.hpp
 include/axom/slam/DynamicSet.hpp
 include/axom/slam/DynamicVariableRelation.hpp
 include/axom/slam/FieldRegistry.hpp
 include/axom/slam/IndirectionSet.hpp
 include/axom/slam/Map.hpp
 include/axom/slam/MapBase.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/RelationSet.hpp
 include/axom/slam/Set.hpp
 include/axom/slam/StaticRelation.hpp
 include/axom/slam/SubMap.hpp
 include/axom/slam/Utilities.hpp
 include/axom/slam/mesh_struct/IA.hpp
 include/axom/slam/mesh_struct/IA_impl.hpp
 include/axom/slam/policies/CardinalityPolicies.hpp
 include/axom/slam/policies/IndirectionPolicies.hpp
 include/axom/slam/policies/OffsetPolicies.hpp
 include/axom/slam/policies/PolicyTraits.hpp
 include/axom/slam/policies/SizePolicies.hpp
 include/axom/slam/policies/StridePolicies.hpp
 include/axom/slam/policies/SubsettingPolicies.hpp
 include/axom/slic.hpp
 include/axom/slic/core/LogStream.hpp
 include/axom/slic/core/Logger.hpp
 include/axom/slic/core/MessageLevel.hpp
 include/axom/slic/core/SimpleLogger.hpp
 include/axom/slic/interface/slic.hpp
 include/axom/slic/interface/slic_macros.hpp
 include/axom/slic/internal/stacktrace.hpp
 include/axom/slic/streams/GenericOutputStream.hpp
-%%MPI%%include/axom/slic/streams/LumberjackStream.hpp
-%%MPI%%include/axom/slic/streams/SynchronizedStream.hpp
+%%NO_NOMPI%%include/axom/slic/streams/LumberjackStream.hpp
+%%NO_NOMPI%%include/axom/slic/streams/SynchronizedStream.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
 include/axom/sparsehash/internal/densehashtable.h
 include/axom/sparsehash/internal/hashtable-common.h
 include/axom/sparsehash/internal/libc_allocator_with_realloc.h
 include/axom/sparsehash/internal/sparseconfig.h
 include/axom/sparsehash/internal/sparseconfig.h.patch
 include/axom/sparsehash/internal/sparsehashtable.h
 include/axom/sparsehash/sparse_hash.header_path.patch
 include/axom/sparsehash/sparse_hash_map
 include/axom/sparsehash/sparse_hash_set
 include/axom/sparsehash/sparsetable
 include/axom/sparsehash/template_util.h
 include/axom/sparsehash/type_traits.h
 include/axom/spin.hpp
 include/axom/spin/BVH.hpp
 include/axom/spin/Brood.hpp
 include/axom/spin/DenseOctreeLevel.hpp
 include/axom/spin/ImplicitGrid.hpp
 include/axom/spin/MortonIndex.hpp
 include/axom/spin/OctreeBase.hpp
 include/axom/spin/OctreeLevel.hpp
 include/axom/spin/RectangularLattice.hpp
 include/axom/spin/SparseOctreeLevel.hpp
 include/axom/spin/SpatialOctree.hpp
 include/axom/spin/UniformGrid.hpp
 include/axom/spin/internal/linear_bvh/RadixTree.hpp
 include/axom/spin/internal/linear_bvh/build_radix_tree.hpp
 include/axom/spin/internal/linear_bvh/bvh_traverse.hpp
 include/axom/spin/internal/linear_bvh/bvh_vtkio.hpp
 include/axom/spin/policy/LinearBVH.hpp
 include/axom/spin/policy/UniformGridStorage.hpp
 lib/cmake/axom-config-version.cmake
 lib/cmake/axom-config.cmake
 lib/cmake/axom-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/axom-targets.cmake
 lib/libaxom.so