git: 3ccd12b970a9 - main - devel/git-extras: Update to 6.5.0

The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3ccd12b970a94128c78110c67eb5e45ea5e94b30

commit 3ccd12b970a94128c78110c67eb5e45ea5e94b30
Author:     Igor Ostapenko <igor.ostapenko@pm.me>
AuthorDate: 2022-10-11 05:36:14 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2022-10-11 15:43:21 +0000

    devel/git-extras: Update to 6.5.0
    
    ChangeLog: https://github.com/tj/git-extras/releases/tag/6.5.0
    
     * Include revert conflicts in git abort
     * fix(git-effort):fork: retry: Resource temporarily unavailable
     * git-sync --force will sync without interaction
     * fix(git-cp): keep the history of the files
     * git-bulk: previous refactor redirected $PWD to stderr by mistake
     * Fix lazy loading bash_completion from XDG_DATA_DIRS
     * feat(bin/git-browse): open website at file & line number or range
     * #970 standup added -A flag for author date
     * update git-utimes.{1,html} to add --newer flag
     * git-utimes: add --newer flag and don't touch files in the working tree and
       index
     * docs(instllation): replace git.io
     * Added config git-extras.standup-implicit-week for git standup
     * Document git standup -w option
    
    PR:             266953
    Reported by:    igor.ostapenko@pm.me (maintainer)
---
 devel/git-extras/Makefile             |  2 +-
 devel/git-extras/distinfo             |  6 +++---
 devel/git-extras/files/patch-Makefile | 22 +++++++++++++++++++++-
 devel/git-extras/pkg-plist            |  2 +-
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/devel/git-extras/Makefile b/devel/git-extras/Makefile
index 043c1942d7ed..587e4ab9ef1e 100644
--- a/devel/git-extras/Makefile
+++ b/devel/git-extras/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	git-extras
-PORTVERSION=	6.4.0
+PORTVERSION=	6.5.0
 CATEGORIES=	devel
 
 MAINTAINER=	igor.ostapenko@pm.me
diff --git a/devel/git-extras/distinfo b/devel/git-extras/distinfo
index c91b17b9fe83..3327105cd433 100644
--- a/devel/git-extras/distinfo
+++ b/devel/git-extras/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1651259571
-SHA256 (tj-git-extras-6.4.0_GH0.tar.gz) = d8943c0caab43e70c23890816a9775844d33261c40d5be03c1e012c276b1aa63
-SIZE (tj-git-extras-6.4.0_GH0.tar.gz) = 163508
+TIMESTAMP = 1665433128
+SHA256 (tj-git-extras-6.5.0_GH0.tar.gz) = eace7a0659749c72abf1cee68c03ea0a77715870d5e321c729e4a231ee359b61
+SIZE (tj-git-extras-6.5.0_GH0.tar.gz) = 167015
diff --git a/devel/git-extras/files/patch-Makefile b/devel/git-extras/files/patch-Makefile
index eb5c6f6801da..19a85d1d6616 100644
--- a/devel/git-extras/files/patch-Makefile
+++ b/devel/git-extras/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2018-10-06 02:29:08 UTC
+--- Makefile.orig	2022-10-06 12:33:44 UTC
 +++ Makefile
 @@ -3,7 +3,7 @@ BINPREFIX ?= "$(PREFIX)/bin"
  
@@ -9,3 +9,23 @@
  else
  	MANPREFIX ?= "$(PREFIX)/share/man/man1"
  endif
+@@ -69,8 +69,8 @@ install: check
+ 		cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX); \
+ 		echo "cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX)"; \
+ 	fi
+-	@mkdir -p $(DESTDIR)$(SYSCONFDIR)/bash-completion/completions
+-	cp -f etc/bash_completion.sh $(DESTDIR)$(SYSCONFDIR)/bash-completion/completions/git-extras
++	@mkdir -p $(DESTDIR)$(PREFIX)/share/bash-completion/completions
++	cp -f etc/bash_completion.sh $(DESTDIR)$(PREFIX)/share/bash-completion/completions/git-extras
+ 	@echo ""
+ 	@echo "If you are a zsh user, you may want to 'source $(CODE_DIR)etc/git-extras-completion.zsh'" \
+ 		"and put this line into ~/.zshrc to enable zsh completion"
+@@ -119,7 +119,7 @@ uninstall:
+ 		echo "... uninstalling $(DESTDIR)$(MANPREFIX)/$(notdir $(MAN))"; \
+ 		rm -f $(DESTDIR)$(MANPREFIX)/$(notdir $(MAN)); \
+ 	)
+-	rm -f $(DESTDIR)$(SYSCONFDIR)/bash-completion/completions/git-extras
++	rm -f $(DESTDIR)$(PREFIX)/share/bash-completion/completions/git-extras
+ 
+ clean: docclean
+ 
diff --git a/devel/git-extras/pkg-plist b/devel/git-extras/pkg-plist
index 7932949b9153..33cf02a680e8 100644
--- a/devel/git-extras/pkg-plist
+++ b/devel/git-extras/pkg-plist
@@ -71,7 +71,6 @@ bin/git-touch
 bin/git-undo
 bin/git-unlock
 bin/git-utimes
-etc/bash_completion.d/git-extras
 man/man1/git-abort.1.gz
 man/man1/git-alias.1.gz
 man/man1/git-archive-file.1.gz
@@ -144,3 +143,4 @@ man/man1/git-touch.1.gz
 man/man1/git-undo.1.gz
 man/man1/git-unlock.1.gz
 man/man1/git-utimes.1.gz
+share/bash-completion/completions/git-extras