Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 28 Sep 2018 12:48:37 +0000 (UTC)
From:      Renato Botelho <garga@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r480858 - head/devel/git
Message-ID:  <201809281248.w8SCmbNn033706@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: garga
Date: Fri Sep 28 12:48:37 2018
New Revision: 480858
URL: https://svnweb.freebsd.org/changeset/ports/480858

Log:
  devel/git: Keep original bash completion filename
  
  Do not rename git-completion.bash to git.sh to make it easier for users
  that follow git docs, which point to original filename. Add a note in
  pkg-message to let users know about it.
  
  PR:		231775
  Submitted by:	pierogmorski@gmail.com
  Sponsored by:	Rubicon Communications, LLC (Netgate)

Modified:
  head/devel/git/Makefile
  head/devel/git/pkg-message
  head/devel/git/pkg-plist

Modified: head/devel/git/Makefile
==============================================================================
--- head/devel/git/Makefile	Fri Sep 28 12:35:42 2018	(r480857)
+++ head/devel/git/Makefile	Fri Sep 28 12:48:37 2018	(r480858)
@@ -3,6 +3,7 @@
 
 PORTNAME=	git
 DISTVERSION=	2.19.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -229,13 +230,13 @@ post-install-CONTRIB-on:
 	# will be useful
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	@${LN} -s ../../share/git-core/contrib/completion/git-completion.bash \
-		${STAGEDIR}${PREFIX}/etc/bash_completion.d/git.sh
+		${STAGEDIR}${PREFIX}/etc/bash_completion.d/
 
 post-install-CONTRIB-off:
 	# Install the contrib completions anyway
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/completion/git-completion.bash \
-		${STAGEDIR}${PREFIX}/etc/bash_completion.d/git.sh
+		${STAGEDIR}${PREFIX}/etc/bash_completion.d/
 
 post-install-P4-on:
 	${INSTALL_SCRIPT} ${WRKSRC}/git-p4.py ${STAGEDIR}${PREFIX}/bin/

Modified: head/devel/git/pkg-message
==============================================================================
--- head/devel/git/pkg-message	Fri Sep 28 12:35:42 2018	(r480857)
+++ head/devel/git/pkg-message	Fri Sep 28 12:48:37 2018	(r480858)
@@ -7,4 +7,6 @@ Also, if git's color output is broken (eg. color codes
 applied) please consult the core.pager option in the git-config(1) manual, and
 your preferred pager's manual for color output options.
 
+bash completion script was renamed to git-completion.bash to keep original name
+
 -------------------------------------------------------------------------------

Modified: head/devel/git/pkg-plist
==============================================================================
--- head/devel/git/pkg-plist	Fri Sep 28 12:35:42 2018	(r480857)
+++ head/devel/git/pkg-plist	Fri Sep 28 12:48:37 2018	(r480858)
@@ -6,7 +6,7 @@ bin/git-shell
 bin/git-upload-archive
 bin/git-upload-pack
 %%GUI%%bin/gitk
-etc/bash_completion.d/git.sh
+etc/bash_completion.d/git-completion.bash
 %%PERL%%%%SITE_PERL%%/FromCPAN/Error.pm
 %%PERL%%%%SITE_PERL%%/FromCPAN/Mail/Address.pm
 %%PERL%%%%SITE_PERL%%/Git.pm



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809281248.w8SCmbNn033706>