git: 08cec4b9494e - main - science/h5z-zfp: Update 1.0.1 -> 1.1.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Sat, 20 Aug 2022 16:37:43 UTC
The branch main has been updated by yuri:

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

commit 08cec4b9494ea20ba6c8fac8a753b650d1e090e5
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-08-20 16:37:04 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-08-20 16:37:39 +0000

    science/h5z-zfp: Update 1.0.1 -> 1.1.0
    
    Reported by:    portscout
---
 science/h5z-zfp/Makefile                       | 23 ++++-----------
 science/h5z-zfp/distinfo                       |  6 ++--
 science/h5z-zfp/files/patch-src_CMakeLists.txt | 13 ++++++++
 science/h5z-zfp/files/patch-src_Makefile       | 41 --------------------------
 science/h5z-zfp/pkg-plist                      |  8 +++++
 5 files changed, 30 insertions(+), 61 deletions(-)

diff --git a/science/h5z-zfp/Makefile b/science/h5z-zfp/Makefile
index 5f6af11e3fda..a33716192436 100644
--- a/science/h5z-zfp/Makefile
+++ b/science/h5z-zfp/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	h5z-zfp
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.0.1
-PORTREVISION=	1
+DISTVERSION=	1.1.0
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -10,28 +9,18 @@ COMMENT=	Registered ZFP compression plugin for HDF5
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libzfp.so:devel/zfp
 
-USES=		gmake localbase
+USES=		cmake fortran localbase
+USE_LDCONFIG=	yes
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	LLNL
 GH_PROJECT=	${PORTNAME:tu}
-USE_LDCONFIG=	yes
-
-MAKE_ARGS=	SHELL=${LOCALBASE}/bin/bash \
-		HDF5_HOME=${STAGEDIR}${LOCALBASE} HDF5_LIB=${LOCALBASE}/lib \
-		ZFP_HOME=${STAGEDIR}${LOCALBASE} ZFP_LIB=${LOCALBASE}/lib \
-		PREPATH=-Wl,-rpath= SOEXT=so SHFLAG=-shared
 
-CFLAGS+=	-fPIC
+OPTIONS_DEFINE=		FORTRAN
 
-PLIST_FILES=	include/H5Zzfp.h \
-		include/H5Zzfp_lib.h \
-		include/H5Zzfp_plugin.h \
-		include/H5Zzfp_props.h \
-		lib/libh5zzfp.so \
-		plugin/libh5zzfp.so
+FORTRAN_CMAKE_BOOL=	FORTRAN_INTERFACE
 
 .include <bsd.port.mk>
