mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
Update mercurial to 2.4 and git to 1.8.0
This commit is contained in:
Chris Roberts
@@ -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)"
|
||||
@@ -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)"
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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" \
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -1,20 +0,0 @@
|
||||
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.7.2.tar.gz"
|
||||
CHECKSUM_MD5="24e2d2b6c3f97102f7b79e05c165fd22"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
|
||||
BUILD {
|
||||
echo "Building Git documentation"
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
DOC_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)'/man'
|
||||
echo $DOC_DIR
|
||||
cp -r man* $DOC_DIR
|
||||
}
|
||||
|
||||
LICENSE="GNU GPL v2"
|
||||
COPYRIGHT="2005-2011 Git Authors (see git web site for list)"
|
||||
@@ -1,32 +0,0 @@
|
||||
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.9.1.tar.gz"
|
||||
CHECKSUM_MD5="c2d9b838bb5ba1385e65ed8ae0e4fe00"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
|
||||
BUILD {
|
||||
echo "Attempting to download additional formats"
|
||||
wget http://git-core.googlecode.com/files/git-htmldocs-1.7.9.1.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.9.1
|
||||
mkdir -p "${DESTDIR}/${DOC_DIR}"
|
||||
WORKDIR="$(pwd)"
|
||||
cd "${DESTDIR}/${DOC_DIR}"
|
||||
tar xvf "${WORKDIR}/git-htmldocs-1.7.9.1.tar.gz"
|
||||
}
|
||||
|
||||
LICENSE="GNU GPL v2"
|
||||
COPYRIGHT="2005-2012 Git Authors (see git web site for list)"
|
||||
@@ -1,14 +1,14 @@
|
||||
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.tar.gz"
|
||||
CHECKSUM_MD5="5066600fe67986acd36c008c876e9489"
|
||||
SRC_URI="http://git-core.googlecode.com/files/git-manpages-1.8.0.tar.gz"
|
||||
CHECKSUM_MD5="66f0a839d933c7d573fb40cb051b5e66"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
|
||||
BUILD {
|
||||
echo "Attempting to download additional formats"
|
||||
wget http://git-core.googlecode.com/files/git-htmldocs-1.7.10.tar.gz
|
||||
wget http://git-core.googlecode.com/files/git-htmldocs-1.8.0.tar.gz
|
||||
if [ $? != 0 ];then
|
||||
echo "Error downloading additional formats"
|
||||
exit 1
|
||||
@@ -21,11 +21,11 @@ INSTALL {
|
||||
cp -afv man* "${DESTDIR}/${MAN_DIR}"
|
||||
|
||||
echo "Extracting extra docs"
|
||||
DOC_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/doc/git-1.7.10
|
||||
DOC_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/doc/git-1.8.0
|
||||
mkdir -p "${DESTDIR}/${DOC_DIR}"
|
||||
WORKDIR="$(pwd)"
|
||||
cd "${DESTDIR}/${DOC_DIR}"
|
||||
tar xvf "${WORKDIR}/git-htmldocs-1.7.10.tar.gz"
|
||||
tar xvf "${WORKDIR}/git-htmldocs-1.8.0.tar.gz"
|
||||
}
|
||||
|
||||
LICENSE="GNU GPL v2"
|
||||
@@ -1,30 +0,0 @@
|
||||
DESCRIPTION="Mercurial is a free, distributed source control management tool"
|
||||
HOMEPAGE="http://mercurial.selenic.com/"
|
||||
SRC_URI="http://mercurial.selenic.com/release/mercurial-2.1.tar.gz"
|
||||
CHECKSUM_MD5="d2ca44f8d0129ab50639143af99d9363"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND="dev-lang/python >= 2.3"
|
||||
BUILD {
|
||||
cd mercurial-2.1
|
||||
python setup.py build --force
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd mercurial-2.1
|
||||
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.1/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."
|
||||
@@ -1,30 +0,0 @@
|
||||
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.1.tar.gz"
|
||||
CHECKSUM_MD5="0ff7c7f7c50e506d494ff84baa10a77d"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND="dev-lang/python >= 2.3"
|
||||
BUILD {
|
||||
cd mercurial-2.2.1
|
||||
python setup.py build --force
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd mercurial-2.2.1
|
||||
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.1/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."
|
||||
@@ -1,17 +1,17 @@
|
||||
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.tar.gz"
|
||||
CHECKSUM_MD5="e52ab7ab35105c768a4cd1658de0e1a5"
|
||||
SRC_URI="http://mercurial.selenic.com/release/mercurial-2.4.tar.gz"
|
||||
CHECKSUM_MD5="c1fc9bec6951dd3c913092c3c72da014"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND="dev-lang/python >= 2.3"
|
||||
DEPEND="dev-lang/python >= 2.4"
|
||||
BUILD {
|
||||
cd mercurial-2.2
|
||||
cd mercurial-2.4
|
||||
python setup.py build --force
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd mercurial-2.2
|
||||
cd mercurial-2.4
|
||||
if [ -n "${DESTDIR}" ];then
|
||||
python setup.py install --root="${DESTDIR}" --prefix="$(finddir B_COMMON_DIRECTORY)" --force
|
||||
else
|
||||
@@ -20,7 +20,7 @@ INSTALL {
|
||||
}
|
||||
|
||||
TEST {
|
||||
cd mercurial-2.2/tests
|
||||
cd mercurial-2.4/tests
|
||||
shopt -s extglob
|
||||
sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn)
|
||||
python run-tests.py
|
||||
@@ -1,12 +0,0 @@
|
||||
diff -up mercurial-2.1/mercurial/ui.py.orig mercurial-2.1/mercurial/ui.py
|
||||
--- mercurial-2.1/mercurial/ui.py.orig 2012-02-01 13:23:54.044040192 -0700
|
||||
+++ mercurial-2.1/mercurial/ui.py 2012-02-20 23:13:31.630980608 -0700
|
||||
@@ -687,7 +687,7 @@ class ui(object):
|
||||
return (os.environ.get("HGEDITOR") or
|
||||
self.config("ui", "editor") or
|
||||
os.environ.get("VISUAL") or
|
||||
- os.environ.get("EDITOR", "vi"))
|
||||
+ os.environ.get("EDITOR", "nano"))
|
||||
|
||||
def progress(self, topic, pos, item="", unit="", total=None):
|
||||
'''show a progress message
|
||||
@@ -1,12 +0,0 @@
|
||||
diff -up mercurial-2.2.1/mercurial/ui.py.orig mercurial-2.2.1/mercurial/ui.py
|
||||
--- mercurial-2.2.1/mercurial/ui.py.orig 2012-05-03 15:06:29.013369344 -0600
|
||||
+++ mercurial-2.2.1/mercurial/ui.py 2012-05-03 20:21:26.126091264 -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
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -up mercurial-2.2/mercurial/ui.py.orig mercurial-2.2/mercurial/ui.py
|
||||
--- mercurial-2.2/mercurial/ui.py.orig 2012-05-02 21:41:24.391643136 -0600
|
||||
+++ mercurial-2.2/mercurial/ui.py 2012-05-02 21:42:15.730595328 -0600
|
||||
@@ -693,7 +693,7 @@ class ui(object):
|
||||
diff -up mercurial-2.4/mercurial/ui.py.orig mercurial-2.4/mercurial/ui.py
|
||||
--- mercurial-2.4/mercurial/ui.py.orig 2012-08-02 00:49:31.022544384 -0600
|
||||
+++ mercurial-2.4/mercurial/ui.py 2012-08-02 01:06:19.942407680 -0600
|
||||
@@ -701,7 +701,7 @@ class ui(object):
|
||||
# avoid confusion.
|
||||
editor = 'E'
|
||||
else:
|
||||
Reference in New Issue
Block a user