3 files changed, 40 insertions, 12 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 4246dd75d810..2f2ff9ce9372 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mercurial
-PORTVERSION=	3.7.3
+PORTVERSION=	3.8.1
 CATEGORIES=	devel python
 MASTER_SITES=	http://mercurial.selenic.com/release/
 
@@ -33,10 +33,6 @@ CONTRIB_FILES=	bash_completion \
 		debugshell.py \
 		dumprevlog \
 		hg-ssh \
-		hgfixes/__init__.py \
-		hgfixes/fix_bytes.py \
-		hgfixes/fix_bytesmod.py \
-		hgfixes/fix_leftover_imports.py \
 		hgk \
 		hgsh/Makefile \
 		hgsh/hgsh.c \
@@ -68,10 +64,11 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/doc/*.5 ${STAGEDIR}${PREFIX}/man/man5/
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/*.so
+	${STRIP_CMD} \
+		${STAGEDIR}${PYTHON_SITELIBDIR}/hgext/fsmonitor/pywatchman/*.so
 .if ${PORT_OPTIONS:MDATA}
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}/contrib
-	${MKDIR} ${STAGEDIR}${DATADIR}/contrib/hgfixes
 	${MKDIR} ${STAGEDIR}${DATADIR}/contrib/hgsh
 	${MKDIR} ${STAGEDIR}${DATADIR}/contrib/vim
 	for f in ${CONTRIB_FILES}; do \
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index 75a8d69488f4..5bb1c8831325 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mercurial-3.7.3.tar.gz) = c099c42d74e2d520b61dd372cd996b0fa7605c06617834fd7b13c79b9a9a5b30
-SIZE (mercurial-3.7.3.tar.gz) = 4636732
+SHA256 (mercurial-3.8.1.tar.gz) = face1f058de5530b56b0dfd3b4d0b23d89590c588605c06f3d18b79e8c30d594
+SIZE (mercurial-3.8.1.tar.gz) = 4766849
diff --git a/devel/mercurial/pkg-plist b/devel/mercurial/pkg-plist
index 6c0ccc83159c..788aeb80b7c1 100644
--- a/devel/mercurial/pkg-plist
+++ b/devel/mercurial/pkg-plist
@@ -5,6 +5,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/hgext/acl.py
 %%PYTHON_SITELIBDIR%%/hgext/acl.pyc
 %%PYTHON_SITELIBDIR%%/hgext/acl.pyo
+%%PYTHON_SITELIBDIR%%/hgext/automv.py
+%%PYTHON_SITELIBDIR%%/hgext/automv.pyc
+%%PYTHON_SITELIBDIR%%/hgext/automv.pyo
 %%PYTHON_SITELIBDIR%%/hgext/blackbox.py
 %%PYTHON_SITELIBDIR%%/hgext/blackbox.pyc
 %%PYTHON_SITELIBDIR%%/hgext/blackbox.pyo
@@ -86,6 +89,25 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/hgext/fetch.py
 %%PYTHON_SITELIBDIR%%/hgext/fetch.pyc
 %%PYTHON_SITELIBDIR%%/hgext/fetch.pyo
+%%PYTHON_SITELIBDIR%%/hgext/fsmonitor/__init__.py
+%%PYTHON_SITELIBDIR%%/hgext/fsmonitor/__init__.pyc
+%%PYTHON_SITELIBDIR%%/hgext/fsmonitor/__init__.pyo
+%%PYTHON_SITELIBDIR%%/hgext/fsmonitor/pywatchman/__init__.py
+%%PYTHON_SITELIBDIR%%/hgext/fsmonitor/pywatchman/__init__.pyc
+%%PYTHON_SITELIBDIR%%/hgext/fsmonitor/pywatchman/__init__.pyo
+%%PYTHON_SITELIBDIR%%/hgext/fsmonitor/pywatchman/bser.so
+%%PYTHON_SITELIBDIR%%/hgext/fsmonitor/pywatchman/capabilities.py
+%%PYTHON_SITELIBDIR%%/hgext/fsmonitor/pywatchman/capabilities.pyc
+%%PYTHON_SITELIBDIR%%/hgext/fsmonitor/pywatchman/capabilities.pyo
+%%PYTHON_SITELIBDIR%%/hgext/fsmonitor/pywatchman/pybser.py
+%%PYTHON_SITELIBDIR%%/hgext/fsmonitor/pywatchman/pybser.pyc
+%%PYTHON_SITELIBDIR%%/hgext/fsmonitor/pywatchman/pybser.pyo
+%%PYTHON_SITELIBDIR%%/hgext/fsmonitor/state.py
+%%PYTHON_SITELIBDIR%%/hgext/fsmonitor/state.pyc
+%%PYTHON_SITELIBDIR%%/hgext/fsmonitor/state.pyo
+%%PYTHON_SITELIBDIR%%/hgext/fsmonitor/watchmanclient.py
+%%PYTHON_SITELIBDIR%%/hgext/fsmonitor/watchmanclient.pyc
+%%PYTHON_SITELIBDIR%%/hgext/fsmonitor/watchmanclient.pyo
 %%PYTHON_SITELIBDIR%%/hgext/gpg.py
 %%PYTHON_SITELIBDIR%%/hgext/gpg.pyc
 %%PYTHON_SITELIBDIR%%/hgext/gpg.pyo
@@ -143,6 +165,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/hgext/largefiles/wirestore.py
 %%PYTHON_SITELIBDIR%%/hgext/largefiles/wirestore.pyc
 %%PYTHON_SITELIBDIR%%/hgext/largefiles/wirestore.pyo
+%%PYTHON_SITELIBDIR%%/hgext/logtoprocess.py
+%%PYTHON_SITELIBDIR%%/hgext/logtoprocess.pyc
+%%PYTHON_SITELIBDIR%%/hgext/logtoprocess.pyo
 %%PYTHON_SITELIBDIR%%/hgext/mq.py
 %%PYTHON_SITELIBDIR%%/hgext/mq.pyc
 %%PYTHON_SITELIBDIR%%/hgext/mq.pyo
@@ -194,9 +219,15 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/hgext/zeroconf/__init__.py
 %%PYTHON_SITELIBDIR%%/hgext/zeroconf/__init__.pyc
 %%PYTHON_SITELIBDIR%%/hgext/zeroconf/__init__.pyo
+%%PYTHON_SITELIBDIR%%/hgext3rd/__init__.py
+%%PYTHON_SITELIBDIR%%/hgext3rd/__init__.pyc
+%%PYTHON_SITELIBDIR%%/hgext3rd/__init__.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/__init__.py
 %%PYTHON_SITELIBDIR%%/mercurial/__init__.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/__init__.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/__modulepolicy__.py
+%%PYTHON_SITELIBDIR%%/mercurial/__modulepolicy__.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/__modulepolicy__.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/__version__.py
 %%PYTHON_SITELIBDIR%%/mercurial/__version__.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/__version__.pyo
@@ -325,6 +356,7 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/help/hgweb.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/internals/bundles.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/internals/changegroups.txt
+%%PYTHON_SITELIBDIR%%/mercurial/help/internals/requirements.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/internals/revlogs.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/merge-tools.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/multirevs.txt
@@ -498,6 +530,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/py3kcompat.py
 %%PYTHON_SITELIBDIR%%/mercurial/py3kcompat.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/py3kcompat.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/pycompat.py
+%%PYTHON_SITELIBDIR%%/mercurial/pycompat.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/pycompat.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/registrar.py
 %%PYTHON_SITELIBDIR%%/mercurial/registrar.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/registrar.pyo
@@ -771,10 +806,6 @@ man/man5/hgrc.5.gz
 %%DATA%%%%DATADIR%%/contrib/debugshell.py
 %%DATA%%%%DATADIR%%/contrib/dumprevlog
 %%DATA%%%%DATADIR%%/contrib/hg-ssh
-%%DATA%%%%DATADIR%%/contrib/hgfixes/__init__.py
-%%DATA%%%%DATADIR%%/contrib/hgfixes/fix_bytes.py
-%%DATA%%%%DATADIR%%/contrib/hgfixes/fix_bytesmod.py
-%%DATA%%%%DATADIR%%/contrib/hgfixes/fix_leftover_imports.py
 %%DATA%%%%DATADIR%%/contrib/hgk
 %%DATA%%%%DATADIR%%/contrib/hgsh/Makefile
 %%DATA%%%%DATADIR%%/contrib/hgsh/hgsh.c