Update devel/git to 2.18.0

Sponsored by:	Rubicon Communications, LLC (Netgate)

5 files changed, 33 insertions, 46 deletions

diff --git a/devel/git/Makefile b/devel/git/Makefile
index 61a7498bbade..54f718337eb2 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	git
-DISTVERSION=	2.17.1
+DISTVERSION=	2.18.0
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 742537286971..10ac0257afab 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1527618147
-SHA256 (git-2.17.1.tar.xz) = 79136e7aa83abae4d8a25c8111f113d3c5a63aeb5fd93cc72c26d49c6d5ba65e
-SIZE (git-2.17.1.tar.xz) = 5015484
-SHA256 (git-manpages-2.17.1.tar.xz) = 83d54786ea634488458486f262cb5157629a898f9d45f5d86b302aac79ceef54
-SIZE (git-manpages-2.17.1.tar.xz) = 419400
-SHA256 (git-htmldocs-2.17.1.tar.xz) = 945b1c8c8761e7c17ca39ce0fc5af94d2b238da37f8d2b1823c65302cfa4d275
-SIZE (git-htmldocs-2.17.1.tar.xz) = 1173296
+TIMESTAMP = 1529666333
+SHA256 (git-2.18.0.tar.xz) = 8b40be383a603147ae29337136c00d1c634bdfdc169a30924a024596a7e30e92
+SIZE (git-2.18.0.tar.xz) = 5102264
+SHA256 (git-manpages-2.18.0.tar.xz) = 9ae3be95e63379597164c79c9018e84b7ef6964da923e5689dbc307693266096
+SIZE (git-manpages-2.18.0.tar.xz) = 425516
+SHA256 (git-htmldocs-2.18.0.tar.xz) = 5b70d9b1f86aad464ae172040eb87da83058c00581388af6f60b050214912efc
+SIZE (git-htmldocs-2.18.0.tar.xz) = 1201076
diff --git a/devel/git/files/patch-Documentation__Makefile b/devel/git/files/patch-Documentation__Makefile
index d0d875730414..4f0252834c7b 100644
--- a/devel/git/files/patch-Documentation__Makefile
+++ b/devel/git/files/patch-Documentation__Makefile
@@ -1,6 +1,6 @@
---- Documentation/Makefile.orig	2018-04-02 17:44:04 UTC
+--- Documentation/Makefile.orig	2018-06-21 17:18:50 UTC
 +++ Documentation/Makefile
-@@ -92,11 +92,11 @@ DOC_MAN1 = $(patsubst %.txt,%.1,$(MAN1_TXT))
+@@ -93,11 +93,11 @@ DOC_MAN1 = $(patsubst %.txt,%.1,$(MAN1_TXT))
  DOC_MAN5 = $(patsubst %.txt,%.5,$(MAN5_TXT))
  DOC_MAN7 = $(patsubst %.txt,%.7,$(MAN7_TXT))
  
@@ -15,7 +15,7 @@
  mandir ?= $(prefix)/share/man
  man1dir = $(mandir)/man1
  man5dir = $(mandir)/man5
-@@ -231,7 +231,7 @@ ifndef V
+@@ -232,7 +232,7 @@ ifndef V
  endif
  endif
  
diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile
index 23eb2a98279d..974bd81a7828 100644
--- a/devel/git/files/patch-Makefile
+++ b/devel/git/files/patch-Makefile
@@ -1,9 +1,9 @@
---- Makefile.orig	2018-04-02 17:44:04 UTC
+--- Makefile.orig	2018-06-21 17:18:50 UTC
 +++ Makefile
-@@ -476,16 +476,16 @@ ARFLAGS = rcs
+@@ -518,16 +518,16 @@ ARFLAGS = rcs
+ 
  prefix = $(HOME)
- bindir_relative = bin
- bindir = $(prefix)/$(bindir_relative)
+ bindir = $(prefix)/bin
 -mandir = $(prefix)/share/man
 -infodir = $(prefix)/share/info
 +mandir = $(prefix)/man
@@ -22,7 +22,7 @@
  ETC_GITCONFIG = $(sysconfdir)/gitconfig
  ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
  lib = lib
-@@ -1267,9 +1267,9 @@ EXTLIBS += -lz
+@@ -1326,9 +1326,9 @@ EXTLIBS += -lz
  
  ifndef NO_OPENSSL
  	OPENSSL_LIBSSL = -lssl
@@ -35,7 +35,7 @@
  	else
  		OPENSSL_LINK =
  	endif
