3 files changed, 31 insertions, 14 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 3eba600e3293..b7e26b72a9d0 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mercurial
-PORTVERSION=	1.1.2
+PORTVERSION=	1.2.1
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.selenic.com/mercurial/release/
 
@@ -15,6 +15,7 @@ COMMENT=	A fast, lightweight source control management system
 
 USE_PYTHON=	2.3+
 USE_PYDISTUTILS=yes
+PYDISTUTILS_NOEGGINFO=  yes
 
 CONTRIB_FILES=	bash_completion \
 		convert-repo \
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index 20b14605780a..aba35a4150eb 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,3 +1,3 @@
-MD5 (mercurial-1.1.2.tar.gz) = 4fd3b9a2e5dcd025840c3849b136bec8
-SHA256 (mercurial-1.1.2.tar.gz) = dd18a3c3821d1638f202b4212a02b9349acac9333785e96e9a8119f6c21d5e44
-SIZE (mercurial-1.1.2.tar.gz) = 952241
+MD5 (mercurial-1.2.1.tar.gz) = 24d6994cc58b353398e11c7a19cf1d19
+SHA256 (mercurial-1.2.1.tar.gz) = 03187464bccfbd82b78d5c55d708447181745085a62f491a206f5143376eb47e
+SIZE (mercurial-1.2.1.tar.gz) = 1269393
diff --git a/devel/mercurial/pkg-plist b/devel/mercurial/pkg-plist
index 8712d3685098..422f389dc4cf 100644
--- a/devel/mercurial/pkg-plist
+++ b/devel/mercurial/pkg-plist
@@ -59,6 +59,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/hgext/convert/monotone.py
 %%PYTHON_SITELIBDIR%%/hgext/convert/monotone.pyc
 %%PYTHON_SITELIBDIR%%/hgext/convert/monotone.pyo
+%%PYTHON_SITELIBDIR%%/hgext/convert/p4.py
+%%PYTHON_SITELIBDIR%%/hgext/convert/p4.pyc
+%%PYTHON_SITELIBDIR%%/hgext/convert/p4.pyo
 %%PYTHON_SITELIBDIR%%/hgext/convert/subversion.py
 %%PYTHON_SITELIBDIR%%/hgext/convert/subversion.pyc
 %%PYTHON_SITELIBDIR%%/hgext/convert/subversion.pyo
@@ -89,9 +92,6 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/hgext/highlight/highlight.py
 %%PYTHON_SITELIBDIR%%/hgext/highlight/highlight.pyc
 %%PYTHON_SITELIBDIR%%/hgext/highlight/highlight.pyo
-%%PYTHON_SITELIBDIR%%/hgext/imerge.py
-%%PYTHON_SITELIBDIR%%/hgext/imerge.pyc
-%%PYTHON_SITELIBDIR%%/hgext/imerge.pyo
 %%PYTHON_SITELIBDIR%%/hgext/interhg.py
 %%PYTHON_SITELIBDIR%%/hgext/interhg.pyc
 %%PYTHON_SITELIBDIR%%/hgext/interhg.pyo
@@ -185,6 +185,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/dispatch.py
 %%PYTHON_SITELIBDIR%%/mercurial/dispatch.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/dispatch.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/error.py
+%%PYTHON_SITELIBDIR%%/mercurial/error.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/error.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/extensions.py
 %%PYTHON_SITELIBDIR%%/mercurial/extensions.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/extensions.pyo
@@ -248,12 +251,20 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/i18n.py
 %%PYTHON_SITELIBDIR%%/mercurial/i18n.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/i18n.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/i18n/da.po
+%%PYTHON_SITELIBDIR%%/mercurial/i18n/ja.po
+%%PYTHON_SITELIBDIR%%/mercurial/i18n/zh.po
+%%PYTHON_SITELIBDIR%%/mercurial/i18n/it.po
 %%PYTHON_SITELIBDIR%%/mercurial/ignore.py
 %%PYTHON_SITELIBDIR%%/mercurial/ignore.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/ignore.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/keepalive.py
 %%PYTHON_SITELIBDIR%%/mercurial/keepalive.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/keepalive.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/locale/da/LC_MESSAGES/hg.mo
+%%PYTHON_SITELIBDIR%%/mercurial/locale/ja/LC_MESSAGES/hg.mo
+%%PYTHON_SITELIBDIR%%/mercurial/locale/zh/LC_MESSAGES/hg.mo
+%%PYTHON_SITELIBDIR%%/mercurial/locale/it/LC_MESSAGES/hg.mo
 %%PYTHON_SITELIBDIR%%/mercurial/localrepo.py
 %%PYTHON_SITELIBDIR%%/mercurial/localrepo.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/localrepo.pyo
@@ -282,9 +293,6 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/node.py
 %%PYTHON_SITELIBDIR%%/mercurial/node.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/node.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/osutil.py
-%%PYTHON_SITELIBDIR%%/mercurial/osutil.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/osutil.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/osutil.so
 %%PYTHON_SITELIBDIR%%/mercurial/parsers.so
 %%PYTHON_SITELIBDIR%%/mercurial/patch.py
@@ -328,6 +336,7 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/templater.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/templates/atom/changelog.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/atom/changelogentry.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/atom/error.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/atom/filelog.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/atom/header.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/atom/map
@@ -404,6 +413,7 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/templates/raw/notfound.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/rss/changelog.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/rss/changelogentry.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/rss/error.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/rss/filelog.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/rss/filelogentry.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/rss/header.tmpl
@@ -461,9 +471,6 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/verify.py
 %%PYTHON_SITELIBDIR%%/mercurial/verify.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/verify.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/version.py
-%%PYTHON_SITELIBDIR%%/mercurial/version.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/version.pyo
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README
@@ -521,10 +528,19 @@ bin/hg
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/coal
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/atom
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/it/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/it
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/ja/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/ja
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/da/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/da
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/i18n
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/hgweb
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial
 @dirrm %%PYTHON_SITELIBDIR%%/hgext/zeroconf
-@dirrm %%PYTHON_SITELIBDIR%%/hgext/inotify
 @dirrm %%PYTHON_SITELIBDIR%%/hgext/highlight
 @dirrm %%PYTHON_SITELIBDIR%%/hgext/convert
 @dirrm %%PYTHON_SITELIBDIR%%/hgext