<!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>[153209] 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/153209">153209</a></dd>
<dt>Author</dt> <dd>ciserlohn@macports.org</dd>
<dt>Date</dt> <dd>2016-09-27 04:49:52 -0700 (Tue, 27 Sep 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>git: update to version 2.10.0; remove python/bash_completion variants; move to perl 5.24; adapt livecheck regex</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelgitPortfile">trunk/dports/devel/git/Portfile</a></li>
<li><a href="#trunkdportsdevelgitfilesgitsubtree1diff">trunk/dports/devel/git/files/git-subtree.1.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 (153208 => 153209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/git/Portfile        2016-09-27 11:36:47 UTC (rev 153208)
+++ trunk/dports/devel/git/Portfile        2016-09-27 11:49:52 UTC (rev 153209)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup           perl5 1.0
</span><span class="cx"> 
</span><span class="cx"> name                git
</span><del>-version             2.9.3
</del><ins>+version             2.10.0
</ins><span class="cx"> 
</span><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="lines">@@ -21,23 +21,24 @@
</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  da4094b8fcba4e0cdd5012573b6a781fec10e271 \
-                    sha256  a252b6636b12d5ba57732c8469701544c26c2b1689933bd1b425e603cbb247c0 \
</del><ins>+                    rmd160  68bfc3dbb5522c80d9017be321081e1fa93189bc \
+                    sha256  207cfce8cc0a36497abb66236817ef449a45f6ff9141f586bbe2aafd7bc3d90b \
</ins><span class="cx">                     git-manpages-${version}${extract.suffix} \
</span><del>-                    rmd160  341905c6e939f8a8663dad3cde93318ed74854ae \
-                    sha256  8ea1a55b048fafbf0c0c6fcbca4b5b0f5e9917893221fc7345c09051d65832ce \
</del><ins>+                    rmd160  3de9262c9ba5b21813da205b46925c6305f843a9 \
+                    sha256  f12a72c3cd01952e43fbbbd84343a5afbb0566fee680a1052ea9c715cdb65c14 \
</ins><span class="cx"> 
</span><span class="cx"> perl5.require_variant   yes
</span><span class="cx"> perl5.conflict_variants yes
</span><del>-perl5.branches          5.22 5.24
</del><ins>+perl5.branches          5.24
</ins><span class="cx"> perl5.create_variants   ${perl5.branches}
</span><del>-perl5.default_branch    5.22
</del><ins>+perl5.default_branch    5.24
</ins><span class="cx"> 
</span><span class="cx"> depends_lib-append  port:curl \
</span><span class="cx">                     port:zlib \
</span><span class="cx">                     path:lib/libssl.dylib:openssl \
</span><span class="cx">                     port:expat \
</span><del>-                    port:libiconv
</del><ins>+                    port:libiconv \
+                    port:python27
</ins><span class="cx"> 
</span><span class="cx"> depends_run-append  port:p${perl5.major}-authen-sasl \
</span><span class="cx">                     port:p${perl5.major}-error \
</span><span class="lines">@@ -67,6 +68,7 @@
</span><span class="cx">                     OPENSSLDIR=${prefix} \
</span><span class="cx">                     ICONVDIR=${prefix} \
</span><span class="cx">                     PERL_PATH=&quot;${prefix}/bin/perl${perl5.major}&quot; \
</span><ins>+                    PYTHON_PATH=&quot;${prefix}/bin/python2.7&quot; \
</ins><span class="cx">                     NO_FINK=1 \
</span><span class="cx">                     NO_DARWIN_PORTS=1 \
</span><span class="cx">                     NO_R_TO_GCC_LINKER=1 \
</span><span class="lines">@@ -130,20 +132,6 @@
</span><span class="cx"> 
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-if {![variant_isset python26] &amp;&amp; ![variant_isset python27]} {
-    default_variants    +python27
-}
-
-variant python26 conflicts python27 description {Use Python 2.6} {
-    build.args-append       PYTHON_PATH=&quot;${prefix}/bin/python2.6&quot;
-    depends_lib-append      port:python26
-}
-
-variant python27 conflicts python26 description {Use Python 2.7} {
-    build.args-append       PYTHON_PATH=&quot;${prefix}/bin/python2.7&quot;
-    depends_lib-append      port:python27
-}
-
</del><span class="cx"> variant pcre {
</span><span class="cx">     build.args-append       LIBPCREDIR=${prefix} USE_LIBPCRE=1
</span><span class="cx">     depends_lib-append      port:pcre
</span><span class="lines">@@ -152,8 +140,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  06b51f28bd9f873da8f6774a7dd049e580f65907 \
-                            sha256  04c13358e9930a52fccd1b60a0602a883ec7ff450df36bbdd5a828d366fbbd08
</del><ins>+                            rmd160  7527703d93cf9e920d86dc53fcf7fbdf32a6ba6b \
+                            sha256  c40afce5949a3788f4fc2928b0daaffad71813b59e14fcec7bd2e48381a17dce
</ins><span class="cx"> 
</span><span class="cx">     patchfiles-append       git-subtree.html.diff
</span><span class="cx"> 
</span><span class="lines">@@ -213,11 +201,6 @@
</span><span class="cx">                         port:p${perl5.major}-svn-simple
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-variant bash_completion {
-    depends_run-append  path:etc/bash_completion:bash-completion
-}
-
-
</del><span class="cx"> variant credential_osxkeychain description {Install git credential-osxkeychain utility from contrib} {
</span><span class="cx"> 
</span><span class="cx">     post-build {
</span><span class="lines">@@ -237,4 +220,4 @@
</span><span class="cx"> default_variants    +doc +pcre +credential_osxkeychain
</span><span class="cx"> 
</span><span class="cx"> livecheck.type          regexm
</span><del>-livecheck.regex         {&lt;span class=&quot;version&quot;&gt;.*?(\d\.\d\.\d).*?&lt;/span&gt;}
</del><ins>+livecheck.regex         {&lt;span class=&quot;version&quot;&gt;.*?(\d+\.\d+\.\d+).*?&lt;/span&gt;}
</ins></span></pre></div>
<a id="trunkdportsdevelgitfilesgitsubtree1diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/git/files/git-subtree.1.diff (153208 => 153209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/git/files/git-subtree.1.diff        2016-09-27 11:36:47 UTC (rev 153208)
+++ trunk/dports/devel/git/files/git-subtree.1.diff        2016-09-27 11:49:52 UTC (rev 153209)
</span><span class="lines">@@ -7,10 +7,10 @@
</span><span class="cx"> +.\&quot; Generator: DocBook XSL Stylesheets v1.78.1 &lt;http://docbook.sf.net/&gt;
</span><span class="cx"> +.\&quot;      Date: 03/03/2016
</span><span class="cx"> +.\&quot;    Manual: Git Manual
</span><del>-+.\&quot;    Source: Git 2.9.3
</del><ins>++.\&quot;    Source: Git 2.10.0
</ins><span class="cx"> +.\&quot;  Language: English
</span><span class="cx"> +.\&quot;
</span><del>-+.TH &quot;GIT\-SUBTREE&quot; &quot;1&quot; &quot;03/03/2016&quot; &quot;Git 2\&amp;.9\&amp;.3&quot; &quot;Git Manual&quot;
</del><ins>++.TH &quot;GIT\-SUBTREE&quot; &quot;1&quot; &quot;03/03/2016&quot; &quot;Git 2\&amp;.10\&amp;.0&quot; &quot;Git Manual&quot;
</ins><span class="cx"> +.\&quot; -----------------------------------------------------------------
</span><span class="cx"> +.\&quot; * Define some portability stuff
</span><span class="cx"> +.\&quot; -----------------------------------------------------------------
</span></span></pre>
</div>
</div>

</body>
</html>