Wed Apr 10 12:33:02 2019 UTC ()
filesystems/fuse-encfs: Fix man page location, and pkglint cleanup

encfs has open-coded per-OS man page locations, and doesn't have the
equivalent of autoconf's --mandir.  Mostly remediate the
cmake-inspired open coding by using PKGMANDIR.

Add patch comment.

Add comment about making TEST_TARGET work.


(gdt)
diff -r1.16 -r1.17 pkgsrc/filesystems/fuse-encfs/Makefile
diff -r1.3 -r1.4 pkgsrc/filesystems/fuse-encfs/PLIST
diff -r1.10 -r1.11 pkgsrc/filesystems/fuse-encfs/distinfo
diff -r1.3 -r1.4 pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_main.cpp
cvs diff -r1.16 -r1.17 pkgsrc/filesystems/fuse-encfs/Makefile (expand / switch to unified diff)

--- pkgsrc/filesystems/fuse-encfs/Makefile 2019/04/09 16:32:28 1.16
+++ pkgsrc/filesystems/fuse-encfs/Makefile 2019/04/10 12:33:01 1.17
@@ -1,33 +1,44 @@ @@ -1,33 +1,44 @@
1# $NetBSD: Makefile,v 1.16 2019/04/09 16:32:28 maya Exp $ 1# $NetBSD: Makefile,v 1.17 2019/04/10 12:33:01 gdt Exp $
2# 2#
3 3
4GITHUB_PROJECT= encfs 4GITHUB_PROJECT= encfs
5GITHUB_TAG= v${PKGVERSION_NOREV} 5GITHUB_TAG= v${PKGVERSION_NOREV}
6DISTNAME= encfs-1.9.4 6DISTNAME= encfs-1.9.4
7PKGNAME= fuse-${DISTNAME} 7PKGNAME= fuse-${DISTNAME}
8PKGREVISION= 1 8PKGREVISION= 2
9CATEGORIES= filesystems 9CATEGORIES= filesystems
10MASTER_SITES= ${MASTER_SITE_GITHUB:=vgough/} 10MASTER_SITES= ${MASTER_SITE_GITHUB:=vgough/}
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://www.arg0.net/encfs 13HOMEPAGE= http://www.arg0.net/encfs
14COMMENT= FUSE Encrypted Filesystem 14COMMENT= FUSE Encrypted Filesystem
15LICENSE= gnu-gpl-v3 15LICENSE= gnu-gpl-v3
16 16
17 17
18USE_TOOLS+= autoconf cmake pkg-config 18USE_TOOLS+= autoconf cmake pkg-config
19USE_CMAKE= yes 19USE_CMAKE= yes
20USE_LANGUAGES= c c++ 20USE_LANGUAGES= c c++
21 21
22CONFIGURE_DIRS= ${WRKDIR}/build 22CONFIGURE_DIRS= ${WRKDIR}/build
23CMAKE_ARG_PATH= ${WRKSRC} 23CMAKE_ARG_PATH= ${WRKSRC}
24 24
 25# Remediate open-coding in cmake that badly reimplements autoconf's
 26# --mandir=.
 27# \todo File a bug upstream.
 28SUBST_CLASSES+= mandir
 29SUBST_STAGE.mandir= pre-configure
 30SUBST_MESSAGE.mandir= Remediating cmake PKGMANDIR
 31SUBST_FILES.mandir= CMakeLists.txt
 32SUBST_SED.mandir= -E -e "/MAN_DESTINATION/s,share/man,${PKGMANDIR},"
 33
 34# \todo Add TEST_DEPENDS for unittest, after finding it or packaging
 35# it.
25TEST_TARGET= test 36TEST_TARGET= test
26 37
27post-extract: 38post-extract:
28 ${RUN} mkdir -p ${WRKDIR}/build 39 ${RUN} mkdir -p ${WRKDIR}/build
29 40
30.include "../../security/openssl/buildlink3.mk" 41.include "../../security/openssl/buildlink3.mk"
31.include "../../mk/fuse.buildlink3.mk" 42.include "../../mk/fuse.buildlink3.mk"
32.include "../../mk/pthread.buildlink3.mk" 43.include "../../mk/pthread.buildlink3.mk"
33.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/filesystems/fuse-encfs/PLIST (expand / switch to unified diff)

