From 347e4c9d1217de0a1b85346eb21fd2b712ccb15e Mon Sep 17 00:00:00 2001
From: martin <martin@openbsd.org>
Date: Mon, 7 Mar 2022 11:10:52 +0000
Subject: [PATCH] Update hdf5 to 1.12.1.

Initiated by a diff from jmeister@posteo.ch.
---
 math/hdf5/Makefile                            | 21 +++++++++----------
 math/hdf5/distinfo                            |  4 ++--
 .../patches/patch-c++_examples_Makefile_in    | 16 --------------
 math/hdf5/patches/patch-examples_Makefile_in  | 16 --------------
 .../patch-fortran_examples_Makefile_in        | 16 --------------
 .../patches/patch-hl_c++_examples_Makefile_in | 16 --------------
 .../patches/patch-hl_examples_Makefile_in     | 16 --------------
 .../patch-hl_fortran_examples_Makefile_in     | 16 --------------
 math/hdf5/patches/patch-m4_aclocal_fc_f90     | 13 ++++++++++++
 ...-tools_test_h5repack_h5repack_plugin_sh_in |  2 --
 math/hdf5/pkg/PLIST                           |  6 +++++-
 11 files changed, 30 insertions(+), 112 deletions(-)
 delete mode 100644 math/hdf5/patches/patch-c++_examples_Makefile_in
 delete mode 100644 math/hdf5/patches/patch-examples_Makefile_in
 delete mode 100644 math/hdf5/patches/patch-fortran_examples_Makefile_in
 delete mode 100644 math/hdf5/patches/patch-hl_c++_examples_Makefile_in
 delete mode 100644 math/hdf5/patches/patch-hl_examples_Makefile_in
 delete mode 100644 math/hdf5/patches/patch-hl_fortran_examples_Makefile_in
 create mode 100644 math/hdf5/patches/patch-m4_aclocal_fc_f90

diff --git a/math/hdf5/Makefile b/math/hdf5/Makefile
index c82e8949b4b..b708739170c 100644
--- a/math/hdf5/Makefile
+++ b/math/hdf5/Makefile
@@ -1,19 +1,17 @@
-# $OpenBSD: Makefile,v 1.23 2021/10/28 14:46:11 jca Exp $
-
 # gfortran
 ONLY_FOR_ARCHS =	${GCC49_ARCHS}
 
 COMMENT =		Hierarchical Data Format 5 Technology suite
 
-V =			1.12.0
+V =			1.12.1
 DISTNAME =		hdf5-${V}
 
-SHARED_LIBS +=	hdf5		3.0 # 200.0
-SHARED_LIBS +=	hdf5_cpp	7.0 # 200.0
-SHARED_LIBS +=	hdf5_hl		3.0 # 200.0
-SHARED_LIBS +=	hdf5_hl_cpp	4.0 # 200.0
-SHARED_LIBS +=	hdf5_fortran	0.0 # 200.0
-SHARED_LIBS +=	hdf5hl_fortran	0.0 # 200.0
+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
 
 CATEGORIES =		math
 
@@ -28,14 +26,15 @@ WANTLIB += c m ${COMPILER_LIBCXX} z
 
 COMPILER =		base-clang ports-gcc base-gcc
 
-MASTER_SITES =		https://support.hdfgroup.org/ftp/HDF5/current/src/ \
-			https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.12/hdf5-${V}/src/
+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
 CONFIGURE_ARGS =	--enable-cxx \
 			--enable-fortran \
+			FC=egfortran \
 			--with-examplesdir=${PREFIX}/share/examples/hdf5
 
 post-install:
