git: a6233e5a2fdf - main - */*: switch dependency from devel/py-lxml5 to devel/py-lxml

From: Hiroki Tagato <tagattie_at_FreeBSD.org>
Date: Mon, 15 Sep 2025 14:08:43 UTC
The branch main has been updated by tagattie:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a6233e5a2fdfc3f67a89a90ac005521f25395355

commit a6233e5a2fdfc3f67a89a90ac005521f25395355
Author:     Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2025-09-15 13:55:40 +0000
Commit:     Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2025-09-15 13:55:40 +0000

    */*: switch dependency from devel/py-lxml5 to devel/py-lxml
    
    Currently, there are two versions of python XML processing library
    which conflict each other in the ports tree, namely:
    - devel/py-lxml5 (now at version 5.4.0)
    - devel/py-lxml  (now at version 6.0.1)
    
    To avoid the situation that some ports depend on py-lxml5 and some
    others do on py-lxml (by switching dependencies individually), this
    commit switches the dependencies from py-lxml5 to py-lxml at once.
    
    Additional note: There are still two ports (textproc/py-rdflib and
    www/py-draftjs-exporter) depending on py-lxml5 since they limit upper
    version to less than 6.
    
    PR:             289491
    Approved by:    Michiel van Baak Jansen <michiel@vanbaak.eu>, arrowd,
                    crees, madpilot, delphij, marcus, nivit, kai,
                    skreuzer, fluffy, bofh, thierry, stephen, sunpoet,
                    0mp, Eric Camachat <eric@camachat.org>
