7 files changed, 201 insertions, 0 deletions

diff --git a/devel/Makefile b/devel/Makefile
index ef410617b43e..87e51aa4e1b8 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -318,6 +318,7 @@
     SUBDIR += gettext-lint
     SUBDIR += getxml
     SUBDIR += gindent
+    SUBDIR += git
     SUBDIR += glade2
     SUBDIR += glademm
     SUBDIR += glib-java
diff --git a/devel/git/Makefile b/devel/git/Makefile
new file mode 100644
index 000000000000..d51da030dbf3
--- /dev/null
+++ b/devel/git/Makefile
@@ -0,0 +1,34 @@
+# Ports collection makefile for:	git
+# Date created:				7 Feb 2006
+# Whom:					Eric Anholt
+#
+# $FreeBSD$
+#
+
+PORTNAME=	git
+PORTVERSION=	1.1.6
+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
+RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
+		wish8.4:${PORTSDIR}/x11-toolkits/tk84
+
+USE_PERL5=	yes
+USE_PYTHON=	yes
+USE_ICONV=	yes
+USE_GMAKE=	yes
+CFLAGS+=	-I${LOCALBASE}/include
+MAKE_ENV+=	CURLDIR=${LOCALBASE} \
+		NEEDS_LIBICONV=yes \
+		LDFLAGS="-L${LOCALBASE}/lib"
+MAKE_ARGS+=	prefix="${PREFIX}"
+
+pre-patch:
+	${REINPLACE_CMD} "s|/usr/bin/python|${LOCALBASE}/bin/python|g" \
+		${WRKSRC}/git-merge-recursive.py
+
+.include <bsd.port.mk>
diff --git a/devel/git/distinfo b/devel/git/distinfo
new file mode 100644
index 000000000000..e667371b9a88
--- /dev/null
+++ b/devel/git/distinfo
@@ -0,0 +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
diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile
new file mode 100644
index 000000000000..f7b2693a2d01
--- /dev/null
+++ b/devel/git/files/patch-Makefile
@@ -0,0 +1,13 @@
+--- Makefile.orig	Sun Jan 29 17:55:20 2006
++++ Makefile	Tue Feb  7 23:12:22 2006
+@@ -61,8 +61,8 @@
+ 
+ # CFLAGS and LDFLAGS are for the users to override from the command line.
+ 
+-CFLAGS = -g -O2 -Wall
+-LDFLAGS =
++#CFLAGS = -g -O2 -Wall
++#LDFLAGS =
+ ALL_CFLAGS = $(CFLAGS)
+ ALL_LDFLAGS = $(LDFLAGS)
+ 
diff --git a/devel/git/files/patch-gitk b/devel/git/files/patch-gitk
new file mode 100644
index 000000000000..592ad605be6b
--- /dev/null
+++ b/devel/git/files/patch-gitk
@@ -0,0 +1,10 @@
+--- gitk.orig	Tue Feb  7 23:58:47 2006
++++ gitk	Tue Feb  7 23:58:55 2006
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ # Tcl ignores the next line -*- tcl -*- \
+-exec wish "$0" -- "$@"
++exec wish8.4 "$0" -- "$@"
+ 
+ # Copyright (C) 2005 Paul Mackerras.  All rights reserved.
+ # This program is free software; it may be used, copied, modified
diff --git a/devel/git/pkg-descr b/devel/git/pkg-descr
new file mode 100644
index 000000000000..67039848a9fb
--- /dev/null
+++ b/devel/git/pkg-descr
@@ -0,0 +1,11 @@
+GIT is a "directory content manager" designed to handle absolutely massive
+projects with speed and efficiency, and the release of the 2.6.12 (and later)
+versions of the Linux kernel as well as more and more other projects switching
+to it would indicate that it does this task well.
+
+GIT falls in the category of distributed source code management tools, similar
+to e.g. GNU Arch or Monotone (or, in the commercial world, BitKeeper). Every
+GIT working directory is a full-fledged repository with full revision tracking
+capabilities, not dependent on network access to a central server.
+
+WWW: http://git.or.cz/
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
new file mode 100644
index 000000000000..741e59daf823
--- /dev/null
+++ b/devel/git/pkg-plist
@@ -0,0 +1,129 @@
+bin/git
+bin/git-add
+bin/git-am
+bin/git-apply
+bin/git-applymbox
+bin/git-applypatch
+bin/git-archimport
+bin/git-bisect
+bin/git-branch
+bin/git-cat-file
+bin/git-check-ref-format
+bin/git-checkout
+bin/git-checkout-index
+bin/git-cherry
+bin/git-cherry-pick
+bin/git-clone
+bin/git-clone-pack
+bin/git-commit
+bin/git-commit-tree
+bin/git-convert-objects
+bin/git-count-objects
+bin/git-cvsexportcommit
+bin/git-cvsimport
+bin/git-daemon
+bin/git-describe
+bin/git-diff
+bin/git-diff-files
+bin/git-diff-index
+bin/git-diff-stages
+bin/git-diff-tree
+bin/git-fetch
+bin/git-fetch-pack
+bin/git-fmt-merge-msg
+bin/git-format-patch
+bin/git-fsck-objects
+bin/git-get-tar-commit-id
+bin/git-grep
+bin/git-hash-object
+bin/git-http-fetch
+bin/git-http-push
+bin/git-index-pack
+bin/git-init-db
+bin/git-local-fetch
+bin/git-log
+bin/git-lost-found
+bin/git-ls-files
+bin/git-ls-remote
+bin/git-ls-tree
+bin/git-mailinfo
+bin/git-mailsplit
+bin/git-merge
+bin/git-merge-base
+bin/git-merge-index
+bin/git-merge-octopus
+bin/git-merge-one-file
+bin/git-merge-ours
+bin/git-merge-recursive
+bin/git-merge-resolve
+bin/git-merge-stupid
+bin/git-mktag
+bin/git-mv
+bin/git-name-rev
+bin/git-pack-objects
+bin/git-pack-redundant
+bin/git-parse-remote
+bin/git-patch-id
+bin/git-peek-remote
+bin/git-prune
+bin/git-prune-packed
+bin/git-pull
+bin/git-push
+bin/git-read-tree
+bin/git-rebase
+bin/git-receive-pack
+bin/git-relink
+bin/git-repack
+bin/git-repo-config
+bin/git-request-pull
+bin/git-reset
+bin/git-resolve
+bin/git-rev-list
+bin/git-rev-parse
+bin/git-revert
+bin/git-send-pack
+bin/git-sh-setup
+bin/git-shell
+bin/git-shortlog
+bin/git-show-branch
+bin/git-show-index
+bin/git-ssh-fetch
+bin/git-ssh-pull
+bin/git-ssh-push
+bin/git-ssh-upload
+bin/git-status
+bin/git-stripspace
+bin/git-svnimport
+bin/git-symbolic-ref
+bin/git-tag
+bin/git-tar-tree
+bin/git-unpack-file
+bin/git-unpack-objects
+bin/git-update-index
+bin/git-update-ref
+bin/git-update-server-info
+bin/git-upload-pack
+bin/git-var
+bin/git-verify-pack
+bin/git-verify-tag
+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
+share/git-core/templates/hooks/post-commit
+share/git-core/templates/hooks/post-update
+share/git-core/templates/hooks/pre-applypatch
+share/git-core/templates/hooks/pre-commit
+share/git-core/templates/hooks/update
+share/git-core/templates/info/exclude
+@dirrm share/git-core/python
+@dirrm share/git-core/templates/branches
+@dirrm share/git-core/templates/hooks
+@dirrm share/git-core/templates/info
+@dirrm share/git-core/templates/remotes
+@dirrm share/git-core/templates
+@dirrm share/git-core