Index: head/devel/tortoisehg/Makefile
===================================================================
--- head/devel/tortoisehg/Makefile
+++ head/devel/tortoisehg/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	tortoisehg
 PORTVERSION=	4.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://bitbucket.org/tortoisehg/targz/downloads/
 #MASTER_SITES=	http://cdn.bitbucket.org/tortoisehg/targz/downloads/
@@ -39,6 +40,9 @@
 
 SUB_FILES=	pkg-message
 
+# Do not conflict with devel/mercurial, which also installs hgext3rd/__init__.py
+EXTRACT_AFTER_ARGS=	--exclude ${DISTNAME}/hgext3rd/__init__.py
+
 post-patch:
 	@${REINPLACE_CMD} -e '/_path/ s|/usr|${PREFIX}|' ${WRKSRC}/${PYSETUP}
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/contrib/tortoisehg.desktop
Index: head/devel/tortoisehg/pkg-plist
===================================================================
--- head/devel/tortoisehg/pkg-plist
+++ head/devel/tortoisehg/pkg-plist
@@ -1,5 +1,8 @@
 bin/thg
 %%NAUTILUS%%share/nautilus-python/extensions/nautilus-thg.py
+%%PYTHON_SITELIBDIR%%/hgext3rd/thg.py
+%%PYTHON_SITELIBDIR%%/hgext3rd/thg.pyc
+%%PYTHON_SITELIBDIR%%/hgext3rd/thg.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/tortoisehg/__init__.py
 %%PYTHON_SITELIBDIR%%/tortoisehg/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tortoisehg/__init__.pyo