Index | Thread | Search

From:
"Marco van Hulten" <marco@hulten.org>
Subject:
Re: [update] geo/cdo-2.6.4
To:
"Martin Reindl" <martin@catai.org>, <ports@openbsd.org>
Date:
Sun, 27 Sep 2026 22:15:06 +0200

Download raw body.

Thread
Hi Martin,

On Sun Sep 27, 2026 at 11:43 AM CEST, Martin Reindl wrote:
> Am 14.09.26 um 12:24 schrieb Marco van Hulten:
>> Below update to Climate Data Operators (CDO).
>> 
>> This works with netcdf both linked to hdf5-1.14.6 and hdf5-2.2.0.
>> 
>>  Marco
>> 
>
> Hi Marco,
>
> needs an easy fix for WANTLIB:
>
> $ make port-lib-depends-check
>
> cdo-2.6.4(geo/cdo):
> Missing: iconv.7 from libiconv-1.19 (/usr/local/bin/cdo)
> Missing: lz4.3 from lz4-1.10.0 (/usr/local/bin/cdo)
> Missing: lzma.2 from xz-5.8.4 (/usr/local/bin/cdo)
> Missing: snappy.3 from snappy-1.1.10p3 (/usr/local/bin/cdo)
> WANTLIB += iconv lz4 lzma snappy
> *** Error 1 in target 'port-lib-depends-check' (ignored)

Thanks for testing.

For my make check-shlib-syms does not show this.  I am on current (base
and packages and checked out latest ports CVS tree) and have other
changes in related packages:

- archivers/libaec  Updated and moved to CMake
- geo/nco           Updated and removed sz, because it links to hdf5,
                    which links to libaec which already provides sz
- math/netcdf       Removed sz and libaec dependency (same reason)

This seems fine, as 'nc-config --has-szlib' returns yes.  I am not sure
if any of these packages' changes explain our discrepency in the
port-lib-depends-check, but here are follow those changes (also cdo) to
minimise differences.


diff -u -r archivers/libaec/Makefile mystuff/archivers/libaec/Makefile
--- archivers/libaec/Makefile	Fri Jul  4 21:09:54 2025
+++ mystuff/archivers/libaec/Makefile	Sun Sep 27 15:47:37 2026
@@ -1,10 +1,10 @@
 COMMENT =	fast lossless compression, implementing Golomb-Rice coding
 
-VERSION =	1.1.4
-DISTNAME =	libaec-$(VERSION)
+VERSION =		1.1.7
+DISTNAME =		libaec-$(VERSION)
 
-SHARED_LIBS +=	aec                  0.0      # 1.4
-SHARED_LIBS +=	sz                   0.0      # 2.1
+SHARED_LIBS +=		aec	0.0 # 1.4
+SHARED_LIBS +=		sz	0.0 # 2.1
 
 CATEGORIES =		archivers
 
@@ -17,8 +17,7 @@
 
 SITES =			https://github.com/MathisRosenhauer/libaec/releases/download/v$(VERSION)/
 
-SEPARATE_BUILD =	Yes
-
-CONFIGURE_STYLE =	gnu
+MODULES =		devel/cmake
+CONFIGURE_ARGS +=	-DBUILD_STATIC_LIBS=OFF
 
 .include <bsd.port.mk>
diff -u -r archivers/libaec/distinfo mystuff/archivers/libaec/distinfo
--- archivers/libaec/distinfo	Fri Jul  4 21:09:54 2025
+++ mystuff/archivers/libaec/distinfo	Mon Sep 14 16:14:44 2026
@@ -1,2 +1,2 @@
-SHA256 (libaec-1.1.4.tar.gz) = G587kT2REUaag4IKtiu2qfPsel+bbWgXYXdq7Lx/774=
-SIZE (libaec-1.1.4.tar.gz) = 3148407
+SHA256 (libaec-1.1.7.tar.gz) = zHuTvpAC4lqItF1rjV9hIHVsteEABhP5HYA84L66JNk=
+SIZE (libaec-1.1.7.tar.gz) = 3152700
diff -u -r archivers/libaec/pkg/PLIST mystuff/archivers/libaec/pkg/PLIST
--- archivers/libaec/pkg/PLIST	Fri Jul  4 21:09:54 2025
+++ mystuff/archivers/libaec/pkg/PLIST	Wed Sep 16 11:43:11 2026
@@ -1,8 +1,10 @@
 include/libaec.h
 include/szlib.h
-@static-lib lib/libaec.a
-lib/libaec.la
+lib/cmake/
+lib/cmake/libaec/
+lib/cmake/libaec/libaec-config-version.cmake
+lib/cmake/libaec/libaec-config.cmake
+lib/cmake/libaec/libaec_shared-targets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/libaec/libaec_shared-targets.cmake
 @lib lib/libaec.so.${LIBaec_VERSION}
-@static-lib lib/libsz.a
-lib/libsz.la
 @lib lib/libsz.so.${LIBsz_VERSION}
diff -u -r geo/nco/Makefile mystuff/geo/nco/Makefile
--- geo/nco/Makefile	Sun Apr 12 09:23:02 2026
+++ mystuff/geo/nco/Makefile	Sun Sep 27 14:46:51 2026
@@ -1,6 +1,6 @@
 COMMENT =		CLI tools to manipulate and analyse netCDF/HDF/DAP data
 
