3 files changed, 17 insertions, 14 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 07474fa86469..52e67dfc64b9 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mercurial
-PORTVERSION=	2.9.2
+PORTVERSION=	3.0
 CATEGORIES=	devel python
 MASTER_SITES=	http://mercurial.selenic.com/release/
 
@@ -13,9 +13,8 @@ LICENSE=	GPLv2
 
 USE_PYTHON=	2
 USE_PYDISTUTILS=yes
-USES=		shebangfix
 
-OPTIONS_DEFINE=	CA_BUNDLE DATA DOCS NLS
+OPTIONS_DEFINE=	CA_BUNDLE DATA DOCS EXAMPLES NLS
 OPTIONS_DEFAULT=DATA
 OPTIONS_SUB=	yes
 CA_BUNDLE_DESC=	Install CA Certificates
@@ -41,11 +40,9 @@ CONTRIB_FILES=	bash_completion \
 		perf.py \
 		pylintrc \
 		python-hook-examples.py \
-		sample.hgrc \
 		simplemerge \
 		tcsh_completion \
 		tcsh_completion_build.sh \
-		tmplrewrite.py \
 		undumprevlog \
 		zsh_completion \
 		vim/HGAnnotate.vim \
@@ -56,8 +53,6 @@ CONTRIB_FILES=	bash_completion \
 		vim/patchreview.vim
 DOCS=		CONTRIBUTORS README
 
-SHEBANG_FILES=	contrib/tmplrewrite.py
-
 CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 NLS_USES=		gettext
 
@@ -93,5 +88,10 @@ post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/
 .endif
+.if ${PORT_OPTIONS:MEXAMPLES}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/sample.hgrc \
+		${STAGEDIR}${EXAMPLESDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index 4add04f34c39..a7796f904b36 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mercurial-2.9.2.tar.gz) = 86462b3a1518e137cfe813dc273b8acb120ad71230a1813c0dc9335223b38f53
-SIZE (mercurial-2.9.2.tar.gz) = 3855689
+SHA256 (mercurial-3.0.tar.gz) = 640c96556a4524df2169c6706a4f68997c5bf5862b5971b3c2ee13ed4c349cfb
+SIZE (mercurial-3.0.tar.gz) = 3903047
diff --git a/devel/mercurial/pkg-plist b/devel/mercurial/pkg-plist
index cb3aa3340572..972ead13a5d9 100644
--- a/devel/mercurial/pkg-plist
+++ b/devel/mercurial/pkg-plist
@@ -98,9 +98,6 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/hgext/histedit.py
 %%PYTHON_SITELIBDIR%%/hgext/histedit.pyc
 %%PYTHON_SITELIBDIR%%/hgext/histedit.pyo
-%%PYTHON_SITELIBDIR%%/hgext/interhg.py
-%%PYTHON_SITELIBDIR%%/hgext/interhg.pyc
-%%PYTHON_SITELIBDIR%%/hgext/interhg.pyo
 %%PYTHON_SITELIBDIR%%/hgext/keyword.py
 %%PYTHON_SITELIBDIR%%/hgext/keyword.pyc
 %%PYTHON_SITELIBDIR%%/hgext/keyword.pyo
@@ -211,6 +208,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/branchmap.py
 %%PYTHON_SITELIBDIR%%/mercurial/branchmap.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/branchmap.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/bundle2.py
+%%PYTHON_SITELIBDIR%%/mercurial/bundle2.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/bundle2.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/bundlerepo.py
 %%PYTHON_SITELIBDIR%%/mercurial/bundlerepo.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/bundlerepo.pyo
@@ -269,6 +269,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/error.py
 %%PYTHON_SITELIBDIR%%/mercurial/error.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/error.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/exchange.py
+%%PYTHON_SITELIBDIR%%/mercurial/exchange.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/exchange.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/extensions.py
 %%PYTHON_SITELIBDIR%%/mercurial/extensions.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/extensions.pyo
@@ -710,6 +713,7 @@ man/man5/hgignore.5.gz
 man/man5/hgrc.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.hgrc
 %%DATA%%%%DATADIR%%/contrib/bash_completion
 %%DATA%%%%DATADIR%%/contrib/casesmash.py
 %%DATA%%%%DATADIR%%/contrib/check-code.py
@@ -731,11 +735,9 @@ man/man5/hgrc.5.gz
 %%DATA%%%%DATADIR%%/contrib/perf.py
 %%DATA%%%%DATADIR%%/contrib/pylintrc
 %%DATA%%%%DATADIR%%/contrib/python-hook-examples.py
-%%DATA%%%%DATADIR%%/contrib/sample.hgrc
 %%DATA%%%%DATADIR%%/contrib/simplemerge
 %%DATA%%%%DATADIR%%/contrib/tcsh_completion
 %%DATA%%%%DATADIR%%/contrib/tcsh_completion_build.sh
-%%DATA%%%%DATADIR%%/contrib/tmplrewrite.py
 %%DATA%%%%DATADIR%%/contrib/undumprevlog
 %%DATA%%%%DATADIR%%/contrib/vim/HGAnnotate.vim
 %%DATA%%%%DATADIR%%/contrib/vim/hg-menu.vim
@@ -753,6 +755,7 @@ man/man5/hgrc.5.gz
 %%DATA%%@dirrm %%DATADIR%%/contrib/hgfixes
 %%DATA%%@dirrm %%DATADIR%%/contrib
 %%DATA%%@dirrm %%DATADIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/static
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/spartan