From: Martin Reindl Subject: Re: [maintainer update] math/hdf5 2.2.0 To: Stuart Henderson Cc: Marco van Hulten , ports@openbsd.org Date: Fri, 11 Sep 2026 21:46:20 +0200 On Fri, Sep 11, 2026 at 06:06:39PM +0100, Stuart Henderson wrote: > On 2026/09/11 14:29, Marco van Hulten wrote: > > > > There is a problem with patching (on arm64): > > ... > > ===> Applying OpenBSD patch patch-m4_aclocal_fc_f90 > > > > Should the patches be skipped/removed? > > that's just a missed cvs rm. > > > On 2026/08/21 20:38, Martin Reindl wrote: > > +V = 2.2.0 > > DISTNAME = hdf5-${V} > > GH_ACCOUNT = HDFGroup > > GH_PROJECT = hdf5 > > -GH_TAGNAME = ${DISTNAME:S/-/_/g} > > +GH_TAGNAME = ${V} > > just needs this I think (instead of the above 5 lines): > > GH_ACCOUNT = HDFGroup > GH_PROJECT = hdf5 > GH_TAGNAME = 2.2.0 > > > # for h5fuse.sh > > -RUN_DEPENDS += shells/bash > > +#RUN_DEPENDS += shells/bash > > is bash needed? if not, please remove the above lines. no point having > it there but commented. > > > +CONFIGURE_STYLE = cmake > > this is the default when the cmake module is loaded. > > > +share/LICENSE > > this file shouldn't be there - please rm or @comment With h5fuse.sh gone, there is no need for bash anymore. New diff: Index: Makefile =================================================================== RCS file: /cvs/ports/math/hdf5/Makefile,v diff -u -p -u -p -r1.31 Makefile --- Makefile 24 Nov 2025 13:28:00 -0000 1.31 +++ Makefile 11 Sep 2026 19:42:37 -0000 @@ -1,21 +1,20 @@ -# gfortran ONLY_FOR_ARCHS = ${GCC49_ARCHS} COMMENT = Hierarchical Data Format 5 Technology suite -V = 1.14.6 -REVISION = 1 -DISTNAME = hdf5-${V} GH_ACCOUNT = HDFGroup GH_PROJECT = hdf5 -GH_TAGNAME = ${DISTNAME:S/-/_/g} +GH_TAGNAME = 2.2.0 SHARED_LIBS += hdf5 8.0 # 315.1 -SHARED_LIBS += hdf5_cpp 12.0 # 310.6 +SHARED_LIBS += hdf5_cpp 13.0 # 310.6 SHARED_LIBS += hdf5_hl 7.0 # 310.6 -SHARED_LIBS += hdf5_hl_cpp 8.0 # 310.6 -SHARED_LIBS += hdf5_fortran 5.0 # 313.2 -SHARED_LIBS += hdf5hl_fortran 4.0 # 310.6 +SHARED_LIBS += hdf5_hl_cpp 9.0 # 310.6 +SHARED_LIBS += hdf5_f90cstub 0.0 # 0.0 +SHARED_LIBS += hdf5_hl_f90cstub 0.0 # 0.0 +SHARED_LIBS += hdf5_fortran 6.0 # 313.2 +SHARED_LIBS += hdf5_hl_fortran 7.0 # 310.6 +SHARED_LIBS += hdf5_tools 0.0 # 0.0 CATEGORIES = math @@ -31,20 +30,17 @@ WANTLIB += c m ${COMPILER_LIBCXX} z aec COMPILER = base-clang ports-gcc COMPILER_LANGS = c++ fortran -# for h5fuse.sh -RUN_DEPENDS += shells/bash - LIB_DEPENDS += archivers/libaec -MODULES = fortran +MODULES += devel/cmake fortran SEPARATE_BUILD = Yes -CONFIGURE_STYLE = gnu -CONFIGURE_ARGS = --enable-cxx \ - --enable-fortran \ - --with-szlib=${PREFIX} +CONFIGURE_ARGS += -DCMAKE_INSTALL_PREFIX=${PREFIX} \ + -DHDF5_BUILD_CPP_LIB=ON \ + -DHDF5_BUILD_FORTRAN=ON \ + -DHDF5_ENABLE_ZLIB_SUPPORT=ON post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/hdf5 - ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/hdf5 + ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/hdf5 .include Index: distinfo =================================================================== RCS file: /cvs/ports/math/hdf5/distinfo,v diff -u -p -u -p -r1.16 distinfo --- distinfo 5 Sep 2025 20:53:57 -0000 1.16 +++ distinfo 11 Sep 2026 19:42:37 -0000 @@ -1,2 +1,2 @@ -SHA256 (hdf5-1.14.6.tar.gz) = Ce4cZxqHQBpSAcBhBmUPYrre6lo7OUHpseLh4IMXNX8= -SIZE (hdf5-1.14.6.tar.gz) = 39195022 +SHA256 (hdf5-2.2.0.tar.gz) = W411ElrntP71XTs56NPb/SOM32O2UYr9Z/pprIDwZUI= +SIZE (hdf5-2.2.0.tar.gz) = 42186897 Index: patches/patch-m4_aclocal_fc_f90 =================================================================== RCS file: patches/patch-m4_aclocal_fc_f90 diff -N patches/patch-m4_aclocal_fc_f90 --- patches/patch-m4_aclocal_fc_f90 20 Jul 2026 12:53:05 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -Already fixed upstream. - -Index: m4/aclocal_fc.f90 ---- m4/aclocal_fc.f90.orig -+++ m4/aclocal_fc.f90 -@@ -179,6 +179,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 - Index: patches/patch-tools_test_h5repack_h5repack_plugin_sh_in =================================================================== RCS file: patches/patch-tools_test_h5repack_h5repack_plugin_sh_in diff -N patches/patch-tools_test_h5repack_h5repack_plugin_sh_in --- patches/patch-tools_test_h5repack_h5repack_plugin_sh_in 7 Mar 2022 11:10:52 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -Index: tools/test/h5repack/h5repack_plugin.sh.in ---- tools/test/h5repack/h5repack_plugin.sh.in.orig -+++ tools/test/h5repack/h5repack_plugin.sh.in -@@ -37,7 +37,7 @@ PLUGIN_LIBDIR=testdir3 - RM='rm -rf' - - GREP='grep' --CP='cp' -+CP='cp -R' - DIRNAME='dirname' - LS='ls' - AWK='awk' Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/math/hdf5/pkg/PLIST,v diff -u -p -u -p -r1.13 PLIST --- pkg/PLIST 5 Sep 2025 20:53:57 -0000 1.13 +++ pkg/PLIST 11 Sep 2026 19:42:37 -0000 @@ -1,3 +1,5 @@ +@comment bin/mirror_server +@comment bin/mirror_server_stop bin/h5c++ bin/h5cc @bin bin/h5clear @@ -8,22 +10,19 @@ bin/h5cc @bin bin/h5dump bin/h5fc @bin bin/h5format_convert -bin/h5fuse @bin bin/h5import @bin bin/h5jam @bin bin/h5ls @bin bin/h5mkgrp @bin bin/h5perf_serial -bin/h5redeploy @bin bin/h5repack @bin bin/h5repart @bin bin/h5stat @bin bin/h5unjam @bin bin/h5watch -@comment bin/mirror_server -@comment bin/mirror_server_stop include/H5ACpublic.h include/H5AbstractDs.h +include/H5Alltypes.h include/H5Apublic.h include/H5ArrayType.h include/H5AtomType.h @@ -32,7 +31,6 @@ include/H5Classes.h include/H5CommonFG.h include/H5CompType.h include/H5Cpp.h -include/H5CppDoc.h include/H5Cpublic.h include/H5DOpublic.h include/H5DSpublic.h @@ -118,8 +116,10 @@ include/H5Zdevelop.h include/H5Zpublic.h include/H5api_adpt.h include/H5config_f.inc +include/H5f90.h include/H5f90i.h include/H5f90i_gen.h +include/H5f90proto.h include/H5overflow.h include/H5pubconf.h include/H5public.h @@ -132,6 +132,7 @@ include/h5ds.mod include/h5e.mod include/h5es.mod include/h5f.mod +include/h5fd.mod include/h5fortkit.mod include/h5fortran_types.mod include/h5g.mod @@ -154,25 +155,106 @@ include/h5z.mod include/hdf5.h include/hdf5.mod include/hdf5_hl.h +include/mod/ +include/mod/shared/ +include/mod/shared/h5_gen.mod +include/mod/shared/h5a.mod +include/mod/shared/h5d.mod +include/mod/shared/h5do.mod +include/mod/shared/h5ds.mod +include/mod/shared/h5e.mod +include/mod/shared/h5es.mod +include/mod/shared/h5f.mod +include/mod/shared/h5fd.mod +include/mod/shared/h5fortkit.mod +include/mod/shared/h5fortran_types.mod +include/mod/shared/h5g.mod +include/mod/shared/h5global.mod +include/mod/shared/h5i.mod +include/mod/shared/h5im.mod +include/mod/shared/h5l.mod +include/mod/shared/h5lib.mod +include/mod/shared/h5lt.mod +include/mod/shared/h5lt_const.mod +include/mod/shared/h5o.mod +include/mod/shared/h5p.mod +include/mod/shared/h5r.mod +include/mod/shared/h5s.mod +include/mod/shared/h5t.mod +include/mod/shared/h5tb.mod +include/mod/shared/h5tb_const.mod +include/mod/shared/h5vl.mod +include/mod/shared/h5z.mod +include/mod/shared/hdf5.mod +include/mod/static/ +include/mod/static/h5_gen.mod +include/mod/static/h5a.mod +include/mod/static/h5d.mod +include/mod/static/h5do.mod +include/mod/static/h5ds.mod +include/mod/static/h5e.mod +include/mod/static/h5es.mod +include/mod/static/h5f.mod +include/mod/static/h5fd.mod +include/mod/static/h5fortkit.mod +include/mod/static/h5fortran_types.mod +include/mod/static/h5g.mod +include/mod/static/h5global.mod +include/mod/static/h5i.mod +include/mod/static/h5im.mod +include/mod/static/h5l.mod +include/mod/static/h5lib.mod +include/mod/static/h5lt.mod +include/mod/static/h5lt_const.mod +include/mod/static/h5o.mod +include/mod/static/h5p.mod +include/mod/static/h5r.mod +include/mod/static/h5s.mod +include/mod/static/h5t.mod +include/mod/static/h5tb.mod +include/mod/static/h5tb_const.mod +include/mod/static/h5vl.mod +include/mod/static/h5z.mod +include/mod/static/hdf5.mod +lib/cmake/ +lib/cmake/hdf5/ +lib/cmake/hdf5/Modules/ +lib/cmake/hdf5/Modules/FindZLIBNG.cmake +lib/cmake/hdf5/Modules/Findlibaec.cmake +lib/cmake/hdf5/hdf5-config-version.cmake +lib/cmake/hdf5/hdf5-config.cmake +lib/cmake/hdf5/hdf5-targets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/hdf5/hdf5-targets.cmake +lib/cmake/hdf5/hdf5_static-targets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/hdf5/hdf5_static-targets.cmake @static-lib lib/libhdf5.a -lib/libhdf5.la lib/libhdf5.settings @lib lib/libhdf5.so.${LIBhdf5_VERSION} @static-lib lib/libhdf5_cpp.a -lib/libhdf5_cpp.la @lib lib/libhdf5_cpp.so.${LIBhdf5_cpp_VERSION} +@static-lib lib/libhdf5_f90cstub.a +@lib lib/libhdf5_f90cstub.so.${LIBhdf5_f90cstub_VERSION} @static-lib lib/libhdf5_fortran.a -lib/libhdf5_fortran.la @lib lib/libhdf5_fortran.so.${LIBhdf5_fortran_VERSION} @static-lib lib/libhdf5_hl.a -lib/libhdf5_hl.la @lib lib/libhdf5_hl.so.${LIBhdf5_hl_VERSION} @static-lib lib/libhdf5_hl_cpp.a -lib/libhdf5_hl_cpp.la @lib lib/libhdf5_hl_cpp.so.${LIBhdf5_hl_cpp_VERSION} +@static-lib lib/libhdf5_hl_f90cstub.a +@lib lib/libhdf5_hl_f90cstub.so.${LIBhdf5_hl_f90cstub_VERSION} @static-lib lib/libhdf5_hl_fortran.a -@static-lib lib/libhdf5hl_fortran.a -lib/libhdf5hl_fortran.la -@lib lib/libhdf5hl_fortran.so.${LIBhdf5hl_fortran_VERSION} +@lib lib/libhdf5_hl_fortran.so.${LIBhdf5_hl_fortran_VERSION} +@static-lib lib/libhdf5_tools.a +@lib lib/libhdf5_tools.so.${LIBhdf5_tools_VERSION} +lib/pkgconfig/hdf5.pc +lib/pkgconfig/hdf5_cpp.pc +lib/pkgconfig/hdf5_fortran.pc +lib/pkgconfig/hdf5_hl.pc +lib/pkgconfig/hdf5_hl_cpp.pc +lib/pkgconfig/hdf5_hl_fortran.pc +@comment share/LICENSE +share/doc/HDF5/ +share/doc/HDF5/CHANGELOG.md +share/doc/HDF5/USING_HDF5_CMake.md share/doc/hdf5/ -share/doc/hdf5/COPYING +share/doc/hdf5/LICENSE