Hi,
I'd like to propose an update to current math/hdf5 from 1.12.0 to
1.12.1. This removes the need of all patches related to non-existing
$(DESTDIR) at the time of 1.12.0 version.
All tests PASSED (make test + gmake check-install in ports obj dir).
The only new patch added is a missing CLOSE statement
(hdf5-current has corrected this problem so it won't stay for next
version bump).
Tested on -current, amd64 only.
Also, with the port version of hdf5 (1.12.0), fortran
binary bin/h5fc is linked to "gfortran" compiler name instead of
egfortran (which gets built/installed from source with
modules=fortran, at least on amd64 for now until flang comes,
with the name "egfortran").
$ h5fc -show
gfortran -I/usr/local/include ..........
which results in a "missing gfortran" error. (gmake check-install is
failing)
In the diff below, I specified the env variable FC=egfortran to get:
$ h5fc -show
egfortran -I/usr/local/include ..............
(gmake check-install is now PASSED)
but I'm wondering if that's the right way of dealing with this issue.
As MODFORTRAN_COMPILER is reporting 'gfortran' by default,
we cannot use that to get the correct name for FC env variable.
So, do we have to hardcode it this way or let the user deal with
some symbolic links from egfortran -> gfortran (and add a note
for that in the readme?)?
Comments/advises/corrections are welcomed/needed as I'm new
in the writing/updating ports world.
Thank you!
##########################
### MAKEFILE DIFF ###
##########################
--- /usr/ports/math/hdf5/Makefile Tue Jan 25 16:12:27 2022
+++ /usr/ports/mystuff/math/hdf5/Makefile.new Thu Feb 3 19:51:20 2022
@@ -5,15 +5,15 @@
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
@@ -34,6 +34,8 @@
MODULES = fortran
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
+# Needed so h5fc is linked with correct gfortran name from ports/g95
+CONFIGURE_ENV = FC=egfortran
CONFIGURE_ARGS = --enable-cxx \
--enable-fortran \
--with-examplesdir=${PREFIX}/share/examples/hdf5
##########################
### DISTINFO DIFF ###
##########################
--- /usr/ports/math/hdf5/distinfo Wed Dec 2 19:17:02 2020
+++ /usr/ports/mystuff/math/hdf5/distinfo Tue Feb 1 10:23:39 2022
@@ -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
##########################
### PLIST DIFF ###
##########################
--- /usr/ports/math/hdf5/pkg/PLIST Wed Dec 2 19:17:02 2020
+++ /usr/ports/mystuff/math/hdf5/pkg/PLIST Wed Feb 2 18:52:40 2022
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2020/12/02 13:27:55 martin Exp $
+@comment $OpenBSD: PLIST,v$
@bin bin/gif2h5
@bin bin/h52gif
bin/h5c++
@@ -21,6 +21,8 @@
@bin bin/h5stat
@bin bin/h5unjam
@bin bin/h5watch
+@bin bin/mirror_server
+@bin bin/mirror_server_stop
include/H5ACpublic.h
include/H5AbstractDs.h
include/H5Apublic.h
@@ -52,12 +54,14 @@
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 +194,7 @@
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
##########################
### PATCH ADDED ###
##########################
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
##########################
### PATCH UNTOUCHED ###
##########################
patch-tools_test_h5repack_h5repack_plugin_sh_in
#############################
### PATCHES NOT NEEDED/REMOVED ###
#############################
patch-c++_examples_Makefile_in
patch-examples_Makefile_in
patch-fortran_examples_Makefile_in
patch-hl_c++_examples_Makefile_in
patch-hl_examples_Makefile_in
patch-hl_fortran_examples_Makefile_in
