diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 0b4cbf4ebfd8..ba50c6c2b7b5 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -1,82 +1,82 @@
 PORTNAME=	evolution-data-server
 DISTVERSION=	3.44.4
 PORTREVISION=	9
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Data backends for the Evolution integrated mail/PIM suite
 WWW=		https://wiki.gnome.org/Apps/Evolution
 
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
 		libfribidi.so:converters/fribidi \
 		libgcr-base-3.so:security/gcr3 \
 		libgoa-1.0.so:net/gnome-online-accounts \
 		libgdata.so:devel/libgdata \
 		libharfbuzz.so:print/harfbuzz \
 		libical.so:devel/libical \
 		libnss3.so:security/nss \
 		libicudata.so:devel/icu \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk@40 \
 		libjson-glib-1.0.so:devel/json-glib \
 		libp11-kit.so:security/p11-kit \
 		libnspr4.so:devel/nspr \
 		libsecret-1.so:security/libsecret \
 		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libcanberra.so:audio/libcanberra
 
 PORTSCOUT=	limitw:1,even
 
-USES=		bdb:5 cmake compiler:c++11-lib cpe gettext gnome gperf \
-		iconv:wchar_t localbase pathfix pkgconfig python:build\
+USES=		bdb:5 cmake compiler:c++17-lang cpe gettext gnome gperf \
+		iconv:wchar_t localbase pathfix pkgconfig python:build \
 		sqlite tar:xz xorg
 USE_CXXSTD=	gnu++11
 USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool introspection:build libxml2
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 CPE_VENDOR=	gnome
 
+CMAKE_OFF=	CMAKE_CXX_EXTENSIONS
 CMAKE_ARGS=	-DENABLE_INTROSPECTION=ON \
-		-DENABLE_UOA=OFF
-
-CMAKE_ARGS+=	-DWITH_LIBDB_CFLAGS=-I${LOCALBASE}/include/db5 \
+		-DENABLE_UOA=OFF \
+		-DWITH_LIBDB_CFLAGS=-I${LOCALBASE}/include/db5 \
 		-DWITH_LIBDB_LIBS="-L${LOCALBASE}/lib -ldb-5"
 
 GLIB_SCHEMAS=	org.gnome.evolution-data-server.addressbook.gschema.xml \
 		org.gnome.evolution-data-server.calendar.gschema.xml \
 		org.gnome.evolution-data-server.gschema.xml \
 		org.gnome.Evolution.DefaultSources.gschema.xml \
 		org.gnome.evolution.eds-shell.gschema.xml \
 		org.gnome.evolution.shell.network-config.gschema.xml
 
 PLIST_SUB=	EVO_VERSION="1.2"
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	WEATHER KERBEROS LDAP VAPI
 OPTIONS_DEFAULT=WEATHER KERBEROS LDAP VAPI
 
 KERBEROS_CMAKE_ON=	-DWITH_KRB5=/usr
 KERBEROS_CMAKE_OFF=	-DWITH_KRB5=OFF
 KERBEROS_USES=		ssl
 
 LDAP_CMAKE_ON=		-DWITH_OPENLDAP=${LOCALBASE}
 LDAP_CMAKE_OFF=		-DWITH_OPENLDAP=OFF
 LDAP_USES=		ldap
 
 VAPI_USES=		vala:build
 VAPI_CMAKE_BOOL=	ENABLE_VALA_BINDINGS
 
 WEATHER_DESC=	Weather calendar backend
 WEATHER_LIB_DEPENDS=	libgweather-3.so:net/libgweather
 WEATHER_CMAKE_BOOL=	ENABLE_WEATHER
 
 .include <bsd.port.options.mk>
 
 post-install:
 	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/systemd
 
 .include <bsd.port.mk>
diff --git a/databases/evolution-data-server/files/patch-CMakeLists.txt b/databases/evolution-data-server/files/patch-CMakeLists.txt
index 498ca37305de..54edf6edce36 100644
--- a/databases/evolution-data-server/files/patch-CMakeLists.txt
+++ b/databases/evolution-data-server/files/patch-CMakeLists.txt
@@ -1,10 +1,28 @@
---- CMakeLists.txt.orig	2021-11-05 17:23:17 UTC
+--- CMakeLists.txt.orig	2022-08-05 07:45:35 UTC
 +++ CMakeLists.txt
-@@ -521,6 +521,7 @@ endif(WITH_LIBDB)
+@@ -6,7 +6,7 @@ project(evolution-data-server
+ project(evolution-data-server
+ 	VERSION 3.44.4
+ 	LANGUAGES C CXX)
+-set(CMAKE_CXX_STANDARD 14)
++set(CMAKE_CXX_STANDARD 17)
+ set(PROJECT_BUGREPORT "https://gitlab.gnome.org/GNOME/evolution-data-server/issues/")
+ 
+ # Base Version: This is for API/version tracking for things like
+@@ -358,7 +358,7 @@ endif(WIN32)
+ # ICU started shipping pkg-config files but it's not present
+ # on many systems, if we don't find the pkg-config
+ # file then let's fallback on a manual check
+-pkg_check_modules(ICU icu-i18n)
++pkg_check_modules(ICU icu-i18n icu-uc)
+ 
+ if(NOT ICU_FOUND)
+ 	CHECK_INCLUDE_FILE(unicode/ucol.h HAVE_UNICODE_UCOL_H)
+@@ -526,6 +526,7 @@ set(CMAKE_REQUIRED_LIBRARIES "-liconv")
  # ******************************
  
  set(CMAKE_REQUIRED_LIBRARIES "-liconv")
 +set(CMAKE_REQUIRED_FLAGS "-L/usr/local/lib")
  CHECK_C_SOURCE_COMPILES("#include <iconv.h>
  			#include <stdlib.h>
  			int main(void) { iconv_t cd; cd = iconv_open (\"UTF-8\", \"ISO-8859-1\"); return 0; }" HAVE_LIBICONV)