[145492] trunk/dports/devel/git

[ciserlohn at macports.org]

Revision: 145492
          https://trac.macports.org/changeset/145492
Author:   ciserlohn at macports.org
Date:     2016-02-07 03:35:34 -0800 (Sun, 07 Feb 2016)
Log Message:
-----------
git: update to version 2.7.1; fix gitk to run with tcl/tk provided by OSX (closes #50400)

Modified Paths:
--------------
    trunk/dports/devel/git/Portfile

Added Paths:
-----------
    trunk/dports/devel/git/files/gitk-color-lime.diff

Modified: trunk/dports/devel/git/Portfile
===================================================================
--- trunk/dports/devel/git/Portfile	2016-02-07 11:33:48 UTC (rev 145491)
+++ trunk/dports/devel/git/Portfile	2016-02-07 11:35:34 UTC (rev 145492)
@@ -5,8 +5,8 @@
 PortGroup           perl5 1.0
 
 name                git
-version             2.7.0
-revision            1
+version             2.7.1
+
 description         A fast version control system
 long_description    Git is a fast, scalable, distributed open source version \
                     control system focusing on speed and efficiency.
@@ -21,11 +21,11 @@
                     git-manpages-${version}${extract.suffix}
 
 checksums           git-${version}${extract.suffix} \
-                    rmd160  ec0cb7220bc24bd8e90e4353418ba9e1456e7090 \
-                    sha256  db9df4435c70a9b25d20a9ee20d65101692dc907a5a4b30e8343c9ae1b913ead \
+                    rmd160  d54355d98b62c93b328650c34313ec190a960c25 \
+                    sha256  b4ab42798b7fb038eaefabb0c32ce9dbde2919103e5e2a35adc35dd46258a66f \
                     git-manpages-${version}${extract.suffix} \
-                    rmd160  6bc841213195a7e5ed3eefdc8045968e88a48a31 \
-                    sha256  444703d66d8441c3c67ba12997719d7510b67a6bc51ccd098474c417a334fb61 \
+                    rmd160  02ae74188d2938b07c841afc0748056884d2dbb6 \
+                    sha256  0313cf4d283336088883d8416692fb6c547512233e11dbf06e5b925b7e762d61 \
 
 perl5.require_variant   yes
 perl5.conflict_variants yes
@@ -46,7 +46,7 @@
                     port:p${perl5.major}-cgi \
                     port:rsync
 
-patchfiles          patch-Makefile.diff git-subtree.1.diff
+patchfiles          patch-Makefile.diff git-subtree.1.diff gitk-color-lime.diff
 patch.pre_args      -p1
 
 extract.only        git-${version}${extract.suffix} \
@@ -152,8 +152,8 @@
 variant doc description {Install HTML and plaintext documentation} {
     distfiles-append        git-htmldocs-${version}${extract.suffix}
     checksums-append        git-htmldocs-${version}${extract.suffix} \
-                            rmd160  a9595a0dfb333a2851d050d9b9f5e7b977471f7e \
-                            sha256  6aaf52ac565b024b7190821f8d5783973a025027e1ed9abbef61bbe7fd652d0c
+                            rmd160  6c31054c05b8a87a122d5536e08d07283f720fe7 \
+                            sha256  101fe51df3d1c53a8daa72e84d3d4b75de0e1c09ff5c48f7bd9d5a402c51bc56
 
     patchfiles-append       git-subtree.html.diff
 

Added: trunk/dports/devel/git/files/gitk-color-lime.diff
===================================================================
--- trunk/dports/devel/git/files/gitk-color-lime.diff	                        (rev 0)
+++ trunk/dports/devel/git/files/gitk-color-lime.diff	2016-02-07 11:35:34 UTC (rev 145492)
@@ -0,0 +1,53 @@
+--- a/gitk-git/gitk.orig	2016-01-21 18:18:32.000000000 +0100
++++ b/gitk-git/gitk	2016-01-21 18:24:22.000000000 +0100
+@@ -2265,7 +2265,7 @@
+ 	set h [expr {[font metrics uifont -linespace] + 2}]
+ 	set progresscanv .tf.bar.progress
+ 	canvas $progresscanv -relief sunken -height $h -borderwidth 2
+-	set progressitem [$progresscanv create rect -1 0 0 $h -fill lime]
++	set progressitem [$progresscanv create rect -1 0 0 $h -fill "#00FF00"]
+ 	set fprogitem [$progresscanv create rect -1 0 0 $h -fill yellow]
+ 	set rprogitem [$progresscanv create rect -1 0 0 $h -fill red]
+     }
+@@ -3397,7 +3397,7 @@
+        0x00, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,
+        0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00};
+ }
+-image create bitmap reficon-H -background black -foreground lime \
++image create bitmap reficon-H -background black -foreground "#00FF00" \
+     -data $rectdata -maskdata $rectmask
+ image create bitmap reficon-o -background black -foreground "#ddddff" \
+     -data $rectdata -maskdata $rectmask
+@@ -12188,7 +12188,7 @@
+     set extdifftool "meld"
+ }
+ 
+-set colors {lime red blue magenta darkgrey brown orange}
++set colors {"#00FF00" red blue magenta darkgrey brown orange}
+ if {[tk windowingsystem] eq "win32"} {
+     set uicolor SystemButtonFace
+     set uifgcolor SystemButtonText
+@@ -12206,12 +12206,12 @@
+ }
+ set diffcolors {red "#00a000" blue}
+ set diffcontext 3
+-set mergecolors {red blue lime purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
++set mergecolors {red blue "#00FF00" purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
+ set ignorespace 0
+ set worddiff ""
+ set markbgcolor "#e0e0ff"
+ 
+-set headbgcolor lime
++set headbgcolor "#00FF00"
+ set headfgcolor black
+ set headoutlinecolor black
+ set remotebgcolor #ffddaa
+@@ -12226,7 +12226,7 @@
+ set linehoveroutlinecolor black
+ set mainheadcirclecolor yellow
+ set workingfilescirclecolor red
+-set indexcirclecolor lime
++set indexcirclecolor "#00FF00"
+ set circlecolors {white blue gray blue blue}
+ set linkfgcolor blue
+ set circleoutlinecolor $fgcolor
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160207/06ba5ac3/attachment.html>