devel/hdf5{,-c++}: Update to 1.10.1

New features since 1.8.x:
- SWMR (a concurrent read/write file access pattern)
- Fine-tuning the Metadata Cache
- Collective Metadata I/O
- File Space Management
- Virtual Datasets (VDS)
- Partial Edge Chunk Options
- Metadata Cache Image
- Metadata Cache Evict on Close
- Paged Aggregation
- Page Buffering

10 files changed, 53 insertions, 78 deletions

diff --git a/devel/hdf5/Makefile b/devel/hdf5/Makefile
index a86655671fc..3eb4a9ce729 100644
--- a/devel/hdf5/Makefile
+++ b/devel/hdf5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2013/09/01 09:56:41 adam Exp $
+# $NetBSD: Makefile,v 1.48 2017/11/15 20:28:27 minskim Exp $
 
 COMMENT=	Hierarchical Data Format (new generation)
 
@@ -7,12 +7,16 @@ INSTALLATION_DIRS+=	share/doc/hdf5
 INSTALLATION_DIRS+=	share/examples/hdf5/c
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/misc/h5cc \
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/src/misc/h5cc \
 		${DESTDIR}${PREFIX}/bin/
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/misc/h5redeploy.in \
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/src/misc/h5clear \
+		${DESTDIR}${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/src/misc/h5redeploy.in \
 		${DESTDIR}${PREFIX}/bin/h5redeploy
 	cd ${WRKSRC} && ${INSTALL_DATA} COPYING \
 		release_docs/RELEASE.txt \
+		release_docs/HISTORY-1_10.txt \
+		release_docs/HISTORY-1_8_0-1_10_0.txt \
 		release_docs/HISTORY-1_8.txt \
 		release_docs/HISTORY-1_0-1_8_0_rc3.txt \
 		${DESTDIR}${PREFIX}/share/doc/hdf5/
diff --git a/devel/hdf5/Makefile.common b/devel/hdf5/Makefile.common
index 897a3a78e93..83431e06459 100644
--- a/devel/hdf5/Makefile.common
+++ b/devel/hdf5/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.15 2017/08/16 20:21:07 wiz Exp $
+# $NetBSD: Makefile.common,v 1.16 2017/11/15 20:28:27 minskim Exp $
 # used by devel/hdf5/Makefile
 # used by devel/hdf5-c++/Makefile
 
-DISTNAME=	hdf5-1.8.18
+DISTNAME=	hdf5-1.10.1
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.hdfgroup.org/HDF5/current18/src/
+MASTER_SITES=	https://support.hdfgroup.org/ftp/HDF5/current/src/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/devel/hdf5/PLIST b/devel/hdf5/PLIST
index 887b7712955..01b91ae659b 100644
--- a/devel/hdf5/PLIST
+++ b/devel/hdf5/PLIST
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST,v 1.24 2015/11/26 11:25:10 adam Exp $
+@comment $NetBSD: PLIST,v 1.25 2017/11/15 20:28:27 minskim Exp $
 bin/gif2h5
 bin/h52gif
 bin/h5cc
+bin/h5clear
 bin/h5copy
 bin/h5debug
 bin/h5diff
 bin/h5dump
+bin/h5format_convert
 bin/h5import
 bin/h5jam
 bin/h5ls
@@ -16,6 +18,7 @@ bin/h5repack
 bin/h5repart
 bin/h5stat
 bin/h5unjam
+bin/h5watch
 include/H5ACpublic.h
 include/H5Apublic.h
 include/H5Cpublic.h
@@ -38,6 +41,7 @@ include/H5Fpublic.h
 include/H5Gpublic.h
 include/H5IMpublic.h
 include/H5Ipublic.h
+include/H5LDpublic.h
 include/H5LTpublic.h
 include/H5Lpublic.h
 include/H5MMpublic.h
@@ -58,12 +62,23 @@ include/H5public.h
 include/H5version.h
 include/hdf5.h
 include/hdf5_hl.h
+lib/libdynlib1.la
+lib/libdynlib2.la
+lib/libdynlib3.la
+lib/libdynlib4.la
+lib/libdynlibadd.la
+lib/libdynlibdiff.la
+lib/libdynlibdump.la
+lib/libdynlibls.la
+lib/libdynlibvers.la
 lib/libhdf5.la
 lib/libhdf5.settings
 lib/libhdf5_hl.la
 share/doc/hdf5/COPYING
 share/doc/hdf5/HISTORY-1_0-1_8_0_rc3.txt
+share/doc/hdf5/HISTORY-1_10.txt
 share/doc/hdf5/HISTORY-1_8.txt
+share/doc/hdf5/HISTORY-1_8_0-1_10_0.txt
 share/doc/hdf5/RELEASE.txt
 share/examples/hdf5/README
 share/examples/hdf5/c/h5_attribute.c
@@ -89,6 +104,14 @@ share/examples/hdf5/c/h5_reference.c
 share/examples/hdf5/c/h5_select.c
 share/examples/hdf5/c/h5_shared_mesg.c
 share/examples/hdf5/c/h5_subset.c
+share/examples/hdf5/c/h5_vds-eiger.c
+share/examples/hdf5/c/h5_vds-exc.c
+share/examples/hdf5/c/h5_vds-exclim.c
+share/examples/hdf5/c/h5_vds-percival-unlim-maxmin.c
+share/examples/hdf5/c/h5_vds-percival-unlim.c
+share/examples/hdf5/c/h5_vds-percival.c
+share/examples/hdf5/c/h5_vds-simpleIO.c
+share/examples/hdf5/c/h5_vds.c
 share/examples/hdf5/c/h5_write.c
 share/examples/hdf5/c/ph5example.c
 share/examples/hdf5/c/run-c-ex.sh
diff --git a/devel/hdf5/distinfo b/devel/hdf5/distinfo
index f72a727a44b..b17f3b75a33 100644
--- a/devel/hdf5/distinfo
+++ b/devel/hdf5/distinfo
@@ -1,17 +1,16 @@
-$NetBSD: distinfo,v 1.38 2016/12/03 18:56:36 alnsn Exp $
+$NetBSD: distinfo,v 1.39 2017/11/15 20:28:27 minskim Exp $
 
-SHA1 (hdf5-1.8.18.tar.bz2) = d7e008cbfcf5cb6913b5327a81bbcaf34cc9436d
-RMD160 (hdf5-1.8.18.tar.bz2) = a3910b7129f80080c0574bb798f6d40849724005
-SHA512 (hdf5-1.8.18.tar.bz2) = 01f6d14bdd3be2ced9c63cc9e1820cd7ea11db649ff9f3a3055c18c4b0fffe777fd23baad536e3bce31c4d76fe17db64a3972762e1bb4d232927c1ca140e72b2
-Size (hdf5-1.8.18.tar.bz2) = 10081294 bytes
-SHA1 (patch-bin_cmakehdf5) = c31107e3f67dd2b58318ebc94e6044c8c76df049
+SHA1 (hdf5-1.10.1.tar.bz2) = 22edee1f4ed603ea9544daec3492874fa3028bbb
+RMD160 (hdf5-1.10.1.tar.bz2) = 759e63ead405740dcf3260bdc9644b97480f3b8b
+SHA512 (hdf5-1.10.1.tar.bz2) = 266b0e2f28c5fd540099a4955244ddb8c03aca3ad40d626358643f033a6ae5e9266a1d6c1d60925c7d42d24d28a1549d3305fe8ddb42cec2379af7231b93e554
+Size (hdf5-1.10.1.tar.bz2) = 11769617 bytes
 SHA1 (patch-c++_examples_Makefile.in) = 2b62c0b30258fcce5e22b5932bd400ca5897e0c3
-SHA1 (patch-c++_examples_run-c++-ex.sh.in) = f0605ce2cf35e72f47a1c848aa637342eab65070
+SHA1 (patch-c++_examples_run-c++-ex.sh.in) = 2575d749930773fbe58dd1394cc451ad88fd4ed3
 SHA1 (patch-configure) = e7f141d54c39cbee2f7d703ab7d6ff582158904e
 SHA1 (patch-examples_Makefile.in) = af9cf68a50544312a759b7732aea9297a6881582
-SHA1 (patch-examples_run-c-ex.sh.in) = 3614da26657a1428d134d915593d03cd408292d3
+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) = 48050e21799cca24b19a60b6242fd7d156a7cb59
+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) = a7cd97c716c598cd3aac05f0b1dcee46d77bd968
-SHA1 (patch-tools_h5jam_testh5jam.sh.in) = 89068ae1694c586f85b25240fda30549eddf2d0f
+SHA1 (patch-hl_examples_run-hlc-ex.sh.in) = 43bf6c28fb667f3ae39145be08e0a3a75f370b47
+SHA1 (patch-tools_test_h5jam_testh5jam.sh.in) = c23e66454bf817b68120d360c63329ebed6ac2aa
diff --git a/devel/hdf5/patches/patch-bin_cmakehdf5 b/devel/hdf5/patches/patch-bin_cmakehdf5
deleted file mode 100644
index ac82e93b26c..00000000000
--- a/devel/hdf5/patches/patch-bin_cmakehdf5
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bin_cmakehdf5,v 1.1 2015/11/26 11:25:10 adam Exp $
-
-Portability fix.
-
---- bin/cmakehdf5.orig	2015-11-26 11:09:09.000000000 +0000
-+++ bin/cmakehdf5
-@@ -30,7 +30,7 @@ exit_code=0
- # and should have invoked as "$srcdir/bin/$progname" or
- # "bin/$progname". So, by striping bin/$program from $0,
- # we can find $srcdir.
--if [ $0 == bin/$progname ]; then
-+if [ $0 = bin/$progname ]; then
-     srcdir="."		# current directory
- else
-     # $0 is $srdir/bin/$progname
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
index caef7ff9296..cec5b6c33d0 100644
--- a/devel/hdf5/patches/patch-c++_examples_run-c++-ex.sh.in
+++ b/devel/hdf5/patches/patch-c++_examples_run-c++-ex.sh.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-c++_examples_run-c++-ex.sh.in,v 1.3 2016/10/09 18:44:35 alnsn Exp $
+$NetBSD: patch-c++_examples_run-c++-ex.sh.in,v 1.4 2017/11/15 20:28:27 minskim Exp $
 
 Fix paths to examples.
 
