git: 1a80ec7c2281 - main - devel/py-pyyaml: Move devel/py-yaml to devel/py-pyyaml

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Sun, 07 Jul 2024 08:05:58 UTC
The branch main has been updated by sunpoet:

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

commit 1a80ec7c2281900b82b228ee3a7b070c8ca4286e
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-07-07 08:05:33 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-07-07 08:05:33 +0000

    devel/py-pyyaml: Move devel/py-yaml to devel/py-pyyaml
    
    - Bump PORTREVISION of dependent ports for dependency change
---
 MOVED                                         | 1 +
 audio/beets/Makefile                          | 6 +++---
 audio/picard/Makefile                         | 3 ++-
 audio/py-essentia/Makefile                    | 4 ++--
 audio/py-pylast/Makefile                      | 2 +-
 benchmarks/py-asv/Makefile                    | 3 ++-
 biology/py-multiqc/Makefile                   | 3 ++-
 cad/python-gdsii/Makefile                     | 3 ++-
 comms/gnuradio/Makefile                       | 4 ++--
 comms/py-esptool/Makefile                     | 3 ++-
 databases/datasette/Makefile                  | 3 ++-
 databases/mongodb44/Makefile                  | 3 ++-
 databases/mongodb50/Makefile                  | 3 ++-
 databases/mongodb60/Makefile                  | 3 ++-
 databases/mongodb70/Makefile                  | 3 ++-
 databases/py-Pyrseas/Makefile                 | 3 ++-
 databases/py-cassandra-driver/Makefile        | 2 +-
 databases/py-dbt-core/Makefile                | 4 ++--
 databases/py-dbt-semantic-interfaces/Makefile | 3 ++-
 databases/py-pgmigrate/Makefile               | 3 ++-
 databases/py-pum/Makefile                     | 3 ++-
 databases/py-schemachange/Makefile            | 3 ++-
 databases/py-snowddl/Makefile                 | 3 ++-
 deskutils/py-paperless-ngx/Makefile           | 4 ++--
 deskutils/rednotebook/Makefile                | 3 ++-
 devel/Makefile                                | 2 +-
 devel/eric6/Makefile                          | 8 ++++----
 devel/oci-cli/Makefile                        | 3 ++-
 devel/py-acstore/Makefile                     | 3 ++-
 devel/py-apispec/Makefile                     | 2 +-
 devel/py-aspy.yaml/Makefile                   | 3 ++-
 devel/py-awscli/Makefile                      | 3 ++-
 devel/py-bandit/Makefile                      | 3 ++-
 devel/py-buildbot/Makefile                    | 3 ++-
 devel/py-cfn-lint/Makefile                    | 3 ++-
 devel/py-cliapp/Makefile                      | 5 +++--
 devel/py-cliff/Makefile                       | 3 ++-
 devel/py-configargparse/Makefile              | 2 +-
 devel/py-confuse/Makefile                     | 3 ++-
 devel/py-connexion/Makefile                   | 3 ++-
 devel/py-cookiecutter/Makefile                | 3 ++-
 devel/py-copier/Makefile                      | 3 ++-
 devel/py-dask/Makefile                        | 3 ++-
 devel/py-datasette/Makefile                   | 3 ++-
 devel/py-ddt/Makefile                         | 2 +-
 devel/py-deepdiff/Makefile                    | 3 ++-
 devel/py-distributed/Makefile                 | 3 ++-
 devel/py-dtfabric/Makefile                    | 3 ++-
 devel/py-flex/Makefile                        | 3 ++-
 devel/py-frictionless/Makefile                | 3 ++-
 devel/py-gapic-generator/Makefile             | 3 ++-
 devel/py-http-prompt/Makefile                 | 4 ++--
 devel/py-jenkins-job-builder/Makefile         | 3 ++-
 devel/py-jinja2-ansible-filters/Makefile      | 4 ++--
 devel/py-jsonnet/Makefile                     | 2 +-
 devel/py-jsonschema-path/Makefile             | 3 ++-
 devel/py-jsonschema-spec/Makefile             | 4 ++--
 devel/py-jupyter-events/Makefile              | 3 ++-
 devel/py-kaptan/Makefile                      | 4 ++--
 devel/py-knack/Makefile                       | 3 ++-
 devel/py-libcst/Makefile                      | 4 ++--
 devel/py-libcst03/Makefile                    | 4 ++--
 devel/py-livemark/Makefile                    | 3 ++-
 devel/py-mdv/Makefile                         | 5 +++--
 devel/py-molecule/Makefile                    | 3 ++-
 devel/py-moto/Makefile                        | 2 +-
 devel/py-msgspec/Makefile                     | 3 ++-
 devel/py-opengrok-tools/Makefile              | 3 ++-
 devel/py-openstacksdk/Makefile                | 3 ++-
 devel/py-oslo.config/Makefile                 | 4 ++--
 devel/py-oslo.messaging/Makefile              | 3 ++-
 devel/py-oslo.policy/Makefile                 | 4 ++--
 devel/py-oslo.utils/Makefile                  | 4 ++--
 devel/py-oslo.vmware/Makefile                 | 4 ++--
 devel/py-oyaml/Makefile                       | 4 ++--
 devel/py-pop/Makefile                         | 3 ++-
 devel/py-pre-commit/Makefile                  | 3 ++-
 devel/py-prospector/Makefile                  | 4 ++--
 devel/py-pyaml-env/Makefile                   | 3 ++-
 devel/py-pydrive/Makefile                     | 4 ++--
 devel/py-pytest-mypy-plugins/Makefile         | 3 ++-
 devel/py-pytest-regressions/Makefile          | 4 ++--
 devel/py-python-easyconfig/Makefile           | 3 ++-
 devel/py-python-gilt/Makefile                 | 3 ++-
 devel/py-python-gitlab/Makefile               | 3 ++-
 devel/py-pyyaml-include/Makefile              | 3 ++-
 devel/{py-yaml => py-pyyaml}/Makefile         | 2 +-
 devel/{py-yaml => py-pyyaml}/distinfo         | 0
 devel/{py-yaml => py-pyyaml}/pkg-descr        | 0
 devel/{py-yaml => py-pyyaml}/pkg-plist        | 0
 devel/py-pyyaml_env_tag/Makefile              | 4 ++--
 devel/py-ramlfications/Makefile               | 3 ++-
 devel/py-responses/Makefile                   | 4 ++--
 devel/py-saneyaml/Makefile                    | 3 ++-
 devel/py-setoptconf/Makefile                  | 4 ++--
 devel/py-simple-parsing/Makefile              | 4 ++--
 devel/py-stestr/Makefile                      | 3 ++-
 devel/py-swagger-spec-validator/Makefile      | 3 ++-
 devel/py-ua_parser/Makefile                   | 5 +++--
 devel/py-vcrpy/Makefile                       | 3 ++-
 devel/py-watchdog/Makefile                    | 3 ++-
 devel/py-yacs/Makefile                        | 3 ++-
 devel/py-yamllint/Makefile                    | 3 ++-
 devel/py-yamlordereddictloader/Makefile       | 3 ++-
 devel/pycomposefile/Makefile                  | 3 ++-
 devel/ros-rosdep/Makefile                     | 3 ++-
 devel/ros-rosdistro/Makefile                  | 3 ++-
 devel/ros-rosinstall_generator/Makefile       | 3 ++-
 devel/ros-rospkg/Makefile                     | 3 ++-
 devel/ros-vcstool/Makefile                    | 3 ++-
 devel/ros-vcstools/Makefile                   | 4 ++--
 devel/ros-wstool/Makefile                     | 3 ++-
 devel/shroud/Makefile                         | 3 ++-
 dns/py-cloudflare/Makefile                    | 4 ++--
 dns/py-dns-lexicon/Makefile                   | 3 ++-
 games/naev/Makefile                           | 6 +++---
 games/open-adventure/Makefile                 | 4 ++--
 games/stonesoup/Makefile                      | 3 ++-
 games/unknown-horizons/Makefile               | 4 ++--
 graphics/py-albumentations/Makefile           | 3 ++-
 graphics/py-glooey/Makefile                   | 4 ++--
 graphics/py-pygeoapi/Makefile                 | 4 ++--
 graphics/py-urbanaccess/Makefile              | 4 ++--
 graphics/py-urbansim/Makefile                 | 4 ++--
 graphics/qgis-ltr/Makefile                    | 5 +++--
 graphics/qgis/Makefile                        | 5 +++--
 lang/rizin/Makefile                           | 3 ++-
 mail/py-postfix-mta-sts-resolver/Makefile     | 3 ++-
 mail/py-pyspf/Makefile                        | 2 +-
 mail/slimta/Makefile                          | 3 ++-
 math/py-flax/Makefile                         | 4 ++--
 math/py-fvcore/Makefile                       | 4 ++--
 math/py-mathics-scanner/Makefile              | 3 ++-
 math/py-networkx/Makefile                     | 3 ++-
 math/py-rvlib/Makefile                        | 6 +++---
 misc/orange3/Makefile                         | 4 ++--
 misc/pubs/Makefile                            | 4 ++--
 misc/py-accelerate/Makefile                   | 3 ++-
 misc/py-apache-beam/Makefile                  | 2 +-
 misc/py-huggingface-hub/Makefile              | 3 ++-
 misc/py-mmcv/Makefile                         | 3 ++-
 misc/py-mmengine/Makefile                     | 3 ++-
 misc/py-onnx-tf/Makefile                      | 4 ++--
 misc/py-optuna/Makefile                       | 3 ++-
 misc/py-papermill/Makefile                    | 4 ++--
 misc/py-pytorch-lightning/Makefile            | 3 ++-
 misc/py-pytorch/Makefile                      | 4 ++--
 misc/py-sigopt/Makefile                       | 3 ++-
 misc/py-spdx-tools/Makefile                   | 3 ++-
 misc/py-timm/Makefile                         | 3 ++-
 misc/py-toil/Makefile                         | 3 ++-
 misc/py-wandb/Makefile                        | 3 ++-
 misc/pytorch/Makefile                         | 4 ++--
 misc/snakemake/Makefile                       | 4 ++--
 net-im/py-apprise/Makefile                    | 3 ++-
 net-im/py-matrix-synapse/Makefile             | 4 ++--
 net-mgmt/crmsh/Makefile                       | 4 ++--
 net-mgmt/netbox/Makefile                      | 4 ++--
 net-mgmt/netdata/Makefile                     | 4 ++--
 net-mgmt/py-arouteserver/Makefile             | 3 ++-
 net-mgmt/py-junos-eznc/Makefile               | 3 ++-
 net-mgmt/py-napalm-logs/Makefile              | 4 ++--
 net-mgmt/py-napalm/Makefile                   | 3 ++-
 net-mgmt/py-opn-cli/Makefile                  | 3 ++-
 net-mgmt/py-pynetbox/Makefile                 | 2 +-
 net/cloud-init-devel/Makefile                 | 3 ++-
 net/cloud-init/Makefile                       | 3 ++-
 net/irrd/Makefile                             | 3 ++-
 net/onionprobe/Makefile                       | 3 ++-
 net/py-python-heatclient/Makefile             | 4 ++--
 net/py-ripe.atlas.tools/Makefile              | 3 ++-
 ports-mgmt/reprise/Makefile                   | 3 ++-
 print/py-fontbakery/Makefile                  | 3 ++-
 print/py-glyphsets/Makefile                   | 3 ++-
 print/py-relatorio/Makefile                   | 3 ++-
 science/dvc/Makefile                          | 4 ++--
 science/py-PyNE/Makefile                      | 4 ++--
 science/py-abipy/Makefile                     | 3 ++-
 science/py-asdf/Makefile                      | 3 ++-
 science/py-kliff/Makefile                     | 4 ++--
 science/py-phono3py/Makefile                  | 4 ++--
 science/py-phonopy/Makefile                   | 3 ++-
 science/py-pygeometa/Makefile                 | 4 ++--
 science/py-pyked/Makefile                     | 4 ++--
 science/py-qcengine/Makefile                  | 3 ++-
 security/caldera/Makefile                     | 4 ++--
 security/caldera4/Makefile                    | 4 ++--
 security/liboqs/Makefile                      | 2 +-
 security/py-artifacts/Makefile                | 3 ++-
 security/py-certomancer/Makefile              | 4 ++--
 security/py-detect-secrets/Makefile           | 3 ++-
 security/py-dfvfs/Makefile                    | 3 ++-
 security/py-dfwinreg/Makefile                 | 3 ++-
 security/py-netmiko/Makefile                  | 4 ++--
 security/py-plaso/Makefile                    | 4 ++--
 security/py-pyaff4/Makefile                   | 4 ++--
 security/py-pyhanko/Makefile                  | 3 ++-
 security/suricata/Makefile                    | 4 ++--
 sysutils/conan/Makefile                       | 3 ++-
 sysutils/conky/Makefile                       | 3 ++-
 sysutils/datadog-agent/Makefile               | 4 ++--
 sysutils/datadog-integrations/Makefile        | 4 ++--
 sysutils/docker-compose/Makefile              | 4 ++--
 sysutils/hid-tools/Makefile                   | 3 ++-
 sysutils/py-ansible-compat/Makefile           | 3 ++-
 sysutils/py-ansible-core/Makefile             | 3 ++-
 sysutils/py-ansible-lint/Makefile             | 4 ++--
 sysutils/py-ansible-runner/Makefile           | 3 ++-
 sysutils/py-azure-cli-core/Makefile           | 4 ++--
 sysutils/py-azure-cli/Makefile                | 4 ++--
 sysutils/py-elf_diff/Makefile                 | 3 ++-
 sysutils/py-focker/Makefile                   | 3 ++-
 sysutils/py-rdiff-backup/Makefile             | 3 ++-
 sysutils/py-salt/Makefile                     | 4 ++--
 sysutils/py-tmuxp/Makefile                    | 3 ++-
 sysutils/zsm/Makefile                         | 3 ++-
 textproc/json2yaml/Makefile                   | 4 ++--
 textproc/lookatme/Makefile                    | 4 ++--
 textproc/py-dparse/Makefile                   | 3 ++-
 textproc/py-elasticsearch-curator/Makefile    | 3 ++-
 textproc/py-elasticsearch/Makefile            | 2 +-
 textproc/py-elasticsearch6/Makefile           | 2 +-
 textproc/py-j2cli/Makefile                    | 3 ++-
 textproc/py-jinja2-cli/Makefile               | 3 ++-
 textproc/py-markdown/Makefile                 | 2 +-
 textproc/py-markups/Makefile                  | 2 +-
 textproc/py-mike/Makefile                     | 3 ++-
 textproc/py-mkdocs-get-deps/Makefile          | 3 ++-
 textproc/py-mkdocs/Makefile                   | 3 ++-
 textproc/py-myst-parser/Makefile              | 3 ++-
 textproc/py-ntc-templates/Makefile            | 2 +-
 textproc/py-os-api-ref/Makefile               | 3 ++-
 textproc/py-pyaml/Makefile                    | 3 ++-
 textproc/py-pybtex/Makefile                   | 4 ++--
 textproc/py-pymdown-extensions/Makefile       | 3 ++-
 textproc/py-reno/Makefile                     | 3 ++-
 textproc/py-sphinx-autoapi/Makefile           | 4 ++--
 textproc/py-tableschema-to-template/Makefile  | 4 ++--
 textproc/py-tablib/Makefile                   | 3 ++-
 textproc/py-tomlkit/Makefile                  | 2 +-
 textproc/py-wavedrom/Makefile                 | 3 ++-
 textproc/xml2rfc/Makefile                     | 3 ++-
 www/flexget/Makefile                          | 4 ++--
 www/mod_gnutls/Makefile                       | 3 ++-
 www/py-bokeh/Makefile                         | 4 ++--
 www/py-bravado-core/Makefile                  | 4 ++--
 www/py-bravado/Makefile                       | 4 ++--
 www/py-drf-spectacular/Makefile               | 4 ++--
 www/py-drf-yasg/Makefile                      | 4 ++--
 www/py-falcon/Makefile                        | 2 +-
 www/py-flasgger/Makefile                      | 3 ++-
 www/py-flask-flatpages/Makefile               | 3 ++-
 www/py-gandi.cli/Makefile                     | 3 ++-
 www/py-graphite-api/Makefile                  | 4 ++--
 www/py-habanero/Makefile                      | 3 ++-
 www/py-horizon/Makefile                       | 4 ++--
 www/py-python-multipart/Makefile              | 2 +-
 www/py-quilt3/Makefile                        | 4 ++--
 www/py-seafdav/Makefile                       | 3 ++-
 www/py-slumber/Makefile                       | 3 ++-
 www/py-spyne/Makefile                         | 2 +-
 www/py-starlette/Makefile                     | 3 ++-
 www/py-urlwatch/Makefile                      | 4 ++--
 www/py-uvicorn/Makefile                       | 3 ++-
 www/py-woob/Makefile                          | 6 +++---
 www/py-wsgidav/Makefile                       | 5 +++--
 www/qutebrowser/Makefile                      | 3 ++-
 www/searx/Makefile                            | 4 ++--
 x11-fonts/py-shaperglot/Makefile              | 3 ++-
 x11-wm/nscde/Makefile                         | 5 +++--
 x11/libei/Makefile                            | 2 +-
 271 files changed, 525 insertions(+), 366 deletions(-)

