summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpho <pho@pkgsrc.org>2021-11-23 07:50:15 +0000
committerpho <pho@pkgsrc.org>2021-11-23 07:50:15 +0000
commit96b5905909c7e352f1e60174a4e8dc7a5122d3b0 (patch)
treedc2f620ad3cab253d80409aee48d87e36a918f31
parentf076ff86e53003b3a92ec74fba231a507b953d0a (diff)
downloadpkgsrc-96b5905909c7e352f1e60174a4e8dc7a5122d3b0.tar.gz
Install shell-completion scripts into shell-specific directories
...so that they will be automatically found by shells. It's more helpful than requiring users to copy scripts from share/examples.
-rw-r--r--security/password-store/Makefile20
-rw-r--r--security/password-store/PLIST8
2 files changed, 17 insertions, 11 deletions
diff --git a/security/password-store/Makefile b/security/password-store/Makefile
index fa9d7d9a78b..8a8457e21dd 100644
--- a/security/password-store/Makefile
+++ b/security/password-store/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2020/08/18 02:12:43 tnn Exp $
+# $NetBSD: Makefile,v 1.14 2021/11/23 07:50:15 pho Exp $
DISTNAME= password-store-1.7.3
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= security
MASTER_SITES= http://git.zx2c4.com/password-store/snapshot/
EXTRACT_SUFX= .tar.xz
@@ -22,7 +22,10 @@ DEPENDS+= tree>=1.7.0:../../sysutils/tree
EGDIR= share/examples/password-store
INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
-INSTALLATION_DIRS+= ${EGDIR}/contrib ${EGDIR}/completion
+INSTALLATION_DIRS+= ${EGDIR}/contrib
+INSTALLATION_DIRS+= share/bash-completion/completions
+INSTALLATION_DIRS+= share/fish/completions
+INSTALLATION_DIRS+= share/zsh/site-functions
REPLACE_BASH+= src/password-store.sh
REPLACE_BASH+= tests/*.sh
@@ -44,13 +47,16 @@ do-install:
${DESTDIR}${PREFIX}/bin/pass
${INSTALL_SCRIPT} ${WRKSRC}/man/example-filter.sh \
${DESTDIR}${PREFIX}/${EGDIR}
- ${INSTALL_MAN} ${WRKSRC}/man/pass.1 \
+ ${INSTALL_MAN} ${WRKSRC}/man/pass.1 \
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/pass.1
cd ${WRKSRC}/contrib && \
${PAX} -wr * -s',.*\.orig$$,,' -s',.*\.gitignore$$,,' \
${DESTDIR}${PREFIX}/${EGDIR}/contrib
- cd ${WRKSRC}/src/completion && \
- ${PAX} -wr * -s',.*\.orig$$,,' -s',.*\.gitignore$$,,' \
- ${DESTDIR}${PREFIX}/${EGDIR}/completion
+ ${INSTALL_DATA} ${WRKSRC}/src/completion/pass.bash-completion \
+ ${DESTDIR}${PREFIX}/share/bash-completion/completions/pass
+ ${INSTALL_DATA} ${WRKSRC}/src/completion/pass.fish-completion \
+ ${DESTDIR}${PREFIX}/share/fish/completions/pass.fish
+ ${INSTALL_DATA} ${WRKSRC}/src/completion/pass.zsh-completion \
+ ${DESTDIR}${PREFIX}/share/zsh/site-functions/_pass
.include "../../mk/bsd.pkg.mk"
diff --git a/security/password-store/PLIST b/security/password-store/PLIST
index 38d6e9b9594..68c24d4f7be 100644
--- a/security/password-store/PLIST
+++ b/security/password-store/PLIST
@@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2018/06/14 16:08:39 leot Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/11/23 07:50:15 pho Exp $
bin/pass
man/man1/pass.1
-share/examples/password-store/completion/pass.bash-completion
-share/examples/password-store/completion/pass.fish-completion
-share/examples/password-store/completion/pass.zsh-completion
+share/bash-completion/completions/pass
share/examples/password-store/contrib/dmenu/README.md
share/examples/password-store/contrib/dmenu/passmenu
share/examples/password-store/contrib/emacs/CHANGELOG.md
@@ -28,3 +26,5 @@ share/examples/password-store/contrib/pass.applescript
share/examples/password-store/contrib/vim/redact_pass.txt
share/examples/password-store/contrib/vim/redact_pass.vim
share/examples/password-store/example-filter.sh
+share/fish/completions/pass.fish
+share/zsh/site-functions/_pass