[csw-devel] SF.net SVN: gar:[3591] csw/mgar/pkg/git/trunk
bdwalton at users.sourceforge.net
bdwalton at users.sourceforge.net
Thu Mar 5 21:36:19 CET 2009
Revision: 3591
http://gar.svn.sourceforge.net/gar/?rev=3591&view=rev
Author: bdwalton
Date: 2009-03-05 20:36:19 +0000 (Thu, 05 Mar 2009)
Log Message:
-----------
Bump to 1.6.2
Remove patches since they're incorporated upstrea.
Switch to tracking Git repo instead of static tarballs.
Modified Paths:
--------------
csw/mgar/pkg/git/trunk/Makefile
csw/mgar/pkg/git/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/git/trunk/files/0001-git-svn-fix-to-avoid-using-strftime-z.patch
csw/mgar/pkg/git/trunk/files/CSWgit.gspec
csw/mgar/pkg/git/trunk/files/CSWgitcvs.gspec
csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec
csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec
csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec
csw/mgar/pkg/git/trunk/files/CSWgitk.gspec
csw/mgar/pkg/git/trunk/files/CSWgitsvn.gspec
Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile 2009-03-05 19:41:28 UTC (rev 3590)
+++ csw/mgar/pkg/git/trunk/Makefile 2009-03-05 20:36:19 UTC (rev 3591)
@@ -1,5 +1,5 @@
GARNAME = git
-GARVERSION = 1.6.1.3
+GARVERSION = 1.6.2
CATEGORIES = devel
PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc
@@ -52,11 +52,11 @@
SPKG_DESC_CSWgitcvs = Git tools for working with CVS repositories
SPKG_DESC_CSWgitdoc = Documentation for Git
-MASTER_SITES = http://kernel.org/pub/software/scm/$(GARNAME)/
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
+GIT_USE_PROXY = 1
+GIT_REPOS = git://git.kernel.org/pub/scm/git/git.git
+GIT_TREEISH_git.git = v$(GARVERSION)
PATCHFILES = doc-makefile.patch
-PATCHFILES += 0001-git-svn-fix-to-avoid-using-strftime-z.patch
PKGFILES_CSWgitsvn = .*svn.*
PKGFILES_CSWgitgui = .*git-gui.* .*git-citool.*
@@ -65,7 +65,8 @@
PKGFILES_CSWgitcvs = .*cvs.*
PKGFILES_CSWgitdoc = $(PKGFILES_DOC)
-# We define upstream file regex so we can be notifed of new upstream software release
+# We define upstream file regex so we can be notifed of new upstream
+# software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
GARCOMPILER = GNU
@@ -84,13 +85,17 @@
include gar/category.mk
-# override path so we use the local modifications to checkpkg.
-PATH := /home/bwalton:$(PATH)
-
# for tail -n and to override things like, etc with the gnu counterparts
# gnu must come first so xpg4/sed isn't found first.
PATH := /opt/csw/gnu:/usr/xpg4/bin:$(PATH)
+# git doesn't track the configure file, it needs to be built when using
+# source right from the repo.
+pre-configure-modulated:
+ @(cd $(WORKSRC); echo $(GARVERSION) > version; \
+ $(MAKE) configure )
+ @$(MAKECOOKIE)
+
# force the elisp extension to be built too.
post-build-modulated:
@echo Builing Emacs Git extension
Modified: csw/mgar/pkg/git/trunk/checksums
===================================================================
--- csw/mgar/pkg/git/trunk/checksums 2009-03-05 19:41:28 UTC (rev 3590)
+++ csw/mgar/pkg/git/trunk/checksums 2009-03-05 20:36:19 UTC (rev 3591)
@@ -1,3 +1,3 @@
-e31ea5ce9b076f5745056f01465e9602 download/git-1.6.1.3.tar.bz2
075441ea2a95cfa5fd7aaebb888a93f3 download/doc-makefile.patch
97290254ce2e9e6c37fdd824140fda85 download/0001-git-svn-fix-to-avoid-using-strftime-z.patch
+1081a8ca474317f1963e0d1ee69832de download/0002-git-svn-return-original-format_svn_date-semantics.patch
Deleted: 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 2009-03-05 19:41:28 UTC (rev 3590)
+++ csw/mgar/pkg/git/trunk/files/0001-git-svn-fix-to-avoid-using-strftime-z.patch 2009-03-05 20:36:19 UTC (rev 3591)
@@ -1,41 +0,0 @@
-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
-
Deleted: csw/mgar/pkg/git/trunk/files/CSWgit.gspec
===================================================================
--- csw/mgar/pkg/git/trunk/files/CSWgit.gspec 2009-03-05 19:41:28 UTC (rev 3590)
+++ csw/mgar/pkg/git/trunk/files/CSWgit.gspec 2009-03-05 20:36:19 UTC (rev 3591)
@@ -1,4 +0,0 @@
-%var bitname git
-%var pkgname CSWgit
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING
Deleted: csw/mgar/pkg/git/trunk/files/CSWgitcvs.gspec
===================================================================
--- csw/mgar/pkg/git/trunk/files/CSWgitcvs.gspec 2009-03-05 19:41:28 UTC (rev 3590)
+++ csw/mgar/pkg/git/trunk/files/CSWgitcvs.gspec 2009-03-05 20:36:19 UTC (rev 3591)
@@ -1,5 +0,0 @@
-%var bitname git_cvs
-%var pkgname CSWgitcvs
-%var arch all
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING
Deleted: csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec
===================================================================
--- csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec 2009-03-05 19:41:28 UTC (rev 3590)
+++ csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec 2009-03-05 20:36:19 UTC (rev 3591)
@@ -1,5 +0,0 @@
-%var bitname git_doc
-%var pkgname CSWgitdoc
-%var arch all
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING
Deleted: csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec
===================================================================
--- csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec 2009-03-05 19:41:28 UTC (rev 3590)
+++ csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec 2009-03-05 20:36:19 UTC (rev 3591)
@@ -1,6 +0,0 @@
-%var bitname git_emacs
-%var pkgname CSWgitemacs
-%var desc A Git VCS mode for Emacs
-%var arch all
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING
Deleted: csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec
===================================================================
--- csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec 2009-03-05 19:41:28 UTC (rev 3590)
+++ csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec 2009-03-05 20:36:19 UTC (rev 3591)
@@ -1,5 +0,0 @@
-%var bitname git_gui
-%var pkgname CSWgitgui
-%var arch all
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING
Deleted: csw/mgar/pkg/git/trunk/files/CSWgitk.gspec
===================================================================
--- csw/mgar/pkg/git/trunk/files/CSWgitk.gspec 2009-03-05 19:41:28 UTC (rev 3590)
+++ csw/mgar/pkg/git/trunk/files/CSWgitk.gspec 2009-03-05 20:36:19 UTC (rev 3591)
@@ -1,5 +0,0 @@
-%var bitname gitk
-%var pkgname CSWgitk
-%var arch all
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING
Deleted: csw/mgar/pkg/git/trunk/files/CSWgitsvn.gspec
===================================================================
--- csw/mgar/pkg/git/trunk/files/CSWgitsvn.gspec 2009-03-05 19:41:28 UTC (rev 3590)
+++ csw/mgar/pkg/git/trunk/files/CSWgitsvn.gspec 2009-03-05 20:36:19 UTC (rev 3591)
@@ -1,5 +0,0 @@
-%var bitname git_svn
-%var pkgname CSWgitsvn
-%var arch all
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING
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