Files
haikuports/dev-vcs/git/patches/git-1.7.9.1.patch
Chris Roberts 52ad672192 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)
2012-02-20 00:39:18 +00:00

48 lines
1.6 KiB
Diff

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" \