--- pkgsrc/filesystems/fuse-encfs/PLIST 2018/03/21 22:38:57 1.3
+++ pkgsrc/filesystems/fuse-encfs/PLIST 2019/04/10 12:33:01 1.4
@@ -1,17 +1,20 @@ @@ -1,17 +1,20 @@
1@comment $NetBSD: PLIST,v 1.3 2018/03/21 22:38:57 gdt Exp $ 1@comment $NetBSD: PLIST,v 1.4 2019/04/10 12:33:01 gdt Exp $
2bin/encfs 2bin/encfs
3bin/encfsctl 3bin/encfsctl
4bin/encfssh 4bin/encfssh
 5man/man1/encfs.1
 6man/man1/encfsctl.1
 7man/man1/encfssh.1
5share/locale/ar/LC_MESSAGES/encfs.mo 8share/locale/ar/LC_MESSAGES/encfs.mo
6share/locale/be/LC_MESSAGES/encfs.mo 9share/locale/be/LC_MESSAGES/encfs.mo
7share/locale/bg/LC_MESSAGES/encfs.mo 10share/locale/bg/LC_MESSAGES/encfs.mo
8share/locale/bs/LC_MESSAGES/encfs.mo 11share/locale/bs/LC_MESSAGES/encfs.mo
9share/locale/ca/LC_MESSAGES/encfs.mo 12share/locale/ca/LC_MESSAGES/encfs.mo
10share/locale/cs/LC_MESSAGES/encfs.mo 13share/locale/cs/LC_MESSAGES/encfs.mo
11share/locale/da/LC_MESSAGES/encfs.mo 14share/locale/da/LC_MESSAGES/encfs.mo
12share/locale/de/LC_MESSAGES/encfs.mo 15share/locale/de/LC_MESSAGES/encfs.mo
13share/locale/de_AT/LC_MESSAGES/encfs.mo 16share/locale/de_AT/LC_MESSAGES/encfs.mo
14share/locale/de_CH/LC_MESSAGES/encfs.mo 17share/locale/de_CH/LC_MESSAGES/encfs.mo
15share/locale/de_DE/LC_MESSAGES/encfs.mo 18share/locale/de_DE/LC_MESSAGES/encfs.mo
16share/locale/el/LC_MESSAGES/encfs.mo 19share/locale/el/LC_MESSAGES/encfs.mo
17share/locale/eo/LC_MESSAGES/encfs.mo 20share/locale/eo/LC_MESSAGES/encfs.mo
@@ -42,16 +45,13 @@ share/locale/pt_BR/LC_MESSAGES/encfs.mo @@ -42,16 +45,13 @@ share/locale/pt_BR/LC_MESSAGES/encfs.mo
42share/locale/pt_PT/LC_MESSAGES/encfs.mo 45share/locale/pt_PT/LC_MESSAGES/encfs.mo
43share/locale/ro/LC_MESSAGES/encfs.mo 46share/locale/ro/LC_MESSAGES/encfs.mo
44share/locale/ru/LC_MESSAGES/encfs.mo 47share/locale/ru/LC_MESSAGES/encfs.mo
45share/locale/sk/LC_MESSAGES/encfs.mo 48share/locale/sk/LC_MESSAGES/encfs.mo
46share/locale/sr/LC_MESSAGES/encfs.mo 49share/locale/sr/LC_MESSAGES/encfs.mo
47share/locale/sv/LC_MESSAGES/encfs.mo 50share/locale/sv/LC_MESSAGES/encfs.mo
48share/locale/ta/LC_MESSAGES/encfs.mo 51share/locale/ta/LC_MESSAGES/encfs.mo
49share/locale/tr/LC_MESSAGES/encfs.mo 52share/locale/tr/LC_MESSAGES/encfs.mo
50share/locale/uk/LC_MESSAGES/encfs.mo 53share/locale/uk/LC_MESSAGES/encfs.mo
51share/locale/vi/LC_MESSAGES/encfs.mo 54share/locale/vi/LC_MESSAGES/encfs.mo
52share/locale/zh_CN/LC_MESSAGES/encfs.mo 55share/locale/zh_CN/LC_MESSAGES/encfs.mo
53share/locale/zh_HK/LC_MESSAGES/encfs.mo 56share/locale/zh_HK/LC_MESSAGES/encfs.mo
54share/locale/zh_TW/LC_MESSAGES/encfs.mo 57share/locale/zh_TW/LC_MESSAGES/encfs.mo
55share/man/man1/encfs.1 
56share/man/man1/encfsctl.1 
57share/man/man1/encfssh.1 
cvs diff -r1.10 -r1.11 pkgsrc/filesystems/fuse-encfs/distinfo (expand / switch to unified diff)

