git: 9136596bb35b - main - devel/git-extras: update to 7.0.0

The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9136596bb35b59fb654b31b6748ed97c00e6aadc

commit 9136596bb35b59fb654b31b6748ed97c00e6aadc
Author:     Igor Ostapenko <igor.ostapenko@pm.me>
AuthorDate: 2023-04-25 20:38:11 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-04-28 16:13:39 +0000

    devel/git-extras: update to 7.0.0
    
    Changelog: https://github.com/tj/git-extras/releases/tag/7.0.0
    
    PR:             271046
---
 devel/git-extras/Makefile             |  2 +-
 devel/git-extras/distinfo             |  6 +++---
 devel/git-extras/files/patch-Makefile | 30 ++++++++----------------------
 devel/git-extras/pkg-plist            |  2 +-
 4 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/devel/git-extras/Makefile b/devel/git-extras/Makefile
index 587e4ab9ef1e..98c5ce3f4683 100644
--- a/devel/git-extras/Makefile
+++ b/devel/git-extras/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	git-extras
-PORTVERSION=	6.5.0
+PORTVERSION=	7.0.0
 CATEGORIES=	devel
 
 MAINTAINER=	igor.ostapenko@pm.me
diff --git a/devel/git-extras/distinfo b/devel/git-extras/distinfo
index 3327105cd433..9565b9364fd1 100644
--- a/devel/git-extras/distinfo
+++ b/devel/git-extras/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1665433128
-SHA256 (tj-git-extras-6.5.0_GH0.tar.gz) = eace7a0659749c72abf1cee68c03ea0a77715870d5e321c729e4a231ee359b61
-SIZE (tj-git-extras-6.5.0_GH0.tar.gz) = 167015
+TIMESTAMP = 1682352305
+SHA256 (tj-git-extras-7.0.0_GH0.tar.gz) = 3adcbc247d6cb78dc58cace22e9ad789cd6f5061522516660dfb59cc6ec08def
+SIZE (tj-git-extras-7.0.0_GH0.tar.gz) = 169165
diff --git a/devel/git-extras/files/patch-Makefile b/devel/git-extras/files/patch-Makefile
index 19a85d1d6616..255e8932853b 100644
--- a/devel/git-extras/files/patch-Makefile
+++ b/devel/git-extras/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2022-10-06 12:33:44 UTC
+--- Makefile.orig	2023-04-25 12:19:36 UTC
 +++ Makefile
-@@ -3,7 +3,7 @@ BINPREFIX ?= "$(PREFIX)/bin"
+@@ -4,11 +4,13 @@ ifeq ($(OS), FreeBSD)
  
  OS = $(shell uname)
  ifeq ($(OS), FreeBSD)
@@ -9,23 +9,9 @@
  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
- 
+ ifeq ($(OS), Darwin)
++	COMPL_DIR ?= "$(DESTDIR)$(SYSCONFDIR)/bash_completion.d"
++else ifeq ($(OS), FreeBSD)
+ 	COMPL_DIR ?= "$(DESTDIR)$(SYSCONFDIR)/bash_completion.d"
+ else
+ 	COMPL_DIR ?= "$(DESTDIR)$(SYSCONFDIR)/bash-completion/completions"
diff --git a/devel/git-extras/pkg-plist b/devel/git-extras/pkg-plist
index 33cf02a680e8..7932949b9153 100644
--- a/devel/git-extras/pkg-plist
+++ b/devel/git-extras/pkg-plist
@@ -71,6 +71,7 @@ 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
@@ -143,4 +144,3 @@ 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