- Update to 1.6.1

Changelog: http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.1.txt

4 files changed, 32 insertions, 17 deletions

diff --git a/devel/git/Makefile b/devel/git/Makefile
index 2fee3d210164..feb152c14e84 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	git
-PORTVERSION=	1.6.0.6
+PORTVERSION=	1.6.1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
diff --git a/devel/git/distinfo b/devel/git/distinfo
index dde67e792249..a4a24fa0b49b 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,9 +1,9 @@
-MD5 (git-1.6.0.6.tar.bz2) = b5be9b34b441cb57f92086bfaf59f255
-SHA256 (git-1.6.0.6.tar.bz2) = e1d65bece5e8da1b72db22d3f6f2cbcefd28360c7f5bba141af436f43f887d0c
-SIZE (git-1.6.0.6.tar.bz2) = 1882225
-MD5 (git-manpages-1.6.0.6.tar.bz2) = e795e251df5c14a8c7212742880a6a9e
-SHA256 (git-manpages-1.6.0.6.tar.bz2) = 80dc6a8a05bccdb49de261c32c9c22ab8c2e957edd618c0315fdf49e46f89bc8
-SIZE (git-manpages-1.6.0.6.tar.bz2) = 217074
-MD5 (git-1.6.0.6.tar.bz2.sign) = cdf072cc0d4b93ddfd9e34f9825bd239
-SHA256 (git-1.6.0.6.tar.bz2.sign) = b471b66a3a0d748ff90bc9e8579b6c88559b3c906dd80466eaa2ab38055b4c88
-SIZE (git-1.6.0.6.tar.bz2.sign) = 248
+MD5 (git-1.6.1.tar.bz2) = 66265d85593473b23290232b9dccef77
+SHA256 (git-1.6.1.tar.bz2) = 09d64bd88f6f432ddcb0f051a3ead2579f895a7f0dece702bc933ba21a434fe4
+SIZE (git-1.6.1.tar.bz2) = 1971286
+MD5 (git-manpages-1.6.1.tar.bz2) = f53f454c397f691ad50ca6657b56d35c
+SHA256 (git-manpages-1.6.1.tar.bz2) = 877b9648508cb57adc2f9059f8c72d05db2cc1a0286b225d1d18ab11f5c81242
+SIZE (git-manpages-1.6.1.tar.bz2) = 231011
+MD5 (git-1.6.1.tar.bz2.sign) = a9a076a84b644c7618a4704365d2dbdf
+SHA256 (git-1.6.1.tar.bz2.sign) = a9d373b7d808a673db19254d0759480c973eba3c40febe15c1058c5fed0ddd06
+SIZE (git-1.6.1.tar.bz2.sign) = 248
diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile
index 2e170297aefd..fa5d155bc0d4 100644
--- a/devel/git/files/patch-Makefile
+++ b/devel/git/files/patch-Makefile
@@ -1,6 +1,6 @@
---- ./Makefile.orig	2008-10-22 00:19:18.000000000 -0400
-+++ ./Makefile	2008-10-24 10:06:40.855506700 -0400
-@@ -164,8 +164,8 @@
+--- Makefile.orig	2008-12-25 00:33:25.000000000 -0500
++++ Makefile	2009-01-14 09:37:39.152324285 -0500
+@@ -170,8 +170,8 @@
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@ -11,7 +11,7 @@
  ALL_CFLAGS = $(CFLAGS)
  ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
-@@ -182,12 +182,12 @@
+@@ -188,12 +188,12 @@
  
  prefix = $(HOME)
  bindir = $(prefix)/bin
@@ -27,7 +27,7 @@
  ifeq ($(prefix),/usr)
  sysconfdir = /etc
  else
-@@ -217,15 +217,15 @@
+@@ -223,16 +223,16 @@
  
  export prefix bindir sharedir htmldir sysconfdir
  
@@ -40,6 +40,7 @@
 -RPMBUILD = rpmbuild
 -TCL_PATH = tclsh
 -TCLTK_PATH = wish
+-PTHREAD_LIBS = -lpthread
 +CC ?= gcc
 +AR ?= ar
 +RM ?= rm -f