diff --git a/MOVED b/MOVED
index 89ff955ff029..25a0a7c784bb 100644
--- a/MOVED
+++ b/MOVED
@@ -3380,3 +3380,4 @@ www/npm-node21||2024-07-02|Removed, part of www/node21
 security/bcrypt||2024-07-02|Has expired: Hasn't seen updates in 15 years, insecure Blowfish ECB mode, unauthenticated encryption
 devel/py-stackexchange|devel/py-py-stackexchange|2024-07-06|Move devel/py-stackexchange to devel/py-py-stackexchange
 devel/py-xcaplib|devel/py-python-xcaplib|2024-07-06|Move devel/py-xcaplib to devel/py-python-xcaplib
+devel/py-yaml|devel/py-pyyaml|2024-07-07|Move devel/py-yaml to devel/py-pyyaml
diff --git a/audio/beets/Makefile b/audio/beets/Makefile
index 0445c920a7fb..4b651d59f2f3 100644
--- a/audio/beets/Makefile
+++ b/audio/beets/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	beets
 DISTVERSION=	1.6.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio python
 MASTER_SITES=	PYPI
 
@@ -18,10 +18,10 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}confuse>=1.0.0:devel/py-confuse@${PY_FLAVOR}
 		${PYTHON_PKGNAMEPREFIX}musicbrainzngs>=0.4:audio/py-musicbrainzngs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mutagen>=1.45:audio/py-mutagen@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyacoustid>=0:audio/py-pyacoustid@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils optsuffix
diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index 1ceea917488b..4fe7ba39fee4 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	picard
 PORTVERSION=	2.12
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	http://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
 		ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
@@ -18,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}discid>=1.0:audio/py-discid@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mutagen>=1.37:audio/py-mutagen@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.7:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fasteners>=0.14:devel/py-fasteners@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>=3.2:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyjwt>=2.0:www/py-pyjwt@${PY_FLAVOR}
 
diff --git a/audio/py-essentia/Makefile b/audio/py-essentia/Makefile
index 09b431c64d19..b127782773a3 100644
--- a/audio/py-essentia/Makefile
+++ b/audio/py-essentia/Makefile
@@ -1,8 +1,8 @@
 PORTNAME=	essentia
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.1_beta5-859
-PORTREVISION=	4
 DISTVERSIONSUFFIX=	-gb247091f
+PORTREVISION=	5
 CATEGORIES=	audio
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${PYNUMPY} \
 LIB_DEPENDS=	libessentia.so:audio/essentia
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 MASTER_SITES=	https://raw.githubusercontent.com/MTG/essentia/d02b6c752046802a711530e2bcd5feafca42247d/
 DISTFILES=	waf
diff --git a/audio/py-pylast/Makefile b/audio/py-pylast/Makefile
index 2de63e40e9f9..e9722bee5a52 100644
--- a/audio/py-pylast/Makefile
+++ b/audio/py-pylast/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}httpx>=0:www/py-httpx@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flaky>=0:devel/py-flaky@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-random-order>=0:devel/py-pytest-random-order@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517 pytest
diff --git a/benchmarks/py-asv/Makefile b/benchmarks/py-asv/Makefile
index c17db49b9750..7baaa8338a32 100644
--- a/benchmarks/py-asv/Makefile
+++ b/benchmarks/py-asv/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	asv
 DISTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	benchmarks python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +19,7 @@ BUILD_DEPENDS:=	${PY_SETUPTOOLS} \
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asv-runner>=0.1.0:benchmarks/py-asv-runner@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}json5>0:devel/py-json5@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Pympler>0:devel/py-pympler@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \
diff --git a/biology/py-multiqc/Makefile b/biology/py-multiqc/Makefile
index 481a194e2c51..4be09d193455 100644
--- a/biology/py-multiqc/Makefile
+++ b/biology/py-multiqc/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	multiqc
 DISTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,7 +20,7 @@ RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rich>0:textproc/py-rich@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=4:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=4:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.9:devel/py-Jinja2@${PY_FLAVOR} \
