Update 2.8.4 to 2.9.3

---------------------
2013-07-01  Miklos Szeredi <miklos@szeredi.hu>
	* Released 2.9.3

2013-06-20  Miklos Szeredi <miklos@szeredi.hu>
	* libfuse: fix multiple close of device fd.  Reported by Dan
	Greenfield

2013-03-19  Miklos Szeredi <miklos@szeredi.hu>
	* libfuse: fix thread cancel race.  Exiting a worker my race with
	cancelling that same worker.  This caused a segmenation
	fault. Reported and tested by Anatol Pomozov

2013-02-04  Miklos Szeredi <miklos@szeredi.hu>
	* libfuse: fix crash in unlock_path().  Patch by Ratna Manoj

	* libfuse: fix the 'remember' option.  The lru list was not
	initialized for the "/" path.  This resulted in remove_node_lru()
	crashing on LOOKUP-DOTDOT.  Patch by Madan Valluri

	* libfuse: configure: detect new util-linux

	* libfuse: Use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER.
	Patch by Anatol Pomozov

	* libfuse: rename ./configure.in to ./configure.ac.  Patch by
	Anatol Pomozov

2012-10-01  Miklos Szeredi <miklos@szeredi.hu>
	* Released 2.9.2

2012-10-01  Miklos Szeredi <miklos@szeredi.hu>
	* Fix deadlock in libfuse.  Running "svn update" on a fuse
	filesystem could deadlock because of a bug in the way the paths
	are locked.  Reported by Kazuaki Anami

2012-08-23  Miklos Szeredi <miklos@szeredi.hu>
	* Fix missing config.h in buffer.c.  Reported by Matthew Gabeler-Lee

2012-08-14  Miklos Szeredi <miklos@szeredi.hu>
	* Not unhashing the name in forget (commit on 2011-12-09) broke
	the forget logic in a subtle way, resulting in "fuse internal
	error: node NNN not found" and causing the filesystem daemon to
	abort.  Fix by incrementing the node refcount if nlookup goes from
	zero to one.  Reported by Kyle Lippincott

2012-08-13  Miklos Szeredi <miklos@szeredi.hu>
	* Fix linking against GNU libiconv.  Patch by Natanael Copa

2012-07-19  Miklos Szeredi <miklos@szeredi.hu>
	* Released 2.9.1

2012-07-19  Miklos Szeredi <miklos@szeredi.hu>
	* Fix crash caused by freeing a stack address.  Reported by Itay
	Perl

2012-07-04  Miklos Szeredi <miklos@szeredi.hu>
	* Fix install of mount.fuse from out-of-tree build.  Patch by
	Olivier Blin

	* Fix build with automake >= 1.12.1.  Patch by Olivier Blin

2012-04-24  Miklos Szeredi <miklos@szeredi.hu>
	* Add fallocate operation.  Only works on linux kernels 3.5 or
	later.  Patch by Anatol Pomozov

2012-05-16  Miklos Szeredi <miklos@szeredi.hu>
	* Linking to a library that uses threads requires the application
	to be linked with -pthreads otherwise some pthread functions will
	be linked to stubs in glibc.  So move -pthread from Libs.private
	to Libs in fuse.pc.  Reported by Werner Fink

	* Fix the compile command in the examples. Reported by Luciano
	Dalle Ore

2012-04-20  Miklos Szeredi <miklos@szeredi.hu>
	* Released 2.9.0

2012-04-20  Miklos Szeredi <miklos@szeredi.hu>
	* Add missing fuse_fs_flock to fuse_versionscript

2012-04-10  Miklos Szeredi <miklos@szeredi.hu>
	* Check protocol version before sending notifications and return
	-ENOSYS if a particular notification is not supported.

	* Add 'flag_utime_omit_ok' flag to fuse_operations.  If the
	filesystem sets this flag then ->utimens() will receive UTIME_OMIT
	and UTIME_NOW values as specified in utimensat(2).

2012-01-27  Miklos Szeredi <miklos@szeredi.hu>
	* Interpret octal escape codes in options.  Requested by Jan
	Engelhardt

2012-01-26  Miklos Szeredi <miklos@szeredi.hu>

	* Add man pages for fusermount, mount.fuse and ulockmgr_server.
	Lifted from the Debian package.  The man pages were written by
	Daniel Baumann and Bastien Roucaries

2012-01-13  Miklos Szeredi <miklos@szeredi.hu>
	* Disable symbol versions on MacOSX.  Patch by Anatol Pomozov

2012-01-02  Miklos Szeredi <miklos@szeredi.hu>
	* Remove unnecessary mutex unlock at the end of multithreaded
	event loop.

2011-12-09  Miklos Szeredi <miklos@szeredi.hu>
	* Fix hang in wait_on_path().  Reported by Ville Silventoinen

	* Don't unhash name in FORGET.  This resulted in ENOENT being
	returned for unlinked but still open files if the kernel sent a
	FORGET request for the parent directory.

	* Free request in fuse_reply_data().

