Update to 1.8.4

Changes: https://raw.github.com/git/git/master/Documentation/RelNotes/1.8.4.txt

4 files changed, 48 insertions, 29 deletions

diff --git a/devel/git/Makefile b/devel/git/Makefile
index 3174d794f2b3..ffedd0893cfe 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	git
-PORTVERSION=	1.8.3.4
+PORTVERSION=	1.8.4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
@@ -30,6 +30,7 @@ MAN1=		git.1 \
 		git-cat-file.1 \
 		git-check-attr.1 \
 		git-check-ignore.1 \
+		git-check-mailmap.1 \
 		git-check-ref-format.1 \
 		git-checkout-index.1 \
 		git-checkout.1 \
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 2dbf32395885..eb317c152d40 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,6 +1,6 @@
-SHA256 (git-1.8.3.4.tar.gz) = dfa2cdf2df92b4abe956b1e7586030381c4e39e89161ab789a660d8d1f24d9d9
-SIZE (git-1.8.3.4.tar.gz) = 4479898
-SHA256 (git-manpages-1.8.3.4.tar.gz) = 6943c3b2362c107ab32d8ed81b8f4811c6e5a2eddd91b8e4188ccf6b4be2b740
-SIZE (git-manpages-1.8.3.4.tar.gz) = 545017
-SHA256 (git-htmldocs-1.8.3.4.tar.gz) = da13f9453489145d5aaefeb6535ce43621fdb7ff426c50304acf2c2e4430005c
-SIZE (git-htmldocs-1.8.3.4.tar.gz) = 2119640
+SHA256 (git-1.8.4.tar.gz) = 51e8522c256ef8091c6fd5846b9cef8ba4e764819193b5b6cec570f530e6cb94
+SIZE (git-1.8.4.tar.gz) = 4657759
+SHA256 (git-manpages-1.8.4.tar.gz) = 854552e693b22a7ff1c25d2d710d87c8f7dad14888c946c10be60893fdee091f
+SIZE (git-manpages-1.8.4.tar.gz) = 564928
+SHA256 (git-htmldocs-1.8.4.tar.gz) = 5afc0d00e476975075c3658ffb628c2d4c4f11940ff379b600e2fdf8018d622a
+SIZE (git-htmldocs-1.8.4.tar.gz) = 2202854
diff --git a/devel/git/files/patch-Documentation__Makefile b/devel/git/files/patch-Documentation__Makefile
index 73472fa3bfd5..42c8095bcff7 100644
--- a/devel/git/files/patch-Documentation__Makefile
+++ b/devel/git/files/patch-Documentation__Makefile
@@ -1,20 +1,21 @@
---- ./Documentation/Makefile.orig	2011-05-04 21:16:14.000000000 -0400
-+++ ./Documentation/Makefile	2011-05-06 09:51:54.565045058 -0400
-@@ -30,10 +30,10 @@
- DOC_MAN5=$(patsubst %.txt,%.5,$(MAN5_TXT))
- DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
+--- ./Documentation/Makefile.orig	2013-08-27 12:08:25.000000000 -0400
++++ ./Documentation/Makefile	2013-08-27 12:09:18.000000000 -0400
+@@ -78,11 +78,11 @@
+ DOC_MAN5 = $(patsubst %.txt,%.5,$(MAN5_TXT))
+ DOC_MAN7 = $(patsubst %.txt,%.7,$(MAN7_TXT))
  
--prefix?=$(HOME)
-+prefix?=$(PREFIX)
- bindir?=$(prefix)/bin
--htmldir?=$(prefix)/share/doc/git-doc
--pdfdir?=$(prefix)/share/doc/git-doc
-+htmldir?=$(prefix)/share/doc/git
-+pdfdir?=$(prefix)/share/doc/git
- mandir?=$(prefix)/share/man
- man1dir=$(mandir)/man1
- man5dir=$(mandir)/man5
-@@ -155,7 +155,7 @@
+-prefix ?= $(HOME)
++prefix ?= $(PREFIX)
+ bindir ?= $(prefix)/bin
+-htmldir ?= $(prefix)/share/doc/git-doc
++htmldir ?= $(prefix)/share/doc/git
+ infodir ?= $(prefix)/share/info
+-pdfdir ?= $(prefix)/share/doc/git-doc
++pdfdir ?= $(prefix)/share/doc/git
+ mandir ?= $(prefix)/share/man
+ man1dir = $(mandir)/man1
+ man5dir = $(mandir)/man5
+@@ -196,7 +196,7 @@
  endif
  endif
  
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index b5f92f268583..bf27f7fc3dde 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -39,6 +39,7 @@ libexec/git-core/git-bundle
 libexec/git-core/git-cat-file
 libexec/git-core/git-check-attr
 libexec/git-core/git-check-ignore
