3 files changed, 119 insertions, 7 deletions

diff --git a/devel/git/Makefile b/devel/git/Makefile
index 122fa731e7b0..52b92334f4ea 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -6,25 +6,136 @@
 #
 
 PORTNAME=	git
-PORTVERSION=	1.1.6
-PORTREVISION=	1
+PORTVERSION=	1.2.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
 
 MAINTAINER=	anholt@FreeBSD.org
 COMMENT=	Distributed source code management tool
 
-BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl
+BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
+		asciidoc:${PORTSDIR}/textproc/asciidoc \
+		xmlto:${PORTSDIR}/textproc/xmlto
 RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		wish8.4:${PORTSDIR}/x11-toolkits/tk84
 LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 
 CONFLICTS=	cogito-[0-9]* git-4.*
 
+MAN1=		git-add.1 \
+		git-am.1 \
+		git-apply.1 \
+		git-applymbox.1 \
+		git-applypatch.1 \
+		git-archimport.1 \
+		git-bisect.1 \
+		git-branch.1 \
+		git-cat-file.1 \
+		git-check-ref-format.1 \
+		git-checkout-index.1 \
+		git-checkout.1 \
+		git-cherry-pick.1 \
+		git-cherry.1 \
+		git-clone-pack.1 \
+		git-clone.1 \
+		git-commit-tree.1 \
+		git-commit.1 \
+		git-convert-objects.1 \
+		git-count-objects.1 \
+		git-cvsexportcommit.1 \
+		git-cvsimport.1 \
+		git-daemon.1 \
+		git-describe.1 \
+		git-diff-files.1 \
+		git-diff-index.1 \
+		git-diff-stages.1 \
+		git-diff-tree.1 \
+		git-diff.1 \
+		git-fetch-pack.1 \
+		git-fetch.1 \
+		git-fmt-merge-msg.1 \
+		git-format-patch.1 \
+		git-fsck-objects.1 \
+		git-get-tar-commit-id.1 \
+		git-grep.1 \
+		git-hash-object.1 \
+		git-http-fetch.1 \
+		git-http-push.1 \
+		git-index-pack.1 \
+		git-init-db.1 \
+		git-local-fetch.1 \
+		git-log.1 \
+		git-lost-found.1 \
+		git-ls-files.1 \
+		git-ls-remote.1 \
+		git-ls-tree.1 \
+		git-mailinfo.1 \
+		git-mailsplit.1 \
+		git-merge-base.1 \
+		git-merge-index.1 \
+		git-merge-one-file.1 \
+		git-merge.1 \
+		git-mktag.1 \
+		git-mv.1 \
+		git-name-rev.1 \
+		git-pack-objects.1 \
+		git-pack-redundant.1 \
+		git-parse-remote.1 \
+		git-patch-id.1 \
+		git-peek-remote.1 \
+		git-prune-packed.1 \
+		git-prune.1 \
+		git-pull.1 \
+		git-push.1 \
+		git-read-tree.1 \
+		git-rebase.1 \
+		git-receive-pack.1 \
+		git-relink.1 \
+		git-repack.1 \
+		git-repo-config.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 \
+		git-send-email.1 \
+		git-send-pack.1 \
+		git-sh-setup.1 \
+		git-shell.1 \
+		git-shortlog.1 \
+		git-show-branch.1 \
+		git-show-index.1 \
+		git-show.1 \
+		git-ssh-fetch.1 \
+		git-ssh-upload.1 \
+		git-status.1 \
+		git-stripspace.1 \
+		git-svnimport.1 \
+		git-symbolic-ref.1 \
+		git-tag.1 \
+		git-tar-tree.1 \
+		git-unpack-file.1 \
+		git-unpack-objects.1 \
+		git-update-index.1 \
+		git-update-ref.1 \
+		git-update-server-info.1 \
+		git-upload-pack.1 \
+		git-var.1 \
+		git-verify-pack.1 \
+		git-verify-tag.1 \
+		git-whatchanged.1 \
+		git-write-tree.1 \
+		gitk.1
+MAN7=		git.7
+
 USE_PERL5=	yes
 USE_PYTHON=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
+ALL_TARGET=	all doc
+INSTALL_TARGET=	install install-doc
 CFLAGS+=	-I${LOCALBASE}/include
 MAKE_ENV+=	CURLDIR=${LOCALBASE} \
 		NEEDS_LIBICONV=yes \
diff --git a/devel/git/distinfo b/devel/git/distinfo
index e667371b9a88..794337cdef81 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,3 +1,3 @@
-MD5 (git-1.1.6.tar.gz) = 7113bc518919bea1b24c628b8c2a1386
-SHA256 (git-1.1.6.tar.gz) = 6746d9cb87c888b2aa81a52a511d46fd73c0b27540d1e8879f9f32d0f82bc31c
-SIZE (git-1.1.6.tar.gz) = 572957
+MD5 (git-1.2.0.tar.gz) = d0e943574f7639e7c1c686ba20da27ea
+SHA256 (git-1.2.0.tar.gz) = e6e876d9c81d717b3a9292b5b1fb4bc7bd02956f1175a96d3d6164c709ab22af
+SIZE (git-1.2.0.tar.gz) = 600033
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 741e59daf823..15294f6b8ddb 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -76,6 +76,7 @@ bin/git-relink
 bin/git-repack
 bin/git-repo-config
 bin/git-request-pull
+bin/git-rerere
 bin/git-reset
 bin/git-resolve
 bin/git-rev-list
@@ -85,6 +86,7 @@ bin/git-send-pack
 bin/git-sh-setup
 bin/git-shell
 bin/git-shortlog
+bin/git-show
 bin/git-show-branch
 bin/git-show-index
 bin/git-ssh-fetch
@@ -110,7 +112,6 @@ bin/git-whatchanged
 bin/git-write-tree
 bin/gitk
 share/git-core/python/gitMergeCommon.py
-share/git-core/python/subprocess.py
 share/git-core/templates/description
 share/git-core/templates/hooks/applypatch-msg
 share/git-core/templates/hooks/commit-msg