Lots of changes:
https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.20.0.txt
nghttp2 is needed for git-remote-https.
Tested on amd64.
On update-patches, don't worry about the new patch-t_t4256_1_mailinfo_c
as upstream simply left an .orig file in their tarball.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.195
diff -u -p -r1.195 Makefile
--- Makefile 25 Nov 2018 12:41:35 -0000 1.195
+++ Makefile 14 Dec 2018 14:37:41 -0000
@@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storag
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
-V = 2.19.2
+V = 2.20.0
DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}
@@ -39,13 +39,14 @@ BUILD_DEPENDS = devel/gettext-tools \
MULTI_PACKAGES = -main -svn -x11
-WANTLIB-main = c crypto curl expat iconv intl pthread ssl z
+WANTLIB-main = c crypto curl expat iconv intl nghttp2 pthread ssl z
RUN_DEPENDS-main = devel/cvsps \
devel/p5-Error \
net/rsync
LIB_DEPENDS-main = devel/gettext \
- net/curl
+ net/curl \
+ www/nghttp2
RUN_DEPENDS-svn = ${BASE_PKGPATH} \
devel/subversion,-perl \
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/git/distinfo,v
retrieving revision 1.148
diff -u -p -r1.148 distinfo
--- distinfo 25 Nov 2018 12:41:35 -0000 1.148
+++ distinfo 14 Dec 2018 10:04:07 -0000
@@ -1,4 +1,4 @@
-SHA256 (git-2.19.2.tar.gz) = 24k61pyayUmLCWd8WDl4frous7fvK8ML+6fmLnfPeFA=
-SHA256 (git-manpages-2.19.2.tar.gz) =
YDNOzVnuEDGa9KeBUXTRCZHRr6us07MSnVifA4vyVUI=
-SIZE (git-2.19.2.tar.gz) = 7720555
-SIZE (git-manpages-2.19.2.tar.gz) = 702847
+SHA256 (git-2.20.0.tar.gz) = YHb2+Ds8nBKKGxxZh9TCAnMcDMnIT7KV0637B27s2TE=
+SHA256 (git-manpages-2.20.0.tar.gz) =
gcLmCF3qGyy36l7uOEWJSY3UxEL7xNBWdATPE6d7MMs=
+SIZE (git-2.20.0.tar.gz) = 7961711
+SIZE (git-manpages-2.20.0.tar.gz) = 713955
Index: patches/patch-t_t1450-fsck_sh
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-t_t1450-fsck_sh,v
retrieving revision 1.6
diff -u -p -r1.6 patch-t_t1450-fsck_sh
--- patches/patch-t_t1450-fsck_sh 13 Sep 2018 05:59:22 -0000 1.6
+++ patches/patch-t_t1450-fsck_sh 14 Dec 2018 10:04:16 -0000
@@ -5,7 +5,7 @@ Avoid GNU grep syntax
Index: t/t1450-fsck.sh
--- t/t1450-fsck.sh.orig
+++ t/t1450-fsck.sh
-@@ -594,7 +594,7 @@ test_expect_success 'fsck --name-objects' '
+@@ -629,7 +629,7 @@ test_expect_success 'fsck --name-objects' '
remove_object $(git rev-parse julius:caesar.t) &&
test_must_fail git fsck --name-objects >out &&
tree=$(git rev-parse --verify julius:) &&
Index: patches/patch-t_test-lib_sh
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-t_test-lib_sh,v
retrieving revision 1.28
diff -u -p -r1.28 patch-t_test-lib_sh
--- patches/patch-t_test-lib_sh 14 Jun 2018 17:43:48 -0000 1.28
+++ patches/patch-t_test-lib_sh 14 Dec 2018 10:04:13 -0000
@@ -6,9 +6,9 @@ wants it badly.
Index: t/test-lib.sh
--- t/test-lib.sh.orig
+++ t/test-lib.sh
-@@ -61,6 +61,11 @@ fi
- . "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
- export PERL_PATH SHELL_PATH
+@@ -71,6 +71,11 @@ then
+ exit 1
+ fi
+if [ -n "${TEST_TAR}" ]; then
+ TAR=${TEST_TAR}
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/git/pkg/PLIST-main,v
retrieving revision 1.85
diff -u -p -r1.85 PLIST-main
--- pkg/PLIST-main 13 Sep 2018 05:59:22 -0000 1.85
+++ pkg/PLIST-main 14 Dec 2018 10:35:08 -0000
@@ -80,6 +80,7 @@ libexec/git/git-filter-branch
@bin libexec/git/git-init-db
libexec/git/git-instaweb
@bin libexec/git/git-interpret-trailers
+libexec/git/git-legacy-rebase
@bin libexec/git/git-log
@bin libexec/git/git-ls-files
@bin libexec/git/git-ls-remote
@@ -101,6 +102,7 @@ libexec/git/git-mergetool
libexec/git/git-mergetool--lib
@bin libexec/git/git-mktag
@bin libexec/git/git-mktree
+@bin libexec/git/git-multi-pack-index
@bin libexec/git/git-mv
@bin libexec/git/git-name-rev
@bin libexec/git/git-notes
@@ -117,10 +119,10 @@ libexec/git/git-parse-remote
libexec/git/git-quiltimport
@bin libexec/git/git-range-diff
@bin libexec/git/git-read-tree
-libexec/git/git-rebase
+@bin libexec/git/git-rebase
libexec/git/git-rebase--am
-@bin libexec/git/git-rebase--helper
-libexec/git/git-rebase--interactive
+libexec/git/git-rebase--common
+@bin libexec/git/git-rebase--interactive
libexec/git/git-rebase--merge
libexec/git/git-rebase--preserve-merges
@bin libexec/git/git-receive-pack
@@ -285,6 +287,7 @@ libexec/git/mergetools/xxdiff
@man man/man1/git-mergetool.1
@man man/man1/git-mktag.1
@man man/man1/git-mktree.1
+@man man/man1/git-multi-pack-index.1
@man man/man1/git-mv.1
@man man/man1/git-name-rev.1
@man man/man1/git-notes.1
