Fix build on NetBSD 9

6 files changed, 44 insertions, 10 deletions

diff --git a/filesystems/fuse-obexfs/distinfo b/filesystems/fuse-obexfs/distinfo
index af1c183d108..e765a377e68 100644
--- a/filesystems/fuse-obexfs/distinfo
+++ b/filesystems/fuse-obexfs/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2022/01/22 18:43:19 pho Exp $
+$NetBSD: distinfo,v 1.7 2022/01/27 03:58:34 pho Exp $
 
 BLAKE2s (obexfs-0.8.tar.gz) = f8e0463c0199df63e4c5111e3b947e56a594f159b2eea75e9f79ff82efb1472a
 SHA512 (obexfs-0.8.tar.gz) = 3fdca66b52315c8d119dd7ee3f48e974cc3b0834531dd99f8cdd61b8d7558a9899e4f25fef29461d5a9fc8c9dd1fdaccbf8af43521d75ddd413a45f48a26a73d
 Size (obexfs-0.8.tar.gz) = 76393 bytes
 SHA1 (patch-aa) = 2e607af6ee2cd4a57091e4cce9ca799ca0fd5dcf
-SHA1 (patch-ab) = 63936898afa0cbf1c2e972d9aef9a6681de65f20
+SHA1 (patch-ab) = f92c0bad4e19b20da8fe350bf924cb6f1dbf34d0
 SHA1 (patch-ac) = 42a1f77900e49f7e3afc9b3e935d66443b92ad69
diff --git a/filesystems/fuse-obexfs/patches/patch-ab b/filesystems/fuse-obexfs/patches/patch-ab
index ce21f4f1001..c9e3be56952 100644
--- a/filesystems/fuse-obexfs/patches/patch-ab
+++ b/filesystems/fuse-obexfs/patches/patch-ab
@@ -1,8 +1,10 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/05/16 10:32:52 xtraeme Exp $
+$NetBSD: patch-ab,v 1.2 2022/01/27 03:58:34 pho Exp $
 
---- configure.in.orig	2006-02-08 22:18:40.000000000 +0100
-+++ configure.in	2007-05-14 09:22:27.000000000 +0200
-@@ -7,6 +7,7 @@
+Do not overwrite CFLAGS
+
+--- configure.in.orig	2006-02-08 21:18:40.000000000 +0000
++++ configure.in
+@@ -7,10 +7,11 @@ AC_PROG_CC
  AC_PROG_RANLIB
  AC_PROG_INSTALL
  
@@ -10,3 +12,8 @@ $NetBSD: patch-ab,v 1.1.1.1 2007/05/16 10:32:52 xtraeme Exp $
  PKG_CHECK_MODULES(OPENOBEX,openobex)
  # PKG_CHECK_MODULES(OBEXFTP,obexftp)
  
+-CFLAGS="-Wall -W -Wmissing-declarations -Wmissing-prototypes"
++CFLAGS="$CFLAGS -Wall -W -Wmissing-declarations -Wmissing-prototypes"
+ CFLAGS="$CFLAGS -O2 -D_FILE_OFFSET_BITS=64"
+ 
+ AC_OUTPUT([Makefile fuse/Makefile])
diff --git a/filesystems/fuse-sshfs/distinfo b/filesystems/fuse-sshfs/distinfo
index ea1c8abbe93..b2ed116ae20 100644
--- a/filesystems/fuse-sshfs/distinfo
+++ b/filesystems/fuse-sshfs/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.6 2022/01/22 18:48:04 pho Exp $
+$NetBSD: distinfo,v 1.7 2022/01/27 04:06:20 pho Exp $
 
 BLAKE2s (sshfs-3.7.2.tar.xz) = a770780be6c0d5b26ebb9b7b43c35c8a689e226a619f03cdaee847598c81d025
 SHA512 (sshfs-3.7.2.tar.xz) = 1612d515869a8b38c0bc3d79eaf80e8b4da1a9710c9668e6ec23e6b77313063ae0bee66ab9e9e0f70d98eaa1334425b2087dd93cc4618af3ac6ac191acf7f838
 Size (sshfs-3.7.2.tar.xz) = 53160 bytes
 SHA1 (patch-cache.c) = 570525d7cae09055537b00e3eeadb639c6f1fa5b
