science/axom: Update 0.4.0 -> 0.5.0

Reported by: portscout
freebsd · May 16, 2021 · 09af378 · 09af378
1 parent c77b478
commit 09af378
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 19 deletions.
diff --git a/science/axom/Makefile b/science/axom/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	axom
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.4.0
+DISTVERSION=	0.5.0
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -13,12 +13,12 @@ LIB_DEPENDS=	libconduit.so:science/conduit
 RUN_DEPENDS=	sparsehash>0:devel/sparsehash
 
 USES=		cmake compiler:c++11-lang
-USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	LLNL
-GH_TUPLE=	LLNL:blt:095becb5af6af5c2a2290d2fbcb5246cc01e7345:LLNL_blt/cmake/blt \
-		LLNL:axom_data:c434d0723843b4013a922771ef2cf3cc73fb32d8:LLNL_axom_data/../data
+GH_TUPLE=	LLNL:axom_data:517e53e:axom_data/../data \
+		LLNL:blt:7ec2cb8:blt/cmake/blt \
+		LLNL:uberenv:a121a45:uberenv/scripts/uberenv
 
 CMAKE_OFF=	AXOM_ENABLE_DOCS AXOM_ENABLE_EXAMPLES AXOM_ENABLE_TESTS FREEBSD_ENABLE_EXAMPLES
 CMAKE_ON=	BUILD_SHARED_LIBS
@@ -28,7 +28,15 @@ 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
+
 post-install: # installs headers of a third party library sparsehash: https://github.com/LLNL/axom/issues/365
 	@${RM} -r ${STAGEDIR}${PREFIX}/include/sparsehash
 
+do-test:
+	@cd ${BUILD_WRKSRC} && \
+		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DAXOM_ENABLE_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
+
 .include <bsd.port.mk>
diff --git a/science/axom/distinfo b/science/axom/distinfo
@@ -1,7 +1,9 @@
-TIMESTAMP = 1602186422
-SHA256 (LLNL-axom-v0.4.0_GH0.tar.gz) = a1bde0a278e8b29ad47b78444c5026cb0508278113ec87d4c25965be71d6e92e
-SIZE (LLNL-axom-v0.4.0_GH0.tar.gz) = 11435232
-SHA256 (LLNL-blt-095becb5af6af5c2a2290d2fbcb5246cc01e7345_GH0.tar.gz) = ecf4f3f420a485ddc6e13f617702b016496538dc988b031d29835611ec4f277b
-SIZE (LLNL-blt-095becb5af6af5c2a2290d2fbcb5246cc01e7345_GH0.tar.gz) = 1180812
-SHA256 (LLNL-axom_data-c434d0723843b4013a922771ef2cf3cc73fb32d8_GH0.tar.gz) = 87acbfec82aee5866d5fa405ccf78b3a6857d887ffd8a21461155d5af6bcf9e3
-SIZE (LLNL-axom_data-c434d0723843b4013a922771ef2cf3cc73fb32d8_GH0.tar.gz) = 35980392
+TIMESTAMP = 1621178119
+SHA256 (LLNL-axom-v0.5.0_GH0.tar.gz) = 4a506556355a5024e8932669fac913fb0a8aa855d03cf8345873789e383af2eb
+SIZE (LLNL-axom-v0.5.0_GH0.tar.gz) = 12024819
+SHA256 (LLNL-axom_data-517e53e_GH0.tar.gz) = 10c54db1feb46efbe0b8ce72d2f36aedfc00e1dd9302d532e6a0e2f8ecab1cd8
+SIZE (LLNL-axom_data-517e53e_GH0.tar.gz) = 36265745
+SHA256 (LLNL-blt-7ec2cb8_GH0.tar.gz) = b2e51460154a9b04cc6e396c6e7fbcdc147f0bf802c1368c7e3514e63f8a10a8
+SIZE (LLNL-blt-7ec2cb8_GH0.tar.gz) = 1218321
+SHA256 (LLNL-uberenv-a121a45_GH0.tar.gz) = 325f9bebeb7283db51918bb6a9a0894fb8ceb52b561e83b72b2987ddc08c33ca
+SIZE (LLNL-uberenv-a121a45_GH0.tar.gz) = 19698
diff --git a/science/axom/pkg-plist b/science/axom/pkg-plist
@@ -4,6 +4,7 @@ include/axom/config.hpp
 include/axom/core.hpp
 include/axom/core/Array.hpp
 include/axom/core/Macros.hpp
+include/axom/core/Path.hpp
 include/axom/core/StackArray.hpp
 include/axom/core/Types.hpp
 include/axom/core/execution/execution_space.hpp
@@ -34,13 +35,22 @@ include/axom/core/utilities/nvtx/Macros.hpp
 include/axom/core/utilities/nvtx/Range.hpp
 include/axom/core/utilities/nvtx/interface.hpp
 include/axom/inlet.hpp
-include/axom/inlet/DocWriter.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
+include/axom/inlet/Proxy.hpp
 include/axom/inlet/Reader.hpp
-include/axom/inlet/SchemaCreator.hpp
-include/axom/inlet/SphinxDocWriter.hpp
-include/axom/inlet/Table.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/mint.hpp
 include/axom/mint/config.hpp
@@ -179,7 +189,7 @@ 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/UnitTestLogger.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
@@ -196,20 +206,22 @@ include/axom/spin/RectangularLattice.hpp
 include/axom/spin/SparseOctreeLevel.hpp
 include/axom/spin/SpatialOctree.hpp
 include/axom/spin/UniformGrid.hpp
-include/fmt/LICENSE
+include/fmt/LICENSE.rst
 include/fmt/README
+include/fmt/args.h
 include/fmt/chrono.h
 include/fmt/color.h
+include/fmt/compile.h
 include/fmt/core.h
 include/fmt/fmt.hpp
 include/fmt/format-inl.h
-include/fmt/format.cc
 include/fmt/format.h
 include/fmt/locale.h
+include/fmt/os.h
 include/fmt/ostream.h
+include/fmt/posix.h
 include/fmt/printf.h
 include/fmt/ranges.h
-include/fmt/time.h
 lib/cmake/axom-config-version.cmake
 lib/cmake/axom-config.cmake
 lib/cmake/axom-targets-%%CMAKE_BUILD_TYPE%%.cmake