diff --git a/cad/python-gdsii/Makefile b/cad/python-gdsii/Makefile
index 94d1dd658410..70f40d94e7d5 100644
--- a/cad/python-gdsii/Makefile
+++ b/cad/python-gdsii/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	python-gdsii
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	cad python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +12,7 @@ WWW=		https://pythonhosted.org/python-gdsii/
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/LGPL-3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 6dd79944d7c1..8fb7adac66fd 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gnuradio
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.8.4.0
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	comms astro hamradio
 
 MAINTAINER=	hamradio@FreeBSD.org
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	volk>0:devel/volk \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_SITELIBDIR}/mako/__init__.py:textproc/py-mako@${PY_FLAVOR} \
-		${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.11:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/gi/__init__.py:devel/py-gobject3@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR} \
diff --git a/comms/py-esptool/Makefile b/comms/py-esptool/Makefile
index 3d5d45c42872..cd7d902f4faa 100644
--- a/comms/py-esptool/Makefile
+++ b/comms/py-esptool/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	esptool
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.7.0
+PORTREVISION=	1
 CATEGORIES=	comms python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -15,7 +16,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyserial>=3.0:comms/py-pyserial@${PY_FLAVOR}
 		${PYTHON_PKGNAMEPREFIX}ecdsa>=0.16.0:security/py-ecdsa@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}bitstring>=3.1.6:devel/py-bitstring@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}reedsolo>=1.5.3,<1.8:devel/py-reedsolo@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}intelhex>0:devel/py-intelhex@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyelftools>0:devel/py-pyelftools@${PY_FLAVOR}
 
