CVS commit: pkgsrc/filesystems/fuse-unionfs

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Mon Sep 17 14:33:35 UTC 2018

Modified Files:
        pkgsrc/filesystems/fuse-unionfs: Makefile PLIST distinfo
        pkgsrc/filesystems/fuse-unionfs/patches: patch-Makefile

Log Message:
fuse-unionfs: Simplify the package a bit

- MASTER_SITE_GITHUB only needs the repository owner username, adjust it in
  DISTNAME in order to avoid DIST_SUBDIR and WRKSRC redefinition
- Add LICENSE
- Append to USE_TOOLS
- Both INSTALLATION_DIRS and pre-install target are not needed because it is
  done via Makefile (needed a little adjustements of patch-Makefile
  `install -d' of ${MANDIR})

Last item discussed with <maya> (any possible regression is mine though!)


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

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.7 pkgsrc/filesystems/fuse-unionfs/Makefile:1.8
--- pkgsrc/filesystems/fuse-unionfs/Makefile:1.7        Mon Sep 17 14:03:08 2018
+++ pkgsrc/filesystems/fuse-unionfs/Makefile    Mon Sep 17 14:33:35 2018
@@ -1,30 +1,23 @@
-# $NetBSD: Makefile,v 1.7 2018/09/17 14:03:08 maya Exp $
-#
+# $NetBSD: Makefile,v 1.8 2018/09/17 14:33:35 leot Exp $
 
-DISTNAME=      v2.0
-DIST_SUBDIR=   ${PKGBASE}
-PKGNAME=       fuse-unionfs-${DISTNAME:S/v//}
+DISTNAME=      unionfs-fuse-2.0
+PKGNAME=       ${DISTNAME:S/unionfs-fuse/fuse-unionfs/}
 CATEGORIES=    filesystems
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=rpodgorny/unionfs-fuse/archive/}
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=rpodgorny/}
+GITHUB_PROJECT=        unionfs-fuse
+GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/rpodgorny/unionfs-fuse
 COMMENT=       FUSE-based union filesystem
+LICENSE=       modified-bsd
 
 BUILD_TARGET=  build
-USE_TOOLS=     gmake pkg-config bash:run
-WRKSRC=                ${WRKDIR}/unionfs-fuse-${DISTNAME:S/v//}
+USE_TOOLS+=    gmake pkg-config bash:run
 
 REPLACE_BASH+= mount.unionfs
 
 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.3 pkgsrc/filesystems/fuse-unionfs/PLIST:1.4
--- pkgsrc/filesystems/fuse-unionfs/PLIST:1.3   Mon Sep 17 14:03:08 2018
+++ pkgsrc/filesystems/fuse-unionfs/PLIST       Mon Sep 17 14:33:35 2018
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2018/09/17 14:03:08 maya Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/09/17 14:33:35 leot Exp $
 bin/unionfs
 bin/unionfsctl
-sbin/mount.unionfs
 man/man8/unionfs.8
+sbin/mount.unionfs

Index: pkgsrc/filesystems/fuse-unionfs/distinfo
diff -u pkgsrc/filesystems/fuse-unionfs/distinfo:1.6 pkgsrc/filesystems/fuse-unionfs/distinfo:1.7
--- pkgsrc/filesystems/fuse-unionfs/distinfo:1.6        Mon Sep 17 14:03:08 2018
+++ pkgsrc/filesystems/fuse-unionfs/distinfo    Mon Sep 17 14:33:35 2018
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2018/09/17 14:03:08 maya Exp $
+$NetBSD: distinfo,v 1.7 2018/09/17 14:33:35 leot Exp $
 
-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
+SHA1 (unionfs-fuse-2.0.tar.gz) = a883bcd5d57345d7b154998908e72249946f6ad2
+RMD160 (unionfs-fuse-2.0.tar.gz) = f135f854f316bc9fd6272450b8aa11a420c15d31
+SHA512 (unionfs-fuse-2.0.tar.gz) = 5b60204632f498931fff7671cc9f40b1800d34cb8c0d0de0773626e2653eb0a36647566c92c1d0cf79543e01b934602ef5603a06508407f352e48ef27a7ee758
+Size (unionfs-fuse-2.0.tar.gz) = 46537 bytes
+SHA1 (patch-Makefile) = b4eceef7cd6131e8f6446fea98ec367e83202497

Index: pkgsrc/filesystems/fuse-unionfs/patches/patch-Makefile
diff -u pkgsrc/filesystems/fuse-unionfs/patches/patch-Makefile:1.1 pkgsrc/filesystems/fuse-unionfs/patches/patch-Makefile:1.2
--- pkgsrc/filesystems/fuse-unionfs/patches/patch-Makefile:1.1  Mon Sep 17 14:03:09 2018
+++ pkgsrc/filesystems/fuse-unionfs/patches/patch-Makefile      Mon Sep 17 14:33:35 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.1 2018/09/17 14:03:09 maya Exp $
+$NetBSD: patch-Makefile,v 1.2 2018/09/17 14:33:35 leot Exp $
 
 Allow overriding PREFIX.
 
@@ -28,7 +28,7 @@ Allow overriding PREFIX.
 -      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 -d $(DESTDIR)$(PREFIX)/$(MANDIR)/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)