An update to git-1.8.5.2
tests:
fixed 1
success 10855
failed 0
broken 91
total 11158
on -current amd64.
OK?
Ciao,
David
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.107
diff -u -p -u -p -r1.107 Makefile
--- Makefile 6 Dec 2013 17:10:42 -0000 1.107
+++ Makefile 12 Jan 2014 19:22:27 -0000
@@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storag
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
-V = 1.8.4.5
+V = 1.8.5.2
DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/git/distinfo,v
retrieving revision 1.77
diff -u -p -u -p -r1.77 distinfo
--- distinfo 6 Dec 2013 17:10:42 -0000 1.77
+++ distinfo 12 Jan 2014 19:22:27 -0000
@@ -1,4 +1,4 @@
-SHA256 (git-1.8.4.5.tar.gz) = KhcGpU72X+IYdH7IqIa9DyVX1CAo8SKFKdgR9puBKho=
-SHA256 (git-manpages-1.8.4.5.tar.gz) =
b92/TpUqnkkPv4+ns8O1JQkUsoP8QWSHqqeB4E42pNQ=
-SIZE (git-1.8.4.5.tar.gz) = 4677754
-SIZE (git-manpages-1.8.4.5.tar.gz) = 565177
+SHA256 (git-1.8.5.2.tar.gz) = AkaUUkuL6R/imvymW8Op5A3hMi3V7yssC6u2hJyRPoo=
+SHA256 (git-manpages-1.8.5.2.tar.gz) =
61DJuXfbiTj2StT0l99Z02anaSwJ11Osf7DImGOVhms=
+SIZE (git-1.8.5.2.tar.gz) = 4755723
+SIZE (git-manpages-1.8.5.2.tar.gz) = 569581
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
retrieving revision 1.43
diff -u -p -u -p -r1.43 patch-Makefile
--- patches/patch-Makefile 19 Oct 2013 07:21:04 -0000 1.43
+++ patches/patch-Makefile 12 Jan 2014 19:22:27 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.43 2013/10/19 07:21:04 benoit Exp $
---- Makefile.orig Fri Sep 27 01:49:38 2013
-+++ Makefile Sat Oct 19 09:11:02 2013
-@@ -2066,13 +2066,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
+--- Makefile.orig Wed Dec 18 00:46:08 2013
++++ Makefile Fri Jan 10 15:55:01 2014
+@@ -2065,13 +2065,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
$(LIB_FILE): $(LIB_OBJS)
@@ -18,7 +18,7 @@ $OpenBSD: patch-Makefile,v 1.43 2013/10/
export DEFAULT_EDITOR DEFAULT_PAGER
-@@ -2250,7 +2250,7 @@ export TEST_NO_MALLOC_CHECK
+@@ -2249,7 +2249,7 @@ export TEST_NO_MALLOC_CHECK
### Testing rules
Index: patches/patch-gitweb_gitweb_perl
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-gitweb_gitweb_perl,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 patch-gitweb_gitweb_perl
--- patches/patch-gitweb_gitweb_perl 13 Sep 2013 07:10:01 -0000 1.23
+++ patches/patch-gitweb_gitweb_perl 12 Jan 2014 19:22:27 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-gitweb_gitweb_perl,v 1.2
This prevents the following error: '-T and -B not implemented on filehandles'
---- gitweb/gitweb.perl.orig Fri Aug 23 21:38:43 2013
-+++ gitweb/gitweb.perl Thu Sep 12 13:47:09 2013
-@@ -6907,7 +6907,7 @@ sub git_blob_plain {
+--- gitweb/gitweb.perl.orig Wed Dec 18 00:46:08 2013
++++ gitweb/gitweb.perl Fri Jan 10 15:55:01 2014
+@@ -6908,7 +6908,7 @@ sub git_blob_plain {
$expires = "+1d";
}
@@ -13,7 +13,7 @@ This prevents the following error: '-T a
or die_error(500, "Open git-cat-file blob '$hash' failed");
# content-type (can include charset)
-@@ -6969,7 +6969,7 @@ sub git_blob {
+@@ -6970,7 +6970,7 @@ sub git_blob {
}
my $have_blame = gitweb_check_feature('blame');
Index: patches/patch-t_t7001-mv_sh
===================================================================
RCS file: patches/patch-t_t7001-mv_sh
diff -N patches/patch-t_t7001-mv_sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-t_t7001-mv_sh 12 Jan 2014 19:22:27 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+use 'cp -RpP' instead of 'cp -a'
+
+--- t/t7001-mv.sh.orig Wed Dec 18 00:46:08 2013
++++ t/t7001-mv.sh Sun Jan 12 18:24:38 2014
+@@ -278,7 +278,7 @@ test_expect_success 'git mv moves a submodule with a .
+ (
+ cd sub &&
+ rm -f .git &&
+- cp -a ../.git/modules/sub .git &&
++ cp -RpP ../.git/modules/sub .git &&
+ GIT_WORK_TREE=. git config --unset core.worktree
+ ) &&
+ mkdir mod &&
+@@ -301,7 +301,7 @@ test_expect_success 'git mv moves a submodule with a .
+ (
+ cd sub &&
+ rm -f .git &&
+- cp -a ../.git/modules/sub .git &&
++ cp -RpP ../.git/modules/sub .git &&
+ GIT_WORK_TREE=. git config --unset core.worktree
+ ) &&
+ mkdir mod &&
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/git/pkg/PLIST-main,v
retrieving revision 1.55
diff -u -p -u -p -r1.55 PLIST-main
--- pkg/PLIST-main 13 Sep 2013 07:10:01 -0000 1.55
+++ pkg/PLIST-main 12 Jan 2014 19:22:27 -0000
@@ -133,7 +133,7 @@ libexec/git/git-relink
@bin libexec/git/git-remote-http
@bin libexec/git/git-remote-https
@bin libexec/git/git-remote-testsvn
-libexec/git/git-repack
+@bin libexec/git/git-repack
@bin libexec/git/git-replace
@bin libexec/git/git-repo-config
libexec/git/git-request-pull
@@ -180,6 +180,7 @@ libexec/git/mergetools/araxis
libexec/git/mergetools/bc3
libexec/git/mergetools/codecompare
libexec/git/mergetools/deltawalker
+libexec/git/mergetools/diffmerge
libexec/git/mergetools/diffuse
libexec/git/mergetools/ecmerge
libexec/git/mergetools/emerge
