[csw-devel] SF.net SVN: gar:[3469] csw/mgar/pkg/git/trunk
bdwalton at users.sourceforge.net
bdwalton at users.sourceforge.net
Tue Feb 24 20:48:24 CET 2009
Revision: 3469
http://gar.svn.sourceforge.net/gar/?rev=3469&view=rev
Author: bdwalton
Date: 2009-02-24 19:48:23 +0000 (Tue, 24 Feb 2009)
Log Message:
-----------
* Modified patch to make the %z substitution the default based on comments
from upstream.
* Specifically name LICENSE files.
Modified Paths:
--------------
csw/mgar/pkg/git/trunk/Makefile
csw/mgar/pkg/git/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/git/trunk/files/0001-git-svn-fix-to-avoid-using-strftime-z.patch
Removed Paths:
-------------
csw/mgar/pkg/git/trunk/files/0001-git-svn-fix-for-systems-without-strftime-z.patch
Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile 2009-02-24 19:34:24 UTC (rev 3468)
+++ csw/mgar/pkg/git/trunk/Makefile 2009-02-24 19:48:23 UTC (rev 3469)
@@ -30,6 +30,14 @@
REQUIRED_PKGS_CSWgitdoc = CSWgit
+LICENSE_CSWgit = COPYING
+LICENSE_CSWgitk = COPYING
+LICENSE_CSWgitgui = COPYING
+LICENSE_CSWgitsvn = COPYING
+LICENSE_CSWgitcvs = COPYING
+LICENSE_CSWgitemacs = COPYING
+LICENSE_CSWgitdoc = COPYING
+
DESCRIPTION = Fast Version Control System
define BLURB
Git is a popular version control system designed to handle
@@ -48,7 +56,7 @@
DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
PATCHFILES = doc-makefile.patch
-PATCHFILES += 0001-git-svn-fix-for-systems-without-strftime-z.patch
+PATCHFILES += 0001-git-svn-fix-to-avoid-using-strftime-z.patch
PKGFILES_CSWgitsvn = .*svn.*
PKGFILES_CSWgitgui = .*git-gui.* .*git-citool.*
Modified: csw/mgar/pkg/git/trunk/checksums
===================================================================
--- csw/mgar/pkg/git/trunk/checksums 2009-02-24 19:34:24 UTC (rev 3468)
+++ csw/mgar/pkg/git/trunk/checksums 2009-02-24 19:48:23 UTC (rev 3469)
@@ -1,3 +1,3 @@
e31ea5ce9b076f5745056f01465e9602 download/git-1.6.1.3.tar.bz2
075441ea2a95cfa5fd7aaebb888a93f3 download/doc-makefile.patch
-eb302356ce2cfbf076d3e86aa450f97a download/0001-git-svn-fix-for-systems-without-strftime-z.patch
+97290254ce2e9e6c37fdd824140fda85 download/0001-git-svn-fix-to-avoid-using-strftime-z.patch
Deleted: csw/mgar/pkg/git/trunk/files/0001-git-svn-fix-for-systems-without-strftime-z.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0001-git-svn-fix-for-systems-without-strftime-z.patch 2009-02-24 19:34:24 UTC (rev 3468)
+++ csw/mgar/pkg/git/trunk/files/0001-git-svn-fix-for-systems-without-strftime-z.patch 2009-02-24 19:48:23 UTC (rev 3469)
@@ -1,47 +0,0 @@
-From 1f6308edd35dde7e9f4a73c9a446b353020b73c2 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at artsci.utoronto.ca>
-Date: Sun, 22 Feb 2009 13:53:11 -0500
-Subject: [PATCH] git-svn fix for systems without strftime %z
-
-%z isn't available on all platforms in the date formatting
-routines. Detect when %z is ignored and insert the
-the proper value if necessary.
----
- git-svn.perl | 14 +++++++++++++-
- 1 files changed, 13 insertions(+), 1 deletions(-)
-
-diff --git a/git-svn.perl b/git-svn.perl
-index cbc5211..66f49b4 100755
---- a/git-svn.perl
-+++ b/git-svn.perl
-@@ -4615,6 +4615,7 @@ package Git::SVN::Log;
- use strict;
- use warnings;
- use POSIX qw/strftime/;
-+use Time::Local;
- use constant commit_log_separator => ('-' x 72) . "\n";
- use vars qw/$TZ $limit $color $pager $non_recursive $verbose $oneline
- %rusers $show_commit $incremental/;
-@@ -4721,7 +4722,18 @@ sub run_pager {
- }
-
- sub format_svn_date {
-- return strftime("%Y-%m-%d %H:%M:%S %z (%a, %d %b %Y)", localtime(shift));
-+ my $timestr = strftime("%Y-%m-%d %H:%M:%S %z (%a, %d %b %Y)", localtime(shift));
-+
-+ # for systems without %z (solaris 8, 9, etc)
-+ if ($timestr =~ /%z/) {
-+ my $lt = time;
-+ my $gm = timelocal(gmtime($lt));
-+ my $sign = qw( + + - )[ $lt <=> $gm ];
-+ my $gmoff = sprintf("%s%02d%02d", $sign, (gmtime(abs($lt - $gm)))[2,1]);
-+ $timestr =~ s/%z/$gmoff/;
-+ }
-+
-+ return $timestr;
- }
-
- sub parse_git_date {
---
-1.6.0.4
-
Added: csw/mgar/pkg/git/trunk/files/0001-git-svn-fix-to-avoid-using-strftime-z.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0001-git-svn-fix-to-avoid-using-strftime-z.patch (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0001-git-svn-fix-to-avoid-using-strftime-z.patch 2009-02-24 19:48:23 UTC (rev 3469)
@@ -0,0 +1,41 @@
+From 48fcd6ae6c41779336242bb4cd00b3050b7bf6e2 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at artsci.utoronto.ca>
+Date: Tue, 24 Feb 2009 12:31:39 -0500
+Subject: [PATCH] git-svn fix to avoid using strftime %z
+
+%z isn't available on all platforms in the date formatting
+routines. Provide a workalike capability that should be
+more portable.
+---
+ git-svn.perl | 8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/git-svn.perl b/git-svn.perl
+index cbc5211..24180eb 100755
+--- a/git-svn.perl
++++ b/git-svn.perl
+@@ -4615,6 +4615,7 @@ package Git::SVN::Log;
+ use strict;
+ use warnings;
+ use POSIX qw/strftime/;
++use Time::Local;
+ use constant commit_log_separator => ('-' x 72) . "\n";
+ use vars qw/$TZ $limit $color $pager $non_recursive $verbose $oneline
+ %rusers $show_commit $incremental/;
+@@ -4721,7 +4722,12 @@ sub run_pager {
+ }
+
+ sub format_svn_date {
+- return strftime("%Y-%m-%d %H:%M:%S %z (%a, %d %b %Y)", localtime(shift));
++ # some systmes don't handle or mishandle %z, so be creative.
++ my $t = shift;
++ my $gm = timelocal(gmtime($t));
++ my $sign = qw( + + - )[ $t <=> $gm ];
++ my $gmoff = sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]);
++ return strftime("%Y-%m-%d %H:%M:%S $gmoff (%a, %d %b %Y)", localtime($t));
+ }
+
+ sub parse_git_date {
+--
+1.6.0.4
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list