diff --git a/databases/datasette/Makefile b/databases/datasette/Makefile
index 069f94fcb475..23edbe903b5b 100644
--- a/databases/datasette/Makefile
+++ b/databases/datasette/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	datasette
 DISTVERSION=	0.63.3
+PORTREVISION=	1
 CATEGORIES=	databases www
 MASTER_SITES=	PYPI
 
@@ -25,7 +26,7 @@ PY_DEPENDS=	\
 		${PYTHON_PKGNAMEPREFIX}pint>=0.9:devel/py-pint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pluggy>=1.0:devel/py-pluggy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}uvicorn>=0.11:www/py-uvicorn@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.3:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.3:devel/py-pyyaml@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} \
diff --git a/databases/mongodb44/Makefile b/databases/mongodb44/Makefile
index c99d892ab6d7..4cc292298cc9 100644
--- a/databases/mongodb44/Makefile
+++ b/databases/mongodb44/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
 DISTVERSION=	4.4.29
+PORTREVISION=	1
 CATEGORIES=	databases net
 MASTER_SITES=	https://fastdl.mongodb.org/src/ \
 		http://fastdl.mongodb.org/src/
@@ -24,7 +25,7 @@ ONLY_FOR_ARCHS_REASON=	only ported to amd64, aarch64, and powerpc64le on FreeBSD
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.11:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libcurl.so:ftp/curl \
diff --git a/databases/mongodb50/Makefile b/databases/mongodb50/Makefile
index 60d1e6ac1811..ec3e7e3ba4f9 100644
--- a/databases/mongodb50/Makefile
+++ b/databases/mongodb50/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
 DISTVERSION=	5.0.27
