diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index e1208fc20932..e56f1c5cd37e 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=	6
+PORTREVISION=	7
 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/gcr \
 		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-gtk3 \
 		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\
 		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_ARGS=	-DENABLE_INTROSPECTION=ON \
 		-DENABLE_UOA=OFF
 
 CMAKE_ARGS+=	-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-src_camel_camel-db.c b/databases/evolution-data-server/files/patch-src_camel_camel-db.c
new file mode 100644
index 000000000000..2ff44c2cb5e8
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-src_camel_camel-db.c
@@ -0,0 +1,36 @@
+Allow evolution to be used when databases/sqlite3 has been compiled
+with option DQS disabled.
+
+--- src/camel/camel-db.c.orig	2024-04-08 09:37:09 UTC
++++ src/camel/camel-db.c
+@@ -1823,8 +1823,8 @@ camel_db_migrate_folder_prepare (CamelDB *cdb,
+ 			"mail_to , mail_cc , mlist , followup_flag , "
+ 			"followup_completed_on , followup_due_by , "
+ 			"part , labels , usertags , cinfo , bdata , '', '', "
+-			"strftime(\"%%s\", 'now'), "
+-			"strftime(\"%%s\", 'now') FROM %Q",
++			"strftime('%%s', 'now'), "
++			"strftime('%%s', 'now') FROM %Q",
+ 			folder_name, folder_name);
+ 		ret = camel_db_add_to_transaction (cdb, table_creation_query, error);
+ 		sqlite3_free (table_creation_query);
+@@ -2093,8 +2093,8 @@ camel_db_write_message_info_record (CamelDB *cdb,
+ 		"%Q, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, "
+ 		"%lld, %lld, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, "
+ 		"%Q, %Q, %Q, %Q, %Q, %Q, %Q, "
+-		"strftime(\"%%s\", 'now'), "
+-		"strftime(\"%%s\", 'now') )",
++		"strftime('%%s', 'now'), "
++		"strftime('%%s', 'now') )",
+ 		folder_name,
+ 		record->uid,
+ 		record->flags,
+@@ -2578,7 +2578,7 @@ camel_db_rename_folder (CamelDB *cdb,
+ 	ret = camel_db_add_to_transaction (cdb, cmd, error);
+ 	sqlite3_free (cmd);
+ 
+-	cmd = sqlite3_mprintf ("UPDATE %Q SET modified=strftime(\"%%s\", 'now'), created=strftime(\"%%s\", 'now')", new_folder_name);
++	cmd = sqlite3_mprintf ("UPDATE %Q SET modified=strftime('%%s', 'now'), created=strftime('%%s', 'now')", new_folder_name);
+ 	ret = camel_db_add_to_transaction (cdb, cmd, error);
+ 	sqlite3_free (cmd);
+