---
 astro/py-skyfield/Makefile                | 4 ++--
 audio/lv2/Makefile                        | 6 +++---
 audio/puddletag/Makefile                  | 3 ++-
 biology/py-ete3/Makefile                  | 4 ++--
 cad/k40-whisperer/Makefile                | 4 ++--
 comms/gnuradio/Makefile                   | 4 ++--
 converters/py-svglib/Makefile             | 4 ++--
 deskutils/calibre/Makefile                | 5 +++--
 deskutils/dosage/Makefile                 | 4 ++--
 devel/py-clldutils/Makefile               | 4 ++--
 devel/py-grab/Makefile                    | 4 ++--
 devel/py-keystoneauth1/Makefile           | 3 ++-
 devel/py-libtaxii/Makefile                | 4 ++--
 devel/py-lxml-html-clean/Makefile         | 4 ++--
 devel/py-mypy/Makefile                    | 5 +++--
 devel/py-oslo.vmware/Makefile             | 4 ++--
 devel/py-pyTooling/Makefile               | 4 ++--
 devel/py-pymaven-patch/Makefile           | 4 ++--
 devel/py-pyquery/Makefile                 | 4 ++--
 devel/py-python-xcaplib/Makefile          | 4 ++--
 devel/py-selection/Makefile               | 4 ++--
 devel/py-trimesh/Makefile                 | 4 ++--
 devel/py-weblib/Makefile                  | 4 ++--
 devel/py-xsdata/Makefile                  | 4 ++--
 devel/qbs/Makefile                        | 3 ++-
 dns/dnsrecon/Makefile                     | 4 ++--
 editors/libreoffice/Makefile              | 4 ++--
 editors/novelwriter/Makefile              | 3 ++-
 finance/beancount/Makefile                | 6 +++---
 finance/beangulp/Makefile                 | 4 ++--
 finance/odoo/Makefile                     | 4 ++--
 finance/odoo16/Makefile                   | 4 ++--
 finance/odoo17/Makefile                   | 4 ++--
 finance/py-ebaysdk/Makefile               | 4 ++--
 finance/py-finviz/Makefile                | 4 ++--
 finance/py-investpy/Makefile              | 4 ++--
 finance/py-ofxparse/Makefile              | 3 ++-
 finance/py-pytrends/Makefile              | 4 ++--
 finance/py-yahooquery/Makefile            | 4 ++--
 graphics/inkscape/Makefile                | 4 ++--
 graphics/py-pycollada/Makefile            | 4 ++--
 graphics/py-termtosvg/Makefile            | 4 ++--
 graphics/py-tifffile/Makefile             | 3 ++-
 graphics/variety/Makefile                 | 4 ++--
 korean/hunspell/Makefile                  | 4 ++--
 mail/automx/Makefile                      | 4 ++--
 mail/py-premailer/Makefile                | 4 ++--
 math/octave-forge-geometry/Makefile       | 4 ++--
 math/py-mathics/Makefile                  | 3 ++-
 math/py-pandas-datareader/Makefile        | 4 ++--
 math/py-pandas/Makefile                   | 4 ++--
 misc/py-cppman/Makefile                   | 3 ++-
 misc/py-kartograph/Makefile               | 4 ++--
 misc/py-mffpy/Makefile                    | 4 ++--
 misc/py-pykml/Makefile                    | 4 ++--
 multimedia/mythtv/Makefile                | 6 +++---
 multimedia/py-soco/Makefile               | 4 ++--
 multimedia/streamlink/Makefile            | 4 ++--
 multimedia/wireplumber/Makefile           | 4 ++--
 net-im/py-matrix-synapse/Makefile         | 6 +++---
 net-mgmt/crmsh/Makefile                   | 4 ++--
 net-mgmt/py-junos-eznc/Makefile           | 4 ++--
 net-mgmt/py-napalm/Makefile               | 4 ++--
 net-mgmt/py-ncclient/Makefile             | 4 ++--
 net-mgmt/py-nxapi-plumbing/Makefile       | 4 ++--
 net-mgmt/py-opn-cli/Makefile              | 4 ++--
 net-mgmt/py-pyIOSXR/Makefile              | 4 ++--
 net-mgmt/py-pyang/Makefile                | 4 ++--
 net-p2p/bazarr/Makefile                   | 4 ++--
 net/py-blobfile/Makefile                  | 4 ++--
 net/py-pyshark/Makefile                   | 4 ++--
 net/py-zeep/Makefile                      | 4 ++--
 net/ryu/Makefile                          | 4 ++--
 news/py-pynzb/Makefile                    | 4 ++--
 print/py-fontaine/Makefile                | 4 ++--
 print/py-fontbakery/Makefile              | 4 ++--
 print/py-relatorio/Makefile               | 4 ++--
 print/py-ufolib2/Makefile                 | 3 ++-
 science/py-OpenMC/Makefile                | 4 ++--
 science/py-pycsw/Makefile                 | 4 ++--
 science/py-pygeometa/Makefile             | 4 ++--
 science/py-pyteomics/Makefile             | 6 +++---
 science/py-sarpy/Makefile                 | 3 ++-
 science/votca/Makefile                    | 4 ++--
 security/caldera/Makefile                 | 4 ++--
 security/gvmd/Makefile                    | 4 ++--
 security/py-cybox/Makefile                | 4 ++--
 security/py-maec/Makefile                 | 4 ++--
 security/py-mixbox/Makefile               | 4 ++--
 security/py-ospd-openvas/Makefile         | 4 ++--
 security/py-pykeepass/Makefile            | 4 ++--
 security/py-python-cas/Makefile           | 4 ++--
 security/py-python3-saml/Makefile         | 4 ++--
 security/py-signxml/Makefile              | 3 ++-
 security/py-stix/Makefile                 | 4 ++--
 security/py-xmlsec/Makefile               | 3 ++-
 sysutils/bamf/Makefile                    | 4 ++--
 sysutils/py-howdoi/Makefile               | 4 ++--
 textproc/itstool/Makefile                 | 4 ++--
 textproc/py-citeproc-py/Makefile          | 4 ++--
 textproc/py-cyclonedx-python-lib/Makefile | 3 ++-
 textproc/py-docxcompose/Makefile          | 4 ++--
 textproc/py-docxtpl/Makefile              | 4 ++--
 textproc/py-elementpath/Makefile          | 4 ++--
 textproc/py-markups/Makefile              | 4 ++--
 textproc/py-parsel/Makefile               | 4 ++--
 textproc/py-petl/Makefile                 | 4 ++--
 textproc/py-pikepdf/Makefile              | 4 ++--
 textproc/py-pyexcel-ezodf/Makefile        | 4 ++--
 textproc/py-pyexcel-ods3/Makefile         | 4 ++--
 textproc/py-python-docx/Makefile          | 4 ++--
 textproc/py-python-pptx/Makefile          | 4 ++--
 textproc/py-sphinx-material/Makefile      | 4 ++--
 textproc/py-sphinx-tabs/Makefile          | 4 ++--
 textproc/py-toronado/Makefile             | 4 ++--
 textproc/py-xmldiff/Makefile              | 4 ++--
 textproc/sigil/Makefile                   | 3 ++-
 textproc/translate-toolkit/Makefile       | 4 ++--
 textproc/xml2rfc/Makefile                 | 3 ++-
 textproc/yelp-tools/Makefile              | 4 ++--
 www/py-beautifulsoup/Makefile             | 4 ++--
 www/py-caldav/Makefile                    | 4 ++--
 www/py-calibreweb/Makefile                | 3 ++-
 www/py-cinemagoer/Makefile                | 4 ++--
 www/py-django_compressor/Makefile         | 4 ++--
 www/py-feedgen/Makefile                   | 4 ++--
 www/py-free-proxy/Makefile                | 4 ++--
 www/py-html5-parser/Makefile              | 4 ++--
 www/py-html5lib-modern/Makefile           | 4 ++--
 www/py-htmldate/Makefile                  | 4 ++--
 www/py-inlinestyler/Makefile              | 4 ++--
 www/py-mechanicalsoup/Makefile            | 4 ++--
 www/py-pelican/Makefile                   | 4 ++--
 www/py-readability-lxml/Makefile          | 3 ++-
 www/py-scrapy/Makefile                    | 3 ++-
 www/py-seafdav/Makefile                   | 4 ++--
 www/py-searxng-devel/Makefile             | 4 ++--
 www/py-soupsieve/Makefile                 | 3 ++-
 www/py-splinter/Makefile                  | 4 ++--
 www/py-spyne/Makefile                     | 4 ++--
 www/py-urlwatch/Makefile                  | 4 ++--
 www/py-woob/Makefile                      | 6 +++---
 www/xist/Makefile                         | 4 ++--
 x11-fonts/py-afdko/Makefile               | 4 ++--
 x11-fonts/py-fontfeatures/Makefile        | 4 ++--
 x11-fonts/py-ufoLib/Makefile              | 4 ++--
 x11-themes/kf6-breeze-icons/Makefile      | 3 ++-
 x11/cinnamon/Makefile                     | 4 ++--
 148 files changed, 304 insertions(+), 282 deletions(-)

