diff --git a/devel/tortoisehg/Makefile b/devel/tortoisehg/Makefile
index 81ebe9e8bfad..bb68c7531aba 100644
--- a/devel/tortoisehg/Makefile
+++ b/devel/tortoisehg/Makefile
@@ -1,58 +1,59 @@
 # $FreeBSD$
 
 PORTNAME=	tortoisehg
 DISTVERSION=	5.0.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://bitbucket.org/tortoisehg/targz/downloads/
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	GUI for Mercurial VCS
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 BUILD_DEPENDS=	hg:devel/mercurial
 RUN_DEPENDS=	hg:devel/mercurial \
 		${PYTHON_PKGNAMEPREFIX}iniparse>=0.4:devel/py-iniparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR}
 
 USES=		pyqt:5 python:2.7
 USE_PYQT=	core gui network qscintilla2 xml
 USE_PYTHON=	distutils
 
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 
 # Do not conflict with devel/mercurial, which also installs hgext3rd/__init__.py
 EXTRACT_AFTER_ARGS=	--exclude ${DISTNAME}/hgext3rd/__init__.py
 
 OPTIONS_DEFINE=	NAUTILUS NLS
 NAUTILUS_DESC=	Install TortoiseHG Nautilus extension
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
 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>
diff --git a/devel/tortoisehg/files/patch-tortoisehg_util_hgversion.py b/devel/tortoisehg/files/patch-tortoisehg_util_hgversion.py
new file mode 100644
index 000000000000..9b3129cd602e
--- /dev/null
+++ b/devel/tortoisehg/files/patch-tortoisehg_util_hgversion.py
@@ -0,0 +1,20 @@
+--- tortoisehg/util/hgversion.py.orig	2019-06-27 21:18:37 UTC
++++ tortoisehg/util/hgversion.py
+@@ -19,16 +19,4 @@ except AttributeError:
+ testedwith = '4.9 5.0'
+ 
+ def checkhgversion(v):
+-    """range check the Mercurial version"""
+-    reqvers = testedwith.split()
+-    v = v.split('+')[0]
+-    if not v or v == 'unknown' or len(v) >= 12:
+-        # can't make any intelligent decisions about unknown or hashes
+-        return
+-    vers = re.split(r'\.|-|rc', v)[:2]
+-    if len(vers) < 2:
+-        return
+-    if '.'.join(vers) in reqvers:
+-        return
+-    return ('This version of TortoiseHg requires Mercurial version %s.n to '
+-            '%s.n, but found %s') % (reqvers[0], reqvers[-1], v)
++    return