+libexec/git-core/git-check-mailmap
 libexec/git-core/git-check-ref-format
 libexec/git-core/git-checkout
 libexec/git-core/git-checkout-index
@@ -140,7 +141,6 @@ libexec/git-core/git-relink
 libexec/git-core/git-remote
 libexec/git-core/git-remote-ext
 libexec/git-core/git-remote-fd
-libexec/git-core/git-remote-testpy
 libexec/git-core/git-remote-testsvn
 %%CURL%%libexec/git-core/git-remote-http
 %%CURL%%libexec/git-core/git-remote-https
@@ -230,6 +230,7 @@ lib/xemacs/site-lisp/git/git.el
 lib/xemacs/site-lisp/git/git-blame.el
 %%NLS%%share/locale/da/LC_MESSAGES/git.mo
 %%NLS%%share/locale/de/LC_MESSAGES/git.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/git.mo
 %%NLS%%share/locale/is/LC_MESSAGES/git.mo
 %%NLS%%share/locale/it/LC_MESSAGES/git.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/git.mo
@@ -492,6 +493,9 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/cmds-purehelpers.txt
 %%HTMLDOCS%%%%DOCSDIR%%/cmds-synchelpers.txt
 %%HTMLDOCS%%%%DOCSDIR%%/cmds-synchingrepositories.txt
+%%HTMLDOCS%%%%DOCSDIR%%/line-range-format.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-check-mailmap.html
+%%HTMLDOCS%%%%DOCSDIR%%/git-check-mailmap.txt
 %%HTMLDOCS%%%%DOCSDIR%%/mailmap.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-citool.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-hash-object.txt
@@ -1005,16 +1009,17 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.3.2.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.3.3.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.3.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.4.txt
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/git-favicon.png
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/git-logo.png
+%%CONTRIB%%share/git-core/contrib/contacts/git-contacts
+%%CONTRIB%%share/git-core/contrib/contacts/git-contacts.txt
 %%CONTRIB%%share/git-core/contrib/diffall/README
 %%CONTRIB%%share/git-core/contrib/diffall/git-diffall
 %%CONTRIB%%share/git-core/contrib/README
-%%CONTRIB%%share/git-core/contrib/blameview/README
-%%CONTRIB%%share/git-core/contrib/blameview/blameview.perl
 %%CONTRIB%%share/git-core/contrib/buildsystems/Generators.pm
 %%CONTRIB%%share/git-core/contrib/buildsystems/Generators/QMake.pm
 %%CONTRIB%%share/git-core/contrib/buildsystems/Generators/Vcproj.pm
@@ -1029,8 +1034,6 @@ share/git-core/templates/info/exclude
 %%CONTRIB%%share/git-core/contrib/completion/git-completion.tcsh
 %%CONTRIB%%share/git-core/contrib/completion/git-completion.zsh
 %%CONTRIB%%share/git-core/contrib/completion/git-prompt.sh
-%%CONTRIB%%share/git-core/contrib/continuous/cidaemon
-%%CONTRIB%%share/git-core/contrib/continuous/post-receive-cinotify
 %%CONTRIB%%share/git-core/contrib/convert-objects/convert-objects.c
 %%CONTRIB%%share/git-core/contrib/convert-objects/git-convert-objects.txt
 %%CONTRIB%%share/git-core/contrib/credential/gnome-keyring/Makefile