--- pkgsrc/filesystems/fuse-encfs/distinfo 2019/04/09 16:43:10 1.10
+++ pkgsrc/filesystems/fuse-encfs/distinfo 2019/04/10 12:33:01 1.11
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.10 2019/04/09 16:43:10 maya Exp $ 1$NetBSD: distinfo,v 1.11 2019/04/10 12:33:01 gdt Exp $
2 2
3SHA1 (encfs-1.9.4.tar.gz) = bf1e2b7688ee715c487d3d181e810d53c5983a0a 3SHA1 (encfs-1.9.4.tar.gz) = bf1e2b7688ee715c487d3d181e810d53c5983a0a
4RMD160 (encfs-1.9.4.tar.gz) = 847f943f6ae7622d54aa9ef25a64344153c23da0 4RMD160 (encfs-1.9.4.tar.gz) = 847f943f6ae7622d54aa9ef25a64344153c23da0
5SHA512 (encfs-1.9.4.tar.gz) = 082e35e6eae4730b5e7827eed729422f9d995ebe9e441c5f9725f39cc2f46f014ac1479c7b0a7ce04e9e7228c1a93ecf5b4228e667fc48e6a7d3b68d2324cd0b 5SHA512 (encfs-1.9.4.tar.gz) = 082e35e6eae4730b5e7827eed729422f9d995ebe9e441c5f9725f39cc2f46f014ac1479c7b0a7ce04e9e7228c1a93ecf5b4228e667fc48e6a7d3b68d2324cd0b
6Size (encfs-1.9.4.tar.gz) = 2794574 bytes 6Size (encfs-1.9.4.tar.gz) = 2794574 bytes
7SHA1 (patch-encfs_DirNode.cpp) = 960480ee442f534357e3325c5001b6056b2338a6 7SHA1 (patch-encfs_DirNode.cpp) = 960480ee442f534357e3325c5001b6056b2338a6
8SHA1 (patch-encfs_FileUtils.cpp) = 52cfc5d4111f052f490cb64ca7bd00e70ee2e664 8SHA1 (patch-encfs_FileUtils.cpp) = 52cfc5d4111f052f490cb64ca7bd00e70ee2e664
9SHA1 (patch-encfs_main.cpp) = f7f1d9aa6d953aee98b534428e111f38b012d70f 9SHA1 (patch-encfs_main.cpp) = b3dea40037df093183c008917690fc486e8608a9
cvs diff -r1.3 -r1.4 pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_main.cpp (expand / switch to unified diff)

--- pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_main.cpp 2018/03/21 22:38:57 1.3
+++ pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_main.cpp 2019/04/10 12:33:02 1.4
@@ -1,14 +1,20 @@ @@ -1,14 +1,20 @@
1$NetBSD: patch-encfs_main.cpp,v 1.3 2018/03/21 22:38:57 gdt Exp $ 1$NetBSD: patch-encfs_main.cpp,v 1.4 2019/04/10 12:33:02 gdt Exp $
 2
 3Work around older FUSE API on NetBSD.
 4
 5\todo Determine how to qualify this by version.
 6\todo Enhance API in NetBSD.
 7\todo File with encfs upstream.
2 8
3--- encfs/main.cpp.orig 2018-01-28 21:07:41.000000000 +0000 9--- encfs/main.cpp.orig 2018-01-28 21:07:41.000000000 +0000
4+++ encfs/main.cpp 10+++ encfs/main.cpp
5@@ -530,7 +530,9 @@ void *encfs_init(fuse_conn_info *conn) { 11@@ -530,7 +530,9 @@ void *encfs_init(fuse_conn_info *conn) {
6 auto *ctx = (EncFS_Context *)fuse_get_context()->private_data; 12 auto *ctx = (EncFS_Context *)fuse_get_context()->private_data;
7  13
8 // set fuse connection options 14 // set fuse connection options
9+#ifndef __NetBSD__ /* XXX FUSE API too old */ 15+#ifndef __NetBSD__ /* XXX FUSE API too old */
10 conn->async_read = 1u; 16 conn->async_read = 1u;
11+#endif 17+#endif
12  18
13 // if an idle timeout is specified, then setup a thread to monitor the 19 // if an idle timeout is specified, then setup a thread to monitor the
14 // filesystem. 20 // filesystem.