@@ -49,10 +50,11 @@
 +RPMBUILD ?= rpmbuild
 +TCL_PATH ?= tclsh
 +TCLTK_PATH ?= wish
++PTHREAD_LIBS ?= -lpthread
  
  export TCL_PATH TCLTK_PATH
  
-@@ -833,9 +833,9 @@
+@@ -865,9 +865,9 @@
  endif
  ifndef NO_OPENSSL
  	OPENSSL_LIBSSL = -lssl
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 15276abc031d..13cad005bb7f 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -55,7 +55,9 @@ libexec/git-core/git-gc
 libexec/git-core/git-get-tar-commit-id
 libexec/git-core/git-grep
 %%GUI%%libexec/git-core/git-gui
+%%GUI%%libexec/git-core/git-gui--askpass
 libexec/git-core/git-hash-object
+libexec/git-core/git-help
 libexec/git-core/git-http-fetch
 libexec/git-core/git-http-push
 libexec/git-core/git-imap-send
@@ -117,6 +119,7 @@ libexec/git-core/git-send-email
 libexec/git-core/git-send-pack
 libexec/git-core/git-sh-setup
 libexec/git-core/git-shell
+libexec/git-core/git-stage
 @exec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
 @unexec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
 libexec/git-core/git-shortlog
@@ -189,12 +192,18 @@ share/git-core/templates/info/exclude
 %%GUI%%share/git-gui/lib/index.tcl
 %%GUI%%share/git-gui/lib/logo.tcl
 %%GUI%%share/git-gui/lib/merge.tcl
+%%GUI%%share/git-gui/lib/mergetool.tcl
 %%GUI%%share/git-gui/lib/option.tcl
 %%GUI%%share/git-gui/lib/remote.tcl
+%%GUI%%share/git-gui/lib/remote_add.tcl
 %%GUI%%share/git-gui/lib/remote_branch_delete.tcl
+%%GUI%%share/git-gui/lib/search.tcl
 %%GUI%%share/git-gui/lib/shortcut.tcl
 %%GUI%%share/git-gui/lib/spellcheck.tcl
+%%GUI%%share/git-gui/lib/sshkey.tcl
 %%GUI%%share/git-gui/lib/status_bar.tcl
+%%GUI%%share/git-gui/lib/tools_dlg.tcl
+%%GUI%%share/git-gui/lib/tools.tcl
 %%GUI%%share/git-gui/lib/transport.tcl
 %%GUI%%share/git-gui/lib/win32.tcl
 %%GUI%%share/git-gui/lib/win32_shortcut.js
@@ -203,6 +212,7 @@ share/git-core/templates/info/exclude
 %%GUI%%share/git-gui/lib/msgs/hu.msg
 %%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/ru.msg
 %%GUI%%share/git-gui/lib/msgs/sv.msg
 %%GUI%%share/git-gui/lib/msgs/zh_cn.msg
@@ -256,8 +266,8 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/howto/update-hook-example.txt
 %%HTMLDOCS%%%%DOCSDIR%%/howto/rebuild-from-update-hook.txt
 %%HTMLDOCS%%%%DOCSDIR%%/howto/revert-branch-rebase.html
-%%HTMLDOCS%%%%DOCSDIR%%/howto/rebase-and-edit.txt
 %%HTMLDOCS%%%%DOCSDIR%%/howto/using-merge-subtree.html
+%%HTMLDOCS%%%%DOCSDIR%%/howto/revert-a-faulty-merge.txt
 %%HTMLDOCS%%%%DOCSDIR%%/howto/revert-branch-rebase.txt
 %%HTMLDOCS%%%%DOCSDIR%%/howto/separating-topic-branches.txt
 %%HTMLDOCS%%%%DOCSDIR%%/howto/rebase-from-internal-branch.txt
@@ -271,8 +281,10 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/git-merge-index.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-pack-refs.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-rev-parse.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-stage.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-status.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-repack.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitworkflows.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-hash.html
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-setup.html
 %%HTMLDOCS%%%%DOCSDIR%%/technical/send-pack-pipeline.txt
@@ -507,6 +519,7 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.0.4.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.0.5.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.0.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.1.txt
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/INSTALL
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/README
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/git-favicon.png