Attachment 241704 Details for Bug 271046 – git-extras-7.0.0.diff

[patch] git-extras-7.0.0.diff

git-extras-7.0.0.diff (text/plain), 2.68 KB, created by Igor Ostapenko on 2023-04-24 17:43:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Igor Ostapenko

Created: 2023-04-24 17:43:22 UTC

Size: 2.68 KB

patch

obsolete

>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..85a9dd022da5 100644
>--- a/devel/git-extras/files/patch-Makefile
>+++ b/devel/git-extras/files/patch-Makefile
>@@ -1,31 +1,16 @@
>---- Makefile.orig	2022-10-06 12:33:44 UTC
>+--- Makefile.orig	2023-04-24 17:16:52 UTC
> +++ Makefile
>-@@ -3,7 +3,7 @@ BINPREFIX ?= "$(PREFIX)/bin"
>- 
>- OS = $(shell uname)
>- ifeq ($(OS), FreeBSD)
>--	MANPREFIX ?= "$(PREFIX)/man/man1"
>-+	MANPREFIX = "$(PREFIX)/man/man1"
>+@@ -8,11 +8,13 @@ endif
>  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
>++MANPREFIX = "$(PREFIX)/man/man1"
>+ ifeq ($(OS), Darwin)
>+ 	COMPL_DIR ?= "$(DESTDIR)$(SYSCONFDIR)/bash_completion.d"
>+ else
>+ 	COMPL_DIR ?= "$(DESTDIR)$(SYSCONFDIR)/bash-completion/completions"
>+ endif
>++COMPL_DIR = "$(DESTDIR)$(PREFIX)/share/bash-completion/completions"
>  
>+ SYSCONFDIR ?= $(PREFIX)/etc
>+ BINS = $(wildcard bin/git-*)

Flags:

igoro: maintainer-approval+

Actions: View | Diff

Attachments on bug 271046: 241704 | 241738