4 files changed, 65 insertions, 71 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index f47656a7146c..a07ed0de38d9 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	mercurial
-PORTVERSION=	1.2.1
+PORTVERSION=	1.3
 CATEGORIES=	devel python
-MASTER_SITES=	http://www.selenic.com/mercurial/release/
+MASTER_SITES=	http://mercurial.selenic.com/release/
 
 MAINTAINER=	roberto@FreeBSD.org
 COMMENT=	A fast, lightweight source control management system
 
 USE_GETTEXT=	yes
-USE_PYTHON=	2.3+
+USE_PYTHON=	2.4+
 USE_PYDISTUTILS=yes
 PYDISTUTILS_PKGNAME=    ${PORTNAME}
 PYDISTUTILS_PKGVERSION= ${PORTVERSION}
@@ -79,6 +79,7 @@ post-install:
 	${MKDIR} ${DATADIR}/www
 	${INSTALL_MAN} ${WRKSRC}/*.cgi ${DATADIR}/www
 	${INSTALL_MAN} ${WRKSRC}/contrib/hgwebdir.fcgi ${DATADIR}/www
+	${INSTALL_MAN} ${WRKSRC}/contrib/hgwebdir.wsgi ${DATADIR}/www
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index aba35a4150eb..6a73d99b6c72 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,3 +1,3 @@
-MD5 (mercurial-1.2.1.tar.gz) = 24d6994cc58b353398e11c7a19cf1d19
-SHA256 (mercurial-1.2.1.tar.gz) = 03187464bccfbd82b78d5c55d708447181745085a62f491a206f5143376eb47e
-SIZE (mercurial-1.2.1.tar.gz) = 1269393
+SIZE (mercurial-1.3.tar.gz) = 1768227
+SHA256 (mercurial-1.3.tar.gz) = f25feec95586b60b939c60a1dfc0d20d69ebe0f1eca38dc3a8edbcba5b6dfd47
+MD5 (mercurial-1.3.tar.gz) = d25a867e0ef835faafdbe1e82e239945
diff --git a/devel/mercurial/files/patch-unknown-egg b/devel/mercurial/files/patch-unknown-egg
deleted file mode 100644
index c179eb0e017a..000000000000
--- a/devel/mercurial/files/patch-unknown-egg
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -r 4d79ed5b9ecd mercurial-1.2.1/setup.py
---- setup.py	Fri May 15 13:58:32 2009 +0400
-+++ setup.py	Fri May 15 14:02:00 2009 +0400
-@@ -97,10 +97,7 @@
- except ImportError:
-     pass
- 
--def getversion():
--    if not os.path.exists('.hg'):
--        return None # not in a repository
--
-+if os.path.exists('.hg'):
-     # execute hg out of this directory with a custom environment which
-     # includes the pure Python modules in mercurial/pure
-     pypath = os.environ.get('PYTHONPATH', '')
-@@ -108,6 +105,7 @@
-     os.environ['PYTHONPATH'] = os.pathsep.join(['mercurial', purepath, pypath])
-     os.environ['HGRCPATH'] = '' # do not read any config file
-     cmd = '%s hg id -it' % sys.executable
-+    version = None
- 
-     try:
-         l = os.popen(cmd).read().split()
-@@ -122,16 +120,18 @@
-         version = l[-1] # latest tag or revision number
-         if version.endswith('+'):
-             version += time.strftime('%Y%m%d')
--        return version
- 
--version = getversion()
--if version:
--    f = file("mercurial/__version__.py", "w")
--    f.write('# this file is autogenerated by setup.py\n')
--    f.write('version = "%s"\n' % version)
--    f.close()
--else:
--    version = "unknown"
-+    if version:
-+        f = file("mercurial/__version__.py", "w")
-+        f.write('# this file is autogenerated by setup.py\n')
-+        f.write('version = "%s"\n' % version)
-+        f.close()
-+
-+try:
-+    from mercurial import __version__
-+    version = __version__.version
-+except ImportError:
-+    version = 'unknown'
- 
- class install_package_data(install_data):
-     def finalize_options(self):
diff --git a/devel/mercurial/pkg-plist b/devel/mercurial/pkg-plist
index 422f389dc4cf..97a106c31208 100644
--- a/devel/mercurial/pkg-plist
+++ b/devel/mercurial/pkg-plist
@@ -5,9 +5,6 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/hgext/acl.py
 %%PYTHON_SITELIBDIR%%/hgext/acl.pyc
 %%PYTHON_SITELIBDIR%%/hgext/acl.pyo
-%%PYTHON_SITELIBDIR%%/hgext/alias.py
-%%PYTHON_SITELIBDIR%%/hgext/alias.pyc
-%%PYTHON_SITELIBDIR%%/hgext/alias.pyo
 %%PYTHON_SITELIBDIR%%/hgext/bookmarks.py
 %%PYTHON_SITELIBDIR%%/hgext/bookmarks.pyc
 %%PYTHON_SITELIBDIR%%/hgext/bookmarks.pyo
@@ -122,6 +119,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/hgext/record.py
 %%PYTHON_SITELIBDIR%%/hgext/record.pyc
 %%PYTHON_SITELIBDIR%%/hgext/record.pyo
+%%PYTHON_SITELIBDIR%%/hgext/share.py
+%%PYTHON_SITELIBDIR%%/hgext/share.pyc
+%%PYTHON_SITELIBDIR%%/hgext/share.pyo
 %%PYTHON_SITELIBDIR%%/hgext/transplant.py
 %%PYTHON_SITELIBDIR%%/hgext/transplant.pyc
 %%PYTHON_SITELIBDIR%%/hgext/transplant.pyo
@@ -169,6 +169,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/commands.py
 %%PYTHON_SITELIBDIR%%/mercurial/commands.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/commands.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/config.py
+%%PYTHON_SITELIBDIR%%/mercurial/config.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/config.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/context.py
 %%PYTHON_SITELIBDIR%%/mercurial/context.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/context.pyo
@@ -185,6 +188,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/dispatch.py
 %%PYTHON_SITELIBDIR%%/mercurial/dispatch.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/dispatch.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/encoding.py
+%%PYTHON_SITELIBDIR%%/mercurial/encoding.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/encoding.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/error.py
 %%PYTHON_SITELIBDIR%%/mercurial/error.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/error.pyo
@@ -252,9 +258,15 @@ bin/hg
 %%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/de.po
+%%PYTHON_SITELIBDIR%%/mercurial/i18n/el.po
+%%PYTHON_SITELIBDIR%%/mercurial/i18n/fr.po
+%%PYTHON_SITELIBDIR%%/mercurial/i18n/hggettext
 %%PYTHON_SITELIBDIR%%/mercurial/i18n/it.po
+%%PYTHON_SITELIBDIR%%/mercurial/i18n/ja.po
+%%PYTHON_SITELIBDIR%%/mercurial/i18n/pt_BR.po
+%%PYTHON_SITELIBDIR%%/mercurial/i18n/zh_CN.po
+%%PYTHON_SITELIBDIR%%/mercurial/i18n/zh_TW.po
 %%PYTHON_SITELIBDIR%%/mercurial/ignore.py
 %%PYTHON_SITELIBDIR%%/mercurial/ignore.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/ignore.pyo
@@ -262,9 +274,14 @@ bin/hg
 %%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/de/LC_MESSAGES/hg.mo
+%%PYTHON_SITELIBDIR%%/mercurial/locale/el/LC_MESSAGES/hg.mo
+%%PYTHON_SITELIBDIR%%/mercurial/locale/fr/LC_MESSAGES/hg.mo
 %%PYTHON_SITELIBDIR%%/mercurial/locale/it/LC_MESSAGES/hg.mo
+%%PYTHON_SITELIBDIR%%/mercurial/locale/ja/LC_MESSAGES/hg.mo
+%%PYTHON_SITELIBDIR%%/mercurial/locale/pt_BR/LC_MESSAGES/hg.mo
+%%PYTHON_SITELIBDIR%%/mercurial/locale/zh_CN/LC_MESSAGES/hg.mo
+%%PYTHON_SITELIBDIR%%/mercurial/locale/zh_TW/LC_MESSAGES/hg.mo
 %%PYTHON_SITELIBDIR%%/mercurial/localrepo.py
 %%PYTHON_SITELIBDIR%%/mercurial/localrepo.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/localrepo.pyo
@@ -274,6 +291,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/lsprof.py
 %%PYTHON_SITELIBDIR%%/mercurial/lsprof.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/lsprof.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/lsprofcalltree.py
+%%PYTHON_SITELIBDIR%%/mercurial/lsprofcalltree.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/lsprofcalltree.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/mail.py
 %%PYTHON_SITELIBDIR%%/mercurial/mail.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/mail.pyo
@@ -298,6 +318,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/patch.py
 %%PYTHON_SITELIBDIR%%/mercurial/patch.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/patch.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/posix.py
+%%PYTHON_SITELIBDIR%%/mercurial/posix.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/posix.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/repair.py
 %%PYTHON_SITELIBDIR%%/mercurial/repair.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/repair.pyo
@@ -328,6 +351,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/strutil.py
 %%PYTHON_SITELIBDIR%%/mercurial/strutil.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/strutil.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/subrepo.py
+%%PYTHON_SITELIBDIR%%/mercurial/subrepo.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/subrepo.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/templatefilters.py
 %%PYTHON_SITELIBDIR%%/mercurial/templatefilters.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/templatefilters.pyo
@@ -344,6 +370,7 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/templates/atom/tags.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/coal/header.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/coal/map
+%%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/branches.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/changelog.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/changelogentry.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/changeset.tmpl
@@ -366,6 +393,7 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/templates/map-cmdline.changelog
 %%PYTHON_SITELIBDIR%%/mercurial/templates/map-cmdline.compact
 %%PYTHON_SITELIBDIR%%/mercurial/templates/map-cmdline.default
+%%PYTHON_SITELIBDIR%%/mercurial/templates/monoblue/branches.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/monoblue/changelog.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/monoblue/changelogentry.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/monoblue/changeset.tmpl
@@ -385,6 +413,7 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/templates/monoblue/shortlog.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/monoblue/summary.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/monoblue/tags.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/paper/branches.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/paper/changeset.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/paper/error.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/paper/fileannotate.tmpl
@@ -420,6 +449,7 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/templates/rss/map
 %%PYTHON_SITELIBDIR%%/mercurial/templates/rss/tagentry.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/rss/tags.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/spartan/branches.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/spartan/changelog.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/spartan/changelogentry.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/spartan/changeset.tmpl
@@ -465,12 +495,15 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/util.py
 %%PYTHON_SITELIBDIR%%/mercurial/util.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/util.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/util_win32.py
-%%PYTHON_SITELIBDIR%%/mercurial/util_win32.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/util_win32.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/verify.py
 %%PYTHON_SITELIBDIR%%/mercurial/verify.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/verify.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/win32.py
+%%PYTHON_SITELIBDIR%%/mercurial/win32.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/win32.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/windows.py
+%%PYTHON_SITELIBDIR%%/mercurial/windows.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/windows.pyo
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README
@@ -511,6 +544,7 @@ bin/hg
 %%PORTDATA%%%%DATADIR%%/www/hgweb.cgi
 %%PORTDATA%%%%DATADIR%%/www/hgwebdir.cgi
 %%PORTDATA%%%%DATADIR%%/www/hgwebdir.fcgi
+%%PORTDATA%%%%DATADIR%%/www/hgwebdir.wsgi
 %%PORTDATA%%@dirrm %%DATADIR%%/www
 %%PORTDATA%%@dirrm %%DATADIR%%/contrib/vim
 %%PORTDATA%%@dirrm %%DATADIR%%/contrib/hgsh
@@ -528,14 +562,24 @@ bin/hg
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/coal
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/atom
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/da/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/da
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/de/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/de
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/el/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/el
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/fr/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/fr
 @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/pt_BR/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/pt_BR
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_CN/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_CN
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_TW/LC_MESSAGES
+@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_TW
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/i18n
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/hgweb