diff --git a/math/hdf5/distinfo b/math/hdf5/distinfo
index d8d0e854cd2..682def71e8b 100644
--- a/math/hdf5/distinfo
+++ b/math/hdf5/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hdf5-1.12.0.tar.gz) = pi3LJ2ZYy3jmeV3Sm/km7XqbxO3253AlzSxomo+XwXo=
-SIZE (hdf5-1.12.0.tar.gz) = 12580850
+SHA256 (hdf5-1.12.1.tar.gz) = ecZv9n5mZmU2k5bpyQsy4jjlAfNFr9IjQYa/uDMQgco=
+SIZE (hdf5-1.12.1.tar.gz) = 13534796
diff --git a/math/hdf5/patches/patch-c++_examples_Makefile_in b/math/hdf5/patches/patch-c++_examples_Makefile_in
deleted file mode 100644
index 8ceff54d3e0..00000000000
--- a/math/hdf5/patches/patch-c++_examples_Makefile_in
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-c++_examples_Makefile_in,v 1.1 2020/12/02 13:27:54 martin Exp $
-
-Index: c++/examples/Makefile.in
---- c++/examples/Makefile.in.orig
-+++ c++/examples/Makefile.in
-@@ -709,8 +709,8 @@ CXX_API = yes
- 
- # Where to install examples
- # Note: no '/' after DESTDIR.  Explanation in commence.am
--EXAMPLEDIR = $(examplesdir)/c++
--EXAMPLETOPDIR = $(examplesdir)
-+EXAMPLEDIR = ${DESTDIR}$(examplesdir)/c++
-+EXAMPLETOPDIR = ${DESTDIR}$(examplesdir)
- 
- # Assume that all tests in this directory are examples, and tell
- # conclude.am when to build them.
diff --git a/math/hdf5/patches/patch-examples_Makefile_in b/math/hdf5/patches/patch-examples_Makefile_in
deleted file mode 100644
index 32fdaea13f5..00000000000
--- a/math/hdf5/patches/patch-examples_Makefile_in
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-examples_Makefile_in,v 1.1 2020/12/02 13:27:54 martin Exp $
-
-Index: examples/Makefile.in
---- examples/Makefile.in.orig
-+++ examples/Makefile.in
-@@ -725,8 +725,8 @@ EXTLINK_DIRS = red blue u2w
- 
- # Example directory
- # Note: no '/' after DESTDIR.  Explanation in commence.am
--EXAMPLEDIR = $(examplesdir)/c
--EXAMPLETOPDIR = $(examplesdir)
-+EXAMPLEDIR = ${DESTDIR}$(examplesdir)/c
-+EXAMPLETOPDIR = ${DESTDIR}$(examplesdir)
- @BUILD_SHARED_SZIP_CONDITIONAL_TRUE@LD_LIBRARY_PATH = $(LL_PATH)
- 
- # Assume that all tests in this directory are examples, and tell
diff --git a/math/hdf5/patches/patch-fortran_examples_Makefile_in b/math/hdf5/patches/patch-fortran_examples_Makefile_in
deleted file mode 100644
index 40e44482039..00000000000
--- a/math/hdf5/patches/patch-fortran_examples_Makefile_in
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-fortran_examples_Makefile_in,v 1.1 2020/12/02 13:27:54 martin Exp $
-
-Index: fortran/examples/Makefile.in
---- fortran/examples/Makefile.in.orig
-+++ fortran/examples/Makefile.in
-@@ -722,8 +722,8 @@ FORTRAN_API = yes
- 
- # Tell automake how to install examples
- # Note: no '/' after DESTDIR.  Explanation in commence.am
--EXAMPLEDIR = $(examplesdir)/fortran
--EXAMPLETOPDIR = $(examplesdir)
-+EXAMPLEDIR = ${DESTDIR}$(examplesdir)/fortran
-+EXAMPLETOPDIR = ${DESTDIR}$(examplesdir)
- 
- # Assume that all tests in this directory are examples, and tell
- # conclude.am when to build them.
diff --git a/math/hdf5/patches/patch-hl_c++_examples_Makefile_in b/math/hdf5/patches/patch-hl_c++_examples_Makefile_in
deleted file mode 100644
index 0163b34ac31..00000000000
--- a/math/hdf5/patches/patch-hl_c++_examples_Makefile_in
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-hl_c++_examples_Makefile_in,v 1.1 2020/12/02 13:27:54 martin Exp $
-
-Index: hl/c++/examples/Makefile.in
---- hl/c++/examples/Makefile.in.orig
-+++ hl/c++/examples/Makefile.in
-@@ -698,8 +698,8 @@ CXX_API = yes
- 
- # Where to install examples
- # Note: no '/' after DESTDIR.  Explanation in commence.am
--EXAMPLEDIR = $(examplesdir)/hl/c++
--EXAMPLETOPDIR = $(examplesdir)/hl
-+EXAMPLEDIR = ${DESTDIR}$(examplesdir)/hl/c++
-+EXAMPLETOPDIR = ${DESTDIR}$(examplesdir)/hl
- 
- # Assume that all tests in this directory are examples, and tell
- # conclude.am when to build them.
diff --git a/math/hdf5/patches/patch-hl_examples_Makefile_in b/math/hdf5/patches/patch-hl_examples_Makefile_in
deleted file mode 100644
index be5bbf7b78a..00000000000
--- a/math/hdf5/patches/patch-hl_examples_Makefile_in
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-hl_examples_Makefile_in,v 1.1 2020/12/02 13:27:54 martin Exp $
-
-Index: hl/examples/Makefile.in
---- hl/examples/Makefile.in.orig
-+++ hl/examples/Makefile.in
-@@ -687,8 +687,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.
- 
- # Example directory
- # Note: no '/' after DESTDIR.  Explanation in commence.am
--EXAMPLEDIR = $(examplesdir)/hl/c
--EXAMPLETOPDIR = $(examplesdir)/hl
-+EXAMPLEDIR = ${DESTDIR}$(examplesdir)/hl/c
-+EXAMPLETOPDIR = ${DESTDIR}$(examplesdir)/hl
- INSTALL_SCRIPT_FILES = run-hlc-ex.sh
- INSTALL_TOP_SCRIPT_FILES = run-hl-ex.sh
- 
diff --git a/math/hdf5/patches/patch-hl_fortran_examples_Makefile_in b/math/hdf5/patches/patch-hl_fortran_examples_Makefile_in
deleted file mode 100644
index d4dd0b618f6..00000000000
--- a/math/hdf5/patches/patch-hl_fortran_examples_Makefile_in
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-hl_fortran_examples_Makefile_in,v 1.1 2020/12/02 13:27:54 martin Exp $
-
-Index: hl/fortran/examples/Makefile.in
---- hl/fortran/examples/Makefile.in.orig
-+++ hl/fortran/examples/Makefile.in
-@@ -711,8 +711,8 @@ FORTRAN_API = yes
- 
- # Tell automake how to install examples
- # Note: no '/' after DESTDIR.  Explanation in commence.am
--EXAMPLEDIR = $(examplesdir)/hl/fortran
--EXAMPLETOPDIR = $(examplesdir)/hl
-+EXAMPLEDIR = ${DESTDIR}$(examplesdir)/hl/fortran
-+EXAMPLETOPDIR = ${DESTDIR}$(examplesdir)/hl
- 
- # Assume that all tests in this directory are examples, and tell
- # conclude.am when to build them.
diff --git a/math/hdf5/patches/patch-m4_aclocal_fc_f90 b/math/hdf5/patches/patch-m4_aclocal_fc_f90
new file mode 100644
index 00000000000..4fe4bfc75cf
--- /dev/null
+++ b/math/hdf5/patches/patch-m4_aclocal_fc_f90
@@ -0,0 +1,13 @@
+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)
+ END PROGRAM FC_AVAIL_KINDS
+ !---- END ----- Determine the available KINDs for REALs and INTEGERs
+ 
diff --git a/math/hdf5/patches/patch-tools_test_h5repack_h5repack_plugin_sh_in b/math/hdf5/patches/patch-tools_test_h5repack_h5repack_plugin_sh_in
index 470101af32a..5c2db9d51d1 100644
--- a/math/hdf5/patches/patch-tools_test_h5repack_h5repack_plugin_sh_in
+++ b/math/hdf5/patches/patch-tools_test_h5repack_h5repack_plugin_sh_in
@@ -1,5 +1,3 @@
-$OpenBSD: patch-tools_test_h5repack_h5repack_plugin_sh_in,v 1.1 2020/12/02 13:27:54 martin Exp $
-
 Index: tools/test/h5repack/h5repack_plugin.sh.in
 --- tools/test/h5repack/h5repack_plugin.sh.in.orig
 +++ tools/test/h5repack/h5repack_plugin.sh.in
diff --git a/math/hdf5/pkg/PLIST b/math/hdf5/pkg/PLIST
index c7e4cd937f3..04e68cb1d7a 100644
--- a/math/hdf5/pkg/PLIST
+++ b/math/hdf5/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.8 2020/12/02 13:27:55 martin Exp $
 @bin bin/gif2h5
 @bin bin/h52gif
 bin/h5c++
@@ -21,6 +20,8 @@ bin/h5redeploy
 @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/H5Apublic.h
@@ -52,12 +53,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/H5FaccProp.h
@@ -190,6 +193,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