Attachment #164823 for bug #205698

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




# $FreeBSD$

PORTNAME=	git-extras
PORTVERSION=	4.0.0
CATEGORIES=	devel

MAINTAINER=	igor.ostapenko@gmail.com

USE_GITHUB=	yes
GH_ACCOUNT=	tj

USES=		gmake
SHEBANG_FILES=	bin/git-guilt \
		bin/git-merge-into

NO_BUILD=	yes


Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (tj-git-extras-3.0.0_GH0.tar.gz) = 490742428824d6e807e894c3b6612be37a9a9a4e8fbea747d1813e5d62b2a807	1	SHA256 (tj-git-extras-4.0.0_GH0.tar.gz) = 4adaadc1f22f3240ae9607963ede29a5c010ae14b877b90c27d17d6b0c06f430
2	SIZE (tj-git-extras-3.0.0_GH0.tar.gz) = 74070	2	SIZE (tj-git-extras-4.0.0_GH0.tar.gz) = 94582




--- Makefile.orig	2015-12-29 14:53:09 UTC
+++ Makefile
@@ -1,6 +1,6 @@
 PREFIX ?= /usr/local
 BINPREFIX ?= "$(PREFIX)/bin"
-MANPREFIX ?= "$(PREFIX)/share/man/man1"
+MANPREFIX = "$(PREFIX)/man/man1"
 SYSCONFDIR ?= $(PREFIX)/etc
 BINS = $(wildcard bin/git-*)
 MANS = $(wildcard man/git-*.md)
 MAN_HTML = $(MANS:.md=.html)
@@ -39,8 +40,8 @@ install:
 		cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX); \
 		echo "cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX)"; \
 	fi
-	@mkdir -p $(DESTDIR)/etc/bash_completion.d
-	cp -f etc/bash_completion.sh $(DESTDIR)/etc/bash_completion.d/git-extras
+	@mkdir -p $(DESTDIR)$(ETCPREFIX)/bash_completion.d
+	cp -f etc/bash_completion.sh $(DESTDIR)$(ETCPREFIX)/bash_completion.d/git-extras
 
 man/%.html: man/%.md
 	ronn \
@@ -64,7 +65,7 @@ uninstall:
 		echo "... uninstalling $(DESTDIR)$(MANPREFIX)/$(notdir $(MAN))"; \
 		rm -f $(DESTDIR)$(MANPREFIX)/$(notdir $(MAN)); \
 	)
-	rm -f $(DESTDIR)/etc/bash_completion.d/git-extras
+	rm -f $(DESTDIR)$(ETCPREFIX)/bash_completion.d/git-extras
 
 clean: docclean
 




bin/git-bug
bin/git-changelog
bin/git-chore
bin/git-clear
bin/git-commits-since
bin/git-contrib
bin/git-count

bin/git-graft
bin/git-guilt
bin/git-ignore
bin/git-ignore-io
bin/git-info
bin/git-line-summary
bin/git-local-commits

bin/git-missing
bin/git-obliterate
bin/git-pr
bin/git-psykorebase
bin/git-pull-request
bin/git-rebase-patch
bin/git-refactor

bin/git-root
bin/git-rscp
bin/git-scp
bin/git-sed
bin/git-setup
bin/git-show-merged-branches
bin/git-show-tree

man/man1/git-bug.1.gz
man/man1/git-changelog.1.gz
man/man1/git-chore.1.gz
man/man1/git-clear.1.gz
man/man1/git-commits-since.1.gz
man/man1/git-contrib.1.gz
man/man1/git-count.1.gz

man/man1/git-gh-pages.1.gz
man/man1/git-graft.1.gz
man/man1/git-guilt.1.gz
man/man1/git-ignore-io.1.gz
man/man1/git-ignore.1.gz
man/man1/git-info.1.gz
man/man1/git-line-summary.1.gz
man/man1/git-local-commits.1.gz
man/man1/git-lock.1.gz
man/man1/git-locked.1.gz

