<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[145492] trunk/dports/devel/git</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/145492">145492</a></dd>
<dt>Author</dt> <dd>ciserlohn@macports.org</dd>
<dt>Date</dt> <dd>2016-02-07 03:35:34 -0800 (Sun, 07 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>git: update to version 2.7.1; fix gitk to run with tcl/tk provided by OSX (closes #50400)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelgitPortfile">trunk/dports/devel/git/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelgitfilesgitkcolorlimediff">trunk/dports/devel/git/files/gitk-color-lime.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelgitPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/git/Portfile (145491 => 145492)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5,8 +5,8 @@
</span><span class="cx"> PortGroup perl5 1.0
</span><span class="cx">
</span><span class="cx"> name git
</span><del>-version 2.7.0
-revision 1
</del><ins>+version 2.7.1
+
</ins><span class="cx"> description A fast version control system
</span><span class="cx"> long_description Git is a fast, scalable, distributed open source version \
</span><span class="cx"> control system focusing on speed and efficiency.
</span><span class="lines">@@ -21,11 +21,11 @@
</span><span class="cx"> git-manpages-${version}${extract.suffix}
</span><span class="cx">
</span><span class="cx"> checksums git-${version}${extract.suffix} \
</span><del>- rmd160 ec0cb7220bc24bd8e90e4353418ba9e1456e7090 \
- sha256 db9df4435c70a9b25d20a9ee20d65101692dc907a5a4b30e8343c9ae1b913ead \
</del><ins>+ rmd160 d54355d98b62c93b328650c34313ec190a960c25 \
+ sha256 b4ab42798b7fb038eaefabb0c32ce9dbde2919103e5e2a35adc35dd46258a66f \
</ins><span class="cx"> git-manpages-${version}${extract.suffix} \
</span><del>- rmd160 6bc841213195a7e5ed3eefdc8045968e88a48a31 \
- sha256 444703d66d8441c3c67ba12997719d7510b67a6bc51ccd098474c417a334fb61 \
</del><ins>+ rmd160 02ae74188d2938b07c841afc0748056884d2dbb6 \
+ sha256 0313cf4d283336088883d8416692fb6c547512233e11dbf06e5b925b7e762d61 \
</ins><span class="cx">
</span><span class="cx"> perl5.require_variant yes
</span><span class="cx"> perl5.conflict_variants yes
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> port:p${perl5.major}-cgi \
</span><span class="cx"> port:rsync
</span><span class="cx">
</span><del>-patchfiles patch-Makefile.diff git-subtree.1.diff
</del><ins>+patchfiles patch-Makefile.diff git-subtree.1.diff gitk-color-lime.diff
</ins><span class="cx"> patch.pre_args -p1
</span><span class="cx">
</span><span class="cx"> extract.only git-${version}${extract.suffix} \
</span><span class="lines">@@ -152,8 +152,8 @@
</span><span class="cx"> variant doc description {Install HTML and plaintext documentation} {
</span><span class="cx"> distfiles-append git-htmldocs-${version}${extract.suffix}
</span><span class="cx"> checksums-append git-htmldocs-${version}${extract.suffix} \
</span><del>- rmd160 a9595a0dfb333a2851d050d9b9f5e7b977471f7e \
- sha256 6aaf52ac565b024b7190821f8d5783973a025027e1ed9abbef61bbe7fd652d0c
</del><ins>+ rmd160 6c31054c05b8a87a122d5536e08d07283f720fe7 \
+ sha256 101fe51df3d1c53a8daa72e84d3d4b75de0e1c09ff5c48f7bd9d5a402c51bc56
</ins><span class="cx">
</span><span class="cx"> patchfiles-append git-subtree.html.diff
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsdevelgitfilesgitkcolorlimediff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/git/files/gitk-color-lime.diff (0 => 145492)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+--- 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
</ins></span></pre>
</div>
</div>
</body>
</html>