devel/git-extras: update 2.2.0 -> 3.0.0

PR:		200090
Submitted by:	Igor Ostapenko <igor.ostapenko@gmail.com> (maintainer)

4 files changed, 38 insertions, 9 deletions

diff --git a/devel/git-extras/Makefile b/devel/git-extras/Makefile
index 630dd76056a1..eda49d3faca8 100644
--- a/devel/git-extras/Makefile
+++ b/devel/git-extras/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	git-extras
-PORTVERSION=	2.2.0
+PORTVERSION=	3.0.0
 CATEGORIES=	devel
 
 MAINTAINER=	igor.ostapenko@gmail.com
@@ -16,7 +16,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	tj
 
 USES=		gmake shebangfix
-SHEBANG_FILES=	bin/git-squash
+SHEBANG_FILES=	bin/git-guilt \
+		bin/git-merge-into
 
 NO_BUILD=	yes
 
diff --git a/devel/git-extras/distinfo b/devel/git-extras/distinfo
index 549a1dd2a664..854fcdcff1cf 100644
--- a/devel/git-extras/distinfo
+++ b/devel/git-extras/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tj-git-extras-2.2.0_GH0.tar.gz) = 6a933114d276761a078e653a961566d9517a6a4eaadacb62e655d39481548f63
-SIZE (tj-git-extras-2.2.0_GH0.tar.gz) = 52507
+SHA256 (tj-git-extras-3.0.0_GH0.tar.gz) = 490742428824d6e807e894c3b6612be37a9a9a4e8fbea747d1813e5d62b2a807
+SIZE (tj-git-extras-3.0.0_GH0.tar.gz) = 74070
diff --git a/devel/git-extras/files/patch-Makefile b/devel/git-extras/files/patch-Makefile
index e904f7282655..df05848f37b8 100644
--- a/devel/git-extras/files/patch-Makefile
+++ b/devel/git-extras/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2014-10-13 12:21:54 UTC
+--- Makefile.orig	2015-04-27 12:13:50 UTC
 +++ Makefile
 @@ -1,6 +1,7 @@
  PREFIX ?= /usr/local
@@ -9,10 +9,10 @@
  BINS = $(wildcard bin/git-*)
  MANS = $(wildcard man/git-*.md)
  MAN_HTML = $(MANS:.md=.html)
-@@ -31,8 +32,8 @@
- 		cp -f bin/$(COMMAND) $(DESTDIR)$(BINPREFIX); \
- 	)
- 	cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX)
+@@ -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
@@ -20,3 +20,12 @@
  
  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
+ 
diff --git a/devel/git-extras/pkg-plist b/devel/git-extras/pkg-plist
index 12b5f828485b..32f3280f7646 100644
--- a/devel/git-extras/pkg-plist
+++ b/devel/git-extras/pkg-plist
@@ -1,8 +1,10 @@
 bin/git-alias
 bin/git-archive-file
+bin/git-authors
 bin/git-back
 bin/git-bug
 bin/git-changelog
+bin/git-chore
 bin/git-commits-since
 bin/git-contrib
 bin/git-count
@@ -11,6 +13,7 @@ bin/git-delete-branch
 bin/git-delete-merged-branches
 bin/git-delete-submodule
 bin/git-delete-tag
+bin/git-delta
 bin/git-effort
 bin/git-extras
 bin/git-feature
@@ -18,12 +21,15 @@ bin/git-fork
 bin/git-fresh-branch
 bin/git-gh-pages
 bin/git-graft
+bin/git-guilt
 bin/git-ignore
 bin/git-info
 bin/git-line-summary
 bin/git-local-commits
 bin/git-lock
 bin/git-locked
+bin/git-merge-into
+bin/git-merge-repo
 bin/git-missing
 bin/git-obliterate
 bin/git-pr
@@ -35,8 +41,12 @@ bin/git-rename-tag
 bin/git-repl
 bin/git-reset-file
 bin/git-root
+bin/git-rscp
+bin/git-scp
 bin/git-setup
+bin/git-show-merged-branches
 bin/git-show-tree
+bin/git-show-unmerged-branches
 bin/git-squash
 bin/git-summary
 bin/git-touch
@@ -45,9 +55,11 @@ bin/git-unlock
 etc/bash_completion.d/git-extras
 man/man1/git-alias.1.gz
 man/man1/git-archive-file.1.gz
+man/man1/git-authors.1.gz
 man/man1/git-back.1.gz
 man/man1/git-bug.1.gz
 man/man1/git-changelog.1.gz
+man/man1/git-chore.1.gz
 man/man1/git-commits-since.1.gz
 man/man1/git-contrib.1.gz
 man/man1/git-count.1.gz
@@ -56,6 +68,7 @@ man/man1/git-delete-branch.1.gz
 man/man1/git-delete-merged-branches.1.gz
 man/man1/git-delete-submodule.1.gz
 man/man1/git-delete-tag.1.gz
+man/man1/git-delta.1.gz
 man/man1/git-effort.1.gz
 man/man1/git-extras.1.gz
 man/man1/git-feature.1.gz
@@ -63,11 +76,14 @@ man/man1/git-fork.1.gz
 man/man1/git-fresh-branch.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.1.gz
 man/man1/git-info.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-into.1.gz
+man/man1/git-merge-repo.1.gz
 man/man1/git-missing.1.gz
 man/man1/git-pr.1.gz
 man/man1/git-rebase-patch.1.gz
@@ -77,8 +93,11 @@ man/man1/git-rename-tag.1.gz
 man/man1/git-repl.1.gz
 man/man1/git-reset-file.1.gz
 man/man1/git-root.1.gz
+man/man1/git-scp.1.gz
 man/man1/git-setup.1.gz
+man/man1/git-show-merged-branches.1.gz
 man/man1/git-show-tree.1.gz
+man/man1/git-show-unmerged-branches.1.gz
 man/man1/git-squash.1.gz
 man/man1/git-summary.1.gz
 man/man1/git-touch.1.gz