git: b06a9d2f95c6 - main - science/highfive: Update 2.4.1 -> 2.5.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Fri, 04 Nov 2022 07:35:13 UTC
The branch main has been updated by yuri:

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

commit b06a9d2f95c6c9721c4631e3b3c87b5b572f5288
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-11-04 07:33:36 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-11-04 07:35:08 +0000

    science/highfive: Update 2.4.1 -> 2.5.0
    
    Reported by:    portscout
---
 science/highfive/Makefile                                   |  5 ++---
 science/highfive/distinfo                                   |  6 +++---
 science/highfive/files/patch-CMake_HighFiveTargetDeps.cmake | 13 +++++++++++++
 science/highfive/pkg-plist                                  |  1 -
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/science/highfive/Makefile b/science/highfive/Makefile
index 5fdfd006f074..154ad36cc7a1 100644
--- a/science/highfive/Makefile
+++ b/science/highfive/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	highfive
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.4.1
-PORTREVISION=	1
+DISTVERSION=	2.5.0
 CATEGORIES=	science devel
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -26,7 +25,7 @@ CMAKE_OFF=	HIGHFIVE_USE_BOOST HIGHFIVE_UNIT_TESTS HIGHFIVE_EXAMPLES
 NO_BUILD=	yes
 NO_ARCH=	yes
 
-do-test:
+do-test: # one test fails, see https://github.com/BlueBrain/HighFive/issues/634
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DHIGHFIVE_UNIT_TESTS:BOOL=ON -DHIGHFIVE_USE_BOOST=ON -DHIGHFIVE_USE_EIGEN:BOOL=ON -DHIGHFIVE_USE_XTENSOR=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
diff --git a/science/highfive/distinfo b/science/highfive/distinfo
index 550c9f3c482d..4afadfb4fde8 100644
--- a/science/highfive/distinfo
+++ b/science/highfive/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1652376532
-SHA256 (BlueBrain-HighFive-v2.4.1_GH0.tar.gz) = 6826471ef5c645ebf947d29574b302991525a8a8ff1ef687aba7311d9a0ea36f
-SIZE (BlueBrain-HighFive-v2.4.1_GH0.tar.gz) = 146051
+TIMESTAMP = 1667543124
+SHA256 (BlueBrain-HighFive-v2.5.0_GH0.tar.gz) = 27f55596570df3cc8b878a1681a0d4ba0fe2e3da4a0ef8d436722990d77dc93a
+SIZE (BlueBrain-HighFive-v2.5.0_GH0.tar.gz) = 505297
diff --git a/science/highfive/files/patch-CMake_HighFiveTargetDeps.cmake b/science/highfive/files/patch-CMake_HighFiveTargetDeps.cmake
new file mode 100644
index 000000000000..307f9737c698
--- /dev/null
+++ b/science/highfive/files/patch-CMake_HighFiveTargetDeps.cmake
@@ -0,0 +1,13 @@
+- workaround for https://github.com/BlueBrain/HighFive/issues/633
+
+--- CMake/HighFiveTargetDeps.cmake.orig	2022-11-04 06:45:25 UTC
++++ CMake/HighFiveTargetDeps.cmake
+@@ -8,7 +8,7 @@ if(NOT TARGET libdeps)
+ 
+   # HDF5
+   if(NOT DEFINED HDF5_C_LIBRARIES)
+-    set(HDF5_NO_FIND_PACKAGE_CONFIG_FILE TRUE)  # Consistency
++    #set(HDF5_NO_FIND_PACKAGE_CONFIG_FILE TRUE)  # Consistency
+     set(HDF5_PREFER_PARALLEL ${HIGHFIVE_PARALLEL_HDF5})
+     find_package(HDF5 REQUIRED)
+   endif()
diff --git a/science/highfive/pkg-plist b/science/highfive/pkg-plist
index 4adb61f21d6b..86aa2fd58abc 100644
--- a/science/highfive/pkg-plist
+++ b/science/highfive/pkg-plist
@@ -16,7 +16,6 @@ include/highfive/H5Version.hpp
 include/highfive/bits/H5Annotate_traits.hpp
 include/highfive/bits/H5Annotate_traits_misc.hpp
 include/highfive/bits/H5Attribute_misc.hpp
-include/highfive/bits/H5ConverterEigen_misc.hpp
 include/highfive/bits/H5Converter_misc.hpp
 include/highfive/bits/H5DataSet_misc.hpp
 include/highfive/bits/H5DataType_misc.hpp