[133702] trunk/dports/devel/git-extras

[ryandesign at macports.org]

Revision: 133702
          https://trac.macports.org/changeset/133702
Author:   ryandesign at macports.org
Date:     2015-03-08 23:42:34 -0700 (Sun, 08 Mar 2015)
Log Message:
-----------
git-extras: update to 2.2.0 (#46977)

Modified Paths:
--------------
    trunk/dports/devel/git-extras/Portfile
    trunk/dports/devel/git-extras/files/patch-Makefile.diff

Added Paths:
-----------
    trunk/dports/devel/git-extras/files/patch-bin-git-extras.diff

Removed Paths:
-------------
    trunk/dports/devel/git-extras/files/patch-remove-auto-updater.diff

Modified: trunk/dports/devel/git-extras/Portfile
===================================================================
--- trunk/dports/devel/git-extras/Portfile	2015-03-09 06:35:12 UTC (rev 133701)
+++ trunk/dports/devel/git-extras/Portfile	2015-03-09 06:42:34 UTC (rev 133702)
@@ -4,8 +4,7 @@
 PortSystem              1.0
 PortGroup               github 1.0
 
-github.setup            tj git-extras 2.1.0 v
-revision                1
+github.setup            tj git-extras 2.2.0
 maintainers             nomaintainer
 platforms               darwin
 categories              devel
@@ -17,10 +16,10 @@
     commit percentages and more
 license                 MIT
 
-checksums               rmd160  dfd5e33402bc65c1ef6310c93c49371b723622ef \
-                        sha256  bcd0aed2f6675929f59d4be386a34f71023c7851f69d60f2d9360131705b40b7
+checksums               rmd160  5147eb7fd8470a30dd04861944e7c3a1daeaeddb \
+                        sha256  1cfeaa9f2644a37541f8c4e8f175222c70b36fe9672fc7f9c9ef248c0071e4bb
 
-patchfiles              patch-remove-auto-updater.diff \
+patchfiles              patch-bin-git-extras.diff \
                         patch-Makefile.diff
 
 use_configure           no

Modified: trunk/dports/devel/git-extras/files/patch-Makefile.diff
===================================================================
--- trunk/dports/devel/git-extras/files/patch-Makefile.diff	2015-03-09 06:35:12 UTC (rev 133701)
+++ trunk/dports/devel/git-extras/files/patch-Makefile.diff	2015-03-09 06:42:34 UTC (rev 133702)
@@ -1,14 +1,5 @@
 --- Makefile	2015-03-09 01:31:30.000000000 -0500
 +++ Makefile	2015-03-09 01:31:43.000000000 -0500
-@@ -17,7 +17,7 @@
- 	@mkdir -p $(DESTDIR)$(BINPREFIX)
- 	@echo "... installing bins to $(DESTDIR)$(BINPREFIX)"
- 	@echo "... installing man pages to $(DESTDIR)$(MANPREFIX)"
--	$(eval TEMPFILE := $(shell mktemp))
-+	$(eval TEMPFILE := $(shell mktemp tmp.XXXXXXXXXX))
- 	@# chmod from rw-------(default) to rwxrwxr-x, so that users can exec the scripts
- 	@chmod 775 $(TEMPFILE)
- 	@$(foreach COMMAND, $(COMMANDS_USED_WITH_GIT_REPO), \
 @@ -31,8 +31,8 @@
  		cp -f bin/$(COMMAND) $(DESTDIR)$(BINPREFIX); \
  	)

Copied: trunk/dports/devel/git-extras/files/patch-bin-git-extras.diff (from rev 133653, trunk/dports/devel/git-extras/files/patch-remove-auto-updater.diff)
===================================================================
--- trunk/dports/devel/git-extras/files/patch-bin-git-extras.diff	                        (rev 0)
+++ trunk/dports/devel/git-extras/files/patch-bin-git-extras.diff	2015-03-09 06:42:34 UTC (rev 133702)
@@ -0,0 +1,23 @@
+--- bin/git-extras.orig	2014-11-18 10:07:03.000000000 -0600
++++ bin/git-extras	2015-03-09 01:38:44.000000000 -0500
+@@ -4,15 +4,9 @@
+ 
+ update() {
+-  local bin=$(which git-extras)
+-  local prefix=${bin%/*/*}
+-  local orig=$PWD
+-
+-  cd /tmp \
+-    && rm -fr ./git-extras \
+-    && git clone --depth 1 https://github.com/tj/git-extras.git \
+-    && cd git-extras \
+-    && PREFIX="$prefix" make install \
+-    && cd "$orig" \
+-    && echo "... updated git-extras $VERSION -> $(git extras --version)"
++  echo "Please run the following commands to update your installation of git-extras to the latest version provided by MacPorts:"
++  echo ""
++  echo "    sudo port selfupdate"
++  echo "    sudo port upgrade git-extras"
++  echo ""
+ }
+ 

Deleted: trunk/dports/devel/git-extras/files/patch-remove-auto-updater.diff
===================================================================
--- trunk/dports/devel/git-extras/files/patch-remove-auto-updater.diff	2015-03-09 06:35:12 UTC (rev 133701)
+++ trunk/dports/devel/git-extras/files/patch-remove-auto-updater.diff	2015-03-09 06:42:34 UTC (rev 133702)
@@ -1,25 +0,0 @@
---- bin/git-extras.orig	2014-03-19 11:23:28.000000000 +0100
-+++ bin/git-extras	2014-03-19 11:27:30.000000000 +0100
-@@ -3,17 +3,11 @@
- VERSION="1.9.0"
- 
- update() {
--  local bin=$(which git-extras)
--  local prefix=${bin%/*/*}
--  local orig=$PWD
--
--  cd /tmp \
--    && rm -fr ./git-extras \
--    && git clone --depth 1 https://github.com/visionmedia/git-extras.git \
--    && cd git-extras \
--    && PREFIX="$prefix" make install \
--    && cd "$orig" \
--    && echo "... updated git-extras $VERSION -> $(git extras --version)"
-+  echo "Please run the following commands to update your installation of git-extras to the latest version provided by MacPorts:"
-+  echo ""
-+  echo "    sudo port selfupdate"
-+  echo "    sudo port upgrade git-extras"
-+  echo ""
- }
- 
- case "$1" in
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150308/b5767b83/attachment.html>