git: c48d8c2fadd0 - main - science/rmf: Update 1.1 -> 1.2

Yuri Victorovich yuri at FreeBSD.org
Wed Apr 21 08:32:15 UTC 2021 

The branch main has been updated by yuri:

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

commit c48d8c2fadd0859608274d869384ad2f7a0ac973
Author:     Yuri Victorovich <yuri at FreeBSD.org>
AuthorDate: 2021-04-21 08:30:55 +0000
Commit:     Yuri Victorovich <yuri at FreeBSD.org>
CommitDate: 2021-04-21 08:32:09 +0000

    science/rmf: Update 1.1 -> 1.2
---
 science/rmf/Makefile                         | 15 +++++++++++----
 science/rmf/distinfo                         |  6 +++---
 science/rmf/files/patch-CMakeLists.txt       | 23 ++++++++++++-----------
 science/rmf/files/patch-src-hdf5_wrapper.cpp | 10 +++++-----
 science/rmf/pkg-plist                        |  2 ++
 5 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/science/rmf/Makefile b/science/rmf/Makefile
index 431a4b74a912..c76e625087b2 100644
--- a/science/rmf/Makefile
+++ b/science/rmf/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	rmf
-DISTVERSION=	1.1
-PORTREVISION=	8
+DISTVERSION=	1.2
 CATEGORIES=	science graphics
 
 MAINTAINER=	yuri at FreeBSD.org
@@ -14,12 +13,20 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libsz.so:science/szip
 
 USES=		compiler:c++11-lang cmake python:build shebangfix
+USE_LDCONFIG=	yes
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	salilab
-GH_TAGNAME=	f917cf2
+
 SHEBANG_GLOB=	*.py
