haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge all changes from trunk

Browse Source
This commit is contained in:
Oliver Tappe
2013-03-29 14:04:07 +00:00
parent 888e133171
commit 94cc6aaf85
1052 changed files with 65053 additions and 2541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
dev-vcs/git/patches/git-1.7.10.2.patch Normal file
View File

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