Wed Mar 10 16:58:05 2021 UTC ()
git-base: Install bash completion correctly.

Bump PKGREVISION.


(jperkin)
diff -r1.84 -r1.85 pkgsrc/devel/git-base/Makefile
diff -r1.32 -r1.33 pkgsrc/devel/git-base/PLIST
cvs diff -r1.84 -r1.85 pkgsrc/devel/git-base/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/git-base/Makefile 2020/10/31 21:10:01 1.84
+++ pkgsrc/devel/git-base/Makefile 2021/03/10 16:58:05 1.85
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.84 2020/10/31 21:10:01 adam Exp $ 1# $NetBSD: Makefile,v 1.85 2021/03/10 16:58:05 jperkin Exp $
2 2
3.include "../../devel/git/Makefile.common" 3.include "../../devel/git/Makefile.common"
4 4
5PKGNAME= git-base-${GIT_VERSION} 5PKGNAME= git-base-${GIT_VERSION}
 6PKGREVISION= 1
6COMMENT= GIT Tree History Storage Tool (base package) 7COMMENT= GIT Tree History Storage Tool (base package)
7 8
8CONFLICTS+= scmgit-base-[0-9]* 9CONFLICTS+= scmgit-base-[0-9]*
9SUPERSEDES+= scmgit-base-[0-9]* 10SUPERSEDES+= scmgit-base-[0-9]*
10 11
11DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error 12DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error
12DEPENDS+= p5-Email-Valid>=0.190:../../mail/p5-Email-Valid 13DEPENDS+= p5-Email-Valid>=0.190:../../mail/p5-Email-Valid
13DEPENDS+= p5-MailTools>=2.11:../../mail/p5-MailTools 14DEPENDS+= p5-MailTools>=2.11:../../mail/p5-MailTools
14DEPENDS+= p5-Net-SMTP-SSL>=1.01:../../mail/p5-Net-SMTP-SSL 15DEPENDS+= p5-Net-SMTP-SSL>=1.01:../../mail/p5-Net-SMTP-SSL
15DEPENDS+= p5-Authen-SASL>=1.0:../../security/p5-Authen-SASL 16DEPENDS+= p5-Authen-SASL>=1.0:../../security/p5-Authen-SASL
16 17
17USE_LANGUAGES= c99 18USE_LANGUAGES= c99
18USE_TOOLS+= perl:run sh:run msgfmt bash:test 19USE_TOOLS+= perl:run sh:run msgfmt bash:test
@@ -46,29 +47,29 @@ GIT_TEMPLATEDIR= templates @@ -46,29 +47,29 @@ GIT_TEMPLATEDIR= templates
46GIT_TEMPLATES= description info/exclude 47GIT_TEMPLATES= description info/exclude
47GIT_TEMPLATES+= hooks/applypatch-msg.sample hooks/commit-msg.sample 48GIT_TEMPLATES+= hooks/applypatch-msg.sample hooks/commit-msg.sample
48GIT_TEMPLATES+= hooks/post-update.sample hooks/pre-applypatch.sample 49GIT_TEMPLATES+= hooks/post-update.sample hooks/pre-applypatch.sample
49GIT_TEMPLATES+= hooks/pre-commit.sample hooks/pre-rebase.sample 50GIT_TEMPLATES+= hooks/pre-commit.sample hooks/pre-rebase.sample
50GIT_TEMPLATES+= hooks/prepare-commit-msg.sample hooks/update.sample 51GIT_TEMPLATES+= hooks/prepare-commit-msg.sample hooks/update.sample
51 52
52GIT_CORE_DATADIR= share/${GIT_COREDIR} 53GIT_CORE_DATADIR= share/${GIT_COREDIR}
53GIT_CORE_TEMPLATEDIR= ${GIT_CORE_DATADIR}/${GIT_TEMPLATEDIR} 54GIT_CORE_TEMPLATEDIR= ${GIT_CORE_DATADIR}/${GIT_TEMPLATEDIR}
54 55
55MAKE_DIRS= ${GIT_CORE_TEMPLATEDIR} 56MAKE_DIRS= ${GIT_CORE_TEMPLATEDIR}
56MAKE_DIRS+= ${GIT_CORE_TEMPLATEDIR}/hooks 57MAKE_DIRS+= ${GIT_CORE_TEMPLATEDIR}/hooks
57MAKE_DIRS+= ${GIT_CORE_TEMPLATEDIR}/info 58MAKE_DIRS+= ${GIT_CORE_TEMPLATEDIR}/info
58 59
59REQD_FILES+= ${GIT_TEMPLATES:@.t.@\ 60REQD_FILES+= ${GIT_TEMPLATES:@.t.@ \
60 ${EGDIR}/${GIT_TEMPLATEDIR}/${.t.}\ 61 ${EGDIR}/${GIT_TEMPLATEDIR}/${.t.} \
61 ${PREFIX}/${GIT_CORE_TEMPLATEDIR}/${.t.}\ 62 ${PREFIX}/${GIT_CORE_TEMPLATEDIR}/${.t.} \
62 @:M*} 63 @:M*}
63 64
64CONFIGURE_ENV+= HOME=${PREFIX} 65CONFIGURE_ENV+= HOME=${PREFIX}
65CONFIGURE_ENV+= gitexecdir=${GITCOREDIR} 66CONFIGURE_ENV+= gitexecdir=${GITCOREDIR}
66 67
67MAKE_FLAGS+= INSTALL=${INSTALL:Q} 68MAKE_FLAGS+= INSTALL=${INSTALL:Q}
68MAKE_ENV+= PERLLIBDIR=${PERL5_INSTALLVENDORLIB} 69MAKE_ENV+= PERLLIBDIR=${PERL5_INSTALLVENDORLIB}
69 70
70GIT_TEMPLATE_INSTDIR= ${EGDIR}/${GIT_TEMPLATEDIR} 71GIT_TEMPLATE_INSTDIR= ${EGDIR}/${GIT_TEMPLATEDIR}
71MAKE_ENV+= GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR} 72MAKE_ENV+= GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR}
72MESSAGE_SUBST+= GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR} 73MESSAGE_SUBST+= GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR}
73 74
74.include "../../mk/bsd.prefs.mk" 75.include "../../mk/bsd.prefs.mk"
@@ -89,30 +90,32 @@ SUBST_SED.test-shell= -e '/^TEST_SHELL_ @@ -89,30 +90,32 @@ SUBST_SED.test-shell= -e '/^TEST_SHELL_
89 90
90LDFLAGS.SunOS+= -lintl -lnsl 91LDFLAGS.SunOS+= -lintl -lnsl
91 92
92.include "../../mk/compiler.mk" 93.include "../../mk/compiler.mk"
93.if !empty(PKGSRC_COMPILER:Mclang) 94.if !empty(PKGSRC_COMPILER:Mclang)
94# configure test gets confused by wrappers dropping -R / 95# configure test gets confused by wrappers dropping -R /
95CONFIGURE_ARGS+= git_cv_ld_dashr=no 96CONFIGURE_ARGS+= git_cv_ld_dashr=no
96.endif 97.endif
97 98
98# Prefer to install symlinks. 99# Prefer to install symlinks.
99INSTALL_ENV+= NO_CROSS_DIRECTORY_HARDLINKS=1 100INSTALL_ENV+= NO_CROSS_DIRECTORY_HARDLINKS=1
100INSTALL_ENV+= NO_INSTALL_HARDLINKS=1 101INSTALL_ENV+= NO_INSTALL_HARDLINKS=1
101 102
 103INSTALLATION_DIRS+= share/bash-completion/completions
 104INSTALLATION_DIRS+= ${EGDIR}
 105
