[pkgsrc/trunk]: pkgsrc/devel/git-base git-base: Install bash completion corre...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3b2b2d099461
branches:  trunk
changeset: 448579:3b2b2d099461
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Mar 10 16:58:05 2021 +0000

description:
git-base: Install bash completion correctly.

Bump PKGREVISION.

diffstat:

 devel/git-base/Makefile |  15 +++++++++------
 devel/git-base/PLIST    |   4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diffs (60 lines):

diff -r 8dc00ebcbc47 -r 3b2b2d099461 devel/git-base/Makefile
--- a/devel/git-base/Makefile   Wed Mar 10 16:44:30 2021 +0000
+++ b/devel/git-base/Makefile   Wed Mar 10 16:58:05 2021 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.84 2020/10/31 21:10:01 adam Exp $
+# $NetBSD: Makefile,v 1.85 2021/03/10 16:58:05 jperkin Exp $
 
 .include "../../devel/git/Makefile.common"
 
 PKGNAME=       git-base-${GIT_VERSION}
+PKGREVISION=   1
 COMMENT=       GIT Tree History Storage Tool (base package)
 
 CONFLICTS+=    scmgit-base-[0-9]*
@@ -56,9 +57,9 @@
 MAKE_DIRS+=            ${GIT_CORE_TEMPLATEDIR}/hooks
 MAKE_DIRS+=            ${GIT_CORE_TEMPLATEDIR}/info
 
-REQD_FILES+=           ${GIT_TEMPLATES:@.t.@\
-                       ${EGDIR}/${GIT_TEMPLATEDIR}/${.t.}\
-                       ${PREFIX}/${GIT_CORE_TEMPLATEDIR}/${.t.}\
+REQD_FILES+=           ${GIT_TEMPLATES:@.t.@ \
+                       ${EGDIR}/${GIT_TEMPLATEDIR}/${.t.} \
+                       ${PREFIX}/${GIT_CORE_TEMPLATEDIR}/${.t.} \
                        @:M*}
 
 CONFIGURE_ENV+=                HOME=${PREFIX}
@@ -99,10 +100,12 @@
 INSTALL_ENV+=          NO_CROSS_DIRECTORY_HARDLINKS=1
 INSTALL_ENV+=          NO_INSTALL_HARDLINKS=1
 
+INSTALLATION_DIRS+=    share/bash-completion/completions
+INSTALLATION_DIRS+=    ${EGDIR}
+
 post-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-completion.bash \
-               ${DESTDIR}${EGDIR}
+               ${DESTDIR}${PREFIX}/share/bash-completion/completions/git
        ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-prompt.sh \
                ${DESTDIR}${EGDIR}
 
diff -r 8dc00ebcbc47 -r 3b2b2d099461 devel/git-base/PLIST
--- a/devel/git-base/PLIST      Wed Mar 10 16:44:30 2021 +0000
+++ b/devel/git-base/PLIST      Wed Mar 10 16:58:05 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2021/01/11 10:20:16 adam Exp $
+@comment $NetBSD: PLIST,v 1.33 2021/03/10 16:58:05 jperkin Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -214,7 +214,7 @@
 libexec/git-core/mergetools/vimdiff
 libexec/git-core/mergetools/winmerge
 libexec/git-core/mergetools/xxdiff
-share/examples/git/git-completion.bash
+share/bash-completion/completions/git
 share/examples/git/git-prompt.sh
 share/examples/git/templates/description
 share/examples/git/templates/hooks/applypatch-msg.sample