5 files changed, 28 insertions, 23 deletions

diff --git a/devel/git/Makefile b/devel/git/Makefile
index 1d3f69024484..528e0f0c356a 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	git
-PORTVERSION=	1.7.4.5
+PORTVERSION=	1.7.5.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_KERNEL_ORG}
 MASTER_SITE_SUBDIR=	software/scm/${PORTNAME}
diff --git a/devel/git/distinfo b/devel/git/distinfo
index be8bc56863d7..19a214204a66 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,12 +1,12 @@
-SHA256 (git-1.7.4.5.tar.bz2) = a6c084752cf5645864b466ea10c0afb2dd74854dc9e4189aa87bf1446668a901
-SIZE (git-1.7.4.5.tar.bz2) = 2711452
-SHA256 (git-manpages-1.7.4.5.tar.bz2) = 04e06a14db8c4258cdec1b9bf8cc33b2407bea368ecf22a5e06012af3c01cd2c
-SIZE (git-manpages-1.7.4.5.tar.bz2) = 301080
-SHA256 (git-htmldocs-1.7.4.5.tar.bz2) = 52a2007146acdc4ab9ca4a4b70d4f55b72ef8c4b1a29395d06ed93561c84dcfb
-SIZE (git-htmldocs-1.7.4.5.tar.bz2) = 945737
-SHA256 (git-1.7.4.5.tar.bz2.sign) = 750bf0e2006cf6a9460a0351f119f86bdd98bafe19e7a60f0760362e3813bb07
-SIZE (git-1.7.4.5.tar.bz2.sign) = 249
-SHA256 (git-manpages-1.7.4.5.tar.bz2.sign) = 6c4220fe7d8a7c40e7c4d711e32903f04ae653d9926aa1fe91d8725a8678957a
-SIZE (git-manpages-1.7.4.5.tar.bz2.sign) = 249
-SHA256 (git-htmldocs-1.7.4.5.tar.bz2.sign) = aa8d12e989c7cf752e80c193e504d3f6e3c047190974d519e71858340a2b045f
-SIZE (git-htmldocs-1.7.4.5.tar.bz2.sign) = 249
+SHA256 (git-1.7.5.1.tar.bz2) = a1d4a1c59300e68fbc493a2cbe9257048d4d6f4363924bf34f38c413a825f80c
+SIZE (git-1.7.5.1.tar.bz2) = 2753815
+SHA256 (git-manpages-1.7.5.1.tar.bz2) = 9d8ab1487df85ca596f3f6718d6a7831868abd9b98035a65c71d7f45af4aac8e
+SIZE (git-manpages-1.7.5.1.tar.bz2) = 300730
+SHA256 (git-htmldocs-1.7.5.1.tar.bz2) = f13b918b5dee8486e83655e9270981cc2840d2ff0002044782d2c59eb2fe032e
+SIZE (git-htmldocs-1.7.5.1.tar.bz2) = 949939
+SHA256 (git-1.7.5.1.tar.bz2.sign) = f4342c22b464ee9700637479ccbf151b895f7773a1fb3c5ae302133b0dee9718
+SIZE (git-1.7.5.1.tar.bz2.sign) = 249
+SHA256 (git-manpages-1.7.5.1.tar.bz2.sign) = 976eadbfec8f7d414262cedb9d4cca19bc905e6fbc27e4958839673fa389c8ad
+SIZE (git-manpages-1.7.5.1.tar.bz2.sign) = 249
+SHA256 (git-htmldocs-1.7.5.1.tar.bz2.sign) = 0d20de6552a531cbe05038aa326b1736c5faa678578be3730a7be2884e4e8694
+SIZE (git-htmldocs-1.7.5.1.tar.bz2.sign) = 249
diff --git a/devel/git/files/patch-Documentation__Makefile b/devel/git/files/patch-Documentation__Makefile
index 0a53fbcbd3b3..73472fa3bfd5 100644
--- a/devel/git/files/patch-Documentation__Makefile
+++ b/devel/git/files/patch-Documentation__Makefile
@@ -1,5 +1,5 @@
---- ./Documentation/Makefile.orig	2010-07-28 13:03:43.000000000 -0400
-+++ ./Documentation/Makefile	2010-08-16 21:56:14.233982716 -0400
+--- ./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))
@@ -14,7 +14,7 @@
  mandir?=$(prefix)/share/man
  man1dir=$(mandir)/man1
  man5dir=$(mandir)/man5
-@@ -162,7 +162,7 @@
+@@ -155,7 +155,7 @@
  endif
  endif
  
diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile
index 6cf158d33aaf..9d8c27b319ce 100644
--- a/devel/git/files/patch-Makefile
+++ b/devel/git/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2010-09-18 19:43:54.000000000 -0400
-+++ Makefile	2010-09-26 16:22:51.939180025 -0400
-@@ -257,8 +257,8 @@
+--- ./Makefile.orig	2011-05-04 21:16:14.000000000 -0400
++++ ./Makefile	2011-05-06 09:53:40.669035774 -0400
+@@ -262,8 +262,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
-@@ -278,13 +278,13 @@
+@@ -284,13 +284,13 @@
  prefix = $(HOME)
  bindir_relative = bin
  bindir = $(prefix)/$(bindir_relative)
@@ -29,7 +29,7 @@
  ifeq ($(prefix),/usr)
  sysconfdir = /etc
  ETC_GITCONFIG = $(sysconfdir)/gitconfig
-@@ -298,19 +298,19 @@
+@@ -306,20 +306,20 @@
  
  export prefix bindir sharedir sysconfdir gitwebdir
  
@@ -43,6 +43,7 @@
 -RPMBUILD = rpmbuild
 -TCL_PATH = tclsh
 -TCLTK_PATH = wish
+-XGETTEXT = xgettext
 -PTHREAD_LIBS = -lpthread
 -PTHREAD_CFLAGS =
 -GCOV = gcov
@@ -56,14 +57,15 @@
 +RPMBUILD ?= rpmbuild
 +TCL_PATH ?= tclsh
 +TCLTK_PATH ?= wish
++XGETTEXT ?= xgettext
 +PTHREAD_LIBS ?= -lpthread
 +PTHREAD_CFLAGS ?=
 +GCOV ?= gcov
  
  export TCL_PATH TCLTK_PATH
  
-@@ -1245,9 +1245,9 @@
- endif
+@@ -1290,9 +1290,9 @@
+ 
  ifndef NO_OPENSSL
  	OPENSSL_LIBSSL = -lssl
 -	ifdef OPENSSLDIR
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 8a3eaaa65c0a..c796869d9f92 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -246,6 +246,7 @@ share/git-core/templates/info/exclude
 %%GUI%%share/git-gui/lib/msgs/it.msg
 %%GUI%%share/git-gui/lib/msgs/ja.msg
 %%GUI%%share/git-gui/lib/msgs/nb.msg
+%%GUI%%share/git-gui/lib/msgs/pt_br.msg
 %%GUI%%share/git-gui/lib/msgs/ru.msg
 %%GUI%%share/git-gui/lib/msgs/sv.msg
 %%GUI%%share/git-gui/lib/msgs/zh_cn.msg
@@ -811,6 +812,8 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.4.3.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.4.4.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.4.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.5.1.txt
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css