-USE_LDCONFIG=	yes
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
+do-test:
+	@${RM} ${WRKSRC}/test/*.py
+	@cd ${BUILD_WRKSRC} && \
+		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DFREEBSD_BUILS_WITH_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/rmf/distinfo b/science/rmf/distinfo
index b71e79ddbf9f..f595de328afd 100644
--- a/science/rmf/distinfo
+++ b/science/rmf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535650020
-SHA256 (salilab-rmf-1.1-f917cf2_GH0.tar.gz) = 9c877539b8c7a6af38b3d7155522a90b16b3e28596ec27ac941c7f812f1a1c6f
-SIZE (salilab-rmf-1.1-f917cf2_GH0.tar.gz) = 15087905
+TIMESTAMP = 1618991588
+SHA256 (salilab-rmf-1.2_GH0.tar.gz) = 72ee7c8083f1c1f089fda239b4e94297252149aafefdd71736ede04e00267420
+SIZE (salilab-rmf-1.2_GH0.tar.gz) = 15090975
diff --git a/science/rmf/files/patch-CMakeLists.txt b/science/rmf/files/patch-CMakeLists.txt
index 6df7a51d65e3..71804333cac4 100644
--- a/science/rmf/files/patch-CMakeLists.txt
+++ b/science/rmf/files/patch-CMakeLists.txt
@@ -1,10 +1,10 @@
---- CMakeLists.txt.orig	2018-06-15 00:56:51 UTC
+--- CMakeLists.txt.orig	2021-04-19 19:25:22 UTC
 +++ CMakeLists.txt
-@@ -4,15 +4,15 @@ project(RMF)
- # needs to be in main CMakeLists.txt
- enable_testing()
+@@ -18,15 +18,15 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_S
+ include(cmake_modules/IMPFindPython.cmake)
+ imp_find_python()
  
--execute_process(COMMAND python setup_git.py
+-execute_process(COMMAND ${PYTHON_EXECUTABLE} setup_git.py
 -                  RESULT_VARIABLE setup
 -                  OUTPUT_VARIABLE toutput
 -                  ERROR_VARIABLE error
@@ -13,7 +13,7 @@
 -if(NOT ${setup} EQUAL 0)
 -   message(FATAL_ERROR " Failed to run setup_git.py: ${setup}; ${error}")
 -endif()
-+#execute_process(COMMAND python setup_git.py
++#execute_process(COMMAND ${PYTHON_EXECUTABLE} setup_git.py
 +#                  RESULT_VARIABLE setup
 +#                  OUTPUT_VARIABLE toutput
 +#                  ERROR_VARIABLE error
@@ -23,20 +23,21 @@
 +#   message(FATAL_ERROR " Failed to run setup_git.py: ${setup}; ${error}")
 +#endif()
  
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake_modules)
- 
-@@ -140,12 +140,12 @@ else()
+ # Don't deref quoted variables in if()
+ if(POLICY CMP0054)
+@@ -168,12 +168,14 @@ else()
  endif()
  
  
 -add_subdirectory(swig)
 +#add_subdirectory(swig)
  
--add_subdirectory(test)
++if (FREEBSD_BUILS_WITH_TESTS)
+ add_subdirectory(test)
 -add_subdirectory(examples)
 -add_subdirectory(benchmark)
 -add_subdirectory(doc)
-+#add_subdirectory(test)
++endif()
 +#add_subdirectory(examples)
 +#add_subdirectory(benchmark)
 +#add_subdirectory(doc)
diff --git a/science/rmf/files/patch-src-hdf5_wrapper.cpp b/science/rmf/files/patch-src-hdf5_wrapper.cpp
index 0b784ecb1081..b923de1888ac 100644
--- a/science/rmf/files/patch-src-hdf5_wrapper.cpp
+++ b/science/rmf/files/patch-src-hdf5_wrapper.cpp
@@ -1,9 +1,9 @@
---- src/hdf5_wrapper.cpp.orig	2019-10-16 16:05:15 UTC
+--- src/hdf5_wrapper.cpp.orig	2021-04-19 19:25:22 UTC
 +++ src/hdf5_wrapper.cpp
-@@ -138,7 +138,7 @@ hid_t get_parameters() {
-   RMF_HDF5_CALL(H5Pset_cache(plist, 0, 10000, 10000000, 0.0));
- #if defined(H5_VERS_MAJOR) && H5_VERS_MAJOR >= 1 && H5_VERS_MINOR >= 8 && \
-     H5_VERS_RELEASE >= 6
+@@ -150,7 +150,7 @@ hid_t get_parameters() {
+   RMF_HDF5_CALL(H5Pset_libver_bounds(plist, H5F_LIBVER_V18, H5F_LIBVER_LATEST));
+ #elif defined(H5_VERS_MAJOR) && \
+     H5_VERS_MAJOR == 1 && H5_VERS_MINOR == 8 && H5_VERS_RELEASE >= 6
 -  RMF_HDF5_CALL(H5Pset_libver_bounds(plist, H5F_LIBVER_18, H5F_LIBVER_LATEST));
 +  RMF_HDF5_CALL(H5Pset_libver_bounds(plist, H5F_LIBVER_V18, H5F_LIBVER_LATEST));
  #endif
diff --git a/science/rmf/pkg-plist b/science/rmf/pkg-plist
index b7db19bfa0ea..e07f57114647 100644
--- a/science/rmf/pkg-plist
+++ b/science/rmf/pkg-plist
@@ -11,6 +11,7 @@ bin/rmf_transform
 bin/rmf_update
 bin/rmf_validate
 bin/rmf_xml
+include/RMF.h
 include/RMF/BufferConstHandle.h
 include/RMF/BufferHandle.h
 include/RMF/CoordinateTransformer.h
@@ -60,6 +61,7 @@ include/RMF/decorator/reference.h
 include/RMF/decorator/representation.h
 include/RMF/decorator/sequence.h
 include/RMF/decorator/shape.h
+include/RMF/decorator/uncertainty.h
 include/RMF/decorators.h
 include/RMF/enums.h
 include/RMF/exceptions.h

More information about the dev-commits-ports-all mailing list