diff --git a/filesystems/gvfs/Makefile b/filesystems/gvfs/Makefile
index f43683c48846..1272366c0d4a 100644
--- a/filesystems/gvfs/Makefile
+++ b/filesystems/gvfs/Makefile
@@ -1,89 +1,88 @@
 PORTNAME=	gvfs
 DISTVERSION=	1.56.1
 PORTREVISION=	1
 CATEGORIES=	filesystems devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME virtual file system
 WWW=		https://www.gnome.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl
 LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 		libdbus-1.so:devel/dbus \
 		libgcr-4.so:security/gcr \
 		libsoup-3.0.so:devel/libsoup3 \
 		libgudev-1.0.so:devel/libgudev \
 		libudisks2.so:sysutils/libudisks \
 		libsecret-1.so:security/libsecret
 RUN_DEPENDS=	bsdisks>0:sysutils/bsdisks \
 		lsof:sysutils/lsof
-PORTSCOUT=	limitw:1,even
 
 USES=		cpe gettext gnome libarchive localbase meson \
 		pkgconfig python:build tar:xz
+CPE_VENDOR=	gnome
 USE_GNOME=	glib20 libxml2 libxslt:build
+GLIB_SCHEMAS=	org.gnome.system.gvfs.enums.xml
 MESON_ARGS=	-Dsystemduserunitdir=no \
 		-Dtmpfilesdir=no \
 		-Dadmin=false \
 		-Dlogind=false \
 		-Dlibusb=false \
 		-Dman=true
-USE_LDCONFIG=	yes
-CPE_VENDOR=	gnome
 
-GLIB_SCHEMAS=	org.gnome.system.gvfs.enums.xml
+PORTSCOUT=	limitw:1,even
 
-OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	AVAHI FUSE AFC GOA SMB CDDA GOOGLE GPHOTO MTP NFS BLURAY
 OPTIONS_DEFAULT=AVAHI SMB CDDA GPHOTO MTP NFS BLURAY
+OPTIONS_SUB=	yes
 
 AFC_DESC=	Apple device support
+BLURAY_DESC=	Blu-ray metadata support
 GOA_DESC=	GNOME Online Accounts volume monitor support
 GOOGLE_DESC=	Google backend
 
+AFC_LIB_DEPENDS=	libimobiledevice-1.0.so:comms/libimobiledevice \
+			libplist-2.0.so:devel/libplist
+AFC_MESON_TRUE=		afc
+
 AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 AVAHI_MESON_TRUE=	dnssd
 AVAHI_VARS=		GLIB_SCHEMAS+=org.gnome.system.dns_sd.gschema.xml
 
 BLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
 BLURAY_MESON_TRUE=	bluray
-BLURAY_DESC=		Blu-ray metadata support
+
+CDDA_LIB_DEPENDS=	libcdio_paranoia.so:sysutils/libcdio-paranoia \
+			libcdio.so:sysutils/libcdio
+CDDA_MESON_TRUE=	cdda
 
 FUSE_USES=		fuse:3
 FUSE_MESON_TRUE=	fuse
 
-AFC_LIB_DEPENDS=	libimobiledevice-1.0.so:comms/libimobiledevice \
-			libplist-2.0.so:devel/libplist
-AFC_MESON_TRUE=		afc
-
 GOA_LIB_DEPENDS=	libgoa-1.0.so:net/gnome-online-accounts \
-			libmsgraph-0.so:net/msgraph
+			libmsgraph-1.so:net/msgraph
 GOA_MESON_TRUE=		goa onedrive
 
-SMB_USES=		samba:lib
-SMB_MESON_TRUE=		smb
-SMB_VARS=		GLIB_SCHEMAS+=org.gnome.system.smb.gschema.xml
-
-CDDA_LIB_DEPENDS=	libcdio_paranoia.so:sysutils/libcdio-paranoia \
-			libcdio.so:sysutils/libcdio
-CDDA_MESON_TRUE=	cdda
-
 GOOGLE_IMPLIES=		GOA
 GOOGLE_LIB_DEPENDS=	libgdata.so:devel/libgdata
 GOOGLE_MESON_TRUE=	google
 
 GPHOTO_LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
 GPHOTO_MESON_TRUE=	gphoto2
 
 MTP_LIB_DEPENDS=	libmtp.so:multimedia/libmtp
 MTP_MESON_TRUE=		mtp
 
 NFS_LIB_DEPENDS=	libnfs.so:net/libnfs
 NFS_MESON_TRUE=		nfs
 
+SMB_USES=		samba:lib
+SMB_MESON_TRUE=		smb
+SMB_VARS=		GLIB_SCHEMAS+=org.gnome.system.smb.gschema.xml
+
 .include <bsd.port.mk>
diff --git a/filesystems/gvfs/files/patch-client_gvfsfusedaemon.c b/filesystems/gvfs/files/patch-client_gvfsfusedaemon.c
index 0d9c69189b48..0b7b9cce8a4f 100644
--- a/filesystems/gvfs/files/patch-client_gvfsfusedaemon.c
+++ b/filesystems/gvfs/files/patch-client_gvfsfusedaemon.c
@@ -1,12 +1,12 @@
---- client/gvfsfusedaemon.c.orig	2012-05-15 20:01:49.000000000 +0200
-+++ client/gvfsfusedaemon.c	2012-05-31 14:00:26.000000000 +0200
-@@ -2361,7 +2361,9 @@
+--- client/gvfsfusedaemon.c.orig	2024-10-18 10:28:21 UTC
++++ client/gvfsfusedaemon.c
+@@ -2478,7 +2478,9 @@ vfs_init (struct fuse_conn_info *conn, struct fuse_con
    subthread = g_thread_new ("gvfs-fuse-sub", (GThreadFunc) subthread_main, NULL);
  
    /* Indicate O_TRUNC support for open() */
 +#ifdef FUSE_CAP_ATOMIC_O_TRUNC
    conn->want |= FUSE_CAP_ATOMIC_O_TRUNC;
 +#endif
  
-   return NULL;
- }
+   /* Prevent out-of-order readahead */
+   conn->want &= ~FUSE_CAP_ASYNC_READ;
diff --git a/filesystems/gvfs/files/patch-daemon_gvfswritechannel.c b/filesystems/gvfs/files/patch-daemon_gvfswritechannel.c
index 54c4216873e4..8e0bbde1850d 100644
--- a/filesystems/gvfs/files/patch-daemon_gvfswritechannel.c
+++ b/filesystems/gvfs/files/patch-daemon_gvfswritechannel.c
@@ -1,10 +1,10 @@
---- daemon/gvfswritechannel.c.orig	2007-12-22 18:50:10.000000000 -0500
-+++ daemon/gvfswritechannel.c	2007-12-22 18:50:20.000000000 -0500
-@@ -30,6 +30,7 @@
+--- daemon/gvfswritechannel.c.orig	2024-10-18 10:28:21 UTC
++++ daemon/gvfswritechannel.c
+@@ -29,6 +29,7 @@
+ #include <sys/socket.h>
  #include <sys/un.h>
- #include <unistd.h>
  #include <fcntl.h>
 +#include <string.h>
  
  #include <glib.h>
  #include <glib-object.h>