102post-install: 106post-install:
103 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} 
104 ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-completion.bash \ 107 ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-completion.bash \
105 ${DESTDIR}${EGDIR} 108 ${DESTDIR}${PREFIX}/share/bash-completion/completions/git
106 ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-prompt.sh \ 109 ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-prompt.sh \
107 ${DESTDIR}${EGDIR} 110 ${DESTDIR}${EGDIR}
108 111
109.include "options.mk" 112.include "options.mk"
110 113
111.include "../../converters/libiconv/buildlink3.mk" 114.include "../../converters/libiconv/buildlink3.mk"
112.include "../../devel/gettext-lib/buildlink3.mk" 115.include "../../devel/gettext-lib/buildlink3.mk"
113BUILDLINK_API_DEPENDS.pcre2?= pcre2>=10.34 116BUILDLINK_API_DEPENDS.pcre2?= pcre2>=10.34
114.include "../../devel/pcre2/buildlink3.mk" 117.include "../../devel/pcre2/buildlink3.mk"
115.include "../../devel/zlib/buildlink3.mk" 118.include "../../devel/zlib/buildlink3.mk"
116.include "../../lang/perl5/buildlink3.mk" 119.include "../../lang/perl5/buildlink3.mk"
117.include "../../lang/perl5/vars.mk" 120.include "../../lang/perl5/vars.mk"
118.include "../../textproc/expat/buildlink3.mk" 121.include "../../textproc/expat/buildlink3.mk"
cvs diff -r1.32 -r1.33 pkgsrc/devel/git-base/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/git-base/PLIST 2021/01/11 10:20:16 1.32
+++ pkgsrc/devel/git-base/PLIST 2021/03/10 16:58:05 1.33
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.32 2021/01/11 10:20:16 adam Exp $ 1@comment $NetBSD: PLIST,v 1.33 2021/03/10 16:58:05 jperkin Exp $
2bin/git 2bin/git
3bin/git-cvsserver 3bin/git-cvsserver
4bin/git-receive-pack 4bin/git-receive-pack
5bin/git-shell 5bin/git-shell
6bin/git-upload-archive 6bin/git-upload-archive
7bin/git-upload-pack 7bin/git-upload-pack
8${PERL5_SUB_INSTALLVENDORLIB}/FromCPAN/Error.pm 8${PERL5_SUB_INSTALLVENDORLIB}/FromCPAN/Error.pm
9${PERL5_SUB_INSTALLVENDORLIB}/FromCPAN/Mail/Address.pm 9${PERL5_SUB_INSTALLVENDORLIB}/FromCPAN/Mail/Address.pm
10${PERL5_SUB_INSTALLVENDORLIB}/Git.pm 10${PERL5_SUB_INSTALLVENDORLIB}/Git.pm
11${PERL5_SUB_INSTALLVENDORLIB}/Git/I18N.pm 11${PERL5_SUB_INSTALLVENDORLIB}/Git/I18N.pm
12${PERL5_SUB_INSTALLVENDORLIB}/Git/IndexInfo.pm 12${PERL5_SUB_INSTALLVENDORLIB}/Git/IndexInfo.pm
13${PERL5_SUB_INSTALLVENDORLIB}/Git/LoadCPAN.pm 13${PERL5_SUB_INSTALLVENDORLIB}/Git/LoadCPAN.pm
14${PERL5_SUB_INSTALLVENDORLIB}/Git/LoadCPAN/Error.pm 14${PERL5_SUB_INSTALLVENDORLIB}/Git/LoadCPAN/Error.pm
@@ -204,27 +204,27 @@ libexec/git-core/mergetools/guiffy @@ -204,27 +204,27 @@ libexec/git-core/mergetools/guiffy
204libexec/git-core/mergetools/gvimdiff 204libexec/git-core/mergetools/gvimdiff
205libexec/git-core/mergetools/kdiff3 205libexec/git-core/mergetools/kdiff3
206libexec/git-core/mergetools/kompare 206libexec/git-core/mergetools/kompare
207libexec/git-core/mergetools/meld 207libexec/git-core/mergetools/meld
208libexec/git-core/mergetools/nvimdiff 208libexec/git-core/mergetools/nvimdiff
209libexec/git-core/mergetools/opendiff 209libexec/git-core/mergetools/opendiff
210libexec/git-core/mergetools/p4merge 210libexec/git-core/mergetools/p4merge
211libexec/git-core/mergetools/smerge 211libexec/git-core/mergetools/smerge
212libexec/git-core/mergetools/tkdiff 212libexec/git-core/mergetools/tkdiff
213libexec/git-core/mergetools/tortoisemerge 213libexec/git-core/mergetools/tortoisemerge
214libexec/git-core/mergetools/vimdiff 214libexec/git-core/mergetools/vimdiff
215libexec/git-core/mergetools/winmerge 215libexec/git-core/mergetools/winmerge
216libexec/git-core/mergetools/xxdiff 216libexec/git-core/mergetools/xxdiff
217share/examples/git/git-completion.bash 217share/bash-completion/completions/git
218share/examples/git/git-prompt.sh 218share/examples/git/git-prompt.sh
219share/examples/git/templates/description 219share/examples/git/templates/description
220share/examples/git/templates/hooks/applypatch-msg.sample 220share/examples/git/templates/hooks/applypatch-msg.sample
221share/examples/git/templates/hooks/commit-msg.sample 221share/examples/git/templates/hooks/commit-msg.sample
222share/examples/git/templates/hooks/fsmonitor-watchman.sample 222share/examples/git/templates/hooks/fsmonitor-watchman.sample
223share/examples/git/templates/hooks/post-update.sample 223share/examples/git/templates/hooks/post-update.sample
224share/examples/git/templates/hooks/pre-applypatch.sample 224share/examples/git/templates/hooks/pre-applypatch.sample
225share/examples/git/templates/hooks/pre-commit.sample 225share/examples/git/templates/hooks/pre-commit.sample
226share/examples/git/templates/hooks/pre-merge-commit.sample 226share/examples/git/templates/hooks/pre-merge-commit.sample
227share/examples/git/templates/hooks/pre-push.sample 227share/examples/git/templates/hooks/pre-push.sample
228share/examples/git/templates/hooks/pre-rebase.sample 228share/examples/git/templates/hooks/pre-rebase.sample
229share/examples/git/templates/hooks/pre-receive.sample 229share/examples/git/templates/hooks/pre-receive.sample
230share/examples/git/templates/hooks/prepare-commit-msg.sample 230share/examples/git/templates/hooks/prepare-commit-msg.sample