2011-12-08  Miklos Szeredi <miklos@szeredi.hu>
	* Fix build if FUSE_NODE_SLAB is not defined.  Patch by Emmanuel
	Dreyfus

	* Check for availability of utimensat() function.  Patch by
	Emmanuel Dreyfus

2011-12-07  Miklos Szeredi <miklos@szeredi.hu>
	* Add fuse_lowlevel_notify_delete() which tells the kernel that a
	file or directory is deleted.  Patch by John Muir

2011-12-06  Miklos Szeredi <miklos@szeredi.hu>
	* Update retrieve_reply() method

2011-12-05  Miklos Szeredi <miklos@szeredi.hu>
	* Low level API: lock argument of fuse_reply_lock should have a
	'const' qualifier.  Reported by Shachar Sharon

	* Add support for ioctl on directories.  Reported by Antonio SJ
	Musumeci

2011-10-13  Miklos Szeredi <miklos@szeredi.hu>
	* Reply to request with ENOMEM in case of failure to allocate
	request structure.  Otherwise the task issuing the request will
	just freeze up until the filesystem daemon is killed.  Reported by
	Stephan Kulow

2011-09-23  Miklos Szeredi <miklos@szeredi.hu>

	* Replace daemon() function with fork().  Patch by Anatol Pomozov

2011-08-26  Miklos Szeredi <miklos@szeredi.hu>
	* If configured with --disable-mtab then don't call mount(8) from
	libfuse to update the mtab.  Reported by: James Sierp

2011-08-24  Miklos Szeredi <miklos@szeredi.hu>
	* Use LRU list for cleaning up the cache if the "remember=T"
	option was given.  Patch by therealneworld@gmail.com

2011-07-06  Miklos Szeredi <miklos@szeredi.hu>
	* Add ->flock() operation to low and high level interfaces.  This
	fixes problems with emulating flock() with POSIX locking.
	Reported by Sebastian Pipping.  As with lock/setlk/getlk most
	filesystems don't need to implement this, as the kernel takes care
	of file locking.  The only reason to implement locking operations
	is for network filesystems which want file locking to work between
	clients.

2011-07-02  Sebastian Pipping <sebastian@pipping.org>
	* Make xmp_utimens of examples "fusexmp" and "fusexmp_fh"
	not follow symlinks as other layers do that already.

2011-06-02  Miklos Szeredi <miklos@szeredi.hu>
	* Add "remember" option.  This works similar to "noforget" except
	that eventually the node will be allowed to expire from the cache.
	Patch by therealneworld@gmail.com

2011-05-27  Miklos Szeredi <miklos@szeredi.hu>
	* Check if splice/vmsplice are supported

2011-05-26  Miklos Szeredi <miklos@szeredi.hu>
	* Remove -lrt -ldl from fuse.pc for dynamic linking since
	libfuse.so is already linked with these libraries.  Reported by:
	Nikolaus Rath

2011-05-20  Miklos Szeredi <miklos@szeredi.hu>
	* Cleaner build output.  Patch by Reuben Hawkins

2011-05-19  Miklos Szeredi <miklos@szeredi.hu>
	* Disable splice by default, add "splice_read", "splice_write" and
	"splice_move" options.  Keep the "no_splice_*" variants, which can
	disable splice even if the filesystem explicitly enables it.

2011-04-15  Max Krasnyansky <maxk@kernel.org>
	* Added support for "auto_unmount" option which unmounts the
	filesystem automatically on process exit (or crash).

2011-03-30  Miklos Szeredi <miklos@szeredi.hu>
	* Patches by Laszlo Papp fixing various issues found by the
	Coverity checker

2011-03-11  Miklos Szeredi <miklos@szeredi.hu>
	* In case of failure to add to /etc/mtab don't umount.  Reported
	by Marc Deslauriers

2011-02-02  Miklos Szeredi <miklos@szeredi.hu>
	* libfuse: In fuse_session_loop_mt() don't pause when exiting the
	worker threads.  The pause() was added in 2.2.1 to prevent
	segfault on pthread_cancel() on an exited, detached thread.  Now
	worker threads are not detached and pthread_cancel() should work
	fine even after the thread exited.  Reported by Boris Protopopov

2011-01-31  Miklos Szeredi <miklos@szeredi.hu>
	* fusermount: chdir to / before performing mount/umount

	* fusermount: only allow mount and umount if util-linux supports
	--no-canonicalize

2010-12-16  Miklos Szeredi <miklos@szeredi.hu>
	* Highlevel lib: allow hash tables to shrink

	* Highlevel lib: add slab allocation for node cache.  This will
	allow the memory used by the filesystem to grow and shrink
	depending on how many inodes are currently cached.

2010-12-13  Miklos Szeredi <miklos@szeredi.hu>
	* Highlevel lib: use dynamically resized hash table for looking up
	by name and node ID.

