diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile index 8352b5905357..6acbf9797279 100644 --- a/devel/mercurial/Makefile +++ b/devel/mercurial/Makefile @@ -1,86 +1,83 @@ PORTNAME= mercurial -PORTVERSION= 7.1.2 +PORTVERSION= 7.2.3 CATEGORIES= devel python MASTER_SITES= https://www.mercurial-scm.org/release/ MAINTAINER= python@FreeBSD.org COMMENT= Fast, lightweight source control management system WWW= https://www.mercurial-scm.org/ 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 SHEBANG_FILES= contrib/hgweb.fcgi hgweb.cgi USE_PYTHON= autoplist pep517 OPTIONS_DEFINE= DATA DOCS NLS FREEBSD OPTIONS_DEFAULT= DATA 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_USES= gettext-tools CONTRIB_FILES= bash_completion \ casesmash.py \ check-code.py \ debugcmdserver.py \ debugshell.py \ dumprevlog \ hg-ssh \ hgk \ hgsh/Makefile \ hgsh/hgsh.c \ mercurial.el \ mq.el \ pylintrc \ python-hook-examples.py \ simplemerge \ tcsh_completion \ tcsh_completion_build.sh \ undumprevlog \ zsh_completion \ vim/HGAnnotate.vim \ vim/hg-menu.vim \ vim/hgcommand.vim \ vim/hgtest.vim \ vim/patchreview.txt \ vim/patchreview.vim PORTDOCS= CONTRIBUTORS README.rst .include .if ${PYTHON_VER} != ${PYTHON_DEFAULT} 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/ ${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ -name '*.so' -exec ${STRIP_CMD} {} + post-install-DATA-on: .for d in hgsh vim ${MKDIR} ${STAGEDIR}${DATADIR}/contrib/${d} .endfor ${MKDIR} ${STAGEDIR}${DATADIR}/www .for f in ${CONTRIB_FILES} ${INSTALL_DATA} ${WRKSRC}/contrib/${f} \ ${STAGEDIR}${DATADIR}/contrib/${f} .endfor ${INSTALL_DATA} ${WRKSRC}/hgweb.cgi ${WRKSRC}/contrib/hgweb.* ${STAGEDIR}${DATADIR}/www post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo index ff72d5cc6ae3..a81d1b556698 100644 --- a/devel/mercurial/distinfo +++ b/devel/mercurial/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1767819046 -SHA256 (mercurial-7.1.2.tar.gz) = ce27b9a4767cf2ea496b51468bae512fa6a6eaf0891e49f8961dc694b4dc81ca -SIZE (mercurial-7.1.2.tar.gz) = 9059642 +TIMESTAMP = 1782827532 +SHA256 (mercurial-7.2.3.tar.gz) = 1cb74ca95da021666b5a94a9bdc62f16255a6452f5a84cc2ae71bda8c7dbe36b +SIZE (mercurial-7.2.3.tar.gz) = 9290867 diff --git a/devel/mercurial/files/patch-pyproject.toml b/devel/mercurial/files/patch-pyproject.toml new file mode 100644 index 000000000000..db15897c92d5 --- /dev/null +++ b/devel/mercurial/files/patch-pyproject.toml @@ -0,0 +1,20 @@ +--- pyproject.toml.orig 2026-06-29 15:03:22 UTC ++++ pyproject.toml +@@ -1,6 +1,6 @@ requires = [ + [build-system] + requires = [ +- "setuptools>=77", ++ "setuptools", + "setuptools-scm>=8.1.0", + ] + build-backend = "setuptools.build_meta" +@@ -14,8 +14,7 @@ requires-python = ">=3.9" + description="Fast scalable distributed SCM (revision control, version control) system" + readme = "README.rst" + requires-python = ">=3.9" +-license = "GPL-2.0-or-later" +-license-files = ["COPYING"] ++license = {text = "GPL-2.0-or-later"} + classifiers=[ + "Development Status :: 6 - Mature", + "Environment :: Console", diff --git a/devel/mercurial/files/patch-setup.py b/devel/mercurial/files/patch-setup.py index 6edb0a878e11..45922d038036 100644 --- a/devel/mercurial/files/patch-setup.py +++ b/devel/mercurial/files/patch-setup.py @@ -1,26 +1,26 @@ ---- setup.py.orig 2025-11-13 20:57:16 UTC +--- setup.py.orig 2026-06-29 15:03:22 UTC +++ setup.py -@@ -421,7 +421,7 @@ class hgbuildext(build_ext): +@@ -401,7 +401,7 @@ class hgbuildext(build_ext): ) for rustext in ruststandalones: - rustext.build('' if self.editable_mode else self.build_lib) + rustext.build(self.build_lib) return build_ext.build_extensions(self) -@@ -515,12 +515,8 @@ class hgbuildpy(build_py): +@@ -495,12 +495,8 @@ class hgbuildpy(build_py): ] ) - if self.editable_mode: - here = os.path.dirname(__file__) - basepath = os.path.join(here, 'mercurial') - else: - basepath = os.path.join(self.build_lib, 'mercurial') - self.mkpath(basepath) + basepath = os.path.join(self.build_lib, 'mercurial') + self.mkpath(basepath) write_if_changed(os.path.join(basepath, '__modulepolicy__.py'), content) diff --git a/devel/mercurial/pkg-plist b/devel/mercurial/pkg-plist index 383135d7690c..8f98d0cfdc06 100644 --- a/devel/mercurial/pkg-plist +++ b/devel/mercurial/pkg-plist @@ -1,31 +1,31 @@ %%DATA%%%%DATADIR%%/contrib/bash_completion %%DATA%%%%DATADIR%%/contrib/casesmash.py %%DATA%%%%DATADIR%%/contrib/check-code.py %%DATA%%%%DATADIR%%/contrib/debugcmdserver.py %%DATA%%%%DATADIR%%/contrib/debugshell.py %%DATA%%%%DATADIR%%/contrib/dumprevlog %%DATA%%%%DATADIR%%/contrib/hg-ssh %%DATA%%%%DATADIR%%/contrib/hgk -%%DATA%%%%DATADIR%%/contrib/hgsh/hgsh.c %%DATA%%%%DATADIR%%/contrib/hgsh/Makefile +%%DATA%%%%DATADIR%%/contrib/hgsh/hgsh.c %%DATA%%%%DATADIR%%/contrib/mercurial.el %%DATA%%%%DATADIR%%/contrib/mq.el %%DATA%%%%DATADIR%%/contrib/pylintrc %%DATA%%%%DATADIR%%/contrib/python-hook-examples.py %%DATA%%%%DATADIR%%/contrib/simplemerge %%DATA%%%%DATADIR%%/contrib/tcsh_completion %%DATA%%%%DATADIR%%/contrib/tcsh_completion_build.sh %%DATA%%%%DATADIR%%/contrib/undumprevlog -%%DATA%%%%DATADIR%%/contrib/vim/hg-menu.vim %%DATA%%%%DATADIR%%/contrib/vim/HGAnnotate.vim +%%DATA%%%%DATADIR%%/contrib/vim/hg-menu.vim %%DATA%%%%DATADIR%%/contrib/vim/hgcommand.vim %%DATA%%%%DATADIR%%/contrib/vim/hgtest.vim %%DATA%%%%DATADIR%%/contrib/vim/patchreview.txt %%DATA%%%%DATADIR%%/contrib/vim/patchreview.vim %%DATA%%%%DATADIR%%/contrib/zsh_completion %%DATA%%%%DATADIR%%/www/hgweb.cgi %%DATA%%%%DATADIR%%/www/hgweb.fcgi %%DATA%%%%DATADIR%%/www/hgweb.wsgi share/man/man1/hg.1.gz share/man/man5/hgignore.5.gz share/man/man5/hgrc.5.gz