Update git and gitdoc to 1.7.9.1

gitdoc has been fixed to build packages properly and kludged to download htmldocs

git has been fixed to allow help to pop up in web+ with commands like "git help -w clone"
(iirc html docs can be set as the default in a users gitconfig file)
This commit is contained in:
Chris Roberts
2012-02-20 00:39:18 +00:00
parent 6c977ac8a9
commit 52ad672192
3 changed files with 105 additions and 0 deletions

View File

@@ -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.9.1.tar.gz"
CHECKSUM_MD5="b88ae610f8e5f55779899550ec3b37b8"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="net-misc/curl >= 7.20.0
dev-lang/perl >= 5.10.1
dev-vcs/gitdoc == 1.7.9.1"
BUILD {
cd git-1.7.9.1
make strip
}
INSTALL {
cd git-1.7.9.1
make install
}
TEST {
cd git-1.7.9.1
make check
}
LICENSE="GNU GPL v2"
COPYRIGHT="2005-2012 Git Authors (see git web site for list)"

View File

@@ -0,0 +1,47 @@
diff -up git-1.7.9.1/Makefile.orig git-1.7.9.1/Makefile
--- git-1.7.9.1/Makefile.orig 2012-02-14 12:01:35.059244544 -0700
+++ git-1.7.9.1/Makefile 2012-02-19 16:44:31.379060224 -0700
@@ -1232,6 +1232,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.9.1
+ 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.9.1/git-web--browse.sh.orig git-1.7.9.1/git-web--browse.sh
--- git-1.7.9.1/git-web--browse.sh.orig 2012-02-19 17:16:04.545259520 -0700
+++ git-1.7.9.1/git-web--browse.sh 2012-02-19 17:19:01.035913728 -0700
@@ -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" \

View File

@@ -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.9.1.tar.gz"
CHECKSUM_MD5="c2d9b838bb5ba1385e65ed8ae0e4fe00"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
echo "Attempting to download additional formats"
wget http://git-core.googlecode.com/files/git-htmldocs-1.7.9.1.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.9.1
mkdir -p "${DESTDIR}/${DOC_DIR}"
WORKDIR="$(pwd)"
cd "${DESTDIR}/${DOC_DIR}"
tar xvf "${WORKDIR}/git-htmldocs-1.7.9.1.tar.gz"
}
LICENSE="GNU GPL v2"
COPYRIGHT="2005-2012 Git Authors (see git web site for list)"