--- a/components/mercurial/Makefile	Thu Apr 03 09:32:57 2014 -0700
+++ b/components/mercurial/Makefile	Wed Apr 02 14:52:38 2014 -0700
@@ -18,19 +18,19 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
 PATH=/usr/bin:/usr/gnu/bin:/usr/sbin
 
 COMPONENT_NAME=		mercurial
-COMPONENT_VERSION=	2.2.1
+COMPONENT_VERSION=	2.8.2
 COMPONENT_PROJECT_URL=	http://mercurial.selenic.com/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:ab4ffe751553f852813c21ad73907530ffbc5aa39b0cf962f61fe70f196cbb81
+    sha256:c8a5baa21140c6cd6749c3b52b5e5e4a14b6b8ee7c518d9d9de09b1952efbe6f
 COMPONENT_ARCHIVE_URL=	http://www.selenic.com/mercurial/release/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/hg
 
@@ -48,15 +48,49 @@
 # file consistently gets the same timestamp.
 $(SOURCE_DIR)/.https_proxy.patched: GPATCH_FLAGS += -Z
 
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+# Assuming you have docutils installed, update the manpages patch for a new
+# mercurial version based on the patches applied to the source and to the
+# manpage generator.  This works either against source that's already been
+# patched with the older manpages.patch or against a fresh tarball.  Eventually
+# we'll have docutils in the CBE and we'll be able to regenerate the manpages
+# as part of the build, rather than patching them.
+patches/manpages.patch:
+	if [[ -f $(COMPONENT_SRC)/doc/hg.1.~1~ ]]; then \
+		cd $(COMPONENT_SRC)/doc; gmake man || true; cd ../..; \
+		for f in hg.1 hgignore.5 hgrc.5; do \
+			diff -u $(COMPONENT_SRC)/doc/$$f.~1~ $(COMPONENT_SRC)/doc/$$f; \
+		done > $@; \
+	else \
+		for f in hg.1 hgignore.5 hgrc.5; do \
+			cp -p $(COMPONENT_SRC)/doc/$$f $(COMPONENT_SRC)/doc/$$f.orig; \
+		done; \
+		cd $(COMPONENT_SRC)/doc; gmake man || true; cd ../..; \
+		for f in hg.1 hgignore.5 hgrc.5; do \
+			diff -u $(COMPONENT_SRC)/doc/$$f.orig $(COMPONENT_SRC)/doc/$$f; \
+		done > $@; \
+	fi || true
+
 # common targets
 build:		$(BUILD_32)
 
 install:	$(INSTALL_32)
 
+# Use bash in sh mode for the tests; using /bin/sh on Solaris hasn't always
+# worked, and using /bin/bash doesn't always work, either.  Also skip the
+# check-code test, since that ends up trying to check all the code in the
+# userland gate.  And finally, test the bits from the proto area, rather than
+# rebuilding.  Given the way the test suite works, the hg executable must be
+# named "hg".
 test:	$(INSTALL_32)
+	(cd $(BUILD_DIR); rm -f sh; ln -s /bin/bash sh; \
+	 echo test-check-code-hg.t > blacklist)
+	(cd $(PROTOUSRBINDIR); ln -s hg-$(PYTHON_VERSION) hg)
 	(cd $(COMPONENT_SRC)/tests ; \
 	 PYTHONPATH=$(PROTO_DIR)/$(PYTHON_LIB) TERM=dumb \
-	 $(PYTHON) ./run-tests.py --shell /bin/bash)
+	 $(PYTHON) ./run-tests.py --shell $(BUILD_DIR)/sh \
+	 --with-hg $(PROTOUSRBINDIR)/hg --blacklist $(BUILD_DIR)/blacklist)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)