[153209] trunk/dports/devel/git

[ciserlohn at macports.org]

Revision: 153209
          https://trac.macports.org/changeset/153209
Author:   ciserlohn at macports.org
Date:     2016-09-27 04:49:52 -0700 (Tue, 27 Sep 2016)
Log Message:
-----------
git: update to version 2.10.0; remove python/bash_completion variants; move to perl 5.24; adapt livecheck regex

Modified Paths:
--------------
    trunk/dports/devel/git/Portfile
    trunk/dports/devel/git/files/git-subtree.1.diff

Modified: trunk/dports/devel/git/Portfile
===================================================================
--- 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)
@@ -5,7 +5,7 @@
 PortGroup           perl5 1.0
 
 name                git
-version             2.9.3
+version             2.10.0
 
 description         A fast version control system
 long_description    Git is a fast, scalable, distributed open source version \
@@ -21,23 +21,24 @@
                     git-manpages-${version}${extract.suffix}
 
 checksums           git-${version}${extract.suffix} \
-                    rmd160  da4094b8fcba4e0cdd5012573b6a781fec10e271 \
-                    sha256  a252b6636b12d5ba57732c8469701544c26c2b1689933bd1b425e603cbb247c0 \
+                    rmd160  68bfc3dbb5522c80d9017be321081e1fa93189bc \
+                    sha256  207cfce8cc0a36497abb66236817ef449a45f6ff9141f586bbe2aafd7bc3d90b \
                     git-manpages-${version}${extract.suffix} \
-                    rmd160  341905c6e939f8a8663dad3cde93318ed74854ae \
-                    sha256  8ea1a55b048fafbf0c0c6fcbca4b5b0f5e9917893221fc7345c09051d65832ce \
+                    rmd160  3de9262c9ba5b21813da205b46925c6305f843a9 \
+                    sha256  f12a72c3cd01952e43fbbbd84343a5afbb0566fee680a1052ea9c715cdb65c14 \
 
 perl5.require_variant   yes
 perl5.conflict_variants yes
-perl5.branches          5.22 5.24
+perl5.branches          5.24
 perl5.create_variants   ${perl5.branches}
-perl5.default_branch    5.22
+perl5.default_branch    5.24
 
 depends_lib-append  port:curl \
                     port:zlib \
                     path:lib/libssl.dylib:openssl \
                     port:expat \
-                    port:libiconv
+                    port:libiconv \
+                    port:python27
 
 depends_run-append  port:p${perl5.major}-authen-sasl \
                     port:p${perl5.major}-error \
@@ -67,6 +68,7 @@
                     OPENSSLDIR=${prefix} \
                     ICONVDIR=${prefix} \
                     PERL_PATH="${prefix}/bin/perl${perl5.major}" \
+                    PYTHON_PATH="${prefix}/bin/python2.7" \
                     NO_FINK=1 \
                     NO_DARWIN_PORTS=1 \
                     NO_R_TO_GCC_LINKER=1 \
@@ -130,20 +132,6 @@
 
 }
 
-if {![variant_isset python26] && ![variant_isset python27]} {
-    default_variants    +python27
-}
-
-variant python26 conflicts python27 description {Use Python 2.6} {
-    build.args-append       PYTHON_PATH="${prefix}/bin/python2.6"
-    depends_lib-append      port:python26
-}
-
-variant python27 conflicts python26 description {Use Python 2.7} {
-    build.args-append       PYTHON_PATH="${prefix}/bin/python2.7"
-    depends_lib-append      port:python27
-}
-
 variant pcre {
     build.args-append       LIBPCREDIR=${prefix} USE_LIBPCRE=1
     depends_lib-append      port:pcre
@@ -152,8 +140,8 @@
 variant doc description {Install HTML and plaintext documentation} {
     distfiles-append        git-htmldocs-${version}${extract.suffix}
     checksums-append        git-htmldocs-${version}${extract.suffix} \
-                            rmd160  06b51f28bd9f873da8f6774a7dd049e580f65907 \
-                            sha256  04c13358e9930a52fccd1b60a0602a883ec7ff450df36bbdd5a828d366fbbd08
+                            rmd160  7527703d93cf9e920d86dc53fcf7fbdf32a6ba6b \
+                            sha256  c40afce5949a3788f4fc2928b0daaffad71813b59e14fcec7bd2e48381a17dce
 
     patchfiles-append       git-subtree.html.diff
 
@@ -213,11 +201,6 @@
                         port:p${perl5.major}-svn-simple
 }
 
-variant bash_completion {
-    depends_run-append  path:etc/bash_completion:bash-completion
-}
-
-
 variant credential_osxkeychain description {Install git credential-osxkeychain utility from contrib} {
 
     post-build {
@@ -237,4 +220,4 @@
 default_variants    +doc +pcre +credential_osxkeychain
 
 livecheck.type          regexm
-livecheck.regex         {<span class="version">.*?(\d\.\d\.\d).*?</span>}
+livecheck.regex         {<span class="version">.*?(\d+\.\d+\.\d+).*?</span>}

Modified: trunk/dports/devel/git/files/git-subtree.1.diff
===================================================================
--- 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)
@@ -7,10 +7,10 @@
 +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
 +.\"      Date: 03/03/2016
 +.\"    Manual: Git Manual
-+.\"    Source: Git 2.9.3
++.\"    Source: Git 2.10.0
 +.\"  Language: English
 +.\"
-+.TH "GIT\-SUBTREE" "1" "03/03/2016" "Git 2\&.9\&.3" "Git Manual"
++.TH "GIT\-SUBTREE" "1" "03/03/2016" "Git 2\&.10\&.0" "Git Manual"
 +.\" -----------------------------------------------------------------
 +.\" * Define some portability stuff
 +.\" -----------------------------------------------------------------
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160927/0f96b19d/attachment.html>