man/man1/git-merge-repo.1.gz
man/man1/git-missing.1.gz
man/man1/git-pr.1.gz
man/man1/git-psykorebase.1.gz
man/man1/git-rebase-patch.1.gz
man/man1/git-refactor.1.gz
man/man1/git-release.1.gz

man/man1/git-reset-file.1.gz
man/man1/git-root.1.gz
man/man1/git-scp.1.gz
man/man1/git-sed.1.gz
man/man1/git-setup.1.gz
man/man1/git-show-merged-branches.1.gz
man/man1/git-show-tree.1.gz

Return to bug 205698

Lines 1-7 Link Here

(-)Makefile (-4 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= git-extras	3	PORTNAME= git-extras
4	PORTVERSION= 3.0.0	4	PORTVERSION= 4.0.0
5	CATEGORIES= devel	5	CATEGORIES= devel
6		6
7	MAINTAINER= igor.ostapenko@gmail.com	7	MAINTAINER= igor.ostapenko@gmail.com
Lines 15-23 Link Here
15	USE_GITHUB= yes	15	USE_GITHUB= yes
16	GH_ACCOUNT= tj	16	GH_ACCOUNT= tj
17		17
18	USES= gmake shebangfix	18	USES= gmake
19	SHEBANG_FILES= bin/git-guilt \
20	bin/git-merge-into
21		19
22	NO_BUILD= yes	20	NO_BUILD= yes
23		21

Lines 1-31 Link Here

(-)files/patch-Makefile (-24 / +3 lines)
1	--- Makefile.orig 2015-04-27 12:13:50 UTC	1	--- Makefile.orig 2015-12-29 14:53:09 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -1,6 +1,7 @@	3	@@ -1,6 +1,6 @@
4	PREFIX ?= /usr/local	4	PREFIX ?= /usr/local
5	BINPREFIX ?= "$(PREFIX)/bin"	5	BINPREFIX ?= "$(PREFIX)/bin"
6	-MANPREFIX ?= "$(PREFIX)/share/man/man1"	6	-MANPREFIX ?= "$(PREFIX)/share/man/man1"
7	+MANPREFIX = "$(PREFIX)/man/man1"	7	+MANPREFIX = "$(PREFIX)/man/man1"
8	+ETCPREFIX ?= "$(PREFIX)/etc"	8	SYSCONFDIR ?= $(PREFIX)/etc
9	BINS = $(wildcard bin/git-*)	9	BINS = $(wildcard bin/git-*)
10	MANS = $(wildcard man/git-*.md)	10	MANS = $(wildcard man/git-*.md)
11	MAN_HTML = $(MANS:.md=.html)
12	@@ -39,8 +40,8 @@ install:
13	cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX); \
14	echo "cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX)"; \
15	fi
16	- @mkdir -p $(DESTDIR)/etc/bash_completion.d
17	- cp -f etc/bash_completion.sh $(DESTDIR)/etc/bash_completion.d/git-extras
18	+ @mkdir -p $(DESTDIR)$(ETCPREFIX)/bash_completion.d
19	+ cp -f etc/bash_completion.sh $(DESTDIR)$(ETCPREFIX)/bash_completion.d/git-extras
20
21	man/%.html: man/%.md
22	ronn \
23	@@ -64,7 +65,7 @@ uninstall:
24	echo "... uninstalling $(DESTDIR)$(MANPREFIX)/$(notdir $(MAN))"; \
25	rm -f $(DESTDIR)$(MANPREFIX)/$(notdir $(MAN)); \
26	)
27	- rm -f $(DESTDIR)/etc/bash_completion.d/git-extras
28	+ rm -f $(DESTDIR)$(ETCPREFIX)/bash_completion.d/git-extras
29
30	clean: docclean
31

Lines 5-10 Link Here

(-)pkg-plist (+9 lines)
5	bin/git-bug	5	bin/git-bug
6	bin/git-changelog	6	bin/git-changelog
7	bin/git-chore	7	bin/git-chore
		8	bin/git-clear
