diff --git a/science/cdo/Makefile b/science/cdo/Makefile
index c29dac20b01f..e0e1eecede17 100644
--- a/science/cdo/Makefile
+++ b/science/cdo/Makefile
@@ -1,80 +1,80 @@
 PORTNAME=	cdo
-PORTVERSION=	2.0.6
-PORTREVISION=	2
+PORTVERSION=	2.1.1
 CATEGORIES=	science
-MASTER_SITES=	https://code.mpimet.mpg.de/attachments/download/27276/ \
+MASTER_SITES=	https://code.mpimet.mpg.de/attachments/download/27654/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Climate Data Operators
 WWW=		https://code.mpimet.mpg.de/projects/cdo
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 OPTIONS_DEFINE=	CGRIBEX ECCODES HDF5 JASPER NETCDF PROJ SZIP UDUNITS UUID
 OPTIONS_DEFAULT=CGRIBEX ECCODES HDF5 JASPER NETCDF PROJ SZIP UDUNITS UUID
 OPTIONS_SUB=	yes
 CGRIBEX_DESC=	Use CGRIBEX library for GRIB1 files
 ECCODES_DESC=	Use ecCodes for GRIB files
 HDF5_IMPLIES=	SZIP
 NETCDF_IMPLIES=	HDF5
 UUID_DESC=	UUID support
 
 PORTSCOUT=	site:https://code.mpimet.mpg.de/projects/cdo/files
 
-USES=		compiler:c++17-lang gmake libtool localbase pathfix
+USES=		compiler:c++17-lang gmake libtool localbase pathfix python:build
 
 CONFIGURE_ARGS=	--disable-data \
 		--disable-extra \
 		--disable-fortran \
 		--disable-ieg \
 		--disable-openmp \
 		--disable-service \
 		--enable-cdi-lib \
 		--program-transform-name="" \
 		--with-zlib=/usr
+CONFIGURE_ENV=	PYTHON=${PYTHON_CMD}
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 MAKE_JOBS_UNSAFE=	yes
 TEST_TARGET=	check
 USE_CXXSTD=	c++17
 USE_LDCONFIG=	yes
 
 CGRIBEX_CONFIGURE_WITH=	cgribex
 CGRIBEX_LIB_DEPENDS=	libcgribex.so:science/cgribex
 ECCODES_CONFIGURE_WITH=	eccodes
 ECCODES_LIB_DEPENDS=	libeccodes.so:science/eccodes
 HDF5_CONFIGURE_WITH=	hdf5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 JASPER_CONFIGURE_WITH=	jasper
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 NETCDF_CONFIGURE_WITH=	netcdf
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 PROJ_CONFIGURE_WITH=	proj
 PROJ_LIB_DEPENDS=	libproj.so:graphics/proj
 SZIP_CONFIGURE_WITH=	szlib
 SZIP_LIB_DEPENDS=	libsz.so:science/libaec
 UDUNITS_CONFIGURE_WITH=	udunits2
 UDUNITS_LIB_DEPENDS=	libudunits2.so:science/udunits
 UUID_CONFIGURE_OFF=	ac_cv_func_uuid_create=no ac_cv_have_decl_uuid_create=no ac_cv_have_decl_uuid_generate=no ac_cv_lib_uuid_uuid_generate=no
 UUID_LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "sparc64"
 CFLAGS+=	-DPTHREAD_MUTEXATTR
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS = / s| contrib||' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|$$(libdir)/\($$$$pkgconfigfile\)|${PREFIX}/libdata/\1|' ${WRKSRC}/libcdi/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|unsigned32 |uint32_t |' ${WRKSRC}/libcdi/src/cdilib.c ${WRKSRC}/libcdi/src/util.c
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/libcdi/src/cdi.inc ${STAGEDIR}${PREFIX}/include/cdi.inc
 
 test-NETCDF-on:
 	@cd ${WRKSRC}/ && ${SETENV} CDO_PATH=src/cdo src/cdotest
 
 .include <bsd.port.post.mk>
diff --git a/science/cdo/distinfo b/science/cdo/distinfo
index 4f7eb0320be2..f0cc84e7fb13 100644
--- a/science/cdo/distinfo
+++ b/science/cdo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1661599147
-SHA256 (cdo-2.0.6.tar.gz) = ef120dea9032b1be80a4cfa201958c3b910107205beb6674195675f1ee8ed402
-SIZE (cdo-2.0.6.tar.gz) = 11981469
+TIMESTAMP = 1674589534
+SHA256 (cdo-2.1.1.tar.gz) = c29d084ccbda931d71198409fb2d14f99930db6e7a3654b3c0243ceb304755d9
+SIZE (cdo-2.1.1.tar.gz) = 12079495
diff --git a/science/cdo/files/patch-src_cdo__fft.cc b/science/cdo/files/patch-src_cdo__fft.cc
deleted file mode 100644
index a56fcd9d6428..000000000000
--- a/science/cdo/files/patch-src_cdo__fft.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-- workaround for: https://code.mpimet.mpg.de/issues/10967
-- this fixes compilation failure when std::swap isn't completely defined and it fails with:
-- ld: error: undefined hidden symbol: std::__1::enable_if<(is_move_constructible<double>::value) && (is_move_assignable<double>::value), void>::type std::__1::swap<double>(double&, double&)
-
---- src/cdo_fft.cc.orig	2022-09-17 16:10:25 UTC
-+++ src/cdo_fft.cc
-@@ -1,5 +1,6 @@
- // This source code is copied from PINGO version 1.5
- 
-+#include <algorithm>
- #include <cmath>
- 
- namespace cdo
diff --git a/science/cdo/pkg-plist b/science/cdo/pkg-plist
index 31fd70b318c6..e3e5648b9f86 100644
--- a/science/cdo/pkg-plist
+++ b/science/cdo/pkg-plist
@@ -1,14 +1,14 @@
 bin/cdi
 bin/cdo
 include/calendar.h
 include/cdi.h
 include/cdi.inc
 include/cdi_datetime.h
 include/julian_date.h
-lib/cmake/libcdi/cdi-config-version.cmake
-lib/cmake/libcdi/cdi-config.cmake
+lib/cmake/cdi/cdi-config-version.cmake
+lib/cmake/cdi/cdi-config.cmake
 lib/libcdi.a
 lib/libcdi.so
 lib/libcdi.so.0
 lib/libcdi.so.0.0.0
 libdata/pkgconfig/cdi.pc