10 files changed, 32 insertions, 114 deletions
diff --git a/filesystems/mergerfs/Makefile b/filesystems/mergerfs/Makefile
index b774e71a4d12..14705422cba4 100644
--- a/filesystems/mergerfs/Makefile
+++ b/filesystems/mergerfs/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	mergerfs
-DISTVERSION=	2.40.2
+DISTVERSION=	2.41.1
+PORTREVISION=	1
 CATEGORIES=	filesystems
 PKGNAMEPREFIX=	fusefs-
 
@@ -14,7 +15,9 @@ USES=		fuse gmake localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	trapexit
 
-PLIST_FILES=	bin/mergerfs \
+PLIST_FILES=	bin/fsck.mergerfs \
+		bin/mergerfs \
+		bin/mergerfs.collect-info \
 		lib/mergerfs/preload.so \
 		share/man/man1/mergerfs.1.gz
 
diff --git a/filesystems/mergerfs/distinfo b/filesystems/mergerfs/distinfo
index 37bfb871ee16..f0e16a0b6d37 100644
--- a/filesystems/mergerfs/distinfo
+++ b/filesystems/mergerfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1727772197
-SHA256 (trapexit-mergerfs-2.40.2_GH0.tar.gz) = b4f45e635f29b0a8ba1727e6c1f503356d47943a14af8b4586d3e36350f82464
-SIZE (trapexit-mergerfs-2.40.2_GH0.tar.gz) = 743230
+TIMESTAMP = 1764093165
+SHA256 (trapexit-mergerfs-2.41.1_GH0.tar.gz) = 033dd23bef6c87dd7be8776a2ece6f20120cd3ece1feb1fbad6ba54785854aba
+SIZE (trapexit-mergerfs-2.41.1_GH0.tar.gz) = 1220643
diff --git a/filesystems/mergerfs/files/patch-libfuse_lib_cpu.hpp b/filesystems/mergerfs/files/patch-libfuse_lib_cpu.hpp
deleted file mode 100644
index 953ff7e2e86b..000000000000
--- a/filesystems/mergerfs/files/patch-libfuse_lib_cpu.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- libfuse/lib/cpu.hpp.orig	2024-02-29 20:41:22 UTC
-+++ libfuse/lib/cpu.hpp
-@@ -5,8 +5,12 @@
- #endif
- 
- #include <pthread.h>
-+#ifdef __FreeBSD__
-+#define sched_getaffinity(pid, size, set) 0
-+#define pthread_setaffinity_np(thread, size, set) 0
-+#else
- #include <sched.h>
--
-+#endif
- #include <set>
- #include <unordered_map>
- #include <vector>
diff --git a/filesystems/mergerfs/files/patch-libfuse_lib_fuse.c b/filesystems/mergerfs/files/patch-libfuse_lib_fuse.c
deleted file mode 100644
index cdbfe55e710c..000000000000
--- a/filesystems/mergerfs/files/patch-libfuse_lib_fuse.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- libfuse/lib/fuse.c.orig	2024-02-29 20:41:22 UTC
-+++ libfuse/lib/fuse.c
-@@ -48,8 +48,10 @@
- #include <time.h>
- #include <unistd.h>
- 
--#ifdef HAVE_MALLOC_TRIM
-+#ifdef __linux__
- #include <malloc.h>
-+#else
-+#define malloc_trim(x) ((void)(x))
- #endif
- 
- #define FUSE_UNKNOWN_INO UINT64_MAX
diff --git a/filesystems/mergerfs/files/patch-libfuse_lib_fuse.cpp b/filesystems/mergerfs/files/patch-libfuse_lib_fuse.cpp
new file mode 100644
index 000000000000..18fd8b482400
--- /dev/null
+++ b/filesystems/mergerfs/files/patch-libfuse_lib_fuse.cpp
@@ -0,0 +1,17 @@
+--- libfuse/lib/fuse.cpp.orig	2025-11-18 14:35:27 UTC
++++ libfuse/lib/fuse.cpp
+@@ -1636,12 +1636,12 @@ fuse_lib_setattr(fuse_req_t            *req_,
+           if(arg->valid & FATTR_ATIME_NOW)
+             tv[0].tv_nsec = UTIME_NOW;
+           else if(arg->valid & FATTR_ATIME)
+-            tv[0] = (struct timespec){ static_cast<time_t>(arg->atime), arg->atimensec };
++            tv[0] = (struct timespec){ static_cast<time_t>(arg->atime), static_cast<long>(arg->atimensec) };
+ 
+           if(arg->valid & FATTR_MTIME_NOW)
+             tv[1].tv_nsec = UTIME_NOW;
+           else if(arg->valid & FATTR_MTIME)
+-            tv[1] = (struct timespec){ static_cast<time_t>(arg->mtime), arg->mtimensec };
++            tv[1] = (struct timespec){ static_cast<time_t>(arg->mtime), static_cast<long>(arg->mtimensec) };
+ 
+           err = ((fusepath != NULL) ?
+                  f.ops.utimens(&req_->ctx,&fusepath[1],tv) :
diff --git a/filesystems/mergerfs/files/patch-libfuse_util_fusermount.c b/filesystems/mergerfs/files/patch-libfuse_util_fusermount.c
deleted file mode 100644
index 7657ee4ce378..000000000000
--- a/filesystems/mergerfs/files/patch-libfuse_util_fusermount.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- libfuse/util/fusermount.c.orig	2024-02-29 20:41:22 UTC
-+++ libfuse/util/fusermount.c
-@@ -28,7 +28,12 @@
- #include <sys/fsuid.h>
- #include <sys/socket.h>
- #include <sys/utsname.h>
-+#ifdef __linux__
- #include <sched.h>
-+#else
-+#define sched_getaffinity(pid, size, set) 0
-+#define pthread_setaffinity_np(thread, size, set) 0
-+#endif
- 
- #define FUSE_COMMFD_ENV		"_FUSE_COMMFD"
- 
diff --git a/filesystems/mergerfs/files/patch-src_fs__copy__file__range__unsupported.icpp b/filesystems/mergerfs/files/patch-src_fs__copy__file__range__unsupported.icpp
deleted file mode 100644
index 05a307ab97bf..000000000000
--- a/filesystems/mergerfs/files/patch-src_fs__copy__file__range__unsupported.icpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/fs_copy_file_range_unsupported.icpp.orig	2025-08-16 08:24:30 UTC
-+++ src/fs_copy_file_range_unsupported.icpp
-@@ -31,7 +31,7 @@ namespace fs
-                   int64_t            *off_in_,
-                   const int           fd_out_,
-                   int64_t            *off_out_,
--                  const size_t        len_,
-+                  const uint64_t      len_,
-                   const unsigned int  flags_)
-   {
-     return (errno=EOPNOTSUPP,-1);
diff --git a/filesystems/mergerfs/files/patch-src_fs__readahead.cpp b/filesystems/mergerfs/files/patch-src_fs__readahead.cpp
deleted file mode 100644
index 3bb873358455..000000000000
--- a/filesystems/mergerfs/files/patch-src_fs__readahead.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/fs_readahead.cpp.orig	2024-02-29 20:41:22 UTC
-+++ src/fs_readahead.cpp
-@@ -25,7 +25,11 @@
- #include <fstream>
- #include <string>
- 
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#else
- #include <sys/sysmacros.h>
-+#endif
- 
- namespace l
- {
diff --git a/filesystems/mergerfs/files/patch-src_fs__umount2.hpp b/filesystems/mergerfs/files/patch-src_fs__umount2.hpp
deleted file mode 100644
index ce291a314c01..000000000000
--- a/filesystems/mergerfs/files/patch-src_fs__umount2.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/fs_umount2.hpp.orig	2024-02-29 20:41:22 UTC
-+++ src/fs_umount2.hpp
-@@ -19,7 +19,14 @@
- #pragma once
- 
- #include <errno.h>
-+#ifdef __linux__
- #include <sys/mount.h>
-+#else
-+#include <sys/param.h>
-+#include <sys/mount.h>
-+#define umount2(target, flags) unmount(target, flags)
-+#define MNT_DETACH 0
-+#endif
- 
- #include <string>
- 
diff --git a/filesystems/mergerfs/files/patch-tools_preload.c b/filesystems/mergerfs/files/patch-tools_preload.c
index a9a3ad06b3c3..28580071c50d 100644
--- a/filesystems/mergerfs/files/patch-tools_preload.c
+++ b/filesystems/mergerfs/files/patch-tools_preload.c
@@ -1,29 +1,14 @@
---- tools/preload.c.orig	2024-02-29 20:41:22 UTC
+--- tools/preload.c.orig	2025-11-18 14:35:27 UTC
 +++ tools/preload.c
-@@ -25,10 +25,25 @@
- #include <string.h>
+@@ -33,7 +33,11 @@
  #include <sys/ioctl.h>
- #include <stdarg.h>
--#include <sys/stat.h>
-+#include <sys/stat.h>
-+#ifdef __linux__
-+#define S_IFMT S_IFMT
-+#define S_IFREG S_IFREG
-+#else
-+#define S_IFMT 0
-+#define S_IFREG 0
-+#endif
+ #include <sys/stat.h>
  #include <sys/types.h>
- #include <unistd.h>
- #include <fcntl.h>
-+
-+#ifdef __linux__
-+#define O_TMPFILE O_TMPFILE
-+#define O_PATH O_PATH
++#ifdef __FreeBSD__
++#include <sys/extattr.h>
 +#else
-+#define O_TMPFILE 0
-+#define O_PATH 0
+ #include <sys/xattr.h>
 +#endif
+ #include <unistd.h>
  
  typedef char IOCTL_BUF[4096];
- #define IOCTL_APP_TYPE  0xDF