Update to git 1.9.0. Regress tests fine on amd64.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.109
diff -u -p -r1.109 Makefile
--- Makefile 15 Jan 2014 19:57:01 -0000 1.109
+++ Makefile 9 Mar 2014 13:05:39 -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.5.3
+V = 1.9.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.79
diff -u -p -r1.79 distinfo
--- distinfo 15 Jan 2014 19:57:01 -0000 1.79
+++ distinfo 9 Mar 2014 13:05:39 -0000
@@ -1,4 +1,4 @@
-SHA256 (git-1.8.5.3.tar.gz) = MUjuTqtFn+nK8UXBqbiyfGqBxmwYaPeQ9YiWBUzf46c=
-SHA256 (git-manpages-1.8.5.3.tar.gz) =
jAtJ2uawEIoGndkaL+EU0TZC30UJXYYcIHweP45xU2Y=
-SIZE (git-1.8.5.3.tar.gz) = 4757215
-SIZE (git-manpages-1.8.5.3.tar.gz) = 569620
+SHA256 (git-1.9.0.tar.gz) = 3jCX/cNtYk6mz0u4U0Av3ngazbhg8SFSxeuHl3c4mII=
+SHA256 (git-manpages-1.9.0.tar.gz) =
pR4rZKit3jnndPBShD4PUTtdMxhJK1FedS4zmw06hcc=
+SIZE (git-1.9.0.tar.gz) = 4839724
+SIZE (git-manpages-1.9.0.tar.gz) = 571616
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 patch-Makefile
--- patches/patch-Makefile 13 Jan 2014 09:12:10 -0000 1.44
+++ patches/patch-Makefile 9 Mar 2014 13:05:39 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.44 2014/01/13 09:12:10 dcoppa Exp $
---- 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
+--- Makefile.orig Fri Feb 14 22:57:09 2014
++++ Makefile Sun Feb 16 18:13:36 2014
+@@ -2072,13 +2072,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.44 2014/01/
export DEFAULT_EDITOR DEFAULT_PAGER
-@@ -2249,7 +2249,7 @@ export TEST_NO_MALLOC_CHECK
+@@ -2256,7 +2256,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.24
diff -u -p -r1.24 patch-gitweb_gitweb_perl
--- patches/patch-gitweb_gitweb_perl 13 Jan 2014 09:12:10 -0000 1.24
+++ patches/patch-gitweb_gitweb_perl 9 Mar 2014 13:05:39 -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 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 {
+--- gitweb/gitweb.perl.orig Fri Feb 14 22:57:09 2014
++++ gitweb/gitweb.perl Sun Feb 16 18:13:37 2014
+@@ -6981,7 +6981,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)
-@@ -6970,7 +6970,7 @@ sub git_blob {
+@@ -7043,7 +7043,7 @@ sub git_blob {
}
my $have_blame = gitweb_check_feature('blame');
Index: patches/patch-t_t0000-basic_sh
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-t_t0000-basic_sh,v
retrieving revision 1.6
diff -u -p -r1.6 patch-t_t0000-basic_sh
--- patches/patch-t_t0000-basic_sh 13 Sep 2013 07:10:01 -0000 1.6
+++ patches/patch-t_t0000-basic_sh 9 Mar 2014 13:05:39 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-t_t0000-basic_sh,v 1.6 2013/09/13 07:10:01 dcoppa Exp $
---- t/t0000-basic.sh.orig Fri Aug 23 21:38:43 2013
-+++ t/t0000-basic.sh Thu Sep 12 13:47:09 2013
-@@ -631,7 +631,7 @@ test_expect_success 'update-index D/F conflict' '
+--- 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' '
test $numpath0 = 1
'
Index: patches/patch-t_t9200-git-cvsexportcommit_sh
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-t_t9200-git-cvsexportcommit_sh,v
retrieving revision 1.4
diff -u -p -r1.4 patch-t_t9200-git-cvsexportcommit_sh
--- patches/patch-t_t9200-git-cvsexportcommit_sh 25 Jan 2013 08:14:59
-0000 1.4
+++ patches/patch-t_t9200-git-cvsexportcommit_sh 9 Mar 2014 13:05:39
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-t_t9200-git-cvsexportcommit_sh,v 1.4 2013/01/25 08:14:59
dcoppa Exp $
---- t/t9200-git-cvsexportcommit.sh.orig Mon Jan 14 20:22:04 2013
-+++ t/t9200-git-cvsexportcommit.sh Wed Jan 23 14:53:15 2013
-@@ -36,7 +36,7 @@ exit 1
+--- t/t9200-git-cvsexportcommit.sh.orig Fri Feb 14 22:57:09 2014
++++ t/t9200-git-cvsexportcommit.sh Sun Feb 16 18:13:37 2014
+@@ -35,7 +35,7 @@ exit 1
check_entries () {
# $1 == directory, $2 == expected
Index: patches/patch-t_test-lib_sh
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-t_test-lib_sh,v
retrieving revision 1.1
diff -u -p -r1.1 patch-t_test-lib_sh
--- patches/patch-t_test-lib_sh 2 May 2013 10:01:34 -0000 1.1
+++ patches/patch-t_test-lib_sh 9 Mar 2014 13:05:39 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-t_test-lib_sh,v 1.1 2013
Force usage of GNU tar in the test suite: 't5004-archive-corner-cases.sh'
wants it badly.
---- t/test-lib.sh.orig Sat Apr 27 01:54:17 2013
-+++ t/test-lib.sh Tue Apr 30 19:14:52 2013
-@@ -47,6 +47,10 @@ fi
+--- 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
. "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
export PERL_PATH SHELL_PATH
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/git/pkg/PLIST-main,v
retrieving revision 1.56
diff -u -p -r1.56 PLIST-main
--- pkg/PLIST-main 13 Jan 2014 09:12:10 -0000 1.56
+++ pkg/PLIST-main 9 Mar 2014 13:05:39 -0000
@@ -81,7 +81,6 @@ libexec/git/git-filter-branch
@bin libexec/git/git-init-db
libexec/git/git-instaweb
@bin libexec/git/git-log
-libexec/git/git-lost-found
@bin libexec/git/git-ls-files
@bin libexec/git/git-ls-remote
@bin libexec/git/git-ls-tree
@@ -111,7 +110,6 @@ libexec/git/git-p4
@bin libexec/git/git-pack-refs
libexec/git/git-parse-remote
@bin libexec/git/git-patch-id
-@bin libexec/git/git-peek-remote
@bin libexec/git/git-prune
@bin libexec/git/git-prune-packed
libexec/git/git-pull
@@ -135,7 +133,6 @@ libexec/git/git-relink
@bin libexec/git/git-remote-testsvn
@bin libexec/git/git-repack
@bin libexec/git/git-replace
-@bin libexec/git/git-repo-config
libexec/git/git-request-pull
@bin libexec/git/git-rerere
@bin libexec/git/git-reset
@@ -161,7 +158,6 @@ libexec/git/git-stash
libexec/git/git-submodule
@bin libexec/git/git-symbolic-ref
@bin libexec/git/git-tag
-@bin libexec/git/git-tar-tree
@bin libexec/git/git-unpack-file
@bin libexec/git/git-unpack-objects
@bin libexec/git/git-update-index
@@ -260,7 +256,6 @@ libexec/git/mergetools/xxdiff
@man man/man1/git-init.1
@man man/man1/git-instaweb.1
@man man/man1/git-log.1
-@man man/man1/git-lost-found.1
@man man/man1/git-ls-files.1
@man man/man1/git-ls-remote.1
@man man/man1/git-ls-tree.1
@@ -285,7 +280,6 @@ libexec/git/mergetools/xxdiff
@man man/man1/git-pack-refs.1
@man man/man1/git-parse-remote.1
@man man/man1/git-patch-id.1
-@man man/man1/git-peek-remote.1
@man man/man1/git-prune-packed.1
@man man/man1/git-prune.1
@man man/man1/git-pull.1
@@ -302,7 +296,6 @@ libexec/git/mergetools/xxdiff
@man man/man1/git-remote.1
@man man/man1/git-repack.1
@man man/man1/git-replace.1
-@man man/man1/git-repo-config.1
@man man/man1/git-request-pull.1
@man man/man1/git-rerere.1
@man man/man1/git-reset.1
@@ -328,7 +321,6 @@ libexec/git/mergetools/xxdiff
@man man/man1/git-submodule.1
@man man/man1/git-symbolic-ref.1
@man man/man1/git-tag.1
-@man man/man1/git-tar-tree.1
@man man/man1/git-unpack-file.1
@man man/man1/git-unpack-objects.1
@man man/man1/git-update-index.1
@@ -392,14 +384,13 @@ share/gitweb/static/git-favicon.png
share/gitweb/static/git-logo.png
share/gitweb/static/gitweb.css
share/gitweb/static/gitweb.js
-share/locale/da/LC_MESSAGES/git.mo
+share/locale/bg/LC_MESSAGES/git.mo
share/locale/de/LC_MESSAGES/git.mo
share/locale/fr/LC_MESSAGES/git.mo
share/locale/is/
share/locale/is/LC_MESSAGES/
share/locale/is/LC_MESSAGES/git.mo
share/locale/it/LC_MESSAGES/git.mo
-share/locale/nl/LC_MESSAGES/git.mo
share/locale/pt_PT/
share/locale/pt_PT/LC_MESSAGES/
share/locale/pt_PT/LC_MESSAGES/git.mo
Index: pkg/PLIST-x11
===================================================================
RCS file: /cvs/ports/devel/git/pkg/PLIST-x11,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST-x11
--- pkg/PLIST-x11 30 Nov 2012 21:16:30 -0000 1.10
+++ pkg/PLIST-x11 9 Mar 2014 13:05:39 -0000
@@ -36,6 +36,7 @@ share/git-gui/lib/logo.tcl
share/git-gui/lib/merge.tcl
share/git-gui/lib/mergetool.tcl
share/git-gui/lib/msgs/
+share/git-gui/lib/msgs/bg.msg
share/git-gui/lib/msgs/de.msg
share/git-gui/lib/msgs/el.msg
share/git-gui/lib/msgs/fr.msg
@@ -66,6 +67,7 @@ share/git-gui/lib/win32_shortcut.js
share/gitk/
share/gitk/lib/
share/gitk/lib/msgs/
+share/gitk/lib/msgs/bg.msg
share/gitk/lib/msgs/de.msg
share/gitk/lib/msgs/es.msg
share/gitk/lib/msgs/fr.msg
