Attachment 241727 Details for Bug 271013 – [patch] fix plist issues - v1: adjust PORTNAME, use autoplist

[patch] [patch] fix plist issues - v1: adjust PORTNAME, use autoplist

pr-beautifulsoup-plist-fix.diff.1-chg-portname (text/plain), 50.96 KB, created by John Hein on 2023-04-25 00:39:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2023-04-25 00:39:04 UTC

Size: 50.96 KB

patch

obsolete

>diff --git a/astro/py-skyfield/Makefile b/astro/py-skyfield/Makefile
>index bfd0b7490dc8..76e9fb2a0e0d 100644
>--- a/astro/py-skyfield/Makefile
>+++ b/astro/py-skyfield/Makefile
>@@ -33,7 +33,7 @@ RUN_DEPENDS=	${PYNUMPY}	\
> 		${PYTHON_PKGNAMEPREFIX}spktype21>0:astro/py-spktype21@${PY_FLAVOR}\
> 		${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR}\
> 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}\
>-		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup4@${PY_FLAVOR}
> 
> USES=		python:3.7+
> USE_PYTHON=	distutils
>diff --git a/audio/beets/Makefile b/audio/beets/Makefile
>index dc12cc7a9b06..456cd96e568b 100644
>--- a/audio/beets/Makefile
>+++ b/audio/beets/Makefile
>@@ -73,7 +73,7 @@ KODIUPDATE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_
> LASTFM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pylast>=0:audio/py-pylast@${PY_FLAVOR}
> LASTIMPORT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
> LYRICS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
>-LYRICS_GOOGLE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${PY_FLAVOR}
>+LYRICS_GOOGLE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup4@${PY_FLAVOR}
> METASYNC_DBUS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR}
> MPDSTATS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-mpd2>=0.4.2:audio/py-python-mpd2@${PY_FLAVOR}
> PLEXUPDATE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
>diff --git a/audio/lollypop/Makefile b/audio/lollypop/Makefile
>index 723779c5523d..972947ae3f62 100644
>--- a/audio/lollypop/Makefile
>+++ b/audio/lollypop/Makefile
>@@ -18,7 +18,7 @@ LIB_DEPENDS=	libnotify.so:devel/libnotify \
> 		libtotem-plparser.so:multimedia/totem-pl-parser
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.8:databases/py-sqlite3@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}cairo>=1.0.0:graphics/py-cairo@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0.0:www/py-beautifulsoup@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0.0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1:devel/py-dbus@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.4.0:multimedia/py-gstreamer1@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pylast>=1.4.0:audio/py-pylast@${PY_FLAVOR} \
>diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
>index 1f348954773c..39bb03483c88 100644
>--- a/deskutils/calibre/Makefile
>+++ b/deskutils/calibre/Makefile
>@@ -29,7 +29,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
> 		libuchardet.so:textproc/uchardet
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}mechanize>=0:www/py-mechanize@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \
>@@ -47,7 +47,7 @@ RUN_DEPENDS=	xdg-open:devel/xdg-utils \
> 		${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}mechanize>=0:www/py-mechanize@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
>diff --git a/devel/py-nbconvert/Makefile b/devel/py-nbconvert/Makefile
>index 6e65b2e28e79..4e1cb81df8f1 100644
>--- a/devel/py-nbconvert/Makefile
>+++ b/devel/py-nbconvert/Makefile
>@@ -12,7 +12,7 @@ LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatchling>=0.25:devel/py-hatchling@${PY_FLAVOR}
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}bleach>=0:www/py-bleach@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0:devel/py-Jinja2@${PY_FLAVOR} \
>diff --git a/dns/knock/Makefile b/dns/knock/Makefile
>index 36a2c13ef0cc..666d0ab3c67d 100644
>--- a/dns/knock/Makefile
>+++ b/dns/knock/Makefile
>@@ -10,7 +10,7 @@ WWW=		https://github.com/guelfoweb/knock
> 
> LICENSE=	GPLv2
> 
>-PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
>+PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
> BUILD_DEPENDS=	${PY_DEPENDS}
>diff --git a/dns/py-cloudflare/Makefile b/dns/py-cloudflare/Makefile
>index 3fdf4bbb3e5f..c31594fc8561 100644
>--- a/dns/py-cloudflare/Makefile
>+++ b/dns/py-cloudflare/Makefile
>@@ -11,7 +11,7 @@ WWW=		https://github.com/cloudflare/python-cloudflare
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}jsonlines>=0:devel/py-jsonlines@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
>diff --git a/dns/py-dns-lexicon/Makefile b/dns/py-dns-lexicon/Makefile
>index 7f1851f453c8..628135ec8213 100644
>--- a/dns/py-dns-lexicon/Makefile
>+++ b/dns/py-dns-lexicon/Makefile
>@@ -12,7 +12,7 @@ WWW=		https://github.com/AnalogJ/lexicon
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}cryptography>=2:security/py-cryptography@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4:devel/py-importlib-metadata@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}yaml>=3:devel/py-yaml@${PY_FLAVOR} \
>diff --git a/finance/beancount/Makefile b/finance/beancount/Makefile
>index 7d3b80e00809..a766aa02d43e 100644
>--- a/finance/beancount/Makefile
>+++ b/finance/beancount/Makefile
>@@ -10,14 +10,14 @@ WWW=		https://github.com/beancount/beancount
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
>+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}bottle>=0:www/py-bottle@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}python-magic>=0:devel/py-python-magic@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}bottle>=0:www/py-bottle@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
>diff --git a/finance/py-finviz/Makefile b/finance/py-finviz/Makefile
>index f71318cfb1d5..6bca2105d59a 100644
>--- a/finance/py-finviz/Makefile
>+++ b/finance/py-finviz/Makefile
>@@ -11,7 +11,7 @@ WWW=		https://github.com/mariostoev/finviz
> 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}beautifulsoup>=4.9.3:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}cssselect>=1.1.0:www/py-cssselect@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}lxml>=4.6.3:devel/py-lxml@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.25.1:www/py-requests@${PY_FLAVOR} \
>diff --git a/finance/py-finvizfinance/Makefile b/finance/py-finvizfinance/Makefile
>index 9375497afe3c..22199fdf0562 100644
>--- a/finance/py-finvizfinance/Makefile
>+++ b/finance/py-finvizfinance/Makefile
>@@ -12,7 +12,7 @@ WWW=		https://finvizfinance.readthedocs.io/en/latest/
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
>+PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}DateTime>0:devel/py-DateTime@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
>diff --git a/finance/py-ofxparse/Makefile b/finance/py-ofxparse/Makefile
>index 6a541c73dd9a..b1cf6df390d6 100644
>--- a/finance/py-ofxparse/Makefile
>+++ b/finance/py-ofxparse/Makefile
>@@ -12,7 +12,7 @@ WWW=		https://pypi.org/project/ofxparse/
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup4@${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}
>diff --git a/games/anki/Makefile b/games/anki/Makefile
>index 5fc8c01aaa4a..827db3eed2a7 100644
>--- a/games/anki/Makefile
>+++ b/games/anki/Makefile
>@@ -43,7 +43,7 @@ RUN_DEPENDS=	lame:audio/lame \
> 		${PYTHON_PKGNAMEPREFIX}send2trash>0:deskutils/py-send2trash@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}distro>0:sysutils/py-distro@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}Flask-Cors>0:www/py-flask-cors@${PY_FLAVOR} \
>diff --git a/graphics/py-hiplot/Makefile b/graphics/py-hiplot/Makefile
>index 9c26dd8a1a00..65071fd67d1d 100644
>--- a/graphics/py-hiplot/Makefile
>+++ b/graphics/py-hiplot/Makefile
>@@ -10,7 +10,7 @@ WWW=		https://github.com/facebookresearch/hiplot
> 
> LICENSE=	MIT
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}Flask-Compress>=0:www/py-flask-compress@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}ipython>=7.0.1:devel/ipython@${PY_FLAVOR}
>diff --git a/graphics/variety/Makefile b/graphics/variety/Makefile
>index 93e27584b109..041f7772c1ab 100644
>--- a/graphics/variety/Makefile
>+++ b/graphics/variety/Makefile
>@@ -14,7 +14,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.38:devel/py-pyth
> LIB_DEPENDS=	libgexiv2.so:graphics/gexiv2 \
> 		libnotify.so:devel/libnotify
> RUN_DEPENDS=	${PY_PILLOW} \
>-		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}cairo>=1.10.0:graphics/py-cairo@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1_1:devel/py-dbus@${PY_FLAVOR} \
>diff --git a/hebrew/py-pyluach/Makefile b/hebrew/py-pyluach/Makefile
>index b949765d915f..578bb667729c 100644
>--- a/hebrew/py-pyluach/Makefile
>+++ b/hebrew/py-pyluach/Makefile
>@@ -14,7 +14,7 @@ LICENSE=	MIT
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flit-core>0:devel/py-flit-core@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
>-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
>+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR}
> 
>diff --git a/mail/py-fuglu/Makefile b/mail/py-fuglu/Makefile
>index 1403081c0399..a93752cc591d 100644
>--- a/mail/py-fuglu/Makefile
>+++ b/mail/py-fuglu/Makefile
>@@ -36,7 +36,7 @@ SPAMASSASSIN_DESC=	Use SpamAssassin
> SPF_DESC=		Use SPF (in FuGlu)
> SQL_DESC=		Use SQL
> 
>-BEAUTIFULSOUP_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/bs4/__init__.py:www/py-beautifulsoup@${PY_FLAVOR}
>+BEAUTIFULSOUP_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/bs4/__init__.py:www/py-beautifulsoup4@${PY_FLAVOR}
> CLAMAV_RUN_DEPENDS=	clamd:security/clamav
> DKIM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dkimpy>0:mail/py-dkimpy@${PY_FLAVOR}
> MAGIC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}magic>0:devel/py-magic@${PY_FLAVOR}
>diff --git a/math/py-pandas/Makefile b/math/py-pandas/Makefile
>index b648ff458118..71a7ae9b11fa 100644
>--- a/math/py-pandas/Makefile
>+++ b/math/py-pandas/Makefile
>@@ -48,10 +48,10 @@ ALCHEMY14_DESC=	Support SQL databases via databases/py-sqlalchemy14
> BOTO_DESC=	Support Amazon S3 storage via devel/py-boto
> BTLNCK_DESC=	Accelerate certain NaN evals via math/py-bottleneck
> EXCEL_DESC=	MS Excel I/O Add-ons
>-HTML5LIB_DESC=	Parse HTML with www/py-html5lib and www/py-beautifulsoup
>+HTML5LIB_DESC=	Parse HTML with www/py-html5lib and www/py-beautifulsoup4
> HTML_DESC=	HTML Parsing/Generation Add-ons
> JINJA2_DESC=	Support conditional HTML formatting with devel/py-Jinja2
>-LXML_DESC=	Parse HTML with devel/py-lxml and www/py-beautifulsoup
>+LXML_DESC=	Parse HTML with devel/py-lxml and www/py-beautifulsoup4
> MPL_DESC=	Support graphical plotting output via math/py-matplotlib
> NUMEXPR_DESC=	Accelerate certain numerical ops via math/py-numexpr
> OPENPYXL_DESC=	Write MS Excel 2007+ with textproc/py-openpyxl
>@@ -71,10 +71,10 @@ ALCHEMY13_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy13>0:databases/py-sqlalc
> ALCHEMY14_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy14>0:databases/py-sqlalchemy14@${PY_FLAVOR}
> BOTO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR}
> BTLNCK_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bottleneck>=1.2.0:math/py-bottleneck@${PY_FLAVOR}
>-HTML5LIB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.2.1:www/py-beautifulsoup@${PY_FLAVOR} \
>+HTML5LIB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.2.1:www/py-beautifulsoup4@${PY_FLAVOR} \
> 			${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}
> JINJA2_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR}
>-LXML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.2.1:www/py-beautifulsoup@${PY_FLAVOR} \
>+LXML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.2.1:www/py-beautifulsoup4@${PY_FLAVOR} \
> 			${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR}
> MPL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=2.0.0:math/py-matplotlib@${PY_FLAVOR}
> NUMEXPR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numexpr>=2.6.1:math/py-numexpr@${PY_FLAVOR}
>diff --git a/misc/pubs/Makefile b/misc/pubs/Makefile
>index 2d60434c6f08..f01ff24e0712 100644
>--- a/misc/pubs/Makefile
>+++ b/misc/pubs/Makefile
>@@ -10,7 +10,7 @@ WWW=		https://github.com/pubs/pubs
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/license
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}bibtexparser>=1.0:textproc/py-bibtexparser@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
>diff --git a/misc/py-orange3-educational/Makefile b/misc/py-orange3-educational/Makefile
>index 1924f59c65da..f27d36b54d6c 100644
>--- a/misc/py-orange3-educational/Makefile
>+++ b/misc/py-orange3-educational/Makefile
>@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> RUN_DEPENDS=	orange3>0:misc/orange3 \
> 		${PYNUMPY} \
>-		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup4@${PY_FLAVOR}
> 
> USES=		python:3.4+
> USE_PYTHON=	distutils autoplist
>diff --git a/misc/py-pypatent/Makefile b/misc/py-pypatent/Makefile
>index 67a093e59bdf..fc421cd78815 100644
>--- a/misc/py-pypatent/Makefile
>+++ b/misc/py-pypatent/Makefile
>@@ -11,7 +11,7 @@ WWW=		https://github.com/daneads/pypatent
> 
> LICENSE=	GPLv3
> 
>-PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
>+PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}selenium>0:www/py-selenium@${PY_FLAVOR}
>diff --git a/multimedia/py-periscope/Makefile b/multimedia/py-periscope/Makefile
>index 464ffbbdb056..90cdb26aefe9 100644
>--- a/multimedia/py-periscope/Makefile
>+++ b/multimedia/py-periscope/Makefile
>@@ -15,7 +15,7 @@ WWW=		https://code.google.com/archive/p/periscope/
> 
> LICENSE=	LGPL3
> 
>-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${PY_FLAVOR}
>+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup4@${PY_FLAVOR}
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
> USES=		desktop-file-utils python:3.6+
>diff --git a/multimedia/py-subliminal/Makefile b/multimedia/py-subliminal/Makefile
>index 0a502dbb1cdb..19f7e7fb824e 100644
>--- a/multimedia/py-subliminal/Makefile
>+++ b/multimedia/py-subliminal/Makefile
>@@ -11,7 +11,7 @@ WWW=		https://subliminal.readthedocs.org/en/latest/index.html
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.4.0:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.4.0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}enzyme>=0.4.1:multimedia/py-enzyme@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}guessit>=3.0.0:multimedia/py-guessit@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py-requests@${PY_FLAVOR} \
>diff --git a/net-im/toot/Makefile b/net-im/toot/Makefile
>index 8280a65ebca5..e50f7a0d3e51 100644
>--- a/net-im/toot/Makefile
>+++ b/net-im/toot/Makefile
>@@ -10,11 +10,11 @@ WWW=		https://github.com/ihabunek/toot
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5.0:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5.0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.13:www/py-requests@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}wcwidth>=0.1.7:devel/py-wcwidth@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}urwid>=2.0.0:devel/py-urwid@${PY_FLAVOR}
>-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5.0:www/py-beautifulsoup@${PY_FLAVOR} \
>+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5.0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pytest-cov>=2.4.0:devel/py-pytest-cov@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pytest>=3.0.0:devel/py-pytest@${PY_FLAVOR}
> 
>diff --git a/net-mgmt/nagstamon/Makefile b/net-mgmt/nagstamon/Makefile
>index 6c0cebe06a00..f431342259f7 100644
>--- a/net-mgmt/nagstamon/Makefile
>+++ b/net-mgmt/nagstamon/Makefile
>@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}psutil>=2.0:sysutils/py-psutil@${PY_FLAVOR}
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.2.1:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.2.1:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
>diff --git a/net-mgmt/py-opn-cli/Makefile b/net-mgmt/py-opn-cli/Makefile
>index b92788d463b0..505ff789d2e9 100644
>--- a/net-mgmt/py-opn-cli/Makefile
>+++ b/net-mgmt/py-opn-cli/Makefile
>@@ -10,7 +10,7 @@ WWW=		https://github.com/andeman/opn-cli
> 
> LICENSE=	BSD2CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}click>=8.0.1:devel/py-click@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}jsonpath-ng>=0:devel/py-jsonpath-ng@${PY_FLAVOR} \
>diff --git a/net-mgmt/py-pypowerwall/Makefile b/net-mgmt/py-pypowerwall/Makefile
>index 9767d1da3504..e950862dbf70 100644
>--- a/net-mgmt/py-pypowerwall/Makefile
>+++ b/net-mgmt/py-pypowerwall/Makefile
>@@ -10,10 +10,10 @@ WWW=		https://github.com/jasonacox/pypowerwall
> 
> LICENSE=	MIT
> 
>-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
>+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}googleapis-common-protos>0:devel/py-googleapis-common-protos@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR}
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}googleapis-common-protos>0:devel/py-googleapis-common-protos@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR}
> 
>diff --git a/net/py-gdown/Makefile b/net/py-gdown/Makefile
>index 429c5312eb37..4c85d2d4052e 100644
>--- a/net/py-gdown/Makefile
>+++ b/net/py-gdown/Makefile
>@@ -11,7 +11,7 @@ WWW=		https://github.com/wkentaro/gdown
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}filelock>=0:sysutils/py-filelock@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
>diff --git a/print/py-fontbakery/Makefile b/print/py-fontbakery/Makefile
>index 6a9cf6709fa7..431b6e31d295 100644
>--- a/print/py-fontbakery/Makefile
>+++ b/print/py-fontbakery/Makefile
>@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=6.2:devel/py-setuptools_scm@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}axisregistry>=0.3.0:x11-fonts/py-axisregistry@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}beziers>=0.5.0:graphics/py-beziers@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}cmarkgfm>=0:textproc/py-cmarkgfm@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}collidoscope>=0.5.2:print/py-collidoscope@${PY_FLAVOR} \
>diff --git a/science/py-libpysal/Makefile b/science/py-libpysal/Makefile
>index 61b7fd39b00d..28259e2d0715 100644
>--- a/science/py-libpysal/Makefile
>+++ b/science/py-libpysal/Makefile
>@@ -12,7 +12,7 @@ WWW=		https://pysal.org/libpysal/
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}numpy>=1.3,1:math/py-numpy@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
>diff --git a/science/py-pymatgen/Makefile b/science/py-pymatgen/Makefile
>index f37e4e3cfb93..d889cf7d42aa 100644
>--- a/science/py-pymatgen/Makefile
>+++ b/science/py-pymatgen/Makefile
>@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.rst
> 
> BUILD_DEPENDS=	${PYNUMPY}
> RUN_DEPENDS=	${PYNUMPY} \
>-		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}monty>0:devel/py-monty@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
>diff --git a/security/wapiti/Makefile b/security/wapiti/Makefile
>index 098572e836a3..4f49d207be0d 100644
>--- a/security/wapiti/Makefile
>+++ b/security/wapiti/Makefile
>@@ -11,7 +11,7 @@ WWW=		http://wapiti.sourceforge.net/
> 
> LICENSE=	GPLv2
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}tld>=0:dns/py-tld@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}yaswfp>=0:graphics/py-yaswfp@${PY_FLAVOR} \
>diff --git a/sysutils/py-dlipower/Makefile b/sysutils/py-dlipower/Makefile
>index d8a0c7e91599..a8436ef95bea 100644
>--- a/sysutils/py-dlipower/Makefile
>+++ b/sysutils/py-dlipower/Makefile
>@@ -11,7 +11,7 @@ WWW=		https://github.com/dwighthubbard/python-dlipower
> 
> LICENSE=	BSD2CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.0:www/py-requests@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${PY_FLAVOR}
> 
>diff --git a/sysutils/py-elf_diff/Makefile b/sysutils/py-elf_diff/Makefile
>index 1f2303d4a749..a702a384fde2 100644
>--- a/sysutils/py-elf_diff/Makefile
>+++ b/sysutils/py-elf_diff/Makefile
>@@ -18,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools-git>0:devel/py-setuptools-git@${P
> 		${PYTHON_PKGNAMEPREFIX}anytree>0:devel/py-anytree@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}dict2xml>0:textproc/py-dict2xml@${PY_FLAVOR}
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}deepdiff>0:devel/py-deepdiff@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}gitpython>0:devel/py-gitpython@${PY_FLAVOR} \
> 		git:devel/git
> 
>diff --git a/textproc/py-extract-msg/Makefile b/textproc/py-extract-msg/Makefile
>index bb65a29bff11..bd22075d7987 100644
>--- a/textproc/py-extract-msg/Makefile
>+++ b/textproc/py-extract-msg/Makefile
>@@ -12,7 +12,7 @@ WWW=		https://github.com/TeamMsgExtractor/msg-extractor
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.11.1:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.11.1:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}chardet>=4.0.0:textproc/py-chardet@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}compressed-rtf>=1.0.6:archivers/py-compressed-rtf@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}ebcdic>=1.1.1:textproc/py-ebcdic@${PY_FLAVOR} \
>diff --git a/textproc/py-furo/Makefile b/textproc/py-furo/Makefile
>index 8e3141608f0f..4ad46ca8b257 100644
>--- a/textproc/py-furo/Makefile
>+++ b/textproc/py-furo/Makefile
>@@ -14,7 +14,7 @@ WWW=		https://github.com/pradyunsg/furo
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pygments>=2.7:textproc/py-pygments@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}sphinx>=5.0,1<7.0,1:textproc/py-sphinx@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}sphinx-basic-ng>=0:textproc/py-sphinx-basic-ng@${PY_FLAVOR}
>diff --git a/textproc/py-mkdocs-mermaid2-plugin/Makefile b/textproc/py-mkdocs-mermaid2-plugin/Makefile
>index 5a59226e6d29..5f3ab3725f08 100644
>--- a/textproc/py-mkdocs-mermaid2-plugin/Makefile
>+++ b/textproc/py-mkdocs-mermaid2-plugin/Makefile
>@@ -11,7 +11,7 @@ WWW=		https://github.com/fralau/mkdocs-mermaid2-plugin
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}jsbeautifier>0:devel/py-jsbeautifier@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}mkdocs>=0:textproc/py-mkdocs@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pymdown-extensions>0:textproc/py-pymdown-extensions@${PY_FLAVOR} \
>diff --git a/textproc/py-orange3-text/Makefile b/textproc/py-orange3-text/Makefile
>index a1a8d5694811..a9848ae1957c 100644
>--- a/textproc/py-orange3-text/Makefile
>+++ b/textproc/py-orange3-text/Makefile
>@@ -12,7 +12,7 @@ LICENSE=	AGPLv3
> 
> RUN_DEPENDS=	orange3>0:misc/orange3 \
> 		${PYNUMPY} \
>-		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}biopython>0:biology/py-biopython@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.0:devel/py-dateutil@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}docx2txt>=0.6:textproc/py-docx2txt@${PY_FLAVOR} \
>diff --git a/textproc/py-pydata-sphinx-theme/Makefile b/textproc/py-pydata-sphinx-theme/Makefile
>index a46ad938ad19..1c81f70e333d 100644
>--- a/textproc/py-pydata-sphinx-theme/Makefile
>+++ b/textproc/py-pydata-sphinx-theme/Makefile
>@@ -15,7 +15,7 @@ WWW=		https://github.com/pydata/pydata-sphinx-theme
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}docutils>=0.17.1:textproc/py-docutils@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}sphinx>=4,1<6,1:textproc/py-sphinx@${PY_FLAVOR}
>diff --git a/textproc/py-textract/Makefile b/textproc/py-textract/Makefile
>index f11965608502..0dbedf07621a 100644
>--- a/textproc/py-textract/Makefile
>+++ b/textproc/py-textract/Makefile
>@@ -49,7 +49,7 @@ TESSERACT_DESC=	Commercial quality open source OCR engine
> UNRTF_DESC=	RTF document support
> 
> ANTIWORD_RUN_DEPENDS=	antiword>0:textproc/antiword
>-BEAUTIFULSOUP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.8.0:www/py-beautifulsoup@${PY_FLAVOR}
>+BEAUTIFULSOUP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.8.0:www/py-beautifulsoup4@${PY_FLAVOR}
> DOCX2TXT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docx2txt>=0.8:textproc/py-docx2txt@${PY_FLAVOR}
> FFMPEG_RUN_DEPENDS=	ffmpeg>0:multimedia/ffmpeg
> FLAC_RUN_DEPENDS=	flac>0:audio/flac
>diff --git a/textproc/translate-toolkit/Makefile b/textproc/translate-toolkit/Makefile
>index bf708b4ecc52..2c0971456373 100644
>--- a/textproc/translate-toolkit/Makefile
>+++ b/textproc/translate-toolkit/Makefile
>@@ -63,7 +63,7 @@ RC_VARS=		MANPAGES+="po2rc rc2po"
> SPELLCHECK_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}enchant>=3.2.2:textproc/py-enchant@${PY_FLAVOR}
> SUBTITLES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aeidon>=1.12:textproc/py-aeidon@${PY_FLAVOR}
> TMSERVER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheroot>=9.0.0:www/py-cheroot@${PY_FLAVOR}
>-TRADOS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3:www/py-beautifulsoup@${PY_FLAVOR}
>+TRADOS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3:www/py-beautifulsoup4@${PY_FLAVOR}
> YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.17.21:devel/py-ruamel.yaml@${PY_FLAVOR}
> YAML_VARS=		MANPAGES+="po2yaml yaml2po"
> 
>diff --git a/www/buku/Makefile b/www/buku/Makefile
>index 32877bdb03ae..69ed132f7104 100644
>--- a/www/buku/Makefile
>+++ b/www/buku/Makefile
>@@ -10,7 +10,7 @@ WWW=		https://github.com/jarun/buku
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.4.1:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.4.1:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}cryptography>=1.2.3:security/py-cryptography@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}html5lib>=1.0.1:www/py-html5lib@${PY_FLAVOR} \
>diff --git a/www/flexget/Makefile b/www/flexget/Makefile
>index ddcc67f890be..4186c65f9f9b 100644
>--- a/www/flexget/Makefile
>+++ b/www/flexget/Makefile
>@@ -32,7 +32,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=1.3.10:databases/py-sqlalchemy
> 		${PYTHON_PKGNAMEPREFIX}feedparser>=6.0.2:textproc/py-feedparser@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}rich>=9.0.0:textproc/py-rich@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}rss2gen>0:textproc/py-rss2gen@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5:www/py-beautifulsoup@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}cherrypy>=3.7.0:www/py-cherrypy@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}Flask>=0.7:www/py-flask@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}Flask-Compress>=1.2.1:www/py-flask-compress@${PY_FLAVOR} \
>diff --git a/www/py-WebTest/Makefile b/www/py-WebTest/Makefile
>index d4babe4d9721..a1f9c7730d01 100644
>--- a/www/py-WebTest/Makefile
>+++ b/www/py-WebTest/Makefile
>@@ -10,11 +10,11 @@ WWW=		https://pythonpaste.org/webtest/
> LICENSE=	MIT
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}webob>=1.2:www/py-webob@${PY_FLAVOR}
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}webob>=1.2:www/py-webob@${PY_FLAVOR}
> 
>diff --git a/www/py-beautifulsoup/Makefile b/www/py-beautifulsoup/Makefile
>index 5fba1f244993..9cce15a22d16 100644
>--- a/www/py-beautifulsoup/Makefile
>+++ b/www/py-beautifulsoup/Makefile
>@@ -1,9 +1,8 @@
>-PORTNAME=	beautifulsoup
>+PORTNAME=	beautifulsoup4
> PORTVERSION=	4.12.2
> CATEGORIES=	www python
> MASTER_SITES=	PYPI
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>-DISTNAME=	beautifulsoup4-${PORTVERSION}
> 
> MAINTAINER=	wen@FreeBSD.org
> COMMENT=	HTML/XML Parser for Python
>@@ -19,15 +18,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}soupsieve>=1.2:www/py-soupsieve@${PY_FLAVOR}
> 		${PYTHON_PKGNAMEPREFIX}html5lib>=0:www/py-html5lib@${PY_FLAVOR}
> 
> USES=		python:3.6+
>-USE_PYTHON=	concurrent pep517 pytest
>+USE_PYTHON=	autoplist concurrent pep517 pytest
> NO_ARCH=	yes
> 
>-do-build:
>-	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} -m build --wheel --no-isolation --outdir ${WRKDIR}
>-
>-do-install:
>-	@cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} -m installer ${WRKDIR}/*.whl --destdir ${STAGEDIR}
>-
> do-test:
> 	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest bs4
> 
>diff --git a/www/py-beautifulsoup/pkg-plist b/www/py-beautifulsoup/pkg-plist
>deleted file mode 100644
>index 2a89247e9073..000000000000
>--- a/www/py-beautifulsoup/pkg-plist
>+++ /dev/null
>@@ -1,97 +0,0 @@
>-%%PYTHON_SITELIBDIR%%/beautifulsoup4-4.12.2.dist-info/METADATA
>-%%PYTHON_SITELIBDIR%%/beautifulsoup4-4.12.2.dist-info/RECORD
>-%%PYTHON_SITELIBDIR%%/beautifulsoup4-4.12.2.dist-info/WHEEL
>-%%PYTHON_SITELIBDIR%%/beautifulsoup4-4.12.2.dist-info/licenses/AUTHORS
>-%%PYTHON_SITELIBDIR%%/beautifulsoup4-4.12.2.dist-info/licenses/LICENSE
>-%%PYTHON_SITELIBDIR%%/bs4/__init__.py
>-%%PYTHON_SITELIBDIR%%/bs4/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/__pycache__/css%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/__pycache__/css%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/__pycache__/dammit%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/__pycache__/dammit%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/__pycache__/diagnose%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/__pycache__/diagnose%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/__pycache__/element%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/__pycache__/element%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/__pycache__/formatter%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/__pycache__/formatter%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/builder/__init__.py
>-%%PYTHON_SITELIBDIR%%/bs4/builder/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/builder/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/builder/__pycache__/_html5lib%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/builder/__pycache__/_html5lib%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/builder/__pycache__/_htmlparser%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/builder/__pycache__/_htmlparser%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/builder/__pycache__/_lxml%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/builder/__pycache__/_lxml%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/builder/_html5lib.py
>-%%PYTHON_SITELIBDIR%%/bs4/builder/_htmlparser.py
>-%%PYTHON_SITELIBDIR%%/bs4/builder/_lxml.py
>-%%PYTHON_SITELIBDIR%%/bs4/css.py
>-%%PYTHON_SITELIBDIR%%/bs4/dammit.py
>-%%PYTHON_SITELIBDIR%%/bs4/diagnose.py
>-%%PYTHON_SITELIBDIR%%/bs4/element.py
>-%%PYTHON_SITELIBDIR%%/bs4/formatter.py
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__init__.py
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_builder%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_builder%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_builder_registry%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_builder_registry%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_css%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_css%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_dammit%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_dammit%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_docs%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_docs%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_element%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_element%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_formatter%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_formatter%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_fuzz%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_fuzz%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_html5lib%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_html5lib%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_htmlparser%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_htmlparser%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_lxml%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_lxml%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_navigablestring%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_navigablestring%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_pageelement%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_pageelement%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_soup%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_soup%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_tag%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_tag%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_tree%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/__pycache__/test_tree%%PYTHON_EXT_SUFFIX%%.pyc
>-%%PYTHON_SITELIBDIR%%/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-4818336571064320.testcase
>-%%PYTHON_SITELIBDIR%%/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-4999465949331456.testcase
>-%%PYTHON_SITELIBDIR%%/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5167584867909632.testcase
>-%%PYTHON_SITELIBDIR%%/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5703933063462912.testcase
>-%%PYTHON_SITELIBDIR%%/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5843991618256896.testcase
>-%%PYTHON_SITELIBDIR%%/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5984173902397440.testcase
>-%%PYTHON_SITELIBDIR%%/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6124268085182464.testcase
>-%%PYTHON_SITELIBDIR%%/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6241471367348224.testcase
>-%%PYTHON_SITELIBDIR%%/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6450958476902400.testcase
>-%%PYTHON_SITELIBDIR%%/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6600557255327744.testcase
>-%%PYTHON_SITELIBDIR%%/bs4/tests/fuzz/crash-0d306a50c8ed8bcd0785b67000fcd5dea1d33f08.testcase
>-%%PYTHON_SITELIBDIR%%/bs4/tests/test_builder.py
>-%%PYTHON_SITELIBDIR%%/bs4/tests/test_builder_registry.py
>-%%PYTHON_SITELIBDIR%%/bs4/tests/test_css.py
>-%%PYTHON_SITELIBDIR%%/bs4/tests/test_dammit.py
>-%%PYTHON_SITELIBDIR%%/bs4/tests/test_docs.py
>-%%PYTHON_SITELIBDIR%%/bs4/tests/test_element.py
>-%%PYTHON_SITELIBDIR%%/bs4/tests/test_formatter.py
>-%%PYTHON_SITELIBDIR%%/bs4/tests/test_fuzz.py
>-%%PYTHON_SITELIBDIR%%/bs4/tests/test_html5lib.py
>-%%PYTHON_SITELIBDIR%%/bs4/tests/test_htmlparser.py
>-%%PYTHON_SITELIBDIR%%/bs4/tests/test_lxml.py
>-%%PYTHON_SITELIBDIR%%/bs4/tests/test_navigablestring.py
>-%%PYTHON_SITELIBDIR%%/bs4/tests/test_pageelement.py
>-%%PYTHON_SITELIBDIR%%/bs4/tests/test_soup.py
>-%%PYTHON_SITELIBDIR%%/bs4/tests/test_tag.py
>-%%PYTHON_SITELIBDIR%%/bs4/tests/test_tree.py
>diff --git a/www/py-django-htmlmin/Makefile b/www/py-django-htmlmin/Makefile
>index 4066d1ed5b62..d5d67ff41ee9 100644
>--- a/www/py-django-htmlmin/Makefile
>+++ b/www/py-django-htmlmin/Makefile
>@@ -8,7 +8,7 @@ MAINTAINER=	demon@FreeBSD.org
> COMMENT=	HTML minifier for Python
> WWW=		https://pypi.org/project/django-htmlmin/
> 
>-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/bs4/element.py:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/bs4/element.py:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_SITELIBDIR}/html5lib/html5parser.py:www/py-html5lib@${PY_FLAVOR}
> 
> USES=		python:3.6+
>diff --git a/www/py-django_compressor/Makefile b/www/py-django_compressor/Makefile
>index 5b76f7f636a2..7f38c1115427 100644
>--- a/www/py-django_compressor/Makefile
>+++ b/www/py-django_compressor/Makefile
>@@ -24,7 +24,7 @@ BEAUTIFULSOUP_DESC=	Enable BeautifulSoupParser
> LXML_DESC=		Enable LxmlParser
> HTML5LIB_DESC=		Enable Html5LibParser
> 
>-BEAUTIFULSOUP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${PY_FLAVOR}
>+BEAUTIFULSOUP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup4@${PY_FLAVOR}
> LXML_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR}
> HTML5LIB_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}
> 
>diff --git a/www/py-draftjs-exporter/Makefile b/www/py-draftjs-exporter/Makefile
>index e21f09d7b9cf..feb9762f60f7 100644
>--- a/www/py-draftjs-exporter/Makefile
>+++ b/www/py-draftjs-exporter/Makefile
>@@ -21,7 +21,7 @@ OPTIONS_DEFINE=	HTML5LIB LXML
> HTML5LIB_DESC=	Use html5lib as backing engine
> LXML_DESC=	Use lxml as backing engine
> 
>-HTML5LIB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.4.1<5:www/py-beautifulsoup@${PY_FLAVOR} \
>+HTML5LIB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.4.1<5:www/py-beautifulsoup4@${PY_FLAVOR} \
> 			${PYTHON_PKGNAMEPREFIX}html5lib>=0.999<2:www/py-html5lib@${PY_FLAVOR}
> LXML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=4.2.0<5:devel/py-lxml@${PY_FLAVOR}
> 
>diff --git a/www/py-google/Makefile b/www/py-google/Makefile
>index e9b33faf202d..6b025c9fbee2 100644
>--- a/www/py-google/Makefile
>+++ b/www/py-google/Makefile
>@@ -10,7 +10,7 @@ WWW=		https://breakingcode.wordpress.com/
> 
> LICENSE=	BSD2CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${PY_FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup4@${PY_FLAVOR}
> 
> USES=		python:3.6+
> USE_PYTHON=	autoplist distutils
>diff --git a/www/py-mechanicalsoup/Makefile b/www/py-mechanicalsoup/Makefile
>index df804bc09947..e845b51c4d6c 100644
>--- a/www/py-mechanicalsoup/Makefile
>+++ b/www/py-mechanicalsoup/Makefile
>@@ -12,7 +12,7 @@ WWW=		https://github.com/MechanicalSoup/MechanicalSoup
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.7:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.7:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR}
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
>diff --git a/www/py-pelican/Makefile b/www/py-pelican/Makefile
>index 036ad6b9a17d..efdf46cc5374 100644
>--- a/www/py-pelican/Makefile
>+++ b/www/py-pelican/Makefile
>@@ -21,7 +21,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}blinker>=1.4:devel/py-blinker@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}rich>=10.1:textproc/py-rich@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}unidecode>=1.1:converters/py-unidecode@${PY_FLAVOR}
>-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.9:www/py-beautifulsoup@${PY_FLAVOR} \
>+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.9:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}flake8-import-order>=0.18:devel/py-flake8-import-order@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}flake8>:devel/py-flake8@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}flake8>=3.8:devel/py-flake8@${PY_FLAVOR} \
>diff --git a/www/py-postorius/Makefile b/www/py-postorius/Makefile
>index cacd665ed631..59873dfc7ed1 100644
>--- a/www/py-postorius/Makefile
>+++ b/www/py-postorius/Makefile
>@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django-gravatar2>1.0.6:www/py-django-gravata
> 		${PYTHON_PKGNAMEPREFIX}mailmanclient>=3.3.3:mail/py-mailmanclient@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}readme-renderer>0:devel/py-readme-renderer@${PY_FLAVOR}
> 
>-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
>+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}isort>0:devel/py-isort@${PY_FLAVOR}
> 
> USES=		cpe python:3.6+
>diff --git a/www/py-pywikibot/Makefile b/www/py-pywikibot/Makefile
>index 3211d45e585a..9b269084ee76 100644
>--- a/www/py-pywikibot/Makefile
>+++ b/www/py-pywikibot/Makefile
>@@ -37,6 +37,6 @@ GOOGLE_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}google>0:www/py-google@${PY_FLAVOR}
> IRC_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}irc>0:irc/py-irc@${PY_FLAVOR}
> PILLOW_RUN_DEPENDS=		${PY_PILLOW}
> MWOAUTH_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}mwoauth>0:www/py-mwoauth@${PY_FLAVOR}
>-HTML_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR}
>+HTML_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup4@${PY_FLAVOR}
> 
> .include <bsd.port.mk>
>diff --git a/www/py-soupsieve/Makefile b/www/py-soupsieve/Makefile
>index 62ac47095a10..e324f4c2e274 100644
>--- a/www/py-soupsieve/Makefile
>+++ b/www/py-soupsieve/Makefile
>@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.md
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}beautifulsoup>4:www/py-beautifulsoup@${PY_FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>4:www/py-beautifulsoup4@${PY_FLAVOR}
> 
> USES=		python:3.6+
> USE_PYTHON=	autoplist concurrent distutils
>diff --git a/www/py-ttrv/Makefile b/www/py-ttrv/Makefile
>index a8a663d8acd3..c49275cc466c 100644
>--- a/www/py-ttrv/Makefile
>+++ b/www/py-ttrv/Makefile
>@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}kitchen>0:devel/py-kitchen@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.4.0:www/py-requests@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR}
> 
> USES=		python:3.6+
>diff --git a/www/py-tuir/Makefile b/www/py-tuir/Makefile
>index d94d122b20de..ffbc70fab72d 100644
>--- a/www/py-tuir/Makefile
>+++ b/www/py-tuir/Makefile
>@@ -12,7 +12,7 @@ WWW=		https://gitlab.com/ajak/tuir
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5.1:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5.1:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}decorator>=4.0.10:devel/py-decorator@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}kitchen>=1.2.4:devel/py-kitchen@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.4.0:www/py-requests@${PY_FLAVOR} \
>diff --git a/www/py-wagtail/Makefile b/www/py-wagtail/Makefile
>index 58632ed29827..08a95f507210 100644
>--- a/www/py-wagtail/Makefile
>+++ b/www/py-wagtail/Makefile
>@@ -14,7 +14,7 @@ LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}anyascii>=0.1.5:textproc/py-anyascii@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.8<4.13:www/py-beautifulsoup@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.8<4.13:www/py-beautifulsoup4@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}django32>=3.2<4.2:www/py-django32@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}django-filter>=2.2<23:www/py-django-filter@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}django-modelcluster>=6.0<7.0:www/py-django-modelcluster@${PY_FLAVOR} \
>diff --git a/www/py-wikipedia/Makefile b/www/py-wikipedia/Makefile
>index 8296cff47edc..e7a547d1ffac 100644
>--- a/www/py-wikipedia/Makefile
>+++ b/www/py-wikipedia/Makefile
>@@ -10,7 +10,7 @@ WWW=		https://github.com/goldsmith/Wikipedia
> 
> LICENSE=	MIT
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup4@${PY_FLAVOR} \
> 	${PYTHON_PKGNAMEPREFIX}requests>=2.7:www/py-requests@${PY_FLAVOR}
> 
> USES=	python:3.6+

Flags:

jcfyecrayz: maintainer-approval? (wen)

Actions: View | Diff

Attachments on bug 271013: 241727 | 241728