diff --git a/devel/git/Makefile b/devel/git/Makefile index 95fd4ec72f4..fe8205ecca4 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.34 2008/09/27 21:47:20 bernd Exp $ +# $OpenBSD: Makefile,v 1.35 2008/10/24 09:17:34 bernd Exp $ COMMENT-main= GIT - Tree History Storage Tool COMMENT-svn= GIT - subversion interoperability tools COMMENT-x11= GIT - graphical tools -V= 1.6.0.2 +V= 1.6.0.3 DISTNAME= git-${V} PKGNAME-main= ${DISTNAME} PKGNAME-svn= git-svn-${V} diff --git a/devel/git/distinfo b/devel/git/distinfo index f219bd85875..c1c66d44291 100644 --- a/devel/git/distinfo +++ b/devel/git/distinfo @@ -1,15 +1,15 @@ -MD5 (git-1.6.0.2.tar.gz) = zGmu5TY+Q+cH1reB42pGIA== -MD5 (git-htmldocs-1.6.0.2.tar.gz) = ubEMguawNr8lVvOGvvqrEg== -MD5 (git-manpages-1.6.0.2.tar.gz) = C/mO9tyyRij6Q1ONMKlz1w== -RMD160 (git-1.6.0.2.tar.gz) = UPyoEDlDKSGUZzCC1wuM5tIayjk= -RMD160 (git-htmldocs-1.6.0.2.tar.gz) = /giJlRjygRJ1XMxvYb9261OmNJE= -RMD160 (git-manpages-1.6.0.2.tar.gz) = +lXgWcuxCZIy8PZx/W8ICXv5HpE= -SHA1 (git-1.6.0.2.tar.gz) = ewgUN0qXNLKVVxjJOQpAIdoxEP8= -SHA1 (git-htmldocs-1.6.0.2.tar.gz) = 1F84hUnliJDFSV25yBHucecTQJA= -SHA1 (git-manpages-1.6.0.2.tar.gz) = 1vjb7YqDa9V+xnVRMNAWEKCaMXM= -SHA256 (git-1.6.0.2.tar.gz) = pNbiQlMPBIGTfN94mULXnAE8vWoh57Uuzp6diz/6Kxg= -SHA256 (git-htmldocs-1.6.0.2.tar.gz) = EzED3UJ3UC/TeD4W+jTlwyaJQ80OTM4xuKmzfJiTTZ8= -SHA256 (git-manpages-1.6.0.2.tar.gz) = cgpXH3tFNmLnyKJam2X6g79eOO1/xmsJOftqL20/nOw= -SIZE (git-1.6.0.2.tar.gz) = 2237730 -SIZE (git-htmldocs-1.6.0.2.tar.gz) = 1011895 -SIZE (git-manpages-1.6.0.2.tar.gz) = 321707 +MD5 (git-1.6.0.3.tar.gz) = 85O+iOALzD0UNRpuT31AfQ== +MD5 (git-htmldocs-1.6.0.3.tar.gz) = RTt8GgDr4Jj4aCH5/LWRiQ== +MD5 (git-manpages-1.6.0.3.tar.gz) = rMn7JsF2laUNk3GFMwnSLg== +RMD160 (git-1.6.0.3.tar.gz) = upDMaxkkyZsuPmCJLeBl9XhFeSg= +RMD160 (git-htmldocs-1.6.0.3.tar.gz) = 6EOqATnEwcqG3IbJu2Xy/AU2W1E= +RMD160 (git-manpages-1.6.0.3.tar.gz) = HnpmSVY4CGS+9ZnA+DpTNwI6mZs= +SHA1 (git-1.6.0.3.tar.gz) = VAs694mEUE+onjUScRu/8nXpudM= +SHA1 (git-htmldocs-1.6.0.3.tar.gz) = fbkKJNtg1yOidPPIW2OKtLD4GzU= +SHA1 (git-manpages-1.6.0.3.tar.gz) = h9gKpnOYW0I2YQ69EdyHvyp2824= +SHA256 (git-1.6.0.3.tar.gz) = zSX56yzolZGP+dRHpKYeBChlf0vAbV98OhsibIA6AX0= +SHA256 (git-htmldocs-1.6.0.3.tar.gz) = A+I1hM1sewIt5uaNMMQ4FfzuytCiaTF5uibRtymoq04= +SHA256 (git-manpages-1.6.0.3.tar.gz) = V48NGMIn5Dh+rhyO30AJVyTw88e7hMq9lzG3gnG6vOo= +SIZE (git-1.6.0.3.tar.gz) = 2245170 +SIZE (git-htmldocs-1.6.0.3.tar.gz) = 1016680 +SIZE (git-manpages-1.6.0.3.tar.gz) = 322752 diff --git a/devel/git/patches/patch-gitweb_gitweb_perl b/devel/git/patches/patch-gitweb_gitweb_perl index 354bd0c0d89..ae9d387370a 100644 --- a/devel/git/patches/patch-gitweb_gitweb_perl +++ b/devel/git/patches/patch-gitweb_gitweb_perl @@ -1,10 +1,10 @@ -$OpenBSD: patch-gitweb_gitweb_perl,v 1.5 2008/09/27 21:47:20 bernd Exp $ +$OpenBSD: patch-gitweb_gitweb_perl,v 1.6 2008/10/24 09:17:34 bernd Exp $ This prevents the following error: '-T and -B not implemented on filehandles' ---- gitweb/gitweb.perl.orig Mon Aug 25 09:34:18 2008 -+++ gitweb/gitweb.perl Mon Aug 25 09:35:15 2008 -@@ -4291,7 +4291,7 @@ sub git_blob_plain { +--- gitweb/gitweb.perl.orig Wed Oct 22 06:19:18 2008 ++++ gitweb/gitweb.perl Wed Oct 22 08:12:23 2008 +@@ -4298,7 +4298,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) -@@ -4334,7 +4334,7 @@ sub git_blob { +@@ -4341,7 +4341,7 @@ sub git_blob { } my ($have_blame) = gitweb_check_feature('blame'); diff --git a/devel/git/patches/patch-t_t4018-diff-funcname_sh b/devel/git/patches/patch-t_t4018-diff-funcname_sh deleted file mode 100644 index 6a3131069e7..00000000000 --- a/devel/git/patches/patch-t_t4018-diff-funcname_sh +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-t_t4018-diff-funcname_sh,v 1.1 2008/09/27 21:47:20 bernd Exp $ ---- t/t4018-diff-funcname.sh.orig Tue Sep 16 11:36:03 2008 -+++ t/t4018-diff-funcname.sh Tue Sep 16 11:36:37 2008 -@@ -57,10 +57,11 @@ test_expect_success 'last regexp must not be negated' - test_must_fail git diff --no-index Beer.java Beer-correct.java - ' - --test_expect_success 'alternation in pattern' ' -- git config diff.java.funcname "^[ ]*\\(\\(public\\|static\\).*\\)$" -- git diff --no-index Beer.java Beer-correct.java | -- grep "^@@.*@@ public static void main(" --' -+# No regex alternation support in OpenBSD libc -+#test_expect_success 'alternation in pattern' ' -+# git config diff.java.funcname "^[ ]*\\(\\(public\\|static\\).*\\)$" -+# git diff --no-index Beer.java Beer-correct.java | -+# grep "^@@.*@@ public static void main(" -+#' - - test_done diff --git a/devel/git/pkg/PLIST-main b/devel/git/pkg/PLIST-main index 17e16259117..ee867b7776b 100644 --- a/devel/git/pkg/PLIST-main +++ b/devel/git/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.19 2008/09/27 21:47:20 bernd Exp $ +@comment $OpenBSD: PLIST-main,v 1.20 2008/10/24 09:17:34 bernd Exp $ @pkgpath devel/git @bin bin/git @bin bin/git-receive-pack @@ -335,6 +335,7 @@ share/doc/git/RelNotes-1.5.6.5.txt share/doc/git/RelNotes-1.5.6.txt share/doc/git/RelNotes-1.6.0.1.txt share/doc/git/RelNotes-1.6.0.2.txt +share/doc/git/RelNotes-1.6.0.3.txt share/doc/git/RelNotes-1.6.0.txt share/doc/git/blame-options.txt share/doc/git/cmds-ancillaryinterrogators.txt