+PORTREVISION=	1
 CATEGORIES=	databases net
 PKGNAMESUFFIX=	${DISTVERSION:R:S/.//}
 
@@ -20,7 +21,7 @@ ONLY_FOR_ARCHS_REASON=	only ported to amd64, aarch64, and powerpc64le on FreeBSD
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.11:devel/py-pyyaml@${PY_FLAVOR}
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libpcre.so:devel/pcre \
 		libsnappy.so:archivers/snappy \
diff --git a/databases/mongodb60/Makefile b/databases/mongodb60/Makefile
index 159813d1747f..264d4320c3f7 100644
--- a/databases/mongodb60/Makefile
+++ b/databases/mongodb60/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
 DISTVERSION=	6.0.16
+PORTREVISION=	1
 CATEGORIES=	databases net
 PKGNAMESUFFIX=	${DISTVERSION:R:S/.//}
 
@@ -22,7 +23,7 @@ BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/py-pymongo@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.11:devel/py-pyyaml@${PY_FLAVOR}
 # build depends used while running ${WRKSRC}/src/third_party/mozjs/gen-config.sh
 BUILD_DEPENDS+=	autoconf2.13:devel/autoconf2.13 \
 		gsed:textproc/gsed
diff --git a/databases/mongodb70/Makefile b/databases/mongodb70/Makefile
index 8adf763fae47..72426165f2d2 100644
--- a/databases/mongodb70/Makefile
+++ b/databases/mongodb70/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
 DISTVERSION=	7.0.11
+PORTREVISION=	1
 CATEGORIES=	databases net
 PKGNAMESUFFIX=	${DISTVERSION:R:S/.//}
 
@@ -22,7 +23,7 @@ BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/py-pymongo@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.11:devel/py-pyyaml@${PY_FLAVOR}
 # build depends used while running ${WRKSRC}/src/third_party/mozjs/gen-config.sh
 BUILD_DEPENDS+=	autoconf2.13:devel/autoconf2.13 \
 		gsed:textproc/gsed
diff --git a/databases/py-Pyrseas/Makefile b/databases/py-Pyrseas/Makefile
index 5027a88af18d..6b6633455edf 100644
--- a/databases/py-Pyrseas/Makefile
+++ b/databases/py-Pyrseas/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	Pyrseas
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	databases python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -12,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pgdbconn>=0.8:databases/py-pgdbconn@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.10:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python
diff --git a/databases/py-cassandra-driver/Makefile b/databases/py-cassandra-driver/Makefile
index 8a120269118c..768aa8bd18fc 100644
--- a/databases/py-cassandra-driver/Makefile
+++ b/databases/py-cassandra-driver/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sure>0:devel/py-sure@${PY_FLAVOR}
 
diff --git a/databases/py-dbt-core/Makefile b/databases/py-dbt-core/Makefile
index 852530aef055..b41276fdbef3 100644
--- a/databases/py-dbt-core/Makefile
+++ b/databases/py-dbt-core/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	dbt-core
 DISTVERSION=	1.7.11
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -29,7 +29,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}agate>=1.7,<2:textproc/py-agate@${PY_FLAVOR}
 		${PYTHON_PKGNAMEPREFIX}packaging>20.9:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=4.0.0:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2015.7:devel/py-pytz@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=6.0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=6.0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.7.4:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cffi>=1.9,<2:devel/py-cffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}idna>=2.5,<4:dns/py-idna@${PY_FLAVOR} \
diff --git a/databases/py-dbt-semantic-interfaces/Makefile b/databases/py-dbt-semantic-interfaces/Makefile
index c105cf041761..7e1e0e2909ef 100644
--- a/databases/py-dbt-semantic-interfaces/Makefile
+++ b/databases/py-dbt-semantic-interfaces/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	dbt-semantic-interfaces
 DISTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +17,7 @@ BUILD_DEPENDS=	hatch:devel/py-hatch@${PY_FLAVOR} \
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pydantic>=1.10:devel/py-pydantic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=4,<5:devel/py-jsonschema@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=6,<7:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=6,<7:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}more-itertools>=8,<11:devel/py-more-itertools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.3,<4:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=7,<9:devel/py-click@${PY_FLAVOR} \
diff --git a/databases/py-pgmigrate/Makefile b/databases/py-pgmigrate/Makefile
index 70a93898a68b..1a9302fa1e7a 100644
--- a/databases/py-pgmigrate/Makefile
+++ b/databases/py-pgmigrate/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pgmigrate
 PORTVERSION=	1.0.8
