From 6d9281424a2790c6f50d4157775f6529c0641844 Mon Sep 17 00:00:00 2001 From: "Eric A. Borisch" Date: Thu, 4 Jun 2026 13:20:03 -0500 Subject: [PATCH] hdf5: MAJOR VERSION UPDATE 2.1.1 (#32874) * hdf5: MAJOR VERSION UPDATE 2.1.1 * hdf5: Fix tests; add upstream fortran patch * hdf5: revbumps --- R/R-hdf5r/Portfile | 2 +- devel/starpu13/Portfile | 2 +- fortran/h5fortran/Portfile | 2 +- gis/gdal/Portfile | 2 +- gis/kealib/Portfile | 2 +- gis/qgis3/Portfile | 2 +- gis/saga/Portfile | 2 +- graphics/InsightToolkit/Portfile | 2 +- graphics/InsightToolkit4/Portfile | 2 +- graphics/field3d/Portfile | 2 +- graphics/opencv3-devel/Portfile | 4 +- graphics/opencv3/Portfile | 4 +- graphics/opencv4-devel/Portfile | 4 +- graphics/opencv4/Portfile | 4 +- graphics/vigra/Portfile | 2 +- graphics/vips/Portfile | 2 +- graphics/vtk/Portfile | 2 +- lua/lua-numlua/Portfile | 2 +- math/caffe/Portfile | 2 +- math/deal.ii/Portfile | 2 +- math/gnudatalanguage/Portfile | 2 +- math/libKriging/Portfile | 2 +- math/mathgl/Portfile | 2 +- math/matio/Portfile | 2 +- math/octave/Portfile | 2 +- math/shark/Portfile | 2 +- math/shogun-devel/Portfile | 2 +- math/shogun/Portfile | 2 +- octave/octave-communications/Portfile | 2 +- perl/p5-pdl-io-hdf5/Portfile | 2 +- python/py-fabio/Portfile | 2 +- python/py-h5py/Portfile | 2 +- python/py-netcdf4/Portfile | 2 +- python/py-nio/Portfile | 2 +- python/py-tables/Portfile | 2 +- python/py-xraylarch/Portfile | 2 +- science/ALPSCore/Portfile | 2 +- science/ALPSMaxent/Portfile | 2 +- science/AppCSXCAD/Portfile | 2 +- science/H5Part/Portfile | 2 +- science/HDF5-External-Filter-Plugins/Portfile | 2 +- science/abinit/Portfile | 2 +- science/alps/Portfile | 2 +- science/armadillo/Portfile | 2 +- science/cdo/Portfile | 2 +- science/cgnslib/Portfile | 2 +- science/crystfel/Portfile | 2 +- science/digital_rf/Portfile | 2 +- science/flann/Portfile | 2 +- science/gmsh/Portfile | 2 +- science/gmtk/Portfile | 2 +- science/gmtsar/Portfile | 2 +- science/grads/Portfile | 2 +- science/h4h5tools/Portfile | 2 +- science/h5utils/Portfile | 2 +- science/hdf5/Portfile | 195 +++--- science/hdf5/files/fortran_build_fix.patch | 570 ++++++++++++++++++ .../files/patch-tools-src-misc-h5cc.in.diff | 12 - science/hdfeos5/Portfile | 2 +- science/ismrmrd/Portfile | 2 +- science/lal/Portfile | 2 +- science/libmed/Portfile | 2 +- science/libminc/Portfile | 2 +- science/lscsoft-deps/Portfile | 4 +- science/luma/Portfile | 2 +- science/magicspp/Portfile | 2 +- science/metview/Portfile | 2 +- science/mfem/Portfile | 2 +- science/ncpp/Portfile | 2 +- science/netcdf/Portfile | 2 +- science/openEMS/Portfile | 2 +- science/paraview/Portfile | 2 +- science/silo/Portfile | 2 +- science/swarm/Portfile | 2 +- science/vapor/Portfile | 2 +- science/wgrib2/Portfile | 2 +- science/xdmf/Portfile | 2 +- science/yorick-hdf5/Portfile | 2 +- textproc/CSXCAD/Portfile | 2 +- 79 files changed, 719 insertions(+), 220 deletions(-) create mode 100644 science/hdf5/files/fortran_build_fix.patch delete mode 100644 science/hdf5/files/patch-tools-src-misc-h5cc.in.diff diff --git a/R/R-hdf5r/Portfile b/R/R-hdf5r/Portfile index 0709d1ed274..e6779b6915b 100644 --- a/R/R-hdf5r/Portfile +++ b/R/R-hdf5r/Portfile @@ -5,7 +5,7 @@ PortGroup R 1.0 # GitHub version is outdated. R.setup cran hhoeflin hdf5r 1.3.11 -revision 0 +revision 1 maintainers nomaintainer license Apache-2 description Interface to the HDF5 binary data format diff --git a/devel/starpu13/Portfile b/devel/starpu13/Portfile index 834b2355a88..63811740771 100644 --- a/devel/starpu13/Portfile +++ b/devel/starpu13/Portfile @@ -13,7 +13,7 @@ legacysupport.newest_darwin_requires_legacy 15 # For the time-being, have both in Macports as well. They do not conflict, see below. github.setup starpu-runtime starpu 1.3.11 starpu- name starpu13 -revision 3 +revision 4 categories devel license LGPL-2.1 maintainers nomaintainer diff --git a/fortran/h5fortran/Portfile b/fortran/h5fortran/Portfile index 1b790de503f..034900981a0 100644 --- a/fortran/h5fortran/Portfile +++ b/fortran/h5fortran/Portfile @@ -6,7 +6,7 @@ PortGroup github 1.0 PortGroup mpi 1.0 github.setup geospace-code h5fortran 4.11.0 v -revision 0 +revision 1 categories fortran science license BSD maintainers nomaintainer diff --git a/gis/gdal/Portfile b/gis/gdal/Portfile index 04cb613152a..40c84a4b40b 100644 --- a/gis/gdal/Portfile +++ b/gis/gdal/Portfile @@ -10,7 +10,7 @@ name gdal # keep version in sync with py-gdal; rev-bump dependents after an # install_name-changing update (typically when a or b changes in version a.b.c). version 3.13.0 -revision 0 +revision 1 checksums rmd160 d85862aaee5c7e8943a469188e3435ee357f0f37 \ sha256 1c537dd2f4d66f05534ae419bc2af495c2204ce13bb266c8cbd867dd6705f0c7 \ diff --git a/gis/kealib/Portfile b/gis/kealib/Portfile index aee0a06bbd3..5c09608d5fd 100644 --- a/gis/kealib/Portfile +++ b/gis/kealib/Portfile @@ -7,7 +7,7 @@ PortGroup github 1.0 github.setup ubarsc kealib 1.6.2 kealib- github.tarball_from releases -revision 0 +revision 1 categories gis license MIT diff --git a/gis/qgis3/Portfile b/gis/qgis3/Portfile index 41e575458ec..26f51950007 100644 --- a/gis/qgis3/Portfile +++ b/gis/qgis3/Portfile @@ -32,7 +32,7 @@ if {${subport} eq "qgis3-ltr"} { github.setup qgis QGIS 3_44_11 final- github.tarball_from archive -revision 0 +revision 1 set app_name QGIS3 checksums rmd160 6843b639f310ddfeccf60816d44079a195ae6b0f \ diff --git a/gis/saga/Portfile b/gis/saga/Portfile index bf93ec7607c..b51a26769fd 100644 --- a/gis/saga/Portfile +++ b/gis/saga/Portfile @@ -11,7 +11,7 @@ name saga categories gis license GPL version 9.12.4 -revision 0 +revision 1 maintainers {yahoo.com:n_larsson @nilason} openmaintainer description SAGA is a GIS oriented towards statistics and analysis diff --git a/graphics/InsightToolkit/Portfile b/graphics/InsightToolkit/Portfile index 5255dea1d0b..894e5947577 100644 --- a/graphics/InsightToolkit/Portfile +++ b/graphics/InsightToolkit/Portfile @@ -9,7 +9,7 @@ PortGroup github 1.0 name InsightToolkit github.setup InsightSoftwareConsortium ITK 5.4.4 v github.tarball_from releases -revision 2 +revision 3 categories graphics science devel license Apache conflicts_build InsightToolkit4 diff --git a/graphics/InsightToolkit4/Portfile b/graphics/InsightToolkit4/Portfile index 751e8fc800e..27b02098151 100644 --- a/graphics/InsightToolkit4/Portfile +++ b/graphics/InsightToolkit4/Portfile @@ -10,7 +10,7 @@ name InsightToolkit4 github.setup InsightSoftwareConsortium ITK 4.13.3 v # Change github.tarball_from to 'releases' or 'archive' next update github.tarball_from tarball -revision 5 +revision 6 categories graphics science devel license Apache conflicts_build InsightToolkit diff --git a/graphics/field3d/Portfile b/graphics/field3d/Portfile index 82843c579fe..b7881655294 100644 --- a/graphics/field3d/Portfile +++ b/graphics/field3d/Portfile @@ -9,7 +9,7 @@ github.setup imageworks Field3D 1.7.3 v # Change github.tarball_from to 'releases' or 'archive' next update github.tarball_from tarball name field3d -revision 9 +revision 10 checksums rmd160 b540eed98c0c4abf529289e87032d3bdac47be5f \ sha256 b4f6e5c6aeb8d014be7d1d9cabc1f9464094f7f287fbfe33a37def2a73549d52 \ diff --git a/graphics/opencv3-devel/Portfile b/graphics/opencv3-devel/Portfile index 6b25912888e..4ba0afa8eb9 100644 --- a/graphics/opencv3-devel/Portfile +++ b/graphics/opencv3-devel/Portfile @@ -360,7 +360,7 @@ foreach python_branch {2.7} { subport py${python_version}-${name} { # NOTE: Only rev-bump subports, for major changes/additions - revision 5 + revision 6 conflicts-append \ py${python_version}-opencv3 @@ -412,7 +412,7 @@ foreach python_branch ${python_branches} { subport py${python_version}-${name} { # NOTE: Only rev-bump subports, for major changes/additions - revision 5 + revision 6 conflicts-append \ py${python_version}-opencv3 \ diff --git a/graphics/opencv3/Portfile b/graphics/opencv3/Portfile index 83e53f993b4..887cec4af78 100644 --- a/graphics/opencv3/Portfile +++ b/graphics/opencv3/Portfile @@ -360,7 +360,7 @@ foreach python_branch {2.7} { subport py${python_version}-${name} { # NOTE: Only rev-bump subports, for major changes/additions - revision 5 + revision 6 conflicts-append \ py${python_version}-opencv3-devel @@ -412,7 +412,7 @@ foreach python_branch ${python_branches} { subport py${python_version}-${name} { # NOTE: Only rev-bump subports, for major changes/additions - revision 5 + revision 6 conflicts-append \ py${python_version}-opencv3-devel \ diff --git a/graphics/opencv4-devel/Portfile b/graphics/opencv4-devel/Portfile index 8227876f8eb..d8541ef5400 100644 --- a/graphics/opencv4-devel/Portfile +++ b/graphics/opencv4-devel/Portfile @@ -363,9 +363,9 @@ foreach python_branch ${python_branches} { subport py${python_version}-${name} { # NOTE: Only rev-bump subports, for major changes/additions if {${opencv_latest}} { - revision 3 + revision 4 } else { - revision 14 + revision 15 } conflicts-append \ diff --git a/graphics/opencv4/Portfile b/graphics/opencv4/Portfile index 3e16751a9ee..fa4c4c05ec1 100644 --- a/graphics/opencv4/Portfile +++ b/graphics/opencv4/Portfile @@ -416,9 +416,9 @@ foreach python_branch ${python_branches} { subport py${python_version}-${name} { # NOTE: Only rev-bump subports, for major changes/additions if {${opencv_latest}} { - revision 3 + revision 4 } else { - revision 20 + revision 21 } conflicts-append \ diff --git a/graphics/vigra/Portfile b/graphics/vigra/Portfile index 611fef30080..667538ff1ef 100644 --- a/graphics/vigra/Portfile +++ b/graphics/vigra/Portfile @@ -11,7 +11,7 @@ github.setup ukoethe vigra 1-11-1 Version- # Change github.tarball_from to 'releases' or 'archive' next update github.tarball_from tarball version [strsed ${github.version} {g/-/./}] -revision 23 +revision 24 categories graphics platforms darwin license MIT diff --git a/graphics/vips/Portfile b/graphics/vips/Portfile index 1dd8456f07c..a2637928b48 100644 --- a/graphics/vips/Portfile +++ b/graphics/vips/Portfile @@ -6,7 +6,7 @@ PortGroup gobject_introspection 1.0 PortGroup meson 1.0 github.setup libvips libvips 8.16.0 v -revision 1 +revision 2 name vips distname vips-${version} description VIPS is an image processing library. diff --git a/graphics/vtk/Portfile b/graphics/vtk/Portfile index 22a75c0da30..21b1f5eb188 100644 --- a/graphics/vtk/Portfile +++ b/graphics/vtk/Portfile @@ -28,7 +28,7 @@ compiler.blacklist-append {clang < 1100} github.setup Kitware vtk 9.6.1 v github.tarball_from archive -revision 1 +revision 2 categories graphics devel license BSD diff --git a/lua/lua-numlua/Portfile b/lua/lua-numlua/Portfile index 969881f311d..8f09fe4f5fb 100644 --- a/lua/lua-numlua/Portfile +++ b/lua/lua-numlua/Portfile @@ -6,7 +6,7 @@ PortGroup luarocks_org 1.0 name lua-numlua version 0.3 -revision 16 +revision 17 luarocks.rock numlua-${version}-1.src.rock categories-append math license MIT diff --git a/math/caffe/Portfile b/math/caffe/Portfile index 6f54f80af9e..ce8b0da812b 100644 --- a/math/caffe/Portfile +++ b/math/caffe/Portfile @@ -8,7 +8,7 @@ github.setup BVLC caffe 1de4cebfb81d50267d0d8c2595372b14e1408248 # Change github.tarball_from to 'releases' or 'archive' next update github.tarball_from tarball version 20170817 -revision 27 +revision 28 categories math science maintainers nomaintainer diff --git a/math/deal.ii/Portfile b/math/deal.ii/Portfile index fd94d8e5c56..6a9c98c889b 100644 --- a/math/deal.ii/Portfile +++ b/math/deal.ii/Portfile @@ -11,7 +11,7 @@ name deal.ii github.setup dealii dealii 9.4.2 v # Change github.tarball_from to 'releases' or 'archive' next update github.tarball_from tarball -revision 5 +revision 6 categories math science license LGPL-2.1+ maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer diff --git a/math/gnudatalanguage/Portfile b/math/gnudatalanguage/Portfile index f66f95cfc42..1fb8a0beeca 100644 --- a/math/gnudatalanguage/Portfile +++ b/math/gnudatalanguage/Portfile @@ -8,7 +8,7 @@ PortGroup github 1.0 PortGroup wxWidgets 1.0 github.setup gnudatalanguage gdl 1.1.3 v -revision 0 +revision 1 name ${github.author} epoch 2 diff --git a/math/libKriging/Portfile b/math/libKriging/Portfile index d65ed76ea28..1571e61fefe 100644 --- a/math/libKriging/Portfile +++ b/math/libKriging/Portfile @@ -8,7 +8,7 @@ PortGroup github 1.0 github.setup libKriging libKriging 0.8.3 v # Change github.tarball_from to 'releases' or 'archive' next update github.tarball_from tarball -revision 3 +revision 4 categories math license Apache-2 maintainers nomaintainer diff --git a/math/mathgl/Portfile b/math/mathgl/Portfile index abb5c40895c..deea9fec196 100644 --- a/math/mathgl/Portfile +++ b/math/mathgl/Portfile @@ -5,7 +5,7 @@ PortGroup cmake 1.0 name mathgl version 8.0.3 -revision 1 +revision 2 categories math license GPL-3 maintainers {mps @Schamschula} openmaintainer diff --git a/math/matio/Portfile b/math/matio/Portfile index 6bdc8193231..d18081a2968 100644 --- a/math/matio/Portfile +++ b/math/matio/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 name matio version 1.5.30 -revision 0 +revision 1 maintainers {mps @Schamschula} openmaintainer license LGPL-2.1 diff --git a/math/octave/Portfile b/math/octave/Portfile index 10450375097..b8e446b2470 100644 --- a/math/octave/Portfile +++ b/math/octave/Portfile @@ -10,7 +10,7 @@ name octave version 11.2.0 # package_version has to be kept in sync with the octave PortGroup set package_version 11.x.x -revision 0 +revision 1 categories math science license GPL-3+ diff --git a/math/shark/Portfile b/math/shark/Portfile index 74255c6d6ac..4b5a46da070 100644 --- a/math/shark/Portfile +++ b/math/shark/Portfile @@ -7,7 +7,7 @@ PortGroup github 1.0 github.setup Shark-ML Shark 4.0.1 v set name shark -revision 2 +revision 3 categories math license LGPL-3 maintainers nomaintainer diff --git a/math/shogun-devel/Portfile b/math/shogun-devel/Portfile index 5110848619b..fa3fd6f62d5 100644 --- a/math/shogun-devel/Portfile +++ b/math/shogun-devel/Portfile @@ -6,7 +6,7 @@ PortGroup cmake 1.0 name shogun-devel version 4.0.0 set branch [join [lrange [split ${version} .] 0 1] .] -revision 24 +revision 25 categories math science license GPL-3 diff --git a/math/shogun/Portfile b/math/shogun/Portfile index 08323f75715..c504d84817d 100644 --- a/math/shogun/Portfile +++ b/math/shogun/Portfile @@ -6,7 +6,7 @@ PortGroup compilers 1.0 name shogun version 2.1.0 set branch [join [lrange [split ${version} .] 0 1] .] -revision 27 +revision 28 categories math science license GPL-3 diff --git a/octave/octave-communications/Portfile b/octave/octave-communications/Portfile index 64bd1480b25..b594e66a88e 100644 --- a/octave/octave-communications/Portfile +++ b/octave/octave-communications/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 PortGroup octave 1.0 octave.setup sourceforge octave communications 1.2.7 -revision 2 +revision 3 octave.config_h yes license GPL-3+ diff --git a/perl/p5-pdl-io-hdf5/Portfile b/perl/p5-pdl-io-hdf5/Portfile index 3c6337e0d4b..4f5ac75952f 100644 --- a/perl/p5-pdl-io-hdf5/Portfile +++ b/perl/p5-pdl-io-hdf5/Portfile @@ -5,7 +5,7 @@ PortGroup perl5 1.0 perl5.branches 5.28 5.30 5.32 5.34 perl5.setup PDL-IO-HDF5 0.762 ../../authors/id/E/ET/ETJ -revision 0 +revision 1 license {Artistic-1 GPL} maintainers nomaintainer description PDL::IO::HDF5 - PDL Interface to the HDF5 Data Format. diff --git a/python/py-fabio/Portfile b/python/py-fabio/Portfile index 0c53422206a..b40d466a9ca 100644 --- a/python/py-fabio/Portfile +++ b/python/py-fabio/Portfile @@ -5,7 +5,7 @@ PortGroup python 1.0 name py-fabio version 2024.9.0 -revision 1 +revision 2 universal_variant no license MIT diff --git a/python/py-h5py/Portfile b/python/py-h5py/Portfile index ca6b03a0aed..6f8ea8bb14a 100644 --- a/python/py-h5py/Portfile +++ b/python/py-h5py/Portfile @@ -11,7 +11,7 @@ name py-h5py # h5py needs to be re-built after hdf5 upgrades; it has its own version # check included. -revision 0 +revision 1 checksums \ rmd160 7e8b15d0604d38faa0fe78297b2d757a6717a29e \ diff --git a/python/py-netcdf4/Portfile b/python/py-netcdf4/Portfile index 3da06fbca36..d085e235505 100644 --- a/python/py-netcdf4/Portfile +++ b/python/py-netcdf4/Portfile @@ -7,7 +7,7 @@ PortGroup mpi 1.0 name py-netcdf4 python.rootname netCDF4 version 1.7.3 -revision 0 +revision 1 categories-append science license MIT diff --git a/python/py-nio/Portfile b/python/py-nio/Portfile index 1f3db54b01a..d7b3b30d55c 100644 --- a/python/py-nio/Portfile +++ b/python/py-nio/Portfile @@ -6,7 +6,7 @@ PortGroup compilers 1.0 name py-nio version 1.3.0b1 -revision 29 +revision 30 categories-append science license PyNIO maintainers {petr @petrrr} openmaintainer diff --git a/python/py-tables/Portfile b/python/py-tables/Portfile index e98f0cf7b42..a5d9816d8f5 100644 --- a/python/py-tables/Portfile +++ b/python/py-tables/Portfile @@ -6,7 +6,7 @@ PortGroup mpi 1.0 name py-tables version 3.10.2 -revision 3 +revision 4 categories-append science license BSD diff --git a/python/py-xraylarch/Portfile b/python/py-xraylarch/Portfile index e9b5f6f0c66..196f13a2b6b 100644 --- a/python/py-xraylarch/Portfile +++ b/python/py-xraylarch/Portfile @@ -5,7 +5,7 @@ PortGroup python 1.0 name py-xraylarch version 2025.2.2 -revision 0 +revision 1 categories-append science platforms {darwin any} diff --git a/science/ALPSCore/Portfile b/science/ALPSCore/Portfile index 999e48c39d7..d4cc376b92d 100644 --- a/science/ALPSCore/Portfile +++ b/science/ALPSCore/Portfile @@ -9,7 +9,7 @@ PortGroup boost 1.0 github.setup ALPSCore ALPSCore 2.2.0 v # Change github.tarball_from to 'releases' or 'archive' next update github.tarball_from tarball -revision 13 +revision 14 categories science platforms darwin diff --git a/science/ALPSMaxent/Portfile b/science/ALPSMaxent/Portfile index a7bc1c7a691..72a2b5c7b13 100644 --- a/science/ALPSMaxent/Portfile +++ b/science/ALPSMaxent/Portfile @@ -10,7 +10,7 @@ name ALPSMaxent github.setup CQMP Maxent 1.0 v # Change github.tarball_from to 'releases' or 'archive' next update github.tarball_from tarball -revision 18 +revision 19 categories science platforms darwin license GPL-2 diff --git a/science/AppCSXCAD/Portfile b/science/AppCSXCAD/Portfile index a90706771be..8672bb40c30 100644 --- a/science/AppCSXCAD/Portfile +++ b/science/AppCSXCAD/Portfile @@ -14,7 +14,7 @@ version 20230106-[string range ${github.version} 0 7] checksums rmd160 fa4359e0d7b6f77ae2162720a47dfe7d2586083c \ sha256 53b107889de36ef7655829988575c69342c52d164edf76f76ca76f0b04fd68aa \ size 18807 -revision 6 +revision 7 platforms darwin macosx categories science diff --git a/science/H5Part/Portfile b/science/H5Part/Portfile index ea7e6d36a3e..eac4fcf26e1 100644 --- a/science/H5Part/Portfile +++ b/science/H5Part/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 name H5Part version 1.6.6 -revision 22 +revision 23 categories science maintainers lbl.gov:ghweber license BSD diff --git a/science/HDF5-External-Filter-Plugins/Portfile b/science/HDF5-External-Filter-Plugins/Portfile index 0698e3d16b2..69c8f993fbe 100644 --- a/science/HDF5-External-Filter-Plugins/Portfile +++ b/science/HDF5-External-Filter-Plugins/Portfile @@ -8,7 +8,7 @@ PortGroup cmake 1.0 github.setup nexusformat HDF5-External-Filter-Plugins 0.1.0 v # Change github.tarball_from to 'releases' or 'archive' next update github.tarball_from tarball -revision 11 +revision 12 categories science license BSD MIT maintainers {@eborisch eborisch} openmaintainer diff --git a/science/abinit/Portfile b/science/abinit/Portfile index daa3f84db20..a8c0c67d5a3 100644 --- a/science/abinit/Portfile +++ b/science/abinit/Portfile @@ -7,7 +7,7 @@ PortGroup mpi 1.0 github.setup abinit abinit 10.8.1 github.tarball_from archive -revision 0 +revision 1 categories science license GPL-3 diff --git a/science/alps/Portfile b/science/alps/Portfile index c9f881a2ab2..f4107efe823 100644 --- a/science/alps/Portfile +++ b/science/alps/Portfile @@ -6,7 +6,7 @@ PortGroup compilers 1.0 name alps version 2.3.0 -revision 16 +revision 17 checksums rmd160 40a04447f7c6d26aff0124a3b0f879aedc981ed9 \ sha256 a40963811a05ad874e9f02747c532a4873095b94e183ecd31869199f58be1f65 \ size 127625225 diff --git a/science/armadillo/Portfile b/science/armadillo/Portfile index ee768ba80ba..32ab891fad6 100644 --- a/science/armadillo/Portfile +++ b/science/armadillo/Portfile @@ -6,7 +6,7 @@ PortGroup mpi 1.0 name armadillo version 15.2.7 -revision 0 +revision 1 categories science maintainers {mps @Schamschula} openmaintainer diff --git a/science/cdo/Portfile b/science/cdo/Portfile index 93d687872bd..e4a32aaa455 100644 --- a/science/cdo/Portfile +++ b/science/cdo/Portfile @@ -6,7 +6,7 @@ PortGroup legacysupport 1.1 name cdo version 2.6.1 -revision 0 +revision 1 maintainers {takeshi @tenomoto} \ {me.com:remko.scharroo @remkos} \ openmaintainer diff --git a/science/cgnslib/Portfile b/science/cgnslib/Portfile index 1639a002a55..459c141af1b 100644 --- a/science/cgnslib/Portfile +++ b/science/cgnslib/Portfile @@ -10,7 +10,7 @@ name cgnslib github.setup CGNS CGNS 4.4.0 v # Change github.tarball_from to 'releases' or 'archive' next update github.tarball_from tarball -revision 2 +revision 3 categories science maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer license zlib diff --git a/science/crystfel/Portfile b/science/crystfel/Portfile index e72d1949055..f87b2202f63 100644 --- a/science/crystfel/Portfile +++ b/science/crystfel/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 name crystfel version 0.6.1 -revision 18 +revision 19 categories science platforms darwin license GPL-3 diff --git a/science/digital_rf/Portfile b/science/digital_rf/Portfile index 7bd73d492b0..077fc120bfb 100644 --- a/science/digital_rf/Portfile +++ b/science/digital_rf/Portfile @@ -8,7 +8,7 @@ PortGroup boost 1.0 github.setup MITHaystack digital_rf 2.6.1 # Change github.tarball_from to 'releases' or 'archive' next update github.tarball_from tarball -revision 17 +revision 18 categories science license BSD diff --git a/science/flann/Portfile b/science/flann/Portfile index 2abdc148c2c..877bc1898a1 100644 --- a/science/flann/Portfile +++ b/science/flann/Portfile @@ -8,7 +8,7 @@ PortGroup github 1.0 github.setup mariusmuja flann 1.9.2 # Change github.tarball_from to 'releases' or 'archive' next update github.tarball_from tarball -revision 3 +revision 4 categories science devel maintainers nomaintainer description Fast Library for Approximate Nearest Neighbors diff --git a/science/gmsh/Portfile b/science/gmsh/Portfile index 2b532916066..f585d960b97 100644 --- a/science/gmsh/Portfile +++ b/science/gmsh/Portfile @@ -13,7 +13,7 @@ legacysupport.newest_darwin_requires_legacy 15 name gmsh version 4.15.0 -revision 1 +revision 2 categories science license GPL-2+ maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer diff --git a/science/gmtk/Portfile b/science/gmtk/Portfile index 58ce0e79a18..9a57f930d95 100644 --- a/science/gmtk/Portfile +++ b/science/gmtk/Portfile @@ -11,7 +11,7 @@ if {${os.platform} eq "darwin" && ${os.major} > 11} { name gmtk version 1.4.3 -revision 17 +revision 18 categories science license OSL-3 maintainers uw.edu:rprogers openmaintainer diff --git a/science/gmtsar/Portfile b/science/gmtsar/Portfile index 2756b8accbf..ac22fe3c68d 100644 --- a/science/gmtsar/Portfile +++ b/science/gmtsar/Portfile @@ -8,7 +8,7 @@ PortGroup legacysupport 1.1 legacysupport.newest_darwin_requires_legacy 10 github.setup gmtsar gmtsar 6.1 v -revision 5 +revision 6 checksums rmd160 38e267a7d12536d3d411d51d2d3ad9957b2a8987 \ sha256 b50bd3f01d2a53f68ece27e30e84f122b7239bb50028c4d0a8eaf450bd1c0ad2 \ size 1380815 diff --git a/science/grads/Portfile b/science/grads/Portfile index cbb718f9fdb..048546f8b4f 100644 --- a/science/grads/Portfile +++ b/science/grads/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 name grads version 2.2.1 -revision 22 +revision 23 set branch [join [lrange [split ${version} .] 0 1] .] maintainers {takeshi @tenomoto} license GPL-2 diff --git a/science/h4h5tools/Portfile b/science/h4h5tools/Portfile index 925c5dc6190..94dbd40dafd 100644 --- a/science/h4h5tools/Portfile +++ b/science/h4h5tools/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 name h4h5tools version 2.2.3 -revision 16 +revision 17 categories science # Equivalent to BSD + explicitly requiring modifications to be documented license Permissive diff --git a/science/h5utils/Portfile b/science/h5utils/Portfile index 018ae4e2035..7810c798550 100644 --- a/science/h5utils/Portfile +++ b/science/h5utils/Portfile @@ -5,7 +5,7 @@ PortGroup mpi 1.0 name h5utils version 1.12.1 -revision 25 +revision 26 categories science platforms darwin maintainers ece.pdx.edu:higginja openmaintainer diff --git a/science/hdf5/Portfile b/science/hdf5/Portfile index 0dec1b1333e..df1081599e6 100644 --- a/science/hdf5/Portfile +++ b/science/hdf5/Portfile @@ -1,18 +1,14 @@ # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 PortSystem 1.0 -PortGroup muniversal 1.0 PortGroup mpi 1.0 PortGroup legacysupport 1.1 PortGroup github 1.0 +PortGroup cmake 1.1 -github.setup HDFGroup hdf5 1.14.6 hdf5_ -set distversion $version +github.setup HDFGroup hdf5 2.1.1 revision 0 -#set mainversion [lindex [split ${distversion} -] 0] -#set shortversion [join [lrange [split ${mainversion} .] 0 1] .] - categories science maintainers {eborisch @eborisch} openmaintainer @@ -30,19 +26,19 @@ long_description HDF5 is a data model, library, and file format for storing\ homepage https://www.hdfgroup.org/solutions/hdf5/ github.tarball_from releases -distname ${name}-${distversion} checksums \ - rmd160 25870c7e455e7f83bd043ed60ed6662c94ac90d5 \ - sha256 e4defbac30f50d64e1556374aa49e574417c9e72c6b1de7a4ff88c4b1bea6e9b \ - size 39289609 + rmd160 e1fc58cd2d17ad1d269ef7d2fa4f9e4a8b84e499 \ + sha256 efff93b5a904d66e8f626d7da60b5eedc9faf544be27dbabbaa87967b8ad798b \ + size 42049698 + +patchfiles fortran_build_fix.patch + +compiler.cxx_standard 2011 mpi.setup -gcc44 -gcc45 depends_lib port:zlib port:libaec -use_parallel_build yes - -patchfiles patch-tools-src-misc-h5cc.in.diff # llvm-gcc-4.2 produced code fails type conversion tests # Upstream suggestion is use -O0. Clang-produced code passes all tests. @@ -64,94 +60,84 @@ compilers.add_gcc_rpath_support no # Use lib/hdf5 rather than hdf5/lib plugin directory configure.args \ - --disable-cxx \ - --disable-fortran \ - --disable-hl \ - --disable-parallel \ - --disable-silent-rules \ - --disable-threadsafe \ - --enable-build-mode=production \ - --enable-shared \ - --enable-static \ - --with-default-plugindir=${prefix}/lib/hdf5 \ - --with-szlib=${prefix}/lib/libaec \ - --with-zlib=yes + -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_FIND_DEBUG_MODE:BOOL=OFF \ + -DH5_DEFAULT_PLUGINDIR:STRING=${prefix}/lib/hdf5 \ + -DHDF5_BUILD_CPP_LIB:BOOL=ON \ + -DHDF5_BUILD_FORTRAN:BOOL=OFF \ + -DHDF5_ENABLE_OPTIMIZATION:BOOL=ON \ + -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON \ + -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=ON \ + -DHDF5_INSTALL_CMAKE_DIR:STRING=${cmake_share_module_dir} \ + -DSZIP_INCLUDE_DIR:PATH=${prefix}/lib/libaec/include \ + -DSZIP_LIBRARY:FILEPATH=${prefix}/lib/libaec/lib/libsz.dylib \ + -DSZIP_USE_EXTERNAL:BOOL=OFF \ + -Dlibaec_INCLUDE_DIR:PATH=${prefix}/lib/libaec/include \ + -Dlibaec_LIBRARY:FILEPATH=${prefix}/lib/libaec/lib/libaec.dylib + +configure.env-append ZLIB_ROOT=${prefix}/lib +configure.env-append libaec_DIR=${prefix}/lib/libaec +configure.cflags-append -fno-common # Actively checks how to get clang to warn on implicit functions with this. configure.checks.implicit_function_declaration.whitelist-append strchr -# http://mail.hdfgroup.org/pipermail/hdf-forum_hdfgroup.org/2010-March/002682.html -license NCSA +# https://github.com/HDFGroup/hdf5/pull/5638 +license BSD -default_variants +cxx +hl +fortran +default_variants +fortran -post-configure { - if {[variant_exists universal] && [variant_isset universal]} { - set dirs {} - foreach arch ${universal_archs_to_use} { - lappend dirs ${worksrcpath}-${arch} - } - } else { - set dirs ${worksrcpath} - } - foreach dir ${dirs} { - reinplace -E {s|-arch [a-z0-9_]+||g} \ - ${dir}/bin/h5cc \ - ${dir}/c++/src/h5c++ \ - ${dir}/src/libhdf5.settings \ - ${dir}/fortran/src/h5fc - if {${configure.ccache}} { - reinplace -W ${dir} {s|ccache ||} bin/h5cc c++/src/h5c++ - } - } +variant fortran description {Build fortran libs} { + configure.args-replace -DHDF5_BUILD_FORTRAN:BOOL=OFF -DHDF5_BUILD_FORTRAN:BOOL=ON + configure.args-append -DHDF5_INSTALL_MOD_FORTRAN:BOOL=ON } post-destroot { + # Move LICENSE, etc. xinstall -d ${destroot}${prefix}/share/hdf5/ - xinstall -m 444 ${worksrcpath}/COPYING\ - ${destroot}${prefix}/share/hdf5/ + foreach f [ glob -type f ${destroot}${prefix}/share/* ] { + move $f ${destroot}${prefix}/share/hdf5/ + } - # remove paths to libraries used to build HDF5 when packaging HDF5 - system -W ${destroot}${prefix}/bin "${worksrcpath}/bin/pkgscrpts/h5rmflags -prefix=${prefix}" + foreach f [ glob ${destroot}${prefix}/mod/static/* ] { + move $f ${destroot}${prefix}/include/ + } - # ensure libraries are found and that they are from MacPorts - # see https://trac.macports.org/ticket/67507 - # Depending on build config, a number of different files need to be patched - # just let the system find which ones need it for this build. - system -W ${destroot}${prefix}/bin \ - "grep -Il --null -- '-lsz -lz' * | xargs -0 sed -i '' \ - -e 's^-lsz^${prefix}/lib/libaec/lib/libsz.dylib^' \ - -e 's^-lz^${prefix}/lib/libz.dylib^'" + delete ${destroot}${prefix}/mod } test.run yes -test.target check +test.env-append DYLD_FALLBACK_LIBRARY_PATH=${workpath}/build/bin -variant hl description { - Enable High Level interface. - +hl is EXPERIMENTAL with +threadsafe +variant threadsafe description { + Enable threadsafety. + +threadsafe is EXPERIMENTAL } { - configure.args-delete --disable-hl - configure.args-append --enable-hl + # Tell hdf5 to configure in this experimental configuration + configure.args-append -DHDF5_ALLOW_UNSUPPORTED=ON \ + -DHDF5_ENABLE_THREADSAFE=ON + + pre-configure { + ui_warn { +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +hdf5 has been configured in an unsupported "Experimental" mode due to\ ++threadsafe. +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + } + } + + + notes-append { +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +hdf5 has been installed in an unsupported "Experimental" mode due to\ ++threadsafe. +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + } + } -variant cxx description { - Enable c++ interface. - +cxx is EXPERIMENTAL with +threadsafe or any mpi variant -} { - configure.args-delete --disable-cxx - configure.args-append --enable-cxx - - # See: https://github.com/ubarsc/kealib/issues/42 - compiler.cxx_standard 2011 -} - -variant fortran description { - Enable Fortran bindings. - +fortran is EXPERIMENTAL with +threadsafe -} { - configure.args-delete --disable-fortran - configure.args-append --enable-fortran +if {[ mpi_variant_isset ]} { + configure.args-append -DHDF5_ENABLE_PARALLEL=ON } if {[variant_isset fortran] && ![fortran_variant_isset]} { @@ -161,51 +147,6 @@ if {[variant_isset fortran] && ![fortran_variant_isset]} { } } -if {([ variant_isset gfortran ] || [ variant_isset g95 ]) && ![ variant_isset fortran ]} { - default_variants +fortran -} - -variant threadsafe description { - Enable threadsafety. - +threadsafe is EXPERIMENTAL with +cxx, +fortran, or any mpi variant -} { - configure.args-delete --disable-threadsafe - configure.args-append --enable-threadsafe --with-pthread -} - -if {[ variant_isset threadsafe ] && ([ variant_isset cxx ] || - [ variant_isset hl ] || - [ variant_isset fortran ]) || - ([ mpi_variant_isset ]) && - ([ variant_isset cxx ] || [ variant_isset threadsafe ]) } { - - # Tell hdf5 to configure in this experimental configuration - configure.args-append --enable-unsupported - - notes-append { -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -hdf5 has been installed in an unsupported "Experimental" mode due to\ -selected variants. See "port variants hdf5 | grep EXPERIMENTAL" for more\ -information. -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - } - - pre-configure { - ui_warn { -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -hdf5 will been configured in an unsupported "Experimental" mode due to\ -selected variants. See "port variants hdf5 | grep EXPERIMENTAL" for more\ -information. -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - } - } -} - -if {[ mpi_variant_isset ]} { - configure.args-delete --disable-parallel - configure.args-append --enable-parallel -} - notes-append { Mac users may need to set the environment variable "HDF5_USE_FILE_LOCKING"\ to the five-character string "FALSE" when accessing network mounted files.\ diff --git a/science/hdf5/files/fortran_build_fix.patch b/science/hdf5/files/fortran_build_fix.patch new file mode 100644 index 00000000000..6474cfbbcf7 --- /dev/null +++ b/science/hdf5/files/fortran_build_fix.patch @@ -0,0 +1,570 @@ +From 5b044ac47c9d808baba25564baa34b4ac17cb148 Mon Sep 17 00:00:00 2001 +From: Scot Breitenfeld +Date: Fri, 29 May 2026 16:07:46 -0500 +Subject: [PATCH] Fortran: simplify H5config_f.inc.cmake to use #cmakedefine + directly + +All #cmakedefine01 CMAKE_H5_* blocks used a five-line pattern: + + #cmakedefine01 CMAKE_H5_HAVE_FOO + #if CMAKE_H5_HAVE_FOO == 0 + #undef H5_HAVE_FOO + #else + #define H5_HAVE_FOO + #endif + +This is exactly what #cmakedefine H5_HAVE_FOO does: it emits +#define H5_HAVE_FOO (no value) when the CMake variable is truthy and +/* #undef H5_HAVE_FOO */ when falsy. The CMAKE_H5_* intermediate +variables in fortran/src/CMakeLists.txt were only needed to feed these +blocks and are no longer required. + +Replace all such blocks with #cmakedefine H5_HAVE_FOO, using the H5_* +variable directly. MPI_LOGICAL_KIND retains its value via +#cmakedefine H5_MPI_LOGICAL_KIND @H5_MPI_LOGICAL_KIND@. + +This also fixes a real bug: H5_FORTRAN_C_BOOL_IS_UNIQUE was emitted as +#define H5_FORTRAN_C_BOOL_IS_UNIQUE 0 when C_BOOL and default LOGICAL +are the same kind (e.g. Apple PowerPC ABI). #ifdef only tests whether +a macro is defined, not its value, so the guard in H5_test_buildiface.F90 +was always true and verify_c_bool was written into tf_gen.F90 regardless, +causing an "Ambiguous interfaces" build failure on that platform. +--- + fortran/src/CMakeLists.txt | 64 +----------------- + fortran/src/H5Dff.F90 | 6 +- + fortran/src/H5_f.c | 4 +- + fortran/src/H5_ff.F90 | 4 +- + fortran/src/H5config_f.inc.cmake | 87 +++++-------------------- + fortran/src/H5fort_type_defines.h.cmake | 6 +- + fortran/src/H5match_types.c | 8 +-- + fortran/test/tH5D.F90 | 16 ++--- + fortran/test/tH5T_F03.F90 | 12 ++-- + hl/fortran/test/tstlite.F90 | 6 +- + src/H5pubconf.h.in | 2 +- + 11 files changed, 49 insertions(+), 166 deletions(-) + +diff --git fortran/src/CMakeLists.txt fortran/src/CMakeLists.txt +index 7f8610f0afa..6a93643b946 100644 +--- fortran/src/CMakeLists.txt ++++ fortran/src/CMakeLists.txt +@@ -8,12 +8,6 @@ cmake_minimum_required (VERSION 3.26) + project (HDF5_F90_SRC C Fortran) + + #----------------------------------------------------------------------------- +-if (H5_NO_DEPRECATED_SYMBOLS) +- set (CMAKE_NO_DEPRECATED_SYMBOLS 1) +-else () +- set (CMAKE_NO_DEPRECATED_SYMBOLS 0) +-endif () +- + # configure def file for shared libs on windows + if (WIN32) + if (BUILD_SHARED_LIBS) +@@ -34,64 +28,8 @@ if (WIN32) + endif () + endif () + +-if (H5_HAVE_MPI_F08) # MPI-3 module mpi_f08 supported +- set (CMAKE_H5_HAVE_MPI_F08 1) +-else () ++if (NOT H5_HAVE_MPI_F08) # MPI-3 module mpi_f08 supported + set (H5_NOMPI_F08 ";") +- set (CMAKE_H5_HAVE_MPI_F08 0) +-endif () +- +-if (H5_HAVE_DARWIN) # Used in testing +- set (CMAKE_H5_HAVE_DARWIN 1) +-else () +- set (CMAKE_H5_HAVE_DARWIN 0) +-endif () +- +-# configure for Fortran preprocessor +- +-# Define Parallel variable for passing to H5config_f.inc.cmake +-set (CMAKE_H5_HAVE_PARALLEL 0) +-set (CMAKE_H5_HAVE_SUBFILING_VFD 0) +-if (H5_HAVE_PARALLEL) +- set (CMAKE_H5_HAVE_PARALLEL 1) +- if (H5_HAVE_SUBFILING_VFD) +- set (CMAKE_H5_HAVE_SUBFILING_VFD 1) +- endif () +-endif () +- +-set (CMAKE_H5_HAVE_FLOAT128 0) +-if (H5_HAVE_FLOAT128) +- set (CMAKE_H5_HAVE_FLOAT128 1) +-endif () +- +-set (CMAKE_H5_FORTRAN_HAVE_STORAGE_SIZE 0) +-if (H5_FORTRAN_HAVE_STORAGE_SIZE) +- set (CMAKE_H5_FORTRAN_HAVE_STORAGE_SIZE 1) +-endif () +- +-set (CMAKE_H5_FORTRAN_HAVE_SIZEOF 0) +-if (H5_FORTRAN_HAVE_SIZEOF) +- set (CMAKE_H5_FORTRAN_HAVE_SIZEOF 1) +-endif () +- +-set (CMAKE_H5_FORTRAN_HAVE_C_SIZEOF 0) +-if (H5_FORTRAN_HAVE_C_SIZEOF) +- set (CMAKE_H5_FORTRAN_HAVE_C_SIZEOF 1) +-endif () +- +-set (CMAKE_H5_HAVE_ISO_FORTRAN_ENV 0) +-if (H5_HAVE_ISO_FORTRAN_ENV) +- set (CMAKE_H5_HAVE_ISO_FORTRAN_ENV 1) +-endif () +- +-set (CMAKE_H5_FORTRAN_HAVE_CHAR_ALLOC 0) +-if (H5_FORTRAN_HAVE_CHAR_ALLOC) +- set (CMAKE_H5_FORTRAN_HAVE_CHAR_ALLOC 1) +-endif () +- +-set (CMAKE_H5_MPI_LOGICAL_KIND 0) +-if (H5_MPI_LOGICAL_KIND) +- set (CMAKE_H5_MPI_LOGICAL_KIND 1) + endif () + + configure_file (${HDF5_F90_SRC_SOURCE_DIR}/H5config_f.inc.cmake ${HDF5_F90_BINARY_DIR}/H5config_f.inc @ONLY) +diff --git fortran/src/H5Dff.F90 fortran/src/H5Dff.F90 +index d597bcf306a..1b962d773b6 100644 +--- fortran/src/H5Dff.F90 ++++ fortran/src/H5Dff.F90 +@@ -95,7 +95,7 @@ MODULE H5D + PRIVATE h5dwrite_reference_obj, h5dwrite_reference_dsetreg, h5dwrite_char_scalar, h5dwrite_ptr + PRIVATE h5dread_reference_obj, h5dread_reference_dsetreg, h5dread_char_scalar, h5dread_ptr + PRIVATE h5dfill_integer, h5dfill_c_float, h5dfill_c_double, h5dfill_char, h5dfill_ptr +-#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0 ++#ifdef H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE + PRIVATE h5dfill_c_long_double + #endif + +@@ -180,7 +180,7 @@ END FUNCTION h5dread_f_c + MODULE PROCEDURE h5dfill_integer + MODULE PROCEDURE h5dfill_c_float + MODULE PROCEDURE h5dfill_c_double +-#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0 ++#ifdef H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE + MODULE PROCEDURE h5dfill_c_long_double + #endif + MODULE PROCEDURE h5dfill_char +@@ -2308,7 +2308,7 @@ SUBROUTINE h5dfill_c_double(fill_value, space_id, buf, hdferr) + + END SUBROUTINE h5dfill_c_double + +-#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0 ++#ifdef H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE + SUBROUTINE h5dfill_c_long_double(fill_value, space_id, buf, hdferr) + IMPLICIT NONE + REAL(KIND=C_LONG_DOUBLE), INTENT(IN), TARGET :: fill_value +diff --git fortran/src/H5_f.c fortran/src/H5_f.c +index 4b5cd3c8b0f..9202c2e26c1 100644 +--- fortran/src/H5_f.c ++++ fortran/src/H5_f.c +@@ -183,7 +183,7 @@ h5init_types_c(hid_t_f *types, hid_t_f *floatingtypes, hid_t_f *integertypes) + /* + * FIND H5T_NATIVE_REAL_C_LONG_DOUBLE + */ +-#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE != 0 ++#ifdef H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE + if (sizeof(real_C_LONG_DOUBLE_f) == sizeof(float)) { + if ((types[13] = (hid_t_f)H5Tcopy(H5T_NATIVE_FLOAT)) < 0) + return ret_value; +@@ -192,7 +192,7 @@ h5init_types_c(hid_t_f *types, hid_t_f *floatingtypes, hid_t_f *integertypes) + if ((types[13] = (hid_t_f)H5Tcopy(H5T_NATIVE_DOUBLE)) < 0) + return ret_value; + } /*end if */ +-#if H5_FORTRAN_HAVE_C_LONG_DOUBLE != 0 ++#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE + else if (sizeof(real_C_LONG_DOUBLE_f) == sizeof(long double)) { + if (H5_PAC_C_MAX_REAL_PRECISION >= H5_PAC_FC_MAX_REAL_PRECISION) { + if ((types[13] = (hid_t_f)H5Tcopy(H5T_NATIVE_LDOUBLE)) < 0) +diff --git fortran/src/H5_ff.F90 fortran/src/H5_ff.F90 +index 2d398c518c8..b6a71db2fbe 100644 +--- fortran/src/H5_ff.F90 ++++ fortran/src/H5_ff.F90 +@@ -997,7 +997,7 @@ INTEGER(HID_T) FUNCTION h5kind_to_type(ikind, flag) RESULT(h5_type) + INTEGER, INTENT(IN) :: flag + INTEGER :: i + +-!#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0 ++!#ifdef H5_HAVE_Fortran_INTEGER_SIZEOF_16 + ! ! (1) The array index assumes INTEGER*16 the last integer in the series, and + ! ! (2) it should map to INTEGER*16 on most modern processors + ! H5T_NATIVE_INTEGER_KIND(H5_FORTRAN_NUM_INTEGER_KINDS)=SELECTED_INT_KIND(36) +@@ -1016,7 +1016,7 @@ INTEGER(HID_T) FUNCTION h5kind_to_type(ikind, flag) RESULT(h5_type) + h5_type = H5T_NATIVE_REAL_C_FLOAT + ELSE IF(ikind.EQ.KIND(1.0_C_DOUBLE))THEN + h5_type = H5T_NATIVE_REAL_C_DOUBLE +-#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0 ++#ifdef H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE + ELSE IF(ikind.EQ.KIND(1.0_C_LONG_DOUBLE))THEN + h5_type = H5T_NATIVE_REAL_C_LONG_DOUBLE + #endif +diff --git fortran/src/H5config_f.inc.cmake fortran/src/H5config_f.inc.cmake +index 88875cb0b9a..2f9d662db04 100644 +--- fortran/src/H5config_f.inc.cmake ++++ fortran/src/H5config_f.inc.cmake +@@ -12,88 +12,43 @@ + ! fortran/H5config_f.inc. Generated from fortran/src/H5config_f.inc.cmake by CMake + + ! Define if there is parallel support +-#cmakedefine01 CMAKE_H5_HAVE_PARALLEL +-#if CMAKE_H5_HAVE_PARALLEL == 0 +-#undef H5_HAVE_PARALLEL +-#else +-#define H5_HAVE_PARALLEL +-#endif ++#cmakedefine H5_HAVE_PARALLEL + + ! Define if MPI supports mpi_f08 module +-#cmakedefine01 CMAKE_H5_HAVE_MPI_F08 +-#if CMAKE_H5_HAVE_MPI_F08 == 0 +-#undef H5_HAVE_MPI_F08 +-#else +-#define H5_HAVE_MPI_F08 +-#endif ++#cmakedefine H5_HAVE_MPI_F08 + + ! Define if there is subfiling support +-#cmakedefine01 CMAKE_H5_HAVE_SUBFILING_VFD +-#if CMAKE_H5_HAVE_SUBFILING_VFD == 0 +-#undef H5_HAVE_SUBFILING_VFD +-#else +-#define H5_HAVE_SUBFILING_VFD +-#endif ++#cmakedefine H5_HAVE_SUBFILING_VFD + + ! Define if on APPLE +-#cmakedefine01 CMAKE_H5_HAVE_DARWIN +-#if CMAKE_H5_HAVE_DARWIN == 0 +-#undef H5_HAVE_DARWIN +-#else +-#define H5_HAVE_DARWIN +-#endif ++#cmakedefine H5_HAVE_DARWIN + + ! Define if the intrinsic function STORAGE_SIZE exists +-#cmakedefine01 CMAKE_H5_FORTRAN_HAVE_STORAGE_SIZE +-#if CMAKE_H5_FORTRAN_HAVE_STORAGE_SIZE == 0 +-#undef H5_FORTRAN_HAVE_STORAGE_SIZE +-#else +-#define H5_FORTRAN_HAVE_STORAGE_SIZE +-#endif ++#cmakedefine H5_FORTRAN_HAVE_STORAGE_SIZE + + ! Define if the intrinsic function SIZEOF exists +-#cmakedefine01 CMAKE_H5_FORTRAN_HAVE_SIZEOF +-#if CMAKE_H5_FORTRAN_HAVE_SIZEOF == 0 +-#undef H5_FORTRAN_HAVE_SIZEOF +-#else +-#define H5_FORTRAN_HAVE_SIZEOF +-#endif ++#cmakedefine H5_FORTRAN_HAVE_SIZEOF + + ! Define if the intrinsic function C_SIZEOF exists +-#cmakedefine01 CMAKE_H5_FORTRAN_HAVE_C_SIZEOF +-#if CMAKE_H5_FORTRAN_HAVE_C_SIZEOF == 0 +-#undef H5_FORTRAN_HAVE_C_SIZEOF +-#else +-#define H5_FORTRAN_HAVE_C_SIZEOF +-#endif ++#cmakedefine H5_FORTRAN_HAVE_C_SIZEOF + + ! Define if allocatable character is supported +-#define H5_FORTRAN_HAVE_CHAR_ALLOC @H5_FORTRAN_HAVE_CHAR_ALLOC@ ++#cmakedefine H5_FORTRAN_HAVE_CHAR_ALLOC + + ! Define if the intrinsic function C_LONG_DOUBLE exists +-#define H5_FORTRAN_HAVE_C_LONG_DOUBLE @H5_FORTRAN_HAVE_C_LONG_DOUBLE@ ++#cmakedefine H5_FORTRAN_HAVE_C_LONG_DOUBLE + + ! Define if Fortran C_LONG_DOUBLE is different from C_DOUBLE +-#define H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE @H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE@ ++#cmakedefine H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE + + ! Define if Fortran C_BOOL is different from default LOGICAL +-#define H5_FORTRAN_C_BOOL_IS_UNIQUE @H5_FORTRAN_C_BOOL_IS_UNIQUE@ ++#cmakedefine H5_FORTRAN_C_BOOL_IS_UNIQUE + + ! Define MPI Fortran KIND of LOGICAL +-#cmakedefine01 CMAKE_H5_MPI_LOGICAL_KIND +-#if CMAKE_H5_MPI_LOGICAL_KIND == 0 +-#undef H5_MPI_LOGICAL_KIND +-#else +-#define H5_MPI_LOGICAL_KIND @H5_MPI_LOGICAL_KIND@ +-#endif ++#cmakedefine H5_MPI_LOGICAL_KIND @H5_MPI_LOGICAL_KIND@ + + ! Define if Fortran supports ISO_FORTRAN_ENV (F08) +-#cmakedefine01 CMAKE_H5_HAVE_ISO_FORTRAN_ENV +-#if CMAKE_H5_HAVE_ISO_FORTRAN_ENV == 0 +-#undef H5_HAVE_ISO_FORTRAN_ENV +-#else +-#define H5_HAVE_ISO_FORTRAN_ENV +-#endif ++#cmakedefine H5_HAVE_ISO_FORTRAN_ENV + + ! Define the size of C's double + #define H5_SIZEOF_DOUBLE @H5_SIZEOF_DOUBLE@ +@@ -105,15 +60,10 @@ + #define H5_PAC_FC_MAX_REAL_PRECISION @H5_PAC_FC_MAX_REAL_PRECISION@ + + ! If C has quad precision +-#cmakedefine01 CMAKE_H5_HAVE_FLOAT128 +-#if CMAKE_H5_HAVE_FLOAT128 == 0 +-#undef H5_HAVE_FLOAT128 +-#else +-#define H5_HAVE_FLOAT128 +-#endif ++#cmakedefine H5_HAVE_FLOAT128 + + ! Define if INTEGER*16 is available +-#define H5_HAVE_Fortran_INTEGER_SIZEOF_16 @H5_HAVE_Fortran_INTEGER_SIZEOF_16@ ++#cmakedefine H5_HAVE_Fortran_INTEGER_SIZEOF_16 + + ! Maximum decimal precision for C + #define H5_PAC_C_MAX_REAL_PRECISION @H5_PAC_C_MAX_REAL_PRECISION@ +@@ -137,12 +87,7 @@ + #define H5_Fortran_COMPILER_ID @CMAKE_Fortran_COMPILER_ID@ + + ! Define if deprecated public API symbols are disabled +-#cmakedefine01 CMAKE_NO_DEPRECATED_SYMBOLS +-#if CMAKE_NO_DEPRECATED_SYMBOLS == 0 +-#undef H5_NO_DEPRECATED_SYMBOLS +-#else +-#define H5_NO_DEPRECATED_SYMBOLS +-#endif ++#cmakedefine H5_NO_DEPRECATED_SYMBOLS + + ! For major interface/format changes + #define H5_VERS_MAJOR @H5_VERS_MAJOR@ +diff --git fortran/src/H5fort_type_defines.h.cmake fortran/src/H5fort_type_defines.h.cmake +index 02493d1f928..7e4a0e563d2 100644 +--- fortran/src/H5fort_type_defines.h.cmake ++++ fortran/src/H5fort_type_defines.h.cmake +@@ -23,6 +23,6 @@ + #define H5_FORTRAN_INTEGER_KINDS_SIZEOF @PAC_FC_ALL_INTEGER_KINDS_SIZEOF@ + #define H5_FORTRAN_REAL_KINDS @PAC_FC_ALL_REAL_KINDS@ + #define H5_FORTRAN_REAL_KINDS_SIZEOF @PAC_FC_ALL_REAL_KINDS_SIZEOF@ +-#define H5_HAVE_Fortran_INTEGER_SIZEOF_16 @H5_HAVE_Fortran_INTEGER_SIZEOF_16@ +-#define H5_FORTRAN_HAVE_C_LONG_DOUBLE @H5_FORTRAN_HAVE_C_LONG_DOUBLE@ +-#define H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE @H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE@ ++#cmakedefine H5_HAVE_Fortran_INTEGER_SIZEOF_16 ++#cmakedefine H5_FORTRAN_HAVE_C_LONG_DOUBLE ++#cmakedefine H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE +diff --git fortran/src/H5match_types.c fortran/src/H5match_types.c +index fef07a4a668..c882bca59c0 100644 +--- fortran/src/H5match_types.c ++++ fortran/src/H5match_types.c +@@ -156,7 +156,7 @@ main(void) + + int FORTRAN_NUM_INTEGER_KINDS = H5_FORTRAN_NUM_INTEGER_KINDS; + int H5_FORTRAN_NUM_REAL_KINDS; +-#if H5_FORTRAN_HAVE_C_LONG_DOUBLE != 0 ++#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE + int found_long_double = 0; + #endif + +@@ -213,7 +213,7 @@ main(void) + writeTypedef("float", "double", RealKinds[i]); + strcpy(Real_C_TYPES[i], "C_DOUBLE"); + } +-#if H5_FORTRAN_HAVE_C_LONG_DOUBLE != 0 ++#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE + else if (sizeof(long double) == RealKinds_SizeOf[i] && found_long_double == 0) { + writeTypedef("float", "long double", RealKinds[i]); + strcpy(Real_C_TYPES[i], "C_LONG_DOUBLE"); +@@ -376,7 +376,7 @@ main(void) + return -1; + } + /* real_f */ +-#if H5_FORTRAN_HAVE_C_LONG_DOUBLE != 0 ++#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE + if (H5_FORTRAN_NATIVE_REAL_SIZEOF == sizeof(long double)) { + writeToFilesChr("float", "Fortran_REAL", "real_f", H5_FORTRAN_NATIVE_REAL_KIND, "C_LONG_DOUBLE"); + } +@@ -403,7 +403,7 @@ main(void) + } + + /* double_f */ +-#if H5_FORTRAN_HAVE_C_LONG_DOUBLE != 0 ++#ifdef H5_FORTRAN_HAVE_C_LONG_DOUBLE + if (H5_FORTRAN_NATIVE_DOUBLE_SIZEOF == sizeof(long double)) { + writeToFilesChr("float", "Fortran_DOUBLE", "double_f", H5_FORTRAN_NATIVE_DOUBLE_KIND, + "C_LONG_DOUBLE"); +diff --git fortran/test/tH5D.F90 fortran/test/tH5D.F90 +index d5c5355c5d3..22c98cc84ee 100644 +--- fortran/test/tH5D.F90 ++++ fortran/test/tH5D.F90 +@@ -645,7 +645,7 @@ SUBROUTINE test_dset_fill(cleanup, total_error) + INTEGER(KIND=int_kind_16), TARGET :: data0_i16 = 4 + INTEGER, DIMENSION(1:DIM0) :: data_int + INTEGER, TARGET :: data0_int = 4 +-#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0 ++#ifdef H5_HAVE_Fortran_INTEGER_SIZEOF_16 + INTEGER, PARAMETER :: int_kind_32 = SELECTED_INT_KIND(36) !should map to INTEGER*16 on most modern processors + INTEGER(KIND=int_kind_32), DIMENSION(1:DIM0), TARGET :: data_i32 + INTEGER(KIND=int_kind_32), TARGET :: data0_i32 = 4 +@@ -656,7 +656,7 @@ SUBROUTINE test_dset_fill(cleanup, total_error) + REAL(KIND=real_kind_8), DIMENSION(1:DIM0), TARGET :: data_r8 + REAL(KIND=real_kind_4) , TARGET :: data0_r4 = 4.0 + REAL(KIND=real_kind_8), TARGET :: data0_r8 = 4.0 +-#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0 ++#ifdef H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE + INTEGER, PARAMETER :: real_kind_16 = C_LONG_DOUBLE + REAL(KIND=real_kind_16) , DIMENSION(1:DIM0), TARGET :: data_r16 + REAL(KIND=real_kind_16) , TARGET :: data0_r16 = 4.0 +@@ -679,12 +679,12 @@ SUBROUTINE test_dset_fill(cleanup, total_error) + data_i4 = -2 + data_i16 = -2 + data_int = -2 +-#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0 ++#ifdef H5_HAVE_Fortran_INTEGER_SIZEOF_16 + data_i32 = -2 + #endif + data_r4 = -2.0_real_kind_4 + data_r8 = -2.0_real_kind_8 +-#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0 ++#ifdef H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE + data_r16 = -2.0_real_kind_16 + #endif + data_chr = "H" +@@ -767,7 +767,7 @@ SUBROUTINE test_dset_fill(cleanup, total_error) + ENDIF + ENDDO + +-#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0 ++#ifdef H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE + CALL h5dfill_f(data0_r16, space_id, data_r16, error) + CALL check("h5dfill_f", error, total_error) + DO i = 1, DIM0 +@@ -792,7 +792,7 @@ SUBROUTINE test_dset_fill(cleanup, total_error) + data_i1 = -2 + data_i4 = -2 + data_i16 = -2 +-#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0 ++#ifdef H5_HAVE_Fortran_INTEGER_SIZEOF_16 + data_i32 = -2 + #endif + data_r4 = -2.0_real_kind_4 +@@ -867,7 +867,7 @@ SUBROUTINE test_dset_fill(cleanup, total_error) + ENDIF + ENDDO + +-#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0 ++#ifdef H5_HAVE_Fortran_INTEGER_SIZEOF_16 + + f_ptr1 = C_LOC(data0_i32) + f_ptr2 = C_LOC(data_i32(1)) +@@ -936,7 +936,7 @@ SUBROUTINE test_dset_fill(cleanup, total_error) + ENDIF + ENDDO + +-#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0 ++#ifdef H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE + f_ptr1 = C_LOC(data0_r16) + f_ptr2 = C_LOC(data_r16(1)) + +diff --git fortran/test/tH5T_F03.F90 fortran/test/tH5T_F03.F90 +index 632495cb90e..d066db87199 100644 +--- fortran/test/tH5T_F03.F90 ++++ fortran/test/tH5T_F03.F90 +@@ -974,7 +974,7 @@ SUBROUTINE test_h5kind_to_type(total_error) + INTEGER, PARAMETER :: int_kind_4 = SELECTED_INT_KIND(4) !should map to INTEGER*2 on most modern processors + INTEGER, PARAMETER :: int_kind_8 = SELECTED_INT_KIND(9) !should map to INTEGER*4 on most modern processors + INTEGER, PARAMETER :: int_kind_16 = SELECTED_INT_KIND(18) !should map to INTEGER*8 on most modern processors +-#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0 ++#ifdef H5_HAVE_Fortran_INTEGER_SIZEOF_16 + INTEGER, PARAMETER :: int_kind_32 = SELECTED_INT_KIND(36) !should map to INTEGER*16 on most modern processors + INTEGER(int_kind_32), DIMENSION(1:4), TARGET :: dset_data_i32, data_out_i32 + INTEGER(HID_T) :: dset_id32 ! Dataset identifier +@@ -1052,7 +1052,7 @@ SUBROUTINE test_h5kind_to_type(total_error) + dset_data_i4(i) = HUGE(0_int_kind_4)-INT(i,int_kind_4) + dset_data_i8(i) = HUGE(0_int_kind_8)-INT(i,int_kind_8) + dset_data_i16(i) = HUGE(0_int_kind_16)-INT(i,int_kind_16) +-#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0 ++#ifdef H5_HAVE_Fortran_INTEGER_SIZEOF_16 + dset_data_i32(i) = HUGE(0_int_kind_32)-INT(i,int_kind_32) + #endif + dset_data_r(i) = 4.0*ATAN(1.0)-REAL(i-1) +@@ -1080,7 +1080,7 @@ SUBROUTINE test_h5kind_to_type(total_error) + CALL check("H5Dcreate_f",error, total_error) + CALL H5Dcreate_f(file_id, dsetname8, h5kind_to_type(int_kind_16,H5_INTEGER_KIND), dspace_id, dset_id16, error) + CALL check("H5Dcreate_f",error, total_error) +-#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0 ++#ifdef H5_HAVE_Fortran_INTEGER_SIZEOF_16 + CALL H5Dcreate_f(file_id, dsetname16, h5kind_to_type(int_kind_32,H5_INTEGER_KIND), dspace_id, dset_id32, error) + CALL check("H5Dcreate_f",error, total_error) + #endif +@@ -1107,7 +1107,7 @@ SUBROUTINE test_h5kind_to_type(total_error) + f_ptr = C_LOC(dset_data_i16(1)) + CALL h5dwrite_f(dset_id16, h5kind_to_type(int_kind_16,H5_INTEGER_KIND), f_ptr, error) + CALL check("H5Dwrite_f",error, total_error) +-#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0 ++#ifdef H5_HAVE_Fortran_INTEGER_SIZEOF_16 + f_ptr = C_LOC(dset_data_i32(1)) + CALL h5dwrite_f(dset_id32, h5kind_to_type(int_kind_32,H5_INTEGER_KIND), f_ptr, error) + CALL check("H5Dwrite_f",error, total_error) +@@ -1151,7 +1151,7 @@ SUBROUTINE test_h5kind_to_type(total_error) + f_ptr = C_LOC(data_out_i16(1)) + CALL h5dread_f(dset_id16, h5kind_to_type(int_kind_16,H5_INTEGER_KIND), f_ptr, error) + CALL check("h5dread_f",error, total_error) +-#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0 ++#ifdef H5_HAVE_Fortran_INTEGER_SIZEOF_16 + f_ptr = C_LOC(data_out_i32(1)) + CALL h5dread_f(dset_id32, h5kind_to_type(int_kind_32,H5_INTEGER_KIND), f_ptr, error) + CALL check("h5dread_f",error, total_error) +@@ -1175,7 +1175,7 @@ SUBROUTINE test_h5kind_to_type(total_error) + CALL verify("h5kind_to_type",dset_data_i8(i),data_out_i8(i),total_error) + CALL verify("h5kind_to_type",dset_data_i16(i),data_out_i16(i),total_error) + +-#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0 ++#ifdef H5_HAVE_Fortran_INTEGER_SIZEOF_16 + CALL verify("h5kind_to_type",dset_data_i32(i),data_out_i32(i),total_error) + #endif + CALL verify("h5kind_to_type",dset_data_r(i),data_out_r(i),total_error) +diff --git hl/fortran/test/tstlite.F90 hl/fortran/test/tstlite.F90 +index 9916c333625..9f405ce3b35 100644 +--- hl/fortran/test/tstlite.F90 ++++ hl/fortran/test/tstlite.F90 +@@ -430,7 +430,7 @@ SUBROUTINE test_dataset3D() + INTEGER :: type_class + INTEGER(SIZE_T) :: type_size + TYPE(C_PTR) :: f_ptr +-#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0 ++#ifdef H5_HAVE_Fortran_INTEGER_SIZEOF_16 + INTEGER, PARAMETER :: int_kind_32 = SELECTED_INT_KIND(36) !should map to INTEGER*16 on most modern processors + INTEGER(int_kind_32), DIMENSION(DIM1,DIM2,DIM3), TARGET :: dset_data_i32, data_out_i32 + CHARACTER(LEN=7), PARAMETER :: dsetname16a = "dset16a" ! Dataset name +@@ -458,7 +458,7 @@ SUBROUTINE test_dataset3D() + buf2(i,j,k) = INT(n) + buf3(i,j,k) = INT(n) + buf4(i,j,k) = INT(n) +-#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0 ++#ifdef H5_HAVE_Fortran_INTEGER_SIZEOF_16 + dset_data_i32(i,j,k) = HUGE(1_int_kind_32)-INT(n,int_kind_32) + #endif + n = n + 1 +@@ -612,7 +612,7 @@ SUBROUTINE test_dataset3D() + ! CHECKING NON-NATIVE INTEGER TYPES + !------------------------------------------------------------------------- + +-#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0 ++#ifdef H5_HAVE_Fortran_INTEGER_SIZEOF_16 + ! (A) CHECKING INTEGER*16 + ! + ! (i.a) write dataset using F2003 interface +diff --git src/H5pubconf.h.in src/H5pubconf.h.in +index 041d5e96dca..f99ad797f4f 100644 +--- src/H5pubconf.h.in ++++ src/H5pubconf.h.in +@@ -48,7 +48,7 @@ + #define @H5_FC_FUNC_@ + + /* Define if Fortran C_BOOL is different from default LOGICAL */ +-#define H5_FORTRAN_C_BOOL_IS_UNIQUE @H5_FORTRAN_C_BOOL_IS_UNIQUE@ ++#cmakedefine H5_FORTRAN_C_BOOL_IS_UNIQUE + + /* Define if we have Fortran intrinsic C_SIZEOF */ + #cmakedefine H5_FORTRAN_HAVE_C_SIZEOF @H5_FORTRAN_HAVE_C_SIZEOF@ diff --git a/science/hdf5/files/patch-tools-src-misc-h5cc.in.diff b/science/hdf5/files/patch-tools-src-misc-h5cc.in.diff deleted file mode 100644 index 0ed305dabae..00000000000 --- a/science/hdf5/files/patch-tools-src-misc-h5cc.in.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- bin/h5cc.in.orig 2024-04-15 13:47:31.000000000 -0600 -+++ bin/h5cc.in 2024-04-20 15:14:36.000000000 -0600 -@@ -94,9 +94,6 @@ - - CC="${HDF5_CC:-$CCBASE}" - CLINKER="${HDF5_CLINKER:-$CLINKERBASE}" --CFLAGS="${HDF5_CFLAGS:-$CFLAGSBASE}" --CPPFLAGS="${HDF5_CPPFLAGS:-$CPPFLAGSBASE}" --LDFLAGS="${HDF5_LDFLAGS:-$LDFLAGSBASE}" - LIBS="${HDF5_LIBS:-$LIBSBASE}" - - # If a static library is available, the default will be to use it. If the only diff --git a/science/hdfeos5/Portfile b/science/hdfeos5/Portfile index d1bf206cbe2..6f2e2421d3a 100644 --- a/science/hdfeos5/Portfile +++ b/science/hdfeos5/Portfile @@ -5,7 +5,7 @@ PortGroup mpi 1.0 name hdfeos5 version 2.0 -revision 4 +revision 5 categories science license public-domain maintainers {takeshi @tenomoto} diff --git a/science/ismrmrd/Portfile b/science/ismrmrd/Portfile index 56394cc554c..b03d848c3af 100644 --- a/science/ismrmrd/Portfile +++ b/science/ismrmrd/Portfile @@ -14,7 +14,7 @@ maintainers {eborisch @eborisch} openmaintainer license permissive # Keep; can need rebuild for HDF5 on version incompatibilities -revision 0 +revision 1 description ISMRM Raw Data Format long_description ISMRM Raw Data format tools and libraries. diff --git a/science/lal/Portfile b/science/lal/Portfile index 7181cf869cb..4341628af88 100644 --- a/science/lal/Portfile +++ b/science/lal/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 name lal version 7.6.0 -revision 0 +revision 1 description LSC Algorithm Library long_description LIGO Scientific Collaboration Algorithm Library containing core \ diff --git a/science/libmed/Portfile b/science/libmed/Portfile index c7b1f099072..f1e1034f93e 100644 --- a/science/libmed/Portfile +++ b/science/libmed/Portfile @@ -10,7 +10,7 @@ legacysupport.newest_darwin_requires_legacy 10 name libmed version 4.1.1 -revision 4 +revision 5 categories science devel maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer license GPL-3+ LGPL-3+ diff --git a/science/libminc/Portfile b/science/libminc/Portfile index a879751b857..6a9266b5284 100644 --- a/science/libminc/Portfile +++ b/science/libminc/Portfile @@ -7,7 +7,7 @@ PortGroup active_variants 1.1 github.setup BIC-MNI libminc 2.5.0 release- github.tarball_from archive -revision 1 +revision 2 categories science maintainers nomaintainer diff --git a/science/lscsoft-deps/Portfile b/science/lscsoft-deps/Portfile index 381c87d3cf4..3467c2a4ca1 100644 --- a/science/lscsoft-deps/Portfile +++ b/science/lscsoft-deps/Portfile @@ -4,8 +4,8 @@ PortSystem 1.0 name lscsoft-deps version 20200805 -# Note: rebuild afer upgrading HDF5. Keep revision number even if 0. -revision 9 +# 1 rebuild afer upgrading HDF5. Keep revision number even if 0. +revision 10 categories science maintainers nomaintainer platforms any diff --git a/science/luma/Portfile b/science/luma/Portfile index b4bbea01278..57a64ecd1a6 100644 --- a/science/luma/Portfile +++ b/science/luma/Portfile @@ -11,7 +11,7 @@ github.setup cfdemons LUMA 1.7.12 Release_ # Change github.tarball_from to 'releases' or 'archive' next update github.tarball_from tarball name luma -revision 3 +revision 4 categories science license Apache-2 maintainers nomaintainer diff --git a/science/magicspp/Portfile b/science/magicspp/Portfile index bf3239bfeee..a97401832c6 100644 --- a/science/magicspp/Portfile +++ b/science/magicspp/Portfile @@ -9,7 +9,7 @@ if {[variant_isset qt5]} { name magicspp version 4.16.0 -revision 0 +revision 1 maintainers {takeshi @tenomoto} license Apache-2 categories science diff --git a/science/metview/Portfile b/science/metview/Portfile index 8199a77da5d..197211213b2 100644 --- a/science/metview/Portfile +++ b/science/metview/Portfile @@ -7,7 +7,7 @@ PortGroup boost 1.0 name metview version 5.25.1 -revision 0 +revision 1 maintainers {takeshi @tenomoto} license Apache-2 categories science diff --git a/science/mfem/Portfile b/science/mfem/Portfile index bc99d2c6ea4..fea512e8860 100644 --- a/science/mfem/Portfile +++ b/science/mfem/Portfile @@ -10,7 +10,7 @@ PortGroup linear_algebra 1.0 # PortGroup mpi 1.0 github.setup mfem mfem 4.8 v -revision 0 +revision 1 categories science license BSD maintainers nomaintainer diff --git a/science/ncpp/Portfile b/science/ncpp/Portfile index 8ce6912c305..cad1f11e1dd 100644 --- a/science/ncpp/Portfile +++ b/science/ncpp/Portfile @@ -6,7 +6,7 @@ PortGroup github 1.0 github.setup NCAR ncpp 2.3.0 v # Change github.tarball_from to 'releases' or 'archive' next update github.tarball_from tarball -revision 5 +revision 6 categories science license permissive diff --git a/science/netcdf/Portfile b/science/netcdf/Portfile index 61b94a8f229..369bf203cbc 100644 --- a/science/netcdf/Portfile +++ b/science/netcdf/Portfile @@ -12,7 +12,7 @@ legacysupport.newest_darwin_requires_legacy 10 epoch 3 github.setup Unidata netcdf-c 4.10.0 v -revision 1 +revision 2 name netcdf maintainers {takeshi @tenomoto} openmaintainer categories science diff --git a/science/openEMS/Portfile b/science/openEMS/Portfile index 24c2c27dbb3..a8bb9cbff43 100644 --- a/science/openEMS/Portfile +++ b/science/openEMS/Portfile @@ -9,7 +9,7 @@ boost.version 1.81 github.setup thliebig openEMS 32c5c6b537b33a8b70f9ba4f5c9a8ecbb12777b3 version 20260122-[string range ${github.version} 0 7] -revision 1 +revision 2 checksums rmd160 8824177c39eaea6a8a3a1ad0d766bca276b0f5e2 \ sha256 fc2b44c4817bca4085ac7166d000394cfbaa3313bffb8fd9401d7173f3bbab43 \ diff --git a/science/paraview/Portfile b/science/paraview/Portfile index 65afa9929da..4129fcf74a9 100644 --- a/science/paraview/Portfile +++ b/science/paraview/Portfile @@ -8,7 +8,7 @@ PortGroup mpi 1.0 name paraview version 5.6.2 -revision 22 +revision 23 # TODO: Remove, if/when this port is fixed known_fail yes diff --git a/science/silo/Portfile b/science/silo/Portfile index bcffe8116e1..cf74dbe1275 100644 --- a/science/silo/Portfile +++ b/science/silo/Portfile @@ -5,7 +5,7 @@ PortGroup compilers 1.0 name silo version 4.10.2 -revision 17 +revision 18 categories science platforms darwin license BSD diff --git a/science/swarm/Portfile b/science/swarm/Portfile index 6fcf037044e..f31711ea40a 100644 --- a/science/swarm/Portfile +++ b/science/swarm/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 name swarm version 2.4.1 -revision 27 +revision 28 categories science maintainers nomaintainer license GPL-2 diff --git a/science/vapor/Portfile b/science/vapor/Portfile index 56ef5735803..3e14b92c3e3 100644 --- a/science/vapor/Portfile +++ b/science/vapor/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 name vapor version 2.2.4 -revision 32 +revision 33 categories science maintainers nomaintainer description interactive 3D scientific visualization environment diff --git a/science/wgrib2/Portfile b/science/wgrib2/Portfile index b7a4040c274..2114e3eec5d 100644 --- a/science/wgrib2/Portfile +++ b/science/wgrib2/Portfile @@ -9,7 +9,7 @@ legacysupport.newest_darwin_requires_legacy 10 name wgrib2 version 3.1.1 -revision 7 +revision 8 maintainers {takeshi @tenomoto} license public-domain categories science diff --git a/science/xdmf/Portfile b/science/xdmf/Portfile index fb6a7dce87d..6e82fb020b2 100644 --- a/science/xdmf/Portfile +++ b/science/xdmf/Portfile @@ -6,7 +6,7 @@ PortGroup boost 1.0 name xdmf version 3.0.0 -revision 13 +revision 14 categories science devel # cannot find license, assume same as ParaView license BSD diff --git a/science/yorick-hdf5/Portfile b/science/yorick-hdf5/Portfile index cbb705b037c..c74e8de74f3 100644 --- a/science/yorick-hdf5/Portfile +++ b/science/yorick-hdf5/Portfile @@ -7,7 +7,7 @@ set uname hdf5 github.setup frigaut yorick-${uname} 0.8.0 # Change github.tarball_from to 'releases' or 'archive' next update github.tarball_from tarball -revision 14 +revision 15 license GPL-2+ categories science yorick maintainers {thibaut @paumard} openmaintainer diff --git a/textproc/CSXCAD/Portfile b/textproc/CSXCAD/Portfile index 5651c973402..e8f80e8a76d 100644 --- a/textproc/CSXCAD/Portfile +++ b/textproc/CSXCAD/Portfile @@ -12,7 +12,7 @@ version 20260207-0.6.3-[string range ${github.version} 0 7] checksums rmd160 58617d9251d6b834677f1d0a8539456c25e25ff3 \ sha256 45816ea46cc4e9f6cd5e90f2835c04c09d3ce20bc699ae3af9c7bb16d09b88e5 \ size 207477 -revision 1 +revision 2 platforms darwin macosx categories textproc