diff --git a/astro/py-skyfield/Makefile b/astro/py-skyfield/Makefile
index ab562fd15987..11a611318900 100644
--- a/astro/py-skyfield/Makefile
+++ b/astro/py-skyfield/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	skyfield
 PORTVERSION=	1.53
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	astro python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}jplephem>0:astro/py-jplephem@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY}	\
-		${PYTHON_PKGNAMEPREFIX}lxml5>0:devel/py-lxml5@${PY_FLAVOR}	\
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}sgp4>0:astro/py-sgp4@${PY_FLAVOR}	\
diff --git a/audio/lv2/Makefile b/audio/lv2/Makefile
index 72bfb3945e03..ed4045786e46 100644
--- a/audio/lv2/Makefile
+++ b/audio/lv2/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	lv2
 PORTVERSION=	1.18.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	https://lv2plug.in/spec/
 
@@ -13,7 +13,7 @@ LICENSE_COMB=	multi
 # Only lv2specgen.py is under MIT
 LICENSE_FILE_ISCL=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml5>0:devel/py-lxml5@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rdflib>0:textproc/py-rdflib@${PY_FLAVOR}
 
@@ -31,7 +31,7 @@ DOCS_BUILD_DEPENDS=	asciidoc:textproc/asciidoc
 
 DOXYGEN_IMPLIES=	DOCS
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
-			${PYTHON_PKGNAMEPREFIX}lxml5>0:devel/py-lxml5@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}rdflib>0:textproc/py-rdflib@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR}
diff --git a/audio/puddletag/Makefile b/audio/puddletag/Makefile
index 2ae6968755be..e3dd96ece499 100644
--- a/audio/puddletag/Makefile
+++ b/audio/puddletag/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	puddletag
 DISTVERSION=	2.5.0
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -32,7 +33,7 @@ LXML_DESC=		Enable better HTML parsing
 PYACOUSTID_DESC=	Enable support for tagging audio files using web based Tag Sources
 
 LEVENSHTEIN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Levenshtein>=0:devel/py-Levenshtein@${PY_FLAVOR}
