From ca1df0dab33894147212d23c0c4bed06d002a2f8 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 17 Mar 2013 18:43:08 +0000 Subject: [PATCH] Updated git and gitdoc to 1.8.1.3 this closes #706. --- dev-vcs/git/git-1.8.1.3.bep | 26 +++++++++++++++ dev-vcs/git/patches/git-1.8.1.3.patch | 47 +++++++++++++++++++++++++++ dev-vcs/gitdoc/gitdoc-1.8.1.3.bep | 32 ++++++++++++++++++ 3 files changed, 105 insertions(+) create mode 100644 dev-vcs/git/git-1.8.1.3.bep create mode 100644 dev-vcs/git/patches/git-1.8.1.3.patch create mode 100644 dev-vcs/gitdoc/gitdoc-1.8.1.3.bep diff --git a/dev-vcs/git/git-1.8.1.3.bep b/dev-vcs/git/git-1.8.1.3.bep new file mode 100644 index 000000000..ba37b6fe3 --- /dev/null +++ b/dev-vcs/git/git-1.8.1.3.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.8.1.3.tar.gz" +CHECKSUM_MD5="05fb5ea3792a51cef2becc8d06ea9b87" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="net-misc/curl >= 7.20.0 + dev-lang/perl >= 5.10.1 + dev-vcs/gitdoc == 1.8.0" +BUILD { + cd git-1.8.1.3 + make strip +} + +INSTALL { + cd git-1.8.1.3 + make install +} + +TEST { + cd git-1.8.1.3 + make check +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2005-2013 Git Authors (see git web site for list)" diff --git a/dev-vcs/git/patches/git-1.8.1.3.patch b/dev-vcs/git/patches/git-1.8.1.3.patch new file mode 100644 index 000000000..ce6762401 --- /dev/null +++ b/dev-vcs/git/patches/git-1.8.1.3.patch @@ -0,0 +1,47 @@ +diff -up git-1.8.1.3/Makefile.orig git-1.8.0/Makefile +--- git-1.8.1.3/Makefile.orig ++++ git-1.8.1.3/Makefile +@@ -1382,6 +1382,31 @@ ifeq ($(uname_S),NONSTOP_KERNEL) + # RFE 10-120912-4693 submitted to HP NonStop development. + NO_SETITIMER = UnfortunatelyYes + 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.8.0 ++ 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.8.1.3/git-web--browse.sh.orig git-1.8.0/git-web--browse.sh +--- git-1.8.1.3/git-web--browse.sh.orig ++++ git-1.8.1.3/git-web--browse.sh +@@ -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.8.1.3.bep b/dev-vcs/gitdoc/gitdoc-1.8.1.3.bep new file mode 100644 index 000000000..743a2b073 --- /dev/null +++ b/dev-vcs/gitdoc/gitdoc-1.8.1.3.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.8.1.3.tar.gz" +CHECKSUM_MD5="b8e050c3c96b0b9fa28a7b7e9413af01" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" + +BUILD { + echo "Attempting to download additional formats" + wget http://git-core.googlecode.com/files/git-htmldocs-1.8.1.3.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.8.1.3 + mkdir -p "${DESTDIR}/${DOC_DIR}" + WORKDIR="$(pwd)" + cd "${DESTDIR}/${DOC_DIR}" + tar xvf "${WORKDIR}/git-htmldocs-1.8.1.3.tar.gz" +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2005-2013 Git Authors (see git web site for list)"