[Midnightbsd-cvs] mports [18080] trunk/devel/git: git 2.3.1
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Mar 8 14:21:59 EDT 2015
Revision: 18080
http://svnweb.midnightbsd.org/mports/?rev=18080
Author: laffer1
Date: 2015-03-08 14:21:58 -0400 (Sun, 08 Mar 2015)
Log Message:
-----------
git 2.3.1
Modified Paths:
--------------
trunk/devel/git/Makefile
trunk/devel/git/distinfo
trunk/devel/git/pkg-plist
Removed Paths:
-------------
trunk/devel/git/files/README.patches
trunk/devel/git/files/patch-git-svn.perl
trunk/devel/git/files/patch-perl_Git_SVN_Editor.pm
trunk/devel/git/files/patch-subtree-Makefile
Modified: trunk/devel/git/Makefile
===================================================================
--- trunk/devel/git/Makefile 2015-03-08 18:17:51 UTC (rev 18079)
+++ trunk/devel/git/Makefile 2015-03-08 18:21:58 UTC (rev 18080)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= git
-PORTVERSION= 2.2.1
+PORTVERSION= 2.3.1
CATEGORIES= devel
MASTER_SITES= KERNEL_ORG
MASTER_SITE_SUBDIR= software/scm/git
@@ -26,7 +26,7 @@
GNU_CONFIGURE= yes
USES= gmake shebangfix tar:xz
-CPPFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -isystem${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV+= V=1 XMLTO_EXTRA=--skip-validation
USE_OPENSSL= yes
Modified: trunk/devel/git/distinfo
===================================================================
--- trunk/devel/git/distinfo 2015-03-08 18:17:51 UTC (rev 18079)
+++ trunk/devel/git/distinfo 2015-03-08 18:21:58 UTC (rev 18080)
@@ -1,6 +1,6 @@
-SHA256 (git-2.2.1.tar.xz) = 09422dc9a0bdddf6bdd5b8634c71e1ed3125256c47424e6a2687701e764ef450
-SIZE (git-2.2.1.tar.xz) = 3590808
-SHA256 (git-manpages-2.2.1.tar.xz) = 00f8357fd8ab9e3b397dd087b20d405ed141765d04f3f2162e65fdec7cb1e538
-SIZE (git-manpages-2.2.1.tar.xz) = 369796
-SHA256 (git-htmldocs-2.2.1.tar.xz) = dee32b06ecf26044169adf40d95cb301c4219416a65c94b89c6513a80f03863b
-SIZE (git-htmldocs-2.2.1.tar.xz) = 975488
+SHA256 (git-2.3.1.tar.xz) = 1acc4b051576143eb41d80f5675476629588c7c5fb4e6a1dc2c4590f47c498b7
+SIZE (git-2.3.1.tar.xz) = 3609908
+SHA256 (git-manpages-2.3.1.tar.xz) = c58b033af1b26baba78ffc940f4f5a0f16c3491a3f5708375d0bcf0d8031a940
+SIZE (git-manpages-2.3.1.tar.xz) = 370756
+SHA256 (git-htmldocs-2.3.1.tar.xz) = 03bfc92c813a5cbbb34b61fdd7b9cf1226ad9b2b8388d24c649d915df3b93dad
+SIZE (git-htmldocs-2.3.1.tar.xz) = 981748
Deleted: trunk/devel/git/files/README.patches
===================================================================
--- trunk/devel/git/files/README.patches 2015-03-08 18:17:51 UTC (rev 18079)
+++ trunk/devel/git/files/README.patches 2015-03-08 18:21:58 UTC (rev 18080)
@@ -1,6 +0,0 @@
- These two patches:
- patch-git-svn.perl
- patch-perl_Git_SVN_Editor.pm
- Are forward ported from: http://marc.info/?l=git&m=125259772625008&w=2
- Updated here: https://github.com/splbio/git/tree/v2.1.2-git-svn-propset
-
Deleted: trunk/devel/git/files/patch-git-svn.perl
===================================================================
--- trunk/devel/git/files/patch-git-svn.perl 2015-03-08 18:17:51 UTC (rev 18079)
+++ trunk/devel/git/files/patch-git-svn.perl 2015-03-08 18:21:58 UTC (rev 18080)
@@ -1,80 +0,0 @@
---- git-svn.perl.orig 2014-11-16 02:01:16 UTC
-+++ git-svn.perl
-@@ -115,7 +115,7 @@ my ($_stdin, $_help, $_edit,
- $_before, $_after,
- $_merge, $_strategy, $_preserve_merges, $_dry_run, $_parents, $_local,
- $_prefix, $_no_checkout, $_url, $_verbose,
-- $_commit_url, $_tag, $_merge_info, $_interactive);
-+ $_commit_url, $_tag, $_merge_info, $_interactive, $_set_svn_props);
-
- # This is a refactoring artifact so Git::SVN can get at this git-svn switch.
- sub opt_prefix { return $_prefix || '' }
-@@ -193,6 +193,7 @@ my %cmd = (
- 'dry-run|n' => \$_dry_run,
- 'fetch-all|all' => \$_fetch_all,
- 'commit-url=s' => \$_commit_url,
-+ 'set-svn-props=s' => \$_set_svn_props,
- 'revision|r=i' => \$_revision,
- 'no-rebase' => \$_no_rebase,
- 'mergeinfo=s' => \$_merge_info,
-@@ -228,6 +229,9 @@ my %cmd = (
- 'propget' => [ \&cmd_propget,
- 'Print the value of a property on a file or directory',
- { 'revision|r=i' => \$_revision } ],
-+ 'propset' => [ \&cmd_propset,
-+ 'Set the value of a property on a file or directory - will be set on commit',
-+ {} ],
- 'proplist' => [ \&cmd_proplist,
- 'List all properties of a file or directory',
- { 'revision|r=i' => \$_revision } ],
-@@ -1370,6 +1374,50 @@ sub cmd_propget {
- print $props->{$prop} . "\n";
- }
-
-+# cmd_propset (PROPNAME, PROPVAL, PATH)
-+# ------------------------
-+# Adjust the SVN property PROPNAME to PROPVAL for PATH.
-+sub cmd_propset {
-+ my ($propname, $propval, $path) = @_;
-+ $path = '.' if not defined $path;
-+ $path = $cmd_dir_prefix . $path;
-+ usage(1) if not defined $propname;
-+ usage(1) if not defined $propval;
-+ my $file = basename($path);
-+ my $dn = dirname($path);
-+ # diff has check_attr locally, so just call direct
-+ #my $current_properties = check_attr( "svn-properties", $path );
-+ my $current_properties = Git::SVN::Editor::check_attr( "svn-properties", $path );
-+ my $new_properties = "";
-+ if ($current_properties eq "unset" || $current_properties eq "" || $current_properties eq "set") {
-+ $new_properties = "$propname=$propval";
-+ } else {
-+ # TODO: handle combining properties better
-+ my @props = split(/;/, $current_properties);
-+ my $replaced_prop = 0;
-+ foreach my $prop (@props) {
-+ # Parse 'name=value' syntax and set the property.
-+ if ($prop =~ /([^=]+)=(.*)/) {
-+ my ($n,$v) = ($1,$2);
-+ if ($n eq $propname)
-+ {
-+ $v = $propval;
-+ $replaced_prop = 1;
-+ }
-+ if ($new_properties eq "") { $new_properties="$n=$v"; }
-+ else { $new_properties="$new_properties;$n=$v"; }
-+ }
-+ }
-+ if ($replaced_prop eq 0) {
-+ $new_properties = "$new_properties;$propname=$propval";
-+ }
-+ }
-+ my $attrfile = "$dn/.gitattributes";
-+ open my $attrfh, '>>', $attrfile or die "Can't open $attrfile: $!\n";
-+ # TODO: don't simply append here if $file already has svn-properties
-+ print $attrfh "$file svn-properties=$new_properties\n";
-+}
-+
- # cmd_proplist (PATH)
- # -------------------
- # Print the list of SVN properties for PATH.
Deleted: trunk/devel/git/files/patch-perl_Git_SVN_Editor.pm
===================================================================
--- trunk/devel/git/files/patch-perl_Git_SVN_Editor.pm 2015-03-08 18:17:51 UTC (rev 18079)
+++ trunk/devel/git/files/patch-perl_Git_SVN_Editor.pm 2015-03-08 18:21:58 UTC (rev 18080)
@@ -1,84 +0,0 @@
---- perl/Git/SVN/Editor.pm.orig 2014-09-30 19:00:40 UTC
-+++ perl/Git/SVN/Editor.pm
-@@ -288,6 +288,49 @@ sub apply_autoprops {
- }
- }
-
-+sub check_attr
-+{
-+ my ($attr,$path) = @_;
-+ if ( open my $fh, '-|', "git", "check-attr", $attr, "--", $path )
-+ {
-+ my $val = <$fh>;
-+ close $fh;
-+ $val =~ s/^[^:]*:\s*[^:]*:\s*(.*)\s*$/$1/;
-+ return $val;
-+ }
-+ else
-+ {
-+ return undef;
-+ }
-+}
-+
-+sub apply_manualprops {
-+ my ($self, $file, $fbat) = @_;
-+ my $pending_properties = check_attr( "svn-properties", $file );
-+ if ($pending_properties eq "") { return; }
-+ # Parse the list of properties to set.
-+ my @props = split(/;/, $pending_properties);
-+ # TODO: get existing properties to compare to - this fails for add so currently not done
-+ # my $existing_props = ::get_svnprops($file);
-+ my $existing_props = {};
-+ # TODO: caching svn properties or storing them in .gitattributes would make that faster
-+ foreach my $prop (@props) {
-+ # Parse 'name=value' syntax and set the property.
-+ if ($prop =~ /([^=]+)=(.*)/) {
-+ my ($n,$v) = ($1,$2);
-+ for ($n, $v) {
-+ s/^\s+//; s/\s+$//;
-+ }
-+ # FIXME: clearly I don't know perl and couldn't work out how to evaluate this better
-+ if (defined $existing_props->{$n} && $existing_props->{$n} eq $v) {
-+ my $needed = 0;
-+ } else {
-+ $self->change_file_prop($fbat, $n, $v);
-+ }
-+ }
-+ }
-+}
-+
- sub A {
- my ($self, $m, $deletions) = @_;
- my ($dir, $file) = split_path($m->{file_b});
-@@ -296,6 +339,7 @@ sub A {
- undef, -1);
- print "\tA\t$m->{file_b}\n" unless $::_q;
- $self->apply_autoprops($file, $fbat);
-+ $self->apply_manualprops($m->{file_b}, $fbat);
- $self->chg_file($fbat, $m);
- $self->close_file($fbat,undef,$self->{pool});
- }
-@@ -311,6 +355,7 @@ sub C {
- my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
- $upa, $self->{r});
- print "\tC\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
-+ $self->apply_manualprops($m->{file_b}, $fbat);
- $self->chg_file($fbat, $m);
- $self->close_file($fbat,undef,$self->{pool});
- }
-@@ -333,6 +378,7 @@ sub R {
- $upa, $self->{r});
- print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
- $self->apply_autoprops($file, $fbat);
-+ $self->apply_manualprops($m->{file_b}, $fbat);
- $self->chg_file($fbat, $m);
- $self->close_file($fbat,undef,$self->{pool});
-
-@@ -348,6 +394,7 @@ sub M {
- my $fbat = $self->open_file($self->repo_path($m->{file_b}),
- $pbat,$self->{r},$self->{pool});
- print "\t$m->{chg}\t$m->{file_b}\n" unless $::_q;
-+ $self->apply_manualprops($m->{file_b}, $fbat);
- $self->chg_file($fbat, $m);
- $self->close_file($fbat,undef,$self->{pool});
- }
Deleted: trunk/devel/git/files/patch-subtree-Makefile
===================================================================
--- trunk/devel/git/files/patch-subtree-Makefile 2015-03-08 18:17:51 UTC (rev 18079)
+++ trunk/devel/git/files/patch-subtree-Makefile 2015-03-08 18:21:58 UTC (rev 18080)
@@ -1,11 +0,0 @@
---- contrib/subtree/Makefile.orig 2014-10-14 22:09:29.000000000 -0400
-+++ contrib/subtree/Makefile 2014-10-14 22:09:43.000000000 -0400
-@@ -53,7 +53,7 @@
- $(INSTALL) -m 644 $^ $(DESTDIR)$(man1dir)
-
- $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
-- $(XMLTO) -m $(MANPAGE_XSL) man $^
-+ $(XMLTO) --skip-validation -m $(MANPAGE_XSL) man $^
-
- $(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)
- $(ASCIIDOC) -b docbook -d manpage -f $(ASCIIDOC_CONF) \
Modified: trunk/devel/git/pkg-plist
===================================================================
--- trunk/devel/git/pkg-plist 2015-03-08 18:17:51 UTC (rev 18079)
+++ trunk/devel/git/pkg-plist 2015-03-08 18:21:58 UTC (rev 18080)
@@ -1209,11 +1209,15 @@
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.1.4.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.0.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.1.txt
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/git-favicon.png
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/git-logo.png
+%%CONTRIB%%share/git-core/contrib/contacts/Makefile
%%CONTRIB%%share/git-core/contrib/contacts/git-contacts
%%CONTRIB%%share/git-core/contrib/contacts/git-contacts.txt
%%CONTRIB%%share/git-core/contrib/README
More information about the Midnightbsd-cvs
mailing list