-LXML_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}lxml5>=0:devel/py-lxml5@${PY_FLAVOR}
+LXML_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR}
 PYACOUSTID_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}pyacoustid>=0:audio/py-pyacoustid@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/biology/py-ete3/Makefile b/biology/py-ete3/Makefile
index 4fc14d250f0a..66cbe3d09a76 100644
--- a/biology/py-ete3/Makefile
+++ b/biology/py-ete3/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ete3
 DISTVERSION=	3.1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,7 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}lxml5>0:devel/py-lxml5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
diff --git a/cad/k40-whisperer/Makefile b/cad/k40-whisperer/Makefile
index 8762b7c14d70..33da3eede4b5 100644
--- a/cad/k40-whisperer/Makefile
+++ b/cad/k40-whisperer/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	k40-whisperer
 DISTVERSION=	0.59
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	cad python
 MASTER_SITES=	http://www.scorchworks.com/K40whisperer/
 DISTNAME=	K40_Whisperer-${DISTVERSION}_src
@@ -12,7 +12,7 @@ WWW=		https://www.scorchworks.com/K40whisperer/k40whisperer.html
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/gpl-3.0.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml5>0:devel/py-lxml5@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyusb>0:devel/py-pyusb@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR}
 
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 4d2beac8d839..f83233cf20c4 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gnuradio
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.10.12.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	comms astro hamradio
 
 MAINTAINER=	hamradio@FreeBSD.org
@@ -12,7 +12,7 @@ LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lxml5>0:devel/py-lxml5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyqtgraph>0:graphics/py-pyqtgraph@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.2,1:textproc/py-sphinx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml>0:devel/py-pyyaml@${PY_FLAVOR} \
diff --git a/converters/py-svglib/Makefile b/converters/py-svglib/Makefile
index 8385d4785f18..2dc75470ed1e 100644
--- a/converters/py-svglib/Makefile
+++ b/converters/py-svglib/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	svglib
 DISTVERSION=	1.5.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	converters python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,7 @@ LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cssselect2>=0.2.0:textproc/py-cssselect2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lxml5>0:devel/py-lxml5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tinycss2>=0.6.0:textproc/py-tinycss2@${PY_FLAVOR}
 
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index 19d4e3717021..ea6a0d023b74 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	calibre
 PORTVERSION=	8.10.0
+PORTREVISION=	1
 CATEGORIES=	deskutils python
 MASTER_SITES=	https://download.calibre-ebook.com/${PORTVERSION}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -20,7 +21,7 @@ BUILD_DEPENDS=		${LOCALBASE}/bin/cmake:devel/cmake-core \
 			${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.10:www/py-css-parser@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8.2:devel/py-python-dateutil@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.12:www/py-html5-parser@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}lxml5>=4.9.3:devel/py-lxml5@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}lxml>=4.9.3:devel/py-lxml@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}mechanize>=0.4.8:www/py-mechanize@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \
@@ -47,7 +48,7 @@ RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}apsw>=3.43.0.0:databases/py-apsw@${PY_FLAVO
 			${PYTHON_PKGNAMEPREFIX}feedparser>=6.0.10:textproc/py-feedparser@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.12:www/py-html5-parser@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}jeepney>=0.8.0:devel/py-jeepney@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}lxml5>=4.9.3:devel/py-lxml5@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}lxml>=4.9.3:devel/py-lxml@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}markdown>=3.4.4:textproc/py-markdown@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}mechanize>=0.4.8:www/py-mechanize@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.7:devel/py-msgpack@${PY_FLAVOR} \
diff --git a/deskutils/dosage/Makefile b/deskutils/dosage/Makefile
index a7a3b1a8c8c1..f64d3c2c5258 100644
--- a/deskutils/dosage/Makefile
+++ b/deskutils/dosage/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	dosage
 DISTVERSION=	3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils python
 MASTER_SITES=	PYPI
 
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}imagesize>0:graphics/py-imagesize@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lxml5>0:devel/py-lxml5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}platformdirs>0:devel/py-platformdirs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.0:www/py-requests@${PY_FLAVOR}
 