-@@ -2012,7 +2012,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
+@@ -2151,7 +2151,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
  	chmod +x $@+ && \
  	mv $@+ $@
  else # NO_PERL
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index ec1f573a9f0b..854b635b5cb4 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -53,6 +53,7 @@ libexec/git-core/git-clean
 libexec/git-core/git-clone
 libexec/git-core/git-column
 libexec/git-core/git-commit
+libexec/git-core/git-commit-graph
 libexec/git-core/git-commit-tree
 libexec/git-core/git-config
 libexec/git-core/git-count-objects
@@ -159,6 +160,7 @@ libexec/git-core/git-revert
 libexec/git-core/git-rm
 %%SEND_EMAIL%%libexec/git-core/git-send-email
 libexec/git-core/git-send-pack
+libexec/git-core/git-serve
 libexec/git-core/git-sh-i18n
 libexec/git-core/git-sh-i18n--envsubst
 libexec/git-core/git-sh-setup
@@ -203,6 +205,7 @@ libexec/git-core/mergetools/diffuse
 libexec/git-core/mergetools/ecmerge
 libexec/git-core/mergetools/emerge
 libexec/git-core/mergetools/examdiff
+libexec/git-core/mergetools/guiffy
 libexec/git-core/mergetools/gvimdiff
 libexec/git-core/mergetools/gvimdiff2
 libexec/git-core/mergetools/gvimdiff3
@@ -241,6 +244,7 @@ man/man1/git-cherry.1.gz
 man/man1/git-clean.1.gz
 man/man1/git-clone.1.gz
 man/man1/git-column.1.gz
+man/man1/git-commit-graph.1.gz
 man/man1/git-commit-tree.1.gz
 man/man1/git-commit.1.gz
 man/man1/git-config.1.gz
@@ -661,6 +665,7 @@ man/man7/gitworkflows.7.gz
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.16.4.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.17.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.17.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.18.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt
@@ -794,6 +799,8 @@ man/man7/gitworkflows.7.gz
 %%HTMLDOCS%%%%DOCSDIR%%/git-clone.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-column.html
 %%HTMLDOCS%%%%DOCSDIR%%/git-column.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-commit-graph.html
+%%HTMLDOCS%%%%DOCSDIR%%/git-commit-graph.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-commit-tree.html
 %%HTMLDOCS%%%%DOCSDIR%%/git-commit-tree.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-commit.html
@@ -1195,6 +1202,8 @@ man/man7/gitworkflows.7.gz
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-xdiff-interface.html
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-xdiff-interface.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/bitmap-format.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/commit-graph-format.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/commit-graph.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/hash-function-transition.html
 %%HTMLDOCS%%%%DOCSDIR%%/technical/hash-function-transition.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/http-protocol.html
@@ -1214,6 +1223,8 @@ man/man7/gitworkflows.7.gz
 %%HTMLDOCS%%%%DOCSDIR%%/technical/protocol-capabilities.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/protocol-common.html
 %%HTMLDOCS%%%%DOCSDIR%%/technical/protocol-common.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/protocol-v2.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/protocol-v2.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/racy-git.html
 %%HTMLDOCS%%%%DOCSDIR%%/technical/racy-git.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/repository-version.txt
@@ -1247,6 +1258,7 @@ share/emacs/site-lisp/git/git.el
 %%CONTRIB%%share/git-core/contrib/buildsystems/parse.pl
 %%CONTRIB%%share/git-core/contrib/coccinelle/README
 %%CONTRIB%%share/git-core/contrib/coccinelle/array.cocci
+%%CONTRIB%%share/git-core/contrib/coccinelle/commit.cocci
 %%CONTRIB%%share/git-core/contrib/coccinelle/free.cocci
 %%CONTRIB%%share/git-core/contrib/coccinelle/object_id.cocci
 %%CONTRIB%%share/git-core/contrib/coccinelle/qsort.cocci
@@ -1260,7 +1272,6 @@ share/emacs/site-lisp/git/git.el
 %%CONTRIB%%share/git-core/contrib/contacts/Makefile
 %%CONTRIB%%share/git-core/contrib/contacts/git-contacts
 %%CONTRIB%%share/git-core/contrib/contacts/git-contacts.txt
-%%CONTRIB%%share/git-core/contrib/convert-grafts-to-replace-refs.sh
 %%CONTRIB%%share/git-core/contrib/credential/gnome-keyring/.gitignore
 %%CONTRIB%%share/git-core/contrib/credential/gnome-keyring/Makefile
 %%CONTRIB%%share/git-core/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c