diff --git a/science/h5z-zfp/distinfo b/science/h5z-zfp/distinfo
index d34a08d2eb3e..b4b4a5d4d6c7 100644
--- a/science/h5z-zfp/distinfo
+++ b/science/h5z-zfp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561883087
-SHA256 (LLNL-H5Z-ZFP-v1.0.1_GH0.tar.gz) = b9ed91dab8e2ef82dc6706b4242c807fb352875e3b21c217dd00782dd1a22b24
-SIZE (LLNL-H5Z-ZFP-v1.0.1_GH0.tar.gz) = 141731
+TIMESTAMP = 1661011697
+SHA256 (LLNL-H5Z-ZFP-v1.1.0_GH0.tar.gz) = 48a81e69d1f3b61d9a1eb07e868164fadf3b88690ec930efd849f5889681a893
+SIZE (LLNL-H5Z-ZFP-v1.1.0_GH0.tar.gz) = 169122
diff --git a/science/h5z-zfp/files/patch-src_CMakeLists.txt b/science/h5z-zfp/files/patch-src_CMakeLists.txt
new file mode 100644
index 000000000000..7a04c401f946
--- /dev/null
+++ b/science/h5z-zfp/files/patch-src_CMakeLists.txt
@@ -0,0 +1,13 @@
+--- src/CMakeLists.txt.orig	2022-08-20 16:23:47 UTC
++++ src/CMakeLists.txt
+@@ -46,8 +46,8 @@ target_include_directories(h5z_zfp_shared
+ target_link_libraries(h5z_zfp_shared PUBLIC zfp::zfp ${HDF5_LIBRARIES})
+ set_target_properties(h5z_zfp_shared PROPERTIES OUTPUT_NAME h5zzfp)
+ install(TARGETS h5z_zfp_shared
+-  ARCHIVE DESTINATION plugin
+-  LIBRARY DESTINATION plugin)
++  ARCHIVE DESTINATION lib
++  LIBRARY DESTINATION lib)
+ 
+ #------------------------------------------------------------------------------#
+ # Install header and module files.
diff --git a/science/h5z-zfp/files/patch-src_Makefile b/science/h5z-zfp/files/patch-src_Makefile
deleted file mode 100644
index 99ecaf1ac20b..000000000000
--- a/science/h5z-zfp/files/patch-src_Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/Makefile.orig	2019-06-28 08:23:01 UTC
-+++ src/Makefile
-@@ -30,21 +30,21 @@ H5Zzfp_props_f.o H5Zzfp_props_f.mod: H5Zzfp_props_f.F9
- 	$(FC) -c $< -o $@ $(FCFLAGS) -I$(H5Z_ZFP_BASE) -I$(ZFP_INC) -I$(HDF5_INC)
- 
- # The filter member of the filter library
--libh5zzfp.a(H5Zzfp_lib.o): H5Zzfp_lib.o
--	$(AR) cr libh5zzfp.a $<
-+libh5zzfp-s.$(SOEXT)(H5Zzfp_lib.o): H5Zzfp_lib.o
-+	$(CC) -shared -o libh5zzfp-s.$(SOEXT) $<
- 
- # The C properties interface member of the filter library
--libh5zzfp.a(H5Zzfp_props.o): H5Zzfp_props.o
--	$(AR) cr libh5zzfp.a $<
-+libh5zzfp-s.$(SOEXT)(H5Zzfp_props.o): H5Zzfp_props.o
-+	$(CC) -shared -o libh5zzfp-s.$(SOEXT) $<
- 
- # The Fortran properties interface member of the filter library
--libh5zzfp.a(H5Zzfp_props_f.o): H5Zzfp_props_f.o
--	$(AR) cr libh5zzfp.a $<
-+libh5zzfp-s.$(SOEXT)(H5Zzfp_props_f.o): H5Zzfp_props_f.o
-+	$(CC) -shared -o libh5zzfp-s.$(SOEXT) $<
- 
- # Alias target for filter library, conditionally includes Fortran
--LIBOBJ = libh5zzfp.a(H5Zzfp_lib.o) libh5zzfp.a(H5Zzfp_props.o)
-+LIBOBJ = libh5zzfp-s.$(SOEXT)(H5Zzfp_lib.o) libh5zzfp-s.$(SOEXT)(H5Zzfp_props.o)
- ifneq ($(FC),)
--LIBOBJ += libh5zzfp.a(H5Zzfp_props_f.o)
-+LIBOBJ += libh5zzfp-s.$(SOEXT)(H5Zzfp_props_f.o)
- endif
- lib: $(LIBOBJ)
- 
-@@ -54,7 +54,7 @@ install: all
- 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/{plugin,include,lib}
- 	echo $(MAKEVARS) > $(DESTDIR)$(PREFIX)/include/make.vars.inc
- 	$(INSTALL) plugin/libh5zzfp.$(SOEXT) $(DESTDIR)$(PREFIX)/plugin
--	$(INSTALL) libh5zzfp.a $(DESTDIR)$(PREFIX)/lib
-+	$(INSTALL) libh5zzfp-s.$(SOEXT) $(DESTDIR)$(PREFIX)/lib/libh5zzfp.so
- 	$(INSTALL) -m 644 H5Zzfp.h H5Zzfp_lib.h H5Zzfp_plugin.h H5Zzfp_props.h $(DESTDIR)$(PREFIX)/include
- ifneq ($(FC),)
- 	$(INSTALL) -m 644 *.[mM][oO][dD] $(DESTDIR)$(PREFIX)/include
diff --git a/science/h5z-zfp/pkg-plist b/science/h5z-zfp/pkg-plist
new file mode 100644
index 000000000000..276785d2e9be
--- /dev/null
+++ b/science/h5z-zfp/pkg-plist
@@ -0,0 +1,8 @@
+include/H5Zzfp.h
+include/H5Zzfp_lib.h
+include/H5Zzfp_plugin.h
+include/H5Zzfp_props.h
+lib/cmake/h5z_zfp/h5z_zfp-config-version.cmake
+lib/cmake/h5z_zfp/h5z_zfp-config.cmake
+lib/libh5zzfp.a
+lib/libh5zzfp.so