2010-12-07  Miklos Szeredi <miklos@szeredi.hu>
	* Allow batching of forget requests.  This allows forget requests
	to be processed faster and doesn't require a modification to fuse
	filesystems.  Reported by Terje Malmedal

	* Add ->forget_multi() operation to the lowlevel API.  The
	filesystem may implement this to process multiple forget requests
	in one call

	* Fix the ambiguity of ioctl ABI on the kernel/userspace boundary
	for 32bit vs. 64bit userspace

2010-11-10  Miklos Szeredi <miklos@szeredi.hu>
	* Add new write_buf() method to the highlevel API.  Similarly to
	the lowlevel write_buf() method, this allows implementing zero
	copy writes.

	* Add a new read_buf() method to the highlevel API.  This allows
	returning a generic buffer from the read method, which in turn
	allows zero copy reads.

	* In fusexmp_fh implement the ->read_buf() and ->write_buf()
	methods.  Leave the ->read() and ->write() implementations for
	reference, even though they are not necessary.

2010-11-08  Miklos Szeredi <miklos@szeredi.hu>
	* Fix check for read-only fs in mtab update

	* Open /dev/null for write instead of read for redirecting stdout
	and stderr

	* If umount(8) supports --fake and --no-canonicalize (util-linux-ng
	version 2.18 or later), and umount(2) supports the
	UMOUNT_NOFOLLOW flag (linux kernel version 2.6.35 or later)  then,
	"fusermount -u" will call the umount(2) system call and use
	"umount --fake ..." to update /etc/mtab

	* Added --disable-legacy-umount option to configure.  This
	disables the runtime checking of umount(8) version.  When built
	with this option then "fusermount -u" will fail if umount(8)
	doesn't support the --fake and --no-canonicalize options.

	* Fix fuse_buf_copy() if already at the end of the buffers

	* Add new ->write_buf() method to low level interface.  This
	allows passig a generic buffer, either containing a memory buffer
	or a file descriptor.  This allows implementing zero copy writes.

	* Add fuse_session_receive_buf() and fuse_session_process_buf()
	which may be used in event loop implementations to replace
	fuse_chan_recv() and fuse_session_process() respectively.

	* Remove unnecessary restoring of current working directory in
	"fusermount -u"

	* Add ctx->pid to debug output

	* Fix st_nlink value in high level lib if file is unlinked but
	still open

	* libfuse: add store request.  Request data to be stored in the
	kernel buffers for a given inode.

	* libfuse: add retrieve request.  Retrieve data stored in the
	kernel buffers for a given inode.

2010-10-14  Miklos Szeredi <miklos@szeredi.hu>
	* Use LTLIBICONV when linking libfuse.  This fixes building against
	uclibc + libiconv.  Patch by Natanael Copa

2010-10-05  Miklos Szeredi <miklos@szeredi.hu>
	* Add missing argument check in ulockmgr.c to prevent calling
	ulockmgr_server with illegal arguments. This would cause an ever
	growing list of ulockmgr_server processes with an endless list of
	open files which finally exceeds the open file handle limit.
	Patch by Markus Ammer

2010-09-28  Miklos Szeredi <miklos@szeredi.hu>
	* Fix ambiguous symbol version for fuse_chan_new.
	fuse_versionscript included fuse_chan_new in both FUSE_2.4 and
	FUSE_2.6.  Remove the FUSE_2.4, which is invalid.

