CVS commit: pkgsrc/filesystems

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed Jun  3 23:27:17 UTC 2026

Modified Files:
        pkgsrc/filesystems/fuse: DESCR Makefile
        pkgsrc/filesystems/fuse3: DESCR Makefile

Log Message:
filesystems/fuse{,3}: Tidy, NFCI

  - Align DESCR to each other, taking the text that describes what the
    package is, vs marketing copy about FUSE.  Explain fuse2 vs 3, and
    add a NetBSD-only see-also to perfused(8).
  - trim duplicate bsd.prefs.mk
  - align whitespace between versions to reduce diffs
  - reorder some lines to reduce diffs

Likely more diff-reduction could be done, but this is what I felt
confident would not cause even any binary change in the package.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/filesystems/fuse/DESCR
cvs rdiff -u -r1.20 -r1.21 pkgsrc/filesystems/fuse/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/filesystems/fuse3/DESCR
cvs rdiff -u -r1.1 -r1.2 pkgsrc/filesystems/fuse3/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/filesystems/fuse/DESCR
diff -u pkgsrc/filesystems/fuse/DESCR:1.4 pkgsrc/filesystems/fuse/DESCR:1.5
--- pkgsrc/filesystems/fuse/DESCR:1.4   Sat May  9 19:21:36 2026
+++ pkgsrc/filesystems/fuse/DESCR       Wed Jun  3 23:27:17 2026
@@ -1,10 +1,12 @@
-With FUSE it is possible to implement a fully functional file system in a
-userspace program.  Features include:
+FUSE (Filesystem in Userspace) is a simple interface for userspace
+programs to export a virtual filesystem to a kernel, originally Linux.
+Fuse also aims to provide a secure method for non privileged users to
+create and mount their own filesystem implementations.
 
-* Simple library API
-* Simple installation (no need to patch or recompile the kernel)
-* Secure implementation
-* Userspace - kernel interface is very efficient
-* Usable by non privileged users
-* Runs on Linux kernels 2.4.X and 2.6.X
-* Has proven very stable over time
+This package provides FUSE version 2.  While superceded it is still in
+significant use.
+
+This package provides libfuse, a library translating procedure calls
+to messages on /dev/fuse.  On Linux, it additionally provides the
+fusermount3 and mount.fuse3 utilities.  On NetBSD, see also
+perfused(8).

Index: pkgsrc/filesystems/fuse/Makefile
diff -u pkgsrc/filesystems/fuse/Makefile:1.20 pkgsrc/filesystems/fuse/Makefile:1.21
--- pkgsrc/filesystems/fuse/Makefile:1.20       Sat May  9 19:21:36 2026
+++ pkgsrc/filesystems/fuse/Makefile    Wed Jun  3 23:27:17 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2026/05/09 19:21:36 vins Exp $
+# $NetBSD: Makefile,v 1.21 2026/06/03 23:27:17 gdt Exp $
 #
 
 DISTNAME=      fuse-2.9.9
