CVS commit: pkgsrc/filesystems/fuse-unionfs

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon Sep 17 14:03:09 UTC 2018

Modified Files:
        pkgsrc/filesystems/fuse-unionfs: Makefile PLIST distinfo
Added Files:
        pkgsrc/filesystems/fuse-unionfs/patches: patch-Makefile
Removed Files:
        pkgsrc/filesystems/fuse-unionfs/patches: patch-cow_utils.h
            patch-unionfs.c

Log Message:
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)


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/filesystems/fuse-unionfs/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/filesystems/fuse-unionfs/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/filesystems/fuse-unionfs/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/filesystems/fuse-unionfs/patches/patch-Makefile
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/filesystems/fuse-unionfs/patches/patch-cow_utils.h \
    pkgsrc/filesystems/fuse-unionfs/patches/patch-unionfs.c

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-unionfs/Makefile
diff -u pkgsrc/filesystems/fuse-unionfs/Makefile:1.6 pkgsrc/filesystems/fuse-unionfs/Makefile:1.7
--- pkgsrc/filesystems/fuse-unionfs/Makefile:1.6        Sat Aug 19 00:20:50 2017
+++ pkgsrc/filesystems/fuse-unionfs/Makefile    Mon Sep 17 14:03:08 2018
@@ -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/u
 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"

Index: pkgsrc/filesystems/fuse-unionfs/PLIST
diff -u pkgsrc/filesystems/fuse-unionfs/PLIST:1.2 pkgsrc/filesystems/fuse-unionfs/PLIST:1.3
--- pkgsrc/filesystems/fuse-unionfs/PLIST:1.2   Mon Feb  1 02:41:21 2016
+++ pkgsrc/filesystems/fuse-unionfs/PLIST       Mon Sep 17 14:03:08 2018
@@ -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

Index: pkgsrc/filesystems/fuse-unionfs/distinfo
diff -u pkgsrc/filesystems/fuse-unionfs/distinfo:1.5 pkgsrc/filesystems/fuse-unionfs/distinfo:1.6
--- pkgsrc/filesystems/fuse-unionfs/distinfo:1.5        Mon Feb  1 02:41:21 2016
+++ pkgsrc/filesystems/fuse-unionfs/distinfo    Mon Sep 17 14:03:08 2018
@@ -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

Added files:

Index: pkgsrc/filesystems/fuse-unionfs/patches/patch-Makefile
diff -u /dev/null pkgsrc/filesystems/fuse-unionfs/patches/patch-Makefile:1.1
--- /dev/null   Mon Sep 17 14:03:09 2018
+++ pkgsrc/filesystems/fuse-unionfs/patches/patch-Makefile      Mon Sep 17 14:03:09 2018
@@ -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/