+SHA1 (patch-meson.build) = 2d10515de44239d6fad0fd5f512140d86f4dff7a
 SHA1 (patch-sshfs.c) = 95e0b5bf01c36b803d1ea0c3b71b8740be98506b
 SHA1 (patch-utils_install__helper.sh) = 7e31f031ecf40731acb4a96b0c23543b7015c290
diff --git a/filesystems/fuse-sshfs/patches/patch-meson.build b/filesystems/fuse-sshfs/patches/patch-meson.build
new file mode 100644
index 00000000000..de8b70b3c6b
--- /dev/null
+++ b/filesystems/fuse-sshfs/patches/patch-meson.build
@@ -0,0 +1,17 @@
+$NetBSD: patch-meson.build,v 1.3 2022/01/27 04:06:20 pho Exp $
+
+Workaround for old librefuse. This patch can go away when NetBSD 9 reaches its
+EOL.
+
+--- meson.build.orig	2022-01-27 04:02:43.383365139 +0000
++++ meson.build
+@@ -44,7 +44,8 @@ endif
+ configure_file(output: 'config.h',
+                configuration : cfg)
+ 
+-sshfs_deps = [ dependency('fuse3', version: '>= 3.1.0'),
++sshfs_deps = [ dependency('fuse3', version: '>= 3.1.0', required: false),
++               dependency('fuse' , version: '>= 2.6'  , required: false),
+                dependency('glib-2.0'),
+                dependency('gthread-2.0') ]
+ 
diff --git a/filesystems/fuse-wdfs/distinfo b/filesystems/fuse-wdfs/distinfo
index d3c743f3599..2aa65f95a1c 100644
--- a/filesystems/fuse-wdfs/distinfo
+++ b/filesystems/fuse-wdfs/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2022/01/22 18:50:23 pho Exp $
+$NetBSD: distinfo,v 1.9 2022/01/27 04:15:44 pho Exp $
 
 BLAKE2s (wdfs-1.4.2.tar.gz) = 8048713564688dc8e4529a93d31612638065d346fdcec98e2329600cf6d2bb75
 SHA512 (wdfs-1.4.2.tar.gz) = da7e16ed86cbe4746fabe5fce44c83b1d0cd0fbc19994eefe0ce2a75f3d8c77c3c341a76409150a3509be08f8c0d28b8a9650037edcbbf2aa60f4c8ea5407004
 Size (wdfs-1.4.2.tar.gz) = 109315 bytes
-SHA1 (patch-aa) = 1acb91eea14670c048eba39f48deb88a6c52d8cf
+SHA1 (patch-aa) = af1963fab0b0334286d6ec497af41930d065e08a
 SHA1 (patch-ab) = 1237cdd4baf150899b4d9ea1073d399ffe925a64
diff --git a/filesystems/fuse-wdfs/patches/patch-aa b/filesystems/fuse-wdfs/patches/patch-aa
index 7da804a87f0..d48b5c8eea9 100644
--- a/filesystems/fuse-wdfs/patches/patch-aa
+++ b/filesystems/fuse-wdfs/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2022/01/22 18:50:23 pho Exp $
+$NetBSD: patch-aa,v 1.5 2022/01/27 04:15:44 pho Exp $
 
 refuse(3) used to not support -ho in option_list. Already fixed in
 HEAD.
@@ -20,3 +20,12 @@ HEAD.
  			exit(1);
  
  		case KEY_VERSION:
+@@ -1308,7 +1314,7 @@ static void print_help()
+ /* just a simple wrapper for fuse_main(), because the interface changed...  */
+ static int call_fuse_main(struct fuse_args *args)
+ {
+-#if FUSE_VERSION >= 26
++#if (!defined(__NetBSD__) || FUSE_H_ >= 20211204) && FUSE_VERSION >= 26
+ 	return fuse_main(args->argc, args->argv, &wdfs_operations, NULL);
+ #else
+ 	return fuse_main(args->argc, args->argv, &wdfs_operations);