cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to git 1.6.1.2 and add a subversion 1.5.5 fix for git-svn.

Browse Source
This commit is contained in:
bernd 2009-01-29 23:16:35 +00:00
parent e7b91b80fd
commit 64507eb71a
5 changed files with 47 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devel/git/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.40 2009/01/26 08:58:43 bernd Exp $
# $OpenBSD: Makefile,v 1.41 2009/01/29 23:16:35 bernd Exp $
COMMENT-main= GIT - Tree History Storage Tool
COMMENT-svn= GIT - subversion interoperability tools
COMMENT-x11= GIT - graphical tools
V= 1.6.1
V= 1.6.1.2
DISTNAME= git-${V}
PKGNAME-main= ${DISTNAME}p0
PKGNAME-main= ${DISTNAME}
PKGNAME-svn= git-svn-${V}
PKGNAME-x11= git-x11-${V}
CATEGORIES= devel

30
devel/git/distinfo
View File

@ -1,15 +1,15 @@
MD5 (git-1.6.1.tar.gz) = H5FZKdT1Si4ESaSgjwkxGA==
MD5 (git-htmldocs-1.6.1.tar.gz) = SJ/2lpB6ElOzi+MZJPamzQ==
MD5 (git-manpages-1.6.1.tar.gz) = l/M9oxfQU6H675uU1MMoOA==
RMD160 (git-1.6.1.tar.gz) = pvMiFr5otul4+dF83u6fBD9W/6A=
RMD160 (git-htmldocs-1.6.1.tar.gz) = PcYKM6KxpeX4/kOCvWvyaSnIVKI=
RMD160 (git-manpages-1.6.1.tar.gz) = IdgPa6swjF5GR7pOoReGoh5DUp8=
SHA1 (git-1.6.1.tar.gz) = 2/5tLIORqExCndmoeh4fyYzkirs=
SHA1 (git-htmldocs-1.6.1.tar.gz) = qm/tXAD90d4iY/BHAKh20HQj+rc=
SHA1 (git-manpages-1.6.1.tar.gz) = PjWyzMJLzjHfPpzLsQ4MHzDkr+U=
SHA256 (git-1.6.1.tar.gz) = fgl5ZtMaoNGPUfgPZuGa5t9NUj/nQimPMxdRMd4hoew=
SHA256 (git-htmldocs-1.6.1.tar.gz) = z9KUOeZ/mYBuGXIxSHGyvHu4JsEcKNbh1O+Zidj5I1A=
SHA256 (git-manpages-1.6.1.tar.gz) = uCORUeN9N8DvwnebJ52ZWyMnntm32pFyfKO4oLFPxZA=
SIZE (git-1.6.1.tar.gz) = 2381834
SIZE (git-htmldocs-1.6.1.tar.gz) = 1007598
SIZE (git-manpages-1.6.1.tar.gz) = 327846
MD5 (git-1.6.1.2.tar.gz) = 5WjagmFrODbzhQKvywsMIQ==
MD5 (git-htmldocs-1.6.1.2.tar.gz) = 3yEmSu39idFPObLSCJMk2g==
MD5 (git-manpages-1.6.1.2.tar.gz) = Y9ZCGJo2qjRloQ20hWRUpw==
RMD160 (git-1.6.1.2.tar.gz) = 4UU1Pzwu7w/DUuaCTTJrkzI3E68=
RMD160 (git-htmldocs-1.6.1.2.tar.gz) = YX/cXJmK4v4S9giOXnrFSboGE7U=
RMD160 (git-manpages-1.6.1.2.tar.gz) = pMkWQF/fOYeKKuj1hd6hxzEgUhE=
SHA1 (git-1.6.1.2.tar.gz) = 5Rb4v1eLGZcDmv5Xa63eRpedNwU=
SHA1 (git-htmldocs-1.6.1.2.tar.gz) = 1G9xkY4RZmWHwJeSfFLAP24bYRo=
SHA1 (git-manpages-1.6.1.2.tar.gz) = VJYZDUGiNofZmcEaLlrg7+JuY9o=
SHA256 (git-1.6.1.2.tar.gz) = 8HM7+Gz5sQSzaSSdNgn5XpdYJ1E0QnBS3vOunkHh4qA=
SHA256 (git-htmldocs-1.6.1.2.tar.gz) = Lbgt3d5pfxDAo7ERCbDQfEaXTmov+XBmmncweYmGCuk=
SHA256 (git-manpages-1.6.1.2.tar.gz) = G8lap+VIogfGxdYMZbLF1t72eA6ZNMKx0CfrEyeOQTc=
SIZE (git-1.6.1.2.tar.gz) = 2387524
SIZE (git-htmldocs-1.6.1.2.tar.gz) = 1009420
SIZE (git-manpages-1.6.1.2.tar.gz) = 328232