-DIST_TUPLE +=		github nco nco 5.3.8 .
+DIST_TUPLE +=		github nco nco 5.4.0 .
 
 SHARED_LIBS +=		nco	0.0 # 0.0
 
@@ -19,7 +19,7 @@
 
 WANTLIB += aec blosc bz2 c crypto curl execinfo expat gsl gslcblas
 WANTLIB += hdf5 hdf5_hl iconv intl m netcdf nghttp2 nghttp3 ngtcp2
-WANTLIB += ngtcp2_crypto_libressl pthread ssl sz udunits2 xml2
+WANTLIB += ngtcp2_crypto_libressl pthread ssl udunits2 xml2
 WANTLIB += z zip zstd
 
 CONFIGURE_STYLE =	autoreconf
diff -u -r geo/nco/distinfo mystuff/geo/nco/distinfo
--- geo/nco/distinfo	Sun Apr 12 09:23:02 2026
+++ mystuff/geo/nco/distinfo	Sat Sep 26 17:31:08 2026
@@ -1,2 +1,2 @@
-SHA256 (nco-nco-5.3.8.tar.gz) = 8jsLlVJUc9MFqxW5YmbRRY49+hk7nucBr4JpE2AtRz0=
-SIZE (nco-nco-5.3.8.tar.gz) = 6894442
+SHA256 (nco-nco-5.4.0.tar.gz) = xuA8rL3n6ukI6r/mWywe3HsXVOB1l7j3/i/IlPIbLco=
+SIZE (nco-nco-5.4.0.tar.gz) = 6915890
diff -u -r geo/nco/pkg/PLIST mystuff/geo/nco/pkg/PLIST
--- geo/nco/pkg/PLIST	Sun Feb 15 17:54:22 2026
+++ mystuff/geo/nco/pkg/PLIST	Sat Sep 26 17:31:28 2026
@@ -16,9 +16,10 @@
 @bin bin/ncwa
 bin/ncz2psx
 @info info/nco.info
+@so lib/libnco-5.4.0.so
 @static-lib lib/libnco.a
 lib/libnco.la
-@lib lib/libnco.so.${LIBnco_VERSION}
+@so lib/libnco.so
 @man man/man1/ncap2.1
 @man man/man1/ncatted.1
 @man man/man1/ncbo.1
diff -u -r math/netcdf/Makefile mystuff/math/netcdf/Makefile
--- math/netcdf/Makefile	Mon Sep 14 10:58:43 2026
+++ mystuff/math/netcdf/Makefile	Sat Sep 26 22:51:08 2026
@@ -4,7 +4,7 @@
 NAME=		netcdf
 DISTNAME=	${NAME}-c-${V}
 PKGNAME=	${NAME}-${V}
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	math
 
@@ -21,11 +21,10 @@
 
 WANTLIB+=	${COMPILER_LIBCXX} aec blosc bz2 c crypto curl execinfo
 WANTLIB+=	hdf5 hdf5_hl iconv lz4 lzma m nghttp2 nghttp3 ngtcp2
-WANTLIB+=	ngtcp2_crypto_libressl pthread ssl snappy sz xml2 z zip zstd
+WANTLIB+=	ngtcp2_crypto_libressl pthread ssl snappy xml2 z zip zstd
 
 # curl is needed for DAP support
 LIB_DEPENDS=		archivers/blosc \
-			archivers/libaec \
 			archivers/libzip \
 			math/hdf5 \
 			net/curl \
diff -u -r geo/cdo/Makefile mystuff/geo/cdo/Makefile
--- geo/cdo/Makefile	Sat Apr 11 19:21:09 2026
+++ mystuff/geo/cdo/Makefile	Mon Sep 14 12:07:19 2026
@@ -1,6 +1,6 @@
 COMMENT =		manipulate and analyse climate and NWP model data
 
-DISTNAME =		cdo-2.6.0
+DISTNAME =		cdo-2.6.4
 
 CATEGORIES =		geo
 
@@ -12,7 +12,7 @@
 PERMIT_PACKAGE =	Yes
 
 # number changes at newer version
-SITES =			https://code.mpimet.mpg.de/attachments/download/30182/
+SITES =			https://code.mpimet.mpg.de/attachments/download/30242/
 
 COMPILER =		base-clang ports-gcc
 
diff -u -r geo/cdo/distinfo mystuff/geo/cdo/distinfo
--- geo/cdo/distinfo	Sat Apr 11 19:21:09 2026
+++ mystuff/geo/cdo/distinfo	Fri Sep 11 09:43:06 2026
@@ -1,2 +1,2 @@
-SHA256 (cdo-2.6.0.tar.gz) = dS1c2m+j/bigTc6havWRjl+fVGV9ml0uNa409XVcMdg=
-SIZE (cdo-2.6.0.tar.gz) = 13654519
+SHA256 (cdo-2.6.4.tar.gz) = mI2U+A1yNQa9Bh+9/s3OJBKvqzf3tc8Bo3mkWKh5kjQ=
+SIZE (cdo-2.6.4.tar.gz) = 13219087