From ee1d6a11bba06c851094489f12c75ee7f52739e2 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Tue, 3 Dec 2013 02:29:08 -0700 Subject: [PATCH] Update mercurial to 2.8.1 Changed the requires because mercurial only needs the msgfmt tool at build time. --HG-- rename : dev-vcs/mercurial/mercurial-2.8.recipe => dev-vcs/mercurial/mercurial-2.8.1.recipe rename : dev-vcs/mercurial/patches/mercurial-2.8.patch => dev-vcs/mercurial/patches/mercurial-2.8.1.patch --- ...curial-2.8.recipe => mercurial-2.8.1.recipe} | 17 +++++++++-------- ...ercurial-2.8.patch => mercurial-2.8.1.patch} | 6 +++--- 2 files changed, 12 insertions(+), 11 deletions(-) rename dev-vcs/mercurial/{mercurial-2.8.recipe => mercurial-2.8.1.recipe} (81%) rename dev-vcs/mercurial/patches/{mercurial-2.8.patch => mercurial-2.8.1.patch} (57%) diff --git a/dev-vcs/mercurial/mercurial-2.8.recipe b/dev-vcs/mercurial/mercurial-2.8.1.recipe similarity index 81% rename from dev-vcs/mercurial/mercurial-2.8.recipe rename to dev-vcs/mercurial/mercurial-2.8.1.recipe index e4fc40317..46ea1cb8c 100644 --- a/dev-vcs/mercurial/mercurial-2.8.recipe +++ b/dev-vcs/mercurial/mercurial-2.8.1.recipe @@ -3,36 +3,37 @@ 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.8.tar.gz" -CHECKSUM_MD5="76b565f48000e9f331356ab107a5bcbb" +SRC_URI="http://mercurial.selenic.com/release/mercurial-2.8.1.tar.gz" +CHECKSUM_MD5="bede5869f9b5d09ab3269bac472495e7" REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" -PATCHES="mercurial-2.8.patch" +PATCHES="mercurial-2.8.1.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 + " + +BUILD_PREREQUIRES=" cmd:python cmd:gcc cmd:gettext cmd:ld cmd:make + cmd:msgfmt " -SOURCE_DIR="$portVersionedName" - BUILD() { $portPackageLinksDir/cmd~python/bin/python setup.py build --force diff --git a/dev-vcs/mercurial/patches/mercurial-2.8.patch b/dev-vcs/mercurial/patches/mercurial-2.8.1.patch similarity index 57% rename from dev-vcs/mercurial/patches/mercurial-2.8.patch rename to dev-vcs/mercurial/patches/mercurial-2.8.1.patch index 734c4b759..edfe44133 100644 --- a/dev-vcs/mercurial/patches/mercurial-2.8.patch +++ b/dev-vcs/mercurial/patches/mercurial-2.8.1.patch @@ -1,6 +1,6 @@ -diff -up mercurial-2.8/mercurial/ui.py.orig mercurial-2.8/mercurial/ui.py ---- mercurial-2.8/mercurial/ui.py.orig 2012-06-01 22:48:21.025690112 -0600 -+++ mercurial-2.8/mercurial/ui.py 2012-06-04 17:15:16.317980672 -0600 +diff -up mercurial-2.8.1/mercurial/ui.py.orig mercurial-2.8.1/mercurial/ui.py +--- mercurial-2.8.1/mercurial/ui.py.orig 2012-06-01 22:48:21.025690112 -0600 ++++ mercurial-2.8.1/mercurial/ui.py 2012-06-04 17:15:16.317980672 -0600 @@ -693,7 +693,7 @@ class ui(object): # avoid confusion. editor = 'E'