21
devel/git/patches/patch-git-svn_perl Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-git-svn_perl,v 1.1 2009/01/29 23:16:35 bernd Exp $
In svn 1.5.5 the output of "svn info" for added directories was changed
and now shows the repository UUID. This patch implements the same
behavior for "git svn info" and makes t9119-git-svn-info.17 pass if
svn 1.5.5 is used.
Patch from Marcel Koeppen, found on the git mailing list.
--- git-svn.perl.orig Thu Jan 29 10:43:46 2009
+++ git-svn.perl Thu Jan 29 20:13:00 2009
@@ -911,7 +911,8 @@ sub cmd_info {
if ($@) {
$result .= "Repository Root: (offline)\n";
}
- $result .= "Repository UUID: $uuid\n" unless $diff_status eq "A";
+ $result .= "Repository UUID: $uuid\n" unless $diff_status eq "A" &&
+ ($SVN::Core::VERSION le '1.5.4' || $file_type ne "dir");
$result .= "Revision: " . ($diff_status eq "A" ? 0 : $rev) . "\n";
$result .= "Node Kind: " .

10
devel/git/patches/patch-gitweb_gitweb_perl
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-gitweb_gitweb_perl,v 1.8 2009/01/24 14:31:29 bernd Exp $
$OpenBSD: patch-gitweb_gitweb_perl,v 1.9 2009/01/29 23:16:35 bernd Exp $
This prevents the following error: '-T and -B not implemented on filehandles'
--- gitweb/gitweb.perl.orig Thu Dec 25 06:33:25 2008
+++ gitweb/gitweb.perl Thu Dec 25 19:30:58 2008
@@ -4724,7 +4724,7 @@ sub git_blob_plain {
--- gitweb/gitweb.perl.orig Mon Jan 26 01:48:26 2009
+++ gitweb/gitweb.perl Mon Jan 26 16:24:54 2009
@@ -4725,7 +4725,7 @@ sub git_blob_plain {
$expires = "+1d";
}
@ -13,7 +13,7 @@ This prevents the following error: '-T and -B not implemented on filehandles'
or die_error(500, "Open git-cat-file blob '$hash' failed");
# content-type (can include charset)
@@ -4767,7 +4767,7 @@ sub git_blob {
@@ -4768,7 +4768,7 @@ sub git_blob {
}
my $have_blame = gitweb_check_feature('blame');

4
devel/git/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.23 2009/01/24 14:31:29 bernd Exp $
@comment $OpenBSD: PLIST-main,v 1.24 2009/01/29 23:16:35 bernd Exp $
@pkgpath devel/git
@bin bin/git
bin/git-cvsserver
@ -350,6 +350,8 @@ share/doc/git/RelNotes-1.6.0.4.txt
share/doc/git/RelNotes-1.6.0.5.txt
share/doc/git/RelNotes-1.6.0.6.txt
share/doc/git/RelNotes-1.6.0.txt
share/doc/git/RelNotes-1.6.1.1.txt
share/doc/git/RelNotes-1.6.1.2.txt
share/doc/git/RelNotes-1.6.1.txt
share/doc/git/blame-options.txt
share/doc/git/cmds-ancillaryinterrogators.txt