CVS commit: pkgsrc/security/password-store

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Tue Nov 23 07:50:15 UTC 2021

Modified Files:
        pkgsrc/security/password-store: Makefile PLIST

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/security/password-store/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/password-store/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/password-store/Makefile
diff -u pkgsrc/security/password-store/Makefile:1.13 pkgsrc/security/password-store/Makefile:1.14
--- pkgsrc/security/password-store/Makefile:1.13        Tue Aug 18 02:12:43 2020
+++ pkgsrc/security/password-store/Makefile     Tue Nov 23 07:50:15 2021
@@ -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/tre
 
 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"

Index: pkgsrc/security/password-store/PLIST
diff -u pkgsrc/security/password-store/PLIST:1.4 pkgsrc/security/password-store/PLIST:1.5
--- pkgsrc/security/password-store/PLIST:1.4    Thu Jun 14 16:08:39 2018
+++ pkgsrc/security/password-store/PLIST        Tue Nov 23 07:50:15 2021
@@ -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/pa
 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