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

Update mercurial to 2.4 and git to 1.8.0

Browse Source
This commit is contained in:
Chris Roberts
2012-11-04 23:14:00 +00:00
parent dd51c82ad6
commit fd24328716
15 changed files with 31 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
dev-vcs/git/git-1.7.7.2.bep
View File

@@ -1,26 +0,0 @@
DESCRIPTION="git a fast version control system"
HOMEPAGE="http://git-scm.com/"
SRC_URI="http://git-core.googlecode.com/files/git-1.7.7.2.tar.gz"
CHECKSUM_MD5="400d85fd17bdb7f8923dbf3b3a2ca671"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="net-misc/curl >= 7.20.0
dev-lang/perl >= 5.10.1
dev-vcs/gitdoc == 1.7.7.2"
BUILD {
cd git-1.7.7.2
make strip
}
INSTALL {
cd git-1.7.7.2
make install
}
TEST {
cd git-1.7.7.2
make check
}
LICENSE="GNU GPL v2"
COPYRIGHT="2005-2011 Git Authors (see git web site for list)"

26
dev-vcs/git/git-1.7.9.1.bep
View File

@@ -1,26 +0,0 @@
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)"

12
dev-vcs/git/git-1.7.10.bep → dev-vcs/git/git-1.8.0.bep
View File

@@ -1,24 +1,24 @@
DESCRIPTION="git a fast version control system"
HOMEPAGE="http://git-scm.com/"
SRC_URI="http://git-core.googlecode.com/files/git-1.7.10.tar.gz"
CHECKSUM_MD5="ab2716db51580037c7ebda4c8e9d56eb"
SRC_URI="http://git-core.googlecode.com/files/git-1.8.0.tar.gz"
CHECKSUM_MD5="12f4d20f34ae37086d86dd3b9d037bba"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="net-misc/curl >= 7.20.0
dev-lang/perl >= 5.10.1
dev-vcs/gitdoc == 1.7.10"
dev-vcs/gitdoc == 1.8.0"
BUILD {
cd git-1.7.10
cd git-1.8.0
make strip
}
INSTALL {
cd git-1.7.10
cd git-1.8.0
make install
}
TEST {
cd git-1.7.10
cd git-1.8.0
make check
}

47
dev-vcs/git/patches/git-1.7.10.patch
View File

@@ -1,47 +0,0 @@
diff -up git-1.7.10/Makefile.orig git-1.7.10/Makefile
--- git-1.7.10/Makefile.orig 2012-04-06 12:42:50.033030144 -0600
+++ git-1.7.10/Makefile 2012-04-22 15:44:52.718798848 -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
+ 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/git-web--browse.sh.orig git-1.7.10/git-web--browse.sh
--- git-1.7.10/git-web--browse.sh.orig 2012-04-06 12:42:50.020185088 -0600
+++ git-1.7.10/git-web--browse.sh 2012-04-22 15:44:52.720371712 -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" \

33
dev-vcs/git/patches/git-1.7.7.2.patch
View File

@@ -1,33 +0,0 @@
diff -urN git-1.7.7.2/Makefile git-1.7.7.2-haiku/Makefile
--- git-1.7.7.2/Makefile 2011-11-02 01:06:28.053739520 +0000
+++ git-1.7.7.2-haiku/Makefile 2011-11-03 15:27:49.000000000 +0000
@@ -1176,6 +1176,29 @@
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
+ 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
+endif
ifneq (,$(findstring MINGW,$(uname_S)))
pathsep = ;
NO_PREAD = YesPlease

20
dev-vcs/git/patches/git-1.7.9.1.patch → dev-vcs/git/patches/git-1.8.0.patch
View File

@@ -1,9 +1,9 @@
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 =
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
@@ -15,7 +15,7 @@ diff -up git-1.7.9.1/Makefile.orig git-1.7.9.1/Makefile
+# TCL_PATH = tclsh
+ mandir = /boot/common/documentation/man
+ infodir = /boot/common/documentation/info
+ htmldir = /boot/common/documentation/doc/git-1.7.9.1
+ 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
@@ -33,9 +33,9 @@ diff -up git-1.7.9.1/Makefile.orig git-1.7.9.1/Makefile
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
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