devel/git: sync with upstream

Taken from: HardenedBSD
carystudio · Jan 20, 2018 · 03a41e0 · 03a41e0
1 parent 4690709
commit 03a41e0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/devel/git/Makefile b/devel/git/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	git
-DISTVERSION=	2.15.1
+DISTVERSION=	2.16.0
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -47,7 +47,8 @@ SHEBANG_FILES=	*.perl */*.perl */*/*.perl */*.pl */*/*.pl */*/*/*.pl \
 		contrib/remote-helpers/git-remote-hg \
 		contrib/credential/netrc/git-credential-netrc \
 		contrib/buildsystems/generate contrib/contacts/git-contacts \
-		contrib/svn-fe/svnrdump_sim.py
+		contrib/svn-fe/svnrdump_sim.py \
+		templates/hooks--fsmonitor-watchman.sample
 TEST_TARGET=	test
 
 CONFIGURE_ARGS=	--enable-pthreads=-pthread ac_cv_header_libcharset_h=no

diff --git a/devel/git/distinfo b/devel/git/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1511997359
-SHA256 (git-2.15.1.tar.xz) = 999c90fd7d45066992cdb87dda35bdff6dfc1d01496118ea718dfb866da4045c
-SIZE (git-2.15.1.tar.xz) = 4894768
-SHA256 (git-manpages-2.15.1.tar.xz) = 6c6bcf7d53aec8a498a1f5af558ae8f83daf892c3565188ee81ce34f6f022656
-SIZE (git-manpages-2.15.1.tar.xz) = 413124
-SHA256 (git-htmldocs-2.15.1.tar.xz) = 0b3ad20f1f98d548f07a19900852e134cfc958d9664af95d04c028cf8d140166
-SIZE (git-htmldocs-2.15.1.tar.xz) = 1134848
+TIMESTAMP = 1516282462
+SHA256 (git-2.16.0.tar.xz) = 0d10764e66b3d650dee0d99a1c77afa4aaae5e739c0973fcc1c5b9e6516e30f8
+SIZE (git-2.16.0.tar.xz) = 4961856
+SHA256 (git-manpages-2.16.0.tar.xz) = 894224a6eb67dd00bec8dcf83f357b03d5aec351c29a8d62de030be778dcab4c
+SIZE (git-manpages-2.16.0.tar.xz) = 417192
+SHA256 (git-htmldocs-2.16.0.tar.xz) = 26ea1a977d45a955000345cf52d65e51f573a2a9382a67adca570f3a58be47d8
+SIZE (git-htmldocs-2.16.0.tar.xz) = 1159956
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
@@ -10,6 +10,7 @@ etc/bash_completion.d/git.sh
 %%PERL%%%%SITE_PERL%%/Git.pm
 %%PERL%%%%SITE_PERL%%/Git/I18N.pm
 %%PERL%%%%SITE_PERL%%/Git/IndexInfo.pm
+%%PERL%%%%SITE_PERL%%/Git/Packet.pm
 %%PERL%%%%SITE_PERL%%/Git/SVN.pm
 %%PERL%%%%SITE_PERL%%/Git/SVN/Editor.pm
 %%PERL%%%%SITE_PERL%%/Git/SVN/Fetcher.pm
@@ -653,6 +654,8 @@ man/man7/gitworkflows.7.gz
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.14.3.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.15.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.15.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.15.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.16.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt
@@ -716,6 +719,8 @@ man/man7/gitworkflows.7.gz
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.9.3.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.9.4.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.9.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/SubmittingPatches.html
+%%HTMLDOCS%%%%DOCSDIR%%/SubmittingPatches.txt
 %%HTMLDOCS%%%%DOCSDIR%%/blame-options.txt
 %%HTMLDOCS%%%%DOCSDIR%%/cmds-ancillaryinterrogators.txt
 %%HTMLDOCS%%%%DOCSDIR%%/cmds-ancillarymanipulators.txt
@@ -1128,6 +1133,7 @@ man/man7/gitworkflows.7.gz
 %%HTMLDOCS%%%%DOCSDIR%%/pretty-options.txt
 %%HTMLDOCS%%%%DOCSDIR%%/pull-fetch-param.txt
 %%HTMLDOCS%%%%DOCSDIR%%/rev-list-options.txt
+%%HTMLDOCS%%%%DOCSDIR%%/rebase-config.txt
 %%HTMLDOCS%%%%DOCSDIR%%/revisions.txt
 %%HTMLDOCS%%%%DOCSDIR%%/sequencer.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-allocation-growing.html
@@ -1138,8 +1144,6 @@ man/man7/gitworkflows.7.gz
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-config.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-credentials.html
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-credentials.txt
-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-decorate.html
-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-decorate.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-diff.html
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-diff.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-directory-listing.html
@@ -1198,6 +1202,7 @@ man/man7/gitworkflows.7.gz
 %%HTMLDOCS%%%%DOCSDIR%%/technical/pack-heuristics.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/pack-protocol.html
 %%HTMLDOCS%%%%DOCSDIR%%/technical/pack-protocol.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/partial-clone.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/protocol-capabilities.html
 %%HTMLDOCS%%%%DOCSDIR%%/technical/protocol-capabilities.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/protocol-common.html
@@ -1395,6 +1400,7 @@ share/emacs/site-lisp/git/git.el
 share/git-core/templates/description
 share/git-core/templates/hooks/applypatch-msg.sample
 share/git-core/templates/hooks/commit-msg.sample
+share/git-core/templates/hooks/fsmonitor-watchman.sample
 share/git-core/templates/hooks/post-update.sample
 share/git-core/templates/hooks/pre-applypatch.sample
 share/git-core/templates/hooks/pre-commit.sample