@@ -1089,11 +1092,22 @@ share/git-core/templates/info/exclude
 %%CONTRIB%%share/git-core/contrib/gitview/gitview.txt
 %%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.py
 %%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.txt
+%%CONTRIB%%share/git-core/contrib/hooks/multimail/README
+%%CONTRIB%%share/git-core/contrib/hooks/multimail/README.Git
+%%CONTRIB%%share/git-core/contrib/hooks/multimail/README.migrate-from-post-receive-email
+%%CONTRIB%%share/git-core/contrib/hooks/multimail/git_multimail.py
+%%CONTRIB%%share/git-core/contrib/hooks/multimail/migrate-mailhook-config
+%%CONTRIB%%share/git-core/contrib/hooks/multimail/post-receive
+%%CONTRIB%%share/git-core/contrib/hooks/multimail/git_multimail.py
 %%CONTRIB%%share/git-core/contrib/hooks/post-receive-email
 %%CONTRIB%%share/git-core/contrib/hooks/pre-auto-gc-battery
 %%CONTRIB%%share/git-core/contrib/hooks/setgitperms.perl
 %%CONTRIB%%share/git-core/contrib/hooks/update-paranoid
+%%CONTRIB%%share/git-core/contrib/mw-to-git/git-mw.perl
 %%CONTRIB%%share/git-core/contrib/mw-to-git/.gitignore
+%%CONTRIB%%share/git-core/contrib/mw-to-git/.perlcriticrc
+%%CONTRIB%%share/git-core/contrib/mw-to-git/Git/Mediawiki.pm
+%%CONTRIB%%share/git-core/contrib/mw-to-git/bin-wrapper/git
 %%CONTRIB%%share/git-core/contrib/mw-to-git/git-remote-mediawiki.perl
 %%CONTRIB%%share/git-core/contrib/mw-to-git/git-remote-mediawiki.txt
 %%CONTRIB%%share/git-core/contrib/mw-to-git/Makefile
@@ -1117,7 +1131,6 @@ share/git-core/templates/info/exclude
 %%CONTRIB%%share/git-core/contrib/p4import/git-p4import.py
 %%CONTRIB%%share/git-core/contrib/p4import/git-p4import.txt
 %%CONTRIB%%share/git-core/contrib/p4import/git-p4import
-%%CONTRIB%%share/git-core/contrib/patches/docbook-xsl-manpages-charmap.patch
 %%CONTRIB%%share/git-core/contrib/remotes2config.sh
 %%CONTRIB%%share/git-core/contrib/rerere-train.sh
 %%CONTRIB%%share/git-core/contrib/persistent-https/client.go
@@ -1188,6 +1201,7 @@ share/git-core/templates/info/exclude
 %%CONTRIB%%@dirrm share/git-core/contrib/buildsystems
 %%CONTRIB%%@dirrm share/git-core/contrib/ciabot
 %%CONTRIB%%@dirrm share/git-core/contrib/completion
+%%CONTRIB%%@dirrm share/git-core/contrib/contacts
 %%CONTRIB%%@dirrm share/git-core/contrib/continuous
 %%CONTRIB%%@dirrm share/git-core/contrib/convert-objects
 %%CONTRIB%%@dirrm share/git-core/contrib/credential/gnome-keyring
@@ -1204,7 +1218,10 @@ share/git-core/templates/info/exclude
 %%CONTRIB%%@dirrm share/git-core/contrib/git-shell-commands
 %%CONTRIB%%@dirrm share/git-core/contrib/gitview
 %%CONTRIB%%@dirrm share/git-core/contrib/hg-to-git
+%%CONTRIB%%@dirrm share/git-core/contrib/hooks/multimail
 %%CONTRIB%%@dirrm share/git-core/contrib/hooks
+%%CONTRIB%%@dirrm share/git-core/contrib/mw-to-git/bin-wrapper
+%%CONTRIB%%@dirrm share/git-core/contrib/mw-to-git/Git
 %%CONTRIB%%@dirrm share/git-core/contrib/mw-to-git/t/install-wiki
 %%CONTRIB%%@dirrm share/git-core/contrib/mw-to-git/t/
 %%CONTRIB%%@dirrm share/git-core/contrib/mw-to-git/