summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/hdf5-c++/Makefile3
-rw-r--r--devel/hdf5/Makefile.common7
-rw-r--r--devel/hdf5/PLIST7
-rw-r--r--devel/hdf5/buildlink3.mk4
-rw-r--r--devel/hdf5/distinfo22
-rw-r--r--devel/hdf5/patches/patch-c++_examples_Makefile.in17
-rw-r--r--devel/hdf5/patches/patch-c++_examples_run-c++-ex.sh.in15
-rw-r--r--devel/hdf5/patches/patch-examples_Makefile.in17
-rw-r--r--devel/hdf5/patches/patch-examples_run-c-ex.sh.in15
-rw-r--r--devel/hdf5/patches/patch-hl_c++_examples_Makefile.in17
-rw-r--r--devel/hdf5/patches/patch-hl_c++_examples_run-hlc++-ex.sh.in15
-rw-r--r--devel/hdf5/patches/patch-hl_examples_Makefile.in17
-rw-r--r--devel/hdf5/patches/patch-hl_examples_run-hlc-ex.sh.in15
-rw-r--r--devel/hdf5/patches/patch-src_H5private.h17
-rw-r--r--devel/hdf5/patches/patch-tools_test_h5jam_testh5jam.sh.in18
-rw-r--r--devel/hdf5/patches/patch-tools_test_h5repack_h5repack.sh.in10
16 files changed, 24 insertions, 192 deletions
diff --git a/devel/hdf5-c++/Makefile b/devel/hdf5-c++/Makefile
index 83202a33f67..d2abc1f9422 100644
--- a/devel/hdf5-c++/Makefile
+++ b/devel/hdf5-c++/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2020/03/14 23:09:48 bacon Exp $
+# $NetBSD: Makefile,v 1.8 2021/06/07 11:52:48 adam Exp $
PKGNAME= ${DISTNAME:S/-/-c++-/}
-PKGREVISION= 1
COMMENT= Hierarchical Data Format (new generation) - C++ wrappers
USE_LANGUAGES= c c++
diff --git a/devel/hdf5/Makefile.common b/devel/hdf5/Makefile.common
index b894be154b6..4c3def14e60 100644
--- a/devel/hdf5/Makefile.common
+++ b/devel/hdf5/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.21 2020/03/17 22:29:34 rillig Exp $
+# $NetBSD: Makefile.common,v 1.22 2021/06/07 11:52:48 adam Exp $
# used by devel/hdf5/Makefile
# used by devel/hdf5-c++/Makefile
-DISTNAME= hdf5-1.10.6
+DISTNAME= hdf5-1.10.7
CATEGORIES= devel
-MASTER_SITES= https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-${PKGVERSION_NOREV}/src/
+MASTER_SITES= https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${PKGVERSION_NOREV:R}/hdf5-${PKGVERSION_NOREV}/src/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -14,6 +14,7 @@ LICENSE= original-bsd
USE_LIBTOOL= yes
USE_TOOLS+= pax tr
GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --with-examplesdir=${PREFIX}/share/examples/hdf5
TEST_TARGET= check
CFLAGS.SunOS+= -std=c99 -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
diff --git a/devel/hdf5/PLIST b/devel/hdf5/PLIST
index 4885197fee1..b58bf7f007a 100644
--- a/devel/hdf5/PLIST
+++ b/devel/hdf5/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2020/01/08 12:30:34 nia Exp $
+@comment $NetBSD: PLIST,v 1.29 2021/06/07 11:52:48 adam Exp $
bin/gif2h5
bin/h52gif
bin/h5cc
@@ -19,6 +19,8 @@ bin/h5repart
bin/h5stat
bin/h5unjam
bin/h5watch
+bin/mirror_server
+bin/mirror_server_stop
include/H5ACpublic.h
include/H5Apublic.h
include/H5Cpublic.h
@@ -32,12 +34,14 @@ include/H5FDdirect.h
include/H5FDfamily.h
include/H5FDhdfs.h
include/H5FDlog.h
+include/H5FDmirror.h
include/H5FDmpi.h
include/H5FDmpio.h
include/H5FDmulti.h
include/H5FDpublic.h
include/H5FDros3.h
include/H5FDsec2.h
+include/H5FDsplitter.h
include/H5FDstdio.h
include/H5FDwindows.h
include/H5Fpublic.h
@@ -84,6 +88,7 @@ share/examples/hdf5/c/h5_crtdat.c
share/examples/hdf5/c/h5_crtgrp.c
share/examples/hdf5/c/h5_crtgrpar.c
share/examples/hdf5/c/h5_crtgrpd.c
+share/examples/hdf5/c/h5_debug_trace.c
share/examples/hdf5/c/h5_drivers.c
share/examples/hdf5/c/h5_elink_unix2win.c
share/examples/hdf5/c/h5_extend.c
diff --git a/devel/hdf5/buildlink3.mk b/devel/hdf5/buildlink3.mk
index 97d88522962..218086fc984 100644
--- a/devel/hdf5/buildlink3.mk
+++ b/devel/hdf5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2019/05/01 22:39:29 bacon Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2021/06/07 11:52:48 adam Exp $
BUILDLINK_TREE+= hdf5
@@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.hdf5?= ../../devel/hdf5
pkgbase := hdf5
.include "../../mk/pkg-build-options.mk"
-.if !empty(PKG_BUILD_OPTIONS.hdf5:Mszip)
+.if ${PKG_BUILD_OPTIONS.hdf5:Mszip}
.include "../../archivers/libaec/buildlink3.mk"
.endif
diff --git a/devel/hdf5/distinfo b/devel/hdf5/distinfo
index 04d4c71c52d..cc093725b66 100644
--- a/devel/hdf5/distinfo
+++ b/devel/hdf5/distinfo
@@ -1,18 +1,8 @@
-$NetBSD: distinfo,v 1.44 2020/01/08 12:30:34 nia Exp $
+$NetBSD: distinfo,v 1.45 2021/06/07 11:52:48 adam Exp $
-SHA1 (hdf5-1.10.6.tar.bz2) = 5e11d91abe071858b0d9a4f3a202c1e6a0d27290
-RMD160 (hdf5-1.10.6.tar.bz2) = c31216cd83187e69509fa36c6ae7015cee331ea1
-SHA512 (hdf5-1.10.6.tar.bz2) = 821392718605e3f7a287d4729d022a55fd7b91ddaa2e9a3f35ab8fce3d3d4871a0cc88215be3052887cbac3615cc8953569c7f131217962103c98151c0ab58d4
-Size (hdf5-1.10.6.tar.bz2) = 8813699 bytes
-SHA1 (patch-c++_examples_Makefile.in) = 2b62c0b30258fcce5e22b5932bd400ca5897e0c3
-SHA1 (patch-c++_examples_run-c++-ex.sh.in) = 2575d749930773fbe58dd1394cc451ad88fd4ed3
+SHA1 (hdf5-1.10.7.tar.bz2) = 125b2dacb4fdac33f7bfbc7dfdeeb000ff68466b
+RMD160 (hdf5-1.10.7.tar.bz2) = 6da25b3aee83ad2aba421ac7b7026aa1f8c1d38f
+SHA512 (hdf5-1.10.7.tar.bz2) = bfbd045ea5d7940ac1d0f9aef964dad2e9f22d78b49c90668021106259c9612352fbcb4e89085a7fa189f58142ef83a363c6220ea89aa0d57bdfed245df0ab57
+Size (hdf5-1.10.7.tar.bz2) = 8957844 bytes
SHA1 (patch-configure) = e7f141d54c39cbee2f7d703ab7d6ff582158904e
-SHA1 (patch-examples_Makefile.in) = af9cf68a50544312a759b7732aea9297a6881582
-SHA1 (patch-examples_run-c-ex.sh.in) = bafcd2157606858a2fa1bc6aaf0dee74a44ee640
-SHA1 (patch-hl_c++_examples_Makefile.in) = a65d0461a6e1ac464e089703f9f5ab6c1dcf1666
-SHA1 (patch-hl_c++_examples_run-hlc++-ex.sh.in) = 166d7c570e93948e68308d9e0584df8d19bdfec9
-SHA1 (patch-hl_examples_Makefile.in) = df3650c121152471a045e1fec169eedeea757377
-SHA1 (patch-hl_examples_run-hlc-ex.sh.in) = 43bf6c28fb667f3ae39145be08e0a3a75f370b47
-SHA1 (patch-src_H5private.h) = dbf7e44248b653274fbe1e0f7429d723107c6cdd
-SHA1 (patch-tools_test_h5jam_testh5jam.sh.in) = 17c93dcd36556667383d8def13450a09b75d5623
-SHA1 (patch-tools_test_h5repack_h5repack.sh.in) = 03bfd89a55f618fcc7719ff0bb122419f562f598
+SHA1 (patch-tools_test_h5repack_h5repack.sh.in) = b31bef7a47e15647fa6090cf1590c9dbb606d8e6
diff --git a/devel/hdf5/patches/patch-c++_examples_Makefile.in b/devel/hdf5/patches/patch-c++_examples_Makefile.in
deleted file mode 100644
index 170004baa6f..00000000000
--- a/devel/hdf5/patches/patch-c++_examples_Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-c++_examples_Makefile.in,v 1.4 2016/10/09 18:44:35 alnsn Exp $
-
-Fix paths to examples.
-
---- c++/examples/Makefile.in.orig 2016-05-10 21:24:51.000000000 +0000
-+++ c++/examples/Makefile.in
-@@ -626,8 +626,8 @@ CXX_API = yes
-
- # Where to install examples
- # Note: no '/' after DESTDIR. Explanation in commence.am
--EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/c++
--EXAMPLETOPDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples
-+EXAMPLEDIR = ${DESTDIR}$(datarootdir)/examples/hdf5/c++
-+EXAMPLETOPDIR = ${DESTDIR}$(datarootdir)/examples/hdf5
-
- # Assume that all tests in this directory are examples, and tell
- # conclude.am when to build them.
diff --git a/devel/hdf5/patches/patch-c++_examples_run-c++-ex.sh.in b/devel/hdf5/patches/patch-c++_examples_run-c++-ex.sh.in
deleted file mode 100644
index cec5b6c33d0..00000000000
--- a/devel/hdf5/patches/patch-c++_examples_run-c++-ex.sh.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-c++_examples_run-c++-ex.sh.in,v 1.4 2017/11/15 20:28:27 minskim Exp $
-
-Fix paths to examples.
-
---- c++/examples/run-c++-ex.sh.in.orig 2016-04-26 12:44:06.000000000 +0000
-+++ c++/examples/run-c++-ex.sh.in
-@@ -20,7 +20,7 @@
- # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
- # #
- # This script will compile and run the c++ examples from source files #
--# installed in .../share/hdf5_examples/c++ using h5c++. The #
-+# installed in .../share/examples/hdf5/c++ using h5c++. The #
- # order for running programs with RunTest in the MAIN section below is taken #
- # from the Makefile. The order is important since some of the test programs #
- # use data files created by earlier test programs. Any future additions should #
diff --git a/devel/hdf5/patches/patch-examples_Makefile.in b/devel/hdf5/patches/patch-examples_Makefile.in
deleted file mode 100644
index 8779d762c3e..00000000000
--- a/devel/hdf5/patches/patch-examples_Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-examples_Makefile.in,v 1.4 2016/10/09 18:44:35 alnsn Exp $
-
-Fix paths to examples.
-
---- examples/Makefile.in.orig 2016-05-10 21:24:51.000000000 +0000
-+++ examples/Makefile.in
-@@ -636,8 +636,8 @@ EXTLINK_DIRS = red blue u2w
-
- # Example directory
- # Note: no '/' after DESTDIR. Explanation in commence.am
--EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/c
--EXAMPLETOPDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples
-+EXAMPLEDIR = ${DESTDIR}$(datarootdir)/examples/hdf5/c
-+EXAMPLETOPDIR = ${DESTDIR}$(datarootdir)/examples/hdf5
- @BUILD_SHARED_SZIP_CONDITIONAL_TRUE@LD_LIBRARY_PATH = $(LL_PATH)
-
- # Assume that all tests in this directory are examples, and tell
diff --git a/devel/hdf5/patches/patch-examples_run-c-ex.sh.in b/devel/hdf5/patches/patch-examples_run-c-ex.sh.in
deleted file mode 100644
index b37adb1f278..00000000000
--- a/devel/hdf5/patches/patch-examples_run-c-ex.sh.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-examples_run-c-ex.sh.in,v 1.4 2017/11/15 20:28:27 minskim Exp $
-
-Fix path to examples.
-
---- examples/run-c-ex.sh.in.orig 2016-04-26 12:44:10.000000000 +0000
-+++ examples/run-c-ex.sh.in
-@@ -20,7 +20,7 @@
- # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
- # #
- # This script will compile and run the c examples from source files installed #
--# in .../share/hdf5_examples/c using h5cc or h5pc. The order for running #
-+# in .../share/examples/hdf5/c using h5cc or h5pc. The order for running #
- # programs with RunTest in the MAIN section below is taken from the Makefile. #
- # The order is important since some of the test programs use data files created #
- # by earlier test programs. Any future additions should be placed accordingly. #
diff --git a/devel/hdf5/patches/patch-hl_c++_examples_Makefile.in b/devel/hdf5/patches/patch-hl_c++_examples_Makefile.in
deleted file mode 100644
index e0b950d52c7..00000000000
--- a/devel/hdf5/patches/patch-hl_c++_examples_Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-hl_c++_examples_Makefile.in,v 1.4 2016/10/09 18:44:35 alnsn Exp $
-
-Fix paths to examples.
-
---- hl/c++/examples/Makefile.in.orig 2016-05-10 21:24:52.000000000 +0000
-+++ hl/c++/examples/Makefile.in
-@@ -615,8 +615,8 @@ CXX_API = yes
-
- # Where to install examples
- # Note: no '/' after DESTDIR. Explanation in commence.am
--EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/c++
--EXAMPLETOPDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl
-+EXAMPLEDIR = ${DESTDIR}$(datarootdir)/examples/hdf5/hl/c++
-+EXAMPLETOPDIR = ${DESTDIR}$(datarootdir)/examples/hdf5/hl
-
- # Assume that all tests in this directory are examples, and tell
- # conclude.am when to build them.
diff --git a/devel/hdf5/patches/patch-hl_c++_examples_run-hlc++-ex.sh.in b/devel/hdf5/patches/patch-hl_c++_examples_run-hlc++-ex.sh.in
deleted file mode 100644
index 32b31b27ae1..00000000000
--- a/devel/hdf5/patches/patch-hl_c++_examples_run-hlc++-ex.sh.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-hl_c++_examples_run-hlc++-ex.sh.in,v 1.4 2017/11/15 20:28:27 minskim Exp $
-
-Fix paths to examples.
-
---- hl/c++/examples/run-hlc++-ex.sh.in.orig 2016-04-26 12:43:57.000000000 +0000
-+++ hl/c++/examples/run-hlc++-ex.sh.in
-@@ -20,7 +20,7 @@
- # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
- # #
- # This script will compile and run the c++ examples from source files #
--# installed in .../share/hdf5_examples/hl/c++ using h5c++. The #
-+# installed in .../share/examples/hdf5/hl/c++ using h5c++. The #
- # order for running programs with RunTest in the MAIN section below is taken #
- # from the Makefile. The order is important since some of the test programs #
- # use data files created by earlier test programs. Any future additions should #
diff --git a/devel/hdf5/patches/patch-hl_examples_Makefile.in b/devel/hdf5/patches/patch-hl_examples_Makefile.in
deleted file mode 100644
index 53402bd48a2..00000000000
--- a/devel/hdf5/patches/patch-hl_examples_Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-hl_examples_Makefile.in,v 1.4 2016/10/09 18:44:35 alnsn Exp $
-
-Fix paths to examples.
-
---- hl/examples/Makefile.in.orig 2016-05-10 21:24:53.000000000 +0000
-+++ hl/examples/Makefile.in
-@@ -604,8 +604,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.c
-
- # Example directory
- # Note: no '/' after DESTDIR. Explanation in commence.am
--EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/c
--EXAMPLETOPDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl
-+EXAMPLEDIR = ${DESTDIR}$(datarootdir)/examples/hdf5/hl/c
-+EXAMPLETOPDIR = ${DESTDIR}$(datarootdir)/examples/hdf5/hl
- INSTALL_SCRIPT_FILES = run-hlc-ex.sh
- INSTALL_TOP_SCRIPT_FILES = run-hl-ex.sh
-
diff --git a/devel/hdf5/patches/patch-hl_examples_run-hlc-ex.sh.in b/devel/hdf5/patches/patch-hl_examples_run-hlc-ex.sh.in
deleted file mode 100644
index b5bc83a6e0c..00000000000
--- a/devel/hdf5/patches/patch-hl_examples_run-hlc-ex.sh.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-hl_examples_run-hlc-ex.sh.in,v 1.4 2017/11/15 20:28:27 minskim Exp $
-
-Fix paths to examples.
-
---- hl/examples/run-hlc-ex.sh.in.orig 2016-04-26 12:43:59.000000000 +0000
-+++ hl/examples/run-hlc-ex.sh.in
-@@ -20,7 +20,7 @@
- # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
- # #
- # This script will compile and run the c examples from source files installed #
--# in .../share/hdf5_examples/hl/c using h5cc or h5pc. The order for running #
-+# in .../share/examples/hdf5/hl/c using h5cc or h5pc. The order for running #
- # programs with RunTest in the MAIN section below is taken from the Makefile. #
- # The order is important since some of the test programs use data files created #
- # by earlier test programs. Any future additions should be placed accordingly. #
diff --git a/devel/hdf5/patches/patch-src_H5private.h b/devel/hdf5/patches/patch-src_H5private.h
deleted file mode 100644
index 1461de786bf..00000000000
--- a/devel/hdf5/patches/patch-src_H5private.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_H5private.h,v 1.1 2018/01/02 09:58:47 jperkin Exp $
-
-Avoid existing ERR definition.
-
---- src/H5private.h.orig 2017-04-25 21:45:02.000000000 +0000
-+++ src/H5private.h
-@@ -336,6 +336,10 @@
- #define FAIL (-1)
- #define UFAIL (unsigned)(-1)
-
-+#ifdef ERR
-+#undef ERR
-+#endif
-+
- /* number of members in an array */
- #ifndef NELMTS
- # define NELMTS(X) (sizeof(X)/sizeof(X[0]))
diff --git a/devel/hdf5/patches/patch-tools_test_h5jam_testh5jam.sh.in b/devel/hdf5/patches/patch-tools_test_h5jam_testh5jam.sh.in
deleted file mode 100644
index c517cddd1dd..00000000000
--- a/devel/hdf5/patches/patch-tools_test_h5jam_testh5jam.sh.in
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-tools_test_h5jam_testh5jam.sh.in,v 1.2 2020/01/08 12:30:34 nia Exp $
-
-Use portable "=" to test string equality.
-
---- tools/test/h5jam/testh5jam.sh.in.orig 2019-12-19 16:38:30.000000000 +0000
-+++ tools/test/h5jam/testh5jam.sh.in
-@@ -474,9 +474,9 @@ UNJAMTEST () {
- #
-
- TOOLTEST_OUTPUT() {
-- if [ "$1" == "JAM" ]; then
-+ if [ "$1" = "JAM" ]; then
- TOOLCMD=$JAM_BIN/$JAM
-- elif [ "$1" == "UNJAM" ]; then
-+ elif [ "$1" = "UNJAM" ]; then
- TOOLCMD=$JAM_BIN/$UNJAM
- fi
- shift
diff --git a/devel/hdf5/patches/patch-tools_test_h5repack_h5repack.sh.in b/devel/hdf5/patches/patch-tools_test_h5repack_h5repack.sh.in
index aed7deb2533..0be90cbff5c 100644
--- a/devel/hdf5/patches/patch-tools_test_h5repack_h5repack.sh.in
+++ b/devel/hdf5/patches/patch-tools_test_h5repack_h5repack.sh.in
@@ -1,12 +1,12 @@
-$NetBSD: patch-tools_test_h5repack_h5repack.sh.in,v 1.1 2020/01/08 12:30:50 nia Exp $
+$NetBSD: patch-tools_test_h5repack_h5repack.sh.in,v 1.2 2021/06/07 11:52:48 adam Exp $
test portability fix
---- tools/test/h5repack/h5repack.sh.in.orig 2019-12-19 16:38:30.000000000 +0000
+--- tools/test/h5repack/h5repack.sh.in.orig 2020-09-04 21:50:59.000000000 +0000
+++ tools/test/h5repack/h5repack.sh.in
-@@ -625,7 +625,7 @@ DIFFFAIL()
- $RUNSERIAL $H5DIFF_BIN -q "$@"
- )
+@@ -928,7 +928,7 @@ TOOLFAILSV()
+ $RUNSERIAL $H5DIFF_BIN -v $infile $outfile
+ ) >$actual 2>$actual_err
RET=$?
- if [ $RET == 0 ] ; then
+ if [ $RET = 0 ] ; then
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-11 20:52:33 +0000