Update to 1.7.9

4 files changed, 50 insertions, 16 deletions

diff --git a/devel/git/Makefile b/devel/git/Makefile
index b5cd2d5321c8..175dce2a1bac 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	git
-PORTVERSION=	1.7.8.4
+PORTVERSION=	1.7.9
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
@@ -45,6 +45,9 @@ MAN1=		git.1 \
 		git-commit.1 \
 		git-config.1 \
 		git-count-objects.1 \
+		git-credential-cache--daemon.1 \
+		git-credential-cache.1 \
+		git-credential-store.1 \
 		git-daemon.1 \
 		git-describe.1 \
 		git-diff-files.1 \
@@ -95,6 +98,7 @@ MAN1=		git.1 \
 		git-mv.1 \
 		git-name-rev.1 \
 		git-notes.1 \
+		git-p4.1 \
 		git-pack-objects.1 \
 		git-pack-redundant.1 \
 		git-pack-refs.1 \
@@ -166,6 +170,7 @@ MAN5=		gitattributes.5 \
 		gitrepository-layout.5 \
 		gitweb.conf.5
 MAN7=		gitcli.7 \
+		gitcredentials.7 \
 		gitglossary.7 \
 		gittutorial.7 \
 		gitcore-tutorial.7 \
@@ -226,7 +231,8 @@ MAKE_ENV+=	PERL_PATH=${PERL}
 BUILD_DEPENDS+=	${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error
 RUN_DEPENDS+=	${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error \
 		${SITE_PERL}/Net/SMTP/SSL.pm:${PORTSDIR}/mail/p5-Net-SMTP-SSL
-MAN3=		Git.3
+MAN3=		Git.3 \
+		Git::I18N.3
 PLIST_SUB+=	PERLSUB=""
 .else
 MAKE_ENV+=	NO_PERL=1
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 2fa2032943df..6415157c69ad 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,6 +1,6 @@
-SHA256 (git-1.7.8.4.tar.gz) = 71a5a98d386061fe606b5be1ac390dc725d418d12edfa20796ff7671247c67e3
-SIZE (git-1.7.8.4.tar.gz) = 3544195
-SHA256 (git-manpages-1.7.8.4.tar.gz) = b4930a17de7b18d40d81c3830913e5c4c2a91134e3a331ad49757d496ee53b76
-SIZE (git-manpages-1.7.8.4.tar.gz) = 497621
-SHA256 (git-htmldocs-1.7.8.4.tar.gz) = a86d8d939cb031d8ebbbaa17399c32474a13e0e4a6705406ad5771620b351acd
-SIZE (git-htmldocs-1.7.8.4.tar.gz) = 1699142
+SHA256 (git-1.7.9.tar.gz) = dd9dfcf1da59f09c4b66b53836b56fcb2208d0be9edf1f8b9079c7e980435086
+SIZE (git-1.7.9.tar.gz) = 3606326
+SHA256 (git-manpages-1.7.9.tar.gz) = b85c4533c0bbe0a5920399b3dc856577feaec2bbcde60c577338d29fac2f2cb1
+SIZE (git-manpages-1.7.9.tar.gz) = 508027
+SHA256 (git-htmldocs-1.7.9.tar.gz) = a43234a0288e34ba826c3e77b7a9e9b2b3f30fbd63c847806ee5437e883f1699
+SIZE (git-htmldocs-1.7.9.tar.gz) = 1742462
diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile
index 5c4f305f6316..679aeba65432 100644
--- a/devel/git/files/patch-Makefile
+++ b/devel/git/files/patch-Makefile
@@ -1,6 +1,6 @@
---- ./Makefile.orig	2011-10-05 10:02:13.605889189 -0400
-+++ ./Makefile	2011-10-05 10:05:22.414881672 -0400
-@@ -278,8 +278,8 @@
+--- ./Makefile.orig	2012-01-30 16:19:10.085737423 -0500
++++ ./Makefile	2012-01-30 20:58:38.938730750 -0500
+@@ -301,8 +301,8 @@
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@ -11,7 +11,7 @@
  ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
  ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
-@@ -299,14 +299,14 @@
+@@ -322,15 +322,15 @@
  prefix = $(HOME)
  bindir_relative = bin
  bindir = $(prefix)/$(bindir_relative)
@@ -24,15 +24,16 @@
  sharedir = $(prefix)/share
 -gitwebdir = $(sharedir)/gitweb
 +gitwebdir = $(sharedir)/examples/git/gitweb
+ localedir = $(sharedir)/locale
  template_dir = share/git-core/templates
 -htmldir = share/doc/git-doc
 +htmldir = share/doc/git
  ETC_GITCONFIG = $(sysconfdir)/gitconfig
  ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
  lib = lib
-@@ -315,20 +315,20 @@
+@@ -339,21 +339,21 @@
  
- export prefix bindir sharedir sysconfdir gitwebdir
+ export prefix bindir sharedir sysconfdir gitwebdir localedir
  
 -CC = gcc
 -AR = ar
@@ -45,6 +46,7 @@
 -TCL_PATH = tclsh
 -TCLTK_PATH = wish
 -XGETTEXT = xgettext
+-MSGFMT = msgfmt
 -PTHREAD_LIBS = -lpthread
 -PTHREAD_CFLAGS =
 -GCOV = gcov
@@ -59,13 +61,14 @@
 +TCL_PATH ?= tclsh
 +TCLTK_PATH ?= wish
 +XGETTEXT ?= xgettext
++MSGFMT ?= msgfmt
 +PTHREAD_LIBS ?= -lpthread
 +PTHREAD_CFLAGS ?=
 +GCOV ?= gcov
  
  export TCL_PATH TCLTK_PATH
  
-@@ -1356,9 +1356,9 @@
+@@ -1435,9 +1435,9 @@
  
  ifndef NO_OPENSSL
  	OPENSSL_LIBSSL = -lssl
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index da63335321b5..954bd615480c 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -50,6 +50,9 @@ libexec/git-core/git-commit
 libexec/git-core/git-commit-tree
 libexec/git-core/git-config
 libexec/git-core/git-count-objects
+libexec/git-core/git-credential-cache--daemon
+libexec/git-core/git-credential-cache
+libexec/git-core/git-credential-store
 %%CVS%%libexec/git-core/git-cvsexportcommit
 %%CVS%%libexec/git-core/git-cvsimport
 %%CVS%%libexec/git-core/git-cvsserver
@@ -201,8 +204,10 @@ libexec/git-core/mergetools/araxis
 %%GUI%%bin/gitk
 %%PERLSUB%%%%SITE_PERL%%/Git.pm
 %%PERLSUB%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Git/.packlist
+%%PERLSUB%%%%SITE_PERL%%/Git/I18N.pm
 lib/xemacs/site-lisp/git/git.el
 lib/xemacs/site-lisp/git/git-blame.el
+share/locale/is/LC_MESSAGES/git.mo
 share/emacs/site-lisp/git/git.el
 share/emacs/site-lisp/git/git-blame.el
 share/git-core/templates/description
@@ -510,6 +515,18 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/howto/separating-topic-branches.txt
 %%HTMLDOCS%%%%DOCSDIR%%/howto/rebase-from-internal-branch.txt
 %%HTMLDOCS%%%%DOCSDIR%%/howto/use-git-daemon.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/using-signed-tag-in-pull-request.html
+%%HTMLDOCS%%%%DOCSDIR%%/howto/using-signed-tag-in-pull-request.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-credential-cache--daemon.html
+%%HTMLDOCS%%%%DOCSDIR%%/git-credential-cache--daemon.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-credential-cache.html
+%%HTMLDOCS%%%%DOCSDIR%%/git-credential-cache.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-credential-store.html
+%%HTMLDOCS%%%%DOCSDIR%%/git-credential-store.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitcredentials.html
+%%HTMLDOCS%%%%DOCSDIR%%/gitcredentials.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-p4.html
+%%HTMLDOCS%%%%DOCSDIR%%/git-p4.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-merge-one-file.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-fetch-pack.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-branch.txt
@@ -524,6 +541,8 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/git-repack.txt
 %%HTMLDOCS%%%%DOCSDIR%%/gitworkflows.txt
 %%HTMLDOCS%%%%DOCSDIR%%/diff-config.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-credentials.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-credentials.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-argv-array.html
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-argv-array.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-sha1-array.html
@@ -874,6 +893,7 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.8.2.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.8.3.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.8.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.9.txt
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css
@@ -896,6 +916,9 @@ share/git-core/templates/info/exclude
 %%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/osxkeychain/Makefile
+%%CONTRIB%%share/git-core/contrib/credential/osxkeychain/git-credential-osxkeychain.c
+%%CONTRIB%%share/git-core/contrib/credential/osxkeychain/.gitignore
 %%CONTRIB%%share/git-core/contrib/diff-highlight/README
 %%CONTRIB%%share/git-core/contrib/diff-highlight/diff-highlight
 %%CONTRIB%%share/git-core/contrib/emacs/.gitignore
@@ -928,7 +951,6 @@ share/git-core/templates/info/exclude
 %%CONTRIB%%share/git-core/contrib/fast-import/git-import.sh
 %%CONTRIB%%share/git-core/contrib/fast-import/git-p4
 %%CONTRIB%%share/git-core/contrib/fast-import/git-p4.bat
-%%CONTRIB%%share/git-core/contrib/fast-import/git-p4.txt
 %%CONTRIB%%share/git-core/contrib/fast-import/import-directories.perl
 %%CONTRIB%%share/git-core/contrib/fast-import/import-tars.perl
 %%CONTRIB%%share/git-core/contrib/fast-import/import-zips.py
@@ -970,6 +992,7 @@ share/git-core/templates/info/exclude
 %%GITWEB%%@dirrm %%EXAMPLESDIR%%/gitweb
 %%GITWEB%%@dirrm %%EXAMPLESDIR%%
 %%PERLSUB%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Git
+%%PERLSUB%%@dirrmtry %%SITE_PERL%%/Git
 @dirrm lib/xemacs/site-lisp/git
 @dirrmtry lib/xemacs/site-lisp
 @dirrmtry lib/xemacs
@@ -997,6 +1020,8 @@ share/git-core/templates/info/exclude
 %%CONTRIB%%@dirrm share/git-core/contrib/completion
 %%CONTRIB%%@dirrm share/git-core/contrib/continuous
 %%CONTRIB%%@dirrm share/git-core/contrib/convert-objects
+%%CONTRIB%%@dirrm share/git-core/contrib/credential/osxkeychain
+%%CONTRIB%%@dirrm share/git-core/contrib/credential
 %%CONTRIB%%@dirrm share/git-core/contrib/diff-highlight
 %%CONTRIB%%@dirrm share/git-core/contrib/emacs
 %%CONTRIB%%@dirrm share/git-core/contrib/examples