diff --git a/devel/py-clldutils/Makefile b/devel/py-clldutils/Makefile
index 1b420981e498..c5c9baee284a 100644
--- a/devel/py-clldutils/Makefile
+++ b/devel/py-clldutils/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	clldutils
 PORTVERSION=	3.24.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>=0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tabulate>=0:devel/py-tabulate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorlog>=0:devel/py-colorlog@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>=0:textproc/py-markdown@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lxml5>=0:devel/py-lxml5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=0:textproc/py-markupsafe@${PY_FLAVOR}
 
 USES=		python
diff --git a/devel/py-grab/Makefile b/devel/py-grab/Makefile
index 775b25e842eb..484e9bdb6a88 100644
--- a/devel/py-grab/Makefile
+++ b/devel/py-grab/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	grab
 PORTVERSION=	0.6.41
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +12,7 @@ WWW=		http://grablib.org/
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml5>0:devel/py-lxml5@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}weblib>0:devel/py-weblib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}selection>0:devel/py-selection@${PY_FLAVOR} \
diff --git a/devel/py-keystoneauth1/Makefile b/devel/py-keystoneauth1/Makefile
index 895d4bcf982c..91110b4d12e1 100644
--- a/devel/py-keystoneauth1/Makefile
+++ b/devel/py-keystoneauth1/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	keystoneauth1
 PORTVERSION=	5.12.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -37,6 +38,6 @@ BETAMAX_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}betamax>=0.7.0:www/py-betamax@${PY_F
 			${PYTHON_PKGNAMEPREFIX}pyyaml>=3.13:devel/py-pyyaml@${PY_FLAVOR}
 KERBEROS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests-kerberos>=0.8.0:security/py-requests-kerberos@${PY_FLAVOR}
 OAUTH1_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}oauthlib>=0.6.2:security/py-oauthlib@${PY_FLAVOR}
-SAML2_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml5>=4.2.0:devel/py-lxml5@${PY_FLAVOR}
+SAML2_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=4.2.0:devel/py-lxml@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-libtaxii/Makefile b/devel/py-libtaxii/Makefile
index c1e4ffbc5474..95e66598b14d 100644
--- a/devel/py-libtaxii/Makefile
+++ b/devel/py-libtaxii/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	libtaxii
 PORTVERSION=	1.1.119
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml5>=2.2.3:devel/py-lxml5@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.2.3:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=1.4.1:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR}
 
diff --git a/devel/py-lxml-html-clean/Makefile b/devel/py-lxml-html-clean/Makefile
index 51033a6ea298..d217b7203477 100644
--- a/devel/py-lxml-html-clean/Makefile
+++ b/devel/py-lxml-html-clean/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	lxml-html-clean
 PORTVERSION=	0.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,7 @@ WWW=		https://github.com/fedora-python/lxml_html_clean/
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml5>0:devel/py-lxml5@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils pytest
diff --git a/devel/py-mypy/Makefile b/devel/py-mypy/Makefile
index ca1d4e6e2704..00df859dadef 100644
--- a/devel/py-mypy/Makefile
+++ b/devel/py-mypy/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	mypy
 PORTVERSION=	1.17.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -27,7 +28,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mypy_extensions>=1.0.0:devel/py-mypy_extensi
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>=18.0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}filelock>=3.3.0:sysutils/py-filelock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.6.1<5.0.0:devel/py-importlib-metadata@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lxml5>=4.4.0:devel/py-lxml5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>=4.4.0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=4.0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}py>=1.5.2:devel/py-py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>=2.9.0:devel/py-pytest-cov@${PY_FLAVOR} \
@@ -53,6 +54,6 @@ DMYPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=4.0:sysutils/py-psutil@${PY_FL
 FASTER_CACHE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}orjson>=0:devel/py-orjson@${PY_FLAVOR}
 INSTALL_TYPES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip@${PY_FLAVOR}
 MYPYC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=50:devel/py-setuptools@${PY_FLAVOR}