2010-09-28  Miklos Szeredi <miklos@szeredi.hu>
	* Fix option escaping for fusermount.  If the "fsname=" option
	contained a comma then the option parser in fusermount was
	confused (Novell bugzilla #641480).  Fix by escaping commas when
	passing them over to fusermount.  Reported by Jan Engelhardt

2010-08-27  Miklos Szeredi <miklos@szeredi.hu>
	* Add NetBSD support.  Patch from Emmanuel Dreyfus

2010-07-12  Miklos Szeredi <miklos@szeredi.hu>
	* libfuse: add buffer interface.  Add a generic buffer interface
	for use with I/O.  Buffer vectors are supplied and each buffer in
	the vector may be a memory pointer or a file descriptor.

	* The fuse_reply_fd() interface is converted to using buffers.

2010-06-23  Miklos Szeredi <miklos@szeredi.hu>
	* Make the number of max background requests and congestion
	threshold tunable.  New options are "max_background" and
	"congestion_threshold".  Only effective on linux kernel versions
	2.6.32 or greater.  Patch by Csaba Henk

2010-06-17  Miklos Szeredi <miklos@szeredi.hu>
	* Add fuse_reply_fd() reply function to the low level interface.
	On linux version 2.6.35 or greater this will use splice() to move
	data directly from a file descriptor to the fuse device without
	needing to go though a userspace buffer.  With the
	FUSE_REPLY_FD_MOVE flag the kernel will attempt to move the data
	directly into the filesystem's cache.  On earlier kernels it will
	fall back to an intermediate buffer.  The options
	"no_splice_write" and "no_splice_move" can be used to disable
	splicing and moving respectively.

2010-06-15  Miklos Szeredi <miklos@szeredi.hu>
	* Fix out-of-source build.  Patch by Jörg Faschingbauer

	* Add a "nopath" option and flag, indicating that path argument
	need not be calculated for the following operations: read, write,
	flush, release, fsync, readdir, releasedir, fsyncdir, ftruncate,
	fgetattr, lock, ioctl and poll.

2010-05-10  Miklos Szeredi <miklos@szeredi.hu>
	* Remove "chmod root" from install of fusermount.  Reported by
	Lucas C. Villa Real

15 files changed, 17 insertions, 470 deletions

diff --git a/filesystems/fuse/Makefile b/filesystems/fuse/Makefile
index 444d82efd6d..c10b843c2a7 100644
--- a/filesystems/fuse/Makefile
+++ b/filesystems/fuse/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.9 2012/10/03 16:08:30 asau Exp $
+# $NetBSD: Makefile,v 1.10 2014/11/24 13:19:12 mef Exp $
 #
 
-DISTNAME=		fuse-2.8.4
-PKGREVISION=		2
+DISTNAME=		fuse-2.9.3
 CATEGORIES=		filesystems
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=fuse/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://fuse.sourceforge.net/
 COMMENT=		Filesystem in Userspace
+LICENSE=		gnu-gpl-v2 AND gnu-lgpl-v2.1
 
 GNU_CONFIGURE=		yes
 
diff --git a/filesystems/fuse/distinfo b/filesystems/fuse/distinfo
index 5813cf937d1..81f01d484cb 100644
--- a/filesystems/fuse/distinfo
+++ b/filesystems/fuse/distinfo
@@ -1,18 +1,6 @@
-$NetBSD: distinfo,v 1.3 2012/03/10 20:59:52 markd Exp $
+$NetBSD: distinfo,v 1.4 2014/11/24 13:19:12 mef Exp $
 
-SHA1 (fuse-2.8.4.tar.gz) = b1bc296c3e5b90b3658edb5d8d7aa0ee97c145d7
-RMD160 (fuse-2.8.4.tar.gz) = 75093d0ddf8c4b9fc2e4764bdf86c43c5937c297
-Size (fuse-2.8.4.tar.gz) = 500345 bytes
-SHA1 (patch-aa) = 651517ebbc440cb84a7b21c45b48aa717babc227
-SHA1 (patch-ab) = c53da5e8e9bd934ae9753b604c11d6a49b45731c
-SHA1 (patch-ac) = f31f83ca7cd7f75845f90d00b4c62f28935b93f3
-SHA1 (patch-ad) = e3e013137fbafca9a2944d23265e66553408b503
-SHA1 (patch-ae) = b275cd57b8f7c331fb730c27a8f1c901c11a9d01
-SHA1 (patch-af) = fdd24a2c94b31b4c3586e8ed56a78583e85f029d
-SHA1 (patch-ag) = e3fa9eac0a8e6de91f43c43cd904f12a1eb3621a
-SHA1 (patch-ai) = cc40e939f884c6c9b7b413021b9f18671507a2ab
-SHA1 (patch-ak) = 222faa9b6549063428c89e65dfcb77e002dc798e
-SHA1 (patch-al) = 358d734dbfa43e306bf0bb0a39b006be5822f1a3
-SHA1 (patch-am) = 2abd07b403896bff5aad6cd865cb473553851a22
-SHA1 (patch-an) = 3f119dae5f08996dd483a0fb4fa0365507be2070
-SHA1 (patch-util_fusermount.c) = c65c377b917dc0c34cf5b8fb4d70e75075debcf9
+SHA1 (fuse-2.9.3.tar.gz) = 94bd1974a9f2173ac3c2cf122f9fa3c35996b88e
+RMD160 (fuse-2.9.3.tar.gz) = a81f350842a43aa82cff2cb75e0bf9f5b123ad5a
+Size (fuse-2.9.3.tar.gz) = 572044 bytes
+SHA1 (patch-aa) = 1179876c7a4f230d8df8a7a6724b90779c9fa0e3
diff --git a/filesystems/fuse/patches/patch-aa b/filesystems/fuse/patches/patch-aa
index 4a0dcf951d3..ff244161f0f 100644
--- a/filesystems/fuse/patches/patch-aa
+++ b/filesystems/fuse/patches/patch-aa
@@ -1,16 +1,15 @@
-$NetBSD: patch-aa,v 1.2 2010/08/25 08:02:21 manu Exp $
+$NetBSD: patch-aa,v 1.3 2014/11/24 13:19:12 mef Exp $
 
 mount.fuse is a script, not a binary
---- util/Makefile.in.orig	2010-08-24 10:08:52.000000000 +0200
-+++ util/Makefile.in	2010-08-24 10:08:59.000000000 +0200
-@@ -591,9 +591,9 @@
- 	fi
+
+--- util/Makefile.in~	2014-11-24 22:04:40.000000000 +0900
++++ util/Makefile.in	2014-11-24 22:05:24.000000000 +0900
+@@ -684,7 +684,7 @@ install-exec-hook:
  
  install-exec-local:
- 	$(mkdir_p) $(DESTDIR)$(MOUNT_FUSE_PATH)
--	$(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
-+	$(INSTALL_SCRIPT) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
- 	$(mkdir_p) $(DESTDIR)$(INIT_D_PATH)
+ 	$(MKDIR_P) $(DESTDIR)$(MOUNT_FUSE_PATH)
+-	$(INSTALL_PROGRAM) $(builddir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
++	$(INSTALL_SCRIPT) $(builddir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+ 	$(MKDIR_P) $(DESTDIR)$(INIT_D_PATH)
  	$(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
  	@if test -x /usr/sbin/update-rc.d; then \
- 		echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \
diff --git a/filesystems/fuse/patches/patch-ab b/filesystems/fuse/patches/patch-ab
deleted file mode 100644
index 80ef1cf8d9a..00000000000
--- a/filesystems/fuse/patches/patch-ab
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2010/08/25 08:02:21 manu Exp $
-
-NetBSD has the same build oddities af FreeBSD.
---- ./lib/fuse.c.orig	2010-07-25 15:16:03.000000000 +0200
-+++ ./lib/fuse.c	2010-08-07 03:25:21.000000000 +0200
-@@ -953,9 +953,9 @@
- 	if (f->conf.intr)
- 		fuse_do_prepare_interrupt(req, d);
- }
- 
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
- 
- static int fuse_compat_open(struct fuse_fs *fs, const char *path,
- 			    struct fuse_file_info *fi)
- {
-@@ -1048,9 +1048,9 @@
- 	}
- 	return err;
- }
- 
--#else /* __FreeBSD__ */
-+#else /* __FreeBSD__ || __NetBSD__ */
- 
- static inline int fuse_compat_open(struct fuse_fs *fs, char *path,
- 				   struct fuse_file_info *fi)
- {
-@@ -1074,9 +1074,9 @@
- {
- 	return fs->op.statfs(fs->compat == 25 ? "/" : path, buf);
- }
- 
--#endif /* __FreeBSD__ */
-+#endif /* __FreeBSD__ || __NetBSD__ */
- 
- int fuse_fs_getattr(struct fuse_fs *fs, const char *path, struct stat *buf)
- {
- 	fuse_get_context()->private_data = fs->user_data;
-@@ -3720,9 +3720,9 @@
- 
- 	if (!f->conf.ac_attr_timeout_set)
- 		f->conf.ac_attr_timeout = f->conf.attr_timeout;
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__) 
- 	/*
- 	 * In FreeBSD, we always use these settings as inode numbers
- 	 * are needed to make getcwd(3) work.
- 	 */
-@@ -3896,9 +3896,9 @@
- 	mod->next = fuse_modules;
- 	fuse_modules = mod;
- }
- 
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
- 
- static struct fuse *fuse_new_common_compat(int fd, const char *opts,
- 					   const struct fuse_operations *op,
- 					   size_t op_size, int compat)
-@@ -3953,9 +3953,9 @@
- FUSE_SYMVER(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@");
- FUSE_SYMVER(".symver fuse_new_compat2,fuse_new@");
- FUSE_SYMVER(".symver fuse_new_compat22,fuse_new@FUSE_2.2");
- 
--#endif /* __FreeBSD__ */
-+#endif /* __FreeBSD__ || __NetBSD__  */
- 
- struct fuse *fuse_new_compat25(int fd, struct fuse_args *args,
- 			       const struct fuse_operations_compat25 *op,
- 			       size_t op_size)
diff --git a/filesystems/fuse/patches/patch-ac b/filesystems/fuse/patches/patch-ac
deleted file mode 100644
index ad31204480d..00000000000
--- a/filesystems/fuse/patches/patch-ac
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2010/08/25 08:02:21 manu Exp $
-
-NetBSD has the same build oddities af FreeBSD. We also have this strange 
-problem with fuse_req_ctx_compat24
---- ./lib/fuse_lowlevel.c.orig	2010-07-25 15:18:20.000000000 +0200
-+++ ./lib/fuse_lowlevel.c	2010-08-04 03:53:16.000000000 +0200
-@@ -1366,9 +1366,11 @@
- const struct fuse_ctx *fuse_req_ctx_compat24(fuse_req_t req)
- {
- 	return fuse_req_ctx(req);
- }
-+#ifndef __NetBSD__
- FUSE_SYMVER(".symver fuse_req_ctx_compat24,fuse_req_ctx@FUSE_2.4");
-+#endif
- 
- 
- void fuse_req_interrupt_func(fuse_req_t req, fuse_interrupt_func_t func,
- 			     void *data)
-@@ -1735,9 +1733,9 @@
- 	return -ENOSYS;
- }
- #endif
- 
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
- 
- static void fill_open_compat(struct fuse_open_out *arg,
- 			     const struct fuse_file_info_compat *f)
- {
-@@ -1837,17 +1835,17 @@
- FUSE_SYMVER(".symver fuse_reply_statfs_compat,fuse_reply_statfs@FUSE_2.4");
- FUSE_SYMVER(".symver fuse_reply_open_compat,fuse_reply_open@FUSE_2.4");
- FUSE_SYMVER(".symver fuse_lowlevel_new_compat,fuse_lowlevel_new@FUSE_2.4");
- 
--#else /* __FreeBSD__ */
-+#else /* __FreeBSD__ || __NetBSD__ */
- 
- int fuse_sync_compat_args(struct fuse_args *args)
- {
- 	(void) args;
- 	return 0;
- }
- 
--#endif /* __FreeBSD__ */
-+#endif /* __FreeBSD__ || __NetBSD__ */
- 
- struct fuse_session *fuse_lowlevel_new_compat25(struct fuse_args *args,
- 				const struct fuse_lowlevel_ops_compat25 *op,
- 				size_t op_size, void *userdata)
diff --git a/filesystems/fuse/patches/patch-ad b/filesystems/fuse/patches/patch-ad
deleted file mode 100644
index d510e5a19fa..00000000000
--- a/filesystems/fuse/patches/patch-ad
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2010/08/25 08:02:21 manu Exp $
-
-NetBSD has the same build oddities af FreeBSD.
---- ./lib/helper.c.orig	2010-07-25 15:25:28.000000000 +0200
-+++ ./lib/helper.c	2010-07-29 18:05:33.000000000 +0200
-@@ -356,9 +356,9 @@
- }
- 
- #include "fuse_compat.h"
- 
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
- 
- struct fuse *fuse_setup_compat22(int argc, char *argv[],
- 				 const struct fuse_operations_compat22 *op,
- 				 size_t op_size, char **mountpoint,
-@@ -414,9 +414,9 @@
- FUSE_SYMVER(".symver fuse_teardown,__fuse_teardown@");
- FUSE_SYMVER(".symver fuse_main_compat2,fuse_main@");
- FUSE_SYMVER(".symver fuse_main_real_compat22,fuse_main_real@FUSE_2.2");
- 
--#endif /* __FreeBSD__ */
-+#endif /* __FreeBSD__ || __NetBSD__ */
- 
- 
- struct fuse *fuse_setup_compat25(int argc, char *argv[],
- 				 const struct fuse_operations_compat25 *op,
diff --git a/filesystems/fuse/patches/patch-ae b/filesystems/fuse/patches/patch-ae
deleted file mode 100644
index 2e761137ab5..00000000000
--- a/filesystems/fuse/patches/patch-ae
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2010/08/25 08:02:21 manu Exp $
-
-NetBSD uses libperfuse(3). Also remap MNT_* flags to Linux MS_*, and
-unmount(2) to umount2(2)
---- lib/mount.c.orig	2010-04-26 14:11:30.000000000 +0200
-+++ lib/mount.c	2010-08-24 09:20:25.000000000 +0200
-@@ -16,16 +16,30 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
- #include <stddef.h>
-+#include <string.h>
- #include <fcntl.h>
- #include <errno.h>
- #include <sys/poll.h>
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <sys/wait.h>
- #include <sys/mount.h>
- 
-+#ifdef __NetBSD__
-+#include <perfuse.h>
-+
-+#define MS_RDONLY 	MNT_RDONLY
-+#define MS_NOSUID 	MNT_NOSUID
-+#define MS_NODEV 	MNT_NODEV
-+#define MS_NOEXEC 	MNT_NOEXEC
-+#define MS_SYNCHRONOUS 	MNT_SYNCHRONOUS
-+#define MS_NOATIME 	MNT_NOATIME
-+
-+#define umount2(mnt, flags) unmount(mnt, (flags == 2) ? MNT_FORCE : 0)
-+#endif
-+
- #define FUSERMOUNT_PROG		"fusermount"
- #define FUSE_COMMFD_ENV		"_FUSE_COMMFD"
- 
- #ifndef HAVE_FORK
-@@ -154,9 +168,11 @@
- 	{"async",   MS_SYNCHRONOUS, 0},
- 	{"sync",    MS_SYNCHRONOUS, 1},
- 	{"atime",   MS_NOATIME,	    0},
- 	{"noatime", MS_NOATIME,	    1},
-+#ifndef __NetBSD__
- 	{"dirsync", MS_DIRSYNC,	    1},
-+#endif
- 	{NULL,	    0,		    0}
- };
- 
- static void set_mount_flag(const char *s, int *flags)
-@@ -483,8 +499,9 @@
- 
- 		goto out_close;
- 	}
- 
-+#ifndef __NetBSD__
- 	if (geteuid() == 0) {
- 		char *newmnt = fuse_mnt_resolve_path("fuse", mnt);
- 		res = -1;
- 		if (!newmnt)
-@@ -495,8 +512,9 @@
- 		free(newmnt);
- 		if (res == -1)
- 			goto out_umount;
- 	}
-+#endif /* __NetBSD__ */
- 	free(type);
- 	free(source);
- 
- 	return fd;
diff --git a/filesystems/fuse/patches/patch-af b/filesystems/fuse/patches/patch-af
deleted file mode 100644
index 8dd53b5a16d..00000000000
--- a/filesystems/fuse/patches/patch-af
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-af,v 1.1 2010/08/25 08:02:21 manu Exp $
-
-Do not check for inexistant /etc/mtab on NetBSD. Also remap umount2() to 
-unmount(2).
---- lib/mount_util.c.orig	2010-08-24 09:44:43.000000000 +0200
-+++ lib/mount_util.c	2010-08-24 09:48:40.000000000 +0200
-@@ -10,18 +10,25 @@
- #include <stdio.h>
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <signal.h>
- #include <dirent.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <limits.h>
-+#ifndef __NetBSD__
- #include <mntent.h>
-+#endif
- #include <sys/stat.h>
- #include <sys/wait.h>
- #include <sys/mount.h>
- #include <sys/param.h>
- 
-+#ifdef __NetBSD__
-+#define umount2(mnt, flags) unmount(mnt, (flags == 2) ? MNT_FORCE : 0)
-+#define mtab_needs_update(mnt) 0
-+#else
- static int mtab_needs_update(const char *mnt)
- {
- 	int res;
- 	struct stat stbuf;
-@@ -52,8 +59,9 @@
- 	}
- 
- 	return 1;
- }
-+#endif /* __NetBSD__ */
- 
- static int add_mount_legacy(const char *progname, const char *fsname,
- 			    const char *mnt, const char *type, const char *opts)
- {
diff --git a/filesystems/fuse/patches/patch-ag b/filesystems/fuse/patches/patch-ag
deleted file mode 100644
index 40b7cf073a0..00000000000
--- a/filesystems/fuse/patches/patch-ag
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2010/08/25 08:02:21 manu Exp $
-
-NetBSD has the same build oddities af FreeBSD.
---- ./include/fuse_compat.h	2010-07-25 15:16:35.000000000 +0200
-+++ ./include/fuse_compat.h.orig	2010-07-25 15:14:11.000000000 +0200
-@@ -64,9 +64,9 @@
- 				 int *multithreaded, int *fd);
- 
- void fuse_teardown_compat22(struct fuse *fuse, int fd, char *mountpoint);
- 
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
- #include <sys/statfs.h>
- 
- struct fuse_operations_compat22 {
- 	int (*getattr) (const char *, struct stat *);
-@@ -197,5 +197,5 @@
- 
- void fuse_main_compat1(int argc, char *argv[],
- 		       const struct fuse_operations_compat1 *op);
- 
--#endif /* __FreeBSD__ */
-+#endif /* __FreeBSD__ || __NetBSD__ */
diff --git a/filesystems/fuse/patches/patch-ai b/filesystems/fuse/patches/patch-ai
deleted file mode 100644
index d5e31c3ee63..00000000000
--- a/filesystems/fuse/patches/patch-ai
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2010/08/25 08:02:21 manu Exp $
-
-NetBSD has the same build oddities af FreeBSD.
---- ./include/fuse_lowlevel_compat.h.orig	2010-07-25 15:21:50.000000000 +0200
-+++ ./include/fuse_lowlevel_compat.h	2010-07-25 15:22:20.000000000 +0200
-@@ -71,9 +71,9 @@
- 
- char *fuse_add_dirent(char *buf, const char *name, const struct stat *stbuf,
- 		      off_t off);
- 
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
- 
- #include <sys/statfs.h>
- 
- struct fuse_lowlevel_ops_compat {
-@@ -138,9 +138,9 @@
- struct fuse_session *fuse_lowlevel_new_compat(const char *opts,
- 				const struct fuse_lowlevel_ops_compat *op,
- 				size_t op_size, void *userdata);
- 
--#endif /* __FreeBSD__ */
-+#endif /* __FreeBSD__ || __NetBSD__ */
- 
- struct fuse_chan_ops_compat24 {
- 	int (*receive)(struct fuse_chan *ch, char *buf, size_t size);
- 	int (*send)(struct fuse_chan *ch, const struct iovec iov[],
diff --git a/filesystems/fuse/patches/patch-ak b/filesystems/fuse/patches/patch-ak
deleted file mode 100644
index 837f78738d8..00000000000
--- a/filesystems/fuse/patches/patch-ak
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2010/08/25 08:02:21 manu Exp $
-
-Take care of NetBSD so that we can link with -lperfuse in makefile.
---- configure.in.orig	2010-08-24 09:26:08.000000000 +0200
-+++ configure.in	2010-08-24 09:27:01.000000000 +0200
-@@ -15,8 +15,9 @@
- fi
- 
- case $target_os in
-      *linux*)	arch=linux;;
-+     *netbsd*)  arch=netbsd;;
-      *bsd*)	arch=bsd;;
-      *)		arch=unknown;;
- esac
- 
-@@ -90,8 +91,9 @@
- 
- AC_SUBST(subdirs2)
- 
- AM_CONDITIONAL(LINUX, test "$arch" = linux)
-+AM_CONDITIONAL(NETBSD, test "$arch" = netbsd)
- AM_CONDITIONAL(BSD, test "$arch" = bsd)
- 
- AC_CONFIG_FILES([fuse.pc Makefile lib/Makefile util/Makefile example/Makefile include/Makefile])
- AC_OUTPUT
diff --git a/filesystems/fuse/patches/patch-al b/filesystems/fuse/patches/patch-al
deleted file mode 100644
index e86157ebfdf..00000000000
--- a/filesystems/fuse/patches/patch-al
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-al,v 1.1 2010/08/25 08:02:21 manu Exp $
-
-Take care of NetBSD so that we can link with -lperfuse in makefile.
---- configure.orig	2010-08-24 09:28:13.000000000 +0200
-+++ configure	2010-08-24 09:31:20.000000000 +0200
-@@ -788,8 +788,10 @@
- LTLIBOBJS
- LIBOBJS
- BSD_FALSE
- BSD_TRUE
-+NETBSD_FALSE
-+NETBSD_TRUE
- LINUX_FALSE
- LINUX_TRUE
- subdirs2
- INIT_D_PATH
-@@ -12082,8 +12084,9 @@
- fi
- 
- case $target_os in
-      *linux*)	arch=linux;;
-+     *netbsd*)	arch=netbsd;;
-      *bsd*)	arch=bsd;;
-      *)		arch=unknown;;
- esac
- 
-@@ -13671,8 +13674,16 @@
-   LINUX_TRUE='#'
-   LINUX_FALSE=
- fi
- 
-+ if test "$arch" = netbsd; then
-+  NETBSD_TRUE=
-+  NETBSD_FALSE='#'
-+else
-+  NETBSD_TRUE='#'
-+  NETBSD_FALSE=
-+fi
-+
-  if test "$arch" = bsd; then
-   BSD_TRUE=
-   BSD_FALSE='#'
- else
-@@ -13822,8 +13833,15 @@
- $as_echo "$as_me: error: conditional \"LINUX\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
-+if test -z "${NETBSD_TRUE}" && test -z "${NETBSD_FALSE}"; then
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"NETBSD\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+$as_echo "$as_me: error: conditional \"NETBSD\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
- if test -z "${BSD_TRUE}" && test -z "${BSD_FALSE}"; then
-   { { $as_echo "$as_me:$LINENO: error: conditional \"BSD\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
- $as_echo "$as_me: error: conditional \"BSD\" was never defined.
diff --git a/filesystems/fuse/patches/patch-am b/filesystems/fuse/patches/patch-am
deleted file mode 100644
index d5bd9da3d17..00000000000
--- a/filesystems/fuse/patches/patch-am
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-am,v 1.1 2010/08/25 08:02:21 manu Exp $
-
-Link with -lperfuse on NetBSD
---- lib/Makefile.am.orig	2010-08-24 09:32:59.000000000 +0200
-+++ lib/Makefile.am	2010-08-24 09:33:09.000000000 +0200
-@@ -37,8 +37,12 @@
- 
- libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:8:4 \
- 	-Wl,--version-script,$(srcdir)/fuse_versionscript
- 
-+if NETBSD
-+libfuse_la_LIBADD = -lperfuse -lpuffs
-+endif
-+
- libulockmgr_la_SOURCES = ulockmgr.c
- libulockmgr_la_LDFLAGS = -pthread -version-number 1:0:1
- 
- EXTRA_DIST = fuse_versionscript
diff --git a/filesystems/fuse/patches/patch-an b/filesystems/fuse/patches/patch-an
deleted file mode 100644
index c31f687e6cf..00000000000
--- a/filesystems/fuse/patches/patch-an
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-an,v 1.1 2010/08/25 08:02:21 manu Exp $
-
-Link with -lperfuse on NetBSD
---- lib/Makefile.in.orig	2010-08-24 09:33:40.000000000 +0200
-+++ lib/Makefile.in	2010-08-24 09:35:20.000000000 +0200
-@@ -263,8 +263,10 @@
- 
- libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:8:4 \
- 	-Wl,--version-script,$(srcdir)/fuse_versionscript
- 
-+@NETBSD_TRUE@libfuse_la_LIBADD = -lperfuse -lpuffs
-+
- libulockmgr_la_SOURCES = ulockmgr.c
- libulockmgr_la_LDFLAGS = -pthread -version-number 1:0:1
- EXTRA_DIST = fuse_versionscript
- all: all-am
diff --git a/filesystems/fuse/patches/patch-util_fusermount.c b/filesystems/fuse/patches/patch-util_fusermount.c
deleted file mode 100644
index 2d41172bf1b..00000000000
--- a/filesystems/fuse/patches/patch-util_fusermount.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-util_fusermount.c,v 1.1 2012/03/10 20:59:52 markd Exp $
-
-Fix error 'CLONE_NEWNS' undeclared on recent linux.  From git.
-
---- util/fusermount.c.orig	2010-04-26 12:15:36.000000000 +0000
-+++ util/fusermount.c
-@@ -7,6 +7,7 @@
- */
- /* This program does the mounting and unmounting of FUSE filesystems */
- 
-+#define _GNU_SOURCE /* for clone */
- #include <config.h>
- 
- #include "mount_util.h"