diff --git a/math/hdf5/Makefile b/math/hdf5/Makefile index b708739170c..09d4fb8e246 100644 --- a/math/hdf5/Makefile +++ b/math/hdf5/Makefile @@ -3,15 +3,16 @@ ONLY_FOR_ARCHS = ${GCC49_ARCHS} COMMENT = Hierarchical Data Format 5 Technology suite -V = 1.12.1 -DISTNAME = hdf5-${V} +GH_ACCOUNT = HDFGroup +GH_PROJECT = hdf5 +GH_TAGNAME = 1.14.1 -SHARED_LIBS += hdf5 4.0 # 201.0 -SHARED_LIBS += hdf5_cpp 8.0 # 201.0 -SHARED_LIBS += hdf5_hl 3.1 # 200.1 -SHARED_LIBS += hdf5_hl_cpp 4.1 # 200.1 -SHARED_LIBS += hdf5_fortran 1.0 # 201.0 -SHARED_LIBS += hdf5hl_fortran 0.1 # 200.1 +SHARED_LIBS += hdf5 5.0 # 311.0 +SHARED_LIBS += hdf5_cpp 9.0 # 310.1 +SHARED_LIBS += hdf5_hl 4.0 # 310.1 +SHARED_LIBS += hdf5_hl_cpp 5.0 # 310.1 +SHARED_LIBS += hdf5_fortran 2.0 # 311.0 +SHARED_LIBS += hdf5hl_fortran 1.0 # 310.1 CATEGORIES = math @@ -26,9 +27,6 @@ WANTLIB += c m ${COMPILER_LIBCXX} z COMPILER = base-clang ports-gcc base-gcc -MASTER_SITES = https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.12/hdf5-${V}/src/ \ - https://support.hdfgroup.org/ftp/HDF5/current/src/ - MODULES = fortran SEPARATE_BUILD = Yes CONFIGURE_STYLE = gnu diff --git a/math/hdf5/distinfo b/math/hdf5/distinfo index 682def71e8b..ebeed3ae8da 100644 --- a/math/hdf5/distinfo +++ b/math/hdf5/distinfo @@ -1,2 +1,2 @@ -SHA256 (hdf5-1.12.1.tar.gz) = ecZv9n5mZmU2k5bpyQsy4jjlAfNFr9IjQYa/uDMQgco= -SIZE (hdf5-1.12.1.tar.gz) = 13534796 +SHA256 (hdf5-1.14.1.tar.gz) = Vpvfg5B6nZ8C/vs9GUjpNmLV1QZTnuhPhk5n7fIktno= +SIZE (hdf5-1.14.1.tar.gz) = 20141065 diff --git a/math/hdf5/patches/patch-m4_aclocal_fc_f90 b/math/hdf5/patches/patch-m4_aclocal_fc_f90 index 4fe4bfc75cf..4da155a0ee8 100644 --- a/math/hdf5/patches/patch-m4_aclocal_fc_f90 +++ b/math/hdf5/patches/patch-m4_aclocal_fc_f90 @@ -3,11 +3,11 @@ Already fixed upstream. Index: m4/aclocal_fc.f90 --- m4/aclocal_fc.f90.orig +++ m4/aclocal_fc.f90 -@@ -151,6 +151,7 @@ PROGRAM FC_AVAIL_KINDS - WRITE(8,'(I0)') max_decimal_prec - WRITE(8,'(I0)') num_ikinds - WRITE(8,'(I0)') num_rkinds -+ CLOSE(8) +@@ -150,6 +150,7 @@ PROGRAM FC_AVAIL_KINDS + WRITE(stdout,'(I0)') max_decimal_prec + WRITE(stdout,'(I0)') num_ikinds + WRITE(stdout,'(I0)') num_rkinds ++ CLOSE(stdout) END PROGRAM FC_AVAIL_KINDS !---- END ----- Determine the available KINDs for REALs and INTEGERs diff --git a/math/hdf5/pkg/PLIST b/math/hdf5/pkg/PLIST index 04e68cb1d7a..dbf16862f70 100644 --- a/math/hdf5/pkg/PLIST +++ b/math/hdf5/pkg/PLIST @@ -1,10 +1,9 @@ -@bin bin/gif2h5 -@bin bin/h52gif bin/h5c++ bin/h5cc @bin bin/h5clear @bin bin/h5copy @bin bin/h5debug +@bin bin/h5delete @bin bin/h5diff @bin bin/h5dump bin/h5fc @@ -43,25 +42,30 @@ include/H5DataType.h include/H5DcreatProp.h include/H5Dpublic.h include/H5DxferProp.h +include/H5ESdevelop.h include/H5ESpublic.h include/H5EnumType.h include/H5Epubgen.h include/H5Epublic.h include/H5Exception.h include/H5FDcore.h +include/H5FDdevelop.h include/H5FDdirect.h include/H5FDfamily.h include/H5FDhdfs.h +include/H5FDioc.h include/H5FDlog.h include/H5FDmirror.h include/H5FDmpi.h include/H5FDmpio.h include/H5FDmulti.h +include/H5FDonion.h include/H5FDpublic.h include/H5FDros3.h include/H5FDsec2.h include/H5FDsplitter.h include/H5FDstdio.h +include/H5FDsubfiling.h include/H5FDwindows.h include/H5FaccProp.h include/H5FcreatProp.h @@ -72,6 +76,7 @@ include/H5Gpublic.h include/H5Group.h include/H5IMpublic.h include/H5IdComponent.h +include/H5Idevelop.h include/H5Include.h include/H5IntType.h include/H5Ipublic.h @@ -79,6 +84,7 @@ include/H5LDpublic.h include/H5LTpublic.h include/H5LaccProp.h include/H5LcreatProp.h +include/H5Ldevelop.h include/H5Library.h include/H5Location.h include/H5Lpublic.h @@ -98,6 +104,8 @@ include/H5Rpublic.h include/H5Spublic.h include/H5StrType.h include/H5TBpublic.h +include/H5TSdevelop.h +include/H5Tdevelop.h include/H5Tpublic.h include/H5VLconnector.h include/H5VLconnector_passthru.h @@ -105,6 +113,7 @@ include/H5VLnative.h include/H5VLpassthru.h include/H5VLpublic.h include/H5VarLenType.h +include/H5Zdevelop.h include/H5Zpublic.h include/H5api_adpt.h include/H5f90i.h @@ -118,6 +127,7 @@ include/h5a.mod include/h5d.mod include/h5ds.mod include/h5e.mod +include/h5es.mod include/h5f.mod include/h5fortkit.mod include/h5fortran_types.mod @@ -219,6 +229,9 @@ 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/ph5_filtered_writes.c +share/examples/hdf5/c/ph5_filtered_writes_no_sel.c +share/examples/hdf5/c/ph5_subfiling.c share/examples/hdf5/c/ph5example.c share/examples/hdf5/c/run-c-ex.sh share/examples/hdf5/fortran/