Sun Sep 23 12:39:19 2018 UTC ()
password-store: Adjust BASE64 definition as part of fixsh SUBST class

Instead of using a generic `base64' initialize the BASE64 variable in order to
actually use converters/base64 (this was problematic when for example NetBSD
base64(1) was used).

Bump PKGREVISION


(leot)
diff -r1.10 -r1.11 pkgsrc/security/password-store/Makefile
cvs diff -r1.10 -r1.11 pkgsrc/security/password-store/Makefile (expand / switch to unified diff)

--- pkgsrc/security/password-store/Makefile 2018/09/19 09:45:18 1.10
+++ pkgsrc/security/password-store/Makefile 2018/09/23 12:39:19 1.11
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.10 2018/09/19 09:45:18 leot Exp $ 1# $NetBSD: Makefile,v 1.11 2018/09/23 12:39:19 leot Exp $
2 2
3DISTNAME= password-store-1.7.3 3DISTNAME= password-store-1.7.3
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= security 5CATEGORIES= security
6MASTER_SITES= http://git.zx2c4.com/password-store/snapshot/ 6MASTER_SITES= http://git.zx2c4.com/password-store/snapshot/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= imil@NetBSD.org 9MAINTAINER= imil@NetBSD.org
10HOMEPAGE= https://www.passwordstore.org/ 10HOMEPAGE= https://www.passwordstore.org/
11COMMENT= Standard UNIX password manager 11COMMENT= Standard UNIX password manager
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_LANGUAGES= # none 14USE_LANGUAGES= # none
15NO_BUILD= yes 15NO_BUILD= yes
16USE_TOOLS+= gmake pax bash:run 16USE_TOOLS+= gmake pax bash:run
17 17
@@ -22,26 +22,27 @@ DEPENDS+= tree>=1.7.0:../../sysutils/tre @@ -22,26 +22,27 @@ DEPENDS+= tree>=1.7.0:../../sysutils/tre
22EGDIR= share/examples/password-store 22EGDIR= share/examples/password-store
23INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 23INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
24INSTALLATION_DIRS+= ${EGDIR}/contrib ${EGDIR}/completion 24INSTALLATION_DIRS+= ${EGDIR}/contrib ${EGDIR}/completion
25 25
26REPLACE_BASH+= src/password-store.sh 26REPLACE_BASH+= src/password-store.sh
27REPLACE_BASH+= tests/*.sh 27REPLACE_BASH+= tests/*.sh
28 28
29SUBST_CLASSES+= fixsh 29SUBST_CLASSES+= fixsh
30SUBST_STAGE.fixsh= pre-configure 30SUBST_STAGE.fixsh= pre-configure
31SUBST_MESSAGE.fixsh= Fixing shell script 31SUBST_MESSAGE.fixsh= Fixing shell script
32SUBST_FILES.fixsh= src/password-store.sh 32SUBST_FILES.fixsh= src/password-store.sh
33SUBST_SED.fixsh+= -e 's,GETOPT="getopt",GETOPT="${PREFIX}/bin/getopt",' 33SUBST_SED.fixsh+= -e 's,GETOPT="getopt",GETOPT="${PREFIX}/bin/getopt",'
34SUBST_SED.fixsh+= -e "s,SHRED=\"shred -f -z\",SHRED=\"${RM} -f -P\"," 34SUBST_SED.fixsh+= -e "s,SHRED=\"shred -f -z\",SHRED=\"${RM} -f -P\","
 35SUBST_SED.fixsh+= -e 's,BASE64="base64",BASE64="${PREFIX}/bin/base64",'
35 36
36TEST_TARGET= test 37TEST_TARGET= test
37 38
38.include "options.mk" 39.include "options.mk"
39 40
40do-install: 41do-install:
41 ${INSTALL_SCRIPT} ${WRKSRC}/src/password-store.sh \ 42 ${INSTALL_SCRIPT} ${WRKSRC}/src/password-store.sh \
42 ${DESTDIR}${PREFIX}/bin/pass 43 ${DESTDIR}${PREFIX}/bin/pass
43 ${INSTALL_SCRIPT} ${WRKSRC}/man/example-filter.sh \ 44 ${INSTALL_SCRIPT} ${WRKSRC}/man/example-filter.sh \
44 ${DESTDIR}${PREFIX}/${EGDIR} 45 ${DESTDIR}${PREFIX}/${EGDIR}
45 ${INSTALL_MAN} ${WRKSRC}/man/pass.1 \ 46 ${INSTALL_MAN} ${WRKSRC}/man/pass.1 \
46 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/pass.1 47 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/pass.1
47 cd ${WRKSRC}/contrib && \ 48 cd ${WRKSRC}/contrib && \