From nobody Sat Aug 20 16:37:43 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M946b2Vtxz4ZhtF; Sat, 20 Aug 2022 16:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M946b24MSz3TP2; Sat, 20 Aug 2022 16:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661013463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GbarN6rzCOmWbYG9hwHYfTJ6pOoxgaCIFcknHmON5tg=; b=X7IpoNN4vFaGi667FMrH7geUHUFL0cWq7Ht8FH82puE8yAw2VnqVub91/32Jpd3S22tjoN khXRQTSSCnLpDgs155o5q0XBKtbh5QXLxMXFqaE44Iv9X45tRC7dr/u8D0p4ky2ZFD/Ob7 AxxBs23S2Y7IemMM/ktFtnzqLN608n/Jx8nYETIi+ebuFT7imO48E7791U/uEJKXjYsnuR +S1GnUOWeS4KYz8m4oS4OabReFSe1zUHN0s0j3Ouktz8tTwVBSs0IZEY9TyM5oAsxVQiXc TTdohCg7ZvZfuuR01wRpHcvx7oic1z1dsgkjjIpRMJDPmJaMjoV8VEk0bHmy/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M946b0tbRzfB2; Sat, 20 Aug 2022 16:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27KGbhmB008926; Sat, 20 Aug 2022 16:37:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27KGbhJx008925; Sat, 20 Aug 2022 16:37:43 GMT (envelope-from git) Date: Sat, 20 Aug 2022 16:37:43 GMT Message-Id: <202208201637.27KGbhJx008925@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 08cec4b9494e - main - science/h5z-zfp: Update 1.0.1 -> 1.1.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08cec4b9494ea20ba6c8fac8a753b650d1e090e5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661013463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GbarN6rzCOmWbYG9hwHYfTJ6pOoxgaCIFcknHmON5tg=; b=CMoW6IFXV2QFpE8vizJ5wTii+7mnaDrsD0CTKLExhz9p1ZKEo4hC+AgGR2NQ9kXbZzCGik sSYrxX4HwWyzAT3zoBmJ/nd0Xs+H/NZf02sdVmdrFBLhkabCJRVd3hTngJcIrPKx4Ru5De xOoh5mkrs2Kc78rFLXCO26KVPQ83wlKrdWMFG7/1XjQhUiFDRN8eQpiOBff9Zcu6x+131i uq9OG/XlpM9MX3jJD1K6VZbIQrw3hgsDFUhIUgjZaWpem+6kUzZHQ5zMEq4CzXITOWhHGx w1QLlndJmk47/ElxlxTMhg6slglN5Q4vk8k8ppwrcUgobBMnbluMpLLtd60D6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661013463; a=rsa-sha256; cv=none; b=EwWKftWZ5NEbLXGmyY31SqOG6g22xBGc9wBFGm4624Z1qnOYPrmM9NduHynWp6pa2CaXyB hD8G/pWC9cTuZniNBgVy/e9n/7ZOKTn93nq+4RA9Z5+yFVaNqG1njGOF3ptPUnr75wuwvA lTZrRd6jtR9AztGoBAV+UcntYs4pfv0XebhgXTW5HteNBh8RCQ2pIt5IvsnYw69S/6ue4U 07oy4L08FICPjZN5RjwLtirdOayrybAuAdMlqQtEmZw30YD1VPzupScICou0ZPGBCiuaar 3j+Xsfr9t2SkX0+r3okuUOohC883O2nv5xQ/ZpNsFnUB8ANvO9h7d3dABGw16Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=08cec4b9494ea20ba6c8fac8a753b650d1e090e5 commit 08cec4b9494ea20ba6c8fac8a753b650d1e090e5 Author: Yuri Victorovich AuthorDate: 2022-08-20 16:37:04 +0000 Commit: Yuri Victorovich 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 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