8	bin/git-commits-since	9	bin/git-commits-since
9	bin/git-contrib	10	bin/git-contrib
10	bin/git-count	11	bin/git-count
Lines 23-28 Link Here
23	bin/git-graft	24	bin/git-graft
24	bin/git-guilt	25	bin/git-guilt
25	bin/git-ignore	26	bin/git-ignore
		27	bin/git-ignore-io
26	bin/git-info	28	bin/git-info
27	bin/git-line-summary	29	bin/git-line-summary
28	bin/git-local-commits	30	bin/git-local-commits
Lines 33-38 Link Here
33	bin/git-missing	35	bin/git-missing
34	bin/git-obliterate	36	bin/git-obliterate
35	bin/git-pr	37	bin/git-pr
		38	bin/git-psykorebase
36	bin/git-pull-request	39	bin/git-pull-request
37	bin/git-rebase-patch	40	bin/git-rebase-patch
38	bin/git-refactor	41	bin/git-refactor
Lines 43-48 Link Here
43	bin/git-root	46	bin/git-root
44	bin/git-rscp	47	bin/git-rscp
45	bin/git-scp	48	bin/git-scp
		49	bin/git-sed
46	bin/git-setup	50	bin/git-setup
47	bin/git-show-merged-branches	51	bin/git-show-merged-branches
48	bin/git-show-tree	52	bin/git-show-tree
Lines 60-65 Link Here
60	man/man1/git-bug.1.gz	64	man/man1/git-bug.1.gz
61	man/man1/git-changelog.1.gz	65	man/man1/git-changelog.1.gz
62	man/man1/git-chore.1.gz	66	man/man1/git-chore.1.gz
		67	man/man1/git-clear.1.gz
63	man/man1/git-commits-since.1.gz	68	man/man1/git-commits-since.1.gz
64	man/man1/git-contrib.1.gz	69	man/man1/git-contrib.1.gz
65	man/man1/git-count.1.gz	70	man/man1/git-count.1.gz
Lines 77-84 Link Here
77	man/man1/git-gh-pages.1.gz	82	man/man1/git-gh-pages.1.gz
78	man/man1/git-graft.1.gz	83	man/man1/git-graft.1.gz
79	man/man1/git-guilt.1.gz	84	man/man1/git-guilt.1.gz
		85	man/man1/git-ignore-io.1.gz
80	man/man1/git-ignore.1.gz	86	man/man1/git-ignore.1.gz
81	man/man1/git-info.1.gz	87	man/man1/git-info.1.gz
		88	man/man1/git-line-summary.1.gz
82	man/man1/git-local-commits.1.gz	89	man/man1/git-local-commits.1.gz
83	man/man1/git-lock.1.gz	90	man/man1/git-lock.1.gz
84	man/man1/git-locked.1.gz	91	man/man1/git-locked.1.gz
Lines 86-91 Link Here
86	man/man1/git-merge-repo.1.gz	93	man/man1/git-merge-repo.1.gz
87	man/man1/git-missing.1.gz	94	man/man1/git-missing.1.gz
88	man/man1/git-pr.1.gz	95	man/man1/git-pr.1.gz
		96	man/man1/git-psykorebase.1.gz
89	man/man1/git-rebase-patch.1.gz	97	man/man1/git-rebase-patch.1.gz
90	man/man1/git-refactor.1.gz	98	man/man1/git-refactor.1.gz
91	man/man1/git-release.1.gz	99	man/man1/git-release.1.gz
Lines 94-99 Link Here
94	man/man1/git-reset-file.1.gz	102	man/man1/git-reset-file.1.gz
95	man/man1/git-root.1.gz	103	man/man1/git-root.1.gz
96	man/man1/git-scp.1.gz	104	man/man1/git-scp.1.gz
		105	man/man1/git-sed.1.gz
97	man/man1/git-setup.1.gz	106	man/man1/git-setup.1.gz
98	man/man1/git-show-merged-branches.1.gz	107	man/man1/git-show-merged-branches.1.gz
99	man/man1/git-show-tree.1.gz	108	man/man1/git-show-tree.1.gz