Update to version 2.1.

Release notes for 2.1 and before:
http://mercurial.selenic.com/wiki/WhatsNew#Mercurial_2.1_.282012-02-01.29

PR:             ports/164708
Submitted by:   Olivier Duchateau <duchateau.olivier AT gmail.com>

4 files changed, 18 insertions, 25 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index d0ba4f294e4..74ea0a893f5 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mercurial
-PORTVERSION=	2.0.2
+PORTVERSION=	2.1
 CATEGORIES=	devel python
 MASTER_SITES=	http://mercurial.selenic.com/release/
 
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index 3a124a1abec..b74dde3b217 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mercurial-2.0.2.tar.gz) = ca8b8fb93f2e3e8c3cdf2f81d87e92592f5f20c5bfcaaeb6a75550d4a69572c9
-SIZE (mercurial-2.0.2.tar.gz) = 3134016
+SHA256 (mercurial-2.1.tar.gz) = cb37f90807e99dd4508cac70c098aa433b26adb7a3ab064c0b1626dc9a094383
+SIZE (mercurial-2.1.tar.gz) = 3308300
diff --git a/devel/mercurial/files/patch-setup.py b/devel/mercurial/files/patch-setup.py
new file mode 100644
index 00000000000..2b0b914c758
--- /dev/null
+++ b/devel/mercurial/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	2012-02-01 21:23:54.000000000 +0100
++++ setup.py	2012-02-02 12:44:12.000000000 +0100
+@@ -379,7 +379,7 @@
+             'install_scripts': hginstallscripts}
+ 
+ packages = ['mercurial', 'mercurial.hgweb',
+-            'mercurial.httpclient', 'mercurial.httpclient.tests',
++            'mercurial.httpclient',
+             'hgext', 'hgext.convert', 'hgext.highlight', 'hgext.zeroconf',
+             'hgext.largefiles']
+ 
diff --git a/devel/mercurial/pkg-plist b/devel/mercurial/pkg-plist
index 74ca10dc226..73c69ac489f 100644
--- a/devel/mercurial/pkg-plist
+++ b/devel/mercurial/pkg-plist
@@ -285,6 +285,7 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/help/merge-tools.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/multirevs.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/patterns.txt
+%%PYTHON_SITELIBDIR%%/mercurial/help/phases.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/revisions.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/revsets.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/subrepos.txt
@@ -332,27 +333,6 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/httpclient/socketutil.py
 %%PYTHON_SITELIBDIR%%/mercurial/httpclient/socketutil.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/httpclient/socketutil.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/simple_http_test.py
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/simple_http_test.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/simple_http_test.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/test_bogus_responses.py
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/test_bogus_responses.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/test_bogus_responses.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/test_chunked_transfer.py
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/test_chunked_transfer.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/test_chunked_transfer.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/test_proxy_support.py
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/test_proxy_support.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/test_proxy_support.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/test_ssl.py
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/test_ssl.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/test_ssl.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/util.py
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/util.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests/util.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/httpconnection.py
 %%PYTHON_SITELIBDIR%%/mercurial/httpconnection.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/httpconnection.pyo
@@ -368,6 +348,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/keepalive.py
 %%PYTHON_SITELIBDIR%%/mercurial/keepalive.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/keepalive.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/phases.py
+%%PYTHON_SITELIBDIR%%/mercurial/phases.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/phases.pyo
 %%NLS%%%%PYTHON_SITELIBDIR%%/mercurial/locale/da/LC_MESSAGES/hg.mo
 %%NLS%%%%PYTHON_SITELIBDIR%%/mercurial/locale/de/LC_MESSAGES/hg.mo
 %%NLS%%%%PYTHON_SITELIBDIR%%/mercurial/locale/el/LC_MESSAGES/hg.mo
@@ -735,7 +718,6 @@ bin/hg
 %%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_TW/LC_MESSAGES
 %%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_TW
 %%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/httpclient/tests
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/httpclient
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/help
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/hgweb