git: 84c3fe3a93fd - main - devel/mercurial: update from 6.9.5 to 7.1.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 30 Jun 2026 10:22:03 UTC
The branch main has been updated by osa:
URL: https://cgit.FreeBSD.org/ports/commit/?id=84c3fe3a93fdc9b9207ea4b58ce39479b6dbc740
commit 84c3fe3a93fdc9b9207ea4b58ce39479b6dbc740
Author: Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2026-06-30 10:20:21 +0000
Commit: Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2026-06-30 10:21:57 +0000
devel/mercurial: update from 6.9.5 to 7.1.2
PR: 286908
Approved by: python (vishwin, maintainer)
Sponsored by: tipi.work
---
devel/mercurial/Makefile | 10 +++--
devel/mercurial/distinfo | 6 +--
devel/mercurial/files/extra-patch-setup.py | 43 ----------------------
.../files/patch-hgdemandimport_____init____.py | 10 -----
4 files changed, 9 insertions(+), 60 deletions(-)
diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 92f10715c22c..8352b5905357 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,6 +1,5 @@
PORTNAME= mercurial
-PORTVERSION= 6.9.5
-PORTREVISION= 1
+PORTVERSION= 7.1.2
CATEGORIES= devel python
MASTER_SITES= https://www.mercurial-scm.org/release/
@@ -12,6 +11,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=8.1.0:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
USES= cpe python shebangfix
@@ -25,8 +25,7 @@ OPTIONS_SUB= yes
DATA_SUB_FILES= pkg-message
FREEBSD_DESC= Patches used internally by the FreeBSD Project
FREEBSD_EXTRA_PATCHES= ${FILESDIR}/extra-patch-authormapsuffix
-NLS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-setup.py
-NLS_USES= gettext
+NLS_USES= gettext-tools
CONTRIB_FILES= bash_completion \
casesmash.py \
@@ -61,6 +60,9 @@ PORTDOCS= CONTRIBUTORS README.rst
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
.endif
+post-patch:
+ @${REINPLACE_CMD} -e 's|setuptools>=64|setuptools|' ${WRKSRC}/pyproject.toml
+
post-install:
${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/share/man/man1/
${INSTALL_MAN} ${WRKSRC}/doc/*.5 ${STAGEDIR}${PREFIX}/share/man/man5/
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index 2022330fd3f5..ff72d5cc6ae3 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745178254
-SHA256 (mercurial-6.9.5.tar.gz) = d3f22aeef9e9dcd6e562132950226c2c955d35271bd00a01481efca2b1cc65fd
-SIZE (mercurial-6.9.5.tar.gz) = 8922574
+TIMESTAMP = 1767819046
+SHA256 (mercurial-7.1.2.tar.gz) = ce27b9a4767cf2ea496b51468bae512fa6a6eaf0891e49f8961dc694b4dc81ca
+SIZE (mercurial-7.1.2.tar.gz) = 9059642
diff --git a/devel/mercurial/files/extra-patch-setup.py b/devel/mercurial/files/extra-patch-setup.py
deleted file mode 100644
index fc8a62f9e36e..000000000000
--- a/devel/mercurial/files/extra-patch-setup.py
+++ /dev/null
@@ -1,43 +0,0 @@
---- setup.py.orig 2024-11-20 14:38:51 UTC
-+++ setup.py
-@@ -527,39 +527,7 @@ class hgbuildmo(build):
- raise DistutilsExecError("failed to build translations")
-
- def _run(self):
-- try:
-- from shutil import which as find_executable
-- except ImportError:
-- # Deprecated in py3.12
-- from distutils.spawn import find_executable
--
-- if not find_executable('msgfmt'):
-- self.warn(
-- "could not find msgfmt executable, no translations "
-- "will be built"
-- )
-- return False
--
-- podir = 'i18n'
-- if not os.path.isdir(podir):
-- self.warn("could not find %s/ directory" % podir)
-- return False
--
-- join = os.path.join
-- for po in os.listdir(podir):
-- if not po.endswith('.po'):
-- continue
-- pofile = join(podir, po)
-- modir = join('locale', po[:-3], 'LC_MESSAGES')
-- mofile = join(modir, 'hg.mo')
-- mobuildfile = join('mercurial', mofile)
-- cmd = ['msgfmt', '-v', '-o', mobuildfile, pofile]
-- if sys.platform != 'sunos5':
-- # msgfmt on Solaris does not know about -c
-- cmd.append('-c')
-- self.mkpath(join('mercurial', modir))
-- self.make_file([pofile], mobuildfile, spawn, (cmd,))
-- return True
-+ pass
-
-
- class hgdist(Distribution):
diff --git a/devel/mercurial/files/patch-hgdemandimport_____init____.py b/devel/mercurial/files/patch-hgdemandimport_____init____.py
deleted file mode 100644
index a6f4c1d7ae80..000000000000
--- a/devel/mercurial/files/patch-hgdemandimport_____init____.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- hgdemandimport/__init__.py.orig 2025-04-03 13:32:42 UTC
-+++ hgdemandimport/__init__.py
-@@ -60,6 +60,7 @@ IGNORES = {
- 'setuptools',
- '_distutils_hack.override',
- # threading is locally imported by importlib.util.LazyLoader.exec_module
-+ '_contextvars',
- '_weakrefset',
- 'warnings',
- 'threading',