-REPORTS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml5>=0:devel/py-lxml5@${PY_FLAVOR}
+REPORTS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-oslo.vmware/Makefile b/devel/py-oslo.vmware/Makefile
index a259856c41b8..72993c8e3532 100644
--- a/devel/py-oslo.vmware/Makefile
+++ b/devel/py-oslo.vmware/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	oslo.vmware
 PORTVERSION=	4.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}defusedxml>=0.7.1:devel/py-defusedxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}eventlet>=0.18.2:net/py-eventlet@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lxml5>=4.5.0:devel/py-lxml5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>=4.5.0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.26.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.context>=2.19.2:devel/py-oslo.context@${PY_FLAVOR} \
diff --git a/devel/py-pyTooling/Makefile b/devel/py-pyTooling/Makefile
index c6f2553c0b5e..c49f158fe214 100644
--- a/devel/py-pyTooling/Makefile
+++ b/devel/py-pyTooling/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pyTooling
 DISTVERSIONPREFIX=	v
 DISTVERSION=	8.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 #MASTER_SITES=	PYPI # requirements.txt is missing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -20,7 +20,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}anytree>=2.8.0:devel/py-anytree@${PY_FLAVOR
 		${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}igraph>0:math/py-igraph@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}itertree>0:devel/py-itertree@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lxml5>0:devel/py-lxml5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mypy>=1.10:devel/py-mypy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.6:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-benchmark>=4.0.0:devel/py-pytest-benchmark@${PY_FLAVOR} \
diff --git a/devel/py-pymaven-patch/Makefile b/devel/py-pymaven-patch/Makefile
index 9fc5fc0d5098..053df718dfea 100644
--- a/devel/py-pymaven-patch/Makefile
+++ b/devel/py-pymaven-patch/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pymaven-patch
 DISTVERSION=	0.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=1.9:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml5>=4.0.0:devel/py-lxml5@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=4.0.0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.10<2.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.7.0<3.0.0:www/py-requests@${PY_FLAVOR}
 
diff --git a/devel/py-pyquery/Makefile b/devel/py-pyquery/Makefile
index 8f737b2b57b3..68c9dc8d149b 100644
--- a/devel/py-pyquery/Makefile
+++ b/devel/py-pyquery/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pyquery
 PORTVERSION=	2.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cssselect>=1.2.0:www/py-cssselect@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lxml5>=2.1:devel/py-lxml5@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}lxml>=2.1:devel/py-lxml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
diff --git a/devel/py-python-xcaplib/Makefile b/devel/py-python-xcaplib/Makefile
index 795c77bd565a..6193a3771012 100644
--- a/devel/py-python-xcaplib/Makefile
+++ b/devel/py-python-xcaplib/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	python-xcaplib
 PORTVERSION=	1.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	http://download.ag-projects.com/XCAP/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,7 @@ LICENSE=	LGPL20+
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml5>=0:devel/py-lxml5@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-application>=1.1.5:devel/py-python-application@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
 
diff --git a/devel/py-selection/Makefile b/devel/py-selection/Makefile
index 8ed028b529dd..47c95714680c 100644
--- a/devel/py-selection/Makefile
+++ b/devel/py-selection/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	selection
 PORTVERSION=	0.0.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml5>0:devel/py-lxml5@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyquery>0:devel/py-pyquery@${PY_FLAVOR}
 
 USES=		python
diff --git a/devel/py-trimesh/Makefile b/devel/py-trimesh/Makefile
index 95217e9a5760..70bca1407374 100644
--- a/devel/py-trimesh/Makefile
+++ b/devel/py-trimesh/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	trimesh
 PORTVERSION=	3.5.25
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel cad python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.md
 # This order of dependancies directly lifted from setup.py please do not change!
 NEEDED_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lxml5>0:devel/py-lxml5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyglet1>0:graphics/py-pyglet1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}shapely>0:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rtree>0:devel/py-rtree@${PY_FLAVOR} \
diff --git a/devel/py-weblib/Makefile b/devel/py-weblib/Makefile
index 4a713635c261..c328db7bd965 100644
--- a/devel/py-weblib/Makefile
+++ b/devel/py-weblib/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	weblib
 PORTVERSION=	0.1.30
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,7 @@ LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytils>0:russian/py-pytils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lxml5>0:devel/py-lxml5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}user_agent>0:www/py-user_agent@${PY_FLAVOR}
 
 USES=		python
