Revision: 105637 https://trac.macports.org/changeset/105637 Author: ciserlohn@macports.org Date: 2013-04-29 01:42:46 -0700 (Mon, 29 Apr 2013) Log Message: ----------- git-core: update to version 1.8.2.2 Modified Paths: -------------- trunk/dports/devel/git-core/Portfile trunk/dports/devel/git-core/files/git-subtree.1.diff trunk/dports/devel/git-core/files/git-subtree.html.diff Modified: trunk/dports/devel/git-core/Portfile =================================================================== --- trunk/dports/devel/git-core/Portfile 2013-04-29 07:05:02 UTC (rev 105636) +++ trunk/dports/devel/git-core/Portfile 2013-04-29 08:42:46 UTC (rev 105637) @@ -4,7 +4,7 @@ PortSystem 1.0 name git-core -version 1.8.2.1 +version 1.8.2.2 description A fast version control system long_description Git is a fast, scalable, distributed open source version \ control system focusing on speed and efficiency. @@ -19,11 +19,11 @@ git-manpages-${version}${extract.suffix} checksums git-${version}${extract.suffix} \ - rmd160 9f17311a8dc4d8f3192065b9db3420f2b0abed78 \ - sha256 ed6dbf91b56c1540627563b5e8683fe726dac881ae028f3f17650b88fcb641d7 \ + rmd160 320ca9cd5aa41cbd2c3f6997f58c8ec38181dbc6 \ + sha256 020de38eda302bb6e1be460f7499211948193b306beab4e1a520ffc6f7294794 \ git-manpages-${version}${extract.suffix} \ - rmd160 5b88a228cf5371938b4f76a5ee9d07d1776a4773 \ - sha256 1d3bc31d10564d29d0c3a45f98f98a7d936dfcdb1692528bf2fdb2140fe89824 \ + rmd160 d8524f0d09cb1782e691eac1ccfbef9a44ea451b \ + sha256 228deb53865415728ebd7abf18d88c73d3c1660deda0d379705d46db106366eb \ depends_run port:rsync \ port:p5.12-error \ @@ -134,8 +134,8 @@ variant doc description {Install HTML and plaintext documentation} { distfiles-append git-htmldocs-${version}${extract.suffix} checksums-append git-htmldocs-${version}${extract.suffix} \ - rmd160 44b616ef6b203286255a3be3b5947216d2c436d1 \ - sha256 3f2482089eb345ec7d2ad61ad731c17ea87733b763585b580cf99b17194e0286 + rmd160 1d907f5a0cc7857035270210425ac26fe06ea4f6 \ + sha256 c0fbf3600c781c5db29f7efc408d23ba5be617865e6f2ae8af17fce1a1dd06cc patchfiles-append git-subtree.html.diff Modified: trunk/dports/devel/git-core/files/git-subtree.1.diff =================================================================== --- trunk/dports/devel/git-core/files/git-subtree.1.diff 2013-04-29 07:05:02 UTC (rev 105636) +++ trunk/dports/devel/git-core/files/git-subtree.1.diff 2013-04-29 08:42:46 UTC (rev 105637) @@ -1,17 +1,17 @@ diff -urN a/contrib/subtree/git-subtree.1 b/contrib/subtree/git-subtree.1 --- a/contrib/subtree/git-subtree.1 1970-01-01 01:00:00.000000000 +0100 -+++ b/contrib/subtree/git-subtree.1 2013-04-08 13:18:05.000000000 +0200 -@@ -0,0 +1,606 @@ ++++ b/contrib/subtree/git-subtree.1 2013-04-29 10:28:52.000000000 +0200 +@@ -0,0 +1,607 @@ +'\" t +.\" Title: git-subtree +.\" Author: [see the "AUTHOR" section] +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -+.\" Date: 04/07/2013 ++.\" Date: 04/26/2013 +.\" Manual: Git Manual -+.\" Source: Git 1.8.2.1 ++.\" Source: Git 1.8.2.2 +.\" Language: English +.\" -+.TH "GIT\-SUBTREE" "1" "04/07/2013" "Git 1\&.8\&.2\&.1" "Git Manual" ++.TH "GIT\-SUBTREE" "1" "04/26/2013" "Git 1\&.8\&.2\&.2" "Git Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- @@ -43,6 +43,7 @@ +\fIgit subtree\fR merge \-P <prefix> <commit> +\fIgit subtree\fR split \-P <prefix> [OPTIONS] [<commit>] +.fi ++.sp +.SH "DESCRIPTION" +.sp +Subtrees allow subprojects to be included within a subdirectory of the main project, optionally including the subproject\(cqs entire history\&. Modified: trunk/dports/devel/git-core/files/git-subtree.html.diff =================================================================== --- trunk/dports/devel/git-core/files/git-subtree.html.diff 2013-04-29 07:05:02 UTC (rev 105636) +++ trunk/dports/devel/git-core/files/git-subtree.html.diff 2013-04-29 08:42:46 UTC (rev 105637) @@ -1,6 +1,6 @@ diff -urN a/contrib/subtree/git-subtree.html b/contrib/subtree/git-subtree.html --- a/contrib/subtree/git-subtree.html 1970-01-01 01:00:00.000000000 +0100 -+++ b/contrib/subtree/git-subtree.html 2013-04-08 13:43:38.000000000 +0200 ++++ b/contrib/subtree/git-subtree.html 2013-04-29 10:30:14.000000000 +0200 @@ -0,0 +1,1276 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> @@ -1273,7 +1273,7 @@ +<div id="footnotes"><hr /></div> +<div id="footer"> +<div id="footer-text"> -+Last updated 2013-04-07 15:50:17 PDT ++Last updated 2013-04-26 16:52:58 PDT +</div> +</div> +</body>