@@ -1268,7 +1279,11 @@ share/emacs/site-lisp/git/git.el
 %%CONTRIB%%share/git-core/contrib/credential/libsecret/git-credential-libsecret.c
 %%CONTRIB%%share/git-core/contrib/credential/netrc/Makefile
 %%CONTRIB%%share/git-core/contrib/credential/netrc/git-credential-netrc
+%%CONTRIB%%share/git-core/contrib/credential/netrc/t-git-credential-netrc.sh
+%%CONTRIB%%share/git-core/contrib/credential/netrc/test.command-option-gpg
+%%CONTRIB%%share/git-core/contrib/credential/netrc/test.git-config-gpg
 %%CONTRIB%%share/git-core/contrib/credential/netrc/test.netrc
+%%CONTRIB%%share/git-core/contrib/credential/netrc/test.netrc.gpg
 %%CONTRIB%%share/git-core/contrib/credential/netrc/test.pl
 %%CONTRIB%%share/git-core/contrib/credential/osxkeychain/.gitignore
 %%CONTRIB%%share/git-core/contrib/credential/osxkeychain/Makefile
@@ -1282,38 +1297,10 @@ share/emacs/site-lisp/git/git.el
 %%CONTRIB%%share/git-core/contrib/diff-highlight/diff-highlight
 %%CONTRIB%%share/git-core/contrib/diff-highlight/t/Makefile
 %%CONTRIB%%share/git-core/contrib/diff-highlight/t/t9400-diff-highlight.sh
-%%CONTRIB%%share/git-core/contrib/emacs/.gitignore
-%%CONTRIB%%share/git-core/contrib/emacs/Makefile
 %%CONTRIB%%share/git-core/contrib/emacs/README
 %%CONTRIB%%share/git-core/contrib/emacs/git-blame.el
 %%CONTRIB%%share/git-core/contrib/emacs/git.el
 %%CONTRIB%%share/git-core/contrib/examples/README
-%%CONTRIB%%share/git-core/contrib/examples/builtin-fetch--tool.c
-%%CONTRIB%%share/git-core/contrib/examples/git-am.sh
-%%CONTRIB%%share/git-core/contrib/examples/git-checkout.sh
-%%CONTRIB%%share/git-core/contrib/examples/git-clean.sh
-%%CONTRIB%%share/git-core/contrib/examples/git-clone.sh
-%%CONTRIB%%share/git-core/contrib/examples/git-commit.sh
-%%CONTRIB%%share/git-core/contrib/examples/git-difftool.perl
-%%CONTRIB%%share/git-core/contrib/examples/git-fetch.sh
-%%CONTRIB%%share/git-core/contrib/examples/git-gc.sh
-%%CONTRIB%%share/git-core/contrib/examples/git-log.sh
-%%CONTRIB%%share/git-core/contrib/examples/git-ls-remote.sh
-%%CONTRIB%%share/git-core/contrib/examples/git-merge-ours.sh
-%%CONTRIB%%share/git-core/contrib/examples/git-merge.sh
-%%CONTRIB%%share/git-core/contrib/examples/git-notes.sh
-%%CONTRIB%%share/git-core/contrib/examples/git-pull.sh
-%%CONTRIB%%share/git-core/contrib/examples/git-remote.perl
-%%CONTRIB%%share/git-core/contrib/examples/git-repack.sh
-%%CONTRIB%%share/git-core/contrib/examples/git-rerere.perl
-%%CONTRIB%%share/git-core/contrib/examples/git-reset.sh
-%%CONTRIB%%share/git-core/contrib/examples/git-resolve.sh
-%%CONTRIB%%share/git-core/contrib/examples/git-revert.sh
-%%CONTRIB%%share/git-core/contrib/examples/git-svnimport.perl
-%%CONTRIB%%share/git-core/contrib/examples/git-svnimport.txt
-%%CONTRIB%%share/git-core/contrib/examples/git-tag.sh
-%%CONTRIB%%share/git-core/contrib/examples/git-verify-tag.sh
-%%CONTRIB%%share/git-core/contrib/examples/git-whatchanged.sh
 %%CONTRIB%%share/git-core/contrib/fast-import/git-import.perl
 %%CONTRIB%%share/git-core/contrib/fast-import/git-import.sh
 %%CONTRIB%%share/git-core/contrib/fast-import/git-p4.README