@@ -13,12 +13,3 @@ Fix paths to examples.
  # 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 #
-@@ -34,7 +34,7 @@ EXIT_FAILURE=1
- 
- # Where the tool is installed.
- # default is relative path to installed location of the tools
--prefix="${prefix:-../../../}"
-+prefix="${prefix:-../../../..}"
- AR="@AR@"
- RANLIB="@RANLIB@"
- H5TOOL="h5c++"                  # The tool name
diff --git a/devel/hdf5/patches/patch-examples_run-c-ex.sh.in b/devel/hdf5/patches/patch-examples_run-c-ex.sh.in
index 880050e78ee..b37adb1f278 100644
--- a/devel/hdf5/patches/patch-examples_run-c-ex.sh.in
+++ b/devel/hdf5/patches/patch-examples_run-c-ex.sh.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-examples_run-c-ex.sh.in,v 1.3 2016/10/09 18:44:35 alnsn Exp $
+$NetBSD: patch-examples_run-c-ex.sh.in,v 1.4 2017/11/15 20:28:27 minskim Exp $
 
 Fix path to examples.
 
@@ -13,12 +13,3 @@ Fix path to examples.
  # 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. #
-@@ -33,7 +33,7 @@ EXIT_FAILURE=1
-  
- # Where the tool is installed.
- # default is relative path to installed location of the tools 
--prefix="${prefix:-../../../}"
-+prefix="${prefix:-../../../..}"
- PARALLEL=@PARALLEL@             # Am I in parallel mode?
- AR="@AR@"
- RANLIB="@RANLIB@"
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
index 2e8efb2d129..32b31b27ae1 100644
--- 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
@@ -1,4 +1,4 @@
-$NetBSD: patch-hl_c++_examples_run-hlc++-ex.sh.in,v 1.3 2016/10/09 18:44:35 alnsn Exp $
+$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.
 
