Update to Mercurial 2.0. Note that the major version number change does

not indicate a major release, they are just monotically increasing.

Release notes:
http://mercurial.selenic.com/wiki/WhatsNew#Mercurial_2.0_.282011-11-01.29

- Clean CONTRIB_FILES macros:
  delete setup3k.py, for Python 3.x (installation script, experimental)
  memory.py, because depends on Linux
- In DOCS macro, delete *.txt and *.html files, because it's redundant with
  man pages (same files)

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

3 files changed, 44 insertions, 21 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index db3ddbb8194c..6f2e49a634a9 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mercurial
-PORTVERSION=	1.9.3
+PORTVERSION=	2.0
 CATEGORIES=	devel python
 MASTER_SITES=	http://mercurial.selenic.com/release/
 
@@ -27,6 +27,7 @@ PYDISTUTILS_EGGINFO=	${PORTNAME}-${PORTVERSION}-${PYTHON_VERSION:S/thon//}.egg-i
 
 CONTRIB_FILES=	bash_completion \
 		convert-repo \
+		debugcmdserver.py \
 		debugshell.py \
 		dumprevlog \
 		hg-ssh \
@@ -37,8 +38,6 @@ CONTRIB_FILES=	bash_completion \
 		hgk \
 		hgsh/Makefile \
 		hgsh/hgsh.c \
-		logo-droplets.svg \
-		memory.py \
 		mercurial.el \
 		mergetools.hgrc \
 		mq.el \
@@ -46,7 +45,6 @@ CONTRIB_FILES=	bash_completion \
 		pylintrc \
 		python-hook-examples.py \
 		sample.hgrc \
-		setup3k.py \
 		shrink-revlog.py \
 		simplemerge \
 		tcsh_completion \
@@ -54,8 +52,6 @@ CONTRIB_FILES=	bash_completion \
 		tmplrewrite.py \
 		undumprevlog \
 		zsh_completion \
-		hgsh/Makefile \
-		hgsh/hgsh.c \
 		vim/HGAnnotate.vim \
 		vim/hg-menu.vim \
 		vim/hgcommand.vim \
@@ -63,7 +59,7 @@ CONTRIB_FILES=	bash_completion \
 		vim/patchreview.txt \
 		vim/patchreview.vim
 
-DOCS=	CONTRIBUTORS COPYING README doc/*.txt doc/*.html
+DOCS=	CONTRIBUTORS COPYING README
 
 MAN1=	hg.1
 MAN5=	hgignore.5 hgrc.5
@@ -81,7 +77,7 @@ post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	for f in ${DOCS}; do \
-		${INSTALL_MAN} ${WRKSRC}/$${f} ${DOCSDIR}; \
+		${INSTALL_DATA} ${WRKSRC}/$${f} ${DOCSDIR}; \
 	done
 .endif
 .if !defined(NOPORTDATA)
@@ -97,7 +93,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/*.cgi ${DATADIR}/www
 	${INSTALL_DATA} ${WRKSRC}/contrib/hgweb.fcgi ${DATADIR}/www
 	${INSTALL_DATA} ${WRKSRC}/contrib/hgweb.wsgi ${DATADIR}/www
-.endif
+
 	@${CAT} ${PKGMESSAGE}
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index cbc8f1d40208..cdd125bbaed2 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mercurial-1.9.3.tar.gz) = 53d8390379b81371f60729decd15f0961777b52ed7514d29c66c1873b918d685
-SIZE (mercurial-1.9.3.tar.gz) = 2977205
+SHA256 (mercurial-2.0.tar.gz) = affab78a4d5074c71f97c07fe211de958263444eb8d86b3ad6fb6d648eb6c594
+SIZE (mercurial-2.0.tar.gz) = 3090977
diff --git a/devel/mercurial/pkg-plist b/devel/mercurial/pkg-plist
index 69307e1686a8..74ca10dc2263 100644
--- a/devel/mercurial/pkg-plist
+++ b/devel/mercurial/pkg-plist
@@ -96,6 +96,39 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/hgext/keyword.py
 %%PYTHON_SITELIBDIR%%/hgext/keyword.pyc
 %%PYTHON_SITELIBDIR%%/hgext/keyword.pyo
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/__init__.py
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/__init__.pyc
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/__init__.pyo
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/basestore.py
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/basestore.pyc
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/basestore.pyo
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/lfcommands.py
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/lfcommands.pyc
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/lfcommands.pyo
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/lfutil.py
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/lfutil.pyc
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/lfutil.pyo
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/localstore.py
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/localstore.pyc
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/localstore.pyo
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/overrides.py
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/overrides.pyc
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/overrides.pyo
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/proto.py
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/proto.pyc
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/proto.pyo
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/remotestore.py
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/remotestore.pyc
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/remotestore.pyo
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/reposetup.py
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/reposetup.pyc
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/reposetup.pyo
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/uisetup.py
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/uisetup.pyc
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/uisetup.pyo
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/wirestore.py
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/wirestore.pyc
+%%PYTHON_SITELIBDIR%%/hgext/largefiles/wirestore.pyo
 %%PYTHON_SITELIBDIR%%/hgext/mq.py
 %%PYTHON_SITELIBDIR%%/hgext/mq.pyc
 %%PYTHON_SITELIBDIR%%/hgext/mq.pyo
@@ -490,6 +523,7 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/shortlog.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/summary.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/tags.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/map-cmdline.bisect
 %%PYTHON_SITELIBDIR%%/mercurial/templates/map-cmdline.changelog
 %%PYTHON_SITELIBDIR%%/mercurial/templates/map-cmdline.compact
 %%PYTHON_SITELIBDIR%%/mercurial/templates/map-cmdline.default
@@ -623,15 +657,9 @@ bin/hg
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/common.txt
-%%PORTDOCS%%%%DOCSDIR%%/hg.1.html
-%%PORTDOCS%%%%DOCSDIR%%/hg.1.txt
-%%PORTDOCS%%%%DOCSDIR%%/hgignore.5.html
-%%PORTDOCS%%%%DOCSDIR%%/hgignore.5.txt
-%%PORTDOCS%%%%DOCSDIR%%/hgrc.5.html
-%%PORTDOCS%%%%DOCSDIR%%/hgrc.5.txt
 %%PORTDATA%%%%DATADIR%%/contrib/bash_completion
 %%PORTDATA%%%%DATADIR%%/contrib/convert-repo
+%%PORTDATA%%%%DATADIR%%/contrib/debugcmdserver.py
 %%PORTDATA%%%%DATADIR%%/contrib/debugshell.py
 %%PORTDATA%%%%DATADIR%%/contrib/dumprevlog
 %%PORTDATA%%%%DATADIR%%/contrib/hg-ssh
@@ -642,8 +670,6 @@ bin/hg
 %%PORTDATA%%%%DATADIR%%/contrib/hgk
 %%PORTDATA%%%%DATADIR%%/contrib/hgsh/Makefile
 %%PORTDATA%%%%DATADIR%%/contrib/hgsh/hgsh.c
-%%PORTDATA%%%%DATADIR%%/contrib/logo-droplets.svg
-%%PORTDATA%%%%DATADIR%%/contrib/memory.py
 %%PORTDATA%%%%DATADIR%%/contrib/mercurial.el
 %%PORTDATA%%%%DATADIR%%/contrib/mergetools.hgrc
 %%PORTDATA%%%%DATADIR%%/contrib/mq.el
@@ -651,7 +677,6 @@ bin/hg
 %%PORTDATA%%%%DATADIR%%/contrib/pylintrc
 %%PORTDATA%%%%DATADIR%%/contrib/python-hook-examples.py
 %%PORTDATA%%%%DATADIR%%/contrib/sample.hgrc
-%%PORTDATA%%%%DATADIR%%/contrib/setup3k.py
 %%PORTDATA%%%%DATADIR%%/contrib/shrink-revlog.py
 %%PORTDATA%%%%DATADIR%%/contrib/simplemerge
 %%PORTDATA%%%%DATADIR%%/contrib/tcsh_completion
@@ -716,6 +741,7 @@ bin/hg
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/hgweb
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial
 @dirrm %%PYTHON_SITELIBDIR%%/hgext/zeroconf
+@dirrm %%PYTHON_SITELIBDIR%%/hgext/largefiles
 @dirrm %%PYTHON_SITELIBDIR%%/hgext/highlight
 @dirrm %%PYTHON_SITELIBDIR%%/hgext/convert
 @dirrm %%PYTHON_SITELIBDIR%%/hgext