+PORTREVISION=	1
 CATEGORIES=	databases python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -12,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.2:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.3.0:databases/py-sqlparse@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.2:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.2:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_GITHUB=	yes
diff --git a/databases/py-pum/Makefile b/databases/py-pum/Makefile
index 70a0983df4ff..d99714d43a40 100644
--- a/databases/py-pum/Makefile
+++ b/databases/py-pum/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pum
 DISTVERSION=	0.9.14
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +12,7 @@ WWW=		https://github.com/opengisch/pum
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7.3:databases/py-psycopg2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/databases/py-schemachange/Makefile b/databases/py-schemachange/Makefile
index ef0e864e149a..4014049e60e1 100644
--- a/databases/py-schemachange/Makefile
+++ b/databases/py-schemachange/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	schemachange
 DISTVERSION=	3.6.1
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -24,7 +25,7 @@ USE_PYTHON=	autoplist concurrent pep517
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0,<4:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.3:math/py-pandas@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=6.0,<7:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=6.0,<7:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}snowflake-connector-python>=2.8,<4:databases/py-snowflake-connector-python@${PY_FLAVOR}
 
 do-test:
diff --git a/databases/py-snowddl/Makefile b/databases/py-snowddl/Makefile
index bc43bf7cc0a7..263469897b6e 100644
--- a/databases/py-snowddl/Makefile
+++ b/databases/py-snowddl/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	snowddl
 DISTVERSION=	0.25.2
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -20,7 +21,7 @@ USE_PYTHON=	autoplist concurrent pep517
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=4.18,<5:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydantic2>=2.4,<3:devel/py-pydantic2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=6.0,<7:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=6.0,<7:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}snowflake-connector-python>=3.0,<4:databases/py-snowflake-connector-python@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/deskutils/py-paperless-ngx/Makefile b/deskutils/py-paperless-ngx/Makefile
index cc2eff7e80ee..c53a3280047a 100644
--- a/deskutils/py-paperless-ngx/Makefile
+++ b/deskutils/py-paperless-ngx/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	paperless-ngx
 PORTVERSION=	2.7.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils python
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/:webui \
 		GH:gh
@@ -63,7 +63,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bleach>=6.1.0:www/py-bleach@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}websockets>=12.0:devel/py-websockets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}whitenoise>=6.2.0:www/py-whitenoise@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}whoosh>=2.7.4:textproc/py-whoosh@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=6.0.1:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=6.0.1:devel/py-pyyaml@${PY_FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 RUN_DEPENDS+=	gpg2:security/gnupg \
 		liberation-fonts-ttf>=2.1.3:x11-fonts/liberation-fonts-ttf \
diff --git a/deskutils/rednotebook/Makefile b/deskutils/rednotebook/Makefile
index 87e131c152f6..118eff06b1f9 100644
--- a/deskutils/rednotebook/Makefile
+++ b/deskutils/rednotebook/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	rednotebook
 DISTVERSIONPREFIX=v
 DISTVERSION=	2.31
+PORTREVISION=	1
 CATEGORIES=	deskutils
 
 MAINTAINER=	cth-freebsd@pm.me
@@ -9,7 +10,7 @@ WWW=		https://rednotebook.app
 
 LICENSE=	GPLv3+
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
 
 USES=		gettext-tools:build gnome python
diff --git a/devel/Makefile b/devel/Makefile
index 6673dd9c0626..49bd4ba785a2 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -5619,6 +5619,7 @@
     SUBDIR += py-pyvisa
     SUBDIR += py-pyvisa-py
     SUBDIR += py-pyxb-x
+    SUBDIR += py-pyyaml
     SUBDIR += py-pyyaml-include
     SUBDIR += py-pyyaml5
     SUBDIR += py-pyyaml_env_tag
@@ -6025,7 +6026,6 @@
     SUBDIR += py-xstatic-tv4
     SUBDIR += py-xxhash
     SUBDIR += py-yacs
-    SUBDIR += py-yaml
     SUBDIR += py-yamllint
     SUBDIR += py-yamlordereddictloader
     SUBDIR += py-yandex-money-sdk
diff --git a/devel/eric6/Makefile b/devel/eric6/Makefile
index 7402ad580f59..80e03b282a98 100644
--- a/devel/eric6/Makefile
+++ b/devel/eric6/Makefile
@@ -1,9 +1,9 @@
 .include "${.CURDIR}/../../devel/eric6/bsd.eric6.mk"
 
+PORTREVISION=	4
+CATEGORIES=	devel python
 PKGNAMESUFFIX=	-qt5-${FLAVOR:U:S/_/-/}
 DISTNAME=	${PORTNAME}-nolang-${DISTVERSION}
-PORTREVISION=	3
-CATEGORIES=	devel python
 
 WWW=		https://eric-ide.python-projects.org/index.html
 
@@ -16,7 +16,7 @@ BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}asttokens>=1.1:devel/py-asttokens@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>=2.3.1:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} \
@@ -27,7 +27,7 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 		${PYTHON_PKGNAMEPREFIX}asttokens>=1.1:devel/py-asttokens@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>=2.3.1:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 CONFLICTS_INSTALL=	${FLAVORS:N${FLAVOR}:C/^/${PORTNAME}-qt5-/}
 
