mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-11 06:10:06 +02:00
48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
diff -up git-1.8.0/Makefile.orig git-1.8.0/Makefile
|
|
--- git-1.8.0/Makefile.orig 2012-10-21 15:32:15.034078720 -0600
|
|
+++ git-1.8.0/Makefile 2012-11-04 15:47:49.335020032 -0700
|
|
@@ -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.0/git-web--browse.sh.orig git-1.8.0/git-web--browse.sh
|
|
--- git-1.8.0/git-web--browse.sh.orig 2012-10-21 15:32:15.028311552 -0600
|
|
+++ git-1.8.0/git-web--browse.sh 2012-11-04 15:47:49.345505792 -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" \
|