--- a/components/mercurial/Makefile	Wed Apr 19 03:24:59 2017 -0700
+++ b/components/mercurial/Makefile	Fri Apr 21 10:43:44 2017 -0700
@@ -28,16 +28,16 @@
 PATH=/usr/bin:/usr/gnu/bin:/usr/sbin
 
 COMPONENT_NAME=		mercurial
-COMPONENT_VERSION=	3.7.3
-COMPONENT_PROJECT_URL=	http://mercurial.selenic.com/
+COMPONENT_VERSION=	4.1.3
+COMPONENT_PROJECT_URL=	http://mercurial-scm.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:c099c42d74e2d520b61dd372cd996b0fa7605c06617834fd7b13c79b9a9a5b30
-COMPONENT_ARCHIVE_URL=	http://www.selenic.com/mercurial/release/$(COMPONENT_ARCHIVE)
+    sha256:103d2ae187d5c94110c0e86ccc3b46f55fcd8e21c78d1c209bac7b59a73e86d8
+COMPONENT_ARCHIVE_URL=	https://www.mercurial-scm.org/release/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/hg
 
-TPNO=			27571
+TPNO=			34883
 
 # Mercurial does not yet support Python 3.
 PYTHON_VERSIONS = $(PYTHON2_VERSIONS)
@@ -60,6 +60,7 @@
 TEST_BLACKLIST = \
 	test-check-code.t \
 	test-check-config.t \
+	test-devel-warnings.t \
 	test-hghave.t \
 	test-module-imports.t \
 	test-run-tests.t
@@ -90,7 +91,7 @@
 # Only build this target if it doesn't already exist, since this recipe is just
 # for the component maintainer's benefit.
 patches/manpages.patch: $(SOURCE_DIR)/.unpacked \
-    $(SOURCE_DIR)/.patched-rst.patch $(SOURCE_DIR)/.patched-hgmanpage.patch
+    $(SOURCE_DIR)/.rst.patched $(SOURCE_DIR)/.hgmanpage.patched
 	if [[ -f $@ ]]; then exit 0; fi; \
 	if [[ -f $(COMPONENT_SRC)/doc/hg.1.~1~ ]]; then \
 		cd $(COMPONENT_SRC)/doc; gmake man || true; cd ../..; \
@@ -107,12 +108,12 @@
 		done > $@; \
 	fi || true
 
-# common targets
-build:		$(BUILD_32)
+# Build and install 64-bit first, so that the 32-bit hg is what's installed.
+build:		$(BUILD_64) $(BUILD_32)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64) $(INSTALL_32)
 
-test:		install $(TEST_32)
+test:		install $(TEST_64) $(TEST_32)
 
 
 REQUIRED_PACKAGES += runtime/python-27