fuse-unionfs: update to 2.0

- fixed NEWS file ;-)
- reverted meta directory name back to .unionfs (from .unionfs-fuse)
  this was never meant to be changed and slipped in in 1.0 release
- fixes and speed improvements

from dziltener in PR pkg/52866 with some changes from myself
(I did not test functionality following the changes)

6 files changed, 55 insertions, 75 deletions

diff --git a/filesystems/fuse-unionfs/Makefile b/filesystems/fuse-unionfs/Makefile
index bd3867a9363..c6e331cf533 100644
--- a/filesystems/fuse-unionfs/Makefile
+++ b/filesystems/fuse-unionfs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2017/08/19 00:20:50 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2018/09/17 14:03:08 maya Exp $
 #
 
-DISTNAME=	v1.0
+DISTNAME=	v2.0
 DIST_SUBDIR=	${PKGBASE}
 PKGNAME=	fuse-unionfs-${DISTNAME:S/v//}
 CATEGORIES=	filesystems
@@ -12,18 +12,19 @@ HOMEPAGE=	https://github.com/rpodgorny/unionfs-fuse
 COMMENT=	FUSE-based union filesystem
 
 BUILD_TARGET=	build
-USE_TOOLS=	gmake pkg-config
+USE_TOOLS=	gmake pkg-config bash:run
 WRKSRC=		${WRKDIR}/unionfs-fuse-${DISTNAME:S/v//}
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8
+REPLACE_BASH+=	mount.unionfs
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/unionfs \
-		${DESTDIR}${PREFIX}/bin/unionfs
-	${INSTALL_PROGRAM} ${WRKSRC}/src/unionfsctl \
-		${DESTDIR}${PREFIX}/bin/unionfsctl
-	${INSTALL_MAN} ${WRKSRC}/man/unionfs.8 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+MAKE_ENV+=		MANDIR=${PKGMANDIR}
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8
 
 .include "../../mk/fuse.buildlink3.mk"
+
+pre-install:
+	mkdir -p ${DESTDIR}${PREFIX}/bin
+	mkdir -p ${DESTDIR}${PREFIX}/sbin
+	mkdir -p ${DESTDIR}${PREFIX}${PKGMANDIR}/man8
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/filesystems/fuse-unionfs/PLIST b/filesystems/fuse-unionfs/PLIST
index 3e34fbe471c..614ef2467e2 100644
--- a/filesystems/fuse-unionfs/PLIST
+++ b/filesystems/fuse-unionfs/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2016/02/01 02:41:21 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/09/17 14:03:08 maya Exp $
 bin/unionfs
 bin/unionfsctl
+sbin/mount.unionfs
 man/man8/unionfs.8
diff --git a/filesystems/fuse-unionfs/distinfo b/filesystems/fuse-unionfs/distinfo
index 88ca5b885b6..125ba9c1b2e 100644
--- a/filesystems/fuse-unionfs/distinfo
+++ b/filesystems/fuse-unionfs/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.5 2016/02/01 02:41:21 jmmv Exp $
+$NetBSD: distinfo,v 1.6 2018/09/17 14:03:08 maya Exp $
 
-SHA1 (fuse-unionfs/v1.0.tar.gz) = f35e5a3f0e033291981766f50cd9895d23fae649
-RMD160 (fuse-unionfs/v1.0.tar.gz) = 9bfed432a36e1736ed197c3292c02d6d57469bf5
-SHA512 (fuse-unionfs/v1.0.tar.gz) = 805151acaeae8526fba430701a1690f6eb0ad8331a9e730095ee538dc2b148d02fe996a63e8a7f6471d1ef622cc5c03d82bd2b2faad1ebe3b614ec343c2f55de
-Size (fuse-unionfs/v1.0.tar.gz) = 48149 bytes
-SHA1 (patch-cow_utils.h) = 78322cee0b3c240df7e63b6ec405ad1a6cdefc2c
-SHA1 (patch-unionfs.c) = dd05ff561ff1def121619fa1cce4f9f3206c625f
+SHA1 (fuse-unionfs/v2.0.tar.gz) = a883bcd5d57345d7b154998908e72249946f6ad2
+RMD160 (fuse-unionfs/v2.0.tar.gz) = f135f854f316bc9fd6272450b8aa11a420c15d31
+SHA512 (fuse-unionfs/v2.0.tar.gz) = 5b60204632f498931fff7671cc9f40b1800d34cb8c0d0de0773626e2653eb0a36647566c92c1d0cf79543e01b934602ef5603a06508407f352e48ef27a7ee758
+Size (fuse-unionfs/v2.0.tar.gz) = 46537 bytes
+SHA1 (patch-Makefile) = bdfbb3433f0f7f56a6c8a6f07ed25d0835bae6d8
diff --git a/filesystems/fuse-unionfs/patches/patch-Makefile b/filesystems/fuse-unionfs/patches/patch-Makefile
new file mode 100644
index 00000000000..2b950681b53
--- /dev/null
+++ b/filesystems/fuse-unionfs/patches/patch-Makefile
@@ -0,0 +1,35 @@
+$NetBSD: patch-Makefile,v 1.1 2018/09/17 14:03:09 maya Exp $
+
+Allow overriding PREFIX.
+
+--- Makefile.orig	2016-11-22 00:57:34.000000000 +0000
++++ Makefile
+@@ -1,6 +1,7 @@
+-PREFIX=/usr/local
+-BINDIR=/bin
+-SBINDIR=/sbin
++PREFIX?=/usr/local
++BINDIR=bin
++SBINDIR=sbin
++MANDIR?=share/man
+ 
+ build:
+ 	$(MAKE) -C src/
+@@ -26,10 +27,10 @@ coverage:
+ 	mkdir $@
+ 
+ install: build
+-	install -d $(DESTDIR)$(PREFIX)$(BINDIR)
+-	install -d $(DESTDIR)$(PREFIX)$(SBINDIR)
+-	install -d $(DESTDIR)$(PREFIX)/share/man/man8
+-	install -m 0755 src/unionfs $(DESTDIR)$(PREFIX)$(BINDIR)
+-	install -m 0755 src/unionfsctl $(DESTDIR)$(PREFIX)$(BINDIR)
+-	install -m 0755 mount.unionfs $(DESTDIR)$(PREFIX)$(SBINDIR)
+-	install -m 0644 man/unionfs.8 $(DESTDIR)$(PREFIX)/share/man/man8/
++	install -d $(DESTDIR)$(PREFIX)/$(BINDIR)
++	install -d $(DESTDIR)$(PREFIX)/$(SBINDIR)
++	install -d $(DESTDIR)$(PREFIX)/$(MANDIR)
++	install -m 0755 src/unionfs $(DESTDIR)$(PREFIX)/$(BINDIR)
++	install -m 0755 src/unionfsctl $(DESTDIR)$(PREFIX)/$(BINDIR)
++	install -m 0755 mount.unionfs $(DESTDIR)$(PREFIX)/$(SBINDIR)
++	install -m 0644 man/unionfs.8 $(DESTDIR)$(PREFIX)/$(MANDIR)/man8/
diff --git a/filesystems/fuse-unionfs/patches/patch-cow_utils.h b/filesystems/fuse-unionfs/patches/patch-cow_utils.h
deleted file mode 100644
index 8b4aff42704..00000000000
--- a/filesystems/fuse-unionfs/patches/patch-cow_utils.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-cow_utils.h,v 1.1 2016/02/01 02:41:21 jmmv Exp $
-
---- src/cow_utils.h.orig	2015-01-14 10:08:20.000000000 +0000
-+++ src/cow_utils.h
-@@ -8,7 +8,9 @@
- #define COW_UTILS_H
- 
- #define VM_AND_BUFFER_CACHE_SYNCHRONIZED
-+#if !defined(MAXBSIZE)
- #define MAXBSIZE 4096
-+#endif
- 
- struct cow {
- 	mode_t umask;
diff --git a/filesystems/fuse-unionfs/patches/patch-unionfs.c b/filesystems/fuse-unionfs/patches/patch-unionfs.c
deleted file mode 100644
index 52f56740acc..00000000000
--- a/filesystems/fuse-unionfs/patches/patch-unionfs.c
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-unionfs.c,v 1.1 2016/02/01 02:41:21 jmmv Exp $
-
---- src/unionfs.c.orig	2015-01-14 10:08:20.000000000 +0000
-+++ src/unionfs.c
-@@ -23,8 +23,10 @@
- 
- #if __APPLE__
- #include <fuse_common.h>
--#else
-+#elif defined linux
- #include <fuse/fuse_common.h>
-+#else
-+#include <fuse.h>
- #endif
- 
- #include <stdio.h>
-@@ -267,6 +269,7 @@ static int unionfs_link(const char *from
- 	RETURN(0);
- }
- 
-+#if defined(FUSE_IOCTL_COMPAT)
- static int unionfs_ioctl(const char *path, int cmd, void *arg, struct fuse_file_info *fi, unsigned int flags, void *data) {
- 	(void) path;
- 	(void) arg; // avoid compiler warning
-@@ -303,6 +306,7 @@ static int unionfs_ioctl(const char *pat
- 
- 	return 0;
- }
-+#endif
- 
- /**
-  * unionfs mkdir() implementation
-@@ -806,7 +810,9 @@ static struct fuse_operations unionfs_op
- 	.fsync = unionfs_fsync,
- 	.getattr = unionfs_getattr,
- 	.init = unionfs_init,
-+#if defined(FUSE_IOCTL_COMPAT)
- 	.ioctl = unionfs_ioctl,
-+#endif
- 	.link = unionfs_link,
- 	.mkdir = unionfs_mkdir,
- 	.mknod = unionfs_mknod,