Index: head/devel/tortoisehg/Makefile
===================================================================
--- head/devel/tortoisehg/Makefile	(revision 427630)
+++ head/devel/tortoisehg/Makefile	(revision 427631)
@@ -1,65 +1,65 @@
 # $FreeBSD$
 
 PORTNAME=	tortoisehg
-PORTVERSION=	3.9
+PORTVERSION=	4.0
 CATEGORIES=	devel
 MASTER_SITES=	https://bitbucket.org/tortoisehg/targz/downloads/
 #MASTER_SITES=	http://cdn.bitbucket.org/tortoisehg/targz/downloads/
 
 MAINTAINER=	6yearold@gmail.com
 COMMENT=	THg script from TortoiseHG
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.11.4:devel/py-qt4-core \
 		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.9.1:devel/py-qt4-qscintilla2 \
 		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.11.4:net/py-qt4-network \
 		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.11.4:x11-toolkits/py-qt4-gui \
 		${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.11.4:textproc/py-qt4-xml
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.11.4:devel/py-qt4-core \
 		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.9.1:devel/py-qt4-qscintilla2 \
 		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.11.4:net/py-qt4-network \
 		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.11.4:x11-toolkits/py-qt4-gui \
 		hg:devel/mercurial \
 		${PYTHON_PKGNAMEPREFIX}iniparse>=0.4:devel/py-iniparse \
 		pygmentize:textproc/py-pygments
 
 OPTIONS_DEFINE=	NAUTILUS NLS
 NAUTILUS_DESC=	Install TortoiseHG Nautilus extension
 OPTIONS_SUB=	yes
 
-USES=		python:2
+USES=		python:2.7
 NLS_USES=	gettext
 
 INSTALLS_ICONS=	yes
 
 USE_PYTHON=	distutils
 NO_ARCH=	yes
 
 SUB_FILES=	pkg-message
 
 post-patch:
 	@${REINPLACE_CMD} -e '/_path/ s|/usr|${PREFIX}|' ${WRKSRC}/${PYSETUP}
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/contrib/tortoisehg.desktop
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/thg
 
 post-patch-NLS-on:
 	@${REINPLACE_CMD} -e 's/^%%NLS%%//' ${WRKSRC}/${PYSETUP}
 
 post-patch-NLS-off:
 	@${REINPLACE_CMD} -e 's/^%%NLS%%/# /' ${WRKSRC}/${PYSETUP}
 
 post-patch-NAUTILUS-on:
 	@${REINPLACE_CMD} -e 's/^%%NAUTILUS%%//' ${WRKSRC}/${PYSETUP}
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/${PYSETUP}
 
 post-patch-NAUTILUS-off:
 	@${REINPLACE_CMD} -e 's/^%%NAUTILUS%%/# /' ${WRKSRC}/${PYSETUP}
 
 post-install:
 	@${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>
Index: head/devel/tortoisehg/distinfo
===================================================================
--- head/devel/tortoisehg/distinfo	(revision 427630)
+++ head/devel/tortoisehg/distinfo	(revision 427631)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472641573
-SHA256 (tortoisehg-3.9.tar.gz) = 7f0eac2bb1d2540a05993390f1ebdaa62f2a98160eeee6e8129a665c4d88c19e
-SIZE (tortoisehg-3.9.tar.gz) = 7816824
+TIMESTAMP = 1480787155
+SHA256 (tortoisehg-4.0.tar.gz) = 791ffa4270cb2f49454290a30da2a915b31a91b94ebc5546289a125e962f7910
+SIZE (tortoisehg-4.0.tar.gz) = 7828059
Index: head/devel/tortoisehg/files/patch-setup.py
===================================================================
--- head/devel/tortoisehg/files/patch-setup.py	(revision 427630)
+++ head/devel/tortoisehg/files/patch-setup.py	(revision 427631)
@@ -1,26 +1,26 @@
---- setup.py.orig	2015-08-06 04:30:23.000000000 +0300
-+++ setup.py	2015-09-05 21:24:08.309849781 +0300
-@@ -413,7 +413,7 @@
-         ('build_config', lambda self: os.name != 'nt'),
+--- setup.py.orig	2016-11-03 15:31:44 UTC
++++ setup.py
+@@ -452,7 +452,7 @@ class build(_build_orig):
+          lambda self: 'py2app' in self.distribution.commands),
          ('build_ui', None),
          ('build_qrc', lambda self: 'py2exe' in self.distribution.commands),
 -        ('build_mo', None),
 +%%NLS%%        ('build_mo', None),
          ] + _build_orig.sub_commands
  
  class clean(_clean_orig):
-@@ -567,10 +567,10 @@
+@@ -666,10 +666,10 @@ def setup_posix():
              dirs.remove('svg')  # drop source of .ico files
          _data_files.append((os.path.join('share/pixmaps/tortoisehg', root),
                              [os.path.join(root, f) for f in files]))
 -    _data_files.extend((os.path.join('share', modir), [mofile])
 -                       for pofile, modir, mofile in _walklocales())
 -    _data_files += [('share/nautilus-python/extensions',
 -                     ['contrib/nautilus-thg.py'])]
 +%%NLS%%    _data_files.extend((os.path.join('share', modir), [mofile])
 +%%NLS%%                       for pofile, modir, mofile in _walklocales())
 +%%NAUTILUS%%    _data_files += [('share/nautilus-python/extensions',
 +%%NAUTILUS%%                     ['contrib/nautilus-thg.py'])]
  
      return _scripts, _packages, _data_files, _extra
  
Index: head/devel/tortoisehg/files/patch-thg
===================================================================
--- head/devel/tortoisehg/files/patch-thg	(revision 427630)
+++ head/devel/tortoisehg/files/patch-thg	(revision 427631)
@@ -1,11 +1,11 @@
---- thg_	2011-05-02 01:39:58.000000000 +0400
-+++ thg	2011-05-25 15:51:43.418176138 +0400
-@@ -13,7 +13,7 @@
+--- thg.orig	2016-03-31 18:28:23 UTC
++++ thg
+@@ -10,7 +10,7 @@
  
  import os
  import sys
 -
 +os.environ["PATH"] +=  ":%%LOCALBASE%%/kde4/bin"
  argv = sys.argv[1:]
  if 'THG_OSX_APP' in os.environ:
-     # Remove the -psn argument supplied by launchd
+     # Remove the -psn argument supplied by launchd (if present - it's not