CVS commit: pkgsrc/sysutils/e2fsprogs

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Jan 22 11:46:34 UTC 2021

Modified Files:
        pkgsrc/sysutils/e2fsprogs: Makefile

Log Message:
e2fsprogs: Explicitly disable building FUSE programs

PR pkg/55943


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/sysutils/e2fsprogs/Makefile

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

Modified files:

Index: pkgsrc/sysutils/e2fsprogs/Makefile
diff -u pkgsrc/sysutils/e2fsprogs/Makefile:1.30 pkgsrc/sysutils/e2fsprogs/Makefile:1.31
--- pkgsrc/sysutils/e2fsprogs/Makefile:1.30     Fri Mar 20 11:58:21 2020
+++ pkgsrc/sysutils/e2fsprogs/Makefile  Fri Jan 22 11:46:34 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2020/03/20 11:58:21 nia Exp $
+# $NetBSD: Makefile,v 1.31 2021/01/22 11:46:34 nia Exp $
 
 DISTNAME=      e2fsprogs-1.43.7
 PKGREVISION=   1
@@ -19,6 +19,13 @@ GNU_CONFIGURE=               yes
 # Use external libraries
 CONFIGURE_ARGS+=       --disable-libblkid
 CONFIGURE_ARGS+=       --disable-libuuid
+# This does not build on NetBSD due to missing FUSE_MAKE_VERSION in fuse.h,
+# but will be automatically built on certain systems when libfuse can be found
+# by the configure script without fuse.buildlink3.mk being included, resulting
+# in PLIST conflicts.
+#
+# I'm unsure whether this is better or more useful than filesystems/fuse-ext2.
+CONFIGURE_ARGS+=       --disable-fuse2fs
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 INFO_FILES=            yes
 INSTALL_TARGET=                install install-libs