diff options
| author | jperkin <jperkin@pkgsrc.org> | 2021-03-10 16:58:05 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2021-03-10 16:58:05 +0000 |
| commit | 83399759099dd31451c98fa2cf4e169a28f35ba5 (patch) | |
| tree | 547091d4126c175f0ff60fe277891b67e4dd0900 /devel | |
| parent | ccea61547389db013119d078f1fb55fbc62ae5c3 (diff) | |
| download | pkgsrc-83399759099dd31451c98fa2cf4e169a28f35ba5.tar.gz | |
git-base: Install bash completion correctly.
Bump PKGREVISION.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/git-base/Makefile | 15 | ||||
| -rw-r--r-- | devel/git-base/PLIST | 4 |
2 files changed, 11 insertions, 8 deletions
diff --git a/devel/git-base/Makefile b/devel/git-base/Makefile index c6e26af351c..70c2102529b 100644 --- a/devel/git-base/Makefile +++ b/devel/git-base/Makefile @@ -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} 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 @@ CONFIGURE_ARGS+= git_cv_ld_dashr=no 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 --git a/devel/git-base/PLIST b/devel/git-base/PLIST index 7847c061d0b..2c492eec1cf 100644 --- a/devel/git-base/PLIST +++ b/devel/git-base/PLIST @@ -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/tortoisemerge 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 |