diff --git a/devel/oci-cli/Makefile b/devel/oci-cli/Makefile
index c88a5744486b..9277d475f2a2 100644
--- a/devel/oci-cli/Makefile
+++ b/devel/oci-cli/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	oci-cli
 DISTVERSION=	3.43.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -29,7 +30,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}arrow>=1.0.0:devel/py-arrow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.15.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}terminaltables>=3.1.0:textproc/py-terminaltables@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.4:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.4:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python:3.8-3.11
 USE_PYTHON=	autoplist concurrent cryptography pep517
diff --git a/devel/py-acstore/Makefile b/devel/py-acstore/Makefile
index 5bb5aabdc7cc..7b24116b7008 100644
--- a/devel/py-acstore/Makefile
+++ b/devel/py-acstore/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	acstore
 PORTVERSION=	20230519
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI \
 		https://github.com/log2timeline/acstore/releases/download/${PORTVERSION}/
@@ -13,7 +14,7 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-apispec/Makefile b/devel/py-apispec/Makefile
index 8377d3ea43f3..eb8a79df64f2 100644
--- a/devel/py-apispec/Makefile
+++ b/devel/py-apispec/Makefile
@@ -18,7 +18,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}marshmallow>0:devel/py-marshmallow@${PY_FLA
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openapi-spec-validator>0:devel/py-openapi-spec-validator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prance>=0.11:devel/py-prance@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.10:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517 pytest
diff --git a/devel/py-aspy.yaml/Makefile b/devel/py-aspy.yaml/Makefile
index 924207cd7ebf..104d4c806cdf 100644
--- a/devel/py-aspy.yaml/Makefile
+++ b/devel/py-aspy.yaml/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	aspy.yaml
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +12,7 @@ WWW=		https://github.com/asottile/aspy.yaml
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-awscli/Makefile b/devel/py-awscli/Makefile
index f550f5dace4c..2ea7eecbcf06 100644
--- a/devel/py-awscli/Makefile
+++ b/devel/py-awscli/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	awscli
 PORTVERSION=	1.29.81
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}botocore>=1.31.35:devel/py-botocore@${PY_FLA
 		${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rsa>=3.1.2:security/py-rsa@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}s3transfer>=0.6.0:net/py-s3transfer@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.10:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-bandit/Makefile b/devel/py-bandit/Makefile
index 2805e29a8a3f..fe4f89942c72 100644
--- a/devel/py-bandit/Makefile
+++ b/devel/py-bandit/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	bandit
 DISTVERSION=	1.7.9
+PORTREVISION=	1
 CATEGORIES=	devel security python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorama>=0.3.9:devel/py-colorama@${PY_FLAVO
 		${PYTHON_PKGNAMEPREFIX}gitpython>=3.1.30:devel/py-gitpython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rich>0:textproc/py-rich@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.3.1:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.8.0:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}coverage>=4.5.4:devel/py-coverage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fixtures>=3.0.0:devel/py-fixtures@${PY_FLAVOR} \
diff --git a/devel/py-buildbot/Makefile b/devel/py-buildbot/Makefile
index 47438bd62420..78ffbf4c6937 100644
--- a/devel/py-buildbot/Makefile
+++ b/devel/py-buildbot/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	buildbot
 DISTVERSION=	3.11.5
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -26,7 +27,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}alembic>=1.6.0:databases/py-alembic@${PY_FLA
 		${PYTHON_PKGNAMEPREFIX}twisted>=18.7.0:devel/py-twisted@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}txaio>=2.2.2:devel/py-txaio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unidiff>=0.7.5:devel/py-unidiff@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.1:devel/py-zope.interface@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}buildbot-pkg==${PORTVERSION}:devel/py-buildbot-pkg@${PY_FLAVOR} \
diff --git a/devel/py-cfn-lint/Makefile b/devel/py-cfn-lint/Makefile
index 60366d6d08bb..9c34e3521db1 100644
--- a/devel/py-cfn-lint/Makefile
+++ b/devel/py-cfn-lint/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	cfn-lint
 DISTVERSION=	0.87.6
+PORTREVISION=	1
 CATEGORIES=	devel python textproc
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -21,7 +22,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aws-sam-translator>=1.89.0:devel/py-aws-sam-
 		${PYTHON_PKGNAMEPREFIX}regex>=2021.7.1:textproc/py-regex@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sarif-om>=1.0.4:devel/py-sarif-om@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>=1.0.0:math/py-sympy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>5.4:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>5.4:devel/py-pyyaml@${PY_FLAVOR}
 
*** 4718 LINES SKIPPED ***