[112427] trunk/dports/devel/git-core
ciserlohn at macports.org
ciserlohn at macports.org
Tue Oct 22 11:45:36 PDT 2013
Revision: 112427
https://trac.macports.org/changeset/112427
Author: ciserlohn at macports.org
Date: 2013-10-22 11:45:36 -0700 (Tue, 22 Oct 2013)
Log Message:
-----------
git-core: update to version 1.8.4.1; remove patches that are now included upstream
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/patch-perl-Git-SVN-Fetcher.pm.diff
trunk/dports/devel/git-core/files/patch-perl-Git.pm.diff
Modified: trunk/dports/devel/git-core/Portfile
===================================================================
--- trunk/dports/devel/git-core/Portfile 2013-10-22 18:25:54 UTC (rev 112426)
+++ trunk/dports/devel/git-core/Portfile 2013-10-22 18:45:36 UTC (rev 112427)
@@ -4,7 +4,7 @@
PortSystem 1.0
name git-core
-version 1.8.4
+version 1.8.4.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.
@@ -19,11 +19,11 @@
git-manpages-${version}${extract.suffix}
checksums git-${version}${extract.suffix} \
- rmd160 546720ff4234e0aec4867a81c7fba3130ccae397 \
- sha256 51e8522c256ef8091c6fd5846b9cef8ba4e764819193b5b6cec570f530e6cb94 \
+ rmd160 0e6c0a3157cfaac312fa2d955d56def510044bae \
+ sha256 f05c513a4a1d9d1ca1182ff43cfbccc1e8da0120f781aca415a5e3e1132451d3 \
git-manpages-${version}${extract.suffix} \
- rmd160 faa19ee86ae56f23bfde6ea446f32b60494ba6d8 \
- sha256 854552e693b22a7ff1c25d2d710d87c8f7dad14888c946c10be60893fdee091f \
+ rmd160 e31aa57c611a921f48a1d3e88e31bae701818f75 \
+ sha256 1466dcec43f27729cb368769fa2f50945b7323fd01c8b623bc7c6092a6e9e09d \
depends_run port:rsync \
port:p5.12-error \
@@ -135,8 +135,8 @@
variant doc description {Install HTML and plaintext documentation} {
distfiles-append git-htmldocs-${version}${extract.suffix}
checksums-append git-htmldocs-${version}${extract.suffix} \
- rmd160 603a99227de0b891618fcd1c81c8dfecc032beaa \
- sha256 5afc0d00e476975075c3658ffb628c2d4c4f11940ff379b600e2fdf8018d622a
+ rmd160 71bd463c1b8b5a1ee0e927a7ca906a241b87ab77 \
+ sha256 36d18b0ca09b80dff20d9a7937022e7f123fcbe07562146230c7e5eaad4e2f74
patchfiles-append git-subtree.html.diff
@@ -183,9 +183,6 @@
depends_run-append port:subversion \
port:p5.12-libwww-perl \
port:p5.12-svn-simple
- patchfiles-append patch-perl-Git-SVN-Fetcher.pm.diff \
- patch-perl-Git.pm.diff
-
}
variant bash_completion {
Modified: trunk/dports/devel/git-core/files/git-subtree.1.diff
===================================================================
--- trunk/dports/devel/git-core/files/git-subtree.1.diff 2013-10-22 18:25:54 UTC (rev 112426)
+++ trunk/dports/devel/git-core/files/git-subtree.1.diff 2013-10-22 18:45:36 UTC (rev 112427)
@@ -5,12 +5,12 @@
+.\" Title: git-subtree
+.\" Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-+.\" Date: 08/23/2013
++.\" Date: 10/21/2013
+.\" Manual: Git Manual
-+.\" Source: Git 1.8.4
++.\" Source: Git 1.8.4.1
+.\" Language: English
+.\"
-+.TH "GIT\-SUBTREE" "1" "08/23/2013" "Git 1\&.8\&.4" "Git Manual"
++.TH "GIT\-SUBTREE" "1" "08/23/2013" "Git 1\&.8\&.4\&.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-10-22 18:25:54 UTC (rev 112426)
+++ trunk/dports/devel/git-core/files/git-subtree.html.diff 2013-10-22 18:45:36 UTC (rev 112427)
@@ -1272,7 +1272,7 @@
+<div id="footnotes"><hr /></div>
+<div id="footer">
+<div id="footer-text">
-+Last updated 2013-07-26 09:37:10 PDT
++Last updated 2013-10-21 10:37:10 PDT
+</div>
+</div>
+</body>
Deleted: trunk/dports/devel/git-core/files/patch-perl-Git-SVN-Fetcher.pm.diff
===================================================================
--- trunk/dports/devel/git-core/files/patch-perl-Git-SVN-Fetcher.pm.diff 2013-10-22 18:25:54 UTC (rev 112426)
+++ trunk/dports/devel/git-core/files/patch-perl-Git-SVN-Fetcher.pm.diff 2013-10-22 18:45:36 UTC (rev 112427)
@@ -1,22 +0,0 @@
-diff --git a/perl/Git/SVN/Fetcher.pm b/perl/Git/SVN/Fetcher.pm
-index bd17418..10edb27 100644
---- a/perl/Git/SVN/Fetcher.pm
-+++ b/perl/Git/SVN/Fetcher.pm
-@@ -315,11 +315,13 @@ sub change_file_prop {
- sub apply_textdelta {
- my ($self, $fb, $exp) = @_;
- return undef if $self->is_path_ignored($fb->{path});
-- my $fh = $::_repository->temp_acquire('svn_delta');
-+ my $suffix = 0;
-+ ++$suffix while $::_repository->temp_is_locked("svn_delta_${$}_$suffix");
-+ my $fh = $::_repository->temp_acquire("svn_delta_${$}_$suffix");
- # $fh gets auto-closed() by SVN::TxDelta::apply(),
- # (but $base does not,) so dup() it for reading in close_file
- open my $dup, '<&', $fh or croak $!;
-- my $base = $::_repository->temp_acquire('git_blob');
-+ my $base = $::_repository->temp_acquire("git_blob_${$}_$suffix");
-
- if ($fb->{blob}) {
- my ($base_is_link, $size);
-
-
Deleted: trunk/dports/devel/git-core/files/patch-perl-Git.pm.diff
===================================================================
--- trunk/dports/devel/git-core/files/patch-perl-Git.pm.diff 2013-10-22 18:25:54 UTC (rev 112426)
+++ trunk/dports/devel/git-core/files/patch-perl-Git.pm.diff 2013-10-22 18:45:36 UTC (rev 112427)
@@ -1,47 +0,0 @@
---- a/perl/Git.pm
-+++ b/perl/Git.pm
-@@ -61,7 +61,7 @@ require Exporter;
- remote_refs prompt
- get_tz_offset
- credential credential_read credential_write
-- temp_acquire temp_release temp_reset temp_path);
-+ temp_acquire temp_is_locked temp_release temp_reset temp_path);
-
-
- =head1 DESCRIPTION
-@@ -1206,6 +1206,35 @@ sub temp_acquire {
- $temp_fd;
- }
-
-+=item temp_is_locked ( NAME )
-+
-+Returns true if the internal lock created by a previous C<temp_acquire()>
-+call with C<NAME> is still in effect.
-+
-+When temp_acquire is called on a C<NAME>, it internally locks the temporary
-+file mapped to C<NAME>. That lock will not be released until C<temp_release()>
-+is called with either the original C<NAME> or the L<File::Handle> that was
-+returned from the original call to temp_acquire.
-+
-+Subsequent attempts to call C<temp_acquire()> with the same C<NAME> will fail
-+unless there has been an intervening C<temp_release()> call for that C<NAME>
-+(or its corresponding L<File::Handle> that was returned by the original
-+C<temp_acquire()> call).
-+
-+If true is returned by C<temp_is_locked()> for a C<NAME>, an attempt to
-+C<temp_acquire()> the same C<NAME> will cause an error unless
-+C<temp_release> is first called on that C<NAME> (or its corresponding
-+L<File::Handle> that was returned by the original C<temp_acquire()> call).
-+
-+=cut
-+
-+sub temp_is_locked {
-+ my ($self, $name) = _maybe_self(@_);
-+ my $temp_fd = \$TEMP_FILEMAP{$name};
-+
-+ defined $$temp_fd && $$temp_fd->opened && $TEMP_FILES{$$temp_fd}{locked};
-+}
-+
- =item temp_release ( NAME )
-
- =item temp_release ( FILEHANDLE )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131022/9434437d/attachment-0001.html>
More information about the macports-changes
mailing list