kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

filesystems/fuse-encfs: Fix man page location, and pkglint cleanup

Browse source 
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.
This commit is contained in:
gdt 2019-04-10 12:33:01 +00:00
parent bb27e4cd70
commit 529a2b4d93
4 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
filesystems/fuse-encfs/Makefile
View file

@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.16 2019/04/09 16:32:28 maya Exp $
# $NetBSD: Makefile,v 1.17 2019/04/10 12:33:01 gdt Exp $
#
GITHUB_PROJECT= encfs
GITHUB_TAG= v${PKGVERSION_NOREV}
DISTNAME= encfs-1.9.4
PKGNAME= fuse-${DISTNAME}
PKGREVISION= 1
PKGREVISION= 2
CATEGORIES= filesystems
MASTER_SITES= ${MASTER_SITE_GITHUB:=vgough/}
@ -22,6 +22,17 @@ USE_LANGUAGES= c c++
CONFIGURE_DIRS= ${WRKDIR}/build
CMAKE_ARG_PATH= ${WRKSRC}
# Remediate open-coding in cmake that badly reimplements autoconf's
# --mandir=.
# \todo File a bug upstream.
SUBST_CLASSES+= mandir
SUBST_STAGE.mandir= pre-configure
SUBST_MESSAGE.mandir= Remediating cmake PKGMANDIR
SUBST_FILES.mandir= CMakeLists.txt
SUBST_SED.mandir= -E -e "/MAN_DESTINATION/s,share/man,${PKGMANDIR},"
# \todo Add TEST_DEPENDS for unittest, after finding it or packaging
# it.
TEST_TARGET= test
post-extract:

8
filesystems/fuse-encfs/PLIST
View file

@ -1,7 +1,10 @@
@comment $NetBSD: PLIST,v 1.3 2018/03/21 22:38:57 gdt Exp $
@comment $NetBSD: PLIST,v 1.4 2019/04/10 12:33:01 gdt Exp $
bin/encfs
bin/encfsctl
bin/encfssh
man/man1/encfs.1
man/man1/encfsctl.1
man/man1/encfssh.1
share/locale/ar/LC_MESSAGES/encfs.mo
share/locale/be/LC_MESSAGES/encfs.mo
share/locale/bg/LC_MESSAGES/encfs.mo
@ -52,6 +55,3 @@ share/locale/vi/LC_MESSAGES/encfs.mo
share/locale/zh_CN/LC_MESSAGES/encfs.mo
share/locale/zh_HK/LC_MESSAGES/encfs.mo
share/locale/zh_TW/LC_MESSAGES/encfs.mo
share/man/man1/encfs.1
share/man/man1/encfsctl.1
share/man/man1/encfssh.1

4
filesystems/fuse-encfs/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.10 2019/04/09 16:43:10 maya Exp $
$NetBSD: distinfo,v 1.11 2019/04/10 12:33:01 gdt Exp $
SHA1 (encfs-1.9.4.tar.gz) = bf1e2b7688ee715c487d3d181e810d53c5983a0a
RMD160 (encfs-1.9.4.tar.gz) = 847f943f6ae7622d54aa9ef25a64344153c23da0
@ -6,4 +6,4 @@ SHA512 (encfs-1.9.4.tar.gz) = 082e35e6eae4730b5e7827eed729422f9d995ebe9e441c5f97
Size (encfs-1.9.4.tar.gz) = 2794574 bytes
SHA1 (patch-encfs_DirNode.cpp) = 960480ee442f534357e3325c5001b6056b2338a6
SHA1 (patch-encfs_FileUtils.cpp) = 52cfc5d4111f052f490cb64ca7bd00e70ee2e664
SHA1 (patch-encfs_main.cpp) = f7f1d9aa6d953aee98b534428e111f38b012d70f
SHA1 (patch-encfs_main.cpp) = b3dea40037df093183c008917690fc486e8608a9

8
filesystems/fuse-encfs/patches/patch-encfs_main.cpp
View file

@ -1,4 +1,10 @@
$NetBSD: patch-encfs_main.cpp,v 1.3 2018/03/21 22:38:57 gdt Exp $
$NetBSD: patch-encfs_main.cpp,v 1.4 2019/04/10 12:33:02 gdt Exp $
Work around older FUSE API on NetBSD.
\todo Determine how to qualify this by version.
\todo Enhance API in NetBSD.
\todo File with encfs upstream.
--- encfs/main.cpp.orig 2018-01-28 21:07:41.000000000 +0000
+++ encfs/main.cpp