Tested in daily production usage, tests pass on amd64 (except for 9400
as usual).
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.192
diff -u -p -r1.192 Makefile
--- Makefile 4 Sep 2018 12:46:10 -0000 1.192
+++ Makefile 12 Sep 2018 13:25:07 -0000
@@ -4,13 +4,12 @@ COMMENT-main = GIT - Tree History Storag
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
-V = 2.18.0
+V = 2.19.0
DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}
PKGNAME-x11 = git-x11-${V}
CATEGORIES = devel
-REVISION-main = 0
HOMEPAGE = https://git-scm.com/
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/git/distinfo,v
retrieving revision 1.145
diff -u -p -r1.145 distinfo
--- distinfo 6 Jul 2018 20:15:42 -0000 1.145
+++ distinfo 12 Sep 2018 13:25:15 -0000
@@ -1,4 +1,4 @@
-SHA256 (git-2.18.0.tar.gz) = lPrywLAqeSCwtG9JYdjpytCOgUGGFBAomKVfmA+j5+Q=
-SHA256 (git-manpages-2.18.0.tar.gz) =
bPOKs61DzNzWpz/9zyoBbVara0skCldLC7lvUgoE/1U=
-SIZE (git-2.18.0.tar.gz) = 7498807
-SIZE (git-manpages-2.18.0.tar.gz) = 692379
+SHA256 (git-2.19.0.tar.gz) = 4OGFsZ1ubKpY3eBaGjMhSXddaKmUbydPQaG9fblyz1U=
+SHA256 (git-manpages-2.19.0.tar.gz) =
CC23Rz05ALeD5nHaCU3atZN8VZ9zIagJh6Q5rDzoTfQ=
+SIZE (git-2.19.0.tar.gz) = 7708477
+SIZE (git-manpages-2.19.0.tar.gz) = 702323
Index: patches/patch-config_mak_uname
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-config_mak_uname,v
retrieving revision 1.6
diff -u -p -r1.6 patch-config_mak_uname
--- patches/patch-config_mak_uname 6 Jul 2018 20:15:42 -0000 1.6
+++ patches/patch-config_mak_uname 12 Sep 2018 13:28:41 -0000
@@ -5,7 +5,7 @@ OpenBSD wants DIR_HAS_BSD_GROUP_SEMANTIC
Index: config.mak.uname
--- config.mak.uname.orig
+++ config.mak.uname
-@@ -215,6 +215,7 @@ endif
+@@ -225,6 +225,7 @@ endif
ifeq ($(uname_S),OpenBSD)
NO_STRCASESTR = YesPlease
NO_MEMMEM = YesPlease
Index: patches/patch-t_t1450-fsck_sh
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-t_t1450-fsck_sh,v
retrieving revision 1.5
diff -u -p -r1.5 patch-t_t1450-fsck_sh
--- patches/patch-t_t1450-fsck_sh 24 Oct 2017 05:26:43 -0000 1.5
+++ patches/patch-t_t1450-fsck_sh 12 Sep 2018 13:28:40 -0000
@@ -5,7 +5,7 @@ Avoid GNU grep syntax
Index: t/t1450-fsck.sh
--- t/t1450-fsck.sh.orig
+++ t/t1450-fsck.sh
-@@ -595,7 +595,7 @@ test_expect_success 'fsck --name-objects' '
+@@ -594,7 +594,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_t5310-pack-bitmaps_sh
===================================================================
RCS file: patches/patch-t_t5310-pack-bitmaps_sh
diff -N patches/patch-t_t5310-pack-bitmaps_sh
--- patches/patch-t_t5310-pack-bitmaps_sh 6 Jul 2018 20:15:42 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-t_t5310-pack-bitmaps_sh,v 1.1 2018/07/06 20:15:42 kn Exp $
-
-Index: t/t5310-pack-bitmaps.sh
---- t/t5310-pack-bitmaps.sh.orig
-+++ t/t5310-pack-bitmaps.sh
-@@ -337,7 +337,7 @@ test_expect_success 'truncated bitmap fails gracefully
- git rev-list --use-bitmap-index --count --all >expect &&
- bitmap=$(ls .git/objects/pack/*.bitmap) &&
- test_when_finished "rm -f $bitmap" &&
-- head -c 512 <$bitmap >$bitmap.tmp &&
-+ dd bs=512 count=1 if=$bitmap of=$bitmap.tmp &&
- mv -f $bitmap.tmp $bitmap &&
- git rev-list --use-bitmap-index --count --all >actual 2>stderr &&
- test_cmp expect actual &&
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/git/pkg/PLIST-main,v
retrieving revision 1.84
diff -u -p -r1.84 PLIST-main
--- pkg/PLIST-main 4 Sep 2018 12:46:10 -0000 1.84
+++ pkg/PLIST-main 12 Sep 2018 13:35:03 -0000
@@ -115,12 +115,14 @@ libexec/git/git-parse-remote
@bin libexec/git/git-pull
@bin libexec/git/git-push
libexec/git/git-quiltimport
+@bin libexec/git/git-range-diff
@bin libexec/git/git-read-tree
libexec/git/git-rebase
libexec/git/git-rebase--am
@bin libexec/git/git-rebase--helper
libexec/git/git-rebase--interactive
libexec/git/git-rebase--merge
+libexec/git/git-rebase--preserve-merges
@bin libexec/git/git-receive-pack
@bin libexec/git/git-reflog
@bin libexec/git/git-remote
@@ -297,6 +299,7 @@ libexec/git/mergetools/xxdiff
@man man/man1/git-pull.1
@man man/man1/git-push.1
@man man/man1/git-quiltimport.1
+@man man/man1/git-range-diff.1
@man man/man1/git-read-tree.1
@man man/man1/git-rebase.1
@man man/man1/git-receive-pack.1
