3 files changed, 24 insertions, 10 deletions

diff --git a/devel/git/Makefile b/devel/git/Makefile
index 50103c844955..bdfadee0276f 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	git
-PORTVERSION=	2.1.2
-PORTREVISION=	1
+PORTVERSION=	2.2.1
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG
 MASTER_SITE_SUBDIR=	software/scm/git
@@ -25,7 +24,7 @@ SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 GNU_CONFIGURE=	yes
-USES=		gmake shebangfix
+USES=		gmake shebangfix tar:xz
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV+=	V=1
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 89faa74897f1..b94d71262808 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,6 +1,6 @@
-SHA256 (git-2.1.2.tar.gz) = fc0af850ef82e6e9ed2940397e65fb45034fba676999eb8404ff31d8d1e388ec
-SIZE (git-2.1.2.tar.gz) = 5086801
-SHA256 (git-manpages-2.1.2.tar.gz) = f5c553d346894452adc67ce69e20e83b01c272c0003dd4cf5f80fad2b9a61d7c
-SIZE (git-manpages-2.1.2.tar.gz) = 577641
-SHA256 (git-htmldocs-2.1.2.tar.gz) = dfd2684676e9b35885fe689e8edae7cba2dcedb813e21a4a80786378adbd4a6b
-SIZE (git-htmldocs-2.1.2.tar.gz) = 2322269
+SHA256 (git-2.2.1.tar.xz) = 09422dc9a0bdddf6bdd5b8634c71e1ed3125256c47424e6a2687701e764ef450
+SIZE (git-2.2.1.tar.xz) = 3590808
+SHA256 (git-manpages-2.2.1.tar.xz) = 00f8357fd8ab9e3b397dd087b20d405ed141765d04f3f2162e65fdec7cb1e538
+SIZE (git-manpages-2.2.1.tar.xz) = 369796
+SHA256 (git-htmldocs-2.2.1.tar.xz) = dee32b06ecf26044169adf40d95cb301c4219416a65c94b89c6513a80f03863b
+SIZE (git-htmldocs-2.2.1.tar.xz) = 975488
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 093bcfe6355c..a4f317de0412 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -71,6 +71,7 @@ man/man1/git-index-pack.1.gz
 man/man1/git-init-db.1.gz
 man/man1/git-init.1.gz
 man/man1/git-instaweb.1.gz
+man/man1/git-interpret-trailers.1.gz
 man/man1/git-log.1.gz
 man/man1/git-ls-files.1.gz
 man/man1/git-ls-remote.1.gz
@@ -177,6 +178,7 @@ man/man7/gitglossary.7.gz
 man/man7/gittutorial.7.gz
 man/man7/gitcore-tutorial.7.gz
 man/man7/gitdiffcore.7.gz
+man/man7/giteveryday.7.gz
 man/man7/gittutorial-2.7.gz
 man/man7/gitworkflows.7.gz
 man/man7/gitrevisions.7.gz
@@ -251,6 +253,7 @@ libexec/git-core/git-index-pack
 libexec/git-core/git-init
 libexec/git-core/git-init-db
 libexec/git-core/git-instaweb
+libexec/git-core/git-interpret-trailers
 libexec/git-core/git-log
 libexec/git-core/git-ls-files
 libexec/git-core/git-ls-remote
@@ -353,6 +356,7 @@ libexec/git-core/mergetools/diffmerge
 libexec/git-core/mergetools/xxdiff
 libexec/git-core/mergetools/tortoisemerge
 libexec/git-core/mergetools/tkdiff
+libexec/git-core/mergetools/bc
 libexec/git-core/mergetools/bc3
 libexec/git-core/mergetools/kdiff3
 libexec/git-core/mergetools/gvimdiff
@@ -535,6 +539,7 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/git-init-db.html
 %%HTMLDOCS%%%%DOCSDIR%%/git-init.html
 %%HTMLDOCS%%%%DOCSDIR%%/git-instaweb.html
+%%HTMLDOCS%%%%DOCSDIR%%/git-interpret-trailers.html
 %%HTMLDOCS%%%%DOCSDIR%%/git-log.html
 %%HTMLDOCS%%%%DOCSDIR%%/git-ls-files.html
 %%HTMLDOCS%%%%DOCSDIR%%/git-ls-remote.html
@@ -606,6 +611,7 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/git-status.html
 %%HTMLDOCS%%%%DOCSDIR%%/git-stripspace.html
 %%HTMLDOCS%%%%DOCSDIR%%/git-submodule.html
+%%HTMLDOCS%%%%DOCSDIR%%/git-subtree.html
 %%HTMLDOCS%%%%DOCSDIR%%/git-svn.html
 %%HTMLDOCS%%%%DOCSDIR%%/git-symbolic-ref.html
 %%HTMLDOCS%%%%DOCSDIR%%/git-tag.html
@@ -629,6 +635,7 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/gitcore-tutorial.html
 %%HTMLDOCS%%%%DOCSDIR%%/gitcvs-migration.html
 %%HTMLDOCS%%%%DOCSDIR%%/gitdiffcore.html
+%%HTMLDOCS%%%%DOCSDIR%%/giteveryday.html
 %%HTMLDOCS%%%%DOCSDIR%%/gitglossary.html
 %%HTMLDOCS%%%%DOCSDIR%%/githooks.html
 %%HTMLDOCS%%%%DOCSDIR%%/gitignore.html
@@ -664,7 +671,6 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/git-mv.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-blame.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-archimport.txt
-%%HTMLDOCS%%%%DOCSDIR%%/everyday.txt
 %%HTMLDOCS%%%%DOCSDIR%%/gitcli.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-shortlog.txt
 %%HTMLDOCS%%%%DOCSDIR%%/fetch-options.txt
@@ -856,6 +862,7 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/urls-remotes.txt
 %%HTMLDOCS%%%%DOCSDIR%%/githooks.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-instaweb.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-interpret-trailers.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-upload-pack.txt
 %%HTMLDOCS%%%%DOCSDIR%%/blame-options.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-describe.txt
@@ -962,6 +969,7 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/git-unpack-objects.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-diff.txt
 %%HTMLDOCS%%%%DOCSDIR%%/gitdiffcore.txt
+%%HTMLDOCS%%%%DOCSDIR%%/giteveryday.txt
 %%HTMLDOCS%%%%DOCSDIR%%/gitrevisions.html
 %%HTMLDOCS%%%%DOCSDIR%%/gitrevisions.txt
 %%HTMLDOCS%%%%DOCSDIR%%/gitweb.html
@@ -1183,19 +1191,26 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.5.3.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.5.4.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.5.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.5.6.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.9.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.9.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.9.2.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.9.3.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.9.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.9.5.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.0.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.0.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.0.2.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.0.3.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.0.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.0.5.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.1.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.1.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.1.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.1.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.1.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css