diff --git a/devel/py-xsdata/Makefile b/devel/py-xsdata/Makefile
index faf3fb1c901b..13d9c3f9e930 100644
--- a/devel/py-xsdata/Makefile
+++ b/devel/py-xsdata/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xsdata
 PORTVERSION=	25.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -32,7 +32,7 @@ CLI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=5.0:devel/py-click@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}toposort>=1.5:devel/py-toposort@${PY_FLAVOR} \
 			ruff>=0.9.8:devel/ruff
-LXML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml5>=4.5.0:devel/py-lxml5@${PY_FLAVOR}
+LXML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=4.5.0:devel/py-lxml@${PY_FLAVOR}
 SOAP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/devel/qbs/Makefile b/devel/qbs/Makefile
index 5d29eda711b9..78ad0d5d09e2 100644
--- a/devel/qbs/Makefile
+++ b/devel/qbs/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	qbs
 DISTVERSIONPREFIX=	src-
 DISTVERSION=	3.0.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	QT/official_releases/${PORTNAME}/${PORTVERSION}
 DIST_SUBDIR=	KDE/Qt/qbs
@@ -25,7 +26,7 @@ PLIST_SUB=	QBS_VER="${DISTVERSION:R}" \
 OPTIONS_DEFINE=	DOCS
 
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.12.2:www/py-beautifulsoup@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}lxml5>=4.9.3:devel/py-lxml5@${PY_FLAVOR}
+			${PYTHON_PKGNAMEPREFIX}lxml>=4.9.3:devel/py-lxml@${PY_FLAVOR}
 DOCS_USES=		python:build
 DOCS_USE=		QT=tools:build
 DOCS_CMAKE_BOOL=	QBS_INSTALL_HTML_DOCS \
diff --git a/dns/dnsrecon/Makefile b/dns/dnsrecon/Makefile
index 1384a4850f54..1c7aa593a64e 100644
--- a/dns/dnsrecon/Makefile
+++ b/dns/dnsrecon/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	dnsrecon
 DISTVERSION=	0.10.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	dns
 
 MAINTAINER=	rihaz.jerrin@gmail.com
@@ -10,7 +10,7 @@ WWW=		https://github.com/darkoperator/dnsrecon
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lxml5>=0:devel/py-lxml5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
 
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index cda08580fced..2a3a3dfc32b7 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	0
+PORTREVISION=	1
 
 .include "${.CURDIR}/Makefile.common"
 
@@ -28,7 +28,7 @@ BUILD_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
 		${LOCALBASE}/include/glm/glm.hpp:math/glm \
 		bash:shells/bash \
 		gsed:textproc/gsed \
-		${PYTHON_PKGNAMEPREFIX}lxml5>0:devel/py-lxml5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		coreutils>=8.23:sysutils/coreutils \
 		flex>=0.26:textproc/flex
 LIB_DEPENDS=	libapr-1.so:devel/apr1 \
diff --git a/editors/novelwriter/Makefile b/editors/novelwriter/Makefile
index 302b51efa716..b6cd30eaf2ea 100644
--- a/editors/novelwriter/Makefile
+++ b/editors/novelwriter/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	novelWriter
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.7.4
+PORTREVISION=	1
 CATEGORIES=	editors python
 MASTER_SITES=	PYPI
 
@@ -11,7 +12,7 @@ WWW=		https://novelwriter.io/ \
 
 LICENSE=	GPLv3
 
-PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml5>0:devel/py-lxml5@${PY_FLAVOR} \
+PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}enchant>=3.0.0:textproc/py-enchant@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PY_DEPENDS} \
diff --git a/finance/beancount/Makefile b/finance/beancount/Makefile
index fed72377bfa8..a7f5435bc147 100644
--- a/finance/beancount/Makefile
+++ b/finance/beancount/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	beancount
 PORTVERSION=	3.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance
 DIST_SUBDIR=	${PORTNAME}
 
@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}bottle>=0:www/py-bottle@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lxml5>=0:devel/py-lxml5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}meson-python>0:devel/meson-python@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=0:devel/py-python-dateutil@${PY_FLAVOR} \
@@ -24,7 +24,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_F
 		${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=0:devel/py-python-dateutil@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lxml5>=0:devel/py-lxml5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}regex>0:textproc/py-regex@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}google-api-python-client>=0:www/py-google-api-python-client@${PY_FLAVOR} \