@@ -13,12 +13,3 @@ Fix paths to examples.
  # 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 #
-@@ -33,7 +33,7 @@ EXIT_SUCCESS=0
- EXIT_FAILURE=1
- # Where the tool is installed.
- # default is relative path to installed location of the tools
--prefix="${prefix:-../../../../}"
-+prefix="${prefix:-../../../../..}"
- AR="@AR@"
- RANLIB="@RANLIB@"
- H5TOOL="h5c++"                  # The tool name
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
index 31d22f791b7..b5bc83a6e0c 100644
--- a/devel/hdf5/patches/patch-hl_examples_run-hlc-ex.sh.in
+++ b/devel/hdf5/patches/patch-hl_examples_run-hlc-ex.sh.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-hl_examples_run-hlc-ex.sh.in,v 1.3 2016/10/09 18:44:35 alnsn Exp $
+$NetBSD: patch-hl_examples_run-hlc-ex.sh.in,v 1.4 2017/11/15 20:28:27 minskim Exp $
 
 Fix paths to examples.
 
@@ -13,12 +13,3 @@ Fix paths to examples.
  # 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. #
-@@ -33,7 +33,7 @@ EXIT_FAILURE=1
- 
- # Where the tool is installed.
- # default is relative path to installed location of the tools
--prefix="${prefix:-../../../../}"
-+prefix="${prefix:-../../../../..}"
- PARALLEL=@PARALLEL@             # Am I in parallel mode?
- AR="@AR@"
- RANLIB="@RANLIB@"
diff --git a/devel/hdf5/patches/patch-tools_h5jam_testh5jam.sh.in b/devel/hdf5/patches/patch-tools_test_h5jam_testh5jam.sh.in
index a81b3348797..ebe6bdce1e9 100644
--- a/devel/hdf5/patches/patch-tools_h5jam_testh5jam.sh.in
+++ b/devel/hdf5/patches/patch-tools_test_h5jam_testh5jam.sh.in
@@ -1,12 +1,12 @@
-$NetBSD: patch-tools_h5jam_testh5jam.sh.in,v 1.2 2012/12/09 00:07:39 adam Exp $
+$NetBSD: patch-tools_test_h5jam_testh5jam.sh.in,v 1.1 2017/11/15 20:28:27 minskim Exp $
 
 Use portable "=" to test string equality.
 
---- tools/h5jam/testh5jam.sh.in.orig	2012-05-09 15:06:08.000000000 +0000
-+++ tools/h5jam/testh5jam.sh.in
-@@ -464,9 +464,9 @@ UNJAMTEST () {
+--- tools/test/h5jam/testh5jam.sh.in.orig	2017-04-25 21:45:02.000000000 +0000
++++ tools/test/h5jam/testh5jam.sh.in
+@@ -474,9 +474,9 @@ UNJAMTEST () {
  #
- 
+
  TOOLTEST_OUTPUT() {
 -    if [ "$1" == "JAM" ]; then
 +    if [ "$1" = "JAM" ]; then