From: Martin Reindl Subject: Re: NEW: archivers/libaec To: Marco van Hulten Cc: ports@openbsd.org Date: Wed, 30 Jul 2025 15:56:17 +0200 > There are many more libraries linked than in your case. How is it > possible that your cdo reads the *.grb file without it being linked to > hdf5? > > I imagine that I should have done something to make cdo work with > netcdf-4.9.2 and that installing netcdf-4.9.3 was not strictly needed. > Is 'make clean' not enough for the ports system to relink to existing > libraries an forget about old ones? > > Apropos, for the updated netcdf, not all patches to the test files > worked, so I skipped the patching (and have not done a make test). If > you want, I could check which patch files are still needed and need > adjustment, but please go ahead if you have the time. I only recompiled the old cdo 1.9.2 code already on my disk, I did not try a newer version. In the hdf5 diff the WANTLIB entries for aec+sz were missing, this is fixed now. The diff below also includes the update for netcdf 4.9.3 with libaec+sz enabled - you're right, some patches can be removed now. -m Index: hdf5/Makefile =================================================================== RCS file: /cvs/ports/math/hdf5/Makefile,v retrieving revision 1.28 diff -u -p -r1.28 Makefile --- hdf5/Makefile 10 Jan 2025 18:03:44 -0000 1.28 +++ hdf5/Makefile 30 Jul 2025 13:40:58 -0000 @@ -3,19 +3,18 @@ ONLY_FOR_ARCHS = ${GCC49_ARCHS} COMMENT = Hierarchical Data Format 5 Technology suite -V = 1.14.4.3 +V = 1.14.6 DISTNAME = hdf5-${V} GH_ACCOUNT = HDFGroup GH_PROJECT = hdf5 GH_TAGNAME = ${DISTNAME:S/-/_/g} -REVISION = 0 -SHARED_LIBS += hdf5 7.0 # 314.0 -SHARED_LIBS += hdf5_cpp 11.0 # 310.4 -SHARED_LIBS += hdf5_hl 6.0 # 310.4 -SHARED_LIBS += hdf5_hl_cpp 7.0 # 3104. -SHARED_LIBS += hdf5_fortran 4.0 # 313.0 -SHARED_LIBS += hdf5hl_fortran 3.0 # 310.4 +SHARED_LIBS += hdf5 8.0 # 315.1 +SHARED_LIBS += hdf5_cpp 12.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 CATEGORIES = math @@ -26,20 +25,22 @@ MAINTAINER = Martin Reindl ./results_test_data/${f}.d4d - if test "x${TEST}" = x1 ; then -- diff -wBb ${BASELINE}/${f}.d4d ./results_test_data/${f}.d4d -+ gdiff -wBb ${BASELINE}/${f}.d4d ./results_test_data/${f}.d4d - elif test "x${RESET}" = x1 ; then - echo "${f}:" - cp ./results_test_data/${f}.d4d ${BASELINE}/${f}.d4d -@@ -77,13 +77,13 @@ if test "x${CDLDIFF}" = x1 ; then - echo "Not found: ${CDLTESTFILES}/${STEM}.cdl" - continue - fi -- echo "diff -wBb ${CDLTESTFILES}/${STEM}.cdl ./results_test_data/${f}.d4d" -+ echo "gdiff -wBb ${CDLTESTFILES}/${STEM}.cdl ./results_test_data/${f}.d4d" - rm -f ./b1 ./b2 ./r1 ./r2 - trim ${CDLTESTFILES}/${STEM}.cdl ./b1 - trim ./results_test_data/${f}.d4d ./r1 - baseclean b1 b2 - resultclean r1 r2 -- diff -wBb ./b2 ./r2 -+ gdiff -wBb ./b2 ./r2 - done - fi - Index: netcdf/patches/patch-dap4_test_test_meta_sh =================================================================== RCS file: netcdf/patches/patch-dap4_test_test_meta_sh diff -N netcdf/patches/patch-dap4_test_test_meta_sh --- netcdf/patches/patch-dap4_test_test_meta_sh 11 Mar 2022 19:36:20 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,30 +0,0 @@ -Index: dap4_test/test_meta.sh ---- dap4_test/test_meta.sh.orig -+++ dap4_test/test_meta.sh -@@ -34,8 +34,8 @@ for f in ${F} ; do - fi - ${NCDUMP} ${DUMPFLAGS} -h ./results_test_meta/${f} > ./results_test_meta/${f}.d4m - if test "x${TEST}" = x1 ; then -- if ! diff -wBb ${BASELINE}/${f}.d4m ./results_test_meta/${f}.d4m ; then -- failure "diff -wBb ${BASELINE}/${f}.ncdump ./results_test_meta/${f}.d4m" -+ if ! gdiff -wBb ${BASELINE}/${f}.d4m ./results_test_meta/${f}.d4m ; then -+ failure "gdiff -wBb ${BASELINE}/${f}.ncdump ./results_test_meta/${f}.d4m" - fi - elif test "x${RESET}" = x1 ; then - echo "${f}:" -@@ -45,12 +45,12 @@ done - - if test "x${CDLDIFF}" = x1 ; then - for f in $CDL ; do -- echo "diff -wBb ${CDLTESTFILES}/${f}.cdl ./results_test_meta/${f}.d4m" -+ echo "gdiff -wBb ${CDLTESTFILES}/${f}.cdl ./results_test_meta/${f}.d4m" - rm -f ./tmp - cat ${CDLTESTFILES}/${f}.cdl \ - cat >./tmp -- echo diff -wBbu ./tmp ./results_test_meta/${f}.d4m -- if ! diff -wBbu ./tmp ./results_test_meta/${f}.d4m ; then -+ echo gdiff -wBbu ./tmp ./results_test_meta/${f}.d4m -+ if ! gdiff -wBbu ./tmp ./results_test_meta/${f}.d4m ; then - failure "${f}" - fi - done Index: netcdf/patches/patch-dap4_test_test_parse_sh =================================================================== RCS file: netcdf/patches/patch-dap4_test_test_parse_sh diff -N netcdf/patches/patch-dap4_test_test_parse_sh --- netcdf/patches/patch-dap4_test_test_parse_sh 16 Apr 2022 11:18:44 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -Index: dap4_test/test_parse.sh ---- dap4_test/test_parse.sh.orig -+++ dap4_test/test_parse.sh -@@ -20,16 +20,16 @@ for f in $F ; do - echo "testing: $f" - ${VG} ${execdir}/test_parse ${DMRTESTFILES}/${f}.dmr > ./results_test_parse/${f}.d4p - if test "x${TEST}" = x1 ; then -- diff -wBb ${BASELINE}/${f}.d4p ./results_test_parse/${f}.d4p -+ gdiff -wBb ${BASELINE}/${f}.d4p ./results_test_parse/${f}.d4p - elif test "x${DIFF}" = x1 ; then -- echo "diff -wBb ${DMRTESTFILES}/${f}.dmr ./results_test_parse/${f}.d4p" -+ echo "gdiff -wBb ${DMRTESTFILES}/${f}.dmr ./results_test_parse/${f}.d4p" - rm -f ./tmp - cat ./results_test_parse/${f}.d4p \ - | sed -e '//d' -e '/'/d -e '/'/d -e '/'/d \ - | sed -e '/<\/Dimensions>/d' -e '/<\/Types>'/d -e '/<\/Variables>'/d -e '/<\/Groups>'/d \ - | sed -e '/_edu.ucar.opaque.size/,+2d' \ - | cat > ./tmp -- diff -wBb ${DMRTESTFILES}/${f}.dmr ./tmp -+ gdiff -wBb ${DMRTESTFILES}/${f}.dmr ./tmp - elif test "x${RESET}" = x1 ; then - echo "${f}:" - cp ./results_test_parse/${f}.d4p ${BASELINE}/${f}.d4p Index: netcdf/patches/patch-dap4_test_test_raw_sh =================================================================== RCS file: netcdf/patches/patch-dap4_test_test_raw_sh diff -N netcdf/patches/patch-dap4_test_test_raw_sh --- netcdf/patches/patch-dap4_test_test_raw_sh 16 Apr 2022 11:18:44 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,25 +0,0 @@ -Index: dap4_test/test_raw.sh ---- dap4_test/test_raw.sh.orig -+++ dap4_test/test_raw.sh -@@ -52,8 +52,8 @@ for f in $F ; do - failure "${URL}" - fi - if test "x${TEST}" = x1 ; then -- if ! diff -wBb ${BASELINERAW}/${f}.dmp ${builddir}/results_test_raw/${f}.dmp ; then -- failure "diff ${f}.dmp" -+ if ! gdiff -wBb ${BASELINERAW}/${f}.dmp ${builddir}/results_test_raw/${f}.dmp ; then -+ failure "gdiff ${f}.dmp" - fi - elif test "x${RESET}" = x1 ; then - echo "${f}:" -@@ -61,8 +61,8 @@ for f in $F ; do - elif test "x${DIFF}" = x1 ; then - echo "hdrtest: ${f}" - baseclean -- if ! diff -wBb ${BASELINERAW}/${f}.dmp ${BASELINE}/${f}.ncdump ; then -- failure diff -wBb ${BASELINERAW}/${f}.dmp ${BASELINE}/${f}.ncdump -+ if ! gdiff -wBb ${BASELINERAW}/${f}.dmp ${BASELINE}/${f}.ncdump ; then -+ failure gdiff -wBb ${BASELINERAW}/${f}.dmp ${BASELINE}/${f}.ncdump - fi - fi - done Index: netcdf/patches/patch-dap4_test_test_remote_sh =================================================================== RCS file: netcdf/patches/patch-dap4_test_test_remote_sh diff -N netcdf/patches/patch-dap4_test_test_remote_sh --- netcdf/patches/patch-dap4_test_test_remote_sh 11 Mar 2022 19:36:20 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -Index: dap4_test/test_remote.sh ---- dap4_test/test_remote.sh.orig -+++ dap4_test/test_remote.sh -@@ -77,8 +77,8 @@ for f in $F ; do - failure "${URL}" - fi - if test "x${TEST}" = x1 ; then -- if ! diff -wBb "${BASELINEREM}/${f}.dmp" "${builddir}/results_test_remote/${f}.dmp" ; then -- failure "diff ${f}.dmp" -+ if ! gdiff -wBb "${BASELINEREM}/${f}.dmp" "${builddir}/results_test_remote/${f}.dmp" ; then -+ failure "gdiff ${f}.dmp" - fi - elif test "x${RESET}" = x1 ; then - echo "${f}:" Index: netcdf/patches/patch-nc_test4_findplugin_in =================================================================== RCS file: netcdf/patches/patch-nc_test4_findplugin_in diff -N netcdf/patches/patch-nc_test4_findplugin_in --- netcdf/patches/patch-nc_test4_findplugin_in 15 Oct 2023 13:42:14 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,9 +0,0 @@ -Index: nc_test4/findplugin.in ---- nc_test4/findplugin.in.orig -+++ nc_test4/findplugin.in -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/env bash - - # Define a function that attempts to locate a - # plugin with a given canonical name. Index: netcdf/patches/patch-ncdump_test_rcmerge_sh =================================================================== RCS file: netcdf/patches/patch-ncdump_test_rcmerge_sh diff -N netcdf/patches/patch-ncdump_test_rcmerge_sh --- netcdf/patches/patch-ncdump_test_rcmerge_sh 15 Oct 2023 13:42:14 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -Index: ncdump/test_rcmerge.sh ---- ncdump/test_rcmerge.sh.orig -+++ ncdump/test_rcmerge.sh -@@ -105,7 +105,7 @@ mergecase3() { - # Test cross file overrides - resetrc - rm -f tmp_rcmerge.txt tmp_rcmerge.txt -- echo "ncrc=ncrc1" >> $HOME/.ncrc -+ echo "ncrc=ncrc1" >> $RCHOME/.ncrc - echo "ncrcx=ncrcx" >> $RCHOME/.ncrc - echo "ncrc=ncrc2" >> $RCHOME/.dodsrc - echo "daprc=daprc" >> $RCHOME/.daprc Index: netcdf/pkg/PLIST =================================================================== RCS file: /cvs/ports/math/netcdf/pkg/PLIST,v retrieving revision 1.12 diff -u -p -r1.12 PLIST --- netcdf/pkg/PLIST 3 May 2023 09:19:14 -0000 1.12 +++ netcdf/pkg/PLIST 30 Jul 2025 13:40:58 -0000 @@ -5,6 +5,36 @@ bin/nc-config @bin bin/ncgen @bin bin/ncgen3 @bin bin/ocprint +hdf5/ +hdf5/lib/ +hdf5/lib/plugin/ +@static-lib hdf5/lib/plugin/lib__nch5blosc.a +hdf5/lib/plugin/lib__nch5blosc.la +@so hdf5/lib/plugin/lib__nch5blosc.so +@static-lib hdf5/lib/plugin/lib__nch5bzip2.a +hdf5/lib/plugin/lib__nch5bzip2.la +@so hdf5/lib/plugin/lib__nch5bzip2.so +@static-lib hdf5/lib/plugin/lib__nch5deflate.a +hdf5/lib/plugin/lib__nch5deflate.la +@so hdf5/lib/plugin/lib__nch5deflate.so +@static-lib hdf5/lib/plugin/lib__nch5fletcher32.a +hdf5/lib/plugin/lib__nch5fletcher32.la +@so hdf5/lib/plugin/lib__nch5fletcher32.so +@static-lib hdf5/lib/plugin/lib__nch5shuffle.a +hdf5/lib/plugin/lib__nch5shuffle.la +@so hdf5/lib/plugin/lib__nch5shuffle.so +@static-lib hdf5/lib/plugin/lib__nch5szip.a +hdf5/lib/plugin/lib__nch5szip.la +@so hdf5/lib/plugin/lib__nch5szip.so +@static-lib hdf5/lib/plugin/lib__nch5zstd.a +hdf5/lib/plugin/lib__nch5zstd.la +@so hdf5/lib/plugin/lib__nch5zstd.so +@static-lib hdf5/lib/plugin/lib__nczhdf5filters.a +hdf5/lib/plugin/lib__nczhdf5filters.la +@so hdf5/lib/plugin/lib__nczhdf5filters.so +@static-lib hdf5/lib/plugin/lib__nczstdfilters.a +hdf5/lib/plugin/lib__nczstdfilters.la +@so hdf5/lib/plugin/lib__nczstdfilters.so include/netcdf.h include/netcdf_aux.h include/netcdf_dispatch.h @@ -14,6 +44,7 @@ include/netcdf_filter_hdf5_build.h include/netcdf_json.h include/netcdf_mem.h include/netcdf_meta.h +include/netcdf_proplist.h @static-lib lib/libnetcdf.a lib/libnetcdf.la lib/libnetcdf.settings