From b9a9d2ceb828298cba194b9470e9cae81f7d5920 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Wed, 16 Oct 2013 16:33:54 -0600
Subject: [PATCH] Add mercurial-2.7.2 recipe

---
 dev-vcs/mercurial/mercurial-2.2.3.recipe      | 33 ------------
 dev-vcs/mercurial/mercurial-2.3.recipe        | 33 ------------
 dev-vcs/mercurial/mercurial-2.4.recipe        | 33 ------------
 dev-vcs/mercurial/mercurial-2.7.2.recipe      | 53 +++++++++++++++++++
 dev-vcs/mercurial/patches/mercurial-2.3.patch | 12 -----
 dev-vcs/mercurial/patches/mercurial-2.4.patch | 12 -----
 ...rial-2.2.3.patch => mercurial-2.7.2.patch} |  6 +--
 7 files changed, 56 insertions(+), 126 deletions(-)
 delete mode 100644 dev-vcs/mercurial/mercurial-2.2.3.recipe
 delete mode 100644 dev-vcs/mercurial/mercurial-2.3.recipe
 delete mode 100644 dev-vcs/mercurial/mercurial-2.4.recipe
 create mode 100644 dev-vcs/mercurial/mercurial-2.7.2.recipe
 delete mode 100644 dev-vcs/mercurial/patches/mercurial-2.3.patch
 delete mode 100644 dev-vcs/mercurial/patches/mercurial-2.4.patch
 rename dev-vcs/mercurial/patches/{mercurial-2.2.3.patch => mercurial-2.7.2.patch} (64%)

diff --git a/dev-vcs/mercurial/mercurial-2.2.3.recipe b/dev-vcs/mercurial/mercurial-2.2.3.recipe
deleted file mode 100644
index c7d8c2dab..000000000
--- a/dev-vcs/mercurial/mercurial-2.2.3.recipe
+++ /dev/null
@@ -1,33 +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.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
-}
-
-shopt -s extglob
-TEST()
-{
-	cd mercurial-2.2.3/tests
-	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."
diff --git a/dev-vcs/mercurial/mercurial-2.3.recipe b/dev-vcs/mercurial/mercurial-2.3.recipe
deleted file mode 100644
index d6e062095..000000000
--- a/dev-vcs/mercurial/mercurial-2.3.recipe
+++ /dev/null
@@ -1,33 +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.3.tar.gz"
-CHECKSUM_MD5="8d9f776e432239571dfab2b5f88b3675"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-lang/python >= 2.3"
-BUILD()
-{
-	cd mercurial-2.3
-	python setup.py build --force
-}
-
-INSTALL()
-{
-	cd mercurial-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
-}
-
-shopt -s extglob
-TEST()
-{
-	cd mercurial-2.3/tests
-	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."
diff --git a/dev-vcs/mercurial/mercurial-2.4.recipe b/dev-vcs/mercurial/mercurial-2.4.recipe
deleted file mode 100644
index b3a628780..000000000
--- a/dev-vcs/mercurial/mercurial-2.4.recipe
+++ /dev/null
@@ -1,33 +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.4.tar.gz"
-CHECKSUM_MD5="c1fc9bec6951dd3c913092c3c72da014"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-lang/python >= 2.4"
-BUILD()
-{
-	cd mercurial-2.4
-	python setup.py build --force
-}
-
-INSTALL()
-{
-	cd mercurial-2.4
-	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
-}
-
-shopt -s extglob
-TEST()
-{
-	cd mercurial-2.4/tests
-	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."
diff --git a/dev-vcs/mercurial/mercurial-2.7.2.recipe b/dev-vcs/mercurial/mercurial-2.7.2.recipe
new file mode 100644
index 000000000..882943274
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-2.7.2.recipe
@@ -0,0 +1,53 @@
+SUMMARY="Free, distributed source control management tool"
+DESCRIPTION="Mercurial is a free, distributed source control management tool."
+HOMEPAGE="http://mercurial.selenic.com/"
+COPYRIGHT="2005-2012 Matt Mackall et al."
+LICENSE="GNU GPL v2"
+SRC_URI="http://mercurial.selenic.com/release/mercurial-2.7.2.tar.gz"
+CHECKSUM_MD5="ec00ddc6aadfea1e11b23650cb741d53"
+REVISION="1"
+ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+
+PATCHES="mercurial-2.7.2.patch"
+
+PROVIDES="
+	mercurial = $portVersion compat >= 2
+	cmd:hg = $portVersion compat >= 2
+	"
+REQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:python
+	cmd:nano
+	lib:libintl
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:python
+	cmd:gcc
+	cmd:gettext
+	cmd:ld
+	cmd:make
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	$portPackageLinksDir/cmd~python/bin/python setup.py build --force
+}
+
+INSTALL()
+{
+	$portPackageLinksDir/cmd~python/bin/python setup.py install \
+		--prefix="$prefix" \
+		--install-headers="$includedir" \
+		--force
+}
+
+TEST()
+{
+	cd tests
+	python run-tests.py
+}
diff --git a/dev-vcs/mercurial/patches/mercurial-2.3.patch b/dev-vcs/mercurial/patches/mercurial-2.3.patch
deleted file mode 100644
index 2bca746e2..000000000
--- a/dev-vcs/mercurial/patches/mercurial-2.3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mercurial-2.3/mercurial/ui.py.orig mercurial-2.3/mercurial/ui.py
---- mercurial-2.3/mercurial/ui.py.orig	2012-08-02 00:49:31.022544384 -0600
-+++ mercurial-2.3/mercurial/ui.py	2012-08-02 01:06:19.942407680 -0600
-@@ -701,7 +701,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
diff --git a/dev-vcs/mercurial/patches/mercurial-2.4.patch b/dev-vcs/mercurial/patches/mercurial-2.4.patch
deleted file mode 100644
index 1ea197e37..000000000
--- a/dev-vcs/mercurial/patches/mercurial-2.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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:
--            editor = 'vi'
-+            editor = 'nano'
-         return (os.environ.get("HGEDITOR") or
-                 self.config("ui", "editor") or
-                 os.environ.get("VISUAL") or
diff --git a/dev-vcs/mercurial/patches/mercurial-2.2.3.patch b/dev-vcs/mercurial/patches/mercurial-2.7.2.patch
similarity index 64%
rename from dev-vcs/mercurial/patches/mercurial-2.2.3.patch
rename to dev-vcs/mercurial/patches/mercurial-2.7.2.patch
index 818833f7d..e5ba9e92f 100644
--- a/dev-vcs/mercurial/patches/mercurial-2.2.3.patch
+++ b/dev-vcs/mercurial/patches/mercurial-2.7.2.patch
@@ -1,6 +1,6 @@
-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
+diff -up mercurial-2.7.1/mercurial/ui.py.orig mercurial-2.7.1/mercurial/ui.py
+--- mercurial-2.7.2/mercurial/ui.py.orig	2012-06-01 22:48:21.025690112 -0600
++++ mercurial-2.7.2/mercurial/ui.py	2012-06-04 17:15:16.317980672 -0600
 @@ -693,7 +693,7 @@ class ui(object):
              # avoid confusion.
              editor = 'E'