diff --git a/dev-vcs/mercurial/mercurial-2.2.2.recipe b/dev-vcs/mercurial/mercurial-2.2.2.recipe
deleted file mode 100644
index a452130aa..000000000
--- a/dev-vcs/mercurial/mercurial-2.2.2.recipe
+++ /dev/null
@@ -1,58 +0,0 @@
-SUMMARY="Free, distributed source control management tool"
-DESCRIPTION="Mercurial (hg) is a free, distributed source control management \
-tool."
-HOMEPAGE="http://mercurial.selenic.com/"
-COPYRIGHT="2005-2012 Matt Mackall et al."
-LICENSE="GNU GPL v2"
-REVISION="5"
-SOURCE_URI="http://mercurial.selenic.com/release/mercurial-2.2.2.tar.gz"
-CHECKSUM_SHA256="3489110ec11fefbd2cbdefb8d715d0a869cef3dd729aaf4d5141108f8be1600a"
-PATCHES="mercurial-2.2.2.patch"
-
-ARCHITECTURES="all"
-
-PROVIDES="
-	mercurial = $portVersion compat >= 2
-	cmd:hg = $portVersion compat >= 2
-	"
-REQUIRES="
-	haiku_devel
-	cmd:python
-	cmd:nano
-	lib:libintl
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:python
-	cmd:aclocal
-	cmd:autoconf
-	cmd:gcc
-	cmd:gettext
-	cmd:ld
-	cmd:libtoolize
-	cmd:make
-	"
-
-BUILD()
-{
-	$portPackageLinksDir/cmd~python/bin/python setup.py build --force
-}
-
-INSTALL()
-{
-	$portPackageLinksDir/cmd~python/bin/python setup.py install \
-		--prefix="$prefix" \
-		--install-headers="$includedir" \
-		--force
-}
-
-shopt -s extglob
-TEST()
-{
-	cd tests
-	sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn)
-	python run-tests.py
-}
diff --git a/dev-vcs/mercurial/mercurial-2.8.1.recipe b/dev-vcs/mercurial/mercurial-2.8.1.recipe
deleted file mode 100644
index 414e605ed..000000000
--- a/dev-vcs/mercurial/mercurial-2.8.1.recipe
+++ /dev/null
@@ -1,53 +0,0 @@
-SUMMARY="Free, distributed source control management tool"
-DESCRIPTION="Mercurial (hg) is a free, distributed source control management \
-tool."
-HOMEPAGE="http://mercurial.selenic.com/"
-COPYRIGHT="2005-2012 Matt Mackall et al."
-LICENSE="GNU GPL v2"
-REVISION="1"
-SOURCE_URI="http://mercurial.selenic.com/release/mercurial-2.8.1.tar.gz"
-CHECKSUM_SHA256="d239a204cc76b6456b4121eaf35e584f33c510855865da0376dd1f708dd33366"
-PATCHES="mercurial-2.8.1.patch"
-
-ARCHITECTURES="all"
-
-PROVIDES="
-	mercurial = $portVersion compat >= 2
-	cmd:hg = $portVersion compat >= 2
-	"
-REQUIRES="
-	haiku_devel
-	cmd:nano
-	cmd:python
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc
-	cmd:gettext
-	cmd:ld
-	cmd:make
-	cmd:msgfmt
-	cmd:python
-	"
-
-BUILD()
-{
-	$portPackageLinksDir/cmd~python/bin/python setup.py build --force
-}
-
-INSTALL()
-{
-	$portPackageLinksDir/cmd~python/bin/python setup.py install \
-		--prefix="$prefix" \
-		--install-headers="$includedir" \
-		--force
-}
-
-TEST()
-{
-	cd tests
-	python run-tests.py
-}
diff --git a/dev-vcs/mercurial/mercurial-2.9.1.recipe b/dev-vcs/mercurial/mercurial-2.9.1.recipe
deleted file mode 100644
index dbf636ac5..000000000
--- a/dev-vcs/mercurial/mercurial-2.9.1.recipe
+++ /dev/null
@@ -1,53 +0,0 @@
-SUMMARY="Free, distributed source control management tool"
-DESCRIPTION="Mercurial (hg) is a free, distributed source control management \
-tool."
-HOMEPAGE="http://mercurial.selenic.com/"
-COPYRIGHT="2005-2012 Matt Mackall et al."
-LICENSE="GNU GPL v2"
-REVISION="1"
-SOURCE_URI="http://mercurial.selenic.com/release/mercurial-2.9.1.tar.gz"
-CHECKSUM_SHA256="a20fb1434ecbdb070ef955c7c292db9eb2676bfc1ac165e95ba73866623bc01a"
-PATCHES="mercurial-2.9.1.patch"
-
-ARCHITECTURES="all"
-
-PROVIDES="
-	mercurial = $portVersion compat >= 2
-	cmd:hg = $portVersion compat >= 2
-	"
-REQUIRES="
-	haiku_devel
-	cmd:nano
-	cmd:python
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc
-	cmd:gettext
-	cmd:ld
-	cmd:make
-	cmd:msgfmt
-	cmd:python
-	"
-
-BUILD()
-{
-	$portPackageLinksDir/cmd~python/bin/python setup.py build --force
-}
-
-INSTALL()
-{
-	$portPackageLinksDir/cmd~python/bin/python setup.py install \
-		--prefix="$prefix" \
-		--install-headers="$includedir" \
-		--force
-}
-
-TEST()
-{
-	cd tests
-	python run-tests.py
-}
diff --git a/dev-vcs/mercurial/mercurial-2.9.2.recipe b/dev-vcs/mercurial/mercurial-2.9.2.recipe
deleted file mode 100644
index 333c060ff..000000000
--- a/dev-vcs/mercurial/mercurial-2.9.2.recipe
+++ /dev/null
@@ -1,53 +0,0 @@
-SUMMARY="Free, distributed source control management tool"
-DESCRIPTION="Mercurial (hg) is a free, distributed source control management \
-tool."
-HOMEPAGE="http://mercurial.selenic.com/"
-COPYRIGHT="2005-2014 Matt Mackall et al."
-LICENSE="GNU GPL v2"
-REVISION="1"
-SOURCE_URI="http://mercurial.selenic.com/release/mercurial-$portVersion.tar.gz"
-CHECKSUM_SHA256="86462b3a1518e137cfe813dc273b8acb120ad71230a1813c0dc9335223b38f53"
-PATCHES="mercurial-2.9.2.patch"
-
-ARCHITECTURES="all"
-
-PROVIDES="
-	mercurial = $portVersion compat >= 2
-	cmd:hg = $portVersion compat >= 2
-	"
-REQUIRES="
-	haiku_devel
-	cmd:nano
-	cmd:python
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc
-	cmd:gettext
-	cmd:ld
-	cmd:make
-	cmd:msgfmt
-	cmd:python
-	"
-
-BUILD()
-{
-	$portPackageLinksDir/cmd~python/bin/python setup.py build --force
-}
-
-INSTALL()
-{
-	$portPackageLinksDir/cmd~python/bin/python setup.py install \
-		--prefix="$prefix" \
-		--install-headers="$includedir" \
-		--force
-}
-
-TEST()
-{
-	cd tests
-	python run-tests.py
-}
diff --git a/dev-vcs/mercurial/mercurial-3.2.1.recipe b/dev-vcs/mercurial/mercurial-3.2.1.recipe
deleted file mode 100644
index 62d7d01bb..000000000
--- a/dev-vcs/mercurial/mercurial-3.2.1.recipe
+++ /dev/null
@@ -1,54 +0,0 @@
-SUMMARY="Free, distributed source control management tool"
-DESCRIPTION="Mercurial (hg) is a free, distributed source control management \
-tool."
-HOMEPAGE="https://www.mercurial-scm.org/"
-COPYRIGHT="2005-2014 Matt Mackall et al."
-LICENSE="GNU GPL v2"
-REVISION="5"
-SOURCE_URI="https://www.mercurial-scm.org/release/mercurial-$portVersion.tar.gz"
-CHECKSUM_SHA256="26418276fbc36850782f1f4feb30da4a83800b48493082985c4d3ac29ad0ca0f"
-PATCHES="mercurial-3.2.1.patch"
-
-ARCHITECTURES="all"
-
-PROVIDES="
-	mercurial = $portVersion compat >= 3
-	cmd:hg = $portVersion compat >= 3
-	"
-REQUIRES="
-	haiku
-	haiku_devel
-	cmd:nano
-	cmd:python2
-	lib:libpython2.7
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc
-	cmd:gettext
-	cmd:ld
-	cmd:make
-	cmd:msgfmt
-	cmd:python2
-	"
-
-BUILD()
-{
-	$portPackageLinksDir/cmd~python2/bin/python2 setup.py build --force
-}
-
-INSTALL()
-{
-	$portPackageLinksDir/cmd~python2/bin/python2 setup.py install \
-		--prefix="$prefix" \
-		--force
-}
-
-TEST()
-{
-	cd tests
-	python2 run-tests.py
-}
diff --git a/dev-vcs/mercurial/mercurial-4.9.1.recipe b/dev-vcs/mercurial/mercurial-4.9.1.recipe
deleted file mode 100644
index 157345168..000000000
--- a/dev-vcs/mercurial/mercurial-4.9.1.recipe
+++ /dev/null
@@ -1,54 +0,0 @@
-SUMMARY="Free, distributed source control management tool"
-DESCRIPTION="Mercurial (hg) is a free, distributed source control management \
-tool."
-HOMEPAGE="https://www.mercurial-scm.org/"
-COPYRIGHT="2005-2019 Matt Mackall et al."
-LICENSE="GNU GPL v2"
-REVISION="1"
-SOURCE_URI="https://www.mercurial-scm.org/release/mercurial-4.9.1.tar.gz"
-CHECKSUM_SHA256="1bdd21bb87d1e05fb5cd395d488d0e0cc2f2f90ce0fd248e31a03595da5ccb47"
-PATCHES="mercurial-4.9.1.patch"
-
-ARCHITECTURES="all"
-
-PROVIDES="
-	mercurial = $portVersion compat >= 4
-	cmd:hg = $portVersion compat >= 4
-	"
-REQUIRES="
-	haiku
-	haiku_devel
-	cmd:nano
-	cmd:python2
-	lib:libpython2.7
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc
-	cmd:gettext
-	cmd:ld
-	cmd:make
-	cmd:msgfmt
-	cmd:python2
-	"
-
-BUILD()
-{
-	$portPackageLinksDir/cmd~python2/bin/python2 setup.py build --force
-}
-
-INSTALL()
-{
-	$portPackageLinksDir/cmd~python2/bin/python2 setup.py install \
-		--prefix="$prefix" \
-		--force
-}
-
-TEST()
-{
-	cd tests
-	python2 run-tests.py
-}
diff --git a/dev-vcs/mercurial/mercurial-6.0.1.recipe b/dev-vcs/mercurial/mercurial-6.0.1.recipe
new file mode 100644
index 000000000..7dc7b9798
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-6.0.1.recipe
@@ -0,0 +1,58 @@
+SUMMARY="Free, distributed source control management tool"
+DESCRIPTION="Mercurial (hg) is a free, distributed source control management \
+tool."
+HOMEPAGE="https://www.mercurial-scm.org/"
+COPYRIGHT="2005-2022 Matt Mackall et al."
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="https://www.mercurial-scm.org/release/mercurial-$portVersion.tar.gz"
+CHECKSUM_SHA256="05fd0b480389c96547f5a6c769e90ee00f1d13f7ac0d465e40a381c6cf3a56e2"
+PATCHES="mercurial-$portVersion.patch"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+PYTHON_VERSION="3.8"
+
+PROVIDES="
+	mercurial$secondaryArchSuffix = $portVersion
+	cmd:hg
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	cmd:nano
+	cmd:python$PYTHON_VERSION
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:gettext
+	cmd:msgfmt
+	cmd:python$PYTHON_VERSION
+	"
+
+TEST_REQUIRES="
+	cmd:diff
+	cmd:find
+	cmd:which
+	"
+
+BUILD()
+{
+	$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python$PYTHON_VERSION setup.py build --force
+}
+
+INSTALL()
+{
+	$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python$PYTHON_VERSION setup.py install \
+		--prefix="$prefix" --force
+}
+
+TEST()
+{
+	cd tests
+	python$PYTHON_VERSION run-tests.py
+}
diff --git a/dev-vcs/mercurial/patches/mercurial-2.2.2.patch b/dev-vcs/mercurial/patches/mercurial-2.2.2.patch
deleted file mode 100644
index 285c8f417..000000000
--- a/dev-vcs/mercurial/patches/mercurial-2.2.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mercurial-2.2.2/mercurial/ui.py.orig mercurial-2.2.2/mercurial/ui.py
---- mercurial-2.2.2/mercurial/ui.py.orig	2012-06-01 22:48:21.025690112 -0600
-+++ mercurial-2.2.2/mercurial/ui.py	2012-06-04 17:15:16.317980672 -0600
-@@ -693,7 +693,7 @@ class ui(object):
-             # avoid confusion.
-             editor = 'E'
-         else:
--            editor = 'vi'
-+            editor = 'nano'
-         return (os.environ.get("HGEDITOR") or
-                 self.config("ui", "editor") or
-                 os.environ.get("VISUAL") or
diff --git a/dev-vcs/mercurial/patches/mercurial-2.8.1.patch b/dev-vcs/mercurial/patches/mercurial-2.8.1.patch
deleted file mode 100644
index edfe44133..000000000
--- a/dev-vcs/mercurial/patches/mercurial-2.8.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mercurial-2.8.1/mercurial/ui.py.orig mercurial-2.8.1/mercurial/ui.py
---- mercurial-2.8.1/mercurial/ui.py.orig	2012-06-01 22:48:21.025690112 -0600
-+++ mercurial-2.8.1/mercurial/ui.py	2012-06-04 17:15:16.317980672 -0600
-@@ -693,7 +693,7 @@ class ui(object):
-             # avoid confusion.
-             editor = 'E'
-         else:
--            editor = 'vi'
-+            editor = 'nano'
-         return (os.environ.get("HGEDITOR") or
-                 self.config("ui", "editor") or
-                 os.environ.get("VISUAL") or
diff --git a/dev-vcs/mercurial/patches/mercurial-2.9.1.patch b/dev-vcs/mercurial/patches/mercurial-2.9.1.patch
deleted file mode 100644
index edfe44133..000000000
--- a/dev-vcs/mercurial/patches/mercurial-2.9.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mercurial-2.8.1/mercurial/ui.py.orig mercurial-2.8.1/mercurial/ui.py
---- mercurial-2.8.1/mercurial/ui.py.orig	2012-06-01 22:48:21.025690112 -0600
-+++ mercurial-2.8.1/mercurial/ui.py	2012-06-04 17:15:16.317980672 -0600
-@@ -693,7 +693,7 @@ class ui(object):
-             # avoid confusion.
-             editor = 'E'
-         else:
--            editor = 'vi'
-+            editor = 'nano'
-         return (os.environ.get("HGEDITOR") or
-                 self.config("ui", "editor") or
-                 os.environ.get("VISUAL") or
diff --git a/dev-vcs/mercurial/patches/mercurial-2.9.2.patch b/dev-vcs/mercurial/patches/mercurial-2.9.2.patch
deleted file mode 100644
index edfe44133..000000000
--- a/dev-vcs/mercurial/patches/mercurial-2.9.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mercurial-2.8.1/mercurial/ui.py.orig mercurial-2.8.1/mercurial/ui.py
---- mercurial-2.8.1/mercurial/ui.py.orig	2012-06-01 22:48:21.025690112 -0600
-+++ mercurial-2.8.1/mercurial/ui.py	2012-06-04 17:15:16.317980672 -0600
-@@ -693,7 +693,7 @@ class ui(object):
-             # avoid confusion.
-             editor = 'E'
-         else:
--            editor = 'vi'
-+            editor = 'nano'
-         return (os.environ.get("HGEDITOR") or
-                 self.config("ui", "editor") or
-                 os.environ.get("VISUAL") or
diff --git a/dev-vcs/mercurial/patches/mercurial-3.2.1.patch b/dev-vcs/mercurial/patches/mercurial-3.2.1.patch
deleted file mode 100644
index 4ca47d318..000000000
--- a/dev-vcs/mercurial/patches/mercurial-3.2.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mercurial-3.2.1/mercurial/ui.py.orig mercurial-3.2/mercurial/ui.py
---- mercurial-3.2.1/mercurial/ui.py.orig	2012-06-01 22:48:21.025690112 -0600
-+++ mercurial-3.2.1/mercurial/ui.py	2012-06-04 17:15:16.317980672 -0600
-@@ -693,7 +693,7 @@ class ui(object):
-             # avoid confusion.
-             editor = 'E'
-         else:
--            editor = 'vi'
-+            editor = 'nano'
-         return (os.environ.get("HGEDITOR") or
-                 self.config("ui", "editor") or
-                 os.environ.get("VISUAL") or
diff --git a/dev-vcs/mercurial/patches/mercurial-4.9.1.patch b/dev-vcs/mercurial/patches/mercurial-4.9.1.patch
deleted file mode 100644
index c2885f8aa..000000000
--- a/dev-vcs/mercurial/patches/mercurial-4.9.1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/contrib/python-zstandard/setup_zstd.py b/contrib/python-zstandard/setup_zstd.py
-index 23b6fa1..9cb9713 100644
---- a/contrib/python-zstandard/setup_zstd.py
-+++ b/contrib/python-zstandard/setup_zstd.py
-@@ -159,8 +159,8 @@ def get_c_extension(support_legacy=False, system_zstd=False, name='zstd',
-         extra_args.append('-DZDICTLIB_VISIBILITY=')
-         extra_args.append('-DZSTDERRORLIB_VISIBILITY=')
- 
--        if compiler_type == 'unix':
--            extra_args.append('-fvisibility=hidden')
-+        #if compiler_type == 'unix':
-+        #    extra_args.append('-fvisibility=hidden')
- 
-     if not system_zstd and support_legacy:
-         extra_args.append('-DZSTD_LEGACY_SUPPORT=1')
-diff --git a/mercurial/ui.py b/mercurial/ui.py
-index 63ecc01..b76dd92 100644
---- a/mercurial/ui.py
-+++ b/mercurial/ui.py
-@@ -1722,7 +1722,7 @@ class ui(object):
-             # avoid confusion.
-             editor = 'E'
-         else:
--            editor = 'vi'
-+            editor = 'nano'
-         return (encoding.environ.get("HGEDITOR") or
-                 self.config("ui", "editor", editor))
- 
diff --git a/dev-vcs/mercurial/patches/mercurial-6.0.1.patch b/dev-vcs/mercurial/patches/mercurial-6.0.1.patch
new file mode 100644
index 000000000..4d896a39c
--- /dev/null
+++ b/dev-vcs/mercurial/patches/mercurial-6.0.1.patch
@@ -0,0 +1,13 @@
+diff --git a/mercurial/ui.py b/mercurial/ui.py
+index 2c5d9cf..406e714 100644
+--- a/mercurial/ui.py
++++ b/mercurial/ui.py
+@@ -1921,7 +1921,7 @@ class ui(object):
+             # while s/vi/vim/ doesn't.
+             editor = b'vim'
+         else:
+-            editor = b'vi'
++            editor = b'nano'
+         return encoding.environ.get(b"HGEDITOR") or self.config(
+             b"ui", b"editor", editor
+         )