mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
Update mercurial to 2.2.3 and git to 1.7.11.3
This commit is contained in:
26
dev-vcs/git/git-1.7.11.3.bep
Normal file
26
dev-vcs/git/git-1.7.11.3.bep
Normal file
@@ -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.7.11.3.tar.gz"
|
||||
CHECKSUM_MD5="23caacd9f3f421b6c05b40796df3505d"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND="net-misc/curl >= 7.20.0
|
||||
dev-lang/perl >= 5.10.1
|
||||
dev-vcs/gitdoc == 1.7.11.3"
|
||||
BUILD {
|
||||
cd git-1.7.11.3
|
||||
make strip
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd git-1.7.11.3
|
||||
make install
|
||||
}
|
||||
|
||||
TEST {
|
||||
cd git-1.7.11.3
|
||||
make check
|
||||
}
|
||||
|
||||
LICENSE="GNU GPL v2"
|
||||
COPYRIGHT="2005-2012 Git Authors (see git web site for list)"
|
||||
47
dev-vcs/git/patches/git-1.7.11.3.patch
Normal file
47
dev-vcs/git/patches/git-1.7.11.3.patch
Normal file
@@ -0,0 +1,47 @@
|
||||
diff -up git-1.7.11.3/Makefile.orig git-1.7.11.3/Makefile
|
||||
--- git-1.7.11.3/Makefile.orig 2012-07-22 14:44:07.027525120 -0600
|
||||
+++ git-1.7.11.3/Makefile 2012-07-28 22:12:40.271056896 -0600
|
||||
@@ -1297,6 +1297,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.11.3
|
||||
+ 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.11.3/git-web--browse.sh.orig git-1.7.11.3/git-web--browse.sh
|
||||
--- git-1.7.11.3/git-web--browse.sh.orig 2012-07-22 14:44:07.017039360 -0600
|
||||
+++ git-1.7.11.3/git-web--browse.sh 2012-07-28 22:12:40.283115520 -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" \
|
||||
32
dev-vcs/gitdoc/gitdoc-1.7.11.3.bep
Normal file
32
dev-vcs/gitdoc/gitdoc-1.7.11.3.bep
Normal file
@@ -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.7.10.2.tar.gz"
|
||||
CHECKSUM_MD5="79bae5456db8366803d28db867892d74"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
|
||||
BUILD {
|
||||
echo "Attempting to download additional formats"
|
||||
wget http://git-core.googlecode.com/files/git-htmldocs-1.7.11.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.7.11.3
|
||||
mkdir -p "${DESTDIR}/${DOC_DIR}"
|
||||
WORKDIR="$(pwd)"
|
||||
cd "${DESTDIR}/${DOC_DIR}"
|
||||
tar xvf "${WORKDIR}/git-htmldocs-1.7.11.3.tar.gz"
|
||||
}
|
||||
|
||||
LICENSE="GNU GPL v2"
|
||||
COPYRIGHT="2005-2012 Git Authors (see git web site for list)"
|
||||
30
dev-vcs/mercurial/mercurial-2.2.3.bep
Normal file
30
dev-vcs/mercurial/mercurial-2.2.3.bep
Normal file
@@ -0,0 +1,30 @@
|
||||
DESCRIPTION="Mercurial is a free, distributed source control management tool"
|
||||
HOMEPAGE="http://mercurial.selenic.com/"
|
||||
SRC_URI="http://mercurial.selenic.com/release/mercurial-2.2.3.tar.gz"
|
||||
CHECKSUM_MD5="f4c70af3892d964b83b2718bde44c2f8"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND="dev-lang/python >= 2.3"
|
||||
BUILD {
|
||||
cd mercurial-2.2.3
|
||||
python setup.py build --force
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd mercurial-2.2.3
|
||||
if [ -n "${DESTDIR}" ];then
|
||||
python setup.py install --root="${DESTDIR}" --prefix="$(finddir B_COMMON_DIRECTORY)" --force
|
||||
else
|
||||
python setup.py install --prefix="$(finddir B_COMMON_DIRECTORY)" --force
|
||||
fi
|
||||
}
|
||||
|
||||
TEST {
|
||||
cd mercurial-2.2.3/tests
|
||||
shopt -s extglob
|
||||
sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn)
|
||||
python run-tests.py
|
||||
}
|
||||
|
||||
LICENSE="GNU GPL v2"
|
||||
COPYRIGHT="2005-2012 Matt Mackall et al."
|
||||
12
dev-vcs/mercurial/patches/mercurial-2.2.3.patch
Normal file
12
dev-vcs/mercurial/patches/mercurial-2.2.3.patch
Normal file
@@ -0,0 +1,12 @@
|
||||
diff -up mercurial-2.2.3/mercurial/ui.py.orig mercurial-2.2.3/mercurial/ui.py
|
||||
--- mercurial-2.2.3/mercurial/ui.py.orig 2012-06-01 22:48:21.025690112 -0600
|
||||
+++ mercurial-2.2.3/mercurial/ui.py 2012-06-04 17:15:16.317980672 -0600
|
||||
@@ -693,7 +693,7 @@ class ui(object):
|
||||
# avoid confusion.
|
||||
editor = 'E'
|
||||
else:
|
||||
- editor = 'vi'
|
||||
+ editor = 'nano'
|
||||
return (os.environ.get("HGEDITOR") or
|
||||
self.config("ui", "editor") or
|
||||
os.environ.get("VISUAL") or
|
||||
Reference in New Issue
Block a user