CVS commit: pkgsrc/devel/git-base

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Oct 21 17:31:18 UTC 2022

Modified Files:
        pkgsrc/devel/git-base: Makefile PLIST distinfo
Added Files:
        pkgsrc/devel/git-base/patches:
            patch-contrib_completion_git-completion.zsh

Log Message:
Install the zsh completion to site-functions. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 pkgsrc/devel/git-base/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/devel/git-base/PLIST
cvs rdiff -u -r1.125 -r1.126 pkgsrc/devel/git-base/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/git-base/patches/patch-contrib_completion_git-completion.zsh

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

Modified files:

Index: pkgsrc/devel/git-base/Makefile
diff -u pkgsrc/devel/git-base/Makefile:1.99 pkgsrc/devel/git-base/Makefile:1.100
--- pkgsrc/devel/git-base/Makefile:1.99 Fri Oct  7 10:10:05 2022
+++ pkgsrc/devel/git-base/Makefile      Fri Oct 21 17:31:18 2022
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.99 2022/10/07 10:10:05 adam Exp $
+# $NetBSD: Makefile,v 1.100 2022/10/21 17:31:18 schmonz 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]*
@@ -73,6 +74,11 @@ GIT_TEMPLATE_INSTDIR=        ${EGDIR}/${GIT_TEM
 MAKE_ENV+=             GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR}
 MESSAGE_SUBST+=                GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR}
 
+SUBST_CLASSES+=                paths
+SUBST_FILES.paths=     contrib/completion/git-completion.zsh
+SUBST_STAGE.paths=     pre-configure
+SUBST_VARS.paths=      PREFIX
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1" || ${OPSYS} == "HPUX" || ${OPSYS} == "QNX" || ${OPSYS} == "UnixWare"
@@ -102,11 +108,14 @@ INSTALL_ENV+=             NO_CROSS_DIRECTORY_HARDLI
 INSTALL_ENV+=          NO_INSTALL_HARDLINKS=1
 
 INSTALLATION_DIRS+=    share/bash-completion/completions
+INSTALLATION_DIRS+=    share/zsh/site-functions
 INSTALLATION_DIRS+=    ${EGDIR}
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-completion.bash \
                ${DESTDIR}${PREFIX}/share/bash-completion/completions/git
+       ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-completion.zsh \
+               ${DESTDIR}${PREFIX}/share/zsh/site-functions/_git
        ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-prompt.sh \
                ${DESTDIR}${EGDIR}
 

Index: pkgsrc/devel/git-base/PLIST
diff -u pkgsrc/devel/git-base/PLIST:1.38 pkgsrc/devel/git-base/PLIST:1.39
--- pkgsrc/devel/git-base/PLIST:1.38    Fri Oct  7 10:10:05 2022
+++ pkgsrc/devel/git-base/PLIST Fri Oct 21 17:31:18 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38 2022/10/07 10:10:05 adam Exp $
+@comment $NetBSD: PLIST,v 1.39 2022/10/21 17:31:18 schmonz Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -255,3 +255,4 @@ share/locale/tr/LC_MESSAGES/git.mo
 share/locale/vi/LC_MESSAGES/git.mo
 share/locale/zh_CN/LC_MESSAGES/git.mo
 share/locale/zh_TW/LC_MESSAGES/git.mo
+share/zsh/site-functions/_git

Index: pkgsrc/devel/git-base/distinfo
diff -u pkgsrc/devel/git-base/distinfo:1.125 pkgsrc/devel/git-base/distinfo:1.126
--- pkgsrc/devel/git-base/distinfo:1.125        Wed Oct 19 07:54:52 2022
+++ pkgsrc/devel/git-base/distinfo      Fri Oct 21 17:31:18 2022
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.125 2022/10/19 07:54:52 adam Exp $
+$NetBSD: distinfo,v 1.126 2022/10/21 17:31:18 schmonz Exp $
 
-BLAKE2s (git-2.38.1.tar.xz) = 9e46f917a14bc0761344a6f07732abc2acb56d74255b7d4c56f3e6327dee89b4
-SHA512 (git-2.38.1.tar.xz) = e62ca6f54f01d2e4ccffb5f94e8e5cd2f3e098b766d909c694a8daf4d00d5cdeb9cc5ff8e9bc55d888406f292ba99433d334d4da9689c0ce5d7299a3c67c90e0
-Size (git-2.38.1.tar.xz) = 7088208 bytes
+BLAKE2s (git-2.38.0.tar.xz) = 195aecebc553edd44cb410c7dc2db91299d10b3cbeb3c7cb0da4fec94026598a
+SHA512 (git-2.38.0.tar.xz) = 5c475d25b40a01cc62be28478b9b5a1b0cedf91c3e007d4869019a25bdc980b5ef9b761e7ee02d7c581bff6c7dbf2696a624431a718dcd976bad34a3f2be5cb6
+Size (git-2.38.0.tar.xz) = 7086664 bytes
 SHA1 (patch-Documentation_Makefile) = 6025adac0fbb4b403f3954e6dac9d690dfb22daa
 SHA1 (patch-Makefile) = 683a2fdf69c3cb5814fcc59360be2eba91cb88a7
 SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886
+SHA1 (patch-contrib_completion_git-completion.zsh) = 695c78c8be7cc2a3792d1c428ebc5739b049852e
 SHA1 (patch-git-gui_Makefile) = d00f4da74a437f3a58f0926f2407c974a8efc2c7
 SHA1 (patch-gitk-git_Makefile) = e5d2112d158fe493a89b244a10d2e4b998a23d98
 SHA1 (patch-templates_Makefile) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0

Added files:

Index: pkgsrc/devel/git-base/patches/patch-contrib_completion_git-completion.zsh
diff -u /dev/null pkgsrc/devel/git-base/patches/patch-contrib_completion_git-completion.zsh:1.1
--- /dev/null   Fri Oct 21 17:31:18 2022
+++ pkgsrc/devel/git-base/patches/patch-contrib_completion_git-completion.zsh   Fri Oct 21 17:31:18 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-contrib_completion_git-completion.zsh,v 1.1 2022/10/21 17:31:18 schmonz Exp $
+
+Find pkgsrc-provided bash completion.
+
+--- contrib/completion/git-completion.zsh.orig 2022-10-02 23:02:46.000000000 +0000
++++ contrib/completion/git-completion.zsh
+@@ -30,7 +30,7 @@ if [ -z "$script" ]; then
+       local e bash_completion
+ 
+       bash_completion=$(pkg-config --variable=completionsdir bash-completion 2>/dev/null) ||
+-              bash_completion='/usr/share/bash-completion/completions/'
++              bash_completion='@PREFIX@/share/bash-completion/completions/'
+ 
+       locations=(
+               "$(dirname ${funcsourcetrace[1]%:*})"/git-completion.bash