@@ -9,17 +9,13 @@ GITHUB_TAG=   ${PKGBASE}-${PKGVERSION_NORE
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              https://github.com/libfuse/libfuse
-COMMENT=               Filesystem in Userspace
+COMMENT=               Filesystem in Userspace (version 2)
 LICENSE=               gnu-gpl-v2 AND gnu-lgpl-v2.1
 
-GNU_CONFIGURE=         yes
-
-# FUSE the implementation only builds on Linux and FreeBSD.
+# The FUSE library requires operating system support for /dev/fuse.
 ONLY_FOR_PLATFORM=     Linux-*-* FreeBSD-*-* NetBSD-*-*
-# On NetBSD 4.99 after 2007-02, /usr/lib/librefuse provides the FUSE
-# interface expected by filesystem implementations and therefore this
-# implementation is not needed. This FUSE implementation can also be
-# used with the perfuse package on NetBSD.
+
+GNU_CONFIGURE=         yes
 
 USE_TOOLS+=    gmake pkg-config gettext
 USE_TOOLS+=    autoconf automake autoreconf
@@ -27,22 +23,22 @@ USE_LIBTOOL=        yes
 
 TOOL_DEPENDS+=         gettext-m4-[0-9]*:../../devel/gettext-m4
 
-CONFIGURE_ARGS+=       --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
-CONFIGURE_ARGS+=       --with-pkgconfigdir=${PREFIX}/lib/pkgconfig
+PKG_DOCS=      doc/how-fuse-works doc/kernel.txt
+DOCDIR=                share/doc/${PKGBASE}
+EGDIR=         share/examples/${PKGBASE}
+INCLUDEDIR=    include/fuse
 
 .include "../../mk/bsd.prefs.mk"
 
+CONFIGURE_ARGS+=       --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
+CONFIGURE_ARGS+=       --with-pkgconfigdir=${PREFIX}/lib/pkgconfig
+
 .if ${OPSYS} == "Linux"
 CONFIGURE_ENV+=        MOUNT_FUSE_PATH=${PREFIX}/sbin
 CONFIGURE_ENV+=        UDEV_RULES_PATH=${PREFIX}/${EGDIR}
 CONFIGURE_ENV+=        INIT_D_PATH=${PREFIX}/${EGDIR}
 .endif
 
-PKG_DOCS=      doc/how-fuse-works doc/kernel.txt
-DOCDIR=                share/doc/${PKGBASE}
-EGDIR=         share/examples/${PKGBASE}
-INCLUDEDIR=    include/fuse
-
 INSTALL_TARGET=                install-strip
 INSTALLATION_DIRS+=    ${DOCDIR} ${INCLUDEDIR}
 
@@ -65,9 +61,8 @@ post-install:
        ${RUN}${CHMOD} -w       ${DESTDIR}${PREFIX}/bin/fusermount
 .endif
 
-.include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "NetBSD"
-.include "../../filesystems/perfuse/buildlink3.mk"
+.  include "../../filesystems/perfuse/buildlink3.mk"
 .endif
 
 .include "../../converters/libiconv/buildlink3.mk"

Index: pkgsrc/filesystems/fuse3/DESCR
diff -u pkgsrc/filesystems/fuse3/DESCR:1.2 pkgsrc/filesystems/fuse3/DESCR:1.3
--- pkgsrc/filesystems/fuse3/DESCR:1.2  Sun May 10 07:00:20 2026
+++ pkgsrc/filesystems/fuse3/DESCR      Wed Jun  3 23:27:17 2026
@@ -1,4 +1,11 @@
 FUSE (Filesystem in Userspace) is a simple interface for userspace
-programs to export a virtual filesystem to the Linux kernel. Fuse also
-aims to provide a secure method for non privileged users to create and
-mount their own filesystem implementations.
+programs to export a virtual filesystem to a kernel, originally Linux.
+Fuse also aims to provide a secure method for non privileged users to
+create and mount their own filesystem implementations.
+
+This package provides FUSE version 3.
+
+This package provides libfuse, a library translating procedure calls
+to messages on /dev/fuse.  On Linux, it additionally provides the
+fusermount3 and mount.fuse3 utilities.  On NetBSD, see also
+perfused(8).

Index: pkgsrc/filesystems/fuse3/Makefile
diff -u pkgsrc/filesystems/fuse3/Makefile:1.1 pkgsrc/filesystems/fuse3/Makefile:1.2
--- pkgsrc/filesystems/fuse3/Makefile:1.1       Sat May  9 20:01:32 2026
+++ pkgsrc/filesystems/fuse3/Makefile   Wed Jun  3 23:27:17 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2026/05/09 20:01:32 vins Exp $
+# $NetBSD: Makefile,v 1.2 2026/06/03 23:27:17 gdt Exp $
 #
 
 DISTNAME=      fuse-3.18.2
@@ -10,15 +10,11 @@ GITHUB_RELEASE=     ${PKGBASE}-${PKGVERSION_
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              https://github.com/libfuse/libfuse
-COMMENT=               Filesystem in Userspace
+COMMENT=               Filesystem in Userspace (version 3)
 LICENSE=               gnu-gpl-v2 AND gnu-lgpl-v2.1
 
-# FUSE the implementation only builds on Linux and FreeBSD.
+# The FUSE library requires operating system support for /dev/fuse.
 ONLY_FOR_PLATFORM=     Linux-*-* FreeBSD-*-* NetBSD-*-*
-# On NetBSD 4.99 after 2007-02, /usr/lib/librefuse provides the FUSE
-# interface expected by filesystem implementations and therefore this
-# implementation is not needed. This FUSE implementation can also be
-# used with the perfuse package on NetBSD.
 
 USE_LANGUAGES+=        c c++
 USE_TOOLS+=    pkg-config
@@ -47,7 +43,6 @@ MESON_ARGS+=  -Dinitscriptdir=${PREFIX}/$
                -Denable-io-uring=true
 .endif
 
-
 PKGCONFIG_OVERRIDE_STAGE=      pre-install
 PKGCONFIG_OVERRIDE+=           output/meson-private/fuse3.pc