summaryrefslogtreecommitdiff
path: root/filesystems
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--filesystems/Makefile3
-rw-r--r--filesystems/bindfs/Makefile6
-rw-r--r--filesystems/bindfs/distinfo6
-rw-r--r--filesystems/dsbmd/Makefile6
-rw-r--r--filesystems/dsbmd/distinfo6
-rw-r--r--filesystems/e2fsprogs-core/Makefile78
-rw-r--r--filesystems/e2fsprogs-core/distinfo6
-rw-r--r--filesystems/e2fsprogs-core/files/patch-misc__Makefile.in17
-rw-r--r--filesystems/e2fsprogs-core/files/patch-tests_f__detect__junk_script11
-rw-r--r--filesystems/e2fsprogs-core/files/patch-tests_m__offset_script11
-rw-r--r--filesystems/e2fsprogs-core/files/patch-tests_t__mmp__fail_script19
-rw-r--r--filesystems/e2fsprogs-core/files/unwanted8
-rw-r--r--filesystems/e2fsprogs-core/pkg-plist5
-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/Makefile4
-rw-r--r--filesystems/gvfs/Makefile1
-rw-r--r--filesystems/hammer2/Makefile2
-rw-r--r--filesystems/hammer2/distinfo6
-rw-r--r--filesystems/httpdirfs/Makefile4
-rw-r--r--filesystems/libblkid/Makefile34
-rw-r--r--filesystems/libblkid/distinfo3
-rw-r--r--filesystems/libblkid/files/patch-libblkid_meson.build13
-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-plist9
-rw-r--r--filesystems/ltfs/Makefile4
-rw-r--r--filesystems/mtools/Makefile2
-rw-r--r--filesystems/mtools/distinfo6
-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/sandboxfs/Makefile2
-rw-r--r--filesystems/ufs/Makefile2
-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
-rw-r--r--filesystems/webdavfs/Makefile2
-rw-r--r--filesystems/xfuse/Makefile3
-rw-r--r--filesystems/xfuse/Makefile.crates29
-rw-r--r--filesystems/xfuse/distinfo64
-rw-r--r--filesystems/zfs-snap-diff/Makefile2
-rw-r--r--filesystems/zrepl-dsh2dsh/Makefile16
-rw-r--r--filesystems/zrepl-dsh2dsh/distinfo10
-rw-r--r--filesystems/zrepl/Makefile2
-rw-r--r--filesystems/ztop/Makefile2
50 files changed, 296 insertions, 331 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/bindfs/Makefile b/filesystems/bindfs/Makefile
index de68d898f5be..aa1450702dbc 100644
--- a/filesystems/bindfs/Makefile
+++ b/filesystems/bindfs/Makefile
@@ -1,6 +1,5 @@
PORTNAME= bindfs
-DISTVERSION= 1.17.7
-PORTREVISION= 2
+DISTVERSION= 1.18.1
CATEGORIES= filesystems
MASTER_SITES= https://bindfs.org/downloads/
PKGNAMEPREFIX= fusefs-
@@ -14,9 +13,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USES= fuse:3 localbase:ldflags pkgconfig
GNU_CONFIGURE= yes
-
-CONFIGURE_ENV+= fuse3_LIBS="-L${LOCALBASE}/lib -lfuse3"
CONFIGURE_ARGS= --with-fuse3
+CONFIGURE_ENV+= fuse3_LIBS="-L${LOCALBASE}/lib -lfuse3"
PLIST_FILES= bin/bindfs \
share/man/man1/bindfs.1.gz
diff --git a/filesystems/bindfs/distinfo b/filesystems/bindfs/distinfo
index c6ae2d4b1980..bad370fe5e41 100644
--- a/filesystems/bindfs/distinfo
+++ b/filesystems/bindfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1718036736
-SHA256 (bindfs-1.17.7.tar.gz) = c0b060e94c3a231a1d4aa0bcf266ff189981a4ef38e42fbe23296a7d81719b7a
-SIZE (bindfs-1.17.7.tar.gz) = 427251
+TIMESTAMP = 1752650056
+SHA256 (bindfs-1.18.1.tar.gz) = 2a7064d993a5f255c52d72385ef14e349c131bc44195766e2173428e06d279fd
+SIZE (bindfs-1.18.1.tar.gz) = 431995
diff --git a/filesystems/dsbmd/Makefile b/filesystems/dsbmd/Makefile
index 915d7182d96a..c1dbba61208c 100644
--- a/filesystems/dsbmd/Makefile
+++ b/filesystems/dsbmd/Makefile
@@ -1,5 +1,5 @@
PORTNAME= dsbmd
-PORTVERSION= 1.11.4
+PORTVERSION= 1.12
CATEGORIES= filesystems sysutils
MAINTAINER= mk@nic-nac-project.org
@@ -10,12 +10,10 @@ LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= tar:tgz
-
-USE_RC_SUBR= dsbmd
-
USE_GITHUB= yes
GH_ACCOUNT= mrclksr
GH_PROJECT= DSBMD
+USE_RC_SUBR= dsbmd
PLIST_FILES= "@sample etc/dsbmd.conf.sample" \
libexec/dsbmd
diff --git a/filesystems/dsbmd/distinfo b/filesystems/dsbmd/distinfo
index 893dc203c2e4..56fa26f6b755 100644
--- a/filesystems/dsbmd/distinfo
+++ b/filesystems/dsbmd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618517134
-SHA256 (mrclksr-DSBMD-1.11.4_GH0.tar.gz) = 8efd286bb21f516f1285602ba052212e200392b06a1979ca0338f05d65a8535d
-SIZE (mrclksr-DSBMD-1.11.4_GH0.tar.gz) = 53458
+TIMESTAMP = 1751899264
+SHA256 (mrclksr-DSBMD-1.12_GH0.tar.gz) = f0523d0be2f532525b4f31c26a1435af7855970b0ac3b945c3b6f295a3d8f425
+SIZE (mrclksr-DSBMD-1.12_GH0.tar.gz) = 53624
diff --git a/filesystems/e2fsprogs-core/Makefile b/filesystems/e2fsprogs-core/Makefile
index 9b978fd773fd..00857d9497ca 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!
+PORTVERSION= 1.47.3
+PORTREVISION?= 0 # NOTE: when bumping PORTREVISION, also bump ../e2fsprogs/Makefile!
CATEGORIES?= filesystems sysutils
MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
@@ -14,9 +14,9 @@ LICENSE_FILE?= ${WRKSRC}/NOTICE
.endif
LICENSE_DISTFILES_GPLv2+ = ${DISTNAME}${EXTRACT_SUFX}
-USES= cpe gmake makeinfo pkgconfig tar:xz
+USES= compiler:c11 cpe gmake makeinfo pkgconfig tar:xz
CPE_VENDOR= e2fsprogs_project
-USE_CSTD= gnu99
+USE_CSTD= gnu11
# this seems a bit redundant to the --rpath below, but
# the latter should be more robust in case someone needs
# to deal with the file systems from a system not yet fully booted.
@@ -26,25 +26,22 @@ 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/' \
--with-root-prefix='${PREFIX}' \
LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib -Wl,--rpath -Wl,${LOCALBASE}/lib/e2fsprogs'
CONFIGURE_ENV?= LIBS='-Wl,--as-needed ${LIBS} -lexecinfo -lelf'
-CPPFLAGS+= ${_FUSEFS_CFLAGS} -I${WRKSRC}/lib -I${LOCALBASE}/include
-CFLAGS+= -Wno-unused-command-line-argument # -D_FILE_OFFSET_BITS=64 # the latter for fuse-libs
MAKE_ARGS+= pkgconfigdir='${PREFIX}/libdata/pkgconfig'
MAKE_ENV+= CHECK_CMD=@true
-PIE_UNSAFE= yes
+CPPFLAGS+= ${_FUSEFS_CFLAGS} -I${WRKSRC}/lib -I${LOCALBASE}/include
+CFLAGS+= -Wno-unused-command-line-argument
PORTSCOUT= ignore:1 # cannot handle the version in the directory
@@ -53,43 +50,44 @@ CPPFLAGS+= -D__GNUC_PREREQ\(a,b\)=1
INSTALL_TARGET= install install-libs
-OPTIONS_DEFINE= DOCS NLS FUSEFS PARALLELTESTS SLOWTESTS BASHTESTS LIBUNWIND
-OPTIONS_EXCLUDE+= EXAMPLES
-OPTIONS_SUB= yes
+PORTDOCS= NOTICE README RELEASE-NOTES SUBMITTING-PATCHES
+OPTIONS_DEFINE= DOCS NLS BASHTESTS FUSEFS PARALLELTESTS SLOWTESTS LIBUNWIND
+OPTIONS_DEFAULT= FUSEFS ALLTESTS
OPTIONS_SINGLE= SELFTEST
OPTIONS_SINGLE_SELFTEST= NOTESTS SMALLTESTS ALLTESTS
-OPTIONS_DEFAULT= SMALLTESTS
+OPTIONS_EXCLUDE+= EXAMPLES
+OPTIONS_SUB= yes
+
+ALLTESTS_DESC= Run most self-tests (needs more RAM/disk space)
+BASHTESTS_DESC= Enable tests that require the GNU bash shell
FUSEFS_DESC= Build user-land ext2/3/4 FUSE module (slow!)
-SELFTEST_DESC= Choose which set of self-tests to run
+LIBUNWIND_DESC= Backtrace with libunwind (do set WITH_DEBUG_PORTS+=${PKGORIGIN}!)
NOTESTS_DESC= Do not run any self-tests (Tier-1, DISCOURAGED)
-SMALLTESTS_DESC=Run tests that need <500 MB disk space (DEFAULT)
-ALLTESTS_DESC= Run most self-tests (needs more RAM/disk space)
PARALLELTESTS_DESC= Parallelize self-tests (needs more disk space)
+SELFTEST_DESC= Choose which set of self-tests to run
SLOWTESTS_DESC= Enable slow tests that are skipped by default
-BASHTESTS_DESC= Enable tests that require the GNU bash shell
-LIBUNWIND_DESC= Backtrace with libunwind (do set WITH_DEBUG_PORTS+=${PKGORIGIN}!)
+SMALLTESTS_DESC=Run tests that need <500 MB disk space
+
+BASHTESTS_BUILD_DEPENDS= ${BASH_CMD}:shells/bash
+BASH_CMD= ${LOCALBASE}/bin/bash
-FUSEFS_CONFIGURE_ENABLE= fuse2fs
FUSEFS_USES= fuse:3
+FUSEFS_CONFIGURE_ENABLE=fuse2fs
# we can't use FUSEFS_CFLAGS, see below for workaround
-FUSEFS_LIBS= -Wl,--as-needed -lfuse3 -lpthread
FUSEFS_LDFLAGS= -L${LOCALBASE}/lib
+FUSEFS_LIBS= -Wl,--as-needed -lfuse3 -lpthread
-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
LIBUNWIND_LDFLAGS+= -rdynamic
+LIBUNWIND_LIBS+= -L${LOCALBASE}/lib -lunwind
LIBUNWIND_EXTRA_PATCHES=${FILESDIR}/extrapatch-e2fsck_sigcatcher.c
-PORTDOCS= NOTICE README RELEASE-NOTES SUBMITTING-PATCHES
+NLS_USES= gettext iconv:build
+
.endif
# even under DEVELOPER, no REINPLACE_CMD warnings desired
@@ -117,13 +115,6 @@ _FUSEFS_CFLAGS= -I${LOCALBASE}/include/fuse3
_FUSEFS_CFLAGS=
.endif
-. if ! empty(ARCH:Mpowerpc*)
-# Fix powerpc64/powerpc SIGSEGV,
-# see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=231570 (ppc64)
-# see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=242798 (ppc32 - untested)
-USES+= compiler:c11
-. endif
-
.if empty(PORT_OPTIONS:MNOTESTS) && ${MASTERDIR} == ${.CURDIR}
USES+= perl5
USE_PERL5= build
@@ -146,10 +137,8 @@ libintl=
EXTRA_PATCHES+= ${FILESDIR}/extrapatch-no-sbrk
.endif
-post-extract: # the symlink RELEASE-NOTES is stale in v1.47.1 and v1.47.2 tarballs, fix:
- ${RLN} ${WRKSRC}/doc/RelNotes/v1.47.2.txt ${WRKSRC}/RELEASE-NOTES
-
post-patch::
+ ${TOUCH} ${WRKSRC}/tests/r_corrupt_fs/is_slow_test
.if !empty(DISTFILES)
@${REINPLACE_CMD} -e 's/<malloc\.h>/<stdlib.h>/' ${WRKSRC}/*/*.c
@${REINPLACE_CMD} -e 's,/etc/blkid.tab,${ETCDIR}/blkid.tab,' ${WRKSRC}/misc/blkid* ${WRKSRC}/lib/blkid/blkidP.h
@@ -239,11 +228,11 @@ _checkaddargs+=TMPDIR=${WRKDIR}/tmp
.endif
.if ${PORT_OPTIONS:MSLOWTESTS}
-_check_target=SKIP_SLOW_TESTS= check
+_check_target=fullcheck
_check_timeout=7200
.else
_check_target=check
-_check_timeout=180
+_check_timeout=600
.endif
.if ${PORT_OPTIONS:MLIBUNWIND}
@@ -316,10 +305,8 @@ 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
+ ${RM} ${STAGEDIR}${PREFIX}/sbin/findfs
${MV} ${STAGEDIR}${PREFIX}/share/man/man1/compile_et.1 ${STAGEDIR}${PREFIX}/share/man/man1/e2fsprogs-compile_et.1
${MKDIR} ${STAGEDIR}${DATADIR}/et/
${MV} ${STAGEDIR}${PREFIX}/share/et/* ${STAGEDIR}${DATADIR}/et/
@@ -328,6 +315,7 @@ post-install:
${MV} -f ${STAGEDIR}${PREFIX}/share/man/man3/com_err.3 \
${STAGEDIR}${PREFIX}/share/man/man3/e2fsprogs-com_err.3
${RM} ${STAGEDIR}${PREFIX}/share/man/man3/libblkid.3
+ ${RM} ${STAGEDIR}${PREFIX}/share/man/man8/findfs.8
#
# the next line closes .if ${MASTERDIR} == ${.CURDIR}
diff --git a/filesystems/e2fsprogs-core/distinfo b/filesystems/e2fsprogs-core/distinfo
index be95528f7e1a..7e9ca88cb575 100644
--- a/filesystems/e2fsprogs-core/distinfo
+++ b/filesystems/e2fsprogs-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1736350272
-SHA256 (e2fsprogs-1.47.2.tar.xz) = 08242e64ca0e8194d9c1caad49762b19209a06318199b63ce74ae4ef2d74e63c
-SIZE (e2fsprogs-1.47.2.tar.xz) = 7299932
+TIMESTAMP = 1752044663
+SHA256 (e2fsprogs-1.47.3.tar.xz) = 857e6ef800feaa2bb4578fbc810214be5d3c88b072ea53c5384733a965737329
+SIZE (e2fsprogs-1.47.3.tar.xz) = 7321540
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/patch-tests_f__detect__junk_script b/filesystems/e2fsprogs-core/files/patch-tests_f__detect__junk_script
deleted file mode 100644
index 45b544cf691d..000000000000
--- a/filesystems/e2fsprogs-core/files/patch-tests_f__detect__junk_script
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/f_detect_junk/script.orig 2023-02-07 03:31:53 UTC
-+++ tests/f_detect_junk/script
-@@ -9,7 +9,7 @@ FSCK_OPT=-fn
- IMAGE=$test_dir/image.bz2
-
- bzip2 -d < $IMAGE > $TMPFILE
--$DD if=/dev/zero of=$TMPFILE conv=notrunc oflag=append bs=1024k count=16 > /dev/null 2>&1
-+$DD if=/dev/zero of=$TMPFILE conv=notrunc bs=1024k count=16 2>/dev/null >>$TMPFILE
-
- # Run fsck to fix things?
- if [ -x $DEBUGFS_EXE ]; then
diff --git a/filesystems/e2fsprogs-core/files/patch-tests_m__offset_script b/filesystems/e2fsprogs-core/files/patch-tests_m__offset_script
deleted file mode 100644
index 9cc4232eec3a..000000000000
--- a/filesystems/e2fsprogs-core/files/patch-tests_m__offset_script
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/m_offset/script.orig 2023-02-02 15:57:32 UTC
-+++ tests/m_offset/script
-@@ -13,7 +13,7 @@ $MKE2FS -F -b 1024 -E offset=524288 "$TMPFILE" 1024 >>
- # compute crc of the first and last 512 1k blocks
- crc_first2=`$DD if="$TMPFILE" bs=1k count=512 2>/dev/null | $CRCSUM`
- crc_last2=`$DD if="$TMPFILE" bs=1k count=512 skip=1536 2>/dev/null | $CRCSUM`
--crc_exp=`yes a | $DD bs=1k count=512 2>/dev/null | $CRCSUM`
-+crc_exp=`yes a | $DD bs=1k count=512 iflag=fullblock 2>/dev/null | $CRCSUM`
- # a warning should be only emitted by the first mke2fs call
- warning=`grep -c "offset specified without an explicit file system size." \
- "$OUT"`
diff --git a/filesystems/e2fsprogs-core/files/patch-tests_t__mmp__fail_script b/filesystems/e2fsprogs-core/files/patch-tests_t__mmp__fail_script
deleted file mode 100644
index 77fd70e4ccf2..000000000000
--- a/filesystems/e2fsprogs-core/files/patch-tests_t__mmp__fail_script
+++ /dev/null
@@ -1,19 +0,0 @@
---- tests/t_mmp_fail/script.orig 2023-02-07 03:31:53 UTC
-+++ tests/t_mmp_fail/script
-@@ -10,14 +10,14 @@ fi
-
- $TUNE2FS -O project $TMPFILE >> $test_name.log 2>&1
- status=$?
--if [ "$status" == 0 ] ; then
-+if [ "$status" = 0 ] ; then
- echo "'tune2fs -O project' succeeded on small inode" > $test_name.failed
- echo "$test_name: $test_description: failed"
- return 1
- fi
- $TUNE2FS -o bad_option $TMPFILE >> $test_name.log 2>&1
- status=$?
--if [ "$status" == 0 ] ; then
-+if [ "$status" = 0 ] ; then
- echo "'tune2fs -o bad_option' succeeded" > $test_name.failed
- echo "$test_name: $test_description: failed"
- return 1
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..441e2c46023a 100644
--- a/filesystems/e2fsprogs-core/pkg-plist
+++ b/filesystems/e2fsprogs-core/pkg-plist
@@ -69,13 +69,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
@@ -84,7 +81,6 @@ sbin/e2image
sbin/e2label
sbin/e2mmpstatus
sbin/e2undo
-sbin/findfs
sbin/fsck.ext2
sbin/fsck.ext3
sbin/fsck.ext4
@@ -112,6 +108,7 @@ sbin/tune2fs
%%NLS%%share/locale/hu/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/id/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/it/LC_MESSAGES/e2fsprogs.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/ms/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/nl/LC_MESSAGES/e2fsprogs.mo
%%NLS%%share/locale/pl/LC_MESSAGES/e2fsprogs.mo
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..5be3d6bb5b50 100644
--- a/filesystems/e2fsprogs/Makefile
+++ b/filesystems/e2fsprogs/Makefile
@@ -1,7 +1,7 @@
PORTNAME= e2fsprogs
CATEGORIES= filesystems sysutils
-PORTVERSION= 1.47.2
-PORTREVISION= 1
+PORTVERSION= 1.47.3
+PORTREVISION= 0
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/hammer2/Makefile b/filesystems/hammer2/Makefile
index e3f64345fa9d..e48d52155961 100644
--- a/filesystems/hammer2/Makefile
+++ b/filesystems/hammer2/Makefile
@@ -1,6 +1,6 @@
PORTNAME= hammer2
DISTVERSIONPREFIX= v
-DISTVERSION= 1.2.10
+DISTVERSION= 1.2.11
CATEGORIES= filesystems
MAINTAINER= tkusumi@netbsd.org
diff --git a/filesystems/hammer2/distinfo b/filesystems/hammer2/distinfo
index eb8b49350dec..bd6e94bf7c11 100644
--- a/filesystems/hammer2/distinfo
+++ b/filesystems/hammer2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1750307563
-SHA256 (kusumi-freebsd_hammer2-v1.2.10_GH0.tar.gz) = deebf541644ceaf4a1437e2fdd5db41af9ce6d59a05072f19e42b85e9dbdbdb0
-SIZE (kusumi-freebsd_hammer2-v1.2.10_GH0.tar.gz) = 297905
+TIMESTAMP = 1752282134
+SHA256 (kusumi-freebsd_hammer2-v1.2.11_GH0.tar.gz) = e140a0ae92dfc44395fa8b094a1c22e7b2c4b6257f37f813a5f6211110330250
+SIZE (kusumi-freebsd_hammer2-v1.2.11_GH0.tar.gz) = 298916
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..077bc2158912
--- /dev/null
+++ b/filesystems/libblkid/Makefile
@@ -0,0 +1,34 @@
+PORTNAME= libblkid
+DISTVERSIONPREFIX= v
+DISTVERSION= 2.41.1
+PORTREVISION= 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=disabled \
+ -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-libblkid_meson.build b/filesystems/libblkid/files/patch-libblkid_meson.build
new file mode 100644
index 000000000000..c1b100f4ab72
--- /dev/null
+++ b/filesystems/libblkid/files/patch-libblkid_meson.build
@@ -0,0 +1,13 @@
+--- libblkid/meson.build.orig 2025-06-24 07:55:28 UTC
++++ libblkid/meson.build
+@@ -141,10 +141,8 @@ libblkid_link_args = []
+ libblkid_link_depends = []
+ libblkid_link_args = []
+
+-if cc.has_link_argument('-Wl,--version-script=@0@'.format(libblkid_sym_path))
+ libblkid_link_depends += [libblkid_sym]
+ libblkid_link_args += ['-Wl,--version-script=@0@'.format(libblkid_sym_path)]
+-endif
+
+ lib_blkid = both_libraries(
+ 'blkid',
diff --git a/filesystems/libblkid/files/patch-meson.build b/filesystems/libblkid/files/patch-meson.build
new file mode 100644
index 000000000000..f64f68b47e8f
--- /dev/null
+++ b/filesystems/libblkid/files/patch-meson.build
@@ -0,0 +1,67 @@
+--- meson.build.orig 2025-06-24 07:55:28 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
+@@ -1868,14 +1868,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
+@@ -1991,15 +1984,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
+@@ -2021,13 +2006,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
+@@ -4024,7 +4003,6 @@ run_target(
+ depends : exes)
+
+
+-manadocs += lib_tcolors_manadocs
+ if build_libblkid
+ manadocs += lib_blkid_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..9e9f9a5aea60
--- /dev/null
+++ b/filesystems/libblkid/pkg-plist
@@ -0,0 +1,9 @@
+include/blkid/blkid.h
+lib/libblkid.a
+lib/libblkid.so
+lib/libblkid.so.1
+lib/libblkid.so.1.1.0
+libdata/pkgconfig/blkid.pc
+sbin/blkid
+%%MANPAGES%%share/man/man3/libblkid.3.gz
+%%MANPAGES%%share/man/man8/blkid.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/mtools/Makefile b/filesystems/mtools/Makefile
index 38f12649be0f..2c297b6322fa 100644
--- a/filesystems/mtools/Makefile
+++ b/filesystems/mtools/Makefile
@@ -1,5 +1,5 @@
PORTNAME= mtools
-PORTVERSION= 4.0.48
+PORTVERSION= 4.0.49
CATEGORIES= filesystems emulators
MASTER_SITES= GNU
diff --git a/filesystems/mtools/distinfo b/filesystems/mtools/distinfo
index 9dabd9a24bc0..4776ef3acafe 100644
--- a/filesystems/mtools/distinfo
+++ b/filesystems/mtools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1740239375
-SHA256 (mtools-4.0.48.tar.lz) = 7d57f14a2482dc4658e4b386180793ef50f0de89ee3a9a28f0a371630baac7c4
-SIZE (mtools-4.0.48.tar.lz) = 396333
+TIMESTAMP = 1749918038
+SHA256 (mtools-4.0.49.tar.lz) = 76dfea98d923dfc9806ce34bd1786aa9b5a39d70f56f26c0670a348c664f1d2a
+SIZE (mtools-4.0.49.tar.lz) = 397000
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/sandboxfs/Makefile b/filesystems/sandboxfs/Makefile
index 548557393469..b5df233cc36c 100644
--- a/filesystems/sandboxfs/Makefile
+++ b/filesystems/sandboxfs/Makefile
@@ -1,7 +1,7 @@
PORTNAME= sandboxfs
DISTVERSIONPREFIX= sandboxfs-
DISTVERSION= 0.2.0
-PORTREVISION= 48
+PORTREVISION= 49
CATEGORIES= filesystems
PKGNAMEPREFIX= fusefs-
diff --git a/filesystems/ufs/Makefile b/filesystems/ufs/Makefile
index c1904f60b287..c827951ee19f 100644
--- a/filesystems/ufs/Makefile
+++ b/filesystems/ufs/Makefile
@@ -1,6 +1,6 @@
PORTNAME= ufs
DISTVERSION= 0.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= filesystems sysutils
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
diff --git a/filesystems/webdavfs/Makefile b/filesystems/webdavfs/Makefile
index 19666938d47d..b33d39bb8111 100644
--- a/filesystems/webdavfs/Makefile
+++ b/filesystems/webdavfs/Makefile
@@ -1,6 +1,6 @@
PORTNAME= fusefs-webdavfs
DISTVERSION= g20200520
-PORTREVISION= 27
+PORTREVISION= 28
CATEGORIES= filesystems
MAINTAINER= eugen@FreeBSD.org
diff --git a/filesystems/xfuse/Makefile b/filesystems/xfuse/Makefile
index f477a66173c7..533be765ed1b 100644
--- a/filesystems/xfuse/Makefile
+++ b/filesystems/xfuse/Makefile
@@ -1,6 +1,5 @@
PORTNAME= xfuse
-DISTVERSION= 0.4.4
-PORTREVISION= 9
+DISTVERSION= 0.5.0
CATEGORIES= filesystems
MASTER_SITES= CRATESIO
MASTER_SITE_SUBDIR= xfs-fuse/${DISTVERSION}
diff --git a/filesystems/xfuse/Makefile.crates b/filesystems/xfuse/Makefile.crates
index 0cb7306bc004..6844b0f9f452 100644
--- a/filesystems/xfuse/Makefile.crates
+++ b/filesystems/xfuse/Makefile.crates
@@ -4,10 +4,10 @@ CARGO_CRATES= aho-corasick-1.0.5 \
anstyle-parse-0.2.4 \
anstyle-query-1.0.3 \
anstyle-wincon-3.0.3 \
- assert_cmd-2.0.11 \
+ assert_cmd-2.0.17 \
autocfg-1.1.0 \
- bincode-2.0.0-rc.3 \
- bincode_derive-2.0.0-rc.3 \
+ bincode-2.0.1 \
+ bincode_derive-2.0.1 \
bitflags-1.3.2 \
bitflags-2.4.0 \
bstr-1.6.2 \
@@ -33,15 +33,15 @@ CARGO_CRATES= aho-corasick-1.0.5 \
function_name-proc-macro-0.3.0 \
fuser-0.13.0 \
futures-0.3.28 \
- futures-channel-0.3.28 \
- futures-core-0.3.28 \
+ futures-channel-0.3.31 \
+ futures-core-0.3.31 \
futures-executor-0.3.28 \
- futures-io-0.3.28 \
- futures-macro-0.3.28 \
- futures-sink-0.3.28 \
- futures-task-0.3.28 \
+ futures-io-0.3.31 \
+ futures-macro-0.3.31 \
+ futures-sink-0.3.31 \
+ futures-task-0.3.31 \
futures-timer-3.0.2 \
- futures-util-0.3.28 \
+ futures-util-0.3.31 \
getrandom-0.2.10 \
glob-0.3.1 \
heck-0.4.1 \
@@ -68,8 +68,8 @@ CARGO_CRATES= aho-corasick-1.0.5 \
predicates-3.0.3 \
predicates-core-1.0.6 \
predicates-tree-1.0.9 \
- proc-macro2-1.0.66 \
- quote-1.0.33 \
+ proc-macro2-1.0.94 \
+ quote-1.0.40 \
rand-0.8.5 \
rand_chacha-0.3.1 \
rand_core-0.6.4 \
@@ -93,7 +93,7 @@ CARGO_CRATES= aho-corasick-1.0.5 \
slab-0.4.9 \
smallvec-1.8.0 \
strsim-0.10.0 \
- syn-2.0.29 \
+ syn-2.0.100 \
sysctl-0.5.5 \
tempfile-3.8.0 \
terminal_size-0.3.0 \
@@ -107,10 +107,11 @@ CARGO_CRATES= aho-corasick-1.0.5 \
tracing-log-0.2.0 \
tracing-subscriber-0.3.18 \
unicode-ident-1.0.11 \
+ unty-0.0.4 \
utf8parse-0.2.1 \
uuid-1.9.1 \
valuable-0.1.0 \
- virtue-0.0.13 \
+ virtue-0.0.18 \
wait-timeout-0.2.0 \
walkdir-2.4.0 \
wasi-0.11.0+wasi-snapshot-preview1 \
diff --git a/filesystems/xfuse/distinfo b/filesystems/xfuse/distinfo
index 8f05c642335c..f87774659095 100644
--- a/filesystems/xfuse/distinfo
+++ b/filesystems/xfuse/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1724178833
-SHA256 (rust/crates/xfs-fuse-0.4.4.crate) = 4a80e87f3b435d7ced5b399c65ecc6acf531bcc175ddc8a45da97480f1e859d6
-SIZE (rust/crates/xfs-fuse-0.4.4.crate) = 49565
+TIMESTAMP = 1752671797
+SHA256 (rust/crates/xfs-fuse-0.5.0.crate) = a30dd31766c7c441b5896a783fdab685621840b6fa1d5458d140996396844b8b
+SIZE (rust/crates/xfs-fuse-0.5.0.crate) = 50228
SHA256 (rust/crates/aho-corasick-1.0.5.crate) = 0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783
SIZE (rust/crates/aho-corasick-1.0.5.crate) = 172064
SHA256 (rust/crates/anstream-0.6.14.crate) = 418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b
@@ -13,14 +13,14 @@ SHA256 (rust/crates/anstyle-query-1.0.3.crate) = a64c907d4e79225ac72e2a354c9ce84
SIZE (rust/crates/anstyle-query-1.0.3.crate) = 9742
SHA256 (rust/crates/anstyle-wincon-3.0.3.crate) = 61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19
SIZE (rust/crates/anstyle-wincon-3.0.3.crate) = 12179
-SHA256 (rust/crates/assert_cmd-2.0.11.crate) = 86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151
-SIZE (rust/crates/assert_cmd-2.0.11.crate) = 25346
+SHA256 (rust/crates/assert_cmd-2.0.17.crate) = 2bd389a4b2970a01282ee455294913c0a43724daedcd1a24c3eb0ec1c1320b66
+SIZE (rust/crates/assert_cmd-2.0.17.crate) = 26914
SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
SIZE (rust/crates/autocfg-1.1.0.crate) = 13272
-SHA256 (rust/crates/bincode-2.0.0-rc.3.crate) = f11ea1a0346b94ef188834a65c068a03aec181c94896d481d7a0a40d85b0ce95
-SIZE (rust/crates/bincode-2.0.0-rc.3.crate) = 57746
-SHA256 (rust/crates/bincode_derive-2.0.0-rc.3.crate) = 7e30759b3b99a1b802a7a3aa21c85c3ded5c28e1c83170d82d70f08bbf7f3e4c
-SIZE (rust/crates/bincode_derive-2.0.0-rc.3.crate) = 6335
+SHA256 (rust/crates/bincode-2.0.1.crate) = 36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740
+SIZE (rust/crates/bincode-2.0.1.crate) = 70469
+SHA256 (rust/crates/bincode_derive-2.0.1.crate) = bf95709a440f45e986983918d0e8a1f30a9b1df04918fc828670606804ac3c09
+SIZE (rust/crates/bincode_derive-2.0.1.crate) = 7404
SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
SHA256 (rust/crates/bitflags-2.4.0.crate) = b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635
@@ -71,24 +71,24 @@ SHA256 (rust/crates/fuser-0.13.0.crate) = 21370f84640642c8ea36dfb2a6bfc4c55941f4
SIZE (rust/crates/fuser-0.13.0.crate) = 86991
SHA256 (rust/crates/futures-0.3.28.crate) = 23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40
SIZE (rust/crates/futures-0.3.28.crate) = 53229
-SHA256 (rust/crates/futures-channel-0.3.28.crate) = 955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2
-SIZE (rust/crates/futures-channel-0.3.28.crate) = 32281
-SHA256 (rust/crates/futures-core-0.3.28.crate) = 4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c
-SIZE (rust/crates/futures-core-0.3.28.crate) = 14780
+SHA256 (rust/crates/futures-channel-0.3.31.crate) = 2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10
+SIZE (rust/crates/futures-channel-0.3.31.crate) = 31971
+SHA256 (rust/crates/futures-core-0.3.31.crate) = 05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e
+SIZE (rust/crates/futures-core-0.3.31.crate) = 14318
SHA256 (rust/crates/futures-executor-0.3.28.crate) = ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0
SIZE (rust/crates/futures-executor-0.3.28.crate) = 17743
-SHA256 (rust/crates/futures-io-0.3.28.crate) = 4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964
-SIZE (rust/crates/futures-io-0.3.28.crate) = 8910
-SHA256 (rust/crates/futures-macro-0.3.28.crate) = 89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72
-SIZE (rust/crates/futures-macro-0.3.28.crate) = 11272
-SHA256 (rust/crates/futures-sink-0.3.28.crate) = f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e
-SIZE (rust/crates/futures-sink-0.3.28.crate) = 7852
-SHA256 (rust/crates/futures-task-0.3.28.crate) = 76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65
-SIZE (rust/crates/futures-task-0.3.28.crate) = 11848
+SHA256 (rust/crates/futures-io-0.3.31.crate) = 9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6
+SIZE (rust/crates/futures-io-0.3.31.crate) = 9047
+SHA256 (rust/crates/futures-macro-0.3.31.crate) = 162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650
+SIZE (rust/crates/futures-macro-0.3.31.crate) = 11341
+SHA256 (rust/crates/futures-sink-0.3.31.crate) = e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7
+SIZE (rust/crates/futures-sink-0.3.31.crate) = 7958
+SHA256 (rust/crates/futures-task-0.3.31.crate) = f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988
+SIZE (rust/crates/futures-task-0.3.31.crate) = 11217
SHA256 (rust/crates/futures-timer-3.0.2.crate) = e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c
SIZE (rust/crates/futures-timer-3.0.2.crate) = 19879
-SHA256 (rust/crates/futures-util-0.3.28.crate) = 26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533
-SIZE (rust/crates/futures-util-0.3.28.crate) = 158510
+SHA256 (rust/crates/futures-util-0.3.31.crate) = 9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81
+SIZE (rust/crates/futures-util-0.3.31.crate) = 162124
SHA256 (rust/crates/getrandom-0.2.10.crate) = be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427
SIZE (rust/crates/getrandom-0.2.10.crate) = 34955
SHA256 (rust/crates/glob-0.3.1.crate) = d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b
@@ -141,10 +141,10 @@ SHA256 (rust/crates/predicates-core-1.0.6.crate) = b794032607612e7abeb4db69adb4e
SIZE (rust/crates/predicates-core-1.0.6.crate) = 8084
SHA256 (rust/crates/predicates-tree-1.0.9.crate) = 368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf
SIZE (rust/crates/predicates-tree-1.0.9.crate) = 7960
-SHA256 (rust/crates/proc-macro2-1.0.66.crate) = 18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9
-SIZE (rust/crates/proc-macro2-1.0.66.crate) = 43575
-SHA256 (rust/crates/quote-1.0.33.crate) = 5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae
-SIZE (rust/crates/quote-1.0.33.crate) = 28090
+SHA256 (rust/crates/proc-macro2-1.0.94.crate) = a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84
+SIZE (rust/crates/proc-macro2-1.0.94.crate) = 52391
+SHA256 (rust/crates/quote-1.0.40.crate) = 1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d
+SIZE (rust/crates/quote-1.0.40.crate) = 31063
SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404
SIZE (rust/crates/rand-0.8.5.crate) = 87113
SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
@@ -191,8 +191,8 @@ SHA256 (rust/crates/smallvec-1.8.0.crate) = f2dd574626839106c320a323308629dcb1ac
SIZE (rust/crates/smallvec-1.8.0.crate) = 27992
SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623
SIZE (rust/crates/strsim-0.10.0.crate) = 11355
-SHA256 (rust/crates/syn-2.0.29.crate) = c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a
-SIZE (rust/crates/syn-2.0.29.crate) = 241664
+SHA256 (rust/crates/syn-2.0.100.crate) = b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0
+SIZE (rust/crates/syn-2.0.100.crate) = 297947
SHA256 (rust/crates/sysctl-0.5.5.crate) = ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea
SIZE (rust/crates/sysctl-0.5.5.crate) = 18414
SHA256 (rust/crates/tempfile-3.8.0.crate) = cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef
@@ -219,14 +219,16 @@ SHA256 (rust/crates/tracing-subscriber-0.3.18.crate) = ad0f048c97dbd9faa9b7df563
SIZE (rust/crates/tracing-subscriber-0.3.18.crate) = 196312
SHA256 (rust/crates/unicode-ident-1.0.11.crate) = 301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c
SIZE (rust/crates/unicode-ident-1.0.11.crate) = 42067
+SHA256 (rust/crates/unty-0.0.4.crate) = 6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae
+SIZE (rust/crates/unty-0.0.4.crate) = 7200
SHA256 (rust/crates/utf8parse-0.2.1.crate) = 711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a
SIZE (rust/crates/utf8parse-0.2.1.crate) = 13435
SHA256 (rust/crates/uuid-1.9.1.crate) = 5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439
SIZE (rust/crates/uuid-1.9.1.crate) = 47492
SHA256 (rust/crates/valuable-0.1.0.crate) = 830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d
SIZE (rust/crates/valuable-0.1.0.crate) = 27718
-SHA256 (rust/crates/virtue-0.0.13.crate) = 9dcc60c0624df774c82a0ef104151231d37da4962957d691c011c852b2473314
-SIZE (rust/crates/virtue-0.0.13.crate) = 26483
+SHA256 (rust/crates/virtue-0.0.18.crate) = 051eb1abcf10076295e815102942cc58f9d5e3b4560e46e53c21e8ff6f3af7b1
+SIZE (rust/crates/virtue-0.0.18.crate) = 33545
SHA256 (rust/crates/wait-timeout-0.2.0.crate) = 9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6
SIZE (rust/crates/wait-timeout-0.2.0.crate) = 12441
SHA256 (rust/crates/walkdir-2.4.0.crate) = d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee
diff --git a/filesystems/zfs-snap-diff/Makefile b/filesystems/zfs-snap-diff/Makefile
index ac6ae6b64bd1..93f3550d8706 100644
--- a/filesystems/zfs-snap-diff/Makefile
+++ b/filesystems/zfs-snap-diff/Makefile
@@ -1,7 +1,7 @@
PORTNAME= zfs-snap-diff
PORTVERSION= 1.1.3
DISTVERSIONPREFIX= v
-PORTREVISION= 26
+PORTREVISION= 27
CATEGORIES= filesystems sysutils
MAINTAINER= ports@FreeBSD.org
diff --git a/filesystems/zrepl-dsh2dsh/Makefile b/filesystems/zrepl-dsh2dsh/Makefile
index cd3ef74a74b7..b880f8ddcc78 100644
--- a/filesystems/zrepl-dsh2dsh/Makefile
+++ b/filesystems/zrepl-dsh2dsh/Makefile
@@ -1,21 +1,23 @@
PORTNAME= zrepl
DISTVERSIONPREFIX= v
-DISTVERSION= 0.9.6
-PORTREVISION= 3
+DISTVERSION= 0.9.10
CATEGORIES= filesystems sysutils
-PKGNAMESUFFIX= -dsh2dsh
+PKGNAMESUFFIX= -${GH_ACCOUNT}
MAINTAINER= dsh@bamus.cz
COMMENT= ZFS dataset replication tool (fork with more features)
-WWW= https://github.com/dsh2dsh/${PORTNAME}
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= go:1.23,modules ncurses
+USES= go:1.24,modules ncurses
+USE_GITHUB= yes
+GH_ACCOUNT= dsh2dsh
-GO_MODULE= github.com/dsh2dsh/${PORTNAME}
-GO_BUILDFLAGS= -ldflags "${STRIP} -w -X github.com/dsh2dsh/${PORTNAME}/internal/version.${PORTNAME}Version=${DISTVERSIONFULL}"
+GO_MOD_DIST= github
+GO_MODULE= github.com/${GH_ACCOUNT}/${PORTNAME}
+_BUILD_XFLAGS= version.${PORTNAME}Version=${DISTVERSIONFULL}
+GO_BUILDFLAGS= -ldflags "${STRIP} ${_BUILD_XFLAGS:S!^!-X ${GO_MODULE}/internal/!}"
CONFLICTS_INSTALL= ${PORTNAME}
diff --git a/filesystems/zrepl-dsh2dsh/distinfo b/filesystems/zrepl-dsh2dsh/distinfo
index 1754ef758e3a..7ecff4f820a1 100644
--- a/filesystems/zrepl-dsh2dsh/distinfo
+++ b/filesystems/zrepl-dsh2dsh/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1739027276
-SHA256 (go/filesystems_zrepl-dsh2dsh/zrepl-v0.9.6/v0.9.6.mod) = 2879957b0b16b65fdbc8685543c0394d9f89a5a8036fae5467666d4b34b3a3b9
-SIZE (go/filesystems_zrepl-dsh2dsh/zrepl-v0.9.6/v0.9.6.mod) = 2920
-SHA256 (go/filesystems_zrepl-dsh2dsh/zrepl-v0.9.6/v0.9.6.zip) = 283ee17c2d5fbbedfd73fe9ee9c6a2c7c6e7a9e1c5c3378d5ffa6f16e82e87af
-SIZE (go/filesystems_zrepl-dsh2dsh/zrepl-v0.9.6/v0.9.6.zip) = 448155
+TIMESTAMP = 1746109607
+SHA256 (go/filesystems_zrepl-dsh2dsh/dsh2dsh-zrepl-v0.9.10_GH0/go.mod) = f8621a55734bb3278fd6355451843e180e978bea80d39b32e8a0b27aae3961d7
+SIZE (go/filesystems_zrepl-dsh2dsh/dsh2dsh-zrepl-v0.9.10_GH0/go.mod) = 3104
+SHA256 (go/filesystems_zrepl-dsh2dsh/dsh2dsh-zrepl-v0.9.10_GH0/dsh2dsh-zrepl-v0.9.10_GH0.tar.gz) = c0250442949c2a2efd0368db7ef7c23e40cb553be5b6dcb28f0571006f251398
+SIZE (go/filesystems_zrepl-dsh2dsh/dsh2dsh-zrepl-v0.9.10_GH0/dsh2dsh-zrepl-v0.9.10_GH0.tar.gz) = 317034
diff --git a/filesystems/zrepl/Makefile b/filesystems/zrepl/Makefile
index f581b5ce3749..32b3da5a73fb 100644
--- a/filesystems/zrepl/Makefile
+++ b/filesystems/zrepl/Makefile
@@ -1,7 +1,7 @@
PORTNAME= zrepl
DISTVERSIONPREFIX= v
DISTVERSION= 0.6.1
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= filesystems sysutils
MAINTAINER= driesm@FreeBSD.org
diff --git a/filesystems/ztop/Makefile b/filesystems/ztop/Makefile
index 51f2ec04d9f4..5219c2f797a6 100644
--- a/filesystems/ztop/Makefile
+++ b/filesystems/ztop/Makefile
@@ -1,7 +1,7 @@
PORTNAME= ztop
DISTVERSIONPREFIX= v
DISTVERSION= 0.3.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= filesystems sysutils
MAINTAINER= asomers@FreeBSD.org