summaryrefslogtreecommitdiff
path: root/filesystems
diff options
context:
space:
mode:
Diffstat (limited to 'filesystems')
-rw-r--r--filesystems/Makefile3
-rw-r--r--filesystems/e2fsprogs-core/Makefile16
-rw-r--r--filesystems/e2fsprogs-core/files/patch-misc__Makefile.in17
-rw-r--r--filesystems/e2fsprogs-core/files/unwanted8
-rw-r--r--filesystems/e2fsprogs-core/pkg-plist4
-rw-r--r--filesystems/e2fsprogs-libblkid/Makefile31
-rw-r--r--filesystems/e2fsprogs-libblkid/pkg-descr1
-rw-r--r--filesystems/e2fsprogs-libblkid/pkg-plist8
-rw-r--r--filesystems/e2fsprogs/Makefile2
-rw-r--r--filesystems/gvfs/Makefile1
-rw-r--r--filesystems/httpdirfs/Makefile4
-rw-r--r--filesystems/libblkid/Makefile33
-rw-r--r--filesystems/libblkid/distinfo3
-rw-r--r--filesystems/libblkid/files/patch-meson.build67
-rw-r--r--filesystems/libblkid/files/patch-tools_poman-translate.sh11
-rw-r--r--filesystems/libblkid/pkg-descr5
-rw-r--r--filesystems/libblkid/pkg-plist28
-rw-r--r--filesystems/ltfs/Makefile4
-rw-r--r--filesystems/ntfs/Makefile4
-rw-r--r--filesystems/py-pyfakefs/Makefile6
-rw-r--r--filesystems/py-pyfakefs/distinfo6
-rw-r--r--filesystems/s3fs/Makefile1
-rw-r--r--filesystems/vzvol/Makefile53
-rw-r--r--filesystems/vzvol/distinfo3
-rw-r--r--filesystems/vzvol/pkg-descr5
-rw-r--r--filesystems/vzvol/pkg-plist22
26 files changed, 183 insertions, 163 deletions
diff --git a/filesystems/Makefile b/filesystems/Makefile
index fc1e7b1318df..84be3e0aa9cd 100644
--- a/filesystems/Makefile
+++ b/filesystems/Makefile
@@ -21,7 +21,6 @@
SUBDIR += dsbmd
SUBDIR += e2fsprogs
SUBDIR += e2fsprogs-core
- SUBDIR += e2fsprogs-libblkid
SUBDIR += e2tools
SUBDIR += encfs
SUBDIR += exfat
@@ -43,6 +42,7 @@
SUBDIR += jmtpfs
SUBDIR += kio-fuse
SUBDIR += libbde
+ SUBDIR += libblkid
SUBDIR += libfsapfs
SUBDIR += libfsext
SUBDIR += libfsfat
@@ -122,7 +122,6 @@
SUBDIR += ufs_copy
SUBDIR += unionfs
SUBDIR += unreliablefs
- SUBDIR += vzvol
SUBDIR += webdavfs
SUBDIR += wimlib
SUBDIR += xfsm
diff --git a/filesystems/e2fsprogs-core/Makefile b/filesystems/e2fsprogs-core/Makefile
index 9b978fd773fd..02865c08ef8b 100644
--- a/filesystems/e2fsprogs-core/Makefile
+++ b/filesystems/e2fsprogs-core/Makefile
@@ -1,6 +1,6 @@
PORTNAME= e2fsprogs
PORTVERSION= 1.47.2
-PORTREVISION?= 1 # NOTE: when bumping PORTREVISION, also bump ../e2fsprogs/Makefile!
+PORTREVISION?= 2 # NOTE: when bumping PORTREVISION, also bump ../e2fsprogs/Makefile!
CATEGORIES?= filesystems sysutils
MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
@@ -26,13 +26,11 @@ USE_LDCONFIG= ${PREFIX}/lib/e2fsprogs
GNU_CONFIGURE= yes
GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
-# while we use the system blkid, we need to --enable-libblkid
-# so that the tools get built:
CONFIGURE_ARGS?=--disable-fsck \
--disable-e2initrd-helper \
--disable-libuuid \
--disable-uuidd \
- --enable-libblkid \
+ --disable-libblkid \
--enable-elf-shlibs \
--libdir='${PREFIX}/lib/e2fsprogs/' \
--includedir='${PREFIX}/include/e2fsprogs/' \
@@ -81,8 +79,8 @@ NLS_USES= gettext iconv:build
BASHTESTS_BUILD_DEPENDS= ${BASH_CMD}:shells/bash
BASH_CMD= ${LOCALBASE}/bin/bash
-LIB_DEPENDS+= libblkid.so:filesystems/e2fsprogs-libblkid
-LIB_DEPENDS+= libuuid.so:misc/e2fsprogs-libuuid
+LIB_DEPENDS+= libblkid.so:filesystems/libblkid \
+ libuuid.so:misc/libuuid
LIBUNWIND_LIB_DEPENDS= libunwind.so:devel/libunwind
LIBUNWIND_LIBS+= -L${LOCALBASE}/lib -lunwind
@@ -177,6 +175,7 @@ post-patch::
r_64to32bit \
r_64to32bit_meta \
r_expand_full \
+ r_corrupt_fs \
r_min_itable \
t_change_uuid_mounted \
t_dangerous \
@@ -243,7 +242,7 @@ _check_target=SKIP_SLOW_TESTS= check
_check_timeout=7200
.else
_check_target=check
-_check_timeout=180
+_check_timeout=600
.endif
.if ${PORT_OPTIONS:MLIBUNWIND}
@@ -316,9 +315,6 @@ post-install:
.endfor
.endif
# remove or relocate files installed by other ports already, or shadowing system files:
- cd ${STAGEDIR}${PREFIX} && \
- ${XARGS} <${FILESDIR}/unwanted ${RM} && \
- ${RMDIR} include/e2fsprogs/blkid
${MV} ${STAGEDIR}${PREFIX}/bin/compile_et ${STAGEDIR}${PREFIX}/bin/e2fsprogs-compile_et
${MV} ${STAGEDIR}${PREFIX}/share/man/man1/compile_et.1 ${STAGEDIR}${PREFIX}/share/man/man1/e2fsprogs-compile_et.1
${MKDIR} ${STAGEDIR}${DATADIR}/et/
diff --git a/filesystems/e2fsprogs-core/files/patch-misc__Makefile.in b/filesystems/e2fsprogs-core/files/patch-misc__Makefile.in
index ec0ff218a622..99de5bdc575b 100644
--- a/filesystems/e2fsprogs-core/files/patch-misc__Makefile.in
+++ b/filesystems/e2fsprogs-core/files/patch-misc__Makefile.in
@@ -1,6 +1,15 @@
---- misc/Makefile.in.orig 2021-01-29 22:02:31 UTC
+--- misc/Makefile.in.orig 2024-05-21 02:52:47 UTC
+++ misc/Makefile.in
-@@ -38,17 +38,17 @@ MKDIR_P = @MKDIR_P@
+@@ -31,24 +31,24 @@ MKDIR_P = @MKDIR_P@
+ @BLKID_CMT@BLKID_STATIC= blkid.static
+ @BLKID_CMT@BLKID_MAN= blkid.8
+
+-@BLKID_CMT@FINDFS_LINK= findfs
+-@BLKID_CMT@FINDFS_MAN= findfs.8
++FINDFS_LINK= findfs
++FINDFS_MAN= findfs.8
+
+ @FUSE_CMT@FUSE_PROG= fuse2fs
SPROGS= mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \
$(E2IMAGE_PROG) @FSCK_PROG@ e2undo
@@ -23,7 +32,7 @@
UMANPAGES+= @FUSE_CMT@ fuse2fs.1
LPROGS= @E2INITRD_PROG@
-@@ -154,14 +154,14 @@ profiled:
+@@ -156,14 +156,14 @@ mke2fs.conf: $(srcdir)/mke2fs.conf.in
mke2fs.conf: $(srcdir)/mke2fs.conf.in
if test -f $(srcdir)/mke2fs.conf.custom.in ; then \
@@ -41,7 +50,7 @@
> default_profile.c
findsuper: findsuper.o
$(E) " LD $@"
-@@ -612,34 +612,9 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs
+@@ -624,34 +624,9 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs
(cd $(DESTDIR)$(man5dir); \
$(LN) $(LINK_INSTALL_FLAGS) ext4.5 $$i.5); \
done
diff --git a/filesystems/e2fsprogs-core/files/unwanted b/filesystems/e2fsprogs-core/files/unwanted
deleted file mode 100644
index 693deb364915..000000000000
--- a/filesystems/e2fsprogs-core/files/unwanted
+++ /dev/null
@@ -1,8 +0,0 @@
-include/e2fsprogs/blkid/blkid.h
-include/e2fsprogs/blkid/blkid_types.h
-lib/e2fsprogs/libblkid.a
-lib/e2fsprogs/libblkid.so
-lib/e2fsprogs/libblkid.so.1
-lib/e2fsprogs/libblkid.so.1.0
-libdata/pkgconfig/blkid.pc
-man/man3/libblkid.3
diff --git a/filesystems/e2fsprogs-core/pkg-plist b/filesystems/e2fsprogs-core/pkg-plist
index 369ce002d590..aa62bd55cd74 100644
--- a/filesystems/e2fsprogs-core/pkg-plist
+++ b/filesystems/e2fsprogs-core/pkg-plist
@@ -59,6 +59,7 @@ share/man/man8/e2image.8.gz
share/man/man8/e2label.8.gz
share/man/man8/e2mmpstatus.8.gz
share/man/man8/e2undo.8.gz
+share/man/man8/findfs.8.gz
share/man/man8/mke2fs.8.gz
share/man/man8/mklost+found.8.gz
share/man/man8/resize2fs.8.gz
@@ -69,13 +70,10 @@ share/man/man8/fsck.ext4.8.gz
share/man/man8/mkfs.ext2.8.gz
share/man/man8/mkfs.ext3.8.gz
share/man/man8/mkfs.ext4.8.gz
-share/man/man8/findfs.8.gz
-share/man/man8/blkid.8.gz
share/man/man8/logsave.8.gz
share/man/man8/fsck_ext2fs.8.gz
share/man/man8/e2freefrag.8.gz
sbin/badblocks
-sbin/blkid
sbin/debugfs
sbin/dumpe2fs
sbin/e2freefrag
diff --git a/filesystems/e2fsprogs-libblkid/Makefile b/filesystems/e2fsprogs-libblkid/Makefile
deleted file mode 100644
index 961808badcf4..000000000000
--- a/filesystems/e2fsprogs-libblkid/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-PORTREVISION= 0
-CATEGORIES= filesystems misc devel
-PKGNAMESUFFIX= -libblkid
-
-COMMENT= Blkid library from e2fsprogs package
-
-LICENSE= LGPL20+
-_no_license_file= sorry
-
-LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid
-
-CONFIGURE_ARGS= --enable-elf-shlibs --disable-libuuid --enable-libblkid
-
-MASTERDIR= ${.CURDIR}/../../filesystems/e2fsprogs-core
-MAKE_ARGS= LIB_SUBDIRS=lib/blkid LDFLAGS_SHLIB=-L${LOCALBASE}/lib
-USE_LDCONFIG= yes
-ALL_TARGET= libs
-LDFLAGS+= -L${LOCALBASE}/lib
-INSTALL_TARGET= install install-shlibs
-INSTALL_WRKSRC= ${WRKSRC}/lib/blkid
-
-PKGDIR= ${.CURDIR}
-
-pre-build:
- ${MKDIR} ${WRKSRC}/lib/blkid/elfshared
- cd ${WRKSRC}/util && ${MAKE_CMD} subst
-
-post-build:
- cd ${INSTALL_WRKSRC} && ${MAKE_CMD} check
-
-.include "${MASTERDIR}/Makefile"
diff --git a/filesystems/e2fsprogs-libblkid/pkg-descr b/filesystems/e2fsprogs-libblkid/pkg-descr
deleted file mode 100644
index 27a1c50756ac..000000000000
--- a/filesystems/e2fsprogs-libblkid/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-Block device identification library from the e2fsprogs package.
diff --git a/filesystems/e2fsprogs-libblkid/pkg-plist b/filesystems/e2fsprogs-libblkid/pkg-plist
deleted file mode 100644
index c3c0e82f85c5..000000000000
--- a/filesystems/e2fsprogs-libblkid/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-include/blkid/blkid.h
-include/blkid/blkid_types.h
-lib/libblkid.so.1.0
-lib/libblkid.so.1
-lib/libblkid.so
-lib/libblkid.a
-libdata/pkgconfig/blkid.pc
-share/man/man3/libblkid.3.gz
diff --git a/filesystems/e2fsprogs/Makefile b/filesystems/e2fsprogs/Makefile
index a296350e9bfb..ff6e1b6bcb05 100644
--- a/filesystems/e2fsprogs/Makefile
+++ b/filesystems/e2fsprogs/Makefile
@@ -1,7 +1,7 @@
PORTNAME= e2fsprogs
CATEGORIES= filesystems sysutils
PORTVERSION= 1.47.2
-PORTREVISION= 1
+PORTREVISION= 2
BUILD_DEPENDS= e2fsprogs-core=${PORTVERSION}${${PORTREVISION} > 0:?_${PORTREVISION}:}:filesystems/e2fsprogs-core
RUN_DEPENDS= ${BUILD_DEPENDS}
DISTFILES= # empty
diff --git a/filesystems/gvfs/Makefile b/filesystems/gvfs/Makefile
index 9935a1ba8856..f43683c48846 100644
--- a/filesystems/gvfs/Makefile
+++ b/filesystems/gvfs/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gvfs
DISTVERSION= 1.56.1
+PORTREVISION= 1
CATEGORIES= filesystems devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/filesystems/httpdirfs/Makefile b/filesystems/httpdirfs/Makefile
index 6188855548b6..ff1655b7d340 100644
--- a/filesystems/httpdirfs/Makefile
+++ b/filesystems/httpdirfs/Makefile
@@ -1,6 +1,6 @@
PORTNAME= httpdirfs
DISTVERSION= 1.2.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= filesystems
PKGNAMEPREFIX= fusefs-
@@ -16,7 +16,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
LIB_DEPENDS= libcurl.so:ftp/curl \
libexpat.so:textproc/expat2 \
libgumbo.so:devel/gumbo \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= fuse:3 meson pkgconfig ssl
USE_GITHUB= yes
diff --git a/filesystems/libblkid/Makefile b/filesystems/libblkid/Makefile
new file mode 100644
index 000000000000..ee9533315f77
--- /dev/null
+++ b/filesystems/libblkid/Makefile
@@ -0,0 +1,33 @@
+PORTNAME= libblkid
+DISTVERSIONPREFIX= v
+DISTVERSION= 2.41.1
+CATEGORIES= filesystems
+
+MAINTAINER= arrowd@FreeBSD.org
+COMMENT= Library to identify block devices (disks) as to their content
+WWW= https://github.com/util-linux/util-linux
+
+LICENSE= BSD3CLAUSE
+LICENSE_FILE= ${WRKSRC}/Documentation/licenses/COPYING.BSD-3-Clause
+
+USES= bison meson pkgconfig tar:xz
+
+USE_GITHUB= yes
+GH_ACCOUNT= util-linux
+GH_PROJECT= util-linux
+
+USE_LDCONFIG= yes
+# disable all Meson features because the project has gazillion of them and we only need few
+MESON_ARGS= --auto-features=disabled \
+ -Dallow-32bit-time=true \
+ -Db_lundef=false \
+ -Dbuild-libblkid=enabled \
+ -Dbuild-libsmartcols=enabled \
+ -Dprogram-tests=false # dependency of libblkid
+
+OPTIONS_DEFINE= MANPAGES
+OPTIONS_DEFAULT= MANPAGES
+OPTIONS_SUB= yes
+MANPAGES_BUILD_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor
+
+.include <bsd.port.mk>
diff --git a/filesystems/libblkid/distinfo b/filesystems/libblkid/distinfo
new file mode 100644
index 000000000000..3723891011d8
--- /dev/null
+++ b/filesystems/libblkid/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1751103248
+SHA256 (util-linux-util-linux-v2.41.1_GH0.tar.gz) = 61a9785cbf04091286ec2bbfb78e87c35e6380f084f38115a4677b90b9ad4437
+SIZE (util-linux-util-linux-v2.41.1_GH0.tar.gz) = 16084246
diff --git a/filesystems/libblkid/files/patch-meson.build b/filesystems/libblkid/files/patch-meson.build
new file mode 100644
index 000000000000..ba004eb9d977
--- /dev/null
+++ b/filesystems/libblkid/files/patch-meson.build
@@ -0,0 +1,67 @@
+--- meson.build.orig 2025-03-18 12:50:51 UTC
++++ meson.build
+@@ -861,7 +861,7 @@ conf.set('HAVE_DECL_VMADDR_CID_LOCAL', have ? 1 : fals
+ prefix : '#include <sys/socket.h>')
+ conf.set('HAVE_DECL_VMADDR_CID_LOCAL', have ? 1 : false)
+
+-build_plymouth_support = (not build_plymouth_support.disabled() and
++build_plymouth_support = (not build_plymouth_support.disabled() and
+ have_tiocglcktrmios and
+ have_sock_cloexec and
+ have_sock_nonblock and
+@@ -1870,14 +1870,7 @@ endif
+ bashcompletions += ['zramctl']
+ endif
+
+-exe = executable(
+- 'prlimit',
+- prlimit_sources,
+- include_directories : includes,
+- link_with : [lib_common,
+- lib_smartcols],
+- install_dir : usrbin_exec_dir,
+- install : true)
++exe = disabler()
+ if not is_disabler(exe)
+ exes += exe
+ manadocs += prlimit_manadocs
+@@ -1993,15 +1986,7 @@ endif
+ bashcompletions += ['swapoff']
+ endif
+
+-exe = executable(
+- 'lscpu',
+- lscpu_sources,
+- include_directories : includes,
+- link_with : [lib_common,
+- lib_smartcols],
+- dependencies : [rtas_libs],
+- install_dir : usrbin_exec_dir,
+- install : true)
++exe = disabler()
+ if not is_disabler(exe)
+ exes += exe
+ manadocs += lscpu_manadocs
+@@ -2023,13 +2008,7 @@ endif
+ bashcompletions += ['chcpu']
+ endif
+
+-exe = executable(
+- 'wdctl',
+- wdctl_sources,
+- include_directories : includes,
+- link_with : [lib_common,
+- lib_smartcols],
+- install : true)
++exe = disabler()
+ if not is_disabler(exe)
+ exes += exe
+ manadocs += wdctl_manadocs
+@@ -4026,7 +4005,6 @@ run_target(
+ depends : exes)
+
+
+-manadocs += lib_tcolors_manadocs
+ if build_libblkid
+ manadocs += lib_blkid_manadocs + lib_smartcols_manadocs
+ endif
diff --git a/filesystems/libblkid/files/patch-tools_poman-translate.sh b/filesystems/libblkid/files/patch-tools_poman-translate.sh
new file mode 100644
index 000000000000..ed558d9f2d9a
--- /dev/null
+++ b/filesystems/libblkid/files/patch-tools_poman-translate.sh
@@ -0,0 +1,11 @@
+--- tools/poman-translate.sh.orig 2025-03-18 12:50:51 UTC
++++ tools/poman-translate.sh
+@@ -82,7 +82,7 @@ mapfile -t PO4ACFG_TRANSLATIONS < <( awk '/\[type:asci
+ mapfile -t LOCALES < <( awk '/\[po4a_langs\]/ {for (i=2; i<=NF; i++) print $i}' "$PO4ACFG" )
+ mapfile -t PO4ACFG_TRANSLATIONS < <( awk '/\[type:asciidoc\]/ {print $2;}' "$PO4ACFG" )
+
+-mkdir --parents "$DESTDIR"
++mkdir -p "$DESTDIR"
+
+ DESTDIR=$( OLDPWD=- CDPATH='' cd -P -- "$DESTDIR" && pwd )
+
diff --git a/filesystems/libblkid/pkg-descr b/filesystems/libblkid/pkg-descr
new file mode 100644
index 000000000000..52777d437567
--- /dev/null
+++ b/filesystems/libblkid/pkg-descr
@@ -0,0 +1,5 @@
+The libblkid library is used to identify block devices (disks) as to their
+content (e.g., filesystem type) as well as extracting additional information
+such as filesystem labels/volume names, unique identifiers/serial numbers.
+A common use is to allow use of LABEL= and UUID= tags instead of hard-coding
+specific block device names into configuration files.
diff --git a/filesystems/libblkid/pkg-plist b/filesystems/libblkid/pkg-plist
new file mode 100644
index 000000000000..bac365512776
--- /dev/null
+++ b/filesystems/libblkid/pkg-plist
@@ -0,0 +1,28 @@
+bin/column
+bin/fincore
+bin/renice
+bin/setpgid
+bin/setsid
+include/blkid/blkid.h
+include/libsmartcols/libsmartcols.h
+lib/libblkid.a
+lib/libblkid.so
+lib/libblkid.so.1
+lib/libblkid.so.1.1.0
+lib/libsmartcols.a
+lib/libsmartcols.so
+lib/libsmartcols.so.1
+lib/libsmartcols.so.1.1.0
+libdata/pkgconfig/blkid.pc
+libdata/pkgconfig/smartcols.pc
+sbin/blkid
+sbin/readprofile
+sbin/wipefs
+%%MANPAGES%%share/man/man1/column.1.gz
+%%MANPAGES%%share/man/man1/fincore.1.gz
+%%MANPAGES%%share/man/man1/renice.1.gz
+%%MANPAGES%%share/man/man3/libblkid.3.gz
+%%MANPAGES%%share/man/man5/scols-filter.5.gz
+%%MANPAGES%%share/man/man8/blkid.8.gz
+%%MANPAGES%%share/man/man8/readprofile.8.gz
+%%MANPAGES%%share/man/man8/wipefs.8.gz
diff --git a/filesystems/ltfs/Makefile b/filesystems/ltfs/Makefile
index 28baf75674b1..32a94538f300 100644
--- a/filesystems/ltfs/Makefile
+++ b/filesystems/ltfs/Makefile
@@ -1,7 +1,7 @@
PORTNAME= ltfs
DISTVERSIONPREFIX= v
DISTVERSION= 2.4.7
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSIONSUFFIX= -10514
CATEGORIES= filesystems sysutils
@@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libicudata.so:devel/icu \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
USES= autoreconf compiler:c11 fuse gnome libtool:build pkgconfig \
python shebangfix
diff --git a/filesystems/ntfs/Makefile b/filesystems/ntfs/Makefile
index 2ff33fa98b38..67ec953eabd7 100644
--- a/filesystems/ntfs/Makefile
+++ b/filesystems/ntfs/Makefile
@@ -1,6 +1,6 @@
PORTNAME= ntfs
PORTVERSION= 2022.10.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= filesystems
MASTER_SITES= https://download.tuxera.com/opensource/
PKGNAMEPREFIX= fusefs-
@@ -13,7 +13,7 @@ WWW= https://github.com/tuxera/ntfs-3g
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid
+LIB_DEPENDS= libuuid.so:misc/libuuid
USES= fuse pkgconfig iconv libtool localbase:ldflags tar:tgz
USE_LDCONFIG= yes
diff --git a/filesystems/py-pyfakefs/Makefile b/filesystems/py-pyfakefs/Makefile
index 501ae6d5a5cb..d346dddadd56 100644
--- a/filesystems/py-pyfakefs/Makefile
+++ b/filesystems/py-pyfakefs/Makefile
@@ -1,5 +1,5 @@
PORTNAME= pyfakefs
-PORTVERSION= 5.8.0
+PORTVERSION= 5.9.1
CATEGORIES= filesystems devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -12,9 +12,9 @@ WWW= https://pytest-pyfakefs.readthedocs.io/en/stable/ \
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=45:devel/py-setuptools@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}undefined>=0:devel/py-undefined@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0,1:devel/py-pytest-xdist@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent pep517 pytest
diff --git a/filesystems/py-pyfakefs/distinfo b/filesystems/py-pyfakefs/distinfo
index eba8abf371bd..475a7024ee72 100644
--- a/filesystems/py-pyfakefs/distinfo
+++ b/filesystems/py-pyfakefs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742070434
-SHA256 (pyfakefs-5.8.0.tar.gz) = 7e5457ee3cc67069d3cef6e278227ecfc80bfb61e925bc0a4d3b0af32d1c99ce
-SIZE (pyfakefs-5.8.0.tar.gz) = 215072
+TIMESTAMP = 1750954204
+SHA256 (pyfakefs-5.9.1.tar.gz) = ca02a1441dc77d7512bebfe4224b32f2127e83c45672f5fe2c02c33d4284bc70
+SIZE (pyfakefs-5.9.1.tar.gz) = 230395
diff --git a/filesystems/s3fs/Makefile b/filesystems/s3fs/Makefile
index d18733cd580c..5600c536edfe 100644
--- a/filesystems/s3fs/Makefile
+++ b/filesystems/s3fs/Makefile
@@ -1,6 +1,7 @@
PORTNAME= s3fs
DISTVERSIONPREFIX= v
DISTVERSION= 1.95
+PORTREVISION= 1
CATEGORIES= filesystems
PKGNAMEPREFIX= fusefs-
diff --git a/filesystems/vzvol/Makefile b/filesystems/vzvol/Makefile
deleted file mode 100644
index 964435b99e2d..000000000000
--- a/filesystems/vzvol/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-PORTNAME= vzvol
-DISTVERSIONPREFIX= v
-DISTVERSION= 0.7.0
-PORTREVISION= 3
-CATEGORIES= filesystems sysutils
-
-MAINTAINER= rainbow@sanitylinux.org
-COMMENT= Feature-rich ZFS zvol management tool
-WWW= https://github.com/RainbowHackerHorse/vzvol
-
-LICENSE= BSD2CLAUSE
-LICENSE_FILE= ${WRKSRC}/LICENSE
-
-DEPRECATED= Abandoned upstream, no activity in 5+ years and multiple unresolved issue reports upstream
-EXPIRATION_DATE=2025-06-30
-
-GROUPS= operator
-
-USE_GITHUB= yes
-GH_ACCOUNT= RainbowHackerHorse
-NO_BUILD= yes
-NO_ARCH= yes
-
-PORTDOCS= README.md CONTRIBUTORS
-
-OPTIONS_DEFINE= DOCS PROGRESS VIRTUALBOX
-OPTIONS_GROUP= FILESYSTEMS
-OPTIONS_GROUP_FILESYSTEMS= EXT XFS
-OPTIONS_DEFAULT= EXT PROGRESS VIRTUALBOX XFS
-
-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:filesystems/xfsprogs
-
-EXT_DESC= Install support for ext2, ext3, and ext4
-PROGRESS_DESC= Enables progress bars for import
-VIRTUALBOX_DESC= Support .VMDK creation with VirtualBox tools
-XFS_DESC= Install support for XFS filesystem
-
-do-install:
- ${INSTALL_MAN} ${WRKSRC}/man/freebsd/vzvol.8 ${STAGEDIR}${PREFIX}/share/man/man8/
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/vzvol ${STAGEDIR}${PREFIX}/sbin
-.for dir in shared freebsd linux
- @${MKDIR} ${STAGEDIR}${PREFIX}/lib/vzvol/lib/${dir}
- ${INSTALL_SCRIPT} ${WRKSRC}/lib/${dir}/* ${STAGEDIR}${PREFIX}/lib/vzvol/lib/${dir}
-.endfor
-
-do-install-DOCS-on:
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/filesystems/vzvol/distinfo b/filesystems/vzvol/distinfo
deleted file mode 100644
index c9c7eef70932..000000000000
--- a/filesystems/vzvol/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1528566896
-SHA256 (RainbowHackerHorse-vzvol-v0.7.0_GH0.tar.gz) = 9e9f0586c3c1c22bf29fb250851968c092bedd517535c02caedbfbe728452579
-SIZE (RainbowHackerHorse-vzvol-v0.7.0_GH0.tar.gz) = 11181
diff --git a/filesystems/vzvol/pkg-descr b/filesystems/vzvol/pkg-descr
deleted file mode 100644
index d3aea5ba1fbb..000000000000
--- a/filesystems/vzvol/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-vzvol is a zvol manager, that allows a user to create,
-format, and manage zvols in the context of use for
-virtualization. It is meant to simplify the management of
-these devices, as well as allow the creation of a shim
-.VMDK file to allow the use of a zvol with VirtualBox.
diff --git a/filesystems/vzvol/pkg-plist b/filesystems/vzvol/pkg-plist
deleted file mode 100644
index a243674c5e1c..000000000000
--- a/filesystems/vzvol/pkg-plist
+++ /dev/null
@@ -1,22 +0,0 @@
-lib/vzvol/lib/freebsd/vzvol_fs_fat32.sh
-lib/vzvol/lib/freebsd/vzvol_import.sh
-lib/vzvol/lib/freebsd/vzvol_pkgcheck.sh
-lib/vzvol/lib/linux/vzvol_fs_fat32.sh
-lib/vzvol/lib/linux/vzvol_import.sh
-lib/vzvol/lib/linux/vzvol_pkgcheck.sh
-lib/vzvol/lib/shared/vzvol_create.sh
-lib/vzvol/lib/shared/vzvol_delete.sh
-lib/vzvol/lib/shared/vzvol_errorcode.sh
-lib/vzvol/lib/shared/vzvol_existondisk.sh
-lib/vzvol/lib/shared/vzvol_fs.sh
-lib/vzvol/lib/shared/vzvol_fs_type.sh
-lib/vzvol/lib/shared/vzvol_fscheck.sh
-lib/vzvol/lib/shared/vzvol_getargz.sh
-lib/vzvol/lib/shared/vzvol_list.sh
-lib/vzvol/lib/shared/vzvol_permissions.sh
-lib/vzvol/lib/shared/vzvol_showhelp.sh
-lib/vzvol/lib/shared/vzvol_type.sh
-lib/vzvol/lib/shared/vzvol_vmdk.sh
-lib/vzvol/lib/shared/zvol_check.sh
-sbin/vzvol
-share/man/man8/vzvol.8.gz