From 9bc7e9ea2d02e8602527be298e74cbd88e3d0809 Mon Sep 17 00:00:00 2001 From: Bartek Rutkowski Date: Tue, 29 Dec 2015 21:55:52 +0000 Subject: [PATCH] devel/git-extras: update 3.0.0 -> 4.0.0 - Remove shebangfix from USES PR: 205698 Submitted by: Igor Ostapenko --- devel/git-extras/Makefile | 6 ++---- devel/git-extras/distinfo | 4 ++-- devel/git-extras/files/patch-Makefile | 27 +++------------------------ devel/git-extras/pkg-plist | 9 +++++++++ 4 files changed, 16 insertions(+), 30 deletions(-) diff --git a/devel/git-extras/Makefile b/devel/git-extras/Makefile index eda49d3faca8..a9665920b4ea 100644 --- a/devel/git-extras/Makefile +++ b/devel/git-extras/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= git-extras -PORTVERSION= 3.0.0 +PORTVERSION= 4.0.0 CATEGORIES= devel MAINTAINER= igor.ostapenko@gmail.com @@ -15,9 +15,7 @@ RUN_DEPENDS= git:${PORTSDIR}/devel/git \ USE_GITHUB= yes GH_ACCOUNT= tj -USES= gmake shebangfix -SHEBANG_FILES= bin/git-guilt \ - bin/git-merge-into +USES= gmake NO_BUILD= yes diff --git a/devel/git-extras/distinfo b/devel/git-extras/distinfo index 854fcdcff1cf..61cd8c5e33cb 100644 --- a/devel/git-extras/distinfo +++ b/devel/git-extras/distinfo @@ -1,2 +1,2 @@ -SHA256 (tj-git-extras-3.0.0_GH0.tar.gz) = 490742428824d6e807e894c3b6612be37a9a9a4e8fbea747d1813e5d62b2a807 -SIZE (tj-git-extras-3.0.0_GH0.tar.gz) = 74070 +SHA256 (tj-git-extras-4.0.0_GH0.tar.gz) = 4adaadc1f22f3240ae9607963ede29a5c010ae14b877b90c27d17d6b0c06f430 +SIZE (tj-git-extras-4.0.0_GH0.tar.gz) = 94582 diff --git a/devel/git-extras/files/patch-Makefile b/devel/git-extras/files/patch-Makefile index df05848f37b8..dcdc87b46ae5 100644 --- a/devel/git-extras/files/patch-Makefile +++ b/devel/git-extras/files/patch-Makefile @@ -1,31 +1,10 @@ ---- Makefile.orig 2015-04-27 12:13:50 UTC +--- Makefile.orig 2015-12-29 14:53:09 UTC +++ Makefile -@@ -1,6 +1,7 @@ +@@ -1,6 +1,6 @@ PREFIX ?= /usr/local BINPREFIX ?= "$(PREFIX)/bin" -MANPREFIX ?= "$(PREFIX)/share/man/man1" +MANPREFIX = "$(PREFIX)/man/man1" -+ETCPREFIX ?= "$(PREFIX)/etc" + 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 - diff --git a/devel/git-extras/pkg-plist b/devel/git-extras/pkg-plist index 32f3280f7646..4386c8a9f990 100644 --- a/devel/git-extras/pkg-plist +++ b/devel/git-extras/pkg-plist @@ -5,6 +5,7 @@ bin/git-back bin/git-bug bin/git-changelog bin/git-chore +bin/git-clear bin/git-commits-since bin/git-contrib bin/git-count @@ -23,6 +24,7 @@ bin/git-gh-pages bin/git-graft bin/git-guilt bin/git-ignore +bin/git-ignore-io bin/git-info bin/git-line-summary bin/git-local-commits @@ -33,6 +35,7 @@ bin/git-merge-repo bin/git-missing bin/git-obliterate bin/git-pr +bin/git-psykorebase bin/git-pull-request bin/git-rebase-patch bin/git-refactor @@ -43,6 +46,7 @@ bin/git-reset-file bin/git-root bin/git-rscp bin/git-scp +bin/git-sed bin/git-setup bin/git-show-merged-branches bin/git-show-tree @@ -60,6 +64,7 @@ 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-clear.1.gz man/man1/git-commits-since.1.gz man/man1/git-contrib.1.gz man/man1/git-count.1.gz @@ -77,8 +82,10 @@ 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-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 @@ -86,6 +93,7 @@ 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-psykorebase.1.gz man/man1/git-rebase-patch.1.gz man/man1/git-refactor.1.gz man/man1/git-release.1.gz @@ -94,6 +102,7 @@ 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-sed.1.gz man/man1/git-setup.1.gz man/man1/git-show-merged-branches.1.gz man/man1/git-show-tree.1.gz