[139218] trunk/dports/devel/git

[ciserlohn at macports.org]

Revision: 139218
          https://trac.macports.org/changeset/139218
Author:   ciserlohn at macports.org
Date:     2015-08-07 13:46:06 -0700 (Fri, 07 Aug 2015)
Log Message:
-----------
git: update to version 2.5.0; switch to perl 5.22 as default (see #48365)

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	2015-08-07 20:39:37 UTC (rev 139217)
+++ trunk/dports/devel/git/Portfile	2015-08-07 20:46:06 UTC (rev 139218)
@@ -5,7 +5,7 @@
 PortGroup           perl5 1.0
 
 name                git
-version             2.4.5
+version             2.5.0
 description         A fast version control system
 long_description    Git is a fast, scalable, distributed open source version \
                     control system focusing on speed and efficiency.
@@ -20,16 +20,17 @@
                     git-manpages-${version}${extract.suffix}
 
 checksums           git-${version}${extract.suffix} \
-                    rmd160  32ad53962077edd1f69cc806d92a83cbd9dfae59 \
-                    sha256  1b180ffe004004f29cadf5e978c8ff54d41d6fa7b98c05433ba685aa8e4be4a2 \
+                    rmd160  64300b7d37ec0d1682b06b508df169db797e8579 \
+                    sha256  8fa13ba8434ff83d24f57f831d55dbb9046434c266641180a37744facfce72ac \
                     git-manpages-${version}${extract.suffix} \
-                    rmd160  34e71a5cb499bfdd6ba157db91c06c3ce18f20b5 \
-                    sha256  76a474a447253b4c61c1b70028695a28386a6ed1ae59bf8ac0e513d59756a6ea \
+                    rmd160  6e1cd1d0a0e36dab3a57d2bd95706464d1020e6b \
+                    sha256  745e4e797fe5061e781c880d370b1beb480199127da5acaf4e376e0b09d4d685
 
 perl5.require_variant   yes
 perl5.conflict_variants yes
 perl5.branches          5.16 5.18 5.20 5.22
 perl5.create_variants   ${perl5.branches}
+perl5.default_branch    5.22
 
 depends_lib-append  port:curl \
                     port:zlib \
@@ -149,8 +150,8 @@
 variant doc description {Install HTML and plaintext documentation} {
     distfiles-append        git-htmldocs-${version}${extract.suffix}
     checksums-append        git-htmldocs-${version}${extract.suffix} \
-                            rmd160  ebb2f09e9ba6c511d2b171b5d0365942957dd18e \
-                            sha256  f6f36d3301f8c881985e0c2ee5b5f4e25703257dd337df166f6e238ba81d9cb7
+                            rmd160  ef85f38d2f38d3ab2c2358f1c4724be367e08ca3 \
+                            sha256  45da44678ed8d0fe5220103218110db2ce16c8899bc53c65c258fce1e0e4dd02
 
     patchfiles-append       git-subtree.html.diff
 

Modified: trunk/dports/devel/git/files/git-subtree.1.diff
===================================================================
--- trunk/dports/devel/git/files/git-subtree.1.diff	2015-08-07 20:39:37 UTC (rev 139217)
+++ trunk/dports/devel/git/files/git-subtree.1.diff	2015-08-07 20:46:06 UTC (rev 139218)
@@ -7,10 +7,10 @@
 +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
 +.\"      Date: 02/06/2015
 +.\"    Manual: Git Manual
-+.\"    Source: Git 2.4.5
++.\"    Source: Git 2.5.0
 +.\"  Language: English
 +.\"
-+.TH "GIT\-SUBTREE" "1" "02/06/2015" "Git 2\&.4\&.5" "Git Manual"
++.TH "GIT\-SUBTREE" "1" "02/06/2015" "Git 2\&.5\&.0" "Git Manual"
 +.\" -----------------------------------------------------------------
 +.\" * Define some portability stuff
 +.\" -----------------------------------------------------------------
@@ -145,7 +145,7 @@
 +.PP
 +\-\-squash
 +.RS 4
-+This option is only valid for add, merge, push and pull commands\&.
++This option is only valid for add, merge and pull commands\&.
 +.sp
 +Instead of merging the entire history from the subtree project, produce only a single commit that contains all the differences you want to merge, and then merge that new commit into your project\&.
 +.sp
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150807/7f4581ad/attachment-0001.html>