diff --git a/finance/beangulp/Makefile b/finance/beangulp/Makefile
index 796b12b66053..cb86308a4a38 100644
--- a/finance/beangulp/Makefile
+++ b/finance/beangulp/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	beangulp
 PORTVERSION=	0.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	finance
 MASTER_SITES=	PYPI
 
@@ -15,7 +15,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@$
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}beautifulsoup>4:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=7:devel/py-click@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lxml5>0:devel/py-lxml5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}magic>0:devel/py-magic@${PY_FLAVOR} \
 		beancount>0:finance/beancount
 
diff --git a/finance/odoo/Makefile b/finance/odoo/Makefile
index e9be8a109df1..15363e299196 100644
--- a/finance/odoo/Makefile
+++ b/finance/odoo/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	odoo
 PORTVERSION=	18.0.20250719
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance www
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -32,7 +32,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}idna>0:dns/py-idna@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libsass>0:www/py-libsass@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml-html-clean>=0:devel/py-lxml-html-clean@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lxml5>=0:devel/py-lxml5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=0:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
diff --git a/finance/odoo16/Makefile b/finance/odoo16/Makefile
index e3d4d7c8e88d..6f9d6e4f30bd 100644
--- a/finance/odoo16/Makefile
+++ b/finance/odoo16/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	odoo
 PORTVERSION=	16.0.20250719
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	finance www
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	16
@@ -32,7 +32,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}idna>0:dns/py-idna@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libsass>0:www/py-libsass@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml-html-clean>=0:devel/py-lxml-html-clean@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lxml5>=0:devel/py-lxml5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=0:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
diff --git a/finance/odoo17/Makefile b/finance/odoo17/Makefile
index fa6e921f7cff..683bc50bbb1c 100644
--- a/finance/odoo17/Makefile
+++ b/finance/odoo17/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	odoo
 PORTVERSION=	17.0.20250719
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance www
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=  17
@@ -33,7 +33,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}idna>0:dns/py-idna@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libsass>0:www/py-libsass@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml-html-clean>=0:devel/py-lxml-html-clean@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lxml5>=0:devel/py-lxml5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=0:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
diff --git a/finance/py-ebaysdk/Makefile b/finance/py-ebaysdk/Makefile
index fe938f59c0c7..438a2dbfa45b 100644
--- a/finance/py-ebaysdk/Makefile
+++ b/finance/py-ebaysdk/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ebaysdk
 PORTVERSION=	2.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	finance python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +11,7 @@ WWW=		https://github.com/timotheus/ebaysdk-python
 
 LICENSE=	CDDL
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml5>=0:devel/py-lxml5@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/finance/py-finviz/Makefile b/finance/py-finviz/Makefile
index cec7fef1d63e..4ad7d126f759 100644
--- a/finance/py-finviz/Makefile
+++ b/finance/py-finviz/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	finviz
 DISTVERSION=	1.4.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	finance python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ LICENSE=	MIT
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiohttp>=3.7.4:www/py-aiohttp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.9.3:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cssselect>=1.1.0:www/py-cssselect@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lxml5>=4.6.3:devel/py-lxml5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>=4.6.3:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.25.1:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tenacity>=7.0.0:devel/py-tenacity@${PY_FLAVOR} \
diff --git a/finance/py-investpy/Makefile b/finance/py-investpy/Makefile
index 9d4ec58b8ede..ce8e6c512958 100644
--- a/finance/py-investpy/Makefile
+++ b/finance/py-investpy/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	investpy
 PORTVERSION=	1.0.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	finance python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +12,7 @@ WWW=		https://investpy.readthedocs.io/
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml5>0:devel/py-lxml5@${PY_FLAVOR} \
+PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.25.1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2019.3:devel/py-pytz@${PY_FLAVOR} \
diff --git a/finance/py-ofxparse/Makefile b/finance/py-ofxparse/Makefile
index 817688f57530..e99e34f5862e 100644
--- a/finance/py-ofxparse/Makefile
+++ b/finance/py-ofxparse/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ofxparse
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	finance python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lxml5>=0:devel/py-lxml5@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR}
*** 2355 LINES SKIPPED ***