[105032] trunk/dports/devel/git-core
ciserlohn at macports.org
ciserlohn at macports.org
Mon Apr 8 04:54:17 PDT 2013
Revision: 105032
https://trac.macports.org/changeset/105032
Author: ciserlohn at macports.org
Date: 2013-04-08 04:54:17 -0700 (Mon, 08 Apr 2013)
Log Message:
-----------
git-core: update to version 1.8.2.1; remove unused patch file
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
Removed Paths:
-------------
trunk/dports/devel/git-core/files/0001-setup-Do-not-strip-trailing-from-paths.patch
Modified: trunk/dports/devel/git-core/Portfile
===================================================================
--- trunk/dports/devel/git-core/Portfile 2013-04-08 11:45:34 UTC (rev 105031)
+++ trunk/dports/devel/git-core/Portfile 2013-04-08 11:54:17 UTC (rev 105032)
@@ -4,8 +4,7 @@
PortSystem 1.0
name git-core
-version 1.8.2
-revision 1
+version 1.8.2.1
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,11 +19,11 @@
git-manpages-${version}${extract.suffix}
checksums git-${version}${extract.suffix} \
- rmd160 5bf37fa0f85b8b73691add594671f60b1a884fb6 \
- sha256 c2f35bcefa4f62a54c4bde41cc0f1cd3ddf03e9a6bc8a79557f1683789f213e6 \
+ rmd160 9f17311a8dc4d8f3192065b9db3420f2b0abed78 \
+ sha256 ed6dbf91b56c1540627563b5e8683fe726dac881ae028f3f17650b88fcb641d7 \
git-manpages-${version}${extract.suffix} \
- rmd160 5229bc5d36b2483e5e561bba5a7ff1625393b2f8 \
- sha256 c164bf40a11b1cc7e6a70fa39749c7c6aaf385429cfdfa2ebcc7386f49bb897a \
+ rmd160 5b88a228cf5371938b4f76a5ee9d07d1776a4773 \
+ sha256 1d3bc31d10564d29d0c3a45f98f98a7d936dfcdb1692528bf2fdb2140fe89824 \
depends_run port:rsync \
port:p5.12-error \
@@ -135,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 7b1d3abeeda78292fae0e7ce05693a0e5907cd62 \
- sha256 0ee46fb610a2a632d62fd37450330ca26301721cef7a4327bb7eb3cab32ba7ff
+ rmd160 44b616ef6b203286255a3be3b5947216d2c436d1 \
+ sha256 3f2482089eb345ec7d2ad61ad731c17ea87733b763585b580cf99b17194e0286
patchfiles-append git-subtree.html.diff
Deleted: trunk/dports/devel/git-core/files/0001-setup-Do-not-strip-trailing-from-paths.patch
===================================================================
--- trunk/dports/devel/git-core/files/0001-setup-Do-not-strip-trailing-from-paths.patch 2013-04-08 11:45:34 UTC (rev 105031)
+++ trunk/dports/devel/git-core/files/0001-setup-Do-not-strip-trailing-from-paths.patch 2013-04-08 11:54:17 UTC (rev 105032)
@@ -1,43 +0,0 @@
-From 76c6800f47dabff89e6aee32c90d6064324868a9 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Tue, 11 Oct 2011 00:33:35 -0700
-Subject: [PATCH] setup: Do not strip trailing / from paths
-
-real_path will strip the trailing / from provided paths. This fixes
-a regression introduced in 18e051a3981f38db08521bb61ccf7e4571335353
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
----
-
-Patch sent upstream via email on 10/11/2011 to
-carenas at sajinet.com.pe gitster at pobox.com
-
-<rdar://problem/10238070>
-
- setup.c | 10 +++++++++-
- 1 files changed, 9 insertions(+), 1 deletions(-)
-
-diff --git a/setup.c b/setup.c
-index 61c22e6..e3a8ae3 100644
---- a/setup.c
-+++ b/setup.c
-@@ -10,8 +10,16 @@ char *prefix_path(const char *prefix, int len, const char *path)
- char *sanitized;
- if (is_absolute_path(orig)) {
- const char *temp = real_path(path);
-- sanitized = xmalloc(len + strlen(temp) + 1);
-+ sanitized = xmalloc(len + strlen(temp) + 2);
- strcpy(sanitized, temp);
-+
-+ temp = strrchr(path, '\0');
-+ temp--;
-+ if (*temp == '/') {
-+ char *s = strrchr(sanitized, '\0');
-+ s[0] = '/';
-+ s[1] = '\0';
-+ }
- } else {
- sanitized = xmalloc(len + strlen(path) + 1);
- if (len)
---
-1.7.6.1
Modified: trunk/dports/devel/git-core/files/git-subtree.1.diff
===================================================================
--- trunk/dports/devel/git-core/files/git-subtree.1.diff 2013-04-08 11:45:34 UTC (rev 105031)
+++ trunk/dports/devel/git-core/files/git-subtree.1.diff 2013-04-08 11:54:17 UTC (rev 105032)
@@ -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-03-20 22:41:42.000000000 +0100
++++ b/contrib/subtree/git-subtree.1 2013-04-08 13:18:05.000000000 +0200
@@ -0,0 +1,606 @@
+'\" t
+.\" Title: git-subtree
+.\" Author: [see the "AUTHOR" section]
-+.\" Generator: DocBook XSL Stylesheets v1.78.0 <http://docbook.sf.net/>
-+.\" Date: 03/13/2013
++.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
++.\" Date: 04/07/2013
+.\" Manual: Git Manual
-+.\" Source: Git 1.8.2
++.\" Source: Git 1.8.2.1
+.\" Language: English
+.\"
-+.TH "GIT\-SUBTREE" "1" "03/13/2013" "Git 1\&.8\&.2" "Git Manual"
++.TH "GIT\-SUBTREE" "1" "04/07/2013" "Git 1\&.8\&.2\&.1" "Git Manual"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
Modified: trunk/dports/devel/git-core/files/git-subtree.html.diff
===================================================================
--- trunk/dports/devel/git-core/files/git-subtree.html.diff 2013-04-08 11:45:34 UTC (rev 105031)
+++ trunk/dports/devel/git-core/files/git-subtree.html.diff 2013-04-08 11:54:17 UTC (rev 105032)
@@ -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-03-20 22:40:35.000000000 +0100
++++ b/contrib/subtree/git-subtree.html 2013-04-08 13:43:38.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-03-13 20:15:22 CET
++Last updated 2013-04-07 15:50:17 PDT
+</div>
+</div>
+</body>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130408/0f3f0d59/attachment.html>
More information about the macports-changes
mailing list