Attachment #246026 for bug #274837

View | Details | Raw Unified | Return to bug 274837
Collapse All | Expand All

Lines 1-5 Link Here

(-)b/devel/git-extras/Makefile (-1 / +1 lines)
1	PORTNAME= git-extras	1	PORTNAME= git-extras
2	PORTVERSION= 7.0.0	2	PORTVERSION= 7.1.0
3	CATEGORIES= devel	3	CATEGORIES= devel
4		4
5	MAINTAINER= igor.ostapenko@pm.me	5	MAINTAINER= igor.ostapenko@pm.me

Lines 1-3 Link Here

(-)b/devel/git-extras/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1682352305	1	TIMESTAMP = 1698778095
2	SHA256 (tj-git-extras-7.0.0_GH0.tar.gz) = 3adcbc247d6cb78dc58cace22e9ad789cd6f5061522516660dfb59cc6ec08def	2	SHA256 (tj-git-extras-7.1.0_GH0.tar.gz) = e5c855361d2f1ec1be6ee601247153d9c8c04a221949b6ec3903b32fa736f542
3	SIZE (tj-git-extras-7.0.0_GH0.tar.gz) = 169165	3	SIZE (tj-git-extras-7.1.0_GH0.tar.gz) = 176733




--- Makefile.orig	2023-04-25 12:19:36 UTC
+++ Makefile
@@ -4,11 +4,13 @@ ifeq ($(OS), FreeBSD)
 
 OS = $(shell uname)
 ifeq ($(OS), FreeBSD)
-	MANPREFIX ?= "$(PREFIX)/man/man1"
+	MANPREFIX = "$(PREFIX)/man/man1"
 else
 	MANPREFIX ?= "$(PREFIX)/share/man/man1"
 endif
 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"

Lines 27-32 bin/git-feature Link Here

(-)b/devel/git-extras/pkg-plist (+2 lines)
27	bin/git-force-clone	27	bin/git-force-clone
28	bin/git-fork	28	bin/git-fork
29	bin/git-fresh-branch	29	bin/git-fresh-branch
		30	bin/git-get
30	bin/git-gh-pages	31	bin/git-gh-pages
31	bin/git-graft	32	bin/git-graft
32	bin/git-guilt	33	bin/git-guilt
Lines 101-106 man/man1/git-feature.1.gz Link Here
101	man/man1/git-force-clone.1.gz	102	man/man1/git-force-clone.1.gz
102	man/man1/git-fork.1.gz	103	man/man1/git-fork.1.gz
103	man/man1/git-fresh-branch.1.gz	104	man/man1/git-fresh-branch.1.gz
		105	man/man1/git-get.1.gz
104	man/man1/git-gh-pages.1.gz	106	man/man1/git-gh-pages.1.gz
105	man/man1/git-graft.1.gz	107	man/man1/git-graft.1.gz
106	man/man1/git-guilt.1.gz	108	man/man1/git-guilt.1.gz

Return to bug 274837

Removed Link Here

(-)a/devel/git-extras/files/patch-Makefile (-17 lines)
1	--- Makefile.orig 2023-04-25 12:19:36 UTC
2	+++ Makefile
3	@@ -4,11 +4,13 @@ ifeq ($(OS), FreeBSD)
4
5	OS = $(shell uname)
6	ifeq ($(OS), FreeBSD)
7	- MANPREFIX ?= "$(PREFIX)/man/man1"
8	+ MANPREFIX = "$(PREFIX)/man/man1"
9	else
10	MANPREFIX ?= "$(PREFIX)/share/man/man1"
11	endif
12	ifeq ($(OS), Darwin)
13	+ COMPL_DIR ?= "$(DESTDIR)$(SYSCONFDIR)/bash_completion.d"
14	+else ifeq ($(OS), FreeBSD)
15	COMPL_DIR ?= "$(DESTDIR)$(SYSCONFDIR)/bash_completion.d"
16	else
17	COMPL_DIR ?= "$(DESTDIR)$(SYSCONFDIR)/bash-completion/completions"