772 files changed, 573 insertions, 399 deletions

diff --git a/MOVED b/MOVED
index 01827ebfa23a..8fbe54ce170a 100644
--- a/MOVED
+++ b/MOVED
@@ -3577,3 +3577,143 @@ misc/uk-phone||2024-10-31|Has expired: Obsolete, 20+ year old data
 textproc/ssddiff||2024-10-31|Has expired: Abandonware, unfetchable and upstream is gone
 sysutils/pydf||2024-11-02|Has expired: Inactive upstream. Does not properly work on FreeBSD
 ports-mgmt/freebsd-bugzilla-cli||2024-11-02|Has expired: Broken. Upstream unavailable
+sysutils/zap|filesystems/zap|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-mergerfs|filesystems/mergerfs|2024-11-06|Moved to new category filesystems
+sysutils/squashfs-tools-ng|filesystems/squashfs-tools-ng|2024-11-06|Moved to new category filesystems
+sysutils/squashfs-tools|filesystems/squashfs-tools|2024-11-06|Moved to new category filesystems
+sysutils/py-zfs-autobackup|filesystems/py-zfs-autobackup|2024-11-06|Moved to new category filesystems
+sysutils/linux-c7-dosfstools|filesystems/linux-c7-dosfstools|2024-11-06|Moved to new category filesystems
+sysutils/hfsutils|filesystems/hfsutils|2024-11-06|Moved to new category filesystems
+sysutils/hfsexplorer|filesystems/hfsexplorer|2024-11-06|Moved to new category filesystems
+sysutils/fswatch-mon|filesystems/fswatch-mon|2024-11-06|Moved to new category filesystems
+sysutils/fstyp|filesystems/fstyp|2024-11-06|Moved to new category filesystems
+sysutils/zxfer|filesystems/zxfer|2024-11-06|Moved to new category filesystems
+security/py-dfvfs|filesystems/py-dfvfs|2024-11-06|Moved to new category filesystems
+security/cfs|filesystems/cfs|2024-11-06|Moved to new category filesystems
+devel/py-fsspec-xrootd|filesystems/py-fsspec-xrootd|2024-11-06|Moved to new category filesystems
+devel/py-fsspec|filesystems/py-fsspec|2024-11-06|Moved to new category filesystems
+devel/py-fs2|filesystems/py-fs2|2024-11-06|Moved to new category filesystems
+sysutils/zrepl-dsh2dsh|filesystems/zrepl-dsh2dsh|2024-11-06|Moved to new category filesystems
+sysutils/zrepl|filesystems/zrepl|2024-11-06|Moved to new category filesystems
+sysutils/zisofs-tools|filesystems/zisofs-tools|2024-11-06|Moved to new category filesystems
+sysutils/zfstools|filesystems/zfstools|2024-11-06|Moved to new category filesystems
+sysutils/zfsnap2|filesystems/zfsnap2|2024-11-06|Moved to new category filesystems
+sysutils/zfsnap|filesystems/zfsnap|2024-11-06|Moved to new category filesystems
+sysutils/zfs-stats-lite|filesystems/zfs-stats-lite|2024-11-06|Moved to new category filesystems
+sysutils/zfs-stats|filesystems/zfs-stats|2024-11-06|Moved to new category filesystems
+sysutils/zfs-snapshot-mgmt|filesystems/zfs-snapshot-mgmt|2024-11-06|Moved to new category filesystems
+sysutils/zfs-snapshot-clean|filesystems/zfs-snapshot-clean|2024-11-06|Moved to new category filesystems
+sysutils/zfs-snap-diff|filesystems/zfs-snap-diff|2024-11-06|Moved to new category filesystems
+sysutils/zfs-replicate|filesystems/zfs-replicate|2024-11-06|Moved to new category filesystems
+sysutils/zfs-periodic|filesystems/zfs-periodic|2024-11-06|Moved to new category filesystems
+sysutils/xfsprogs|filesystems/xfsprogs|2024-11-06|Moved to new category filesystems
+sysutils/xfsm|filesystems/xfsm|2024-11-06|Moved to new category filesystems
+sysutils/wimlib|filesystems/wimlib|2024-11-06|Moved to new category filesystems
+sysutils/vzvol|filesystems/vzvol|2024-11-06|Moved to new category filesystems
+sysutils/ufs_copy|filesystems/ufs_copy|2024-11-06|Moved to new category filesystems
+sysutils/scan_ffs|filesystems/scan_ffs|2024-11-06|Moved to new category filesystems
+sysutils/rubygem-winrm-fs|filesystems/rubygem-winrm-fs|2024-11-06|Moved to new category filesystems
+sysutils/progsreiserfs|filesystems/progsreiserfs|2024-11-06|Moved to new category filesystems
+sysutils/pear-Horde_Vfs|filesystems/pear-Horde_Vfs|2024-11-06|Moved to new category filesystems
+sysutils/py-prometheus-zfs|filesystems/py-prometheus-zfs|2024-11-06|Moved to new category filesystems
+sysutils/p5-Fuse|filesystems/p5-Fuse|2024-11-06|Moved to new category filesystems
+sysutils/p5-Filesys-Statvfs|filesystems/p5-Filesys-Statvfs|2024-11-06|Moved to new category filesystems
+sysutils/openzfs|filesystems/openzfs|2024-11-06|Moved to new category filesystems
+sysutils/openzfs-kmod|filesystems/openzfs-kmod|2024-11-06|Moved to new category filesystems
+sysutils/ntfs2btrfs|filesystems/ntfs2btrfs|2024-11-06|Moved to new category filesystems
+sysutils/mtpfs|filesystems/mtpfs|2024-11-06|Moved to new category filesystems
+sysutils/moosefs3-netdump|filesystems/moosefs3-netdump|2024-11-06|Moved to new category filesystems
+sysutils/moosefs3-metalogger|filesystems/moosefs3-metalogger|2024-11-06|Moved to new category filesystems
+sysutils/moosefs3-master|filesystems/moosefs3-master|2024-11-06|Moved to new category filesystems
+sysutils/moosefs3-client|filesystems/moosefs3-client|2024-11-06|Moved to new category filesystems
+sysutils/moosefs3-cli|filesystems/moosefs3-cli|2024-11-06|Moved to new category filesystems
+sysutils/moosefs3-chunkserver|filesystems/moosefs3-chunkserver|2024-11-06|Moved to new category filesystems
+sysutils/moosefs3-cgiserv|filesystems/moosefs3-cgiserv|2024-11-06|Moved to new category filesystems
+sysutils/moosefs3-cgi|filesystems/moosefs3-cgi|2024-11-06|Moved to new category filesystems
+sysutils/moosefs2-netdump|filesystems/moosefs2-netdump|2024-11-06|Moved to new category filesystems
+sysutils/moosefs2-metalogger|filesystems/moosefs2-metalogger|2024-11-06|Moved to new category filesystems
+sysutils/moosefs2-master|filesystems/moosefs2-master|2024-11-06|Moved to new category filesystems
+sysutils/moosefs2-client|filesystems/moosefs2-client|2024-11-06|Moved to new category filesystems
+sysutils/moosefs2-cli|filesystems/moosefs2-cli|2024-11-06|Moved to new category filesystems
+sysutils/moosefs2-chunkserver|filesystems/moosefs2-chunkserver|2024-11-06|Moved to new category filesystems
+sysutils/moosefs2-cgiserv|filesystems/moosefs2-cgiserv|2024-11-06|Moved to new category filesystems
+sysutils/moosefs2-cgi|filesystems/moosefs2-cgi|2024-11-06|Moved to new category filesystems
+sysutils/ltfs|filesystems/ltfs|2024-11-06|Moved to new category filesystems
+sysutils/lizardfs|filesystems/lizardfs|2024-11-06|Moved to new category filesystems
+sysutils/kio-fuse|filesystems/kio-fuse|2024-11-06|Moved to new category filesystems
+sysutils/exfat-utils|filesystems/exfat-utils|2024-11-06|Moved to new category filesystems
+sysutils/e2tools|filesystems/e2tools|2024-11-06|Moved to new category filesystems
+sysutils/e2fsprogs|filesystems/e2fsprogs|2024-11-06|Moved to new category filesystems
+sysutils/e2fsprogs-core|filesystems/e2fsprogs-core|2024-11-06|Moved to new category filesystems
+sysutils/darling-dmg|filesystems/darling-dmg|2024-11-06|Moved to new category filesystems
+sysutils/cramfs|filesystems/cramfs|2024-11-06|Moved to new category filesystems
+sysutils/avfs|filesystems/avfs|2024-11-06|Moved to new category filesystems
+sysutils/archivemount|filesystems/archivemount|2024-11-06|Moved to new category filesystems
+sysutils/acfgfs|filesystems/acfgfs|2024-11-06|Moved to new category filesystems
+sysutils/R-cran-fs|filesystems/R-cran-fs|2024-11-06|Moved to new category filesystems
+security/clamfs|filesystems/clamfs|2024-11-06|Moved to new category filesystems
+emulators/mtools|filesystems/mtools|2024-11-06|Moved to new category filesystems
+devel/tclvfs|filesystems/tclvfs|2024-11-06|Moved to new category filesystems
+devel/rubygem-aws-sdk-efs|filesystems/rubygem-aws-sdk-efs|2024-11-06|Moved to new category filesystems
+devel/py-s3fs|filesystems/py-s3fs|2024-11-06|Moved to new category filesystems
+devel/py-pyfakefs|filesystems/py-pyfakefs|2024-11-06|Moved to new category filesystems
+devel/py-llfuse|filesystems/py-llfuse|2024-11-06|Moved to new category filesystems
+devel/py-libzfs|filesystems/py-libzfs|2024-11-06|Moved to new category filesystems
+devel/py-fusepy|filesystems/py-fusepy|2024-11-06|Moved to new category filesystems
+devel/py-gcsfs|filesystems/py-gcsfs|2024-11-06|Moved to new category filesystems
+devel/py-fs|filesystems/py-fs|2024-11-06|Moved to new category filesystems
+devel/libmodi|filesystems/libmodi|2024-11-06|Moved to new category filesystems
+devel/libfsxfs|filesystems/libfsxfs|2024-11-06|Moved to new category filesystems
+devel/libfsntfs|filesystems/libfsntfs|2024-11-06|Moved to new category filesystems
+devel/libfshfs|filesystems/libfshfs|2024-11-06|Moved to new category filesystems
+devel/libfsfat|filesystems/libfsfat|2024-11-06|Moved to new category filesystems
+devel/libfsext|filesystems/libfsext|2024-11-06|Moved to new category filesystems
+devel/libfsapfs|filesystems/libfsapfs|2024-11-06|Moved to new category filesystems
+devel/libbde|filesystems/libbde|2024-11-06|Moved to new category filesystems
+devel/gvfs|filesystems/gvfs|2024-11-06|Moved to new category filesystems
+devel/genromfs|filesystems/genromfs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-zip|filesystems/zip|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-xfuse|filesystems/xfuse|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-webdavfs|filesystems/webdavfs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-unreliablefs|filesystems/unreliablefs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-unionfs|filesystems/unionfs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-ufs|filesystems/ufs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-sshfs|filesystems/sshfs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-squashfuse|filesystems/squashfuse|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-sqlfs|filesystems/sqlfs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-smbnetfs|filesystems/smbnetfs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-simple-mtpfs|filesystems/simple-mtpfs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-securefs|filesystems/securefs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-sandboxfs|filesystems/sandboxfs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-s3fs|filesystems/s3fs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-s3backer|filesystems/s3backer|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-rar2fs|filesystems/rar2fs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-pod|filesystems/pod|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-ntfs-compression|filesystems/ntfs-compression|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-ntfs|filesystems/ntfs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-nbt|filesystems/nbt|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-mp3fs|filesystems/mp3fs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-mhddfs|filesystems/mhddfs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-lkl|filesystems/lkl|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-libs3|filesystems/fusefs-libs3|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-libs|filesystems/fusefs-libs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-jmtpfs|filesystems/jmtpfs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-ifuse|filesystems/ifuse|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-httpfs|filesystems/httpfs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-httpdirfs|filesystems/httpdirfs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-hfsfuse|filesystems/hfsfuse|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-gitfs|filesystems/gitfs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-ext2|filesystems/ext2|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-exfat|filesystems/exfat|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-encfs|filesystems/encfs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-curlftpfs|filesystems/curlftpfs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-cryptofs|filesystems/cryptofs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-chironfs|filesystems/chironfs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-bindfs|filesystems/bindfs|2024-11-06|Moved to new category filesystems
+sysutils/fusefs-afuse|filesystems/afuse|2024-11-06|Moved to new category filesystems
+graphics/fusefs-gphotofs|filesystems/gphotofs|2024-11-06|Moved to new category filesystems
+sysutils/automount|filesystems/automount|2024-11-06|Moved to new category filesystems
+sysutils/dsbmd|filesystems/dsbmd|2024-11-06|Moved to new category filesystems
+sysutils/dsbmc-cli|filesystems/dsbmc-cli|2024-11-06|Moved to new category filesystems
+sysutils/dsbmc|filesystems/dsbmc|2024-11-06|Moved to new category filesystems
+misc/e2fsprogs-libblkid|filesystems/e2fsprogs-libblkid|2024-11-06|Moved to new category filesystems
diff --git a/Makefile b/Makefile
index 54afa22117a3..a04954ee9ecb 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ SUBDIR += editors
 SUBDIR += emulators
 SUBDIR += finance
 SUBDIR += french
+SUBDIR += filesystems
 SUBDIR += ftp
 SUBDIR += games
 SUBDIR += german
diff --git a/Mk/Scripts/desktop-categories.sh b/Mk/Scripts/desktop-categories.sh
index 8daaf2a6d2d7..64478234e70a 100644
--- a/Mk/Scripts/desktop-categories.sh
+++ b/Mk/Scripts/desktop-categories.sh
@@ -36,6 +36,7 @@ for native_category in ${dp_CATEGORIES}; do
 		education)	c="Education"				;;
 		emulators)	c="System Emulator"			;;
 		finance)	c="Office Finance"			;;
+                filesystems)    c="System Filesystem"                   ;;
 		ftp)		c="Network FileTransfer"		;;
 		games)		c="Game"				;;
 		geography)	c="Education Science Geography"		;;
diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh
index cc214ec028ee..3b91e2319571 100644
--- a/Mk/Scripts/qa.sh
+++ b/Mk/Scripts/qa.sh
@@ -577,7 +577,7 @@ proxydeps_suggest_uses() {
 	elif [ ${pkg} = "databases/firebird25-client" ]; then
 		warn "you need USES+=firebird"
 	# fuse
-	elif [ ${pkg} = "sysutils/fusefs-libs" ]; then
+	elif [ ${pkg} = "filesystems/fusefs-libs" ]; then
 		warn "you need USES+=fuse"
 	# gnustep
 	elif [ ${pkg} = "lang/gnustep-base" ]; then
diff --git a/Mk/Uses/fuse.mk b/Mk/Uses/fuse.mk
index 9250a86e2429..db4e6562f739 100644
--- a/Mk/Uses/fuse.mk
+++ b/Mk/Uses/fuse.mk
@@ -14,9 +14,9 @@ LIBFUSE_VER=	${fuse_ARGS}
 LIBFUSE_VER?=	2
 
 .  if ${LIBFUSE_VER} == 2
-LIB_DEPENDS+=	libfuse.so:sysutils/fusefs-libs
+LIB_DEPENDS+=	libfuse.so:filesystems/fusefs-libs
 .  elif ${LIBFUSE_VER} == 3
-LIB_DEPENDS+=	libfuse3.so:sysutils/fusefs-libs3
+LIB_DEPENDS+=	libfuse3.so:filesystems/fusefs-libs3
 .  else
 IGNORE=		cannot install: unknown FUSE library version: ${LIBFUSE_VERSION}
 .  endif
diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk
index 6a994f8d5937..a798196181ca 100644
--- a/Mk/Uses/gnome.mk
+++ b/Mk/Uses/gnome.mk
@@ -309,8 +309,8 @@ gtksharp20_USE_GNOME_IMPL=	gtk20
 libgnomekbd_LIB_DEPENDS=	libgnomekbd.so:x11/libgnomekbd
 libgnomekbd_USE_GNOME_IMPL=	gtk30 libxml2
 
-gvfs_BUILD_DEPENDS=	gvfs>=0:devel/gvfs
-gvfs_RUN_DEPENDS=	gvfs>=0:devel/gvfs
+gvfs_BUILD_DEPENDS=	gvfs>=0:filesystems/gvfs
+gvfs_RUN_DEPENDS=	gvfs>=0:filesystems/gvfs
 
 # End component definition section
 
diff --git a/Mk/Uses/horde.mk b/Mk/Uses/horde.mk
index 39f554a72c42..1704530861cb 100644
--- a/Mk/Uses/horde.mk
+++ b/Mk/Uses/horde.mk
@@ -113,7 +113,7 @@ horde-Horde_Timezone-DEPEND=	${PEARDIR}/Horde/Timezone.php:devel/pear-Horde_Time
 horde-Horde_Token-DEPEND=	${PEARDIR}/Horde/Token.php:devel/pear-Horde_Token
 horde-Horde_Translation-DEPEND=	${PEARDIR}/Horde/Translation.php:devel/pear-Horde_Translation
 horde-Horde_Tree-DEPEND=	${PEARDIR}/Horde/Tree.php:devel/pear-Horde_Tree
-horde-Horde_Vfs-DEPEND=		${PEARDIR}/Horde/Vfs.php:sysutils/pear-Horde_Vfs
+horde-Horde_Vfs-DEPEND=		${PEARDIR}/Horde/Vfs.php:filesystems/pear-Horde_Vfs
 horde-Horde_View-DEPEND=	${PEARDIR}/Horde/View.php:devel/pear-Horde_View
 horde-Horde_Xml_Element-DEPEND=	${PEARDIR}/Horde/Xml/Element.php:textproc/pear-Horde_Xml_Element
 horde-Horde_Xml_Wbxml-DEPEND=	${PEARDIR}/Horde/Xml/Wbxml.php:textproc/pear-Horde_Xml_Wbxml
diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk
index 76a215997cc7..5e927e3e2bbe 100644
--- a/Mk/Uses/linux.mk
+++ b/Mk/Uses/linux.mk
@@ -71,7 +71,7 @@ _linux_${linux_ARGS}_curl=		linux-${linux_ARGS}-curl>0:ftp/linux-${linux_ARGS}-c
 _linux_${linux_ARGS}_cyrus-sasl2=	linux-${linux_ARGS}-cyrus-sasl-lib>0:security/linux-${linux_ARGS}-cyrus-sasl2
 _linux_${linux_ARGS}_dbuslibs=		linux-${linux_ARGS}-dbus-libs>0:devel/linux-${linux_ARGS}-dbus-libs
 _linux_${linux_ARGS}_devtools=		linux-${linux_ARGS}-devtools>0:devel/linux-${linux_ARGS}-devtools
-_linux_c7_dosfstools=			linux-c7-dosfstools>0:sysutils/linux-c7-dosfstools
+_linux_c7_dosfstools=			linux-c7-dosfstools>0:filesystems/linux-c7-dosfstools
 _linux_${linux_ARGS}_dri=		linux-${linux_ARGS}-dri>0:graphics/linux-${linux_ARGS}-dri
 _linux_${linux_ARGS}_elfutils-libelf=	linux-${linux_ARGS}-elfutils-libelf>0:devel/linux-${linux_ARGS}-elfutils-libelf
 _linux_${linux_ARGS}_elfutils-libs=	linux-${linux_ARGS}-elfutils-libs>0:devel/linux-${linux_ARGS}-elfutils-libs
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 669c200f47c6..360fff6fc4cd 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -2583,6 +2583,7 @@ VALID_CATEGORIES+= accessibility afterstep arabic archivers astro audio \
 	benchmarks biology budgie cad chinese comms converters \
 	databases deskutils devel dns docs \
 	editors education elisp emulators enlightenment finance french ftp \
+	filesystems \
 	games geography german gnome gnustep graphics \
 	hamradio haskell hebrew hungarian irc japanese java \
 	kde ${_KDE_CATEGORIES_SUPPORTED} kld korean \
diff --git a/archivers/py-borgbackup/Makefile b/archivers/py-borgbackup/Makefile
index 3a716fc66d52..5e863adb04ab 100644
--- a/archivers/py-borgbackup/Makefile
+++ b/archivers/py-borgbackup/Makefile
@@ -35,7 +35,7 @@ OPTIONS_DEFINE=		FUSE
 OPTIONS_DEFAULT=	FUSE
 
 FUSE_DESC=	Support to mount locally borg backup files
-FUSE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}llfuse>0:devel/py-llfuse@${PY_FLAVOR}
+FUSE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}llfuse>0:filesystems/py-llfuse@${PY_FLAVOR}
 
 .include <bsd.port.pre.mk>
 
diff --git a/archivers/py-borgbackup12/Makefile b/archivers/py-borgbackup12/Makefile
index cc3d95778ab1..5e724fab1309 100644
--- a/archivers/py-borgbackup12/Makefile
+++ b/archivers/py-borgbackup12/Makefile
@@ -36,7 +36,7 @@ OPTIONS_DEFINE=		FUSE
 OPTIONS_DEFAULT=	FUSE
 
 FUSE_DESC=	Support to mount locally borg backup files
-FUSE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}llfuse>0:devel/py-llfuse@${PY_FLAVOR}
+FUSE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}llfuse>0:filesystems/py-llfuse@${PY_FLAVOR}
 
 _BORGHOME=${WRKDIR}/testhome
 _BORGENV=-i BORG_PASSPHRASE=secret123 PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} HOME=${_BORGHOME}
diff --git a/databases/py-duckdb/Makefile b/databases/py-duckdb/Makefile
index 324f30891152..253d5893d687 100644
--- a/databases/py-duckdb/Makefile
+++ b/databases/py-duckdb/Makefile
@@ -14,7 +14,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pybind11>=2.6.0:devel/py-pybind11@${PY_FLA
 		${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>0:devel/py-fsspec@${PY_FLAVOR} \
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>0:filesystems/py-fsspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}google-cloud-storage>0:www/py-google-cloud-storage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mypy>0:devel/py-mypy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
diff --git a/databases/py-fastparquet/Makefile b/databases/py-fastparquet/Makefile
index 3c5aeabe6268..fb513b66004d 100644
--- a/databases/py-fastparquet/Makefile
+++ b/databases/py-fastparquet/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \
 		thrift:devel/thrift
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cramjam>=2.3:archivers/py-cramjam@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}fsspec>=0:devel/py-fsspec@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}fsspec>=0:filesystems/py-fsspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.20.3,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.5.0,1:math/py-pandas@${PY_FLAVOR}
diff --git a/deskutils/kdeconnect-kde/Makefile b/deskutils/kdeconnect-kde/Makefile
index 84ef15d86800..3631a834b8a5 100644
--- a/deskutils/kdeconnect-kde/Makefile
+++ b/deskutils/kdeconnect-kde/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	kpeoplevcard>0:net/kpeoplevcard \
 		wayland-protocols>=0:graphics/wayland-protocols \
 		kirigami-addons>=0.6.1:x11-toolkits/kirigami-addons
 RUN_DEPENDS=	sshpass:security/sshpass \
-		sshfs:sysutils/fusefs-sshfs \
+		sshfs:filesystems/sshfs \
 		kpeoplevcard>0:net/kpeoplevcard \
 		kirigami-addons>=0.6.1:x11-toolkits/kirigami-addons
 
diff --git a/deskutils/qmediamanager/pkg-descr b/deskutils/qmediamanager/pkg-descr
index bb428b325930..f54e8c6f52bf 100644
--- a/deskutils/qmediamanager/pkg-descr
+++ b/deskutils/qmediamanager/pkg-descr
@@ -1,3 +1,3 @@
 QMediaManager is a GUI application for managing removable media.  It is
-meant to be launched by an automount service such as sysutils/automount
+meant to be launched by an automount service such as filesystems/automount
 to provide the user options when removable media are inserted.
diff --git a/deskutils/spacefm/Makefile b/deskutils/spacefm/Makefile
index e7687677b912..2a3bb1f5a5c5 100644
--- a/deskutils/spacefm/Makefile
+++ b/deskutils/spacefm/Makefile
@@ -43,19 +43,19 @@ OPTIONS_GROUP_OPT_DEPS=	CURLFTPFS IFUSE JMTPFS LSOF PHOTOFS
 PORTDOCS=	*
 
 CURLFTPFS_DESC=		Mount FTP shares
-CURLFTPFS_RUN_DEPENDS=	fusefs-curlftpfs>0:sysutils/fusefs-curlftpfs
+CURLFTPFS_RUN_DEPENDS=	fusefs-curlftpfs>0:filesystems/curlftpfs
 
 IFUSE_DESC=		Mount your iPhone/iPod Touch
-IFUSE_RUN_DEPENDS=	fusefs-ifuse>0:sysutils/fusefs-ifuse
+IFUSE_RUN_DEPENDS=	fusefs-ifuse>0:filesystems/ifuse
 
 JMTPFS_DESC=		Mount MTP devices
-JMTPFS_RUN_DEPENDS=	fusefs-jmtpfs>0:sysutils/fusefs-jmtpfs
+JMTPFS_RUN_DEPENDS=	fusefs-jmtpfs>0:filesystems/jmtpfs
 
 LSOF_DESC=		Device processes
 LSOF_RUN_DEPENDS=	lsof:sysutils/lsof
 
 PHOTOFS_DESC=		Mount cameras
-PHOTOFS_RUN_DEPENDS=	fusefs-gphotofs>0:graphics/fusefs-gphotofs
+PHOTOFS_RUN_DEPENDS=	fusefs-gphotofs>0:filesystems/gphotofs
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|' \
diff --git a/deskutils/xdg-desktop-portal/Makefile b/deskutils/xdg-desktop-portal/Makefile
index 55df114a98e2..a25f7fa4cec1 100644
--- a/deskutils/xdg-desktop-portal/Makefile
+++ b/deskutils/xdg-desktop-portal/Makefile
@@ -9,7 +9,7 @@ WWW=		https://github.com/flatpak/xdg-desktop-portal/
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libfuse3.so:sysutils/fusefs-libs3 \
+LIB_DEPENDS=	libfuse3.so:filesystems/fusefs-libs3 \
 		libgeoclue-2.so:net/geoclue \
 		libjson-glib-1.0.so:devel/json-glib \
 		libpipewire-0.3.so:multimedia/pipewire \
diff --git a/devel/Makefile b/devel/Makefile
index 873d4182ce39..4471d057fb87 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -798,7 +798,6 @@
     SUBDIR += gengetopt
     SUBDIR += genht
     SUBDIR += genie
-    SUBDIR += genromfs
     SUBDIR += getoptions
     SUBDIR += gettext
     SUBDIR += gettext-lint
@@ -942,7 +941,6 @@
     SUBDIR += guile-lib
     SUBDIR += gum
     SUBDIR += gumbo
-    SUBDIR += gvfs
     SUBDIR += gvp
     SUBDIR += gwenhywfar
     SUBDIR += gwenhywfar-fox16
@@ -1210,7 +1208,6 @@
     SUBDIR += libayatana-indicator
     SUBDIR += libb2
     SUBDIR += libbacktrace
-    SUBDIR += libbde
     SUBDIR += libbegemot
     SUBDIR += libbfd
     SUBDIR += libbinio
@@ -1293,12 +1290,6 @@
     SUBDIR += libfort
     SUBDIR += libfortuna
     SUBDIR += libfreefare
-    SUBDIR += libfsapfs
-    SUBDIR += libfsext
-    SUBDIR += libfsfat
-    SUBDIR += libfshfs
-    SUBDIR += libfsntfs
-    SUBDIR += libfsxfs
     SUBDIR += libftdi
     SUBDIR += libftdi1
     SUBDIR += libfwnt
@@ -1360,7 +1351,6 @@
     SUBDIR += libmcfp
     SUBDIR += libmill
     SUBDIR += libmimedir
-    SUBDIR += libmodi
     SUBDIR += libmowgli
     SUBDIR += libmowgli2
     SUBDIR += libmpcbdm
@@ -4889,16 +4879,11 @@
     SUBDIR += py-frictionless-ckan-mapper
     SUBDIR += py-frozendict
     SUBDIR += py-frozenlist
-    SUBDIR += py-fs
-    SUBDIR += py-fs2
-    SUBDIR += py-fsspec
-    SUBDIR += py-fsspec-xrootd
     SUBDIR += py-fudge
     SUBDIR += py-funcparserlib
     SUBDIR += py-funcsigs
     SUBDIR += py-funcy
     SUBDIR += py-furl
-    SUBDIR += py-fusepy
     SUBDIR += py-future
     SUBDIR += py-futurist
     SUBDIR += py-fuzzywuzzy
@@ -4907,7 +4892,6 @@
     SUBDIR += py-game_sdl2
     SUBDIR += py-gapic-generator
     SUBDIR += py-gast
-    SUBDIR += py-gcsfs
     SUBDIR += py-gelidum
     SUBDIR += py-genson
     SUBDIR += py-genty
@@ -5148,7 +5132,6 @@
     SUBDIR += py-libusb1
     SUBDIR += py-libversion
     SUBDIR += py-libvirt
-    SUBDIR += py-libzfs
     SUBDIR += py-lief
     SUBDIR += py-line-profiler
     SUBDIR += py-linear-tsv
@@ -5157,7 +5140,6 @@
     SUBDIR += py-littleutils
     SUBDIR += py-livemark
     SUBDIR += py-lizard
-    SUBDIR += py-llfuse
     SUBDIR += py-llvmcpy
     SUBDIR += py-llvmlite
     SUBDIR += py-lml
@@ -5535,7 +5517,6 @@
     SUBDIR += py-pyee11
     SUBDIR += py-pyelftools
     SUBDIR += py-pyface
-    SUBDIR += py-pyfakefs
     SUBDIR += py-pyfcm
     SUBDIR += py-pyflakes
     SUBDIR += py-pyformance
@@ -5834,7 +5815,6 @@
     SUBDIR += py-rush
     SUBDIR += py-rx
     SUBDIR += py-rx1
-    SUBDIR += py-s3fs
     SUBDIR += py-saneyaml
     SUBDIR += py-sarge
     SUBDIR += py-sarif-om
@@ -6564,7 +6544,6 @@
     SUBDIR += rubygem-aws-sdk-ecr
     SUBDIR += rubygem-aws-sdk-ecrpublic
     SUBDIR += rubygem-aws-sdk-ecs
-    SUBDIR += rubygem-aws-sdk-efs
     SUBDIR += rubygem-aws-sdk-eks
     SUBDIR += rubygem-aws-sdk-eksauth
     SUBDIR += rubygem-aws-sdk-elasticache
@@ -8177,7 +8156,6 @@
     SUBDIR += tclreadline
     SUBDIR += tclthread
     SUBDIR += tcltls
-    SUBDIR += tclvfs
     SUBDIR += tclxml
     SUBDIR += tdl
     SUBDIR += template-glib
diff --git a/devel/R-cran-devtools/Makefile b/devel/R-cran-devtools/Makefile
index 9857d76d4ed1..c6577a925f5b 100644
--- a/devel/R-cran-devtools/Makefile
+++ b/devel/R-cran-devtools/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 CRAN_DEPENDS=	R-cran-cli>=3.3.0:devel/R-cran-cli \
 		R-cran-desc>=1.4.1:devel/R-cran-desc \
 		R-cran-ellipsis>=0.3.2:devel/R-cran-ellipsis \
-		R-cran-fs>=1.5.2:sysutils/R-cran-fs \
+		R-cran-fs>=1.5.2:filesystems/R-cran-fs \
 		R-cran-httr>=1.4.2:www/R-cran-httr \
 		R-cran-lifecycle>=1.0.1:devel/R-cran-lifecycle \
 		R-cran-memoise>=2.0.1:devel/R-cran-memoise \
diff --git a/devel/R-cran-gargle/Makefile b/devel/R-cran-gargle/Makefile
index 7be4d7afbbdf..bdad5d073ab9 100644
--- a/devel/R-cran-gargle/Makefile
+++ b/devel/R-cran-gargle/Makefile
@@ -10,7 +10,7 @@ WWW=		https://gargle.r-lib.org/
 LICENSE=	MIT
 
 CRAN_DEPENDS=	R-cran-cli>=3.0.1:devel/R-cran-cli \
-		R-cran-fs>=1.3.1:sysutils/R-cran-fs \
+		R-cran-fs>=1.3.1:filesystems/R-cran-fs \
 		R-cran-glue>=1.3.0:devel/R-cran-glue \
 		R-cran-httr>=1.4.5:www/R-cran-httr \
 		R-cran-jsonlite>0:converters/R-cran-jsonlite \
diff --git a/devel/R-cran-pkgload/Makefile b/devel/R-cran-pkgload/Makefile
index 15b5bada5a6d..05d40c99ef32 100644
--- a/devel/R-cran-pkgload/Makefile
+++ b/devel/R-cran-pkgload/Makefile
@@ -11,7 +11,7 @@ LICENSE=	GPLv3
 
 RUN_DEPENDS=	R-cran-cli>=3.3.0:devel/R-cran-cli \
 		R-cran-desc>0:devel/R-cran-desc \
-		R-cran-fs>0:sysutils/R-cran-fs \
+		R-cran-fs>0:filesystems/R-cran-fs \
 		R-cran-glue>0:devel/R-cran-glue \
 		R-cran-lifecycle>0:devel/R-cran-lifecycle \
 		R-cran-pkgbuild>0:devel/R-cran-pkgbuild \
diff --git a/devel/R-cran-usethis/Makefile b/devel/R-cran-usethis/Makefile
index c928160e266b..a3c6d6bbfa88 100644
--- a/devel/R-cran-usethis/Makefile
+++ b/devel/R-cran-usethis/Makefile
@@ -14,7 +14,7 @@ CRAN_DEPENDS=	R-cran-cli>=3.0.1:devel/R-cran-cli \
 		R-cran-crayon>0:devel/R-cran-crayon \
 		R-cran-curl>=2.7:ftp/R-cran-curl \
 		R-cran-desc>=1.4.2:devel/R-cran-desc \
-		R-cran-fs>=1.3.0:sysutils/R-cran-fs \
+		R-cran-fs>=1.3.0:filesystems/R-cran-fs \
 		R-cran-gert>=1.4.1:devel/R-cran-gert \
 		R-cran-gh>=1.2.1:www/R-cran-gh \
 		R-cran-glue>=1.3.0:devel/R-cran-glue \
diff --git a/devel/fossil/Makefile b/devel/fossil/Makefile
index 93ca6ae93ce1..69b6ce89eb18 100644
--- a/devel/fossil/Makefile
+++ b/devel/fossil/Makefile
@@ -41,7 +41,7 @@ TCL_CONFIGURE_ON=	--with-tcl-stubs --with-tcl=${TCL_LIBDIR}
 TCL_USES=		tcl
 TCL_CFLAGS=		-DTCL_LIBRARY_NAME=\\\"libtcl${TCL_SHLIB_VER}.so\\\" \
 			-DTCL_MINOR_OFFSET=7
-FUSE_LIB_DEPENDS=	libfuse.so:sysutils/fusefs-libs
+FUSE_LIB_DEPENDS=	libfuse.so:filesystems/fusefs-libs
 FUSE_USES=		localbase:ldflags
 
 post-patch-FUSE-on:
diff --git a/devel/libublio/pkg-descr b/devel/libublio/pkg-descr
index e89d18797670..04fde723712c 100644
--- a/devel/libublio/pkg-descr
+++ b/devel/libublio/pkg-descr
@@ -1,5 +1,5 @@
 This is a user space caching library, currently used by FreeBSD and Mac OS X
-to improve performance of NTFS-3G (sysutils/fusefs-ntfs port), because these
+to improve performance of NTFS-3G (filesystems/ntfs port), because these
 systems don't have a block device cache, giving a very slow read/write rate.
 
 Note that libublio is _not_ thread safe.
diff --git a/devel/py-dask/Makefile b/devel/py-dask/Makefile
index 4b17cd2a62f5..856c925150f6 100644
--- a/devel/py-dask/Makefile
+++ b/devel/py-dask/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=62.6:devel/py-setuptools@${PY_
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=8.1:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cloudpickle>=3.0.0:devel/py-cloudpickle@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}fsspec>=2021.09.0:devel/py-fsspec@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}fsspec>=2021.09.0:filesystems/py-fsspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}partd>=1.4.0:databases/py-partd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.3.1:devel/py-pyyaml@${PY_FLAVOR} \
diff --git a/devel/py-etils/Makefile b/devel/py-etils/Makefile
index 21017461a1b6..639208edad6f 100644
--- a/devel/py-etils/Makefile
+++ b/devel/py-etils/Makefile
@@ -51,12 +51,12 @@ ECOLAB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jupyter>=0:devel/py-jupyter@${PY_FLAV
 			${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}protobuf>=0,1:devel/py-protobuf@${PY_FLAVOR}
 ENP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR}
-EPATH_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>=0:devel/py-fsspec@${PY_FLAVOR} \
+EPATH_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>=0:filesystems/py-fsspec@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}importlib-resources>=0:devel/py-importlib-resources@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}zipp>=0:devel/py-zipp@${PY_FLAVOR}
-EPATH_GCS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gcsfs>=0:devel/py-gcsfs@${PY_FLAVOR}
-EPATH_S3_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}s3fs>=0:devel/py-s3fs@${PY_FLAVOR}
+EPATH_GCS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gcsfs>=0:filesystems/py-gcsfs@${PY_FLAVOR}
+EPATH_S3_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}s3fs>=0:filesystems/py-s3fs@${PY_FLAVOR}
 EPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR}
 ETQDM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}absl-py>=0:devel/py-absl-py@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}tqdm>=0:misc/py-tqdm@${PY_FLAVOR}
diff --git a/devel/py-libioc/Makefile b/devel/py-libioc/Makefile
index e7e50ee7eac8..45c68d867b61 100644
--- a/devel/py-libioc/Makefile
+++ b/devel/py-libioc/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gitpython>0:devel/py-gitpython@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}libzfs>0:devel/py-libzfs@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}libzfs>0:filesystems/py-libzfs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sysctl>0:devel/py-sysctl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ucl>0:textproc/py-ucl@${PY_FLAVOR} \
 		ca_root_nss>0:security/ca_root_nss \
diff --git a/devel/py-pyyaml-include/Makefile b/devel/py-pyyaml-include/Makefile
index fac502189536..76a6a7004414 100644
--- a/devel/py-pyyaml-include/Makefile
+++ b/devel/py-pyyaml-include/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=8:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>=2021.04.0:devel/py-fsspec@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>=2021.04.0:filesystems/py-fsspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml>=6.0<7.0:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR}
 
diff --git a/devel/py-uproot/Makefile b/devel/py-uproot/Makefile
index ecb63853f7fc..a2447ff202f6 100644
--- a/devel/py-uproot/Makefile
+++ b/devel/py-uproot/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatch-vcs>=0:devel/py-hatch-vcs@${PY_FLAVO
 		${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}awkward>=2.4.6:math/py-awkward@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cramjam>=2.5.0:archivers/py-cramjam@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}fsspec>=0:devel/py-fsspec@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}fsspec>=0:filesystems/py-fsspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xxhash>=0:devel/py-xxhash@${PY_FLAVOR}
@@ -32,8 +32,8 @@ S3_DESC=	Access Amazon S3 storage
 XROOTD_DESC=	Access extended ROOT daemon
 
 HTTP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiohttp>=0:www/py-aiohttp@${PY_FLAVOR}
-S3_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}s3fs>=0:devel/py-s3fs@${PY_FLAVOR}
-XROOTD_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec-xrootd>=0:devel/py-fsspec-xrootd@${PY_FLAVOR}
+S3_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}s3fs>=0:filesystems/py-s3fs@${PY_FLAVOR}
+XROOTD_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec-xrootd>=0:filesystems/py-fsspec-xrootd@${PY_FLAVOR}
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/py-zarr/Makefile b/devel/py-zarr/Makefile
index dfa5af0aff18..c2f354524ca4 100644
--- a/devel/py-zarr/Makefile
+++ b/devel/py-zarr/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asciitree>0:graphics/py-asciitree@${PY_FLAVO
 		${PYTHON_PKGNAMEPREFIX}fasteners>0:devel/py-fasteners@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numcodecs>=0.10.0:misc/py-numcodecs@${PY_FLAVOR} \
 		${PYNUMPY}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}fsspec>0:devel/py-fsspec@${PY_FLAVOR} \
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}fsspec>0:filesystems/py-fsspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR}
 
 USES=		python
diff --git a/devel/rubygem-aws-sdk-resources/Makefile b/devel/rubygem-aws-sdk-resources/Makefile
index f3b4b5aae499..e1705fe6a383 100644
--- a/devel/rubygem-aws-sdk-resources/Makefile
+++ b/devel/rubygem-aws-sdk-resources/Makefile
@@ -137,7 +137,7 @@ RUN_DEPENDS=	rubygem-aws-sdk-accessanalyzer>=1<2:devel/rubygem-aws-sdk-accessana
 		rubygem-aws-sdk-ecr>=1<2:devel/rubygem-aws-sdk-ecr \
 		rubygem-aws-sdk-ecrpublic>=1<2:devel/rubygem-aws-sdk-ecrpublic \
 		rubygem-aws-sdk-ecs>=1<2:devel/rubygem-aws-sdk-ecs \
-		rubygem-aws-sdk-efs>=1<2:devel/rubygem-aws-sdk-efs \
+		rubygem-aws-sdk-efs>=1<2:filesystems/rubygem-aws-sdk-efs \
 		rubygem-aws-sdk-eks>=1<2:devel/rubygem-aws-sdk-eks \
 		rubygem-aws-sdk-eksauth>=1<2:devel/rubygem-aws-sdk-eksauth \
 		rubygem-aws-sdk-elasticache>=1<2:devel/rubygem-aws-sdk-elasticache \
diff --git a/emulators/Makefile b/emulators/Makefile
index decb305a3379..d418a2b88eb3 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -78,7 +78,6 @@
     SUBDIR += mednafen
     SUBDIR += mesen
     SUBDIR += mgba
-    SUBDIR += mtools
     SUBDIR += mupen64plus
     SUBDIR += mupen64plus-audio-sdl
     SUBDIR += mupen64plus-core
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index f9ee258848de..e8ae591b6834 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -106,7 +106,7 @@ QT5_CONFIGURE_OFF=	--disable-qt
 QT5_IMPLIES=		X11
 R0LOGGING_IMPLIES=	DEBUG
 UDPTUNNEL_CONFIGURE_OFF=	--disable-udptunnel
-VBOXIMG_LIB_DEPENDS=	libfuse.so.2:sysutils/fusefs-libs
+VBOXIMG_LIB_DEPENDS=	libfuse.so.2:filesystems/fusefs-libs
 VDE_CONFIGURE_ON=	--enable-vde
 VDE_RUN_DEPENDS=	vde_switch:net/vde2
 VNC_CONFIGURE_ON=	--enable-vnc
diff --git a/filesystems/Makefile b/filesystems/Makefile
new file mode 100644
index 000000000000..5b0e6dbca81c
--- /dev/null
+++ b/filesystems/Makefile
@@ -0,0 +1,144 @@
+    COMMENT = File systems and related utilities
+
+    SUBDIR += acfgfs
+    SUBDIR += afuse
+    SUBDIR += archivemount
+    SUBDIR += automount
+    SUBDIR += avfs
+    SUBDIR += bindfs
+    SUBDIR += cfs
+    SUBDIR += chironfs
+    SUBDIR += clamfs
+    SUBDIR += cramfs
+    SUBDIR += cryptofs
+    SUBDIR += curlftpfs
+    SUBDIR += darling-dmg
+    SUBDIR += dsbmc
+    SUBDIR += dsbmc-cli
+    SUBDIR += dsbmd
+    SUBDIR += e2fsprogs
+    SUBDIR += e2fsprogs-core
+    SUBDIR += e2fsprogs-libblkid
+    SUBDIR += e2tools
+    SUBDIR += encfs
+    SUBDIR += exfat
+    SUBDIR += exfat-utils
+    SUBDIR += ext2
+    SUBDIR += fstyp
+    SUBDIR += fswatch-mon
+    SUBDIR += fusefs-libs
+    SUBDIR += fusefs-libs3
+    SUBDIR += genromfs
+    SUBDIR += gitfs
+    SUBDIR += gphotofs
+    SUBDIR += gvfs
+    SUBDIR += hfsexplorer
+    SUBDIR += hfsfuse
+    SUBDIR += hfsutils
+    SUBDIR += httpdirfs
+    SUBDIR += httpfs
+    SUBDIR += ifuse
+    SUBDIR += jmtpfs
+    SUBDIR += kio-fuse
+    SUBDIR += libbde
+    SUBDIR += libfsapfs
+    SUBDIR += libfsext
+    SUBDIR += libfsfat
+    SUBDIR += libfshfs
+    SUBDIR += libfsntfs
+    SUBDIR += libfsxfs
+    SUBDIR += libmodi
+    SUBDIR += linux-c7-dosfstools
+    SUBDIR += lizardfs
+    SUBDIR += lkl
+    SUBDIR += ltfs
+    SUBDIR += mergerfs
+    SUBDIR += mhddfs
+    SUBDIR += moosefs2-cgi
+    SUBDIR += moosefs2-cgiserv
+    SUBDIR += moosefs2-chunkserver
+    SUBDIR += moosefs2-cli
+    SUBDIR += moosefs2-client
+    SUBDIR += moosefs2-master
+    SUBDIR += moosefs2-metalogger
+    SUBDIR += moosefs2-netdump
+    SUBDIR += moosefs3-cgi
+    SUBDIR += moosefs3-cgiserv
+    SUBDIR += moosefs3-chunkserver
+    SUBDIR += moosefs3-cli
+    SUBDIR += moosefs3-client
+    SUBDIR += moosefs3-master
+    SUBDIR += moosefs3-metalogger
+    SUBDIR += moosefs3-netdump
+    SUBDIR += mp3fs
+    SUBDIR += mtools
+    SUBDIR += mtpfs
+    SUBDIR += nbt
+    SUBDIR += ntfs
+    SUBDIR += ntfs-compression
+    SUBDIR += ntfs2btrfs
+    SUBDIR += openzfs
+    SUBDIR += openzfs-kmod
+    SUBDIR += p5-Filesys-Statvfs
+    SUBDIR += p5-Fuse
+    SUBDIR += pear-Horde_Vfs
+    SUBDIR += pod
+    SUBDIR += progsreiserfs
+    SUBDIR += py-dfvfs
+    SUBDIR += py-fs
+    SUBDIR += py-fs2
+    SUBDIR += py-fsspec
+    SUBDIR += py-fsspec-xrootd
+    SUBDIR += py-fusepy
+    SUBDIR += py-gcsfs
+    SUBDIR += py-libzfs
+    SUBDIR += py-llfuse
+    SUBDIR += py-prometheus-zfs
+    SUBDIR += py-pyfakefs
+    SUBDIR += py-s3fs
+    SUBDIR += py-zfs-autobackup
+    SUBDIR += R-cran-fs
+    SUBDIR += rar2fs
+    SUBDIR += rubygem-aws-sdk-efs
+    SUBDIR += rubygem-winrm-fs
+    SUBDIR += s3backer
+    SUBDIR += s3fs
+    SUBDIR += sandboxfs
+    SUBDIR += scan_ffs
+    SUBDIR += securefs
+    SUBDIR += simple-mtpfs
+    SUBDIR += smbnetfs
+    SUBDIR += sqlfs
+    SUBDIR += squashfs-tools
+    SUBDIR += squashfs-tools-ng
+    SUBDIR += squashfuse
+    SUBDIR += sshfs
+    SUBDIR += tclvfs
+    SUBDIR += ufs
+    SUBDIR += ufs_copy
+    SUBDIR += unionfs
+    SUBDIR += unreliablefs
+    SUBDIR += vzvol
+    SUBDIR += webdavfs
+    SUBDIR += wimlib
+    SUBDIR += xfsm
+    SUBDIR += xfsprogs
+    SUBDIR += xfuse
+    SUBDIR += zap
+    SUBDIR += zfs-periodic
+    SUBDIR += zfs-replicate
+    SUBDIR += zfs-snap-diff
+    SUBDIR += zfs-snapshot-clean
+    SUBDIR += zfs-snapshot-mgmt
+    SUBDIR += zfs-stats
+    SUBDIR += zfs-stats-lite
+    SUBDIR += zfsnap
+    SUBDIR += zfsnap2
+    SUBDIR += zfstools
+    SUBDIR += zip
+    SUBDIR += zisofs-tools
+    SUBDIR += zrepl
+    SUBDIR += zrepl-dsh2dsh
+    SUBDIR += zxfer
+
+.include <bsd.port.subdir.mk>
diff --git a/sysutils/R-cran-fs/Makefile b/filesystems/R-cran-fs/Makefile
index f976115895e7..3d9974d540de 100644
--- a/sysutils/R-cran-fs/Makefile
+++ b/filesystems/R-cran-fs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fs
 DISTVERSION=	1.6.5
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	uzsolt@FreeBSD.org
diff --git a/sysutils/R-cran-fs/distinfo b/filesystems/R-cran-fs/distinfo
index e5669da26a36..e5669da26a36 100644
--- a/sysutils/R-cran-fs/distinfo
+++ b/filesystems/R-cran-fs/distinfo
diff --git a/sysutils/R-cran-fs/pkg-descr b/filesystems/R-cran-fs/pkg-descr
index fcc21a216d41..fcc21a216d41 100644
--- a/sysutils/R-cran-fs/pkg-descr
+++ b/filesystems/R-cran-fs/pkg-descr
diff --git a/sysutils/acfgfs/Makefile b/filesystems/acfgfs/Makefile
index 47947ac645f0..6a62ea14b229 100644
--- a/sysutils/acfgfs/Makefile
+++ b/filesystems/acfgfs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	acfgfs
 DISTVERSION=	0.6.3.4
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	FUSE file system driver for Arcan window managers
diff --git a/sysutils/acfgfs/distinfo b/filesystems/acfgfs/distinfo
index e7950a44e17b..e7950a44e17b 100644
--- a/sysutils/acfgfs/distinfo
+++ b/filesystems/acfgfs/distinfo
diff --git a/sysutils/acfgfs/pkg-descr b/filesystems/acfgfs/pkg-descr
index 977d242c44a2..977d242c44a2 100644
--- a/sysutils/acfgfs/pkg-descr
+++ b/filesystems/acfgfs/pkg-descr
diff --git a/sysutils/fusefs-afuse/Makefile b/filesystems/afuse/Makefile
index 5fceb05e0b95..808794a7224b 100644
--- a/sysutils/fusefs-afuse/Makefile
+++ b/filesystems/afuse/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	afuse
 PORTVERSION=	0.4.1
 PORTREVISION=	2
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 MASTER_SITES=	https://BSDforge.com/projects/source/sysutils/afuse/
 PKGNAMEPREFIX=	fusefs-
 
diff --git a/sysutils/fusefs-afuse/distinfo b/filesystems/afuse/distinfo
index e5693a177760..3dca6b32c27b 100644
--- a/sysutils/fusefs-afuse/distinfo
+++ b/filesystems/afuse/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905207
 SHA256 (afuse-0.4.1.tar.gz) = c6e0555a65d42d3782e0734198bbebd22486386e29cb00047bc43c3eb726dca8
 SIZE (afuse-0.4.1.tar.gz) = 121957
diff --git a/sysutils/fusefs-afuse/files/afuse.1 b/filesystems/afuse/files/afuse.1
index f6212f74aa3f..f6212f74aa3f 100644
--- a/sysutils/fusefs-afuse/files/afuse.1
+++ b/filesystems/afuse/files/afuse.1
diff --git a/sysutils/fusefs-afuse/files/patch-src_afuse.c b/filesystems/afuse/files/patch-src_afuse.c
index 31a49171dcfc..31a49171dcfc 100644
--- a/sysutils/fusefs-afuse/files/patch-src_afuse.c
+++ b/filesystems/afuse/files/patch-src_afuse.c
diff --git a/sysutils/fusefs-afuse/files/pkg-message.in b/filesystems/afuse/files/pkg-message.in
index bf89bc245d9b..bf89bc245d9b 100644
--- a/sysutils/fusefs-afuse/files/pkg-message.in
+++ b/filesystems/afuse/files/pkg-message.in
diff --git a/sysutils/fusefs-afuse/pkg-descr b/filesystems/afuse/pkg-descr
index 7372b291f353..7372b291f353 100644
--- a/sysutils/fusefs-afuse/pkg-descr
+++ b/filesystems/afuse/pkg-descr
diff --git a/sysutils/fusefs-afuse/pkg-plist b/filesystems/afuse/pkg-plist
index ca1d3709154f..ca1d3709154f 100644
--- a/sysutils/fusefs-afuse/pkg-plist
+++ b/filesystems/afuse/pkg-plist
diff --git a/sysutils/archivemount/Makefile b/filesystems/archivemount/Makefile
index cd392edc1786..b29e53e95b7e 100644
--- a/sysutils/archivemount/Makefile
+++ b/filesystems/archivemount/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	archivemount
 DISTVERSION=	0.9.1
 PORTREVISION=	1
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 MASTER_SITES=	https://www.cybernoia.de/software/archivemount/
 
 MAINTAINER=	jirnov@gmail.com
diff --git a/sysutils/archivemount/distinfo b/filesystems/archivemount/distinfo
index f80191a890d9..f80191a890d9 100644
--- a/sysutils/archivemount/distinfo
+++ b/filesystems/archivemount/distinfo
diff --git a/sysutils/archivemount/files/pkg-message.in b/filesystems/archivemount/files/pkg-message.in
index a1fa17f41d3e..a1fa17f41d3e 100644
--- a/sysutils/archivemount/files/pkg-message.in
+++ b/filesystems/archivemount/files/pkg-message.in
diff --git a/sysutils/archivemount/pkg-descr b/filesystems/archivemount/pkg-descr
index c1889e81a9c3..c1889e81a9c3 100644
--- a/sysutils/archivemount/pkg-descr
+++ b/filesystems/archivemount/pkg-descr
diff --git a/sysutils/automount/Makefile b/filesystems/automount/Makefile
index bde02bfdc546..d20e8eafb67e 100644
--- a/sysutils/automount/Makefile
+++ b/filesystems/automount/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	automount
 DISTVERSION=	1.7.9
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 MASTER_SITES=	https://raw.github.com/vermaden/automount/master/
 
 MAINTAINER=	vermaden@interia.pl
@@ -17,14 +17,14 @@ NO_ARCH=	yes
 OPTIONS_DEFINE=		NTFS3G EXT4 EXFAT HFS
 OPTIONS_DEFAULT=	NTFS3G EXT4 EXFAT HFS
 NTFS3G_DESC=		Enable NTFS write support with ntfs-3g over FUSE
-NTFS3G_RUN_DEPENDS=	fusefs-ntfs>=0:sysutils/fusefs-ntfs
+NTFS3G_RUN_DEPENDS=	fusefs-ntfs>=0:filesystems/ntfs
 EXT4_DESC=		Support EXT2/3/4 filesystem
-EXT4_RUN_DEPENDS=	fusefs-lkl>=0:sysutils/fusefs-lkl
+EXT4_RUN_DEPENDS=	fusefs-lkl>=0:filesystems/lkl
 HFS_DESC=		Support macOS HFS filesystem
-HFS_RUN_DEPENDS=	fusefs-hfsfuse>=0:sysutils/fusefs-hfsfuse
+HFS_RUN_DEPENDS=	fusefs-hfsfuse>=0:filesystems/hfsfuse
 EXFAT_DESC=		Support Microsoft exFAT filesystem
-EXFAT_RUN_DEPENDS=	fusefs-exfat>=0:sysutils/fusefs-exfat \
-			exfat-utils>=0:sysutils/exfat-utils
+EXFAT_RUN_DEPENDS=	fusefs-exfat>=0:filesystems/exfat \
+			exfat-utils>=0:filesystems/exfat-utils
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/automount ${STAGEDIR}${PREFIX}/sbin
diff --git a/sysutils/automount/distinfo b/filesystems/automount/distinfo
index 4ac0eb1e32f9..4ac0eb1e32f9 100644
--- a/sysutils/automount/distinfo
+++ b/filesystems/automount/distinfo
diff --git a/sysutils/automount/pkg-descr b/filesystems/automount/pkg-descr
index 63bc37be8cf3..63bc37be8cf3 100644
--- a/sysutils/automount/pkg-descr
+++ b/filesystems/automount/pkg-descr
diff --git a/sysutils/automount/pkg-message b/filesystems/automount/pkg-message
index e8a180cde268..e8a180cde268 100644
--- a/sysutils/automount/pkg-message
+++ b/filesystems/automount/pkg-message
diff --git a/sysutils/avfs/Makefile b/filesystems/avfs/Makefile
index 8ba8e2f619c4..e72960be92e5 100644
--- a/sysutils/avfs/Makefile
+++ b/filesystems/avfs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	avfs
 PORTVERSION=	1.1.4
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 MASTER_SITES=	SF/avf/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	danfe@FreeBSD.org
diff --git a/sysutils/avfs/distinfo b/filesystems/avfs/distinfo
index e9a34b56e85d..da7f15db88bc 100644
--- a/sysutils/avfs/distinfo
+++ b/filesystems/avfs/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905202
 SHA256 (avfs-1.1.4.tar.bz2) = 3a7981af8557f864ae10d4b204c29969588fdb526e117456e8efd54bf8faa12b
 SIZE (avfs-1.1.4.tar.bz2) = 614657
diff --git a/sysutils/avfs/files/patch-scripts_mountavfs b/filesystems/avfs/files/patch-scripts_mountavfs
index 1042b3533c9e..1042b3533c9e 100644
--- a/sysutils/avfs/files/patch-scripts_mountavfs
+++ b/filesystems/avfs/files/patch-scripts_mountavfs
diff --git a/sysutils/avfs/files/patch-scripts_umountavfs b/filesystems/avfs/files/patch-scripts_umountavfs
index e93c9c659029..e93c9c659029 100644
--- a/sysutils/avfs/files/patch-scripts_umountavfs
+++ b/filesystems/avfs/files/patch-scripts_umountavfs
diff --git a/sysutils/avfs/pkg-descr b/filesystems/avfs/pkg-descr
index 4bdc41f8adbd..4bdc41f8adbd 100644
--- a/sysutils/avfs/pkg-descr
+++ b/filesystems/avfs/pkg-descr
diff --git a/sysutils/avfs/pkg-plist b/filesystems/avfs/pkg-plist
index 77e9a9d3032b..77e9a9d3032b 100644
--- a/sysutils/avfs/pkg-plist
+++ b/filesystems/avfs/pkg-plist
diff --git a/sysutils/fusefs-bindfs/Makefile b/filesystems/bindfs/Makefile
index de87bf2c500d..5b631a370acb 100644
--- a/sysutils/fusefs-bindfs/Makefile
+++ b/filesystems/bindfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	bindfs
 DISTVERSION=	1.17.7
 PORTREVISION=	1
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 MASTER_SITES=	https://bindfs.org/downloads/
 PKGNAMEPREFIX=	fusefs-
 
diff --git a/sysutils/fusefs-bindfs/distinfo b/filesystems/bindfs/distinfo
index c6ae2d4b1980..c6ae2d4b1980 100644
--- a/sysutils/fusefs-bindfs/distinfo
+++ b/filesystems/bindfs/distinfo
diff --git a/sysutils/fusefs-bindfs/pkg-descr b/filesystems/bindfs/pkg-descr
index 67d40ef6ebe3..67d40ef6ebe3 100644
--- a/sysutils/fusefs-bindfs/pkg-descr
+++ b/filesystems/bindfs/pkg-descr
diff --git a/security/cfs/Makefile b/filesystems/cfs/Makefile
index 97d483467ef7..64e9f5e1b7a5 100644
--- a/security/cfs/Makefile
+++ b/filesystems/cfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	cfs
 DISTVERSION=	1.5.0
 PORTREVISION=	1
-CATEGORIES=	security
+CATEGORIES=	filesystems security
 MASTER_SITES=	http://www.bayofrum.net/dist/${PORTNAME}/
 
 MAINTAINER=	crees@FreeBSD.org
diff --git a/security/cfs/distinfo b/filesystems/cfs/distinfo
index 6c65d06b258a..6c65d06b258a 100644
--- a/security/cfs/distinfo
+++ b/filesystems/cfs/distinfo
diff --git a/security/cfs/files/cfsd.in b/filesystems/cfs/files/cfsd.in
index 4a090ed7482e..4a090ed7482e 100644
--- a/security/cfs/files/cfsd.in
+++ b/filesystems/cfs/files/cfsd.in
diff --git a/security/cfs/files/pkg-message.in b/filesystems/cfs/files/pkg-message.in
index 11b2ce5ab5e1..11b2ce5ab5e1 100644
--- a/security/cfs/files/pkg-message.in
+++ b/filesystems/cfs/files/pkg-message.in
diff --git a/security/cfs/pkg-descr b/filesystems/cfs/pkg-descr
index 0ade618d36f1..0ade618d36f1 100644
--- a/security/cfs/pkg-descr
+++ b/filesystems/cfs/pkg-descr
diff --git a/security/cfs/pkg-plist b/filesystems/cfs/pkg-plist
index cb9d85095792..cb9d85095792 100644
--- a/security/cfs/pkg-plist
+++ b/filesystems/cfs/pkg-plist
diff --git a/sysutils/fusefs-chironfs/Makefile b/filesystems/chironfs/Makefile
index 27e9c0fe3f7a..018db229218e 100644
--- a/sysutils/fusefs-chironfs/Makefile
+++ b/filesystems/chironfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	chironfs
 PORTVERSION=	1.1.1
 PORTREVISION=	3
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 MASTER_SITES=	https://BSDforge.com/projects/source/sysutils/chironfs/
 PKGNAMEPREFIX=	fusefs-
 
diff --git a/sysutils/fusefs-chironfs/distinfo b/filesystems/chironfs/distinfo
index 746d1181840e..91f1eb78d555 100644
--- a/sysutils/fusefs-chironfs/distinfo
+++ b/filesystems/chironfs/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905042
 SHA256 (chironfs-1.1.1.tar.gz) = 9381aa3773fb4797e6aed5a3a5e83a3d342e7950aab3f63fc94a4fdca92791c9
 SIZE (chironfs-1.1.1.tar.gz) = 444036
diff --git a/sysutils/fusefs-chironfs/pkg-descr b/filesystems/chironfs/pkg-descr
index 8cc07f74f9c9..8cc07f74f9c9 100644
--- a/sysutils/fusefs-chironfs/pkg-descr
+++ b/filesystems/chironfs/pkg-descr
diff --git a/security/clamfs/Makefile b/filesystems/clamfs/Makefile
index 0481dd1eb6dc..bbd947525e7f 100644
--- a/security/clamfs/Makefile
+++ b/filesystems/clamfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	clamfs
 DISTVERSION=	1.2.0
 PORTREVISION=	5
-CATEGORIES=	security
+CATEGORIES=	filesystems security
 MASTER_SITES=	https://github.com/burghardt/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/
 
 MAINTAINER=	anastasios@mageirias.com
diff --git a/security/clamfs/distinfo b/filesystems/clamfs/distinfo
index de1d9eab16af..de1d9eab16af 100644
--- a/security/clamfs/distinfo
+++ b/filesystems/clamfs/distinfo
diff --git a/security/clamfs/pkg-descr b/filesystems/clamfs/pkg-descr
index 25c5ebda1e8d..25c5ebda1e8d 100644
--- a/security/clamfs/pkg-descr
+++ b/filesystems/clamfs/pkg-descr
diff --git a/security/clamfs/pkg-message b/filesystems/clamfs/pkg-message
index 28c11e54ac06..28c11e54ac06 100644
--- a/security/clamfs/pkg-message
+++ b/filesystems/clamfs/pkg-message
diff --git a/sysutils/cramfs/Makefile b/filesystems/cramfs/Makefile
index e740523620e7..7faf71c22319 100644
--- a/sysutils/cramfs/Makefile
+++ b/filesystems/cramfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	cramfs
 PORTVERSION=	1.1
 PORTREVISION=	1
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 MASTER_SITES=	SF
 
 MAINTAINER=	portmaster@BSDforge.com
diff --git a/sysutils/cramfs/distinfo b/filesystems/cramfs/distinfo
index ed9b56adafbb..766181316d36 100644
--- a/sysutils/cramfs/distinfo
+++ b/filesystems/cramfs/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905204
 SHA256 (cramfs-1.1.tar.gz) = 133caca2c4e7c64106555154ee0ff693f5cf5beb9421ce2eb86baee997d22368
 SIZE (cramfs-1.1.tar.gz) = 24179
diff --git a/sysutils/cramfs/files/patch-GNUmakefile b/filesystems/cramfs/files/patch-GNUmakefile
index 39ee95d61ca9..39ee95d61ca9 100644
--- a/sysutils/cramfs/files/patch-GNUmakefile
+++ b/filesystems/cramfs/files/patch-GNUmakefile
diff --git a/sysutils/cramfs/files/patch-cramfsck.c b/filesystems/cramfs/files/patch-cramfsck.c
index 9a685b5565dc..9a685b5565dc 100644
--- a/sysutils/cramfs/files/patch-cramfsck.c
+++ b/filesystems/cramfs/files/patch-cramfsck.c
diff --git a/sysutils/cramfs/files/patch-mkcramfs.c b/filesystems/cramfs/files/patch-mkcramfs.c
index 5e4f1328f7a5..5e4f1328f7a5 100644
--- a/sysutils/cramfs/files/patch-mkcramfs.c
+++ b/filesystems/cramfs/files/patch-mkcramfs.c
diff --git a/sysutils/cramfs/pkg-descr b/filesystems/cramfs/pkg-descr
index 827f6c3addcd..827f6c3addcd 100644
--- a/sysutils/cramfs/pkg-descr
+++ b/filesystems/cramfs/pkg-descr
diff --git a/sysutils/fusefs-cryptofs/Makefile b/filesystems/cryptofs/Makefile
index dac8d80da95a..32a62fa52c02 100644
--- a/sysutils/fusefs-cryptofs/Makefile
+++ b/filesystems/cryptofs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	cryptofs
 PORTVERSION=	0.6.0
 PORTREVISION=	7
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 MASTER_SITES=	https://BSDforge.com/projects/source/sysutils/fusefs-cryptofs/
 PKGNAMEPREFIX=	fusefs-
 
diff --git a/sysutils/fusefs-cryptofs/distinfo b/filesystems/cryptofs/distinfo
index b453c608f56b..ecdb77dac141 100644
--- a/sysutils/fusefs-cryptofs/distinfo
+++ b/filesystems/cryptofs/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905170
 SHA256 (cryptofs-0.6.0.tar.gz) = d884199e38ee09848841dda247db1db0361236b1ce8cc7dd3acb5031f80f6b57
 SIZE (cryptofs-0.6.0.tar.gz) = 352805
diff --git a/sysutils/fusefs-cryptofs/pkg-descr b/filesystems/cryptofs/pkg-descr
index 1f24e29d4552..1f24e29d4552 100644
--- a/sysutils/fusefs-cryptofs/pkg-descr
+++ b/filesystems/cryptofs/pkg-descr
diff --git a/sysutils/fusefs-cryptofs/pkg-plist b/filesystems/cryptofs/pkg-plist
index f7ae325d2bbd..f7ae325d2bbd 100644
--- a/sysutils/fusefs-cryptofs/pkg-plist
+++ b/filesystems/cryptofs/pkg-plist
diff --git a/sysutils/fusefs-curlftpfs/Makefile b/filesystems/curlftpfs/Makefile
index 038e07337dfa..6789a2976b05 100644
--- a/sysutils/fusefs-curlftpfs/Makefile
+++ b/filesystems/curlftpfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	curlftpfs
 PORTVERSION=	0.9.2
 PORTREVISION=	8
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	fusefs-
 DIST_SUBDIR=	${PORTNAME}
diff --git a/sysutils/fusefs-curlftpfs/distinfo b/filesystems/curlftpfs/distinfo
index 822419798166..822419798166 100644
--- a/sysutils/fusefs-curlftpfs/distinfo
+++ b/filesystems/curlftpfs/distinfo
diff --git a/sysutils/fusefs-curlftpfs/files/patch-ftpfs.c b/filesystems/curlftpfs/files/patch-ftpfs.c
index 766e1e826e68..766e1e826e68 100644
--- a/sysutils/fusefs-curlftpfs/files/patch-ftpfs.c
+++ b/filesystems/curlftpfs/files/patch-ftpfs.c
diff --git a/sysutils/fusefs-curlftpfs/files/patch-ftpfs.h b/filesystems/curlftpfs/files/patch-ftpfs.h
index 1f577d3af78a..1f577d3af78a 100644
--- a/sysutils/fusefs-curlftpfs/files/patch-ftpfs.h
+++ b/filesystems/curlftpfs/files/patch-ftpfs.h
diff --git a/sysutils/fusefs-curlftpfs/files/patch-path__utils.c b/filesystems/curlftpfs/files/patch-path__utils.c
index 7855c90e7043..7855c90e7043 100644
--- a/sysutils/fusefs-curlftpfs/files/patch-path__utils.c
+++ b/filesystems/curlftpfs/files/patch-path__utils.c
diff --git a/sysutils/fusefs-curlftpfs/files/patch-path__utils.h b/filesystems/curlftpfs/files/patch-path__utils.h
index 8c1c22344c95..8c1c22344c95 100644
--- a/sysutils/fusefs-curlftpfs/files/patch-path__utils.h
+++ b/filesystems/curlftpfs/files/patch-path__utils.h
diff --git a/sysutils/fusefs-curlftpfs/pkg-descr b/filesystems/curlftpfs/pkg-descr
index 49c7d0da385d..49c7d0da385d 100644
--- a/sysutils/fusefs-curlftpfs/pkg-descr
+++ b/filesystems/curlftpfs/pkg-descr
diff --git a/sysutils/darling-dmg/Makefile b/filesystems/darling-dmg/Makefile
index 825c9df300df..a965a7139c5c 100644
--- a/sysutils/darling-dmg/Makefile
+++ b/filesystems/darling-dmg/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	darling-dmg
 DISTVERSIONPREFIX=v
 DISTVERSION=	1.0.4
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 
 MAINTAINER=	freebsd@sysctl.cz
 COMMENT=	FUSE module for .dmg files (containing an HFS+ filesystem)
diff --git a/sysutils/darling-dmg/distinfo b/filesystems/darling-dmg/distinfo
index 686997207b39..686997207b39 100644
--- a/sysutils/darling-dmg/distinfo
+++ b/filesystems/darling-dmg/distinfo
diff --git a/sysutils/darling-dmg/files/patch-CMakeLists.txt b/filesystems/darling-dmg/files/patch-CMakeLists.txt
index bfb3590a26cf..bfb3590a26cf 100644
--- a/sysutils/darling-dmg/files/patch-CMakeLists.txt
+++ b/filesystems/darling-dmg/files/patch-CMakeLists.txt
diff --git a/sysutils/darling-dmg/pkg-descr b/filesystems/darling-dmg/pkg-descr
index 0a7d431c5991..0a7d431c5991 100644
--- a/sysutils/darling-dmg/pkg-descr
+++ b/filesystems/darling-dmg/pkg-descr
diff --git a/sysutils/dsbmc-cli/Makefile b/filesystems/dsbmc-cli/Makefile
index fe083ce057fc..618c45a973a4 100644
--- a/sysutils/dsbmc-cli/Makefile
+++ b/filesystems/dsbmc-cli/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	dsbmc-cli
 PORTVERSION=	0.4
 PORTREVISION=	1
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 MASTER_SITES=	http://freeshell.de/~mk/download/
 
 MAINTAINER=	mk@nic-nac-project.org
@@ -11,7 +11,7 @@ WWW=		https://freeshell.de/~mk/projects/dsbmc-cli.html
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	dsbmd>=0.3:sysutils/dsbmd
+RUN_DEPENDS=	dsbmd>=0.3:filesystems/dsbmd
 
 USES=		tar:tgz
 
diff --git a/sysutils/dsbmc-cli/distinfo b/filesystems/dsbmc-cli/distinfo
index 4df195151c9a..4df195151c9a 100644
--- a/sysutils/dsbmc-cli/distinfo
+++ b/filesystems/dsbmc-cli/distinfo
diff --git a/sysutils/dsbmc-cli/pkg-descr b/filesystems/dsbmc-cli/pkg-descr
index 676ace3523cf..676ace3523cf 100644
--- a/sysutils/dsbmc-cli/pkg-descr
+++ b/filesystems/dsbmc-cli/pkg-descr
diff --git a/sysutils/dsbmc/Makefile b/filesystems/dsbmc/Makefile
index 6e9fd336389c..dc7efcab0ba1 100644
--- a/sysutils/dsbmc/Makefile
+++ b/filesystems/dsbmc/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	dsbmc
 DISTVERSION=	1.2
 PORTREVISION=	1
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 
 MAINTAINER=	mk@nic-nac-project.org
 COMMENT=	Qt client for DSBMD that lets you mount media, and more
@@ -10,7 +10,7 @@ WWW=		https://github.com/mrclksr/DSBMC
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	dsbmd>=0.3:sysutils/dsbmd
+RUN_DEPENDS=	dsbmd>=0.3:filesystems/dsbmd
 
 USES=		compiler:c++11-lang desktop-file-utils gl qmake qt:5 tar:tgz
 
diff --git a/sysutils/dsbmc/distinfo b/filesystems/dsbmc/distinfo
index 54db0704df9e..54db0704df9e 100644
--- a/sysutils/dsbmc/distinfo
+++ b/filesystems/dsbmc/distinfo
diff --git a/sysutils/dsbmc/files/patch-src_mainwin.cpp b/filesystems/dsbmc/files/patch-src_mainwin.cpp
index eb6e5ef3efba..eb6e5ef3efba 100644
--- a/sysutils/dsbmc/files/patch-src_mainwin.cpp
+++ b/filesystems/dsbmc/files/patch-src_mainwin.cpp
diff --git a/sysutils/dsbmc/pkg-descr b/filesystems/dsbmc/pkg-descr
index 89f7c093e72d..89f7c093e72d 100644
--- a/sysutils/dsbmc/pkg-descr
+++ b/filesystems/dsbmc/pkg-descr
diff --git a/sysutils/dsbmc/pkg-plist b/filesystems/dsbmc/pkg-plist
index 8eb4f23eed53..8eb4f23eed53 100644
--- a/sysutils/dsbmc/pkg-plist
+++ b/filesystems/dsbmc/pkg-plist
diff --git a/sysutils/dsbmd/Makefile b/filesystems/dsbmd/Makefile
index 2b79533ccf89..915d7182d96a 100644
--- a/sysutils/dsbmd/Makefile
+++ b/filesystems/dsbmd/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	dsbmd
 PORTVERSION=	1.11.4
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 
 MAINTAINER=	mk@nic-nac-project.org
 COMMENT=	Media mounting daemon
@@ -32,12 +32,12 @@ LKL_DESC=	Btrfs and XFS support through Linux Kernel Library
 NTFS_DESC=	Mount NTFS filesystems with read and write support
 PTP_DESC=	Picture Transfer Protocol support
 
-EXFAT_RUN_DEPENDS=	mount.exfat:sysutils/fusefs-exfat
-EXT4_RUN_DEPENDS=	fuse-ext2:sysutils/fusefs-ext2
-HFS_RUN_DEPENDS=	hfsfuse:sysutils/fusefs-hfsfuse
-LKL_RUN_DEPENDS=	lklfuse:sysutils/fusefs-lkl
-MTP_RUN_DEPENDS=	jmtpfs:sysutils/fusefs-jmtpfs
-NTFS_RUN_DEPENDS=	ntfs-3g:sysutils/fusefs-ntfs
-PTP_RUN_DEPENDS=	gphotofs:graphics/fusefs-gphotofs
+EXFAT_RUN_DEPENDS=	mount.exfat:filesystems/exfat
+EXT4_RUN_DEPENDS=	fuse-ext2:filesystems/ext2
+HFS_RUN_DEPENDS=	hfsfuse:filesystems/hfsfuse
+LKL_RUN_DEPENDS=	lklfuse:filesystems/lkl
+MTP_RUN_DEPENDS=	jmtpfs:filesystems/jmtpfs
+NTFS_RUN_DEPENDS=	ntfs-3g:filesystems/ntfs
+PTP_RUN_DEPENDS=	gphotofs:filesystems/gphotofs
 
 .include <bsd.port.mk>
diff --git a/sysutils/dsbmd/distinfo b/filesystems/dsbmd/distinfo
index 893dc203c2e4..893dc203c2e4 100644
--- a/sysutils/dsbmd/distinfo
+++ b/filesystems/dsbmd/distinfo
diff --git a/sysutils/dsbmd/files/dsbmd.in b/filesystems/dsbmd/files/dsbmd.in
index 95eb922d3c64..95eb922d3c64 100644
--- a/sysutils/dsbmd/files/dsbmd.in
+++ b/filesystems/dsbmd/files/dsbmd.in
diff --git a/sysutils/dsbmd/pkg-descr b/filesystems/dsbmd/pkg-descr
index 0829e6d49107..0829e6d49107 100644
--- a/sysutils/dsbmd/pkg-descr
+++ b/filesystems/dsbmd/pkg-descr
diff --git a/sysutils/e2fsprogs-core/Makefile b/filesystems/e2fsprogs-core/Makefile
index 4e5526982f2c..03e90db801f3 100644
--- a/sysutils/e2fsprogs-core/Makefile
+++ b/filesystems/e2fsprogs-core/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	e2fsprogs
 PORTVERSION=	1.47.1
 PORTREVISION?=	0	# NOTE: when bumping PORTREVISION, also bump ../e2fsprogs/Makefile!
-CATEGORIES?=	sysutils
+CATEGORIES?=	filesystems sysutils
 MASTER_SITES=	KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
 
 MAINTAINER?=	mandree@FreeBSD.org
@@ -79,7 +79,7 @@ NLS_USES=		gettext iconv:build
 BASHTESTS_BUILD_DEPENDS=	${BASH_CMD}:shells/bash
 BASH_CMD=	${LOCALBASE}/bin/bash
 
-LIB_DEPENDS+=	libblkid.so:misc/e2fsprogs-libblkid
+LIB_DEPENDS+=	libblkid.so:filesystems/e2fsprogs-libblkid
 LIB_DEPENDS+=	libuuid.so:misc/e2fsprogs-libuuid
 
 LIBUNWIND_LIB_DEPENDS=	libunwind.so:devel/libunwind
diff --git a/sysutils/e2fsprogs-core/distinfo b/filesystems/e2fsprogs-core/distinfo
index fba31cb081b8..fba31cb081b8 100644
--- a/sysutils/e2fsprogs-core/distinfo
+++ b/filesystems/e2fsprogs-core/distinfo
diff --git a/sysutils/e2fsprogs-core/files/extrapatch-e2fsck_sigcatcher.c b/filesystems/e2fsprogs-core/files/extrapatch-e2fsck_sigcatcher.c
index 10288de1dc58..10288de1dc58 100644
--- a/sysutils/e2fsprogs-core/files/extrapatch-e2fsck_sigcatcher.c
+++ b/filesystems/e2fsprogs-core/files/extrapatch-e2fsck_sigcatcher.c
diff --git a/sysutils/e2fsprogs-core/files/extrapatch-no-sbrk b/filesystems/e2fsprogs-core/files/extrapatch-no-sbrk
index 6aa12d2b05a5..6aa12d2b05a5 100644
--- a/sysutils/e2fsprogs-core/files/extrapatch-no-sbrk
+++ b/filesystems/e2fsprogs-core/files/extrapatch-no-sbrk
diff --git a/sysutils/e2fsprogs-core/files/fix-ss_err.h.sed b/filesystems/e2fsprogs-core/files/fix-ss_err.h.sed
index 1b72045c519b..1b72045c519b 100644
--- a/sysutils/e2fsprogs-core/files/fix-ss_err.h.sed
+++ b/filesystems/e2fsprogs-core/files/fix-ss_err.h.sed
diff --git a/sysutils/e2fsprogs-core/files/fsck_ext2fs.8 b/filesystems/e2fsprogs-core/files/fsck_ext2fs.8
index 3ab4c664f740..3ab4c664f740 100644
--- a/sysutils/e2fsprogs-core/files/fsck_ext2fs.8
+++ b/filesystems/e2fsprogs-core/files/fsck_ext2fs.8
diff --git a/sysutils/e2fsprogs-core/files/fsck_ext2fs.c b/filesystems/e2fsprogs-core/files/fsck_ext2fs.c
index 9634c414242e..9634c414242e 100644
--- a/sysutils/e2fsprogs-core/files/fsck_ext2fs.c
+++ b/filesystems/e2fsprogs-core/files/fsck_ext2fs.c
diff --git a/sysutils/e2fsprogs-core/files/patch-e2fsck__unix.c b/filesystems/e2fsprogs-core/files/patch-e2fsck__unix.c
index fe98d8988b57..fe98d8988b57 100644
--- a/sysutils/e2fsprogs-core/files/patch-e2fsck__unix.c
+++ b/filesystems/e2fsprogs-core/files/patch-e2fsck__unix.c
diff --git a/sysutils/e2fsprogs-core/files/patch-lib__uuid__gen_uuid.c b/filesystems/e2fsprogs-core/files/patch-lib__uuid__gen_uuid.c
index 13e7b8c2f6b5..13e7b8c2f6b5 100644
--- a/sysutils/e2fsprogs-core/files/patch-lib__uuid__gen_uuid.c
+++ b/filesystems/e2fsprogs-core/files/patch-lib__uuid__gen_uuid.c
diff --git a/sysutils/e2fsprogs-core/files/patch-lib_blkid_devname.c b/filesystems/e2fsprogs-core/files/patch-lib_blkid_devname.c
index 9a59112ed239..9a59112ed239 100644
--- a/sysutils/e2fsprogs-core/files/patch-lib_blkid_devname.c
+++ b/filesystems/e2fsprogs-core/files/patch-lib_blkid_devname.c
diff --git a/sysutils/e2fsprogs-core/files/patch-lib_et_com__err.3 b/filesystems/e2fsprogs-core/files/patch-lib_et_com__err.3
index bc3b522f46ea..bc3b522f46ea 100644
--- a/sysutils/e2fsprogs-core/files/patch-lib_et_com__err.3
+++ b/filesystems/e2fsprogs-core/files/patch-lib_et_com__err.3
diff --git a/sysutils/e2fsprogs-core/files/patch-lib_support_plausible.c b/filesystems/e2fsprogs-core/files/patch-lib_support_plausible.c
index 3d23b30e9c8f..3d23b30e9c8f 100644
--- a/sysutils/e2fsprogs-core/files/patch-lib_support_plausible.c
+++ b/filesystems/e2fsprogs-core/files/patch-lib_support_plausible.c
diff --git a/sysutils/e2fsprogs-core/files/patch-lib_support_sort__r.h b/filesystems/e2fsprogs-core/files/patch-lib_support_sort__r.h
index c01a084feb6b..c01a084feb6b 100644
--- a/sysutils/e2fsprogs-core/files/patch-lib_support_sort__r.h
+++ b/filesystems/e2fsprogs-core/files/patch-lib_support_sort__r.h
diff --git a/sysutils/e2fsprogs-core/files/patch-misc__Makefile.in b/filesystems/e2fsprogs-core/files/patch-misc__Makefile.in
index ec0ff218a622..ec0ff218a622 100644
--- a/sysutils/e2fsprogs-core/files/patch-misc__Makefile.in
+++ b/filesystems/e2fsprogs-core/files/patch-misc__Makefile.in
diff --git a/sysutils/e2fsprogs-core/files/patch-misc_blkid.8.in b/filesystems/e2fsprogs-core/files/patch-misc_blkid.8.in
index c6532a4a1a2e..c6532a4a1a2e 100644
--- a/sysutils/e2fsprogs-core/files/patch-misc_blkid.8.in
+++ b/filesystems/e2fsprogs-core/files/patch-misc_blkid.8.in
diff --git a/sysutils/e2fsprogs-core/files/patch-misc_e2fuzz.c b/filesystems/e2fsprogs-core/files/patch-misc_e2fuzz.c
index a9f56490e5b6..a9f56490e5b6 100644
--- a/sysutils/e2fsprogs-core/files/patch-misc_e2fuzz.c
+++ b/filesystems/e2fsprogs-core/files/patch-misc_e2fuzz.c
diff --git a/sysutils/e2fsprogs-core/files/patch-tests_Makefile.in b/filesystems/e2fsprogs-core/files/patch-tests_Makefile.in
index a5f9b50df891..a5f9b50df891 100644
--- a/sysutils/e2fsprogs-core/files/patch-tests_Makefile.in
+++ b/filesystems/e2fsprogs-core/files/patch-tests_Makefile.in
diff --git a/sysutils/e2fsprogs-core/files/patch-tests_f__detect__junk_script b/filesystems/e2fsprogs-core/files/patch-tests_f__detect__junk_script
index 45b544cf691d..45b544cf691d 100644
--- a/sysutils/e2fsprogs-core/files/patch-tests_f__detect__junk_script
+++ b/filesystems/e2fsprogs-core/files/patch-tests_f__detect__junk_script
diff --git a/sysutils/e2fsprogs-core/files/patch-tests_m__offset_script b/filesystems/e2fsprogs-core/files/patch-tests_m__offset_script
index 9cc4232eec3a..9cc4232eec3a 100644
--- a/sysutils/e2fsprogs-core/files/patch-tests_m__offset_script
+++ b/filesystems/e2fsprogs-core/files/patch-tests_m__offset_script
diff --git a/sysutils/e2fsprogs-core/files/patch-tests_t__mmp__fail_script b/filesystems/e2fsprogs-core/files/patch-tests_t__mmp__fail_script
index 77fd70e4ccf2..77fd70e4ccf2 100644
--- a/sysutils/e2fsprogs-core/files/patch-tests_t__mmp__fail_script
+++ b/filesystems/e2fsprogs-core/files/patch-tests_t__mmp__fail_script
diff --git a/sysutils/e2fsprogs-core/files/unwanted b/filesystems/e2fsprogs-core/files/unwanted
index 693deb364915..693deb364915 100644
--- a/sysutils/e2fsprogs-core/files/unwanted
+++ b/filesystems/e2fsprogs-core/files/unwanted
diff --git a/sysutils/e2fsprogs-core/pkg-descr b/filesystems/e2fsprogs-core/pkg-descr
index d03ad983f1fb..d03ad983f1fb 100644
--- a/sysutils/e2fsprogs-core/pkg-descr
+++ b/filesystems/e2fsprogs-core/pkg-descr
diff --git a/sysutils/e2fsprogs-core/pkg-install b/filesystems/e2fsprogs-core/pkg-install
index 114087fa032a..114087fa032a 100644
--- a/sysutils/e2fsprogs-core/pkg-install
+++ b/filesystems/e2fsprogs-core/pkg-install
diff --git a/sysutils/e2fsprogs-core/pkg-message b/filesystems/e2fsprogs-core/pkg-message
index 68a7a422b142..68a7a422b142 100644
--- a/sysutils/e2fsprogs-core/pkg-message
+++ b/filesystems/e2fsprogs-core/pkg-message
diff --git a/sysutils/e2fsprogs-core/pkg-plist b/filesystems/e2fsprogs-core/pkg-plist
index 369ce002d590..369ce002d590 100644
--- a/sysutils/e2fsprogs-core/pkg-plist
+++ b/filesystems/e2fsprogs-core/pkg-plist
diff --git a/misc/e2fsprogs-libblkid/Makefile b/filesystems/e2fsprogs-libblkid/Makefile
index 2d50de7e985e..961808badcf4 100644
--- a/misc/e2fsprogs-libblkid/Makefile
+++ b/filesystems/e2fsprogs-libblkid/Makefile
@@ -1,5 +1,5 @@
 PORTREVISION=	0
-CATEGORIES=	misc devel
+CATEGORIES=	filesystems misc devel
 PKGNAMESUFFIX=	-libblkid
 
 COMMENT=	Blkid library from e2fsprogs package
@@ -11,7 +11,7 @@ LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid
 
 CONFIGURE_ARGS=	--enable-elf-shlibs --disable-libuuid --enable-libblkid
 
-MASTERDIR=	${.CURDIR}/../../sysutils/e2fsprogs-core
+MASTERDIR=	${.CURDIR}/../../filesystems/e2fsprogs-core
 MAKE_ARGS=	LIB_SUBDIRS=lib/blkid LDFLAGS_SHLIB=-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 ALL_TARGET=	libs
diff --git a/misc/e2fsprogs-libblkid/pkg-descr b/filesystems/e2fsprogs-libblkid/pkg-descr
index 27a1c50756ac..27a1c50756ac 100644
--- a/misc/e2fsprogs-libblkid/pkg-descr
+++ b/filesystems/e2fsprogs-libblkid/pkg-descr
diff --git a/misc/e2fsprogs-libblkid/pkg-plist b/filesystems/e2fsprogs-libblkid/pkg-plist
index c3c0e82f85c5..c3c0e82f85c5 100644
--- a/misc/e2fsprogs-libblkid/pkg-plist
+++ b/filesystems/e2fsprogs-libblkid/pkg-plist
diff --git a/sysutils/e2fsprogs/Makefile b/filesystems/e2fsprogs/Makefile
index 4c00a386ca64..dd338500a5c7 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/filesystems/e2fsprogs/Makefile
@@ -1,8 +1,8 @@
 PORTNAME=	e2fsprogs
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 PORTVERSION=	1.47.1
 PORTREVISION=	0
-BUILD_DEPENDS=	e2fsprogs-core=${PORTVERSION}${${PORTREVISION} > 0:?_${PORTREVISION}:}:sysutils/e2fsprogs-core
+BUILD_DEPENDS=	e2fsprogs-core=${PORTVERSION}${${PORTREVISION} > 0:?_${PORTREVISION}:}:filesystems/e2fsprogs-core
 RUN_DEPENDS=	${BUILD_DEPENDS}
 DISTFILES=	# empty
 NO_BUILD=	yes
diff --git a/sysutils/e2fsprogs/pkg-descr b/filesystems/e2fsprogs/pkg-descr
index 6df887766576..6df887766576 100644
--- a/sysutils/e2fsprogs/pkg-descr
+++ b/filesystems/e2fsprogs/pkg-descr
diff --git a/sysutils/e2fsprogs/pkg-plist b/filesystems/e2fsprogs/pkg-plist
index 796b2c90dfc4..796b2c90dfc4 100644
--- a/sysutils/e2fsprogs/pkg-plist
+++ b/filesystems/e2fsprogs/pkg-plist
diff --git a/sysutils/e2tools/Makefile b/filesystems/e2tools/Makefile
index a5719fc7d86e..3f32f39fee53 100644
--- a/sysutils/e2tools/Makefile
+++ b/filesystems/e2tools/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	e2tools
 DISTVERSION=	0.1.2
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	fuz@FreeBSD.org
@@ -10,7 +10,7 @@ WWW=		https://e2tools.github.io/
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libext2fs.so:sysutils/e2fsprogs-core
+LIB_DEPENDS=	libext2fs.so:filesystems/e2fsprogs-core
 
 USES=		pkgconfig
 GNU_CONFIGURE_MANPREFIX=        ${PREFIX}/share
diff --git a/sysutils/e2tools/distinfo b/filesystems/e2tools/distinfo
index 0e8055b72248..0e8055b72248 100644
--- a/sysutils/e2tools/distinfo
+++ b/filesystems/e2tools/distinfo
diff --git a/sysutils/e2tools/pkg-descr b/filesystems/e2tools/pkg-descr
index 3e72d7e69163..3e72d7e69163 100644
--- a/sysutils/e2tools/pkg-descr
+++ b/filesystems/e2tools/pkg-descr
diff --git a/sysutils/e2tools/pkg-plist b/filesystems/e2tools/pkg-plist
index 2ab92a262c94..2ab92a262c94 100644
--- a/sysutils/e2tools/pkg-plist
+++ b/filesystems/e2tools/pkg-plist
diff --git a/sysutils/fusefs-encfs/Makefile b/filesystems/encfs/Makefile
index e6df15617147..a78fbf67063c 100644
--- a/sysutils/fusefs-encfs/Makefile
+++ b/filesystems/encfs/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	encfs
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.9.5
 PORTREVISION=	9
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 PKGNAMEPREFIX=	fusefs-
 
 MAINTAINER=	dmgk@FreeBSD.org
diff --git a/sysutils/fusefs-encfs/distinfo b/filesystems/encfs/distinfo
index 9998faa7d611..9998faa7d611 100644
--- a/sysutils/fusefs-encfs/distinfo
+++ b/filesystems/encfs/distinfo
diff --git a/sysutils/fusefs-encfs/files/patch-CMakeLists.txt b/filesystems/encfs/files/patch-CMakeLists.txt
index f4e66aaaa10b..f4e66aaaa10b 100644
--- a/sysutils/fusefs-encfs/files/patch-CMakeLists.txt
+++ b/filesystems/encfs/files/patch-CMakeLists.txt
diff --git a/sysutils/fusefs-encfs/files/patch-encfs_NullCipher.cpp b/filesystems/encfs/files/patch-encfs_NullCipher.cpp
index 08e4db20abe8..08e4db20abe8 100644
--- a/sysutils/fusefs-encfs/files/patch-encfs_NullCipher.cpp
+++ b/filesystems/encfs/files/patch-encfs_NullCipher.cpp
diff --git a/sysutils/fusefs-encfs/pkg-descr b/filesystems/encfs/pkg-descr
index 0fafe1d67b16..0fafe1d67b16 100644
--- a/sysutils/fusefs-encfs/pkg-descr
+++ b/filesystems/encfs/pkg-descr
diff --git a/sysutils/fusefs-encfs/pkg-plist b/filesystems/encfs/pkg-plist
index e75b46eceeaa..e75b46eceeaa 100644
--- a/sysutils/fusefs-encfs/pkg-plist
+++ b/filesystems/encfs/pkg-plist
diff --git a/sysutils/exfat-utils/Makefile b/filesystems/exfat-utils/Makefile
index 2fe71887cb7c..ca8e499a18f3 100644
--- a/sysutils/exfat-utils/Makefile
+++ b/filesystems/exfat-utils/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	exfat
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.4.0
 PORTREVISION=	1
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 PKGNAMESUFFIX=	-utils
 
 MAINTAINER=	samm@FreeBSD.org
diff --git a/sysutils/exfat-utils/distinfo b/filesystems/exfat-utils/distinfo
index 4b38f1e77983..4b38f1e77983 100644
--- a/sysutils/exfat-utils/distinfo
+++ b/filesystems/exfat-utils/distinfo
diff --git a/sysutils/exfat-utils/files/patch-Makefile.am b/filesystems/exfat-utils/files/patch-Makefile.am
index 672480a6c8cc..672480a6c8cc 100644
--- a/sysutils/exfat-utils/files/patch-Makefile.am
+++ b/filesystems/exfat-utils/files/patch-Makefile.am
diff --git a/sysutils/exfat-utils/files/patch-configure.ac b/filesystems/exfat-utils/files/patch-configure.ac
index 23a8ce7511e0..23a8ce7511e0 100644
--- a/sysutils/exfat-utils/files/patch-configure.ac
+++ b/filesystems/exfat-utils/files/patch-configure.ac
diff --git a/sysutils/exfat-utils/pkg-descr b/filesystems/exfat-utils/pkg-descr
index e9c5bd8916e4..e9c5bd8916e4 100644
--- a/sysutils/exfat-utils/pkg-descr
+++ b/filesystems/exfat-utils/pkg-descr
diff --git a/sysutils/fusefs-exfat/Makefile b/filesystems/exfat/Makefile
index a5672578f5e8..4910df1a26f8 100644
--- a/sysutils/fusefs-exfat/Makefile
+++ b/filesystems/exfat/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	exfat
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.4.0
 PORTREVISION=	1
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 PKGNAMEPREFIX=	fusefs-
 
 MAINTAINER=	samm@FreeBSD.org
diff --git a/sysutils/fusefs-exfat/distinfo b/filesystems/exfat/distinfo
index 3d2567e5d62d..3d2567e5d62d 100644
--- a/sysutils/fusefs-exfat/distinfo
+++ b/filesystems/exfat/distinfo
diff --git a/sysutils/fusefs-exfat/pkg-descr b/filesystems/exfat/pkg-descr
index 3cf40b3ccad4..3cf40b3ccad4 100644
--- a/sysutils/fusefs-exfat/pkg-descr
+++ b/filesystems/exfat/pkg-descr
diff --git a/sysutils/fusefs-ext2/Makefile b/filesystems/ext2/Makefile
index eeb88d499456..3c3ec5000a85 100644
--- a/sysutils/fusefs-ext2/Makefile
+++ b/filesystems/ext2/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	fusefs-ext2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.0.11
 PORTREVISION=	2
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	FUSE module to mount ext2, ext3 and ext4 with read write support
@@ -11,8 +11,8 @@ WWW=		https://github.com/alperakcan/fuse-ext2
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	mke2fs:sysutils/e2fsprogs-core
-RUN_DEPENDS=	mke2fs:sysutils/e2fsprogs-core
+BUILD_DEPENDS=	mke2fs:filesystems/e2fsprogs-core
+RUN_DEPENDS=	mke2fs:filesystems/e2fsprogs-core
 
 USES=		autoreconf fuse libtool localbase:ldflags pkgconfig
 USE_GITHUB=	yes
diff --git a/sysutils/fusefs-ext2/distinfo b/filesystems/ext2/distinfo
index a1c8808c59aa..a1c8808c59aa 100644
--- a/sysutils/fusefs-ext2/distinfo
+++ b/filesystems/ext2/distinfo
diff --git a/sysutils/fusefs-ext2/files/patch-fuse-ext2_fuse-ext2.c b/filesystems/ext2/files/patch-fuse-ext2_fuse-ext2.c
index 6b12035108f4..6b12035108f4 100644
--- a/sysutils/fusefs-ext2/files/patch-fuse-ext2_fuse-ext2.c
+++ b/filesystems/ext2/files/patch-fuse-ext2_fuse-ext2.c
diff --git a/sysutils/fusefs-ext2/pkg-descr b/filesystems/ext2/pkg-descr
index e1d6775cdc20..e1d6775cdc20 100644
--- a/sysutils/fusefs-ext2/pkg-descr
+++ b/filesystems/ext2/pkg-descr
diff --git a/sysutils/fstyp/Makefile b/filesystems/fstyp/Makefile
index ed2ac1f3b3ed..df5bd1aeee56 100644
--- a/sysutils/fstyp/Makefile
+++ b/filesystems/fstyp/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	fstyp
 PORTVERSION=	0.1
 PORTREVISION=	1
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} http://thegaul.org/src/
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/sysutils/fstyp/distinfo b/filesystems/fstyp/distinfo
index ab1b62dcba1f..b4ac12620020 100644
--- a/sysutils/fstyp/distinfo
+++ b/filesystems/fstyp/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905193
 SHA256 (fstyp-0.1.tar.gz) = a41fa79dc6abbc146101926856706aedf227d7f6b8e6c8375b741bc43b80aec6
 SIZE (fstyp-0.1.tar.gz) = 203414
diff --git a/sysutils/fstyp/pkg-descr b/filesystems/fstyp/pkg-descr
index 2ab082ec691d..2ab082ec691d 100644
--- a/sysutils/fstyp/pkg-descr
+++ b/filesystems/fstyp/pkg-descr
diff --git a/sysutils/fswatch-mon/Makefile b/filesystems/fswatch-mon/Makefile
index d717021465ca..024b1176b393 100644
--- a/sysutils/fswatch-mon/Makefile
+++ b/filesystems/fswatch-mon/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	fswatch
 DISTVERSION=	1.13.0
 PORTREVISION=	3
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 MASTER_SITES=	https://github.com/emcrisostomo/${PORTNAME}/releases/download/${DISTVERSION}/
 PKGNAMESUFFIX=	-mon
 
diff --git a/sysutils/fswatch-mon/distinfo b/filesystems/fswatch-mon/distinfo
index d761195bb2be..d761195bb2be 100644
--- a/sysutils/fswatch-mon/distinfo
+++ b/filesystems/fswatch-mon/distinfo
diff --git a/sysutils/fswatch-mon/pkg-descr b/filesystems/fswatch-mon/pkg-descr
index d388a01b25fc..d388a01b25fc 100644
--- a/sysutils/fswatch-mon/pkg-descr
+++ b/filesystems/fswatch-mon/pkg-descr
diff --git a/sysutils/fswatch-mon/pkg-plist b/filesystems/fswatch-mon/pkg-plist
index 88bdd75d8212..88bdd75d8212 100644
--- a/sysutils/fswatch-mon/pkg-plist
+++ b/filesystems/fswatch-mon/pkg-plist
diff --git a/sysutils/fusefs-libs/Makefile b/filesystems/fusefs-libs/Makefile
index 7df70d03d24f..49557f4a7c76 100644
--- a/sysutils/fusefs-libs/Makefile
+++ b/filesystems/fusefs-libs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	fusefs
 DISTVERSION=	2.9.9
 PORTREVISION=	2
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 MASTER_SITES=	https://github.com/libfuse/libfuse/releases/download/fuse-${DISTVERSION}/
 PKGNAMESUFFIX=	-libs
 DISTNAME=	fuse-${DISTVERSION}
diff --git a/sysutils/fusefs-libs/distinfo b/filesystems/fusefs-libs/distinfo
index 932ca6834e61..932ca6834e61 100644
--- a/sysutils/fusefs-libs/distinfo
+++ b/filesystems/fusefs-libs/distinfo
diff --git a/sysutils/fusefs-libs/files/patch-doc_Makefile.am b/filesystems/fusefs-libs/files/patch-doc_Makefile.am
index d80aa802128e..d80aa802128e 100644
--- a/sysutils/fusefs-libs/files/patch-doc_Makefile.am
+++ b/filesystems/fusefs-libs/files/patch-doc_Makefile.am
diff --git a/sysutils/fusefs-libs/files/patch-lib_fuse__versionscript b/filesystems/fusefs-libs/files/patch-lib_fuse__versionscript
index f287af348fce..f287af348fce 100644
--- a/sysutils/fusefs-libs/files/patch-lib_fuse__versionscript
+++ b/filesystems/fusefs-libs/files/patch-lib_fuse__versionscript
diff --git a/sysutils/fusefs-libs/files/patch-lib_helper.c b/filesystems/fusefs-libs/files/patch-lib_helper.c
index a9cb4b6fd1aa..a9cb4b6fd1aa 100644
--- a/sysutils/fusefs-libs/files/patch-lib_helper.c
+++ b/filesystems/fusefs-libs/files/patch-lib_helper.c
diff --git a/sysutils/fusefs-libs/files/patch-lib_mount__bsd.c b/filesystems/fusefs-libs/files/patch-lib_mount__bsd.c
index 765ec8fb8159..765ec8fb8159 100644
--- a/sysutils/fusefs-libs/files/patch-lib_mount__bsd.c
+++ b/filesystems/fusefs-libs/files/patch-lib_mount__bsd.c
diff --git a/sysutils/fusefs-libs/files/patch-lib_mount__util.c b/filesystems/fusefs-libs/files/patch-lib_mount__util.c
index 1d6a5db2a488..1d6a5db2a488 100644
--- a/sysutils/fusefs-libs/files/patch-lib_mount__util.c
+++ b/filesystems/fusefs-libs/files/patch-lib_mount__util.c
diff --git a/sysutils/fusefs-libs/files/patch-lib_mount__util.h b/filesystems/fusefs-libs/files/patch-lib_mount__util.h
index 07865d839d77..07865d839d77 100644
--- a/sysutils/fusefs-libs/files/patch-lib_mount__util.h
+++ b/filesystems/fusefs-libs/files/patch-lib_mount__util.h
diff --git a/sysutils/fusefs-libs/pkg-descr b/filesystems/fusefs-libs/pkg-descr
index 73b81c35ecd0..73b81c35ecd0 100644
--- a/sysutils/fusefs-libs/pkg-descr
+++ b/filesystems/fusefs-libs/pkg-descr
diff --git a/sysutils/fusefs-libs/pkg-message b/filesystems/fusefs-libs/pkg-message
index 3e54fcf60f9c..3e54fcf60f9c 100644
--- a/sysutils/fusefs-libs/pkg-message
+++ b/filesystems/fusefs-libs/pkg-message
diff --git a/sysutils/fusefs-libs/pkg-plist b/filesystems/fusefs-libs/pkg-plist
index b4fd07c97bc6..b4fd07c97bc6 100644
--- a/sysutils/fusefs-libs/pkg-plist
+++ b/filesystems/fusefs-libs/pkg-plist
diff --git a/sysutils/fusefs-libs3/Makefile b/filesystems/fusefs-libs3/Makefile
index 0c76b6adee13..28bd5ec39c86 100644
--- a/sysutils/fusefs-libs3/Makefile
+++ b/filesystems/fusefs-libs3/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fusefs-libs3
 DISTVERSION=	3.16.2
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 MASTER_SITES=	https://github.com/libfuse/libfuse/releases/download/fuse-${DISTVERSION}/
 DISTNAME=	fuse-${DISTVERSION}
 
diff --git a/sysutils/fusefs-libs3/distinfo b/filesystems/fusefs-libs3/distinfo
index 363a678a4cce..363a678a4cce 100644
--- a/sysutils/fusefs-libs3/distinfo
+++ b/filesystems/fusefs-libs3/distinfo
diff --git a/sysutils/fusefs-libs3/files/extra-patch-test_meson.build b/filesystems/fusefs-libs3/files/extra-patch-test_meson.build
index f7a17a17e4e7..f7a17a17e4e7 100644
--- a/sysutils/fusefs-libs3/files/extra-patch-test_meson.build
+++ b/filesystems/fusefs-libs3/files/extra-patch-test_meson.build
diff --git a/sysutils/fusefs-libs3/files/patch-example_meson.build b/filesystems/fusefs-libs3/files/patch-example_meson.build
index 88340523ed75..88340523ed75 100644
--- a/sysutils/fusefs-libs3/files/patch-example_meson.build
+++ b/filesystems/fusefs-libs3/files/patch-example_meson.build
diff --git a/sysutils/fusefs-libs3/files/patch-lib_mount__bsd.c b/filesystems/fusefs-libs3/files/patch-lib_mount__bsd.c
index 7a757d511cf9..7a757d511cf9 100644
--- a/sysutils/fusefs-libs3/files/patch-lib_mount__bsd.c
+++ b/filesystems/fusefs-libs3/files/patch-lib_mount__bsd.c
diff --git a/sysutils/fusefs-libs3/pkg-descr b/filesystems/fusefs-libs3/pkg-descr
index 8897132a5e08..8897132a5e08 100644
--- a/sysutils/fusefs-libs3/pkg-descr
+++ b/filesystems/fusefs-libs3/pkg-descr
diff --git a/sysutils/fusefs-libs3/pkg-message b/filesystems/fusefs-libs3/pkg-message
index 3e54fcf60f9c..3e54fcf60f9c 100644
--- a/sysutils/fusefs-libs3/pkg-message
+++ b/filesystems/fusefs-libs3/pkg-message
diff --git a/sysutils/fusefs-libs3/pkg-plist b/filesystems/fusefs-libs3/pkg-plist
index e82082ae92f8..e82082ae92f8 100644
--- a/sysutils/fusefs-libs3/pkg-plist
+++ b/filesystems/fusefs-libs3/pkg-plist
diff --git a/devel/genromfs/Makefile b/filesystems/genromfs/Makefile
index 3a5848bbdf9f..4114b7c8345e 100644
--- a/devel/genromfs/Makefile
+++ b/filesystems/genromfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	genromfs
 PORTVERSION=	0.5.7
 PORTREVISION=	1
-CATEGORIES=	devel
+CATEGORIES=	filesystems devel
 
 MAINTAINER=	tomek@cedro.info
 COMMENT=	Mkfs equivalent for romfs filesystem
diff --git a/devel/genromfs/distinfo b/filesystems/genromfs/distinfo
index d56cda096967..d56cda096967 100644
--- a/devel/genromfs/distinfo
+++ b/filesystems/genromfs/distinfo
diff --git a/devel/genromfs/files/patch-Makefile b/filesystems/genromfs/files/patch-Makefile
index 1b9e509d6c3e..1b9e509d6c3e 100644
--- a/devel/genromfs/files/patch-Makefile
+++ b/filesystems/genromfs/files/patch-Makefile
diff --git a/devel/genromfs/pkg-descr b/filesystems/genromfs/pkg-descr
index af0611e1fed2..af0611e1fed2 100644
--- a/devel/genromfs/pkg-descr
+++ b/filesystems/genromfs/pkg-descr
diff --git a/sysutils/fusefs-gitfs/Makefile b/filesystems/gitfs/Makefile
index bb6b2ad0fbb5..d943f6188d14 100644
--- a/sysutils/fusefs-gitfs/Makefile
+++ b/filesystems/gitfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gitfs
 DISTVERSION=	0.5.2
 PORTREVISION=	2
-CATEGORIES=	sysutils devel
+CATEGORIES=	filesystems devel
 PKGNAMEPREFIX=	fusefs-
 
 MAINTAINER=	ports@FreeBSD.org
@@ -16,7 +16,7 @@ EXPIRATION_DATE=2024-12-31
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atomiclong>=0.1.1:devel/py-atomiclong@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cffi>=1.12.3:devel/py-cffi@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}fusepy>=3.0.1:devel/py-fusepy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}fusepy>=3.0.1:filesystems/py-fusepy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycparser>=2.19:devel/py-pycparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygit2>=0.28.2:devel/py-pygit2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}raven>=6.10.0:devel/py-raven@${PY_FLAVOR} \
diff --git a/sysutils/fusefs-gitfs/distinfo b/filesystems/gitfs/distinfo
index a44e0ec16308..a44e0ec16308 100644
--- a/sysutils/fusefs-gitfs/distinfo
+++ b/filesystems/gitfs/distinfo
diff --git a/sysutils/fusefs-gitfs/files/patch-gitfs_utils_args.py b/filesystems/gitfs/files/patch-gitfs_utils_args.py
index bc4d1d42d80d..bc4d1d42d80d 100644
--- a/sysutils/fusefs-gitfs/files/patch-gitfs_utils_args.py
+++ b/filesystems/gitfs/files/patch-gitfs_utils_args.py
diff --git a/sysutils/fusefs-gitfs/pkg-descr b/filesystems/gitfs/pkg-descr
index ce7e2bf5144f..ce7e2bf5144f 100644
--- a/sysutils/fusefs-gitfs/pkg-descr
+++ b/filesystems/gitfs/pkg-descr
diff --git a/graphics/fusefs-gphotofs/Makefile b/filesystems/gphotofs/Makefile
index 466d5bb2ba99..bbd1226738d5 100644
--- a/graphics/fusefs-gphotofs/Makefile
+++ b/filesystems/gphotofs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gphotofs
 PORTVERSION=	0.5
 PORTREVISION=	5
-CATEGORIES=	graphics sysutils
+CATEGORIES=	filesystems graphics sysutils
 MASTER_SITES=	SF/gphoto/${PORTNAME}/${PORTVERSION}.0
 PKGNAMEPREFIX=	fusefs-
 
diff --git a/graphics/fusefs-gphotofs/distinfo b/filesystems/gphotofs/distinfo
index 0ce15b49b9f5..8c2f49dc3b94 100644
--- a/graphics/fusefs-gphotofs/distinfo
+++ b/filesystems/gphotofs/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905199
 SHA256 (gphotofs-0.5.tar.bz2) = 676ec4de69a81c193ffc31bdc7b587ac2a2cc3780b14f0e7c9c4c0a517b343cc
 SIZE (gphotofs-0.5.tar.bz2) = 261357
diff --git a/graphics/fusefs-gphotofs/pkg-descr b/filesystems/gphotofs/pkg-descr
index 4ed340e8b05e..4ed340e8b05e 100644
--- a/graphics/fusefs-gphotofs/pkg-descr
+++ b/filesystems/gphotofs/pkg-descr
diff --git a/devel/gvfs/Makefile b/filesystems/gvfs/Makefile
index b303965b2c7f..46c238fc6b35 100644
--- a/devel/gvfs/Makefile
+++ b/filesystems/gvfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gvfs
 PORTVERSION=	1.50.2
 PORTREVISION=	3
-CATEGORIES=	devel gnome
+CATEGORIES=	filesystems devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
diff --git a/devel/gvfs/distinfo b/filesystems/gvfs/distinfo
index 57983f695276..57983f695276 100644
--- a/devel/gvfs/distinfo
+++ b/filesystems/gvfs/distinfo
diff --git a/devel/gvfs/files/patch-client_gvfsfusedaemon.c b/filesystems/gvfs/files/patch-client_gvfsfusedaemon.c
index 0d9c69189b48..0d9c69189b48 100644
--- a/devel/gvfs/files/patch-client_gvfsfusedaemon.c
+++ b/filesystems/gvfs/files/patch-client_gvfsfusedaemon.c
diff --git a/devel/gvfs/files/patch-daemon_gvfswritechannel.c b/filesystems/gvfs/files/patch-daemon_gvfswritechannel.c
index 54c4216873e4..54c4216873e4 100644
--- a/devel/gvfs/files/patch-daemon_gvfswritechannel.c
+++ b/filesystems/gvfs/files/patch-daemon_gvfswritechannel.c
diff --git a/devel/gvfs/pkg-descr b/filesystems/gvfs/pkg-descr
index 5ea65916b9a7..5ea65916b9a7 100644
--- a/devel/gvfs/pkg-descr
+++ b/filesystems/gvfs/pkg-descr
diff --git a/devel/gvfs/pkg-plist b/filesystems/gvfs/pkg-plist
index b4919f0bf62e..b4919f0bf62e 100644
--- a/devel/gvfs/pkg-plist
+++ b/filesystems/gvfs/pkg-plist
diff --git a/sysutils/hfsexplorer/Makefile b/filesystems/hfsexplorer/Makefile
index 60b1f4ab2a35..1ca4b1fad3b7 100644
--- a/sysutils/hfsexplorer/Makefile
+++ b/filesystems/hfsexplorer/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	hfsexplorer
 DISTVERSIONPREFIX=	${PORTNAME}-
 DISTVERSION=	2021.10.9
-CATEGORIES=	sysutils java
+CATEGORIES=	filesystems sysutils java
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HFSExplorer read Mac-formatted harddisks and disk images
diff --git a/sysutils/hfsexplorer/distinfo b/filesystems/hfsexplorer/distinfo
index 6d63ef3e632c..6d63ef3e632c 100644
--- a/sysutils/hfsexplorer/distinfo
+++ b/filesystems/hfsexplorer/distinfo
diff --git a/sysutils/hfsexplorer/files/patch-build.xml b/filesystems/hfsexplorer/files/patch-build.xml
index f76cc72470ee..f76cc72470ee 100644
--- a/sysutils/hfsexplorer/files/patch-build.xml
+++ b/filesystems/hfsexplorer/files/patch-build.xml
diff --git a/sysutils/hfsexplorer/pkg-descr b/filesystems/hfsexplorer/pkg-descr
index e3aef13452e6..e3aef13452e6 100644
--- a/sysutils/hfsexplorer/pkg-descr
+++ b/filesystems/hfsexplorer/pkg-descr
diff --git a/sysutils/hfsexplorer/pkg-plist b/filesystems/hfsexplorer/pkg-plist
index c61f0354a525..c61f0354a525 100644
--- a/sysutils/hfsexplorer/pkg-plist
+++ b/filesystems/hfsexplorer/pkg-plist
diff --git a/sysutils/fusefs-hfsfuse/Makefile b/filesystems/hfsfuse/Makefile
index 803fd8809bef..cfc69e5b055e 100644
--- a/sysutils/fusefs-hfsfuse/Makefile
+++ b/filesystems/hfsfuse/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	hfsfuse
 DISTVERSION=	0.132
 PORTREVISION=	1
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 MASTER_SITES=	https://github.com/0x09/hfsfuse/releases/download/${DISTVERSION}/
 PKGNAMEPREFIX=	fusefs-
 
diff --git a/sysutils/fusefs-hfsfuse/distinfo b/filesystems/hfsfuse/distinfo
index 57ed21da5d32..57ed21da5d32 100644
--- a/sysutils/fusefs-hfsfuse/distinfo
+++ b/filesystems/hfsfuse/distinfo
diff --git a/sysutils/fusefs-hfsfuse/pkg-descr b/filesystems/hfsfuse/pkg-descr
index f919854c8e6e..f919854c8e6e 100644
--- a/sysutils/fusefs-hfsfuse/pkg-descr
+++ b/filesystems/hfsfuse/pkg-descr
diff --git a/sysutils/hfsutils/Makefile b/filesystems/hfsutils/Makefile
index 3ddb4126de36..80c19431f37e 100644
--- a/sysutils/hfsutils/Makefile
+++ b/filesystems/hfsutils/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	hfsutils
 PORTVERSION=	3.2.6
 PORTREVISION=	4
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 MASTER_SITES=	ftp://ftp.mars.org/pub/hfs/
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/sysutils/hfsutils/distinfo b/filesystems/hfsutils/distinfo
index 5d584efcafce..518b017fcb0c 100644
--- a/sysutils/hfsutils/distinfo
+++ b/filesystems/hfsutils/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905175
 SHA256 (hfsutils-3.2.6.tar.gz) = bc9d22d6d252b920ec9cdf18e00b7655a6189b3f34f42e58d5bb152957289840
 SIZE (hfsutils-3.2.6.tar.gz) = 207697
diff --git a/sysutils/hfsutils/files/patch-Makefile.in b/filesystems/hfsutils/files/patch-Makefile.in
index d736f4db0809..d736f4db0809 100644
--- a/sysutils/hfsutils/files/patch-Makefile.in
+++ b/filesystems/hfsutils/files/patch-Makefile.in
diff --git a/sysutils/hfsutils/pkg-descr b/filesystems/hfsutils/pkg-descr
index 5a79840b7135..5a79840b7135 100644
--- a/sysutils/hfsutils/pkg-descr
+++ b/filesystems/hfsutils/pkg-descr
diff --git a/sysutils/hfsutils/pkg-plist b/filesystems/hfsutils/pkg-plist
index 287d168c53cd..287d168c53cd 100644
--- a/sysutils/hfsutils/pkg-plist
+++ b/filesystems/hfsutils/pkg-plist
diff --git a/sysutils/fusefs-httpdirfs/Makefile b/filesystems/httpdirfs/Makefile
index ae574033d018..8cda154772d7 100644
--- a/sysutils/fusefs-httpdirfs/Makefile
+++ b/filesystems/httpdirfs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	httpdirfs
 DISTVERSION=	1.2.6
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 PKGNAMEPREFIX=	fusefs-
 
 PATCH_SITES=	https://github.com/fangfufu/httpdirfs/commit/
diff --git a/sysutils/fusefs-httpdirfs/distinfo b/filesystems/httpdirfs/distinfo
index 49205edda4c0..49205edda4c0 100644
--- a/sysutils/fusefs-httpdirfs/distinfo
+++ b/filesystems/httpdirfs/distinfo
diff --git a/sysutils/fusefs-httpdirfs/pkg-descr b/filesystems/httpdirfs/pkg-descr
index 14bcef6ad8c5..14bcef6ad8c5 100644
--- a/sysutils/fusefs-httpdirfs/pkg-descr
+++ b/filesystems/httpdirfs/pkg-descr
diff --git a/sysutils/fusefs-httpfs/Makefile b/filesystems/httpfs/Makefile
index 95d2cff486d0..40eaf89aa25b 100644
--- a/sysutils/fusefs-httpfs/Makefile
+++ b/filesystems/httpfs/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	httpfs
 PORTVERSION=	2.${VERSION}
 PORTREVISION=	2
 PORTEPOCH=	1
-CATEGORIES=	sysutils www
+CATEGORIES=	filesystems www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}2/
 PKGNAMEPREFIX=	fusefs-
 DISTNAME=	${PORTNAME}2-${VERSION}
diff --git a/sysutils/fusefs-httpfs/distinfo b/filesystems/httpfs/distinfo
index edd611d2f23d..350e69639b94 100644
--- a/sysutils/fusefs-httpfs/distinfo
+++ b/filesystems/httpfs/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905182
 SHA256 (httpfs2-0.1.5.tar.gz) = 01cb4bb38deb344f540da6f1464dc7edbdeb51213ad810b8c9c282c1e17e0fc1
 SIZE (httpfs2-0.1.5.tar.gz) = 16870
diff --git a/sysutils/fusefs-httpfs/files/patch-Makefile b/filesystems/httpfs/files/patch-Makefile
index 4e2252a2840b..4e2252a2840b 100644
--- a/sysutils/fusefs-httpfs/files/patch-Makefile
+++ b/filesystems/httpfs/files/patch-Makefile
diff --git a/sysutils/fusefs-httpfs/files/patch-httpfs2.c b/filesystems/httpfs/files/patch-httpfs2.c
index c18b96efd4a4..c18b96efd4a4 100644
--- a/sysutils/fusefs-httpfs/files/patch-httpfs2.c
+++ b/filesystems/httpfs/files/patch-httpfs2.c
diff --git a/sysutils/fusefs-httpfs/pkg-descr b/filesystems/httpfs/pkg-descr
index f66315b8419d..f66315b8419d 100644
--- a/sysutils/fusefs-httpfs/pkg-descr
+++ b/filesystems/httpfs/pkg-descr
diff --git a/sysutils/fusefs-ifuse/Makefile b/filesystems/ifuse/Makefile
index 91bb75e3cb01..03bafe10619b 100644
--- a/sysutils/fusefs-ifuse/Makefile
+++ b/filesystems/ifuse/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ifuse
 PORTVERSION=	1.1.4
 PORTREVISION=	2
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 MASTER_SITES=	https://github.com/libimobiledevice/${PORTNAME}/releases/download/${PORTVERSION}/
 PKGNAMEPREFIX=	fusefs-
 
diff --git a/sysutils/fusefs-ifuse/distinfo b/filesystems/ifuse/distinfo
index b21401ae8148..b21401ae8148 100644
--- a/sysutils/fusefs-ifuse/distinfo
+++ b/filesystems/ifuse/distinfo
diff --git a/sysutils/fusefs-ifuse/pkg-descr b/filesystems/ifuse/pkg-descr
index ec833ee456f5..ec833ee456f5 100644
--- a/sysutils/fusefs-ifuse/pkg-descr
+++ b/filesystems/ifuse/pkg-descr
diff --git a/sysutils/fusefs-ifuse/pkg-message b/filesystems/ifuse/pkg-message
index d0087f79ebe9..d0087f79ebe9 100644
--- a/sysutils/fusefs-ifuse/pkg-message
+++ b/filesystems/ifuse/pkg-message
diff --git a/sysutils/fusefs-jmtpfs/Makefile b/filesystems/jmtpfs/Makefile
index dd0838321682..a5ff5c2f3d75 100644
--- a/sysutils/fusefs-jmtpfs/Makefile
+++ b/filesystems/jmtpfs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	jmtpfs
 DISTVERSION=	g20190420
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 PKGNAMEPREFIX=	fusefs-
 
 MAINTAINER=	rozhuk.im@gmail.com
diff --git a/sysutils/fusefs-jmtpfs/distinfo b/filesystems/jmtpfs/distinfo
index 4371cfe4d47c..4371cfe4d47c 100644
--- a/sysutils/fusefs-jmtpfs/distinfo
+++ b/filesystems/jmtpfs/distinfo
diff --git a/sysutils/fusefs-jmtpfs/pkg-descr b/filesystems/jmtpfs/pkg-descr
index 5be262a8d2f0..5be262a8d2f0 100644
--- a/sysutils/fusefs-jmtpfs/pkg-descr
+++ b/filesystems/jmtpfs/pkg-descr
diff --git a/sysutils/kio-fuse/Makefile b/filesystems/kio-fuse/Makefile
index a3cd076642b9..21368d99edb4 100644
--- a/sysutils/kio-fuse/Makefile
+++ b/filesystems/kio-fuse/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	kio-fuse
 DISTVERSION=	5.1.0
-CATEGORIES=	sysutils kde
+CATEGORIES=	filesystems sysutils kde
 MASTER_SITES=	KDE/stable/${PORTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/kio-fuse/distinfo b/filesystems/kio-fuse/distinfo
index b839419dae7d..b839419dae7d 100644
--- a/sysutils/kio-fuse/distinfo
+++ b/filesystems/kio-fuse/distinfo
diff --git a/sysutils/kio-fuse/files/patch-CMakeLists.txt b/filesystems/kio-fuse/files/patch-CMakeLists.txt
index f6a3612f75c0..f6a3612f75c0 100644
--- a/sysutils/kio-fuse/files/patch-CMakeLists.txt
+++ b/filesystems/kio-fuse/files/patch-CMakeLists.txt
diff --git a/sysutils/kio-fuse/pkg-descr b/filesystems/kio-fuse/pkg-descr
index 5b433586114d..5b433586114d 100644
--- a/sysutils/kio-fuse/pkg-descr
+++ b/filesystems/kio-fuse/pkg-descr
diff --git a/sysutils/kio-fuse/pkg-message b/filesystems/kio-fuse/pkg-message
index 46e15e48af4c..46e15e48af4c 100644
--- a/sysutils/kio-fuse/pkg-message
+++ b/filesystems/kio-fuse/pkg-message
diff --git a/devel/libbde/Makefile b/filesystems/libbde/Makefile
index fd5d266e24cb..9a0115c8c2fe 100644
--- a/devel/libbde/Makefile
+++ b/filesystems/libbde/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	libbde
 DISTVERSION=	alpha-20231220
-CATEGORIES=	devel
+CATEGORIES=	filesystems devel
 MASTER_SITES=	https://github.com/libyal/libbde/releases/download/${PORTVERSION:E}/ \
 		LOCAL/antoine
 
diff --git a/devel/libbde/distinfo b/filesystems/libbde/distinfo
index 7d8c38ce375a..7d8c38ce375a 100644
--- a/devel/libbde/distinfo
+++ b/filesystems/libbde/distinfo
diff --git a/devel/libbde/pkg-descr b/filesystems/libbde/pkg-descr
index 9acfb6bca20f..9acfb6bca20f 100644
--- a/devel/libbde/pkg-descr
+++ b/filesystems/libbde/pkg-descr
diff --git a/devel/libbde/pkg-plist b/filesystems/libbde/pkg-plist
index d9f871ed4a9a..d9f871ed4a9a 100644
--- a/devel/libbde/pkg-plist
+++ b/filesystems/libbde/pkg-plist
diff --git a/devel/libfsapfs/Makefile b/filesystems/libfsapfs/Makefile
index 4b9c7e8b80d3..30db939185aa 100644
--- a/devel/libfsapfs/Makefile
+++ b/filesystems/libfsapfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	libfsapfs
 # If/When moving from experimental to alpha, switch to DISTVERSIONPREFIX to prevent PORTEPOCH
 DISTVERSION=	experimental-20231122
-CATEGORIES=	devel
+CATEGORIES=	filesystems devel
 MASTER_SITES=	https://github.com/libyal/libfsapfs/releases/download/${PORTVERSION:E}/ \
 		LOCAL/antoine
 
diff --git a/devel/libfsapfs/distinfo b/filesystems/libfsapfs/distinfo
index c5ac079f5d26..c5ac079f5d26 100644
--- a/devel/libfsapfs/distinfo
+++ b/filesystems/libfsapfs/distinfo
diff --git a/devel/libfsapfs/pkg-descr b/filesystems/libfsapfs/pkg-descr
index 61a4927c5eb0..61a4927c5eb0 100644
--- a/devel/libfsapfs/pkg-descr
+++ b/filesystems/libfsapfs/pkg-descr
diff --git a/devel/libfsapfs/pkg-plist b/filesystems/libfsapfs/pkg-plist
index 939747d660de..939747d660de 100644
--- a/devel/libfsapfs/pkg-plist
+++ b/filesystems/libfsapfs/pkg-plist
diff --git a/devel/libfsext/Makefile b/filesystems/libfsext/Makefile
index c35d4e101549..7216b4326bad 100644
--- a/devel/libfsext/Makefile
+++ b/filesystems/libfsext/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	libfsext
 # If/When moving from experimental to alpha, switch to DISTVERSIONPREFIX to prevent PORTEPOCH
 DISTVERSION=	experimental-20231129
-CATEGORIES=	devel
+CATEGORIES=	filesystems devel
 MASTER_SITES=	https://github.com/libyal/libfsext/releases/download/${PORTVERSION:E}/ \
 		LOCAL/antoine
 
diff --git a/devel/libfsext/distinfo b/filesystems/libfsext/distinfo
index af5acaab6f00..af5acaab6f00 100644
--- a/devel/libfsext/distinfo
+++ b/filesystems/libfsext/distinfo
diff --git a/devel/libfsext/pkg-descr b/filesystems/libfsext/pkg-descr
index 285d40feb04f..285d40feb04f 100644
--- a/devel/libfsext/pkg-descr
+++ b/filesystems/libfsext/pkg-descr
diff --git a/devel/libfsext/pkg-plist b/filesystems/libfsext/pkg-plist
index 81ea09be91c1..81ea09be91c1 100644
--- a/devel/libfsext/pkg-plist
+++ b/filesystems/libfsext/pkg-plist
diff --git a/devel/libfsfat/Makefile b/filesystems/libfsfat/Makefile
index 4d016544f03a..d18cdf5fd726 100644
--- a/devel/libfsfat/Makefile
+++ b/filesystems/libfsfat/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	libfsfat
 # If/When moving from experimental to alpha, switch to DISTVERSIONPREFIX to prevent PORTEPOCH
 DISTVERSION=	experimental-20231122
-CATEGORIES=	devel
+CATEGORIES=	filesystems devel
 MASTER_SITES=	https://github.com/libyal/libfsfat/releases/download/${PORTVERSION:E}/ \
 		LOCAL/antoine
 
diff --git a/devel/libfsfat/distinfo b/filesystems/libfsfat/distinfo
index 0f2626e7770f..0f2626e7770f 100644
--- a/devel/libfsfat/distinfo
+++ b/filesystems/libfsfat/distinfo
diff --git a/devel/libfsfat/pkg-descr b/filesystems/libfsfat/pkg-descr
index f303433616cc..f303433616cc 100644
--- a/devel/libfsfat/pkg-descr
+++ b/filesystems/libfsfat/pkg-descr
diff --git a/devel/libfsfat/pkg-plist b/filesystems/libfsfat/pkg-plist
index c657a6fc2311..c657a6fc2311 100644
--- a/devel/libfsfat/pkg-plist
+++ b/filesystems/libfsfat/pkg-plist
diff --git a/devel/libfshfs/Makefile b/filesystems/libfshfs/Makefile
index 44ab8090cb05..242a99cdb3a7 100644
--- a/devel/libfshfs/Makefile
+++ b/filesystems/libfshfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	libfshfs
 # If/When moving from experimental to alpha, switch to DISTVERSIONPREFIX to prevent PORTEPOCH
 DISTVERSION=	experimental-20231125
-CATEGORIES=	devel
+CATEGORIES=	filesystems devel
 MASTER_SITES=	https://github.com/libyal/libfshfs/releases/download/${PORTVERSION:E}/ \
 		LOCAL/antoine
 
diff --git a/devel/libfshfs/distinfo b/filesystems/libfshfs/distinfo
index d97397cb447c..d97397cb447c 100644
--- a/devel/libfshfs/distinfo
+++ b/filesystems/libfshfs/distinfo
diff --git a/devel/libfshfs/pkg-descr b/filesystems/libfshfs/pkg-descr
index b7634c525b9c..b7634c525b9c 100644
--- a/devel/libfshfs/pkg-descr
+++ b/filesystems/libfshfs/pkg-descr
diff --git a/devel/libfshfs/pkg-plist b/filesystems/libfshfs/pkg-plist
index d5c0ac017d37..d5c0ac017d37 100644
--- a/devel/libfshfs/pkg-plist
+++ b/filesystems/libfshfs/pkg-plist
diff --git a/devel/libfsntfs/Makefile b/filesystems/libfsntfs/Makefile
index b9f207317355..ea2b8a262cfc 100644
--- a/devel/libfsntfs/Makefile
+++ b/filesystems/libfsntfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	libfsntfs
 # If/When moving from experimental to alpha, switch to DISTVERSIONPREFIX to prevent PORTEPOCH
 DISTVERSION=	experimental-20231125
-CATEGORIES=	devel
+CATEGORIES=	filesystems devel
 MASTER_SITES=	https://github.com/libyal/libfsntfs/releases/download/${PORTVERSION:E}/ \
 		LOCAL/antoine
 
diff --git a/devel/libfsntfs/distinfo b/filesystems/libfsntfs/distinfo
index 82438122469a..82438122469a 100644
--- a/devel/libfsntfs/distinfo
+++ b/filesystems/libfsntfs/distinfo
diff --git a/devel/libfsntfs/pkg-descr b/filesystems/libfsntfs/pkg-descr
index 8aa270b801b3..8aa270b801b3 100644
--- a/devel/libfsntfs/pkg-descr
+++ b/filesystems/libfsntfs/pkg-descr
diff --git a/devel/libfsntfs/pkg-plist b/filesystems/libfsntfs/pkg-plist
index 35bb09d1e8d8..35bb09d1e8d8 100644
--- a/devel/libfsntfs/pkg-plist
+++ b/filesystems/libfsntfs/pkg-plist
diff --git a/devel/libfsxfs/Makefile b/filesystems/libfsxfs/Makefile
index c9a36dd78526..3bdd9186fa3d 100644
--- a/devel/libfsxfs/Makefile
+++ b/filesystems/libfsxfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	libfsxfs
 # If/When moving from experimental to alpha, switch to DISTVERSIONPREFIX to prevent PORTEPOCH
 DISTVERSION=	experimental-20231124
-CATEGORIES=	devel
+CATEGORIES=	filesystems devel
 MASTER_SITES=	https://github.com/libyal/libfsxfs/releases/download/${PORTVERSION:E}/ \
 		LOCAL/antoine
 
diff --git a/devel/libfsxfs/distinfo b/filesystems/libfsxfs/distinfo
index a141316a4050..a141316a4050 100644
--- a/devel/libfsxfs/distinfo
+++ b/filesystems/libfsxfs/distinfo
diff --git a/devel/libfsxfs/pkg-descr b/filesystems/libfsxfs/pkg-descr
index 644af6e193f2..644af6e193f2 100644
--- a/devel/libfsxfs/pkg-descr
+++ b/filesystems/libfsxfs/pkg-descr
diff --git a/devel/libfsxfs/pkg-plist b/filesystems/libfsxfs/pkg-plist
index 1c0c6102a1a8..1c0c6102a1a8 100644
--- a/devel/libfsxfs/pkg-plist
+++ b/filesystems/libfsxfs/pkg-plist
diff --git a/devel/libmodi/Makefile b/filesystems/libmodi/Makefile
index 77bca8473f60..d79664531122 100644
--- a/devel/libmodi/Makefile
+++ b/filesystems/libmodi/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	libmodi
 # If/When moving from experimental to alpha, switch to DISTVERSIONPREFIX to prevent PORTEPOCH
 DISTVERSION=	experimental-20231123
-CATEGORIES=	devel
+CATEGORIES=	filesystems devel
 MASTER_SITES=	https://github.com/libyal/libmodi/releases/download/${PORTVERSION:E}/ \
 		LOCAL/antoine
 
diff --git a/devel/libmodi/distinfo b/filesystems/libmodi/distinfo
index 5895684e3a45..5895684e3a45 100644
--- a/devel/libmodi/distinfo
+++ b/filesystems/libmodi/distinfo
diff --git a/devel/libmodi/pkg-descr b/filesystems/libmodi/pkg-descr
index b94a8a7477fa..b94a8a7477fa 100644
--- a/devel/libmodi/pkg-descr
+++ b/filesystems/libmodi/pkg-descr
diff --git a/devel/libmodi/pkg-plist b/filesystems/libmodi/pkg-plist
index 406b08b3b485..406b08b3b485 100644
--- a/devel/libmodi/pkg-plist
+++ b/filesystems/libmodi/pkg-plist
diff --git a/sysutils/linux-c7-dosfstools/Makefile b/filesystems/linux-c7-dosfstools/Makefile
index 4275fcf94c08..a6f1c766cdcf 100644
--- a/sysutils/linux-c7-dosfstools/Makefile
+++ b/filesystems/linux-c7-dosfstools/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	dosfstools
 PORTVERSION=	3.0.20
 DISTVERSIONSUFFIX=	-10.el7
-CATEGORIES=	sysutils linux
+CATEGORIES=	filesystems sysutils linux
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Utilities for MS-DOS FAT filesystems (CentOS ${LINUX_DIST_VER})
diff --git a/sysutils/linux-c7-dosfstools/distinfo b/filesystems/linux-c7-dosfstools/distinfo
index e9e50c078ffd..e9e50c078ffd 100644
--- a/sysutils/linux-c7-dosfstools/distinfo
+++ b/filesystems/linux-c7-dosfstools/distinfo
diff --git a/sysutils/linux-c7-dosfstools/pkg-descr b/filesystems/linux-c7-dosfstools/pkg-descr
index cc3d686d3e87..cc3d686d3e87 100644
--- a/sysutils/linux-c7-dosfstools/pkg-descr
+++ b/filesystems/linux-c7-dosfstools/pkg-descr
diff --git a/sysutils/linux-c7-dosfstools/pkg-plist b/filesystems/linux-c7-dosfstools/pkg-plist
index 6effb0571f67..6effb0571f67 100644
--- a/sysutils/linux-c7-dosfstools/pkg-plist
+++ b/filesystems/linux-c7-dosfstools/pkg-plist
diff --git a/sysutils/lizardfs/Makefile b/filesystems/lizardfs/Makefile
index eedc61c84a2b..f99fb0532899 100644
--- a/sysutils/lizardfs/Makefile
+++ b/filesystems/lizardfs/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	lizardfs
 PORTVERSION=	3.12.0
 DISTVERSIONPREFIX=	v
 PORTREVISION=	22
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 
 MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Open Source Distributed Filesystem
diff --git a/sysutils/lizardfs/distinfo b/filesystems/lizardfs/distinfo
index ffb58e32e777..ffb58e32e777 100644
--- a/sysutils/lizardfs/distinfo
+++ b/filesystems/lizardfs/distinfo
diff --git a/sysutils/lizardfs/files/mfscgiserv.in b/filesystems/lizardfs/files/mfscgiserv.in
index 0876470c2221..0876470c2221 100644
--- a/sysutils/lizardfs/files/mfscgiserv.in
+++ b/filesystems/lizardfs/files/mfscgiserv.in
diff --git a/sysutils/lizardfs/files/mfschunkserver.in b/filesystems/lizardfs/files/mfschunkserver.in
index b4dbe0baae4a..b4dbe0baae4a 100644
--- a/sysutils/lizardfs/files/mfschunkserver.in
+++ b/filesystems/lizardfs/files/mfschunkserver.in
diff --git a/sysutils/lizardfs/files/mfsmaster.in b/filesystems/lizardfs/files/mfsmaster.in
index 3a3bc49bdefd..3a3bc49bdefd 100644
--- a/sysutils/lizardfs/files/mfsmaster.in
+++ b/filesystems/lizardfs/files/mfsmaster.in
diff --git a/sysutils/lizardfs/files/mfsmetalogger.in b/filesystems/lizardfs/files/mfsmetalogger.in
index e1fae34ddb88..e1fae34ddb88 100644
--- a/sysutils/lizardfs/files/mfsmetalogger.in
+++ b/filesystems/lizardfs/files/mfsmetalogger.in
diff --git a/sysutils/lizardfs/files/mfspingserv.in b/filesystems/lizardfs/files/mfspingserv.in
index 625628e37fd6..625628e37fd6 100644
--- a/sysutils/lizardfs/files/mfspingserv.in
+++ b/filesystems/lizardfs/files/mfspingserv.in
diff --git a/sysutils/lizardfs/files/patch-CMakeLists.txt b/filesystems/lizardfs/files/patch-CMakeLists.txt
index fd2d4079393b..fd2d4079393b 100644
--- a/sysutils/lizardfs/files/patch-CMakeLists.txt
+++ b/filesystems/lizardfs/files/patch-CMakeLists.txt
diff --git a/sysutils/lizardfs/files/patch-cmake_CheckIncludes.cmake b/filesystems/lizardfs/files/patch-cmake_CheckIncludes.cmake
index 0dfe41ad59fb..0dfe41ad59fb 100644
--- a/sysutils/lizardfs/files/patch-cmake_CheckIncludes.cmake
+++ b/filesystems/lizardfs/files/patch-cmake_CheckIncludes.cmake
diff --git a/sysutils/lizardfs/files/patch-cmake__Libraries.cmake b/filesystems/lizardfs/files/patch-cmake__Libraries.cmake
index 95dbb0c4a80a..95dbb0c4a80a 100644
--- a/sysutils/lizardfs/files/patch-cmake__Libraries.cmake
+++ b/filesystems/lizardfs/files/patch-cmake__Libraries.cmake
diff --git a/sysutils/lizardfs/files/patch-src_common_slogger.cc b/filesystems/lizardfs/files/patch-src_common_slogger.cc
index 02566193f6ea..02566193f6ea 100644
--- a/sysutils/lizardfs/files/patch-src_common_slogger.cc
+++ b/filesystems/lizardfs/files/patch-src_common_slogger.cc
diff --git a/sysutils/lizardfs/files/patch-src_common_slogger.h b/filesystems/lizardfs/files/patch-src_common_slogger.h
index 2d5a7367b467..2d5a7367b467 100644
--- a/sysutils/lizardfs/files/patch-src_common_slogger.h
+++ b/filesystems/lizardfs/files/patch-src_common_slogger.h
diff --git a/sysutils/lizardfs/pkg-descr b/filesystems/lizardfs/pkg-descr
index e80d3740401b..e80d3740401b 100644
--- a/sysutils/lizardfs/pkg-descr
+++ b/filesystems/lizardfs/pkg-descr
diff --git a/sysutils/lizardfs/pkg-plist b/filesystems/lizardfs/pkg-plist
index d9d585a1e3cd..d9d585a1e3cd 100644
--- a/sysutils/lizardfs/pkg-plist
+++ b/filesystems/lizardfs/pkg-plist
diff --git a/sysutils/fusefs-lkl/Makefile b/filesystems/lkl/Makefile
index 86585dde4e96..c56be9005f7e 100644
--- a/sysutils/fusefs-lkl/Makefile
+++ b/filesystems/lkl/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	lkl
 DISTVERSION=	4.16.g20180628
 PORTREVISION=	4
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 PKGNAMEPREFIX=	fusefs-
 
 MAINTAINER=	cem@FreeBSD.org
diff --git a/sysutils/fusefs-lkl/distinfo b/filesystems/lkl/distinfo
index 3a765d45de46..3a765d45de46 100644
--- a/sysutils/fusefs-lkl/distinfo
+++ b/filesystems/lkl/distinfo
diff --git a/sysutils/fusefs-lkl/files/patch-Makefile b/filesystems/lkl/files/patch-Makefile
index 09b164e2c5f6..09b164e2c5f6 100644
--- a/sysutils/fusefs-lkl/files/patch-Makefile
+++ b/filesystems/lkl/files/patch-Makefile
diff --git a/sysutils/fusefs-lkl/files/patch-Targets b/filesystems/lkl/files/patch-Targets
index e1fe24075c09..e1fe24075c09 100644
--- a/sysutils/fusefs-lkl/files/patch-Targets
+++ b/filesystems/lkl/files/patch-Targets
diff --git a/sysutils/fusefs-lkl/pkg-descr b/filesystems/lkl/pkg-descr
index bee83838ac5e..bee83838ac5e 100644
--- a/sysutils/fusefs-lkl/pkg-descr
+++ b/filesystems/lkl/pkg-descr
diff --git a/sysutils/ltfs/Makefile b/filesystems/ltfs/Makefile
index cd4ad4047715..15a3f5985c9d 100644
--- a/sysutils/ltfs/Makefile
+++ b/filesystems/ltfs/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	ltfs
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.4.6.2
 DISTVERSIONSUFFIX=	-10513
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 
 MAINTAINER=	kbowling@FreeBSD.org
 COMMENT=	Reference implementation of LTFS for stand-alone tape drive
diff --git a/sysutils/ltfs/distinfo b/filesystems/ltfs/distinfo
index bdad82fb2bfd..bdad82fb2bfd 100644
--- a/sysutils/ltfs/distinfo
+++ b/filesystems/ltfs/distinfo
diff --git a/sysutils/ltfs/files/patch-src_tape__drivers_freebsd_cam_cam__tc.c b/filesystems/ltfs/files/patch-src_tape__drivers_freebsd_cam_cam__tc.c
index d4be8240818e..d4be8240818e 100644
--- a/sysutils/ltfs/files/patch-src_tape__drivers_freebsd_cam_cam__tc.c
+++ b/filesystems/ltfs/files/patch-src_tape__drivers_freebsd_cam_cam__tc.c
diff --git a/sysutils/ltfs/pkg-descr b/filesystems/ltfs/pkg-descr
index 910dcd0a543f..910dcd0a543f 100644
--- a/sysutils/ltfs/pkg-descr
+++ b/filesystems/ltfs/pkg-descr
diff --git a/sysutils/ltfs/pkg-message b/filesystems/ltfs/pkg-message
index a0fee2742d98..a0fee2742d98 100644
--- a/sysutils/ltfs/pkg-message
+++ b/filesystems/ltfs/pkg-message
diff --git a/sysutils/ltfs/pkg-plist b/filesystems/ltfs/pkg-plist
index 60e9532496db..60e9532496db 100644
--- a/sysutils/ltfs/pkg-plist
+++ b/filesystems/ltfs/pkg-plist
diff --git a/sysutils/fusefs-mergerfs/Makefile b/filesystems/mergerfs/Makefile
index 023c4618a341..288a63552490 100644
--- a/sysutils/fusefs-mergerfs/Makefile
+++ b/filesystems/mergerfs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mergerfs
 DISTVERSION=	2.40.2
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 PKGNAMEPREFIX=	fusefs-
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/sysutils/fusefs-mergerfs/distinfo b/filesystems/mergerfs/distinfo
index 37bfb871ee16..37bfb871ee16 100644
--- a/sysutils/fusefs-mergerfs/distinfo
+++ b/filesystems/mergerfs/distinfo
diff --git a/sysutils/fusefs-mergerfs/files/patch-libfuse_lib_cpu.hpp b/filesystems/mergerfs/files/patch-libfuse_lib_cpu.hpp
index 953ff7e2e86b..953ff7e2e86b 100644
--- a/sysutils/fusefs-mergerfs/files/patch-libfuse_lib_cpu.hpp
+++ b/filesystems/mergerfs/files/patch-libfuse_lib_cpu.hpp
diff --git a/sysutils/fusefs-mergerfs/files/patch-libfuse_lib_fuse.c b/filesystems/mergerfs/files/patch-libfuse_lib_fuse.c
index cdbfe55e710c..cdbfe55e710c 100644
--- a/sysutils/fusefs-mergerfs/files/patch-libfuse_lib_fuse.c
+++ b/filesystems/mergerfs/files/patch-libfuse_lib_fuse.c
diff --git a/sysutils/fusefs-mergerfs/files/patch-libfuse_util_fusermount.c b/filesystems/mergerfs/files/patch-libfuse_util_fusermount.c
index 7657ee4ce378..7657ee4ce378 100644
--- a/sysutils/fusefs-mergerfs/files/patch-libfuse_util_fusermount.c
+++ b/filesystems/mergerfs/files/patch-libfuse_util_fusermount.c
diff --git a/sysutils/fusefs-mergerfs/files/patch-src_fs__readahead.cpp b/filesystems/mergerfs/files/patch-src_fs__readahead.cpp
index 3bb873358455..3bb873358455 100644
--- a/sysutils/fusefs-mergerfs/files/patch-src_fs__readahead.cpp
+++ b/filesystems/mergerfs/files/patch-src_fs__readahead.cpp
diff --git a/sysutils/fusefs-mergerfs/files/patch-src_fs__umount2.hpp b/filesystems/mergerfs/files/patch-src_fs__umount2.hpp
index ce291a314c01..ce291a314c01 100644
--- a/sysutils/fusefs-mergerfs/files/patch-src_fs__umount2.hpp
+++ b/filesystems/mergerfs/files/patch-src_fs__umount2.hpp
diff --git a/sysutils/fusefs-mergerfs/files/patch-tools_preload.c b/filesystems/mergerfs/files/patch-tools_preload.c
index a9a3ad06b3c3..a9a3ad06b3c3 100644
--- a/sysutils/fusefs-mergerfs/files/patch-tools_preload.c
+++ b/filesystems/mergerfs/files/patch-tools_preload.c
diff --git a/sysutils/fusefs-mergerfs/pkg-descr b/filesystems/mergerfs/pkg-descr
index cff399af2600..cff399af2600 100644
--- a/sysutils/fusefs-mergerfs/pkg-descr
+++ b/filesystems/mergerfs/pkg-descr
diff --git a/sysutils/fusefs-mhddfs/Makefile b/filesystems/mhddfs/Makefile
index 612745b00173..5ae9b30c5a9e 100644
--- a/sysutils/fusefs-mhddfs/Makefile
+++ b/filesystems/mhddfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mhddfs
 PORTVERSION=	0.1.37
 PORTREVISION=	1
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 MASTER_SITES=	http://mhddfs.uvw.ru/downloads/
 PKGNAMEPREFIX=	fusefs-
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/sysutils/fusefs-mhddfs/distinfo b/filesystems/mhddfs/distinfo
index 6e2ad39f54f3..9eb0b83fedb0 100644
--- a/sysutils/fusefs-mhddfs/distinfo
+++ b/filesystems/mhddfs/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905183
 SHA256 (mhddfs_0.1.37.tar.gz) = cac6b528b65e7468aa1988bf8ca3cb5cf505f3b543e063649a62e8d1cf800b3b
 SIZE (mhddfs_0.1.37.tar.gz) = 40042
diff --git a/sysutils/fusefs-mhddfs/files/patch-Makefile b/filesystems/mhddfs/files/patch-Makefile
index 27dc30fcdb9d..27dc30fcdb9d 100644
--- a/sysutils/fusefs-mhddfs/files/patch-Makefile
+++ b/filesystems/mhddfs/files/patch-Makefile
diff --git a/sysutils/fusefs-mhddfs/pkg-descr b/filesystems/mhddfs/pkg-descr
index 76148714af7e..76148714af7e 100644
--- a/sysutils/fusefs-mhddfs/pkg-descr
+++ b/filesystems/mhddfs/pkg-descr
diff --git a/sysutils/moosefs2-cgi/Makefile b/filesystems/moosefs2-cgi/Makefile
index d33138f4f30c..d33138f4f30c 100644
--- a/sysutils/moosefs2-cgi/Makefile
+++ b/filesystems/moosefs2-cgi/Makefile
diff --git a/sysutils/moosefs2-cgi/pkg-descr b/filesystems/moosefs2-cgi/pkg-descr
index 36025c132006..36025c132006 100644
--- a/sysutils/moosefs2-cgi/pkg-descr
+++ b/filesystems/moosefs2-cgi/pkg-descr
diff --git a/sysutils/moosefs2-cgi/pkg-plist b/filesystems/moosefs2-cgi/pkg-plist
index d601df00caac..d601df00caac 100644
--- a/sysutils/moosefs2-cgi/pkg-plist
+++ b/filesystems/moosefs2-cgi/pkg-plist
diff --git a/sysutils/moosefs2-cgiserv/Makefile b/filesystems/moosefs2-cgiserv/Makefile
index afe97c58fc27..afe97c58fc27 100644
--- a/sysutils/moosefs2-cgiserv/Makefile
+++ b/filesystems/moosefs2-cgiserv/Makefile
diff --git a/sysutils/moosefs2-cgiserv/pkg-descr b/filesystems/moosefs2-cgiserv/pkg-descr
index 521dda4d677c..521dda4d677c 100644
--- a/sysutils/moosefs2-cgiserv/pkg-descr
+++ b/filesystems/moosefs2-cgiserv/pkg-descr
diff --git a/sysutils/moosefs2-cgiserv/pkg-plist b/filesystems/moosefs2-cgiserv/pkg-plist
index 3f3ea8249528..3f3ea8249528 100644
--- a/sysutils/moosefs2-cgiserv/pkg-plist
+++ b/filesystems/moosefs2-cgiserv/pkg-plist
diff --git a/sysutils/moosefs2-chunkserver/Makefile b/filesystems/moosefs2-chunkserver/Makefile
index a194e2c20296..a194e2c20296 100644
--- a/sysutils/moosefs2-chunkserver/Makefile
+++ b/filesystems/moosefs2-chunkserver/Makefile
diff --git a/sysutils/moosefs2-chunkserver/pkg-descr b/filesystems/moosefs2-chunkserver/pkg-descr
index 49022d32fbbc..49022d32fbbc 100644
--- a/sysutils/moosefs2-chunkserver/pkg-descr
+++ b/filesystems/moosefs2-chunkserver/pkg-descr
diff --git a/sysutils/moosefs2-chunkserver/pkg-plist b/filesystems/moosefs2-chunkserver/pkg-plist
index da630f1080bb..da630f1080bb 100644
--- a/sysutils/moosefs2-chunkserver/pkg-plist
+++ b/filesystems/moosefs2-chunkserver/pkg-plist
diff --git a/sysutils/moosefs2-cli/Makefile b/filesystems/moosefs2-cli/Makefile
index 1a6757a94e1c..1a6757a94e1c 100644
--- a/sysutils/moosefs2-cli/Makefile
+++ b/filesystems/moosefs2-cli/Makefile
diff --git a/sysutils/moosefs2-cli/pkg-descr b/filesystems/moosefs2-cli/pkg-descr
index 9b4fd59436bf..9b4fd59436bf 100644
--- a/sysutils/moosefs2-cli/pkg-descr
+++ b/filesystems/moosefs2-cli/pkg-descr
diff --git a/sysutils/moosefs2-cli/pkg-plist b/filesystems/moosefs2-cli/pkg-plist
index b89b6b5ecf83..b89b6b5ecf83 100644
--- a/sysutils/moosefs2-cli/pkg-plist
+++ b/filesystems/moosefs2-cli/pkg-plist
diff --git a/sysutils/moosefs2-client/Makefile b/filesystems/moosefs2-client/Makefile
index 9cf2d724e61e..9cf2d724e61e 100644
--- a/sysutils/moosefs2-client/Makefile
+++ b/filesystems/moosefs2-client/Makefile
diff --git a/sysutils/moosefs2-client/pkg-descr b/filesystems/moosefs2-client/pkg-descr
index de72d7e2d737..de72d7e2d737 100644
--- a/sysutils/moosefs2-client/pkg-descr
+++ b/filesystems/moosefs2-client/pkg-descr
diff --git a/sysutils/moosefs2-client/pkg-plist b/filesystems/moosefs2-client/pkg-plist
index 8697bf3f7775..8697bf3f7775 100644
--- a/sysutils/moosefs2-client/pkg-plist
+++ b/filesystems/moosefs2-client/pkg-plist
diff --git a/sysutils/moosefs2-master/Makefile b/filesystems/moosefs2-master/Makefile
index 35e4c736bde1..f71b0645904f 100644
--- a/sysutils/moosefs2-master/Makefile
+++ b/filesystems/moosefs2-master/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=		moosefs2
 PORTVERSION=		2.0.91
 PORTREVISION=	1
-CATEGORIES=		sysutils
+CATEGORIES=		filesystems sysutils
 MASTER_SITES=		http://ppa.moosefs.com/src/
 PKGNAMESUFFIX?=		-master
 DISTNAME=		moosefs-${PORTVERSION}-1
@@ -49,7 +49,7 @@ PKGMESSAGE=		${WRKDIR}/pkg-message-cgiserv
 PLIST_SUB+=		MFS_WORKDIR="${MFS_WORKDIR}"
 CONFIGURE_ARGS+=	--enable-mfscgiserv \
 			--with-mfscgiserv-dir=${MFS_CGISERVDIR}
-RUN_DEPENDS=		moosefs2-cgi>0:sysutils/moosefs2-cgi
+RUN_DEPENDS=		moosefs2-cgi>0:filesystems/moosefs2-cgi
 .else
 CONFIGURE_ARGS+=	--disable-mfscgiserv
 .endif
diff --git a/sysutils/moosefs2-master/distinfo b/filesystems/moosefs2-master/distinfo
index 967bb6ec0f40..967bb6ec0f40 100644
--- a/sysutils/moosefs2-master/distinfo
+++ b/filesystems/moosefs2-master/distinfo
diff --git a/sysutils/moosefs2-master/files/mfscgiserv.in b/filesystems/moosefs2-master/files/mfscgiserv.in
index 39f9f59ddb6d..39f9f59ddb6d 100644
--- a/sysutils/moosefs2-master/files/mfscgiserv.in
+++ b/filesystems/moosefs2-master/files/mfscgiserv.in
diff --git a/sysutils/moosefs2-master/files/mfschunkserver.in b/filesystems/moosefs2-master/files/mfschunkserver.in
index 3083fe91b543..3083fe91b543 100644
--- a/sysutils/moosefs2-master/files/mfschunkserver.in
+++ b/filesystems/moosefs2-master/files/mfschunkserver.in
diff --git a/sysutils/moosefs2-master/files/mfsmaster.in b/filesystems/moosefs2-master/files/mfsmaster.in
index a551d441c5b1..a551d441c5b1 100644
--- a/sysutils/moosefs2-master/files/mfsmaster.in
+++ b/filesystems/moosefs2-master/files/mfsmaster.in
diff --git a/sysutils/moosefs2-master/files/mfsmetalogger.in b/filesystems/moosefs2-master/files/mfsmetalogger.in
index 994a1a69f4ec..994a1a69f4ec 100644
--- a/sysutils/moosefs2-master/files/mfsmetalogger.in
+++ b/filesystems/moosefs2-master/files/mfsmetalogger.in
diff --git a/sysutils/moosefs2-master/files/patch-mfsdata_Makefile.in b/filesystems/moosefs2-master/files/patch-mfsdata_Makefile.in
index ac1bd4685b43..ac1bd4685b43 100644
--- a/sysutils/moosefs2-master/files/patch-mfsdata_Makefile.in
+++ b/filesystems/moosefs2-master/files/patch-mfsdata_Makefile.in
diff --git a/sysutils/moosefs2-master/files/pkg-message-cgiserv.in b/filesystems/moosefs2-master/files/pkg-message-cgiserv.in
index b93e90eb8847..b93e90eb8847 100644
--- a/sysutils/moosefs2-master/files/pkg-message-cgiserv.in
+++ b/filesystems/moosefs2-master/files/pkg-message-cgiserv.in
diff --git a/sysutils/moosefs2-master/files/pkg-message-chunkserver.in b/filesystems/moosefs2-master/files/pkg-message-chunkserver.in
index 5ad0ee1a4388..5ad0ee1a4388 100644
--- a/sysutils/moosefs2-master/files/pkg-message-chunkserver.in
+++ b/filesystems/moosefs2-master/files/pkg-message-chunkserver.in
diff --git a/sysutils/moosefs2-master/files/pkg-message-master.in b/filesystems/moosefs2-master/files/pkg-message-master.in
index 748bcc9eee7a..748bcc9eee7a 100644
--- a/sysutils/moosefs2-master/files/pkg-message-master.in
+++ b/filesystems/moosefs2-master/files/pkg-message-master.in
diff --git a/sysutils/moosefs2-master/files/pkg-message-metalogger.in b/filesystems/moosefs2-master/files/pkg-message-metalogger.in
index 0a294c00bc0c..0a294c00bc0c 100644
--- a/sysutils/moosefs2-master/files/pkg-message-metalogger.in
+++ b/filesystems/moosefs2-master/files/pkg-message-metalogger.in
diff --git a/sysutils/moosefs2-master/pkg-descr b/filesystems/moosefs2-master/pkg-descr
index 5a93d68ac286..5a93d68ac286 100644
--- a/sysutils/moosefs2-master/pkg-descr
+++ b/filesystems/moosefs2-master/pkg-descr
diff --git a/sysutils/moosefs2-master/pkg-plist b/filesystems/moosefs2-master/pkg-plist
index d750cf15d914..d750cf15d914 100644
--- a/sysutils/moosefs2-master/pkg-plist
+++ b/filesystems/moosefs2-master/pkg-plist
diff --git a/sysutils/moosefs2-metalogger/Makefile b/filesystems/moosefs2-metalogger/Makefile
index 6922aac6de8f..6922aac6de8f 100644
--- a/sysutils/moosefs2-metalogger/Makefile
+++ b/filesystems/moosefs2-metalogger/Makefile
diff --git a/sysutils/moosefs2-metalogger/pkg-descr b/filesystems/moosefs2-metalogger/pkg-descr
index 02e050e7169b..02e050e7169b 100644
--- a/sysutils/moosefs2-metalogger/pkg-descr
+++ b/filesystems/moosefs2-metalogger/pkg-descr
diff --git a/sysutils/moosefs2-metalogger/pkg-plist b/filesystems/moosefs2-metalogger/pkg-plist
index c27833ff6e37..c27833ff6e37 100644
--- a/sysutils/moosefs2-metalogger/pkg-plist
+++ b/filesystems/moosefs2-metalogger/pkg-plist
diff --git a/sysutils/moosefs2-netdump/Makefile b/filesystems/moosefs2-netdump/Makefile
index 819857812fb0..819857812fb0 100644
--- a/sysutils/moosefs2-netdump/Makefile
+++ b/filesystems/moosefs2-netdump/Makefile
diff --git a/sysutils/moosefs2-netdump/pkg-descr b/filesystems/moosefs2-netdump/pkg-descr
index 6691c4931b69..6691c4931b69 100644
--- a/sysutils/moosefs2-netdump/pkg-descr
+++ b/filesystems/moosefs2-netdump/pkg-descr
diff --git a/sysutils/moosefs2-netdump/pkg-plist b/filesystems/moosefs2-netdump/pkg-plist
index d9fe247254f3..d9fe247254f3 100644
--- a/sysutils/moosefs2-netdump/pkg-plist
+++ b/filesystems/moosefs2-netdump/pkg-plist
diff --git a/sysutils/moosefs3-cgi/Makefile b/filesystems/moosefs3-cgi/Makefile
index 7d037c1e09ae..7d037c1e09ae 100644
--- a/sysutils/moosefs3-cgi/Makefile
+++ b/filesystems/moosefs3-cgi/Makefile
diff --git a/sysutils/moosefs3-cgi/pkg-descr b/filesystems/moosefs3-cgi/pkg-descr
index 36025c132006..36025c132006 100644
--- a/sysutils/moosefs3-cgi/pkg-descr
+++ b/filesystems/moosefs3-cgi/pkg-descr
diff --git a/sysutils/moosefs3-cgi/pkg-plist b/filesystems/moosefs3-cgi/pkg-plist
index d601df00caac..d601df00caac 100644
--- a/sysutils/moosefs3-cgi/pkg-plist
+++ b/filesystems/moosefs3-cgi/pkg-plist
diff --git a/sysutils/moosefs3-cgiserv/Makefile b/filesystems/moosefs3-cgiserv/Makefile
index 3b34f14aa4a4..3b34f14aa4a4 100644
--- a/sysutils/moosefs3-cgiserv/Makefile
+++ b/filesystems/moosefs3-cgiserv/Makefile
diff --git a/sysutils/moosefs3-cgiserv/pkg-descr b/filesystems/moosefs3-cgiserv/pkg-descr
index 521dda4d677c..521dda4d677c 100644
--- a/sysutils/moosefs3-cgiserv/pkg-descr
+++ b/filesystems/moosefs3-cgiserv/pkg-descr
diff --git a/sysutils/moosefs3-cgiserv/pkg-plist b/filesystems/moosefs3-cgiserv/pkg-plist
index 3f3ea8249528..3f3ea8249528 100644
--- a/sysutils/moosefs3-cgiserv/pkg-plist
+++ b/filesystems/moosefs3-cgiserv/pkg-plist
diff --git a/sysutils/moosefs3-chunkserver/Makefile b/filesystems/moosefs3-chunkserver/Makefile
index 34b4fb34d732..34b4fb34d732 100644
--- a/sysutils/moosefs3-chunkserver/Makefile
+++ b/filesystems/moosefs3-chunkserver/Makefile
diff --git a/sysutils/moosefs3-chunkserver/pkg-descr b/filesystems/moosefs3-chunkserver/pkg-descr
index 49022d32fbbc..49022d32fbbc 100644
--- a/sysutils/moosefs3-chunkserver/pkg-descr
+++ b/filesystems/moosefs3-chunkserver/pkg-descr
diff --git a/sysutils/moosefs3-chunkserver/pkg-plist b/filesystems/moosefs3-chunkserver/pkg-plist
index c255b94a42bd..c255b94a42bd 100644
--- a/sysutils/moosefs3-chunkserver/pkg-plist
+++ b/filesystems/moosefs3-chunkserver/pkg-plist
diff --git a/sysutils/moosefs3-cli/Makefile b/filesystems/moosefs3-cli/Makefile
index ae2879d67725..ae2879d67725 100644
--- a/sysutils/moosefs3-cli/Makefile
+++ b/filesystems/moosefs3-cli/Makefile
diff --git a/sysutils/moosefs3-cli/pkg-descr b/filesystems/moosefs3-cli/pkg-descr
index 9b4fd59436bf..9b4fd59436bf 100644
--- a/sysutils/moosefs3-cli/pkg-descr
+++ b/filesystems/moosefs3-cli/pkg-descr
diff --git a/sysutils/moosefs3-cli/pkg-plist b/filesystems/moosefs3-cli/pkg-plist
index b89b6b5ecf83..b89b6b5ecf83 100644
--- a/sysutils/moosefs3-cli/pkg-plist
+++ b/filesystems/moosefs3-cli/pkg-plist
diff --git a/sysutils/moosefs3-client/Makefile b/filesystems/moosefs3-client/Makefile
index 90d9fc570de2..90d9fc570de2 100644
--- a/sysutils/moosefs3-client/Makefile
+++ b/filesystems/moosefs3-client/Makefile
diff --git a/sysutils/moosefs3-client/pkg-descr b/filesystems/moosefs3-client/pkg-descr
index de72d7e2d737..de72d7e2d737 100644
--- a/sysutils/moosefs3-client/pkg-descr
+++ b/filesystems/moosefs3-client/pkg-descr
diff --git a/sysutils/moosefs3-client/pkg-plist b/filesystems/moosefs3-client/pkg-plist
index 2dc2199c4f06..2dc2199c4f06 100644
--- a/sysutils/moosefs3-client/pkg-plist
+++ b/filesystems/moosefs3-client/pkg-plist
diff --git a/sysutils/moosefs3-master/Makefile b/filesystems/moosefs3-master/Makefile
index bd061877abfc..603cdeffcbe9 100644
--- a/sysutils/moosefs3-master/Makefile
+++ b/filesystems/moosefs3-master/Makefile
@@ -2,7 +2,7 @@ PORTNAME=		moosefs3
 DISTVERSION=		3.0.117
 DISTVERSIONSUFFIX=	1
 PORTREVISION=		1
-CATEGORIES=		sysutils
+CATEGORIES=		filesystems sysutils
 MASTER_SITES=		http://ppa.moosefs.com/src/
 PKGNAMESUFFIX?=		-master
 DISTNAME=		moosefs-${DISTVERSION}-${DISTVERSIONSUFFIX}
@@ -52,7 +52,7 @@ PKGMESSAGE=		${WRKDIR}/pkg-message-cgiserv
 PLIST_SUB+=		MFS_WORKDIR="${MFS_WORKDIR}"
 CONFIGURE_ARGS+=	--enable-mfscgiserv \
 			--with-mfscgiserv-dir=${MFS_CGISERVDIR}
-RUN_DEPENDS=		moosefs3-cgi>0:sysutils/moosefs3-cgi
+RUN_DEPENDS=		moosefs3-cgi>0:filesystems/moosefs3-cgi
 .else
 CONFIGURE_ARGS+=	--disable-mfscgiserv
 .endif
diff --git a/sysutils/moosefs3-master/distinfo b/filesystems/moosefs3-master/distinfo
index a07f18a467bb..a07f18a467bb 100644
--- a/sysutils/moosefs3-master/distinfo
+++ b/filesystems/moosefs3-master/distinfo
diff --git a/sysutils/moosefs3-master/files/mfscgiserv.in b/filesystems/moosefs3-master/files/mfscgiserv.in
index 39f9f59ddb6d..39f9f59ddb6d 100644
--- a/sysutils/moosefs3-master/files/mfscgiserv.in
+++ b/filesystems/moosefs3-master/files/mfscgiserv.in
diff --git a/sysutils/moosefs3-master/files/mfschunkserver.in b/filesystems/moosefs3-master/files/mfschunkserver.in
index 3083fe91b543..3083fe91b543 100644
--- a/sysutils/moosefs3-master/files/mfschunkserver.in
+++ b/filesystems/moosefs3-master/files/mfschunkserver.in
diff --git a/sysutils/moosefs3-master/files/mfsmaster.in b/filesystems/moosefs3-master/files/mfsmaster.in
index 74056169626f..74056169626f 100644
--- a/sysutils/moosefs3-master/files/mfsmaster.in
+++ b/filesystems/moosefs3-master/files/mfsmaster.in
diff --git a/sysutils/moosefs3-master/files/mfsmetalogger.in b/filesystems/moosefs3-master/files/mfsmetalogger.in
index 994a1a69f4ec..994a1a69f4ec 100644
--- a/sysutils/moosefs3-master/files/mfsmetalogger.in
+++ b/filesystems/moosefs3-master/files/mfsmetalogger.in
diff --git a/sysutils/moosefs3-master/files/pkg-message-cgiserv.in b/filesystems/moosefs3-master/files/pkg-message-cgiserv.in
index b93e90eb8847..b93e90eb8847 100644
--- a/sysutils/moosefs3-master/files/pkg-message-cgiserv.in
+++ b/filesystems/moosefs3-master/files/pkg-message-cgiserv.in
diff --git a/sysutils/moosefs3-master/files/pkg-message-chunkserver.in b/filesystems/moosefs3-master/files/pkg-message-chunkserver.in
index 5ad0ee1a4388..5ad0ee1a4388 100644
--- a/sysutils/moosefs3-master/files/pkg-message-chunkserver.in
+++ b/filesystems/moosefs3-master/files/pkg-message-chunkserver.in
diff --git a/sysutils/moosefs3-master/files/pkg-message-master.in b/filesystems/moosefs3-master/files/pkg-message-master.in
index 748bcc9eee7a..748bcc9eee7a 100644
--- a/sysutils/moosefs3-master/files/pkg-message-master.in
+++ b/filesystems/moosefs3-master/files/pkg-message-master.in
diff --git a/sysutils/moosefs3-master/files/pkg-message-metalogger.in b/filesystems/moosefs3-master/files/pkg-message-metalogger.in
index 0a294c00bc0c..0a294c00bc0c 100644
--- a/sysutils/moosefs3-master/files/pkg-message-metalogger.in
+++ b/filesystems/moosefs3-master/files/pkg-message-metalogger.in
diff --git a/sysutils/moosefs3-master/pkg-descr b/filesystems/moosefs3-master/pkg-descr
index 5a93d68ac286..5a93d68ac286 100644
--- a/sysutils/moosefs3-master/pkg-descr
+++ b/filesystems/moosefs3-master/pkg-descr
diff --git a/sysutils/moosefs3-master/pkg-plist b/filesystems/moosefs3-master/pkg-plist
index f144525c0af2..f144525c0af2 100644
--- a/sysutils/moosefs3-master/pkg-plist
+++ b/filesystems/moosefs3-master/pkg-plist
diff --git a/sysutils/moosefs3-metalogger/Makefile b/filesystems/moosefs3-metalogger/Makefile
index 086c97898f87..086c97898f87 100644
--- a/sysutils/moosefs3-metalogger/Makefile
+++ b/filesystems/moosefs3-metalogger/Makefile
diff --git a/sysutils/moosefs3-metalogger/pkg-descr b/filesystems/moosefs3-metalogger/pkg-descr
index 02e050e7169b..02e050e7169b 100644
--- a/sysutils/moosefs3-metalogger/pkg-descr
+++ b/filesystems/moosefs3-metalogger/pkg-descr
diff --git a/sysutils/moosefs3-metalogger/pkg-plist b/filesystems/moosefs3-metalogger/pkg-plist
index c27833ff6e37..c27833ff6e37 100644
--- a/sysutils/moosefs3-metalogger/pkg-plist
+++ b/filesystems/moosefs3-metalogger/pkg-plist
diff --git a/sysutils/moosefs3-netdump/Makefile b/filesystems/moosefs3-netdump/Makefile
index 7e51b535aa18..7e51b535aa18 100644
--- a/sysutils/moosefs3-netdump/Makefile
+++ b/filesystems/moosefs3-netdump/Makefile
diff --git a/sysutils/moosefs3-netdump/pkg-descr b/filesystems/moosefs3-netdump/pkg-descr
index 6691c4931b69..6691c4931b69 100644
--- a/sysutils/moosefs3-netdump/pkg-descr
+++ b/filesystems/moosefs3-netdump/pkg-descr
diff --git a/sysutils/moosefs3-netdump/pkg-plist b/filesystems/moosefs3-netdump/pkg-plist
index d9fe247254f3..d9fe247254f3 100644
--- a/sysutils/moosefs3-netdump/pkg-plist
+++ b/filesystems/moosefs3-netdump/pkg-plist
diff --git a/sysutils/fusefs-mp3fs/Makefile b/filesystems/mp3fs/Makefile
index 0579bd543da0..8f5249983c00 100644
--- a/sysutils/fusefs-mp3fs/Makefile
+++ b/filesystems/mp3fs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mp3fs
 PORTVERSION=	1.1.1
 PORTEPOCH=	1
-CATEGORIES=	sysutils audio
+CATEGORIES=	filesystems audio
 MASTER_SITES=	https://github.com/khenriks/${PORTNAME}/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	fusefs-
 
diff --git a/sysutils/fusefs-mp3fs/distinfo b/filesystems/mp3fs/distinfo
index e5d4f1dc027f..e5d4f1dc027f 100644
--- a/sysutils/fusefs-mp3fs/distinfo
+++ b/filesystems/mp3fs/distinfo
diff --git a/sysutils/fusefs-mp3fs/pkg-descr b/filesystems/mp3fs/pkg-descr
index 391cbd7593b3..391cbd7593b3 100644
--- a/sysutils/fusefs-mp3fs/pkg-descr
+++ b/filesystems/mp3fs/pkg-descr
diff --git a/emulators/mtools/Makefile b/filesystems/mtools/Makefile
index ff56f4ef8de1..33b2c796964c 100644
--- a/emulators/mtools/Makefile
+++ b/filesystems/mtools/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mtools
 PORTVERSION=	4.0.43
 PORTREVISION=	1
-CATEGORIES=	emulators
+CATEGORIES=	filesystems emulators
 MASTER_SITES=	GNU
 
 MAINTAINER=	skreuzer@FreeBSD.org
diff --git a/emulators/mtools/distinfo b/filesystems/mtools/distinfo
index fdded9f52cc2..fdded9f52cc2 100644
--- a/emulators/mtools/distinfo
+++ b/filesystems/mtools/distinfo
diff --git a/emulators/mtools/files/patch-Makefile.in b/filesystems/mtools/files/patch-Makefile.in
index 1c9d84b0e764..1c9d84b0e764 100644
--- a/emulators/mtools/files/patch-Makefile.in
+++ b/filesystems/mtools/files/patch-Makefile.in
diff --git a/emulators/mtools/files/patch-configure b/filesystems/mtools/files/patch-configure
index f7dc9e442ebd..f7dc9e442ebd 100644
--- a/emulators/mtools/files/patch-configure
+++ b/filesystems/mtools/files/patch-configure
diff --git a/emulators/mtools/files/patch-mtools.texi b/filesystems/mtools/files/patch-mtools.texi
index 02360f495ddc..02360f495ddc 100644
--- a/emulators/mtools/files/patch-mtools.texi
+++ b/filesystems/mtools/files/patch-mtools.texi
diff --git a/emulators/mtools/files/patch-scsi.c b/filesystems/mtools/files/patch-scsi.c
index c0338b7ed945..c0338b7ed945 100644
--- a/emulators/mtools/files/patch-scsi.c
+++ b/filesystems/mtools/files/patch-scsi.c
diff --git a/emulators/mtools/files/pkg-message.in b/filesystems/mtools/files/pkg-message.in
index fb262add717d..fb262add717d 100644
--- a/emulators/mtools/files/pkg-message.in
+++ b/filesystems/mtools/files/pkg-message.in
diff --git a/emulators/mtools/pkg-descr b/filesystems/mtools/pkg-descr
index 5ab285231a70..5ab285231a70 100644
--- a/emulators/mtools/pkg-descr
+++ b/filesystems/mtools/pkg-descr
diff --git a/emulators/mtools/pkg-plist b/filesystems/mtools/pkg-plist
index 8fe66ac5cb9c..8fe66ac5cb9c 100644
--- a/emulators/mtools/pkg-plist
+++ b/filesystems/mtools/pkg-plist
diff --git a/sysutils/mtpfs/Makefile b/filesystems/mtpfs/Makefile
index 1574df76dcc0..45280de5a66a 100644
--- a/sysutils/mtpfs/Makefile
+++ b/filesystems/mtpfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mtpfs
 PORTVERSION=	1.1
 PORTREVISION=	5
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 
 MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	MTP device filesystem
diff --git a/sysutils/mtpfs/distinfo b/filesystems/mtpfs/distinfo
index f5a1fe2cc047..f5a1fe2cc047 100644
--- a/sysutils/mtpfs/distinfo
+++ b/filesystems/mtpfs/distinfo
diff --git a/sysutils/mtpfs/files/patch-Makefile.am b/filesystems/mtpfs/files/patch-Makefile.am
index 88b3b171b057..88b3b171b057 100644
--- a/sysutils/mtpfs/files/patch-Makefile.am
+++ b/filesystems/mtpfs/files/patch-Makefile.am
diff --git a/sysutils/mtpfs/files/patch-Makefile.in b/filesystems/mtpfs/files/patch-Makefile.in
index 81605bc20d6b..81605bc20d6b 100644
--- a/sysutils/mtpfs/files/patch-Makefile.in
+++ b/filesystems/mtpfs/files/patch-Makefile.in
diff --git a/sysutils/mtpfs/files/patch-mtpfs.c b/filesystems/mtpfs/files/patch-mtpfs.c
index 2c9be7d4cdb1..2c9be7d4cdb1 100644
--- a/sysutils/mtpfs/files/patch-mtpfs.c
+++ b/filesystems/mtpfs/files/patch-mtpfs.c
diff --git a/sysutils/mtpfs/files/patch-mtpfs.h b/filesystems/mtpfs/files/patch-mtpfs.h
index 92ca2ae91cda..92ca2ae91cda 100644
--- a/sysutils/mtpfs/files/patch-mtpfs.h
+++ b/filesystems/mtpfs/files/patch-mtpfs.h
diff --git a/sysutils/mtpfs/pkg-descr b/filesystems/mtpfs/pkg-descr
index 95934af17d80..95934af17d80 100644
--- a/sysutils/mtpfs/pkg-descr
+++ b/filesystems/mtpfs/pkg-descr
diff --git a/sysutils/fusefs-nbt/Makefile b/filesystems/nbt/Makefile
index 8d7416481637..b7f9c57a61dc 100644
--- a/sysutils/fusefs-nbt/Makefile
+++ b/filesystems/nbt/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nbt
 PORTVERSION=	${REVISION_DATE}
 PORTREVISION=	1
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 MASTER_SITES=	SF/nbtfsutils
 PKGNAMEPREFIX=	fusefs-
 DISTNAME=	nbtfsutils-${REVISION_DATE}-${REVISION_HASH}-src
diff --git a/sysutils/fusefs-nbt/distinfo b/filesystems/nbt/distinfo
index ea368f58e177..ea368f58e177 100644
--- a/sysutils/fusefs-nbt/distinfo
+++ b/filesystems/nbt/distinfo
diff --git a/sysutils/fusefs-nbt/pkg-descr b/filesystems/nbt/pkg-descr
index 1060a6bd8392..1060a6bd8392 100644
--- a/sysutils/fusefs-nbt/pkg-descr
+++ b/filesystems/nbt/pkg-descr
diff --git a/sysutils/fusefs-nbt/pkg-plist b/filesystems/nbt/pkg-plist
index c94aa0406782..c94aa0406782 100644
--- a/sysutils/fusefs-nbt/pkg-plist
+++ b/filesystems/nbt/pkg-plist
diff --git a/sysutils/fusefs-ntfs-compression/Makefile b/filesystems/ntfs-compression/Makefile
index 8aff56637c32..5932750c15e0 100644
--- a/sysutils/fusefs-ntfs-compression/Makefile
+++ b/filesystems/ntfs-compression/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ntfs-compression
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 PKGNAMEPREFIX=	fusefs-
 
 MAINTAINER=	danfe@FreeBSD.org
@@ -11,7 +11,7 @@ WWW=		https://github.com/ebiggers/ntfs-3g-system-compression
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libntfs-3g.so:sysutils/fusefs-ntfs
+LIB_DEPENDS=	libntfs-3g.so:filesystems/ntfs
 
 USES=		autoreconf libtool pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/sysutils/fusefs-ntfs-compression/distinfo b/filesystems/ntfs-compression/distinfo
index fbc99b05fba6..fbc99b05fba6 100644
--- a/sysutils/fusefs-ntfs-compression/distinfo
+++ b/filesystems/ntfs-compression/distinfo
diff --git a/sysutils/fusefs-ntfs-compression/pkg-descr b/filesystems/ntfs-compression/pkg-descr
index 603491ffe814..603491ffe814 100644
--- a/sysutils/fusefs-ntfs-compression/pkg-descr
+++ b/filesystems/ntfs-compression/pkg-descr
diff --git a/sysutils/fusefs-ntfs/Makefile b/filesystems/ntfs/Makefile
index 1623d537ba8d..2ff33fa98b38 100644
--- a/sysutils/fusefs-ntfs/Makefile
+++ b/filesystems/ntfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ntfs
 PORTVERSION=	2022.10.3
 PORTREVISION=	1
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 MASTER_SITES=	https://download.tuxera.com/opensource/
 PKGNAMEPREFIX=	fusefs-
 DISTNAME=	${PORTNAME}-3g_ntfsprogs-${PORTVERSION}
diff --git a/sysutils/fusefs-ntfs/distinfo b/filesystems/ntfs/distinfo
index 51633f525273..51633f525273 100644
--- a/sysutils/fusefs-ntfs/distinfo
+++ b/filesystems/ntfs/distinfo
diff --git a/sysutils/fusefs-ntfs/files/README.FreeBSD b/filesystems/ntfs/files/README.FreeBSD
index ffaedb7707c3..ffaedb7707c3 100644
--- a/sysutils/fusefs-ntfs/files/README.FreeBSD
+++ b/filesystems/ntfs/files/README.FreeBSD
diff --git a/sysutils/fusefs-ntfs/files/extra-patch-ublio b/filesystems/ntfs/files/extra-patch-ublio
index 36f1bb32acc9..36f1bb32acc9 100644
--- a/sysutils/fusefs-ntfs/files/extra-patch-ublio
+++ b/filesystems/ntfs/files/extra-patch-ublio
diff --git a/sysutils/fusefs-ntfs/files/patch-configure b/filesystems/ntfs/files/patch-configure
index cee7cc4a9090..cee7cc4a9090 100644
--- a/sysutils/fusefs-ntfs/files/patch-configure
+++ b/filesystems/ntfs/files/patch-configure
diff --git a/sysutils/fusefs-ntfs/files/patch-libntfs-3g__unix_io.c b/filesystems/ntfs/files/patch-libntfs-3g__unix_io.c
index b3e4c3dad80a..b3e4c3dad80a 100644
--- a/sysutils/fusefs-ntfs/files/patch-libntfs-3g__unix_io.c
+++ b/filesystems/ntfs/files/patch-libntfs-3g__unix_io.c
diff --git a/sysutils/fusefs-ntfs/files/patch-ntfsprogs_mkntfs.c b/filesystems/ntfs/files/patch-ntfsprogs_mkntfs.c
index 4338563b5e04..4338563b5e04 100644
--- a/sysutils/fusefs-ntfs/files/patch-ntfsprogs_mkntfs.c
+++ b/filesystems/ntfs/files/patch-ntfsprogs_mkntfs.c
diff --git a/sysutils/fusefs-ntfs/files/pkg-message.in b/filesystems/ntfs/files/pkg-message.in
index dad797469e8e..dad797469e8e 100644
--- a/sysutils/fusefs-ntfs/files/pkg-message.in
+++ b/filesystems/ntfs/files/pkg-message.in
diff --git a/sysutils/fusefs-ntfs/pkg-descr b/filesystems/ntfs/pkg-descr
index 539b307f498c..539b307f498c 100644
--- a/sysutils/fusefs-ntfs/pkg-descr
+++ b/filesystems/ntfs/pkg-descr
diff --git a/sysutils/fusefs-ntfs/pkg-plist b/filesystems/ntfs/pkg-plist
index 93dcc52a90fd..93dcc52a90fd 100644
--- a/sysutils/fusefs-ntfs/pkg-plist
+++ b/filesystems/ntfs/pkg-plist
diff --git a/sysutils/ntfs2btrfs/Makefile b/filesystems/ntfs2btrfs/Makefile
index 7d8ea00fc08a..7bc3fb88d004 100644
--- a/sysutils/ntfs2btrfs/Makefile
+++ b/filesystems/ntfs2btrfs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ntfs2btrfs
 PORTVERSION=	20230501
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	NTFS to Btrfs in-place conversion utility
diff --git a/sysutils/ntfs2btrfs/distinfo b/filesystems/ntfs2btrfs/distinfo
index e0ecb1e9b75e..e0ecb1e9b75e 100644
--- a/sysutils/ntfs2btrfs/distinfo
+++ b/filesystems/ntfs2btrfs/distinfo
diff --git a/sysutils/ntfs2btrfs/files/patch-src_ntfs.cpp b/filesystems/ntfs2btrfs/files/patch-src_ntfs.cpp
index 74817c12412f..74817c12412f 100644
--- a/sysutils/ntfs2btrfs/files/patch-src_ntfs.cpp
+++ b/filesystems/ntfs2btrfs/files/patch-src_ntfs.cpp
diff --git a/sysutils/ntfs2btrfs/pkg-descr b/filesystems/ntfs2btrfs/pkg-descr
index 6845f5661a10..6845f5661a10 100644
--- a/sysutils/ntfs2btrfs/pkg-descr
+++ b/filesystems/ntfs2btrfs/pkg-descr
diff --git a/sysutils/openzfs-kmod/Makefile b/filesystems/openzfs-kmod/Makefile
index 6377620d21f1..3dc28a9feadb 100644
--- a/sysutils/openzfs-kmod/Makefile
+++ b/filesystems/openzfs-kmod/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	openzfs
 PORTVERSION=	2023113000
 DISTVERSIONPREFIX=	v
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 PKGNAMESUFFIX?=	-kmod
 
 MAINTAINER=	freqlabs@FreeBSD.org
diff --git a/sysutils/openzfs-kmod/distinfo b/filesystems/openzfs-kmod/distinfo
index 46df98bb02c8..46df98bb02c8 100644
--- a/sysutils/openzfs-kmod/distinfo
+++ b/filesystems/openzfs-kmod/distinfo
diff --git a/sysutils/openzfs-kmod/pkg-descr b/filesystems/openzfs-kmod/pkg-descr
index 423d6ae3c738..423d6ae3c738 100644
--- a/sysutils/openzfs-kmod/pkg-descr
+++ b/filesystems/openzfs-kmod/pkg-descr
diff --git a/sysutils/openzfs-kmod/pkg-message b/filesystems/openzfs-kmod/pkg-message
index 9554fc733667..9554fc733667 100644
--- a/sysutils/openzfs-kmod/pkg-message
+++ b/filesystems/openzfs-kmod/pkg-message
diff --git a/sysutils/openzfs/Makefile b/filesystems/openzfs/Makefile
index 0254187d2e05..bec123954ce9 100644
--- a/sysutils/openzfs/Makefile
+++ b/filesystems/openzfs/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	openzfs
 PORTVERSION=	2023113000
 DISTVERSIONPREFIX=	v
 PORTREVISION=	1
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 
 MAINTAINER=	freqlabs@FreeBSD.org
 COMMENT=	OpenZFS userland for FreeBSD
@@ -14,7 +14,7 @@ BROKEN_aarch64=	invokes x86 assembler
 BROKEN_riscv64=	fails to compile: btree_test.c:462:49: result of comparison of constant -1 with expression of type 'char' is always true
 
 BUILD_DEPENDS=	ksh93:shells/ksh93
-RUN_DEPENDS=	openzfs-kmod>=0:sysutils/openzfs-kmod
+RUN_DEPENDS=	openzfs-kmod>=0:filesystems/openzfs-kmod
 
 USES+=		autoreconf:build cpe libtool gmake gettext-runtime python:build shebangfix ssl
 SHEBANG_GLOB=	*.ksh *.ksh.in *.kshlib *.py.in
diff --git a/sysutils/openzfs/distinfo b/filesystems/openzfs/distinfo
index 6b9911e58395..6b9911e58395 100644
--- a/sysutils/openzfs/distinfo
+++ b/filesystems/openzfs/distinfo
diff --git a/sysutils/openzfs/pkg-descr b/filesystems/openzfs/pkg-descr
index 38b91fde925c..38b91fde925c 100644
--- a/sysutils/openzfs/pkg-descr
+++ b/filesystems/openzfs/pkg-descr
diff --git a/sysutils/openzfs/pkg-message b/filesystems/openzfs/pkg-message
index 1101f72fc507..1101f72fc507 100644
--- a/sysutils/openzfs/pkg-message
+++ b/filesystems/openzfs/pkg-message
diff --git a/sysutils/openzfs/pkg-plist b/filesystems/openzfs/pkg-plist
index ea46b291888d..ea46b291888d 100644
--- a/sysutils/openzfs/pkg-plist
+++ b/filesystems/openzfs/pkg-plist
diff --git a/sysutils/p5-Filesys-Statvfs/Makefile b/filesystems/p5-Filesys-Statvfs/Makefile
index 2bfce4da6b05..cb5c0edb80b7 100644
--- a/sysutils/p5-Filesys-Statvfs/Makefile
+++ b/filesystems/p5-Filesys-Statvfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	Filesys-Statvfs
 PORTVERSION=	0.82
 PORTREVISION=	1
-CATEGORIES=	sysutils perl5
+CATEGORIES=	filesystems sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
diff --git a/sysutils/p5-Filesys-Statvfs/distinfo b/filesystems/p5-Filesys-Statvfs/distinfo
index 807e82412a8e..d86ff35b399a 100644
--- a/sysutils/p5-Filesys-Statvfs/distinfo
+++ b/filesystems/p5-Filesys-Statvfs/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905189
 SHA256 (Filesys-Statvfs-0.82.tar.gz) = dc9494ca17af2b5226d50313efc5f02f3ff268d71c653cdb39bdd65fb3cf916a
 SIZE (Filesys-Statvfs-0.82.tar.gz) = 3964
diff --git a/sysutils/p5-Filesys-Statvfs/pkg-descr b/filesystems/p5-Filesys-Statvfs/pkg-descr
index af468cd421ee..af468cd421ee 100644
--- a/sysutils/p5-Filesys-Statvfs/pkg-descr
+++ b/filesystems/p5-Filesys-Statvfs/pkg-descr
diff --git a/sysutils/p5-Filesys-Statvfs/pkg-plist b/filesystems/p5-Filesys-Statvfs/pkg-plist
index 4cd96e0eafc2..4cd96e0eafc2 100644
--- a/sysutils/p5-Filesys-Statvfs/pkg-plist
+++ b/filesystems/p5-Filesys-Statvfs/pkg-plist
diff --git a/sysutils/p5-Fuse/Makefile b/filesystems/p5-Fuse/Makefile
index 890b989c5a77..d26754813ba8 100644
--- a/sysutils/p5-Fuse/Makefile
+++ b/filesystems/p5-Fuse/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	Fuse
 PORTVERSION=	0.16.1
 PORTREVISION=	2
-CATEGORIES=	sysutils perl5
+CATEGORIES=	filesystems sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DPATES
 PKGNAMEPREFIX=	p5-
diff --git a/sysutils/p5-Fuse/distinfo b/filesystems/p5-Fuse/distinfo
index 583e3a3216ea..a779be4f8ec4 100644
--- a/sysutils/p5-Fuse/distinfo
+++ b/filesystems/p5-Fuse/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905168
 SHA256 (Fuse-0.16.1.tar.gz) = 13a2e923f247781acb79259f4e57ee62aa392e36a6df110fa56e1970010d1127
 SIZE (Fuse-0.16.1.tar.gz) = 43004
diff --git a/sysutils/p5-Fuse/pkg-descr b/filesystems/p5-Fuse/pkg-descr
index 06ddb4bde5c6..06ddb4bde5c6 100644
--- a/sysutils/p5-Fuse/pkg-descr
+++ b/filesystems/p5-Fuse/pkg-descr
diff --git a/sysutils/p5-Fuse/pkg-plist b/filesystems/p5-Fuse/pkg-plist
index 8125fb7a462a..8125fb7a462a 100644
--- a/sysutils/p5-Fuse/pkg-plist
+++ b/filesystems/p5-Fuse/pkg-plist
diff --git a/sysutils/pear-Horde_Vfs/Makefile b/filesystems/pear-Horde_Vfs/Makefile
index 794a74200562..a119b27240b5 100644
--- a/sysutils/pear-Horde_Vfs/Makefile
+++ b/filesystems/pear-Horde_Vfs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	Horde_Vfs
 PORTVERSION=	2.4.2
-CATEGORIES=	sysutils www pear
+CATEGORIES=	filesystems sysutils www pear
 PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}
 
 MAINTAINER=	horde@FreeBSD.org
diff --git a/sysutils/pear-Horde_Vfs/distinfo b/filesystems/pear-Horde_Vfs/distinfo
index f93c76e1c8b9..f93c76e1c8b9 100644
--- a/sysutils/pear-Horde_Vfs/distinfo
+++ b/filesystems/pear-Horde_Vfs/distinfo
diff --git a/sysutils/pear-Horde_Vfs/pkg-descr b/filesystems/pear-Horde_Vfs/pkg-descr
index dd4d38627a97..dd4d38627a97 100644
--- a/sysutils/pear-Horde_Vfs/pkg-descr
+++ b/filesystems/pear-Horde_Vfs/pkg-descr
diff --git a/sysutils/fusefs-pod/Makefile b/filesystems/pod/Makefile
index 3d9b931cdc8c..c529f422b50e 100644
--- a/sysutils/fusefs-pod/Makefile
+++ b/filesystems/pod/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pod
 PORTVERSION=	0.5.2
 PORTREVISION=	16
-CATEGORIES=	sysutils audio
+CATEGORIES=	filesystems audio
 MASTER_SITES=	SF/fuse${PORTNAME}/fuse${PORTNAME}/FUSEPod%20v${PORTVERSION}
 PKGNAMEPREFIX=	fusefs-
 DISTNAME=	fusepod-${PORTVERSION}
diff --git a/sysutils/fusefs-pod/distinfo b/filesystems/pod/distinfo
index e6b919a7e816..e4ce1b828068 100644
--- a/sysutils/fusefs-pod/distinfo
+++ b/filesystems/pod/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905181
 SHA256 (fusepod-0.5.2.tar.bz2) = 210d77cb2ec7701d4af681e63c4f52bc4d0c8cbfa493f55d3d9580e7106b857f
 SIZE (fusepod-0.5.2.tar.bz2) = 80923
diff --git a/sysutils/fusefs-pod/files/patch-configure b/filesystems/pod/files/patch-configure
index 2cf3daa10dd1..2cf3daa10dd1 100644
--- a/sysutils/fusefs-pod/files/patch-configure
+++ b/filesystems/pod/files/patch-configure
diff --git a/sysutils/fusefs-pod/files/patch-src_fusepod__ipod.h b/filesystems/pod/files/patch-src_fusepod__ipod.h
index c0f147ea9465..c0f147ea9465 100644
--- a/sysutils/fusefs-pod/files/patch-src_fusepod__ipod.h
+++ b/filesystems/pod/files/patch-src_fusepod__ipod.h
diff --git a/sysutils/fusefs-pod/files/patch-src_fusepod__util.h b/filesystems/pod/files/patch-src_fusepod__util.h
index e4bb07a47865..e4bb07a47865 100644
--- a/sysutils/fusefs-pod/files/patch-src_fusepod__util.h
+++ b/filesystems/pod/files/patch-src_fusepod__util.h
diff --git a/sysutils/fusefs-pod/pkg-descr b/filesystems/pod/pkg-descr
index 9628c63574f1..9628c63574f1 100644
--- a/sysutils/fusefs-pod/pkg-descr
+++ b/filesystems/pod/pkg-descr
diff --git a/sysutils/progsreiserfs/Makefile b/filesystems/progsreiserfs/Makefile
index 7ce7b2e6610c..77c84c817a49 100644
--- a/sysutils/progsreiserfs/Makefile
+++ b/filesystems/progsreiserfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	progsreiserfs
 DISTVERSION=	0.3.1-rc8
 PORTREVISION=	8
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 MASTER_SITES=	http://www.cgsecurity.org/
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/sysutils/progsreiserfs/distinfo b/filesystems/progsreiserfs/distinfo
index a88cb394ec63..851742dec79c 100644
--- a/sysutils/progsreiserfs/distinfo
+++ b/filesystems/progsreiserfs/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905181
 SHA256 (progsreiserfs-0.3.1-rc8.tar.gz) = 1473899a21df0679a32ebde5a35c158468a7e51a0cb6fd89d77c42bfde9b6399
 SIZE (progsreiserfs-0.3.1-rc8.tar.gz) = 399279
diff --git a/sysutils/progsreiserfs/files/extrapatch-progsreiserfs_libmisc_Makefile.in b/filesystems/progsreiserfs/files/extrapatch-progsreiserfs_libmisc_Makefile.in
index b482ec8293dd..b482ec8293dd 100644
--- a/sysutils/progsreiserfs/files/extrapatch-progsreiserfs_libmisc_Makefile.in
+++ b/filesystems/progsreiserfs/files/extrapatch-progsreiserfs_libmisc_Makefile.in
diff --git a/sysutils/progsreiserfs/files/patch-libdal_file.c b/filesystems/progsreiserfs/files/patch-libdal_file.c
index 76a7926d532f..76a7926d532f 100644
--- a/sysutils/progsreiserfs/files/patch-libdal_file.c
+++ b/filesystems/progsreiserfs/files/patch-libdal_file.c
diff --git a/sysutils/progsreiserfs/files/patch-libreiserfs_journal.c b/filesystems/progsreiserfs/files/patch-libreiserfs_journal.c
index da24c4593308..da24c4593308 100644
--- a/sysutils/progsreiserfs/files/patch-libreiserfs_journal.c
+++ b/filesystems/progsreiserfs/files/patch-libreiserfs_journal.c
diff --git a/sysutils/progsreiserfs/pkg-descr b/filesystems/progsreiserfs/pkg-descr
index db3516d4aedd..db3516d4aedd 100644
--- a/sysutils/progsreiserfs/pkg-descr
+++ b/filesystems/progsreiserfs/pkg-descr
diff --git a/sysutils/progsreiserfs/pkg-plist b/filesystems/progsreiserfs/pkg-plist
index 76e0ff06b7ad..76e0ff06b7ad 100644
--- a/sysutils/progsreiserfs/pkg-plist
+++ b/filesystems/progsreiserfs/pkg-plist
diff --git a/security/py-dfvfs/Makefile b/filesystems/py-dfvfs/Makefile
index 448defd41cc9..cf96f98a9a0c 100644
--- a/security/py-dfvfs/Makefile
+++ b/filesystems/py-dfvfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	dfvfs
 PORTVERSION=	20231208
 PORTREVISION=	1
-CATEGORIES=	security devel python
+CATEGORIES=	filesystems security devel python
 MASTER_SITES=	https://github.com/log2timeline/dfvfs/releases/download/${PORTVERSION}/ \
 		LOCAL/antoine
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,18 +13,18 @@ WWW=		https://github.com/log2timeline/dfvfs
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	libbde>=a:devel/libbde \
+RUN_DEPENDS=	libbde>=a:filesystems/libbde \
 		libewf>=0:devel/libewf \
-		libfsapfs>=e:devel/libfsapfs \
-		libfsext>=e:devel/libfsext \
-		libfsfat>=e:devel/libfsfat \
-		libfshfs>=e:devel/libfshfs \
-		libfsntfs>=e:devel/libfsntfs \
-		libfsxfs>=e:devel/libfsxfs \
+		libfsapfs>=e:filesystems/libfsapfs \
+		libfsext>=e:filesystems/libfsext \
+		libfsfat>=e:filesystems/libfsfat \
+		libfshfs>=e:filesystems/libfshfs \
+		libfsntfs>=e:filesystems/libfsntfs \
+		libfsxfs>=e:filesystems/libfsxfs \
 		libfvde>=0:sysutils/libfvde \
 		libfwnt>=e:devel/libfwnt \
 		libluksde>=e:devel/libluksde \
-		libmodi>=e:devel/libmodi \
+		libmodi>=e:filesystems/libmodi \
 		libphdi>=e:devel/libphdi \
 		libqcow>=a:devel/libqcow \
 		libsigscan>=e:devel/libsigscan \
diff --git a/security/py-dfvfs/distinfo b/filesystems/py-dfvfs/distinfo
index 7566b547002f..7566b547002f 100644
--- a/security/py-dfvfs/distinfo
+++ b/filesystems/py-dfvfs/distinfo
diff --git a/security/py-dfvfs/pkg-descr b/filesystems/py-dfvfs/pkg-descr
index cfddc03f0d97..cfddc03f0d97 100644
--- a/security/py-dfvfs/pkg-descr
+++ b/filesystems/py-dfvfs/pkg-descr
diff --git a/devel/py-fs/Makefile b/filesystems/py-fs/Makefile
index 11780bfbde3a..f9b5d57677ca 100644
--- a/devel/py-fs/Makefile
+++ b/filesystems/py-fs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	fs
 PORTVERSION=	0.5.4
 PORTREVISION=	1
-CATEGORIES=	devel python
+CATEGORIES=	filesystems devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/devel/py-fs/distinfo b/filesystems/py-fs/distinfo
index 58372636118c..1c22b48a1ee9 100644
--- a/devel/py-fs/distinfo
+++ b/filesystems/py-fs/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905183
 SHA256 (fs-0.5.4.tar.gz) = ba2cca8773435a7c86059d57cb4b8ea30fda40f8610941f7822d1ce3ffd36197
 SIZE (fs-0.5.4.tar.gz) = 231333
diff --git a/devel/py-fs/files/patch-2to3 b/filesystems/py-fs/files/patch-2to3
index 5e5874a2a21b..5e5874a2a21b 100644
--- a/devel/py-fs/files/patch-2to3
+++ b/filesystems/py-fs/files/patch-2to3
diff --git a/devel/py-fs/pkg-descr b/filesystems/py-fs/pkg-descr
index 712dede347d6..712dede347d6 100644
--- a/devel/py-fs/pkg-descr
+++ b/filesystems/py-fs/pkg-descr
diff --git a/devel/py-fs2/Makefile b/filesystems/py-fs2/Makefile
index 352ddbf36525..b6f702cdbce5 100644
--- a/devel/py-fs2/Makefile
+++ b/filesystems/py-fs2/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fs
 PORTVERSION=	2.4.16
-CATEGORIES=	devel
+CATEGORIES=	filesystems devel
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	2
diff --git a/devel/py-fs2/distinfo b/filesystems/py-fs2/distinfo
index 0aee290aa7cd..0aee290aa7cd 100644
--- a/devel/py-fs2/distinfo
+++ b/filesystems/py-fs2/distinfo
diff --git a/devel/py-fs2/pkg-descr b/filesystems/py-fs2/pkg-descr
index 6807f41b753b..6807f41b753b 100644
--- a/devel/py-fs2/pkg-descr
+++ b/filesystems/py-fs2/pkg-descr
diff --git a/devel/py-fsspec-xrootd/Makefile b/filesystems/py-fsspec-xrootd/Makefile
index d48487387b00..b121c44958f9 100644
--- a/devel/py-fsspec-xrootd/Makefile
+++ b/filesystems/py-fsspec-xrootd/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fsspec-xrootd
 PORTVERSION=	0.4.0
-CATEGORIES=	devel python
+CATEGORIES=	filesystems devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	fsspec_xrootd-${PORTVERSION}
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=42:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=3.4:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>=0:devel/py-fsspec@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>=0:filesystems/py-fsspec@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
diff --git a/devel/py-fsspec-xrootd/distinfo b/filesystems/py-fsspec-xrootd/distinfo
index 2d8ab0f7585e..2d8ab0f7585e 100644
--- a/devel/py-fsspec-xrootd/distinfo
+++ b/filesystems/py-fsspec-xrootd/distinfo
diff --git a/devel/py-fsspec-xrootd/pkg-descr b/filesystems/py-fsspec-xrootd/pkg-descr
index cd72b8510731..cd72b8510731 100644
--- a/devel/py-fsspec-xrootd/pkg-descr
+++ b/filesystems/py-fsspec-xrootd/pkg-descr
diff --git a/devel/py-fsspec/Makefile b/filesystems/py-fsspec/Makefile
index cbf695c4e698..13612b3d29ca 100644
--- a/devel/py-fsspec/Makefile
+++ b/filesystems/py-fsspec/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fsspec
 PORTVERSION=	2024.10.0
-CATEGORIES=	devel python
+CATEGORIES=	filesystems devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/devel/py-fsspec/distinfo b/filesystems/py-fsspec/distinfo
index 09aee0a26075..09aee0a26075 100644
--- a/devel/py-fsspec/distinfo
+++ b/filesystems/py-fsspec/distinfo
diff --git a/devel/py-fsspec/pkg-descr b/filesystems/py-fsspec/pkg-descr
index 7d23085ccff9..7d23085ccff9 100644
--- a/devel/py-fsspec/pkg-descr
+++ b/filesystems/py-fsspec/pkg-descr
diff --git a/devel/py-fusepy/Makefile b/filesystems/py-fusepy/Makefile
index 23f039b8e04f..7161a1b1fe0d 100644
--- a/devel/py-fusepy/Makefile
+++ b/filesystems/py-fusepy/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	fusepy
 PORTVERSION=	3.0.1
 PORTREVISION=	1
-CATEGORIES=	devel python
+CATEGORIES=	filesystems devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/devel/py-fusepy/distinfo b/filesystems/py-fusepy/distinfo
index ef6c8fc3299e..ef6c8fc3299e 100644
--- a/devel/py-fusepy/distinfo
+++ b/filesystems/py-fusepy/distinfo
diff --git a/devel/py-fusepy/pkg-descr b/filesystems/py-fusepy/pkg-descr
index 898b2d3e9be3..898b2d3e9be3 100644
--- a/devel/py-fusepy/pkg-descr
+++ b/filesystems/py-fusepy/pkg-descr
diff --git a/devel/py-gcsfs/Makefile b/filesystems/py-gcsfs/Makefile
index 2bb0c79f14ed..b02e89e48711 100644
--- a/devel/py-gcsfs/Makefile
+++ b/filesystems/py-gcsfs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gcsfs
 PORTVERSION=	2024.10.0
-CATEGORIES=	devel python
+CATEGORIES=	filesystems devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLA
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiohttp>=0:www/py-aiohttp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}decorator>=4.1.2:devel/py-decorator@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}fsspec>=${PORTVERSION}<${PORTVERSION}_99:devel/py-fsspec@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}fsspec>=${PORTVERSION}<${PORTVERSION}_99:filesystems/py-fsspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}google-auth-oauthlib>=0:security/py-google-auth-oauthlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}google-auth>=1.2:security/py-google-auth@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}google-cloud-storage>=0:www/py-google-cloud-storage@${PY_FLAVOR} \
@@ -32,6 +32,6 @@ GCSFUSE_DESC=	Fuse support
 CRC_DESC=	CRC support
 
 GCSFUSE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}crcmod>=0:devel/py-crcmod@${PY_FLAVOR}
-CRC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fusepy>=0:devel/py-fusepy@${PY_FLAVOR}
+CRC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fusepy>=0:filesystems/py-fusepy@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-gcsfs/distinfo b/filesystems/py-gcsfs/distinfo
index e0a97da9c6a0..e0a97da9c6a0 100644
--- a/devel/py-gcsfs/distinfo
+++ b/filesystems/py-gcsfs/distinfo
diff --git a/devel/py-gcsfs/pkg-descr b/filesystems/py-gcsfs/pkg-descr
index 781572993acc..781572993acc 100644
--- a/devel/py-gcsfs/pkg-descr
+++ b/filesystems/py-gcsfs/pkg-descr
diff --git a/devel/py-libzfs/Makefile b/filesystems/py-libzfs/Makefile
index 2db1495ec1c6..c4bc9fd0007b 100644
--- a/devel/py-libzfs/Makefile
+++ b/filesystems/py-libzfs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	libzfs
 PORTVERSION=	1.1.2023020700
-CATEGORIES=	devel python
+CATEGORIES=	filesystems devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	freqlabs@FreeBSD.org
diff --git a/devel/py-libzfs/distinfo b/filesystems/py-libzfs/distinfo
index 3ae8f5fa9a4d..3ae8f5fa9a4d 100644
--- a/devel/py-libzfs/distinfo
+++ b/filesystems/py-libzfs/distinfo
diff --git a/devel/py-libzfs/files/extra-zpool-add.patch b/filesystems/py-libzfs/files/extra-zpool-add.patch
index 7d0688ca4f13..7d0688ca4f13 100644
--- a/devel/py-libzfs/files/extra-zpool-add.patch
+++ b/filesystems/py-libzfs/files/extra-zpool-add.patch
diff --git a/devel/py-libzfs/pkg-descr b/filesystems/py-libzfs/pkg-descr
index 51a23404441a..51a23404441a 100644
--- a/devel/py-libzfs/pkg-descr
+++ b/filesystems/py-libzfs/pkg-descr
diff --git a/devel/py-llfuse/Makefile b/filesystems/py-llfuse/Makefile
index 55c0941bb899..2b69e3173c74 100644
--- a/devel/py-llfuse/Makefile
+++ b/filesystems/py-llfuse/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	llfuse
 PORTVERSION=	1.5.1
-CATEGORIES=	devel python
+CATEGORIES=	filesystems devel python
 MASTER_SITES=	PYPI \
 		https://github.com/python-llfuse/python-llfuse/releases/download/release-${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-llfuse/distinfo b/filesystems/py-llfuse/distinfo
index 30da47d20723..30da47d20723 100644
--- a/devel/py-llfuse/distinfo
+++ b/filesystems/py-llfuse/distinfo
diff --git a/devel/py-llfuse/pkg-descr b/filesystems/py-llfuse/pkg-descr
index b6da83cc7e55..b6da83cc7e55 100644
--- a/devel/py-llfuse/pkg-descr
+++ b/filesystems/py-llfuse/pkg-descr
diff --git a/sysutils/py-prometheus-zfs/Makefile b/filesystems/py-prometheus-zfs/Makefile
index 5a4b897fd9af..b25e5527cb09 100644
--- a/sysutils/py-prometheus-zfs/Makefile
+++ b/filesystems/py-prometheus-zfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	prometheus-zfs
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.4
-CATEGORIES=	sysutils python
+CATEGORIES=	filesystems sysutils python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	0mp@FreeBSD.org
@@ -11,7 +11,7 @@ WWW=		https://github.com/matusnovak/prometheus-zfs
 LICENSE=	UNLICENSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libzfs>=0:devel/py-libzfs@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libzfs>=0:filesystems/py-libzfs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prometheus-client>=0:net-mgmt/py-prometheus-client@${PY_FLAVOR}
 
 USES=		python shebangfix
diff --git a/sysutils/py-prometheus-zfs/distinfo b/filesystems/py-prometheus-zfs/distinfo
index 89dbf2a5a11c..89dbf2a5a11c 100644
--- a/sysutils/py-prometheus-zfs/distinfo
+++ b/filesystems/py-prometheus-zfs/distinfo
diff --git a/sysutils/py-prometheus-zfs/files/zfsprom.in b/filesystems/py-prometheus-zfs/files/zfsprom.in
index f4e3fbfc2e49..f4e3fbfc2e49 100644
--- a/sysutils/py-prometheus-zfs/files/zfsprom.in
+++ b/filesystems/py-prometheus-zfs/files/zfsprom.in
diff --git a/sysutils/py-prometheus-zfs/pkg-descr b/filesystems/py-prometheus-zfs/pkg-descr
index a75059149294..a75059149294 100644
--- a/sysutils/py-prometheus-zfs/pkg-descr
+++ b/filesystems/py-prometheus-zfs/pkg-descr
diff --git a/devel/py-pyfakefs/Makefile b/filesystems/py-pyfakefs/Makefile
index 1565ad8b0350..5fd0516b932c 100644
--- a/devel/py-pyfakefs/Makefile
+++ b/filesystems/py-pyfakefs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pyfakefs
 PORTVERSION=	5.7.1
-CATEGORIES=	devel python
+CATEGORIES=	filesystems devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/devel/py-pyfakefs/distinfo b/filesystems/py-pyfakefs/distinfo
index d76b6044cd26..d76b6044cd26 100644
--- a/devel/py-pyfakefs/distinfo
+++ b/filesystems/py-pyfakefs/distinfo
diff --git a/devel/py-pyfakefs/pkg-descr b/filesystems/py-pyfakefs/pkg-descr
index 4e82fbb5cd45..4e82fbb5cd45 100644
--- a/devel/py-pyfakefs/pkg-descr
+++ b/filesystems/py-pyfakefs/pkg-descr
diff --git a/devel/py-s3fs/Makefile b/filesystems/py-s3fs/Makefile
index 22915d7c9cc3..055547d3f385 100644
--- a/devel/py-s3fs/Makefile
+++ b/filesystems/py-s3fs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	s3fs
 PORTVERSION=	2024.10.0
-CATEGORIES=	devel python
+CATEGORIES=	filesystems devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLA
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiobotocore>=2.5.4<3.0.0:devel/py-aiobotocore@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}aiohttp>=0:www/py-aiohttp@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}fsspec>=${PORTVERSION}<${PORTVERSION}_99:devel/py-fsspec@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}fsspec>=${PORTVERSION}<${PORTVERSION}_99:filesystems/py-fsspec@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
diff --git a/devel/py-s3fs/distinfo b/filesystems/py-s3fs/distinfo
index e12bca6c5c7a..e12bca6c5c7a 100644
--- a/devel/py-s3fs/distinfo
+++ b/filesystems/py-s3fs/distinfo
diff --git a/devel/py-s3fs/pkg-descr b/filesystems/py-s3fs/pkg-descr
index ba62075e68c6..ba62075e68c6 100644
--- a/devel/py-s3fs/pkg-descr
+++ b/filesystems/py-s3fs/pkg-descr
diff --git a/sysutils/py-zfs-autobackup/Makefile b/filesystems/py-zfs-autobackup/Makefile
index a86dc9de83da..5c4b9f55ec28 100644
--- a/sysutils/py-zfs-autobackup/Makefile
+++ b/filesystems/py-zfs-autobackup/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	zfs-autobackup
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.2.2
-CATEGORIES=	sysutils python
+CATEGORIES=	filesystems sysutils python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	skozlov@FreeBSD.org
diff --git a/sysutils/py-zfs-autobackup/distinfo b/filesystems/py-zfs-autobackup/distinfo
index bc8df6ea038e..bc8df6ea038e 100644
--- a/sysutils/py-zfs-autobackup/distinfo
+++ b/filesystems/py-zfs-autobackup/distinfo
diff --git a/sysutils/py-zfs-autobackup/pkg-descr b/filesystems/py-zfs-autobackup/pkg-descr
index a76d09ca93f4..a76d09ca93f4 100644
--- a/sysutils/py-zfs-autobackup/pkg-descr
+++ b/filesystems/py-zfs-autobackup/pkg-descr
diff --git a/sysutils/fusefs-rar2fs/Makefile b/filesystems/rar2fs/Makefile
index 2366593e13d8..14727f144467 100644
--- a/sysutils/fusefs-rar2fs/Makefile
+++ b/filesystems/rar2fs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	rar2fs
 DISTVERSION=	1.29.6
 DISTVERSIONPREFIX=	v
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 PKGNAMEPREFIX=	fusefs-
 
 MAINTAINER=	n_carlsson@outlook.com
diff --git a/sysutils/fusefs-rar2fs/distinfo b/filesystems/rar2fs/distinfo
index abf89d3cdeef..abf89d3cdeef 100644
--- a/sysutils/fusefs-rar2fs/distinfo
+++ b/filesystems/rar2fs/distinfo
diff --git a/sysutils/fusefs-rar2fs/files/patch-configure.ac b/filesystems/rar2fs/files/patch-configure.ac
index 02ff1d32cef8..02ff1d32cef8 100644
--- a/sysutils/fusefs-rar2fs/files/patch-configure.ac
+++ b/filesystems/rar2fs/files/patch-configure.ac
diff --git a/sysutils/fusefs-rar2fs/files/patch-src_dllext.cpp b/filesystems/rar2fs/files/patch-src_dllext.cpp
index e3a8682f763a..e3a8682f763a 100644
--- a/sysutils/fusefs-rar2fs/files/patch-src_dllext.cpp
+++ b/filesystems/rar2fs/files/patch-src_dllext.cpp
diff --git a/sysutils/fusefs-rar2fs/pkg-descr b/filesystems/rar2fs/pkg-descr
index 8bb098de582c..8bb098de582c 100644
--- a/sysutils/fusefs-rar2fs/pkg-descr
+++ b/filesystems/rar2fs/pkg-descr
diff --git a/devel/rubygem-aws-sdk-efs/Makefile b/filesystems/rubygem-aws-sdk-efs/Makefile
index df70496db8c7..f362964453ef 100644
--- a/devel/rubygem-aws-sdk-efs/Makefile
+++ b/filesystems/rubygem-aws-sdk-efs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	aws-sdk-efs
 PORTVERSION=	1.86.0
-CATEGORIES=	devel rubygems
+CATEGORIES=	filesystems devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/devel/rubygem-aws-sdk-efs/distinfo b/filesystems/rubygem-aws-sdk-efs/distinfo
index 2b61149e6faa..2b61149e6faa 100644
--- a/devel/rubygem-aws-sdk-efs/distinfo
+++ b/filesystems/rubygem-aws-sdk-efs/distinfo
diff --git a/devel/rubygem-aws-sdk-efs/pkg-descr b/filesystems/rubygem-aws-sdk-efs/pkg-descr
index 6bee43ab7c62..6bee43ab7c62 100644
--- a/devel/rubygem-aws-sdk-efs/pkg-descr
+++ b/filesystems/rubygem-aws-sdk-efs/pkg-descr
diff --git a/sysutils/rubygem-winrm-fs/Makefile b/filesystems/rubygem-winrm-fs/Makefile
index cfb86bc8f687..531f6a52c7c4 100644
--- a/sysutils/rubygem-winrm-fs/Makefile
+++ b/filesystems/rubygem-winrm-fs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	winrm-fs
 PORTVERSION=	1.3.5
-CATEGORIES=	sysutils rubygems
+CATEGORIES=	filesystems sysutils rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
diff --git a/sysutils/rubygem-winrm-fs/distinfo b/filesystems/rubygem-winrm-fs/distinfo
index cd58beb1948e..cd58beb1948e 100644
--- a/sysutils/rubygem-winrm-fs/distinfo
+++ b/filesystems/rubygem-winrm-fs/distinfo
diff --git a/sysutils/rubygem-winrm-fs/pkg-descr b/filesystems/rubygem-winrm-fs/pkg-descr
index 68293f4f359f..68293f4f359f 100644
--- a/sysutils/rubygem-winrm-fs/pkg-descr
+++ b/filesystems/rubygem-winrm-fs/pkg-descr
diff --git a/sysutils/fusefs-s3backer/Makefile b/filesystems/s3backer/Makefile
index 7e4f8d784cb0..725ee9d03d17 100644
--- a/sysutils/fusefs-s3backer/Makefile
+++ b/filesystems/s3backer/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	s3backer
 DISTVERSION=	1.5.4
 PORTREVISION=	1
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 MASTER_SITES=	https://s3.amazonaws.com/archie-public/s3backer/
 PKGNAMEPREFIX=	fusefs-
 
diff --git a/sysutils/fusefs-s3backer/distinfo b/filesystems/s3backer/distinfo
index 5962e7dd3853..5962e7dd3853 100644
--- a/sysutils/fusefs-s3backer/distinfo
+++ b/filesystems/s3backer/distinfo
diff --git a/sysutils/fusefs-s3backer/pkg-descr b/filesystems/s3backer/pkg-descr
index bb97b04b3ce2..bb97b04b3ce2 100644
--- a/sysutils/fusefs-s3backer/pkg-descr
+++ b/filesystems/s3backer/pkg-descr
diff --git a/sysutils/fusefs-s3backer/pkg-plist b/filesystems/s3backer/pkg-plist
index 0cf15714456a..0cf15714456a 100644
--- a/sysutils/fusefs-s3backer/pkg-plist
+++ b/filesystems/s3backer/pkg-plist
diff --git a/sysutils/fusefs-s3fs/Makefile b/filesystems/s3fs/Makefile
index 1db67a9392d7..20cdfb4ae528 100644
--- a/sysutils/fusefs-s3fs/Makefile
+++ b/filesystems/s3fs/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	s3fs
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.92
 PORTREVISION=	1
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 PKGNAMEPREFIX=	fusefs-
 
 MAINTAINER=	dmgk@FreeBSD.org
diff --git a/sysutils/fusefs-s3fs/distinfo b/filesystems/s3fs/distinfo
index 0b27b3158f5a..0b27b3158f5a 100644
--- a/sysutils/fusefs-s3fs/distinfo
+++ b/filesystems/s3fs/distinfo
diff --git a/sysutils/fusefs-s3fs/files/patch-test_mknod__test.c b/filesystems/s3fs/files/patch-test_mknod__test.c
index c3e06b5e0bae..c3e06b5e0bae 100644
--- a/sysutils/fusefs-s3fs/files/patch-test_mknod__test.c
+++ b/filesystems/s3fs/files/patch-test_mknod__test.c
diff --git a/sysutils/fusefs-s3fs/pkg-descr b/filesystems/s3fs/pkg-descr
index 67900733a8f9..67900733a8f9 100644
--- a/sysutils/fusefs-s3fs/pkg-descr
+++ b/filesystems/s3fs/pkg-descr
diff --git a/sysutils/fusefs-s3fs/pkg-message b/filesystems/s3fs/pkg-message
index 0d5dfff241e3..0d5dfff241e3 100644
--- a/sysutils/fusefs-s3fs/pkg-message
+++ b/filesystems/s3fs/pkg-message
diff --git a/sysutils/fusefs-sandboxfs/Makefile b/filesystems/sandboxfs/Makefile
index 6ffed0a874ba..51512f949899 100644
--- a/sysutils/fusefs-sandboxfs/Makefile
+++ b/filesystems/sandboxfs/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	sandboxfs
 DISTVERSIONPREFIX=	sandboxfs-
 DISTVERSION=	0.2.0
 PORTREVISION=	42
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 PKGNAMEPREFIX=	fusefs-
 
 MAINTAINER=	mikael@FreeBSD.org
diff --git a/sysutils/fusefs-sandboxfs/distinfo b/filesystems/sandboxfs/distinfo
index 42005c53f6bd..42005c53f6bd 100644
--- a/sysutils/fusefs-sandboxfs/distinfo
+++ b/filesystems/sandboxfs/distinfo
diff --git a/sysutils/fusefs-sandboxfs/files/patch-powerpc b/filesystems/sandboxfs/files/patch-powerpc
index df525d6e5b13..df525d6e5b13 100644
--- a/sysutils/fusefs-sandboxfs/files/patch-powerpc
+++ b/filesystems/sandboxfs/files/patch-powerpc
diff --git a/sysutils/fusefs-sandboxfs/files/patch-src_lib.rs b/filesystems/sandboxfs/files/patch-src_lib.rs
index ffee85062382..ffee85062382 100644
--- a/sysutils/fusefs-sandboxfs/files/patch-src_lib.rs
+++ b/filesystems/sandboxfs/files/patch-src_lib.rs
diff --git a/sysutils/fusefs-sandboxfs/files/patch-src_nodes_conv.rs b/filesystems/sandboxfs/files/patch-src_nodes_conv.rs
index 949974945d2c..949974945d2c 100644
--- a/sysutils/fusefs-sandboxfs/files/patch-src_nodes_conv.rs
+++ b/filesystems/sandboxfs/files/patch-src_nodes_conv.rs
diff --git a/sysutils/fusefs-sandboxfs/files/patch-src_nodes_mod.rs b/filesystems/sandboxfs/files/patch-src_nodes_mod.rs
index 696e611469c7..696e611469c7 100644
--- a/sysutils/fusefs-sandboxfs/files/patch-src_nodes_mod.rs
+++ b/filesystems/sandboxfs/files/patch-src_nodes_mod.rs
diff --git a/sysutils/fusefs-sandboxfs/pkg-descr b/filesystems/sandboxfs/pkg-descr
index 92e275c2262c..92e275c2262c 100644
--- a/sysutils/fusefs-sandboxfs/pkg-descr
+++ b/filesystems/sandboxfs/pkg-descr
diff --git a/sysutils/fusefs-sandboxfs/pkg-message b/filesystems/sandboxfs/pkg-message
index 7ec584f0028f..7ec584f0028f 100644
--- a/sysutils/fusefs-sandboxfs/pkg-message
+++ b/filesystems/sandboxfs/pkg-message
diff --git a/sysutils/scan_ffs/Makefile b/filesystems/scan_ffs/Makefile
index a9bfc094b95a..59d5340aa7fb 100644
--- a/sysutils/scan_ffs/Makefile
+++ b/filesystems/scan_ffs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	scan_ffs
 PORTVERSION=	1.2
 PORTREVISION=	1
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 MASTER_SITES=	http://www.ranner.eu/stuff/
 
 MAINTAINER=	michael@ranner.eu
diff --git a/sysutils/scan_ffs/distinfo b/filesystems/scan_ffs/distinfo
index 8b031839366f..f5fe89273c1e 100644
--- a/sysutils/scan_ffs/distinfo
+++ b/filesystems/scan_ffs/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905190
 SHA256 (scan_ffs-1.2.tar.bz2) = a6d52583a275c02ca8c504a302e065b20512da5795cd2929cda13184c5305d4a
 SIZE (scan_ffs-1.2.tar.bz2) = 5119
diff --git a/sysutils/scan_ffs/pkg-descr b/filesystems/scan_ffs/pkg-descr
index d156d70ae1b7..d156d70ae1b7 100644
--- a/sysutils/scan_ffs/pkg-descr
+++ b/filesystems/scan_ffs/pkg-descr
diff --git a/sysutils/fusefs-securefs/Makefile b/filesystems/securefs/Makefile
index 06b1c52881bd..89cd7aa324d1 100644
--- a/sysutils/fusefs-securefs/Makefile
+++ b/filesystems/securefs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	securefs
 DISTVERSION=	0.14.3
 PORTREVISION=	2
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 PKGNAMEPREFIX=	fusefs-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/sysutils/fusefs-securefs/distinfo b/filesystems/securefs/distinfo
index caa7b87bbd5f..caa7b87bbd5f 100644
--- a/sysutils/fusefs-securefs/distinfo
+++ b/filesystems/securefs/distinfo
diff --git a/sysutils/fusefs-securefs/pkg-descr b/filesystems/securefs/pkg-descr
index cbd0e2663d3e..cbd0e2663d3e 100644
--- a/sysutils/fusefs-securefs/pkg-descr
+++ b/filesystems/securefs/pkg-descr
diff --git a/sysutils/fusefs-simple-mtpfs/Makefile b/filesystems/simple-mtpfs/Makefile
index 43f5a6eade76..2c04141d0886 100644
--- a/sysutils/fusefs-simple-mtpfs/Makefile
+++ b/filesystems/simple-mtpfs/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	simple-mtpfs
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4.0
 PORTREVISION=	1
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 PKGNAMEPREFIX=	fusefs-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/sysutils/fusefs-simple-mtpfs/distinfo b/filesystems/simple-mtpfs/distinfo
index d9a8c2d015ab..d9a8c2d015ab 100644
--- a/sysutils/fusefs-simple-mtpfs/distinfo
+++ b/filesystems/simple-mtpfs/distinfo
diff --git a/sysutils/fusefs-simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp b/filesystems/simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp
index d1dbca44fbe2..d1dbca44fbe2 100644
--- a/sysutils/fusefs-simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp
+++ b/filesystems/simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp
diff --git a/sysutils/fusefs-simple-mtpfs/files/special_simple-mtpfs.in b/filesystems/simple-mtpfs/files/special_simple-mtpfs.in
index 7f45b8649e53..7f45b8649e53 100644
--- a/sysutils/fusefs-simple-mtpfs/files/special_simple-mtpfs.in
+++ b/filesystems/simple-mtpfs/files/special_simple-mtpfs.in
diff --git a/sysutils/fusefs-simple-mtpfs/pkg-descr b/filesystems/simple-mtpfs/pkg-descr
index 4b44f0a90134..4b44f0a90134 100644
--- a/sysutils/fusefs-simple-mtpfs/pkg-descr
+++ b/filesystems/simple-mtpfs/pkg-descr
diff --git a/sysutils/fusefs-smbnetfs/Makefile b/filesystems/smbnetfs/Makefile
index b60c8843e066..a577b6ece99b 100644
--- a/sysutils/fusefs-smbnetfs/Makefile
+++ b/filesystems/smbnetfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	smbnetfs
 PORTVERSION=	0.6.3
 PORTREVISION=	1
-CATEGORIES=	sysutils net
+CATEGORIES=	filesystems net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/SMBNetFS-${PORTVERSION}
 PKGNAMEPREFIX=	fusefs-
 
diff --git a/sysutils/fusefs-smbnetfs/distinfo b/filesystems/smbnetfs/distinfo
index 3e27f3e6cd71..3e27f3e6cd71 100644
--- a/sysutils/fusefs-smbnetfs/distinfo
+++ b/filesystems/smbnetfs/distinfo
diff --git a/sysutils/fusefs-smbnetfs/files/patch-fuse3 b/filesystems/smbnetfs/files/patch-fuse3
index c30563999e05..c30563999e05 100644
--- a/sysutils/fusefs-smbnetfs/files/patch-fuse3
+++ b/filesystems/smbnetfs/files/patch-fuse3
diff --git a/sysutils/fusefs-smbnetfs/files/pkg-message.in b/filesystems/smbnetfs/files/pkg-message.in
index 0fcdc867d05a..0fcdc867d05a 100644
--- a/sysutils/fusefs-smbnetfs/files/pkg-message.in
+++ b/filesystems/smbnetfs/files/pkg-message.in
diff --git a/sysutils/fusefs-smbnetfs/pkg-descr b/filesystems/smbnetfs/pkg-descr
index b8083d7ddc58..b8083d7ddc58 100644
--- a/sysutils/fusefs-smbnetfs/pkg-descr
+++ b/filesystems/smbnetfs/pkg-descr
diff --git a/sysutils/fusefs-smbnetfs/pkg-plist b/filesystems/smbnetfs/pkg-plist
index 655ee52c5eb8..655ee52c5eb8 100644
--- a/sysutils/fusefs-smbnetfs/pkg-plist
+++ b/filesystems/smbnetfs/pkg-plist
diff --git a/sysutils/fusefs-sqlfs/Makefile b/filesystems/sqlfs/Makefile
index 2b74b42b6124..820783f9370f 100644
--- a/sysutils/fusefs-sqlfs/Makefile
+++ b/filesystems/sqlfs/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	sqlfs
 PORTVERSION=	1.1
 PORTREVISION=	1
 PORTEPOCH=	1
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 MASTER_SITES=	SAVANNAH/libsqlfs
 PKGNAMEPREFIX=	fusefs-
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}
diff --git a/sysutils/fusefs-sqlfs/distinfo b/filesystems/sqlfs/distinfo
index e7d1b04ac3ef..dea05271c448 100644
--- a/sysutils/fusefs-sqlfs/distinfo
+++ b/filesystems/sqlfs/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905177
 SHA256 (libsqlfs-1.1.tar.gz) = 0ca70ae5f6153186e54931365bb4932a29c96be3e39aa9a981d838b53f3705ff
 SIZE (libsqlfs-1.1.tar.gz) = 329744
diff --git a/sysutils/fusefs-sqlfs/files/patch-fuse_main.c b/filesystems/sqlfs/files/patch-fuse_main.c
index 2e9fff3146e2..2e9fff3146e2 100644
--- a/sysutils/fusefs-sqlfs/files/patch-fuse_main.c
+++ b/filesystems/sqlfs/files/patch-fuse_main.c
diff --git a/sysutils/fusefs-sqlfs/pkg-descr b/filesystems/sqlfs/pkg-descr
index 378379443d03..378379443d03 100644
--- a/sysutils/fusefs-sqlfs/pkg-descr
+++ b/filesystems/sqlfs/pkg-descr
diff --git a/sysutils/fusefs-sqlfs/pkg-message b/filesystems/sqlfs/pkg-message
index 7d5fccea8529..7d5fccea8529 100644
--- a/sysutils/fusefs-sqlfs/pkg-message
+++ b/filesystems/sqlfs/pkg-message
diff --git a/sysutils/squashfs-tools-ng/Makefile b/filesystems/squashfs-tools-ng/Makefile
index f77d3c03740d..c2b6818c66d2 100644
--- a/sysutils/squashfs-tools-ng/Makefile
+++ b/filesystems/squashfs-tools-ng/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	squashfs-tools-ng
 PORTVERSION=	1.3.2
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 MASTER_SITES=	https://infraroot.at/pub/squashfs/
 
 MAINTAINER=	danfe@FreeBSD.org
diff --git a/sysutils/squashfs-tools-ng/distinfo b/filesystems/squashfs-tools-ng/distinfo
index e39b6384c88e..e39b6384c88e 100644
--- a/sysutils/squashfs-tools-ng/distinfo
+++ b/filesystems/squashfs-tools-ng/distinfo
diff --git a/sysutils/squashfs-tools-ng/pkg-descr b/filesystems/squashfs-tools-ng/pkg-descr
index e11c2c62ff02..e11c2c62ff02 100644
--- a/sysutils/squashfs-tools-ng/pkg-descr
+++ b/filesystems/squashfs-tools-ng/pkg-descr
diff --git a/sysutils/squashfs-tools-ng/pkg-plist b/filesystems/squashfs-tools-ng/pkg-plist
index c45f36f07a70..c45f36f07a70 100644
--- a/sysutils/squashfs-tools-ng/pkg-plist
+++ b/filesystems/squashfs-tools-ng/pkg-plist
diff --git a/sysutils/squashfs-tools/Makefile b/filesystems/squashfs-tools/Makefile
index df50ca585978..d7a8a1105688 100644
--- a/sysutils/squashfs-tools/Makefile
+++ b/filesystems/squashfs-tools/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	squashfs-tools
 PORTVERSION=	4.6.1
 PORTREVISION=	1
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 MASTER_SITES=	SF/squashfs/squashfs/squashfs${PORTVERSION}
 DISTFILES=	squashfs${PORTVERSION}${EXTRACT_SUFX}
 
diff --git a/sysutils/squashfs-tools/distinfo b/filesystems/squashfs-tools/distinfo
index 4747eff52625..4747eff52625 100644
--- a/sysutils/squashfs-tools/distinfo
+++ b/filesystems/squashfs-tools/distinfo
diff --git a/sysutils/squashfs-tools/files/patch-Makefile b/filesystems/squashfs-tools/files/patch-Makefile
index cb729b5d2dc4..cb729b5d2dc4 100644
--- a/sysutils/squashfs-tools/files/patch-Makefile
+++ b/filesystems/squashfs-tools/files/patch-Makefile
diff --git a/sysutils/squashfs-tools/files/patch-action.c b/filesystems/squashfs-tools/files/patch-action.c
index 2c07b6980c84..2c07b6980c84 100644
--- a/sysutils/squashfs-tools/files/patch-action.c
+++ b/filesystems/squashfs-tools/files/patch-action.c
diff --git a/sysutils/squashfs-tools/files/patch-pseudo.c b/filesystems/squashfs-tools/files/patch-pseudo.c
index 3639ca3e0c1a..3639ca3e0c1a 100644
--- a/sysutils/squashfs-tools/files/patch-pseudo.c
+++ b/filesystems/squashfs-tools/files/patch-pseudo.c
diff --git a/sysutils/squashfs-tools/pkg-descr b/filesystems/squashfs-tools/pkg-descr
index af37d38d07e0..af37d38d07e0 100644
--- a/sysutils/squashfs-tools/pkg-descr
+++ b/filesystems/squashfs-tools/pkg-descr
diff --git a/sysutils/fusefs-squashfuse/Makefile b/filesystems/squashfuse/Makefile
index fe3cca75ea80..e79c6b87eb82 100644
--- a/sysutils/fusefs-squashfuse/Makefile
+++ b/filesystems/squashfuse/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	squashfuse
 DISTVERSION=	0.5.2
 PORTREVISION=	1
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 MASTER_SITES=	https://github.com/vasi/${PORTNAME}/releases/download/${DISTVERSION}/
 PKGNAMEPREFIX=	fusefs-
 
diff --git a/sysutils/fusefs-squashfuse/distinfo b/filesystems/squashfuse/distinfo
index 430954dba40e..430954dba40e 100644
--- a/sysutils/fusefs-squashfuse/distinfo
+++ b/filesystems/squashfuse/distinfo
diff --git a/sysutils/fusefs-squashfuse/pkg-descr b/filesystems/squashfuse/pkg-descr
index df92832d0777..df92832d0777 100644
--- a/sysutils/fusefs-squashfuse/pkg-descr
+++ b/filesystems/squashfuse/pkg-descr
diff --git a/sysutils/fusefs-squashfuse/pkg-plist b/filesystems/squashfuse/pkg-plist
index c895195a0a6c..c895195a0a6c 100644
--- a/sysutils/fusefs-squashfuse/pkg-plist
+++ b/filesystems/squashfuse/pkg-plist
diff --git a/sysutils/fusefs-sshfs/Makefile b/filesystems/sshfs/Makefile
index 818e674d3f82..6dd076551ea4 100644
--- a/sysutils/fusefs-sshfs/Makefile
+++ b/filesystems/sshfs/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	sshfs
 PORTVERSION=	3.7.3
 PORTREVISION=	2
 DISTVERSIONPREFIX=	${PORTNAME}-
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 PKGNAMEPREFIX=	fusefs-
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
diff --git a/sysutils/fusefs-sshfs/distinfo b/filesystems/sshfs/distinfo
index 10d8cf33b962..10d8cf33b962 100644
--- a/sysutils/fusefs-sshfs/distinfo
+++ b/filesystems/sshfs/distinfo
diff --git a/sysutils/fusefs-sshfs/files/patch-meson.build b/filesystems/sshfs/files/patch-meson.build
index 34209e1f6504..34209e1f6504 100644
--- a/sysutils/fusefs-sshfs/files/patch-meson.build
+++ b/filesystems/sshfs/files/patch-meson.build
diff --git a/sysutils/fusefs-sshfs/pkg-descr b/filesystems/sshfs/pkg-descr
index 91ee403527c4..91ee403527c4 100644
--- a/sysutils/fusefs-sshfs/pkg-descr
+++ b/filesystems/sshfs/pkg-descr
diff --git a/sysutils/fusefs-sshfs/pkg-message b/filesystems/sshfs/pkg-message
index 187edabe7faf..187edabe7faf 100644
--- a/sysutils/fusefs-sshfs/pkg-message
+++ b/filesystems/sshfs/pkg-message
diff --git a/devel/tclvfs/Makefile b/filesystems/tclvfs/Makefile
index a720e16be00d..192f2df2af56 100644
--- a/devel/tclvfs/Makefile
+++ b/filesystems/tclvfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	tclvfs
 PORTVERSION=	20080503
 PORTREVISION=	1
-CATEGORIES=	devel
+CATEGORIES=	filesystems devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
 
 MAINTAINER=	tcltk@FreeBSD.org
diff --git a/devel/tclvfs/distinfo b/filesystems/tclvfs/distinfo
index 2e2c73fc23d7..2ec546790727 100644
--- a/devel/tclvfs/distinfo
+++ b/filesystems/tclvfs/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905188
 SHA256 (tclvfs-20080503.tar.gz) = 0d90362078c8f59347b14be377e9306336b6d25d147397f845e705a6fa1d38f2
 SIZE (tclvfs-20080503.tar.gz) = 258723
diff --git a/devel/tclvfs/files/patch-Makefile.in b/filesystems/tclvfs/files/patch-Makefile.in
index f14d9d60f5a4..f14d9d60f5a4 100644
--- a/devel/tclvfs/files/patch-Makefile.in
+++ b/filesystems/tclvfs/files/patch-Makefile.in
diff --git a/devel/tclvfs/files/patch-generic_vfs.c b/filesystems/tclvfs/files/patch-generic_vfs.c
index 1c52b734021d..1c52b734021d 100644
--- a/devel/tclvfs/files/patch-generic_vfs.c
+++ b/filesystems/tclvfs/files/patch-generic_vfs.c
diff --git a/devel/tclvfs/pkg-descr b/filesystems/tclvfs/pkg-descr
index 462b43010f65..462b43010f65 100644
--- a/devel/tclvfs/pkg-descr
+++ b/filesystems/tclvfs/pkg-descr
diff --git a/devel/tclvfs/pkg-plist b/filesystems/tclvfs/pkg-plist
index 1edebfbba711..1edebfbba711 100644
--- a/devel/tclvfs/pkg-plist
+++ b/filesystems/tclvfs/pkg-plist
diff --git a/sysutils/fusefs-ufs/Makefile b/filesystems/ufs/Makefile
index 4965103b18f2..411c31af777c 100644
--- a/sysutils/fusefs-ufs/Makefile
+++ b/filesystems/ufs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ufs
 DISTVERSION=	0.4.3
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 PKGNAMEPREFIX=	fusefs-
 
 MAINTAINER=	fuz@FreeBSD.org
diff --git a/sysutils/fusefs-ufs/Makefile.crates b/filesystems/ufs/Makefile.crates
index 5753ed67fb60..5753ed67fb60 100644
--- a/sysutils/fusefs-ufs/Makefile.crates
+++ b/filesystems/ufs/Makefile.crates
diff --git a/sysutils/fusefs-ufs/distinfo b/filesystems/ufs/distinfo
index 3551e171a522..3551e171a522 100644
--- a/sysutils/fusefs-ufs/distinfo
+++ b/filesystems/ufs/distinfo
diff --git a/sysutils/fusefs-ufs/pkg-descr b/filesystems/ufs/pkg-descr
index a4268e90af05..a4268e90af05 100644
--- a/sysutils/fusefs-ufs/pkg-descr
+++ b/filesystems/ufs/pkg-descr
diff --git a/sysutils/fusefs-ufs/pkg-plist b/filesystems/ufs/pkg-plist
index 4cc756be2006..4cc756be2006 100644
--- a/sysutils/fusefs-ufs/pkg-plist
+++ b/filesystems/ufs/pkg-plist
diff --git a/sysutils/ufs_copy/Makefile b/filesystems/ufs_copy/Makefile
index e097ba2116f4..4a600350aa63 100644
--- a/sysutils/ufs_copy/Makefile
+++ b/filesystems/ufs_copy/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ufs_copy
 PORTVERSION=	20060921
 PORTREVISION=	2
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 MASTER_SITES=	https://people.freebsd.org/~simokawa/ufs/
 DISTNAME=	ufs-${PORTVERSION}
 
diff --git a/sysutils/ufs_copy/distinfo b/filesystems/ufs_copy/distinfo
index 412b19fb1a25..3e8ccd65ccd4 100644
--- a/sysutils/ufs_copy/distinfo
+++ b/filesystems/ufs_copy/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905208
 SHA256 (ufs-20060921.tar.gz) = 0dc787a8c10334fa7bbfc56b166498a3057f6adff34dac4f6454a88c75d967ed
 SIZE (ufs-20060921.tar.gz) = 9734
diff --git a/sysutils/ufs_copy/files/patch-ufs_copy.c b/filesystems/ufs_copy/files/patch-ufs_copy.c
index 3c5bfd367a81..3c5bfd367a81 100644
--- a/sysutils/ufs_copy/files/patch-ufs_copy.c
+++ b/filesystems/ufs_copy/files/patch-ufs_copy.c
diff --git a/sysutils/ufs_copy/pkg-descr b/filesystems/ufs_copy/pkg-descr
index 3bc45eb518d3..3bc45eb518d3 100644
--- a/sysutils/ufs_copy/pkg-descr
+++ b/filesystems/ufs_copy/pkg-descr
diff --git a/sysutils/fusefs-unionfs/Makefile b/filesystems/unionfs/Makefile
index 31e255809a46..4db9d90fc34c 100644
--- a/sysutils/fusefs-unionfs/Makefile
+++ b/filesystems/unionfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	unionfs
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 PKGNAMEPREFIX=	fusefs-
 
 MAINTAINER=	0mp@FreeBSD.org
diff --git a/sysutils/fusefs-unionfs/distinfo b/filesystems/unionfs/distinfo
index de0face115d1..de0face115d1 100644
--- a/sysutils/fusefs-unionfs/distinfo
+++ b/filesystems/unionfs/distinfo
diff --git a/sysutils/fusefs-unionfs/files/patch-CMakeLists.txt b/filesystems/unionfs/files/patch-CMakeLists.txt
index 107d85a0e259..107d85a0e259 100644
--- a/sysutils/fusefs-unionfs/files/patch-CMakeLists.txt
+++ b/filesystems/unionfs/files/patch-CMakeLists.txt
diff --git a/sysutils/fusefs-unionfs/files/patch-src__usyslog.c b/filesystems/unionfs/files/patch-src__usyslog.c
index 42f8ec61068b..42f8ec61068b 100644
--- a/sysutils/fusefs-unionfs/files/patch-src__usyslog.c
+++ b/filesystems/unionfs/files/patch-src__usyslog.c
diff --git a/sysutils/fusefs-unionfs/files/pkg-message.in b/filesystems/unionfs/files/pkg-message.in
index 4859a839c805..4859a839c805 100644
--- a/sysutils/fusefs-unionfs/files/pkg-message.in
+++ b/filesystems/unionfs/files/pkg-message.in
diff --git a/sysutils/fusefs-unionfs/pkg-descr b/filesystems/unionfs/pkg-descr
index 850c1a069c5a..850c1a069c5a 100644
--- a/sysutils/fusefs-unionfs/pkg-descr
+++ b/filesystems/unionfs/pkg-descr
diff --git a/sysutils/fusefs-unreliablefs/Makefile b/filesystems/unreliablefs/Makefile
index a5ade2473124..532c5a696b2d 100644
--- a/sysutils/fusefs-unreliablefs/Makefile
+++ b/filesystems/unreliablefs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	unreliablefs
 DISTVERSION=	0.2.0
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 PKGNAMEPREFIX=	fusefs-
 PATCH_SITES=	https://github.com/ligurio/unreliablefs/commit/
 PATCHFILES=	e97d259b1cda3c1342c9cb472d31230e50b0776d.patch:-p1
diff --git a/sysutils/fusefs-unreliablefs/distinfo b/filesystems/unreliablefs/distinfo
index 42458d53119d..42458d53119d 100644
--- a/sysutils/fusefs-unreliablefs/distinfo
+++ b/filesystems/unreliablefs/distinfo
diff --git a/sysutils/fusefs-unreliablefs/pkg-descr b/filesystems/unreliablefs/pkg-descr
index dfc24ceb8f34..dfc24ceb8f34 100644
--- a/sysutils/fusefs-unreliablefs/pkg-descr
+++ b/filesystems/unreliablefs/pkg-descr
diff --git a/sysutils/vzvol/Makefile b/filesystems/vzvol/Makefile
index 048e8e389756..98aa8be7bc74 100644
--- a/sysutils/vzvol/Makefile
+++ b/filesystems/vzvol/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	vzvol
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.7.0
 PORTREVISION=	3
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 
 MAINTAINER=	rainbow@sanitylinux.org
 COMMENT=	Feature-rich ZFS zvol management tool
@@ -25,10 +25,10 @@ OPTIONS_GROUP=	FILESYSTEMS
 OPTIONS_GROUP_FILESYSTEMS=	EXT XFS
 OPTIONS_DEFAULT=	EXT PROGRESS VIRTUALBOX XFS
 
-EXT_RUN_DEPENDS=	mke2fs:sysutils/e2fsprogs-core
+EXT_RUN_DEPENDS=	mke2fs:filesystems/e2fsprogs-core
 PROGRESS_RUN_DEPENDS=	pv:sysutils/pv
 VIRTUALBOX_RUN_DEPENDS=	VBoxManage:emulators/virtualbox-ose
-XFS_RUN_DEPENDS=	mkfs.xfs:sysutils/xfsprogs
+XFS_RUN_DEPENDS=	mkfs.xfs:filesystems/xfsprogs
 
 EXT_DESC=		Install support for ext2, ext3, and ext4
 PROGRESS_DESC=		Enables progress bars for import
diff --git a/sysutils/vzvol/distinfo b/filesystems/vzvol/distinfo
index c9c7eef70932..c9c7eef70932 100644
--- a/sysutils/vzvol/distinfo
+++ b/filesystems/vzvol/distinfo
diff --git a/sysutils/vzvol/pkg-descr b/filesystems/vzvol/pkg-descr
index d3aea5ba1fbb..d3aea5ba1fbb 100644
--- a/sysutils/vzvol/pkg-descr
+++ b/filesystems/vzvol/pkg-descr
diff --git a/sysutils/vzvol/pkg-plist b/filesystems/vzvol/pkg-plist
index a243674c5e1c..a243674c5e1c 100644
--- a/sysutils/vzvol/pkg-plist
+++ b/filesystems/vzvol/pkg-plist
diff --git a/sysutils/fusefs-webdavfs/Makefile b/filesystems/webdavfs/Makefile
index 4424e4378a29..fcf14c2f1f5f 100644
--- a/sysutils/fusefs-webdavfs/Makefile
+++ b/filesystems/webdavfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	fusefs-webdavfs
 DISTVERSION=	g20200520
 PORTREVISION=	23
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 
 MAINTAINER=	eugen@FreeBSD.org
 COMMENT=	FUSE filesystem for WEBDAV shares
diff --git a/sysutils/fusefs-webdavfs/distinfo b/filesystems/webdavfs/distinfo
index 190ae655ec4c..190ae655ec4c 100644
--- a/sysutils/fusefs-webdavfs/distinfo
+++ b/filesystems/webdavfs/distinfo
diff --git a/sysutils/fusefs-webdavfs/files/mount_webdavfs.in b/filesystems/webdavfs/files/mount_webdavfs.in
index a8600c2c88ef..a8600c2c88ef 100644
--- a/sysutils/fusefs-webdavfs/files/mount_webdavfs.in
+++ b/filesystems/webdavfs/files/mount_webdavfs.in
diff --git a/sysutils/fusefs-webdavfs/files/pkg-message.in b/filesystems/webdavfs/files/pkg-message.in
index eaf4a6f48f16..eaf4a6f48f16 100644
--- a/sysutils/fusefs-webdavfs/files/pkg-message.in
+++ b/filesystems/webdavfs/files/pkg-message.in
diff --git a/sysutils/fusefs-webdavfs/pkg-descr b/filesystems/webdavfs/pkg-descr
index 6b585d937353..6b585d937353 100644
--- a/sysutils/fusefs-webdavfs/pkg-descr
+++ b/filesystems/webdavfs/pkg-descr
diff --git a/sysutils/wimlib/Makefile b/filesystems/wimlib/Makefile
index b6c6ac2995dc..8f5fa210b35d 100644
--- a/sysutils/wimlib/Makefile
+++ b/filesystems/wimlib/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	wimlib
 PORTVERSION=	1.13.0
 PORTREVISION=	3
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 MASTER_SITES=	https://wimlib.net/downloads/
 
 MAINTAINER=	mail_of_sergey@mail.ru
@@ -25,6 +25,6 @@ OPTIONS_DEFAULT=	NTFS
 NTFS_DESC=	Build with libntfs-3g for NTFS support (recommended)
 
 NTFS_CONFIGURE_WITH=	ntfs-3g
-NTFS_LIB_DEPENDS=	libntfs-3g.so:sysutils/fusefs-ntfs
+NTFS_LIB_DEPENDS=	libntfs-3g.so:filesystems/ntfs
 
 .include <bsd.port.mk>
diff --git a/sysutils/wimlib/distinfo b/filesystems/wimlib/distinfo
index 7daf28637a57..7daf28637a57 100644
--- a/sysutils/wimlib/distinfo
+++ b/filesystems/wimlib/distinfo
diff --git a/sysutils/wimlib/pkg-descr b/filesystems/wimlib/pkg-descr
index e806457b59ad..e806457b59ad 100644
--- a/sysutils/wimlib/pkg-descr
+++ b/filesystems/wimlib/pkg-descr
diff --git a/sysutils/wimlib/pkg-plist b/filesystems/wimlib/pkg-plist
index ebb96360f340..ebb96360f340 100644
--- a/sysutils/wimlib/pkg-plist
+++ b/filesystems/wimlib/pkg-plist
diff --git a/sysutils/xfsm/Makefile b/filesystems/xfsm/Makefile
index 23ccd0572ad1..45e8a6629152 100644
--- a/sysutils/xfsm/Makefile
+++ b/filesystems/xfsm/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	xfsm
 PORTVERSION=	1.99
 PORTREVISION=	2
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 MASTER_SITES=	SUNSITE/system/status/xstatus
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/sysutils/xfsm/distinfo b/filesystems/xfsm/distinfo
index f8c8bf3ac1ea..084adda37eca 100644
--- a/sysutils/xfsm/distinfo
+++ b/filesystems/xfsm/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905176
 SHA256 (xfsm-1.99.tgz) = 6ba199530b282cecea0e82d636f155f73fa5cddf3cef3c66b6a57864801b22da
 SIZE (xfsm-1.99.tgz) = 51872
diff --git a/sysutils/xfsm/files/patch-xfsm_util.c b/filesystems/xfsm/files/patch-xfsm_util.c
index 3cbc2489196d..3cbc2489196d 100644
--- a/sysutils/xfsm/files/patch-xfsm_util.c
+++ b/filesystems/xfsm/files/patch-xfsm_util.c
diff --git a/sysutils/xfsm/pkg-descr b/filesystems/xfsm/pkg-descr
index 9a9c488303d7..9a9c488303d7 100644
--- a/sysutils/xfsm/pkg-descr
+++ b/filesystems/xfsm/pkg-descr
diff --git a/sysutils/xfsprogs/Makefile b/filesystems/xfsprogs/Makefile
index e7b595283985..d6322b0c38c9 100644
--- a/sysutils/xfsprogs/Makefile
+++ b/filesystems/xfsprogs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	xfsprogs
 DISTVERSION=	3.2.4
 PORTREVISION=	4
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 MASTER_SITES=	ftp://oss.sgi.com/projects/xfs/cmd_tars/ \
 		ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/
 
diff --git a/sysutils/xfsprogs/distinfo b/filesystems/xfsprogs/distinfo
index cbbd873ecf05..cbbd873ecf05 100644
--- a/sysutils/xfsprogs/distinfo
+++ b/filesystems/xfsprogs/distinfo
diff --git a/sysutils/xfsprogs/files/patch-fsr_xfs__fsr.c b/filesystems/xfsprogs/files/patch-fsr_xfs__fsr.c
index 2ded0bf3606c..2ded0bf3606c 100644
--- a/sysutils/xfsprogs/files/patch-fsr_xfs__fsr.c
+++ b/filesystems/xfsprogs/files/patch-fsr_xfs__fsr.c
diff --git a/sysutils/xfsprogs/files/patch-include_freebsd.h b/filesystems/xfsprogs/files/patch-include_freebsd.h
index e6f636c3509c..e6f636c3509c 100644
--- a/sysutils/xfsprogs/files/patch-include_freebsd.h
+++ b/filesystems/xfsprogs/files/patch-include_freebsd.h
diff --git a/sysutils/xfsprogs/files/patch-include_libxfs.h b/filesystems/xfsprogs/files/patch-include_libxfs.h
index 229231935310..229231935310 100644
--- a/sysutils/xfsprogs/files/patch-include_libxfs.h
+++ b/filesystems/xfsprogs/files/patch-include_libxfs.h
diff --git a/sysutils/xfsprogs/files/patch-include_list.h b/filesystems/xfsprogs/files/patch-include_list.h
index ec1874b585ca..ec1874b585ca 100644
--- a/sysutils/xfsprogs/files/patch-include_list.h
+++ b/filesystems/xfsprogs/files/patch-include_list.h
diff --git a/sysutils/xfsprogs/files/patch-include_xfs__bit.h b/filesystems/xfsprogs/files/patch-include_xfs__bit.h
index 768cb386f418..768cb386f418 100644
--- a/sysutils/xfsprogs/files/patch-include_xfs__bit.h
+++ b/filesystems/xfsprogs/files/patch-include_xfs__bit.h
diff --git a/sysutils/xfsprogs/files/patch-io_mmap.c b/filesystems/xfsprogs/files/patch-io_mmap.c
index 89fdc3d72548..89fdc3d72548 100644
--- a/sysutils/xfsprogs/files/patch-io_mmap.c
+++ b/filesystems/xfsprogs/files/patch-io_mmap.c
diff --git a/sysutils/xfsprogs/files/patch-io_readdir.c b/filesystems/xfsprogs/files/patch-io_readdir.c
index b3c1d2968f4f..b3c1d2968f4f 100644
--- a/sysutils/xfsprogs/files/patch-io_readdir.c
+++ b/filesystems/xfsprogs/files/patch-io_readdir.c
diff --git a/sysutils/xfsprogs/files/patch-libhandle_handle.c b/filesystems/xfsprogs/files/patch-libhandle_handle.c
index 0ecca06fd629..0ecca06fd629 100644
--- a/sysutils/xfsprogs/files/patch-libhandle_handle.c
+++ b/filesystems/xfsprogs/files/patch-libhandle_handle.c
diff --git a/sysutils/xfsprogs/files/patch-libhandle_jdm.c b/filesystems/xfsprogs/files/patch-libhandle_jdm.c
index ef504248d1cb..ef504248d1cb 100644
--- a/sysutils/xfsprogs/files/patch-libhandle_jdm.c
+++ b/filesystems/xfsprogs/files/patch-libhandle_jdm.c
diff --git a/sysutils/xfsprogs/files/patch-libxcmd_paths.c b/filesystems/xfsprogs/files/patch-libxcmd_paths.c
index 59037da27541..59037da27541 100644
--- a/sysutils/xfsprogs/files/patch-libxcmd_paths.c
+++ b/filesystems/xfsprogs/files/patch-libxcmd_paths.c
diff --git a/sysutils/xfsprogs/files/patch-libxfs_crc32.c b/filesystems/xfsprogs/files/patch-libxfs_crc32.c
index 32f53647b5d6..32f53647b5d6 100644
--- a/sysutils/xfsprogs/files/patch-libxfs_crc32.c
+++ b/filesystems/xfsprogs/files/patch-libxfs_crc32.c
diff --git a/sysutils/xfsprogs/files/patch-libxfs_rdwr.c b/filesystems/xfsprogs/files/patch-libxfs_rdwr.c
index d89bf99c7ee7..d89bf99c7ee7 100644
--- a/sysutils/xfsprogs/files/patch-libxfs_rdwr.c
+++ b/filesystems/xfsprogs/files/patch-libxfs_rdwr.c
diff --git a/sysutils/xfsprogs/files/patch-libxfs_util.c b/filesystems/xfsprogs/files/patch-libxfs_util.c
index cb15c74f5518..cb15c74f5518 100644
--- a/sysutils/xfsprogs/files/patch-libxfs_util.c
+++ b/filesystems/xfsprogs/files/patch-libxfs_util.c
diff --git a/sysutils/xfsprogs/files/patch-libxfs_xfs__attr__remote.c b/filesystems/xfsprogs/files/patch-libxfs_xfs__attr__remote.c
index 969d1bdf444a..969d1bdf444a 100644
--- a/sysutils/xfsprogs/files/patch-libxfs_xfs__attr__remote.c
+++ b/filesystems/xfsprogs/files/patch-libxfs_xfs__attr__remote.c
diff --git a/sysutils/xfsprogs/files/patch-libxlog_util.c b/filesystems/xfsprogs/files/patch-libxlog_util.c
index 3b2f23613efb..3b2f23613efb 100644
--- a/sysutils/xfsprogs/files/patch-libxlog_util.c
+++ b/filesystems/xfsprogs/files/patch-libxlog_util.c
diff --git a/sysutils/xfsprogs/files/patch-po_de.po b/filesystems/xfsprogs/files/patch-po_de.po
index bf9faedd7eda..bf9faedd7eda 100644
--- a/sysutils/xfsprogs/files/patch-po_de.po
+++ b/filesystems/xfsprogs/files/patch-po_de.po
diff --git a/sysutils/xfsprogs/files/patch-repair_agheader.c b/filesystems/xfsprogs/files/patch-repair_agheader.c
index d0d0f14ea0a6..d0d0f14ea0a6 100644
--- a/sysutils/xfsprogs/files/patch-repair_agheader.c
+++ b/filesystems/xfsprogs/files/patch-repair_agheader.c
diff --git a/sysutils/xfsprogs/files/patch-repair_attr__repair.c b/filesystems/xfsprogs/files/patch-repair_attr__repair.c
index 6ea276ef3e88..6ea276ef3e88 100644
--- a/sysutils/xfsprogs/files/patch-repair_attr__repair.c
+++ b/filesystems/xfsprogs/files/patch-repair_attr__repair.c
diff --git a/sysutils/xfsprogs/files/patch-repair_attr__repair.h b/filesystems/xfsprogs/files/patch-repair_attr__repair.h
index 9ae0d545ec7e..9ae0d545ec7e 100644
--- a/sysutils/xfsprogs/files/patch-repair_attr__repair.h
+++ b/filesystems/xfsprogs/files/patch-repair_attr__repair.h
diff --git a/sysutils/xfsprogs/files/patch-repair_bmap.c b/filesystems/xfsprogs/files/patch-repair_bmap.c
index 754e1d435384..754e1d435384 100644
--- a/sysutils/xfsprogs/files/patch-repair_bmap.c
+++ b/filesystems/xfsprogs/files/patch-repair_bmap.c
diff --git a/sysutils/xfsprogs/files/patch-repair_dino__chunks.c b/filesystems/xfsprogs/files/patch-repair_dino__chunks.c
index e99a31e860bc..e99a31e860bc 100644
--- a/sysutils/xfsprogs/files/patch-repair_dino__chunks.c
+++ b/filesystems/xfsprogs/files/patch-repair_dino__chunks.c
diff --git a/sysutils/xfsprogs/files/patch-repair_dinode.c b/filesystems/xfsprogs/files/patch-repair_dinode.c
index 681657d22168..681657d22168 100644
--- a/sysutils/xfsprogs/files/patch-repair_dinode.c
+++ b/filesystems/xfsprogs/files/patch-repair_dinode.c
diff --git a/sysutils/xfsprogs/files/patch-repair_dir2.c b/filesystems/xfsprogs/files/patch-repair_dir2.c
index 9056ade2151f..9056ade2151f 100644
--- a/sysutils/xfsprogs/files/patch-repair_dir2.c
+++ b/filesystems/xfsprogs/files/patch-repair_dir2.c
diff --git a/sysutils/xfsprogs/files/patch-repair_incore.c b/filesystems/xfsprogs/files/patch-repair_incore.c
index 97637a572c82..97637a572c82 100644
--- a/sysutils/xfsprogs/files/patch-repair_incore.c
+++ b/filesystems/xfsprogs/files/patch-repair_incore.c
diff --git a/sysutils/xfsprogs/files/patch-repair_phase2.c b/filesystems/xfsprogs/files/patch-repair_phase2.c
index 6a3b7ecda94b..6a3b7ecda94b 100644
--- a/sysutils/xfsprogs/files/patch-repair_phase2.c
+++ b/filesystems/xfsprogs/files/patch-repair_phase2.c
diff --git a/sysutils/xfsprogs/files/patch-repair_phase3.c b/filesystems/xfsprogs/files/patch-repair_phase3.c
index 3d5de760b8b7..3d5de760b8b7 100644
--- a/sysutils/xfsprogs/files/patch-repair_phase3.c
+++ b/filesystems/xfsprogs/files/patch-repair_phase3.c
diff --git a/sysutils/xfsprogs/files/patch-repair_phase4.c b/filesystems/xfsprogs/files/patch-repair_phase4.c
index 79b6ee00e029..79b6ee00e029 100644
--- a/sysutils/xfsprogs/files/patch-repair_phase4.c
+++ b/filesystems/xfsprogs/files/patch-repair_phase4.c
diff --git a/sysutils/xfsprogs/files/patch-repair_phase6.c b/filesystems/xfsprogs/files/patch-repair_phase6.c
index 6285609ca09b..6285609ca09b 100644
--- a/sysutils/xfsprogs/files/patch-repair_phase6.c
+++ b/filesystems/xfsprogs/files/patch-repair_phase6.c
diff --git a/sysutils/xfsprogs/files/patch-repair_phase7.c b/filesystems/xfsprogs/files/patch-repair_phase7.c
index a89d928ac70e..a89d928ac70e 100644
--- a/sysutils/xfsprogs/files/patch-repair_phase7.c
+++ b/filesystems/xfsprogs/files/patch-repair_phase7.c
diff --git a/sysutils/xfsprogs/files/patch-repair_progress.c b/filesystems/xfsprogs/files/patch-repair_progress.c
index eb0d4c92c28c..eb0d4c92c28c 100644
--- a/sysutils/xfsprogs/files/patch-repair_progress.c
+++ b/filesystems/xfsprogs/files/patch-repair_progress.c
diff --git a/sysutils/xfsprogs/files/patch-repair_sb.c b/filesystems/xfsprogs/files/patch-repair_sb.c
index c2a88d67f7c6..c2a88d67f7c6 100644
--- a/sysutils/xfsprogs/files/patch-repair_sb.c
+++ b/filesystems/xfsprogs/files/patch-repair_sb.c
diff --git a/sysutils/xfsprogs/files/patch-repair_scan.c b/filesystems/xfsprogs/files/patch-repair_scan.c
index 6d57dfd276d5..6d57dfd276d5 100644
--- a/sysutils/xfsprogs/files/patch-repair_scan.c
+++ b/filesystems/xfsprogs/files/patch-repair_scan.c
diff --git a/sysutils/xfsprogs/files/patch-repair_xfs__repair.c b/filesystems/xfsprogs/files/patch-repair_xfs__repair.c
index f86768dfeb1f..f86768dfeb1f 100644
--- a/sysutils/xfsprogs/files/patch-repair_xfs__repair.c
+++ b/filesystems/xfsprogs/files/patch-repair_xfs__repair.c
diff --git a/sysutils/xfsprogs/pkg-descr b/filesystems/xfsprogs/pkg-descr
index ec87fe1373cd..ec87fe1373cd 100644
--- a/sysutils/xfsprogs/pkg-descr
+++ b/filesystems/xfsprogs/pkg-descr
diff --git a/sysutils/xfsprogs/pkg-plist b/filesystems/xfsprogs/pkg-plist
index 7b0c0fdc61a6..7b0c0fdc61a6 100644
--- a/sysutils/xfsprogs/pkg-plist
+++ b/filesystems/xfsprogs/pkg-plist
diff --git a/sysutils/fusefs-xfuse/Makefile b/filesystems/xfuse/Makefile
index e3473df319d5..335e950fc5f8 100644
--- a/sysutils/fusefs-xfuse/Makefile
+++ b/filesystems/xfuse/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	xfuse
 DISTVERSION=	0.4.4
 PORTREVISION=	2
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems
 MASTER_SITES=	CRATESIO
 MASTER_SITE_SUBDIR=	xfs-fuse/${DISTVERSION}
 PKGNAMEPREFIX=	fusefs-
diff --git a/sysutils/fusefs-xfuse/Makefile.crates b/filesystems/xfuse/Makefile.crates
index 0cb7306bc004..0cb7306bc004 100644
--- a/sysutils/fusefs-xfuse/Makefile.crates
+++ b/filesystems/xfuse/Makefile.crates
diff --git a/sysutils/fusefs-xfuse/distinfo b/filesystems/xfuse/distinfo
index 8f05c642335c..8f05c642335c 100644
--- a/sysutils/fusefs-xfuse/distinfo
+++ b/filesystems/xfuse/distinfo
diff --git a/sysutils/fusefs-xfuse/pkg-descr b/filesystems/xfuse/pkg-descr
index cbbff2467b70..cbbff2467b70 100644
--- a/sysutils/fusefs-xfuse/pkg-descr
+++ b/filesystems/xfuse/pkg-descr
diff --git a/sysutils/zap/Makefile b/filesystems/zap/Makefile
index 7cee05fbd8d3..bb12e0484463 100644
--- a/sysutils/zap/Makefile
+++ b/filesystems/zap/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	zap
 DISTVERSION=	0.8.3
 PORTREVISION=	1
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	Maintain and replicate ZFS snapshots
diff --git a/sysutils/zap/distinfo b/filesystems/zap/distinfo
index 2e0b3bc02b22..2e0b3bc02b22 100644
--- a/sysutils/zap/distinfo
+++ b/filesystems/zap/distinfo
diff --git a/sysutils/zap/pkg-descr b/filesystems/zap/pkg-descr
index eb2e26271169..eb2e26271169 100644
--- a/sysutils/zap/pkg-descr
+++ b/filesystems/zap/pkg-descr
diff --git a/sysutils/zap/pkg-message b/filesystems/zap/pkg-message
index c7a25a6452ce..c7a25a6452ce 100644
--- a/sysutils/zap/pkg-message
+++ b/filesystems/zap/pkg-message
diff --git a/sysutils/zfs-periodic/Makefile b/filesystems/zfs-periodic/Makefile
index 948a9749f2b3..33b3525a8c5b 100644
--- a/sysutils/zfs-periodic/Makefile
+++ b/filesystems/zfs-periodic/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	zfs-periodic
 PORTVERSION=	1.0.20130213
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 
 MAINTAINER=	peter@pean.org
 COMMENT=	Simple way of maintaining zfs snapshots using the periodic system
diff --git a/sysutils/zfs-periodic/distinfo b/filesystems/zfs-periodic/distinfo
index 8822295d3f53..6dc4d093226b 100644
--- a/sysutils/zfs-periodic/distinfo
+++ b/filesystems/zfs-periodic/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905184
 SHA256 (ross-zfs-periodic-1.0.20130213-a481121_GH0.tar.gz) = e0d12bb3ff466e3aaabd09c2b9685b5e5ee5f91e0d62126c05ba33c60a7b9a9b
 SIZE (ross-zfs-periodic-1.0.20130213-a481121_GH0.tar.gz) = 2527
diff --git a/sysutils/zfs-periodic/pkg-descr b/filesystems/zfs-periodic/pkg-descr
index 29e40518d2ff..29e40518d2ff 100644
--- a/sysutils/zfs-periodic/pkg-descr
+++ b/filesystems/zfs-periodic/pkg-descr
diff --git a/sysutils/zfs-periodic/pkg-message b/filesystems/zfs-periodic/pkg-message
index 010d2e7d1ce1..010d2e7d1ce1 100644
--- a/sysutils/zfs-periodic/pkg-message
+++ b/filesystems/zfs-periodic/pkg-message
diff --git a/sysutils/zfs-replicate/Makefile b/filesystems/zfs-replicate/Makefile
index 97effbb969fd..cf5805523867 100644
--- a/sysutils/zfs-replicate/Makefile
+++ b/filesystems/zfs-replicate/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	zfs-replicate
 PORTVERSION=	2.0.2
 DISTVERSIONPREFIX=	v
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 
 MAINTAINER=	tschetter.victor@gmail.com
 COMMENT=	ZFS Snapshot Replication Script
diff --git a/sysutils/zfs-replicate/distinfo b/filesystems/zfs-replicate/distinfo
index d5712e4d42a4..d5712e4d42a4 100644
--- a/sysutils/zfs-replicate/distinfo
+++ b/filesystems/zfs-replicate/distinfo
diff --git a/sysutils/zfs-replicate/pkg-descr b/filesystems/zfs-replicate/pkg-descr
index e711cf2aa663..e711cf2aa663 100644
--- a/sysutils/zfs-replicate/pkg-descr
+++ b/filesystems/zfs-replicate/pkg-descr
diff --git a/sysutils/zfs-replicate/pkg-message b/filesystems/zfs-replicate/pkg-message
index 385ffcd0e03a..385ffcd0e03a 100644
--- a/sysutils/zfs-replicate/pkg-message
+++ b/filesystems/zfs-replicate/pkg-message
diff --git a/sysutils/zfs-snap-diff/Makefile b/filesystems/zfs-snap-diff/Makefile
index d23bd55a04de..f0a2268c0c79 100644
--- a/sysutils/zfs-snap-diff/Makefile
+++ b/filesystems/zfs-snap-diff/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	zfs-snap-diff
 PORTVERSION=	1.1.3
 DISTVERSIONPREFIX=	v
 PORTREVISION=	22
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	View ZFS snapshot differences via a web browser
diff --git a/sysutils/zfs-snap-diff/distinfo b/filesystems/zfs-snap-diff/distinfo
index d8811a1f5672..d8811a1f5672 100644
--- a/sysutils/zfs-snap-diff/distinfo
+++ b/filesystems/zfs-snap-diff/distinfo
diff --git a/sysutils/zfs-snap-diff/pkg-descr b/filesystems/zfs-snap-diff/pkg-descr
index cf148fee69aa..cf148fee69aa 100644
--- a/sysutils/zfs-snap-diff/pkg-descr
+++ b/filesystems/zfs-snap-diff/pkg-descr
diff --git a/sysutils/zfs-snapshot-clean/Makefile b/filesystems/zfs-snapshot-clean/Makefile
index 06ae6d29327f..b275df946eb6 100644
--- a/sysutils/zfs-snapshot-clean/Makefile
+++ b/filesystems/zfs-snapshot-clean/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	zfs-snapshot-clean
 PORTVERSION=	0.2.0
 DISTVERSIONPREFIX=	v
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool to sieve ZFS snapshots as per given spec a la 'pdumpfs-clean'
diff --git a/sysutils/zfs-snapshot-clean/distinfo b/filesystems/zfs-snapshot-clean/distinfo
index 4301594495ca..b2cbb033a9fa 100644
--- a/sysutils/zfs-snapshot-clean/distinfo
+++ b/filesystems/zfs-snapshot-clean/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905189
 SHA256 (knu-zfs-snapshot-clean-v0.2.0_GH0.tar.gz) = a6cc354df2b245309293e40d29a98a5245e07357ff918f2f75be55eb8b5d78fa
 SIZE (knu-zfs-snapshot-clean-v0.2.0_GH0.tar.gz) = 2962
diff --git a/sysutils/zfs-snapshot-clean/pkg-descr b/filesystems/zfs-snapshot-clean/pkg-descr
index b2633bdb9cff..b2633bdb9cff 100644
--- a/sysutils/zfs-snapshot-clean/pkg-descr
+++ b/filesystems/zfs-snapshot-clean/pkg-descr
diff --git a/sysutils/zfs-snapshot-mgmt/Makefile b/filesystems/zfs-snapshot-mgmt/Makefile
index 6e8d0669d14a..b54509bfd61a 100644
--- a/sysutils/zfs-snapshot-mgmt/Makefile
+++ b/filesystems/zfs-snapshot-mgmt/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	zfs-snapshot-mgmt
 PORTVERSION=	20090201
 PORTREVISION=	4
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 MASTER_SITES=	http://marcin.studio4plus.com/files/
 
 MAINTAINER=	johntdarrah@gmail.com
diff --git a/sysutils/zfs-snapshot-mgmt/distinfo b/filesystems/zfs-snapshot-mgmt/distinfo
index 19291311ec5c..f7206ebb56ac 100644
--- a/sysutils/zfs-snapshot-mgmt/distinfo
+++ b/filesystems/zfs-snapshot-mgmt/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905184
 SHA256 (zfs-snapshot-mgmt-20090201.tar.gz) = 972f6eb51cc08dd2ab83491cb8942e310a9838f953edb7471df462446b59a8c4
 SIZE (zfs-snapshot-mgmt-20090201.tar.gz) = 4903
diff --git a/sysutils/zfs-snapshot-mgmt/files/patch-zfs-snapshot-mgmt b/filesystems/zfs-snapshot-mgmt/files/patch-zfs-snapshot-mgmt
index 382543b79b93..382543b79b93 100644
--- a/sysutils/zfs-snapshot-mgmt/files/patch-zfs-snapshot-mgmt
+++ b/filesystems/zfs-snapshot-mgmt/files/patch-zfs-snapshot-mgmt
diff --git a/sysutils/zfs-snapshot-mgmt/files/pkg-message.in b/filesystems/zfs-snapshot-mgmt/files/pkg-message.in
index 8b9ac6273efe..8b9ac6273efe 100644
--- a/sysutils/zfs-snapshot-mgmt/files/pkg-message.in
+++ b/filesystems/zfs-snapshot-mgmt/files/pkg-message.in
diff --git a/sysutils/zfs-snapshot-mgmt/pkg-descr b/filesystems/zfs-snapshot-mgmt/pkg-descr
index 81fff38ffbd5..81fff38ffbd5 100644
--- a/sysutils/zfs-snapshot-mgmt/pkg-descr
+++ b/filesystems/zfs-snapshot-mgmt/pkg-descr
diff --git a/sysutils/zfs-snapshot-mgmt/pkg-plist b/filesystems/zfs-snapshot-mgmt/pkg-plist
index 5ce124a03a6c..5ce124a03a6c 100644
--- a/sysutils/zfs-snapshot-mgmt/pkg-plist
+++ b/filesystems/zfs-snapshot-mgmt/pkg-plist
diff --git a/sysutils/zfs-stats-lite/Makefile b/filesystems/zfs-stats-lite/Makefile
index c20086c05b31..b60914e31921 100644
--- a/sysutils/zfs-stats-lite/Makefile
+++ b/filesystems/zfs-stats-lite/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	zfs-stats-lite
 PORTVERSION=	1.4
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 MASTER_SITES=	http://druidbsd.sourceforge.net/download/
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/sysutils/zfs-stats-lite/distinfo b/filesystems/zfs-stats-lite/distinfo
index d2ee3bf06c15..d7f18ce72cc1 100644
--- a/sysutils/zfs-stats-lite/distinfo
+++ b/filesystems/zfs-stats-lite/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905185
 SHA256 (zfs-stats-lite-1.4.tar.gz) = bb09a299fe24eb062eda4ca65b7931ce11c523a0b3aa0a72021108609a3b3b10
 SIZE (zfs-stats-lite-1.4.tar.gz) = 8241
diff --git a/sysutils/zfs-stats-lite/pkg-descr b/filesystems/zfs-stats-lite/pkg-descr
index f7c7ed10a7c7..3407c2d67b0f 100644
--- a/sysutils/zfs-stats-lite/pkg-descr
+++ b/filesystems/zfs-stats-lite/pkg-descr
@@ -1,5 +1,5 @@
 zfs-stats displays ZFS statistics in human-readable format including
 ARC, L2ARC, zfetch (DMU) and vdev cache statistics.
 
-This script is a fork of sysutils/zfs-stats which has no dependency on perl or
+This script is a fork of filesystems/zfs-stats which has no dependency on perl or
 other ports.
diff --git a/sysutils/zfs-stats/Makefile b/filesystems/zfs-stats/Makefile
index 2c737b93a38e..41a1aff92ef0 100644
--- a/sysutils/zfs-stats/Makefile
+++ b/filesystems/zfs-stats/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	zfs-stats
 DISTVERSION=	1.3.2
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Displays general ZFS information and human-readable statistics
diff --git a/sysutils/zfs-stats/distinfo b/filesystems/zfs-stats/distinfo
index 3856c2623bc4..3856c2623bc4 100644
--- a/sysutils/zfs-stats/distinfo
+++ b/filesystems/zfs-stats/distinfo
diff --git a/sysutils/zfs-stats/pkg-descr b/filesystems/zfs-stats/pkg-descr
index 3cd64d8cc2f4..3cd64d8cc2f4 100644
--- a/sysutils/zfs-stats/pkg-descr
+++ b/filesystems/zfs-stats/pkg-descr
diff --git a/sysutils/zfsnap/Makefile b/filesystems/zfsnap/Makefile
index a64bca3152e3..65385b1144fc 100644
--- a/sysutils/zfsnap/Makefile
+++ b/filesystems/zfsnap/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	zfsnap
 PORTVERSION=	1.11.1
 DISTVERSIONPREFIX=	v
 PORTREVISION=	1
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 
 MAINTAINER=	yamagi@yamagi.org
 COMMENT=	Simple sh script to make zfs rolling snaphosts with cron
diff --git a/sysutils/zfsnap/distinfo b/filesystems/zfsnap/distinfo
index 924412581609..195e29ee0742 100644
--- a/sysutils/zfsnap/distinfo
+++ b/filesystems/zfsnap/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905205
 SHA256 (zfsnap-zfsnap-v1.11.1_GH0.tar.gz) = dd533d5faff9fa98deeb9ae0909784b67b0dc43d3870f259eeb390fbc1d03bcf
 SIZE (zfsnap-zfsnap-v1.11.1_GH0.tar.gz) = 4969
diff --git a/sysutils/zfsnap/files/patch-zfSnap.sh b/filesystems/zfsnap/files/patch-zfSnap.sh
index 1cdd609dd8b3..1cdd609dd8b3 100644
--- a/sysutils/zfsnap/files/patch-zfSnap.sh
+++ b/filesystems/zfsnap/files/patch-zfSnap.sh
diff --git a/sysutils/zfsnap/pkg-descr b/filesystems/zfsnap/pkg-descr
index 16d0cef6da58..16d0cef6da58 100644
--- a/sysutils/zfsnap/pkg-descr
+++ b/filesystems/zfsnap/pkg-descr
diff --git a/sysutils/zfsnap/pkg-message b/filesystems/zfsnap/pkg-message
index 927cda7debfd..927cda7debfd 100644
--- a/sysutils/zfsnap/pkg-message
+++ b/filesystems/zfsnap/pkg-message
diff --git a/sysutils/zfsnap/pkg-plist b/filesystems/zfsnap/pkg-plist
index 048f85a2e8f1..048f85a2e8f1 100644
--- a/sysutils/zfsnap/pkg-plist
+++ b/filesystems/zfsnap/pkg-plist
diff --git a/sysutils/zfsnap2/Makefile b/filesystems/zfsnap2/Makefile
index b6a5b3c4236e..559ad86aef7b 100644
--- a/sysutils/zfsnap2/Makefile
+++ b/filesystems/zfsnap2/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	zfsnap
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.0-beta3
 PORTREVISION=	4
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	mm@FreeBSD.org
diff --git a/sysutils/zfsnap2/distinfo b/filesystems/zfsnap2/distinfo
index 944dc6c3b08e..944dc6c3b08e 100644
--- a/sysutils/zfsnap2/distinfo
+++ b/filesystems/zfsnap2/distinfo
diff --git a/sysutils/zfsnap2/files/patch-periodic_xPERIODICx__zfsnap.sh b/filesystems/zfsnap2/files/patch-periodic_xPERIODICx__zfsnap.sh
index 3b8bf6daee22..3b8bf6daee22 100644
--- a/sysutils/zfsnap2/files/patch-periodic_xPERIODICx__zfsnap.sh
+++ b/filesystems/zfsnap2/files/patch-periodic_xPERIODICx__zfsnap.sh
diff --git a/sysutils/zfsnap2/pkg-descr b/filesystems/zfsnap2/pkg-descr
index e5aa55629cad..e5aa55629cad 100644
--- a/sysutils/zfsnap2/pkg-descr
+++ b/filesystems/zfsnap2/pkg-descr
diff --git a/sysutils/zfsnap2/pkg-plist b/filesystems/zfsnap2/pkg-plist
index 865f12042d3e..865f12042d3e 100644
--- a/sysutils/zfsnap2/pkg-plist
+++ b/filesystems/zfsnap2/pkg-plist
diff --git a/sysutils/zfstools/Makefile b/filesystems/zfstools/Makefile
index 8ebf2c6bd323..53d733ceddb3 100644
--- a/sysutils/zfstools/Makefile
+++ b/filesystems/zfstools/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	zfstools
 DISTVERSIONPREFIX=v
 DISTVERSION=	0.3.6
 PORTREVISION=	2
-CATEGORIES=	sysutils ruby
+CATEGORIES=	filesystems sysutils ruby
 MASTER_SITES=	GH \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/
 
diff --git a/sysutils/zfstools/distinfo b/filesystems/zfstools/distinfo
index a99c0e484e02..3975d23051b6 100644
--- a/sysutils/zfstools/distinfo
+++ b/filesystems/zfstools/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905190
 SHA256 (bdrewery-zfstools-v0.3.6_GH0.tar.gz) = 060112d89f11e95415f07cdbc05fef29a6a1bc5046046c56d37f16b1232fb2cf
 SIZE (bdrewery-zfstools-v0.3.6_GH0.tar.gz) = 12323
diff --git a/sysutils/zfstools/files/pkg-message.in b/filesystems/zfstools/files/pkg-message.in
index 6df0d4d832a2..6df0d4d832a2 100644
--- a/sysutils/zfstools/files/pkg-message.in
+++ b/filesystems/zfstools/files/pkg-message.in
diff --git a/sysutils/zfstools/pkg-descr b/filesystems/zfstools/pkg-descr
index 3fbffa57a0df..3fbffa57a0df 100644
--- a/sysutils/zfstools/pkg-descr
+++ b/filesystems/zfstools/pkg-descr
diff --git a/sysutils/zfstools/pkg-plist b/filesystems/zfstools/pkg-plist
index 1dc611682ff4..1dc611682ff4 100644
--- a/sysutils/zfstools/pkg-plist
+++ b/filesystems/zfstools/pkg-plist
diff --git a/sysutils/fusefs-zip/Makefile b/filesystems/zip/Makefile
index 36bdba712ff9..ed3d6a2bd0a4 100644
--- a/sysutils/fusefs-zip/Makefile
+++ b/filesystems/zip/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	fuse-zip
 PORTVERSION=	0.4.4
 PORTREVISION=	2
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 MASTER_SITES=	https://bitbucket.org/agalanin/fuse-zip/downloads/
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/sysutils/fusefs-zip/distinfo b/filesystems/zip/distinfo
index 7d75d75162d5..7d75d75162d5 100644
--- a/sysutils/fusefs-zip/distinfo
+++ b/filesystems/zip/distinfo
diff --git a/sysutils/fusefs-zip/pkg-descr b/filesystems/zip/pkg-descr
index d2d8b2a7d5c0..d2d8b2a7d5c0 100644
--- a/sysutils/fusefs-zip/pkg-descr
+++ b/filesystems/zip/pkg-descr
diff --git a/sysutils/zisofs-tools/Makefile b/filesystems/zisofs-tools/Makefile
index 4a3d1eada34e..bc5292711ea7 100644
--- a/sysutils/zisofs-tools/Makefile
+++ b/filesystems/zisofs-tools/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	zisofs-tools
 PORTVERSION=	1.0.8
 PORTREVISION=	2
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 MASTER_SITES=	KERNEL_ORG/linux/utils/fs/zisofs
 
 MAINTAINER=	chip-set@mail.ru
diff --git a/sysutils/zisofs-tools/distinfo b/filesystems/zisofs-tools/distinfo
index c24f6042bf93..55f66cc351ea 100644
--- a/sysutils/zisofs-tools/distinfo
+++ b/filesystems/zisofs-tools/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1730905167
 SHA256 (zisofs-tools-1.0.8.tar.bz2) = ae4e53e4914934d41660248fb59d3c8761f1f1fd180d5ec993c17ddb3afd04f3
 SIZE (zisofs-tools-1.0.8.tar.bz2) = 52968
diff --git a/sysutils/zisofs-tools/files/patch-compress.c b/filesystems/zisofs-tools/files/patch-compress.c
index 3606d9f3be0e..3606d9f3be0e 100644
--- a/sysutils/zisofs-tools/files/patch-compress.c
+++ b/filesystems/zisofs-tools/files/patch-compress.c
diff --git a/sysutils/zisofs-tools/pkg-descr b/filesystems/zisofs-tools/pkg-descr
index e834f8f04a46..e834f8f04a46 100644
--- a/sysutils/zisofs-tools/pkg-descr
+++ b/filesystems/zisofs-tools/pkg-descr
diff --git a/sysutils/zrepl-dsh2dsh/Makefile b/filesystems/zrepl-dsh2dsh/Makefile
index a190fc7e7294..8ce302dfd1c2 100644
--- a/sysutils/zrepl-dsh2dsh/Makefile
+++ b/filesystems/zrepl-dsh2dsh/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	zrepl
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.9
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 PKGNAMESUFFIX=	-dsh2dsh
 
 MAINTAINER=	dsh@bamus.cz
diff --git a/sysutils/zrepl-dsh2dsh/distinfo b/filesystems/zrepl-dsh2dsh/distinfo
index 6f28a3b3592c..6f28a3b3592c 100644
--- a/sysutils/zrepl-dsh2dsh/distinfo
+++ b/filesystems/zrepl-dsh2dsh/distinfo
diff --git a/sysutils/zrepl-dsh2dsh/files/pkg-message.in b/filesystems/zrepl-dsh2dsh/files/pkg-message.in
index f1b1d52c1f00..288cad6b2a1e 100644
--- a/sysutils/zrepl-dsh2dsh/files/pkg-message.in
+++ b/filesystems/zrepl-dsh2dsh/files/pkg-message.in
@@ -1,7 +1,7 @@
 [
 { type: install
   message: <<EOM
-Messages from sysutils/zrepl:
+Messages from filesystems/zrepl-dsh2dsh:
 
 SETUP BEFORE FIRST USE:
 - Create the log file /var/log/zrepl.log:
diff --git a/sysutils/zrepl-dsh2dsh/pkg-descr b/filesystems/zrepl-dsh2dsh/pkg-descr
index 2a89cb5c62d7..2a89cb5c62d7 100644
--- a/sysutils/zrepl-dsh2dsh/pkg-descr
+++ b/filesystems/zrepl-dsh2dsh/pkg-descr
diff --git a/sysutils/zrepl-dsh2dsh/pkg-plist b/filesystems/zrepl-dsh2dsh/pkg-plist
index 3e2aac89ae3b..3e2aac89ae3b 100644
--- a/sysutils/zrepl-dsh2dsh/pkg-plist
+++ b/filesystems/zrepl-dsh2dsh/pkg-plist
diff --git a/sysutils/zrepl/Makefile b/filesystems/zrepl/Makefile
index fbd5344e9c56..fccb602a1809 100644
--- a/sysutils/zrepl/Makefile
+++ b/filesystems/zrepl/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	zrepl
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.1
 PORTREVISION=	9
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 
 MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	ZFS dataset replication tool
diff --git a/sysutils/zrepl/distinfo b/filesystems/zrepl/distinfo
index 33e3320c0169..33e3320c0169 100644
--- a/sysutils/zrepl/distinfo
+++ b/filesystems/zrepl/distinfo
diff --git a/sysutils/zrepl/files/500.zrepl.in b/filesystems/zrepl/files/500.zrepl.in
index b7f1b3abb4d3..b7f1b3abb4d3 100644
--- a/sysutils/zrepl/files/500.zrepl.in
+++ b/filesystems/zrepl/files/500.zrepl.in
diff --git a/sysutils/zrepl/files/newsyslog.conf b/filesystems/zrepl/files/newsyslog.conf
index 647b87247baa..647b87247baa 100644
--- a/sysutils/zrepl/files/newsyslog.conf
+++ b/filesystems/zrepl/files/newsyslog.conf
diff --git a/sysutils/zrepl/files/patch-go.mod b/filesystems/zrepl/files/patch-go.mod
index abb50a71b69c..abb50a71b69c 100644
--- a/sysutils/zrepl/files/patch-go.mod
+++ b/filesystems/zrepl/files/patch-go.mod
diff --git a/sysutils/zrepl/files/patch-go.sum b/filesystems/zrepl/files/patch-go.sum
index 7a439ab0bf98..7a439ab0bf98 100644
--- a/sysutils/zrepl/files/patch-go.sum
+++ b/filesystems/zrepl/files/patch-go.sum
diff --git a/sysutils/zrepl/files/patch-vendor_modules.txt b/filesystems/zrepl/files/patch-vendor_modules.txt
index 90f922b88bf2..90f922b88bf2 100644
--- a/sysutils/zrepl/files/patch-vendor_modules.txt
+++ b/filesystems/zrepl/files/patch-vendor_modules.txt
diff --git a/sysutils/zrepl/files/pkg-message.in b/filesystems/zrepl/files/pkg-message.in
index 9d0cc7020a45..b210277014d0 100644
--- a/sysutils/zrepl/files/pkg-message.in
+++ b/filesystems/zrepl/files/pkg-message.in
@@ -1,7 +1,7 @@
 [
 { type: install
   message: <<EOM
-Messages from sysutils/zrepl:
+Messages from filesystems/zrepl:
 
 SETUP BEFORE FIRST USE:
 - Create the log file /var/log/zrepl.log:
diff --git a/sysutils/zrepl/files/syslog.conf b/filesystems/zrepl/files/syslog.conf
index c825c409d5a6..c825c409d5a6 100644
--- a/sysutils/zrepl/files/syslog.conf
+++ b/filesystems/zrepl/files/syslog.conf
diff --git a/sysutils/zrepl/files/zrepl.in b/filesystems/zrepl/files/zrepl.in
index 6a2510f80572..6a2510f80572 100644
--- a/sysutils/zrepl/files/zrepl.in
+++ b/filesystems/zrepl/files/zrepl.in
diff --git a/sysutils/zrepl/files/zrepl.yml b/filesystems/zrepl/files/zrepl.yml
index 94e924c4eb7e..94e924c4eb7e 100644
--- a/sysutils/zrepl/files/zrepl.yml
+++ b/filesystems/zrepl/files/zrepl.yml
diff --git a/sysutils/zrepl/pkg-descr b/filesystems/zrepl/pkg-descr
index 4913c21f125b..4913c21f125b 100644
--- a/sysutils/zrepl/pkg-descr
+++ b/filesystems/zrepl/pkg-descr
diff --git a/sysutils/zrepl/pkg-plist b/filesystems/zrepl/pkg-plist
index a11961d1fa43..a11961d1fa43 100644
--- a/sysutils/zrepl/pkg-plist
+++ b/filesystems/zrepl/pkg-plist
diff --git a/sysutils/zxfer/Makefile b/filesystems/zxfer/Makefile
index 6784ec68eb4b..9a0ecce6db0f 100644
--- a/sysutils/zxfer/Makefile
+++ b/filesystems/zxfer/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	zxfer
 PORTVERSION=	1.1.7
 PORTREVISION=	1
 DISTVERSIONPREFIX=	v
-CATEGORIES=	sysutils
+CATEGORIES=	filesystems sysutils
 
 MAINTAINER=	ports@scaleengine.com
 COMMENT=	Easily and reliably transfer ZFS filesystems
diff --git a/sysutils/zxfer/distinfo b/filesystems/zxfer/distinfo
index 8f43bc8feced..8f43bc8feced 100644
--- a/sysutils/zxfer/distinfo
+++ b/filesystems/zxfer/distinfo
diff --git a/sysutils/zxfer/pkg-descr b/filesystems/zxfer/pkg-descr
index 1e7e4caee271..1e7e4caee271 100644
--- a/sysutils/zxfer/pkg-descr
+++ b/filesystems/zxfer/pkg-descr
diff --git a/graphics/Makefile b/graphics/Makefile
index 1b5d4af9aade..f9de09a6b7dd 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -215,7 +215,6 @@
     SUBDIR += frei0r-plugins-opencv
     SUBDIR += frogr
     SUBDIR += ftgl
-    SUBDIR += fusefs-gphotofs
     SUBDIR += fv
     SUBDIR += fyre
     SUBDIR += g2
diff --git a/graphics/py-geosnap/Makefile b/graphics/py-geosnap/Makefile
index 09fe1edeec3c..a43ebb7b846f 100644
--- a/graphics/py-geosnap/Makefile
+++ b/graphics/py-geosnap/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=61.0:devel/py-setuptools@${PY_
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.2:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}contextily>=0:graphics/py-contextily@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}fsspec>=:devel/py-fsspec@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}fsspec>=:filesystems/py-fsspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geopandas>=0.9:graphics/py-geopandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}giddy>=2.2.1:graphics/py-giddy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libpysal>=0:science/py-libpysal@${PY_FLAVOR} \
@@ -32,7 +32,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}contextily>=0:graphics/py-contextily@${PY_FL
 		${PYTHON_PKGNAMEPREFIX}pyarrow>=0.14.1:databases/py-pyarrow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=3:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}quilt3>=3.6:www/py-quilt3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}s3fs>=0:devel/py-s3fs@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}s3fs>=0:filesystems/py-s3fs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}seaborn>=0:math/py-seaborn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}segregation>=2.1:science/py-segregation@${PY_FLAVOR} \
diff --git a/graphics/py-imageio/Makefile b/graphics/py-imageio/Makefile
index b0dbb976d266..a1b0df2e0562 100644
--- a/graphics/py-imageio/Makefile
+++ b/graphics/py-imageio/Makefile
@@ -22,10 +22,10 @@ TEST_DEPENDS=	opencv>=0:graphics/opencv \
 		${PYTHON_PKGNAMEPREFIX}astropy>=0:astro/py-astropy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}av>=0:multimedia/py-av@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gdal>=0:graphics/py-gdal@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}fsspec>=0:devel/py-fsspec@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}fsspec>=0:filesystems/py-fsspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tifffile>=0:graphics/py-tifffile@${PY_FLAVOR}
-# devel/py-fsspec[github]
+# filesystems/py-fsspec[github]
 TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 
 USES=		python:3.9+
diff --git a/graphics/py-tifffile/Makefile b/graphics/py-tifffile/Makefile
index 946ac79abd97..937ce250d420 100644
--- a/graphics/py-tifffile/Makefile
+++ b/graphics/py-tifffile/Makefile
@@ -31,7 +31,7 @@ CODECS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}imagecodecs>=2023.8.12:graphics/py-im
 PLOT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR}
 XML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR}
-ZARR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>=0:devel/py-fsspec@${PY_FLAVOR} \
+ZARR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>=0:filesystems/py-fsspec@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}zarr>=0:devel/py-zarr@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/math/py-awkward/Makefile b/math/py-awkward/Makefile
index 7f52358e88d7..48bee23bd546 100644
--- a/math/py-awkward/Makefile
+++ b/math/py-awkward/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatch-fancy-pypi-readme>=0:devel/py-hatch-fancy-pypi-readme@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hatchling>=1.10.0:devel/py-hatchling@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}awkward-cpp>=39<39_99:math/py-awkward-cpp@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}fsspec>=2022.11.0:devel/py-fsspec@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}fsspec>=2022.11.0:filesystems/py-fsspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.18.0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
 
diff --git a/math/py-modin/Makefile b/math/py-modin/Makefile
index e5db69c117c1..3e4d6e8e877c 100644
--- a/math/py-modin/Makefile
+++ b/math/py-modin/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>=2022.11.0:devel/py-fsspec@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>=2022.11.0:filesystems/py-fsspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.22.4,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=21.0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=2,1<2.3,1:math/py-pandas@${PY_FLAVOR} \
diff --git a/misc/Makefile b/misc/Makefile
index 34195fc80e54..4b130212299f 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -95,7 +95,6 @@
     SUBDIR += dtach
     SUBDIR += dvorak7min
     SUBDIR += dynomite
-    SUBDIR += e2fsprogs-libblkid
     SUBDIR += e2fsprogs-libuuid
     SUBDIR += ecflow
     SUBDIR += edfbrowser
diff --git a/misc/e2fsprogs-libuuid/Makefile b/misc/e2fsprogs-libuuid/Makefile
index b2f6cfec86a8..d0439b78b2c8 100644
--- a/misc/e2fsprogs-libuuid/Makefile
+++ b/misc/e2fsprogs-libuuid/Makefile
@@ -10,7 +10,7 @@ LICENSE_FILE=	${INSTALL_WRKSRC}/COPYING
 CONFIGURE_ARGS=	--enable-elf-shlibs --enable-libuuid
 
 OPTIONS_EXCLUDE=	NLS
-MASTERDIR=	${.CURDIR}/../../sysutils/e2fsprogs-core
+MASTERDIR=	${.CURDIR}/../../filesystems/e2fsprogs-core
 MAKE_ARGS=	LIB_SUBDIRS=lib/uuid
 USE_LDCONFIG=	yes
 ALL_TARGET=	libs
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 982c6f86900c..4747cff879f9 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -49,7 +49,7 @@ ASPELL_CONFIGURE_ENABLE=aspell
 
 EDITOR_CONFIGURE_WITH=	internal-edit
 
-EXTATTR_LIB_DEPENDS=	libe2p.so:sysutils/e2fsprogs-core
+EXTATTR_LIB_DEPENDS=	libe2p.so:filesystems/e2fsprogs-core
 
 ICONV_USES=		iconv
 ICONV_CONFIGURE_ENABLE=	charset
diff --git a/misc/py-datasets/Makefile b/misc/py-datasets/Makefile
index dd2c96e2321a..dfbe0c313fc8 100644
--- a/misc/py-datasets/Makefile
+++ b/misc/py-datasets/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyproject-hooks>0:devel/py-pyproject-hooks
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dill>0.3.0:devel/py-dill@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}filelock>0:sysutils/py-filelock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}fsspec>=2023.1.0:devel/py-fsspec@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}fsspec>=2023.1.0:filesystems/py-fsspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}huggingface-hub>0.21.2:misc/py-huggingface-hub@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}multiprocess>0:devel/py-multiprocess@${PY_FLAVOR} \
 		${PYNUMPY} \
@@ -46,7 +46,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}absl-py>=0:devel/py-absl-py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytorch>=2.0.0:misc/py-pytorch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rarfile>=4.0:archivers/py-rarfile@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}s3fs>=2021.11.1:devel/py-s3fs@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}s3fs>=2021.11.1:filesystems/py-s3fs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tiktoken>=0:textproc/py-tiktoken@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.6.1:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zstandard>=0:archivers/py-zstandard@${PY_FLAVOR}
diff --git a/misc/py-huggingface-hub/Makefile b/misc/py-huggingface-hub/Makefile
index d09122d49c3e..aa8e22c2099e 100644
--- a/misc/py-huggingface-hub/Makefile
+++ b/misc/py-huggingface-hub/Makefile
@@ -13,7 +13,7 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}filelock>0:sysutils/py-filelock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}fsspec>=2023.5.0:devel/py-fsspec@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}fsspec>=2023.5.0:filesystems/py-fsspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=20.9:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
diff --git a/misc/py-pytorch-lightning/Makefile b/misc/py-pytorch-lightning/Makefile
index bd775061749d..fc08a9079edf 100644
--- a/misc/py-pytorch-lightning/Makefile
+++ b/misc/py-pytorch-lightning/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>=2022.5.0:devel/py-fsspec@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>=2022.5.0:filesystems/py-fsspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lightning-utilities>=0.10.0:misc/py-lightning-utilities@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \
diff --git a/misc/py-torch-geometric/Makefile b/misc/py-torch-geometric/Makefile
index 477e3af35fb3..eee73e0e2377 100644
--- a/misc/py-torch-geometric/Makefile
+++ b/misc/py-torch-geometric/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flit-core>0:devel/py-flit-core@${PY_FLAVOR
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dgl>0:math/py-dgl@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}fsspec>0:devel/py-fsspec@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}fsspec>0:filesystems/py-fsspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYNUMPY}  \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.8.0:sysutils/py-psutil@${PY_FLAVOR} \
diff --git a/net-mgmt/seafile-server/Makefile b/net-mgmt/seafile-server/Makefile
index 66dcbd46d73d..6447e010f535 100644
--- a/net-mgmt/seafile-server/Makefile
+++ b/net-mgmt/seafile-server/Makefile
@@ -57,7 +57,7 @@ OPTIONS_SUB=		yes
 FUSE_DESC=		Use file system in userspace
 
 FUSE_CONFIGURE_ENABLE=	fuse
-FUSE_LIB_DEPENDS=	libfuse.so:sysutils/fusefs-libs
+FUSE_LIB_DEPENDS=	libfuse.so:filesystems/fusefs-libs
 
 LDAP_CONFIGURE_ENABLE=	ldap
 LDAP_USES=		ldap
diff --git a/net/afpfs-ng/Makefile b/net/afpfs-ng/Makefile
index 4e27440a0ec3..10d1031e1080 100644
--- a/net/afpfs-ng/Makefile
+++ b/net/afpfs-ng/Makefile
@@ -26,7 +26,7 @@ CPPFLAGS+=	-D_FILE_OFFSET_BITS=64
 OPTIONS_DEFINE=	FUSE GCRYPT
 OPTIONS_SUB=	yes
 
-FUSE_LIB_DEPENDS=	libfuse.so:sysutils/fusefs-libs
+FUSE_LIB_DEPENDS=	libfuse.so:filesystems/fusefs-libs
 FUSE_CONFIGURE_ENABLE=	fuse
 GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 GCRYPT_CONFIGURE_ENABLE=gcrypt
diff --git a/net/ipxe/Makefile b/net/ipxe/Makefile
index ae4333184319..29b99b50322b 100644
--- a/net/ipxe/Makefile
+++ b/net/ipxe/Makefile
@@ -68,7 +68,7 @@ OPTIONS_DEFAULT=	EFI ISO
 EFI_DESC=	Create EFI images
 ISO_DESC=	Create bootable CD image
 
-EFI_BUILD_DEPENDS=	mformat:emulators/mtools
+EFI_BUILD_DEPENDS=	mformat:filesystems/mtools
 _EFI_ARCHS=		${ARCH:Mamd64:S/amd64/x86_64/} i386
 _EFI_TARGETS=		ipxe snp snponly
 .for _arch in ${_EFI_ARCHS}
diff --git a/net/rclone/Makefile b/net/rclone/Makefile
index 6030629127ff..1cb64f9f4171 100644
--- a/net/rclone/Makefile
+++ b/net/rclone/Makefile
@@ -10,7 +10,7 @@ WWW=		https://rclone.org/
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libfuse.so:sysutils/fusefs-libs
+LIB_DEPENDS=	libfuse.so:filesystems/fusefs-libs
 RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
 USES=		cpe go:modules
diff --git a/net/rubygem-train-winrm/Makefile b/net/rubygem-train-winrm/Makefile
index a5dfabf05b8f..bcb5bdccca0e 100644
--- a/net/rubygem-train-winrm/Makefile
+++ b/net/rubygem-train-winrm/Makefile
@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-winrm>=2.3.6<3.0:sysutils/rubygem-winrm \
 		rubygem-winrm-elevated>=1.2.2<1.3:sysutils/rubygem-winrm-elevated \
-		rubygem-winrm-fs>=1.0<2:sysutils/rubygem-winrm-fs
+		rubygem-winrm-fs>=1.0<2:filesystems/rubygem-winrm-fs
 
 USES=		gem
 
diff --git a/net/wifibox-alpine/Makefile b/net/wifibox-alpine/Makefile
index 53affd870ba9..ad3a1de1e3b5 100644
--- a/net/wifibox-alpine/Makefile
+++ b/net/wifibox-alpine/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY=	${_DISTFILES:M*_GH0.tar.gz}
 
 BUILD_DEPENDS=	gtar>0:archivers/gtar \
 		patchelf>0:sysutils/patchelf \
-		squashfs-tools-ng>0:sysutils/squashfs-tools-ng
+		squashfs-tools-ng>0:filesystems/squashfs-tools-ng
 
 .include "${.CURDIR}/flavors.mk"
 
diff --git a/print/py-fonttools/Makefile b/print/py-fonttools/Makefile
index 41e5be16cfcf..26b4d4ef3328 100644
--- a/print/py-fonttools/Makefile
+++ b/print/py-fonttools/Makefile
@@ -37,7 +37,7 @@ LXML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=4.0:devel/py-lxml@${PY_FLAVOR}
 PLOT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR}
 REPACKER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}uharfbuzz>=0.23.0:print/py-uharfbuzz@${PY_FLAVOR}
 SYMFONT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sympy>=0:math/py-sympy@${PY_FLAVOR}
-UFO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fs2>=2.2.0<3:devel/py-fs2@${PY_FLAVOR}
+UFO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fs2>=2.2.0<3:filesystems/py-fs2@${PY_FLAVOR}
 WOFF_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}brotli>=1.0.1:archivers/py-brotli@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}zopfli>=0.1.4:archivers/py-zopfli@${PY_FLAVOR}
 
diff --git a/science/py-asdf/Makefile b/science/py-asdf/Makefile
index f591bf167772..9bdc4449399a 100644
--- a/science/py-asdf/Makefile
+++ b/science/py-asdf/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asdf-standard>=1.1.0:science/py-asdf-standar
 		${PYTHON_PKGNAMEPREFIX}packaging>=19:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.4.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}semantic-version>=2.8:devel/py-semantic-version@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>=2022.8.2:devel/py-fsspec@${PY_FLAVOR} \
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>=2022.8.2:filesystems/py-fsspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lz4>=0.10:archivers/py-lz4@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-doctestplus>=0:devel/py-pytest-doctestplus@${PY_FLAVOR} \
diff --git a/security/Makefile b/security/Makefile
index cb05fdb6c6da..68d55de0e6bd 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -76,7 +76,6 @@
     SUBDIR += ccsrch
     SUBDIR += certmgr
     SUBDIR += certspotter
-    SUBDIR += cfs
     SUBDIR += cfssl
     SUBDIR += cfv
     SUBDIR += chaosreader
@@ -95,7 +94,6 @@
     SUBDIR += clamav-lts
     SUBDIR += clamav-unofficial-sigs
     SUBDIR += clamd-stream-client
-    SUBDIR += clamfs
     SUBDIR += clamsmtp
     SUBDIR += clamtk
     SUBDIR += cloak
@@ -927,7 +925,6 @@
     SUBDIR += py-cybox
     SUBDIR += py-detect-secrets
     SUBDIR += py-dfdatetime
-    SUBDIR += py-dfvfs
     SUBDIR += py-dfwinreg
     SUBDIR += py-dirhash
     SUBDIR += py-django-auth-kerberos
diff --git a/security/aide/Makefile b/security/aide/Makefile
index b3344005693b..c0cf6224f99b 100644
--- a/security/aide/Makefile
+++ b/security/aide/Makefile
@@ -10,7 +10,7 @@ WWW=		https://aide.github.io/
 
 LIB_DEPENDS=	libmhash.so:security/mhash \
 		libpcre2-8.so:devel/pcre2 \
-		libe2p.so:sysutils/e2fsprogs-core
+		libe2p.so:filesystems/e2fsprogs-core
 
 USES=		bison gmake localbase pkgconfig:build
 
diff --git a/security/py-keyrings.alt/Makefile b/security/py-keyrings.alt/Makefile
index 2c00f96752d6..494c77fda84d 100644
--- a/security/py-keyrings.alt/Makefile
+++ b/security/py-keyrings.alt/Makefile
@@ -17,7 +17,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keyring>=10.3.1:security/py-keyring@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycryptodome>0:security/py-pycryptodome@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycryptodomex>0:security/py-pycryptodomex@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}fs>=0.5:devel/py-fs@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}fs>=0.5:filesystems/py-fs@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils pytest
@@ -32,6 +32,6 @@ PYFS_DESC=		Install pyfilesystem to support the pyfs backend
 ENCRYPTED_FILE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycryptodomex>0:security/py-pycryptodomex@${PY_FLAVOR}
 GNOME_KEYRING_USES=		gnome
 GNOME_KEYRING_USE=		GNOME=pygobject3
-PYFS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}fs>=0.5:devel/py-fs@${PY_FLAVOR}
+PYFS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}fs>=0.5:filesystems/py-fs@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/security/py-plaso/Makefile b/security/py-plaso/Makefile
index 6adab0f07cd5..78c0b58a819c 100644
--- a/security/py-plaso/Makefile
+++ b/security/py-plaso/Makefile
@@ -31,7 +31,7 @@ RUN_DEPENDS=	libcaes>=a:security/libcaes \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dfdatetime>=0:security/py-dfdatetime@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dfvfs>=0:security/py-dfvfs@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dfvfs>=0:filesystems/py-dfvfs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dfwinreg>=0:security/py-dfwinreg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dtfabric>=0:devel/py-dtfabric@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flor>=0:textproc/py-flor@${PY_FLAVOR} \
diff --git a/security/rage-encryption/Makefile b/security/rage-encryption/Makefile
index 9ceb9dc3560a..2eef7531ee70 100644
--- a/security/rage-encryption/Makefile
+++ b/security/rage-encryption/Makefile
@@ -13,7 +13,7 @@ LICENSE_COMB=	dual
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-APACHE
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
 
-LIB_DEPENDS=	libfuse.so:sysutils/fusefs-libs \
+LIB_DEPENDS=	libfuse.so:filesystems/fusefs-libs \
 		libzstd.so:archivers/zstd
 
 USES=		cargo
diff --git a/sysutils/Makefile b/sysutils/Makefile
index b00f9aa9a1a7..97666541984b 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -6,7 +6,6 @@
     SUBDIR += 915resolution
     SUBDIR += LPRng
     SUBDIR += LPRngTool
-    SUBDIR += R-cran-fs
     SUBDIR += R-cran-processx
     SUBDIR += R-cran-ps
     SUBDIR += R-cran-xopen
@@ -16,7 +15,6 @@
     SUBDIR += accounts-qml-module
     SUBDIR += accountsservice
     SUBDIR += acerhdf-kmod
-    SUBDIR += acfgfs
     SUBDIR += acltool
     SUBDIR += acpi_call
     SUBDIR += acpica-tools
@@ -59,7 +57,6 @@
     SUBDIR += arc_summary
     SUBDIR += arcconf
     SUBDIR += archey4
-    SUBDIR += archivemount
     SUBDIR += ascpu
     SUBDIR += asfsm
     SUBDIR += asmctl
@@ -75,10 +72,8 @@
     SUBDIR += atop
     SUBDIR += auto-admin
     SUBDIR += autojump
-    SUBDIR += automount
     SUBDIR += automounter
     SUBDIR += autorestic
-    SUBDIR += avfs
     SUBDIR += azure-agent
     SUBDIR += b2sum
     SUBDIR += b3sum
@@ -251,7 +246,6 @@
     SUBDIR += cpuid2cpuflags
     SUBDIR += cpulimit
     SUBDIR += cpupdate
-    SUBDIR += cramfs
     SUBDIR += crashme
     SUBDIR += crate
     SUBDIR += createrepo_c
@@ -270,7 +264,6 @@
     SUBDIR += daggy
     SUBDIR += damager
     SUBDIR += dar
-    SUBDIR += darling-dmg
     SUBDIR += dateutils
     SUBDIR += dc3dd
     SUBDIR += dcfldd
@@ -317,9 +310,6 @@
     SUBDIR += dsbbatmon
     SUBDIR += dsbdriverd
     SUBDIR += dsblogoutmgr
-    SUBDIR += dsbmc
-    SUBDIR += dsbmc-cli
-    SUBDIR += dsbmd
     SUBDIR += dsbsu
     SUBDIR += dsbwrtsysctl
     SUBDIR += dtc
@@ -347,9 +337,6 @@
     SUBDIR += dwatch-json
     SUBDIR += dwatch-pwsnoop
     SUBDIR += dynamic_motd
-    SUBDIR += e2fsprogs
-    SUBDIR += e2fsprogs-core
-    SUBDIR += e2tools
     SUBDIR += ebsnvme-id
     SUBDIR += ec2-scripts
     SUBDIR += eclat
@@ -373,7 +360,6 @@
     SUBDIR += evisum
     SUBDIR += evtviewer
     SUBDIR += exa
-    SUBDIR += exfat-utils
     SUBDIR += extipl
     SUBDIR += eza
     SUBDIR += ezjail
@@ -435,51 +421,9 @@
     SUBDIR += fsc
     SUBDIR += fsearch
     SUBDIR += fselect
-    SUBDIR += fstyp
-    SUBDIR += fswatch-mon
     SUBDIR += ftwin
-    SUBDIR += fusefs-afuse
-    SUBDIR += fusefs-bindfs
-    SUBDIR += fusefs-chironfs
-    SUBDIR += fusefs-cryptofs
-    SUBDIR += fusefs-curlftpfs
-    SUBDIR += fusefs-encfs
-    SUBDIR += fusefs-exfat
-    SUBDIR += fusefs-ext2
     SUBDIR += fusefs-funionfs
     SUBDIR += fusefs-fusepak
-    SUBDIR += fusefs-gitfs
-    SUBDIR += fusefs-hfsfuse
-    SUBDIR += fusefs-httpdirfs
-    SUBDIR += fusefs-httpfs
-    SUBDIR += fusefs-ifuse
-    SUBDIR += fusefs-jmtpfs
-    SUBDIR += fusefs-libs
-    SUBDIR += fusefs-libs3
-    SUBDIR += fusefs-lkl
-    SUBDIR += fusefs-mergerfs
-    SUBDIR += fusefs-mhddfs
-    SUBDIR += fusefs-mp3fs
-    SUBDIR += fusefs-nbt
-    SUBDIR += fusefs-ntfs
-    SUBDIR += fusefs-ntfs-compression
-    SUBDIR += fusefs-pod
-    SUBDIR += fusefs-rar2fs
-    SUBDIR += fusefs-s3backer
-    SUBDIR += fusefs-s3fs
-    SUBDIR += fusefs-sandboxfs
-    SUBDIR += fusefs-securefs
-    SUBDIR += fusefs-simple-mtpfs
-    SUBDIR += fusefs-smbnetfs
-    SUBDIR += fusefs-sqlfs
-    SUBDIR += fusefs-squashfuse
-    SUBDIR += fusefs-sshfs
-    SUBDIR += fusefs-ufs
-    SUBDIR += fusefs-unionfs
-    SUBDIR += fusefs-unreliablefs
-    SUBDIR += fusefs-webdavfs
-    SUBDIR += fusefs-xfuse
-    SUBDIR += fusefs-zip
     SUBDIR += fvcool
     SUBDIR += fwup
     SUBDIR += fx
@@ -552,8 +496,6 @@
     SUBDIR += hexpeek
     SUBDIR += hextools
     SUBDIR += hexyl
-    SUBDIR += hfsexplorer
-    SUBDIR += hfsutils
     SUBDIR += hid-tools
     SUBDIR += highlnk
     SUBDIR += hilite
@@ -643,7 +585,6 @@
     SUBDIR += kf6-kwallet
     SUBDIR += khelpcenter
     SUBDIR += kiconvtool
-    SUBDIR += kio-fuse
     SUBDIR += kldfind
     SUBDIR += kldpatch
     SUBDIR += kopia
@@ -689,7 +630,6 @@
     SUBDIR += lineak-xosdplugin
     SUBDIR += lineakd
     SUBDIR += linrename
-    SUBDIR += linux-c7-dosfstools
     SUBDIR += linux-c7-lttng-ust
     SUBDIR += linux-c7-numactl-libs
     SUBDIR += linux-c7-userspace-rcu
@@ -697,7 +637,6 @@
     SUBDIR += linux-rkbin
     SUBDIR += linuxfdisk
     SUBDIR += littlejet
-    SUBDIR += lizardfs
     SUBDIR += lmmon
     SUBDIR += lmon
     SUBDIR += lnav
@@ -719,7 +658,6 @@
     SUBDIR += lsof
     SUBDIR += lsop
     SUBDIR += lsyncd
-    SUBDIR += ltfs
     SUBDIR += ltrace
     SUBDIR += lttng-ust
     SUBDIR += lua-puremagic
@@ -781,22 +719,6 @@
     SUBDIR += monit
     SUBDIR += monitord
     SUBDIR += monitorix
-    SUBDIR += moosefs2-cgi
-    SUBDIR += moosefs2-cgiserv
-    SUBDIR += moosefs2-chunkserver
-    SUBDIR += moosefs2-cli
-    SUBDIR += moosefs2-client
-    SUBDIR += moosefs2-master
-    SUBDIR += moosefs2-metalogger
-    SUBDIR += moosefs2-netdump
-    SUBDIR += moosefs3-cgi
-    SUBDIR += moosefs3-cgiserv
-    SUBDIR += moosefs3-chunkserver
-    SUBDIR += moosefs3-cli
-    SUBDIR += moosefs3-client
-    SUBDIR += moosefs3-master
-    SUBDIR += moosefs3-metalogger
-    SUBDIR += moosefs3-netdump
     SUBDIR += moreutils
     SUBDIR += most
     SUBDIR += mountsmb2
@@ -807,7 +729,6 @@
     SUBDIR += msktutil
     SUBDIR += mstflint
     SUBDIR += mtm
-    SUBDIR += mtpfs
     SUBDIR += mtxorbd
     SUBDIR += multitail
     SUBDIR += munin-common
@@ -842,7 +763,6 @@
     SUBDIR += nrg2iso
     SUBDIR += nss_ndb
     SUBDIR += nsysctl
-    SUBDIR += ntfs2btrfs
     SUBDIR += ntfy
     SUBDIR += ntpstat
     SUBDIR += nut
@@ -870,8 +790,6 @@
     SUBDIR += openseachest
     SUBDIR += opentofu
     SUBDIR += openupsd
-    SUBDIR += openzfs
-    SUBDIR += openzfs-kmod
     SUBDIR += osinfo-db-tools
     SUBDIR += p5-App-Regather
     SUBDIR += p5-App-RunCron
@@ -902,10 +820,8 @@
     SUBDIR += p5-Filesys-DiskFree
     SUBDIR += p5-Filesys-DiskSpace
     SUBDIR += p5-Filesys-DiskUsage
-    SUBDIR += p5-Filesys-Statvfs
     SUBDIR += p5-Filesys-ZFS
     SUBDIR += p5-Filesys-ZFS-Stat
-    SUBDIR += p5-Fuse
     SUBDIR += p5-Fuse-Simple
     SUBDIR += p5-Giovanni
     SUBDIR += p5-Iterator-File
@@ -997,7 +913,6 @@
     SUBDIR += pear-File_Fstab
     SUBDIR += pear-File_Gettext
     SUBDIR += pear-Horde_Log
-    SUBDIR += pear-Horde_Vfs
     SUBDIR += pear-I18Nv2
     SUBDIR += pear-Log
     SUBDIR += pear-Translation2
@@ -1073,7 +988,6 @@
     SUBDIR += process-viewer
     SUBDIR += procmap
     SUBDIR += procs
-    SUBDIR += progsreiserfs
     SUBDIR += pslist
     SUBDIR += psmisc
     SUBDIR += pstack
@@ -1143,7 +1057,6 @@
     SUBDIR += py-ploy_ezjail
     SUBDIR += py-plumbum
     SUBDIR += py-power
-    SUBDIR += py-prometheus-zfs
     SUBDIR += py-psutil
     SUBDIR += py-ptyprocess
     SUBDIR += py-puremagic
@@ -1176,7 +1089,6 @@
     SUBDIR += py-upt-rubygems
     SUBDIR += py-uptime
     SUBDIR += py-zdaemon
-    SUBDIR += py-zfs-autobackup
     SUBDIR += qchroot
     SUBDIR += qdirstat
     SUBDIR += qflipper
@@ -1321,7 +1233,6 @@
     SUBDIR += rubygem-win32-file-stat
     SUBDIR += rubygem-winrm
     SUBDIR += rubygem-winrm-elevated
-    SUBDIR += rubygem-winrm-fs
     SUBDIR += rubygem-yell
     SUBDIR += runas
     SUBDIR += rundeck
@@ -1351,7 +1262,6 @@
     SUBDIR += sas3ircu
     SUBDIR += savelogs
     SUBDIR += scalpel
-    SUBDIR += scan_ffs
     SUBDIR += scanbd
     SUBDIR += scanbuttond
     SUBDIR += scanmem
@@ -1408,8 +1318,6 @@
     SUBDIR += spindown
     SUBDIR += spinner
     SUBDIR += spiped
-    SUBDIR += squashfs-tools
-    SUBDIR += squashfs-tools-ng
     SUBDIR += ssd_report
     SUBDIR += sshsudo
     SUBDIR += ssync
@@ -1576,7 +1484,6 @@
     SUBDIR += ucspi-unix
     SUBDIR += udfclient
     SUBDIR += ufetch
-    SUBDIR += ufs_copy
     SUBDIR += uhidd
     SUBDIR += uif2iso
     SUBDIR += unetbootin
@@ -1620,7 +1527,6 @@
     SUBDIR += volman
     SUBDIR += vpnc-scripts
     SUBDIR += vttest
-    SUBDIR += vzvol
     SUBDIR += wait_on
     SUBDIR += walk
     SUBDIR += watchfolder
@@ -1633,7 +1539,6 @@
     SUBDIR += whatpix
     SUBDIR += whowatch
     SUBDIR += wiimms
-    SUBDIR += wimlib
     SUBDIR += wiper
     SUBDIR += wmapmload
     SUBDIR += wmbluecpu
@@ -1674,8 +1579,6 @@
     SUBDIR += xfce4-settings
     SUBDIR += xfce4-systemload-plugin
     SUBDIR += xfce4-wavelan-plugin
-    SUBDIR += xfsm
-    SUBDIR += xfsprogs
     SUBDIR += xin
     SUBDIR += xjobs
     SUBDIR += xmbmon
@@ -1691,7 +1594,6 @@
     SUBDIR += yank
     SUBDIR += yazi
     SUBDIR += z
-    SUBDIR += zap
     SUBDIR += zbackup
     SUBDIR += zeitgeist
     SUBDIR += zellij
@@ -1699,28 +1601,14 @@
     SUBDIR += zeroer
     SUBDIR += zetaback
     SUBDIR += zetaback-devel
-    SUBDIR += zfs-periodic
-    SUBDIR += zfs-replicate
-    SUBDIR += zfs-snap-diff
-    SUBDIR += zfs-snapshot-clean
-    SUBDIR += zfs-snapshot-mgmt
-    SUBDIR += zfs-stats
-    SUBDIR += zfs-stats-lite
-    SUBDIR += zfsnap
-    SUBDIR += zfsnap2
-    SUBDIR += zfstools
     SUBDIR += zidrav
-    SUBDIR += zisofs-tools
     SUBDIR += znapzend
     SUBDIR += zogftw
     SUBDIR += zoxide
     SUBDIR += zpool-iostat-viz
     SUBDIR += zrep
-    SUBDIR += zrepl
-    SUBDIR += zrepl-dsh2dsh
     SUBDIR += zsd
     SUBDIR += zsm
     SUBDIR += ztop
-    SUBDIR += zxfer
 
 .include <bsd.port.subdir.mk>
diff --git a/sysutils/fwup/Makefile b/sysutils/fwup/Makefile
index f10b89e45459..9e239aa65b0d 100644
--- a/sysutils/fwup/Makefile
+++ b/sysutils/fwup/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${LOCALBASE}/bin/autogen:devel/autogen \
 		${LOCALBASE}/bin/base64:converters/base64 \
 		${LOCALBASE}/bin/help2man:misc/help2man \
-		${LOCALBASE}/bin/mdir:emulators/mtools \
+		${LOCALBASE}/bin/mdir:filesystems/mtools \
 		${LOCALBASE}/bin/zip:archivers/zip
 LIB_DEPENDS=	libconfuse.so:devel/libconfuse \
 		libsodium.so:security/libsodium
diff --git a/sysutils/grub2-efi/Makefile b/sysutils/grub2-efi/Makefile
index 44351b692ece..4c184e08558f 100644
--- a/sysutils/grub2-efi/Makefile
+++ b/sysutils/grub2-efi/Makefile
@@ -11,7 +11,7 @@ WWW=		https://www.gnu.org/software/grub/
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${LOCALBASE}/bin/mformat:emulators/mtools \
+RUN_DEPENDS=	${LOCALBASE}/bin/mformat:filesystems/mtools \
 		${LOCALBASE}/bin/grub-mkrescue:sysutils/grub2-pcbsd
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
 		${LOCALBASE}/bin/bash:shells/bash \
diff --git a/sysutils/grub2-pcbsd/Makefile b/sysutils/grub2-pcbsd/Makefile
index 91cd2bfc42ff..a5e71cf5371e 100644
--- a/sysutils/grub2-pcbsd/Makefile
+++ b/sysutils/grub2-pcbsd/Makefile
@@ -63,7 +63,7 @@ CONFIGURE_ARGS+=	--disable-grub-mkfont
 .endif
 
 .if ${PORT_OPTIONS:MFUSE}
-LIB_DEPENDS+=	libfuse.so:sysutils/fusefs-libs
+LIB_DEPENDS+=	libfuse.so:filesystems/fusefs-libs
 CONFIGURE_ARGS+=	--enable-grub-mount
 .else
 CONFIGURE_ARGS+=	--disable-grub-mount
diff --git a/sysutils/iocage-devel/Makefile b/sysutils/iocage-devel/Makefile
index 4754b7d8e909..ede04e32b2ea 100644
--- a/sysutils/iocage-devel/Makefile
+++ b/sysutils/iocage-devel/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=6.7:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gitpython>=2.1.10:devel/py-gitpython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}libzfs>=1.0.2:devel/py-libzfs@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}libzfs>=1.0.2:filesystems/py-libzfs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0.0:devel/py-pytest-runner@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${PY_FLAVOR} \
diff --git a/sysutils/iocage/Makefile b/sysutils/iocage/Makefile
index 7382360fb479..bd966a2674fe 100644
--- a/sysutils/iocage/Makefile
+++ b/sysutils/iocage/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gitpython>0:devel/py-gitpython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libzfs>=1.0.2:devel/py-libzfs@${PY_FLAVOR} \
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libzfs>=1.0.2:filesystems/py-libzfs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest4-cov>0:devel/py-pytest4-cov@${PY_FLAVOR} \
diff --git a/sysutils/limine/Makefile b/sysutils/limine/Makefile
index b000ada03633..6a2da089a8ff 100644
--- a/sysutils/limine/Makefile
+++ b/sysutils/limine/Makefile
@@ -10,7 +10,7 @@ WWW=		https://limine-bootloader.org/
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	mtools:emulators/mtools \
+BUILD_DEPENDS=	mtools:filesystems/mtools \
 		nasm:devel/nasm
 
 USES=		gmake
diff --git a/sysutils/p5-Brackup/Makefile b/sysutils/p5-Brackup/Makefile
index 958af49fc042..e706aa210901 100644
--- a/sysutils/p5-Brackup/Makefile
+++ b/sysutils/p5-Brackup/Makefile
@@ -15,7 +15,7 @@ RUN_DEPENDS=	p5-DBD-SQLite>0:databases/p5-DBD-SQLite \
 		p5-DBI>0:databases/p5-DBI \
 		p5-DateTime-Format-ISO8601>0:devel/p5-DateTime-Format-ISO8601 \
 		p5-Digest-SHA1>0:security/p5-Digest-SHA1 \
-		p5-Fuse>0:sysutils/p5-Fuse \
+		p5-Fuse>0:filesystems/p5-Fuse \
 		p5-IO-Stringy>0:devel/p5-IO-Stringy \
 		p5-Net-Amazon-S3>0:net/p5-Net-Amazon-S3 \
 		p5-Net-SFTP>0:net/p5-Net-SFTP \
diff --git a/sysutils/p5-Fuse-Simple/Makefile b/sysutils/p5-Fuse-Simple/Makefile
index 12f85036ac9c..649d46f76b55 100644
--- a/sysutils/p5-Fuse-Simple/Makefile
+++ b/sysutils/p5-Fuse-Simple/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-Fuse>=0:sysutils/p5-Fuse
+RUN_DEPENDS=	p5-Fuse>=0:filesystems/p5-Fuse
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/sysutils/rubygem-bolt/Makefile b/sysutils/rubygem-bolt/Makefile
index d1daf8a8bb15..eb60a60bef73 100644
--- a/sysutils/rubygem-bolt/Makefile
+++ b/sysutils/rubygem-bolt/Makefile
@@ -29,7 +29,7 @@ RUN_DEPENDS=	r10k:sysutils/rubygem-r10k \
 		rubygem-puppetfile-resolver>=0.6.2:sysutils/rubygem-puppetfile-resolver \
 		rubygem-ruby_smb>=1.0:net/rubygem-ruby_smb \
 		rubygem-terminal-table>=3.0<4:textproc/rubygem-terminal-table \
-		rubygem-winrm-fs>=1.3:sysutils/rubygem-winrm-fs \
+		rubygem-winrm-fs>=1.3:filesystems/rubygem-winrm-fs \
 		rubygem-winrm>=2.0:sysutils/rubygem-winrm
 
 USES=		gem shebangfix
diff --git a/sysutils/rubygem-winrm-elevated/Makefile b/sysutils/rubygem-winrm-elevated/Makefile
index bbba405e7b9d..086abb9a3791 100644
--- a/sysutils/rubygem-winrm-elevated/Makefile
+++ b/sysutils/rubygem-winrm-elevated/Makefile
@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-erubi>=1.8<2:www/rubygem-erubi \
 		rubygem-winrm>=2.0<3:sysutils/rubygem-winrm \
-		rubygem-winrm-fs>=1.0<2:sysutils/rubygem-winrm-fs
+		rubygem-winrm-fs>=1.0<2:filesystems/rubygem-winrm-fs
 
 USES=		gem
 
diff --git a/sysutils/swtpm/Makefile b/sysutils/swtpm/Makefile
index fb7b13d2891c..926f5d076b33 100644
--- a/sysutils/swtpm/Makefile
+++ b/sysutils/swtpm/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	base64>=0:converters/base64 \
 		expect>=0:lang/expect \
 		gawk>=0:lang/gawk \
 		socat>=0:net/socat
-LIB_DEPENDS=	libfuse.so:sysutils/fusefs-libs \
+LIB_DEPENDS=	libfuse.so:filesystems/fusefs-libs \
 		libgmp.so:math/gmp \
 		libgnutls.so:security/gnutls \
 		libjson-glib-1.0.so:devel/json-glib \
diff --git a/sysutils/syslinux/Makefile b/sysutils/syslinux/Makefile
index 63a6c0e1bea0..07593c0f70f3 100644
--- a/sysutils/syslinux/Makefile
+++ b/sysutils/syslinux/Makefile
@@ -12,7 +12,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	nasm:devel/nasm
-RUN_DEPENDS=	mtools:emulators/mtools
+RUN_DEPENDS=	mtools:filesystems/mtools
 
 USES=		perl5 gmake tar:xz
 USE_PERL5=	build
diff --git a/sysutils/testdisk/Makefile b/sysutils/testdisk/Makefile
index f33d38e464c5..5c0ccfef1513 100644
--- a/sysutils/testdisk/Makefile
+++ b/sysutils/testdisk/Makefile
@@ -27,10 +27,10 @@ PROGSREISERFS_DESC=	Use reiserfs extensions
 ICONV_USES=		iconv
 ICONV_CONFIGURE_OFF=	--without-iconv
 
-NTFS_LIB_DEPENDS=	libntfs-3g.so:sysutils/fusefs-ntfs
+NTFS_LIB_DEPENDS=	libntfs-3g.so:filesystems/ntfs
 NTFS_CONFIGURE_OFF=	--without-ntfs3g
 
-PROGSREISERFS_LIB_DEPENDS=	libreiserfs-0.3.so.0:sysutils/progsreiserfs
+PROGSREISERFS_LIB_DEPENDS=	libreiserfs-0.3.so.0:filesystems/progsreiserfs
 PROGSREISERFS_CONFIGURE_OFF=	--without-reiserfs
 
 .include <bsd.port.mk>
diff --git a/sysutils/unetbootin/Makefile b/sysutils/unetbootin/Makefile
index 043e85d598ca..c95cf0e7703b 100644
--- a/sysutils/unetbootin/Makefile
+++ b/sysutils/unetbootin/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv2+
 
 RUN_DEPENDS=	7zz:archivers/7-zip \
 		syslinux:sysutils/syslinux \
-		mke2fs:sysutils/e2fsprogs-core
+		mke2fs:filesystems/e2fsprogs-core
 
 USES=		qt:5
 USE_QT=		buildtools:build linguisttools:build qmake:build \
diff --git a/sysutils/vagrant/Makefile b/sysutils/vagrant/Makefile
index cd98b1803163..749772fc3bb4 100644
--- a/sysutils/vagrant/Makefile
+++ b/sysutils/vagrant/Makefile
@@ -39,7 +39,7 @@ RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
 		rubygem-vagrant_cloud>=3.1.1:sysutils/rubygem-vagrant_cloud \
 		rubygem-wdm>=0.1.1:devel/rubygem-wdm \
 		rubygem-winrm-elevated>=1.2.3<2:sysutils/rubygem-winrm-elevated \
-		rubygem-winrm-fs>=1.3.5<2:sysutils/rubygem-winrm-fs \
+		rubygem-winrm-fs>=1.3.5<2:filesystems/rubygem-winrm-fs \
 		rubygem-winrm>=2.3.6<3:sysutils/rubygem-winrm
 
 USES=		cpe ruby shebangfix
diff --git a/sysutils/volman/Makefile b/sysutils/volman/Makefile
index 4433b9bef110..bc84a8c199a3 100644
--- a/sysutils/volman/Makefile
+++ b/sysutils/volman/Makefile
@@ -28,7 +28,7 @@ PLIST_SUB+=	OPENBOX="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MNTFS3G}
-RUN_DEPENDS+=	${LOCALBASE}/bin/ntfs-3g:sysutils/fusefs-ntfs
+RUN_DEPENDS+=	${LOCALBASE}/bin/ntfs-3g:filesystems/ntfs
 SUB_LIST+=	RCFUSEFS=" fusefs"
 .else
 SUB_LIST+=	RCFUSEFS=""
diff --git a/textproc/R-cran-reprex/Makefile b/textproc/R-cran-reprex/Makefile
index df231445e4b5..d9910c3beb02 100644
--- a/textproc/R-cran-reprex/Makefile
+++ b/textproc/R-cran-reprex/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 CRAN_DEPENDS=	R-cran-callr>=3.6.0:devel/R-cran-callr \
 		R-cran-cli>=3.2.0:devel/R-cran-cli \
 		R-cran-clipr>=0.4.0:devel/R-cran-clipr \
-		R-cran-fs>0:sysutils/R-cran-fs \
+		R-cran-fs>0:filesystems/R-cran-fs \
 		R-cran-glue>0:devel/R-cran-glue \
 		R-cran-knitr>=1.23:print/R-cran-knitr \
 		R-cran-lifecycle>0:devel/R-cran-lifecycle \
diff --git a/textproc/R-cran-sass/Makefile b/textproc/R-cran-sass/Makefile
index 32d8c72c8aaa..9ceac240916e 100644
--- a/textproc/R-cran-sass/Makefile
+++ b/textproc/R-cran-sass/Makefile
@@ -9,7 +9,7 @@ WWW=		https://cran.r-project.org/web/packages/sass/
 
 LICENSE=	MIT
 
-CRAN_DEPENDS=	R-cran-fs>0:sysutils/R-cran-fs \
+CRAN_DEPENDS=	R-cran-fs>0:filesystems/R-cran-fs \
 		R-cran-htmltools>=0.5.1:textproc/R-cran-htmltools \
 		R-cran-R6>0:devel/R-cran-R6 \
 		R-cran-rappdirs>0:devel/R-cran-rappdirs \
diff --git a/textproc/multimarkdown/Makefile b/textproc/multimarkdown/Makefile
index bfa9defeb33d..03d80b493e0a 100644
--- a/textproc/multimarkdown/Makefile
+++ b/textproc/multimarkdown/Makefile
@@ -26,7 +26,7 @@ OPTIONS_SUB=	yes
 
 CHEAT_SHEET_DESC=	HTML-based cheat sheat
 EXTRAS_DESC=		Extra scripts and XSLT support
-HELPERS_DESC=		Helper scripts (conflicts with emulators/mtools)
+HELPERS_DESC=		Helper scripts (conflicts with filesystems/mtools)
 
 CHEAT_SHEET_GH_PROJECT=	MultiMarkdown-6-Syntax-Guide:cheat
 CHEAT_SHEET_GH_SUBDIR=	cheat-sheet:cheat
diff --git a/textproc/py-petl/Makefile b/textproc/py-petl/Makefile
index c76095426b1d..2a3fb4ac545c 100644
--- a/textproc/py-petl/Makefile
+++ b/textproc/py-petl/Makefile
@@ -48,7 +48,7 @@ HTTP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiohttp>=3.6.2:www/py-aiohttp@${PY_FLAV
 INTERVAL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}intervaltree>=3.0.2:devel/py-intervaltree@${PY_FLAVOR}
 NUMPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.16.4,1:math/py-numpy@${PY_FLAVOR}
 PANDAS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>=0.24.2,1:math/py-pandas@${PY_FLAVOR}
-REMOTE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>=0.7.4:devel/py-fsspec@${PY_FLAVOR}
+REMOTE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>=0.7.4:filesystems/py-fsspec@${PY_FLAVOR}
 SMB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}smbprotocol>=1.0.1:net/py-smbprotocol@${PY_FLAVOR}
 XLS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlrd>=2.0.1:textproc/py-xlrd@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}xlwt>=1.3.0:textproc/py-xlwt@${PY_FLAVOR}
diff --git a/www/R-cran-pkgdown/Makefile b/www/R-cran-pkgdown/Makefile
index 4784858fb1c8..b37380706d36 100644
--- a/www/R-cran-pkgdown/Makefile
+++ b/www/R-cran-pkgdown/Makefile
@@ -17,7 +17,7 @@ CRAN_DEPENDS=	R-cran-bslib>0:www/R-cran-bslib \
 		R-cran-digest>0:security/R-cran-digest \
 		R-cran-downlit>0:textproc/R-cran-downlit \
 		R-cran-fontawesome>0:devel/R-cran-fontawesome \
-		R-cran-fs>0:sysutils/R-cran-fs \
+		R-cran-fs>0:filesystems/R-cran-fs \
 		R-cran-httr2>0:www/R-cran-httr2 \
 		R-cran-jsonlite>0:converters/R-cran-jsonlite \
 		R-cran-openssl>0:security/R-cran-openssl \
diff --git a/www/py-django-bakery/Makefile b/www/py-django-bakery/Makefile
index 3e62d772da04..be46ca5f530e 100644
--- a/www/py-django-bakery/Makefile
+++ b/www/py-django-bakery/Makefile
@@ -13,7 +13,7 @@ LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>1.5.2:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}boto3>=1.4.4:www/py-boto3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}fs2>=2.0.17:devel/py-fs2@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}fs2>=2.0.17:filesystems/py-fs2@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile
index 066548421e45..7a71e04ce72b 100644
--- a/x11-fm/nemo/Makefile
+++ b/x11-fm/nemo/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libcinnamon-desktop.so:x11/cinnamon-desktop \
 		libxapp.so:x11/xapp
 RUN_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme \
 		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
-		gvfs>0:devel/gvfs
+		gvfs>0:filesystems/gvfs
 
 USES=		compiler:c11 desktop-file-utils gettext gnome meson pkgconfig \
 		python shared-mime-info shebangfix xorg
diff --git a/x11-fm/worker/Makefile b/x11-fm/worker/Makefile
index eb3ed5bbbe77..205a3ed9d5fd 100644
--- a/x11-fm/worker/Makefile
+++ b/x11-fm/worker/Makefile
@@ -28,7 +28,7 @@ INOTIFY_DESC=	Monitor directory changes via libinotify
 AVFS_DESC=	Use AVFS library to access archives
 SSL_DESC=	SHA-256 checksum support via OpenSSL
 
-AVFS_LIB_DEPENDS=	libavfs.so:sysutils/avfs
+AVFS_LIB_DEPENDS=	libavfs.so:filesystems/avfs
 AVFS_CONFIGURE_OFF=	--without-avfs
 
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
diff --git a/x11-fonts/py-fontfeatures/Makefile b/x11-fonts/py-fontfeatures/Makefile
index b4cc69348f22..040c5fcf7452 100644
--- a/x11-fonts/py-fontfeatures/Makefile
+++ b/x11-fonts/py-fontfeatures/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fonttools>=4.28.0:print/py-fonttools@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}fs2>=0:devel/py-fs2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}fs2>=0:filesystems/py-fs2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR}
 
 USES=		python