Update to git-2.18.0

OK benoit danj

devel/git/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.190 2018/06/14 17:43:47 kn Exp $
+# $OpenBSD: Makefile,v 1.191 2018/07/06 20:15:42 kn Exp $
 
 COMMENT-main =	GIT - Tree History Storage Tool
 COMMENT-svn =	GIT - subversion interoperability tools
 COMMENT-x11 =	GIT - graphical tools
 
-V =		2.17.1
+V =		2.18.0
 DISTNAME =	git-${V}
 PKGNAME-main =	${DISTNAME}
 PKGNAME-svn =	git-svn-${V}

devel/git/distinfo

@@ -1,4 +1,4 @@
-SHA256 (git-2.17.1.tar.gz) = 7GRS8MjVwfO8zqvXBwuKil7qEdTioElVwTm1Bl/X0Jo=
-SHA256 (git-manpages-2.17.1.tar.gz) = lzIFPBphjSV2wXUdAknkNwL2MqVx+EURMxiCvrNgZ30=
-SIZE (git-2.17.1.tar.gz) = 7366760
-SIZE (git-manpages-2.17.1.tar.gz) = 682441
+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

devel/git/patches/patch-config_mak_uname

@@ -1,11 +1,11 @@
-$OpenBSD: patch-config_mak_uname,v 1.5 2018/06/04 10:47:29 sthen Exp $
+$OpenBSD: patch-config_mak_uname,v 1.6 2018/07/06 20:15:42 kn Exp $
 
 OpenBSD wants DIR_HAS_BSD_GROUP_SEMANTICS, just like FreeBSD
 
 Index: config.mak.uname
 --- config.mak.uname.orig
 +++ config.mak.uname
-@@ -211,6 +211,7 @@ endif
+@@ -215,6 +215,7 @@ endif
  ifeq ($(uname_S),OpenBSD)
  	NO_STRCASESTR = YesPlease
  	NO_MEMMEM = YesPlease

devel/git/patches/patch-t_t5310-pack-bitmaps_sh

@@ -0,0 +1,14 @@
+$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 &&

devel/git/pkg/PLIST-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.82 2018/06/14 17:43:48 kn Exp $
+@comment $OpenBSD: PLIST-main,v 1.83 2018/07/06 20:15:42 kn Exp $
 @pkgpath devel/git
 @newgroup _gitdaemon:778
 @newuser _gitdaemon:778:_gitdaemon:daemon:GIT Daemon:/nonexistent:/sbin/nologin
@@ -37,6 +37,7 @@ libexec/git/git-bisect
 @bin libexec/git/git-clone
 @bin libexec/git/git-column
 @bin libexec/git/git-commit
+@bin libexec/git/git-commit-graph
 @bin libexec/git/git-commit-tree
 @bin libexec/git/git-config
 @bin libexec/git/git-count-objects
@@ -141,6 +142,7 @@ libexec/git/git-request-pull
 @bin libexec/git/git-rm
 libexec/git/git-send-email
 @bin libexec/git/git-send-pack
+@bin libexec/git/git-serve
 libexec/git/git-sh-i18n
 @bin libexec/git/git-sh-i18n--envsubst
 libexec/git/git-sh-setup
@@ -184,6 +186,7 @@ libexec/git/mergetools/diffuse
 libexec/git/mergetools/ecmerge
 libexec/git/mergetools/emerge
 libexec/git/mergetools/examdiff
+libexec/git/mergetools/guiffy
 libexec/git/mergetools/gvimdiff
 libexec/git/mergetools/gvimdiff2
 libexec/git/mergetools/gvimdiff3
@@ -221,6 +224,7 @@ libexec/git/mergetools/xxdiff
 @man man/man1/git-clean.1
 @man man/man1/git-clone.1
 @man man/man1/git-column.1
+@man man/man1/git-commit-graph.1
 @man man/man1/git-commit-tree.1
 @man man/man1/git-commit.1
 @man man/man1/git-config.1