From 974123fc229006a0073942316948bc84a2126654 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Sat, 19 May 2012 19:39:17 +0000
Subject: [PATCH] Update git to 1.7.10.2

---
 dev-vcs/git/git-1.7.10.2.bep           | 26 ++++++++++++++
 dev-vcs/git/patches/git-1.7.10.2.patch | 47 ++++++++++++++++++++++++++
 dev-vcs/gitdoc/gitdoc-1.7.10.2.bep     | 32 ++++++++++++++++++
 3 files changed, 105 insertions(+)
 create mode 100644 dev-vcs/git/git-1.7.10.2.bep
 create mode 100644 dev-vcs/git/patches/git-1.7.10.2.patch
 create mode 100644 dev-vcs/gitdoc/gitdoc-1.7.10.2.bep

diff --git a/dev-vcs/git/git-1.7.10.2.bep b/dev-vcs/git/git-1.7.10.2.bep
new file mode 100644
index 000000000..16648b18e
--- /dev/null
+++ b/dev-vcs/git/git-1.7.10.2.bep
@@ -0,0 +1,26 @@
+DESCRIPTION="git a fast version control system" 
+HOMEPAGE="http://git-scm.com/" 
+SRC_URI="http://git-core.googlecode.com/files/git-1.7.10.2.tar.gz"
+CHECKSUM_MD5="2e2ee53243ab8e7cf10f15c5229c3fce"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND="net-misc/curl >= 7.20.0
+		dev-lang/perl >= 5.10.1
+		dev-vcs/gitdoc == 1.7.10"
+BUILD {
+	cd git-1.7.10.2
+	make strip
+}
+
+INSTALL {
+	cd git-1.7.10.2
+	make install
+}
+
+TEST {
+	cd git-1.7.10.2
+	make check
+}
+
+LICENSE="GNU GPL v2"
+COPYRIGHT="2005-2012 Git Authors (see git web site for list)"
diff --git a/dev-vcs/git/patches/git-1.7.10.2.patch b/dev-vcs/git/patches/git-1.7.10.2.patch
new file mode 100644
index 000000000..36c719f64
--- /dev/null
+++ b/dev-vcs/git/patches/git-1.7.10.2.patch
@@ -0,0 +1,47 @@
+diff -up git-1.7.10.2/Makefile.orig git-1.7.10.2/Makefile
+--- git-1.7.10.2/Makefile.orig	2012-05-11 14:25:45.066322432 -0600
++++ git-1.7.10.2/Makefile	2012-05-19 12:53:42.392429568 -0600
+@@ -1242,6 +1242,31 @@ ifeq ($(uname_S),Minix)
+ 	NO_CURL =
+ 	NO_EXPAT =
+ endif
++ifeq ($(uname_S),Haiku)
++	NO_LIBGEN_H = YesPlease
++	NO_MEMMEM = YesPlease
++	NO_MKSTEMPS = YesPlease
++	NEEDS_LIBICONV = YesPlease
++	PERL_PATH = perl
++	PYTHON_PATH = python
++#	TCL_PATH = tclsh
++	mandir = /boot/common/documentation/man
++	infodir = /boot/common/documentation/info
++	htmldir = /boot/common/documentation/doc/git-1.7.10.2
++	gitexecdir = /boot/common/bin/git-core
++	gitwebdir = /boot/common/data/gitweb
++	template_dir = /boot/common/data/git-core/templates
++	NO_TCLTK = YesPlease
++	DEFAULT_EDITOR = nano
++	CURL_DIR = /boot/common
++	EXPAT_DIR = /boot/common
++	BASIC_CFLAGS += -I/boot/common/include
++	BASIC_LDFLAGS += -lnetwork -lbsd -L/boot/common/lib
++	PTHREAD_LIBS =
++	prefix = /boot/common
++	NO_CROSS_DIRECTORY_HARDLINKS = YesPlease
++	NO_GETTEXT = YesPlease
++endif
+ ifneq (,$(findstring MINGW,$(uname_S)))
+ 	pathsep = ;
+ 	NO_PREAD = YesPlease
+diff -up git-1.7.10.2/git-web--browse.sh.orig git-1.7.10.2/git-web--browse.sh
+--- git-1.7.10.2/git-web--browse.sh.orig	2012-05-11 14:25:45.053477376 -0600
++++ git-1.7.10.2/git-web--browse.sh	2012-05-19 12:53:42.405536768 -0600
+@@ -116,7 +116,7 @@ if test -z "$browser" ; then
+ 			browser_candidates="konqueror $browser_candidates"
+ 		fi
+ 	else
+-		browser_candidates="w3m elinks links lynx"
++		browser_candidates="w3m elinks links lynx open"
+ 	fi
+ 	# SECURITYSESSIONID indicates an OS X GUI login session
+ 	if test -n "$SECURITYSESSIONID" \
diff --git a/dev-vcs/gitdoc/gitdoc-1.7.10.2.bep b/dev-vcs/gitdoc/gitdoc-1.7.10.2.bep
new file mode 100644
index 000000000..0eff3fdf2
--- /dev/null
+++ b/dev-vcs/gitdoc/gitdoc-1.7.10.2.bep
@@ -0,0 +1,32 @@
+DESCRIPTION="git a fast version control system"
+HOMEPAGE="http://code.google.com/p/git-core/"
+SRC_URI="http://git-core.googlecode.com/files/git-manpages-1.7.10.2.tar.gz"
+CHECKSUM_MD5="79bae5456db8366803d28db867892d74"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND=""
+
+BUILD {
+	echo "Attempting to download additional formats"
+	wget http://git-core.googlecode.com/files/git-htmldocs-1.7.10.2.tar.gz
+	if [ $? != 0 ];then
+		echo "Error downloading additional formats"
+		exit 1
+	fi
+}
+
+INSTALL {
+	MAN_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man
+	mkdir -p "${DESTDIR}/${MAN_DIR}"
+	cp -afv man* "${DESTDIR}/${MAN_DIR}"
+
+	echo "Extracting extra docs"
+	DOC_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/doc/git-1.7.10.2
+	mkdir -p "${DESTDIR}/${DOC_DIR}"
+	WORKDIR="$(pwd)"
+	cd "${DESTDIR}/${DOC_DIR}"
+	tar xvf "${WORKDIR}/git-htmldocs-1.7.10.2.tar.gz"
+}
+
+LICENSE="GNU GPL v2"
+COPYRIGHT="2005-2012 Git Authors (see git web site for list)"