3 files changed, 32 insertions, 8 deletions

diff --git a/devel/git/Makefile b/devel/git/Makefile
index 302615c036ba..8ca182d9c5bf 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	git
-PORTVERSION=	1.5.0.3
+PORTVERSION=	1.5.2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
 
@@ -36,7 +36,9 @@ MAN1=		git-add.1 \
 		git-bisect.1 \
 		git-blame.1 \
 		git-branch.1 \
+		git-bundle.1 \
 		git-cat-file.1 \
+		git-check-attr.1 \
 		git-check-ref-format.1 \
 		git-checkout-index.1 \
 		git-checkout.1 \
@@ -56,7 +58,6 @@ MAN1=		git-add.1 \
 		git-describe.1 \
 		git-diff-files.1 \
 		git-diff-index.1 \
-		git-diff-stages.1 \
 		git-diff-tree.1 \
 		git-diff.1 \
 		git-fast-import.1 \
@@ -92,6 +93,7 @@ MAN1=		git-add.1 \
 		git-merge-index.1 \
 		git-merge-one-file.1 \
 		git-merge-tree.1 \
+		git-mergetool.1 \
 		git-mktag.1 \
 		git-mktree.1 \
 		git-mv.1 \
@@ -119,7 +121,6 @@ MAN1=		git-add.1 \
 		git-request-pull.1 \
 		git-rerere.1 \
 		git-reset.1 \
-		git-resolve.1 \
 		git-rev-list.1 \
 		git-rev-parse.1 \
 		git-revert.1 \
@@ -157,6 +158,7 @@ MAN1=		git-add.1 \
 		git-write-tree.1 \
 		gitk.1
 MAN3=		Git.3
+MAN5=		gitattributes.5
 MAN7=		git.7
 
 USE_BZIP2=	yes
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 1c0d73f5d3ab..ea0fdc1f4953 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,3 +1,3 @@
-MD5 (git-1.5.0.3.tar.bz2) = ea7a01dbde1da8fce235dde689bfeeea
-SHA256 (git-1.5.0.3.tar.bz2) = 950be95ece89a4c03aa22cd93626a27619536d1b9d40631b4369c339d63c120a
-SIZE (git-1.5.0.3.tar.bz2) = 1047037
+MD5 (git-1.5.2.tar.bz2) = 79c749b720c29c024d948163fdc47dac
+SHA256 (git-1.5.2.tar.bz2) = 26e30a20a6ee659018a863f743803811535042454f1edad8727b375fefac6ff5
+SIZE (git-1.5.2.tar.bz2) = 1180424
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 76cabf5a62b6..0f2d03fea3f2 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -11,7 +11,9 @@ bin/git-archive
 bin/git-bisect
 bin/git-blame
 bin/git-branch
+bin/git-bundle
 bin/git-cat-file
+bin/git-check-attr
 bin/git-check-ref-format
 bin/git-checkout
 bin/git-checkout-index
@@ -33,11 +35,11 @@ bin/git-describe
 bin/git-diff
 bin/git-diff-files
 bin/git-diff-index
-bin/git-diff-stages
 bin/git-diff-tree
 bin/git-fast-import
 bin/git-fetch
 bin/git-fetch-pack
+bin/git-fetch--tool
 bin/git-fmt-merge-msg
 bin/git-for-each-ref
 bin/git-format-patch
@@ -73,7 +75,9 @@ bin/git-merge-ours
 bin/git-merge-recursive
 bin/git-merge-resolve
 bin/git-merge-stupid
+bin/git-merge-subtree
 bin/git-merge-tree
+bin/git-mergetool
 bin/git-mktag
 bin/git-mktree
 bin/git-mv
@@ -101,7 +105,6 @@ bin/git-repo-config
 bin/git-request-pull
 bin/git-rerere
 bin/git-reset
-bin/git-resolve
 bin/git-rev-list
 bin/git-rev-parse
 bin/git-revert
@@ -151,11 +154,28 @@ share/git-core/templates/hooks/applypatch-msg
 share/git-core/templates/hooks/commit-msg
 share/git-core/templates/hooks/post-commit
 share/git-core/templates/hooks/post-update
+share/git-core/templates/hooks/post-receive
 share/git-core/templates/hooks/pre-applypatch
 share/git-core/templates/hooks/pre-commit
 share/git-core/templates/hooks/pre-rebase
 share/git-core/templates/hooks/update
 share/git-core/templates/info/exclude
+%%GUI%%share/git-gui/lib/tclIndex
+%%GUI%%share/git-gui/lib/blame.tcl
+%%GUI%%share/git-gui/lib/branch.tcl
+%%GUI%%share/git-gui/lib/browser.tcl
+%%GUI%%share/git-gui/lib/class.tcl
+%%GUI%%share/git-gui/lib/commit.tcl
+%%GUI%%share/git-gui/lib/console.tcl
+%%GUI%%share/git-gui/lib/database.tcl
+%%GUI%%share/git-gui/lib/diff.tcl
+%%GUI%%share/git-gui/lib/error.tcl
+%%GUI%%share/git-gui/lib/index.tcl
+%%GUI%%share/git-gui/lib/merge.tcl
+%%GUI%%share/git-gui/lib/option.tcl
+%%GUI%%share/git-gui/lib/remote.tcl
+%%GUI%%share/git-gui/lib/shortcut.tcl
+%%GUI%%share/git-gui/lib/transport.tcl
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Git
 @dirrm lib/xemacs/site-lisp/git
 @dirrmtry lib/xemacs/site-lisp
@@ -163,6 +183,8 @@ share/git-core/templates/info/exclude
 @dirrm share/emacs/site-lisp/git
 @dirrmtry share/emacs/site-lisp
 @dirrmtry share/emacs
+%%GUI%%@dirrm share/git-gui/lib
+%%GUI%%@dirrm share/git-gui
 @dirrm share/git-core/templates/branches
 @dirrm share/git-core/templates/hooks
 @dirrm share/git-core/templates/info