devel/tortoisehg2: update to 2.10

- Update to 2.10
- Allow staging

PR:		ports/183751
Submitted by:	maintainer

3 files changed, 19 insertions, 25 deletions

diff --git a/devel/tortoisehg2/Makefile b/devel/tortoisehg2/Makefile
index 8fe541d33a13..9dd171fa86fd 100644
--- a/devel/tortoisehg2/Makefile
+++ b/devel/tortoisehg2/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	tortoisehg
-PORTVERSION=	2.9.1
+PORTVERSION=	2.10
 CATEGORIES=	devel
 MASTER_SITES=	http://cdn.bitbucket.org/tortoisehg/targz/downloads/
 
@@ -23,6 +23,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.10.2:${PORTSDIR}/devel/py-qt4-co
 
 OPTIONS_DEFINE=	NAUTILUS NLS
 
+NLS_USES=	gettext
+
 NAUTILUS_DESC=	Install TortoiseHG Nautilus extension
 
 OPTIONS_SUB=	yes
@@ -35,13 +37,8 @@ INSTALLS_EGGINFO=yes
 
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e '/_path/ s|/usr|${PREFIX}|' ${WRKSRC}/${PYSETUP}
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/contrib/tortoisehg.desktop
@@ -59,12 +56,8 @@ post-patch:
 .endif
 
 post-install:
-	${MKDIR} ${PREFIX}/share/tortoisehg
-	${INSTALL_DATA} ${WRKSRC}/contrib/mergetools.rc ${PREFIX}/share/tortoisehg/
-	${INSTALL_DATA} ${WRKSRC}/contrib/tortoisehg.desktop ${PREFIX}/share/applications/
-
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/tortoisehg
+	${INSTALL_DATA} ${WRKSRC}/contrib/mergetools.rc ${STAGEDIR}${PREFIX}/share/tortoisehg/
+	${INSTALL_DATA} ${WRKSRC}/contrib/tortoisehg.desktop ${STAGEDIR}${PREFIX}/share/applications/
 
 .include <bsd.port.mk>
diff --git a/devel/tortoisehg2/distinfo b/devel/tortoisehg2/distinfo
index 01a17b3a98e3..e7dc58cd7fef 100644
--- a/devel/tortoisehg2/distinfo
+++ b/devel/tortoisehg2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tortoisehg-2.9.1.tar.gz) = 5b1433df6129e0668cc945685b17d044210b4eb54f26aaa30c38cee600cc8e66
-SIZE (tortoisehg-2.9.1.tar.gz) = 8682337
+SHA256 (tortoisehg-2.10.tar.gz) = d7023304d3a6c21e22fcc199b2b626ee11e7b7f89ec46e73e8afa24cd7fb546f
+SIZE (tortoisehg-2.10.tar.gz) = 9618287
diff --git a/devel/tortoisehg2/pkg-plist b/devel/tortoisehg2/pkg-plist
index 4121a45dcd72..b459192ca16c 100644
--- a/devel/tortoisehg2/pkg-plist
+++ b/devel/tortoisehg2/pkg-plist
@@ -36,6 +36,9 @@ bin/thg
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/clone.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/clone.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/clone.pyo
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/cmdcore.py
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/cmdcore.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/cmdcore.pyo
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/cmdui.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/cmdui.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/cmdui.pyo
@@ -183,15 +186,9 @@ bin/thg
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qfold.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qfold.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qfold.pyo
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qqueue.py
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qqueue.pyc
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qqueue.pyo
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qrename.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qrename.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qrename.pyo
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qreorder.py
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qreorder.pyc
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qreorder.pyo
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qscilib.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qscilib.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qscilib.pyo
@@ -201,9 +198,6 @@ bin/thg
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qtlib.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qtlib.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/qtlib.pyo
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/quickbar.py
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/quickbar.pyc
-%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/quickbar.pyo
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/quickop.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/quickop.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/quickop.pyo
@@ -306,6 +300,9 @@ bin/thg
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/wctxactions.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/wctxactions.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/wctxactions.pyo
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/wctxcleaner.py
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/wctxcleaner.pyc
+%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/wctxcleaner.pyo
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/webconf.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/webconf.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/webconf.pyo
@@ -509,7 +506,6 @@ share/pixmaps/tortoisehg/icons/scalable/actions/hg-qpop-all.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/hg-qpop.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/hg-qpush-all.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/hg-qpush.svg
-share/pixmaps/tortoisehg/icons/scalable/actions/hg-qreorder.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/hg-rebase.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/hg-recover.svg
 share/pixmaps/tortoisehg/icons/scalable/actions/hg-remove.svg
@@ -565,12 +561,17 @@ share/pixmaps/tortoisehg/icons/scalable/apps/thg-logo.svg
 share/pixmaps/tortoisehg/icons/scalable/apps/tools-hooks.svg
 share/pixmaps/tortoisehg/icons/scalable/apps/tools-spanner-hammer.svg
 share/pixmaps/tortoisehg/icons/scalable/apps/utilities-terminal.svg
+share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-applied.svg
+share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-guarded.svg
+share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-unguarded.svg
+share/pixmaps/tortoisehg/icons/scalable/status/thg-added-subrepo.svg
 share/pixmaps/tortoisehg/icons/scalable/status/thg-error.svg
 share/pixmaps/tortoisehg/icons/scalable/status/thg-file-merged.svg
 share/pixmaps/tortoisehg/icons/scalable/status/thg-file-p0.svg
 share/pixmaps/tortoisehg/icons/scalable/status/thg-file-p1.svg
 share/pixmaps/tortoisehg/icons/scalable/status/thg-git-subrepo.svg
 share/pixmaps/tortoisehg/icons/scalable/status/thg-remote-repo.svg
+share/pixmaps/tortoisehg/icons/scalable/status/thg-removed-subrepo.svg
 share/pixmaps/tortoisehg/icons/scalable/status/thg-subrepo.svg
 share/pixmaps/tortoisehg/icons/scalable/status/thg-success.svg
 share/pixmaps/tortoisehg/icons/scalable/status/thg-svn-subrepo.svg