Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1615395485294930"
MIME-Version: 1.0
Date: Wed, 10 Mar 2021 16:58:05 +0000
From: "Jonathan Perkin" <jperkin@netbsd.org>
Subject: CVS commit: pkgsrc/devel/git-base
To: pkgsrc-changes@NetBSD.org
Reply-To: jperkin@netbsd.org
Message-Id: <20210310165805.3B6F7FA95@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1615395485294930
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jperkin
Date:		Wed Mar 10 16:58:05 UTC 2021

Modified Files:
	pkgsrc/devel/git-base: Makefile PLIST

Log Message:
git-base: Install bash completion correctly.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 pkgsrc/devel/git-base/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/devel/git-base/PLIST

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


--_----------=_1615395485294930
Content-Disposition: inline
Content-Length: 2360
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/git-base/Makefile
diff -u pkgsrc/devel/git-base/Makefile:1.84 pkgsrc/devel/git-base/Makefile:1.85
--- pkgsrc/devel/git-base/Makefile:1.84	Sat Oct 31 21:10:01 2020
+++ pkgsrc/devel/git-base/Makefile	Wed Mar 10 16:58:05 2021
@@ -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}
 

Index: pkgsrc/devel/git-base/PLIST
diff -u pkgsrc/devel/git-base/PLIST:1.32 pkgsrc/devel/git-base/PLIST:1.33
--- pkgsrc/devel/git-base/PLIST:1.32	Mon Jan 11 10:20:16 2021
+++ pkgsrc/devel/git-base/PLIST	Wed Mar 10 16:58:05 2021
@@ -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/tortoisemerg
 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


--_----------=_1615395485294930--