Regresses fine on amd64.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.114
diff -u -p -r1.114 Makefile
--- Makefile 11 Aug 2014 16:49:31 -0000 1.114
+++ Makefile 19 Aug 2014 18:53:10 -0000
@@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storag
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
-V = 2.0.4
+V = 2.1.0
DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/git/distinfo,v
retrieving revision 1.84
diff -u -p -r1.84 distinfo
--- distinfo 11 Aug 2014 16:49:31 -0000 1.84
+++ distinfo 19 Aug 2014 18:53:10 -0000
@@ -1,4 +1,4 @@
-SHA256 (git-2.0.4.tar.gz) = 3Z3wK33Mdfl3fE+ALGuFYhgDhd3eTjuEeeB5+ZzR0ck=
-SHA256 (git-manpages-2.0.4.tar.gz) =
pM9SedQbRIkFs6mVjjXolFTXbi8UBN8TWe2XaU+c/f4=
-SIZE (git-2.0.4.tar.gz) = 4905866
-SIZE (git-manpages-2.0.4.tar.gz) = 575421
+SHA256 (git-2.1.0.tar.gz) = 1bA1cX9iEwy/FU1sFAPGhQtIYiO9b4fiCClr6Kykdus=
+SHA256 (git-manpages-2.1.0.tar.gz) =
Op6lv5w2m1ZFnE3XZGOtuU5CmPZ58v/9ytxEfInou3w=
+SIZE (git-2.1.0.tar.gz) = 4975916
+SIZE (git-manpages-2.1.0.tar.gz) = 577429
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 patch-Makefile
--- patches/patch-Makefile 11 Aug 2014 16:49:31 -0000 1.47
+++ patches/patch-Makefile 19 Aug 2014 18:53:10 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.47 2014/08/11 16:49:31 pascal Exp $
---- Makefile.orig Thu Jul 31 00:10:29 2014
-+++ Makefile Sun Aug 10 18:57:39 2014
-@@ -2068,13 +2068,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
+--- Makefile.orig Sat Aug 16 00:26:55 2014
++++ Makefile Tue Aug 19 14:09:04 2014
+@@ -2093,13 +2093,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.47 2014/08/
export DEFAULT_EDITOR DEFAULT_PAGER
-@@ -2255,7 +2255,7 @@ export TEST_NO_MALLOC_CHECK
+@@ -2280,7 +2280,7 @@ export TEST_NO_MALLOC_CHECK
### Testing rules
Index: patches/patch-t_t0000-basic_sh
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-t_t0000-basic_sh,v
retrieving revision 1.7
diff -u -p -r1.7 patch-t_t0000-basic_sh
--- patches/patch-t_t0000-basic_sh 10 Mar 2014 20:56:53 -0000 1.7
+++ patches/patch-t_t0000-basic_sh 19 Aug 2014 18:53:10 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-t_t0000-basic_sh,v 1.7 2014/03/10 20:56:53 pascal Exp $
---- t/t0000-basic.sh.orig Fri Feb 14 22:57:09 2014
-+++ t/t0000-basic.sh Sun Feb 16 18:13:37 2014
-@@ -626,7 +626,7 @@ test_expect_success 'update-index D/F conflict' '
+--- t/t0000-basic.sh.orig Sat Aug 16 00:26:55 2014
++++ t/t0000-basic.sh Tue Aug 19 14:09:04 2014
+@@ -1043,7 +1043,7 @@ test_expect_success 'update-index D/F conflict' '
test $numpath0 = 1
'
Index: patches/patch-t_test-lib_sh
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-t_test-lib_sh,v
retrieving revision 1.2
diff -u -p -r1.2 patch-t_test-lib_sh
--- patches/patch-t_test-lib_sh 10 Mar 2014 20:56:53 -0000 1.2
+++ patches/patch-t_test-lib_sh 19 Aug 2014 18:53:10 -0000
@@ -3,14 +3,15 @@ $OpenBSD: patch-t_test-lib_sh,v 1.2 2014
Force usage of GNU tar in the test suite: 't5004-archive-corner-cases.sh'
wants it badly.
---- t/test-lib.sh.orig Fri Feb 14 22:57:09 2014
-+++ t/test-lib.sh Sun Feb 16 18:13:37 2014
-@@ -51,6 +51,10 @@ fi
+--- t/test-lib.sh.orig Sat Aug 16 00:26:55 2014
++++ t/test-lib.sh Tue Aug 19 14:43:36 2014
+@@ -51,6 +51,11 @@ fi
. "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
export PERL_PATH SHELL_PATH
+if [ -n "${TEST_TAR}" ]; then
-+ export TAR=${TEST_TAR}
++ TAR=${TEST_TAR}
++ export TAR
+fi
+
# if --tee was passed, write the output not only to the terminal, but
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/git/pkg/PLIST-main,v
retrieving revision 1.58
diff -u -p -r1.58 PLIST-main
--- pkg/PLIST-main 11 Aug 2014 16:49:31 -0000 1.58
+++ pkg/PLIST-main 19 Aug 2014 18:53:11 -0000
@@ -166,6 +166,7 @@ libexec/git/git-submodule
@bin libexec/git/git-upload-archive
@bin libexec/git/git-upload-pack
@bin libexec/git/git-var
+@bin libexec/git/git-verify-commit
@bin libexec/git/git-verify-pack
@bin libexec/git/git-verify-tag
libexec/git/git-web--browse
@@ -182,6 +183,7 @@ libexec/git/mergetools/ecmerge
libexec/git/mergetools/emerge
libexec/git/mergetools/gvimdiff
libexec/git/mergetools/gvimdiff2
+libexec/git/mergetools/gvimdiff3
libexec/git/mergetools/kdiff3
libexec/git/mergetools/kompare
libexec/git/mergetools/meld
@@ -191,6 +193,7 @@ libexec/git/mergetools/tkdiff
libexec/git/mergetools/tortoisemerge
libexec/git/mergetools/vimdiff
libexec/git/mergetools/vimdiff2
+libexec/git/mergetools/vimdiff3
libexec/git/mergetools/xxdiff
@man man/man1/git-add.1
@man man/man1/git-am.1
@@ -329,6 +332,7 @@ libexec/git/mergetools/xxdiff
@man man/man1/git-upload-archive.1
@man man/man1/git-upload-pack.1
@man man/man1/git-var.1
+@man man/man1/git-verify-commit.1
@man man/man1/git-verify-pack.1
@man man/man1/git-verify-tag.1
@man man/man1/git-web--browse.1
Index: pkg/PLIST-x11
===================================================================
RCS file: /cvs/ports/devel/git/pkg/PLIST-x11,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST-x11
--- pkg/PLIST-x11 10 Mar 2014 20:56:53 -0000 1.11
+++ pkg/PLIST-x11 19 Aug 2014 18:53:11 -0000
@@ -77,3 +77,4 @@ share/gitk/lib/msgs/ja.msg
share/gitk/lib/msgs/pt_br.msg
share/gitk/lib/msgs/ru.msg
share/gitk/lib/msgs/sv.msg
+share/gitk/lib/msgs/vi.msg
