diff --git a/MOVED b/MOVED
index 89ff955ff029..25a0a7c784bb 100644
--- a/MOVED
+++ b/MOVED
@@ -1,3382 +1,3383 @@
 #
 # MOVED -- A list of (recently) moved or removed ports
 #
 # Each entry consists of a single line containing the following four
 # fields in the order named, separated with the pipe (`|') character:
 #
 #     Port:	A port that was moved (category/portname)
 #     Moved to:	Where the port was moved to, or which port users can
 #		and should migrate to (category/portname); no entry
 #		indicates that the port was deleted
 #     Date:	When the moving or the removal was done (YYYY-MM-DD,
 #		in PST/PDT)
 #     Why:	The reason why the port was moved or removed
 #
 # Keep this list sorted in the chronological order.  New entries must be
 # added at the tail.  Reason for (re)move should start with a capital letter
 # (unless it's a file or other special name) and not end with the dot.
 #
 # If previously removed port gets restored, make sure to delete the relevant
 # line.  If a port is copied to a new location and the old location is kept
 # (e.g. upgraded to a later version), don't record it here.
 #
 # This file can be linted with Tools/scripts/MOVEDlint.awk
 #
 # Port|Moved to|Date|Why
 x11/wmctrl|x11/wmctrl-fork|2024-05-18|Forked due to the upstream being no longer available; the port had no maintainer
 www/wt3|www/wt|2021-01-03|Has expired: Upstream end of life, switch to www/wt instead
 archivers/ecm|archivers/cmdpack|2021-01-04|ECM is now included in cmdpack
 math/qhull5|math/qhull|2021-01-04|Has expired: Legacy version of port no longer required by math/octave
 devel/py-typing||2021-01-12|Python 2 only, backport of Python 3
 net/py-ipaddress||2021-01-12|Uses Python 2.7 which is EOLed upstream
 graphics/gif2png||2021-01-13|Has expired: Uses Python 2.7 which is EOLed upstream
 lang/harbour||2021-01-15|BROKEN, needs ancient version of openssl, upstream will not fix it
 net-im/telegram|net-im/telegram-cli|2021-01-17|Has expired: Upstream unmaintained; please migrate to net-im/telegram-cli
 science/dlpoly-classic||2021-01-17|Has expired: MASTERSITE gone; possibly replaced by https://gitlab.com/DL_POLY_Classic/dl_poly ?
 security/py-gtts-token|audio/py-gtts|2021-01-17|Has expired: Obsolete, please use audio/py-gtts instead
 graphics/qt-avif-image-plugin|graphics/kf5-kimageformats|2021-01-18|Part of kimageformats since KDE Frameworks 5.78.0
 archivers/libunrar5|archivers/libunrar6|2021-01-19|Renamed to match current major version of libunrar
 devel/electron7|devel/electron9|2021-01-21|EOLed upstream, switch to newer major version
 www/riot-web|www/element-web|2021-01-22|Project was renamed upstream
 sysutils/bareos16-client|sysutils/bareos18-client|2021-01-24|Has expired: Unmaintained, please migrate to a newer version of bareos
 sysutils/bareos16-client-static|sysutils/bareos18-client|2021-01-24|Has expired: Unmaintained, please migrate to a newer version of bareos
 sysutils/bareos16-server|sysutils/bareos18-server|2021-01-24|Has expired: Unmaintained, please migrate to a newer version of bareos
 www/bareos16-webui|www/bareos18-webui|2021-01-24|Has expired: Unmaintained, please migrate to a newer version of bareos
 www/sogo4|www/sogo|2021-01-28|Has expired: Unmaintained, please migrate to a newer version of sogo
 www/sogo4-activesync|www/sogo-activesync|2021-01-28|Has expired: Unmaintained, please migrate to a newer version of sogo
 security/py-rekall_lib||2021-01-28|Has expired: Unmaintained upstream
 devel/py-rekall-efilter||2021-01-28|Has expired: Unmaintained upstream
 security/py-rekall|security/py-volatility3|2021-01-28|Has expired: Unmaintained upstream, use security/py-volatility3 instead
 security/py-rekall-core||2021-01-28|Has expired: Unmaintained upstream
 www/kurly||2021-01-28|Has expired: Upstream is gone
 security/regripper||2021-01-28|Has expired: Upstream repo disappeared
 ftp/bbftp||2021-01-30|Was split into client and server ports, install as needed
 devel/rubygem-brpoplpush-redis_script|databases/rubygem-brpoplpush-redis_script|2021-01-30|Remove duplicate port
 graphics/opencv-core|graphics/opencv|2021-01-30|Reintegrated into a simple, maintainable port
 graphics/py-opencv|graphics/opencv|2021-01-30|Reintegrated into a simple, maintainable port
 graphics/opencv-java|graphics/opencv|2021-01-30|Reintegrated into a simple, maintainable port
 devel/py-automaton1|devel/py-automaton|2021-01-31|Has expired: Use devel/py-automaton instead
 devel/py-jaraco.functools2|devel/py-jaraco.functools|2021-01-31|Has expired: Use devel/py-jaraco.functools instead
 math/py-statsmodels010|math/py-statsmodels|2021-01-31|Has expired: Use math/py-statsmodels instead
 www/py-tornado6|www/py-tornado|2021-01-31|Has expired: Use www/py-tornado instead
 sysutils/rubygem-chef-config12|sysutils/rubygem-chef-config|2021-02-01|Has expired
 mail/openwebmail||2021-02-01|Has expired: Does not use modern Perl syntax and no development activity since 2006
 sysutils/rubygem-ohai8|sysutils/rubygem-ohai|2021-02-01|Has expired
 deskutils/xfce4-volumed||2021-02-01|Has expired: Unsupported upstream, cannot work with XFCE 4.16
 sysutils/rubygem-chef12|sysutils/rubygem-chef|2021-02-01|Has expired: Please use sysutils/rubygem-chef instead
 x11/xfce4-embed-plugin||2021-02-01|Has expired: Unsupported upstream, cannot work with XFCE 4.16
 net-p2p/py-transmissionrpc|net-p2p/py-transmission-rpc|2021-02-01|Has expired: Unmaintained and dead upstream, use net-p2p/py-transmission-rpc instead
 science/xfce4-equake-plugin||2021-02-01|Has expired: Unsupported upstream, cannot work with XFCE 4.16
 sysutils/xfce4-kbdleds-plugin||2021-02-01|Has expired: Unsupported upstream, cannot work with XFCE 4.16
 textproc/py-gfm|textproc/py-cmarkgfm|2021-02-01|Has expired: No longer maintained by upstream, please use textproc/py-cmarkgfm instead
 devel/godep||2021-02-02|Has expired: Unmaintained and dead upstream
 security/titus||2021-02-02|Has expired: Development has officially ceased
 www/p5-RT-Authen-ExternalAuth||2021-02-02|Removed, part of RT44
 www/p5-RT-Extension-QuickAssign||2021-02-02|Removed, only compatible with expired RT42
 www/p5-RT-Extension-SLA||2021-02-02|Removed, only compatible with expired RT42
 www/p5-RT-Extension-CommandByMail@rt42||2021-02-02|Removed, currently only supported with www/rt44
 www/p5-RT-Extension-CommandByMail@rt44|www/p5-RT-Extension-CommandByMail|2021-02-02|Unflavor, currently only supported with www/rt44
 www/p5-RT-Extension-Gravatar@rt42||2021-02-02|Removed, currently only supported with www/rt44
 www/p5-RT-Extension-Gravatar@rt44|www/p5-RT-Extension-Gravatar|2021-02-02|Unflavor, currently only supported with www/rt44
 www/p5-RT-Extension-LDAPImport@rt42||2021-02-02|Removed, currently only supported with www/rt44
 www/p5-RT-Extension-LDAPImport@rt44|www/p5-RT-Extension-LDAPImport|2021-02-02|Unflavor, currently only supported with www/rt44
 www/p5-RT-Extension-MandatoryOnTransition@rt42||2021-02-02|Removed, currently only supported with www/rt44
 www/p5-RT-Extension-RepeatTicket@rt42||2021-02-02|Removed, currently only supported with www/rt44
 www/p5-RT-Extension-RepeatTicket@rt44|www/p5-RT-Extension-RepeatTicket|2021-02-02|Unflavor, currently only supported with www/rt44
 www/p5-RTx-Calendar@rt42||2021-02-02|Removed, currently only supported with www/rt44
 www/rt42|www/rt44|2021-02-02|Has expired: Upstream support is ending; please migrate to RT-5.0 (www/rt50)
 www/opera||2021-02-04|Abandonware since 2013
 www/opera-linuxplugins||2021-02-04|Depends on opera browser
 sysutils/fusefs-gstfs||2021-02-04|Depends on the deprecated gstreamer 0.x
 audio/gstreamer-plugins-a52dec|audio/gstreamer1-plugins-a52dec|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-amrnb|audio/gstreamer1-plugins-amrnb|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-amrwbdec|audio/gstreamer1-plugins-amrwbdec|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-cdaudio||2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-cdparanoia|audio/gstreamer1-plugins-cdparanoia|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-faac|audio/gstreamer1-plugins-faac|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-faad|audio/gstreamer1-plugins-faad|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-flac|audio/gstreamer1-plugins-flac|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-flite|audio/gstreamer1-plugins-flite|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-fluendo-mp3||2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-gme|audio/gstreamer1-plugins-gme|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-gsm|audio/gstreamer1-plugins-gsm|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-jack|audio/gstreamer1-plugins-jack|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-ladspa|audio/gstreamer1-plugins-ladspa|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-lame|audio/gstreamer1-plugins-lame|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-mad||2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-mp3||2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-musepack|audio/gstreamer1-plugins-musepack|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-nas||2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-ogg|audio/gstreamer1-plugins-ogg|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-opus|audio/gstreamer1-plugins-opus|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-pulse|audio/gstreamer1-plugins-pulse|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-shout2|audio/gstreamer1-plugins-shout2|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-sidplay|audio/gstreamer1-plugins-sidplay|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-sndfile|audio/gstreamer1-plugins-sndfile|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-sndio|audio/gstreamer1-plugins-sndio|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-soundtouch|audio/gstreamer1-plugins-soundtouch|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-spc||2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-speex|audio/gstreamer1-plugins-speex|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-taglib|audio/gstreamer1-plugins-taglib|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-twolame|audio/gstreamer1-plugins-twolame|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-vorbis|audio/gstreamer1-plugins-vorbis|2021-02-04|Replaced by gstreamer1
 audio/gstreamer-plugins-wavpack|audio/gstreamer1-plugins-wavpack|2021-02-04|Replaced by gstreamer1
 devel/gstreamer-plugins-gconf||2021-02-04|Replaced by gstreamer1
 devel/gstreamer-plugins-gio||2021-02-04|Replaced by gstreamer1
 devel/gstreamer-plugins-gnomevfs||2021-02-04|Replaced by gstreamer1
 devel/gstreamer-plugins-sdl||2021-02-04|Replaced by gstreamer1
 devel/gstreamer-plugins-soup|devel/gstreamer1-plugins-soup|2021-02-04|Replaced by gstreamer1
 graphics/gstreamer-plugins-aalib|graphics/gstreamer1-plugins-aalib|2021-02-04|Replaced by gstreamer1
 graphics/gstreamer-plugins-cairo|graphics/gstreamer1-plugins-cairo|2021-02-04|Replaced by gstreamer1
 graphics/gstreamer-plugins-gdkpixbuf|graphics/gstreamer1-plugins-gdkpixbuf|2021-02-04|Replaced by gstreamer1
 graphics/gstreamer-plugins-gl|graphics/gstreamer1-plugins-gl|2021-02-04|Replaced by gstreamer1
 graphics/gstreamer-plugins-jpeg|graphics/gstreamer1-plugins-jpeg|2021-02-04|Replaced by gstreamer1
 graphics/gstreamer-plugins-libcaca|graphics/gstreamer1-plugins-libcaca|2021-02-04|Replaced by gstreamer1
 graphics/gstreamer-plugins-libpng|graphics/gstreamer1-plugins-png|2021-02-04|Replaced by gstreamer1
 graphics/gstreamer-plugins-libvisual|graphics/gstreamer1-plugins-libvisual|2021-02-04|Replaced by gstreamer1
 graphics/gstreamer-plugins-opencv|graphics/gstreamer1-plugins-opencv|2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer-ffmpeg|multimedia/gstreamer1-libav|2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer-plugins-all|multimedia/gstreamer1-plugins-all|2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer-plugins-annodex||2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer-plugins-bad|multimedia/gstreamer1-plugins-bad|2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer-plugins-bz2||2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer-plugins-core|multimedia/gstreamer1-plugins-core|2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer-plugins-dts|multimedia/gstreamer1-plugins-dts|2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer-plugins-dvd|multimedia/gstreamer1-plugins-dvdread|2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer-plugins-dv|multimedia/gstreamer1-plugins-dv|2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer-plugins-fluendo-mpegdemux||2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer-plugins-gnonlin|multimedia/gstreamer1-plugins-gnonlin|2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer-plugins-good|multimedia/gstreamer1-plugins-good|2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer-plugins-mpeg2dec|multimedia/gstreamer1-plugins-mpeg2dec|2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer-plugins-mpeg2enc|multimedia/gstreamer1-plugins-mpeg2enc|2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer-plugins-resindvd|multimedia/gstreamer1-plugins-resindvd|2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer-plugins-schroedinger||2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer-plugins-theora|multimedia/gstreamer1-plugins-theora|2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer-plugins-ugly|multimedia/gstreamer1-plugins-ugly|2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer-plugins-v4l2|multimedia/gstreamer1-plugins-v4l2|2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer-plugins-vdpau||2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer-plugins-vp8||2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer-plugins-x264|multimedia/gstreamer1-plugins-x264|2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer-plugins-xvid||2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer-plugins|multimedia/gstreamer1-plugins|2021-02-04|Replaced by gstreamer1
 multimedia/gstreamer|multimedia/gstreamer1|2021-02-04|Replaced by gstreamer1
 net/gstreamer-plugins-libmms|net/gstreamer1-plugins-libmms|2021-02-04|Replaced by gstreamer1
 sysutils/gstreamer-plugins-cdio|sysutils/gstreamer1-plugins-cdio|2021-02-04|Replaced by gstreamer1
 sysutils/gstreamer-plugins-hal||2021-02-04|Replaced by gstreamer1
 www/gstreamer-plugins-neon|www/gstreamer1-plugins-neon|2021-02-04|Replaced by gstreamer1
 x11-toolkits/gstreamer-plugins-pango|x11-toolkits/gstreamer1-plugins-pango|2021-02-04|Replaced by gstreamer1
 x11-themes/gnome-themes-extras|x11-themes/gnome-themes-extra|2021-02-04|Gnome2 desktop has been removed long ago
 math/why3||2021-02-04|Depends on deprecated gnome2 library, very outdated and unmaintained
 www/syndigator||2021-02-05|Abandon upstream, does not work with recent perl5 use deprecated Gnome2 libraries
 x11-toolkits/p5-Gtk2-Html2||2021-02-05|Deprecated upstream, not depended on, dpeends on deprecated Gnome2 libraries
 www/libgtkhtml||2021-02-05|Deprecated upstream, not depended on
 net/twitux||2021-02-06|Does not work with actually twitter
 devel/grpc_old|devel/grpc|2021-02-06|Added by accident in r564200 and removed in r564203
 net-mgmt/ccnet-server||2021-02-07|Removed
 x11-toolkits/c++-gtk-utils||2021-02-07|Abandoned library not depended on
 textproc/xml-i18n-tools|textproc/intltool|2021-02-07|Has been replaced by intltools long ago
 sysutils/hal||2021-02-08|Has been abandonned upstream long ago, replacement have now hit the ports tree almost everywhere
 sysutils/hal-info||2021-02-08|Has no use without hal which has been removed
 devel/electron9|devel/electron11|2021-02-08|VSCode update requires a newer major version
 security/openvas8|security/gvm|2021-02-08|Has expired: End of life, please migrate to security/gvm port
 security/openvas8-cli||2021-02-08|Has expired: End of life
 security/openvas8-libraries|security/gvm-libs|2021-02-08|Has expired: End of life, please migrate to security/gvm-libs port
 security/openvas8-manager|security/gvmd|2021-02-08|Has expired: End of life, please migrate to security/gvmd port
 security/openvas8-scanner|security/openvas|2021-02-08|Has expired: End of life, please migrate to security/openvas port
 security/openvas9|security/gvm|2021-02-08|Has expired: End of life, please migrate to security/gvm port
 security/openvas9-cli||2021-02-08|Has expired: End of life
 security/openvas9-libraries|security/gvm-libs|2021-02-08|Has expired: End of life, please migrate to security/gvm-libs port
 security/openvas9-manager|security/gvmd|2021-02-08|Has expired: End of life, please migrate to security/gvmd port
 security/openvas9-scanner|security/openvas|2021-02-08|Has expired: End of life, please migrate to security/openvas port
 security/greenbone-security-assistant8|security/greenbone-security-assistant|2021-02-08|Has expired: End of life, please migrate to new version of greenbone-security-assistant
 security/greenbone-security-assistant9|security/greenbone-security-assistant|2021-02-08|Has expired: End of life, please migrate to new version of greenbone-security-assistant
 misc/pnpids|misc/hwdata|2021-02-14|Rename package to upstreams name
 misc/cdcollect||2021-02-14|Has expired: Unmaintained and dead upstream (12+ years) depends on deprecated libraries as www/gtkhtml3
 security/krb5-116|security/krb5-118|2021-02-14|Has expired: EOL one year after the release of krb5 1.18
 www/palemoon||2021-02-15|Depends on expired version of python
 www/rtv||2021-02-17|Has expired: Abandoned, use www/py-ttrv or www/py-tuir instead
 textproc/py-sphinxcontrib-websupport11|textproc/py-sphinxcontrib-websupport|2021-02-17|Has expired: Use textproc/py-sphinxcontrib-websupport instead
 textproc/py-sphinx18|textproc/py-sphinx|2021-02-17|Has expired: Old version, use textproc/py-sphinx instead
 audio/herrie||2021-02-17|Removed
 sysutils/uefi-edk2-bhyve-devel|sysutils/uefi-edk2-bhyve|2021-02-17|Development version no longer necessary
 graphics/py-graph-core|graphics/py-pygraph|2021-02-19|Is outdated and broken with python3, use graphics/py-pygraph instead
 devel/allegro-devel|devel/allegro5|2021-02-20|Rename to better match upstream name
 www/py-djangorestframework311||2021-02-26|Removed: Used as a transitional package for www/seahub, please use www/py-djangorestframework instead
 editors/mg-static|editors/mg@static|2021-02-28|Flavored
 devel/snorenotify||2021-02-28|Has expired: Unmaintained upstream
 multimedia/kodi-addon-pvr-iptvsimple|multimedia/kodi-addon-pvr.iptvsimple|2021-03-01|Renamed to match upstream naming
 multimedia/kodi-addon-pvr-hts|multimedia/kodi-addon-pvr.hts|2021-03-01|Renamed to match upstream naming
 audio/beatslash-lv2||2021-03-01|Has expired: Unmaintained and doesn't build with the latest audio/lvtk version 2.x
 multimedia/kodi-addon-vfs.libarchive-devel||2021-03-01|Has expired: Depends on deprecated multimedia/kodi-devel
 multimedia/kodi-addon-peripheral.joystick-devel||2021-03-01|Has expired: Depends on deprecated multimedia/kodi-devel
 multimedia/kodi-devel|multimedia/kodi|2021-03-01|Has expired: Deprecated. Please use multimedia/kodi instead
 multimedia/kodi-addon-inputstream.adaptive-devel||2021-03-01|Has expired: Depends on deprecated multimedia/kodi-devel
 print/cloud-print-connector||2021-03-01|Has expired: Google Cloud Print has been shut down by Google as of December 31, 2020
 dns/knot2|dns/knot3|2021-03-01|Has expired: Use knot3, it is functionally compatible with 2.9.x
 print/cups-cloud-print||2021-03-01|Has expired: Google Cloud Print has been shut down by Google as of December 31, 2020
 www/helma||2021-03-01|Has expired: Upstream is basically dead and recommends ringojs.org
 multimedia/kodi-addon-peripheral-joystick|multimedia/kodi-addon-peripheral.joystick|2021-03-01|Renamed to match upstream naming
 sysutils/py-salt-2019|sysutils/py-salt|2021-03-02|Has expired: Deprecated. Please use sysutils/py-salt instead
 www/rubygem-gitlab-puma_worker_killer|www/rubygem-puma_worker_killer|2021-03-03|Obsolete, use www/rubygem-puma_worker_killer instead
 www/rubygem-gitlab-puma|www/rubygem-puma|2021-03-03|Obsolete, use www/rubygem-puma instead
 korean/man-doc||2021-03-03|Has expired: Poor quality, severely outdated and undermaintained
 devel/relx||2021-03-03|Has expired: Script removed upstream, library included in devel/rebar3
 sysutils/synergy-1|sysutils/synergy|2021-03-03|Current version is 1.x.x, 2.x.x was tagged by the upstream by mistake
 www/moodle35|www/moodle39|2021-03-04|Has expired: Deprecated by upstream
 www/moodle38|www/moodle39|2021-03-04|Has expired: Deprecated by upstream
 devel/llvm60|devel/llvm80|2021-03-06|Has expired: Uses Python 2.7 which is EOLed upstream
 audio/fplib||2021-03-07|Dead service since 2015
 sysutils/prelink||2021-03-11|Has expired: Have no users in the ports tree
 x11-fonts/vtfontcvt-ng||2021-03-12|no longer useful on any supported releases; use vtfontcvt(8) instead
 biology/py-fastTSNE|math/py-openTSNE|2021-03-13|project renamed/reimplemented under a different name
 misc/py-XlsxWriter|textproc/py-xlsxwriter|2021-03-13|Remove duplicate
 emulators/open-vm-tools-nox11|emulators/open-vm-tools@nox11|2021-03-17|Moved to a flavored, generic, version
 math/s2geometry|graphics/s2|2021-03-22|Remove duplicate port
 www/py-django-jsonfield||2021-03-24|Removed: This port will be deleted in the future, please switch to use www/py-jsonfield or www/py-jsonfield2
 devel/hs-c2hs||2021-03-27|Has expired: Was used as BUILD_DEPENDS, not useful on its own
 x11-toolkits/tile||2021-03-27|Has expired: The Tile widget set is part of Tk 8.5 and above, see TIP 248
 lang/Gofer||2021-03-28|Has expired: Old, unmaintained language
 net/libsignal|net/libsignal-protocol-c|2021-03-30|Renamed to match upstream naming
 databases/redis4|databases/redis|2021-04-06|Has expired: End of life, please use modern version
 lang/ruby25|lang/ruby27|2021-04-06|Has expired: Use newer version, e.g. lang/ruby27 or above. Ruby 2.5 is in security maintenance phase and planned for EOL on March 31, 2021
 www/gtkhtml3|www/gtkhtml4|2021-04-06|Has expired: Obsolete by upstream, doesn't build with recent versions of pango
 deskutils/tomboy||2021-04-06|Has expired: Unmaintained and dead upstream, depends on deprecated libraries such as www/gtkhtml3. Upstream project is now called tomboy-ng
 deskutils/tomboy-plugin-reminder||2021-04-06|Removed, part of deskutils/tomboy
 devel/monodevelop||2021-04-06|Has expired: outdated, depends on deprecated library www/gtkhtml3
 sysutils/syslog-ng327|sysutils/syslog-ng|2021-04-06|Has expired: Not officially supported by upstream
 sysutils/logstash5|sysutils/logstash6|2021-04-06|Has expired: End of life since release of 7.3.0
 www/decss||2021-04-06|Has expired: Abandonware
 textproc/elasticsearch5|textproc/elasticsearch6|2021-04-06|Has expired: End of life since release of 7.3.0
 textproc/elasticsearch5-search-guard||2021-04-06|Has expired: textproc/elasticsearch5 is scheduled for removal
 multimedia/gnome-subtitles||2021-04-06|Has expired: outdated, depends on deprecated library www/gtkhtml3
 net/libproxy-mozjs||2021-04-06|Has expired: Uses EOL Python 2.7 via lang/spidermonkey52
 lang/spidermonkey52|lang/spidermonkey78|2021-04-06|Has expired: Uses Python 2.7 which is EOLed upstream
 astro/roadmap||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 games/cosmo||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 games/bomberinstinct||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 games/drm||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 games/bygfoot||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 games/cre||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 irc/hybserv||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 irc/xaric||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 mail/elmo||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 misc/cave||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 security/bugs||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 security/dmitry||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 security/doorman||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 shells/esh||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 sysutils/cpu||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 textproc/libcrm114||2021-04-07|Has expired: No known users, dead upstream
 x11/wmmatrix||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 x11/wmxss||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 x11/tycoon||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 x11/xgrab||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 x11/xbanner||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 x11/bricons||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 x11/xmon||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 astro/saoimage||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 audio/ksmp3play||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 audio/jamin||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 audio/musicbox-tag-editor||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 audio/nspmod||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 audio/cdplay||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 audio/gimmix||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 audio/ghostess||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 audio/wmrecord||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 audio/toolame||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 audio/shout||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 biology/grappa||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 biology/phylip||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 biology/lagan||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 cad/varkon||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 cad/transcalc||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 comms/seyon||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 comms/efax||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 converters/vda2fbd||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 converters/shftool||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 devel/openzz||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 devel/sourcenav||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 devel/gb||2021-04-07|Has expired: Unmaintained and dead upstream
 dns/checkdns||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 dns/inadyn-mt||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 editors/gate||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 editors/thoteditor||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 emulators/cinc||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 emulators/e-uae||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 emulators/dtcyber||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 ftp/jftpgw||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 ftp/pureadmin||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 textproc/hs-pandoc-citeproc||2021-04-07|Has expired: Integrated into textproc/hs-pandoc
 devel/buildtool-doc||2021-04-07|Removed, depends on expired devel/buildtool
 devel/buildtool||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 misc/floatator||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 finance/wmstock||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 ftp/frox||2021-04-07|Has expired: Unmaintained and dead upstream, does not build with -fno-common (llvm 11)
 databases/couchdb2|databases/couchdb3|2021-04-07|No longer supported upstream, uses spidermonkey68 & python2; move to databases/couchdb3
 security/pidentd||2021-04-07|Removed: Unmaintained, abandoned, does not build with recent OS versions
 net/coturn|net/turnserver|2021-04-09|Remove duplicate port: coturn is another name for turnserver
 databases/percona55-server||2021-04-11|EOL upstream
 databases/percona55-client||2021-04-11|EOL upstream
 graphics/ilmbase|math/Imath|2021-04-11|Ilmbase was split out into Imath and OpenEXR
 www/xshttpd||2021-04-12|Unmaintained and dead upstream
 www/xshttpd-devel||2021-04-12|Unmaintained and dead upstream
 dns/credns||2021-04-12|Broken 12+, unmaintained upstream
 www/youtube_dlc|www/yt-dlp|2021-04-12|Upstream have made a complete transition to new project name
 security/netpgp||2021-04-12|Broken 12+, unmaintained upstream
 net/freenet6||2021-04-12|Broken 12+, service discontinued
 devel/sd-mux|devel/sd-mux-ctrl|2021-04-13|Renamed to match upstream naming
 sysutils/sd-mux-ctrl|devel/sd-mux-ctrl|2021-04-13|Remove duplicate port
 net/traefik2|net/traefik|2021-04-14|Superseded by net/traefik update
 net-mgmt/pdagent-integrations|net-mgmt/py-pdagent-integrations|2021-04-15|Restored and renamed
 www/grafana4|www/grafana6|2021-04-17|Has expired: Upstream end of life
 www/grafana5|www/grafana6|2021-04-17|Has expired: Upstream end of life
 comms/py-lirc||2021-04-17|Has expired: No longer maintained and not compatible with Python 3
 x11-toolkits/qt5-gtkplatform||2021-04-17|Has expired: Archived upstream
 textproc/py-markdown3|textproc/py-markdown|2021-04-20|markdown3 confilicts with too many ports
 security/fbopenssl||2021-04-20|Unmaintained, abandoned, does not build with recent OS versions
 devel/gearmand-devel||2021-04-20|Unmaintained, abandoned, has not built for over half a year
 textproc/bsdsort||2021-04-21|Old version of sort(1)
 www/py-django-mezzanine||2021-04-23|Depends on expired www/py-django111, not compatible with newer versions of Django
 devel/py-enum34||2021-04-23|No longer needed with python 3
 multimedia/gmimms||2021-04-23|Unmaintained, uses EOL'd Python 2.7
 multimedia/mimms||2021-04-23|Unmaintained, uses EOL'd Python 2.7
 net/samba411|net/samba412|2021-04-24|Has expired: Security Support ends on 03 Dec 2020
 net-im/cordless||2021-04-24|Has expired: Unmaintained and dead upstream, uses the old Discord API which notably has got users banned
 news/plor||2021-04-24|Has expired: listed as "Alpha-release" but last update in 2001; unmaintained
 security/certificate-transparency||2021-04-24|Has expired: Broken for more than 6 months
 misc/soapysdr-rtlsdr|comms/soapysdr-rtlsdr|2021-04-28|Move port to a proper category
 net/libjson-rpc-cpp||2021-04-28|Port has been broken since October 2020
 www/py-django111|www/py-django22|2021-04-30|Has expired: Django 1.11 is End-of-Life since April 2020. Switch to Django 2.2+ as soon as possible
 archivers/par2cmdline-tbb|archivers/par2cmdline|2021-04-30|Has expired: Unmaintained upstream, does not build with oneTbb. Use archivers/par2cmdline instead
 x11-toolkits/p5-Gnome2-VFS||2021-05-01|Has expired: Deprecated by the Gtk-Perl project. No more security patches and bug fixes
 x11-toolkits/p5-Gnome2||2021-05-01|Has expired: Deprecated by the Gtk-Perl project. No more security patches and bug fixes
 deskutils/shutter||2021-05-01|Has expired: Upstream gone, depends on expired x11-toolkits/p5-Gnome2-VFS
 misc/gcstar||2021-05-01|Has expired: Depends on expired x11-toolkits/p5-Gnome2-VFS
 x11/gnome-sharp20||2021-05-01|Dead upstream, no consumers left in the ports tree
 x11-toolkits/libgnomeui||2021-05-01|Dead upstream, no consumers left in the ports tree
 x11-toolkits/p5-Gnome2-Canvas||2021-05-01|Has expired: Deprecated by the Gtk-Perl project. No more security patches and bug fixes
 x11-toolkits/p5-Gnome2-Wnck||2021-05-01|Has expired: Deprecated by the Gtk-Perl project. No more security patches and bug fixes
 devel/p5-Gnome2-GConf||2021-05-01|Has expired: Deprecated by the Gtk-Perl project. No more security patches and bug fixes
 comms/kb||2021-05-01|Abandonware, upstream has disappeared, depends on libgnome
 games/monster-masher||2021-05-01|Abandonware, depends on libgnome
 x11/libgnome||2021-05-01|Dead upstream, no consumers left in the ports tree
 devel/gnome-vfs||2021-05-01|Dead upstream, no consumers left in the ports tree
 devel/libbonobo||2021-05-01|Dead upstream, no consumers left in the ports tree
 x11-toolkits/p5-Gtk2-Unique||2021-05-01|Dead upstream, no consumers left in the ports tree
 sysutils/policykit-gnome||2021-05-01|Gnome2 component, no consumers left in the ports tree
 sysutils/policykit|sysutils/polkit|2021-05-01|Gnome2 component, no consumers left in the ports tree
 databases/rubygem-gitlab-pg_query|databases/rubygem-pg_query|2021-05-03|Obsolete, please use databases/rubygem-pg_query
 devel/rubygem-licensee8|devel/rubygem-licensee|2021-05-03|Obsolete, please use devel/rubygem-licensee
 devel/rubygem-ruby-magic-static|devel/rubygem-ruby-magic|2021-05-03|Obsolete, please use devel/rubygem-ruby-magic
 ftp/cpr|www/cpr|2021-05-03|Remove duplicate port
 devel/gecode|math/gecode|2021-05-04|Move to a proper category
 net-im/libqmatrixclient|net-im/libquotient|2021-05-08|Has expired: Use libQuotient (devel/libquotient) instead
 devel/electron11|devel/electron12|2021-05-12|VSCode update requires a newer major version
 dns/opendd||2021-05-15|Has expired: Abandonware
 www/py-django30|www/py-django31|2021-05-16|Has expired: Has expired: Extended support has expired on April 6th, 2021. Use www/py-django31 or www/py-django32 instead
 net-mgmt/unifi-devel|net-mgmt/unifi6|2021-05-16|Has expired: Use net-mgmt/unifi6 instead
 print/rubygem-pdf-core07|print/rubygem-pdf-core|2021-05-16|Obsoleted. Use print/rubygem-pdf-core instead
 security/bitwarden_rs|security/vaultwarden|2021-05-16|Project was renamed upstream
 sysutils/kdiskmark|benchmarks/kdiskmark|2021-05-18|Moved to a more appropriate category
 sysutils/edk2@xen|sysutils/edk2@xen_x64|2021-05-18|Add Xen arch to the flavor name to be futur-proof
 devel/py-jupyter_core|devel/py-jupyter-core|2021-05-18|Renamed to match upstream naming
 devel/sope4|devel/sope|2021-05-19|Obsolete, please use devel/sope
 sysutils/ansible27|sysutils/ansible|2021-05-21|Has expired: Upstream support ended; consider upgrading to sysutils/ansible
 sysutils/ansible28|sysutils/ansible|2021-05-21|Has expired: Upstream support ended; consider upgrading to sysutils/ansible
 devel/omnisharp-server||2021-05-23|Dead upstream, no depends in ports tree
 devel/py-jupyter_client|devel/py-jupyter-client|2021-05-26|Renamed to match upstream naming
 textproc/gi-docgen|textproc/py-gi-docgen|2021-05-27|Follow standard python port conventions
 x11/phosh||2021-05-29|Incomplete
 multimedia/libav|multimedia/ffmpeg|2021-05-31|Has expired: Unmaintained upstream, use multimedia/ffmpeg instead
 devel/py-iterpipes||2021-06-06|Has expired: Unmaintained upstream, uses old Python
 devel/py-aspyct||2021-06-06|Has expired: Unmaintained upstream, uses old Python
 irc/oragono|irc/ergo|2021-06-08|Project was renamed upstream
 devel/py-castellan1|devel/py-castellan|2021-06-10|Remove obsoleted port. Use devel/py-castellan instead
 devel/py-cliff2|devel/py-cliff|2021-06-10|Remove obsoleted port. Use devel/py-cliff instead
 devel/py-cmd208|devel/py-cmd2|2021-06-10|Remove obsoleted port. Use devel/py-cmd2 instead
 devel/py-futurist1|devel/py-futurist|2021-06-10|Remove obsoleted port. Use devel/py-futurist instead
 devel/py-google-crc32c0|devel/py-google-crc32c|2021-06-10|Remove obsoleted port. Use devel/py-google-crc32c instead
 devel/py-jaraco.context2|devel/py-jaraco.context|2021-06-10|Remove obsoleted port. Use devel/py-jaraco.context instead
 devel/py-jaraco.util13|devel/py-jaraco.util|2021-06-10|Remove obsoleted port. Use devel/py-jaraco.util instead
 devel/py-keystoneauth13|devel/py-keystoneauth1|2021-06-10|Remove obsoleted port. Use devel/py-keystoneauth1 instead
 devel/py-keystonemiddleware8|devel/py-keystonemiddleware|2021-06-10|Remove obsoleted port. Use devel/py-keystonemiddleware instead
 devel/py-openstacksdk043|devel/py-openstacksdk|2021-06-10|Remove obsoleted port. Use devel/py-openstacksdk instead
 devel/py-os-brick2|devel/py-os-brick|2021-06-10|Remove obsoleted port. Use devel/py-os-brick instead
 devel/py-os-client-config1|devel/py-os-client-config|2021-06-10|Remove obsoleted port. Use devel/py-os-client-config instead
 devel/py-os-win4|devel/py-os-win|2021-06-10|Remove obsoleted port. Use devel/py-os-win instead
 devel/py-osc-lib1|devel/py-osc-lib|2021-06-10|Remove obsoleted port. Use devel/py-osc-lib instead
 devel/py-oslo.cache1|devel/py-oslo.cache|2021-06-10|Remove obsoleted port. Use devel/py-oslo.cache instead
 devel/py-oslo.concurrency3|devel/py-oslo.concurrency|2021-06-10|Remove obsoleted port. Use devel/py-oslo.concurrency instead
 devel/py-oslo.config7|devel/py-oslo.config|2021-06-10|Remove obsoleted port. Use devel/py-oslo.config instead
 devel/py-oslo.context2|devel/py-oslo.context|2021-06-10|Remove obsoleted port. Use devel/py-oslo.context instead
 devel/py-oslo.db6|devel/py-oslo.db|2021-06-10|Remove obsoleted port. Use devel/py-oslo.db instead
 devel/py-oslo.i18n3|devel/py-oslo.i18n|2021-06-10|Remove obsoleted port. Use devel/py-oslo.i18n instead
 devel/py-oslo.log3|devel/py-oslo.log|2021-06-10|Remove obsoleted port. Use devel/py-oslo.log instead
 devel/py-oslo.messaging10|devel/py-oslo.messaging|2021-06-10|Remove obsoleted port. Use devel/py-oslo.messaging instead
 devel/py-oslo.middleware3|devel/py-oslo.middleware|2021-06-10|Remove obsoleted port. Use devel/py-oslo.middleware instead
 devel/py-oslo.policy2|devel/py-oslo.policy|2021-06-10|Remove obsoleted port. Use devel/py-oslo.policy instead
 devel/py-oslo.privsep1|devel/py-oslo.privsep|2021-06-10|Remove obsoleted port. Use devel/py-oslo.privsep instead
 devel/py-oslo.reports1|devel/py-oslo.reports|2021-06-10|Remove obsoleted port. Use devel/py-oslo.reports instead
 devel/py-oslo.rootwrap5|devel/py-oslo.rootwrap|2021-06-10|Remove obsoleted port. Use devel/py-oslo.rootwrap instead
 devel/py-oslo.serialization2|devel/py-oslo.serialization|2021-06-10|Remove obsoleted port. Use devel/py-oslo.serialization instead
 devel/py-oslo.service1|devel/py-oslo.service|2021-06-10|Remove obsoleted port. Use devel/py-oslo.service instead
 devel/py-oslo.utils3|devel/py-oslo.utils|2021-06-10|Remove obsoleted port. Use devel/py-oslo.utils instead
 devel/py-oslo.versionedobjects1|devel/py-oslo.versionedobjects|2021-06-10|Remove obsoleted port. Use devel/py-oslo.versionedobjects instead
 devel/py-oslo.vmware2|devel/py-oslo.vmware|2021-06-10|Remove obsoleted port. Use devel/py-oslo.vmware instead
 devel/py-pycadf2|devel/py-pycadf|2021-06-10|Remove obsoleted port. Use devel/py-pycadf instead
 devel/py-taskflow3|devel/py-taskflow|2021-06-10|Remove obsoleted port. Use devel/py-taskflow instead
 devel/py-tempora1|devel/py-tempora|2021-06-10|Remove obsoleted port. Use devel/py-tempora instead
 devel/py-tinyrpc0|devel/py-tinyrpc|2021-06-10|Remove obsoleted port. Use devel/py-tinyrpc instead
 devel/py-tooz1|devel/py-tooz|2021-06-10|Remove obsoleted port. Use devel/py-tooz instead
 devel/py-twine1|devel/py-twine|2021-06-10|Remove obsoleted port. Use devel/py-twine instead
 net/py-python-cinderclient5|net/py-python-cinderclient|2021-06-10|Remove obsoleted port. Use net/py-python-cinderclient instead
 net/py-python-glanceclient2|net/py-python-glanceclient|2021-06-10|Remove obsoleted port. Use net/py-python-glanceclient instead
 net/py-python-keystoneclient3|net/py-python-keystoneclient|2021-06-10|Remove obsoleted port. Use net/py-python-keystoneclient instead
 net/py-python-novaclient16|net/py-python-novaclient|2021-06-10|Remove obsoleted port. Use net/py-python-novaclient instead
 print/py-pycups1|print/py-pycups|2021-06-10|Remove obsoleted port. Use print/py-pycups instead
 lang/gcc8-devel|lang/gcc8|2021-06-11|GCC 8 reached end of life, use the final release (or a new major version)
 news/inn-CURRENT|news/inn-current|2021-06-12|Port renamed on request
 databases/postgresql95-client||2021-06-13|Has expired: PostgreSQL-9.5 has reached end-of-life
 databases/postgresql95-contrib||2021-06-13|Has expired: PostgreSQL-9.5 has reached end-of-life
 databases/postgresql95-docs||2021-06-13|Has expired: PostgreSQL-9.5 has reached end-of-life
 databases/postgresql95-pgtcl||2021-06-13|Has expired: PostgreSQL-9.5 has reached end-of-life
 databases/postgresql95-plperl||2021-06-13|Has expired: PostgreSQL-9.5 has reached end-of-life
 databases/postgresql95-plpython||2021-06-13|Has expired: PostgreSQL-9.5 has reached end-of-life
 databases/postgresql95-pltcl||2021-06-13|Has expired: PostgreSQL-9.5 has reached end-of-life
 databases/postgresql95-server||2021-06-13|Has expired: PostgreSQL-9.5 has reached end-of-life
 databases/pg_reorg||2021-06-13|Removed, abandonware only for PostgreSQL 9.5
 databases/pgespresso||2021-06-13|Removed, functionality part of PostgreSQL 9.6 and later
 x11-fonts/urw-core35-fonts|x11-fonts/urw-base35-fonts|2021-06-15|Project was renamed upstream
 graphics/jpeg-xl|graphics/libjxl|2021-06-16|Project was renamed upstream
 chinese/docproj|textproc/docproj|2021-06-17|Deprecated after the doc transition
 devel/aarch64-gcc|devel/freebsd-gcc6@aarch64|2021-06-18|Replaced by a flavor
 devel/aarch64-xtoolchain-gcc|devel/freebsd-gcc6@aarch64|2021-06-18|Replaced by a flavor
 devel/amd64-gcc|devel/freebsd-gcc6@amd64|2021-06-18|Replaced by a flavor
 devel/amd64-xtoolchain-gcc|devel/freebsd-gcc6@amd64|2021-06-18|Replaced by a flavor
 devel/i386-gcc|devel/freebsd-gcc6@i386|2021-06-18|Replaced by a flavor
 devel/i386-xtoolchain-gcc|devel/freebsd-gcc6@i386|2021-06-18|Replaced by a flavor
 devel/mips-gcc|devel/freebsd-gcc6@mips|2021-06-18|Replaced by a flavor
 devel/mips-xtoolchain-gcc|devel/freebsd-gcc6@mips|2021-06-18|Replaced by a flavor
 devel/mips64-gcc|devel/freebsd-gcc6@mips64|2021-06-18|Replaced by a flavor
 devel/mips64-xtoolchain-gcc|devel/freebsd-gcc6@mips64|2021-06-18|Replaced by a flavor
 devel/powerpc64-gcc|devel/freebsd-gcc6@powerpc64|2021-06-18|Replaced by a flavor
 devel/powerpc64-xtoolchain-gcc|devel/freebsd-gcc6@powerpc64|2021-06-18|Replaced by a flavor
 devel/sparc64-gcc|devel/freebsd-gcc6@sparc64|2021-06-18|Replaced by a flavor
 devel/sparc64-xtoolchain-gcc|devel/freebsd-gcc6@sparc64|2021-06-18|Replaced by a flavor
 devel/riscv64-xtoolchain-gcc|devel/freebsd-gcc9@riscv64|2021-06-19|Replaced by a flavor
 www/py-beautifulsoup448|www/py-beautifulsoup|2021-06-20|Remove obsoleted port. Use www/py-beautifulsoup instead
 comms/rtl-443|comms/rtl-433|2021-06-21|Fix typo in port directory name
 devel/elixir-tirexs||2021-06-24|Remove obsoleted port. No releases on hex.pm
 lang/perl5.28||2021-06-26|Has expired: Support ends three years after .0 release. Please upgrade to a more recent version of Perl
 sysutils/cfengine314||2021-06-26|Has expired: Expire one year after cfengine 3.16.0 released
 sysutils/cfengine-masterfiles314||2021-06-26|Has expired: Expire one year after cfengine 3.16.0 released
 lang/pypy3||2021-06-26|Has expired: Uses Python 2.7 which is EOLed upstream
 lang/pypy||2021-06-26|Has expired: Uses Python 2.7 which is EOLed upstream
 databases/pypy-gdbm||2021-06-26|Has expired: Uses EOL Python 2.7 via lang/pypy
 databases/pypy-sqlite3||2021-06-26|Has expired: Uses EOL Python 2.7 via lang/pypy
 x11-toolkits/pypy-tkinter||2021-06-26|Has expired: Uses EOL Python 2.7 via lang/pypy
 multimedia/gxine||2021-06-26|Has expired: Uses EOL Python 2.7 via lang/spidermonkey185
 lang/spidermonkey185||2021-06-26|Has expired: Uses Python 2.7 which is EOLed upstream
 www/aws||2021-06-26|Has expired: Uses EOL Python 2.7 via devel/gnatpython
 www/aws-demos||2021-06-26|Has expired: Uses EOL Python 2.7 via www/aws
 devel/gnatpython||2021-06-26|Has expired: Uses Python 2.7 which is EOLed upstream
 devel/libosmocore||2021-06-26|Has expired: Uses Python 2.7 which is EOLed upstream
 net/openggsn||2021-06-26|Has expired: Uses EOL Python 2.7 via devel/libosmocore
 devel/libosmo-abis||2021-06-26|Has expired: Uses EOL Python 2.7 via devel/libosmocore
 www/node12||2021-06-26|Has expired: Uses Python 2.7 which is EOLed upstream
 www/npm-node12||2021-06-26|Removed, uses www/node12
 www/yarn-node12||2021-06-26|Has expired: Uses EOL Python 2.7 via www/node12
 www/npm-node10||2021-06-26|Removed, uses EOL Python 2.7 via www/node10
 www/yarn-node10||2021-06-26|Has expired: Uses EOL Python 2.7 via www/node10
 devel/libhid||2021-06-26|Has expired: Uses Python 2.7 which is EOLed upstream
 sysutils/usbhotkey||2021-06-26|Has expired: Uses EOL Python 2.7 via devel/libhid
 net/panoptis||2021-06-26|Has expired: Unmaintained upstream
 databases/elixir-mongo||2021-06-26|Has expired: Upsupported by upstream
 irc/eggdrop-devel|irc/eggdrop|2021-06-26|Has expired: Use stable version instead, irc/eggdrop
 audio/xmms2||2021-06-26|Has expired: Uses Python 2.7 which is EOLed upstream
 audio/gxmms2||2021-06-26|Has expired: Uses EOL Python 2.7 via audio/xmms2
 audio/lxmusic||2021-06-26|Has expired: Uses EOL Python 2.7 via audio/xmms2
 math/gringo||2021-06-26|Has expired: Uses Python 2.7 which is EOLed upstream
 math/aspcud||2021-06-26|Has expired: Uses EOL Python 2.7 via math/gringo
 math/py-pyasp||2021-06-26|Has expired: Uses EOL Python 2.7 via math/gringo
 devel/viewvc|devel/viewvc-devel|2021-06-26|Has expired: Uses Python 2.7 which is EOLed upstream
 chinese/sunpinyin||2021-06-26|Has expired: Uses Python 2.7 which is EOLed upstream
 chinese/fcitx-sunpinyin||2021-06-26|Has expired: Uses EOL Python 2.7 via chinese/sunpinyin
 www/dojo-shrinksafe||2021-06-26|Removed, deprecated upstream
 www/blastbeat||2021-06-26|Removed, abandoned upstream, broken on 12.X since 2019
 www/demoroniser||2021-06-26|Removed, made for Microsoft Powerpoint 9x with Perl 4.0
 x11-toolkits/v||2021-06-27|Has expired: Dead upstream, unmaintained and no consumers
 sysutils/ssid|sysutils/setsid|2021-06-27|Move to more obvious package name
 databases/pgpool-II-35||2021-07-01|Has expired: EOL since January 2021, please use one of the other pgpool-II-* ports
 sysutils/cdrtools-devel|sysutils/cdrtools|2021-07-01|Obsolete, use sysutils/cdrtools instead
 sysutils/sformat|sysutils/schilyutils|2021-07-01|Subsumed under sysutils/schilyutils
 misc/qtchooser||2021-07-04|No longer supported upstream
 databases/puppetdb5||2021-07-05|Has expired: Puppet 5 has reached EOL
 sysutils/puppet5||2021-07-05|Has expired: Puppet 5 has reached EOL
 sysutils/puppetserver5||2021-07-05|Has expired: Puppet 5 has reached EOL
 databases/puppetdb-terminus5||2021-07-05|Has expired: Puppet 5 has reached EOL
 devel/synfig|graphics/synfig|2021-07-06|The Graphics category is a more appropriate category for an image manipulation program
 www/nextcloud-circles|www/nextcloud|2021-07-09|Included in the Nextcloud port with 22.0.0
 net-mgmt/unifi-lts||2021-07-18|Has expired: Upstream EoL the hardware supported by this release
 audio/ripit|audio/abcde|2021-07-18|Has expired: Upstream no longer maintained, use audio/abcde instead
 x11-toolkits/libsexymm||2021-07-19|Discontinued in 2006, no dependency left in the ports tree
 sysutils/rubygem-fluent-plugin-graylog||2021-07-21|Has expired: Project is abandoned upstreams
 www/rubygem-toml-rb10|www/rubygem-toml-rb|2021-07-25|Obsolete, use www/rubygem-toml-rb
 devel/rubygem-grape-entity07|devel/rubygem-grape-entity|2021-07-25|Obsolete, use devel/rubygem-grape-entity
 net/rubygem-gitlab-fog-google|net/rubygem-fog-google|2021-07-25|Obsolete, use net/rubygem-fog-google
 devel/rubygem-gitlab-rdoc|devel/rubygem-rdoc|2021-07-25|Obsolete, use devel/rubygem-rdoc
 databases/rubygem-redis-namespace17|databases/rubygem-redis-namespace|2021-07-25|Obsolete, use databases/rubygem-redis-namespace
 multimedia/mlt|multimedia/mlt6|2021-07-30|Moved to a versioned directory to make place for future versions
 multimedia/mlt-qt5|multimedia/mlt6-qt5|2021-07-30|Moved to a versioned directory to make place for future versions
 multimedia/py-mlt|multimedia/py-mlt6|2021-07-30|Moved to a versioned directory to make place for future versions
 net/openldap24-sasl-client|net/openldap24-client|2021-08-01|SASL is always enabled for OpenLDAP
 textproc/py-python-language-server|textproc/py-python-lsp-server|2021-08-01|Has expired: Upstream forked and replaced by py-python-lsp-server
 games/ponscripter-sekai|games/ponscripter-07th-mod|2021-08-13|Switch to active fork
 sysutils/graid5||2021-08-21|Has expired: Module contains subtile errors and is obsolete by ZFS raidz. Consider migrating to ZFS
 x11-wm/gcompmgr||2021-08-21|Has expired: Abandonware since 2005, using discontinued libraries
 irc/lostirc||2021-08-21|Has expired: Abandonware since 2005, dependens on discontinued libraries
 math/normaliz|math/libnormaliz|2021-08-21|Remove duplicate
 devel/rubygem-paperclip||2021-08-28|Has expired: Use ActiveStorage or a fork kt-paperclip
 textproc/rubygem-rich||2021-08-28|Has expired: Depends on expired devel/rubygem-paperclip
 devel/magit-popup||2021-09-01|Has expired: No consumer in the ports tree any more
 databases/mongodb49|databases/mongodb50|2021-09-01|Has expired: This was a developer version which became MongoDB 5.0
 editors/vim-console|editors/vim|2021-09-02|The "vim" package is now console-only
 editors/vim-tiny|editors/vim@tiny|2021-09-02|The vim-tiny package is now a vim flavor
 lang/gcc7|lang/gcc10|2021-09-05|Has expired: Unsupported by upstream. Use GCC 10 or newer instead
 www/py-django-rest-swagger|www/py-drf-yasg|2021-09-17|Has expired: Has expired: Upstream no longer maintained, please use www/py-drf-yasg instead
 www/py-django-taggit-serializer|www/py-django-taggit|2021-09-17|Has expired: Obsolete, please use www/py-django-taggit instead
 www/efront||2021-09-17|Has expired: Unsupported by upstream
 devel/pear-PHPDoc|devel/pear-PhpDocumentor|2021-09-19|This package is not maintained anymore and has been superseded. Use devel/pear-PhpDocumentor instead
 devel/py-application|devel/py-python-application|2021-09-19|Renamed to match upstream naming
 net-mgmt/zabbix52-agent||2021-09-19|Has expired: Unsupported by upstream
 net-mgmt/zabbix52-frontend||2021-09-19|Has expired: Unsupported by upstream
 net-mgmt/zabbix52-java||2021-09-19|Has expired: Unsupported by upstream
 net-mgmt/zabbix52-proxy||2021-09-19|Has expired: Unsupported by upstream
 net-mgmt/zabbix52-server||2021-09-19|Has expired: Unsupported by upstream
 sysutils/roottail|sysutils/root-tail|2021-09-26|Renamed to match upstream naming
 devel/py-pyyaml-env-tag|devel/py-pyyaml_env_tag|2021-09-28|Renamed to match upstream naming
 mail/opensmtpd-devel|mail/opensmtpd|2021-09-28|Has expired: move to offical releases
 devel/erlang-exmpp||2021-09-30|Removed, last upstream patches over 10 years ago
 sysutils/showbeastie||2021-09-30|Broken on FreeBSD 12 and above since 2018
 www/squid3|www/squid|2021-09-30|Has expired: Unsupported by upstream
 sysutils/cfengine310|sysutils/cfengine317|2021-09-30|Has expired: OpenSSL 1.1.X is not supported
 security/py-paramiko1|security/py-paramiko|2021-09-30|Has expired: Out of date version.  No consumer now.  Use security/py-paramiko
 sysutils/cfengine-masterfiles310|sysutils/cfengine-masterfiles317|2021-09-30|Has expired: cfengine310 will retire at FreeBSD 11 EOL
 security/openca-tools-forked|security/libscep|2021-09-30|Has expired: Use modern port security/libscep instead
 multimedia/sms1xxx-kmod|multimedia/webcamd|2021-09-30|Has expired: Supports DVB API v3 only. Use multimedia/webcamd instead
 sysutils/cfengine311|sysutils/cfengine317|2021-09-30|Has expired: OpenSSL 1.1.X is not supported
 sysutils/cfengine-masterfiles311|sysutils/cfengine-masterfiles317|2021-09-30|Has expired: cfengine311 will retire at FreeBSD 11 EOL
 mail/postfix35|mail/postfix|2021-09-30|Has expired: It is only here until FreeBSD 11 is EoL (Postfix >= 3.6 requires OpenSSL >= 1.1.x)
 graphics/drm-fbsd11.2-kmod||2021-09-30|Removed, only useful on EOL FreeBSD 11.4
 devel/qca-legacy|devel/qca|2021-09-30|Removed, only useful on EOL FreeBSD 11.4
 lang/erlang-runtime20|lang/erlang-runtime22|2021-10-04|Has expired: no longer supported upstream, use lang/erlang >=22
 lang/erlang-riak|lang/erlang-runtime22|2021-10-04|Has expired: no longer supported upstream, use lang/erlang >=22
 sysutils/stanchion||2021-10-04|Has expired: dependencies no longer supported upstream
 sysutils/riak-cs||2021-10-04|Has expired: dependencies no longer supported upstream
 devel/py-thriftpy|devel/py-thriftpy2|2021-10-04|Remove deprecated port. Use devel/py-thriftpy2 instead
 net/kafkacat|net/kcat|2021-10-06|Renamed
 devel/geany@gtk2|devel/geany|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-addons@gtk2|devel/geany-plugin-addons|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-autoclose@gtk2|devel/geany-plugin-autoclose|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-automark@gtk2|devel/geany-plugin-automark|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-codenav@gtk2|devel/geany-plugin-codenav|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-commander@gtk2|devel/geany-plugin-commander|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-ctags@gtk2|devel/geany-plugin-ctags|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-debugger@gtk2|devel/geany-plugin-debugger|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-defineformat@gtk2|devel/geany-plugin-defineformat|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-doc@gtk2|devel/geany-plugin-doc|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-extrasel@gtk2|devel/geany-plugin-extrasel|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-gendoc@gtk2|devel/geany-plugin-gendoc|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-geniuspaste@gtk2|devel/geany-plugin-geniuspaste|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-git-changebar@gtk2|devel/geany-plugin-git-changebar|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-insertnum@gtk2|devel/geany-plugin-insertnum|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-latex@gtk2|devel/geany-plugin-latex|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-lineoperations@gtk2|devel/geany-plugin-lineoperations|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-lipsum@gtk2|devel/geany-plugin-lipsum|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-lua@gtk2|devel/geany-plugin-lua|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-macro@gtk2|devel/geany-plugin-macro|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-miniscript@gtk2|devel/geany-plugin-miniscript|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-multiterm||2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-numberedbookmarks@gtk2|devel/geany-plugin-numberedbookmarks|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-overview@gtk2|devel/geany-plugin-overview|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-pairtaghighlighter@gtk2|devel/geany-plugin-pairtaghighlighter|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-pg@gtk2|devel/geany-plugin-pg|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-pohelper@gtk2|devel/geany-plugin-pohelper|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-pretty-printer@gtk2|devel/geany-plugin-pretty-printer|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-projectorganizer@gtk2|devel/geany-plugin-projectorganizer|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-prj@gtk2|devel/geany-plugin-prj|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-scope@gtk2|devel/geany-plugin-scope|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-sendmail@gtk2|devel/geany-plugin-sendmail|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-shiftcolumn@gtk2|devel/geany-plugin-shiftcolumn|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-spellcheck@gtk2|devel/geany-plugin-spellcheck|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-tableconvert@gtk2|devel/geany-plugin-tableconvert|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-treebrowser@gtk2|devel/geany-plugin-treebrowser|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-updatechecker@gtk2|devel/geany-plugin-updatechecker|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-vc@gtk2|devel/geany-plugin-vc|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-vimode@gtk2|devel/geany-plugin-vimode|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-workbench@gtk2|devel/geany-plugin-workbench|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-xmlsnippets@gtk2|devel/geany-plugin-xmlsnippets|2021-10-10|Project dropped GTK2 support
 net-mgmt/unifi5|net-mgmt/unifi6|2021-10-16|Has expired: Use net-mgmt/unifi6 instead
 databases/rubygem-activemodel613|databases/rubygem-activemodel61|2021-10-22|Removed: Use databases/rubygem-activemodel61 instead
 databases/rubygem-activerecord613|databases/rubygem-activerecord61|2021-10-22|Removed: Use databases/rubygem-activerecord61 instead
 devel/rubygem-actionview613|devel/rubygem-actionview61|2021-10-22|Removed: Use devel/rubygem-actionview61 instead
 devel/rubygem-activejob613|devel/rubygem-activejob61|2021-10-22|Removed: Use devel/rubygem-activejob61 instead
 devel/rubygem-activesupport613|devel/rubygem-activesupport61|2021-10-22|Removed: Use devel/rubygem-activesupport61 instead
 devel/rubygem-devise-rails613|devel/rubygem-devise-rails61|2021-10-22|Removed: Use devel/rubygem-devise-rails61 instead
 devel/rubygem-devise47-rails613|devel/rubygem-devise47-rails61|2021-10-22|Removed: Use devel/rubygem-devise47-rails61 instead
 devel/rubygem-gettext_i18n_rails_js-rails613|devel/rubygem-gettext_i18n_rails_js-rails61|2021-10-22|Removed: Use devel/rubygem-gettext_i18n_rails_js-rails61 instead
 devel/rubygem-peek-rails613|devel/rubygem-peek-rails61|2021-10-22|Removed: Use devel/rubygem-peek-rails61 instead
 devel/rubygem-rails-i18n-rails613|devel/rubygem-rails-i18n-rails61|2021-10-22|Removed: Use devel/rubygem-rails-i18n-rails61 instead
 devel/rubygem-web-console-rails613|devel/rubygem-web-console-rails61|2021-10-22|Removed: Use devel/rubygem-web-console-rails61 instead
 devel/rubygem-webpacker-rails613|devel/rubygem-webpacker-rails61|2021-10-22|Removed: Use devel/rubygem-webpacker-rails61 instead
 mail/rubygem-actionmailbox613|mail/rubygem-actionmailbox61|2021-10-22|Removed: Use mail/rubygem-actionmailbox61 instead
 mail/rubygem-actionmailer613|mail/rubygem-actionmailer61|2021-10-22|Removed: Use mail/rubygem-actionmailer61 instead
 net/rubygem-activestorage613|net/rubygem-activestorage61|2021-10-22|Removed: Use net/rubygem-activestorage61 instead
 security/rubygem-devise-two-factor-rails613|security/rubygem-devise-two-factor-rails61|2021-10-22|Removed: Use security/rubygem-devise-two-factor-rails61 instead
 textproc/rubygem-actiontext613|textproc/rubygem-actiontext61|2021-10-22|Removed: Use textproc/rubygem-actiontext61 instead
 textproc/rubygem-sass-rails-rails613|textproc/rubygem-sass-rails-rails61|2021-10-22|Removed: Use textproc/rubygem-sass-rails-rails61 instead
 textproc/rubygem-sassc-rails-rails613|textproc/rubygem-sassc-rails-rails61|2021-10-22|Removed: Use textproc/rubygem-sassc-rails-rails61 instead
 www/rubygem-actioncable613|www/rubygem-actioncable61|2021-10-22|Removed: Use www/rubygem-actioncable61 instead
 www/rubygem-actionpack613|www/rubygem-actionpack61|2021-10-22|Removed: Use www/rubygem-actionpack61 instead
 www/rubygem-lograge-rails613|www/rubygem-lograge-rails61|2021-10-22|Removed: Use www/rubygem-lograge-rails61 instead
 www/rubygem-rails613|www/rubygem-rails61|2021-10-22|Removed: Use www/rubygem-rails61 instead
 www/rubygem-railties613|www/rubygem-railties61|2021-10-22|Removed: Use www/rubygem-railties61 instead
 www/rubygem-responders-rails613|www/rubygem-responders-rails61|2021-10-22|Removed: Use www/rubygem-responders-rails61 instead
 net/asterisk13|net/asterisk18|2021-10-24|Has expired: Asterisk 13.x will reach EOL on 2021-10-24. Please migrate to net/asterisk18
 textproc/py-tomli_w|textproc/py-tomli-w|2021-10-25|Renamed to match upstream naming
 devel/rubygem-chef-provisioning||2021-10-25|Chef Provisioning is EoL'd on August 31, 2019
 devel/rubygem-grit||2021-10-25|Deprecated by upstream. Unmaintained since January 29, 2014
 graphics/rubygem-goocanvas||2021-10-25|Deprecated by upstream. Unmaintained since October 12, 2014
 sysutils/rubygem-chef15|sysutils/rubygem-chef|2021-10-25|Chef Infra Client 15 and under is EoL'd on April 30, 2021
 sysutils/rubygem-chef-config15|sysutils/rubygem-chef-config|2021-10-25|Chef Infra Client 15 and under is EoL'd on April 30, 2021
 sysutils/rubygem-chef-dk||2021-10-25|ChefDK is EoL'd on December 31, 2020
 sysutils/rubygem-chef-utils15|sysutils/rubygem-chef-utils|2021-10-25|Chef Infra Client 15 and under is EoL'd on April 30, 2021
 sysutils/rubygem-ohai15|sysutils/rubygem-ohai|2021-10-25|Chef Infra Client 15 and under is EoL'd on April 30, 2021
 www/rubygem-kensa||2021-10-25|Kensa is deprecated in favor of the addons-admin Heroku CLI plugin since December 14, 2018
 textproc/rubygem-compass||2021-10-25|Compass is no longer supported since August 4, 2016
 textproc/rubygem-compass-core||2021-10-25|Compass is no longer supported since August 4, 2016
 textproc/rubygem-compass-import-once||2021-10-25|Compass is no longer supported since August 4, 2016
 textproc/rubygem-compass-blueprint||2021-10-25|Depend on unsupported textproc/rubygem-compass
 emulators/vpcs||2021-10-27|Has expired: Upstream unmaintained
 devel/google-gdata||2021-10-27|Has expired: Google is no longer using GoogleData APIs
 net/irrd-legacy|net/irrd|2021-10-27|Has expired: Use net/irrd
 mail/postfix-ldap-sasl|mail/postfix@ldap|2021-10-28|Converted to flavor
 mail/postfix-sasl|mail/postfix@sasl|2021-10-28|Converted to flavor
 mail/postfix-current-sasl|mail/postfix-current@sasl|2021-10-28|Converted to flavor
 databases/mysqlsniffer||2021-10-30|Has expired: Development discontinued upstream, doesn't build on recent FreeBSD
 emulators/advancemenu||2021-10-31|Has expired: Heavily outdated and unmaintained
 emulators/qemu31|emulators/qemu|2021-10-31|Has expired: Use emulators/qemu or emulators/qemu-devel
 games/super_methane_brothers||2021-10-31|Removed, depnds on expired devel/clanlib
 emulators/advancemess||2021-10-31|Removed, depends on expired emulators/advancemame
 emulators/advancemame||2021-10-31|Has expired: Heavily outdated and unmaintained
 devel/clanlib||2021-10-31|Has expired: Upstream no longer maintained
 astro/boinc-setiathome||2021-11-03|No longer giving out work units
 astro/boinc-astropulse||2021-11-04|boinc-setiathome removed, no longer needed
 multimedia/celluloid-devel|multimedia/celluloid|2021-11-05|Out of date: use multimedia/celluloid for now
 devel/zmusic|audio/zmusic|2021-11-10|Category change
 emulators/i386-wine-devel||2021-11-16|Removed: obsolete, emulators/wine-devel provides i386 support
 emulators/qemu52|emulators/qemu5|2021-11-16|Has expired
 emulators/i386-wine||2021-11-19|Removed: obsolete, emulators/wine provides i386 support
 net-im/twitmail||2021-11-19|Not functional anymore
 sysutils/cfengine315||2021-11-21|Has expired: Expire one year after cfengine 3.17.0 released
 sysutils/cfengine-masterfiles315||2021-11-21|Has expired: Expire one year after cfengine 3.17.0 released
 games/linux-unigine-heaven|benchmarks/linux-unigine-heaven|2021-11-21|Moved to a more appropriate category
 games/linux-unigine-valley|benchmarks/linux-unigine-valley|2021-11-21|Moved to a more appropriate category
 devel/electron12|devel/electron13|2021-11-24|VSCode update requires a newer major version
 mail/gmime24-sharp||2021-11-30|Has expired: Use mail/gmime26 or mail/gmime30
 mail/gmime24||2021-11-30|Has expired: Use mail/gmime26 or mail/gmime30
 sysutils/bareos17-client|sysutils/bareos18-client|2021-12-05|Has expired: Deprecated, no new release since 2020
 sysutils/bareos17-client-static||2021-12-05|Has expired: Deprecated, no new release since 2020
 sysutils/bareos17-server|sysutils/bareos18-server|2021-12-05|Has expired: Deprecated, no new release since 2020
 www/bareos17-webui|www/bareos18-webui|2021-12-05|Has expired: Deprecated, no new release since 2020
 math/eigen2||2021-12-07|Has expired: No longer available upstream, no consumers in ports
 misc/opensubdiv|graphics/opensubdiv|2021-12-07|remove duplicate
 emulators/qemu41||2021-12-10|Has expired: Use emulators/qemu or emulators/qemu-devel
 security/putty-gtk2||2021-12-15|Has expired: putty-gtk2 is being phased out
 games/xnethack-nox11|games/xnethack@nox11|2021-12-16|Turned into flavor
 devel/py-dexml||2021-12-20|Has expired: Use devel/py-dexml2
 misc/cmatrix|games/cmatrix|2021-12-20|Move to a more appropriate category
 games/homura|games/suyimazu|2021-12-21|Project was renamed upstream
 textproc/py-markdown-math|textproc/py-python-markdown-math|2021-12-21|Renamed to match upstream naming
 databases/rubygem-flipper-active_record017|databases/rubygem-flipper-active_record|2021-12-21|Remove obsoleted port. Use databases/rubygem-flipper-active_record instead
 databases/rubygem-mysql204|databases/rubygem-mysql2|2021-12-21|Remove obsoleted port. Use databases/rubygem-mysql2 instead
 databases/rubygem-pg0|databases/rubygem-pg|2021-12-21|Remove obsoleted port. Use databases/rubygem-pg instead
 databases/rubygem-pg018|databases/rubygem-pg|2021-12-21|Remove obsoleted port. Use databases/rubygem-pg instead
 databases/rubygem-redis-namespace16|databases/rubygem-redis-namespace|2021-12-21|Remove obsoleted port. Use databases/rubygem-redis-namespace instead
 devel/rubygem-batch-loader14|devel/rubygem-batch-loader|2021-12-21|Remove obsoleted port. Use devel/rubygem-batch-loader instead
 devel/rubygem-bootsnap14|devel/rubygem-bootsnap|2021-12-21|Remove obsoleted port. Use devel/rubygem-bootsnap instead
 devel/rubygem-cucumber-create-meta2|devel/rubygem-cucumber-create-meta|2021-12-21|Remove obsoleted port. Use devel/rubygem-cucumber-create-meta instead
 devel/rubygem-cucumber-create-meta4|devel/rubygem-cucumber-create-meta|2021-12-21|Remove obsoleted port. Use devel/rubygem-cucumber-create-meta instead
 devel/rubygem-cucumber-cucumber-expressions10|devel/rubygem-cucumber-cucumber-expressions|2021-12-21|Remove obsoleted port. Use devel/rubygem-cucumber-cucumber-expressions instead
 devel/rubygem-cucumber-messages13|devel/rubygem-cucumber-messages|2021-12-21|Remove obsoleted port. Use devel/rubygem-cucumber-messages instead
 devel/rubygem-cucumber-messages15|devel/rubygem-cucumber-messages|2021-12-21|Remove obsoleted port. Use devel/rubygem-cucumber-messages instead
 devel/rubygem-devise47-rails60|devel/rubygem-devise-rails60|2021-12-21|Remove obsoleted port. Use devel/rubygem-devise-rails60 instead
 devel/rubygem-faraday_middleware-aws-signers-v4|devel/rubygem-faraday_middleware-aws-sigv4|2021-12-21|Upstream archived repository and suggest using faraday_middleware-aws-sigv4
 devel/rubygem-ffi110|devel/rubygem-ffi|2021-12-21|Remove obsoleted port. Use devel/rubygem-ffi instead
 devel/rubygem-flipper-active_support_cache_store017|devel/rubygem-flipper-active_support_cache_store|2021-12-21|Remove obsoleted port. Use devel/rubygem-flipper-active_support_cache_store instead
 devel/rubygem-flipper-ui017|devel/rubygem-flipper-ui|2021-12-21|Remove obsoleted port. Use devel/rubygem-flipper-ui instead
 devel/rubygem-flipper017|devel/rubygem-flipper|2021-12-21|Remove obsoleted port. Use devel/rubygem-flipper instead
 devel/rubygem-gettext32|devel/rubygem-gettext|2021-12-21|Remove obsoleted port. Use devel/rubygem-gettext instead
 devel/rubygem-google-protobuf314|devel/rubygem-google-protobuf|2021-12-21|Remove obsoleted port. Use devel/rubygem-google-protobuf instead
 devel/rubygem-google-protobuf315|devel/rubygem-google-protobuf|2021-12-21|Remove obsoleted port. Use devel/rubygem-google-protobuf instead
 devel/rubygem-google-protobuf317|devel/rubygem-google-protobuf|2021-12-21|Remove obsoleted port. Use devel/rubygem-google-protobuf instead
 devel/rubygem-google-protobuf38|devel/rubygem-google-protobuf|2021-12-21|Remove obsoleted port. Use devel/rubygem-google-protobuf instead
 devel/rubygem-googleapis-common-protos-types104|devel/rubygem-googleapis-common-protos-types|2021-12-21|Remove obsoleted port. Use devel/rubygem-googleapis-common-protos-types instead
 devel/rubygem-grape140|devel/rubygem-grape|2021-12-21|Remove obsoleted port. Use devel/rubygem-grape instead
 devel/rubygem-hashie2|devel/rubygem-hashie|2021-12-21|Remove obsoleted port. Use devel/rubygem-hashie instead
 devel/rubygem-hashie3|devel/rubygem-hashie|2021-12-21|Remove obsoleted port. Use devel/rubygem-hashie instead
 devel/rubygem-jira-ruby1|devel/rubygem-jira-ruby|2021-12-21|Remove obsoleted port. Use devel/rubygem-jira-ruby instead
 devel/rubygem-jira-ruby20|devel/rubygem-jira-ruby|2021-12-21|Remove obsoleted port. Use devel/rubygem-jira-ruby instead
 devel/rubygem-launchy22|devel/rubygem-launchy|2021-12-21|Remove obsoleted port. Use devel/rubygem-launchy instead
 devel/rubygem-method_source0|devel/rubygem-method_source|2021-12-21|Remove obsoleted port. Use devel/rubygem-method_source instead
 devel/rubygem-micromachine2|devel/rubygem-micromachine|2021-12-21|Remove obsoleted port. Use devel/rubygem-micromachine instead
 devel/rubygem-opentracing04|devel/rubygem-opentracing|2021-12-21|Remove obsoleted port. Use devel/rubygem-opentracing instead
 devel/rubygem-paint1|devel/rubygem-paint|2021-12-21|Remove obsoleted port. Use devel/rubygem-paint instead
 devel/rubygem-rails-i18n-4|devel/rubygem-rails-i18n-rails61|2021-12-21|Remove obsoleted port. Use devel/rubygem-rails-i18n-rails61 instead
 devel/rubygem-sentry-raven2|devel/rubygem-sentry-raven|2021-12-21|Remove obsoleted port. Use devel/rubygem-sentry-raven instead
 devel/rubygem-sentry-raven25|devel/rubygem-sentry-raven|2021-12-21|Remove obsoleted port. Use devel/rubygem-sentry-raven instead
 devel/rubygem-sentry-raven29|devel/rubygem-sentry-raven|2021-12-21|Remove obsoleted port. Use devel/rubygem-sentry-raven instead
 devel/rubygem-sidekiq5|devel/rubygem-sidekiq|2021-12-21|Remove obsoleted port. Use devel/rubygem-sidekiq instead
 devel/rubygem-thread_safe1|devel/rubygem-thread_safe|2021-12-21|Remove obsoleted port. Use devel/rubygem-thread_safe instead
 devel/rubygem-unicode-display_width1|devel/rubygem-unicode-display_width|2021-12-21|Remove obsoleted port. Use devel/rubygem-unicode-display_width instead
 devel/rubygem-webpacker4-rails5|devel/rubygem-webpacker-rails61|2021-12-21|Remove obsoleted port. Use devel/rubygem-webpacker-rails61 instead
 devel/rubygem-webpacker4-rails50|devel/rubygem-webpacker-rails61|2021-12-21|Remove obsoleted port. Use devel/rubygem-webpacker-rails61 instead
 misc/rubygem-mime-types1|misc/rubygem-mime-types|2021-12-21|Remove obsoleted port. Use misc/rubygem-mime-types instead
 net/rubygem-fog-brightbox0|net/rubygem-fog-brightbox|2021-12-21|Remove obsoleted port. Use net/rubygem-fog-brightbox instead
 net/rubygem-fog-google19|net/rubygem-fog-google|2021-12-21|Remove obsoleted port. Use net/rubygem-fog-google instead
 net/rubygem-grpc124|net/rubygem-grpc|2021-12-21|Remove obsoleted port. Use net/rubygem-grpc instead
 net/rubygem-grpc130|net/rubygem-grpc|2021-12-21|Remove obsoleted port. Use net/rubygem-grpc instead
 net/rubygem-omniauth-auth014|net/rubygem-omniauth-auth0|2021-12-21|Remove obsoleted port. Use net/rubygem-omniauth-auth0 instead
 security/rubygem-devise-two-factor30-rails52|security/rubygem-devise-two-factor|2021-12-21|Remove obsoleted port. Use security/rubygem-devise-two-factor instead
 security/rubygem-devise-two-factor30-rails60|security/rubygem-devise-two-factor|2021-12-21|Remove obsoleted port. Use security/rubygem-devise-two-factor instead
 security/rubygem-net-ssh-gateway1|security/rubygem-net-ssh-gateway|2021-12-21|Remove obsoleted port. Use security/rubygem-net-ssh-gateway instead
 security/rubygem-net-ssh4|security/rubygem-net-ssh|2021-12-21|Remove obsoleted port. Use security/rubygem-net-ssh instead
 sysutils/rubygem-bundler1|sysutils/rubygem-bundler|2021-12-21|Remove obsoleted port. Use sysutils/rubygem-bundler instead
 textproc/rubygem-actionpack-xml_parser1-rails4|textproc/rubygem-actionpack-xml_parser-rails5|2021-12-21|Remove obsoleted port. Use textproc/rubygem-actionpack-xml_parser-rails5 instead
 textproc/rubygem-asciidoctor-plantuml0010|textproc/rubygem-asciidoctor-plantuml|2021-12-21|Remove obsoleted port. Use textproc/rubygem-asciidoctor-plantuml instead
 textproc/rubygem-autoprefixer-rails1020|textproc/rubygem-autoprefixer-rails|2021-12-21|Remove obsoleted port. Use textproc/rubygem-autoprefixer-rails instead
 textproc/rubygem-cucumber-gherkin15|textproc/rubygem-cucumber-gherkin|2021-12-21|Remove obsoleted port. Use textproc/rubygem-cucumber-gherkin instead
 textproc/rubygem-cucumber-gherkin18|textproc/rubygem-cucumber-gherkin|2021-12-21|Remove obsoleted port. Use textproc/rubygem-cucumber-gherkin instead
 textproc/rubygem-cucumber-html-formatter13|textproc/rubygem-cucumber-html-formatter|2021-12-21|Remove obsoleted port. Use textproc/rubygem-cucumber-html-formatter instead
 textproc/rubygem-cucumber-html-formatter9|textproc/rubygem-cucumber-html-formatter|2021-12-21|Remove obsoleted port. Use textproc/rubygem-cucumber-html-formatter instead
 textproc/rubygem-escape_utils11|textproc/rubygem-escape_utils|2021-12-21|Remove obsoleted port. Use textproc/rubygem-escape_utils instead
 textproc/rubygem-html-pipeline27|textproc/rubygem-html-pipeline|2021-12-21|Remove obsoleted port. Use textproc/rubygem-html-pipeline instead
 textproc/rubygem-nokogiri18|textproc/rubygem-nokogiri|2021-12-21|Remove obsoleted port. Use textproc/rubygem-nokogiri instead
 textproc/rubygem-rouge317|textproc/rubygem-rouge|2021-12-21|Remove obsoleted port. Use textproc/rubygem-rouge instead
 textproc/rubygem-rouge318|textproc/rubygem-rouge|2021-12-21|Remove obsoleted port. Use textproc/rubygem-rouge instead
 textproc/rubygem-rouge319|textproc/rubygem-rouge|2021-12-21|Remove obsoleted port. Use textproc/rubygem-rouge instead
 textproc/rubygem-rouge321|textproc/rubygem-rouge|2021-12-21|Remove obsoleted port. Use textproc/rubygem-rouge instead
 textproc/rubygem-rouge324|textproc/rubygem-rouge|2021-12-21|Remove obsoleted port. Use textproc/rubygem-rouge instead
 textproc/rubygem-rouge325|textproc/rubygem-rouge|2021-12-21|Remove obsoleted port. Use textproc/rubygem-rouge instead
 textproc/rubygem-sanitize20|textproc/rubygem-sanitize|2021-12-21|Remove obsoleted port. Use textproc/rubygem-sanitize instead
 textproc/rubygem-sass32|textproc/rubygem-sass|2021-12-21|Remove obsoleted port. Use textproc/rubygem-sass instead
 textproc/rubygem-sass34|textproc/rubygem-sass|2021-12-21|Remove obsoleted port. Use textproc/rubygem-sass instead
 textproc/rubygem-terminal-table1|textproc/rubygem-terminal-table|2021-12-21|Remove obsoleted port. Use textproc/rubygem-terminal-table instead
 www/rubygem-acts-as-taggable-on3|www/rubygem-acts-as-taggable-on|2021-12-21|Remove obsoleted port. Use www/rubygem-acts-as-taggable-on instead
 www/rubygem-acts-as-taggable-on5|www/rubygem-acts-as-taggable-on|2021-12-21|Remove obsoleted port. Use www/rubygem-acts-as-taggable-on instead
 www/rubygem-addressable23|www/rubygem-addressable|2021-12-21|Remove obsoleted port. Use www/rubygem-addressable instead
 www/rubygem-addressable25|www/rubygem-addressable|2021-12-21|Remove obsoleted port. Use www/rubygem-addressable instead
 www/rubygem-haml4|www/rubygem-haml|2021-12-21|Remove obsoleted port. Use www/rubygem-haml instead
 www/rubygem-rack15|www/rubygem-rack|2021-12-21|Remove obsoleted port. Use www/rubygem-rack instead
 www/rubygem-rack20|www/rubygem-rack|2021-12-21|Remove obsoleted port. Use www/rubygem-rack instead
 www/rubygem-redis-rack1|www/rubygem-redis-rack|2021-12-21|Remove obsoleted port. Use www/rubygem-redis-rack instead
 x11-toolkits/rubygem-gtksourceview2|x11-toolkits/rubygem-gtksourceview3|2021-12-21|Remove obsoleted port. Use x11-toolkits/rubygem-gtksourceview3 instead
 x11-toolkits/rubygem-vte|x11-toolkits/rubygem-vte3|2021-12-21|Remove obsoleted port. Use x11-toolkits/rubygem-vte3 instead
 sysutils/asmon||2021-12-27|Has expired: Fails to build on modern FreeBSD
 java/intellij-rubymine|devel/rubymine|2021-12-31|Use better name and category
 lang/python36||2021-12-31|Has expired: Upgrade to a newer Python version. 3.6 is in maintenance status and gets security fixes only. End-of-Life: 2021-12-23. See https://devguide.python.org/
 devel/sdl_sge||2021-12-31|Has expired: Upstream no longer maintained
 net/appkonference||2021-12-31|Has expired: Outdated, depends on unsupported version of net/asterisk
 net/zebra||2021-12-31|Has expired: Abandoned upstream, last release in 2005. Consider migrating to net/frr7 or net/bird2
 audio/osalp||2021-12-31|Has expired: Abandoned upstream, listed as beta and no new release since 2008
 games/stransball2||2021-12-31|Has expired: Depends on expired devel/sdl_sge
 devel/rubygem-ruby-sdl-ffi||2021-12-31|Has expired: Depends on expired devel/sdl_sge
 devel/rubygem-rubygame||2021-12-31|Has expired: Depends on expired devel/sdl_sge
 devel/ruby-sdl||2021-12-31|Has expired: Depends on expired devel/sdl_sge
 games/magicmaze||2021-12-31|Has expired: Depends on expired devel/sdl_sge
 games/trophy||2021-12-31|Has expired: Depends on expired devel/clanlib1
 devel/clanlib1||2021-12-31|Has expired: Older than expired and removed devel/clanlib
 www/py-django31||2021-12-31|Has expired: Upgrade to Django 3.2+. Mainstream support ended (April 6, 2021). Extended support ends December 2021. See https://www.djangoproject.com/download/
 www/py-dj31-django-prometheus||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
 databases/postgis24||2021-12-31|Has expired: Deprecated in favour of databases/postgis3x
 net-im/ekiga||2021-12-31|Has expired: Last release in 2013, not actively maintained
 sysutils/sample||2021-12-31|Has expired: abandoned upstream, incompatible with newer kernels
 www/mediawiki131||2021-12-31|Has expired: Upstream EOL
 www/py-dj31-django-mptt||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
 net/py-flask-xml-rpc||2021-12-31|Has expired: No longer maintained upstream
 audio/libaacplus||2021-12-31|Has expired: Abandoned upstream, no new release since 2011
 security/obfsclient||2021-12-31|Has expired: https://github.com/Yawning/obfsclient/issues/37
 www/py-dj31-django-auth-ldap||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj31-django-filter||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj31-drf-yasg||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj31-django-js-asset||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj31-django-timezone-field||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj31-django-tables2||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj31-django-taggit||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
 graphics/librasterlite|graphics/librasterlite2|2021-12-31|Has expired: Deprecated in favour of graphics/librasterlite2
 www/py-dj31-django-cacheops||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
 net-mgmt/p0f2|net-mgmt/p0f|2021-12-31|Has expired: newer version available in net-mgmt/p0f
 devel/libhash||2021-12-31|Has expired: Abandoned upstream
 www/py-dj31-django-debug-toolbar||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj31-django-cors-headers||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
 audio/flake||2021-12-31|Has expired: Abandoned upstream, no new release since 2007
 audio/ifp-line||2021-12-31|Has expired: Abandoned upstream, no new release since 2005
 audio/libnjb||2021-12-31|Has expired: Abandoned upstream, no new release since 2011
 audio/lpac||2021-12-31|Has expired: Abandoned upstream in 2003
 multimedia/mmsclient||2021-12-31|Has expired: Abandoned upstream, Microsoft deprecated MMS in 2003
 www/plugger||2021-12-31|Has expired: Uses incompatible plugin interface NPAPI
 audio/mpiosh||2021-12-31|Has expired: Abandoned upstream, no new release since 2004
 audio/rplay||2021-12-31|Has expired: Abandoned upstream, no new releases since 1999
 audio/celt||2021-12-31|Has expired: Deprecated and considered obsolete by upstream in 2016 in favour of (lib)opus
 security/nacl|security/libsodium|2021-12-31|Has expired: Unmaintained by upstream, use libsodium instead
 net-mgmt/unifi-poller||2021-12-31|Has expired: Now called unpoller by upstream
 lang/nml||2021-12-31|Has expired: Abandoned upstream, last release 2004-04-19
 audio/mp32ogg||2021-12-31|Has expired: Abandoned upstream and unfetchable from upstream
 net/libstorj|net/storj|2021-12-31|Has expired: Deprecated in favour of net/storj due to v3 rearchitecture
 devel/yasm-devel|devel/yasm|2021-12-31|Has expired: No need to keep the -devel version due to upstream inactivity
 www/py-dj31-django-redis||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
 devel/py-dj31-django-rq||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
 graphics/libreatlas||2021-12-31|Has expired: Abandoned upstream, no new release since 2012
 www/py-dj31-djangorestframework||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
 astro/google-earth||2022-01-01|Has expired: Needs newer version to connect to server
 net/tramp||2022-01-01|Has expired: Not updated in 5 years and now part of Emacs
 archivers/p7zip-codec-rar||2022-01-01|Has expired: Unmaintained for years and has known vulnerabilities
 textproc/askgit|textproc/mergestat|2022-01-03|Project was renamed upstream
 emulators/qemu-utils|emulators/qemu@tools|2022-01-10|Has expired: Use emulators/qemu@tools
 emulators/qemu42||2022-01-10|Has expired: Use emulators/qemu or emulators/qemu-devel
 devel/py-click6|devel/py-click|2022-01-11|Remove obsoleted port. Use devel/py-click instead
 devel/py-contextvars||2022-01-11|Remove obsoleted port. It is included in Python 3.7+
 devel/py-future-annotations||2022-01-11|Remove obsoleted port. It is included in Python 3.7+
 devel/rubygem-aws-sdk-v1|devel/rubygem-aws-sdk|2022-01-11|Remove obsoleted port. Use devel/rubygem-aws-sdk instead
 devel/rubygem-sidekiq62|devel/rubygem-sidekiq|2022-01-11|Remove obsoleted port. Use devel/rubygem-sidekiq instead
 security/rubygem-bcrypt_pbkdf10|security/rubygem-bcrypt_pbkdf|2022-01-11|Remove obsoleted port. Use security/rubygem-bcrypt_pbkdf instead
 math/gotoblas|math/openblas|2022-01-15|Remove obsoleted port. Use math/openblas instead
 net/pipsecd||2022-01-15|Has expired: Abandonware, current release is from 1999 and uses insecure encryption algorithms
 devel/maven31|devel/maven|2022-01-15|Has expired: Outdated, unsupported upstream
 devel/e2fsprogs-libss||2022-01-17|Folded back into sysutils/e2fsprogs, which was the sole user
 lang/spidermonkey60|lang/spidermonkey78|2022-01-18|Has expired: Requires python2 to build
 shells/ammonite|devel/ammonite|2022-01-18|Ammonite dropped built-in shell support
 emulators/yuzu-qt5|emulators/yuzu|2022-01-20|Merged as QT5 port option
 print/py-fonttools3|print/py-fonttools|2022-01-23|Remove obsoleted port. Use print/py-fonttools instead
 textproc/rubygem-rouge2|textproc/rubygem-rouge|2022-01-23|Remove obsoleted port. Use textproc/rubygem-rouge instead
 security/truecrypt|security/veracrypt|2022-01-23|Has expired: Development and support for truecrypt ended in 2014
 graphics/radiance||2022-01-23|Has expired: Application uses deprecated OpenGL support in libmpv, see the comment in https://github.com/zbanks/radiance/issues/118
 databases/postgis25||2022-01-25|Has expired: Deprecated in favour of databases/postgis3x
 www/zend-framework1|www/zend-framework|2022-01-25|Has expired: Fails to work with current active PHP versions
 archivers/php73-bz2|archivers/php74-bz2|2022-01-26|Has expired: Security support ended on 2021-12-06
 archivers/php73-zlib|archivers/php74-zlib|2022-01-26|Has expired: Security support ended on 2021-12-06
 archivers/php73-zip|archivers/php74-zip|2022-01-26|Has expired: Security support ended on 2021-12-06
 archivers/php73-phar|archivers/php74-phar|2022-01-26|Has expired: Security support ended on 2021-12-06
 math/php73-gmp|math/php74-gmp|2022-01-26|Has expired: Security support ended on 2021-12-06
 math/php73-bcmath|math/php74-bcmath|2022-01-26|Has expired: Security support ended on 2021-12-06
 net-mgmt/php73-snmp|net-mgmt/php74-snmp|2022-01-26|Has expired: Security support ended on 2021-12-06
 converters/php73-iconv|converters/php74-iconv|2022-01-26|Has expired: Security support ended on 2021-12-06
 converters/php73-mbstring|converters/php74-mbstring|2022-01-26|Has expired: Security support ended on 2021-12-06
 converters/php73-recode||2022-01-26|Has expired: Security support ended on 2021-12-06
 lang/php73|lang/php74|2022-01-26|Has expired: Security support ended on 2021-12-06
 lang/php73-extensions|lang/php74-extensions|2022-01-26|Has expired: Security support ended on 2021-12-06
 sysutils/php73-posix|sysutils/php74-posix|2022-01-26|Has expired: Security support ended on 2021-12-06
 sysutils/php73-fileinfo|sysutils/php74-fileinfo|2022-01-26|Has expired: Security support ended on 2021-12-06
 textproc/php73-xmlreader|textproc/php74-xmlreader|2022-01-26|Has expired: Security support ended on 2021-12-06
 textproc/php73-ctype|textproc/php74-ctype|2022-01-26|Has expired: Security support ended on 2021-12-06
 textproc/php73-simplexml|textproc/php74-simplexml|2022-01-26|Has expired: Security support ended on 2021-12-06
 textproc/php73-xsl|textproc/php74-xsl|2022-01-26|Has expired: Security support ended on 2021-12-06
 textproc/php73-dom|textproc/php74-dom|2022-01-26|Has expired: Security support ended on 2021-12-06
 textproc/php73-xml|textproc/php74-xml|2022-01-26|Has expired: Security support ended on 2021-12-06
 textproc/php73-enchant|textproc/php74-enchant|2022-01-26|Has expired: Security support ended on 2021-12-06
 textproc/php73-pspell|textproc/php74-pspell|2022-01-26|Has expired: Security support ended on 2021-12-06
 textproc/php73-xmlwriter|textproc/php74-xmlwriter|2022-01-26|Has expired: Security support ended on 2021-12-06
 textproc/php73-wddx||2022-01-26|Has expired: Security support ended on 2021-12-06
 ftp/php73-curl|ftp/php74-curl|2022-01-26|Has expired: Security support ended on 2021-12-06
 ftp/php73-ftp|ftp/php74-ftp|2022-01-26|Has expired: Security support ended on 2021-12-06
 devel/php73-shmop|devel/php74-shmop|2022-01-26|Has expired: Security support ended on 2021-12-06
 devel/php73-readline|devel/php74-readline|2022-01-26|Has expired: Security support ended on 2021-12-06
 devel/php73-sysvsem|devel/php74-sysvsem|2022-01-26|Has expired: Security support ended on 2021-12-06
 devel/php73-sysvmsg|devel/php74-sysvmsg|2022-01-26|Has expired: Security support ended on 2021-12-06
 devel/php73-pcntl|devel/php74-pcntl|2022-01-26|Has expired: Security support ended on 2021-12-06
 devel/php73-tokenizer|devel/php74-tokenizer|2022-01-26|Has expired: Security support ended on 2021-12-06
 devel/php73-json|devel/php74-json|2022-01-26|Has expired: Security support ended on 2021-12-06
 devel/php73-sysvshm|devel/php74-sysvshm|2022-01-26|Has expired: Security support ended on 2021-12-06
 devel/php73-gettext|devel/php74-gettext|2022-01-26|Has expired: Security support ended on 2021-12-06
 devel/php73-intl|devel/php74-intl|2022-01-26|Has expired: Security support ended on 2021-12-06
 www/php73-opcache|www/php74-opcache|2022-01-26|Has expired: Security support ended on 2021-12-06
 www/mod_php73|www/mod_php74|2022-01-26|Has expired: Security support ended on 2021-12-06
 www/php73-tidy|www/php74-tidy|2022-01-26|Has expired: Security support ended on 2021-12-06
 www/php73-session|www/php74-session|2022-01-26|Has expired: Security support ended on 2021-12-06
 graphics/php73-gd|graphics/php74-gd|2022-01-26|Has expired: Security support ended on 2021-12-06
 graphics/php73-exif|graphics/php74-exif|2022-01-26|Has expired: Security support ended on 2021-12-06
 security/php73-sodium|security/php74-sodium|2022-01-26|Has expired: Security support ended on 2021-12-06
 security/php73-openssl|security/php74-openssl|2022-01-26|Has expired: Security support ended on 2021-12-06
 security/php73-filter|security/php74-filter|2022-01-26|Has expired: Security support ended on 2021-12-06
 security/php73-hash||2022-01-26|Has expired: Security support ended on 2021-12-06
 databases/php73-pdo_dblib|databases/php74-pdo_dblib|2022-01-26|Has expired: Security support ended on 2021-12-06
 databases/php73-pdo|databases/php74-pdo|2022-01-26|Has expired: Security support ended on 2021-12-06
 databases/php73-dba|databases/php74-dba|2022-01-26|Has expired: Security support ended on 2021-12-06
 databases/php73-pgsql|databases/php74-pgsql|2022-01-26|Has expired: Security support ended on 2021-12-06
 databases/php73-odbc|databases/php74-odbc|2022-01-26|Has expired: Security support ended on 2021-12-06
 databases/php73-interbase||2022-01-26|Has expired: Security support ended on 2021-12-06
 databases/php73-pdo_sqlite|databases/php74-pdo_sqlite|2022-01-26|Has expired: Security support ended on 2021-12-06
 databases/php73-sqlite3|databases/php74-sqlite3|2022-01-26|Has expired: Security support ended on 2021-12-06
 databases/php73-pdo_pgsql|databases/php74-pdo_pgsql|2022-01-26|Has expired: Security support ended on 2021-12-06
 databases/php73-pdo_odbc|databases/php74-pdo_odbc|2022-01-26|Has expired: Security support ended on 2021-12-06
 databases/php73-mysqli|databases/php74-mysqli|2022-01-26|Has expired: Security support ended on 2021-12-06
 databases/php73-pdo_mysql|databases/php74-pdo_mysql|2022-01-26|Has expired: Security support ended on 2021-12-06
 databases/php73-pdo_firebird|databases/php74-pdo_firebird|2022-01-26|Has expired: Security support ended on 2021-12-06
 misc/php73-calendar|misc/php74-calendar|2022-01-26|Has expired: Security support ended on 2021-12-06
 mail/php73-imap|mail/php74-imap|2022-01-26|Has expired: Security support ended on 2021-12-06
 net/php73-sockets|net/php74-sockets|2022-01-26|Has expired: Security support ended on 2021-12-06
 net/php73-xmlrpc|net/php74-xmlrpc|2022-01-26|Has expired: Security support ended on 2021-12-06
 net/php73-ldap|net/php74-ldap|2022-01-26|Has expired: Security support ended on 2021-12-06
 net/php73-soap|net/php74-soap|2022-01-26|Has expired: Security support ended on 2021-12-06
 mail/bogofilter-lmdb|mail/bogofilter|2022-01-26|Port renamed to make LMDB the new default DB
 comms/py-qt5-sensors|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 comms/py-qt5-serialport|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 databases/py-qt5-sql|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 devel/py-qt5-core|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 devel/py-qt5-dbus|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 devel/py-qt5-dbussupport|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 devel/py-qt5-designer|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 devel/py-qt5-designerplugin|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 devel/py-qt5-help|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 devel/py-qt5-location|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 devel/py-qt5-positioning|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 devel/py-qt5-remoteobjects|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 devel/py-qt5-test|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 graphics/py-qt5-svg|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 lang/py-qt5-qml|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 misc/py-qt5-demo|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 multimedia/py-qt5-multimedia|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 multimedia/py-qt5-multimediawidgets|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 net/py-qt5-network|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 print/py-qt5-printsupport|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 textproc/py-qt5-xml|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 textproc/py-qt5-xmlpatterns|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 www/py-qt5-webchannel|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 www/py-qt5-webkit|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 www/py-qt5-webkitwidgets|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 www/py-qt5-websockets|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 x11-toolkits/py-qt5-gui|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 x11-toolkits/py-qt5-quick|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 x11-toolkits/py-qt5-quick3d|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 x11-toolkits/py-qt5-quickwidgets|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 x11-toolkits/py-qt5-widgets|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 x11/py-qt5-opengl|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt
 x11-fonts/sourcesanspro-ttf|x11-fonts/source-sans-ttf|2022-01-28|Renamed to match upstream naming
 audio/nekobi-lv2|audio/dpf-plugins-lv2|2022-01-28|Nekobi is part of dpf-plugins
 audio/kars-lv2|audio/dpf-plugins-lv2|2022-01-28|Kars is part of dpf-plugins
 converters/p5-JSON1|converters/p5-JSON|2022-01-29|Remove obsoleted port. Use converters/p5-JSON instead
 devel/rubygem-bootsnap19|devel/rubygem-bootsnap|2022-01-29|Remove obsoleted port. Use devel/rubygem-bootsnap instead
 textproc/rubygem-rouge326|textproc/rubygem-rouge|2022-01-29|Remove obsoleted port. Use textproc/rubygem-rouge instead
 lang/scala-docs||2022-01-31|New 3.x versions dropped archived documentation
 x11/gnome3|x11/gnome|2022-01-31|GNOME has moved past version 3, including the Ports version
 security/krb5-117|security/krb5|2022-02-01|Has expired: EOL one year after the release of krb5 1.19
 www/annie|www/lux|2022-02-03|Project was renamed upstream
 devel/rubygem-gettext_i18n_rails_js-rails60|devel/rubygem-gettext_i18n_rails_js-rails61|2022-02-07|Obsolete use devel/rubygem-gettext_i18n_rails_js-rails61 instead
 security/rubygem-devise-two-factor-rails60|security/rubygem-devise-two-factor-rails61|2022-02-07|Obsolete use security/rubygem-devise-two-factor-rails61 instead
 korean/nanumcoding-ttf|korean/nanum-gothic-coding|2022-02-10|Renamed to match upstream naming
 korean/nanumfonts-otf|korean/nanumfonts|2022-02-10|Split into multiple ports, use korean/nanumfonts meta-port instead
 korean/nanumfonts-ttf|korean/nanumfonts|2022-02-10|Split into multiple ports, use korean/nanumfonts meta-port instead
 security/php80-openssl||2022-02-12|php80-openssl module is a default module for lang/php80 from now on
 security/php81-openssl||2022-02-12|php81-openssl module is a default module for lang/php81 from now on
 math/qhull8|math/qhull|2022-02-19|qhull as version 8 is the default from now on
 print/tex-aleph||2022-02-19|tex-aleph has been removed from texlive-2021 system
 sysutils/intel-pcm-devel||2022-02-19|intel-pcm-devel has been removed, encouraging users to use intel-pcm instead
 graphics/copperspice|x11-toolkits/copperspice|2022-02-20|Revive in more appropriate category
 math/mathics-django||2022-02-20|Mathics-Django now requires npm: you can use math/mathicsscript instead
 net-mgmt/percona-monitoring-plugins||2022-02-22|Has expired: Upstream EOL reached on 2020-08-01
 math/coinmumps|math/coin-or-mumps|2022-02-23|Renamed into a more appropriate name
 www/py-weboob|www/py-woob|2022-02-24|Project was renamed upstream
 www/py-weboob-qt|www/py-woob-qt|2022-02-24|Project was renamed upstream
 math/py-pyipopt||2022-02-24|Removed: not compatible with the latest Ipopt-3.14.4 and abandoned upstream
 x11-toolkits/py-wxPython40|x11-toolkits/py-wxPython4|2022-02-25|Renamed to py-wxPython4
 graphics/libgaiagraphics|graphics/librasterlite2|2022-02-27|Has expired: Abandoned upstream, replaced by graphics/librasterlite2
 databases/zabbix3-libzbxpgsql||2022-02-27|Has expired: Upstream EOL reached on 2021-02-28
 lang/bf2c||2022-02-28|Has expired: No development since 2013
 lang/nbc||2022-02-28|Has expired: No releases since 2011, for previous generation LEGO Mindstorms
 textproc/gutenmark||2022-02-28|Has expired: No releases since 2011
 net-mgmt/zabbix3-proxy||2022-02-28|Has expired: Upstream EOL reached on 2021-02-28
 net-mgmt/zabbix3-java||2022-02-28|Has expired: Upstream EOL reached on 2021-02-28
 net-mgmt/zabbix3-frontend||2022-02-28|Has expired: Upstream EOL reached on 2021-02-28
 net-mgmt/zabbix3-agent||2022-02-28|Has expired: Upstream EOL reached on 2021-02-28
 net-mgmt/zabbix3-server||2022-02-28|Has expired: Upstream EOL reached on 2021-02-28
 archivers/zip-ada||2022-02-28|Removed, depends on expired lang/gcc6-aux
 databases/adabase||2022-02-28|Removed, depends on expired lang/gcc6-aux
 databases/apq||2022-02-28|Removed, depends on expired lang/gcc6-aux
 databases/apq-mysql||2022-02-28|Removed, depends on expired lang/gcc6-aux
 databases/apq-odbc||2022-02-28|Removed, depends on expired lang/gcc6-aux
 databases/apq-pgsql||2022-02-28|Removed, depends on expired lang/gcc6-aux
 devel/ada-util||2022-02-28|Removed, depends on expired lang/gcc6-aux
 devel/adabooch||2022-02-28|Removed, depends on expired lang/gcc6-aux
 devel/adaid||2022-02-28|Removed, depends on expired lang/gcc6-aux
 devel/ahven||2022-02-28|Removed, depends on expired lang/gcc6-aux
 devel/alog||2022-02-28|Removed, depends on expired lang/gcc6-aux
 devel/aunit||2022-02-28|Removed, depends on expired lang/gcc6-aux
 devel/florist-gpl||2022-02-28|Removed, depends on expired lang/gcc6-aux
 devel/libspark2012||2022-02-28|Removed, depends on expired lang/gcc6-aux
 devel/pcsc-ada||2022-02-28|Removed, depends on expired lang/gcc6-aux
 devel/pragmarcs||2022-02-28|Removed, depends on expired lang/gcc6-aux
 devel/sdl_gnat||2022-02-28|Removed, depends on expired lang/gcc6-aux
 dns/ironsides||2022-02-28|Removed, depends on expired lang/gcc6-aux
 graphics/generic_image_decoder||2022-02-28|Removed, depends on expired lang/gcc6-aux
 lang/adacontrol||2022-02-28|Removed, depends on expired lang/gcc6-aux
 lang/asis||2022-02-28|Removed, depends on expired lang/gcc6-aux
 lang/gnat_util||2022-02-28|Removed, depends on expired lang/gcc6-aux
 lang/lua-ada||2022-02-28|Removed, depends on expired lang/gcc6-aux
 math/plplot-ada||2022-02-28|Removed, depends on expired lang/gcc6-aux
 misc/excel-writer||2022-02-28|Removed, depends on expired lang/gcc6-aux
 net/adasockets||2022-02-28|Removed, depends on expired lang/gcc6-aux
 net/anet||2022-02-28|Removed, depends on expired lang/gcc6-aux
 security/libadacrypt||2022-02-28|Removed, depends on expired lang/gcc6-aux
 textproc/adabrowse||2022-02-28|Removed, depends on expired lang/gcc6-aux
 textproc/templates_parser||2022-02-28|Removed, depends on expired lang/gcc6-aux
 textproc/words||2022-02-28|Removed, depends on expired lang/gcc6-aux
 x11-toolkits/gtkada||2022-02-28|Removed, depends on expired lang/gcc6-aux
 x11-toolkits/gtkada3||2022-02-28|Removed, depends on expired lang/gcc6-aux
 devel/py-zsm-lib|sysutils/zsm|2022-03-07|Remove obsoleted port. Use sysutils/zsm instead
 databases/postgresql96-client||2022-03-11|Has expired: PostgreSQL-9.6 has reached end-of-life
 databases/postgresql96-contrib||2022-03-11|Has expired: PostgreSQL-9.6 has reached end-of-life
 databases/postgresql96-docs||2022-03-11|Has expired: PostgreSQL-9.6 has reached end-of-life
 databases/postgresql96-pgtcl||2022-03-11|Removed, part of expired PostgresQL 9.6
 databases/postgresql96-plperl||2022-03-11|Has expired: PostgreSQL-9.6 has reached end-of-life
 databases/postgresql96-plpython||2022-03-11|Has expired: PostgreSQL-9.6 has reached end-of-life
 databases/postgresql96-pltcl||2022-03-11|Has expired: PostgreSQL-9.6 has reached end-of-life
 databases/postgresql96-server||2022-03-11|Has expired: PostgreSQL-9.6 has reached end-of-life
 net-im/pidgin-bs|net-im/pidgin-bot-sentry|2022-03-13|Project was renamed upstream
 math/qalculate|math/qalculate-gtk|2022-03-14|Renamed to match upstream naming
 deskutils/nautilus-actions||2022-03-15|Abandonware
 devel/ORBit2||2022-03-15|Gnome2 library unused anymore
 games/pushover|games/domino-chain|2022-03-17|Chase upstream rename
 graphics/darktable38|graphics/darktable|2022-03-19|Darktable was upgraded to 3.8, separate port no longer needed
 security/1password-client-devel|security/1password-client2|2022-03-19|cli version 2 is now released
 x11-toolkits/pangoxsl||2022-03-20|Has expired: Abandonware and not used by any port
 print/lgrind||2022-03-22|Has expired: Abandonware as last release was in 2001
 devel/py-decorator4||2022-03-22|Has expired: Legacy version, use devel/py-decorator instead
 devel/p5-Log-Any-Adapter-Callback|devel/p5-Log-Any|2022-03-22|Has expired: Use devel/p5-Log-Any (Log::Any::Adapter::Capture) instead
 devel/py-asyncio||2022-03-25|Remove obsoleted port. The asyncio package has been included in the standard library since Python 3.4
 math/py-mutatormath|math/py-MutatorMath|2022-03-25|Remove duplicate port
 math/py-symcxx||2022-03-28|Deprecated because the upstream repository was experimental and is now archived
 net-p2p/bazarr-devel|net-p2p/bazarr|2022-03-29|Use net-p2p/bazarr instead
 dns/py-dnspython2|dns/py-dnspython|2022-03-30|Has expired: Use dns/py-dnspython
 net/inlets||2022-03-30|FOSS version removed, project went commercial
 devel/ipython5|devel/ipython|2022-03-30|Remove obsoleted port. Use devel/ipython instead
 editors/libreoffice6|editors/libreoffice|2022-03-31|Unsupported upstream. Please use editors/libreoffice instead
 security/revealrk||2022-03-31|Has expired: Deprecate, marked BROKEN on 12+ in 2018
 devel/apache-commons-modeler||2022-03-31|Has expired: Abandoned upstream, last release in 2013
 security/afl||2022-03-31|Has expired: Abandoned upstream, no new release since 2017. Please consider using security/afl++ instead
 www/mod_line_edit||2022-03-31|Has expired: Abandoned upstream, last release in 2006, Apache includes mod_sed
 www/myfaces||2022-03-31|Has expired: Unsupported by upstream, released in 2005
 www/mod_backtrace||2022-03-31|Has expired: Abandoned upstream in 2012 (version 2.0)
 security/base||2022-03-31|Has expired: Broken with PHP 7+, forked here https://github.com/NathanGibbs3/BASE/
 security/find-zlib||2022-03-31|Has expired: Deprecated, no longer relevant
 security/razorback-clamavNugget||2022-03-31|Has expired: Abandonware, last release in 2012 and listed as alpha quality by upstream
 security/shimmer||2022-03-31|Has expired: Abandonware, last release in 2008
 security/kripp||2022-03-31|Has expired: Abandonware, upstream returns 404 and last release was back in 2007
 security/ipfilter2dshield||2022-03-31|Has expired: Abandonware, no word of it on upstream web site
 security/sha||2022-03-31|Has expired: Obsolete, we have tools in base
 security/gputty||2022-03-31|Has expired: Unfetchable, dead upstream
 java/apache-commons-discovery||2022-03-31|Has expired: Abandoned upstream, last release in 2006
 www/geronimo||2022-03-31|Has expired: Port outdated, unsupported upstream and depends on deprecated software
 security/isakmpd||2022-03-31|Has expired: 15+ years old and broken on multiple versions
 security/razorback-swfScanner||2022-03-31|Has expired: Abandonware, last release in 2012 and listed as alpha quality by upstream
 devel/hadoop||2022-03-31|Has expired: Outdated, unsupported upstream
 java/apache-commons-primitives||2022-03-31|Has expired: Abandoned upstream, last release in 2003
 security/l5||2022-03-31|Has expired: Abandonware, broken on amd64 for 10+ years
 security/unicornscan||2022-03-31|Has expired: Very outdated and abandoned, current version in tree was released in 2004 and last release by upstream in Aug 2013. Please consider using security/nmap or security/rustscan
 security/gringotts||2022-03-31|Has expired: Abandonware, upstream dead and last release in 2009
 security/axTLS||2022-03-31|Has expired: Very outdated and abandoned, current version in tree was released in 2013 and last by upstream in 2019
 security/shttpscanner||2022-03-31|Has expired: Abandonware, last release in 2006
 security/sniff||2022-03-31|Has expired: Abandonware, last release around 2000 and dead upstream. Please consider using net/wireshark
 security/razorback-archiveInflate||2022-03-31|Has expired: Abandonware, last release in 2012 and listed as alpha quality by upstream
 security/scanssh||2022-03-31|Has expired: Abandonware, last release in 2005. Please consider using security/nmap or security/rustscan
 security/symbion-sslproxy||2022-03-31|Has expired: Abandonware, last release in 2009 and inactive upstream
 security/manipulate_data||2022-03-31|Has expired: Abandonware, unsupported upstream
 security/vinetto||2022-03-31|Has expired: Obsolete, targets deprecated Windows operating systems such as XP and 2003 Server
 security/pbnj||2022-03-31|Has expired: Abandonware, last release in 2006 and reported broken upstream in 2017 upstream
 databases/jasperreports||2022-03-31|Has expired: Unsupported by upstream, released in 2013
 security/retranslator||2022-03-31|Has expired: Deprecated upstream (EOL)
 security/cp2fwb||2022-03-31|Has expired: Abandonware, used with deprecated software Firewall Builder
 security/webscarab||2022-03-31|Has expired: Deprecated by upstream in 2014
 security/pscan||2022-03-31|Has expired: Abandonware, last release in 2000
 security/vnccrack||2022-03-31|Has expired: Outdated and abandoned, last release in 2008. Upstream is at 2.1 while version in ports is 1.0.0
 security/doscan||2022-03-31|Has expired: Abandonware, last release in 2014. Please consider using security/masscan or sysutils/pnscan
 security/radamsa||2022-03-31|Has expired: Abandonware, last release in 2017 and marked as BROKEN in late 2020
 security/trinokiller||2022-03-31|Has expired: Abandonware, dead upstream
 security/spybye||2022-03-31|Has expired: Abandonware, last release in 2008 and no upstream development
 security/razorback-officeCat||2022-03-31|Has expired: Abandonware, last release in 2012 and listed as alpha quality by upstream
 textproc/crimson||2022-03-31|Has expired: Deprecated by upstream 2010-08-06
 security/tripwire-131||2022-03-31|Has expired: Deprecated, please consider using security/tripwire instead
 security/bruteforceblocker||2022-03-31|Has expired: Abandonware, please consider using security/sshguard
 security/razorback-fsMonitor||2022-03-31|Has expired: Abandonware, last release in 2012 and listed as alpha quality by upstream
 security/tlswrap||2022-03-31|Has expired: Abandonware, last release in 2007 and dead upstream
 security/sslsniffer||2022-03-31|Has expired: Abandonware, last release in 2001. Please consider using security/sslsplit or security/sslproxy
 security/strobe||2022-03-31|Has expired: Abandonware, last release around 2000 and dead upstream. Please consider using security/nmap or security/rustscan
 security/amap||2022-03-31|Has expired: Abandoned upstream, no new release for 10+ years. Please consider using security/nmap or security/rustscan
 security/ppars||2022-03-31|Has expired: Abandonware, no word of it on upstream web site
 security/zebedee||2022-03-31|Has expired: Abandonware, last release in 2005 and runtime issues reported upstream
 security/matrixssl||2022-03-31|Has expired: Abandonware, dead upstream
 security/razorback-virusTotal||2022-03-31|Has expired: Abandonware, last release in 2012 and listed as alpha quality by upstream
 security/stud||2022-03-31|Has expired: Abandonware, marked BROKEN on 12+ in 2019
 security/sslwrap||2022-03-31|Has expired: Abandonware, marked BROKEN on 12+ in 2019
 security/dcetest||2022-03-31|Has expired: Targets deprecated protocol by Microsoft in favour of .NET
 security/l0phtcrack||2022-03-31|Has expired: Obsolete, Microsoft LANMAN and NT password hashes are deprecated
 security/slurpie||2022-03-31|Has expired: Abandonware, last release around 2000 and dead upstream
 security/ike||2022-03-31|Has expired: Abandonware, last release in 2013 and IKEv1 is considered to be insecure
 security/mussh||2022-03-31|Has expired: Abandonware, last release in 2011 please consider using security/teleport
 security/razorback-fsWalk||2022-03-31|Has expired: Abandonware, last release in 2012 and listed as alpha quality by upstream
 security/hackbot||2022-03-31|Has expired: Abandonware, last release in 2003. Please consider using security/nmap or security/rustscan
 security/phpsecinfo||2022-03-31|Has expired: Abandonware, last release in 2006
 security/ipfw2dshield||2022-03-31|Has expired: Abandonware, no word of it on upstream web site
 security/razorback-fileInject||2022-03-31|Has expired: Abandonware, last release in 2012 and listed as alpha quality by upstream
 security/gwee||2022-03-31|Has expired: Abandonware, last release 15+ years ago and dead upstream
 security/pktsuckers||2022-03-31|Has expired: Abandonware, last release from somewhere around 1999
 security/slush||2022-03-31|Has expired: Obsolete, listed as alpha quality, last release around 2000 and dead upstream
 security/integrit||2022-03-31|Has expired: Abandonware, last release in 2003
 security/razorback-pdfFox||2022-03-31|Has expired: Abandonware, last release in 2012 and listed as alpha quality by upstream
 security/razorback-yaraNugget||2022-03-31|Has expired: Abandonware, last release in 2012 and listed as alpha quality by upstream
 security/hlfl||2022-03-31|Has expired: Abandonware, last release in 2003
 security/jbrofuzz||2022-03-31|Has expired: Abandonware, no word of it on upstream web site and last release was 10 years ago
 security/libpwstor||2022-03-31|Has expired: Abandonware, last release in 2008
 security/smtpscan||2022-03-31|Has expired: Abandonware, last release in 2003 and dead upstream. Please consider using security/nmap
 security/cisco-torch||2022-03-31|Has expired: Abandonware, dead upstream
 security/amavis-stats||2022-03-31|Has expired: Abandoned, upstream is dead and last release was back in 2005
 textproc/lucene4||2022-03-31|Has expired: Unsupported by upstream, released in 2015
 devel/liballium||2022-03-31|Has expired: Abandonware, last release in 2014 and upstream is dead
 www/sakai||2022-03-31|Has expired: Depends on expired www/tomcat7
 graphics/deegree-wpvs||2022-03-31|Has expired: Depends on expired www/tomcat7
 graphics/deegree-igeoportal||2022-03-31|Has expired: Depends on expired www/tomcat7
 www/jspwiki||2022-03-31|Has expired: Depends on expired www/tomcat7
 graphics/deegree-wcs||2022-03-31|Has expired: Depends on expired www/tomcat7
 graphics/deegree-csw||2022-03-31|Has expired: Depends on expired www/tomcat7
 graphics/deegree-wms||2022-03-31|Has expired: Depends on expired www/tomcat7
 www/tomcat7|www/tomcat85|2022-03-31|Has expired: Tomcat 7 is EOL on 2021-03-31. Please upgrade to a later version
 devel/gitblit||2022-03-31|Has expired: Depends on expired www/tomcat7
 graphics/barbecue||2022-03-31|Has expired: Depends on expired www/tomcat7
 graphics/deegree-wfs||2022-03-31|Has expired: Depends on expired www/tomcat7
 graphics/deegree-wps||2022-03-31|Has expired: Depends on expired www/tomcat7
 sysutils/rubygem-smart_proxy_chef||2022-03-31|Has expired: Depends on expired sysutils/rubygem-chef-api
 sysutils/rubygem-chef-api||2022-03-31|Has expired: The chef-api gem is no longer maintained. Please use the supported Chef::ServerAPI library from the Chef gem
 databases/redis5||2022-03-31|Has expired: EOLed upstream
 security/outguess||2022-03-31|Has expired: Abandonware, dead upstream and last release in 2001
 devel/maven3||2022-03-31|Has expired: Outdated, unsupported upstream
 devel/maven33||2022-03-31|Has expired: Outdated, unsupported upstream
 devel/monotone||2022-03-31|Has expired: Abandoned upstream, no release since 2014
 security/botan110||2022-03-31|Has expired: Deprecated upstream, users are recommended to migrate to 2.x
 net/hping||2022-03-31|Has expired: Deprecated upstream, please consider using net/hping3 instead
 sysutils/autopsy||2022-03-31|Has expired: Very outdated, current version in tree was released back in 2010 and upstream is still active
 java/cryptix-jce||2022-03-31|Has expired: Abandonware, last release in 2005 and listed as dead upstream
 net-mgmt/netustad||2022-03-31|Has expired: Abandonware, dead upstream, unfetchable and is marked BROKEN for 13+
 www/paros||2022-03-31|Has expired: Abandonware, last release in 2006 and dead upstream
 net/queso||2022-03-31|Has expired: Abandonware and obsolete, last release back in 1998. Please consider using security/nmap instead
 mail/rlytest||2022-03-31|Has expired: Abandonware, last release in 2003 and dead upstream
 net/ssvnc||2022-03-31|Has expired: Abandonware, last release in 2011 and broken functionality reported upstream
 sysutils/webjob||2022-03-31|Has expired: Abandonware, last release in 2012 and broken on multiple architectures
 dns/bundy||2022-03-31|Has expired: Project is in hibernation and not recommended to use in production
 lang/ruby26||2022-03-31|Has expired: Use newer version of Ruby. Ruby 2.6 will reach its EoL on March 31, 2022
 textproc/kibana6||2022-03-31|Has expired: Uses expired www/node10
 www/node10||2022-03-31|Has expired: Node.js v10.x reaches end-of-life on 2021-04-30, see https://github.com/nodejs/Release
 comms/zssh||2022-03-31|Has expired: Abandonware, last release in 2003. Please consider using scp or net/croc instead
 devel/py-dataclasses||2022-03-31|Has expired: Included in Python 3.7 or later
 net-im/diligent||2022-03-31|Has expired: Abandoned upstream, users also confirms port to be non working
 www/typo3-9||2022-03-31|Has expired: Mainstream support ended 2021-09-30
 databases/adodb||2022-03-31|Has expired: Unsupported upstream, cannot be used with PHP 8.0+
 audio/clementine-player||2022-03-31|Has expired: Last release in 2016, many issue reports upstream and little to no development for years. Please consider using audio/strawberry
 www/crp||2022-03-31|Has expired: Abandonware, last release in 2003 and upstream refers to PHP 4.x and is dead
 devel/fb-adb||2022-03-31|Has expired: Last release in 2016 and deprecated by upstream, please consider using devel/android-tools-adb instead
 comms/o2sms||2022-03-31|Has expired: Abandonware, last release in 2010 and upstream is dead
 comms/p5-SMS-Send-TW-Qma||2022-03-31|Has expired: QMA service provider is no longer around
 comms/p5-SMS-Send-TW-ShareSMS||2022-03-31|Has expired: Service provider is no longer around
 comms/yaps||2022-03-31|Has expired: Service providers are no longer around and/or are no longer providing this service
 security/arirang||2022-03-31|Has expired: Abandoned upstream and last release was back in 2011
 security/openvpn-mbedtls||2022-03-31|Has expired: mbedTLS only has a minimum viable TLSv1.3 implementation, and OpenVPN-mbedtls does not work on FreeBSD 14-CURRENT
 www/mod_proxy_xml||2022-03-31|Has expired: Abandoned upstream, last release in 2004
 www/mod_xmlns||2022-03-31|Has expired: Abandoned upstream, last release in 2004
 www/mod_authnz_crowd||2022-03-31|Has expired: Abandoned upstream in 2014, doesn't work with Apache 2.4+
 security/razorback-scriptNugget||2022-03-31|Has expired: Abandonware, last release in 2012 and listed as alpha quality by upstream
 dns/bind911||2022-03-31|Has expired: End of life, please migrate to a newer version of BIND9
 www/grafana6||2022-03-31|Has expired: EOLed upstream, unfixed vulnerabilities
 security/govpn||2022-03-31|Has expired: Deprecated upstream, reference: http://www.govpn.info/
 security/hashcat-legacy||2022-03-31|Has expired: Unsupported upstream, please consider using security/hashcat
 security/razorback-masterNugget||2022-03-31|Has expired: Abandonware, last release in 2012 and listed as alpha quality by upstream
 security/razorback-syslogNugget||2022-03-31|Has expired: Abandonware, last release in 2012 and listed as alpha quality by upstream
 security/pxytest||2022-03-31|Has expired: Abandonware, last release around 2003, dead upsteam and unfetchable
 security/razorback-api||2022-03-31|Has expired: Abandonware, last release in 2012 and listed as alpha quality by upstream
 devel/hadoop2||2022-03-31|Has expired: Depends on expired devel/maven3
 databases/opentsdb||2022-03-31|Removed: unmaintained, depends on expired devel/hadoop2 and databases/hbase
 databases/hbase||2022-03-31|Has expired: Outdated, unsupported by upstream since June 2019 (upstream is at 2.3 and higher)
 textproc/rubygem-diffy330|textproc/rubygem-diffy|2022-04-01|Obsolete, please use textproc/rubygem-diffy
 graphics/sxiv|graphics/nsxiv|2022-04-01|Has expired: Upstream has archived the project; please switch to the maintained fork (graphics/nsxiv)
 graphics/xface.el||2022-04-07|Port has failed to build for years; last release in 2003
 lang/gcc9-devel||2022-04-14|Has expired: Not serving its purpose any longer due to lack of maintenance
 games/pouetchess||2022-04-15|Has expired: Abandonware with last release in 2006
 devel/grpc130|devel/grpc|2022-04-16|Remove obsoleted port. Use devel/grpc instead
 devel/grpc134|devel/grpc|2022-04-16|Remove obsoleted port. Use devel/grpc instead
 devel/py-trollius||2022-04-16|Remove obsoleted port. The asyncio package has been included in the standard library since Python 3.4
 graphics/py-pyglet150|graphics/py-pyglet|2022-04-16|Has expired: No longer needed, use graphics/py-pyglet instead
 games/critterding||2022-04-16|Has expired: Abandonware with last release in 2013, newer version bundles depends and requires Qt4
 devel/glibmm268||2022-04-16|port was added by accident
 lang/gcc10-devel||2022-04-17|Has expired: Not serving its purpose any longer due to lack of maintenance
 devel/py-installer03|devel/py-installer|2022-04-17|Remove obsoleted port. Use devel/py-installer instead
 games/cultivation||2022-04-18|Has expired: Abandonware with last release in 2010, non-portable build system
 devel/ros-rosinstall||2022-04-20|Has expired: Upstream has archived the project and is no longer being used in the ROS project
 net/kalarmcal|deskutils/kalarm|2022-04-21|Packages were merged
 math/py-gmpy2-devel|math/py-gmpy2|2022-04-22|No more need for the -devel port, py-gmpy2 is at latest
 net/google-cloud-sdk-app-engine-go||2022-04-27|Obsolete, not supported by the current GCP SDK
 www/py-dj32-django-modelcluster|www/py-django-modelcluster|2022-04-30|Remove obsoleted port. Use www/py-django-modelcluster instead
 www/rubygem-rack-proxy06|www/rubygem-rack-proxy|2022-04-30|Remove obsoleted port. Use www/rubygem-rack-proxy instead
 security/py-ssh|security/py-paramiko|2022-04-30|Remove obsoleted port. Use security/py-paramiko instead
 security/pinentry-gnome3|security/pinentry-gnome|2022-04-30|De-versioned due to new GNOME versioning scheme
 www/shttpd||2022-04-30|Has expired: Abandonware, last release over 12+ years ago
 mail/p5-Email-Sender-Transport-SMTPS|mail/p5-Email-Sender|2022-04-30|Has expired: Deprecated by upstream. Use Email::Sender::Transport::SMTP in mail/p5-Email-Sender instead
 net/gogoc||2022-04-30|Has expired: Services were discontinued in 2016
 graphics/drm-current-kmod||2022-05-01|Switched to a Linux version based naming scheme. Use graphics/drm-510-kmod
 graphics/drm-devel-kmod||2022-05-01|Switched to a Linux version based naming scheme. Use graphics/drm-510-kmod
 math/rkward-kde|math/rkward|2022-05-06|Switched to the name used by upstream
 graphics/photoflow||2022-05-06|Unmaintainer upstream, has been broken for months, particularly this issue isn't answered: https://github.com/aferrero2707/PhotoFlow/issues/220
 textproc/redisearch16||2022-05-09|Has expired. Use textproc/redisearch or textproc/redisearch20
 devel/git-arc|devel/freebsd-git-devtools|2022-05-13|Renamed because more tools are now included
 graphics/magnum-examples||2022-05-17|Has expired: Depends on broken graphics/magnum
 graphics/magnum-extras||2022-05-17|Has expired: Depends on broken graphics/magnum
 math/pantheon-calculator|math/elementary-calculator|2022-05-18|Switch to reverse domain name notation
 mail/p5-MIME-Fast||2022-05-19|Depends on long deprecated gmime-2.2
 mail/gmime2-sharp|mail/gmime26-sharp|2022-05-19|Depends on long deprecated gmime-2.2
 mail/gmime2|mail/gmime26|2022-05-19|Not used anymore overcome by gnime26
 graphics/p5-Geo-GDAL||2022-05-22|Remove obsoleted port. GDAL removed deprecated SWIG Perl bindings since 3.5.0
 devel/py-gitdb2|devel/py-gitdb|2022-05-22|Remove obsoleted port. Use devel/py-gitdb instead
 devel/py-smmap2|devel/py-smmap|2022-05-22|Remove obsoleted port. Use devel/py-smmap instead
 devel/rubygem-cucumber-create-meta|devel/rubygem-cucumber-ci-environment|2022-05-22|Remove obsoleted port. Use devel/rubygem-cucumber-ci-environment instead
 devel/rubygem-cucumber-cucumber-expressions14|devel/rubygem-cucumber-cucumber-expressions|2022-05-22|Remove obsoleted port. Use devel/rubygem-cucumber-cucumber-expressions instead
 devel/rubygem-cucumber-formatter-dots|textproc/rubygem-cucumber-html-formatter|2022-05-22|Remove obsoleted port. Use textproc/rubygem-cucumber-html-formatter instead
 devel/rubygem-cucumber-messages4|devel/rubygem-cucumber-messages|2022-05-22|Remove obsoleted port. Use devel/rubygem-cucumber-messages instead
 devel/rubygem-cucumber-messages17|devel/rubygem-cucumber-messages|2022-05-22|Remove obsoleted port. Use devel/rubygem-cucumber-messages instead
 textproc/rubygem-cucumber-gherkin22|textproc/rubygem-cucumber-gherkin|2022-05-22|Remove obsoleted port. Use textproc/rubygem-cucumber-gherkin instead
 textproc/rubygem-cucumber-html-formatter17|textproc/rubygem-cucumber-html-formatter|2022-05-22|Remove obsoleted port. Use textproc/rubygem-cucumber-html-formatter instead
 security/greenbone-security-assistant|security/gsa|2022-05-22|It was splitted into security/gsad and security/gsa
 security/py-ospd|security/py-ospd-openvas|2022-05-22|It was merged into security/py-ospd-openvas
 lang/perl5.30||2022-05-23|Has expired: Support ends three years after .0 release. Please upgrade to a more recent version of Perl
 sysutils/ansible2||2022-05-23|Has expired: Upstream support ceases
 java/jdk12-doc||2022-05-24|Only useful for removed java/openjdk12
 java/openjdk12||2022-05-24|Has expired: EOLed since 30 september 2019
 java/openjdk13||2022-05-24|Has expired: EOLed since 31 march 2020
 java/openjdk14||2022-05-24|Has expired: EOLed since 30 september 2020
 java/openjdk15||2022-05-24|Has expired: EOLed since 31 march 2021
 java/openjdk16||2022-05-24|Has expired: EOLed since 30 September 2021
 sysutils/uefi-edk2-bhyve|sysutils/edk2@bhyve|2022-05-24|No more need for this port: please use sysutils/edk2 FLAVOR bhyve instead
 archivers/p7zip|archivers/7-zip|2022-05-25|Unmaintained for years and has known vulnerabilities. Use 7-Zip instead
 graphics/blender-lts28|graphics/blender-lts29|2022-05-26|Has expired: EOLed
 devel/autoconf-wrapper|devel/autoconf-switch|2022-05-27|Autoconf restructuring
 devel/autoconf213|devel/autoconf2.13|2022-05-27|Autoconf restructuring
 math/py-cdecimal||2022-05-27|Has expired: upstream does not support it after Python-3.2
 devel/py-meliae||2022-05-27|Has expired: does not build against Python-3.9
 databases/R-cran-RSQLite.extfuns|databases/R-cran-RSQLite|2022-05-31|Has expired: RSQLite incorporates RSQLite.extfuns
 net/mpich2|net/mpich|2022-05-31|Has been deprecrated for a long time and build fails with GCC 11
 deskutils/planner|deskutils/gnome-planner|2022-05-31|Revive in more appropriate port name
 net-im/jabber.el||2022-06-01|Has expired: is marked as broken: fails to build: jabber-chat.el:25:1: Error: Wrong number of arguments: (3 . 3), 2
 x11-fm/Arqiver|x11-fm/arqiver|2022-06-01|Convert PORTNATE to lowercase
 net/py-suds-community|net/py-suds|2022-06-03|Remove obsoleted port. Use net/py-suds instead
 net/py-suds-jurko|net/py-suds|2022-06-03|Remove obsoleted port. Use net/py-suds instead
 www/rubygem-faraday110|www/rubygem-faraday|2022-06-03|Obsolete, please use www/rubygem-faraday instead
 www/npm-node17|www/npm-node18|2022-06-03|Renamed for www/node update to v18
 www/yarn-node17|www/yarn-node18|2022-06-03|Renamed for www/node update to v18
 security/keepassx-devel||2022-06-05|Has expired: KeePassX had been stopped development/maintenance, please consider using security/keepassxc instead
 sysutils/uefi-edk2-qemu|sysutils/edk2@qemu_x64|2022-06-05|No more need for this port: please use sysutils/edk2 FLAVOR qemu instead
 graphics/gltt||2022-06-08|Abdonware, depends on freetype1
 print/ttftot42||2022-06-08|Abdonware, depends on freetype1
 archivers/erlang-snappy||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 converters/erlang-base64url||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 databases/elixir-calecto||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 databases/elixir-db_connection||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 databases/elixir-ecto||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 databases/elixir-geo||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 databases/elixir-mariaex||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 databases/elixir-postgrex||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 databases/elixir-timex_ecto||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 databases/erlang-couchbeam||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 databases/erlang-epgsql||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 databases/erlang-eredis||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-apex||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-bson||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-cachex||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-calendar||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-combine||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-conform||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-connection||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-coverex||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-crontab||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-csv||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-decimal||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-deppie||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-dialyze||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-distillery||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-estree||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-eternal||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-exactor||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-excoveralls||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-exjsx||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-exprotobuf||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-gen_stage||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-gettext||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-inflex||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-libring||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-math||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-msgpax||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-nadia||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-nats||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-nimble_csv||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-paratize||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-plug||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-poison||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-quantum||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-smppex||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-timex||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-trailing_format_plug||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-tzdata||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/elixir-unsafe||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-bbmustache||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-certifi||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-cuttlefish||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-erlware_commons||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-gen_smtp||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-getopt||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-goldrush||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-hut||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-jobs||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-jsx||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-katana||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-lager||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-lager_syslog||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-meck||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-metrics||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-parse_trans||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-providers||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-ssl_verify_fun||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-unicode_util_compat||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 dns/erlang-idna||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 misc/elixir-mime||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 misc/elixir-uuid||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 misc/erlang-mimerl||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 misc/erlang-mimetypes||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 net/elixir-kafka_ex||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 net/elixir-oauth2||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 net/erlang-ranch||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 security/elixir-comeonin||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 security/elixir-comeonin_i18n||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 security/elixir-jose||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 security/erlang-fast_tls||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 security/erlang-jose||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 textproc/elixir-earmark||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 textproc/elixir-funnel||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 textproc/elixir-sweet_xml||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 textproc/erlang-edown||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 textproc/erlang-fast_xml||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 textproc/erlang-p1_utils||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 textproc/erlang-yamerl||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 www/elixir-html_entities||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 www/elixir-html_sanitize_ex||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 www/elixir-httpoison||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 www/elixir-httpotion||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 www/elixir-joken||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 www/elixir-maru||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 www/elixir-phoenix||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 www/elixir-phoenix_ecto||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 www/elixir-phoenix_html||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 www/elixir-phoenix_pubsub||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 www/elixir-webassembly||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 www/erlang-cowboy||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 www/erlang-cowlib||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 www/erlang-hackney||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 www/erlang-ibrowse||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 www/erlang-mochiweb||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 www/erlang-mochiweb-basho||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 www/erlang-webmachine||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-backoff||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-bear||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-cf||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-common_lib||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-esdl||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-folsom||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-gen_leader||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-gpb||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-gproc||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-jsxd||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-neotoma||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-poolboy||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-pooler||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-sbroker||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 devel/erlang-syslog||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead
 print/freetype|print/freetype2|2022-06-08|Has been replaced long ago by freetype2
 net/libgnetwork||2022-06-08|Gnome2 library unused anymore
 x11-wm/compizconfig-backend-gconf||2022-06-08|gconf support has been removed from compiz
 devel/android-tools-adb|devel/android-tools|2022-06-09|Port has been updated, unbroken and consolidated into devel/android-tools
 devel/android-tools-fastboot|devel/android-tools|2022-06-09|Port has been updated and consolidated into devel/android-tools
 devel/py-lark-parser|devel/py-lark|2022-06-09|Remove obsoleted port. Use devel/py-lark instead
 databases/py-arrow|databases/py-apache-arrow|2022-06-12|Rename to avoid conflict with devel/py-arrow and to match the project name
 science/szip|science/libaec|2022-06-16|Remove obsoleted port. Use science/libaec instead
 net/pfinger||2022-06-17|Has expired: Unmaintained and dead upstream, consider base fingerd
 biology/mopac|science/mopac|2022-06-19|Move to a proper category
 devel/liblas12||2022-06-21|Has expired: Previously only required by math/saga (now superseeded by math/pdal)
 net-im/licq||2022-06-21|Has expired: Abandonware, project is dead
 net-im/licq-icq||2022-06-21|Removed, part of expired net-im/licq
 net-im/licq-jabber||2022-06-21|Removed, part of expired net-im/licq
 net-im/licq-osd||2022-06-21|Removed, part of expired net-im/licq
 net-im/licq-qt-gui||2022-06-21|Removed, part of expired net-im/licq
 x11-toolkits/py-xlib|x11-toolkits/py-python-xlib|2022-06-21|Use registered upstream (PyPI) name (Python ports compliance)
 www/openarc|mail/openarc|2022-06-21|Move to a proper category
 textproc/rubygem-elasticsearch-model6|textproc/rubygem-elasticsearch-model|2022-06-24|Obsolete use textproc/rubygem-elasticsearch-model instead
 textproc/rubygem-elasticsearch6|textproc/rubygem-elasticsearch|2022-06-24|Obsolete use textproc/rubygem-elasticsearch instead
 textproc/rubygem-elasticsearch-transport6|textproc/rubygem-elasticsearch-transport|2022-06-24|Obsolete use textproc/rubygem-elasticsearch-transport instead
 textproc/rubygem-elasticsearch-api6|textproc/rubygem-elasticsearch-api|2022-06-24|Obsolete use textproc/rubygem-elasticsearch-api instead
 textproc/rubygem-elasticsearch-rails6|textproc/rubygem-elasticsearch-rails|2022-06-24|Obsolete use textproc/rubygem-elasticsearch-rails instead
 devel/p5-Goo-Canvas|devel/p5-Goo-Canvas2|2022-06-24|Obsolete use devel/p5-Goo-Canvas2 instead
 graphics/goocanvas|graphics/goocanvas3|2022-06-24|Obsolete use graphics/goocanvas3
 x11-toolkits/tepl|x11-toolkits/tepl6|2022-06-25|Obsolete use x11-toolkits/tepl6
 lang/cmucl||2022-06-27|Has expired: Not supported upstream since 2017 and broken since FreeBSD 12.1
 devel/qbs||2022-06-27|Has expired: Abandoned and not working with modern clang
 lang/cmucl-extra||2022-06-27|Has expired: lang/cmucl is not supported upstream since 2017 and broken since FreeBSD 12.1
 security/protonvpn-cli||2022-06-27|Has expired: This version is deprecated and unsupported upstream. The port needs an update, which would require a fair amount of effort. Use OpenVPN or Wireguard with configuration files provided by ProtonVPN instead
 sysutils/firstboot-growfs||2022-06-27|Has expired: A better version is available on all FreeBSD version
 security/modsecurity3-apache||2022-06-27|Has expired: The project was not developed further
 net-mgmt/zabbix54-frontend||2022-06-27|Has expired: Unsupported by upstream
 net-mgmt/zabbix54-server||2022-06-27|Has expired: Unsupported by upstream
 net-mgmt/zabbix54-agent||2022-06-27|Has expired: Unsupported by upstream
 net-mgmt/zabbix54-java||2022-06-27|Has expired: Unsupported by upstream
 net-mgmt/zabbix54-proxy||2022-06-27|Has expired: Unsupported by upstream
 www/py-graphite-web||2022-06-30|Has expired: No support for newer versions of Django
 databases/percona56-server||2022-06-30|Has expired: EOL since February 2021
 databases/percona56-client||2022-06-30|Has expired: EOL since February 2021
 databases/mysql55-server||2022-06-30|Has expired: Upstream support ended on December 2018
 databases/mysql55-client||2022-06-30|Has expired: Upstream support ended on December 2018
 multimedia/schroedinger||2022-06-30|Has expired: Abandoned legacy video codec, upstream is dead and last release was back in 2012
 emulators/kcemu||2022-06-30|Has expired: Depends on expired multimedia/schroedinger
 multimedia/ccextractor||2022-06-30|Has expired: Depends on expired multimedia/schroedinger
 security/libgringotts||2022-06-30|Has expired: Abandonware, upstream dead and last release in 2008
 deskutils/osmo||2022-06-30|Has expired: Depends on expired security/libgringotts
 devel/itext||2022-06-30|Has expired: Outdated version and deprecated by upstream
 audio/tuxguitar||2022-06-30|Has expired: Depends on expired devel/itext
 security/ruby-bitwarden||2022-06-30|Has expired: Broken with all supported versions of Ruby
 mail/rubygem-tmail||2022-06-30|Has expired: Broken with all supported versions of Ruby
 www/redmine4|www/redmine42|2022-06-30|Has expired: Deprecated by upstream. Please consider using www/redmine42
 www/py-django-common-helpers||2022-06-30|Has expired: No longer maintained, doesn't work with newer versions of Django
 www/py-django||2022-06-30|Has expired: Was used as a metaport, no longer required
 www/py-django-sudo||2022-06-30|Has expired: Abandoned upstream, not compatible with newer versions of Django
 www/py-django-bootstrap-form||2022-06-30|Has expired: No longer maintained, not compatible with newer versions of Django
 www/py-django-babel||2022-06-30|Has expired: Upstream no longer maintained, please use www/py-enmerkar instead
 www/py-django-bulk-update||2022-06-30|Has expired: No longer maintained, not compatible with newer versions of Django
 www/py-django-happenings-update||2022-06-30|Has expired: Upstream no longer maintained, not compatible with newer versions of Django
 www/py-django-compat||2022-06-30|Has expired: No longer maintained, doesn't work with newer versions of Django
 www/py-django-modern-rpc||2022-06-30|Has expired: Not compatible with newer versions of Django
 www/py-django22||2022-06-30|Has expired: Django 2.2 is now in Extended Support, receives security fixes only and will reach End-Of-Life on 2022-04-01. Upgrade to a later Django version. See https://www.djangoproject.com/download/
 www/py-jsonfield2|www/py-jsonfield|2022-06-30|Has expired: Obsolete, please use www/py-jsonfield instead
 www/py-dj32-django-filter|www/py-django-filter|2022-06-30|Has expired: Obsolete, please use www/py-django-filter instead
 www/py-dj32-djangorestframework|www/py-djangorestframework|2022-06-30|Has expired: Obsolete, please use www/py-djangorestframework instead
 www/py-dj32-drf-yasg|www/py-drf-yasg|2022-06-30|Has expired: Obsolete, please use www/py-drf-yasg instead
 www/py-dj32-django-cacheops|www/py-django-cacheops|2022-06-30|Has expired: Obsolete, please use www/py-django-cacheops instead
 www/py-dj32-django-graphiql-debug-toolbar|www/py-django-graphiql-debug-toolbar|2022-06-30|Has expired: Obsolete, please use www/py-django-graphiql-debug-toolbar instead
 devel/py-dj32-django-rq|devel/py-django-rq|2022-06-30|Has expired: Obsolete, please use devel/py-django-rq instead
 www/py-dj32-django-tables2|www/py-django-tables2|2022-06-30|Has expired: Obsolete, please use www/py-django-tables2 instead
 www/py-dj32-django-prometheus|www/py-django-prometheus|2022-06-30|Has expired: Obsolete, please use www/py-django-prometheus instead
 www/py-dj32-django-treebeard|www/py-django-treebeard|2022-06-30|Has expired: Obsolete, please use www/py-django-treebeard instead
 www/py-dj32-django-mptt|www/py-django-mptt|2022-06-30|Has expired: Obslete, please use www/py-django-mptt instead
 devel/py-dj32-graphene-django|devel/py-graphene-django|2022-06-30|Has expired: Obsolete, please use devel/py-graphene-django instead
 www/py-dj32-django-taggit|www/py-django-taggit|2022-06-30|Has expired: Obsolete, please use www/py-django-taggit instead
 www/py-dj32-django-auth-ldap|www/py-django-auth-ldap|2022-06-30|Has expired: Obsolete, please use www/py-django-auth-ldap instead
 www/py-dj32-django-cors-headers|www/py-django-cors-headers|2022-06-30|Has expired: Obsolete, please use www/py-django-cors-headers instead
 www/py-dj32-django-debug-toolbar|www/py-django-debug-toolbar|2022-06-30|Has expired: Obsolete, please use www/py-django-debug-toolbar instead
 www/py-dj32-django-redis|www/py-django-redis|2022-06-30|Has expired: Obsolete, please use www/py-django-redis instead
 www/py-dj32-django-timezone-field|www/py-django-timezone-field|2022-06-30|Has expired: Obsolete, please use www/py-django-timezone-field instead
 www/py-dj32-django-js-asset|www/py-django-js-asset|2022-06-30|Has expired: Obsolete, please use www/py-django-js-asset instead
 www/py-rackspace-monitoring||2022-06-30|Has expired: Python compatibility upto 3.2 and last release was 3 years ago
 devel/py-apns2|devel/py-aioapns|2022-06-30|Has expired: Use devel/py-aioapns
 www/py-hyper|www/py-httpx|2022-06-30|Has expired: Project abandoned use www/py-httpx
 irc/py-fishcrypt||2022-06-30|Has expired: Abandoned, unmaintained, requires Python 2 and depends on deprecated pycrypto
 devel/py-stsci.distutils||2022-06-30|Has expired: Upstream abandoned in 2013
 net-im/py-slackclient|net-im/py-slack-sdk|2022-06-30|Has expired: Use net-im/py-slack-sdk
 multimedia/mpeg2codec||2022-06-30|Has expired: Obsolete, please consider using multimedia/ffmpeg
 multimedia/livestreamer||2022-06-30|Has expired: Abandoned upstream, please consider using www/yt-dlp or multimedia/streamlink
 net/kissd||2022-06-30|Has expired: Obsolete, target hardware was released 19 years ago
 www/gecko-mediaplayer||2022-06-30|Has expired: Uses incompatible plugin interface NPAPI
 multimedia/snappy||2022-06-30|Has expired: Deprecated upstream, please consider multimedia/mpv or multimedia/vlc
 multimedia/gnome-twitch||2022-06-30|Has expired: Unmaintained, please consider using www/yt-dlp or multimedia/streamlink
 multimedia/clive||2022-06-30|Has expired: Last release in 2012, please consider using www/yt-dlp or multimedia/streamlink
 multimedia/imagination||2022-06-30|Has expired: Obsolete, majority of DVD players made in the last 15+ years have been able to do image slideshows
 multimedia/m2tstoavi||2022-06-30|Has expired: Marked obsolete by upstream in 2010, please consider using multimedia/ffmpeg or multimedia/handbrake
 multimedia/mps-youtube||2022-06-30|Has expired: Abandoned upstream
 multimedia/umph||2022-06-30|Has expired: Last release in 2012 and abandoned upstream, please consider using www/yt-dlp
 multimedia/quvi09||2022-06-30|Has expired: Deprecated upstream, please consider using www/yt-dlp or multimedia/streamlink
 multimedia/quvi||2022-06-30|Has expired: Deprecated upstream, please consider using www/yt-dlp or multimedia/streamlink
 multimedia/libquvi09||2022-06-30|Has expired: Deprecated upstream, please consider using www/yt-dlp or multimedia/streamlink
 multimedia/libquvi||2022-06-30|Has expired: Deprecated upstream, please consider using www/yt-dlp or multimedia/streamlink
 multimedia/libquvi-scripts09||2022-06-30|Has expired: Deprecated upstream, please consider using www/yt-dlp or multimedia/streamlink
 multimedia/libquvi-scripts||2022-06-30|Has expired: Deprecated upstream, please consider using www/yt-dlp or multimedia/streamlink
 multimedia/cclive||2022-06-30|Has expired: Last release in 2013, please consider using www/yt-dlp or multimedia/streamlink
 multimedia/p5-Umph-Prompt||2022-06-30|Has expired: Last release in 2011 and abandoned upstream
 sysutils/xvidcap||2022-06-30|Has expired: Abandoned upstream, depends on deprecated GTK2 and only supports legacy video codecs. Please consider using multimedia/obs-studio
 audio/gmpc-lastfm||2022-06-30|Has expired: Abandonware, last release in 2011 and upstream is dead
 audio/gmpc-magnatune||2022-06-30|Has expired: Abandonware, last release in 2011 and upstream is dead
 audio/gmpc-shout||2022-06-30|Has expired: Abandonware, last release in 2011 and upstream is dead
 audio/gmpc-alarm||2022-06-30|Has expired: Abandonware, last release in 2011 and upstream is dead
 audio/gmpc-lyricsplugin||2022-06-30|Has expired: Abandonware, last release in 2011 and upstream is dead
 audio/gmpc-mdcover||2022-06-30|Has expired: Abandonware, last release in 2011 and upstream is dead
 audio/gmpc-albumview||2022-06-30|Has expired: Abandonware, last release in 2011 and upstream is dead
 audio/gmpc-extraplaylist||2022-06-30|Has expired: Abandonware, last release in 2011 and upstream is dead
 audio/gmpc-libnotify||2022-06-30|Has expired: Abandonware, last release in 2011 and upstream is dead
 audio/gmpc||2022-06-30|Has expired: Abandonware, last release in 2011 and upstream is dead
 audio/gmpc-lyrics||2022-06-30|Has expired: Abandonware, last release in 2011 and upstream is dead
 audio/gmpc-discogs||2022-06-30|Has expired: Abandonware, last release in 2011 and upstream is dead
 audio/gmpc-mserver||2022-06-30|Has expired: Abandonware, last release in 2011 and upstream is dead
 multimedia/ffmpeg2theora||2022-06-30|Has expired: Legacy video format, superseded by AV1/H.264/H.265/VP8/VP9
 multimedia/grake||2022-06-30|Has expired: Dead upstream, please consider using www/yt-dlp or multimedia/streamlink
 multimedia/iriverter||2022-06-30|Has expired: Obsolete and unmaintained for 15+ years, please consider using multimedia/handbrake
 multimedia/libmpeg3||2022-06-30|Has expired: Deprecated upstream
 multimedia/mmsrip||2022-06-30|Has expired: Obsolete, Microsoft deprecated MMS in 2003
 multimedia/mpeg2play||2022-06-30|Has expired: Obsolete, please consider using multimedia/mpv or multimedia/vlc
 multimedia/mpeg_play||2022-06-30|Has expired: Obsolete, please consider using multimedia/mpv or multimedia/vlc
 multimedia/mpeg_stat||2022-06-30|Has expired: Obsolete, please consider using multimedia/mediainfo or multimedia/ffmpeg
 multimedia/qt-faststart||2022-06-30|Has expired: Obsolete, please consider using multimedia/Bento4, multimedia/gpac-mp4box or multimedia/ffmpeg
 multimedia/spigot||2022-06-30|Has expired: Deprecated hardware, released in the early 90s
 audio/forked-daapd|audio/owntone|2022-06-30|Has expired: Deprecated upstream, project is now called OwnTone
 multimedia/tstools||2022-06-30|Has expired: Obsolete, please consider using multimedia/ffmpeg
 multimedia/sabbu||2022-06-30|Has expired: please consider using multimedia/aegisub
 multimedia/avinfo||2022-06-30|Has expired: Last release in 2008, please consider using multimedia/mediainfo or multimedia/ffmpeg instead
 multimedia/mpgtx||2022-06-30|Has expired: Obsolete, please consider using multimedia/ffmpeg
 devel/psptoolchain||2022-06-30|Has expired: Security issues for multiple years
 devel/psptoolchain-binutils||2022-06-30|Has expired: Security issues for multiple years
 devel/psptoolchain-newlib||2022-06-30|Has expired: Security issues for multiple years
 devel/psptoolchain-gdb||2022-06-30|Has expired: Security issues for multiple years
 devel/psptoolchain-gcc-stage1||2022-06-30|Has expired: Security issues for multiple years
 devel/psptoolchain-pspsdk-stage1||2022-06-30|Has expired: Security issues for multiple years
 devel/psptoolchain-pspsdk-stage2||2022-06-30|Has expired: Security issues for multiple years
 devel/psptoolchain-gcc-stage2||2022-06-30|Has expired: Security issues for multiple years
 databases/pgpool-II-36||2022-06-30|Has expired: Upstream support ended use databases/pgpool-II-43
 ftp/multiget||2022-06-30|Has expired: Last release in 2007, doesn't support https, depends on deprecated wxgtk28 and dead upstream. Please consider using net/uget
 devel/electron13||2022-06-30|Has expired: EOLed upstream, switch to newer version
 ftp/puf||2022-06-30|Has expired: Last release in 2006, doesn't support https and upstream is dead. Please consider using www/aria2
 security/gss||2022-06-30|Has expired: Abandonware, last release in 2014 and no development since
 security/shishi||2022-06-30|Has expired: Abandonware, last release in 2013 and no development since
 ftp/urlgfe||2022-06-30|Has expired
 www/nspluginwrapper||2022-06-30|Has expired: Abandonware, last release in 2011 and upstream is dead. NPAPI plugins are now obsolete and depends on deprecated library GTK 2
 devel/govendor||2022-06-30|Has expired: Use Go modules
 devel/racer||2022-06-30|Has expired: Racer is not actively developped now. Please consider using newer software such as devel/rust-analyzer
 net-mgmt/unifi6||2022-06-30|Has expired: No longer maintained by upstream
 devel/dep||2022-06-30|Has expired: Use Go modules
 databases/libgda5-bdb||2022-06-30|Has expired: Depends on deprecated databases/db5
 emulators/qemu5||2022-06-30|Has expired: Use emulators/qemu6 or emulators/qemu
 deskutils/bitcollider||2022-06-30|Has expired: bitzi.com is no longer available, closed down in 2013
 converters/htx||2022-06-30|Has expired: XHTML is considered obsolete in favor of HTML5
 www/getleft||2022-06-30|Has expired: Abandonware last updated on 2008
 ftp/wxdfast||2022-06-30|Has expired: Last release in 2009, doesn't support https, depends on deprecated wxgtk28 and dead upstream. Please consider using net/uget
 x11/dmenu-wayland|deskutils/dmenu-wayland|2022-07-01|move desktop utility to its right category
 x11/i3lock|deskutils/i3lock|2022-07-01|move desktop utility to its right category
 x11/i3status|deskutils/i3status|2022-07-01|move desktop utility to its right category
 x11/xcbautolock|deskutils/xcbautolock|2022-07-01|move desktop utility to its right category
 x11/havoc|deskutils/havoc|2022-07-01|move desktop utility to its right category
 devel/go-glide||2022-07-01|Has expired: use go mod instead of glide
 sysutils/go-btfs||2022-07-01|Has expired: Requires go 1.15
 sysutils/pesign||2022-07-01|Has expired: Unmaintaned since 2016, very much out of date, does not build with GCC 11 (PR #263544)
 sysutils/cfengine316||2022-07-06|Has expired: Expire one year after cfengine 3.18.0 released
 sysutils/cfengine-masterfiles316||2022-07-06|Has expired: Expire one year after cfengine 3.18.0 released
 devel/hs-hls-install||2022-07-06|Removed: was a build dependency and not needed anymore
 devel/hs-haddock||2022-07-06|Removed: Haddock is shipped as part of lang/ghc
 x11/gsynaptics||2022-07-08|Has expired: Abandonware using old gnome2 libs
 x11/alltray||2022-07-08|Has expired: abandonware
 x11/simdock||2022-07-08|Has expired: Abandonware using deprecated gnome2 libs
 misc/cxxmatrix|games/cxxmatrix|2022-07-10|Move to a more appropriate category
 devel/ChipmunkPhysics|science/ChipmunkPhysics|2022-07-13|Move to a more appropriate category
 textproc/rubygem-escape_utils12|textproc/rubygem-escape_utils|2022-07-13|Remove obsoleted port. Use textproc/rubygem-escape_utils instead
 net/rubygem-omniauth-oauth2-v1|net/rubygem-omniauth-oauth2|2022-07-13|Remove obsoleted port. Use net/rubygem-omniauth-oauth2 instead
 devel/rubygem-execjs-node16|devel/rubygem-execjs|2022-07-13|Remove obsoleted port. Use devel/rubygem-execjs instead
 devel/rubygem-webpacker-rails61-node16|devel/rubygem-webpacker-rails61|2022-07-13|Remove obsoleted port. Use devel/rubygem-webpacker-rails61 instead
 textproc/rubygem-autoprefixer-rails-node16|textproc/rubygem-autoprefixer-rails|2022-07-13|Remove obsoleted port. Use textproc/rubygem-autoprefixer-rails instead
 www/rubygem-rails61-node16|www/rubygem-rails61|2022-07-13|Remove obsoleted port. Use www/rubygem-rails61 instead
 www/rubygem-uglifier-node16|www/rubygem-uglifier|2022-07-13|Remove obsoleted port. Use www/rubygem-uglifier instead
 audio/espeak|audio/espeak-ng|2022-07-15|Switch to fork of (stale) original repository
 misc/ngraph||2022-07-15|Software is discontinued because its developer Nervana Systems is defunct
 math/hipmcl||2022-07-16|Discontinued: old versions aren't compatible with new combblas-2.0, latest versions require CUDA that is not available on FreeBSD
 security/base-audit|ports-mgmt/pkg|2022-07-17|Merged into ports-mgmt/pkg
 net/py-pyroute2.core|net/py-pyroute2|2022-07-18|Remove obsoleted port. Upstream moves back to single package layout (net/py-pyroute2)
 net/py-pyroute2.ethtool|net/py-pyroute2|2022-07-18|Remove obsoleted port. Upstream moves back to single package layout (net/py-pyroute2)
 net/py-pyroute2.ipset|net/py-pyroute2|2022-07-18|Remove obsoleted port. Upstream moves back to single package layout (net/py-pyroute2)
 net/py-pyroute2.ndb|net/py-pyroute2|2022-07-18|Remove obsoleted port. Upstream moves back to single package layout (net/py-pyroute2)
 net/py-pyroute2.nftables|net/py-pyroute2|2022-07-18|Remove obsoleted port. Upstream moves back to single package layout (net/py-pyroute2)
 net/py-pyroute2.nslink|net/py-pyroute2|2022-07-18|Remove obsoleted port. Upstream moves back to single package layout (net/py-pyroute2)
 math/intervaltree||2022-07-27|Has expired: Dependent ports now use GH_TUPLE
 security/gnomint||2022-07-27|Has expired: Abandonware, depending on gconf2
 japanese/im-ja||2022-07-27|Has expired: Abandonware, depending on gconf2
 sysutils/mgeupsd||2022-07-27|Has expired: Last release is 23 years old. It is not clear what devices are supported
 x11-wm/lxmed||2022-07-27|Removed, depends on expired sysutils/gksu
 sysutils/gksu||2022-07-27|Has expired: Abandonware, depending on gconf2
 sysutils/libgksu||2022-07-27|Has expired: Abandonware, depending on gconf2
 multimedia/webvfx-qt5||2022-07-29|Abandoned upstream, multimedia/shotcut no longer supports/uses
 textproc/rubygem-rouge312|textproc/rubygem-rouge|2022-07-30|Remove obsoleted port. Use textproc/rubygem-rouge instead
 textproc/rubygem-rouge327|textproc/rubygem-rouge|2022-07-30|Remove obsoleted port. Use textproc/rubygem-rouge instead
 net-mgmt/py-netbox-plugin-extensions||2022-07-31|Has expired: No longer required for net-mgmt/netbox 3.2+
 deskutils/gnome-system-log||2022-08-01|Has expired: Did not survive gnome 3
 deskutils/gnome-documents||2022-08-01|Has expired: Archived upstream
 deskutils/gnome-search-tool||2022-08-01|Has expired: Did not survive gnome3
 security/nextcloud-twofactor_u2f|security/nextcloud-twofactor_webauthn|2022-08-01|Has expired: Upstream deprecated this port in favor of twofactor_webauthn. Check https://github.com/nextcloud/twofactor_webauthn#migration-from-two-factor-u2f for migration instructions
 editors/codelite||2022-08-01|Has expired: Has been broken for over a year
 x11-servers/xephyr|x11-servers/xorg-server@xephyr|2022-08-02|Merged into flavorized version
 x11-servers/xorg-nestserver|x11-servers/xorg-server@xnest|2022-08-02|Merged into the flavorized version
 x11-servers/xorg-vfbserver|x11-servers/xorg-server@xvfb|2022-08-02|Merged into the flavorized version
 x11-servers/xorg-dmx||2022-08-02|Discontinued upstream
 lang/go117||2022-08-02|Upstream support ended
 games/fishfight|games/jumpy|2022-08-02|Project was renamed upstream
 mail/roundcube-mobilecube||2022-08-05|Removed, broken and no upstream updates
 mail/roundcube-mvision2||2022-08-05|Removed, broken and no upstream updates
 mail/roundcube-umich||2022-08-05|Removed, broken and no upstream updates
 science/openkim|science/openkim-models|2022-08-07|Retire obsolete science/openkim, users should install science/openkim-models instead
 net/zeroconf-ioslave|net/kio-zeroconf|2022-08-18|Renamed upstream
 japanese/font-hackgen-nerd|japanese/font-hackgen-nf|2022-08-20|Renamed upstream
 x11-themes/adwaita-qt|x11-themes/adwaita-qt5|2022-08-23|Renamed to make space for x11-themes/adwaita-qt6
 net/gstreamer1-plugins-libmms||2022-08-26|Microsoft deprecated MMS in 2003
 mail/py-email_reply_parser|mail/py-email-reply-parser|2022-08-27|Renamed to match upstream naming
 print/py-pdf2|print/py-pypdf2|2022-08-27|Renamed to match upstream naming
 textproc/py-Chameleon|textproc/py-chameleon|2022-08-27|Renamed to match upstream naming
 print/py-pdf|print/py-pypdf|2022-08-27|Renamed to match upstream naming
 shells/ksh93-devel|shells/ksh-devel|2022-08-28|Development has resumed under a new GH account
 devel/boehm-gc-redirect||2022-08-29|No consumer in ports tree
 devel/libthreader|devel/libthreadar|2022-08-29|Fix directory name
 mail/rainloop-community|mail/rainloop|2022-09-01|Only one edition "legacy" is provided now
 java/openjdk7||2022-09-03|Has expired: EOLed since 31 July 2022
 java/openjdk7-jre||2022-09-03|Has expired: EOLed since 31 July 2022
 devel/py-logfury0|devel/py-logfury|2022-09-04|Remove obsoleted port. Use devel/py-logfury instead
 www/py-beautifulsoup449|www/py-beautifulsoup|2022-09-04|Remove obsoleted port. Use www/py-beautifulsoup instead
 x11-drivers/xf86-video-trident||2022-09-04|Has expired: Broken with recent xorg, no fixes upstream
 x11-drivers/xf86-video-s3||2022-09-04|Has expired: Broken with recent xorg, no fixes upstream
 x11-drivers/xf86-video-glint||2022-09-04|Has expired: Broken with recent xorg, no fixes upstream
 www/mediawiki136||2022-09-04|Has expired: Upstream no longer maintained
 games/sopwith|games/sdl-sopwith|2022-09-04|Renamed to match upstream naming
 graphics/drm-fbsd13-kmod|graphics/drm-510-kmod|2022-09-07|Obsolete, use graphics/drm-510-kmod
 graphics/drm-54-kmod|graphics/drm-510-kmod|2022-09-07|Obsolete, use graphics/drm-510-kmod
 archivers/ppmd-7z|archivers/7-zip|2022-09-11|ppmd-7z was a mis-named p7zip project that is unmaintained and has numerous vulnerabilities, users should use 7-zip instead
 science/R-cran-AMORE||2022-09-12|Has expired: Upstream no longer maintained
 www/moodle310|www/moodle311|2022-09-12|Has expired: Upstream no longer maintained, upgrade to next LTS
 security/s2n|security/s2n-tls|2022-09-13|Renamed to match upstream naming
 audio/kid3-kf5|audio/kid3@kf5|2022-09-13|Merged into flavorized version
 audio/kid3-qt5|audio/kid3@qt6|2022-09-13|Merged into flavorized version
 audio/phaserotate-lv2|audio/x42-plugins-lv2|2022-09-13|phaserotate-lv2 LV2 plugin is included in the x42-plugins-lv2 plugin collection
 graphics/darktable40|graphics/darktable|2022-09-22|Obsolete. Use graphics/darktable, which is the same version
 java/bootstrap-openjdk6|java/bootstrap-openjdk8|2022-09-25|Was only used to bootstrap the now deleted java/openjdk7 port
 graphics/caffe|misc/caffe|2022-09-29|Move to a more appropriate category
 security/pwman3||2022-09-30|Has expired: Depends on expired security/py-pycrypto
 sysutils/py-ansible-base||2022-09-30|Has expired: Depends on expired security/py-pycrypto
 devel/flang||2022-09-30|Has expired: Very outdated and unsupported upstream, current version in tree is several years old and upstream is still active
 devel/flang-clang||2022-09-30|Has expired: Very outdated and unsupported upstream, current version in tree is several years old and upstream is still active
 deskutils/myitcrm||2022-09-30|Has expired: Abandoned project as last update was on 2012-01-15
 lang/spidermonkey17||2022-09-30|Has expired: Obsolete, released in 2007 and since long unsupported upstream
 lang/p5-JavaScript-SpiderMonkey||2022-09-30|Has expired: Depends on deprecated SpiderMonkey 1.7
 devel/electron17||2022-09-30|Has expired: EOLed upstream, switch to newer version
 www/ttf2eot||2022-09-30|Has expired: Obsolete font format that's been superseded by OTF/TTF/WOFF/WOFF2
 audio/aacplusenc||2022-09-30|Has expired: Legacy audio format, superseded by HE-AAC(v1), HE-AACv2 and xHE-AAC/USAC. Please consider using audio/fdk-aac via FFmpeg or audio/exhale
 net/libmms||2022-09-30|Has expired: Obsolete, Microsoft deprecated MMS protocol in favour of RTSP in 2003
 audio/mctoolame-decoder||2022-09-30|Has expired: Legacy and obscure audio format that never gained any traction
 audio/mctoolame-encoder||2022-09-30|Has expired: Legacy and obscure audio format that never gained any traction
 www/py-ws4py||2022-09-30|Has expired: Upstream abandoned
 databases/py-bsddb3|databases/py-berkeleydb|2022-09-30|Has expired: Requires upstream EOLd db5. Use py-berkeleydb
 graphics/megapov|graphics/povray37|2022-10-01|Has expired: Abandoned upstream. graphics/povray37 is the recommended replacement
 x11-toolkits/gstreamer1-plugins-gtk4||2022-10-01|No consumers left and deprecated in favor gtk4 plugin from multimedia/gstreamer1-plugins-rust >= 0.8.0
 deskutils/lookbook|deskutils/iconbrowser|2022-10-05|Project was renamed, now it is an official elementary OS application
 devel/p5-Type-Tie|devel/p5-Type-Tiny|2022-10-09|Remove obsoleted port. Use devel/p5-Type-Tiny instead
 databases/py-alembic16|databases/py-alembic|2022-10-09|Remove obsoleted port. Use databases/py-alembic instead
 devel/py-openapi-spec-validator04|devel/py-openapi-spec-validator|2022-10-09|Remove obsoleted port. Use devel/py-openapi-spec-validator instead
 devel/py-openapi-schema-validator02|devel/py-openapi-schema-validator|2022-10-09|Remove obsoleted port. Use devel/py-openapi-schema-validator instead
 databases/rubygem-redis44|databases/rubygem-redis|2022-10-09|Remove obsoleted port. Use databases/rubygem-redis instead
 databases/rubygem-redis-actionpack52-rails61|databases/rubygem-redis-actionpack-rails61|2022-10-09|Remove obsoleted port. Use databases/rubygem-redis-actionpack-rails61 instead
 devel/rubygem-devise47-rails61|devel/rubygem-devise-rails61|2022-10-09|Remove obsoleted port. Use devel/rubygem-devise-rails61 instead
 devel/rubygem-flipper021|devel/rubygem-flipper|2022-10-09|Remove obsoleted port. Use devel/rubygem-flipper instead
 devel/rubygem-fugit12|devel/rubygem-fugit|2022-10-09|Remove obsoleted port. Use devel/rubygem-fugit instead
 devel/rubygem-json25|devel/rubygem-json|2022-10-09|Remove obsoleted port. Use devel/rubygem-json instead
 devel/rubygem-oj310|devel/rubygem-oj|2022-10-09|Remove obsoleted port. Use devel/rubygem-oj instead
 net/rubygem-omniauth-facebook4|net/rubygem-omniauth-facebook|2022-10-09|Remove obsoleted port. Use net/rubygem-omniauth-facebook instead
 www/rubygem-cal-heatmap-rails-rails4|www/rubygem-cal-heatmap-rails|2022-10-09|Remove obsoleted port. Use www/rubygem-cal-heatmap-rails instead
 www/rubygem-d3_rails-rails4|www/rubygem-d3_rails|2022-10-09|Remove obsoleted port. Use www/rubygem-d3_rails instead
 www/rubygem-jwt21|www/rubygem-jwt|2022-10-09|Remove obsoleted port. Use www/rubygem-jwt instead
 www/rubygem-protocol-rack01|www/rubygem-protocol-rack|2022-10-09|Remove obsoleted port. Use www/rubygem-protocol-rack instead
 www/rubygem-rack223|www/rubygem-rack|2022-10-09|Remove obsoleted port. Use www/rubygem-rack instead
 databases/pymongo|databases/py-pymongo|2022-10-09|Add the py- prefix which all Python ports should have
 audio/protracker|audio/pt2-clone|2022-10-12|Renamed to match upstream naming
 multimedia/gstreamer1-transcoder|multimedia/gstreamer1-plugins-bad|2022-10-15|Upstream included transcoding in plugins-bad
 devel/py-ipykernel5|devel/py-ipykernel|2022-10-15|ipykernel5 is discontinued, ipykernel is used instead
 x11-toolkits/libshumate-shortwave|x11-toolkits/libshumate|2022-10-15|No longer used by audio/shortwave
 misc/orion||2022-10-16|Dead upstream and fails to build with mpv-0.35
 devel/msgpack|devel/msgpack-c|2022-10-16|MsgPack now separates C and C++ versions
 games/arttime|deskutils/arttime|2022-10-18|Moved to a better category
 security/nextcloud-twofactor_totp|www/nextcloud|2022-10-21|Twofactor TOTP provider bundled with Nextcloud 25
 x11-toolkits/wxgtk31|x11-toolkits/wxgtk32|2022-10-25|Remove obsoleted port. Use x11-toolkits/wxgtk32 instead
 devel/py-pyxdg|devel/py-xdg|2022-10-28|Remove duplicate port
 lang/chicken5|lang/chicken|2022-10-30|Has expired: Please use lang/chicken instead
 devel/py-spyder|devel/spyder|2022-11-06|Spyder is an application, and not a library
 www/grafana7||2022-11-07|Has expired: EOLed upstream, unfixed vulnerabilities
 devel/cppcheck-gui|devel/cppcheck|2022-11-07|GUI is now included in devel/cppcheck port
 devel/py-types-termcolor||2022-11-11|No longer needed, type annotations are now available in termcolor module
 multimedia/mpv034||2022-11-14|No longer needed
 devel/py-types-xxhash||2022-11-15|No longer needed, type annotations are now available in xxhash module
 devel/awscli|devel/py-awscli|2022-11-15|Renamed comply with Python Ports Policy and flavored
 graphics/sciplot|science/sciplot|2022-11-15|Move to avoid conflict with graphics/SciPlot
 net/rabbitmq-c-devel|net/rabbitmq-c|2022-11-16|Remove obsolete devel port, use net/rabbitmq-c instead
 databases/foundationdb-devel|databases/foundationdb|2022-11-16|Remove obsolete devel port, use databases/foundationdb instead
 devel/py-pytest4-asyncio||2022-11-19|Has expired: legacy version for pytest4 no longer used by any port
 devel/tokamak||2022-11-20|Has expired: Last release in 2008, abandoned upstream, not used, website disappeared
 net/libutp|net-p2p/libutp|2022-11-20|Moved to a more adequated category
 math/suitesparse-slip_lu|math/suitesparse-spex|2022-11-26|Renamed by upstream
 graphics/giblib||2022-11-27|Has expired: Last release in 2004, abandoned upstream, not used, website disappeared
 www/typo3-10||2022-11-29|Requires php74 which was EOL on 2022-11-28
 www/phalcon4||2022-11-29|Requires php74 which was EOL on 2022-11-28
 www/ilias6||2022-11-29|Requires php74 which was EOL on 2022-11-28
 net/pecl-zmq||2022-11-29|Requires php74 which was EOL on 2022-11-28
 textproc/php-mecab||2022-11-29|Requires php74 which was EOL on 2022-11-28
 sysutils/ganglia-webfrontend||2022-11-29|Requires php74 which was EOL on 2022-11-28
 net/pecl-mosquitto||2022-11-30|Requires php74 which was EOL on 2022-11-28
 devel/pecl-propro2||2022-11-30|Requires php74 which was EOL on 2022-11-28
 devel/pecl-jsond||2022-11-30|Requires php74 which was EOL on 2022-11-28
 databases/pecl-cassandra||2022-11-30|Requires php74 which was EOL on 2022-11-28
 deskutils/egroupware||2022-12-01|Requires php74 which was EOL on 2022-11-28
 devel/pecl-APCu_bc||2022-12-01|Requires php74 which was EOL on 2022-11-28
 textproc/google-translate-cli|textproc/translate-shell|2022-12-02|Renamed by upstream
 net-mgmt/zabbix4-frontend||2022-12-05|Requires php74 which was EOL on 2022-11-28
 math/pecl-stats2||2022-12-05|Requires php74 which was EOL on 2022-11-28
 devel/pecl-jsmin||2022-12-05|Requires php74 which was EOL on 2022-11-28
 security/py-certbot-dns-cloudxns||2022-12-06|The CloudXNS DNS service is defunct and upstream removed plugin for it
 devel/pecl-hrtime||2022-12-08|Requires php74 which was EOL on 2022-11-28
 net-mgmt/zabbix5-frontend||2022-12-08|Requires php74 which was EOL on 2022-11-28
 multimedia/php-pHash||2022-12-08|Requires php74 which was EOL on 2022-11-28
 print/pecl-pdflib||2022-12-09|Requires php74 which was EOL on 2022-11-28
 ftp/php-fastdfs||2022-12-09|Requires php74 which was EOL on 2022-11-28
 multimedia/mlt7-qt5|multimedia/mlt7-qt|2022-12-10|Flavorized for Qt5 and Qt6
 sysutils/cfengine317||2022-12-10|Has expired: Expire one year after cfengine 3.19.0 released
 sysutils/cfengine-masterfiles317||2022-12-10|Has expired: Expire one year after cfengine-masterfiles 3.19.0 released
 net-mgmt/icingaweb2-module-ipl|net-mgmt/icinga-php-library|2022-12-13|Renamed by project
 x11/darkman|accessibility/darkman|2022-12-14|Moved to a better category
 net/samba412||2022-12-18|Has expired: Reached its EoL on September 20, 2021
 graphics/openimageio-ociov1|graphics/openimageio|2022-12-20|Used by blender-lts28 which is EOL'd
 textproc/retext|editors/retext|2022-12-21|Moved to a better category
 math/vtk6||2022-12-24|Has expired: Old version not used anywhere in the ports tree
 misc/php74-calendar|misc/php80-calendar|2022-12-25|Has expired: Security support ended on 2022-11-22
 graphics/php74-gd|graphics/php80-gd|2022-12-25|Has expired: Security support ended on 2022-11-22
 graphics/php74-exif|graphics/php80-exif|2022-12-25|Has expired: Security support ended on 2022-11-22
 textproc/php74-xmlreader|textproc/php80-xmlreader|2022-12-25|Has expired: Security support ended on 2022-11-22
 textproc/php74-simplexml|textproc/php80-simplexml|2022-12-25|Has expired: Security support ended on 2022-11-22
 textproc/php74-enchant|textproc/php80-enchant|2022-12-25|Has expired: Security support ended on 2022-11-22
 textproc/php74-xml|textproc/php80-xml|2022-12-25|Has expired: Security support ended on 2022-11-22
 textproc/php74-xmlwriter|textproc/php80-xmlwriter|2022-12-25|Has expired: Security support ended on 2022-11-22
 textproc/php74-pspell|textproc/php80-pspell|2022-12-25|Has expired: Security support ended on 2022-11-22
 textproc/php74-ctype|textproc/php80-ctype|2022-12-25|Has expired: Security support ended on 2022-11-22
 textproc/php74-dom|textproc/php80-dom|2022-12-25|Has expired: Security support ended on 2022-11-22
 textproc/php74-xsl|textproc/php80-xsl|2022-12-25|Has expired: Security support ended on 2022-11-22
 mail/php74-imap|mail/php80-imap|2022-12-25|Has expired: Security support ended on 2022-11-22
 databases/php74-odbc|databases/php80-odbc|2022-12-25|Has expired: Security support ended on 2022-11-22
 databases/php74-pdo_dblib|databases/php80-pdo_dblib|2022-12-25|Has expired: Security support ended on 2022-11-22
 databases/php74-dba|databases/php80-dba|2022-12-25|Has expired: Security support ended on 2022-11-22
 databases/php74-pdo|databases/php80-pdo|2022-12-25|Has expired: Security support ended on 2022-11-22
 databases/php74-pdo_firebird|databases/php80-pdo_firebird|2022-12-25|Has expired: Security support ended on 2022-11-22
 databases/php74-pgsql|databases/php80-pgsql|2022-12-25|Has expired: Security support ended on 2022-11-22
 databases/php74-mysqli|databases/php80-mysqli|2022-12-25|Has expired: Security support ended on 2022-11-22
 databases/php74-pdo_pgsql|databases/php80-pdo_pgsql|2022-12-25|Has expired: Security support ended on 2022-11-22
 databases/php74-pdo_odbc|databases/php80-pdo_odbc|2022-12-25|Has expired: Security support ended on 2022-11-22
 databases/php74-pdo_mysql|databases/php80-pdo_mysql|2022-12-25|Has expired: Security support ended on 2022-11-22
 databases/php74-pdo_sqlite|databases/php80-pdo_sqlite|2022-12-25|Has expired: Security support ended on 2022-11-22
 databases/php74-sqlite3|databases/php80-sqlite3|2022-12-25|Has expired: Security support ended on 2022-11-22
 security/php74-sodium|security/php80-sodium|2022-12-25|Has expired: Security support ended on 2022-11-22
 security/php74-filter|security/php80-filter|2022-12-25|Has expired: Security support ended on 2022-11-22
 security/php74-openssl||2022-12-25|Has expired: Security support ended on 2022-11-22
 net-mgmt/php74-snmp|net-mgmt/php80-snmp|2022-12-25|Has expired: Security support ended on 2022-11-22
 net/php74-ldap|net/php80-ldap|2022-12-25|Has expired: Security support ended on 2022-11-22
 net/php74-sockets|net/php80-sockets|2022-12-25|Has expired: Security support ended on 2022-11-22
 net/php74-xmlrpc||2022-12-25|Has expired: Security support ended on 2022-11-22
 net/php74-soap|net/php80-soap|2022-12-25|Has expired: Security support ended on 2022-11-22
 converters/php74-mbstring|converters/php80-mbstring|2022-12-25|Has expired: Security support ended on 2022-11-22
 converters/php74-iconv|converters/php80-iconv|2022-12-25|Has expired: Security support ended on 2022-11-22
 lang/php74-extensions|lang/php80-extensions|2022-12-25|Has expired: Security support ended on 2022-11-22
 lang/php74|lang/php80|2022-12-25|Has expired: Security support ended on 2022-11-22
 archivers/php74-zip|archivers/php80-zip|2022-12-25|Has expired: Security support ended on 2022-11-22
 archivers/php74-zlib|archivers/php80-zlib|2022-12-25|Has expired: Security support ended on 2022-11-22
 archivers/php74-bz2|archivers/php80-bz2|2022-12-25|Has expired: Security support ended on 2022-11-22
 archivers/php74-phar|archivers/php80-phar|2022-12-25|Has expired: Security support ended on 2022-11-22
 ftp/php74-ftp|ftp/php80-ftp|2022-12-25|Has expired: Security support ended on 2022-11-22
 ftp/php74-curl|ftp/php80-curl|2022-12-25|Has expired: Security support ended on 2022-11-22
 sysutils/php74-posix|sysutils/php80-posix|2022-12-25|Has expired: Security support ended on 2022-11-22
 sysutils/php74-fileinfo|sysutils/php80-fileinfo|2022-12-25|Has expired: Security support ended on 2022-11-22
 math/php74-bcmath|math/php80-bcmath|2022-12-25|Has expired: Security support ended on 2022-11-22
 math/php74-gmp|math/php80-gmp|2022-12-25|Has expired: Security support ended on 2022-11-22
 www/php74-opcache|www/php80-opcache|2022-12-25|Has expired: Security support ended on 2022-11-22
 www/mod_php74|www/mod_php80|2022-12-25|Has expired: Security support ended on 2022-11-22
 www/php74-tidy|www/php80-tidy|2022-12-25|Has expired: Security support ended on 2022-11-22
 www/php74-session|www/php80-session|2022-12-25|Has expired: Security support ended on 2022-11-22
 devel/php74-shmop|devel/php80-shmop|2022-12-25|Has expired: Security support ended on 2022-11-22
 devel/php74-sysvsem|devel/php80-sysvsem|2022-12-25|Has expired: Security support ended on 2022-11-22
 devel/php74-json||2022-12-25|Has expired: Security support ended on 2022-11-22
 devel/php74-sysvmsg|devel/php80-sysvmsg|2022-12-25|Has expired: Security support ended on 2022-11-22
 devel/php74-intl|devel/php80-intl|2022-12-25|Has expired: Security support ended on 2022-11-22
 devel/php74-tokenizer|devel/php80-tokenizer|2022-12-25|Has expired: Security support ended on 2022-11-22
 devel/php74-ffi|devel/php80-ffi|2022-12-25|Has expired: Security support ended on 2022-11-22
 devel/php74-pcntl|devel/php80-pcntl|2022-12-25|Has expired: Security support ended on 2022-11-22
 devel/php74-sysvshm|devel/php80-sysvshm|2022-12-25|Has expired: Security support ended on 2022-11-22
 devel/php74-gettext|devel/php80-gettext|2022-12-25|Has expired: Security support ended on 2022-11-22
 devel/php74-readline|devel/php80-readline|2022-12-25|Has expired: Security support ended on 2022-11-22
 audio/ardour6|audio/ardour|2022-12-26|Remove major version from portname as we update from 6.9.0 to 7.2.0
 multimedia/obs-transition-matrix||2022-12-29|Removed: not compatible with obs-studio-28.1.2
 multimedia/obs-websocket||2022-12-29|Removed: included in obs-studio-28.1.2
 multimedia/obs-ndi||2022-12-29|Removed: it depends on a closed commercial library
 multimedia/obs-v4l2sink||2022-12-29|Removed: obs-studio-28.1.2 now contains same functionality
 multimedia/obs-audio-spectralizer|multimedia/obs-waveform|2022-12-29|Removed obsolete port in favor of multimedia/obs-waveform
 www/py-werkzeug21|www/py-werkzeug|2022-12-30|Remove obsoleted port. Use www/py-werkzeug instead
 devel/rubygem-aws-sdk-core3131|devel/rubygem-aws-sdk-core|2022-12-30|Remove obsoleted port. Use devel/rubygem-aws-sdk-core instead
 devel/rubygem-aws-sdk-core3159|devel/rubygem-aws-sdk-core|2022-12-30|Remove obsoleted port. Use devel/rubygem-aws-sdk-core instead
 devel/rubygem-aws-sdk-s31114|devel/rubygem-aws-sdk-s3|2022-12-30|Remove obsoleted port. Use devel/rubygem-aws-sdk-s3 instead
 devel/rubygem-google-protobuf319|devel/rubygem-google-protobuf|2022-12-30|Remove obsoleted port. Use devel/rubygem-google-protobuf instead
 databases/pgpool-II-37|databases/pgpool-II-43|2022-12-30|Has expired: Upstream EOL reaches on 2022-11 use pgpool-II-43
 shells/ksh2020||2022-12-30|Has expired: Upstream ksh2020 branch archived, development continues under new ksh93 project
 games/scorched3d||2022-12-31|Has expired: Abandoned project and use deprecated wxgtk28
 comms/hylafax||2022-12-31|Has expired: dead upstream, someone port hylafax+ from sourceforge.net instead
 comms/tkhylafax||2022-12-31|Has expired: Depends on expired comms/hylafax
 lang/ponyc||2022-12-31|Has expired: Very outdated and unsupported upstream, depends on end of life devel/llvm70
 www/varnish4|www/varnish6|2022-12-31|Has expired: End of life upstream, users are recommended to upgrade to 6.x or higher
 devel/unittest-cpp||2022-12-31|Has expired: Upstream have declared hiatus status since 2+ years back. Please consider using devel/googletest instead
 math/libpgmath||2022-12-31|Has expired: Depends on end of life devel/llvm70
 cad/linux-eagle5||2022-12-31|Has expired: Deprecated upstream, superseded by Autodesk EAGLE 9
 net-p2p/amule-devel|net-p2p/amule|2022-12-31|Has expired: Superseded by non development port
 graphics/comical||2022-12-31|Has expired: Abandoned project and use deprecated wxgtk28
 emulators/lisaem||2022-12-31|Broken for more than a year and use deprecated wxgtk28
 editors/madedit||2022-12-31|Has expired: Abandoned project and use deprecated wxgtk28
 comms/ebook2cwgui||2022-12-31|Has expired: Abandoned project, last update 2013-01-23 and use deprecated wxgtk28
 databases/firebird25-client||2022-12-31|Has expired: Upstream Support ends on 2019-06-24
 databases/firebird25-server||2022-12-31|Has expired: Upstream Support ends on 2019-06-24
 multimedia/libkate||2022-12-31|Has expired: Obsolete format that never got any traction and no development in over 10 years
 net/opennx||2022-12-31|Has expired: Abandoned project and use deprecated wxgtk28
 cad/basicdsp||2022-12-31|Has expired: Abandoned project and use deprecated wxgtk28
 math/graphthing||2022-12-31|Has expired: Abandoned project and use deprecated wxgtk28
 math/pynac||2022-12-31|Project merged with SageMath
 x11-toolkits/wxgtk28-contrib-common||2022-12-31|Has expired: Upstream support ended
 x11-toolkits/wxgtk28-contrib||2022-12-31|Has expired: Upstream support ended
 x11-toolkits/wxgtk28-common||2022-12-31|Has expired: Upstream support ended
 x11-toolkits/wxgtk28|x11-toolkits/wxgtk30|2022-12-31|Has expired: Upstream support ended, use wx 3.x
 www/py-txrequests|www/py-requests-futures|2022-12-31|Has expired: Use www/py-requests-futures as upstream is unmaintained since 2018
 sysutils/py-ansible-core211||2022-12-31|Has expired: Depends on expired security/py-pycrypto
 sysutils/ansible4||2022-12-31|Has expired: Depends on expired security/py-pycrypto (via sysutils/py-ansible-core211)
 security/py-pycrypto|security/py-pycryptodome|2022-12-31|Has expired: Unmaintained, obsolete, and contains security vulnerabilities. Use security/py-pycryptodome instead
 ports-mgmt/chucky||2023-01-01|Has expired: Uses the obsoleted reeBSD tag
 sysutils/beats6||2023-01-01|Has expired: No longer maintained and supported
 sysutils/logstash6||2023-01-01|Has expired: No longer maintained and supported
 textproc/elasticsearch6||2023-01-01|Has expired: No longer maintained and supported
 japanese/ja-tex-xdvik|print/tex-xdvik|2023-01-02|pTeX support has been integrated
 math/cvc4|math/cvc5|2023-01-03|CVC4 was succeeded by CVC5
 math/cvc3|math/cvc5|2023-01-04|CVC3 was succeeded by CVC4 and CVC5
 devel/caf|devel/actor-framework|2023-01-08|Merge duplicates into devel/actor-framework that is a full software name
 net/nebula|security/nebula|2023-01-09|Remove duplicate
 security/kc24|security/kc|2023-01-13|kc24 was a transient package to easy database migration. Rename to original name
 devel/llvm70||2023-01-15|Removed old llvm ports
 devel/llvm80||2023-01-15|Removed old llvm ports
 devel/llvm90||2023-01-15|Removed old llvm ports
 devel/android-tools-simpleperf||2023-01-15|Depends on removed old llvm ports
 devel/f18||2023-01-15|Depends on removed old llvm ports
 devel/xtoolchain-llvm80||2023-01-15|Depends on removed old llvm ports
 devel/xtoolchain-llvm90||2023-01-15|Depends on removed old llvm ports
 net-p2p/tootle|net-p2p/tooth|2023-01-16|Upstream archived, forked
 irc/cwirc||2023-01-19|Has expired: No upstream, no apparent use seen online
 sysutils/ior|benchmarks/ior|2023-01-20|Moved to a better fit category
 emulators/qemu-guest-agent|emulators/qemu@guestagent|2023-01-20|Seperate port merged with main port as a flavor
 devel/rust-bindgen|devel/rust-bindgen-cli|2023-01-22|Renamed upstream
 graphics/darktable42||2023-01-27|Removed as part of the update of graphics/darktable to 4.2.0
 devel/py-cachecontrol|www/py-cachecontrol|2023-01-29|Remove duplicate added later
 devel/dulwich|devel/py-dulwich|2023-01-29|Add py- prefix
 www/webtrees||2023-01-30|Has expired: Uses obsolete PHP version; use www/webtrees21 instead
 x11-toolkits/libsexy||2023-01-30|Depends on EOLed gtk+20, not depended on in the ports tree
 x11-toolkits/gtkmathview||2023-01-30|Depends on EOLed gtk+20, not depended on in the ports tree
 x11-toolkits/vdk||2023-01-30|Depends on EOLed gtk+20, not depended on in the ports tree
 audio/libgpod-sharp||2023-02-01|Depends on EOLed gtk+20, not depended on in the ports tree
 x11/plasma5-kwayland-server|x11-wm/plasma5-kwin|2023-02-07|Reintegrated into x11-wm/plasma5-kwin
 finance/py-TA-Lib|finance/py-ta-lib|2023-02-12|Remove duplicate port
 x11-toolkits/gnocl||2023-02-13|Fails to build, newer snapshot depends on a removed port
 games/opendungeons||2023-02-14|Has expired: Broken for more than 6 months
 databases/mysql-connector-odbc|databases/mysql-connector-odbc-80|2023-02-18|Has expired: Requires EOLd mysql version
 devel/yaml-cpp03|devel/yaml-cpp|2023-02-21|Used by blender-lts28 which is EOL'd
 sysutils/uutils|sysutils/rust-coreutils|2023-02-22|Request by upstream
 print/harfbuzz-hb-view|print/harfbuzz-cairo|2023-02-23|Match feature and library name
 sysutils/screenfetch-nox11|sysutils/screenfetch@nox11|2023-02-23|Converted to flavor
 editors/r7-office|editors/linux-r7-office|2023-02-25|Follow the naming scheme of Linux ports
 www/mediawiki137||2023-02-28|Has expired: End of life upstream, users are recommended to upgrade to 1.39 or higher
 games/veloren|games/veloren-weekly|2023-03-02|Using releases is currently discouraged upstream
 accessibility/atk|accessibility/at-spi2-core|2023-03-02|Integrated into other package
 accessibility/at-spi2-atk|accessibility/at-spi2-core|2023-03-02|Integrated into other package
 net/tshark|net/wireshark@nox11|2023-03-03|Tshark is now the nox11 flavor of wireshark
 net/tshark-lite|net/wireshark@nox11|2023-03-03|Tshark is now the nox11 flavor of wireshark
 net/wireshark-lite|net/wireshark|2023-03-03|The lite port of wireshark can be controlled with OPTIONS
 lang/gcc-ecj45|java/eclipse-ecj|2023-03-06|Has expired: Long time unsupported upstream, use java/eclipse-ecj instead
 databases/postgresql10-client||2023-03-07|Has expired: PostgreSQL 10 has reached end-of-life
 databases/postgresql10-contrib||2023-03-07|Has expired: PostgreSQL 10 has reached end-of-life
 databases/postgresql10-docs||2023-03-07|Has expired: PostgreSQL 10 has reached end-of-life
 databases/postgresql10-pgtcl||2023-03-07|Has expired: PostgreSQL-10 has reached end-of-life
 databases/postgresql10-plperl||2023-03-07|Has expired: PostgreSQL 10 has reached end-of-life
 databases/postgresql10-plpython||2023-03-07|Has expired: PostgreSQL 10 has reached end-of-life
 databases/postgresql10-pltcl||2023-03-07|Has expired: PostgreSQL 10 has reached end-of-life
 databases/postgresql10-server||2023-03-07|Has expired: PostgreSQL 10 has reached end-of-life
 audio/ximp3||2023-03-09|Has expired: Abandonware and obsolete, uses old decoder library and no ID3v2 support
 devel/libpthread-stubs||2023-03-12|No consumers left and never supported pthread stubs in libc on FreeBSD
 multimedia/mkvtoolnix-nox11|multimedia/mkvtoolnix@nogui|2023-03-13|Converted to flavor
 security/openssl-devel|security/openssl30|2023-03-14|3.0 is not devel, prevent confusion with 3.1
 net-p2p/openethereum||2023-03-15|Has expired: not maintained anymore
 devel/pydio-packr||2023-03-15|Was only used for building www/pydio-cells before, not needed anymore
 math/hs-penrose||2023-03-16|Perose Haskell app is deprecated upstrean, it was rewritten in TypeScript
 devel/rubygem-octicons|misc/rubygem-octicons|2023-03-16|Remove duplicate port
 multimedia/libquicktime-lame||2023-03-18|Abandoned upstream and fails to build with newer versions of FFmpeg, consider using multimedia/ffmpeg
 multimedia/libquicktime||2023-03-18|Abandoned upstream and fails to build with newer versions of FFmpeg, consider using multimedia/ffmpeg
 devel/p5-Net-ZooKeeper||2023-03-19|Has expired: Broken since 2020
 devel/libhyve-remote||2023-03-19|Has expired: Broken since 2020
 chinese/brise||2023-03-19|Has expired: Broken since 2020
 cad/NASTRAN-95||2023-03-19|Has expired: Broken since 2020
 lang/dlv||2023-03-19|Has expired: Broken since 2020
 net/nfs-ganesha-kmod||2023-03-19|Has expired: Broken since 2020
 graphics/py-open3d-python||2023-03-19|Has expired: Broken since 2020
 devel/libzrtpcpp||2023-03-20|Has expired: Broken since 2021
 devel/riscv64-gcc||2023-03-20|Has expired: Unsupported version and users should move to devel/freebsd-gcc12@riscv64
 devel/frama-c||2023-03-20|Has expired: Broken since 2021
 misc/dahdi-kmod||2023-03-20|Has expired: Broken since 2021
 misc/glow||2023-03-20|Has expired: Broken since 2021
 science/fisicalab||2023-03-20|Has expired: Broken since 2021
 sysutils/ioc||2023-03-20|Has expired: Broken since 2021
 sysutils/jobd||2023-03-20|Has expired: Broken since 2021
 sysutils/geomWatch||2023-03-20|Has expired: Broken since 2021
 lang/visualworks||2023-03-20|Has expired: Broken since 2021
 lang/J||2023-03-20|Has expired: Broken since 2021
 net/rsocket-cpp||2023-03-20|Has expired: Broken since 2021
 net/opentracker||2023-03-20|Has expired: Broken since 2021
 dns/py-namebench||2023-03-20|Has expired: Broken since 2021
 databases/libgda5-mdb||2023-03-20|Has expired: Broken since 2021
 games/flightgear-terragear||2023-03-20|Has expired: Broken since 2021
 textproc/py-rstfmt||2023-03-20|Has expired: Broken since 2021
 graphics/rubygem-objectdetect||2023-03-20|Has expired: Broken since 2021
 graphics/p5-Image-ObjectDetect||2023-03-20|Has expired: Broken since 2021
 science/dcl||2023-03-20|Has expired: Broken since 2021
 graphics/gimp-gmic-plugin||2023-03-21|Has expired: Broken since 2021
 science/InsightToolkit521|science/InsightToolkit|2023-03-21|Retire InsightToolkit521: it was there only to support graphics/elastix
 sysutils/etcupdate||2023-03-21|Part of the base system since FreeBSD 10.0
 devel/freebsd-gcc6||2023-03-22|No longer able to build base system, use GCC 9 or later instead
 net/rubygem-gitlab-omniauth-openid-connect|net/rubygem-omniauth_openid_connect|2023-03-22|Obsolete use net/rubygem-omniauth_openid_connect instead
 japanese/mutt-devel||2023-03-25|Has expired: Broken since 2019
 audio/amarok||2023-03-31|Has expired: No longer actively maintained upstream
 audio/cd2mp3||2023-03-31|Has expired: Depends on deprecated port audio/dagrab, consider using audio/abcde or audio/cyanrip
 audio/cmp3||2023-03-31|Has expired: Abandonware, no development in 20 years. Please consider using audio/cmus or audio/musicpd
 audio/cpige||2023-03-31|Has expired: Doesn't work, newer versions also fails
 audio/crip||2023-03-31|Has expired: Abandonware, last release in 2007. Please consider using audio/cyanrip or audio/abcde
 audio/cue2toc||2023-03-31|Has expired: Abandonware and unmaintained, please consider using audio/cuetools or sysutils/cdrdao
 audio/dagrab||2023-03-31|Has expired: Abandonware and superseded by audio/cdparanoia
 audio/dekagen||2023-03-31|Has expired: Abandonware, last release in 2004. Please consider using audio/cyanrip or audio/abcde
 audio/gervill||2023-03-31|Has expired: Integrated as of JDK6
 audio/id3ed||2023-03-31|Has expired: Abandonware and obsolete, doesn't support ID3v2 tagging
 audio/id3ren||2023-03-31|Has expired: Abandonware and obsolete, doesn't support ID3v2 tagging
 audio/kexis||2023-03-31|Has expired: Abandonware, niche format that never got any traction and no release in 18 years. Consider using audio/flac or audio/wavpack instead
 audio/libworkman||2023-03-31|Has expired: Abandonware, no development in 20+ years
 audio/mp3c||2023-03-31|Has expired: Abandonware, last release in 2009. Please consider using audio/cyanrip or audio/abcde
 audio/soundkonverter||2023-03-31|Has expired: Unsupported upstream, consider using audio/cyanrip or audio/abcde (ripping CDs), audio/rsgain (ReplayGain scanning) and multimedia/ffmpeg (transcoding)
 audio/splaytk||2023-03-31|Has expired: Abandonware, no development in 20 years and uses obsolete decoding library
 audio/splay||2023-03-31|Has expired: Abandonware, no development in 20 years and uses obsolete decoding library
 audio/tagtool||2023-03-31|Has expired: Abandonware and obsolete, doesn't properly support ID3v2 tagging
 audio/vo-aacenc||2023-03-31|Has expired: Obsolete AAC encoder library, consider using audio/fdk-aac or audio/exhale
 audio/wav2cdr||2023-03-31|Has expired: Obsolete utility, consider using multimedia/ffmpeg
 databases/mongodb36-tools|databases/mongodb40-tools|2023-03-31|Has expired: Upstream EOL reached on 2021-04-30
 databases/mongodb36|databases/mongodb40|2023-03-31|Has expired: Upstream EOL reached on 2021-04-30
 databases/mysql-connector-c||2023-03-31|Has expired: C Connector is included in mysql packages since 5.6
 deskutils/horde-groupware||2023-03-31|Has expired: Requires php74
 devel/horde-whups||2023-03-31|Has expired: Requires php74
 devel/phpunit6||2023-03-31|Has expired: End of Life since February 1, 2019
 devel/phpunit7||2023-03-31|Has expired: End of Life since February 7, 2020
 emulators/pcsxr||2023-03-31|Has expired: Abandoned upstream and no development in 5+ years, consider using games/retroarch
 games/acm||2023-03-31|Has expired: Abandoned upstream. Does not work
 mail/horde-webmail||2023-03-31|Has expired: Requires php74
 multimedia/dvdrip||2023-03-31|Has expired: Depends on broken transcode port
 multimedia/mkxvcd||2023-03-31|Has expired: Depends on broken transcode port
 multimedia/win32-codecs||2023-03-31|Has expired: Obsolete and users are recommended to utilize ffmpeg instead
 net/minisapserver||2023-03-31|Has expired: Obsolete utility, functionality is now included in multimedia/vlc
 news/nntpcache||2023-03-31|Has expired: Upstream site no longer available
 ports-mgmt/p5-FreeBSD-Portindex||2023-03-31|Has expired: Not working, and no fix forthcoming
 print/ghostscript9-x11||2023-03-31|Has expired: Released over 10 years ago and unsupported by upstream, consider print/ghostscript9-agpl-x11
 print/ghostscript9-base||2023-03-31|Has expired: Released over 10 years ago and unsupported by upstream, consider print/ghostscript9-agpl-base
 security/openscep||2023-03-31|Has expired: Do not support recent RFC 8894
 security/openvpn25|security/openvpn|2023-03-31|Has expired: replaced by new upstream release 2.6.0
 security/portsentry||2023-03-31|Has expired: Abandoned, upstream is dead and last release was back in 2003
 sysutils/relaxconf||2023-03-31|Has expired: Abandonware, last release of RelaxBSD was back in 2006
 textproc/artha||2023-03-31|Has expired: Abandonware, last release in 2012
 x11-wm/i3-gaps||2023-03-31|Has expired: Upstream merged with i3, please switch to x11-wm/i3
 www/horde-wicked||2023-03-31|Has expired: Requires php74
 www/horde-passwd||2023-03-31|Has expired: Requires php74
 www/horde-ansel||2023-03-31|Has expired: Requires php74
 multimedia/subtitleripper||2023-03-31|Has expired: Depends on broken transcode port
 sysutils/disktype||2023-03-31|Has expired: Abandonware, last release in 2006 and no development since
 deskutils/horde-kronolith||2023-03-31|Has expired: Requires php74
 deskutils/horde-mnemo||2023-03-31|Has expired: Requires php74
 deskutils/horde-nag||2023-03-31|Has expired: Requires php74
 ftp/horde-gollem||2023-03-31|Has expired: Requires php74
 mail/horde-imp||2023-03-31|Has expired: Requires php74
 mail/horde-ingo||2023-03-31|Has expired: Requires php74
 mail/horde-turba||2023-03-31|Has expired: Requires php74
 www/horde-trean||2023-03-31|Has expired: Requires php74
 devel/horde-content||2023-03-31|Has expired: Requires php74
 devel/horde-timeobjects||2023-03-31|Has expired: Requires php74
 www/horde-base||2023-03-31|Has expired: Requires php74
 multimedia/transcode||2023-03-31|Has expired: abandoned by upstream and does not build
 security/teleport5|security/teleport|2023-03-31|More recent version than expired teleport port
 www/anyterm||2023-04-01|Has expired: upstream is dead
 audio/mousai-devel|audio/mousai|2023-04-06|Updated to the latest stable version
 multimedia/pHash||2023-04-09|Has expired: No users left in tree and fails to build with FFmpeg 6.0
 devel/py-jsonschema49|devel/py-jsonschema|2023-04-09|Remove obsoleted port. Use devel/py-jsonschema instead
 devel/rubygem-aws-sdk-core3168|devel/rubygem-aws-sdk-core|2023-04-09|Remove obsoleted port. Use devel/rubygem-aws-sdk-core instead
 devel/rubygem-aws-sdk-s31117|devel/rubygem-aws-sdk-s3|2023-04-09|Remove obsoleted port. Use devel/rubygem-aws-sdk-s3 instead
 devel/rubygem-bootsnap111|devel/rubygem-bootsnap|2023-04-09|Remove obsoleted port. Use devel/rubygem-bootsnap instead
 devel/rubygem-bootsnap112|devel/rubygem-bootsnap|2023-04-09|Remove obsoleted port. Use devel/rubygem-bootsnap instead
 devel/rubygem-bootsnap114|devel/rubygem-bootsnap|2023-04-09|Remove obsoleted port. Use devel/rubygem-bootsnap instead
 devel/rubygem-bootsnap115|devel/rubygem-bootsnap|2023-04-09|Remove obsoleted port. Use devel/rubygem-bootsnap instead
 devel/rubygem-cucumber-messages19|devel/rubygem-cucumber-messages|2023-04-09|Remove obsoleted port. Use devel/rubygem-cucumber-messages instead
 devel/rubygem-fugit17|devel/rubygem-fugit|2023-04-09|Remove obsoleted port. Use devel/rubygem-fugit instead
 devel/rubygem-ruby-fogbugz021|devel/rubygem-ruby-fogbugz|2023-04-09|Remove obsoleted port. Use devel/rubygem-ruby-fogbugz instead
 devel/rubygem-sidekiq-cron-sidekiq64|devel/rubygem-sidekiq-cron|2023-04-09|Remove obsoleted port. Use devel/rubygem-sidekiq-cron instead
 devel/rubygem-sidekiq64|devel/rubygem-sidekiq|2023-04-09|Remove obsoleted port. Use devel/rubygem-sidekiq instead
 security/rubygem-openssl221|security/rubygem-openssl|2023-04-09|Remove obsoleted port. Use security/rubygem-openssl instead
 textproc/rubygem-github-markup17|textproc/rubygem-github-markup|2023-04-09|Remove obsoleted port. Use textproc/rubygem-github-markup instead
 textproc/rubygem-loofah218|textproc/rubygem-loofah|2023-04-09|Remove obsoleted port. Use textproc/rubygem-loofah instead
 textproc/rubygem-rouge329|textproc/rubygem-rouge|2023-04-09|Remove obsoleted port. Use textproc/rubygem-rouge instead
 www/rubygem-erubi19|www/rubygem-erubi|2023-04-09|Remove obsoleted port. Use www/rubygem-erubi instead
 multimedia/mythtv-frontend|multimedia/mythtv|2023-04-10|Frontend is no part of multimedia/mythtv
 lang/ruby27|lang/ruby30|2023-04-13|Please migrate to newer versions. Ruby 2.7 will reach its EoL on April 12, 2023
 www/py-requests-futures0|www/py-requests-futures|2023-04-19|Remove obsoleted port. Use www/py-requests-futures instead
 mail/rubygem-mail27|mail/rubygem-mail|2023-04-19|Remove obsoleted port. Use mail/rubygem-mail instead
 science/cdcl||2023-04-21|Has expired: Broken since 2021
 science/rubygem-ruby-dcl||2023-04-21|Has expired: requires deprecated science/cdcl
 net-im/webinar||2023-04-24|Has expired: Requires EOLed electron18
 devel/electron18||2023-04-24|Has expired: EOLed upstream, switch to newer version
 x11/libdmx||2023-04-25|Upstream removed support for Xdmx server
 devel/datovka|mail/datovka|2023-04-25|Move port to proper category
 benchmarks/super-smack||2023-04-30|Has expired: Unfetchable
 www/moodle39||2023-04-30|Has expired: Requires php74 which has been removed from the tree
 sysutils/u-boot-utilite||2023-04-30|Has expired: This port depends on the long time unsupported upstream devel/arm-none-eabi-gcc492
 sysutils/py-psutil121|sysutils/py-psutil|2023-04-30|Has expired: Use sysutils/py-psutil instead
 www/dolibarr13||2023-04-30|Has expired: No support PHP >= 8.x
 www/dolibarr15||2023-04-30|Has expired: No support PHP >= 8.x
 www/dolibarr14||2023-04-30|Has expired: No support PHP >= 8.x
 devel/zpu-gcc||2023-04-30|Has expired: Broken with latest C compiler and port unused
 devel/zpu-binutils||2023-04-30|Has expired: Broken with latest C compiler and port unused
 databases/rocksdb-lite||2023-04-30|Has expired: Removed by upstream, see https://github.com/facebook/rocksdb/commit/4720ba4391eb016b05a30d09a8275624c3a4a87e
 textproc/ltxml||2023-04-30|Has expired: Unfetchable
 graphics/ImageMagick7-nox11|graphics/ImageMagick7|2023-04-30|Flavorized
 graphics/ImageMagick6-nox11|graphics/ImageMagick6|2023-04-30|Flavorized
 security/gpgme-qt5|security/gpgme-qt@qt5|2023-05-02|Flavorized to add Qt6 support
 x11-wm/hyprland-devel|x11-wm/hyprland|2023-05-03|Out of date: use x11-wm/hyprland for now
 emulators/qemu70|emulators/qemu7|2023-05-04|Use emulators/qemu or emulators/qemu-devel
 www/resin3||2023-05-06|Deprecated version, unsupported by upstream for years
 news/py-sabyenc3|news/py-sabctools|2023-05-08|Renamed upstream
 news/sabnzbdplus|news/sabnzbd|2023-05-08|Update to proper upstream name
 graphics/camera||2023-05-08|Has expired: abandoned upstream, does not fetch, website disappeared, unmaintained
 emulators/mess||2023-05-08|Merged into emulators/mame in upstream
 textproc/rubygem-semver_dialects|devel/rubygem-semver_dialects|2023-05-15|Removed duplicated port
 devel/rubygem-ruby-openai|www/rubygem-ruby-openai37|2023-05-16|Moved to match www/rubygem-ruby-openai
 sysutils/rundeck2|sysutils/rundeck3|2023-05-17|Has expired: unmaintained and newer version available in sysutils/rundeck3
 devel/gitklient|devel/kommit|2023-05-17|Renamed upstream
 math/py-python-igraph|math/py-igraph|2023-05-18|Renamed to match upstream naming
 www/py-dj40-django-auth-ldap|www/py-dj41-django-auth-ldap|2023-05-20|Has expired: Extended support of Django 4.0 ends April 2023, upgrade to the Django 4.1+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj40-django-rich|www/py-dj41-django-rich|2023-05-20|Has expired: Extended support of Django 4.0 ends April 2023, upgrade to the Django 4.1+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj40-django-filter|www/py-dj41-django-filter|2023-05-20|Has expired: Extended support of Django 4.0 ends April 2023, upgrade to the Django 4.1+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj40-django-debug-toolbar|www/py-dj41-django-debug-toolbar|2023-05-20|Has expired: Extended support of Django 4.0 ends April 2023, upgrade to the Django 4.1+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj40-django-graphiql-debug-toolbar|www/py-dj41-django-graphiql-debug-toolbar|2023-05-20|Has expired: Extended support of Django 4.0 ends April 2023, upgrade to the Django 4.1+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj40-django-redis|www/py-dj41-django-redis|2023-05-20|Has expired: Extended support of Django 4.0 ends April 2023, upgrade to the Django 4.1+ version of this port. See https://www.djangoproject.com/download/
 devel/py-dj40-django-rq|devel/py-dj41-django-rq|2023-05-20|Has expired: Extended support of Django 4.0 ends April 2023, upgrade to the Django 4.1+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj40-django-cors-headers|www/py-dj41-django-cors-headers|2023-05-20|Has expired: Extended support of Django 4.0 ends April 2023, upgrade to the Django 4.1+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj40-drf-yasg|www/py-dj41-drf-yasg|2023-05-20|Has expired: Extended support of Django 4.0 ends April 2023, upgrade to the Django 4.1+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj40-django-tables2|www/py-dj41-django-tables2|2023-05-20|Has expired: Extended support of Django 4.0 ends April 2023, upgrade to the Django 4.1+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj40-django-taggit|www/py-dj41-django-taggit|2023-05-20|Has expired: Extended support of Django 4.0 ends April 2023, upgrade to the Django 4.1+ version of this port. See https://www.djangoproject.com/download/
 devel/py-dj40-graphene-django|devel/py-dj41-graphene-django|2023-05-20|Has expired: Extended support of Django 4.0 ends April 2023, upgrade to the Django 4.1+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj40-django-mptt|www/py-dj41-django-mptt|2023-05-20|Has expired: Extended support of Django 4.0 ends April 2023, upgrade to the Django 4.1+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj40-django-js-asset|www/py-dj41-django-js-asset|2023-05-20|Has expired: Extended support of Django 4.0 ends April 2023, upgrade to the Django 4.1+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj40-django-prometheus|www/py-dj41-django-prometheus|2023-05-20|Has expired: Extended support of Django 4.0 ends April 2023, upgrade to the Django 4.1+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj40-django-timezone-field|www/py-dj41-django-timezone-field|2023-05-20|Has expired: Extended support of Django 4.0 ends April 2023, upgrade to the Django 4.1+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj40-djangorestframework|www/py-dj41-djangorestframework|2023-05-20|Has expired: Extended support of Django 4.0 ends April 2023, upgrade to the Django 4.1+ version of this port. See https://www.djangoproject.com/download/
 www/py-django40|www/py-django41|2023-05-20|Has expired: Extended support of Django 4.0 ends April 2023, upgrade to a newer version of Django. See https://www.djangoproject.com/download/
 net-p2p/edonkey-tool-hash|net-p2p/ed2k-hash|2023-05-26|Renamed to match upstream naming
 net-im/qxmpp-qt5|net-im/qxmpp|2023-05-26|Port flavorized for Qt 5 and 6
 devel/rubygem-aws-sdk-core3170|devel/rubygem-aws-sdk-core|2023-05-27|Remove obsoleted port. Use devel/rubygem-aws-sdk-core instead
 devel/rubygem-aws-sdk-s31119|devel/rubygem-aws-sdk-s3|2023-05-27|Remove obsoleted port. Use devel/rubygem-aws-sdk-s3 instead
 devel/rubygem-clamp11|devel/rubygem-clamp|2023-05-27|Remove obsoleted port. Use devel/rubygem-clamp instead
 net/rubygem-grpc142|net/rubygem-grpc|2023-05-27|Remove obsoleted port. Use net/rubygem-grpc instead
 net/rubygem-ipaddr122|net/rubygem-ipaddr|2023-05-27|Remove obsoleted port. Use net/rubygem-ipaddr instead
 security/rubygem-doorkeeper562|security/rubygem-doorkeeper|2023-05-27|Remove obsoleted port. Use security/rubygem-doorkeeper instead
 security/rubygem-ed2551912|security/rubygem-ed25519|2023-05-27|Remove obsoleted port. Use security/rubygem-ed25519 instead
 sysutils/rubygem-chef16|sysutils/rubygem-chef|2023-05-27|Remove obsoleted port. Use sysutils/rubygem-chef instead
 sysutils/rubygem-ohai16|sysutils/rubygem-ohai|2023-05-27|Remove obsoleted port. Use sysutils/rubygem-ohai instead
 textproc/rubygem-loofah219|textproc/rubygem-loofah|2023-05-27|Remove obsoleted port. Use textproc/rubygem-loofah instead
 www/rubygem-asana0|www/rubygem-asana|2023-05-27|Remove obsoleted port. Use www/rubygem-asana instead
 www/rubygem-jwt25|www/rubygem-jwt|2023-05-27|Remove obsoleted port. Use www/rubygem-jwt instead
 www/rubygem-webrick17|www/rubygem-webrick|2023-05-27|Remove obsoleted port. Use www/rubygem-webrick instead
 textproc/rtf2html||2023-05-28|Has expired: Abandonware, please use something modern like markdown
 databases/mariadb103-server|databases/mariadb106-server|2023-05-28|Has expired: Use databases/mariadb106-server
 databases/mariadb103-client|databases/mariadb106-client|2023-05-28|Has expired: Use databases/mariadb106-server
 net-mgmt/chronograf||2023-05-28|Has expired: Requires upstream EOL node14
 textproc/opensearch-dashboards13|textproc/opensearch-dashboards|2023-05-28|Has expired: Requires upstream EOL node14
 www/yarn-node14||2023-05-28|Has expired: Requires upstream EOL node14
 www/npm-node14||2023-05-28|Has expired: Requires upstream EOL www/node14
 www/node14||2023-05-28|Has expired: Consider using www/node16 or later as Upstream EOL on 2023-04-30
 security/p5-Net-SAML||2023-05-28|Has expired: Depends on deprecated security/zxid
 security/zxid||2023-05-28|Has expired: Do not build with OpenSSL 1.1.1e and later
 security/keynote||2023-05-28|Has expired: Upstream last release in 2000
 security/esteidfirefoxplugin||2023-05-28|Has expired: Upstream last release in 2013 and has been migrated into other products of upstream
 devel/py-pyxb|devel/py-pyxb-x|2023-05-31|Has expired: Upstream issued End-of-Life notice. Use devel/py-pyxb-x instead
 devel/arm-none-eabi-gcc492|devel/arm-none-eabi-gcc|2023-05-31|Has expired: Long time unsupported upstream
 multimedia/nordlicht||2023-05-31|Has expired: Unmaintained for years upstream and fails to build with FFmpeg 6
 finance/vanitygen||2023-05-31|Has expired: Broken for more than a year and upstream last release was 11 years ago
 net-p2p/qtum||2023-05-31|Has expired: Broken for nearly a year
 sysutils/pam_mount||2023-05-31|Has expired: Requires upstream EOL OpenSSL 1.0.X and linux only libmount which is not available for FreeBSD
 polish/kadu||2023-05-31|Has expired: Upstream website no longer exists, no update on SourceForge
 net-mgmt/zabbix62-agent|net-mgmt/zabbix64-agent|2023-05-31|Has expired: Will reach end of life on 2023-05-31
 net-mgmt/zabbix62-frontend|net-mgmt/zabbix64-frontend|2023-05-31|Has expired: Will reach end of life on 2023-05-31
 net-mgmt/zabbix62-java|net-mgmt/zabbix64-java|2023-05-31|Has expired: Will reach end of life on 2023-05-31
 net-mgmt/zabbix62-proxy|net-mgmt/zabbix64-proxy|2023-05-31|Has expired: Will reach end of life on 2023-05-31
 net-mgmt/zabbix62-server|net-mgmt/zabbix64-server|2023-05-31|Has expired: Will reach end of life on 2023-05-31
 mail/esmtp||2023-05-31|Has expired: Upstream announced that this project is no longer being maintained. See https://esmtp.sourceforge.net/links.html for alternatives
 ftp/ftpmirror||2023-05-31|Has expired: Abandonware
 net-p2p/zetacoin||2023-06-01|Has expired: Broken for nearly a year
 net-p2p/zetacoin-daemon||2023-06-01|Has expired: Broken for nearly a year
 net-p2p/zetacoin-utils||2023-06-01|Has expired: Broken for nearly a year
 sysutils/puppet6|sysutils/puppet7|2023-06-01|Has expired: Puppet 6 has reached EOL
 sysutils/puppetserver6|sysutils/puppetserver7|2023-06-01|Has expired: Puppet 6 has reached EOL
 databases/puppetdb6|databases/puppetdb7|2023-06-01|Has expired: Puppet 6 has reached EOL
 databases/puppetdb-terminus6|databases/puppetdb-terminus7|2023-06-01|Has expired: Puppet 6 has reached EOL
 sysutils/boxbackup-devel||2023-06-01|Has expired: Requires upstream EOL OpenSSL 1.0.X
 www/webstone-ssl||2023-06-01|Has expired: Requires upstream EOL OpenSSL 1.0.X
 sysutils/bareos18-client|sysutils/bareos19-client|2023-06-01|Has expired: Upstream EOL reached on 2020-02-03
 sysutils/bareos18-server|sysutils/bareos19-server|2023-06-01|Has expired: Upstream EOL reached on 2020-02-03
 sysutils/bareos18-traymonitor|sysutils/bareos19-traymonitor|2023-06-01|Has expired: Upstream EOL reached on 2020-02-03
 net-mgmt/nagircbot||2023-06-01|Has expired: Broken for more than a year and fails to build on all supported release
 mail/spamdyke||2023-06-01|Has expired: Broken for more than a year and last upstream release was in 2015
 net/haproxy17||2023-06-03|Has expired: Upstream EOL reached on 2021-03-31
 net/haproxy18||2023-06-03|Has expired: Upstream EOL reached on 2022-12-31
 net-mgmt/send||2023-06-03|Has expired: Implementation is based on older obsolete RFC
 dns/validns||2023-06-03|Has expired: Last upstream release was 10 years ago and last upstream activity in 2017
 sysutils/cfengine319||2023-06-03|Has expired: Upstream EOL reached on 2022-06-30
 sysutils/cfengine-masterfiles319||2023-06-03|Removed, part of expired sysutils/cfengine319
 net-mgmt/nrpe3|net-mgmt/nrpe|2023-06-03|Has expired: Fails to build with recent OpenSSL so use net-mgmt/nrpe
 games/spacezero||2023-06-03|Has expired: broken, abandoned upstream, depends on deprecated gtk2
 net/gnu-dico|net/dico|2023-06-03|Renamed to match upstream naming
 editors/o|editors/orbiton|2023-06-04|Project was renamed upstream
 databases/rubygem-pg14|databases/rubygem-pg|2023-06-05|Remove obsoleted port. Use databases/rubygem-pg instead
 databases/rubygem-redis-namespace18|databases/rubygem-redis-namespace|2023-06-05|Remove obsoleted port. Use databases/rubygem-redis-namespace instead
 devel/poetry|devel/py-poetry|2023-06-05|Remove obsoleted port. Use devel/py-poetry instead
 devel/py-dulwich020|devel/py-dulwich|2023-06-05|Remove obsoleted port. Use devel/py-dulwich instead
 devel/rubygem-aws-sdk-core3171|devel/rubygem-aws-sdk-core|2023-06-05|Remove obsoleted port. Use devel/rubygem-aws-sdk-core instead
 net/rubygem-u2f0|net/rubygem-u2f|2023-06-05|Remove obsoleted port. Use net/rubygem-u2f instead
 security/rubygem-omniauth-cas3-oauth2|security/rubygem-omniauth-cas3|2023-06-05|Remove obsoleted port. Use security/rubygem-omniauth-cas3 instead
 textproc/rubygem-loofah220|textproc/rubygem-loofah|2023-06-05|Remove obsoleted port. Use textproc/rubygem-loofah instead
 www/rubygem-rack227|www/rubygem-rack22|2023-06-05|Remove obsoleted port. Use www/rubygem-rack22 instead
 databases/rubygem-pg13|databases/rubygem-pg|2023-06-05|Remove obsoleted port. Use databases/rubygem-pg instead
 devel/rubygem-fast_gettext1|devel/rubygem-fast_gettext|2023-06-05|Remove obsoleted port. Use devel/rubygem-fast_gettext instead
 devel/rubygem-gettext-setup0|devel/rubygem-gettext-setup|2023-06-05|Remove obsoleted port. Use devel/rubygem-gettext-setup instead
 x11/radare-cutter||2023-06-07|Has expired: Cutter for radare has been discontinued as Cutter has moved to use rizin as their backend framework
 www/py-WebTest|www/py-webtest|2023-06-08|Use lowercase PORTNAME and path
 security/py-sequoia||2023-06-09|Deprecated upstream, broken as based on older dependency
 audio/hvl2wav|audio/ocp|2023-06-10|Has expired: Abandoned upstream, use audio/ocp instead
 x11/thinglaunch|x11/thingylaunch|2023-06-10|Has expired: Abandonware, please use x11/thingylaunch instead
 devel/kiwix-lib|devel/libkiwix|2023-06-12|Renamed to match upstream naming
 sysutils/intel-nvmupdate|sysutils/intel-nvmupdate-40g|2023-06-14|Moved to sysutils/intel-nvmupdate-40g, which is 40G-generation specific port to make space for 10G and 100G generations
 sysutils/intel-qcu|sysutils/intel-epct|2023-06-14|Moved to sysutils/intel-epct
 multimedia/obs-qtwebkit||2023-06-16|Has expired: OBS ships with their own browser plugin from version 25 onwards
 games/tuxmath||2023-06-16|Has expired: Upstream last release was in 2011
 emulators/skyeye||2023-06-17|Has expired: Upstream last release was in 2014
 x11/deforaos-desktop||2023-06-18|Removed, needs expired x11/deforaos-panel
 textproc/apache-solr9|textproc/apache-solr|2023-06-18|New stable release
 games/poker-eval||2023-06-20|Upstream vanished
 graphics/3d-ascii-viewer-c|graphics/3d-ascii-viewer|2023-06-21|Project was renamed upstream
 archivers/libunrar6|archivers/libunrar|2023-06-21|Moved to unversioned origin. Use archivers/libunrar instead
 japanese/font-plemoljp-nfj||2023-06-22|Removed by upstream
 graphics/fotofix||2023-06-23|Has expired: Depends on expired graphics/IPA
 graphics/IPA||2023-06-23|Has expired: Broken since 2021
 security/p5-OpenCA-PKCS7||2023-06-23|Has expired: Depends on expired security/p5-OpenCA-OpenSSL
 security/p5-OpenCA-OpenSSL||2023-06-23|Has expired: Broken since 2021
 security/krb5-118|security/krb5|2023-06-25|Has expired: EOL one year after the release of krb5 1.19
 x11-wm/pager|x11-wm/sawfish-pager|2023-06-27|Renamed to match upstream naming
 lang/python37|lang/python38|2023-06-27|Has expired: Upgrade to a newer Python version. 3.7 is in maintenance status and gets security fixes only. End-of-Life: 2023-06-27. See https://devguide.python.org/versions/
 databases/mysql-q4m||2023-06-30|Has expired: Requires upstream EOL MySQL 5.6
 databases/mysqlbigram||2023-06-30|Has expired: Requires upstream EOL MySQL 5.6
 databases/ateam_mysql_ldap_auth||2023-06-30|Has expired: Requires upstream EOL MySQL 5.6
 databases/mysqlwsrep56-server||2023-06-30|Has expired: Requires upstream EOL MySQL 5.6
 databases/mysql56-server||2023-06-30|Has expired: Upstream support ended in February 2021
 databases/mysql56-client||2023-06-30|Has expired: Upstream support ended in February 2021
 databases/mysac||2023-06-30|Has expired: Requires upstream EOL MySQL 5.6
 www/moodle311||2023-06-30|Has expired: Requires php80 which is set to expire on 2023-11-26
 www/moodle40||2023-06-30|Has expired: Requires php80 which is set to expire on 2023-11-26
 www/yarn-node19||2023-06-30|Has expired: This port depends on deprecated www/node19. Migrate to www/yarn-node18 or www/yarn-node20 instead
 www/npm-node19||2023-06-30|Has expired: This port depends on deprecated www/node19. Migrate to www/npm-node18 or www/npm-node20 instead
 www/node19||2023-06-30|Has expired: Nodejs 19.* will reach its EoL on 2023-06-01. Use Node.js 18.* (www/node18) or 20.* (www/node20) instead
 emulators/qemu6||2023-06-30|Has expired: Version 8 is on the horizon while version 7 is stable
 audio/gbemol||2023-06-30|Has expired: Unmaintained for years and depends on deprecated GTK2
 audio/glurp||2023-06-30|Has expired: Unmaintained for years and depends on deprecated GTK2
 finance/R-cran-ccgarch||2023-06-30|Has expired: Fails to build with R 4.3.0+ and abandoned upstream
 www/redmine42||2023-06-30|Has expired: Broken with all supported Ruby versions
 www/tomcat10|www/tomcat101|2023-06-30|Has expired: EOLd, potential security issues (https://tomcat.apache.org/tomcat-10.0-eol.html), use www/tomcat101 instead
 databases/mongodb40-tools||2023-06-30|Has expired: Upstream EOL reached on 2022-04-30
 databases/mongodb40||2023-06-30|Has expired: Upstream EOL reached on 2022-04-30
 dns/djbdns-tools||2023-06-30|Has expired: No longer compliant with current DNS standards and source code hasn't been centrally managed for over 20 years
 dns/djbdns||2023-06-30|Has expired: No longer compliant with current DNS standards and source code hasn't been centrally managed for over 20 years
 dns/libdjbdns||2023-06-30|Has expired: No longer compliant with current DNS standards and source code hasn't been centrally managed for over 20 years
 sysutils/mcollective-actionpolicy-auth||2023-06-30|Has expired: Depends on broken sysutils/mcollective
 sysutils/mcollective-nrpe-client||2023-06-30|Has expired: Depends on broken sysutils/mcollective
 sysutils/mcollective-puppet-agent||2023-06-30|Has expired: Depends on broken sysutils/mcollective
 sysutils/mcollective-puppet-client||2023-06-30|Has expired: Depends on broken sysutils/mcollective
 sysutils/mcollective-nettest-client||2023-06-30|Has expired: Depends on broken sysutils/mcollective
 sysutils/mcollective-nettest-agent||2023-06-30|Has expired: Depends on broken sysutils/mcollective
 sysutils/mcollective-service-agent||2023-06-30|Has expired: Depends on broken sysutils/mcollective
 sysutils/mcollective-service-client||2023-06-30|Has expired: Depends on broken sysutils/mcollective
 sysutils/mcollective-shell-client||2023-06-30|Has expired: Depends on broken sysutils/mcollective
 sysutils/mcollective-shell-agent||2023-06-30|Has expired: Depends on broken sysutils/mcollective
 sysutils/mcollective-nrpe-agent||2023-06-30|Has expired: Depends on broken sysutils/mcollective
 sysutils/mcollective-nrpe-common||2023-06-30|Has expired: Depends on broken sysutils/mcollective
 sysutils/mcollective-service-common||2023-06-30|Has expired: Depends on broken sysutils/mcollective
 sysutils/mcollective-puppet-common||2023-06-30|Has expired: Depends on broken sysutils/mcollective
 sysutils/mcollective-nettest-common||2023-06-30|Has expired: Depends on broken sysutils/mcollective
 sysutils/mnrpes||2023-06-30|Has expired: Depends on broken sysutils/mcollective
 sysutils/mcollective||2023-06-30|Has expired: Broken with all supported Ruby versions
 databases/mariadb104-server||2023-06-30|Has expired: Use databases/mariadb106-server
 databases/mariadb104-client||2023-06-30|Has expired: Use databases/mariadb106-client
 dns/mydns-ng||2023-06-30|Has expired: Abandonware, last release in 2010. Consider migrating to dns/powerdns
 dns/mydns||2023-06-30|Has expired: Abandonware, last release in 2006. Consider migrating to dns/powerdns
 net/opal||2023-06-30|Has expired: Very outdated, current version in tree was released back in 2013 and upstream is still active
 math/R-cran-RHmm||2023-06-30|Has expired: Fails to build with R 4.3.0+ and abandoned upstream
 databases/py-caterva||2023-06-30|Has expired: Use archivers/py-blosc2 instead. All the features of Python-Caterva have been included in the Python-Blosc2 NDArray object
 net-im/purple-hangouts||2023-06-30|Has expired: Google Hangouts discontinued 2022-11-01, data deleted 2023-01-01
 dns/ares||2023-06-30|Has expired: Deprecated upstream as of March 12, 2023
 security/rubygem-omniauth-cas3||2023-06-30|Has expired: Deprecated by upstream. The repository has been archived by the owner on Aug 23, 2022
 graphics/ikona||2023-06-30|Has expired: abandoned upstream, broken
 multimedia/vdr-plugin-osdteletext||2023-06-30|Has expired: Depends on abandoned fork of VDR
 multimedia/vdr-plugin-wirbelscan||2023-06-30|Has expired: Depends on abandoned fork of VDR
 multimedia/vdr-plugin-control||2023-06-30|Has expired: Depends on abandoned fork of VDR
 multimedia/vdr-plugin-markad||2023-06-30|Has expired: Depends on abandoned fork of VDR
 multimedia/vdr-plugin-iptv||2023-06-30|Has expired: Depends on abandoned fork of VDR
 multimedia/vdr-plugin-femon||2023-06-30|Has expired: Depends on abandoned fork of VDR
 multimedia/vdr-plugin-sleeptimer||2023-06-30|Has expired: Depends on abandoned fork of VDR
 multimedia/vdr-plugin-remote||2023-06-30|Has expired: Depends on abandoned fork of VDR
 multimedia/vdr-plugin-infosatepg||2023-06-30|Has expired: Depends on abandoned fork of VDR
 multimedia/vdr-plugin-reelchannelscan||2023-06-30|Has expired: Depends on abandoned fork of VDR
 multimedia/vdr-plugin-extrecmenu||2023-06-30|Has expired: Depends on abandoned fork of VDR
 multimedia/vdr-plugin-vdrmanager||2023-06-30|Has expired: Depends on abandoned fork of VDR
 multimedia/vdr-plugin-vnsiserver||2023-06-30|Has expired: Depends on abandoned fork of VDR
 multimedia/vdr-plugin-xvdr||2023-06-30|Has expired: Depends on abandoned fork of VDR
 multimedia/vdr-plugins||2023-06-30|Has expired: Depends on abandoned fork of VDR
 multimedia/vdr-plugin-eepg||2023-06-30|Has expired: Depends on abandoned fork of VDR
 multimedia/vdr-plugin-xineliboutput||2023-06-30|Has expired: Depends on abandoned fork of VDR
 multimedia/vdr||2023-06-30|Has expired: Abandoned "work in progress" fork in 2015
 multimedia/vdr-plugin-osdpip||2023-06-30|Has expired: Depends on abandoned fork of VDR
 multimedia/vdr-plugin-epgsearch||2023-06-30|Has expired: Depends on abandoned fork of VDR
 multimedia/vdr-plugin-streamdev||2023-06-30|Has expired: Depends on abandoned fork of VDR
 www/vdr-plugin-live||2023-06-30|Has expired: Depends on abandoned fork of VDR
 multimedia/vdr-plugin-skinenigmang||2023-06-30|Has expired: Depends on abandoned fork of VDR
 multimedia/vdr-plugin-ttxtsubs||2023-06-30|Has expired: Depends on abandoned fork of VDR
 audio/pulseeffects||2023-06-30|Has expired: Broken for almost a year and abandoned upstream
 audio/libgroove||2023-06-30|Has expired: Fails to build with FFmpeg 6 and very little activity upstream
 multimedia/py-mlt6||2023-06-30|Has expired: Deprecated and unsupported upstream, please consider using multimedia/mlt7 instead
 multimedia/mlt6-qt5|multimedia/mlt7-qt|2023-06-30|Has expired: Deprecated and unsupported upstream, please consider using multimedia/mlt7 instead
 multimedia/mlt6|multimedia/mlt7|2023-06-30|Has expired: Deprecated and unsupported upstream, please consider using multimedia/mlt7 instead
 devel/electron19||2023-06-30|Has expired: EOLed upstream, switch to newer version
 devel/electron21||2023-06-30|Has expired: EOLed upstream, switch to newer version
 devel/ccache-memcached||2023-06-30|Has expired: Unmaintained fork that targets a very old version of ccache
 devel/ccache-memcached-static||2023-06-30|Has expired: Unmaintained fork that targets a very old version of ccache
 devel/libdlna||2023-06-30|Has expired: Abandonware, development discontinued
 textproc/rubygem-ferret||2023-06-30|Has expired: Broken with all supported Ruby versions
 databases/py-pg8000-112|databases/py-pg8000|2023-06-30|Has expired: EOLd, use www/py-pg8000 instead
 databases/caterva|archivers/c-blosc2|2023-06-30|Has expired: Use archivers/c-blosc2 instead. All the features of Caterva have been included in the C-Blosc2 NDim object
 print/ghostscript7-base||2023-06-30|Has expired: Obsolete and unsupported upstream, consider using a more recent version
 print/ghostscript7-commfont||2023-06-30|Has expired: Obsolete and unsupported upstream
 print/ghostscript7-korfont||2023-06-30|Has expired: Obsolete and unsupported upstream
 print/ghostscript7-x11||2023-06-30|Has expired: Obsolete and unsupported upstream
 print/ghostscript7-jpnfont||2023-06-30|Has expired: Obsolete and unsupported upstream
 print/ghostscript8-base||2023-06-30|Has expired: Obsolete and unsupported upstream, consider using a more recent version
 print/ghostscript8-x11||2023-06-30|Has expired: Obsolete and unsupported upstream
 textproc/py-transifex-client|textproc/go-transifex-client|2023-06-30|Has expired: Upstream switched to go based api client (textproc/go-transifex-client)
 devel/google-cloud-cpp117|devel/google-cloud-cpp|2023-07-01|Has expired: Newer version is in the tree
 math/py-gmpy|math/py-gmpy2|2023-07-01|Has expired: EOLd, use math/py-gmpy2 instead
 security/openssl_tpm_engine||2023-07-02|Has expired: Requires older openssl and upstream unmaintained since 2017
 www/kristall||2023-07-02|Has expired: Requires older openssl
 sysutils/cfengine-masterfiles318||2023-07-02|Has expired: Expire one year after cfengine-masterfiles 3.19.0 released
 sysutils/cfengine318||2023-07-02|Has expired: Expire one year after cfengine 3.19.0 released
 devel/linux-c7-dbus-glib||2023-07-02|Merged into devel/linux-c7-dbus-libs
 net/nuster||2023-07-08|Has expired: Does not support OpenSSL 3 and upstream last release was in 2020
 devel/godot2-tools|devel/godot-tools|2023-07-08|Has expired: Requires legacy OpenSSL 1.1.1 so use devel/godot
 devel/rubygem-aws-sdk-core3172|devel/rubygem-aws-sdk-core|2023-07-09|Remove obsoleted port. Use devel/rubygem-aws-sdk-core instead
 devel/rubygem-aws-sdk-s31122|devel/rubygem-aws-sdk-s3|2023-07-09|Remove obsoleted port. Use devel/rubygem-aws-sdk-s3 instead
 devel/rubygem-google-protobuf322|devel/rubygem-google-protobuf|2023-07-09|Remove obsoleted port. Use devel/rubygem-google-protobuf instead
 devel/rubygem-grape15|devel/rubygem-grape|2023-07-09|Remove obsoleted port. Use devel/rubygem-grape instead
 textproc/rubygem-nokogiri114|textproc/rubygem-nokogiri|2023-07-09|Remove obsoleted port. Use textproc/rubygem-nokogiri instead
 graphics/gmic-qt@krita|graphics/krita-gmic-plugin|2023-07-14|Forked to a seperate project
 devel/capstone5|devel/capstone|2023-07-15|Keep the latest version without any pkgnamesufix
 games/naev-data||2023-07-15|Remove obsoleted port. Now games/naev installs data files
 graphics/pecl-imagick-im7|graphics/pecl-imagick|2023-07-19|Merged into master port
 x11-toolkits/fox14||2023-07-27|Has expired: Obsolete leaf port, use x11-toolkits/fox(16,17) instead
 x11-wm/cage-devel|x11-wm/cage|2023-07-27|Out of date: use x11-wm/cage for now
 misc/py-anndata|devel/py-anndata|2023-07-30|Removed duplicate
 games/cockatrice||2023-07-31|Has expired: Upstream releases haven't occured for multiple years and will require a new portbuild
 graphics/blender-lts29||2023-07-31|Has expired: Deprecated upstream
 x11-fm/wcmcommander||2023-07-31|Has expired: Abandoned upstream
 x11/cde-24|x11/cde-25|2023-08-01|Has expired: Desupported by upstream
 lang/go118||2023-08-04|Upstream support ended
 devel/hhdate|devel/date|2023-08-05|Dedup library
 x11-toolkits/wlinfo||2023-08-10|Redundant with wayland-info from graphics/wayland-utils
 www/bareos18-webui|www/bareos19-webui|2023-08-16|Has expired
 sysutils/devcpu-data-amd|sysutils/cpu-microcode-amd|2023-08-16|Reorganize CPU microcode ports
 sysutils/devcpu-data-intel|sysutils/cpu-microcode-intel|2023-08-16|Reorganize CPU microcode ports
 devel/py-python-Levenshtein|devel/py-Levenshtein|2023-08-17|Rename to match upstream
 devel/py-jaraco||2023-08-21|Remove obsoleted port
 security/rubygem-openssl2|security/rubygem-openssl|2023-08-21|Remove obsoleted port. Use security/rubygem-openssl instead
 games/cataclysm-dda-tiles|games/cataclysm-dda@tiles|2023-08-22|Moved to a flavored version
 devel/lua-language-server||2023-08-22|Has expired: Versions after 3.6.9 dump core (and do not compile)
 security/py-netbox-secretstore|security/py-netbox-secrets|2023-08-22|Has expired: No longer maintained by upstream, not compatible with NetBox 3.5, please migrate to security/py-netbox-secrets
 benchmarks/dbs||2023-08-22|Has expired: Broken on all supported releases for more than an year
 databases/virtuoso||2023-08-22|Has expired: Broken on all supported FreeBSD releases for more than an year
 sysutils/muse||2023-08-22|Has expired: Broken on all supported FreeBSD releases for more than an year
 devel/py-pytest-freezegun|devel/py-pytest-freezer|2023-08-22|Has expired: Use devel/py-pytest-freezer as upstream is unmaintained
 multimedia/QtAV||2023-08-22|Has expired: Abandoned project and broken with FFmpeg 6
 mail/vmailmgr||2023-08-22|Has expired: Last upstream release was in 2005 and upstream points to different site
 irc/komanda-cli||2023-08-25|Has expired: Upstream no longer maintained
 irc/birch||2023-08-25|Has expired: Upstream no longer maintained
 net-im/6cord||2023-08-25|Has expired: Upstream no longer maintained
 devel/py-gpep517||2023-08-26|Remove obsoleted port. It is no longer needed after Python 3.7 removal
 devel/py-rapidfuzz2|devel/py-rapidfuzz|2023-08-26|Remove obsoleted port. Use devel/py-rapidfuzz instead
 devel/py-z3c.batching||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-z3c.zcmlhook||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zc.buildout||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-z3c.autoinclude||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.dottedname||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.app.basicskin||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.app.renderer||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.app.schema||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.broken||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.browserresource||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.cachedescriptors||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.contentprovider||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.copy||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.datetime||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.deferredimport||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.filerepresentation||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.generations||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.lifecycleevent||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.processlifetime||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.sequencesort||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.size||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.tales||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-five.globalrequest||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.globalrequest||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.traversing||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.publisher||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.browser||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.contenttype||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.testing||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.exceptions||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 devel/py-zope.i18n||2023-08-27|Remove leaf zope ports that have no sencse in absence of zope itself
 devel/py-zope.location||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 textproc/py-zope.structuredtext||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 textproc/py-zope.tal||2023-08-27|Remove leaf zope ports that have no sense in absence of zope itself
 databases/mysql-connector-java|databases/mysql-connector-j|2023-08-27|Following rename with upstream
 deskutils/kalendar|deskutils/merkuro|2023-08-28|Renamed upstream
 www/joomla3|www/joomla4|2023-08-30|Has expired: EOL upstream
 sysutils/llama|sysutils/walk|2023-08-31|Renamed to match upstream naming
 devel/py-typed-ast||2023-08-31|Has expired: This project is no longer maintained. Use the standard library ast module instead
 devel/py-retype||2023-08-31|Has expired: This project is no longer supported/maintained
 ports-mgmt/parfetch-overlay||2023-08-31|Has expired: Unmaintained
 cad/py-cq-editor||2023-09-01|Has expired: Depends on expiring cad/py-cadquery
 cad/py-cadquery||2023-09-01|Has expired: Depends on exppired cad/py-ocp
 www/squid-devel||2023-09-01|Has expired: Not used anymore to create rc-state releases
 databases/rubygem-red-plasma||2023-09-04|Remove deprecated port. red-plasma is deprecated since 10.0.0. red-plasma will not be released from Apache Arrow 12.0.0 or so
 devel/rubygem-cucumber-cucumber-expressions15|devel/rubygem-cucumber-cucumber-expressions|2023-09-04|Remove obsoleted port. Use devel/rubygem-cucumber-cucumber-expressions instead
 devel/rubygem-cucumber-messages18|devel/rubygem-cucumber-messages|2023-09-04|Remove obsoleted port. Use devel/rubygem-cucumber-messages instead
 textproc/rubygem-cucumber-gherkin23|textproc/rubygem-cucumber-gherkin|2023-09-04|Remove obsoleted port. Use textproc/rubygem-cucumber-gherkin instead
 textproc/rubygem-cucumber-html-formatter19|textproc/rubygem-cucumber-html-formatter|2023-09-04|Remove obsoleted port. Use textproc/rubygem-cucumber-html-formatter instead
 cad/py-ocp||2023-09-05|Has expired: Broken since 2021
 sysutils/bacula11-libs3|sysutils/bacula-libs3|2023-09-10|No reason to have version in the port name. Works with 11 and 13
 www/transmission-web|net-p2p/transmission-components@daemon|2023-09-10|Moved to the daemon flavor
 devel/rubygem-cucumber-tag-expressions4|devel/rubygem-cucumber-tag-expressions|2023-09-11|Remove obsoleted port. Use devel/rubygem-cucumber-tag-expressions instead
 security/rosenpass|net/rosenpass|2023-09-12|Remove duplicate port
 dns/tinystats||2023-09-20|Has expired: djbdns got removed, port is no longer required
 mail/cyrus-imapd23||2023-09-20|Has expired: No longer supported by upstream
 mail/cyrus-imapd24||2023-09-20|Has expired: No longer supported by upstream
 net/py-python-ceilometerclient||2023-09-22|Remove obsoleted port. This project is no longer maintained
 sysutils/rundeck3|sysutils/rundeck|2023-09-23|Rename to avoid confusion
 games/weebsay||2023-09-26|Has expired: API server is no longer functional
 devel/rubygem-mustache0|devel/rubygem-mustache|2023-09-27|Has expired: Use devel/mustache
 sysutils/rsfetch||2023-09-27|Has expired: Upstream unmaintained
 sysutils/sysrc||2023-09-27|Has expired: Migrated into src
 deskutils/budgie-trash-applet||2023-09-29|Has expired: Merged into newer x11/budgie-desktop >= 10.8
 x11-fonts/sourcecodepro-ttf|x11-fonts/source-code-pro-ttf|2023-09-30|Move x11-fonts/sourcecodepro-ttf to x11-fonts/source-code-pro-ttf
 x11-fonts/sourceserifpro-ttf|x11-fonts/source-serif-ttf|2023-09-30|Move x11-fonts/sourceserifpro-ttf to x11-fonts/source-serif-ttf
 www/pserv||2023-09-30|Has expired: Abandonware, last release in 2005. Consider migrating to www/apache24 , www/lighttpd or www/nginx
 www/polipo||2023-09-30|Has expired: No longer maintained upstream
 audio/aacgain||2023-09-30|Has expired: Obsolete way of handling volume adjustment, consider using audio/rsgain
 audio/ample||2023-09-30|Has expired: Abandonware, last release over 19 years ago
 audio/ccaudio2||2023-09-30|Has expired: Abandonware, no development since 2011
 audio/libtremor||2023-09-30|Has expired: Obsolete, we only support hardware with a fpu and other decoding libraries offer better performance
 audio/rioutil||2023-09-30|Has expired: Obsolete, supported hardware ia about 20 years old
 audio/waveplay||2023-09-30|Has expired: Abandoned upstream
 databases/mongodb42-tools||2023-09-30|Has expired: Upstream EOL reached on 2023-04-30
 databases/mongodb42|databases/mongodb44|2023-09-30|Has expired: Upstream EOL reached on 2023-04-30
 databases/redis6|databases/redis62|2023-09-30|Has expired: Has reached its EoL. Please migrate to newer version
 devel/capstone3|devel/capstone4|2023-09-30|Has expired: Use more recent upstream version from devel/capstone
 devel/directfb||2023-09-30|Has expired: Last upstream release was in 2015
 devel/electron23|devel/electron24|2023-09-30|Has expired: EOLed upstream, switch to newer version
 devel/libtar||2023-09-30|Has expired: Abandonware since 2013 and multiple CVEs over the years
 devel/pear-htmlpurifier||2023-09-30|Has expired: Unfetchable as the pear channel no longer works
 devel/pear-channel-htmlpurifier.org||2023-09-30|Has expired: PEAR Channel is no longer functional
 devel/pmdk||2023-09-30|Has expired: FreeBSD has been deprecated since 1.13.X and support has been dropped on 2.0
 graphics/povray36|graphics/povray37|2023-09-30|Has expired: No longer supported upstream; use POV-Ray 3.7 instead
 lang/onyx||2023-09-30|Has expired: Requires deprecated cook port
 lang/perl5.32|lang/perl5.34|2023-09-30|Has expired: Support ends three years after .0 release. Please upgrade to a more recent version of Perl
 mail/qtools||2023-09-30|Has expired: Upstream last activity in 2003
 math/djbfft||2023-09-30|Has expired: Abandonware, slow and untouched by upstream for over 20 years
 math/py-matplotlib2|math/py-matplotlib|2023-09-30|Has expired: Upstream support ended in 2020 and do not support python3 versions existing on the tree
 net-im/kde-telepathy||2023-09-30|Has expired: Will not be part of KDE Gear 23.08 in August
 net/easysoap||2023-09-30|Has expired: Last release was in 2006
 net-im/ktp-accounts-kcm||2023-09-30|Has expired: Will not be part of KDE Gear 23.08 in August
 net-im/ktp-approver||2023-09-30|Has expired: Will not be part of KDE Gear 23.08 in August
 net-im/ktp-auth-handler||2023-09-30|Has expired: Will not be part of KDE Gear 23.08 in August
 net-im/ktp-call-ui||2023-09-30|Has expired: Will not be part of KDE Gear 23.08 in August
 net-im/ktp-contact-runner||2023-09-30|Has expired: Will not be part of KDE Gear 23.08 in August
 net-im/ktp-desktop-applets||2023-09-30|Has expired: Will not be part of KDE Gear 23.08 in August
 net-im/ktp-kded-module||2023-09-30|Has expired: Will not be part of KDE Gear 23.08 in August
 net-im/ktp-send-file||2023-09-30|Has expired: Will not be part of KDE Gear 23.08 in August
 net-im/ktp-text-ui||2023-09-30|Has expired: Will not be part of KDE Gear 23.08 in August
 net-im/ktp-contact-list||2023-09-30|Has expired: Will not be part of KDE Gear 23.08 in August
 net-im/ktp-filetransfer-handler||2023-09-30|Has expired: Will not be part of KDE Gear 23.08 in August
 net-im/ktp-common-internals||2023-09-30|Has expired: Will not be part of KDE Gear 23.08 in August
 net/openldap24-client|net/openldap25-client|2023-09-30|Has expired: No longer supported by upstream.  Please use a newer version of OpenLDAP instead
 net/openldap24-server|net/openldap25-server|2023-09-30|Has expired: No longer supported by upstream.  Please use a newer version of OpenLDAP instead
 science/crf++||2023-09-30|Has expired: Last upstream activity was in 2015
 security/fwbuilder||2023-09-30|Has expired: Abandonware since Jan 2021
 sysutils/istatserver||2023-09-30|Has expired: Upstream last activity was in 2018
 sysutils/logstash-forwarder||2023-09-30|Has expired: Migrate to sysutils/beats8
 textproc/libextractor||2023-09-30|Has expired: does not compile with exiv2 0.28, and no ports tree users
 www/bareos19-webui|www/bareos20-webui|2023-09-30|Has expired: Upstream EOL reached
 sysutils/bareos19-traymonitor|sysutils/bareos20-traymonitor|2023-09-30|Has expired: Upstream EOL reached
 sysutils/bareos19-client|sysutils/bareos20-client|2023-09-30|Has expired: Upstream EOL reached
 sysutils/bareos19-server|sysutils/bareos20-server|2023-09-30|Has expired: Upstream EOL reached
 textproc/popup||2023-09-30|Has expired: Abandonware, last release in 2004 and dead upstream
 textproc/yamcha||2023-09-30|Has expired: Last upstream release was in 2005
 japanese/awffull||2023-09-30|Has expired: Abandonware, last release in 14+ years ago. Consider using www/awstats
 www/dhttpd||2023-09-30|Has expired: Abandonware, last release in 15+ years ago. Consider using www/darkhttpd, www/obhttpd or www/miniserve
 www/drupal8|www/drupal9|2023-09-30|Has expired: Upstream EOL reached on 2021-11-17
 www/fnord||2023-09-30|Has expired: Deprecated upstream, consider using www/apache24, www/lighttpd or www/nginx
 www/grafana8|www/grafana9|2023-09-30|Has expired: EOLed upstream
 www/mediawiki138|www/mediawiki139|2023-09-30|Has expired: end of life upstream
 www/awffull||2023-09-30|Has expired: Abandonware, last release in 14+ years ago. Consider using www/awstats
 textproc/raptor||2023-09-30|Has expired: No new release in 10+ years and superseded by 2.0-branch, consider using textproc/raptor2
 devel/php-composer2|devel/php-composer|2023-09-30|Port for newer version moved over old EOL version port
 net-p2p/transmission-cli|net-p2p/transmission-components@cli|2023-09-30|Moved for metaport
 net-p2p/transmission-daemon|net-p2p/transmission-components@daemon|2023-09-30|Moved for metaport
 net-p2p/transmission-gtk|net-p2p/transmission-components@gtk|2023-09-30|Moved for metaport
 net-p2p/transmission-qt|net-p2p/transmission-components@qt|2023-09-30|Moved for metaport
 net-p2p/transmission-utils|net-p2p/transmission-components@utils|2023-09-30|Moved for metaport
 databases/percona-pam-for-mysql||2023-10-01|Has expired: Upstream EOL reaches on 2023-10-01
 databases/percona57-pam-for-mysql||2023-10-01|Has expired: Upstream EOL reaches on 2023-10-01
 databases/percona57-server||2023-10-01|Has expired: Upstream EOL reaches on 2023-10-01
 databases/percona57-client||2023-10-01|Has expired: Upstream EOL reaches on 2023-10-01
 sysutils/nfs-over-tls||2023-10-01|Has expired: All supported releases of FreeBSD include this in base
 x11/antimicro|x11/antimicrox|2023-10-01|Has expired: Replaced by x11/antimicrox upstream no longer maintained
 security/krb5-appl||2023-10-01|Has expired: Desupported by upstream, uses old ciphers
 sysutils/mstflint-lite|sysutils/mstflint|2023-10-05|Parent port is now lite by default
 net/frr7|net/frr8|2023-10-05|Keeping only the 2 last major branches in port tree
 devel/rubygem-gitlab-license_finder||2023-10-06|Removed
 devel/rubygem-thor10|devel/rubygem-thor|2023-10-06|Removed
 devel/rubygem-gitlab-sidekiq-fetcher||2023-10-06|Removed
 devel/rubygem-aws-sdk-s31126|devel/rubygem-aws-sdk-s3|2023-10-06|Use devel/rubygem-aws-sdk-s3
 devel/rubygem-aws-sdk-core3175|devel/rubygem-aws-sdk-core|2023-10-06|Use devel/rubygem-aws-sdk-core
 devel/gitlab-metrics-exporter||2023-10-06|Removed
 net/rubygem-octokit5|net/rubygem-octokit|2023-10-06|Use net/rubygem-octokit
 games/minilens||2023-10-08|Has expired: Depends on expired devel/godot2 (use devel/godot instead)
 games/tanks-of-freedom||2023-10-08|Has expired: Depends on expired devel/godot2 (use devel/godot instead)
 devel/godot2|devel/godot|2023-10-08|Has expired: Requires legacy OpenSSL 1.1.1 so use devel/godot
 devel/py-jupyter-server-ydoc|devel/py-jupyter-collaboration|2023-10-11|Remove obsoleted port. Use devel/py-jupyter-collaboration instead
 devel/py-packaging21|devel/py-packaging|2023-10-11|Remove obsoleted port. Use devel/py-packaging instead
 devel/rubygem-google-protobuf323|devel/rubygem-google-protobuf|2023-10-11|Remove obsoleted port. Use devel/rubygem-google-protobuf instead
 audio/rem||2023-10-12|Has expired: Deprecated, replaced by libre
 net/openmpi3|net/openmpi|2023-10-12|Has expired: OpenMPI 3 is not maintained by the upstream project anymore and will be removed
 graphics/tiffgt||2023-10-14|Has expired: Upstream support stopped
 security/openssl30|security/openssl|2023-10-14|Upgrade security/openssl to 3.0
 x11-fonts/gnu-unifont-ttf|x11-fonts/gnu-unifont-otf|2023-10-16|Remove obsoleted port. Use x11-fonts/gnu-unifont-otf instead
 mail/slapd-cyrus||2023-10-20|Has expired: Last upstream release was in 2013
 net/pacemaker1|net/pacemaker2|2023-10-22|Hasn't built in a long time, last upstream release was a while ago, use pacemaker2
 multimedia/subsync|multimedia/ffsubsync|2023-10-22|Project was renamed upstream
 dns/libasr-devel||2023-10-25|Has expired: libasr will be maintained only as part of OpenSMTPD
 dns/libasr||2023-10-25|Has expired: libasr will be maintained only as part of OpenSMTPD
 textproc/xalan-c||2023-10-28|Has expired: Upstream no longer continuing; please consider textproc/libxslt, textproc/qt5-xmlpatterns or SaxonC as potential alternatives
 www/homer|www/homer-web|2023-11-01|Rename port to be consistent with Arch
 textproc/rubygem-yarp|textproc/rubygem-prism|2023-11-01|Remove obsoleted port. Use textproc/rubygem-prism instead
 audio/p5-MIDI|audio/p5-MIDI-Perl|2023-11-01|Move audio/p5-MIDI to audio/p5-MIDI-Perl
 devel/xtoolchain-llvm-devel||2023-11-02|Subsumed into devel/llvm-devel
 net/ceph14||2023-11-02|Has expired: End of life upstream since 2021-06-30
 www/sfnt2woff||2023-11-02|Has expired: Superseded by WOFF 2.0, please consider using devel/woff2
 textproc/kibana7||2023-11-02|Has expired: Depends on EOL NodeJS 16
 devel/electron22|devel/electron24|2023-11-02|Has expired: Depends on EOL NodeJS 16
 www/hedgedoc||2023-11-02|Has expired: Depends on EOL NodeJS 16
 games/libretro-beetle_bsnes|games/libretro-mednafen_bsnes|2023-11-06|Follow naming of libretro-super build script
 games/libretro-beetle_gba|games/libretro-mednafen_gba|2023-11-06|Follow naming of libretro-super build script
 games/libretro-beetle_lynx|games/libretro-mednafen_lynx|2023-11-06|Follow naming of libretro-super build script
 games/libretro-beetle_ngp|games/libretro-mednafen_ngp|2023-11-06|Follow naming of libretro-super build script
 games/libretro-beetle_pce|games/libretro-mednafen_pce|2023-11-06|Follow naming of libretro-super build script
 games/libretro-beetle_pce_fast|games/libretro-mednafen_pce_fast|2023-11-06|Follow naming of libretro-super build script
 games/libretro-beetle_pcfx|games/libretro-mednafen_pcfx|2023-11-06|Follow naming of libretro-super build script
 games/libretro-beetle_saturn|games/libretro-mednafen_saturn|2023-11-06|Follow naming of libretro-super build script
 games/libretro-beetle_supergrafx|games/libretro-mednafen_supergrafx|2023-11-06|Follow naming of libretro-super build script
 games/libretro-beetle_vb|games/libretro-mednafen_vb|2023-11-06|Follow naming of libretro-super build script
 games/libretro-beetle_wswan|games/libretro-mednafen_wswan|2023-11-06|Follow naming of libretro-super build script
 games/libretro-fbalpha|games/libretro-fbalpha2012|2023-11-06|Follow naming of libretro-super build script
 games/libretro-paralleln64|games/libretro-parallel_n64|2023-11-06|Follow naming of libretro-super build script
 games/libretro-uae|games/libretro-puae|2023-11-06|Follow naming of libretro-super build script
 games/libretro-vbanext|games/libretro-vba_next|2023-11-06|Follow naming of libretro-super build script
 archivers/fpc-bzip2|lang/fpc|2023-11-12|This port was merged into lang/fpc
 archivers/fpc-unzip|lang/fpc|2023-11-12|This port was merged into lang/fpc
 audio/fpc-mad|lang/fpc|2023-11-12|This port was merged into lang/fpc
 audio/fpc-a52|lang/fpc|2023-11-12|This port was merged into lang/fpc
 audio/fpc-oggvorbis|lang/fpc|2023-11-12|This port was merged into lang/fpc
 audio/fpc-modplug|lang/fpc|2023-11-12|This port was merged into lang/fpc
 audio/fpc-openal|lang/fpc|2023-11-12|This port was merged into lang/fpc
 converters/fpc-iconvenc|lang/fpc|2023-11-12|This port was merged into lang/fpc
 databases/fpc-odbc|lang/fpc|2023-11-12|This port was merged into lang/fpc
 databases/fpc-fpindexer|lang/fpc|2023-11-12|This port was merged into lang/fpc
 databases/fpc-postgres|lang/fpc|2023-11-12|This port was merged into lang/fpc
 databases/fpc-dblib|lang/fpc|2023-11-12|This port was merged into lang/fpc
 databases/fpc-ibase|lang/fpc|2023-11-12|This port was merged into lang/fpc
 databases/fpc-gdbm|lang/fpc|2023-11-12|This port was merged into lang/fpc
 databases/fpc-mysql|lang/fpc|2023-11-12|This port was merged into lang/fpc
 databases/fpc-pxlib|lang/fpc|2023-11-12|This port was merged into lang/fpc
 databases/fpc-oracle|lang/fpc|2023-11-12|This port was merged into lang/fpc
 databases/fpc-sqlite|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-pthreads|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-tplylib|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-fcl-pdf|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-fcl-sdo|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-fcl-image|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-fcl-xml|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-newt|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-fppkg|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-sdl|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-fcl-extra|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-odata|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-fcl-stl|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-fcl-js|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-symbolic|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-fcl-res|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-fcl-web|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-fcl-registry|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-fcl-fpcunit|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-fcl-report|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-fcl-passrc|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-regexpr|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-fcl-sound|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-dbus|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-fcl-db|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-gdbint|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-libmagic|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-fcl-async|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-fcl-base|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-fcl-json|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-fcl-net|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-fv|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-zlib|lang/fpc|2023-11-12|This port was merged into lang/fpc
 devel/fpc-bfd|lang/fpc|2023-11-12|This port was merged into lang/fpc
 editors/fpc-ide|lang/fpc|2023-11-12|This port was merged into lang/fpc
 ftp/fpc-libcurl|lang/fpc|2023-11-12|This port was merged into lang/fpc
 graphics/fpc-libpng|lang/fpc|2023-11-12|This port was merged into lang/fpc
 graphics/fpc-ncurses|lang/fpc|2023-11-12|This port was merged into lang/fpc
 graphics/fpc-hermes|lang/fpc|2023-11-12|This port was merged into lang/fpc
 graphics/fpc-imagemagick|lang/fpc|2023-11-12|This port was merged into lang/fpc
 graphics/fpc-rsvg|lang/fpc|2023-11-12|This port was merged into lang/fpc
 graphics/fpc-libgd|lang/fpc|2023-11-12|This port was merged into lang/fpc
 graphics/fpc-opengl|lang/fpc|2023-11-12|This port was merged into lang/fpc
 graphics/fpc-graph|lang/fpc|2023-11-12|This port was merged into lang/fpc
 graphics/fpc-vcl-compat|lang/fpc|2023-11-12|This port was merged into lang/fpc
 graphics/fpc-svgalib|lang/fpc|2023-11-12|This port was merged into lang/fpc
 graphics/fpc-proj4|lang/fpc|2023-11-12|This port was merged into lang/fpc
 graphics/fpc-pasjpeg|lang/fpc|2023-11-12|This port was merged into lang/fpc
 graphics/fpc-cairo|lang/fpc|2023-11-12|This port was merged into lang/fpc
 lang/fpc-pastojs|lang/fpc|2023-11-12|This port was merged into lang/fpc
 lang/fpc-rtl-objpas|lang/fpc|2023-11-12|This port was merged into lang/fpc
 lang/fpc-lua|lang/fpc|2023-11-12|This port was merged into lang/fpc
 lang/fpc-utils|lang/fpc|2023-11-12|This port was merged into lang/fpc
 lang/fpc-rtl-generics|lang/fpc|2023-11-12|This port was merged into lang/fpc
 lang/fpc-rtl-extra|lang/fpc|2023-11-12|This port was merged into lang/fpc
 lang/fpc-units|lang/fpc|2023-11-12|This port was merged into lang/fpc
 lang/fpc-rexx|lang/fpc|2023-11-12|This port was merged into lang/fpc
 lang/fpc-base|lang/fpc|2023-11-12|This port was merged into lang/fpc
 lang/fpc-rtl-unicode|lang/fpc|2023-11-12|This port was merged into lang/fpc
 lang/fpc-rtl-console|lang/fpc|2023-11-12|This port was merged into lang/fpc
 math/fpc-gmp|lang/fpc|2023-11-12|This port was merged into lang/fpc
 math/fpc-numlib|lang/fpc|2023-11-12|This port was merged into lang/fpc
 math/fpc-fftw|lang/fpc|2023-11-12|This port was merged into lang/fpc
 misc/fpc-chm|lang/fpc|2023-11-12|This port was merged into lang/fpc
 multimedia/fpc-dts|lang/fpc|2023-11-12|This port was merged into lang/fpc
 multimedia/fpc-libvlc|lang/fpc|2023-11-12|This port was merged into lang/fpc
 net/fpc-ldap|lang/fpc|2023-11-12|This port was merged into lang/fpc
 net/fpc-pcap|lang/fpc|2023-11-12|This port was merged into lang/fpc
 net/fpc-libenet|lang/fpc|2023-11-12|This port was merged into lang/fpc
 print/fpc-libcups|lang/fpc|2023-11-12|This port was merged into lang/fpc
 security/fpc-gnutls|lang/fpc|2023-11-12|This port was merged into lang/fpc
 security/fpc-openssl|lang/fpc|2023-11-12|This port was merged into lang/fpc
 sysutils/fpc-utmp|lang/fpc|2023-11-12|This port was merged into lang/fpc
 sysutils/fpc-uuid|lang/fpc|2023-11-12|This port was merged into lang/fpc
 sysutils/fpc-syslog|lang/fpc|2023-11-12|This port was merged into lang/fpc
 textproc/fpc-aspell|lang/fpc|2023-11-12|This port was merged into lang/fpc
 textproc/fpc-libxml2|lang/fpc|2023-11-12|This port was merged into lang/fpc
 www/fpc-libmicrohttpd|lang/fpc|2023-11-12|This port was merged into lang/fpc
 www/fpc-httpd24|lang/fpc|2023-11-12|This port was merged into lang/fpc
 www/fpc-googleapi|lang/fpc|2023-11-12|This port was merged into lang/fpc
 www/fpc-webidl|lang/fpc|2023-11-12|This port was merged into lang/fpc
 www/fpc-httpd22|lang/fpc|2023-11-12|This port was merged into lang/fpc
 www/fpc-fastcgi|lang/fpc|2023-11-12|This port was merged into lang/fpc
 x11/fpc-x11|lang/fpc|2023-11-12|This port was merged into lang/fpc
 x11-fonts/fpc-libfontconfig|lang/fpc|2023-11-12|This port was merged into lang/fpc
 x11-toolkits/fpc-xforms|lang/fpc|2023-11-12|This port was merged into lang/fpc
 x11-toolkits/fpc-gtk2|lang/fpc|2023-11-12|This port was merged into lang/fpc
 sysutils/fpc-users|lang/fpc|2023-11-14|This port was merged into lang/fpc
 net/py-ldap|net/py-python-ldap|2023-11-17|Rename to conform upstream name
 devel/wasi-compiler-rt11||2023-11-20|Version no longer supported as a WASI component
 devel/mingw32-libyaml||2023-11-21|Has expired: Last upstream release was in 2014 and mingw32 project is defunct
 devel/mingw32-pdcurses||2023-11-21|Has expired: Last upstream release was in 2009 and mingw32 project is defunct
 devel/mingw32-openssl||2023-11-21|Has expired: Upstream reached EOL and mingw32 project is defunct
 devel/mingw32-pthreads||2023-11-21|Has expired: Last upstream release was in 2012 and mingw32 project is defunct
 devel/mingw32-directx||2023-11-21|Has expired: Last upstream release was in 2002 and mingw32 project is more or less dead
 math/mingw32-libgmp||2023-11-21|Has expired: Broken for more than a year
 devel/mingw32-libffi||2023-11-21|Has expired: Last upstream release was in 2014 and mingw32 project is defunct
 devel/mingw32-bin-msvcrt||2023-11-21|Has expired: Last upstream release was in 2014 and project mingw32 is defunct
 devel/mingw32-zlib||2023-11-21|Has expired: Last upstream release was in 2014 and project mingw32 is defunct
 devel/mingw32-gcc||2023-11-21|Has expired: Upstream release was in 2015 and mingw32 project is defunct
 www/guile-www||2023-11-21|Has expired: Last upstream release was in 2002 and no longer relevant nowadays
 games/suyimazu|games/mizuma|2023-11-22|Project was renamed upstream
 www/dfileserver||2023-11-22|Has expired: Obsolete, consider using www/darkhttpd
 devel/sdts++||2023-11-22|Has expired: Last upstream release was in 2003 and both MASTER_SITES and WWW are unreachable
 databases/postgis30||2023-11-22|Removed
 math/gri||2023-11-26|Has expired: Last upstream release was in 2012 and gnuplot generates better results
 comms/telldus-core||2023-11-26|Has expired: BROKEN for more than a year
 sysutils/openshift-install||2023-11-26|Has expired: BROKEN for more than a year
 devel/capnproto080|devel/capnproto1|2023-11-27|Remove obsoleted port. Use devel/capnproto1 instead
 devel/py-cachetools3|devel/py-cachetools|2023-11-27|Remove obsoleted port. Use devel/py-cachetools instead
 www/rubygem-asana1|www/rubygem-asana|2023-11-27|Remove obsoleted port. Use www/rubygem-asana instead
 devel/rubygem-rdoc63|devel/rubygem-rdoc|2023-11-27|Remove obsoleted port. Use devel/rubygem-rdoc instead
 security/rubygem-devise-two-factor40-rails70|security/rubygem-devise-two-factor41-rails70|2023-11-27|Remove obsoleted port. Use security/rubygem-devise-two-factor41-rails70 instead
 www/rubygem-rqrcode-rails3|www/rubygem-rqrcode|2023-11-27|Remove obsoleted port. Use www/rubygem-rqrcode instead
 textproc/py-pygments-25|textproc/py-pygments|2023-11-27|Remove obsoleted port. Use textproc/py-pygments instead
 devel/rubygem-devise48-rails70|devel/rubygem-devise-rails70|2023-11-29|Use devel/rubygem-devise-rails70 instead
 textproc/rubygem-rouge41|textproc/rubygem-rouge|2023-11-29|Use textproc/rubygem-rouge instead
 devel/rubygem-aws-sdk-s31121|devel/rubygem-aws-sdk-s3|2023-11-29|Use devel/rubygem-aws-sdk-s3 instead
 games/py-mnemosyne|games/py-mnemosyne-proj|2023-11-30|Rename to match PyPI name
 databases/p5-Search-Xapian12|databases/p5-Search-Xapian|2023-12-01|Remove obsoleted port. Use databases/p5-Search-Xapian instead
 databases/xapian-bindings12|databases/xapian-bindings|2023-12-01|Remove obsoleted port. Use databases/xapian-bindings instead
 databases/xapian-core12|databases/xapian-core|2023-12-01|Remove obsoleted port. Use databases/xapian-core instead
 www/xapian-omega12|www/xapian-omega|2023-12-01|Remove obsoleted port. Use www/xapian-omega instead
 devel/rubygem-bootsnap116|devel/rubygem-bootsnap|2023-12-01|Remove obsoleted port. Use devel/rubygem-bootsnap instead
 devel/rubygem-gettext_i18n_rails18|devel/rubygem-gettext_i18n_rails|2023-12-01|Remove obsoleted port. Use devel/rubygem-gettext_i18n_rails instead
 sysutils/rubygem-chef17|sysutils/rubygem-chef|2023-12-01|Remove obsoleted port. Use sysutils/rubygem-chef instead
 sysutils/rubygem-chef-bin17|sysutils/rubygem-chef-bin|2023-12-01|Remove obsoleted port. Use sysutils/rubygem-chef-bin instead
 sysutils/rubygem-chef-config17|sysutils/rubygem-chef-config|2023-12-01|Remove obsoleted port. Use sysutils/rubygem-chef-config instead
 sysutils/rubygem-chef-utils17|sysutils/rubygem-chef-utils|2023-12-01|Remove obsoleted port. Use sysutils/rubygem-chef-utils instead
 sysutils/rubygem-ohai17|sysutils/rubygem-ohai|2023-12-01|Remove obsoleted port. Use sysutils/rubygem-ohai instead
 net-im/scudcloud||2023-12-01|Has expired: Project was abandoned in 2018
 java/wildfly24||2023-12-02|Has expired: End of life upstream
 devel/fnccheck||2023-12-02|Has expired: BROKEN for more than an year and last upstream release was in 2012
 mail/qmail-spamcontrol||2023-12-02|Has expired: BROKEN for more than 4+ years
 java/wildfly16||2023-12-02|Has expired: End of life upstream
 java/wildfly90||2023-12-02|Has expired: End of life upstream
 java/wildfly17||2023-12-02|Has expired: End of life upstream
 java/wildfly15||2023-12-02|Has expired: End of life upstream
 astro/ptiger||2023-12-02|Has expired: Depends on expired astro/tkgeomap
 devel/ptmalloc2||2023-12-02|Has expired: Abandonware, last release in 2006 and there are other alternative malloc implementations available
 java/wildfly25||2023-12-02|Has expired: End of life upstream
 net/gupnp-ui||2023-12-02|Has expired: Depends on deprecated port net/gupnp14
 graphics/R-cran-rtiff||2023-12-02|Has expired: Fails to build and abandoned upstream
 games/iagno||2023-12-02|Has expired: BROKEN for more than a year and no upstream activity for the last 2 years
 emulators/ines||2023-12-02|Has expired: Ancient NES emulator that only works on i386, consider using emulators/higan
 www/varnish-nagios||2023-12-02|Has expired: Marked BROKEN for months, also depends on deprecated version of Varnish
 net/gupnp14||2023-12-02|Has expired: Unsupported legacy version upstream, also fails to build with newer versions of libxml2. Consider migrating to net/gupnp
 net/gupnp-dlna||2023-12-02|Has expired: Depends on deprecated port net/gupnp14
 net/gupnp-igd12||2023-12-02|Has expired: Depends on deprecated port net/gupnp14
 irc/irssi-dcc_send_limiter||2023-12-02|Has expired: BROKEN for more than a year
 www/linux-opera||2023-12-02|Has expired: outdated and unsupported version
 sysutils/gtk-imonc||2023-12-02|Has expired: BROKEN for more than 2 years
 audio/gradio||2023-12-02|Has expired: BROKEN for more than a year
 java/wildfly13||2023-12-02|Has expired: End of life upstream
 astro/xeartk||2023-12-02|Has expired: Depends on expired astro/tkgeomap
 math/py-piranha||2023-12-02|Has expired: BROKEN for more than a year and last upstream activity was in 2018
 games/abstreet||2023-12-02|Has expired: BROKEN for more than a year and issue does not seem to be resolvable soon
 security/tor-devel||2023-12-02|Has expired: Ignored for more than a year and security/tor is more recent than this
 java/wildfly12||2023-12-02|Has expired: End of life upstream
 java/wildfly11||2023-12-02|Has expired: End of life upstream
 net-p2p/arbitrum-avm||2023-12-02|Has expired: BROKEN for more than an year
 www/mozplugger||2023-12-02|Has expired: Obsolete, defunct as Mozilla Firefox dropped support for plugin interface as of ESR 60
 devel/ptmalloc||2023-12-02|Has expired: Abandonware, last release in 2006 and there are other alternative malloc implementations available
 java/wildfly18||2023-12-02|Has expired: End of life upstream
 java/wildfly14||2023-12-02|Has expired: End of life upstream
 www/madsonic||2023-12-02|Has expired: Depends on www/jetty8 which has been listed as end of life since 2015
 www/jetty8||2023-12-02|Has expired: End of life in 2014, consider migrating to www/jetty10
 textproc/bibtool||2023-12-02|Has expired: BROKEN for more than an year
 games/gnome-taquin||2023-12-02|Has expired: BROKEN for more than a year and no upstream activity for more than 2 years
 audio/mous||2023-12-02|Has expired: BROKEN for more than a year
 audio/mixxx22|audio/mixxx|2023-12-02|Has expired: Deprecated upstream, consider migrating to audio/mixxx
 www/jetty9||2023-12-02|Has expired: End of life as of 2022-06-01, consider migrating to www/jetty10
 multimedia/obs-scrab||2023-12-02|Has expired: Fails to package and marked broken over 10 months ago
 archivers/jzlib||2023-12-02|Has expired: Abandonware, untouched for over 10 years and Java Platform 8+ provides a Deflater class
 java/wildfly26||2023-12-02|Has expired: End of life upstream
 science/libgeodecomp||2023-12-02|Has expired: BROKEN for more than an year
 astro/tkgeomap||2023-12-02|Has expired: abandoned
 astro/tclgeomap||2023-12-02|Has expired: abandoned
 devel/electron24||2023-12-03|Has expired: Upstream EOL reached on 2023-10-10
 audio/festlex-ogi||2023-12-04|Has expired: Both MASTER_SITES and WWW are defunct
 net/libkvkontakte||2023-12-04|Has expired: Depends on deprecated www/qt5-webkit
 french/geonext||2023-12-05|Has expired: Last upstream release was in 2014
 german/geonext||2023-12-05|Has expired: Last upstream release was in 2014
 math/geonext||2023-12-05|Has expired: Last upstream release was in 2014
 polish/gnugadu2||2023-12-05|Has expired: Last upstream release was in 2006
 net-im/centerim||2023-12-05|Has expired: Last upstream release was in 2011
 net-im/jggtrans||2023-12-05|Has expired: Upstream last release was in 2014
 polish/tleenx2||2023-12-05|Has expired: Last upstream release was in 2004
 polish/libtlen||2023-12-05|Has expired: Last upstream release was in 2004
 devel/rubygem-font-awesome-rails-rails50|devel/rubygem-font-awesome-rails-rails60|2023-12-06|Obsolete, use devel/rubygem-font-awesome-rails-rails60 instead
 security/rubygem-devise-two-factor-rails61|security/rubygem-devise-two-factor-rails70|2023-12-06|Obsolete, use security/rubygem-devise-two-factor-rails70 instead
 net/py-anonfile||2023-12-07|Has expired: anonfile.com has shut down
 www/thundersnarf||2023-12-12|Has expired: Depends on deprecated php80
 textproc/stardict-quick||2023-12-12|Has expired: unfetchable
 devel/rubygem-view_component-rails61|devel/rubygem-view_component-rails70|2023-12-14|Obsolete, use devel/rubygem-view_component-rails70 instead
 devel/py-astroid253|devel/py-astroid|2023-12-14|Remove obsoleted port. Use devel/py-astroid instead
 mail/imap-uw|mail/panda-imap|2023-12-16|Has expired: Last upstream release was in 2007 so use the fork mail/panda-imap
 mail/mailsync||2023-12-16|Has expired: Depends on outdated mail/cclient
 mail/cclient|mail/panda-cclient|2023-12-16|Has expired: Last upstream release was in 2007 so use the fork mail/panda-cclient
 www/yanopaste||2023-12-18|Has expired: Last upstream release was in 2011
 www/py-yt-dlp-devel|www/py-yt-dlp|2023-12-22|Remove the -devel suffix
 math/octave-forge-statistics-bootstrap|math/octave-forge-statistics-resampling|2023-12-24|Name change upstream
 comms/openzwave-devel||2023-12-28|Has expired: Upstream no longer maintained, indicates to move to openzwave JS instead
 net/dpdk-22.11|net/dpdk|2023-12-30|Instead of expiring dpdk move dpdk-22.11 to dpdk
 databases/ateam_mysql57_ldap_auth||2023-12-31|Depends on upstream EOL MySQL 5.7
 databases/mysql-udf||2023-12-31|Has expired: Upstream last update was in 2007
 databases/mysqlwsrep57-server||2023-12-31|Depends on upstream EOL MySQL 5.7
 net-mgmt/glpi-plugins-fusioninventory-server||2023-12-31|Has expired: Requires php80 which is set to expire on 2023-11-26
 x11-fonts/fontmatrix||2023-12-31|Has expired: Depends on deprecated www/qt5-webkit
 cad/jspice3||2023-12-31|Has expired: BROKEN for more than 2 years on all supported versions after the EOL of 12
 emulators/rtc||2023-12-31|Has expired: Driver doesn't actually work with current FreeBSD versions
 emulators/gngeo||2023-12-31|Has expired: BROKEN for more that 2 years after the EOL of 12
 net/rp-pppoe||2023-12-31|Has expired: Upstream restricting future OS support to Linux. Use net/mpd5 or pppoed instead. https://dianne.skoll.ca/pipermail/rp-pppoe/2023q2/000639.html
 net/spread4||2023-12-31|Has expired: BROKEN on all supported versions after the EOL of 12
 net/quiterss||2023-12-31|Has expired: Depends on deprecated www/qt5-webkit
 net/ipsvd||2023-12-31|Has expired: bogus assumption of system type widths, likely crash-prone
 devel/atlas||2023-12-31|Has expired: There has been no release for most of the Worldforge libraries in the past 10 years
 net-im/gitterdone||2023-12-31|Has expired: Upstream has gone away
 databases/pgpool-II-40||2023-12-31|Has expired: Upstream EOL reaches on 2023-12-31
 www/varnish6|www/varnish7|2023-12-31|Has expired: Unsupported version upstream, consider migrating to www/varnish7
 net-im/teamwords||2023-12-31|Has expired: Depends on deprecated www/qt5-webkit
 devel/eris||2023-12-31|Has expired: There has been no release for most of the Worldforge libraries in the past 10 years
 devel/zanata-platform||2023-12-31|Has expired: Depends on expired java/wildfly10, last release from 2018
 textproc/bsdgrep||2023-12-31|Has expired: Merged into base from 13
 mail/postforward||2023-12-31|Has expired: Obsolete as postsrsd 2.x uses unix sockets instead of tcp
 devel/tmake||2023-12-31|Has expired: Last release in 2004 and dead upstream, superseded by qmake
 comms/ncid||2023-12-31|Has expired: Umaintained for over a year, outdated and unsupported version upstream
 multimedia/gmerlin||2023-12-31|Has expired: Upstream last activity was in 2012
 mail/trojita||2023-12-31|Has expired: Depends on deprecated www/qt5-webkit
 games/springlobby||2023-12-31|Has expired: Depends on expired games/spring
 graphics/libgfx||2023-12-31|Has expired: unmaintained upstream since sep 2005
 devel/cook||2023-12-31|Has expired: Upstream last release was in 2008
 multimedia/omxplayer||2023-12-31|Has expired: Depends on legacy APIs and interfaces, functionality is being in integrated into VLC
 devel/mercator||2023-12-31|Has expired: There has been no release for most of the Worldforge libraries in the past 10 years
 comms/sdr-wspr||2023-12-31|Has expired: Depends on deprecated www/qt5-webkit
 devel/atlas-devel||2023-12-31|Has expired: There has been no release for most of the Worldforge libraries in the past 10 years
 mail/qsheff||2023-12-31|Has expired: BROKEN on all supported versions after the EOL of 12
 textproc/py-googletrans||2023-12-31|Has expired: Umaintained for over 3 years, depends on old www/py-httpx013
 multimedia/smtube||2023-12-31|Has expired: Depends on deprecated www/qt5-webkit
 net/thcrut||2023-12-31|Has expired: BROKEN on all supported versions after the EOL of 12
 games/OpenDiablo2||2023-12-31|Has expired: Upstream repository has been archived on Dec 20, 2021
 graphics/figurine||2023-12-31|Has expired: BROKEN for more than 2 years on all supported versions after the EOL of 12
 editors/xi-term||2023-12-31|Has expired: Frontend depends on deprecated editors/xi-core. No upstream activity
 net/wmwlmon||2023-12-31|Has expired: BROKEN on all supported versions after the EOL of 12
 devel/strace||2023-12-31|Has expired: BROKEN on all supported versions after EOL of 12
 audio/tuneradio||2023-12-31|Has expired: Requires defunct bktr
 net/skstream||2023-12-31|Has expired: There has been no release for most of the Worldforge libraries in the past 10 years
 mail/libspf||2023-12-31|Has expired: Abandonware, last commit upstream 14 years ago. Consider migrating to mail/libspf2
 graphics/sage||2023-12-31|Has expired: There has been no release for most of the Worldforge libraries in the past 10 years
 dns/updatedd||2023-12-31|Has expired: Last release in 2006 and upstream is dead. Consider migrating to dns/inadyn, dns/ddclient or dns/godns
 multimedia/ppm2fli||2023-12-31|Has expired: BROKEN on all supported versions after the EOL of 12
 www/drupal9||2023-12-31|Has expired: Upstream EOL reaches on 2023-11-01
 net/asterisk16|net/asterisk18|2023-12-31|Has expired: Upstream EOL reaches on 2023-10-09
 games/quake3||2023-12-31|Has expired: BROKEN for more than 4 years on all supported versions after the EOL of 12
 audio/xmradio||2023-12-31|Has expired: Requires defunct bktr
 editors/xi-core||2023-12-31|Has expired: Project is currently discontinued, one depend port broken (editors/xi-term set to deprecation too). Upstream recommends editors/lapce
 editors/pdfedit||2023-12-31|Has expired: BROKEN on all supported versions for 2 years after the EOL of 12
 games/spring||2023-12-31|Has expired: Fails to build and marked broken for several months
 java/wildfly10||2023-12-31|Has expired: End of life upstream
 graphics/xfpovray||2023-12-31|Has expired: BROKEN for more than 2 years on all supported versions after the EOL of 12
 audio/mp3splt-gtk||2023-12-31|Has expired: BROKEN on all supported versions for more than 2 years after the EOL of 12
 audio/mp3info||2023-12-31|Has expired: Last release in 2006 and lacks support for ID3v2
 comms/uartlirc||2023-12-31|Has expired: BROKEN on all supported versions for more than 2 years after the EOL of 12
 comms/mlan3||2023-12-31|Has expired: BROKEN on all supported versions for more than 2 years after the EOL of 12
 multimedia/fxtv||2023-12-31|Has expired: Requires defunct bktr
 devel/rubygem-aws-sdk-sso|devel/rubygem-aws-sdk-core|2023-12-31|Has expired: SSO is included as part of aws-sdk-core. Use devel/rubygem-aws-sdk-core instead
 devel/libwfut||2023-12-31|Has expired: There has been no release for most of the Worldforge libraries in the past 10 years
 devel/fuel||2023-12-31|Has expired: Depends on deprecated www/qt5-webkit
 devel/rubygem-aws-sdk-macie||2023-12-31|Has expired: Deprecated by upstream
 sysutils/devcpu-data|sysutils/cpu-microcode|2023-12-31|Has expired: Use sysutils/cpu-microcode
 math/wfmath||2023-12-31|Has expired: There has been no release for most of the Worldforge libraries in the past 10 years
 sysutils/ffs2recov||2023-12-31|Has expired: BROKEN on supported versions after EOL of 12
 sysutils/iichid||2023-12-31|Has expired: Merged into base from 13
 devel/varconf||2023-12-31|Has expired: There has been no release for most of the Worldforge libraries in the past 10 years
 multimedia/bsdbktr_tvtune||2023-12-31|Has expired: Requires defunct bktr
 sysutils/lttng-tools||2023-12-31|Has expired: BROKEN on all supported versions after the EOL of 12
 multimedia/phonon-gstreamer||2023-12-31|Has expired: No longer maintained upstream -- the vlc backend is the one to use
 net-mgmt/zabbix4-server|net-mgmt/zabbix5-server|2023-12-31|Has expired: Upstream EOL reaches on 2023-10-31
 net-mgmt/zabbix4-agent|net-mgmt/zabbix5-agent|2023-12-31|Has expired: Upstream EOL reaches on 2023-10-31
 net-mgmt/zabbix4-java|net-mgmt/zabbix5-java|2023-12-31|Has expired: Upstream EOL reaches on 2023-10-31
 net-mgmt/zabbix4-proxy|net-mgmt/zabbix5-proxy|2023-12-31|Has expired: Upstream EOL reaches on 2023-10-31
 devel/py-dj41-django-rq|devel/py-dj42-django-rq|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/
 net/p5-MaxMind-DB-Writer||2023-12-31|Has expired: This is the final release. This distribution is no longer being developed
 www/py-dj41-django-graphiql-debug-toolbar|www/py-dj42-django-graphiql-debug-toolbar|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj41-drf-spectacular|www/py-dj42-drf-spectacular|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj41-django-tables2|www/py-dj42-django-tables2|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/
 www/py-httpx013|www/py-httpx|2023-12-31|Has expired: Old repo-copy needed for deprecated textproc/py-googletrans
 graphics/drm-fbsd12.0-kmod||2023-12-31|Has expired: Requires soon to reach EOL FreeBSD 12
 www/py-dj41-django-taggit|www/py-dj42-django-taggit|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/
 sysutils/etc_os-release||2023-12-31|Has expired: No longer required after the EOL of 12
 sysutils/afbinit||2023-12-31|Has expired: sparc64 architecture is deprecated in FreeBSD
 x11-drivers/xf86-video-sunffb||2023-12-31|Removed
 www/py-dj41-django-rich|www/py-dj42-django-rich|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj41-django-redis|www/py-dj42-django-redis|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj41-django-prometheus|www/py-dj42-django-prometheus|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj41-django-mptt|www/py-dj42-django-mptt|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj41-drf-yasg||2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/
 print/ghostscript9-agpl-x11|print/ghostscript10|2023-12-31|Has expired: Obsolete and unsupported upstream, consider using print/ghostscipt10
 print/ghostscript9-agpl-base|print/ghostscript10|2023-12-31|Has expired: Obsolete and unsupported upstream, consider using print/ghostscipt10
 www/py-dj41-django-cors-headers|www/py-dj42-django-cors-headers|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/
 databases/mysql57-server|databases/mysql80-server|2023-12-31|Has expired: Upstream support ended in October 2019
 databases/mysql57-client|databases/mysql80-client|2023-12-31|Has expired: Upstream support ended in October 2019
 www/py-dj41-django-filter|www/py-dj42-django-filter|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj41-django-debug-toolbar|www/py-dj42-django-debug-toolbar|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/
 www/kf5-kdewebkit||2023-12-31|Has expired: Depends on deprecated www/qt5-webkit
 www/py-dj41-django-auth-ldap|www/py-dj42-django-auth-ldap|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/
 sysutils/kfloppy||2023-12-31|Has expired: No longer part of KDE Gear since 23.08
 net/wireguard||2023-12-31|Has expired: Only useful for FreeBSD 12 which is EoL soon
 net/wireguard-kmod||2023-12-31|Has expired: Only useful for FreeBSD 12 which is EoL soon
 www/py-dj41-django-js-asset|www/py-dj42-django-js-asset|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj41-django-timezone-field|www/py-dj42-django-timezone-field|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/
 lang/gcc8||2023-12-31|Has expired: Unsupported by upstream. Use GCC 11 or newer instead
 devel/py-dj41-graphene-django|devel/py-dj42-graphene-django|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/
 www/py-dj41-drf-spectacular-sidecar|www/py-dj42-drf-spectacular-sidecar|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/
 graphics/php80-exif|graphics/php81-exif|2023-12-31|Has expired: Security support ended on 2023-11-26
 graphics/php80-gd|graphics/php81-gd|2023-12-31|Has expired: Security support ended on 2023-11-26
 mail/php80-imap|mail/php81-imap|2023-12-31|Has expired: Security support ended on 2023-11-26
 devel/php80-ffi|devel/php81-ffi|2023-12-31|Has expired: Security support ended on 2023-11-26
 devel/php80-gettext|devel/php81-gettext|2023-12-31|Has expired: Security support ended on 2023-11-26
 devel/php80-sysvshm|devel/php81-sysvshm|2023-12-31|Has expired: Security support ended on 2023-11-26
 devel/php80-tokenizer|devel/php81-tokenizer|2023-12-31|Has expired: Security support ended on 2023-11-26
 devel/php80-intl|devel/php81-intl|2023-12-31|Has expired: Security support ended on 2023-11-26
 devel/php80-pcntl|devel/php81-pcntl|2023-12-31|Has expired: Security support ended on 2023-11-26
 devel/php80-sysvsem|devel/php81-sysvsem|2023-12-31|Has expired: Security support ended on 2023-11-26
 devel/php80-sysvmsg|devel/php81-sysvmsg|2023-12-31|Has expired: Security support ended on 2023-11-26
 devel/php80-readline|devel/php81-readline|2023-12-31|Has expired: Security support ended on 2023-11-26
 devel/php80-shmop|devel/php81-shmop|2023-12-31|Has expired: Security support ended on 2023-11-26
 archivers/php80-zlib|archivers/php81-zlib|2023-12-31|Has expired: Security support ended on 2023-11-26
 archivers/php80-phar|archivers/php81-phar|2023-12-31|Has expired: Security support ended on 2023-11-26
 archivers/php80-bz2|archivers/php81-bz2|2023-12-31|Has expired: Security support ended on 2023-11-26
 archivers/php80-zip|archivers/php81-zip|2023-12-31|Has expired: Security support ended on 2023-11-26
 misc/php80-calendar|misc/php81-calendar|2023-12-31|Has expired: Security support ended on 2023-11-26
 textproc/php80-enchant|textproc/php81-enchant|2023-12-31|Has expired: Security support ended on 2023-11-26
 textproc/php80-pspell|textproc/php81-pspell|2023-12-31|Has expired: Security support ended on 2023-11-26
 textproc/php80-xmlwriter|textproc/php81-xmlwriter|2023-12-31|Has expired: Security support ended on 2023-11-26
 textproc/php80-xmlreader|textproc/php81-xmlreader|2023-12-31|Has expired: Security support ended on 2023-11-26
 textproc/php80-xsl|textproc/php81-xsl|2023-12-31|Has expired: Security support ended on 2023-11-26
 textproc/php80-dom|textproc/php81-dom|2023-12-31|Has expired: Security support ended on 2023-11-26
 textproc/php80-simplexml|textproc/php81-simplexml|2023-12-31|Has expired: Security support ended on 2023-11-26
 textproc/php80-ctype|textproc/php81-ctype|2023-12-31|Has expired: Security support ended on 2023-11-26
 textproc/php80-xml|textproc/php81-xml|2023-12-31|Has expired: Security support ended on 2023-11-26
 converters/php80-mbstring|converters/php81-mbstring|2023-12-31|Has expired: Security support ended on 2023-11-26
 converters/php80-iconv|converters/php81-iconv|2023-12-31|Has expired: Security support ended on 2023-11-26
 security/php80-sodium|security/php81-sodium|2023-12-31|Has expired: Security support ended on 2023-11-26
 security/php80-filter|security/php81-filter|2023-12-31|Has expired: Security support ended on 2023-11-26
 net-mgmt/php80-snmp|net-mgmt/php81-snmp|2023-12-31|Has expired: Security support ended on 2023-11-26
 lang/php80-extensions|lang/php81-extensions|2023-12-31|Has expired: Security support ended on 2023-11-26
 lang/php80|lang/php81|2023-12-31|Has expired: Security support ended on 2023-11-26
 www/php80-opcache|www/php81-opcache|2023-12-31|Has expired: Security support ended on 2023-11-26
 www/php80-tidy|www/php81-tidy|2023-12-31|Has expired: Security support ended on 2023-11-26
 www/php80-session|www/php81-session|2023-12-31|Has expired: Security support ended on 2023-11-26
 www/mod_php80|www/mod_php81|2023-12-31|Has expired: Security support ended on 2023-11-26
 ftp/php80-curl|ftp/php81-curl|2023-12-31|Has expired: Security support ended on 2023-11-26
 ftp/php80-ftp|ftp/php81-ftp|2023-12-31|Has expired: Security support ended on 2023-11-26
 sysutils/php80-fileinfo|sysutils/php81-fileinfo|2023-12-31|Has expired: Security support ended on 2023-11-26
 sysutils/php80-posix|sysutils/php81-posix|2023-12-31|Has expired: Security support ended on 2023-11-26
 math/php80-bcmath|math/php81-bcmath|2023-12-31|Has expired: Security support ended on 2023-11-26
 math/php80-gmp|math/php81-gmp|2023-12-31|Has expired: Security support ended on 2023-11-26
 net/php80-ldap|net/php81-ldap|2023-12-31|Has expired: Security support ended on 2023-11-26
 net/php80-soap|net/php81-soap|2023-12-31|Has expired: Security support ended on 2023-11-26
 net/php80-sockets|net/php81-sockets|2023-12-31|Has expired: Security support ended on 2023-11-26
 databases/php80-dba|databases/php81-dba|2023-12-31|Has expired: Security support ended on 2023-11-26
 databases/php80-pdo|databases/php81-pdo|2023-12-31|Has expired: Security support ended on 2023-11-26
 databases/php80-pdo_dblib|databases/php81-pdo_dblib|2023-12-31|Has expired: Security support ended on 2023-11-26
 databases/php80-sqlite3|databases/php81-sqlite3|2023-12-31|Has expired: Security support ended on 2023-11-26
 databases/php80-pdo_pgsql|databases/php81-pdo_pgsql|2023-12-31|Has expired: Security support ended on 2023-11-26
 databases/php80-pdo_firebird|databases/php81-pdo_firebird|2023-12-31|Has expired: Security support ended on 2023-11-26
 databases/php80-pgsql|databases/php81-pgsql|2023-12-31|Has expired: Security support ended on 2023-11-26
 databases/php80-pdo_odbc|databases/php81-pdo_odbc|2023-12-31|Has expired: Security support ended on 2023-11-26
 databases/php80-pdo_sqlite|databases/php81-pdo_sqlite|2023-12-31|Has expired: Security support ended on 2023-11-26
 databases/php80-odbc|databases/php81-odbc|2023-12-31|Has expired: Security support ended on 2023-11-26
 databases/php80-mysqli|databases/php81-mysqli|2023-12-31|Has expired: Security support ended on 2023-11-26
 databases/php80-pdo_mysql|databases/php81-pdo_mysql|2023-12-31|Has expired: Security support ended on 2023-11-26
 databases/postgresql11-pltcl|databases/postgresql12-pltcl|2023-12-31|Has expired: Security support ended on 2023-11-09
 databases/postgresql11-docs|databases/postgresql12-docs|2023-12-31|Has expired: Security support ended on 2023-11-09
 databases/postgresql11-plperl|databases/postgresql12-plperl|2023-12-31|Has expired: Security support ended on 2023-11-09
 databases/postgresql11-server|databases/postgresql12-server|2023-12-31|Has expired: Security support ended on 2023-11-09
 databases/postgresql11-plpython|databases/postgresql12-plpython|2023-12-31|Has expired: Security support ended on 2023-11-09
 databases/postgresql11-contrib|databases/postgresql12-contrib|2023-12-31|Has expired: Security support ended on 2023-11-09
 databases/postgresql11-client|databases/postgresql12-client|2023-12-31|Has expired: Security support ended on 2023-11-09
 databases/postgresql11-pgtcl|databases/postgresql12-pgtcl|2023-12-31|Has expired: Security support ended on 2023-11-09
 www/py-dj41-djangorestframework|www/py-dj42-djangorestframework|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/
 www/py-django41|www/py-django42|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to a newer version of Django. See https://www.djangoproject.com/download/
 www/qt5-webkit||2023-12-31|Has expired: No longer actively maintained, increasing security concerns
 textproc/py-grako||2023-12-31|Project is abandoned
 math/p5-Math-BigRat|math/p5-Math-BigInt|2024-01-01|Subsumed into math/p5-Math-BigInt
 www/trac-devel|www/trac|2024-01-02|Trac released stable version with py3 support, so removing -devel port
 sysutils/rtx|sysutils/mise|2024-01-03|Project was renamed upstream
 x11/hyprland-share-picker|x11/xdg-desktop-portal-hyprland|2024-01-05|Merged into main port
 sysutils/signon-qt5|sysutils/signond|2024-01-05|Renamed to match upstream and support flavors
 net-im/libaccounts-qt5|net-im/libaccounts-qt|2024-01-05|Renamed to support flavors
 devel/py-pygithub|devel/py-PyGithub|2024-01-06|Rename port match upstream
 devel/freebsd-gcc9||2024-01-09|No longer able to build base system, use GCC 12 or later instead
 net/downzemall|net/arrowdl|2024-01-11|Project was renamed upstream
 misc/mc-nox11|misc/mc|2024-01-15|No longer useful (misc/mc does not require Xlib at runtime)
 www/mongrel2||2024-01-15|Has expired: BROKEN for more than 2 years on all platforms after the EOL of 12
 net/unison232|net/unison240|2024-01-15|Has expired: More recent versions are in the tree consider using net/unison240
 science/libtensorflow1||2024-01-15|Has expired: Broken for more than a year
 japanese/jed||2024-01-17|Has expired: Upstream site vaporized and returns NXDOMAIN consider using editors/jed
 editors/fte||2024-01-17|Has expired: Upstream last release was in 2001
 chinese/celvis||2024-01-17|Has expired: Last upstream release was in 2001
 x11-clocks/intclock||2024-01-17|Has expired: Upstream website vaporized
 hebrew/he2||2024-01-17|Has expired: Upstream last release was in 2001
 multimedia/acidrip||2024-01-17|Has expired: Last upstream release was in 2004
 editors/edith||2024-01-17|Has expired: Upstream last release was in 2000
 x11-toolkits/p5-Gtk2-GladeXML||2024-01-17|Has expired: Upstream marked this module as Deprecated
 x11-toolkits/p5-Gtk2-TrayIcon||2024-01-17|Has expired: Upstream marked this module as Deprecated
 editors/led||2024-01-17|Has expired: Last upstream release was in 2002 reconsider using editors/nano
 editors/impress||2024-01-18|Has expired: Upstream last release was in 2000
 biology/sim4||2024-01-18|Has expired: Upstream last update was in 2005
 x11-wm/w9wm||2024-01-18|Has expired: Last upstream release was in 2002
 biology/seqio||2024-01-18|Has expired: Upstream last release was in 2000
 x11-wm/tvtwm||2024-01-18|Has expired: Upstream last release was in 2001 reconsider using vtwm
 x11-wm/treewm||2024-01-18|Has expired: Last upstream release was in 2003
 biology/recombine|biology/lamarc|2024-01-18|Has expired: Upstream advises to use biology/lamarc
 x11-wm/phluid||2024-01-18|Has expired: Last upstream release was in 2000
 x11-wm/lwm||2024-01-18|Has expired: Last upstream release was in 2016
 x11-wm/ratmen||2024-01-18|Has expired: Last upstream release was in 2008
 x11-wm/larswm||2024-01-18|Has expired: Last upstream release was in 2010
 x11-wm/flwm||2024-01-19|Has expired: Last upstream release and activity was in 2015
 x11-wm/jewel||2024-01-19|Has expired: Last upstream release was in 2004
 x11-wm/antiwm||2024-01-20|Has expired: Last upstream release was in 2009
 databases/qt5-sqldrivers-ibase||2024-01-21|Has expired: No fix with the oldest Firebird and BROKEN around 1 year
 multimedia/libva-glx|multimedia/libva|2024-01-21|Merged into main port
 net/gq||2024-01-25|Has expired: Upstream last release was in 2008
 databases/isql-viewer||2024-01-25|Has expired: Requires old mysql versions and last upstream release was in 2004
 audio/sphinx3||2024-01-25|Has expired: Upstream advises on using audio/pocketsphinx
 audio/sphinx||2024-01-25|Has expired: Upstream advises to use audio/pocketsphinx
 games/linux-quake3-demo||2024-01-25|Has expired: Cannot be fetched from GENTOO sites
 games/linux-ut2003-demo||2024-01-25|Has expired: Cannot be fetched anymore from GENTOO Master Sites
 x11-themes/kde-icons-nuvola||2024-01-25|Has expired: Unfetchable and upstream WWW returns Not Found
 x11-themes/kde-icons-gartoon-blue-svg||2024-01-25|Has expired
 x11-themes/kde-icons-gartoon-svg||2024-01-25|Has expired: Upstream WWW returns NOT FOUND
 x11-themes/kde-icons-graphite-rade8||2024-01-25|Has expired: Upstream WWW returns Not Found
 x11-themes/kde-icons-lime-rade8||2024-01-25|Has expired: Upstream WWW returns Not Found
 x11-themes/kde-icons-lush||2024-01-25|Has expired: Upstream WWW returns Not Found
 audio/sphinxbase||2024-01-25|Has expired: Upstream last release was in 2012
 devel/libasyncplusplus|devel/asyncplusplus|2024-01-27|Remove duplicated port
 security/rust-rage|security/rage-encryption|2024-01-27|Renamed as per the preferred fallback name suggested by upstream
 emulators/wine7|emulators/wine|2024-01-30|Has expired: emulators/wine itself now again provides 32-bit support as well as WoW64
 security/py-service_identity|security/py-service-identity|2024-01-31|Has expired: Use security/py-service-identity
 www/lighttpd-mod_h264_streaming||2024-01-31|Has expired: Does not build with new lighttpd
 audio/stmp||2024-02-01|Has expired: Broken for more than a year
 audio/baudline||2024-02-01|Has expired: upstream has gone to subscription model and no longer distributes this version. Try comms/Inspectrum or audio/xanalyser instead
 x11-themes/kde-icons-noia||2024-02-06|Has expired: Unfetchable and upstream WWW not found
 databases/pg_vector|databases/pgvector|2024-02-06|Renamed to match upstream
 graphics/rayshade||2024-02-10|Has expired: Defunct upstream with last release in 1992
 graphics/urt||2024-02-11|Has expired: Defunct upstream
 security/sssd-devel|security/sssd2|2024-02-12|Port is stable
 audio/taglib-extras||2024-02-17|Incompatible with taglib 2.x and unmaintained upstream since 2015
 security/py-pysha3||2024-02-17|Merged into python standard library since version 3.6
 graphics/qcustomplot-qt5|graphics/qcustomplot|2024-02-19|Renamed to support flavors
 audio/play||2024-02-20|Has expired: Upstream vaporized and last release was in 2000
 graphics/fotoxx|graphics/fotocx|2024-02-21|Project was renamed upstream
 databases/xtrabackup8|databases/xtrabackup80|2024-02-22|Rename port to avoid confusion
 audio/kid3@qt5|audio/kid3@qt6|2024-02-25|The legacy qt5 flavor has been replaced by the qt6 flavor
 devel/py-setuptools_scm|devel/py-setuptools-scm|2024-02-29|Package name changed
 audio/sweep||2024-02-29|Has expired: Abandonware, last release in 2008 and upstream is dead. Consider using audio/audacity
 audio/gnormalize||2024-02-29|Has expired: Last release in 2008, upstream is dead, depends on deprecated library GTK2 and uses legacy workarounds that can potentially cause lossy conversions. Consider using audio/rsgain and audio/cyanrip
 audio/mp3ck||2024-02-29|Has expired: Last release in 2005 and dead upstream, consider using multimedia/ffmpeg
 audio/mp3rename||2024-02-29|Has expired: Doesn't support ID3v2 tags properly
 audio/pm3umpdl||2024-02-29|Has expired: Deprecated utility as this is supported natively in musicpd
 benchmarks/ramspeed||2024-02-29|Has expired: Upstream is dead and port is unfetchable
 comms/comserv||2024-02-29|Has expired: Abandonware, last release in 2002. Consider using comms/remserial
 comms/sms_client||2024-02-29|Has expired: Abandonware, dead upstream and relies on legacy hardware and or networks that are obsolete
 devel/codeville||2024-02-29|Has expired: Abandonware, dead upstream for at least 10 years. Consider using devel/git or devel/mercurial
 dns/dns_balance||2024-02-29|Has expired: Abandonware, last release in 2005. Consider using dns/dnsdist
 dns/dnscheckengine||2024-02-29|Has expired: Deprecated upstream in favour of Zonemaster Project
 dns/sheerdns||2024-02-29|Has expired: Abandonware, upstream dead and last update over 10 years ago
 finance/cointop||2024-02-29|Has expired: Repo archived upstream Nov 18, 2023
 finance/xtrader||2024-02-29|Has expired: Abandoned upstream
 graphics/acidwarp||2024-02-29|Has expired: Unmaintained by upstream use acidwarp-sdl instead
 graphics/gimmage||2024-02-29|Has expired: Last release in 2007, depends on legacy libraries such as GTK2. Consider using graphics/geeqie or graphics/imv
 misc/smssend||2024-02-29|Has expired: Depends on legacy websites / pages to send SMS
 multimedia/aegisub||2024-02-29|Has expired: BROKEN for nearly a year
 multimedia/camserv||2024-02-29|Has expired: Last upstream release was in 2002, reconsider using multimedia/ustreamer or multimedia/ffmpeg
 multimedia/flvstreamer||2024-02-29|Has expired: Last release 2010 and no active development since, consider using multimedia/ffmpeg
 devel/ptypes||2024-02-29|Has expired: Abandoned upstream, doesn't fetch
 misc/skyutils||2024-02-29|Has expired: Library used for deprecated port misc/smssend
 net-mgmt/unifi7||2024-02-29|Has expired: EOLed upstream, switch to newer version
 net/aslookup||2024-02-29|Has expired: Lookup returns nothing
 net/dimes||2024-02-29|Has expired: The project vaporized in early 2005 and is no longer active
 net/nakenchat||2024-02-29|Has expired: Discontinued upstream and never left BETA stage
 net/sbd||2024-02-29|Has expired: Abandonware and unfetchable, consider using ncat in security/nmap
 security/f-prot||2024-02-29|Has expired: F-Prot Antivirus reached end-of-life on July 31, 2021
 security/fakebo||2024-02-29|Has expired: Remote admin software that hasn't been relevant for last 15 years
 security/fcheck||2024-02-29|Has expired: Abandonware, upstream is gone and notes refers to Windows 98 as the newest OS
 security/fl0p||2024-02-29|Has expired: Abandonware, last release in 2006 and no longer relevant
 security/libzrtpcppcore||2024-02-29|Has expired: Obscure protocol that never got any traction, superseded by SRTP
 security/pbc||2024-02-29|Has expired: Abandonware, last release in 2013 and no development since
 security/poly1305aes||2024-02-29|Has expired: Fails to build on Tier 1 and most other platforms
 www/cgichk||2024-02-29|Has expired: Deprecated utility that checks a list of URLs and lacks HTTPS support
 www/nibbleblog||2024-02-29|Has expired: Upstream WWW redirects to a different CMS software
 chinese/phpbb-tw||2024-02-29|Has expired: Last upstream was released in 2008 use chinese/phpbb3
 www/phpbb||2024-02-29|Has expired: Last upstream was released in 2008 use www/phpbb3
 devel/pcre++||2024-02-29|Unused in the ports tree depends on pcre which is EOLed since 2021
 sysutils/polkit-qt|sysutils/polkit-qt-1|2024-03-01|Renamed to move upstreams name and flavorized
 sysutils/polkit-qt-1-devel|sysutils/polkit-qt-1|2024-03-01|Renamed to move upstreams name and flavorized
 sysutils/cfengine-masterfiles320||2024-03-03|Has expired: No longer supported by upstream
 sysutils/cfengine320||2024-03-03|Has expired: No longer supported by upstream
 net-p2p/sonarr-devel|net-p2p/sonarr|2024-03-03|Has expired: Use net-p2p/sonarr instead
 security/py-pyblake2||2024-03-03|Has expired: Reached it's End Of Life. Integrated into Python Standard Library
 net-im/gtkcord4|net-im/dissent|2024-03-03|Project renamed
 devel/anjuta|devel/gnome-builder|2024-03-12|Has expired: Unmaintained, upstream WWW owned by gambling site, use devel/gnome-builder
 deskutils/rubrica||2024-03-12|Has expired: Upstream WWW redirects to a different site not related to the application
 x11/mrxvt-devel|x11/mrxvt|2024-03-12|Merge most recent version into main port
 math/qalculate-qt@qt5|math/qalculate-qt|2024-03-13|Flavorization has been removed. Qt 5.x has been long deprecated upstream. Please use the unflavored math/qalculate-qt port based on Qt 6.x instead
 math/qalculate-qt@qt6|math/qalculate-qt|2024-03-13|Flavorization has been removed. Continue to enjoy math/qalculate-qt based on Qt 6.x as usual
 games/xataxx||2024-03-16|Has expired: No available WWW
 editors/kak-lsp|editors/kakoune-lsp|2024-03-17|Project was renamed upstream
 www/npm-node16||2024-03-17|Has expired: Depends on deprecated node16
 www/yarn-node16||2024-03-17|Has expired: Depends on deprecated node16
 www/node16||2024-03-17|Has expired: Upstream EOL reaches on 2023-09-11
 graphics/pngcrush||2024-03-17|Has expired
 net-im/telegram-purple||2024-03-17|Has expired: No longer works, migrate to net-im/tdlib-purple
 multimedia/gstreamer1-plugins-rtmp||2024-03-17|Support for legacy library librtmp has been removed in tree
 lang/swi-pl|lang/swipl|2024-03-17|Port renamed on request
 devel/rubygem-with_advisory_lock|devel/rubygem-with_advisory_lock61|2024-03-18|Port renamed to follow naming convention
 emulators/cpmemu||2024-03-19|Has expired: BROKEN on all versions since last year
 devel/grpc142||2024-03-20|Has expired: Please use devel/grpc instead
 www/h2o-devel|www/h2o|2024-03-23|Upstream no longer supports releases, this port is folded into www/h2o instead
 security/rubygem-metasploit-aggregator||2024-03-24|Has expired: No longer used, no longer maintained upstream
 net-p2p/tooth||2024-03-24|Has expired: Project has been renamed to Tuba. Consider porting to the new project. See https://github.com/GeopJr/Tuba
 www/tidy-devel|www/tidy-html5|2024-03-25|Has expired: no more dev at SF, replaced by www/tidy-html5
 www/tidy-lib|www/tidy-html5|2024-03-25|Has expired: no more dev at SF, replaced by www/tidy-html5
 lang/ruby30||2024-03-31|Has expired: Please migrate to newer versions. Ruby 3.0 will reach its EoL on March 30, 2024
 devel/py-pybind11210|devel/py-pybind11|2024-03-31|Remove obsoleted port. Use devel/py-pybind11 instead
 devel/py-y-py|devel/py-pycrdt|2024-03-31|Remove obsoleted port. Use devel/py-pycrdt instead
 devel/py-ypy-websocket|devel/py-pycrdt-websocket|2024-03-31|Remove obsoleted port. Use devel/py-pycrdt-websocket instead
 math/py-munkres10|math/py-munkres|2024-03-31|Remove obsoleted port. Use math/py-munkres instead
 security/py-pysaml24|security/py-pysaml2|2024-03-31|Remove obsoleted port. Use security/py-pysaml2 instead
 textproc/py-atoml|textproc/py-tomlkit|2024-03-31|Remove obsoleted port. This project has been merged back to tomlkit and is no longer maintained. Use textproc/py-tomlkit>=0.8.0 instead
 databases/rubygem-redis-namespace19|databases/rubygem-redis-namespace|2024-03-31|Remove obsoleted port. Use databases/rubygem-redis-namespace instead
 devel/rubygem-cucumber-core12|devel/rubygem-cucumber-core|2024-03-31|Remove obsoleted port. Use devel/rubygem-cucumber-core instead
 devel/rubygem-cucumber-tag-expressions5|devel/rubygem-cucumber-tag-expressions|2024-03-31|Remove obsoleted port. Use devel/rubygem-cucumber-tag-expressions instead
 devel/rubygem-grape-swagger16|devel/rubygem-grape-swagger|2024-03-31|Remove obsoleted port. Use devel/rubygem-grape-swagger instead
 devel/rubygem-grape17|devel/rubygem-grape|2024-03-31|Remove obsoleted port. Use devel/rubygem-grape instead
 devel/rubygem-sidekiq-cron18|devel/rubygem-sidekiq-cron|2024-03-31|Remove obsoleted port. Use devel/rubygem-sidekiq-cron instead
 devel/rubygem-sidekiq6|devel/rubygem-sidekiq|2024-03-31|Remove obsoleted port. Use devel/rubygem-sidekiq instead
 net/rubygem-google-cloud-storage144|net/rubygem-google-cloud-storage|2024-03-31|Remove obsoleted port. Use net/rubygem-google-cloud-storage instead
 security/rubygem-net-sftp2|security/rubygem-net-sftp|2024-03-31|Remove obsoleted port. Use security/rubygem-net-sftp instead
 textproc/rubygem-cucumber-gherkin26|textproc/rubygem-cucumber-gherkin|2024-03-31|Remove obsoleted port. Use textproc/rubygem-cucumber-gherkin instead
 textproc/rubygem-loofah221|textproc/rubygem-loofah|2024-03-31|Remove obsoleted port. Use textproc/rubygem-loofah instead
 www/rubygem-faraday14|www/rubygem-faraday|2024-03-31|Remove obsoleted port. Use www/rubygem-faraday instead
 devel/rubygem-request_store14|devel/rubygem-request_store|2024-03-31|Remove obsoleted port. Use devel/rubygem-request_store instead
 devel/llvm10||2024-04-01|Has expired: No longer supported by upstream
 net-mgmt/phpweathermap||2024-04-01|Has expired: WWW vaporized and has not been updated in last 14 years
 net/csocks||2024-04-01|Has expired: Last release in 2013 and no development since, consider net/microsocks or net/3proxy
 java/sablevm-classpath||2024-04-01|Has expired: Only user in tree is java/sablevm which is deprecated
 java/sablevm||2024-04-01|Has expired: Abandonware, last release in 2007 and is no longer being developed
 editors/asedit||2024-04-01|Has expired: Last upstream release was in 2003
 devel/premake||2024-04-01|Has expired: Legacy unsupported version, consider devel/premake4 or devel/premake5
 devel/lion||2024-04-01|Has expired: Upstream site is removed and library is no longer available
 irc/keitairc2||2024-04-01|Has expired: Abandonware and obsolete, last upstream release in 2010 and now phones have native clients
 irc/bopm||2024-04-01|Has expired: Upstream is dead and archived repo Jul 3 2023
 www/mediawiki135||2024-04-01|Has expired: Upstream reached EOL on 2023-12-21
 net-p2p/bitflu||2024-04-01|Has expired: No development in years and lack common functionality found in modern clients
 devel/busybee||2024-04-01|Has expired: Abandoned upstream, last release 2015 and last commit 2017
 textproc/rubygem-zmq||2024-04-01|Has expired: Last releasee was in 2011 and depends on deprecated libzmq2
 misc/buffer|misc/mbuffer|2024-04-01|Has expired: No upstream updates since 1995.  Switch to misc/mbuffer
 irc/thales||2024-04-01|Has expired: End of life upstream
 irc/sirc||2024-04-01|Has expired: Abandonware, upstream is gone and current version was released over 20 years ago. Consider irc/irssi , irc/epic5 or irc/ircII
 net-p2p/btpd||2024-04-01|Has expired: Abandoned upstream, lacks support for common functionality such as Magnet links, DHT, PEX and HTTPS. Consider net-p2p/qbittorrent or net-p2p/transmission
 net-im/cawbird||2024-04-01|Has expired: No longer developed due to Twitter changes
 irc/ninja||2024-04-01|Has expired: Abandonware, last release around 2002 and upstream is gone. Consider irc/ircII or irc/irssi
 net-p2p/liberator||2024-04-01|Has expired: Abandoned project with last release in 2003
 devel/electron26||2024-04-01|Has expired: EOLed upstream, switch to newer version
 irc/darkbot||2024-04-01|Has expired: Abandonware, last release in 2005 and no activity upstream since 2014
 sysutils/rubygem-vagrant-vbguest||2024-04-01|Has expired: This project is archived and will not receive further updates or support
 net-p2p/frost||2024-04-01|Has expired: Outdated version and unsupported upstream
 archivers/lzmalib||2024-04-01|Has expired: Upstream hasn't been active for over 20 years and no users of this library in tree
 net-p2p/libbt||2024-04-01|Has expired: Last release in 2007 and no active development, lacks functionality found in modern implementations. Consider using net-p2p/libtorrent-rasterbar or net-p2p/libtorrent-rasterbar2
 www/youtube_dl|www/yt-dlp|2024-04-01|Has expired: Many extractors are brokena and upstream can't keep up, consider using www/yt-dlp
 devel/codeworker||2024-04-01|Has expired: Abandonware, outdated version in ports and last release upstream in 2010
 net/libzmq2||2024-04-01|Has expired: Last release was in 2012 switch to libzmq3
 irc/insub||2024-04-01|Has expired: Outdated version, unmaintained in ports since 2015
 archivers/xar||2024-04-01|Has expired: Last release was in 2012 and upstream is dead, consider archivers/libarchive or archivers/7-zip
 editors/morla||2024-04-01|Has expired: Project is unmaintained and last upstream release was in 2011
 java/netcomponents||2024-04-01|Has expired: Last upstream release was in 2000 and upstream unmaintained consider using net/apache-commons-net
 devel/upslug||2024-04-01|Has expired: Utility for a NAS released in 2004 and discontinued in 2008
 security/py-sslyze||2024-04-01|Has expired: It does not support OpenSSL 3.0+
 security/py-nassl||2024-04-01|Has expired: It does not support OpenSSL 3.0+
 devel/cil||2024-04-01|Has expired: Unmaintained upstream due to lack of time
 irc/infobot||2024-04-01|Has expired: Abandonware, outdated version and last upstream release in 2008
 devel/py-mox3||2024-04-01|Has expired: Upstream no longer active and repository has been archived. See also: https://lists.openstack.org/pipermail/openstack-discuss/2020-June/015518.html
 net-p2p/py-vertex||2024-04-01|Has expired: Abandoned project since 7 years back
 textproc/py-html2text2018|textproc/py-html2text|2024-04-01|Has expired: Old version without consumers left, use updated textproc/py-html2text instead
 irc/evangeline||2024-04-01|Has expired: Abandonware, upstream is gone
 devel/libght||2024-04-01|Has expired: Depends on expired devel/liblas
 devel/liblas||2024-04-01|Has expired: Upstream no longer continuing
 www/get_flash_videos|www/yt-dlp|2024-04-01|Has expired: Abandonware, consider using www/yt-dlp
 irc/rbot||2024-04-01|Has expired: Outdated, unmaintained in ports since 2016
 editors/linux-sublime||2024-04-01|Has expired: This is the legacy version Use linux-sublime-text4
 irc/pircbot||2024-04-01|Has expired: Abandoned upstream, last release in 2009 and superseded by pircbotx (fork)
 security/akmos||2024-04-01|Has expired: Last release in 2018, no active development for years and no users in tree
 sysutils/uefi-edk2-bhyve-csm||2024-04-01|Has expired: Requires old edk2 version and gcc 4.8
 net/samba413||2024-04-01|Has expired: Reached its EoL on March 21, 2022
 science/py-asdf-unit-schemas|science/py-asdf-standard|2024-04-01|Has expired: This package is decommissioned and no longer provides any ASDF schemas. The schemas provided by the package were duplicates of the schemas provided by asdf-standard. Use science/py-asdf-standard instead
 textproc/rubygem-autoprefixer-rails1025|textproc/rubygem-autoprefixer-rails|2024-04-02|Obsolete, please use textproc/rubygem-autoprefixer-rails instead
 www/rubygem-cssbundling-rails13-rails70|www/rubygem-cssbundling-rails-rails70|2024-04-02|Obsolete, please use www/rubygem-cssbundling-rails-rails70 instead
 databases/xtrabackup|databases/xtrabackup80|2024-04-02|Has expired: Percona XtraBackup 2.4 has reached EOL status
 net/rubygem-octokit6|net/rubygem-octokit|2024-04-03|Obsolete, please use net/rubygem-octokit instead
 devel/gearmand||2024-04-04|Has expired: Broken and unmaintained in ports
 devel/p5-Gearman-XS||2024-04-04|Depends on removed devel/gearmand and last updated in 2012
 emulators/tuxnes||2024-04-04|Has expired: BROKEN for more than 4 months
 sysutils/vordog||2024-04-04|Has expired: BROKEN for more than 4 months
 science/py-qiskit-terra||2024-04-04|Removed: the upstream gutted the old project and re-imported some other repo; it should be re-ported as a totally new project
 misc/py-qiskit-machine-learning||2024-04-05|Removed
 science/py-qiskit||2024-04-05|Removed
 science/py-qiskit-aer||2024-04-05|Removed
 science/py-qiskit-dynamics||2024-04-05|Removed
 science/py-qiskit-experiments||2024-04-05|Removed
 science/py-qiskit-finance||2024-04-05|Removed
 science/py-qiskit-ibm-experiment||2024-04-05|Removed
 science/py-qiskit-ibm-provider||2024-04-05|Removed
 science/py-qiskit-ibmq-provider||2024-04-05|Removed
 science/py-qiskit-nature||2024-04-05|Removed
 science/py-qiskit-optimization||2024-04-05|Removed
 games/spider||2024-04-06|Has expired: SUNSITE is no longer maintained
 graphics/liblug||2024-04-06|Has expired: SUNSITE is no longer maintained
 misc/xgas||2024-04-06|Has expired: SUNSITE is no longer maintained
 devel/dmucs||2024-04-06|Has expired: Unmaintained, upstream last release was in 2006
 multimedia/mjpg-streamer||2024-04-06|Has expired: Unmaintained for a long time and does not work
 irc/tircproxy||2024-04-06|Has expired: Unmaintained, dead upstream, vaporized from the net
 devel/ds2||2024-04-06|Has expired: Upstream deprecated and archived
 devel/bazel029||2024-04-08|Removed
 math/lean4-std||2024-04-08|Removed: Lean4 doesn't yet support seperate library packages, although it should
 misc/urbit||2024-04-08|Deprecated: Can't be built with a reasonable effort
 lang/tcl85||2024-04-09|EOL
 x11-toolkits/tk85||2024-04-09|EOL
 audio/fasttracker2|audio/ft2-clone|2024-04-10|Renamed to match upstream
 lang/ocaml-nox11|lang/ocaml|2024-04-10|X11 support removed upstream
 lang/qscheme||2024-04-10|Has expired: Unmaintained and there are more modern alternatives
 x11/nvidia-hybrid-graphics||2024-04-11|Has expired: Not maintained and obsoleted by glvnd and nvidia-drm-kmod
 lang/cython-devel|lang/cython3|2024-04-11|Has expired: use lang/cython3
 x11-wm/kwinft|x11-wm/theseus-ship|2024-04-13|Project renamed
 textproc/spiff||2024-04-13|Has expired: Active development of this port has been ceased
 www/p5-libservlet||2024-04-13|Has expired: Upstream unmaintained and last release was in 2001
 textproc/libparsifal||2024-04-13|Has expired: Upsrteam no longer available including WWW and distfile
 www/p5-Catalyst-Plugin-FormBuilder||2024-04-13|Has expired: Deprecated by upstream
 security/sancp||2024-04-13|Has expired: Upstream unmaintained and last release in 2007
 x11-toolkits/p5-Glade2||2024-04-13|Has expired: Deprecated by upstream
 sysutils/msyslog||2024-04-13|Has expired: Unmaintained and last upstream release in 2003
 x11/xdtm||2024-04-13|Has expired: Unmaintained, last upstream release was in 2000 or earlier
 x11/multi-aterm||2024-04-13|Has expired: Unmaintained, last upstream release in 2004
 devel/py-dateutil|devel/py-python-dateutil|2024-04-13|Move devel/py-dateutil to devel/py-python-dateutil
 science/p5-Algorithm-SVMLight||2024-04-16|Has expired: Depends on DEPRECATED science/svmlight
 science/svmlight||2024-04-16|Has expired: Unmaintained, last upstream release in 2008 and there are more modern alternatives
 security/krb5-119||2024-04-16|Has expired: Desupported by MIT following 1.21
 audio/gnuitar||2024-04-18|Has expired: Unmaintained, last upstream release in 2005
 emulators/hugo||2024-04-18|Has expired: Unmaintained, last release in 2005 and uses deprecated gtk2 library
 net-p2p/gtorrentviewer||2024-04-18|Has expired: Unmaintained, last release in 2004 and uses deprecated gtk2
 net-im/tut||2024-04-18|Has expired: Requires deprecated lang/go119
 net/gost||2024-04-18|Has expired: Requires deprecated lang/go119
 lang/go119||2024-04-18|Has expired: Upsrteam EOL reached on 2023-09-06
 www/gitlab-ce|www/gitlab@ce|2024-04-21|Move www/gitlab-ce to www/gitlab and added flavor ce and ee
 multimedia/flvtool++||2024-04-21|Has expired: Abandonware, consider using multimedia/flvmeta
 www/mod_tidy||2024-04-24|Has expired: Last upstream release was in 2005
 net-p2p/go-prysm||2024-04-24|Has expired: Broken for more than 6 months
 x11-toolkits/p5-Gtk2-Ex-Dialogs||2024-04-24|Has expired: No longer works with modern Gtk2
 math/mathlibtools||2024-04-28|Project is obsolete and archived on GitHub since Aug 2023, not compatible with math/lean4
 emulators/qemu7@tools|emulators/qemu@tools|2024-04-29|Use emulators/qemu@tools instead
 lang/tcl9|lang/tcl90|2024-04-30|Renamed for consistency with the 8.x series ports
 deskutils/aspostit||2024-04-30|Has expired: Unmaintained, last upstream release in 2001
 x11-toolkits/p5-Tk-FileDialog||2024-04-30|Has expired: Does not work with recent Tk versions
 www/py-django-dpaste||2024-04-30|Has expired
 dns/bind916|dns/bind918|2024-04-30|Has expired: End of life, please migrate to a newer version of BIND9
 devel/rubygem-ruby_dep||2024-04-30|Has expired: Upstream official support to Ruby 2.x only and is inactive for 7.5 years. And there is no dependent ports
 databases/pgsphere||2024-04-30|Has expired: The repository has been archived by the owner on 2023-08-09 and is inactive for almost 4.5 years
 games/residualvm||2024-04-30|Has expired: Obsolete, merged with ScummVM Oct 9, 2020
 misc/firestring||2024-04-30|Has expired: Upstream is gone and last release in 2004
 dns/firedns||2024-04-30|Has expired: Abandonware, upstream is gone and last release in 2004 and it also depends on unfetchable misc/firestring. Consider dns/c-ares
 sysutils/libretto-config||2024-04-30|Has expired: Utility for obsolete hardware released 20 years ago
 sysutils/dolly||2024-04-30|Has expired: Abandonware, upstream is gone
 sysutils/atitvout||2024-04-30|Has expired: Obsolete, utility for hardware released over 20 years ago
 multimedia/py-librtmp||2024-04-30|Has expired: Depends on deprecated library librtmp
 multimedia/librtmp||2024-04-30|Has expired: Depends on legacy functionality of OpenSSL and superseded by multimedia/ffmpeg
 multimedia/rtmpdump||2024-04-30|Has expired: Depends on deprecated library librtmp, consider migrating to multimedia/ffmpeg
 multimedia/rubygem-paperclip-av-transcoder||2024-04-30|Has expired: Depends on deprecated port devel/rubygem-paperclip-rails5
 benchmarks/iozone21||2024-04-30|Has expired: Abandoned and obsolete version, superseded by benchmarks/iozone (3.x). Consider also migrating to benchmarks/fio
 devel/tla||2024-04-30|Has expired: Deprecated and obsolete revision control system, consider migrating to devel/git or devel/mercurial
 devel/configkit||2024-04-30|Has expired: Depends on deprecated port devel/libphk
 devel/libphk||2024-04-30|Has expired: Superseded by various other projects
 games/2048-qt||2024-04-30|Has expired: Unmaintained, last upstream release in 2016
 devel/cdash||2024-04-30|Has expired: Very outdated version that's unsupported upstream
 sysutils/dim||2024-04-30|Has expired: Abandonware, upstream stopped development in 2005
 net-im/jabberd||2024-04-30|Has expired: No longer developed as of 2019, consider using net-im/ejabberd
 irc/miau||2024-04-30|Has expired: Abandoned upstream, last release in 2010 and no activity since 2014. Consider migrating to irc/soju or irc/znc
 sysutils/no-login||2024-04-30|Has expired: Obsolete, use nologin in base
 lang/gcc48||2024-05-01|Has expired: Unsupported by upstream since 2015. Use GCC 10 or newer instead
 multimedia/rubygem-paperclip-av-transcoder-rails50||2024-05-04|Has expired: Depends on deprecated port devel/rubygem-paperclip-rails50
 devel/rubygem-paperclip-rails50||2024-05-04|Has expired: Upstream repo archived Jul 13, 2023. Upstream recommends using Rails' own ActiveStorage
 devel/rubygem-paperclip-rails5||2024-05-04|Has expired: Upstream repo archived Jul 13, 2023. Upstream recommends using Rails' own ActiveStorage
 biology/pbseqan|biology/seqan|2024-05-05|Has expired: Upstream merged into SeqAn project: Use biology/seqan
 archivers/xpk||2024-05-07|Has expired: Unmaintained, upstream last release in 2002
 www/py-dj42-channels-redis|www/py-channels-redis|2024-05-12|Renamed after all Django consumers were switched from Django 3.2 to Django 4.2 to have a consistent naming scheme
 www/py-dj42-django-auditlog|www/py-django-auditlog|2024-05-12|Renamed after all Django consumers were switched from Django 3.2 to Django 4.2 to have a consistent naming scheme
 www/py-dj42-django-celery-results|www/py-django-celery-results|2024-05-12|Renamed after all Django consumers were switched from Django 3.2 to Django 4.2 to have a consistent naming scheme
 www/py-dj42-django-compression-middleware|www/py-django-compression-middleware|2024-05-12|Renamed after all Django consumers were switched from Django 3.2 to Django 4.2 to have a consistent naming scheme
 www/py-dj42-django-multiselectfield|www/py-django-multiselectfield|2024-05-12|Renamed after all Django consumers were switched from Django 3.2 to Django 4.2 to have a consistent naming scheme
 www/py-dj42-djangorestframework-guardian|www/py-djangorestframework-guardian|2024-05-12|Renamed after all Django consumers were switched from Django 3.2 to Django 4.2 to have a consistent naming scheme
 www/py-dj42-drf-writable-nested|www/py-drf-writable-nested|2024-05-12|Renamed after all Django consumers were switched from Django 3.2 to Django 4.2 to have a consistent naming scheme
 textproc/py-rss2gen|textproc/py-pyrss2gen|2024-05-13|Move textproc/py-rss2gen to textproc/py-pyrss2gen
 x11-fonts/noto-sans-basic|x11-fonts/noto-sans|2024-05-13|Remove obsoleted port. Use x11-fonts/noto-sans instead
 x11-fonts/noto-sans-extra|x11-fonts/noto-sans|2024-05-13|Remove obsoleted port. Use x11-fonts/noto-sans instead
 x11-fonts/noto-sans-mono-basic|x11-fonts/noto-sans-mono|2024-05-13|Remove obsoleted port. Use x11-fonts/noto-sans-mono instead
 x11-fonts/noto-sans-mono-extra|x11-fonts/noto-sans-mono|2024-05-13|Remove obsoleted port. Use x11-fonts/noto-sans-mono instead
 x11-fonts/noto-sans-symbols-basic|x11-fonts/noto-sans-symbols|2024-05-13|Remove obsoleted port. Use x11-fonts/noto-sans-symbols instead
 x11-fonts/noto-sans-symbols-extra|x11-fonts/noto-sans-symbols|2024-05-13|Remove obsoleted port. Use x11-fonts/noto-sans-symbols instead
 x11-fonts/noto-serif-basic|x11-fonts/noto-serif|2024-05-13|Remove obsoleted port. Use x11-fonts/noto-serif instead
 x11-fonts/noto-serif-extra|x11-fonts/noto-serif|2024-05-13|Remove obsoleted port. Use x11-fonts/noto-serif instead
 sysutils/vector||2024-05-15|Has expired: Unmaintained in tree and broken for months
 irc/sic||2024-05-15|Has expired: Last upstream release was in 2001 and no upstream WWW
 devel/tarpaulin|devel/cargo-tarpaulin|2024-05-19|Rename port and package to reflect that this is a Cargo plugin
 sysutils/uutils-coreutils|sysutils/rust-coreutils|2024-05-21|Remove duplicate
 databases/foundationdb|databases/foundationdb71-server|2024-05-23|Reintegrated into databases/foundationdb71-server
 devel/py-dj42-graphene-django|devel/py-graphene-django300|2024-05-26|Renamed to py-graphene-django300 for backwards compatibility with net-mgmt/netbox
 devel/rubygem-jira-ruby21|devel/rubygem-jira-ruby|2024-05-28|Remove obsoleted port. Use devel/rubygem-jira-ruby instead
 devel/rubygem-semver_dialects1|devel/rubygem-semver_dialects|2024-05-28|Remove obsoleted port. Use devel/rubygem-semver_dialects instead
 devel/rubygem-semver_dialects12|devel/rubygem-semver_dialects|2024-05-28|Remove obsoleted port. Use devel/rubygem-semver_dialects instead
 devel/rubygem-xdg3|devel/rubygem-xdg|2024-05-28|Remove obsoleted port. Use devel/rubygem-xdg instead
 devel/rubygem-xdg4|devel/rubygem-xdg|2024-05-28|Remove obsoleted port. Use devel/rubygem-xdg instead
 devel/rubygem-xdg5|devel/rubygem-xdg|2024-05-28|Remove obsoleted port. Use devel/rubygem-xdg instead
 devel/rubygem-xdg6|devel/rubygem-xdg|2024-05-28|Remove obsoleted port. Use devel/rubygem-xdg instead
 graphics/rubygem-mini_magick410|graphics/rubygem-mini_magick|2024-05-28|Remove obsoleted port. Use graphics/rubygem-mini_magick instead
 textproc/rubygem-sassc22|textproc/rubygem-sassc|2024-05-28|Remove obsoleted port. Use textproc/rubygem-sassc instead
 databases/rubygem-flipper-active_record-rails61|databases/rubygem-flipper-active_record|2024-05-28|Remove obsoleted port. Use databases/rubygem-flipper-active_record instead
 devel/rubygem-flipper-active_support_cache_store-rails61|devel/rubygem-flipper-active_support_cache_store|2024-05-28|Remove obsoleted port. Use devel/rubygem-flipper-active_support_cache_store instead
 devel/rubygem-flipper025|devel/rubygem-flipper|2024-05-28|Remove obsoleted port. Use devel/rubygem-flipper instead
 www/rubygem-rqrcode2|www/rubygem-rqrcode|2024-05-28|Remove obsoleted port. Use www/rubygem-rqrcode instead
 net/iaxmodem||2024-05-29|Has expired: outdated and uses end-of-life version of GCC
 www/mod_auth_openid||2024-05-29|Has expired: Depends on expired devel/libopkele
 devel/libopkele||2024-05-29|Has expired: Last upstream release was in 2009
 graphics/vkd3d||2024-05-30|No consumers in ports
 www/pear-Structures_DataGrid_Renderer_Smarty||2024-06-06|Remove expired port
 net/py-soap2py||2024-06-06|Remove expired port
 net/pear-Net_CDDB||2024-06-06|Remove obsoleted port
 sysutils/rtsx-kmod||2024-06-08|Present in base since FreeBSD 13
 devel/rubygem-gettext_i18n_rails111|devel/rubygem-gettext_i18n_rails|2024-06-09|Obsolete use devel/rubygem-gettext_i18n_rails instead
 databases/rubygem-redis-clustering50|databases/rubygem-redis-clustering|2024-06-09|Obsolete use databases/rubygem-redis-clustering instead
 databases/rubygem-redis50|databases/rubygem-redis|2024-06-09|Obsolete use databases/rubygem-redis instead
 math/py-optuna||2024-06-11|Has expired: Depends on expired databases/py-sqlalchemy12
 databases/py-alembic14||2024-06-11|Has expired: Depends on expired databases/py-sqlalchemy12
 deskutils/griffith||2024-06-11|Has expired: Depends on expired databases/py-sqlalchemy12
 misc/py-cinder||2024-06-11|Has expired: Depends on expired databases/py-sqlalchemy12
 databases/py-sqlalchemy12||2024-06-11|Has expired: Upstream makred EOL in Release Status
 devel/py-gtfslib||2024-06-11|Has expired: Depends on expired databases/py-sqlalchemy11
 databases/py-sqlalchemy11||2024-06-11|Has expired: Upstream makred EOL in Release Status
 www/smarty2||2024-06-11|Has expired: Does not support current php versions in tree
 www/librtcdcpp||2024-06-11|Has expired: Dead upstream fails to build
 audio/mp3plot||2024-06-11|Has expired: Dead upstream and fails to build
 dns/dnsforwarder||2024-06-11|Has expired: Abandoned, upstream repo is removed
 dns/crossip|dns/dnsmax-perl|2024-06-11|Has expired: Obsolete, use dns/dnsmax-perl
 dns/curvedns||2024-06-11|Has expired: Protocol never gained traction and is superseded by DoT and DoH
 textproc/mergestat||2024-06-11|Has expired: Marked BROKEN for over a year
 www/bkmrkconv||2024-06-11|Has expired: Obsolete utility, generated files are already in a readable format
 www/chems||2024-06-11|Has expired: Abandonware, last release in 2009 and no activity since upstream
 www/cssed||2024-06-11|Has expired: Abandonware and broken, doesn't work with Python 3.x
 www/goose||2024-06-11|Has expired: Abandonware, last update in 2003 and upstream is dead
 www/larbin||2024-06-11|Has expired: Abandonware, obsolete web crawler
 audio/rebot3||2024-06-11|Has expired: Depends on legacy service/protocol that's requires registration
 net/nepenthes||2024-06-11|Has expired: Abandonware, last update in 2008 and upstream is gone
 sysutils/hploscripts||2024-06-11|Has expired: Abandonware, outdated version
 databases/galera|databases/galera26|2024-06-11|Has expired: Does not build. Superseded by galera26
 databases/tsearch_extras||2024-06-12|Has no consumer both in ports and upstream project
 lang/zig011||2024-06-12|No consumers in ports
 devel/py-ZopeUndo||2024-06-13|No consumers in ports
 multimedia/audacious-qt6|multimedia/audacious|2024-06-13|qt6 flavor is now the default flavor, following upstream change
 multimedia/audacious-plugins-qt6|multimedia/audacious-plugins|2024-06-13|qt6 flavor is now the default flavor, following upstream change
 lang/zig-devel||2024-06-13|Older than lang/zig and no consumers in ports
 www/ctemplate||2024-06-15|Has expired: Abandonware and obsolete, last release in 2008 and never gained any traction
 graphics/electricsheep||2024-06-15|Has expired: Broken for more than 6 months and fails to compile bumping it to latest commit
 www/apt-cacher-ng||2024-06-15|Has expired: Outdated and unsupported version, current version was released in 2020 and upstream is still active
 audio/taglookup||2024-06-15|Has expired: Obsolete, depends on legacy service that is defunct once again
 www/vieb||2024-06-15|Has expired: Outdated and depends on expired (and blacklisted) devel/electron25
 devel/electron25||2024-06-15|Has expired: EOLed upstream, switch to newer version
 devel/py-dj42-django-rq|devel/py-django-rq|2024-06-15|Has expired: Obsolete, please use devel/py-django-rq instead
 www/py-dj42-django-taggit|www/py-django-taggit|2024-06-15|Has expired: Obsolete, please use www/py-django-taggit instead
 www/py-dj42-djangoql|www/py-djangoql|2024-06-15|Has expired: Obsolete, please use www/py-djangoql instead
 www/py-dj42-django-mptt|www/py-django-mptt|2024-06-15|Has expired: Obsolete, please use www/py-django-mptt instead
 www/py-dj42-django-js-asset|www/py-django-js-asset|2024-06-15|Has expired: Obsolete, please use www/py-django-js-asset instead
 www/py-dj42-django-guardian|www/py-django-guardian|2024-06-15|Has expired: Obsolete, please use www/py-django-guardian instead
 www/py-dj42-django-tables2|www/py-django-tables2|2024-06-15|Has expired: Obsolete, please use www/py-django-tables2 instead
 www/py-dj42-django-auth-ldap|www/py-django-auth-ldap|2024-06-15|Has expired: Obsolete, please use www/py-django-auth-ldap instead
 www/py-dj42-django-permissionedforms|www/py-django-permissionedforms|2024-06-15|Has expired: Obsolete, please use www/py-django-permissionedforms instead
 www/py-dj42-django-cors-headers|www/py-django-cors-headers|2024-06-15|Has expired: Obsolete, please use www/py-django-cors-headers instead
 www/py-dj42-django-treebeard|www/py-django-treebeard|2024-06-15|Has expired: Obsolete, please use www/py-django-treebeard instead
 www/py-dj42-django-otp|www/py-django-otp|2024-06-15|Has expired: Obsolete, please use www/py-django-otp instead
 www/py-dj42-django-prometheus|www/py-django-prometheus|2024-06-15|Has expired: Obsolete, please use www/py-django-prometheus instead
 www/py-dj42-channels|www/py-channels|2024-06-15|Has expired: Obsolete, please use www/py-channels instead
 www/py-dj42-django-filter|www/py-django-filter|2024-06-15|Has expired: Obsolete, please use www/py-django-filter instead
 www/py-dj42-drf-spectacular|www/py-drf-spectacular|2024-06-15|Has expired: Obsolete, please use www/py-drf-spectacular instead
 www/py-dj42-drf-spectacular-sidecar|www/py-drf-spectacular-sidecar|2024-06-15|Has expired: Obsolete, please use www/py-drf-spectacular-sidecar instead
 www/py-dj42-django-timezone-field|www/py-django-timezone-field|2024-06-15|Has expired: Obsolete, please use www/py-django-timezone-field instead
 www/py-dj42-django-graphiql-debug-toolbar|www/py-django-graphiql-debug-toolbar|2024-06-15|Has expired: Obsolete, please use www/py-django-graphiql-debug-toolbar instead
 www/py-dj42-django-rich|www/py-django-rich|2024-06-15|Has expired: Obsolete, please use www/py-django-rich instead
 www/py-dj42-django-redis|www/py-django-redis|2024-06-15|Has expired: Obsolete, please use www/py-django-redis instead
 www/py-dj42-django-allauth|www/py-django-allauth|2024-06-15|Has expired: Obsolete, please use www/py-django-allauth instead
 www/py-dj42-django-crispy-forms|www/py-django-crispy-forms|2024-06-15|Has expired: Obsolete, please use www/py-django-crispy-forms instead
 www/py-dj42-django-modelcluster|www/py-django-modelcluster|2024-06-15|Has expired: Obsolete, please use www/py-django-modelcluster instead
 www/py-dj42-django-extensions|www/py-django-extensions|2024-06-15|Has expired: Obsolete, please use www/py-django-extensions instead
 www/py-dj42-djangorestframework|www/py-djangorestframework|2024-06-15|Has expired: Obsolete, please use www/py-djangorestframework instead
 www/py-dj42-django-debug-toolbar|www/py-django-debug-toolbar|2024-06-15|Has expired: Obsolete, please use www/py-django-debug-toolbar instead
 devel/rubygem-ddtrace|devel/rubygem-datadog|2024-06-18|Move devel/rubygem-ddtrace to devel/rubygem-datadog
 databases/py-sqlalchemy13||2024-06-24|Has expired: Upstream makred EOL in Release Status
 chinese/oicq||2024-06-27|ICQ Service closed in 2024-06-24
 security/p5-Crypt-OICQ||2024-06-27|ICQ Service closed in 2024-06-24
 net-im/climm||2024-06-27|ICQ Service closed in 2024-06-24
 multimedia/emby-server-devel|multimedia/emby-server|2024-06-28|Beta port removed: please use the release port multimedia/emby-server
 devel/go-protobuf||2024-06-30|Has expired: Upstream officially deprecated this project
 www/py-django-ldapdb||2024-06-30|Has expired: not compatible with Django >= 4.x, upstream no longer maintained
 www/adzap||2024-06-30|Has expired: Obsolete, no longer provides reasonable amount of filtering
 www/bolt||2024-06-30|Has expired: Outdated and unsupported, current version is several years old and unsupported upstream
 www/interchange||2024-06-30|Has expired: Outdated, current version was released in 2010 is unsupported upstream
 www/itop||2024-06-30|Has expired: Outdated, current version is 5 years old and unsupported upstream
 sysutils/container-diff||2024-06-30|Has expired: The repository has been archived by the owner on 2024-03-28. Upstream suggests diffoci as alternative
 emulators/qemu7|emulators/qemu|2024-06-30|Has expired: qemu 9.X.X is out, so time to retire this one
 lang/perl5.34||2024-06-30|Has expired: Support end three years after .0 release, please upgrade to a more recent version of Perl
 www/httest||2024-06-30|Has expired: Abandonware, no activity from upstream for years and depends on deprecated library devel/pcre
 security/sks||2024-06-30|Has expired: Depends on deprecated port databases/db5
 audio/asunder||2024-06-30|Has expired: Depends on deprecated library libcddb, consider using audio/cyanrip instead
 www/py-cookies||2024-06-30|Has expired: Upstream is inactive for many years
 www/node21||2024-06-30|Has expired: Node.js 21.* will reach its EoL on 2024-06-01. Use Node.js 22.* (www/node22) instead
 graphics/py-ming||2024-06-30|Has expired: Depends on deprecated graphics/ming
 graphics/p5-ming||2024-06-30|Has expired: Depends on deprecated graphics/ming
 print/panda||2024-06-30|Has expired: Depends on deprecated Oracle Berkeley DB 5.3 and upstream is dead
 mail/avenger||2024-06-30|Has expired: Depends on deprecated Oracle Berkeley DB 5.3 and upstream is dead
 www/py-django-bootstrap-pagination||2024-06-30|Has expired: not compatible with Django 4.2, upstream no longer maintained
 www/py-django32||2024-06-30|Has expired: Django 3.2 is now in Extended Support, receives security fixes only and will reach End-Of-Life in April 2024. Upgrade to a later Django version. See https://www.djangoproject.com/download/
 net/haproxy20||2024-06-30|Has expired: Upstream EOL reaches on 2024-06-30
 lang/gcc9||2024-06-30|Has expired: Unsupported by upstream. Use GCC 10 or newer instead
 security/p5-Protocol-ACME||2024-06-30|Has expired: upstream maintainer indicated that it is no longer suitable for use
 graphics/wdune||2024-06-30|Has expired: upstream no longer maintained
 www/zend-framework||2024-06-30|Has expired: Deprecated by upstream, and moved to Laminas Project
 sysutils/torque||2024-06-30|Has expired: unfetchable, upstream no longer open source
 lang/icc||2024-07-01|Has expired: This version is EOL since a long time, i386 only, and the current clang based Intel oneAPI DPC++/C++ seems to work
 graphics/intel-backlight||2024-07-01|Has expired: Use backlight(8)
 www/yarn-node21||2024-07-02|Removed, part of www/node21
 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,94 +1,94 @@
 PORTNAME=	beets
 DISTVERSION=	1.6.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio python
 MASTER_SITES=	PYPI
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Media library management system for obsessive-compulsive music geeks
 WWW=		https://beets.io/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}confuse>=1.0.0:devel/py-confuse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jellyfish>=0:devel/py-jellyfish@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mediafile>=0.2.0:devel/py-mediafile@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}munkres>=1.0.0:math/py-munkres@${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
 
 PLIST_FILES=	share/man/man1/beet.1.gz share/man/man5/beetsconfig.5.gz
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	ACOUSTICBRAINZ BADFILES BEATPORT CHROMA DISCOGS EMBYUPDATE \
 		FETCHART FFMPEG IMAGEMAGICK IPFS KODIUPDATE LASTFM \
 		LASTIMPORT LYRICS LYRICS_GOOGLE MPDSTATS METASYNC_DBUS \
 		PLEXUPDATE REPLAYGAIN SONOS_UPDATE SPOTIFY THUMBNAILS WEB \
 		WEB_CORS
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 ACOUSTICBRAINZ_DESC=	AcousticBrainz Plugin
 BADFILES_DESC=	Bad Files Plugin
 BEATPORT_DESC=	Beatport Catalog Autotagging Support
 DISCOGS_DESC=	Discogs Search Plugin
 EMBYUPDATE_DESC=	Emby Update Plugin
 FETCHART_DESC=	Cover Art Fetch Plugin
 IMAGEMAGICK_DESC=	Cover Art Resizing and Comparison
 IPFS_DESC=	IPFS Plugin
 KODIUPDATE_DESC=	Kodi Update Plugin
 LASTFM_DESC=	LastGenre Plugin
 LASTIMPORT_DESC=	Last.fm Import Plugin
 LYRICS_DESC=	Lyrics Plugin
 LYRICS_GOOGLE_DESC=	Use Google Custom Search for Lyrics
 METASYNC_DBUS_DESC=	Amarok support for the MetaSync plugin
 MPDSTATS_DESC=	MPD Statistics Plugin
 PLEXUPDATE_DESC=	PlexUpdate Plugin
 REPLAYGAIN_DESC=	Normalize Audio Loudness
 SONOS_UPDATE_DESC=	Sonos Update Plugin
 SPOTIFY_DESC=	Spotify Plugin
 THUMBNAILS_DESC=	Thumbnails for freedesktop.org-compliant file managers
 WEB_DESC=		Web plugin for querying, browsing and playing music
 WEB_CORS_DESC=		Cross-origin resource sharing for the Web plugin
 
 ACOUSTICBRAINZ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 BADFILES_RUN_DEPENDS=	flac:audio/flac \
 			mp3val:audio/mp3val
 BEATPORT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.6.1:www/py-requests-oauthlib@${PY_FLAVOR}
 DISCOGS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}discogs-client>=2.2.1:audio/py-discogs-client@${PY_FLAVOR}
 EMBYUPDATE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 FETCHART_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 FFMPEG_RUN_DEPENDS=	ffmpeg>=2:multimedia/ffmpeg
 IMAGEMAGICK_USES=	magick:run
 IPFS_RUN_DEPENDS=	kubo:sysutils/kubo-go
 KODIUPDATE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 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}
 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}
 REPLAYGAIN_RUN_DEPENDS=	mp3gain>=0:audio/mp3gain
 # Broken, unfechable	aacgain>=0:audio/aacgain
 SONOS_UPDATE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}soco>=0:multimedia/py-soco@${PY_FLAVOR}
 SPOTIFY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 THUMBNAILS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${PY_FLAVOR}
 WEB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flask>=0:www/py-flask@${PY_FLAVOR}
 WEB_CORS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask-Cors>=0:www/py-flask-cors@${PY_FLAVOR}
 
 post-install:
 	${INSTALL} ${WRKSRC}/man/beet.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 	${INSTALL} ${WRKSRC}/man/beetsconfig.5 ${STAGEDIR}${PREFIX}/share/man/man5/
 
 .include <bsd.port.mk>
diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index 1ceea917488b..4fe7ba39fee4 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -1,43 +1,44 @@
 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/ \
 		http://ftp.osuosl.org/pub/musicbrainz/picard/
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Next generation MusicBrainz Tagger
 WWW=		https://picard.musicbrainz.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 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}
 
 USES=		desktop-file-utils gettext-tools pyqt:5 python
 USE_LOCALE=	en_US.UTF-8
 USE_PYQT=	pyqt5:run sip
 USE_PYTHON=	autoplist noflavors pep517 unittest
 
 CONFLICTS_INSTALL=	picard-tools py*-python-picard # bin/picard
 
 OPTIONS_DEFINE=		ACOUSTID PLUGINS
 OPTIONS_DEFAULT=	PLUGINS
 
 ACOUSTID_RUN_DEPENDS=	fpcalc:audio/chromaprint
 
 PLUGINS_DESC=		Install various plugins to extend functionality
 PLUGINS_RUN_DEPENDS=	picard-plugins>=2.0:audio/picard-plugins
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/picard/util/_astrcmp*.so
 
 .include <bsd.port.mk>
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,48 +1,48 @@
 PORTNAME=	essentia
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.1_beta5-859
-PORTREVISION=	4
 DISTVERSIONSUFFIX=	-gb247091f
+PORTREVISION=	5
 CATEGORIES=	audio
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python bindings for essentia, C++ library for audio and music analysis
 WWW=		https://essentia.upf.edu/
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 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
 EXTRACT_ONLY=	${GH_ACCOUNT}-${PORTNAME}*.gz
 
 USES=		eigen:3 pkgconfig python
 USE_PYTHON=	pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MTG
 
 post-extract:
 	@${CP} ${DISTDIR}/waf ${WRKSRC}/
 
 do-configure:
 	@cd ${BUILD_WRKSRC} && ${SETENV} ${BUILD_ENV} ${PYTHON_CMD} waf configure --only-python
 
 do-build:
 	@cd ${BUILD_WRKSRC} && ${SETENV} ${BUILD_ENV} ${PYTHON_CMD} waf build --only-python
 
 do-install:
 	# install
 	cd ${BUILD_WRKSRC} && ${SETENV} ${BUILD_ENV} ${PYTHON_CMD} waf install --only-python --prefix ${PREFIX} --destdir ${STAGEDIR}
 	# strip
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/essentia/_essentia${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
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
@@ -1,28 +1,28 @@
 PORTNAME=	pylast
 PORTVERSION=	5.3.0
 CATEGORIES=	audio python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python interface to Last.fm and Libre.fm
 WWW=		https://github.com/pylast/pylast
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatch-vcs>=0:devel/py-hatch-vcs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR}
 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
 
 NO_ARCH=	yes
 TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR}
 
 .include <bsd.port.mk>
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,47 +1,48 @@
 PORTNAME=	asv
 DISTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	benchmarks python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	vishwin@FreeBSD.org
 COMMENT=	Airspeed Velocity: A simple Python history benchmarking tool
 WWW=		https://asv.readthedocs.io/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
 BUILD_DEPENDS:=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.2:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${RUN_DEPENDS}
 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} \
 		${PYTHON_PKGNAMEPREFIX}pytest-rerunfailures>=10.0:devel/py-pytest-rerunfailures@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}filelock>0:sysutils/py-filelock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}virtualenv>0:devel/py-virtualenv@${PY_FLAVOR} \
 		${PY_NUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}selenium>0:www/py-selenium@${PY_FLAVOR} \
 		git:devel/git \
 		${PYTHON_PKGNAMEPREFIX}hglib>0:devel/py-hglib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rpy2>0:math/py-rpy2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517 pytest
 
 # failed because conda is not available
 PYTEST_IGNORED_TESTS=	test_custom_commands \
 			test_installed_commit_hash \
 			test_install_success \
 			test_install_env_matrix_values
 
 .include <bsd.port.mk>
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,39 +1,40 @@
 PORTNAME=	multiqc
 DISTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Aggregate bioinformatics analysis reports across samples and tools
 WWW=		https://pypi.python.org/pypi/multiqc
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}rich-click>0:devel/py-rich-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>0.14.0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}coloredlogs>0:devel/py-coloredlogs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.1:math/py-matplotlib@${PY_FLAVOR} \
 		${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} \
 		${PYTHON_PKGNAMEPREFIX}lzstring>0:archivers/py-lzstring@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spectra>=0.0.10:graphics/py-spectra@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colormath>0:math/py-colormath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}kiwisolver>0:math/py-kiwisolver@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 post-patch:
 	@${RM} ${WRKSRC}/multiqc/utils/config.py.orig
 
 .include <bsd.port.mk>
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,20 +1,21 @@
 PORTNAME=	python-gdsii
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	cad python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	GDSII manipulation library
 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
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 6dd79944d7c1..8fb7adac66fd 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -1,115 +1,115 @@
 PORTNAME=	gnuradio
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.8.4.0
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	comms astro hamradio
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio Software defined radio
 WWW=		https://www.gnuradio.org/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	volk>0:devel/volk \
 		doxygen>0:devel/doxygen \
 		${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.2,1:textproc/py-sphinx@${PY_FLAVOR} \
 		${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} \
 		${PYTHON_SITELIBDIR}/click/__init__.py:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/click_plugins/__init__.py:devel/py-click-plugins@${PY_FLAVOR} \
 		aconnect:audio/alsa-utils \
 		cheetah:devel/py-cheetah3@${PY_FLAVOR} \
 		cppzmq>0:net/cppzmq \
 		minixmlto:textproc/minixmlto \
 		sdl-config:devel/sdl12 \
 		swig:devel/swig \
 		mpir>0:math/mpir \
 		xdg-open:devel/xdg-utils
 LIB_DEPENDS=	libcodec2.so:audio/codec2 \
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libgmpxx.so:math/gmp \
 		libqwt.so:x11-toolkits/qwt6@qt5 \
 		${PY_BOOST} \
 		liblog4cpp.so:devel/log4cpp \
 		libportaudio.so:audio/portaudio \
 		libjack.so:audio/jack \
 		libasound.so:audio/alsa-lib \
 		libgsl.so:math/gsl \
 		libgsm.so:audio/gsm \
 		libboost_date_time.so:devel/boost-libs \
 		liborc-0.4.so:devel/orc \
 		libzmq.so:net/libzmq4
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		cmake compiler:c++11-lang desktop-file-utils fortran gnome \
 		iconv localbase:ldflags perl5 pkgconfig pyqt:5 python \
 		qt:5 shared-mime-info shebangfix
 
 SHEBANG_FILES=	grc/scripts/freedesktop/grc_setup_freedesktop.in \
 		gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor \
 		gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx
 
 CMAKE_ARGS+=	-DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}" \
 		-DENABLE_GR_CTRLPORT="YES" \
 		-DICONV_LIB:STRING="X${ICONV_LIB}" \
 		-DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
 		-DLOCALBASE:STRING="${LOCALBASE}" \
 		-DGR_PKG_DOC_DIR:STRING="${DOCSDIR}" \
 		-DPYTHON_EXECUTABLE:STRING="${PYTHON_CMD}" \
 		-DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig"\
 		-DXMLTO_EXECUTABLE:STRING=minixmlto \
 		-DENABLE_INTERNAL_VOLK:STRING="OFF"
 # for detailed debugging uncomment the next line
 #CMAKE_ARGS+=	--debug-output --trace
 USE_CXXSTD=	c++11
 USE_GITHUB=	yes
 USE_PYQT=	pyqt5
 USE_WX=		3.2
 USE_QT=		buildtools core gui xml qmake widgets
 WX_COMPS=	wx python:run
 USE_LDCONFIG=	yes
 LIBSTRIP_FILES=	analog audio blocks channels digital dtv fec fft\
 		filter pmt qtgui runtime trellis video-sdl\
 		vocoder wavelet
 
 OPTIONS_DEFINE=		DOCS UHD TESTING DOXYGEN
 OPTIONS_EXCLUDE=	DOXYGEN
 OPTIONS_SUB=		yes
 UHD_DESC=	Include UHD support from Ettus
 TESTING_DESC=	Include testing support
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} PORTMAINVER=${PORTVERSION:C|^([1-9]+)\.([0-9]+)\.([0-9]+).*|\1.\2.\3|}
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.2,1:textproc/py-sphinx@${PY_FLAVOR} \
 			dot:graphics/graphviz \
 			xmlto:textproc/xmlto \
 			freefont-ttf>0:x11-fonts/freefont-ttf
 DOXYGEN_CMAKE_ON=	-DENABLE_DOXYGEN:STRING="ON" \
 		-DENABLE_DOCS:STRING="ON"
 DOXYGEN_CMAKE_OFF=	-DENABLE_DOXYGEN:STRING="OFF" \
 		-DENABLE_DOCS:STRING="OFF"
 
 UHD_CMAKE_ON=	-DENABLE_GR_UHD:STRING="ON"
 UHD_CMAKE_OFF=	-DENABLE_GR_UHD:STRING="OFF"
 
 TESTING_CMAKE_ON=	-DENABLE_TESTING:STRING="ON"
 TESTING_CMAKE_OFF=	-DENABLE_TESTING:STRING="OFF"
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MUHD}
 LIBSTRIP_FILES+=	uhd
 LIB_DEPENDS+=	libuhd.so:comms/uhd
 PLIST_SUB+=	UHD=""
 .else
 PLIST_SUB+=	UHD="@comment "
 .endif
 
 .include <bsd.port.post.mk>
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,60 +1,61 @@
 PORTNAME=	esptool
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.7.0
+PORTREVISION=	1
 CATEGORIES=	comms python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	loader@FreeBSD.org
 COMMENT=	Utility to communicate with Espressif ESP8266 & ESP32 chips
 WWW=		https://github.com/espressif/esptool
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 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}
 
 USES=		python
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist concurrent cryptography distutils pytest
 
 GH_ACCOUNT=	espressif
 NO_ARCH=	yes
 
 # test/test_espefuse_host.py calls the python command
 # through subprocess Popen(), create an alias for it.
 BINARY_ALIAS=		python=${PYTHON_CMD}
 TEST_ENV=		${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_ENV+=		CRYPTOGRAPHY_OPENSSL_NO_LEGACY=1
 
 ESPTOOL_BAUDRATE?=	115200
 ESPTOOL_CHIP?=		esp8266
 ESPTOOL_SERIALPORT?=	/dev/ttyU0
 
 do-test:
 	@cd ${TEST_WRKSRC} && for test in \
 		test/test_imagegen.py \
 		test/test_espsecure.py \
 		test/test_merge_bin.py \
 		test/test_image_info.py \
 		test/test_modules.py; \
 		do ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest $${test}; done
 	@cd ${TEST_WRKSRC} && for chip in \
 		esp32 esp32c2 esp32c3 esp32s2 esp32s3 esp32s3beta2 esp32h2beta1 esp32c6 \
 		esp32h2 esp32p4; \
 		do ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest \
 		test/test_espefuse.py --chip $${chip}; done
 .if exists(${ESPTOOL_SERIALPORT})
 	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} \
 		${PYTHON_CMD} -m pytest test/test_esptool.py \
 		--port ${ESPTOOL_SERIALPORT} \
 		--chip ${ESPTOOL_CHIP} \
 		--baud ${ESPTOOL_BAUDRATE}
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/datasette/Makefile b/databases/datasette/Makefile
index 069f94fcb475..23edbe903b5b 100644
--- a/databases/datasette/Makefile
+++ b/databases/datasette/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	datasette
 DISTVERSION=	0.63.3
+PORTREVISION=	1
 CATEGORIES=	databases www
 MASTER_SITES=	PYPI
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Multi-tool for exploring and publishing data
 WWW=		https://datasette.io/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	\
 		${PYTHON_PKGNAMEPREFIX}aiofiles>=0.4:devel/py-aiofiles@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}asgi-csrf>=0.9:www/py-asgi-csrf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}asgiref>=3.2.10:www/py-asgiref@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=7.1.1:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click-default-group-wheel>=1.2.2:devel/py-click-default-group-wheel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hupper>=1.9:devel/py-hupper@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}janus>=0.6.2:devel/py-janus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.3:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httpx>=0.20:www/py-httpx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}itsdangerous>=1.1:security/py-itsdangerous@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mergedeep>=1.1.1:devel/py-mergedeep@${PY_FLAVOR} \
 		${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} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/mongodb44/Makefile b/databases/mongodb44/Makefile
index c99d892ab6d7..4cc292298cc9 100644
--- a/databases/mongodb44/Makefile
+++ b/databases/mongodb44/Makefile
@@ -1,99 +1,100 @@
 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/
 PKGNAMESUFFIX=	${DISTVERSION:R:S/.//}
 DISTNAME=	mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION}
 
 MAINTAINER=	ronald@FreeBSD.org
 COMMENT=	Distributed document-oriented "NoSQL" database (4.4.x Branch)
 WWW=		https://docs.mongodb.com/v4.4/
 
 LICENSE=	SSPLv1 APACHE20 # mongodb is SSPLv1, C++ driver is APACHE20
 LICENSE_COMB=	multi
 LICENSE_NAME_SSPLv1=	Server Side Public License Version 1
 LICENSE_FILE_SSPLv1=	${WRKSRC}/LICENSE-Community.txt
 LICENSE_PERMS_SSPLv1=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 DEPRECATED=	EOL as of February 2024, https://www.mongodb.com/legal/support-policy/lifecycles
 EXPIRATION_DATE=2024-07-31
 ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	only ported to amd64, aarch64, and powerpc64le on FreeBSD; upstream supports arm64, ppc64le, s390x, and x86-64
 
 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 \
 		libsnappy.so:archivers/snappy
 
 USES=		compiler:c++17-lang cpe python:build scons
 USE_RC_SUBR=	mongod
 
 # --modules= disables "enterprise" module from src/mongo/db/modules/
 MAKE_ARGS=	--use-system-zlib \
 		--use-system-pcre \
 		--use-system-snappy \
 		--libc++ \
 		--cxx-std=17 \
 		--modules= \
 		--runtime-hardening=on \
 		-j ${MAKE_JOBS_NUMBER} \
 		--disable-warnings-as-errors \
 		VERBOSE=on \
 		AR=llvm-ar
 
 CFLAGS+=	-D_HAS_AUTO_PTR_ETC=0
 
 CONFLICTS_INSTALL=	mongodb[0-9][0-9] # etc/mongodb.conf.sample
 
 PORTSCOUT=	limit:^4\.4\.
 
 USERS=		mongodb
 GROUPS=		mongodb
 
 OPTIONS_DEFINE=			LTO SASL SSL
 OPTIONS_DEFINE_aarch64=	ARMV80A
 OPTIONS_DEFAULT=		LTO SASL SSL
 OPTIONS_DEFAULT_aarch64=	ARMV80A
 OPTIONS_EXCLUDE_aarch64=	${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}}
 OPTIONS_EXCLUDE_aarch64_14=	LTO # Does not work with llvm12 on aarch64.
 
 # MongoDB on non-LSE ARM cpu like Raspberry Pi can work but is unsupported upstream.
 # Can give corruption on high concurrency.
 # Please read https://jira.mongodb.org/browse/SERVER-71772.
 ARMV80A_DESC=	Enable non-LSE ARM64 CPUs like RPI4.
 
 ARMV80A_EXTRA_PATCHES=	${FILESDIR}/extrapatch-SConstruct
 
 LTO_MAKE_ARGS=	--lto=on
 
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_MAKE_ARGS=		--use-sasl-client
 
 SSL_USES=	ssl
 SSL_MAKE_ARGS=	--ssl
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == aarch64 || ${ARCH} == powerpc64le
 EXTRA_PATCHES+=	${FILESDIR}/${ARCH}
 .endif
 
 ALL_TARGET=	install-core
 
 CPE_PRODUCT=	mongodb
 
 pre-patch:
 	${MV} ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.sx ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.S
 
 do-install:
 .for f in mongo mongod mongos
 	${INSTALL_PROGRAM} ${WRKSRC}/build/install${PREFIX}/bin/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample
 
 .include <bsd.port.post.mk>
diff --git a/databases/mongodb50/Makefile b/databases/mongodb50/Makefile
index 60d1e6ac1811..ec3e7e3ba4f9 100644
--- a/databases/mongodb50/Makefile
+++ b/databases/mongodb50/Makefile
@@ -1,121 +1,122 @@
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
 DISTVERSION=	5.0.27
+PORTREVISION=	1
 CATEGORIES=	databases net
 PKGNAMESUFFIX=	${DISTVERSION:R:S/.//}
 
 MAINTAINER=	ronald@FreeBSD.org
 COMMENT=	MongoDB Community Edition (5.0.x Branch)
 WWW=		https://www.mongodb.com/docs/v5.0/
 
 LICENSE=	APACHE20 SSPLv1 # mongodb is SSPLv1, C++ driver is APACHE20
 LICENSE_COMB=	multi
 LICENSE_NAME_SSPLv1=	Server Side Public License Version 1
 LICENSE_FILE_SSPLv1=	${WRKSRC}/LICENSE-Community.txt
 LICENSE_PERMS_SSPLv1=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	only ported to amd64, aarch64, and powerpc64le on FreeBSD; upstream supports arm64, ppc64le, s390x, and x86-64
 
 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 \
 		libstemmer.so:textproc/snowballstemmer \
 		libunwind.so:devel/libunwind \
 		libyaml-cpp.so:devel/yaml-cpp \
 		libzstd.so:archivers/zstd
 
 USES=		compiler:c++17-lang cpe python:build scons shebangfix
 USE_RC_SUBR=	mongod
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mongodb
 GH_PROJECT=	mongo
 
 SHEBANG_FILES=	buildscripts/scons.py
 python_OLD_CMD=	@python_interpreter@
 
 EXTRACT_AFTER_ARGS=	--exclude src/third_party/pcre-* \
 			--exclude src/third_party/snappy-* \
 			--exclude src/third_party/unwind \
 			--exclude src/third_party/yaml-cpp \
 			--exclude src/third_party/zlib-* \
 			--exclude src/third_party/zstandard-* \
 			--no-same-owner --no-same-permissions
 
 # --modules= disables "enterprise" module from src/mongo/db/modules/
 MAKE_ARGS=	--cxx-std=17 \
 		--disable-warnings-as-errors \
 		--libc++ \
 		--modules= \
 		--runtime-hardening=on \
 		--use-system-libunwind \
 		--use-system-pcre \
 		--use-system-snappy \
 		--use-system-stemmer \
 		--use-system-yaml \
 		--use-system-zlib \
 		--use-system-zstd \
 		-j ${MAKE_JOBS_NUMBER} \
 		AR=llvm-ar \
 		MONGO_VERSION=${DISTVERSION} \
 		VERBOSE=on
 
 CFLAGS+=	-DBOOST_NO_CXX98_FUNCTION_BASE
 
 CONFLICTS_INSTALL=	mongodb[0-9][0-9] # etc/mongodb.conf.sample
 
 USERS=		mongodb
 GROUPS=		mongodb
 
 OPTIONS_DEFINE=		LTO SASL SSL NOAVX
 OPTIONS_DEFAULT=	SASL SSL NOAVX
 
 NOAVX_DESC=	"Disable AVX instructions on amd64 (Sandybridge+)"
 
 LTO_MAKE_ARGS=	--lto=on
 
 NOAVX_MAKE_ARGS=	--experimental-optimization="-sandybridge"
 
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_MAKE_ARGS=		--use-sasl-client
 
 SSL_USES=	ssl
 SSL_MAKE_ARGS=	--ssl
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == aarch64 || ${ARCH} == powerpc64le
 EXTRA_PATCHES=	${FILESDIR}/${ARCH}
 .endif
 
 ALL_TARGET=	install-core
 
 # This ports is only following the Major Release.
 # https://docs.mongodb.com/manual/reference/versioning/
 PORTSCOUT=	limit:^5\.0\.
 
 CPE_PRODUCT=	mongodb
 
 pre-patch:
 	${MV} ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.sx ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.S
 
 do-build:
 	${WRKSRC}/buildscripts/scons.py	-C ${WRKSRC} ${MAKE_ARGS}
 
 do-install:
 .for f in mongo mongod mongos
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in LICENSE-Community.txt MPL-2 README THIRD-PARTY-NOTICES
 	${MV} ${STAGEDIR}${PREFIX}/${doc} ${STAGEDIR}${DOCSDIR}/
 .endfor
 	${RM} ${STAGEDIR}${PREFIX}/bin/resmoke.py
 
 .include <bsd.port.post.mk>
diff --git a/databases/mongodb60/Makefile b/databases/mongodb60/Makefile
index 159813d1747f..264d4320c3f7 100644
--- a/databases/mongodb60/Makefile
+++ b/databases/mongodb60/Makefile
@@ -1,151 +1,152 @@
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
 DISTVERSION=	6.0.16
+PORTREVISION=	1
 CATEGORIES=	databases net
 PKGNAMESUFFIX=	${DISTVERSION:R:S/.//}
 
 MAINTAINER=	ronald@FreeBSD.org
 COMMENT=	MongoDB Community Edition (6.0.x Branch)
 WWW=		https://www.mongodb.com/docs/v6.0/
 
 LICENSE=	APACHE20 SSPLv1 # mongodb is SSPLv1, C++ driver is APACHE20
 LICENSE_COMB=	multi
 LICENSE_NAME_SSPLv1=	Server Side Public License Version 1
 LICENSE_FILE_SSPLv1=	${WRKSRC}/LICENSE-Community.txt
 LICENSE_PERMS_SSPLv1=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	only ported to amd64, aarch64, and powerpc64le on FreeBSD; upstream supports arm64, ppc64le, s390x, and x86-64
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \
 		${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
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libicuuc.so:devel/icu \
 		libpcre.so:devel/pcre \
 		libsnappy.so:archivers/snappy \
 		libstemmer.so:textproc/snowballstemmer \
 		libunwind.so:devel/libunwind \
 		libyaml-cpp.so:devel/yaml-cpp \
 		libzstd.so:archivers/zstd
 
 USES=		compiler:c++17-lang cpe python:build scons shebangfix
 # gmake is used while running ${WRKSRC}/src/third_party/mozjs/gen-config.sh
 USES+=		gmake pkgconfig
 
 # mozjs tag comes from ${WRKSRC}/src/third_party/mozjs/get-sources.sh
 MOZJS_TAG=	82aac6af18abcd5bf188afbc821779ccb0ca0902
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mongodb mongodb-forks:mozjs
 GH_PROJECT=	mongo spidermonkey:mozjs
 GH_TAGNAME=	${MOZJS_TAG}:mozjs
 USE_RC_SUBR=	mongod
 
 SHEBANG_FILES=	buildscripts/scons.py
 python_OLD_CMD=	@python_interpreter@
 
 EXTRACT_AFTER_ARGS=	--exclude src/third_party/icu4c-* \
 			--exclude src/third_party/pcre-* \
 			--exclude src/third_party/snappy-* \
 			--exclude src/third_party/libstemmer_c \
 			--exclude src/third_party/unwind \
 			--exclude src/third_party/yaml-cpp \
 			--exclude src/third_party/zlib-* \
 			--exclude src/third_party/zstandard \
 			--no-same-owner --no-same-permissions
 
 MAKE_ARGS=	--cxx-std=17 \
 		--disable-warnings-as-errors \
 		--libc++ \
 		--runtime-hardening=on \
 		--use-system-icu \
 		--use-system-libunwind \
 		--use-system-pcre \
 		--use-system-snappy \
 		--use-system-stemmer \
 		--use-system-yaml \
 		--use-system-zlib \
 		--use-system-zstd \
 		-j${MAKE_JOBS_NUMBER} \
 		AR=llvm-ar \
 		MONGO_VERSION=${DISTVERSION} \
 		VERBOSE=on
 
 CFLAGS+=	-DBOOST_NO_CXX98_FUNCTION_BASE
 
 CONFLICTS_INSTALL=	mongodb[0-9][0-9]
 
 USERS=		mongodb
 GROUPS=		mongodb
 
 OPTIONS_DEFINE=		LTO SASL SSL NOAVX
 OPTIONS_DEFAULT=	SASL SSL NOAVX
 
 NOAVX_DESC=	"Disable AVX instructions on amd64 (Sandybridge+)"
 
 LTO_MAKE_ARGS=	--lto=on
 
 NOAVX_MAKE_ARGS=	--experimental-optimization="-sandybridge"
 
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_MAKE_ARGS=		--use-sasl-client
 
 SSL_USES=	ssl
 SSL_MAKE_ARGS=	--ssl
 
 .include <bsd.port.pre.mk>
 
 ALL_TARGET=	install-core
 
 # This ports is only following the Major Release.
 # https://docs.mongodb.com/manual/reference/versioning/
 PORTSCOUT=	limit:^6\.0\.
 
 CPE_PRODUCT=	mongodb
 
 .if ${ARCH} == amd64
 MOZJS_ARCH=	x86_64
 .elif ${ARCH} == powerpc64le
 MOZJS_ARCH=	ppc64le
 .elif ${ARCH} == aarch64
 MOZJS_ARCH=	${ARCH}
 .endif
 
 post-patch:
 # fix build with python-3.11
 	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/util.py
 	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/preprocessor.py
 	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/backend/base.py
 	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/action/process_define_files.py
 
 do-configure:
 # Replacement of ${WRKSRC}/src/third_party/mozjs/get-sources.sh
 	${LN} -sF ${WRKDIR}/spidermonkey-${MOZJS_TAG} ${WRKSRC}/src/third_party/mozjs/mozilla-release
 	cd ${WRKSRC}/src/third_party/mozjs/mozilla-release/js/src && ${LOCALBASE}/bin/autoconf2.13
 	cd ${WRKSRC}/src/third_party/mozjs && PYTHON3="${PYTHON_CMD}" ${SH} ./gen-config.sh ${MOZJS_ARCH} freebsd
 
 do-build:
 	${WRKSRC}/buildscripts/scons.py	-C ${WRKSRC} ${MAKE_ARGS}
 
 do-install:
 .for f in mongod mongos
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in LICENSE-Community.txt MPL-2 README THIRD-PARTY-NOTICES
 	${MV} ${STAGEDIR}${PREFIX}/${doc} ${STAGEDIR}${DOCSDIR}/
 .endfor
 	${RM} ${STAGEDIR}${PREFIX}/bin/resmoke.py
 
 do-test:
 	${SH} ${FILESDIR}/make.test.sh "${STAGEDIR}${PREFIX}/bin"
 
 .include <bsd.port.post.mk>
diff --git a/databases/mongodb70/Makefile b/databases/mongodb70/Makefile
index 8adf763fae47..72426165f2d2 100644
--- a/databases/mongodb70/Makefile
+++ b/databases/mongodb70/Makefile
@@ -1,153 +1,154 @@
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
 DISTVERSION=	7.0.11
+PORTREVISION=	1
 CATEGORIES=	databases net
 PKGNAMESUFFIX=	${DISTVERSION:R:S/.//}
 
 MAINTAINER=	ronald@FreeBSD.org
 COMMENT=	Distributed document-oriented "NoSQL" database (7.0.x Branch)
 WWW=		https://www.mongodb.com/docs/v7.0/
 
 LICENSE=	APACHE20 SSPLv1 # mongodb is SSPLv1, C++ driver is APACHE20
 LICENSE_COMB=	multi
 LICENSE_NAME_SSPLv1=	Server Side Public License Version 1
 LICENSE_FILE_SSPLv1=	${WRKSRC}/LICENSE-Community.txt
 LICENSE_PERMS_SSPLv1=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	only ported to amd64, aarch64, and powerpc64le on FreeBSD; upstream supports arm64, ppc64le, s390x, and x86-64
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \
 		${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
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libpcre2-8.so:devel/pcre2 \
 		libsnappy.so:archivers/snappy \
 		libstemmer.so:textproc/snowballstemmer \
 		libunwind.so:devel/libunwind \
 		libyaml-cpp.so:devel/yaml-cpp \
 		libzstd.so:archivers/zstd
 
 USES=		compiler:c++20-lang cpe python:build scons shebangfix
 # gmake is used while running ${WRKSRC}/src/third_party/mozjs/gen-config.sh
 USES+=		gmake pkgconfig
 
 # mozjs tag comes from ${WRKSRC}/src/third_party/mozjs/get-sources.sh
 MOZJS_TAG=	82aac6af18abcd5bf188afbc821779ccb0ca0902
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mongodb mongodb-forks:mozjs
 GH_PROJECT=	mongo spidermonkey:mozjs
 GH_TAGNAME=	${MOZJS_TAG}:mozjs
 USE_RC_SUBR=	mongod
 
 SHEBANG_FILES=	buildscripts/scons.py
 python_OLD_CMD=	@python_interpreter@
 
 EXTRACT_AFTER_ARGS=	--exclude src/third_party/pcre2 \
 			--exclude src/third_party/snappy-* \
 			--exclude src/third_party/libstemmer_c \
 			--exclude src/third_party/unwind \
 			--exclude src/third_party/yaml-cpp \
 			--exclude src/third_party/zlib-* \
 			--exclude src/third_party/zstandard \
 			--no-same-owner --no-same-permissions
 
 MAKE_ARGS=	--allocator=system \
 		--cxx-std=20 \
 		--disable-warnings-as-errors \
 		--libc++ \
 		--runtime-hardening=on \
 		--use-system-libunwind \
 		--use-system-pcre2 \
 		--use-system-snappy \
 		--use-system-stemmer \
 		--use-system-yaml \
 		--use-system-zlib \
 		--use-system-zstd \
 		-j${MAKE_JOBS_NUMBER} \
 		AR=llvm-ar \
 		MONGO_VERSION=${DISTVERSION} \
 		VERBOSE=on
 
 CFLAGS+=	-DBOOST_NO_CXX98_FUNCTION_BASE
 
 CONFLICTS_INSTALL=	mongodb[0-9][0-9]
 
 USERS=		mongodb
 GROUPS=		mongodb
 
 OPTIONS_DEFINE=		LTO SASL SSL NOAVX
 OPTIONS_DEFINE_aarch64=	ARMV80A
 OPTIONS_DEFAULT=	SASL SSL NOAVX
 
 # MongoDB on non-LSE ARM cpu like Raspberry Pi can work but is unsupported upstream.
 # Can give corruption on high concurrency.
 # Please read https://jira.mongodb.org/browse/SERVER-71772.
 ARMV80A_DESC=	Enable non-LSE ARM64 CPUs like RPI4.
 NOAVX_DESC=	"Disable AVX instructions on amd64 (Sandybridge+)"
 
 ARMV80A_EXTRA_PATCHES=	${FILESDIR}/extrapatch-SConstruct
 
 LTO_MAKE_ARGS=	--lto=on
 
 NOAVX_MAKE_ARGS=	--experimental-optimization="-sandybridge"
 
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_MAKE_ARGS=		--use-sasl-client
 
 SSL_USES=	ssl
 SSL_MAKE_ARGS=	--ssl
 
 .include <bsd.port.pre.mk>
 
 ALL_TARGET=	install-core
 
 # This ports is only following the Major Release.
 # https://docs.mongodb.com/manual/reference/versioning/
 PORTSCOUT=	limit:^7\.0\.
 
 CPE_PRODUCT=	mongodb
 
 .if ${ARCH} == amd64
 MOZJS_ARCH=	x86_64
 .elif ${ARCH} == powerpc64le
 MOZJS_ARCH=	ppc64le
 .elif ${ARCH} == aarch64
 MOZJS_ARCH=	${ARCH}
 .endif
 
 post-patch:
 # fix build with python-3.11
 	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/util.py
 	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/preprocessor.py
 	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/backend/base.py
 	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/action/process_define_files.py
 
 do-configure:
 # Replacement of ${WRKSRC}/src/third_party/mozjs/get-sources.sh
 	${LN} -sF ${WRKDIR}/spidermonkey-${MOZJS_TAG} ${WRKSRC}/src/third_party/mozjs/mozilla-release
 	cd ${WRKSRC}/src/third_party/mozjs/mozilla-release/js/src && ${LOCALBASE}/bin/autoconf2.13
 	cd ${WRKSRC}/src/third_party/mozjs && PYTHON3="${PYTHON_CMD}" ${SH} ./gen-config.sh ${MOZJS_ARCH} freebsd
 
 do-build:
 	${WRKSRC}/buildscripts/scons.py	-C ${WRKSRC} ${MAKE_ARGS}
 
 do-install:
 .for f in mongod mongos
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in LICENSE-Community.txt MPL-2 README THIRD-PARTY-NOTICES
 	${MV} ${STAGEDIR}${PREFIX}/${doc} ${STAGEDIR}${DOCSDIR}/
 .endfor
 	${RM} ${STAGEDIR}${PREFIX}/bin/resmoke.py
 
 .include <bsd.port.post.mk>
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,29 +1,30 @@
 PORTNAME=	Pyrseas
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	databases python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	arcade@b1t.name
 COMMENT=	Framework and utilities to upgrade and maintain a relational database
 WWW=		https://github.com/perseas/Pyrseas
 
 LICENSE=	BSD3CLAUSE
 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
 USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	perseas
 
 # Requires a running PostgreSQL instance
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
 
 .include <bsd.port.mk>
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
@@ -1,41 +1,41 @@
 PORTNAME=	cassandra-driver
 DISTVERSION=	3.18.0
 CATEGORIES=	databases python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sergey@akhmatov.ru
 COMMENT=	Python client library for Apache Cassandra
 WWW=		https://github.com/datastax/python-driver
 
 LICENSE=	APACHE20
 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}
 
 USES=		python
 USE_PYTHON=	autoplist cython distutils
 
 OPTIONS_DEFINE=	LIBEV MURMUR3
 LIBEV_DESC=	Use devel/libev for event loop
 MURMUR3_DESC=	Enable murmur3 extension
 OPTIONS_DEFAULT=	LIBEV MURMUR3
 
 LIBEV_LIB_DEPENDS=	libev.so:devel/libev
 LIBEV_VARS=	STRIPFILES=${STAGEDIR}${PYTHON_SITELIBDIR}/cassandra/io/libevwrapper*.so
 LIBEV_VARS_OFF=	PYDISTUTILS_BUILDARGS+=--no-libev PYDISTUTILS_INSTALLARGS+=--no-libev
 
 MURMUR3_VARS_OFF=	PYDISTUTILS_BUILDARGS+=--no-murmur3 PYDISTUTILS_INSTALLARGS+=--no-murmur3
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' | ${XARGS} ${STRIP_CMD}
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.mk>
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,42 +1,42 @@
 PORTNAME=	dbt-core
 DISTVERSION=	1.7.11
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	pat@patmaddox.com
 COMMENT=	With dbt, build analytics the way engineers build applications
 WWW=		https://github.com/dbt-labs/dbt-core
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}agate>=1.7,<2:textproc/py-agate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.3,<4:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mashumaro>=3.9,<4:devel/py-mashumaro@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>0.5.6:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}logbook>0:devel/py-logbook@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=8.0.2,<9:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.3:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorama>=0.3.9,<0.5:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pathspec>=0.9,<0.13:devel/py-pathspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}isodate>=0.6,<0.7:devel/py-isodate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.2.3,<0.6:databases/py-sqlparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dbt-extractor>=0.5:devel/py-dbt-extractor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}minimal-snowplow-tracker>=0.0.2,<0.1:devel/py-minimal-snowplow-tracker@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dbt-semantic-interfaces>=0.4.2:databases/py-dbt-semantic-interfaces@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=3.0:devel/py-jsonschema@${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} \
 		${PYTHON_PKGNAMEPREFIX}requests<3:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.0:net/py-urllib3@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 .include <bsd.port.mk>
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,32 +1,33 @@
 PORTNAME=	dbt-semantic-interfaces
 DISTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	dbt_semantic_interfaces-${PORTVERSION}
 
 MAINTAINER=	pat@patmaddox.com
 COMMENT=	Shared semantic layer definitions that dbt-core and MetricFlow use
 WWW=		https://github.com/dbt-labs/dbt-semantic-interfaces
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	hatch:devel/py-hatch@${PY_FLAVOR} \
 		hatchling:devel/py-hatchling@${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} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=2,<3:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}importlib-metadata>=6:devel/py-importlib-metadata@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.4,<5:devel/py-typing-extensions@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
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,24 +1,25 @@
 PORTNAME=	pgmigrate
 PORTVERSION=	1.0.8
+PORTREVISION=	1
 CATEGORIES=	databases python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dmitry.wagin@ya.ru
 COMMENT=	PostgreSQL migrations made easy
 WWW=		https://github.com/yandex/pgmigrate
 
 LICENSE=	PostgreSQL
 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
 GH_ACCOUNT=	yandex
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
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,21 +1,22 @@
 PORTNAME=	pum
 DISTVERSION=	0.9.14
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Postgres upgrade manager
 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
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
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,33 +1,34 @@
 PORTNAME=	schemachange
 DISTVERSION=	3.6.1
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	pat@patmaddox.com
 COMMENT=	Database Change Management tool for Snowflake
 WWW=		https://github.com/Snowflake-Labs/schemachange
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${PY_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=40.9.0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 
 RUN_DEPENDS=	${PY_DEPENDS}
 
 TEST_DEPENDS=	${PY_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python
 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:
 	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest)
 
 .include <bsd.port.mk>
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,26 +1,27 @@
 PORTNAME=	snowddl
 DISTVERSION=	0.25.2
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	pat@patmaddox.com
 COMMENT=	Object management automation tool for Snowflake
 WWW=		https://docs.snowddl.com/
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${PY_DEPENDS} \
 		${PY_SETUPTOOLS} \
 		wheel-${PYTHON_VER}:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python
 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,175 +1,175 @@
 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
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${EXTRACT_SUFX}:webui
 
 MAINTAINER=	grembo@FreeBSD.org
 COMMENT=	Community-supported supercharged version of paperless
 WWW=		https://docs.paperless-ngx.com
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bleach>=6.1.0:www/py-bleach@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}concurrent-log-handler>=0.9.19:sysutils/py-concurrent-log-handler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateparser>=1.1.4:devel/py-dateparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}channels-redis>=4.2.0:www/py-channels-redis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-allauth>=0.59.0:www/py-django-allauth@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-auditlog>=2.3.0:www/py-django-auditlog@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-celery-results>=2.5.1:www/py-django-celery-results@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-compression-middleware>=0.5.0:www/py-django-compression-middleware@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-cors-headers>=4.3.1:www/py-django-cors-headers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-extensions>=3.2.3:www/py-django-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-filter>=23.5:www/py-django-filter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-multiselectfield>=0.1.12:www/py-django-multiselectfield@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}djangorestframework-guardian>=0.3.0:www/py-djangorestframework-guardian@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}drf-writable-nested>=0.7.0:www/py-drf-writable-nested@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}filelock>=3.13.1:sysutils/py-filelock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flower>=2.0.1:www/py-flower@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gotenberg-client>=0.5.0:converters/py-gotenberg-client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gunicorn>=21.2.0:www/py-gunicorn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}h2>=4.1.0:www/py-h2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hiredis>=2.0.0:databases/py-hiredis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httptools>=0.6.1:www/py-httptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}imap-tools>=1.5.0:mail/py-imap-tools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}inotifyrecursive>=0.3.5_1:devel/py-inotifyrecursive@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}langdetect>=1.0.9:textproc/py-langdetect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mysqlclient>=2.2.1:databases/py-mysqlclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nltk>=3.8.1:textproc/py-nltk@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ocrmypdf>=15.4.4:textproc/py-ocrmypdf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pathvalidate>=3.2.0:devel/py-pathvalidate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pdf2image>=1.17.0:graphics/py-pdf2image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pdftotext>=2.2.2:textproc/py-pdftotext@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.9.9:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dotenv>=1.0.0:www/py-python-dotenv@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-gnupg>=0.5.1:security/py-python-gnupg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-ipware>=2.0.1:net/py-python-ipware@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-magic>=0.4.27:devel/py-python-magic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzbar>=0.1.9:graphics/py-pyzbar@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rapidfuzz>=3.6.1:devel/py-rapidfuzz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=1.4.0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setproctitle>=1.3.2:devel/py-setproctitle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tika-client>=0.5.0:textproc/py-tika-client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}uvicorn>=0.25.0:www/py-uvicorn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}uvloop>=0.17.0:devel/py-uvloop@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}watchdog>=4.0.0:devel/py-watchdog@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}watchfiles>=0.21.0:devel/py-watchfiles@${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 \
 		optipng:graphics/optipng \
 		tesseract:graphics/tesseract \
 		unpaper:graphics/unpaper
 
 USES=		python shebangfix tar:xz
 USE_GITHUB=	yes
 GH_ACCOUNT=	paperless-ngx
 USE_RC_SUBR=	paperless-beat paperless-consumer paperless-flower \
 		paperless-migrate paperless-webui paperless-worker
 
 SHEBANG_FILES=	${WRKSRC}/src/manage.py
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}*paperless
 
 NO_ARCH=	yes
 
 SUB_FILES=	nginx.conf paperless paperless-ngx.7 pkg-message README sshd_config
 SUB_LIST=	CHOWN=${CHOWN} \
 		ECHO=${ECHO} \
 		EGREP=${EGREP} \
 		PKGBASE=${PKGBASE} \
 		PYTHON_CMD=${PYTHON_CMD} \
 		PYTHONPREFIX_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR} \
 		RM=${RM:Q} \
 		TOUCH=${TOUCH}
 
 USERS=		paperless
 GROUPS=		paperless
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=		DOCS EXAMPLES
 OPTIONS_DEFAULT=	IMAGICK7_X11
 OPTIONS_SINGLE=		IMAGICK
 OPTIONS_SINGLE_IMAGICK=	IMAGICK6_NOX11 IMAGICK6_X11 IMAGICK7_NOX11 IMAGICK7_X11
 
 IMAGICK6_NOX11_DESC=	ImageMagick6 without X11 support
 IMAGICK6_X11_DESC=	ImageMagick6 with X11 support
 IMAGICK7_NOX11_DESC=	ImageMagick7 without X11 support
 IMAGICK7_X11_DESC=	ImageMagick7 with X11 support
 IMAGICK_DESC=		${IMAGEMAGICK_DESC}
 
 IMAGICK6_NOX11_USES=	magick:6,run,nox11
 IMAGICK6_X11_USES=	magick:6,run
 IMAGICK7_NOX11_USES=	magick:7,run,nox11
 IMAGICK7_X11_USES=	magick:7,run
 
 PAPERLESS_STATICDIR=	${WRKSRC}/static
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/src/paperless/settings.py
 
 do-build:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PYTHONPREFIX_SITELIBDIR} \
 		-x ".*/tests/" \
 		-f ${WRKSRC}/src
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PYTHONPREFIX_SITELIBDIR} \
 		-x ".*/tests/" \
 		-f ${WRKSRC}/src
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PYTHONPREFIX_SITELIBDIR} \
 		-f ${WRKSRC}/gunicorn.conf.py
 	@${RM} -r ${PAPERLESS_STATICDIR}
 	@${SETENV} \
 		PAPERLESS_STATICDIR=${PAPERLESS_STATICDIR} \
 		${PYTHON_CMD} ${WRKSRC}/src/manage.py collectstatic -i tests
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/paperless
 	@cd ${WRKSRC}/resources && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 	@cd ${WRKSRC}/src && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${PYTHON_SITELIBDIR}/paperless
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} gunicorn.conf.py \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/paperless
 	@${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.orig' -delete
 	@cd ${WRKDIR} && ${INSTALL_SCRIPT} paperless ${STAGEDIR}${PREFIX}/bin
 	@${SED} -e 's|%%WWWDIR%%|${WWWDIR}|g;' \
 		${WRKSRC}/paperless.conf.example \
 		> ${STAGEDIR}${PREFIX}/etc/paperless.conf.sample
 	@${MKDIR} ${STAGEDIR}/var/db/paperless/consume/input \
 		${STAGEDIR}/var/db/paperless/data/log \
 		${STAGEDIR}/var/db/paperless/media \
 		${STAGEDIR}/var/db/paperless/nltkdata
 	${INSTALL_MAN} ${WRKDIR}/paperless-ngx.7 ${STAGEDIR}${PREFIX}/share/man/man7
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	@cd ${WRKDIR}/${PORTNAME} && ${COPYTREE_SHARE} static ${STAGEDIR}${WWWDIR}
 	@${MKDIR} ${STAGEDIR}/var/run/paperless
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	@cd ${WRKSRC}/docs && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} \
 		${WRKDIR}/README \
 		${WRKDIR}/nginx.conf \
 		${WRKDIR}/sshd_config \
 		${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/deskutils/rednotebook/Makefile b/deskutils/rednotebook/Makefile
index 87e131c152f6..118eff06b1f9 100644
--- a/deskutils/rednotebook/Makefile
+++ b/deskutils/rednotebook/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	rednotebook
 DISTVERSIONPREFIX=v
 DISTVERSION=	2.31
+PORTREVISION=	1
 CATEGORIES=	deskutils
 
 MAINTAINER=	cth-freebsd@pm.me
 COMMENT=	Personal desktop journaling application written in Python
 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
 USE_GNOME=	gtk30 gtksourceview3
 USE_GITHUB=	yes
 GH_ACCOUNT=	jendrikseipp
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		ENCHANT NLS
 OPTIONS_DEFAULT=	ENCHANT
 OPTIONS_SUB=		yes
 ENCHANT_DESC=		Use PyEnchant for spell checking
 ENCHANT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}enchant>=1.6:textproc/py-enchant
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext-runtime
 
 USE_PYTHON=	distutils
 
 .include <bsd.port.mk>
diff --git a/devel/Makefile b/devel/Makefile
index 6673dd9c0626..49bd4ba785a2 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,8160 +1,8160 @@
     COMMENT = Development utilities
 
     SUBDIR += 9base
     SUBDIR += ElectricFence
     SUBDIR += R-cran-BH
     SUBDIR += R-cran-Defaults
     SUBDIR += R-cran-Hmisc
     SUBDIR += R-cran-ModelMetrics
     SUBDIR += R-cran-R6
     SUBDIR += R-cran-RUnit
     SUBDIR += R-cran-Rcpp
     SUBDIR += R-cran-RcppProgress
     SUBDIR += R-cran-Rdpack
     SUBDIR += R-cran-abind
     SUBDIR += R-cran-bindr
     SUBDIR += R-cran-bindrcpp
     SUBDIR += R-cran-bit
     SUBDIR += R-cran-bit64
     SUBDIR += R-cran-bitops
     SUBDIR += R-cran-blob
     SUBDIR += R-cran-brio
     SUBDIR += R-cran-broom
     SUBDIR += R-cran-caTools
     SUBDIR += R-cran-callr
     SUBDIR += R-cran-caret
     SUBDIR += R-cran-checkmate
     SUBDIR += R-cran-chk
     SUBDIR += R-cran-chron
     SUBDIR += R-cran-classInt
     SUBDIR += R-cran-cli
     SUBDIR += R-cran-cliapp
     SUBDIR += R-cran-clipr
     SUBDIR += R-cran-clisymbols
     SUBDIR += R-cran-clock
     SUBDIR += R-cran-collapse
     SUBDIR += R-cran-conflicted
     SUBDIR += R-cran-covr
     SUBDIR += R-cran-cpp11
     SUBDIR += R-cran-crayon
     SUBDIR += R-cran-cyclocomp
     SUBDIR += R-cran-data.table
     SUBDIR += R-cran-decor
     SUBDIR += R-cran-desc
     SUBDIR += R-cran-devtools
     SUBDIR += R-cran-diffobj
     SUBDIR += R-cran-doParallel
     SUBDIR += R-cran-ellipsis
     SUBDIR += R-cran-evaluate
     SUBDIR += R-cran-fansi
     SUBDIR += R-cran-filelock
     SUBDIR += R-cran-fontawesome
     SUBDIR += R-cran-foreach
     SUBDIR += R-cran-future
     SUBDIR += R-cran-future.apply
     SUBDIR += R-cran-gargle
     SUBDIR += R-cran-gbRd
     SUBDIR += R-cran-gbm
     SUBDIR += R-cran-gdata
     SUBDIR += R-cran-generics
     SUBDIR += R-cran-gert
     SUBDIR += R-cran-getopt
     SUBDIR += R-cran-git2r
     SUBDIR += R-cran-glmnet
     SUBDIR += R-cran-globals
     SUBDIR += R-cran-glue
     SUBDIR += R-cran-gmodels
     SUBDIR += R-cran-googledrive
     SUBDIR += R-cran-googlesheets4
     SUBDIR += R-cran-gsubfn
     SUBDIR += R-cran-gtools
     SUBDIR += R-cran-hardhat
     SUBDIR += R-cran-hms
     SUBDIR += R-cran-ids
     SUBDIR += R-cran-ini
     SUBDIR += R-cran-iterators
     SUBDIR += R-cran-itertools
     SUBDIR += R-cran-kit
     SUBDIR += R-cran-later
     SUBDIR += R-cran-lifecycle
     SUBDIR += R-cran-lintr
     SUBDIR += R-cran-listenv
     SUBDIR += R-cran-lubridate
     SUBDIR += R-cran-magrittr
     SUBDIR += R-cran-memoise
     SUBDIR += R-cran-microbenchmark
     SUBDIR += R-cran-mlbench
     SUBDIR += R-cran-mockery
     SUBDIR += R-cran-mockr
     SUBDIR += R-cran-modelr
     SUBDIR += R-cran-msm
     SUBDIR += R-cran-multicool
     SUBDIR += R-cran-optparse
     SUBDIR += R-cran-pak
     SUBDIR += R-cran-parallelly
     SUBDIR += R-cran-parsedate
     SUBDIR += R-cran-pillar
     SUBDIR += R-cran-pkgbuild
     SUBDIR += R-cran-pkgcache
     SUBDIR += R-cran-pkgconfig
     SUBDIR += R-cran-pkgdepends
     SUBDIR += R-cran-pkgload
     SUBDIR += R-cran-pkgmaker
     SUBDIR += R-cran-pkgsearch
     SUBDIR += R-cran-plogr
     SUBDIR += R-cran-plyr
     SUBDIR += R-cran-praise
     SUBDIR += R-cran-prettycode
     SUBDIR += R-cran-prettyunits
     SUBDIR += R-cran-progress
     SUBDIR += R-cran-progressr
     SUBDIR += R-cran-promises
     SUBDIR += R-cran-proto
     SUBDIR += R-cran-purrr
     SUBDIR += R-cran-rJava
     SUBDIR += R-cran-randomForest
     SUBDIR += R-cran-rappdirs
     SUBDIR += R-cran-rcmdcheck
     SUBDIR += R-cran-registry
     SUBDIR += R-cran-rematch2
     SUBDIR += R-cran-remotes
     SUBDIR += R-cran-repr
     SUBDIR += R-cran-reshape
     SUBDIR += R-cran-reshape2
     SUBDIR += R-cran-rgexf
     SUBDIR += R-cran-rlang
     SUBDIR += R-cran-rngtools
     SUBDIR += R-cran-roxygen2
     SUBDIR += R-cran-rprojroot
     SUBDIR += R-cran-rstudioapi
     SUBDIR += R-cran-rversions
     SUBDIR += R-cran-sessioninfo
     SUBDIR += R-cran-sfsmisc
     SUBDIR += R-cran-sourcetools
     SUBDIR += R-cran-sys
     SUBDIR += R-cran-systemfonts
     SUBDIR += R-cran-testit
     SUBDIR += R-cran-testthat
     SUBDIR += R-cran-tibble
     SUBDIR += R-cran-tidyr
     SUBDIR += R-cran-tidyselect
     SUBDIR += R-cran-tidyverse
     SUBDIR += R-cran-timechange
     SUBDIR += R-cran-tinytest
     SUBDIR += R-cran-tzdb
     SUBDIR += R-cran-usethis
     SUBDIR += R-cran-uuid
     SUBDIR += R-cran-vcd
     SUBDIR += R-cran-vctrs
     SUBDIR += R-cran-waldo
     SUBDIR += R-cran-whisker
     SUBDIR += R-cran-whoami
     SUBDIR += R-cran-withr
     SUBDIR += R-cran-zeallot
     SUBDIR += RStudio
     SUBDIR += SpecTcl
     SUBDIR += aarch64-none-elf-gcc
     SUBDIR += abi-compliance-checker
     SUBDIR += abseil
     SUBDIR += acme
     SUBDIR += acsccid
     SUBDIR += activitymail
     SUBDIR += actor-framework
     SUBDIR += adacurses
     SUBDIR += aegis
     SUBDIR += agar
     SUBDIR += aifad
     SUBDIR += aixlog
     SUBDIR += ald
     SUBDIR += alire
     SUBDIR += allegro
     SUBDIR += allegro5
     SUBDIR += amber
     SUBDIR += aml
     SUBDIR += ammonite
     SUBDIR += amqp-cpp
     SUBDIR += android-tools
     SUBDIR += antlr
     SUBDIR += antlr3
     SUBDIR += antlr4
     SUBDIR += apache-ant
     SUBDIR += apache-commons-configuration
     SUBDIR += apache-commons-daemon
     SUBDIR += apache-commons-io
     SUBDIR += apache-commons-jxpath
     SUBDIR += apache-log4j2
     SUBDIR += apache-rat
     SUBDIR += aphpbreakdown
     SUBDIR += aphpunit
     SUBDIR += api-sanity-autotest
     SUBDIR += apitrace
     SUBDIR += app-builder
     SUBDIR += appstream
     SUBDIR += appstream-compose
     SUBDIR += appstream-glib
     SUBDIR += appstream-qt
     SUBDIR += apr1
     SUBDIR += arachne-pnr
     SUBDIR += arcanist
     SUBDIR += arcanist-lib
     SUBDIR += arduino
     SUBDIR += arduino-avrdude
     SUBDIR += arduino-bsd-mk
     SUBDIR += arduino-builder
     SUBDIR += arduino-core
     SUBDIR += arduino-ctags
     SUBDIR += arduino-irremote
     SUBDIR += arduino-mk
     SUBDIR += arduino-openglcd
     SUBDIR += arduino-sevseg
     SUBDIR += arduino-tools
     SUBDIR += arduino18
     SUBDIR += arduinoOTA
     SUBDIR += argc
     SUBDIR += argdata
     SUBDIR += argobots
     SUBDIR += argouml
     SUBDIR += argp-standalone
     SUBDIR += argparse
     SUBDIR += args
     SUBDIR += argtable
     SUBDIR += argtable3
     SUBDIR += arm-elf-binutils
     SUBDIR += arm-none-eabi-gcc
     SUBDIR += arm-none-eabi-newlib
     SUBDIR += aros-sdk
     SUBDIR += arpc
     SUBDIR += art
     SUBDIR += artifactory
     SUBDIR += asfml
     SUBDIR += asl
     SUBDIR += asmjit
     SUBDIR += asmutils
     SUBDIR += asmx
     SUBDIR += astah-community
     SUBDIR += astyle
     SUBDIR += asyncplusplus
     SUBDIR += atf
     SUBDIR += athens
     SUBDIR += atl
     SUBDIR += atlantis
     SUBDIR += autobook
     SUBDIR += autoconf
     SUBDIR += autoconf-archive
     SUBDIR += autoconf-switch
     SUBDIR += autoconf2.13
     SUBDIR += autoconf2.69
     SUBDIR += autodia
     SUBDIR += autogen
     SUBDIR += automake
     SUBDIR += autotools
     SUBDIR += avalon-framework
     SUBDIR += avarice
     SUBDIR += avce00
     SUBDIR += avr-gcc
     SUBDIR += avr-gdb
     SUBDIR += avr-libc
     SUBDIR += avra
     SUBDIR += avrdude
     SUBDIR += avro
     SUBDIR += avro-c
     SUBDIR += avro-cpp
     SUBDIR += awless
     SUBDIR += aws-c-common
     SUBDIR += aws-c-compression
     SUBDIR += aws-c-event-stream
     SUBDIR += aws-c-http
     SUBDIR += aws-c-io
     SUBDIR += aws-c-mqtt
     SUBDIR += aws-c-s3
     SUBDIR += aws-c-sdkutils
     SUBDIR += aws-checksums
     SUBDIR += aws-crt-cpp
     SUBDIR += aws-crt-ffi
     SUBDIR += aws-sdk-cpp
     SUBDIR += aws-sdk-php
     SUBDIR += axmldec
     SUBDIR += ayatana-ido
     SUBDIR += b2
     SUBDIR += babelflow
     SUBDIR += babeltrace
     SUBDIR += bacnet-stack
     SUBDIR += bacon
     SUBDIR += bam
     SUBDIR += bashdb
     SUBDIR += basu
     SUBDIR += bats-core
     SUBDIR += bazel
     SUBDIR += bazel-buildtools
     SUBDIR += bazel5
     SUBDIR += bbparse
     SUBDIR += bcc
     SUBDIR += bcpp
     SUBDIR += bcunit
     SUBDIR += bear
     SUBDIR += benchmark
     SUBDIR += bencodetools
     SUBDIR += bennugd-core
     SUBDIR += bennugd-modules
     SUBDIR += bfg
     SUBDIR += bglibs
     SUBDIR += binaryen
     SUBDIR += bingrep
     SUBDIR += binutils
     SUBDIR += bison
     SUBDIR += bit
     SUBDIR += bitkeeper
     SUBDIR += bitsery
     SUBDIR += blame
     SUBDIR += blitz
     SUBDIR += bloaty
     SUBDIR += bloomberg-bde
     SUBDIR += blueprint-compiler
     SUBDIR += bmake
     SUBDIR += bmkdep
     SUBDIR += bnf
     SUBDIR += boehm-gc
     SUBDIR += boehm-gc-threaded
     SUBDIR += boost-all
     SUBDIR += boost-docs
     SUBDIR += boost-jam
     SUBDIR += boost-libs
     SUBDIR += boost-python-libs
     SUBDIR += boost_build
     SUBDIR += bossa
     SUBDIR += boxfort
     SUBDIR += bpython
     SUBDIR += brz
     SUBDIR += bsdbuild
     SUBDIR += bsdcflow
     SUBDIR += bsddialog
     SUBDIR += bsdowl
     SUBDIR += buf
     SUBDIR += bugzilla44
     SUBDIR += bugzilla50
     SUBDIR += build
     SUBDIR += build2
     SUBDIR += buildkite-agent
     SUBDIR += buildstream
     SUBDIR += bullet
     SUBDIR += bunyan
     SUBDIR += busd
     SUBDIR += byacc
     SUBDIR += byaccj
     SUBDIR += c2mdoc
     SUBDIR += c4core
     SUBDIR += calibrator
     SUBDIR += caliper
     SUBDIR += capnproto
     SUBDIR += capnproto1
     SUBDIR += capslock
     SUBDIR += capstone
     SUBDIR += capstone4
     SUBDIR += cargo-about
     SUBDIR += cargo-bloat
     SUBDIR += cargo-c
     SUBDIR += cargo-cache
     SUBDIR += cargo-deny
     SUBDIR += cargo-depgraph
     SUBDIR += cargo-edit
     SUBDIR += cargo-generate
     SUBDIR += cargo-hack
     SUBDIR += cargo-leptos
     SUBDIR += cargo-llvm-cov
     SUBDIR += cargo-mutants
     SUBDIR += cargo-spellcheck
     SUBDIR += cargo-tarpaulin
     SUBDIR += cargo-udeps
     SUBDIR += cask
     SUBDIR += catch
     SUBDIR += catch2
     SUBDIR += cbang
     SUBDIR += cbfmt
     SUBDIR += cbmc
     SUBDIR += cbrowser
     SUBDIR += cc65
     SUBDIR += ccache
     SUBDIR += ccache-static
     SUBDIR += ccache4
     SUBDIR += cccc
     SUBDIR += ccdoc
     SUBDIR += ccls
     SUBDIR += ccrtp
     SUBDIR += cctz
     SUBDIR += cdecl
     SUBDIR += cdialog
     SUBDIR += cdk
     SUBDIR += cereal
     SUBDIR += cervisia
     SUBDIR += cflow
     SUBDIR += cflow2vcg
     SUBDIR += cfr
     SUBDIR += cgdb
     SUBDIR += cgilib
     SUBDIR += cgit
     SUBDIR += cgprof
     SUBDIR += charva
     SUBDIR += check
     SUBDIR += checkbashisms
     SUBDIR += checkheaders
     SUBDIR += chroma
     SUBDIR += chrpath
     SUBDIR += chruby
     SUBDIR += cirrus-cli
     SUBDIR += cityhash
     SUBDIR += cjose
     SUBDIR += cl-alexandria
     SUBDIR += cl-alexandria-sbcl
     SUBDIR += cl-asdf
     SUBDIR += cl-cffi
     SUBDIR += cl-infix
     SUBDIR += cl-infix-sbcl
     SUBDIR += cl-port
     SUBDIR += cl-port-sbcl
     SUBDIR += cl-split-sequence
     SUBDIR += cl-split-sequence-sbcl
     SUBDIR += cl-trivial-features
     SUBDIR += cl-trivial-features-sbcl
     SUBDIR += cl-trivial-gray-streams
     SUBDIR += cl-trivial-gray-streams-sbcl
     SUBDIR += clazy
     SUBDIR += cld2
     SUBDIR += clewn
     SUBDIR += cli
     SUBDIR += cli11
     SUBDIR += clig
     SUBDIR += cligen
     SUBDIR += clinfo
     SUBDIR += clipp
     SUBDIR += clisp-hyperspec
     SUBDIR += clixon
     SUBDIR += clojure-cider
     SUBDIR += cloudabi
     SUBDIR += cloudabi-toolchain
     SUBDIR += clthreads
     SUBDIR += cltune
     SUBDIR += clxclient
     SUBDIR += cmake
     SUBDIR += cmake-core
     SUBDIR += cmake-doc
     SUBDIR += cmake-fedora
     SUBDIR += cmake-gui
     SUBDIR += cmake-man
     SUBDIR += cmake-modules-webos
     SUBDIR += cmakedoc
     SUBDIR += cmph
     SUBDIR += cmunge
     SUBDIR += coccinelle
     SUBDIR += cocogitto
     SUBDIR += codeblocks
     SUBDIR += codequery
     SUBDIR += codesearch-py
     SUBDIR += collada-dom
     SUBDIR += color
     SUBDIR += colorgcc
     SUBDIR += colormake
     SUBDIR += commit-patch
     SUBDIR += commitizen
     SUBDIR += commoncpp
     SUBDIR += compiler-rt
     SUBDIR += compiz-bcop
     SUBDIR += concurrencpp
     SUBDIR += concurrencykit
     SUBDIR += concurrentqueue
     SUBDIR += cons
     SUBDIR += cons-test
     SUBDIR += containers
     SUBDIR += convco
     SUBDIR += corrade
     SUBDIR += corrosion
     SUBDIR += courier-unicode
     SUBDIR += coursier
     SUBDIR += covtool
     SUBDIR += cpan-upload
     SUBDIR += cpan-upload-http
     SUBDIR += cpp-hocon
     SUBDIR += cpp-netlib
     SUBDIR += cpp-utilities
     SUBDIR += cpp2py
     SUBDIR += cppcheck
     SUBDIR += cppi
     SUBDIR += cpplint
     SUBDIR += cpprestsdk
     SUBDIR += cpptest
     SUBDIR += cppunit
     SUBDIR += cppurses
     SUBDIR += cpputest
     SUBDIR += cproto
     SUBDIR += cpu_features
     SUBDIR += cpu_rec_rs
     SUBDIR += cquery
     SUBDIR += cram
     SUBDIR += crc32c
     SUBDIR += creduce
     SUBDIR += critcl
     SUBDIR += criterion
     SUBDIR += cscope
     SUBDIR += cscout
     SUBDIR += csfml
     SUBDIR += csmith
     SUBDIR += csoap
     SUBDIR += cssc
     SUBDIR += ctags
     SUBDIR += ctre
     SUBDIR += ctypes.sh
     SUBDIR += cunit
     SUBDIR += cut
     SUBDIR += cutils
     SUBDIR += cutter
     SUBDIR += cvise
     SUBDIR += cvs
     SUBDIR += cvs+ipv6
     SUBDIR += cvs-devel
     SUBDIR += cvs-syncmail
     SUBDIR += cvs2cl
     SUBDIR += cvs2darcs
     SUBDIR += cvs2html
     SUBDIR += cvsadmin
     SUBDIR += cvsbook
     SUBDIR += cvschangelogbuilder
     SUBDIR += cvschk
     SUBDIR += cvsd
     SUBDIR += cvsdadm
     SUBDIR += cvsdelta
     SUBDIR += cvsdiff2patch
     SUBDIR += cvsgraph
     SUBDIR += cvslines
     SUBDIR += cvsmonitor
     SUBDIR += cvsplot
     SUBDIR += cvsps
     SUBDIR += cvsps-devel
     SUBDIR += cvsspam
     SUBDIR += cvstrac
     SUBDIR += cvsutils
     SUBDIR += cvsweb
     SUBDIR += cvsweb3
     SUBDIR += cvswrap
     SUBDIR += cweb
     SUBDIR += cwrap
     SUBDIR += cxmon
     SUBDIR += cxref
     SUBDIR += cxxopts
     SUBDIR += cxxtest
     SUBDIR += cxxtools
     SUBDIR += d-feet
     SUBDIR += d-scanner
     SUBDIR += d-spy
     SUBDIR += darts
     SUBDIR += dash.el
     SUBDIR += dasm
     SUBDIR += datadraw
     SUBDIR += date
     SUBDIR += dbus
     SUBDIR += dbus-c++
     SUBDIR += dbus-glib
     SUBDIR += dbus-java
     SUBDIR += dbus-sharp
     SUBDIR += dbus-sharp-glib
     SUBDIR += dbus-tcl
     SUBDIR += dcd-client
     SUBDIR += dcd-server
     SUBDIR += dconf
     SUBDIR += dconf-editor
     SUBDIR += debugedit
     SUBDIR += dee
     SUBDIR += deforaos-libsystem
     SUBDIR += deheader
     SUBDIR += delta
     SUBDIR += delve
     SUBDIR += deployer
     SUBDIR += derelict-sdl2
     SUBDIR += derelict-util
     SUBDIR += desed
     SUBDIR += desktop-file-utils
     SUBDIR += dev86
     SUBDIR += devhelp
     SUBDIR += devtodo
     SUBDIR += dfuife-curses
     SUBDIR += dia2code
     SUBDIR += dia2code+
     SUBDIR += dill
     SUBDIR += ding-libs
     SUBDIR += dispy
     SUBDIR += distcc
     SUBDIR += distel
     SUBDIR += distorm
     SUBDIR += djgpp-binutils
     SUBDIR += dlib
     SUBDIR += dmake
     SUBDIR += dmalloc
     SUBDIR += dmlc-core
     SUBDIR += docopt.cpp
     SUBDIR += doctest
     SUBDIR += doctorj
     SUBDIR += dolphin-plugins
     SUBDIR += dolphin-plugins-devel
     SUBDIR += dotconf
     SUBDIR += double-conversion
     SUBDIR += doxygen
     SUBDIR += dparser
     SUBDIR += dra
     SUBDIR += dragon
     SUBDIR += dsymbol
     SUBDIR += dtool
     SUBDIR += dub
     SUBDIR += dupl
     SUBDIR += duplo
     SUBDIR += dura
     SUBDIR += dwarf2json
     SUBDIR += dwarfdump
     SUBDIR += dwarves
     SUBDIR += dwz
     SUBDIR += dxa65
     SUBDIR += dyncall
     SUBDIR += e00compr
     SUBDIR += eastl
     SUBDIR += easy-profiler
     SUBDIR += easyexif
     SUBDIR += easygit
     SUBDIR += easyloggingpp
     SUBDIR += ebnf2yacc
     SUBDIR += ecgi
     SUBDIR += edi
     SUBDIR += editline
     SUBDIR += efivar
     SUBDIR += efl
     SUBDIR += egypt
     SUBDIR += eiffelstudio
     SUBDIR += electron27
     SUBDIR += electron28
     SUBDIR += electron29
     SUBDIR += electron30
     SUBDIR += elf
     SUBDIR += elf-dissector
     SUBDIR += elfcat
     SUBDIR += elfio
     SUBDIR += elfkickers
     SUBDIR += elfsh
     SUBDIR += elfutils
     SUBDIR += elixir-hex
     SUBDIR += elixir-make
     SUBDIR += elm-format
     SUBDIR += emacs-lsp-booster
     SUBDIR += embb
     SUBDIR += emscripten
     SUBDIR += entt
     SUBDIR += envsubst
     SUBDIR += epl.el
     SUBDIR += epm
     SUBDIR += eql5
     SUBDIR += eric6
     SUBDIR += erlang-cl
     SUBDIR += erlang-native-compiler
     SUBDIR += erlang-rebar3_hex
     SUBDIR += erlang-recon
     SUBDIR += es-eric6
     SUBDIR += esbuild
     SUBDIR += estd
     SUBDIR += etcd
     SUBDIR += etcd31
     SUBDIR += etcd32
     SUBDIR += etcd33
     SUBDIR += etcd34
     SUBDIR += etl
     SUBDIR += evcxr-jupyter
     SUBDIR += evdev-proto
     SUBDIR += evemu
     SUBDIR += eventxx
     SUBDIR += exercisix
     SUBDIR += exomizer
     SUBDIR += f77flow
     SUBDIR += fam
     SUBDIR += fastcrc
     SUBDIR += fatal
     SUBDIR += fbthrift
     SUBDIR += fc++
     SUBDIR += fccf
     SUBDIR += fcppt
     SUBDIR += ffs
     SUBDIR += fhist
     SUBDIR += fifechan
     SUBDIR += fire-hpp
     SUBDIR += firmware-utils
     SUBDIR += fistgen
     SUBDIR += flatbuffers
     SUBDIR += flatbuffers205
     SUBDIR += flatcc
     SUBDIR += flatzebra
     SUBDIR += flex-sdk
     SUBDIR += flex-sdk35
     SUBDIR += flexdock
     SUBDIR += flexjson
     SUBDIR += flyspray
     SUBDIR += fmake
     SUBDIR += fnc
     SUBDIR += fnm
     SUBDIR += folly
     SUBDIR += forge
     SUBDIR += forge-devel
     SUBDIR += fortran-utils
     SUBDIR += fortytwo-encore
     SUBDIR += fossil
     SUBDIR += fossology-nomos-standalone
     SUBDIR += fp16
     SUBDIR += fpp
     SUBDIR += freebsd-gcc12
     SUBDIR += freebsd-gcc13
     SUBDIR += freebsd-git-devtools
     SUBDIR += freebsd-sysroot
     SUBDIR += frink
     SUBDIR += fsmtrie
     SUBDIR += fstrcmp
     SUBDIR += fstrm
     SUBDIR += fsx
     SUBDIR += ftjam
     SUBDIR += ftnchek
     SUBDIR += ftxui
     SUBDIR += functionalplus
     SUBDIR += fungw
     SUBDIR += fuzzylite
     SUBDIR += fxdiv
     SUBDIR += g-golf
     SUBDIR += g-wrap
     SUBDIR += ga
     SUBDIR += gaa
     SUBDIR += gamin
     SUBDIR += gammaray
     SUBDIR += gauche-readline
     SUBDIR += gaul
     SUBDIR += gbump
     SUBDIR += gcc-arm-embedded
     SUBDIR += gcc-msp430-ti-toolchain
     SUBDIR += gccmakedep
     SUBDIR += gcem
     SUBDIR += gcli
     SUBDIR += gconf2
     SUBDIR += gconfmm26
     SUBDIR += gdb
     SUBDIR += gdcm
     SUBDIR += gdmd
     SUBDIR += geany
     SUBDIR += geany-plugin-addons
     SUBDIR += geany-plugin-autoclose
     SUBDIR += geany-plugin-automark
     SUBDIR += geany-plugin-codenav
     SUBDIR += geany-plugin-commander
     SUBDIR += geany-plugin-ctags
     SUBDIR += geany-plugin-debugger
     SUBDIR += geany-plugin-defineformat
     SUBDIR += geany-plugin-doc
     SUBDIR += geany-plugin-extrasel
     SUBDIR += geany-plugin-gendoc
     SUBDIR += geany-plugin-geniuspaste
     SUBDIR += geany-plugin-git-changebar
     SUBDIR += geany-plugin-insertnum
     SUBDIR += geany-plugin-latex
     SUBDIR += geany-plugin-lineoperations
     SUBDIR += geany-plugin-lipsum
     SUBDIR += geany-plugin-lua
     SUBDIR += geany-plugin-macro
     SUBDIR += geany-plugin-markdown
     SUBDIR += geany-plugin-miniscript
     SUBDIR += geany-plugin-numberedbookmarks
     SUBDIR += geany-plugin-overview
     SUBDIR += geany-plugin-pairtaghighlighter
     SUBDIR += geany-plugin-pg
     SUBDIR += geany-plugin-pohelper
     SUBDIR += geany-plugin-pretty-printer
     SUBDIR += geany-plugin-prj
     SUBDIR += geany-plugin-projectorganizer
     SUBDIR += geany-plugin-scope
     SUBDIR += geany-plugin-sendmail
     SUBDIR += geany-plugin-shiftcolumn
     SUBDIR += geany-plugin-spellcheck
     SUBDIR += geany-plugin-tableconvert
     SUBDIR += geany-plugin-treebrowser
     SUBDIR += geany-plugin-updatechecker
     SUBDIR += geany-plugin-utilslib
     SUBDIR += geany-plugin-vc
     SUBDIR += geany-plugin-vimode
     SUBDIR += geany-plugin-workbench
     SUBDIR += geany-plugin-xmlsnippets
     SUBDIR += geany-plugins
     SUBDIR += geany-plugins-l10n
     SUBDIR += geany-themes
     SUBDIR += generate
     SUBDIR += gengetopt
     SUBDIR += genht
     SUBDIR += genie
     SUBDIR += genromfs
     SUBDIR += getoptions
     SUBDIR += gettext
     SUBDIR += gettext-lint
     SUBDIR += gettext-msghack
     SUBDIR += gettext-po-mode
     SUBDIR += gettext-runtime
     SUBDIR += gettext-tiny
     SUBDIR += gettext-tools
     SUBDIR += gflags
     SUBDIR += gfold
     SUBDIR += gh
     SUBDIR += ghidra
     SUBDIR += ghostie
     SUBDIR += ghq
     SUBDIR += ghub
     SUBDIR += ghub-devel
     SUBDIR += gindent
     SUBDIR += gio-sharp
     SUBDIR += git
     SUBDIR += git-absorb
     SUBDIR += git-branchless
     SUBDIR += git-bug
     SUBDIR += git-cinnabar
     SUBDIR += git-cliff
     SUBDIR += git-codereview
     SUBDIR += git-cola
     SUBDIR += git-cvs
     SUBDIR += git-delta
     SUBDIR += git-extras
     SUBDIR += git-filter-repo
     SUBDIR += git-gui
     SUBDIR += git-lab
     SUBDIR += git-lfs
     SUBDIR += git-merge-changelog
     SUBDIR += git-modes
     SUBDIR += git-p4
     SUBDIR += git-prev-next
     SUBDIR += git-repo-manager
     SUBDIR += git-review
     SUBDIR += git-subrepo
     SUBDIR += git-svn
     SUBDIR += git-town
     SUBDIR += git-tui
     SUBDIR += git-workspace
     SUBDIR += gitaly
     SUBDIR += gitflow
     SUBDIR += gitg
     SUBDIR += github-backup-utils
     SUBDIR += gitinspector
     SUBDIR += gitlab-runner
     SUBDIR += gitlab-shell
     SUBDIR += gitleaks
     SUBDIR += gitlist
     SUBDIR += gitolite
     SUBDIR += gitolite2
     SUBDIR += gitoxide
     SUBDIR += gitqlient
     SUBDIR += gittrac
     SUBDIR += gitty
     SUBDIR += gitu
     SUBDIR += gitui
     SUBDIR += glab
     SUBDIR += glade
     SUBDIR += glademm
     SUBDIR += glaze
     SUBDIR += glib20
     SUBDIR += glibd
     SUBDIR += glibmm
     SUBDIR += glibmm26
     SUBDIR += glitter
     SUBDIR += gllvm
     SUBDIR += global
     SUBDIR += glog
     SUBDIR += glrparser
     SUBDIR += glui
     SUBDIR += gmake
     SUBDIR += gn
     SUBDIR += gnome-builder
     SUBDIR += gnome-common
     SUBDIR += gnu-efi
     SUBDIR += gnucflow
     SUBDIR += gnulib
     SUBDIR += gnulibiberty
     SUBDIR += gnustep
     SUBDIR += gnustep-make
     SUBDIR += go-bindata
     SUBDIR += go-bindata-assetfs
     SUBDIR += go-git
     SUBDIR += go-mode.el
     SUBDIR += go-perf
     SUBDIR += go-tools
     SUBDIR += go-wire
     SUBDIR += gob2
     SUBDIR += gobject-introspection
     SUBDIR += gocheese
     SUBDIR += gocritic
     SUBDIR += godot
     SUBDIR += godot-tools
     SUBDIR += godot35
     SUBDIR += godot35-tools
     SUBDIR += goffice
     SUBDIR += gogs
     SUBDIR += golangci-lint
     SUBDIR += golint
     SUBDIR += gomigrate
     SUBDIR += google-cloud-cpp
     SUBDIR += google-perftools
     SUBDIR += google-styleguide
     SUBDIR += googletest
     SUBDIR += gopls
     SUBDIR += goprotobuf
     SUBDIR += goredo
     SUBDIR += goreleaser
     SUBDIR += gorm
     SUBDIR += goswagger
     SUBDIR += got
     SUBDIR += gpds
     SUBDIR += gperf
     SUBDIR += gpm
     SUBDIR += gprbuild
     SUBDIR += gputils
     SUBDIR += gradle
     SUBDIR += gradle-completion
     SUBDIR += gradle5
     SUBDIR += gradle6
     SUBDIR += gradle62
     SUBDIR += gradle761
     SUBDIR += grantlee5
     SUBDIR += grcov
     SUBDIR += grex
     SUBDIR += grpc
     SUBDIR += grv
     SUBDIR += gsettings-desktop-schemas
     SUBDIR += gsoap
     SUBDIR += gstreamer1-plugins-soup
     SUBDIR += gtgt
     SUBDIR += gtranslator
     SUBDIR += guichan
     SUBDIR += guile-lib
     SUBDIR += gum
     SUBDIR += gumbo
     SUBDIR += gvfs
     SUBDIR += gvp
     SUBDIR += gwenhywfar
     SUBDIR += gwenhywfar-fox16
     SUBDIR += gwenhywfar-gtk2
     SUBDIR += gwenhywfar-gtk3
     SUBDIR += gwenhywfar-qt5
     SUBDIR += gzstream
     SUBDIR += hapy
     SUBDIR += hare
     SUBDIR += hcs12mem
     SUBDIR += heaptrack
     SUBDIR += heimdall
     SUBDIR += heirloom-devtools
     SUBDIR += hexcompare
     SUBDIR += hexd
     SUBDIR += hgreviewboard
     SUBDIR += hgsvn
     SUBDIR += highlighterkit
     SUBDIR += highway
     SUBDIR += hoel
     SUBDIR += hotspot
     SUBDIR += hp48cc
     SUBDIR += hp48xgcc
     SUBDIR += hpx
     SUBDIR += hs-ShellCheck
     SUBDIR += hs-alex
     SUBDIR += hs-cabal-install
     SUBDIR += hs-cpphs
     SUBDIR += hs-darcs
     SUBDIR += hs-ghc-events
     SUBDIR += hs-ghcprofview
     SUBDIR += hs-git-annex
     SUBDIR += hs-git-brunch
     SUBDIR += hs-happy
     SUBDIR += hs-haskell-language-server
     SUBDIR += hs-hasktags
     SUBDIR += hs-hlint
     SUBDIR += hs-hoogle
     SUBDIR += hs-hpack
     SUBDIR += hs-hspec-discover
     SUBDIR += hs-mueval
     SUBDIR += hs-ormolu
     SUBDIR += hs-profiteur
     SUBDIR += hs-shake
     SUBDIR += hs-spago
     SUBDIR += hs-threadscope
     SUBDIR += htable
     SUBDIR += hub
     SUBDIR += hvm
     SUBDIR += hwloc
     SUBDIR += hwloc2
     SUBDIR += hyperscan
     SUBDIR += hyprlang
     SUBDIR += hyprutils
     SUBDIR += hyprwayland-scanner
     SUBDIR += ice
     SUBDIR += ice37
     SUBDIR += icestorm
     SUBDIR += icmake
     SUBDIR += icontheme
     SUBDIR += icu
     SUBDIR += icu-le-hb
     SUBDIR += icu-lx
     SUBDIR += idutils
     SUBDIR += ignition-cmake
     SUBDIR += ignition-common
     SUBDIR += ignition-msgs
     SUBDIR += ignition-plugin
     SUBDIR += ignition-tools
     SUBDIR += ikos
     SUBDIR += imake
     SUBDIR += immer
     SUBDIR += imtui
     SUBDIR += inastemp
     SUBDIR += include-what-you-use
     SUBDIR += indi
     SUBDIR += indicators
     SUBDIR += influx-pkg-config
     SUBDIR += inifiled
     SUBDIR += inih
     SUBDIR += inilib
     SUBDIR += inilike
     SUBDIR += iniparser
     SUBDIR += initutil
     SUBDIR += injeqt
     SUBDIR += intel-graphics-compiler
     SUBDIR += interactive_rebase_tool
     SUBDIR += ioncube
     SUBDIR += ipython
     SUBDIR += ireport
     SUBDIR += isa-l
     SUBDIR += iscd-commons
     SUBDIR += isfreedesktop
     SUBDIR += isl
     SUBDIR += ispc
     SUBDIR += ittapi
     SUBDIR += ivykis
     SUBDIR += jam
     SUBDIR += jansson
     SUBDIR += java-findbugs
     SUBDIR += jclassinfo
     SUBDIR += jcmdline
     SUBDIR += jech-dht
     SUBDIR += jenkins
     SUBDIR += jenkins-lts
     SUBDIR += jetbrains-clion
     SUBDIR += jetbrains-goland
     SUBDIR += jetbrains-phpstorm
     SUBDIR += jetbrains-pty4j
     SUBDIR += jetbrains-restarter
     SUBDIR += jetbrains-rustrover
     SUBDIR += jetbrains-sqlite
     SUBDIR += jetbrains-webstorm
     SUBDIR += jgoodies-looks
     SUBDIR += jiic
     SUBDIR += jiri
     SUBDIR += jline
     SUBDIR += jna
     SUBDIR += jrtplib
     SUBDIR += jsap
     SUBDIR += jsl
     SUBDIR += jsmin
     SUBDIR += json-c
     SUBDIR += json-dto
     SUBDIR += json-fortran
     SUBDIR += json-glib
     SUBDIR += jsoncpp
     SUBDIR += jsonnet
     SUBDIR += jsonrpc-glib
     SUBDIR += juce
     SUBDIR += juce706
     SUBDIR += judy
     SUBDIR += jujutsu
     SUBDIR += jwasm
     SUBDIR += kBuild
     SUBDIR += kapptemplate
     SUBDIR += kcachegrind
     SUBDIR += kconfig-frontends
     SUBDIR += kcov
     SUBDIR += kdbg
     SUBDIR += kde-dev-scripts
     SUBDIR += kde-dev-utils
     SUBDIR += kdesdk
     SUBDIR += kdesdk-kio
     SUBDIR += kdesdk-thumbnailers
     SUBDIR += kdesvn
     SUBDIR += kdev-php
     SUBDIR += kdev-python
     SUBDIR += kdevelop
     SUBDIR += kdevelop-pg-qt
     SUBDIR += kerl
     SUBDIR += kf5-extra-cmake-modules
     SUBDIR += kf5-kapidox
     SUBDIR += kf5-kauth
     SUBDIR += kf5-kbookmarks
     SUBDIR += kf5-kcmutils
     SUBDIR += kf5-kconfig
     SUBDIR += kf5-kcoreaddons
     SUBDIR += kf5-kcrash
     SUBDIR += kf5-kdbusaddons
     SUBDIR += kf5-kdeclarative
     SUBDIR += kf5-kdoctools
     SUBDIR += kf5-kfilemetadata
     SUBDIR += kf5-ki18n
     SUBDIR += kf5-kidletime
     SUBDIR += kf5-kio
     SUBDIR += kf5-kitemmodels
     SUBDIR += kf5-knewstuff
     SUBDIR += kf5-knotifications
     SUBDIR += kf5-knotifyconfig
     SUBDIR += kf5-kpackage
     SUBDIR += kf5-kparts
     SUBDIR += kf5-kpeople
     SUBDIR += kf5-kpty
     SUBDIR += kf5-kservice
     SUBDIR += kf5-ktexteditor
     SUBDIR += kf5-kunitconversion
     SUBDIR += kf5-solid
     SUBDIR += kf5-threadweaver
     SUBDIR += kf6-extra-cmake-modules
     SUBDIR += kf6-kapidox
     SUBDIR += kf6-kauth
     SUBDIR += kf6-kbookmarks
     SUBDIR += kf6-kcmutils
     SUBDIR += kf6-kconfig
     SUBDIR += kf6-kcoreaddons
     SUBDIR += kf6-kcrash
     SUBDIR += kf6-kdbusaddons
     SUBDIR += kf6-kdeclarative
     SUBDIR += kf6-kdoctools
     SUBDIR += kf6-kfilemetadata
     SUBDIR += kf6-ki18n
     SUBDIR += kf6-kidletime
     SUBDIR += kf6-kio
     SUBDIR += kf6-kitemmodels
     SUBDIR += kf6-knewstuff
     SUBDIR += kf6-knotifications
     SUBDIR += kf6-knotifyconfig
     SUBDIR += kf6-kpackage
     SUBDIR += kf6-kparts
     SUBDIR += kf6-kpeople
     SUBDIR += kf6-kpty
     SUBDIR += kf6-kservice
     SUBDIR += kf6-ktexteditor
     SUBDIR += kf6-ktexttemplate
     SUBDIR += kf6-kunitconversion
     SUBDIR += kf6-solid
     SUBDIR += kf6-threadweaver
     SUBDIR += kio-extras
     SUBDIR += kirigami-gallery
     SUBDIR += klib
     SUBDIR += kms-cmake-utils
     SUBDIR += kodi-platform
     SUBDIR += kokkos
     SUBDIR += kommit
     SUBDIR += kore
     SUBDIR += kpublictransport
     SUBDIR += kronosnet
     SUBDIR += ksql
     SUBDIR += ktextaddons
     SUBDIR += kyra
     SUBDIR += kyua
     SUBDIR += lab
     SUBDIR += lager
     SUBDIR += laminar
     SUBDIR += lasi
     SUBDIR += lattice-ice40-examples-hx1k
     SUBDIR += lattice-ice40-examples-hx8k
     SUBDIR += lattice-ice40-tools
     SUBDIR += lazygit
     SUBDIR += lcov
     SUBDIR += leaktracer
     SUBDIR += leatherman
     SUBDIR += lefthook
     SUBDIR += leiningen
     SUBDIR += lemon
     SUBDIR += lets
     SUBDIR += level-zero
     SUBDIR += lfcbase
     SUBDIR += lfcxml
     SUBDIR += libCello
     SUBDIR += libIDL
     SUBDIR += libPropList
     SUBDIR += libabigail
     SUBDIR += libac
     SUBDIR += libafterbase
     SUBDIR += libantlr3c
     SUBDIR += libantlr4
     SUBDIR += libappindicator
     SUBDIR += libaravis
     SUBDIR += libarea
     SUBDIR += libarena
     SUBDIR += libassa
     SUBDIR += libassetml
     SUBDIR += libast
     SUBDIR += libastylej
     SUBDIR += libastylej-arduino
     SUBDIR += libatomic_ops
     SUBDIR += libaura
     SUBDIR += libavl
     SUBDIR += libayatana-appindicator
     SUBDIR += libayatana-indicator
     SUBDIR += libb2
     SUBDIR += libbacktrace
     SUBDIR += libbde
     SUBDIR += libbegemot
     SUBDIR += libbfd
     SUBDIR += libbinio
     SUBDIR += libbpfjit
     SUBDIR += libbson
     SUBDIR += libburn
     SUBDIR += libcbor
     SUBDIR += libccid
     SUBDIR += libcdada
     SUBDIR += libcdb
     SUBDIR += libcds
     SUBDIR += libcfu
     SUBDIR += libchipcard
     SUBDIR += libcidr
     SUBDIR += libcii
     SUBDIR += libcircllhist
     SUBDIR += libcjson
     SUBDIR += libclc
     SUBDIR += libcli
     SUBDIR += libconcurrent
     SUBDIR += libconfig
     SUBDIR += libconfuse
     SUBDIR += libcreg
     SUBDIR += libcrossguid
     SUBDIR += libcsptr
     SUBDIR += libcuckoo
     SUBDIR += libcutl
     SUBDIR += libcwd
     SUBDIR += libdaemon
     SUBDIR += libdap
     SUBDIR += libdatadog
     SUBDIR += libdatovka
     SUBDIR += libdatrie
     SUBDIR += libdbusmenu
     SUBDIR += libdbusmenu-lxqt
     SUBDIR += libdbusmenu-qt
     SUBDIR += libddoc
     SUBDIR += libddwaf
     SUBDIR += libdevq
     SUBDIR += libdfui
     SUBDIR += libdill
     SUBDIR += libdisasm
     SUBDIR += libdisorder
     SUBDIR += libdispatch
     SUBDIR += libdistance
     SUBDIR += libdlmalloc
     SUBDIR += libdnsres
     SUBDIR += libdombey
     SUBDIR += libdparse
     SUBDIR += libds
     SUBDIR += libdsp
     SUBDIR += libdwarf
     SUBDIR += libe
     SUBDIR += libedit
     SUBDIR += libegit2
     SUBDIR += libeio
     SUBDIR += libelf
     SUBDIR += libepoll-shim
     SUBDIR += libepp-nicbr
     SUBDIR += liberasurecode
     SUBDIR += libesedb
     SUBDIR += libestr
     SUBDIR += libev
     SUBDIR += libevdev
     SUBDIR += libevdevplus
     SUBDIR += libevent
     SUBDIR += libevent-devel
     SUBDIR += libevt
     SUBDIR += libevtx
     SUBDIR += libewf
     SUBDIR += libexplain
     SUBDIR += libfaketime
     SUBDIR += libfastcommon
     SUBDIR += libfastjson
     SUBDIR += libffcall
     SUBDIR += libffi
     SUBDIR += libffi321
     SUBDIR += libffi33
     SUBDIR += libfirm
     SUBDIR += libfixposix
     SUBDIR += libflatarray
     SUBDIR += libfmt
     SUBDIR += libfort
     SUBDIR += libfortuna
     SUBDIR += libfreefare
     SUBDIR += libfsapfs
     SUBDIR += libfsext
     SUBDIR += libfsfat
     SUBDIR += libfshfs
     SUBDIR += libfsntfs
     SUBDIR += libfsxfs
     SUBDIR += libftdi
     SUBDIR += libftdi1
     SUBDIR += libfwnt
     SUBDIR += libfwsi
     SUBDIR += libg19
     SUBDIR += libg19draw
     SUBDIR += libgamepad
     SUBDIR += libgdata
     SUBDIR += libgee
     SUBDIR += libgee06
     SUBDIR += libgetline
     SUBDIR += libgit2
     SUBDIR += libgit2-glib
     SUBDIR += libglade2
     SUBDIR += libglademm24
     SUBDIR += libgnt
     SUBDIR += libgnuregex
     SUBDIR += libgpc
     SUBDIR += libgpkg
     SUBDIR += libgpr
     SUBDIR += libgrading
     SUBDIR += libgraphqlparser
     SUBDIR += libgsf
     SUBDIR += libgta
     SUBDIR += libgtop
     SUBDIR += libgudev
     SUBDIR += libgusb
     SUBDIR += libgutenfetch
     SUBDIR += libheinz
     SUBDIR += libhoard
     SUBDIR += libhtp
     SUBDIR += libibuddy
     SUBDIR += libical
     SUBDIR += libiec61850
     SUBDIR += libindicator
     SUBDIR += libinjection
     SUBDIR += libinotify
     SUBDIR += libiqxmlrpc
     SUBDIR += libisofs
     SUBDIR += libixp
     SUBDIR += libjitterentropy
     SUBDIR += libjodycode
     SUBDIR += libk8055
     SUBDIR += libkiwix
     SUBDIR += libklel
     SUBDIR += liblangtag
     SUBDIR += liblnk
     SUBDIR += liblockfile
     SUBDIR += liblogging
     SUBDIR += liblognorm
     SUBDIR += liblouis
     SUBDIR += liblpm
     SUBDIR += libltdl
     SUBDIR += libluksde
     SUBDIR += liblxqt
     SUBDIR += libmaa
     SUBDIR += libmatheval
     SUBDIR += libmatthew
     SUBDIR += libmba
     SUBDIR += libmcfp
     SUBDIR += libmill
     SUBDIR += libmimedir
     SUBDIR += libmodi
     SUBDIR += libmowgli
     SUBDIR += libmowgli2
     SUBDIR += libmpcbdm
     SUBDIR += libmsiecf
     SUBDIR += libmsocket
     SUBDIR += libmtdev
     SUBDIR += libmtrie
     SUBDIR += libmustache
     SUBDIR += libnaji
     SUBDIR += libnest2d-ultimaker
     SUBDIR += libnfc
     SUBDIR += libnjs
     SUBDIR += libnotify
     SUBDIR += libnsutils
     SUBDIR += liboil
     SUBDIR += libolecf
     SUBDIR += libopenbsd
     SUBDIR += libopencm3
     SUBDIR += libopentracing
     SUBDIR += liborcus
     SUBDIR += libosinfo
     SUBDIR += libowfat
     SUBDIR += libpafe
     SUBDIR += libpafe-ruby
     SUBDIR += libparserutils
     SUBDIR += libpasori
     SUBDIR += libpci
     SUBDIR += libpciaccess
     SUBDIR += libpcl
     SUBDIR += libpdel
     SUBDIR += libpeak
     SUBDIR += libpeas
     SUBDIR += libpff
     SUBDIR += libphdi
     SUBDIR += libphonenumber
     SUBDIR += libplist
     SUBDIR += libpo6
     SUBDIR += libpololu-avr
     SUBDIR += libpru
     SUBDIR += libqb
     SUBDIR += libqcow
     SUBDIR += libqsbr
     SUBDIR += libqt6xdg
     SUBDIR += libqtxdg
     SUBDIR += libr3
     SUBDIR += librcc
     SUBDIR += librcd
     SUBDIR += libreadline-java
     SUBDIR += libregf
     SUBDIR += librelp
     SUBDIR += librest
     SUBDIR += librevisa
     SUBDIR += librevisa-vish
     SUBDIR += librevisa-vxi
     SUBDIR += librolegen
     SUBDIR += librttopo
     SUBDIR += libruin
     SUBDIR += libs11n
     SUBDIR += libsavitar
     SUBDIR += libscca
     SUBDIR += libscfg
     SUBDIR += libsearpc
     SUBDIR += libserdes
     SUBDIR += libserialport
     SUBDIR += libshbuf
     SUBDIR += libshhmsg
     SUBDIR += libshhopt
     SUBDIR += libsigc++20
     SUBDIR += libsigc++30
     SUBDIR += libsigrok
     SUBDIR += libsigrokdecode
     SUBDIR += libsigscan
     SUBDIR += libsigsegv
     SUBDIR += libsimdpp
     SUBDIR += libslang2
     SUBDIR += libsmdev
     SUBDIR += libsml
     SUBDIR += libsmpp34
     SUBDIR += libsmraw
     SUBDIR += libsoup
     SUBDIR += libsoup3
     SUBDIR += libspice-server
     SUBDIR += libstatgrab
     SUBDIR += libstatgrab0
     SUBDIR += libstrfunc
     SUBDIR += libstroke
     SUBDIR += libsysctlmibinfo
     SUBDIR += libsysctlmibinfo2
     SUBDIR += libsysinfo
     SUBDIR += libtai
     SUBDIR += libtap
     SUBDIR += libtecla
     SUBDIR += libtermkey
     SUBDIR += libtextstyle
     SUBDIR += libthai
     SUBDIR += libthmap
     SUBDIR += libthreadar
     SUBDIR += libtickit
     SUBDIR += libtifiles2
     SUBDIR += libtool
     SUBDIR += libtpl
     SUBDIR += libtsm
     SUBDIR += libtuntap
     SUBDIR += libublio
     SUBDIR += libubox
     SUBDIR += libudev-devd
     SUBDIR += libuinputplus
     SUBDIR += libuiohook
     SUBDIR += libukcprog
     SUBDIR += libunicode
     SUBDIR += libuninum
     SUBDIR += libunistring
     SUBDIR += libunit
     SUBDIR += libunwind
     SUBDIR += libuutil
     SUBDIR += libuv
     SUBDIR += libvanessa_adt
     SUBDIR += libvanessa_logger
     SUBDIR += libvanessa_socket
     SUBDIR += libvc
     SUBDIR += libversion
     SUBDIR += libvex
     SUBDIR += libvhdi
     SUBDIR += libvirt
     SUBDIR += libvirt-dbus
     SUBDIR += libvirt-glib
     SUBDIR += libvirt-java
     SUBDIR += libvmdk
     SUBDIR += libvolume_id
     SUBDIR += libvsapm
     SUBDIR += libvsgpt
     SUBDIR += libvshadow
     SUBDIR += libvslvm
     SUBDIR += libvterm
     SUBDIR += libwasmtime
     SUBDIR += libx86
     SUBDIR += libxalloc
     SUBDIR += libxo
     SUBDIR += libxs
     SUBDIR += libxsd
     SUBDIR += libxsd-frontend
     SUBDIR += libxtend
     SUBDIR += libzakalwe
     SUBDIR += libzim
     SUBDIR += libzookeeper
     SUBDIR += libzvbi
     SUBDIR += lightning
     SUBDIR += linenoise
     SUBDIR += linenoise-ng
     SUBDIR += linux-c7-dbus-libs
     SUBDIR += linux-c7-devtools
     SUBDIR += linux-c7-devtoolset
     SUBDIR += linux-c7-elfutils-libelf
     SUBDIR += linux-c7-elfutils-libs
     SUBDIR += linux-c7-icu
     SUBDIR += linux-c7-libaio
     SUBDIR += linux-c7-libgfortran
     SUBDIR += linux-c7-libglade2
     SUBDIR += linux-c7-libpciaccess
     SUBDIR += linux-c7-libsigc++20
     SUBDIR += linux-c7-libthai
     SUBDIR += linux-c7-libtool-ltdl
     SUBDIR += linux-c7-libunwind
     SUBDIR += linux-c7-make
     SUBDIR += linux-c7-nspr
     SUBDIR += linux-c7-qt
     SUBDIR += linux-c7-sdl12
     SUBDIR += linux-c7-sdl20
     SUBDIR += linux-c7-strace
     SUBDIR += linux-c7-systemd-libs
     SUBDIR += linux-c7-zlib-devel
     SUBDIR += linux-ltp
     SUBDIR += linux-rl9-dbus-libs
     SUBDIR += linux-rl9-devtools
     SUBDIR += linux-rl9-elfutils-libelf
     SUBDIR += linux-rl9-elfutils-libs
     SUBDIR += linux-rl9-icu
     SUBDIR += linux-rl9-libevent
     SUBDIR += linux-rl9-libgfortran
     SUBDIR += linux-rl9-libpciaccess
     SUBDIR += linux-rl9-libsigc++20
     SUBDIR += linux-rl9-libsigsegv
     SUBDIR += linux-rl9-libsoup
     SUBDIR += linux-rl9-libthai
     SUBDIR += linux-rl9-libunistring
     SUBDIR += linux-rl9-llvm
     SUBDIR += linux-rl9-nspr
     SUBDIR += linux-rl9-ocl-icd
     SUBDIR += linux-rl9-orc
     SUBDIR += linux-rl9-strace
     SUBDIR += linux-rl9-systemd-libs
     SUBDIR += linux-sublime-merge
     SUBDIR += linux_libusb
     SUBDIR += listserialc
     SUBDIR += liteide
     SUBDIR += llbuild
     SUBDIR += lldb-mi
     SUBDIR += llnextgen
     SUBDIR += llvm
     SUBDIR += llvm-cheri
     SUBDIR += llvm-cheriot
     SUBDIR += llvm-devel
     SUBDIR += llvm-morello
     SUBDIR += llvm11
     SUBDIR += llvm12
     SUBDIR += llvm13
     SUBDIR += llvm14
     SUBDIR += llvm15
     SUBDIR += llvm16
     SUBDIR += llvm17
     SUBDIR += llvm18
     SUBDIR += lm4tools
     SUBDIR += lmdbg
     SUBDIR += lndir
     SUBDIR += lnphost
     SUBDIR += loccount
     SUBDIR += lockfree-malloc
     SUBDIR += log4c
     SUBDIR += log4cplus
     SUBDIR += log4cpp
     SUBDIR += log4cxx
     SUBDIR += log4j
     SUBDIR += log4net
     SUBDIR += log4sh
     SUBDIR += log4shib
     SUBDIR += loguru
     SUBDIR += lokalize
     SUBDIR += loki
     SUBDIR += love
     SUBDIR += love07
     SUBDIR += love08
     SUBDIR += love10
     SUBDIR += love5
     SUBDIR += lpc21isp
     SUBDIR += lrmi
     SUBDIR += lua-Penlight
     SUBDIR += lua-argparse
     SUBDIR += lua-bitlib
     SUBDIR += lua-bitop
     SUBDIR += lua-cjson
     SUBDIR += lua-cqueues
     SUBDIR += lua-gettext
     SUBDIR += lua-lgi
     SUBDIR += lua-libevent
     SUBDIR += lua-lpeg
     SUBDIR += lua-luacheck
     SUBDIR += lua-luarocks
     SUBDIR += lua-lunit
     SUBDIR += lua-mode
     SUBDIR += lua-posix
     SUBDIR += lua-pty
     SUBDIR += lua-rds-parser
     SUBDIR += lua-resty-string
     SUBDIR += lua-stdlib
     SUBDIR += lua-stdlib-debug
     SUBDIR += lua-stdlib-normalize
     SUBDIR += lua-sysctl
     SUBDIR += luabind
     SUBDIR += luafilesystem
     SUBDIR += luajava
     SUBDIR += lutok
     SUBDIR += luv
     SUBDIR += lwp
     SUBDIR += lxqt-build-tools
     SUBDIR += lxqt2-build-tools
     SUBDIR += lyra
     SUBDIR += m17n-db
     SUBDIR += m17n-docs
     SUBDIR += m17n-inscript2
     SUBDIR += m17n-lib
     SUBDIR += m4
     SUBDIR += mage
     SUBDIR += magic_enum
     SUBDIR += magit
     SUBDIR += magit-devel
     SUBDIR += make++
     SUBDIR += makedepend
     SUBDIR += malloy
     SUBDIR += marisa-trie
     SUBDIR += marl
     SUBDIR += massif-visualizer
     SUBDIR += mate-common
     SUBDIR += matreshka
     SUBDIR += maven
     SUBDIR += maven-wrapper
     SUBDIR += maven363
     SUBDIR += maven39
     SUBDIR += mcpp
     SUBDIR += mdb
     SUBDIR += mdds
     SUBDIR += mdspan
     SUBDIR += menhir
     SUBDIR += mercurial
     SUBDIR += mergify
     SUBDIR += meson
     SUBDIR += meson-python
     SUBDIR += microsoft-gsl
     SUBDIR += mill
     SUBDIR += mimalloc
     SUBDIR += mimir
     SUBDIR += mir-core
     SUBDIR += mk-configure
     SUBDIR += mm
     SUBDIR += mm-common
     SUBDIR += modd
     SUBDIR += mold
     SUBDIR += mongo-c-driver
     SUBDIR += mono-addins
     SUBDIR += mpatrol
     SUBDIR += mph
     SUBDIR += mrc
     SUBDIR += msbuild
     SUBDIR += msgpack-c
     SUBDIR += msgpack-cxx
     SUBDIR += msgpack-d
     SUBDIR += msgpuck
     SUBDIR += msitools
     SUBDIR += msp430-debug-stack
     SUBDIR += mspdebug
     SUBDIR += mstch
     SUBDIR += mtbl
     SUBDIR += muon
     SUBDIR += mustache
     SUBDIR += mutagen
     SUBDIR += myrepos
     SUBDIR += nana
     SUBDIR += nano-signal-slot
     SUBDIR += nanopb
     SUBDIR += nant
     SUBDIR += nasm
     SUBDIR += naturaldocs
     SUBDIR += ncc
     SUBDIR += ncnf
     SUBDIR += ncurses
     SUBDIR += ndesk-dbus
     SUBDIR += ndesk-dbus-glib
     SUBDIR += ndesk-options
     SUBDIR += netscape-java40
     SUBDIR += netsurf-buildsystem
     SUBDIR += newfile
     SUBDIR += newt
     SUBDIR += newtonsoft-json
     SUBDIR += nextest
     SUBDIR += nextpnr
     SUBDIR += nexus2-oss
     SUBDIR += nimble
     SUBDIR += nini
     SUBDIR += ninja
     SUBDIR += nlohmann-json
     SUBDIR += node-thrift
     SUBDIR += notcurses
     SUBDIR += notify-sharp
     SUBDIR += nox
     SUBDIR += npth
     SUBDIR += nsgenbind
     SUBDIR += nspr
     SUBDIR += nss_wrapper
     SUBDIR += nsync
     SUBDIR += nuitka
     SUBDIR += ob-rust
     SUBDIR += obby
     SUBDIR += objconv
     SUBDIR += objecthash
     SUBDIR += objfw
     SUBDIR += ocaml-annexlib
     SUBDIR += ocaml-astring
     SUBDIR += ocaml-base
     SUBDIR += ocaml-bos
     SUBDIR += ocaml-calendar
     SUBDIR += ocaml-camljava
     SUBDIR += ocaml-camlp-streams
     SUBDIR += ocaml-camlp4
     SUBDIR += ocaml-camlp5
     SUBDIR += ocaml-camomile
     SUBDIR += ocaml-camomile-examples
     SUBDIR += ocaml-cfg
     SUBDIR += ocaml-classes
     SUBDIR += ocaml-cmdliner
     SUBDIR += ocaml-compiler-libs
     SUBDIR += ocaml-cppo
     SUBDIR += ocaml-csexp
     SUBDIR += ocaml-cstruct
     SUBDIR += ocaml-curses
     SUBDIR += ocaml-domain-name
     SUBDIR += ocaml-dune
     SUBDIR += ocaml-extlib
     SUBDIR += ocaml-findlib
     SUBDIR += ocaml-fmt
     SUBDIR += ocaml-fpath
     SUBDIR += ocaml-ipaddr
     SUBDIR += ocaml-lacaml
     SUBDIR += ocaml-logs
     SUBDIR += ocaml-lwt
     SUBDIR += ocaml-magic
     SUBDIR += ocaml-mtime
     SUBDIR += ocaml-ocamlbuild
     SUBDIR += ocaml-ocplib-endian
     SUBDIR += ocaml-opam
     SUBDIR += ocaml-ounit
     SUBDIR += ocaml-parmap
     SUBDIR += ocaml-parsexp
     SUBDIR += ocaml-pcre
     SUBDIR += ocaml-pcre2
     SUBDIR += ocaml-pomap
     SUBDIR += ocaml-ppx-tools
     SUBDIR += ocaml-ppx_derivers
     SUBDIR += ocaml-ppx_sexp_conv
     SUBDIR += ocaml-ppxlib
     SUBDIR += ocaml-re
     SUBDIR += ocaml-react
     SUBDIR += ocaml-res
     SUBDIR += ocaml-result
     SUBDIR += ocaml-rresult
     SUBDIR += ocaml-sdl
     SUBDIR += ocaml-sem
     SUBDIR += ocaml-seq
     SUBDIR += ocaml-sexplib
     SUBDIR += ocaml-sexplib0
     SUBDIR += ocaml-stdio
     SUBDIR += ocaml-topkg
     SUBDIR += ocaml-type_conv
     SUBDIR += ocaml-uchar
     SUBDIR += ocaml-ulex
     SUBDIR += ocaml-uutf
     SUBDIR += ocaml-xstr
     SUBDIR += ocaml-xstrp4
     SUBDIR += oci-cli
     SUBDIR += ocl-icd
     SUBDIR += oclgrind
     SUBDIR += ode
     SUBDIR += ois
     SUBDIR += okteta
     SUBDIR += omake
     SUBDIR += omniORB
     SUBDIR += omnilinter
     SUBDIR += onetbb
     SUBDIR += oniguruma
     SUBDIR += open-beagle
     SUBDIR += open62541
     SUBDIR += opencl
     SUBDIR += opencl-clang
     SUBDIR += opencvs
     SUBDIR += opendht
     SUBDIR += opengrok
     SUBDIR += openocd
     SUBDIR += opentelemetry-cpp
     SUBDIR += opentelemetry-proto
     SUBDIR += openwince-include
     SUBDIR += orc
     SUBDIR += orcania
     SUBDIR += osc
     SUBDIR += ossp-al
     SUBDIR += ossp-cfg
     SUBDIR += ossp-ex
     SUBDIR += ossp-l2
     SUBDIR += ossp-val
     SUBDIR += ossp-var
     SUBDIR += ossp-xds
     SUBDIR += outcome
     SUBDIR += p4
     SUBDIR += p4.el
     SUBDIR += p4api
     SUBDIR += p4delta
     SUBDIR += p4genpatch
     SUBDIR += p5-AI-Pathfinding-AStar
     SUBDIR += p5-AI-Prolog
     SUBDIR += p5-ARGV-Struct
     SUBDIR += p5-AWS-Signature4
     SUBDIR += p5-Acme-Comment
     SUBDIR += p5-Acme-Damn
     SUBDIR += p5-Acme-MetaSyntactic
     SUBDIR += p5-Adapter-Async
     SUBDIR += p5-Agent
     SUBDIR += p5-Algorithm-Accounting
     SUBDIR += p5-Algorithm-Annotate
     SUBDIR += p5-Algorithm-Backoff
     SUBDIR += p5-Algorithm-Binpack
     SUBDIR += p5-Algorithm-Bucketizer
     SUBDIR += p5-Algorithm-C3
     SUBDIR += p5-Algorithm-ChooseSubsets
     SUBDIR += p5-Algorithm-Cluster
     SUBDIR += p5-Algorithm-Cron
     SUBDIR += p5-Algorithm-Dependency
     SUBDIR += p5-Algorithm-Dependency-Objects
     SUBDIR += p5-Algorithm-Diff
     SUBDIR += p5-Algorithm-Evolutionary
     SUBDIR += p5-Algorithm-FloodControl
     SUBDIR += p5-Algorithm-IncludeExclude
     SUBDIR += p5-Algorithm-Interval2Prefix
     SUBDIR += p5-Algorithm-LCS
     SUBDIR += p5-Algorithm-LUHN
     SUBDIR += p5-Algorithm-MarkovChain
     SUBDIR += p5-Algorithm-Merge
     SUBDIR += p5-Algorithm-MinMax
     SUBDIR += p5-Algorithm-NaiveBayes
     SUBDIR += p5-Algorithm-Networksort
     SUBDIR += p5-Algorithm-Numerical-Shuffle
     SUBDIR += p5-Algorithm-Permute
     SUBDIR += p5-Algorithm-SVM
     SUBDIR += p5-Alias
     SUBDIR += p5-Alien-Base-ModuleBuild
     SUBDIR += p5-Alien-Build
     SUBDIR += p5-Alien-LibGumbo
     SUBDIR += p5-Alien-SDL
     SUBDIR += p5-Alien-cmake3
     SUBDIR += p5-Alzabo
     SUBDIR += p5-Any-Daemon
     SUBDIR += p5-Any-Moose
     SUBDIR += p5-Any-Moose-Convert
     SUBDIR += p5-AnyData
     SUBDIR += p5-AnyEvent
     SUBDIR += p5-AnyEvent-AIO
     SUBDIR += p5-AnyEvent-Connection
     SUBDIR += p5-AnyEvent-Connector
     SUBDIR += p5-AnyEvent-DBI
     SUBDIR += p5-AnyEvent-DBI-Abstract
     SUBDIR += p5-AnyEvent-DBus
     SUBDIR += p5-AnyEvent-Filesys-Notify
     SUBDIR += p5-AnyEvent-Fork
     SUBDIR += p5-AnyEvent-Gearman
     SUBDIR += p5-AnyEvent-Graphite
     SUBDIR += p5-AnyEvent-I3
     SUBDIR += p5-AnyEvent-MessagePack
     SUBDIR += p5-AnyEvent-RPC
     SUBDIR += p5-AnyEvent-Run
     SUBDIR += p5-AnyEvent-Subprocess
     SUBDIR += p5-AnyEvent-Task
     SUBDIR += p5-AnyEvent-Worker
     SUBDIR += p5-AnyMQ
     SUBDIR += p5-App-Build
     SUBDIR += p5-App-CLI
     SUBDIR += p5-App-CLI-Extension
     SUBDIR += p5-App-Cache
     SUBDIR += p5-App-Cmd
     SUBDIR += p5-App-Control
     SUBDIR += p5-App-FatPacker
     SUBDIR += p5-App-GitGot
     SUBDIR += p5-App-GitHub
     SUBDIR += p5-App-Info
     SUBDIR += p5-App-Options
     SUBDIR += p5-App-Rad
     SUBDIR += p5-App-SD
     SUBDIR += p5-App-SVN-Bisect
     SUBDIR += p5-App-Trace
     SUBDIR += p5-App-cpanminus
     SUBDIR += p5-App-cpanminus-reporter
     SUBDIR += p5-App-cpanoutdated
     SUBDIR += p5-App-local-lib-helper
     SUBDIR += p5-App-perlbrew
     SUBDIR += p5-App-scan_prereqs_cpanfile
     SUBDIR += p5-AppConfig
     SUBDIR += p5-AppConfig-Std
     SUBDIR += p5-Array-Group
     SUBDIR += p5-Array-Heap
     SUBDIR += p5-Array-Iterator
     SUBDIR += p5-Array-Unique
     SUBDIR += p5-Array-Window
     SUBDIR += p5-Asm-Preproc
     SUBDIR += p5-Async-Interrupt
     SUBDIR += p5-Async-MergePoint
     SUBDIR += p5-AtExit
     SUBDIR += p5-Attribute-Handlers
     SUBDIR += p5-Attribute-Handlers-Prospective
     SUBDIR += p5-Attribute-Persistent
     SUBDIR += p5-AutoLoader
     SUBDIR += p5-AutoXS-Header
     SUBDIR += p5-Avro
     SUBDIR += p5-B-C
     SUBDIR += p5-B-COW
     SUBDIR += p5-B-Compiling
     SUBDIR += p5-B-Debug
     SUBDIR += p5-B-Deobfuscate
     SUBDIR += p5-B-Flags
     SUBDIR += p5-B-Generate
     SUBDIR += p5-B-Graph
     SUBDIR += p5-B-Hooks-AtRuntime
     SUBDIR += p5-B-Hooks-EndOfScope
     SUBDIR += p5-B-Hooks-OP-Annotation
     SUBDIR += p5-B-Hooks-OP-Check
     SUBDIR += p5-B-Hooks-OP-Check-EntersubForCV
     SUBDIR += p5-B-Hooks-OP-PPAddr
     SUBDIR += p5-B-Hooks-Parser
     SUBDIR += p5-B-Keywords
     SUBDIR += p5-B-OPCheck
     SUBDIR += p5-B-Size2
     SUBDIR += p5-B-Utils
     SUBDIR += p5-BFD
     SUBDIR += p5-BS-Event
     SUBDIR += p5-BSD-Resource
     SUBDIR += p5-BSD-devstat
     SUBDIR += p5-BSD-stat
     SUBDIR += p5-BZ-Client
     SUBDIR += p5-Badger
     SUBDIR += p5-Benchmark-Timer
     SUBDIR += p5-Best
     SUBDIR += p5-Border-Style
     SUBDIR += p5-BorderStyle
     SUBDIR += p5-BorderStyleBase
     SUBDIR += p5-BorderStyles-Standard
     SUBDIR += p5-Brannigan
     SUBDIR += p5-Bread-Board
     SUBDIR += p5-Bread-Board-Declare
     SUBDIR += p5-Bundle-Perl6
     SUBDIR += p5-C-Scan
     SUBDIR += p5-CBOR-XS
     SUBDIR += p5-CHI
     SUBDIR += p5-CHI-Driver-DBI
     SUBDIR += p5-CLASS
     SUBDIR += p5-CLI-Osprey
     SUBDIR += p5-CPAN-Changes
     SUBDIR += p5-CPAN-Checksums
     SUBDIR += p5-CPAN-DistnameInfo
     SUBDIR += p5-CPAN-Inject
     SUBDIR += p5-CPAN-Meta
     SUBDIR += p5-CPAN-Meta-Check
     SUBDIR += p5-CPAN-Meta-Requirements
     SUBDIR += p5-CPAN-Meta-YAML
     SUBDIR += p5-CPAN-Mini
     SUBDIR += p5-CPAN-Perl-Releases
     SUBDIR += p5-CPAN-Recent-Uploads
     SUBDIR += p5-CPAN-Reporter
     SUBDIR += p5-CPAN-Reporter-Smoker
     SUBDIR += p5-CPAN-Requirements-Dynamic
     SUBDIR += p5-CPAN-SQLite
     SUBDIR += p5-CPAN-Site
     SUBDIR += p5-CPAN-Testers-Common-Client
     SUBDIR += p5-CPAN-Testers-Report
     SUBDIR += p5-CPAN-Uploader
     SUBDIR += p5-CPAN-YACSmoke
     SUBDIR += p5-CPANPLUS
     SUBDIR += p5-CPANPLUS-Dist-Build
     SUBDIR += p5-CPS
     SUBDIR += p5-CPU-Z80-Assembler
     SUBDIR += p5-Cache
     SUBDIR += p5-Cache-AgainstFile
     SUBDIR += p5-Cache-Cache
     SUBDIR += p5-Cache-FastMmap
     SUBDIR += p5-Cache-LRU
     SUBDIR += p5-Cache-Memcached-Tie
     SUBDIR += p5-Cache-Mmap
     SUBDIR += p5-Cache-Simple-TimedExpiry
     SUBDIR += p5-Cairo-GObject
     SUBDIR += p5-Calendar-Simple
     SUBDIR += p5-Call-Context
     SUBDIR += p5-Callback-Frame
     SUBDIR += p5-Canary-Stability
     SUBDIR += p5-Capture-Tiny
     SUBDIR += p5-Capture-Tiny-Extended
     SUBDIR += p5-Carp
     SUBDIR += p5-Carp-Always
     SUBDIR += p5-Carp-Always-Color
     SUBDIR += p5-Carp-Assert
     SUBDIR += p5-Carp-Assert-More
     SUBDIR += p5-Carp-Clan
     SUBDIR += p5-Carp-Clan-Share
     SUBDIR += p5-Carp-Datum
     SUBDIR += p5-Carp-REPL
     SUBDIR += p5-Check-ISA
     SUBDIR += p5-Child
     SUBDIR += p5-Chooser
     SUBDIR += p5-Class-Accessor
     SUBDIR += p5-Class-Accessor-Chained
     SUBDIR += p5-Class-Accessor-Children
     SUBDIR += p5-Class-Accessor-Complex
     SUBDIR += p5-Class-Accessor-Constructor
     SUBDIR += p5-Class-Accessor-Fast-Contained
     SUBDIR += p5-Class-Accessor-Fast-XS
     SUBDIR += p5-Class-Accessor-Grouped
     SUBDIR += p5-Class-Accessor-Installer
     SUBDIR += p5-Class-Accessor-Lite
     SUBDIR += p5-Class-Accessor-Lvalue
     SUBDIR += p5-Class-Accessor-Named
     SUBDIR += p5-Class-Adapter
     SUBDIR += p5-Class-AlzaboWrapper
     SUBDIR += p5-Class-ArrayObjects
     SUBDIR += p5-Class-AutoClass
     SUBDIR += p5-Class-Autouse
     SUBDIR += p5-Class-Base
     SUBDIR += p5-Class-BlackHole
     SUBDIR += p5-Class-C3
     SUBDIR += p5-Class-C3-Adopt-NEXT
     SUBDIR += p5-Class-C3-Componentised
     SUBDIR += p5-Class-C3-XS
     SUBDIR += p5-Class-Closure
     SUBDIR += p5-Class-CodeStyler
     SUBDIR += p5-Class-Component
     SUBDIR += p5-Class-Constant
     SUBDIR += p5-Class-Container
     SUBDIR += p5-Class-Contract
     SUBDIR += p5-Class-Data-ConfigHash
     SUBDIR += p5-Class-Data-Inheritable
     SUBDIR += p5-Class-Data-Lite
     SUBDIR += p5-Class-Date
     SUBDIR += p5-Class-Declare
     SUBDIR += p5-Class-Default
     SUBDIR += p5-Class-Delegation
     SUBDIR += p5-Class-EHierarchy
     SUBDIR += p5-Class-ErrorHandler
     SUBDIR += p5-Class-Factory
     SUBDIR += p5-Class-Factory-Util
     SUBDIR += p5-Class-Field
     SUBDIR += p5-Class-Fields
     SUBDIR += p5-Class-Forward
     SUBDIR += p5-Class-Generate
     SUBDIR += p5-Class-Gomor
     SUBDIR += p5-Class-Handle
     SUBDIR += p5-Class-Hook
     SUBDIR += p5-Class-ISA
     SUBDIR += p5-Class-Inner
     SUBDIR += p5-Class-InsideOut
     SUBDIR += p5-Class-Inspector
     SUBDIR += p5-Class-Interfaces
     SUBDIR += p5-Class-Load
     SUBDIR += p5-Class-Load-XS
     SUBDIR += p5-Class-Loader
     SUBDIR += p5-Class-MakeMethods
     SUBDIR += p5-Class-Measure
     SUBDIR += p5-Class-Method-Modifiers
     SUBDIR += p5-Class-Method-Modifiers-Fast
     SUBDIR += p5-Class-MethodMaker
     SUBDIR += p5-Class-MethodMapper
     SUBDIR += p5-Class-Mix
     SUBDIR += p5-Class-Mixin
     SUBDIR += p5-Class-MixinFactory
     SUBDIR += p5-Class-Multimethods
     SUBDIR += p5-Class-Multimethods-Pure
     SUBDIR += p5-Class-NamedParms
     SUBDIR += p5-Class-Null
     SUBDIR += p5-Class-OOorNO
     SUBDIR += p5-Class-ObjectTemplate
     SUBDIR += p5-Class-ObjectTemplate-DB
     SUBDIR += p5-Class-Observable
     SUBDIR += p5-Class-ParmList
     SUBDIR += p5-Class-Prototyped
     SUBDIR += p5-Class-ReturnValue
     SUBDIR += p5-Class-Roles
     SUBDIR += p5-Class-STL-Containers
     SUBDIR += p5-Class-Singleton
     SUBDIR += p5-Class-Spiffy
     SUBDIR += p5-Class-StateMachine
     SUBDIR += p5-Class-Std
     SUBDIR += p5-Class-Std-Fast
     SUBDIR += p5-Class-Std-Utils
     SUBDIR += p5-Class-StrongSingleton
     SUBDIR += p5-Class-Tangram
     SUBDIR += p5-Class-Throwable
     SUBDIR += p5-Class-Tiny
     SUBDIR += p5-Class-Tiny-Chained
     SUBDIR += p5-Class-Tom
     SUBDIR += p5-Class-Trigger
     SUBDIR += p5-Class-Unload
     SUBDIR += p5-Class-Virtual
     SUBDIR += p5-Class-WhiteHole
     SUBDIR += p5-Class-Workflow
     SUBDIR += p5-Class-XPath
     SUBDIR += p5-Class-XSAccessor
     SUBDIR += p5-Clone
     SUBDIR += p5-Clone-Choose
     SUBDIR += p5-Clone-Fast
     SUBDIR += p5-Clone-More
     SUBDIR += p5-Clone-PP
     SUBDIR += p5-Code-Perl
     SUBDIR += p5-Color-ANSI-Util
     SUBDIR += p5-Color-RGB-Util
     SUBDIR += p5-Color-Theme-Role
     SUBDIR += p5-ColorThemeBase-Static
     SUBDIR += p5-ColorThemeUtil-ANSI
     SUBDIR += p5-ColorThemes-Standard
     SUBDIR += p5-Commandable
     SUBDIR += p5-Commands-Guarded
     SUBDIR += p5-CommitBit
     SUBDIR += p5-Compiler-Lexer
     SUBDIR += p5-Complete-Common
     SUBDIR += p5-Complete-Path
     SUBDIR += p5-Complete-Sah
     SUBDIR += p5-Complete-Sequence
     SUBDIR += p5-Complete-Util
     SUBDIR += p5-Config-AST
     SUBDIR += p5-Config-AWS
     SUBDIR += p5-Config-Any
     SUBDIR += p5-Config-ApacheFormat
     SUBDIR += p5-Config-Auto
     SUBDIR += p5-Config-AutoConf
     SUBDIR += p5-Config-Fast
     SUBDIR += p5-Config-General
     SUBDIR += p5-Config-GitLike
     SUBDIR += p5-Config-Grammar
     SUBDIR += p5-Config-INI
     SUBDIR += p5-Config-INI-Reader-Ordered
     SUBDIR += p5-Config-INI-Simple
     SUBDIR += p5-Config-Identity
     SUBDIR += p5-Config-IniFiles
     SUBDIR += p5-Config-IniHash
     SUBDIR += p5-Config-IniRegEx
     SUBDIR += p5-Config-JFDI
     SUBDIR += p5-Config-JSON
     SUBDIR += p5-Config-MVP
     SUBDIR += p5-Config-MVP-Reader-INI
     SUBDIR += p5-Config-Merge
     SUBDIR += p5-Config-Model
     SUBDIR += p5-Config-Model-Backend-Yaml
     SUBDIR += p5-Config-Model-Tester
     SUBDIR += p5-Config-MySQL
     SUBDIR += p5-Config-Objective
     SUBDIR += p5-Config-Options
     SUBDIR += p5-Config-Parser
     SUBDIR += p5-Config-Parser-ldap
     SUBDIR += p5-Config-Perl-V
     SUBDIR += p5-Config-Properties
     SUBDIR += p5-Config-Record
     SUBDIR += p5-Config-Setting
     SUBDIR += p5-Config-Simple
     SUBDIR += p5-Config-Std
     SUBDIR += p5-Config-Tiny
     SUBDIR += p5-Config-Validator
     SUBDIR += p5-Config-Versioned
     SUBDIR += p5-Config-Wrest
     SUBDIR += p5-Config-YAML
     SUBDIR += p5-ConfigReader
     SUBDIR += p5-ConfigReader-Simple
     SUBDIR += p5-Connector
     SUBDIR += p5-Const-Exporter
     SUBDIR += p5-Const-Fast
     SUBDIR += p5-Context-Preserve
     SUBDIR += p5-Contextual-Return
     SUBDIR += p5-Convert-Scalar
     SUBDIR += p5-Coro
     SUBDIR += p5-Curses
     SUBDIR += p5-Curses-Application
     SUBDIR += p5-Curses-Forms
     SUBDIR += p5-Curses-UI
     SUBDIR += p5-Curses-Widgets
     SUBDIR += p5-Cvs
     SUBDIR += p5-Cwd-Guard
     SUBDIR += p5-DB_File-Lock
     SUBDIR += p5-Daemon-Control
     SUBDIR += p5-Dancer-Debug
     SUBDIR += p5-Dancer-Logger-Syslog
     SUBDIR += p5-Danga-Socket
     SUBDIR += p5-Danga-Socket-Callback
     SUBDIR += p5-Data-ACL
     SUBDIR += p5-Data-Alias
     SUBDIR += p5-Data-Binary
     SUBDIR += p5-Data-Bind
     SUBDIR += p5-Data-Capture
     SUBDIR += p5-Data-ClearSilver-HDF
     SUBDIR += p5-Data-Clone
     SUBDIR += p5-Data-Compare
     SUBDIR += p5-Data-Diver
     SUBDIR += p5-Data-Dmp
     SUBDIR += p5-Data-Domain
     SUBDIR += p5-Data-Dump
     SUBDIR += p5-Data-Dump-Color
     SUBDIR += p5-Data-Dump-Streamer
     SUBDIR += p5-Data-DumpXML
     SUBDIR += p5-Data-Dumper
     SUBDIR += p5-Data-Dumper-Concise
     SUBDIR += p5-Data-Dumper-Interp
     SUBDIR += p5-Data-Dumper-Perltidy
     SUBDIR += p5-Data-Dumper-Simple
     SUBDIR += p5-Data-Flow
     SUBDIR += p5-Data-GUID
     SUBDIR += p5-Data-Grouper
     SUBDIR += p5-Data-HashArray
     SUBDIR += p5-Data-HexDump
     SUBDIR += p5-Data-HexDump-Range
     SUBDIR += p5-Data-Hexdumper
     SUBDIR += p5-Data-Hexify
     SUBDIR += p5-Data-Hierarchy
     SUBDIR += p5-Data-IEEE754
     SUBDIR += p5-Data-Inherited
     SUBDIR += p5-Data-Inspect
     SUBDIR += p5-Data-Integer
     SUBDIR += p5-Data-JavaScript-Anon
     SUBDIR += p5-Data-Lazy
     SUBDIR += p5-Data-Localize
     SUBDIR += p5-Data-Lock
     SUBDIR += p5-Data-MessagePack
     SUBDIR += p5-Data-MessagePack-Stream
     SUBDIR += p5-Data-Miscellany
     SUBDIR += p5-Data-Model
     SUBDIR += p5-Data-Munge
     SUBDIR += p5-Data-Object
     SUBDIR += p5-Data-Object-Args
     SUBDIR += p5-Data-Object-Attributes
     SUBDIR += p5-Data-Object-Cast
     SUBDIR += p5-Data-Object-Class
     SUBDIR += p5-Data-Object-ClassHas
     SUBDIR += p5-Data-Object-Data
     SUBDIR += p5-Data-Object-Exception
     SUBDIR += p5-Data-Object-Kind
     SUBDIR += p5-Data-Object-Name
     SUBDIR += p5-Data-Object-Opts
     SUBDIR += p5-Data-Object-Plugin
     SUBDIR += p5-Data-Object-Role
     SUBDIR += p5-Data-Object-Role-Arguable
     SUBDIR += p5-Data-Object-Role-Buildable
     SUBDIR += p5-Data-Object-Role-Dumpable
     SUBDIR += p5-Data-Object-Role-Errable
     SUBDIR += p5-Data-Object-Role-Formulatable
     SUBDIR += p5-Data-Object-Role-Immutable
     SUBDIR += p5-Data-Object-Role-Pluggable
     SUBDIR += p5-Data-Object-Role-Proxyable
     SUBDIR += p5-Data-Object-Role-Stashable
     SUBDIR += p5-Data-Object-Role-Throwable
     SUBDIR += p5-Data-Object-Role-Tryable
     SUBDIR += p5-Data-Object-RoleHas
     SUBDIR += p5-Data-Object-Space
     SUBDIR += p5-Data-Object-State
     SUBDIR += p5-Data-Object-Struct
     SUBDIR += p5-Data-Object-Try
     SUBDIR += p5-Data-Object-Types
     SUBDIR += p5-Data-Object-Vars
     SUBDIR += p5-Data-ObjectDriver
     SUBDIR += p5-Data-OptList
     SUBDIR += p5-Data-Page-NoTotalEntries
     SUBDIR += p5-Data-Page-Pageset
     SUBDIR += p5-Data-ParseBinary
     SUBDIR += p5-Data-Path
     SUBDIR += p5-Data-Peek
     SUBDIR += p5-Data-Perl
     SUBDIR += p5-Data-Printer
     SUBDIR += p5-Data-Properties
     SUBDIR += p5-Data-Rand
     SUBDIR += p5-Data-Rand-Obscure
     SUBDIR += p5-Data-Random
     SUBDIR += p5-Data-Range-Compare
     SUBDIR += p5-Data-Record
     SUBDIR += p5-Data-Recursive-Encode
     SUBDIR += p5-Data-Remember
     SUBDIR += p5-Data-Rmap
     SUBDIR += p5-Data-RoundRobin
     SUBDIR += p5-Data-Rx
     SUBDIR += p5-Data-SExpression
     SUBDIR += p5-Data-Sah-Normalize
     SUBDIR += p5-Data-Section
     SUBDIR += p5-Data-Section-Simple
     SUBDIR += p5-Data-Serializable
     SUBDIR += p5-Data-Serializer
     SUBDIR += p5-Data-Serializer-Sereal
     SUBDIR += p5-Data-ShowTable
     SUBDIR += p5-Data-Stag
     SUBDIR += p5-Data-Stream-Bulk
     SUBDIR += p5-Data-Structure-Util
     SUBDIR += p5-Data-Swap
     SUBDIR += p5-Data-Table
     SUBDIR += p5-Data-Taxonomy-Tags
     SUBDIR += p5-Data-TemporaryBag
     SUBDIR += p5-Data-Throttler
     SUBDIR += p5-Data-Throttler-Memcached
     SUBDIR += p5-Data-Thunk
     SUBDIR += p5-Data-TreeDumper
     SUBDIR += p5-Data-TreeDumper-Renderer-GTK
     SUBDIR += p5-Data-Types
     SUBDIR += p5-Data-URIEncode
     SUBDIR += p5-Data-UUID
     SUBDIR += p5-Data-Uniqid
     SUBDIR += p5-Data-Unixish
     SUBDIR += p5-Data-Util
     SUBDIR += p5-Data-Validate
     SUBDIR += p5-Data-Validator
     SUBDIR += p5-Data-Visitor
     SUBDIR += p5-Data-Visitor-Encode
     SUBDIR += p5-Data-Visitor-Tiny
     SUBDIR += p5-Data-Walk
     SUBDIR += p5-DataStruct-Flat
     SUBDIR += p5-Date-Business
     SUBDIR += p5-Date-Calc
     SUBDIR += p5-Date-Calc-Iterator
     SUBDIR += p5-Date-Calc-XS
     SUBDIR += p5-Date-DayOfWeek
     SUBDIR += p5-Date-Easter
     SUBDIR += p5-Date-Extract
     SUBDIR += p5-Date-EzDate
     SUBDIR += p5-Date-Holidays-DK
     SUBDIR += p5-Date-ICal
     SUBDIR += p5-Date-ISO
     SUBDIR += p5-Date-Leapyear
     SUBDIR += p5-Date-Manip
     SUBDIR += p5-Date-Pcalc
     SUBDIR += p5-Date-Piece
     SUBDIR += p5-Date-Range
     SUBDIR += p5-Date-Roman
     SUBDIR += p5-Date-Simple
     SUBDIR += p5-DateConvert
     SUBDIR += p5-DateTime
     SUBDIR += p5-DateTime-Astro
     SUBDIR += p5-DateTime-Calendar-Chinese
     SUBDIR += p5-DateTime-Calendar-Christian
     SUBDIR += p5-DateTime-Calendar-Discordian
     SUBDIR += p5-DateTime-Calendar-FrenchRevolutionary
     SUBDIR += p5-DateTime-Calendar-Hebrew
     SUBDIR += p5-DateTime-Calendar-Japanese
     SUBDIR += p5-DateTime-Calendar-Julian
     SUBDIR += p5-DateTime-Calendar-Mayan
     SUBDIR += p5-DateTime-Calendar-Pataphysical
     SUBDIR += p5-DateTime-Cron-Simple
     SUBDIR += p5-DateTime-Event-Chinese
     SUBDIR += p5-DateTime-Event-Cron
     SUBDIR += p5-DateTime-Event-Easter
     SUBDIR += p5-DateTime-Event-ICal
     SUBDIR += p5-DateTime-Event-Lunar
     SUBDIR += p5-DateTime-Event-NameDay
     SUBDIR += p5-DateTime-Event-Random
     SUBDIR += p5-DateTime-Event-Recurrence
     SUBDIR += p5-DateTime-Event-Sunrise
     SUBDIR += p5-DateTime-Event-Zodiac
     SUBDIR += p5-DateTime-Fiscal-Year
     SUBDIR += p5-DateTime-Format-Baby
     SUBDIR += p5-DateTime-Format-Bork
     SUBDIR += p5-DateTime-Format-Builder
     SUBDIR += p5-DateTime-Format-DBI
     SUBDIR += p5-DateTime-Format-DateManip
     SUBDIR += p5-DateTime-Format-DateParse
     SUBDIR += p5-DateTime-Format-Duration
     SUBDIR += p5-DateTime-Format-Epoch
     SUBDIR += p5-DateTime-Format-Excel
     SUBDIR += p5-DateTime-Format-Flexible
     SUBDIR += p5-DateTime-Format-HTTP
     SUBDIR += p5-DateTime-Format-IBeat
     SUBDIR += p5-DateTime-Format-ICal
     SUBDIR += p5-DateTime-Format-ISO8601
     SUBDIR += p5-DateTime-Format-Mail
     SUBDIR += p5-DateTime-Format-MySQL
     SUBDIR += p5-DateTime-Format-Natural
     SUBDIR += p5-DateTime-Format-Oracle
     SUBDIR += p5-DateTime-Format-Pg
     SUBDIR += p5-DateTime-Format-RFC3339
     SUBDIR += p5-DateTime-Format-RSS
     SUBDIR += p5-DateTime-Format-Roman
     SUBDIR += p5-DateTime-Format-SQLite
     SUBDIR += p5-DateTime-Format-Strptime
     SUBDIR += p5-DateTime-Format-W3CDTF
     SUBDIR += p5-DateTime-Format-XSD
     SUBDIR += p5-DateTime-Functions
     SUBDIR += p5-DateTime-HiRes
     SUBDIR += p5-DateTime-Incomplete
     SUBDIR += p5-DateTime-Locale
     SUBDIR += p5-DateTime-Precise
     SUBDIR += p5-DateTime-Set
     SUBDIR += p5-DateTime-TimeZone
     SUBDIR += p5-DateTime-TimeZone-Alias
     SUBDIR += p5-DateTime-TimeZone-LMT
     SUBDIR += p5-DateTime-Util-Calc
     SUBDIR += p5-DateTimeX-Easy
     SUBDIR += p5-Debug-Client
     SUBDIR += p5-Decision-ACL
     SUBDIR += p5-Declare-Constraints-Simple
     SUBDIR += p5-DefHash
     SUBDIR += p5-Devel-ArgNames
     SUBDIR += p5-Devel-Autoflush
     SUBDIR += p5-Devel-Backtrace
     SUBDIR += p5-Devel-BeginLift
     SUBDIR += p5-Devel-CallChecker
     SUBDIR += p5-Devel-Caller
     SUBDIR += p5-Devel-Caller-IgnoreNamespaces
     SUBDIR += p5-Devel-Caller-Perl
     SUBDIR += p5-Devel-Callsite
     SUBDIR += p5-Devel-CheckBin
     SUBDIR += p5-Devel-CheckCompiler
     SUBDIR += p5-Devel-CheckLib
     SUBDIR += p5-Devel-CheckOS
     SUBDIR += p5-Devel-Confess
     SUBDIR += p5-Devel-Constants
     SUBDIR += p5-Devel-CoreStack
     SUBDIR += p5-Devel-Cover
     SUBDIR += p5-Devel-Cover-Report-Clover
     SUBDIR += p5-Devel-Cycle
     SUBDIR += p5-Devel-DProfPP
     SUBDIR += p5-Devel-Declare
     SUBDIR += p5-Devel-Declare-Parser
     SUBDIR += p5-Devel-Diagram
     SUBDIR += p5-Devel-Ditto
     SUBDIR += p5-Devel-Dumpvar
     SUBDIR += p5-Devel-EvalContext
     SUBDIR += p5-Devel-Events
     SUBDIR += p5-Devel-Events-Objects
     SUBDIR += p5-Devel-FindPerl
     SUBDIR += p5-Devel-Gladiator
     SUBDIR += p5-Devel-GlobalDestruction
     SUBDIR += p5-Devel-GlobalDestruction-XS
     SUBDIR += p5-Devel-Hide
     SUBDIR += p5-Devel-InheritNamespace
     SUBDIR += p5-Devel-KYTProf
     SUBDIR += p5-Devel-Leak
     SUBDIR += p5-Devel-Leak-Cb
     SUBDIR += p5-Devel-Leak-Object
     SUBDIR += p5-Devel-LeakGuard-Object
     SUBDIR += p5-Devel-LeakTrace
     SUBDIR += p5-Devel-LexAlias
     SUBDIR += p5-Devel-MAT
     SUBDIR += p5-Devel-MAT-Dumper
     SUBDIR += p5-Devel-Messenger
     SUBDIR += p5-Devel-Modlist
     SUBDIR += p5-Devel-NYTProf
     SUBDIR += p5-Devel-OverloadInfo
     SUBDIR += p5-Devel-PPPort
     SUBDIR += p5-Devel-PackagePath
     SUBDIR += p5-Devel-PartialDump
     SUBDIR += p5-Devel-PatchPerl
     SUBDIR += p5-Devel-Platform-Info
     SUBDIR += p5-Devel-Pointer
     SUBDIR += p5-Devel-Profile
     SUBDIR += p5-Devel-REPL
     SUBDIR += p5-Devel-Refactor
     SUBDIR += p5-Devel-Refcount
     SUBDIR += p5-Devel-Required
     SUBDIR += p5-Devel-RingBuffer
     SUBDIR += p5-Devel-STrace
     SUBDIR += p5-Devel-SimpleTrace
     SUBDIR += p5-Devel-Size
     SUBDIR += p5-Devel-Size-Report
     SUBDIR += p5-Devel-SmallProf
     SUBDIR += p5-Devel-StackTrace
     SUBDIR += p5-Devel-StackTrace-AsHTML
     SUBDIR += p5-Devel-StackTrace-WithLexicals
     SUBDIR += p5-Devel-StealthDebug
     SUBDIR += p5-Devel-StrictMode
     SUBDIR += p5-Devel-Symdump
     SUBDIR += p5-Devel-Timer
     SUBDIR += p5-Devel-Trace
     SUBDIR += p5-Devel-TraceCalls
     SUBDIR += p5-Devel-TraceUse
     SUBDIR += p5-Devel-ebug
     SUBDIR += p5-Devel-ptkdb
     SUBDIR += p5-Device-USB
     SUBDIR += p5-Digest-TransformPath
     SUBDIR += p5-Dir-Project
     SUBDIR += p5-Dir-Self
     SUBDIR += p5-Dir-Watch
     SUBDIR += p5-Directory-Queue
     SUBDIR += p5-Directory-Scratch
     SUBDIR += p5-Directory-Scratch-Structured
     SUBDIR += p5-Dist-CheckConflicts
     SUBDIR += p5-Dist-Joseki
     SUBDIR += p5-Dist-Metadata
     SUBDIR += p5-Dist-Zilla
     SUBDIR += p5-Doxygen-Filter-Perl
     SUBDIR += p5-DynaLoader-Functions
     SUBDIR += p5-EV
     SUBDIR += p5-Env-PS1
     SUBDIR += p5-Env-Path
     SUBDIR += p5-Error-Helper
     SUBDIR += p5-Eval-Closure
     SUBDIR += p5-Eval-Context
     SUBDIR += p5-Eval-LineNumbers
     SUBDIR += p5-Eval-WithLexicals
     SUBDIR += p5-Event
     SUBDIR += p5-Event-ExecFlow
     SUBDIR += p5-Event-Join
     SUBDIR += p5-Event-Lib
     SUBDIR += p5-Event-Notify
     SUBDIR += p5-Event-RPC
     SUBDIR += p5-Every
     SUBDIR += p5-Exception-Class
     SUBDIR += p5-Exception-Class-TryCatch
     SUBDIR += p5-Exception-Handler
     SUBDIR += p5-Expect-Simple
     SUBDIR += p5-ExportTo
     SUBDIR += p5-Exporter
     SUBDIR += p5-Exporter-Declare
     SUBDIR += p5-Exporter-Easy
     SUBDIR += p5-Exporter-Lite
     SUBDIR += p5-Exporter-Tidy
     SUBDIR += p5-Exporter-Tiny
     SUBDIR += p5-ExtUtils-AutoInstall
     SUBDIR += p5-ExtUtils-CBuilder
     SUBDIR += p5-ExtUtils-CChecker
     SUBDIR += p5-ExtUtils-Config
     SUBDIR += p5-ExtUtils-Constant
     SUBDIR += p5-ExtUtils-CppGuess
     SUBDIR += p5-ExtUtils-Depends
     SUBDIR += p5-ExtUtils-Helpers
     SUBDIR += p5-ExtUtils-Install
     SUBDIR += p5-ExtUtils-InstallPaths
     SUBDIR += p5-ExtUtils-LibBuilder
     SUBDIR += p5-ExtUtils-MakeMaker
     SUBDIR += p5-ExtUtils-MakeMaker-CPANfile
     SUBDIR += p5-ExtUtils-MakeMaker-Coverage
     SUBDIR += p5-ExtUtils-Manifest
     SUBDIR += p5-ExtUtils-ParseXS
     SUBDIR += p5-ExtUtils-PkgConfig
     SUBDIR += p5-ExtUtils-XSBuilder
     SUBDIR += p5-ExtUtils-XSpp
     SUBDIR += p5-FFI-C-Stat
     SUBDIR += p5-FFI-CheckLib
     SUBDIR += p5-FFI-Platypus
     SUBDIR += p5-FFI-Platypus-Declare
     SUBDIR += p5-FFI-Platypus-Lang-Rust
     SUBDIR += p5-FFI-Platypus-Type-Enum
     SUBDIR += p5-FFI-Platypus-Type-PtrObject
     SUBDIR += p5-FSA-Rules
     SUBDIR += p5-Feature-Compat-Try
     SUBDIR += p5-Fennec-Lite
     SUBDIR += p5-File-Append-TempFile
     SUBDIR += p5-File-Assets
     SUBDIR += p5-File-Attributes
     SUBDIR += p5-File-Attributes-Recursive
     SUBDIR += p5-File-BOM
     SUBDIR += p5-File-BaseDir
     SUBDIR += p5-File-BasicFlock
     SUBDIR += p5-File-Binary
     SUBDIR += p5-File-Cache
     SUBDIR += p5-File-Cat
     SUBDIR += p5-File-ChangeNotify
     SUBDIR += p5-File-ConfigDir
     SUBDIR += p5-File-Copy-Link
     SUBDIR += p5-File-Copy-Recursive
     SUBDIR += p5-File-Copy-Recursive-Reduced
     SUBDIR += p5-File-CountLines
     SUBDIR += p5-File-CreationTime
     SUBDIR += p5-File-DesktopEntry
     SUBDIR += p5-File-Dir-Dumper
     SUBDIR += p5-File-DirSync
     SUBDIR += p5-File-ExtAttr
     SUBDIR += p5-File-FcntlLock
     SUBDIR += p5-File-Find-Closures
     SUBDIR += p5-File-Find-Object
     SUBDIR += p5-File-Find-Object-Rule
     SUBDIR += p5-File-Find-Rule
     SUBDIR += p5-File-Find-Rule-Filesys-Virtual
     SUBDIR += p5-File-Find-Rule-Perl
     SUBDIR += p5-File-Find-Rule-VCS
     SUBDIR += p5-File-Finder
     SUBDIR += p5-File-Flat
     SUBDIR += p5-File-Flock
     SUBDIR += p5-File-Flock-Retry
     SUBDIR += p5-File-FnMatch
     SUBDIR += p5-File-Grep
     SUBDIR += p5-File-HStore
     SUBDIR += p5-File-HomeDir
     SUBDIR += p5-File-HomeDir-PathClass
     SUBDIR += p5-File-HomeDir-Tiny
     SUBDIR += p5-File-Iterator
     SUBDIR += p5-File-LibMagic
     SUBDIR += p5-File-LoadLines
     SUBDIR += p5-File-MMagic
     SUBDIR += p5-File-MMagic-XS
     SUBDIR += p5-File-Map
     SUBDIR += p5-File-MimeInfo
     SUBDIR += p5-File-Modified
     SUBDIR += p5-File-Monitor
     SUBDIR += p5-File-NCopy
     SUBDIR += p5-File-NFSLock
     SUBDIR += p5-File-Path
     SUBDIR += p5-File-Path-Expand
     SUBDIR += p5-File-Path-Tiny
     SUBDIR += p5-File-PathConvert
     SUBDIR += p5-File-Pid
     SUBDIR += p5-File-Pid-Quick
     SUBDIR += p5-File-Policy
     SUBDIR += p5-File-Random
     SUBDIR += p5-File-ReadBackwards
     SUBDIR += p5-File-Remove
     SUBDIR += p5-File-SafeDO
     SUBDIR += p5-File-SearchPath
     SUBDIR += p5-File-Share
     SUBDIR += p5-File-ShareDir
     SUBDIR += p5-File-ShareDir-Dist
     SUBDIR += p5-File-ShareDir-Install
     SUBDIR += p5-File-ShareDir-PAR
     SUBDIR += p5-File-ShareDir-PathClass
     SUBDIR += p5-File-ShareDir-ProjectDistDir
     SUBDIR += p5-File-ShareDir-Tarball
     SUBDIR += p5-File-Slurp
     SUBDIR += p5-File-Slurp-Tiny
     SUBDIR += p5-File-Slurp-Tree
     SUBDIR += p5-File-Slurper
     SUBDIR += p5-File-Spec-Native
     SUBDIR += p5-File-Stream
     SUBDIR += p5-File-Sync
     SUBDIR += p5-File-Tail
     SUBDIR += p5-File-Tail-Dir
     SUBDIR += p5-File-Tail-Multi
     SUBDIR += p5-File-Tail-Scribe
     SUBDIR += p5-File-Temp
     SUBDIR += p5-File-Tempdir
     SUBDIR += p5-File-Touch
     SUBDIR += p5-File-TreeCreate
     SUBDIR += p5-File-Type
     SUBDIR += p5-File-Util
     SUBDIR += p5-File-Write-Rotate
     SUBDIR += p5-File-chdir
     SUBDIR += p5-File-chmod
     SUBDIR += p5-File-pushd
     SUBDIR += p5-FileHandle-Fmode
     SUBDIR += p5-FileHandle-Unget
     SUBDIR += p5-Filesys-Notify-KQueue
     SUBDIR += p5-Filesys-Notify-Simple
     SUBDIR += p5-Filesys-Virtual
     SUBDIR += p5-Filesys-Virtual-Plain
     SUBDIR += p5-Filter
     SUBDIR += p5-Filter-Template
     SUBDIR += p5-Find-Lib
     SUBDIR += p5-FindBin-libs
     SUBDIR += p5-Forest
     SUBDIR += p5-Form-Sensible
     SUBDIR += p5-FreeBSD-i386-Ptrace
     SUBDIR += p5-FreezeThaw
     SUBDIR += p5-Function-Fallback-CoreOrPP
     SUBDIR += p5-Function-Parameters
     SUBDIR += p5-Future
     SUBDIR += p5-Future-AsyncAwait
     SUBDIR += p5-Future-IO
     SUBDIR += p5-Gearman
     SUBDIR += p5-Gearman-Client-Async
     SUBDIR += p5-Gearman-Server
     SUBDIR += p5-Geo-JSON
     SUBDIR += p5-Geo-ShapeFile
     SUBDIR += p5-Getargs-Long
     SUBDIR += p5-Getopt-ArgvFile
     SUBDIR += p5-Getopt-Attribute
     SUBDIR += p5-Getopt-Compact
     SUBDIR += p5-Getopt-Compact-WithCmd
     SUBDIR += p5-Getopt-Declare
     SUBDIR += p5-Getopt-EX
     SUBDIR += p5-Getopt-Euclid
     SUBDIR += p5-Getopt-GUI-Long
     SUBDIR += p5-Getopt-Long
     SUBDIR += p5-Getopt-Long-Descriptive
     SUBDIR += p5-Getopt-Tabular
     SUBDIR += p5-Git-PurePerl
     SUBDIR += p5-Git-Repository
     SUBDIR += p5-Git-Repository-Plugin-Log
     SUBDIR += p5-Git-Sub
     SUBDIR += p5-Git-Version-Compare
     SUBDIR += p5-Git-Wrapper
     SUBDIR += p5-Glib
     SUBDIR += p5-Glib-Object-Introspection
     SUBDIR += p5-Goo-Canvas2
     SUBDIR += p5-Google-Checkout
     SUBDIR += p5-Google-ProtocolBuffers
     SUBDIR += p5-GraphQL
     SUBDIR += p5-Gravatar-URL
     SUBDIR += p5-Gtk2-Notify
     SUBDIR += p5-Gtk2-Spell
     SUBDIR += p5-Guard
     SUBDIR += p5-HOP-Lexer
     SUBDIR += p5-HOP-Stream
     SUBDIR += p5-Hash-AsObject
     SUBDIR += p5-Hash-AutoHash
     SUBDIR += p5-Hash-AutoHash-Args
     SUBDIR += p5-Hash-Case
     SUBDIR += p5-Hash-Diff
     SUBDIR += p5-Hash-FieldHash
     SUBDIR += p5-Hash-Flatten
     SUBDIR += p5-Hash-Merge-Simple
     SUBDIR += p5-Hash-MoreUtils
     SUBDIR += p5-Hash-MultiKey
     SUBDIR += p5-Hash-MultiValue
     SUBDIR += p5-Hash-NoRef
     SUBDIR += p5-Hash-Objectify
     SUBDIR += p5-Hash-Ordered
     SUBDIR += p5-Hash-SharedMem
     SUBDIR += p5-Hash-Slice
     SUBDIR += p5-Hash-Union
     SUBDIR += p5-Hash-Util-FieldHash-Compat
     SUBDIR += p5-Hash-WithDefaults
     SUBDIR += p5-Heap
     SUBDIR += p5-Heap-Simple
     SUBDIR += p5-Heap-Simple-Perl
     SUBDIR += p5-Heap-Simple-XS
     SUBDIR += p5-Hook-LexWrap
     SUBDIR += p5-IO-AIO
     SUBDIR += p5-IO-All
     SUBDIR += p5-IO-All-LWP
     SUBDIR += p5-IO-Any
     SUBDIR += p5-IO-Async
     SUBDIR += p5-IO-BufferedSelect
     SUBDIR += p5-IO-Callback
     SUBDIR += p5-IO-Capture
     SUBDIR += p5-IO-CaptureOutput
     SUBDIR += p5-IO-Digest
     SUBDIR += p5-IO-Event
     SUBDIR += p5-IO-FDPass
     SUBDIR += p5-IO-File-AtomicChange
     SUBDIR += p5-IO-HTML
     SUBDIR += p5-IO-Handle-Util
     SUBDIR += p5-IO-Interactive
     SUBDIR += p5-IO-KQueue
     SUBDIR += p5-IO-Lambda
     SUBDIR += p5-IO-LockedFile
     SUBDIR += p5-IO-MultiPipe
     SUBDIR += p5-IO-Multiplex
     SUBDIR += p5-IO-NestedCapture
     SUBDIR += p5-IO-Null
     SUBDIR += p5-IO-Pager
     SUBDIR += p5-IO-Pipely
     SUBDIR += p5-IO-Prompt
     SUBDIR += p5-IO-Prompt-Simple
     SUBDIR += p5-IO-Prompt-Tiny
     SUBDIR += p5-IO-Prompter
     SUBDIR += p5-IO-Pty-Easy
     SUBDIR += p5-IO-SessionData
     SUBDIR += p5-IO-String
     SUBDIR += p5-IO-Stringy
     SUBDIR += p5-IO-Stty
     SUBDIR += p5-IO-Tee
     SUBDIR += p5-IO-TieCombine
     SUBDIR += p5-IO-Toolkit
     SUBDIR += p5-IO-Tty
     SUBDIR += p5-IO-Util
     SUBDIR += p5-IO-YAML
     SUBDIR += p5-IOC
     SUBDIR += p5-IPC-Cache
     SUBDIR += p5-IPC-Cmd
     SUBDIR += p5-IPC-DirQueue
     SUBDIR += p5-IPC-Locker
     SUBDIR += p5-IPC-MM
     SUBDIR += p5-IPC-MMA
     SUBDIR += p5-IPC-Mmap
     SUBDIR += p5-IPC-Mmap-Share
     SUBDIR += p5-IPC-Open3-Simple
     SUBDIR += p5-IPC-PerlSSH
     SUBDIR += p5-IPC-PubSub
     SUBDIR += p5-IPC-Run
     SUBDIR += p5-IPC-Run-SafeHandles
     SUBDIR += p5-IPC-Run3
     SUBDIR += p5-IPC-ShareLite
     SUBDIR += p5-IPC-Shareable
     SUBDIR += p5-IPC-SharedCache
     SUBDIR += p5-IPC-ShellCmd
     SUBDIR += p5-IPC-Signal
     SUBDIR += p5-IPC-System-Simple
     SUBDIR += p5-IRI
     SUBDIR += p5-Import-Base
     SUBDIR += p5-Import-Into
     SUBDIR += p5-Importer
     SUBDIR += p5-Inline
     SUBDIR += p5-Inline-ASM
     SUBDIR += p5-Inline-C
     SUBDIR += p5-Inline-CPP
     SUBDIR += p5-Inline-Files
     SUBDIR += p5-Inline-Filters
     SUBDIR += p5-Inline-Java
     SUBDIR += p5-Inline-Python
     SUBDIR += p5-Inline-TT
     SUBDIR += p5-Inline-Tcl
     SUBDIR += p5-InlineX-C2XS
     SUBDIR += p5-InlineX-CPP2XS
     SUBDIR += p5-Input-Validator
     SUBDIR += p5-Ioctl
     SUBDIR += p5-Iodef-Pb-Simple
     SUBDIR += p5-Iterator
     SUBDIR += p5-Iterator-IO
     SUBDIR += p5-Iterator-Misc
     SUBDIR += p5-Iterator-Simple
     SUBDIR += p5-Iterator-Simple-Lookahead
     SUBDIR += p5-Iterator-Util
     SUBDIR += p5-JIRA-REST
     SUBDIR += p5-JQuery
     SUBDIR += p5-JSON-Hyper
     SUBDIR += p5-JSON-Parse
     SUBDIR += p5-JSON-Path
     SUBDIR += p5-JSON-Pointer
     SUBDIR += p5-JSON-RPC
     SUBDIR += p5-JSON-RPC-Common
     SUBDIR += p5-JSON-RPC-Dispatcher
     SUBDIR += p5-JSON-Schema
     SUBDIR += p5-Java
     SUBDIR += p5-Jonk
     SUBDIR += p5-Keyword-Declare
     SUBDIR += p5-Keyword-Pluggable
     SUBDIR += p5-Keyword-Simple
     SUBDIR += p5-LV
     SUBDIR += p5-Lexical-Alias
     SUBDIR += p5-Lexical-Import
     SUBDIR += p5-Lexical-Persistence
     SUBDIR += p5-Lexical-SealRequireHints
     SUBDIR += p5-Lexical-Var
     SUBDIR += p5-Lingua-JA-Fold
     SUBDIR += p5-Lingua-Translit
     SUBDIR += p5-List-AllUtils
     SUBDIR += p5-List-BinarySearch
     SUBDIR += p5-List-Cycle
     SUBDIR += p5-List-Flatten
     SUBDIR += p5-List-Gen
     SUBDIR += p5-List-Group
     SUBDIR += p5-List-Objects-Types
     SUBDIR += p5-List-Objects-WithUtils
     SUBDIR += p5-List-Pairwise
     SUBDIR += p5-List-Permutor
     SUBDIR += p5-List-PowerSet
     SUBDIR += p5-List-Regexp
     SUBDIR += p5-List-Rotation-Cycle
     SUBDIR += p5-List-SomeUtils
     SUBDIR += p5-List-SomeUtils-XS
     SUBDIR += p5-List-Uniq
     SUBDIR += p5-List-UtilsBy
     SUBDIR += p5-List-UtilsBy-XS
     SUBDIR += p5-Locale-Maketext
     SUBDIR += p5-Locale-Maketext-Fuzzy
     SUBDIR += p5-Locale-Maketext-Gettext
     SUBDIR += p5-Locale-Maketext-Lexicon
     SUBDIR += p5-Locale-Maketext-Simple
     SUBDIR += p5-Locale-Msgfmt
     SUBDIR += p5-Locale-PGetText
     SUBDIR += p5-Locale-PO
     SUBDIR += p5-Locale-XGettext
     SUBDIR += p5-Locale-gettext
     SUBDIR += p5-Locale-libintl
     SUBDIR += p5-Lock-File
     SUBDIR += p5-LockFile-Simple
     SUBDIR += p5-Log-Accounting-SVK
     SUBDIR += p5-Log-Accounting-SVN
     SUBDIR += p5-Log-Agent
     SUBDIR += p5-Log-Agent-Logger
     SUBDIR += p5-Log-Any
     SUBDIR += p5-Log-Any-Adapter-Dispatch
     SUBDIR += p5-Log-Any-Adapter-Log4perl
     SUBDIR += p5-Log-Any-App
     SUBDIR += p5-Log-Any-IfLOG
     SUBDIR += p5-Log-Contextual
     SUBDIR += p5-Log-Defer
     SUBDIR += p5-Log-Dispatch
     SUBDIR += p5-Log-Dispatch-Array
     SUBDIR += p5-Log-Dispatch-ArrayWithLimits
     SUBDIR += p5-Log-Dispatch-Colorful
     SUBDIR += p5-Log-Dispatch-Config
     SUBDIR += p5-Log-Dispatch-Configurator-Any
     SUBDIR += p5-Log-Dispatch-Configurator-YAML
     SUBDIR += p5-Log-Dispatch-DBI
     SUBDIR += p5-Log-Dispatch-Dir
     SUBDIR += p5-Log-Dispatch-Email-EmailSend
     SUBDIR += p5-Log-Dispatch-File-Rolling
     SUBDIR += p5-Log-Dispatch-File-Stamped
     SUBDIR += p5-Log-Dispatch-FileRotate
     SUBDIR += p5-Log-Dispatch-FileShared
     SUBDIR += p5-Log-Dispatch-FileWriteRotate
     SUBDIR += p5-Log-Dispatch-Perl
     SUBDIR += p5-Log-Dispatch-Screen-Color
     SUBDIR += p5-Log-Dispatch-Scribe
     SUBDIR += p5-Log-Dispatchouli
     SUBDIR += p5-Log-Dump
     SUBDIR += p5-Log-Handler
     SUBDIR += p5-Log-Log4perl
     SUBDIR += p5-Log-Log4perl-Appender-RabbitMQ
     SUBDIR += p5-Log-Log4perl-Appender-Socket-UNIX
     SUBDIR += p5-Log-Log4perl-Layout-JSON
     SUBDIR += p5-Log-Log4perl-Tiny
     SUBDIR += p5-Log-Message
     SUBDIR += p5-Log-Message-Simple
     SUBDIR += p5-Log-Minimal
     SUBDIR += p5-Log-Report
     SUBDIR += p5-Log-Report-Optional
     SUBDIR += p5-Log-Simple
     SUBDIR += p5-Log-Trace
     SUBDIR += p5-Log-TraceMessages
     SUBDIR += p5-Log-ger
     SUBDIR += p5-Logfile-Rotate
     SUBDIR += p5-Long-Jump
     SUBDIR += p5-Luka
     SUBDIR += p5-Lvalue
     SUBDIR += p5-MCE
     SUBDIR += p5-MCE-Shared
     SUBDIR += p5-MRO-Compat
     SUBDIR += p5-MRO-Define
     SUBDIR += p5-Mac-FileSpec-Unixish
     SUBDIR += p5-Mac-PropertyList
     SUBDIR += p5-Make
     SUBDIR += p5-Media-Type-Simple
     SUBDIR += p5-Memoize
     SUBDIR += p5-Memoize-ExpireLRU
     SUBDIR += p5-Meta-Builder
     SUBDIR += p5-MetaCPAN-Client
     SUBDIR += p5-Metabase-Client-Simple
     SUBDIR += p5-Metabase-Fact
     SUBDIR += p5-Method-Alias
     SUBDIR += p5-Method-Signatures
     SUBDIR += p5-Method-Signatures-Simple
     SUBDIR += p5-Metrics-Any
     SUBDIR += p5-Minilla
     SUBDIR += p5-Minion
     SUBDIR += p5-Mixin-Event-Dispatch
     SUBDIR += p5-Mixin-Linewise
     SUBDIR += p5-Mknod
     SUBDIR += p5-Mo
     SUBDIR += p5-Mock-MonkeyPatch
     SUBDIR += p5-Mock-Quick
     SUBDIR += p5-Mock-Sub
     SUBDIR += p5-Module-Build
     SUBDIR += p5-Module-Build-Convert
     SUBDIR += p5-Module-Build-Kwalitee
     SUBDIR += p5-Module-Build-Pluggable
     SUBDIR += p5-Module-Build-Pluggable-CPANfile
     SUBDIR += p5-Module-Build-Pluggable-ReadmeMarkdownFromPod
     SUBDIR += p5-Module-Build-Prereqs-FromCPANfile
     SUBDIR += p5-Module-Build-Tiny
     SUBDIR += p5-Module-Build-Using-PkgConfig
     SUBDIR += p5-Module-Build-WithXSpp
     SUBDIR += p5-Module-Build-XSUtil
     SUBDIR += p5-Module-CPANTS-Analyse
     SUBDIR += p5-Module-CPANfile
     SUBDIR += p5-Module-CheckDeps
     SUBDIR += p5-Module-CheckVersion
     SUBDIR += p5-Module-Collect
     SUBDIR += p5-Module-Compile
     SUBDIR += p5-Module-CoreList
     SUBDIR += p5-Module-Dependency
     SUBDIR += p5-Module-Depends
     SUBDIR += p5-Module-Extract
     SUBDIR += p5-Module-Extract-Use
     SUBDIR += p5-Module-Extract-VERSION
     SUBDIR += p5-Module-ExtractUse
     SUBDIR += p5-Module-Find
     SUBDIR += p5-Module-Functions
     SUBDIR += p5-Module-Implementation
     SUBDIR += p5-Module-Info
     SUBDIR += p5-Module-Info-File
     SUBDIR += p5-Module-Inspector
     SUBDIR += p5-Module-Install
     SUBDIR += p5-Module-Install-AuthorRequires
     SUBDIR += p5-Module-Install-AuthorTests
     SUBDIR += p5-Module-Install-ReadmeFromPod
     SUBDIR += p5-Module-Install-Repository
     SUBDIR += p5-Module-Install-Template
     SUBDIR += p5-Module-Install-TestBase
     SUBDIR += p5-Module-Install-XSUtil
     SUBDIR += p5-Module-Installed-Tiny
     SUBDIR += p5-Module-List
     SUBDIR += p5-Module-Load
     SUBDIR += p5-Module-Load-Conditional
     SUBDIR += p5-Module-Load-Util
     SUBDIR += p5-Module-Loaded
     SUBDIR += p5-Module-Loader
     SUBDIR += p5-Module-Manifest
     SUBDIR += p5-Module-Math-Depends
     SUBDIR += p5-Module-Metadata
     SUBDIR += p5-Module-Path
     SUBDIR += p5-Module-Pluggable
     SUBDIR += p5-Module-Pluggable-Fast
     SUBDIR += p5-Module-Pluggable-Ordered
     SUBDIR += p5-Module-Reader
     SUBDIR += p5-Module-Recursive-Require
     SUBDIR += p5-Module-Refresh
     SUBDIR += p5-Module-Release
     SUBDIR += p5-Module-Reload
     SUBDIR += p5-Module-Reload-Sel
     SUBDIR += p5-Module-Runtime
     SUBDIR += p5-Module-Runtime-Conflicts
     SUBDIR += p5-Module-ScanDeps
     SUBDIR += p5-Module-Setup
     SUBDIR += p5-Module-Starter
     SUBDIR += p5-Module-Starter-PBP
     SUBDIR += p5-Module-Starter-Plugin-SimpleStore
     SUBDIR += p5-Module-Starter-Plugin-TT2
     SUBDIR += p5-Module-Used
     SUBDIR += p5-Module-Util
     SUBDIR += p5-Module-Version
     SUBDIR += p5-Module-Versions
     SUBDIR += p5-Module-Versions-Report
     SUBDIR += p5-Mojo-Base-XS
     SUBDIR += p5-Mojo-Log-Clearable
     SUBDIR += p5-Mojolicious-Plugin-NYTProf
     SUBDIR += p5-Moo
     SUBDIR += p5-MooX-Aliases
     SUBDIR += p5-MooX-Attribute-ENV
     SUBDIR += p5-MooX-Cmd
     SUBDIR += p5-MooX-ConfigFromFile
     SUBDIR += p5-MooX-File-ConfigDir
     SUBDIR += p5-MooX-HandlesVia
     SUBDIR += p5-MooX-Locale-Passthrough
     SUBDIR += p5-MooX-Options
     SUBDIR += p5-MooX-Role-Parameterized
     SUBDIR += p5-MooX-Singleton
     SUBDIR += p5-MooX-StrictConstructor
     SUBDIR += p5-MooX-Thunking
     SUBDIR += p5-MooX-Traits
     SUBDIR += p5-MooX-TypeTiny
     SUBDIR += p5-MooX-Types-MooseLike
     SUBDIR += p5-MooX-Types-MooseLike-Numeric
     SUBDIR += p5-MooX-late
     SUBDIR += p5-Moos
     SUBDIR += p5-Moose
     SUBDIR += p5-Moose-Autobox
     SUBDIR += p5-Moose-Policy
     SUBDIR += p5-Moose-Test
     SUBDIR += p5-MooseX-Aliases
     SUBDIR += p5-MooseX-App
     SUBDIR += p5-MooseX-App-Cmd
     SUBDIR += p5-MooseX-ArrayRef
     SUBDIR += p5-MooseX-Async
     SUBDIR += p5-MooseX-Attribute-Chained
     SUBDIR += p5-MooseX-Attribute-ENV
     SUBDIR += p5-MooseX-AttributeHelpers
     SUBDIR += p5-MooseX-AttributeShortcuts
     SUBDIR += p5-MooseX-AuthorizedMethods
     SUBDIR += p5-MooseX-ClassAttribute
     SUBDIR += p5-MooseX-Clone
     SUBDIR += p5-MooseX-CompileTime-Traits
     SUBDIR += p5-MooseX-ConfigFromFile
     SUBDIR += p5-MooseX-CoverableModifiers
     SUBDIR += p5-MooseX-Daemonize
     SUBDIR += p5-MooseX-Declare
     SUBDIR += p5-MooseX-Emulate-Class-Accessor-Fast
     SUBDIR += p5-MooseX-Extended
     SUBDIR += p5-MooseX-FollowPBP
     SUBDIR += p5-MooseX-Getopt
     SUBDIR += p5-MooseX-Has-Options
     SUBDIR += p5-MooseX-Has-Sugar
     SUBDIR += p5-MooseX-HasDefaults
     SUBDIR += p5-MooseX-IOC
     SUBDIR += p5-MooseX-InsideOut
     SUBDIR += p5-MooseX-LazyRequire
     SUBDIR += p5-MooseX-Lists
     SUBDIR += p5-MooseX-Log-Log4perl
     SUBDIR += p5-MooseX-MarkAsMethods
     SUBDIR += p5-MooseX-Meta-TypeConstraint-ForceCoercion
     SUBDIR += p5-MooseX-Meta-TypeConstraint-Mooish
     SUBDIR += p5-MooseX-MetaDescription
     SUBDIR += p5-MooseX-Method-Signatures
     SUBDIR += p5-MooseX-MethodAttributes
     SUBDIR += p5-MooseX-MultiInitArg
     SUBDIR += p5-MooseX-MultiMethods
     SUBDIR += p5-MooseX-MungeHas
     SUBDIR += p5-MooseX-NonMoose
     SUBDIR += p5-MooseX-Object-Pluggable
     SUBDIR += p5-MooseX-OneArgNew
     SUBDIR += p5-MooseX-POE
     SUBDIR += p5-MooseX-Params-Validate
     SUBDIR += p5-MooseX-RelatedClassRoles
     SUBDIR += p5-MooseX-Role-Loggable
     SUBDIR += p5-MooseX-Role-Matcher
     SUBDIR += p5-MooseX-Role-Parameterized
     SUBDIR += p5-MooseX-Role-Strict
     SUBDIR += p5-MooseX-Role-WarnOnConflict
     SUBDIR += p5-MooseX-Runnable
     SUBDIR += p5-MooseX-SemiAffordanceAccessor
     SUBDIR += p5-MooseX-SetOnce
     SUBDIR += p5-MooseX-SimpleConfig
     SUBDIR += p5-MooseX-Singleton
     SUBDIR += p5-MooseX-Storage
     SUBDIR += p5-MooseX-StrictConstructor
     SUBDIR += p5-MooseX-Test-Role
     SUBDIR += p5-MooseX-TraitFor-Meta-Class-BetterAnonClassNames
     SUBDIR += p5-MooseX-Traits
     SUBDIR += p5-MooseX-Traits-Pluggable
     SUBDIR += p5-MooseX-TransactionalMethods
     SUBDIR += p5-MooseX-Types
     SUBDIR += p5-MooseX-Types-Common
     SUBDIR += p5-MooseX-Types-DateTime
     SUBDIR += p5-MooseX-Types-DateTime-ButMaintained
     SUBDIR += p5-MooseX-Types-DateTime-MoreCoercions
     SUBDIR += p5-MooseX-Types-DateTime-MySQL
     SUBDIR += p5-MooseX-Types-DateTimeX
     SUBDIR += p5-MooseX-Types-ISO8601
     SUBDIR += p5-MooseX-Types-JSON
     SUBDIR += p5-MooseX-Types-LoadableClass
     SUBDIR += p5-MooseX-Types-Path-Class
     SUBDIR += p5-MooseX-Types-Path-Tiny
     SUBDIR += p5-MooseX-Types-Perl
     SUBDIR += p5-MooseX-Types-PortNumber
     SUBDIR += p5-MooseX-Types-Set-Object
     SUBDIR += p5-MooseX-Types-Signal
     SUBDIR += p5-MooseX-Types-Stringlike
     SUBDIR += p5-MooseX-Types-Structured
     SUBDIR += p5-MooseX-Types-URI
     SUBDIR += p5-MooseX-Types-VariantTable
     SUBDIR += p5-MooseX-Util
     SUBDIR += p5-Mouse
     SUBDIR += p5-MouseX-App-Cmd
     SUBDIR += p5-MouseX-AttributeHelpers
     SUBDIR += p5-MouseX-ConfigFromFile
     SUBDIR += p5-MouseX-Foreign
     SUBDIR += p5-MouseX-Getopt
     SUBDIR += p5-MouseX-NativeTraits
     SUBDIR += p5-MouseX-StrictConstructor
     SUBDIR += p5-MouseX-Traits
     SUBDIR += p5-MouseX-Types
     SUBDIR += p5-MouseX-Types-Path-Class
     SUBDIR += p5-Multiplex-CMD
     SUBDIR += p5-NEXT
     SUBDIR += p5-Net-DBus
     SUBDIR += p5-No-Worries
     SUBDIR += p5-Number-Bytes-Human
     SUBDIR += p5-Number-Tolerant
     SUBDIR += p5-OLE-Storage_Lite
     SUBDIR += p5-OOTools
     SUBDIR += p5-Object-Accessor
     SUBDIR += p5-Object-Array
     SUBDIR += p5-Object-Authority
     SUBDIR += p5-Object-Container
     SUBDIR += p5-Object-Declare
     SUBDIR += p5-Object-Destroyer
     SUBDIR += p5-Object-Enum
     SUBDIR += p5-Object-Event
     SUBDIR += p5-Object-Import
     SUBDIR += p5-Object-InsideOut
     SUBDIR += p5-Object-MultiType
     SUBDIR += p5-Object-Pad
     SUBDIR += p5-Object-Pluggable
     SUBDIR += p5-Object-Realize-Later
     SUBDIR += p5-Object-Role
     SUBDIR += p5-Object-Signature
     SUBDIR += p5-Object-Simple
     SUBDIR += p5-Object-Tiny
     SUBDIR += p5-Object-Tiny-Lvalue
     SUBDIR += p5-Object-Tiny-RW
     SUBDIR += p5-Olson-Abbreviations
     SUBDIR += p5-Opcodes
     SUBDIR += p5-OrePAN2
     SUBDIR += p5-Ouch
     SUBDIR += p5-PAR
     SUBDIR += p5-PAR-Dist
     SUBDIR += p5-PAR-Packer
     SUBDIR += p5-PCSC-Card
     SUBDIR += p5-PHP-Serialization
     SUBDIR += p5-POE
     SUBDIR += p5-POE-API-Hooks
     SUBDIR += p5-POE-API-Peek
     SUBDIR += p5-POE-Component-Child
     SUBDIR += p5-POE-Component-Cron
     SUBDIR += p5-POE-Component-Daemon
     SUBDIR += p5-POE-Component-DebugShell
     SUBDIR += p5-POE-Component-DirWatch
     SUBDIR += p5-POE-Component-Hailo
     SUBDIR += p5-POE-Component-IKC
     SUBDIR += p5-POE-Component-JobQueue
     SUBDIR += p5-POE-Component-Logger
     SUBDIR += p5-POE-Component-Pluggable
     SUBDIR += p5-POE-Component-RSS
     SUBDIR += p5-POE-Component-RSSAggregator
     SUBDIR += p5-POE-Component-Schedule
     SUBDIR += p5-POE-Component-Server-XMLRPC
     SUBDIR += p5-POE-Component-Syndicator
     SUBDIR += p5-POE-Component-TSTP
     SUBDIR += p5-POE-Devel-Profiler
     SUBDIR += p5-POE-Loop-AnyEvent
     SUBDIR += p5-POE-Loop-Glib
     SUBDIR += p5-POE-Loop-Tk
     SUBDIR += p5-POE-Quickie
     SUBDIR += p5-POE-Session-MultiDispatch
     SUBDIR += p5-POE-Stage
     SUBDIR += p5-POE-Test-Loops
     SUBDIR += p5-POE-XS-Loop-Poll
     SUBDIR += p5-POE-XS-Queue-Array
     SUBDIR += p5-POEx-Role-SessionInstantiation
     SUBDIR += p5-POEx-Role-Streaming
     SUBDIR += p5-POEx-Types
     SUBDIR += p5-POSIX-strftime-Compiler
     SUBDIR += p5-POSIX-strptime
     SUBDIR += p5-PPR
     SUBDIR += p5-PPerl
     SUBDIR += p5-PV
     SUBDIR += p5-Package-Constants
     SUBDIR += p5-Package-DeprecationManager
     SUBDIR += p5-Package-Generator
     SUBDIR += p5-Package-MoreUtil
     SUBDIR += p5-Package-Stash
     SUBDIR += p5-Package-Stash-XS
     SUBDIR += p5-Package-Util-Lite
     SUBDIR += p5-Package-Variant
     SUBDIR += p5-PadWalker
     SUBDIR += p5-Parallel-Async
     SUBDIR += p5-Parallel-Fork-BossWorker
     SUBDIR += p5-Parallel-ForkManager
     SUBDIR += p5-Parallel-Iterator
     SUBDIR += p5-Parallel-Prefork
     SUBDIR += p5-Parallel-Scoreboard
     SUBDIR += p5-Params-CallbackRequest
     SUBDIR += p5-Params-Check
     SUBDIR += p5-Params-Classify
     SUBDIR += p5-Params-Coerce
     SUBDIR += p5-Params-Util
     SUBDIR += p5-Params-Validate
     SUBDIR += p5-Params-Validate-Dependencies
     SUBDIR += p5-Params-ValidationCompiler
     SUBDIR += p5-Paranoid
     SUBDIR += p5-Paranoid-Log-Email
     SUBDIR += p5-Paranoid-Log-Syslog
     SUBDIR += p5-Parse-CPAN-Packages
     SUBDIR += p5-Parse-CPAN-Packages-Fast
     SUBDIR += p5-Parse-Distname
     SUBDIR += p5-Parse-ErrorString-Perl
     SUBDIR += p5-Parse-ExuberantCTags
     SUBDIR += p5-Parse-LocalDistribution
     SUBDIR += p5-Parse-Method-Signatures
     SUBDIR += p5-Parse-PMFile
     SUBDIR += p5-Parse-PerlConfig
     SUBDIR += p5-Parse-PlainConfig
     SUBDIR += p5-Parse-RecDescent
     SUBDIR += p5-Parse-VarName
     SUBDIR += p5-Parse-Win32Registry
     SUBDIR += p5-Parse-Yapp
     SUBDIR += p5-ParseLex
     SUBDIR += p5-ParseTemplate
     SUBDIR += p5-Parser-MGC
     SUBDIR += p5-PatchReader
     SUBDIR += p5-Path-Abstract
     SUBDIR += p5-Path-Class
     SUBDIR += p5-Path-Class-File-Lockable
     SUBDIR += p5-Path-Dispatcher
     SUBDIR += p5-Path-Dispatcher-Declarative
     SUBDIR += p5-Path-Extended
     SUBDIR += p5-Path-FindDev
     SUBDIR += p5-Path-IsDev
     SUBDIR += p5-Path-Iterator-Rule
     SUBDIR += p5-Path-Resource
     SUBDIR += p5-Path-Tiny
     SUBDIR += p5-PathTools
     SUBDIR += p5-Paws
     SUBDIR += p5-Pegex
     SUBDIR += p5-Perl-Critic-Deprecated
     SUBDIR += p5-Perl-Metrics-Lite
     SUBDIR += p5-Perl-Metrics-Simple
     SUBDIR += p5-Perl-OSType
     SUBDIR += p5-Perl-PrereqScanner
     SUBDIR += p5-Perl-PrereqScanner-Lite
     SUBDIR += p5-Perl-PrereqScanner-NotQuiteLite
     SUBDIR += p5-Perl-Tidy
     SUBDIR += p5-Perl-Unsafe-Signals
     SUBDIR += p5-Perl-Version
     SUBDIR += p5-Perl-osnames
     SUBDIR += p5-Perl4-CoreLibs
     SUBDIR += p5-Perl6-Builtins
     SUBDIR += p5-Perl6-Export
     SUBDIR += p5-Perl6-Export-Attrs
     SUBDIR += p5-Perl6-Form
     SUBDIR += p5-Perl6-Junction
     SUBDIR += p5-Perl6-Rules
     SUBDIR += p5-Perl6-Say
     SUBDIR += p5-Perl6-Slurp
     SUBDIR += p5-PerlIO-Layers
     SUBDIR += p5-PerlIO-Util
     SUBDIR += p5-PerlIO-eol
     SUBDIR += p5-PerlIO-locale
     SUBDIR += p5-PerlIO-utf8_strict
     SUBDIR += p5-PerlIO-via-MD5
     SUBDIR += p5-PerlIO-via-Timeout
     SUBDIR += p5-PerlIO-via-dynamic
     SUBDIR += p5-PerlIO-via-symlink
     SUBDIR += p5-PerlX-Maybe
     SUBDIR += p5-PerlX-Maybe-XS
     SUBDIR += p5-Pid-File-Flock
     SUBDIR += p5-Pipeline
     SUBDIR += p5-Pithub
     SUBDIR += p5-PkgConfig
     SUBDIR += p5-PkgConfig-LibPkgConf
     SUBDIR += p5-Pod-Coverage
     SUBDIR += p5-Pod-Coverage-Moose
     SUBDIR += p5-Pod-Coverage-TrustPod
     SUBDIR += p5-Pod-Tests
     SUBDIR += p5-Pod-Usage
     SUBDIR += p5-Pragmatic
     SUBDIR += p5-Proc-BackOff
     SUBDIR += p5-Proc-Background
     SUBDIR += p5-Proc-Daemon
     SUBDIR += p5-Proc-FastSpawn
     SUBDIR += p5-Proc-Find-Parents
     SUBDIR += p5-Proc-Fork
     SUBDIR += p5-Proc-Guard
     SUBDIR += p5-Proc-PID-File
     SUBDIR += p5-Proc-Pidfile
     SUBDIR += p5-Proc-ProcessTable
     SUBDIR += p5-Proc-Queue
     SUBDIR += p5-Proc-Reliable
     SUBDIR += p5-Proc-SafeExec
     SUBDIR += p5-Proc-Simple
     SUBDIR += p5-Proc-Wait3
     SUBDIR += p5-Proc-WaitStat
     SUBDIR += p5-Process-Status
     SUBDIR += p5-Progress-Any
     SUBDIR += p5-Project-Gantt
     SUBDIR += p5-Project-Libs
     SUBDIR += p5-Pthread-GetThreadId
     SUBDIR += p5-Qudo
     SUBDIR += p5-RPSL-Parser
     SUBDIR += p5-RRDTool-OO
     SUBDIR += p5-Rcs
     SUBDIR += p5-Rcs-Agent
     SUBDIR += p5-Readonly
     SUBDIR += p5-Readonly-XS
     SUBDIR += p5-ReadonlyX
     SUBDIR += p5-Reaper
     SUBDIR += p5-Ref-Util
     SUBDIR += p5-Ref-Util-XS
     SUBDIR += p5-Reflex
     SUBDIR += p5-Regexp-Assemble
     SUBDIR += p5-Regexp-Assemble-Compressed
     SUBDIR += p5-Regexp-Bind
     SUBDIR += p5-Regexp-Compare
     SUBDIR += p5-Regexp-Grammars
     SUBDIR += p5-Regexp-Lexer
     SUBDIR += p5-Regexp-Pattern-Perl
     SUBDIR += p5-Regexp-RegGrp
     SUBDIR += p5-Regexp-Shellish
     SUBDIR += p5-Regexp-Stringify
     SUBDIR += p5-Regexp-Subst-Parallel
     SUBDIR += p5-Regexp-Trie
     SUBDIR += p5-Religion
     SUBDIR += p5-Reply
     SUBDIR += p5-ResourcePool
     SUBDIR += p5-Resources
     SUBDIR += p5-Return-MultiLevel
     SUBDIR += p5-Return-Type
     SUBDIR += p5-Return-Value
     SUBDIR += p5-Rinci
     SUBDIR += p5-Role-Basic
     SUBDIR += p5-Role-HasMessage
     SUBDIR += p5-Role-Hooks
     SUBDIR += p5-Role-Identifiable
     SUBDIR += p5-Role-Tiny
     SUBDIR += p5-Rose-DateTime
     SUBDIR += p5-Rose-Object
     SUBDIR += p5-Router-R3
     SUBDIR += p5-Routes-Tiny
     SUBDIR += p5-RunApp
     SUBDIR += p5-SDL
     SUBDIR += p5-SNMP-Persist
     SUBDIR += p5-SOAP-WSDL
     SUBDIR += p5-SPOPS
     SUBDIR += p5-SSN-Validate
     SUBDIR += p5-SUPER
     SUBDIR += p5-SVN-ACL
     SUBDIR += p5-SVN-Access
     SUBDIR += p5-SVN-Agent
     SUBDIR += p5-SVN-Dump
     SUBDIR += p5-SVN-Dumpfile
     SUBDIR += p5-SVN-Hook
     SUBDIR += p5-SVN-Hooks
     SUBDIR += p5-SVN-Log
     SUBDIR += p5-SVN-Look
     SUBDIR += p5-SVN-Mirror
     SUBDIR += p5-SVN-Notify
     SUBDIR += p5-SVN-Notify-Config
     SUBDIR += p5-SVN-Notify-Filter-AuthZMail
     SUBDIR += p5-SVN-Notify-Filter-EmailFlatFileDB
     SUBDIR += p5-SVN-Notify-Filter-Markdown
     SUBDIR += p5-SVN-Notify-Filter-Watchers
     SUBDIR += p5-SVN-Notify-Mirror
     SUBDIR += p5-SVN-Notify-Snapshot
     SUBDIR += p5-SVN-S4
     SUBDIR += p5-SVN-Simple
     SUBDIR += p5-SVN-Statistics
     SUBDIR += p5-SVN-Web
     SUBDIR += p5-Safe-Isa
     SUBDIR += p5-Sah
     SUBDIR += p5-Scalar-Defer
     SUBDIR += p5-Scalar-Does
     SUBDIR += p5-Scalar-Listify
     SUBDIR += p5-Scalar-String
     SUBDIR += p5-Scalar-Util-LooksLikeNumber
     SUBDIR += p5-Scalar-Util-Numeric
     SUBDIR += p5-Scope-Container
     SUBDIR += p5-Scope-Guard
     SUBDIR += p5-Scope-Upper
     SUBDIR += p5-Script-isAperlScript
     SUBDIR += p5-Sentinel
     SUBDIR += p5-Sepia
     SUBDIR += p5-Set-Array
     SUBDIR += p5-Set-ConsistentHash
     SUBDIR += p5-Set-Crontab
     SUBDIR += p5-Set-CrossProduct
     SUBDIR += p5-Set-Infinite
     SUBDIR += p5-Set-NestedGroups
     SUBDIR += p5-Set-Object
     SUBDIR += p5-Set-Scalar
     SUBDIR += p5-Set-Tiny
     SUBDIR += p5-Shell-Base
     SUBDIR += p5-Shell-Config-Generate
     SUBDIR += p5-Shell-EnvImporter
     SUBDIR += p5-Shell-GetEnv
     SUBDIR += p5-Shell-Guess
     SUBDIR += p5-Shell-Parser
     SUBDIR += p5-Shell-Source
     SUBDIR += p5-ShipIt
     SUBDIR += p5-ShipIt-Step-Manifest
     SUBDIR += p5-Signal-Mask
     SUBDIR += p5-Slurp
     SUBDIR += p5-Smart-Comments
     SUBDIR += p5-Sort-Array
     SUBDIR += p5-Sort-ArrayOfArrays
     SUBDIR += p5-Sort-Key
     SUBDIR += p5-Sort-Key-DateTime
     SUBDIR += p5-Sort-Key-Top
     SUBDIR += p5-Sort-Maker
     SUBDIR += p5-Sort-Sub
     SUBDIR += p5-Sort-Tree
     SUBDIR += p5-Sort-Versions
     SUBDIR += p5-Specio
     SUBDIR += p5-Spiffy
     SUBDIR += p5-Spoon
     SUBDIR += p5-Storable
     SUBDIR += p5-Stream
     SUBDIR += p5-Stream-Buffered
     SUBDIR += p5-Stream-Reader
     SUBDIR += p5-String-Approx
     SUBDIR += p5-String-CRC32
     SUBDIR += p5-String-Checker
     SUBDIR += p5-String-Diff
     SUBDIR += p5-String-Dump
     SUBDIR += p5-String-Ediff
     SUBDIR += p5-String-Errf
     SUBDIR += p5-String-Formatter
     SUBDIR += p5-String-Interpolate-Named
     SUBDIR += p5-String-KeyboardDistance
     SUBDIR += p5-String-LRC
     SUBDIR += p5-String-Parity
     SUBDIR += p5-String-Random
     SUBDIR += p5-String-RexxParse
     SUBDIR += p5-String-Similarity
     SUBDIR += p5-String-TT
     SUBDIR += p5-Struct-Dumb
     SUBDIR += p5-Sub-Alias
     SUBDIR += p5-Sub-Current
     SUBDIR += p5-Sub-Delete
     SUBDIR += p5-Sub-Exporter
     SUBDIR += p5-Sub-Exporter-ForMethods
     SUBDIR += p5-Sub-Exporter-GlobExporter
     SUBDIR += p5-Sub-Exporter-Lexical
     SUBDIR += p5-Sub-Exporter-Progressive
     SUBDIR += p5-Sub-HandlesVia
     SUBDIR += p5-Sub-Identify
     SUBDIR += p5-Sub-Infix
     SUBDIR += p5-Sub-Info
     SUBDIR += p5-Sub-Install
     SUBDIR += p5-Sub-Installer
     SUBDIR += p5-Sub-Multi
     SUBDIR += p5-Sub-Name
     SUBDIR += p5-Sub-Override
     SUBDIR += p5-Sub-Prototype
     SUBDIR += p5-Sub-Quote
     SUBDIR += p5-Sub-Signatures
     SUBDIR += p5-Sub-Uplevel
     SUBDIR += p5-Sub-WrapPackages
     SUBDIR += p5-Symbol-Get
     SUBDIR += p5-Symbol-Global-Name
     SUBDIR += p5-Symbol-Util
     SUBDIR += p5-Syntax-Keyword-Dynamically
     SUBDIR += p5-Syntax-Keyword-Gather
     SUBDIR += p5-Syntax-Keyword-Junction
     SUBDIR += p5-Syntax-Keyword-Match
     SUBDIR += p5-Syntax-Keyword-Try
     SUBDIR += p5-Sys-CPU
     SUBDIR += p5-Sys-Info
     SUBDIR += p5-Sys-Info-Base
     SUBDIR += p5-Sys-Info-Driver-BSD
     SUBDIR += p5-Sys-MemInfo
     SUBDIR += p5-Sys-Mmap
     SUBDIR += p5-Sys-RunAlone
     SUBDIR += p5-Sys-RunAlways
     SUBDIR += p5-Sys-Sendfile
     SUBDIR += p5-Sys-Sendfile-FreeBSD
     SUBDIR += p5-Sys-Sig
     SUBDIR += p5-Sys-SigAction
     SUBDIR += p5-Sys-Syscall
     SUBDIR += p5-Sys-Trace
     SUBDIR += p5-Sys-Virt
     SUBDIR += p5-System-Command
     SUBDIR += p5-System-Info
     SUBDIR += p5-System-Sub
     SUBDIR += p5-System2
     SUBDIR += p5-TAP-Formatter-JUnit
     SUBDIR += p5-TAP-Harness-JUnit
     SUBDIR += p5-TAP-SimpleOutput
     SUBDIR += p5-Taint-Runtime
     SUBDIR += p5-Taint-Util
     SUBDIR += p5-Task-Tiny
     SUBDIR += p5-Task-Weaken
     SUBDIR += p5-Tee
     SUBDIR += p5-Template-Provider-Encode
     SUBDIR += p5-Term-ANSIColor
     SUBDIR += p5-Term-ANSIScreen
     SUBDIR += p5-Term-Animation
     SUBDIR += p5-Term-App-Roles
     SUBDIR += p5-Term-App-Util-Color
     SUBDIR += p5-Term-App-Util-Interactive
     SUBDIR += p5-Term-App-Util-Size
     SUBDIR += p5-Term-CallEditor
     SUBDIR += p5-Term-Choose
     SUBDIR += p5-Term-Choose-Util
     SUBDIR += p5-Term-Clui
     SUBDIR += p5-Term-Detect-Software
     SUBDIR += p5-Term-EditLine
     SUBDIR += p5-Term-Encoding
     SUBDIR += p5-Term-Form
     SUBDIR += p5-Term-Menus
     SUBDIR += p5-Term-ProgressBar
     SUBDIR += p5-Term-ProgressBar-Quiet
     SUBDIR += p5-Term-ProgressBar-Simple
     SUBDIR += p5-Term-Prompt
     SUBDIR += p5-Term-Query
     SUBDIR += p5-Term-RawInput
     SUBDIR += p5-Term-ReadKey
     SUBDIR += p5-Term-ReadLine
     SUBDIR += p5-Term-ReadLine-Gnu
     SUBDIR += p5-Term-ReadLine-Perl
     SUBDIR += p5-Term-ReadLine-TTYtter
     SUBDIR += p5-Term-ReadLine-Zoid
     SUBDIR += p5-Term-ReadPassword
     SUBDIR += p5-Term-Screen
     SUBDIR += p5-Term-ScreenColor
     SUBDIR += p5-Term-Shell
     SUBDIR += p5-Term-Size
     SUBDIR += p5-Term-Size-Any
     SUBDIR += p5-Term-Size-Perl
     SUBDIR += p5-Term-Sk
     SUBDIR += p5-Term-Table
     SUBDIR += p5-Term-TablePrint
     SUBDIR += p5-Term-TermKey
     SUBDIR += p5-Term-Title
     SUBDIR += p5-Term-UI
     SUBDIR += p5-Term-VT102
     SUBDIR += p5-Term-VT102-Boundless
     SUBDIR += p5-Term-Visual
     SUBDIR += p5-Test-API
     SUBDIR += p5-Test-Able
     SUBDIR += p5-Test-Able-Runner
     SUBDIR += p5-Test-Aggregate
     SUBDIR += p5-Test-Archive-Libarchive
     SUBDIR += p5-Test-Assertions
     SUBDIR += p5-Test-Auto
     SUBDIR += p5-Test-Base
     SUBDIR += p5-Test-Benchmark
     SUBDIR += p5-Test-BinaryData
     SUBDIR += p5-Test-Bits
     SUBDIR += p5-Test-CPAN-Meta
     SUBDIR += p5-Test-CPAN-Meta-YAML
     SUBDIR += p5-Test-CheckDeps
     SUBDIR += p5-Test-CheckManifest
     SUBDIR += p5-Test-Class
     SUBDIR += p5-Test-Class-Most
     SUBDIR += p5-Test-ClassAPI
     SUBDIR += p5-Test-Classy
     SUBDIR += p5-Test-CleanNamespaces
     SUBDIR += p5-Test-Cmd
     SUBDIR += p5-Test-Command
     SUBDIR += p5-Test-Command-Simple
     SUBDIR += p5-Test-Compile
     SUBDIR += p5-Test-DBIC-ExpectedQueries
     SUBDIR += p5-Test-DBIx-Class
     SUBDIR += p5-Test-Data
     SUBDIR += p5-Test-Debugger
     SUBDIR += p5-Test-Declare
     SUBDIR += p5-Test-Deep
     SUBDIR += p5-Test-Deep-UnorderedPairs
     SUBDIR += p5-Test-Dependencies
     SUBDIR += p5-Test-DependentModules
     SUBDIR += p5-Test-DiagINC
     SUBDIR += p5-Test-Differences
     SUBDIR += p5-Test-Distribution
     SUBDIR += p5-Test-EOL
     SUBDIR += p5-Test-Exception
     SUBDIR += p5-Test-Exit
     SUBDIR += p5-Test-Expect
     SUBDIR += p5-Test-ExpectAndCheck
     SUBDIR += p5-Test-FailWarnings
     SUBDIR += p5-Test-Fake-HTTPD
     SUBDIR += p5-Test-Fatal
     SUBDIR += p5-Test-File
     SUBDIR += p5-Test-File-Contents
     SUBDIR += p5-Test-File-ShareDir
     SUBDIR += p5-Test-Filename
     SUBDIR += p5-Test-Fixme
     SUBDIR += p5-Test-Fixture-DBIC-Schema
     SUBDIR += p5-Test-Future-IO-Impl
     SUBDIR += p5-Test-Group
     SUBDIR += p5-Test-HTML-Tidy
     SUBDIR += p5-Test-Harness
     SUBDIR += p5-Test-Harness-Straps
     SUBDIR += p5-Test-HasVersion
     SUBDIR += p5-Test-HexDifferences
     SUBDIR += p5-Test-HexString
     SUBDIR += p5-Test-Identity
     SUBDIR += p5-Test-If
     SUBDIR += p5-Test-InDistDir
     SUBDIR += p5-Test-Inline
     SUBDIR += p5-Test-Inter
     SUBDIR += p5-Test-JSON
     SUBDIR += p5-Test-Kwalitee
     SUBDIR += p5-Test-Lazy
     SUBDIR += p5-Test-LeakTrace
     SUBDIR += p5-Test-LectroTest
     SUBDIR += p5-Test-Lib
     SUBDIR += p5-Test-Lives
     SUBDIR += p5-Test-LoadAllModules
     SUBDIR += p5-Test-Log-Log4perl
     SUBDIR += p5-Test-Log4perl
     SUBDIR += p5-Test-LongString
     SUBDIR += p5-Test-Manifest
     SUBDIR += p5-Test-ManyParams
     SUBDIR += p5-Test-Memory-Cycle
     SUBDIR += p5-Test-Metrics-Any
     SUBDIR += p5-Test-Mini
     SUBDIR += p5-Test-Mini-Unit
     SUBDIR += p5-Test-Mock-Guard
     SUBDIR += p5-Test-Mock-LWP
     SUBDIR += p5-Test-Mock-LWP-Dispatch
     SUBDIR += p5-Test-Mock-One
     SUBDIR += p5-Test-Mock-Redis
     SUBDIR += p5-Test-MockDateTime
     SUBDIR += p5-Test-MockModule
     SUBDIR += p5-Test-MockObject
     SUBDIR += p5-Test-MockRandom
     SUBDIR += p5-Test-MockTime
     SUBDIR += p5-Test-MockTime-HiRes
     SUBDIR += p5-Test-Modern
     SUBDIR += p5-Test-Module-Used
     SUBDIR += p5-Test-Moose-More
     SUBDIR += p5-Test-More-UTF8
     SUBDIR += p5-Test-Most
     SUBDIR += p5-Test-Name-FromLine
     SUBDIR += p5-Test-Needs
     SUBDIR += p5-Test-Net-LDAP
     SUBDIR += p5-Test-Net-RabbitMQ
     SUBDIR += p5-Test-NoTabs
     SUBDIR += p5-Test-NoWarnings
     SUBDIR += p5-Test-Number-Delta
     SUBDIR += p5-Test-Object
     SUBDIR += p5-Test-OpenLDAP
     SUBDIR += p5-Test-Output
     SUBDIR += p5-Test-POE-Client-TCP
     SUBDIR += p5-Test-POE-Server-TCP
     SUBDIR += p5-Test-Parser
     SUBDIR += p5-Test-PerlTidy
     SUBDIR += p5-Test-Pod
     SUBDIR += p5-Test-Pod-Coverage
     SUBDIR += p5-Test-Pod-Coverage-Permissive
     SUBDIR += p5-Test-Portability-Files
     SUBDIR += p5-Test-Prereq
     SUBDIR += p5-Test-RandomResults
     SUBDIR += p5-Test-Refcount
     SUBDIR += p5-Test-Reporter
     SUBDIR += p5-Test-Reporter-Transport-Metabase
     SUBDIR += p5-Test-Requires
     SUBDIR += p5-Test-Requires-Git
     SUBDIR += p5-Test-RequiresInternet
     SUBDIR += p5-Test-Roo
     SUBDIR += p5-Test-Script
     SUBDIR += p5-Test-Script-Run
     SUBDIR += p5-Test-SharedFork
     SUBDIR += p5-Test-Signature
     SUBDIR += p5-Test-Simple
     SUBDIR += p5-Test-Singleton
     SUBDIR += p5-Test-Snapshot
     SUBDIR += p5-Test-Spec
     SUBDIR += p5-Test-Spelling
     SUBDIR += p5-Test-Strict
     SUBDIR += p5-Test-SubCalls
     SUBDIR += p5-Test-Synopsis
     SUBDIR += p5-Test-Sys-Info
     SUBDIR += p5-Test-TAP-HTMLMatrix
     SUBDIR += p5-Test-TAP-Model
     SUBDIR += p5-Test-TCP
     SUBDIR += p5-Test-TableDriven
     SUBDIR += p5-Test-Taint
     SUBDIR += p5-Test-TempDir-Tiny
     SUBDIR += p5-Test-Time
     SUBDIR += p5-Test-Timer
     SUBDIR += p5-Test-TinyMocker
     SUBDIR += p5-Test-TrailingSpace
     SUBDIR += p5-Test-Trap
     SUBDIR += p5-Test-UNIXSock
     SUBDIR += p5-Test-Unit
     SUBDIR += p5-Test-UseAllModules
     SUBDIR += p5-Test-Version
     SUBDIR += p5-Test-WWW-Declare
     SUBDIR += p5-Test-WWW-Mechanize
     SUBDIR += p5-Test-WWW-Mechanize-CGI
     SUBDIR += p5-Test-WWW-Mechanize-CGIApp
     SUBDIR += p5-Test-WWW-Mechanize-Catalyst
     SUBDIR += p5-Test-WWW-Mechanize-PSGI
     SUBDIR += p5-Test-WWW-Selenium
     SUBDIR += p5-Test-Warn
     SUBDIR += p5-Test-Warnings
     SUBDIR += p5-Test-Weaken
     SUBDIR += p5-Test-Without-Module
     SUBDIR += p5-Test-XML
     SUBDIR += p5-Test-XML-Valid
     SUBDIR += p5-Test-YAML
     SUBDIR += p5-Test-YAML-Meta
     SUBDIR += p5-Test-YAML-Valid
     SUBDIR += p5-Test-utf8
     SUBDIR += p5-Test2-Harness
     SUBDIR += p5-Test2-Harness-UI
     SUBDIR += p5-Test2-Plugin-Cover
     SUBDIR += p5-Test2-Plugin-DBIProfile
     SUBDIR += p5-Test2-Plugin-IOEvents
     SUBDIR += p5-Test2-Plugin-MemUsage
     SUBDIR += p5-Test2-Plugin-NoWarnings
     SUBDIR += p5-Test2-Plugin-UUID
     SUBDIR += p5-Test2-Suite
     SUBDIR += p5-Test2-Tools-Explain
     SUBDIR += p5-Test2-Tools-FFI
     SUBDIR += p5-Test2-Tools-LoadModule
     SUBDIR += p5-Test2-Tools-MemoryCycle
     SUBDIR += p5-Text-Levenshtein
     SUBDIR += p5-Text-Levenshtein-Damerau
     SUBDIR += p5-Text-Levenshtein-Damerau-XS
     SUBDIR += p5-Text-LevenshteinXS
     SUBDIR += p5-Text-Outdent
     SUBDIR += p5-Text-vFile-asData
     SUBDIR += p5-TheSchwartz
     SUBDIR += p5-TheSchwartz-Simple
     SUBDIR += p5-TheSchwartz-Worker-SendEmail
     SUBDIR += p5-Thread-Apartment
     SUBDIR += p5-Thread-Cancel
     SUBDIR += p5-Thread-Pool-Simple
     SUBDIR += p5-Thread-Queue
     SUBDIR += p5-Thread-Queue-Duplex
     SUBDIR += p5-Thread-Suspend
     SUBDIR += p5-Thrift
     SUBDIR += p5-Thrift-XS
     SUBDIR += p5-Throwable
     SUBDIR += p5-Tickit
     SUBDIR += p5-Tickit-Widget-Table
     SUBDIR += p5-Tickit-Widgets
     SUBDIR += p5-Tie-Array-Pack
     SUBDIR += p5-Tie-Array-Sorted
     SUBDIR += p5-Tie-CPHash
     SUBDIR += p5-Tie-Cache
     SUBDIR += p5-Tie-DB_File-SplitHash
     SUBDIR += p5-Tie-DB_FileLock
     SUBDIR += p5-Tie-File
     SUBDIR += p5-Tie-File-AsHash
     SUBDIR += p5-Tie-FileLRUCache
     SUBDIR += p5-Tie-Function
     SUBDIR += p5-Tie-Hash-Indexed
     SUBDIR += p5-Tie-Hash-MultiValue
     SUBDIR += p5-Tie-Hash-Regex
     SUBDIR += p5-Tie-Hash-Sorted
     SUBDIR += p5-Tie-Hash-TwoWay
     SUBDIR += p5-Tie-IxHash
     SUBDIR += p5-Tie-LLHash
     SUBDIR += p5-Tie-RefHash
     SUBDIR += p5-Tie-RefHash-Weak
     SUBDIR += p5-Tie-RegexpHash
     SUBDIR += p5-Tie-Restore
     SUBDIR += p5-Tie-ShareLite
     SUBDIR += p5-Tie-Simple
     SUBDIR += p5-Tie-Sub
     SUBDIR += p5-Tie-ToObject
     SUBDIR += p5-Tie-Util
     SUBDIR += p5-Tie-iCal
     SUBDIR += p5-Time-Clock
     SUBDIR += p5-Time-Crontab
     SUBDIR += p5-Time-Duration
     SUBDIR += p5-Time-Duration-Parse
     SUBDIR += p5-Time-Elapsed
     SUBDIR += p5-Time-Format
     SUBDIR += p5-Time-HiRes
     SUBDIR += p5-Time-Interval
     SUBDIR += p5-Time-Local
     SUBDIR += p5-Time-Mock
     SUBDIR += p5-Time-Moment
     SUBDIR += p5-Time-Moment-Role-TimeZone
     SUBDIR += p5-Time-Object
     SUBDIR += p5-Time-Out
     SUBDIR += p5-Time-ParseDate
     SUBDIR += p5-Time-Period
     SUBDIR += p5-Time-Piece
     SUBDIR += p5-Time-Piece-Range
     SUBDIR += p5-Time-Progress
     SUBDIR += p5-Time-Stopwatch
     SUBDIR += p5-Time-Warp
     SUBDIR += p5-Time-modules
     SUBDIR += p5-Time-timegm
     SUBDIR += p5-TimeDate
     SUBDIR += p5-ToolSet
     SUBDIR += p5-TraceFuncs
     SUBDIR += p5-Tree-Binary
     SUBDIR += p5-Tree-Binary-Dictionary
     SUBDIR += p5-Tree-DAG_Node
     SUBDIR += p5-Tree-Node
     SUBDIR += p5-Tree-Parser
     SUBDIR += p5-Tree-R
     SUBDIR += p5-Tree-RedBlack
     SUBDIR += p5-Tree-Simple
     SUBDIR += p5-Tree-Simple-View
     SUBDIR += p5-Tree-Simple-VisitorFactory
     SUBDIR += p5-Tree-Trie
     SUBDIR += p5-Type-Tiny
     SUBDIR += p5-Type-Tiny-Signatures
     SUBDIR += p5-Type-Tiny-XS
     SUBDIR += p5-Types-Core
     SUBDIR += p5-Types-Path-Tiny
     SUBDIR += p5-Types-Self
     SUBDIR += p5-Types-Serialiser
     SUBDIR += p5-Types-URI
     SUBDIR += p5-Types-UUID
     SUBDIR += p5-UDCode
     SUBDIR += p5-UI-Dialog
     SUBDIR += p5-UNIVERSAL-can
     SUBDIR += p5-UNIVERSAL-isa
     SUBDIR += p5-UNIVERSAL-moniker
     SUBDIR += p5-UNIVERSAL-ref
     SUBDIR += p5-UNIVERSAL-require
     SUBDIR += p5-UNIVERSAL-which
     SUBDIR += p5-UUID
     SUBDIR += p5-UUID-Random
     SUBDIR += p5-UUID-Random-Patch-UseMRS
     SUBDIR += p5-UUID-Tiny
     SUBDIR += p5-UUID-URandom
     SUBDIR += p5-Uniq
     SUBDIR += p5-Unix-Groups
     SUBDIR += p5-Unix-Groups-FFI
     SUBDIR += p5-Unix-Statgrab
     SUBDIR += p5-Unix-Uptime
     SUBDIR += p5-User-Identity
     SUBDIR += p5-Util-Any
     SUBDIR += p5-VCP-Dest-svk
     SUBDIR += p5-VCP-Source-cvsbk
     SUBDIR += p5-VCP-autrijus
     SUBDIR += p5-VCS
     SUBDIR += p5-VCS-CVS
     SUBDIR += p5-VCS-Lite
     SUBDIR += p5-Validation-Class
     SUBDIR += p5-Variable-Disposition
     SUBDIR += p5-Variable-Eject
     SUBDIR += p5-Variable-Magic
     SUBDIR += p5-Venus
     SUBDIR += p5-Want
     SUBDIR += p5-WeakRef
     SUBDIR += p5-Workflow
     SUBDIR += p5-X-Tiny
     SUBDIR += p5-XML-Compile-Tester
     SUBDIR += p5-XML-Pastor
     SUBDIR += p5-XS-Object-Magic
     SUBDIR += p5-XS-Parse-Keyword
     SUBDIR += p5-XS-Parse-Sublike
     SUBDIR += p5-XSLoader
     SUBDIR += p5-XXX
     SUBDIR += p5-Xporter
     SUBDIR += p5-YAML-AppConfig
     SUBDIR += p5-Yada-Yada-Yada
     SUBDIR += p5-ZML
     SUBDIR += p5-accessors
     SUBDIR += p5-accessors-fast
     SUBDIR += p5-alias-module
     SUBDIR += p5-aliased
     SUBDIR += p5-asa
     SUBDIR += p5-autobox
     SUBDIR += p5-autobox-Core
     SUBDIR += p5-autobox-Transform
     SUBDIR += p5-autodie
     SUBDIR += p5-autovivification
     SUBDIR += p5-bareword-filehandles
     SUBDIR += p5-boolean
     SUBDIR += p5-capitalization
     SUBDIR += p5-carton
     SUBDIR += p5-common-sense
     SUBDIR += p5-constant
     SUBDIR += p5-constant-boolean
     SUBDIR += p5-constant-def
     SUBDIR += p5-constant-defer
     SUBDIR += p5-constant-lexical
     SUBDIR += p5-cpan-listchanges
     SUBDIR += p5-curry
     SUBDIR += p5-enum
     SUBDIR += p5-ex-lib
     SUBDIR += p5-experimental
     SUBDIR += p5-forks
     SUBDIR += p5-github_creator
     SUBDIR += p5-goto-file
     SUBDIR += p5-iCal-Parser
     SUBDIR += p5-indirect
     SUBDIR += p5-interface
     SUBDIR += p5-latest
     SUBDIR += p5-lexical-underscore
     SUBDIR += p5-lib-abs
     SUBDIR += p5-libalarm
     SUBDIR += p5-libxml-enno
     SUBDIR += p5-local-lib
     SUBDIR += p5-match-simple
     SUBDIR += p5-match-simple-XS
     SUBDIR += p5-mem
     SUBDIR += p5-meta
     SUBDIR += p5-mixin
     SUBDIR += p5-mocked
     SUBDIR += p5-multidimensional
     SUBDIR += p5-namespace-autoclean
     SUBDIR += p5-namespace-clean
     SUBDIR += p5-namespace-clean-xs
     SUBDIR += p5-namespace-sweep
     SUBDIR += p5-orz
     SUBDIR += p5-parent
     SUBDIR += p5-pip
     SUBDIR += p5-prefork
     SUBDIR += p5-relative
     SUBDIR += p5-routines
     SUBDIR += p5-self
     SUBDIR += p5-self-init
     SUBDIR += p5-strictures
     SUBDIR += p5-subatom
     SUBDIR += p5-subversion
     SUBDIR += p5-superclass
     SUBDIR += p5-syntax
     SUBDIR += p5-threads
     SUBDIR += p5-threads-shared
     SUBDIR += p5-true
     SUBDIR += p5-uni-perl
     SUBDIR += p5-version
     SUBDIR += p8-platform
     SUBDIR += packr
     SUBDIR += paexec
     SUBDIR += pam_wrapper
     SUBDIR += papi
     SUBDIR += papilio-loader
     SUBDIR += paq-nvim
     SUBDIR += parallel-hashmap
     SUBDIR += parol
     SUBDIR += parol-ls
     SUBDIR += pas2dox
     SUBDIR += pasm
     SUBDIR += patch
     SUBDIR += patsh
     SUBDIR += pcc-libs
     SUBDIR += pcg-cpp
     SUBDIR += pcl
     SUBDIR += pcre
     SUBDIR += pcre2
     SUBDIR += pcsc-cyberjack
     SUBDIR += pcsc-lite
     SUBDIR += pdcurses
     SUBDIR += pear
     SUBDIR += pear-Config
     SUBDIR += pear-Console_Color
     SUBDIR += pear-Console_CommandLine
     SUBDIR += pear-Console_Getargs
     SUBDIR += pear-Console_Table
     SUBDIR += pear-Date
     SUBDIR += pear-Date_Holidays
     SUBDIR += pear-Date_Holidays_Austria
     SUBDIR += pear-Date_Holidays_Brazil
     SUBDIR += pear-Date_Holidays_Denmark
     SUBDIR += pear-Date_Holidays_Discordian
     SUBDIR += pear-Date_Holidays_EnglandWales
     SUBDIR += pear-Date_Holidays_Germany
     SUBDIR += pear-Date_Holidays_Iceland
     SUBDIR += pear-Date_Holidays_Ireland
     SUBDIR += pear-Date_Holidays_Italy
     SUBDIR += pear-Date_Holidays_Japan
     SUBDIR += pear-Date_Holidays_Netherlands
     SUBDIR += pear-Date_Holidays_Norway
     SUBDIR += pear-Date_Holidays_PHPdotNet
     SUBDIR += pear-Date_Holidays_Romania
     SUBDIR += pear-Date_Holidays_Slovenia
     SUBDIR += pear-Date_Holidays_Sweden
     SUBDIR += pear-Date_Holidays_UNO
     SUBDIR += pear-Date_Holidays_USA
     SUBDIR += pear-Date_Holidays_Ukraine
     SUBDIR += pear-Event_Dispatcher
     SUBDIR += pear-FSM
     SUBDIR += pear-File_Iterator
     SUBDIR += pear-HTML_BBCodeParser
     SUBDIR += pear-HTML_CSS
     SUBDIR += pear-HTML_Common
     SUBDIR += pear-HTML_Common2
     SUBDIR += pear-HTML_Form
     SUBDIR += pear-HTML_Javascript
     SUBDIR += pear-HTML_Page2
     SUBDIR += pear-HTML_QuickForm
     SUBDIR += pear-HTML_QuickForm2
     SUBDIR += pear-HTML_QuickForm_Controller
     SUBDIR += pear-HTML_QuickForm_Livesearch
     SUBDIR += pear-HTML_QuickForm_Renderer_Tableless
     SUBDIR += pear-HTML_QuickForm_SelectFilter
     SUBDIR += pear-HTML_QuickForm_advmultiselect
     SUBDIR += pear-HTML_Select
     SUBDIR += pear-HTML_Select_Common
     SUBDIR += pear-HTML_Table
     SUBDIR += pear-HTML_Template_Flexy
     SUBDIR += pear-HTML_Template_IT
     SUBDIR += pear-HTML_Template_PHPLIB
     SUBDIR += pear-HTML_Template_Sigma
     SUBDIR += pear-HTML_TreeMenu
     SUBDIR += pear-Horde_Alarm
     SUBDIR += pear-Horde_Argv
     SUBDIR += pear-Horde_Autoloader
     SUBDIR += pear-Horde_Autoloader_Cache
     SUBDIR += pear-Horde_Cache
     SUBDIR += pear-Horde_Cli
     SUBDIR += pear-Horde_Constraint
     SUBDIR += pear-Horde_Controller
     SUBDIR += pear-Horde_Core
     SUBDIR += pear-Horde_Data
     SUBDIR += pear-Horde_Date
     SUBDIR += pear-Horde_Date_Parser
     SUBDIR += pear-Horde_Exception
     SUBDIR += pear-Horde_History
     SUBDIR += pear-Horde_Icalendar
     SUBDIR += pear-Horde_Injector
     SUBDIR += pear-Horde_Itip
     SUBDIR += pear-Horde_Lock
     SUBDIR += pear-Horde_LoginTasks
     SUBDIR += pear-Horde_Nls
     SUBDIR += pear-Horde_Notification
     SUBDIR += pear-Horde_Prefs
     SUBDIR += pear-Horde_Queue
     SUBDIR += pear-Horde_Rdo
     SUBDIR += pear-Horde_Role
     SUBDIR += pear-Horde_Scheduler
     SUBDIR += pear-Horde_Serialize
     SUBDIR += pear-Horde_Stream
     SUBDIR += pear-Horde_Stream_Filter
     SUBDIR += pear-Horde_Stream_Wrapper
     SUBDIR += pear-Horde_Support
     SUBDIR += pear-Horde_Thrift
     SUBDIR += pear-Horde_Timezone
     SUBDIR += pear-Horde_Token
     SUBDIR += pear-Horde_Translation
     SUBDIR += pear-Horde_Tree
     SUBDIR += pear-Horde_Util
     SUBDIR += pear-Horde_View
     SUBDIR += pear-I18N
     SUBDIR += pear-Math_Fraction
     SUBDIR += pear-Net_Gearman
     SUBDIR += pear-OLE
     SUBDIR += pear-PEAR_Info
     SUBDIR += pear-PEAR_PackageFileManager
     SUBDIR += pear-PEAR_PackageFileManager2
     SUBDIR += pear-PEAR_PackageFileManager_Plugins
     SUBDIR += pear-PHPTAL
     SUBDIR += pear-PHPUnit_MockObject
     SUBDIR += pear-PHP_ArrayOf
     SUBDIR += pear-PHP_Beautifier
     SUBDIR += pear-PHP_CodeCoverage
     SUBDIR += pear-PHP_CodeSniffer
     SUBDIR += pear-PHP_Compat
     SUBDIR += pear-PHP_CompatInfo
     SUBDIR += pear-PHP_Parser
     SUBDIR += pear-PHP_ParserGenerator
     SUBDIR += pear-PHP_Timer
     SUBDIR += pear-PHP_TokenStream
     SUBDIR += pear-PHP_UML
     SUBDIR += pear-Pager
     SUBDIR += pear-PhpDocumentor
     SUBDIR += pear-Pirum
     SUBDIR += pear-SebastianBergmann_FinderFacade
     SUBDIR += pear-SebastianBergmann_Git
     SUBDIR += pear-SebastianBergmann_PHPCPD
     SUBDIR += pear-SebastianBergmann_PHPLOC
     SUBDIR += pear-SebastianBergmann_Version
     SUBDIR += pear-Structure_LinkedList
     SUBDIR += pear-Structures_DataGrid
     SUBDIR += pear-Structures_DataGrid_Renderer_Console
     SUBDIR += pear-Structures_DataGrid_Renderer_HTMLSortForm
     SUBDIR += pear-Structures_DataGrid_Renderer_HTMLTable
     SUBDIR += pear-Structures_DataGrid_Renderer_XUL
     SUBDIR += pear-Symfony_Component_Console
     SUBDIR += pear-Symfony_Component_Finder
     SUBDIR += pear-System_Command
     SUBDIR += pear-Testing_Selenium
     SUBDIR += pear-Text_Diff
     SUBDIR += pear-TheSeer_DirectoryScanner
     SUBDIR += pear-TheSeer_fDOMDocument
     SUBDIR += pear-TheSeer_fXSL
     SUBDIR += pear-VFS
     SUBDIR += pear-Validate
     SUBDIR += pear-Validate_AU
     SUBDIR += pear-Validate_Finance
     SUBDIR += pear-Validate_Finance_CreditCard
     SUBDIR += pear-Validate_US
     SUBDIR += pear-Var_Dump
     SUBDIR += pear-VersionControl_Git
     SUBDIR += pear-VersionControl_SVN
     SUBDIR += pear-XML_NITF
     SUBDIR += pear-XML_Parser
     SUBDIR += pear-XML_RSS
     SUBDIR += pear-XML_SVG
     SUBDIR += pear-XML_Serializer
     SUBDIR += pear-XML_Transformer
     SUBDIR += pear-XML_Tree
     SUBDIR += pear-XML_Util
     SUBDIR += pear-channel-doctrine
     SUBDIR += pear-channel-ezc
     SUBDIR += pear-channel-geshi
     SUBDIR += pear-channel-horde
     SUBDIR += pear-channel-openpear
     SUBDIR += pear-channel-pdepend
     SUBDIR += pear-channel-phing
     SUBDIR += pear-channel-phpdoc
     SUBDIR += pear-channel-phpmd
     SUBDIR += pear-channel-pirum
     SUBDIR += pear-channel-symfony
     SUBDIR += pear-channel-symfony2
     SUBDIR += pear-channel-theseer
     SUBDIR += pear-channel-twig
     SUBDIR += pear-codegen
     SUBDIR += pear-ezc_Base
     SUBDIR += pear-ezc_ConsoleTools
     SUBDIR += pear-geshi
     SUBDIR += pear-pdepend-staticReflection
     SUBDIR += pear-phing
     SUBDIR += pecl-APCu
     SUBDIR += pecl-ast
     SUBDIR += pecl-dio
     SUBDIR += pecl-ds
     SUBDIR += pecl-eio
     SUBDIR += pecl-ev
     SUBDIR += pecl-event
     SUBDIR += pecl-excimer
     SUBDIR += pecl-expect
     SUBDIR += pecl-grpc
     SUBDIR += pecl-inotify
     SUBDIR += pecl-json_post
     SUBDIR += pecl-msgpack
     SUBDIR += pecl-mustache
     SUBDIR += pecl-protobuf
     SUBDIR += pecl-psr
     SUBDIR += pecl-raphf2
     SUBDIR += pecl-runkit7
     SUBDIR += pecl-swoole
     SUBDIR += pecl-sync
     SUBDIR += pecl-uploadprogress
     SUBDIR += pecl-uuid
     SUBDIR += pecl-uv
     SUBDIR += pecl-vld
     SUBDIR += pecl-xdebug
     SUBDIR += pecl-yac
     SUBDIR += pecl-yaconf
     SUBDIR += pecl-zookeeper
     SUBDIR += peg.el
     SUBDIR += pegtl
     SUBDIR += pep8
     SUBDIR += performance
     SUBDIR += perlconsole
     SUBDIR += phabricator
     SUBDIR += phasar
     SUBDIR += phorgeit-arcanist
     SUBDIR += phorgeit-arcanist-lib
     SUBDIR += phorgeit-phorge
     SUBDIR += php-Psr_Log
     SUBDIR += php-composer
     SUBDIR += php-geshi
     SUBDIR += php-ice37
     SUBDIR += php-libawl
     SUBDIR += php-maxminddb
     SUBDIR += php81-ffi
     SUBDIR += php81-gettext
     SUBDIR += php81-intl
     SUBDIR += php81-pcntl
     SUBDIR += php81-readline
     SUBDIR += php81-shmop
     SUBDIR += php81-sysvmsg
     SUBDIR += php81-sysvsem
     SUBDIR += php81-sysvshm
     SUBDIR += php81-tokenizer
     SUBDIR += php82-ffi
     SUBDIR += php82-gettext
     SUBDIR += php82-intl
     SUBDIR += php82-pcntl
     SUBDIR += php82-readline
     SUBDIR += php82-shmop
     SUBDIR += php82-sysvmsg
     SUBDIR += php82-sysvsem
     SUBDIR += php82-sysvshm
     SUBDIR += php82-tokenizer
     SUBDIR += php83-ffi
     SUBDIR += php83-gettext
     SUBDIR += php83-intl
     SUBDIR += php83-pcntl
     SUBDIR += php83-readline
     SUBDIR += php83-shmop
     SUBDIR += php83-sysvmsg
     SUBDIR += php83-sysvsem
     SUBDIR += php83-sysvshm
     SUBDIR += php83-tokenizer
     SUBDIR += phpunit10
     SUBDIR += phpunit11
     SUBDIR += phpunit8
     SUBDIR += phpunit9
     SUBDIR += physfs
     SUBDIR += pickle
     SUBDIR += picojson
     SUBDIR += picprog
     SUBDIR += pijul
     SUBDIR += pika
     SUBDIR += pipestatus
     SUBDIR += pire
     SUBDIR += pit
     SUBDIR += pkg-info.el
     SUBDIR += pkgconf
     SUBDIR += plan9port
     SUBDIR += plasma
     SUBDIR += plasma5-khotkeys
     SUBDIR += plasma5-kwrited
     SUBDIR += plasma5-plasma-sdk
     SUBDIR += plasma6-kwrited
     SUBDIR += plasma6-plasma-sdk
     SUBDIR += plasma6-plasma5support
     SUBDIR += please
     SUBDIR += pmccabe
     SUBDIR += pmd
     SUBDIR += poco
     SUBDIR += popt
     SUBDIR += poser
     SUBDIR += poxml
     SUBDIR += ppl
     SUBDIR += pprof
     SUBDIR += premake4
     SUBDIR += premake5
     SUBDIR += projectcenter
     SUBDIR += protobuf
     SUBDIR += protobuf-c
     SUBDIR += protobuf-java
     SUBDIR += protobuf25
     SUBDIR += protobuf3
     SUBDIR += prototool
     SUBDIR += protozero
     SUBDIR += pructl
     SUBDIR += psimd
     SUBDIR += pstreams
     SUBDIR += psvn
     SUBDIR += pth
     SUBDIR += pth-hard
     SUBDIR += pthreadpool
     SUBDIR += pthsem
     SUBDIR += ptl
     SUBDIR += ptlib
     SUBDIR += publib
     SUBDIR += purescript-language-server
     SUBDIR += pushmi
     SUBDIR += py-Automat
     SUBDIR += py-BTrees
     SUBDIR += py-DateTime
     SUBDIR += py-Dumper
     SUBDIR += py-ExtensionClass
     SUBDIR += py-Faker
     SUBDIR += py-IBMQuantumExperience
     SUBDIR += py-Jinja2
     SUBDIR += py-Jinja2-doc
     SUBDIR += py-Js2Py
     SUBDIR += py-Levenshtein
     SUBDIR += py-PYB11Generator
     SUBDIR += py-PeachPy
     SUBDIR += py-Products.ExternalEditor
     SUBDIR += py-Products.PloneLanguageTool
     SUBDIR += py-PyExecJS
     SUBDIR += py-PyGithub
     SUBDIR += py-PyLD
     SUBDIR += py-PyPubSub
     SUBDIR += py-PyUtilib
     SUBDIR += py-QtPy
     SUBDIR += py-RPyC
     SUBDIR += py-about-time
     SUBDIR += py-absl
     SUBDIR += py-absl-py
     SUBDIR += py-acstore
     SUBDIR += py-adb
     SUBDIR += py-addict
     SUBDIR += py-aenum
     SUBDIR += py-aioapns
     SUBDIR += py-aiobotocore
     SUBDIR += py-aiocontextvars
     SUBDIR += py-aiofiles
     SUBDIR += py-aiohttp-apispec
     SUBDIR += py-aioice
     SUBDIR += py-aioitertools
     SUBDIR += py-aiologger
     SUBDIR += py-aiorpcX
     SUBDIR += py-aiorpcX-legacy
     SUBDIR += py-aiortc
     SUBDIR += py-aiorwlock
     SUBDIR += py-aiosignal
     SUBDIR += py-airtable-python-wrapper
     SUBDIR += py-all-repos
     SUBDIR += py-amalgamate
     SUBDIR += py-aniso8601
     SUBDIR += py-aniso86016
     SUBDIR += py-anndata
     SUBDIR += py-annotated-types
     SUBDIR += py-ansi
     SUBDIR += py-antlr4-python3-runtime
     SUBDIR += py-anyconfig
     SUBDIR += py-anyio
     SUBDIR += py-anyio3
     SUBDIR += py-anyjson
     SUBDIR += py-anytree
     SUBDIR += py-apache_conf_parser
     SUBDIR += py-apipkg
     SUBDIR += py-apispec
     SUBDIR += py-apispec-webframeworks
     SUBDIR += py-appdirs
     SUBDIR += py-applicationinsights
     SUBDIR += py-apptools
     SUBDIR += py-apscheduler
     SUBDIR += py-archinfo
     SUBDIR += py-archspec
     SUBDIR += py-argcomplete
     SUBDIR += py-argh
     SUBDIR += py-argparse
     SUBDIR += py-args
     SUBDIR += py-ariadne
     SUBDIR += py-arpeggio
     SUBDIR += py-array-api-compat
     SUBDIR += py-arrow
     SUBDIR += py-asciimatics
     SUBDIR += py-asgi-lifespan
     SUBDIR += py-asn1
     SUBDIR += py-asn1crypto
     SUBDIR += py-aspectlib
     SUBDIR += py-aspy.yaml
     SUBDIR += py-assertpy
     SUBDIR += py-ast-decompiler
     SUBDIR += py-ast2json
     SUBDIR += py-asteval
     SUBDIR += py-astor
     SUBDIR += py-astroid
     SUBDIR += py-astroid2
     SUBDIR += py-asttokens
     SUBDIR += py-astunparse
     SUBDIR += py-async-lru
     SUBDIR += py-async_generator
     SUBDIR += py-async_timeout
     SUBDIR += py-asynctest
     SUBDIR += py-atomiclong
     SUBDIR += py-atomicwrites
     SUBDIR += py-atpublic
     SUBDIR += py-attrdict
     SUBDIR += py-attrs
     SUBDIR += py-attrs-strict
     SUBDIR += py-autocommand
     SUBDIR += py-autoflake
     SUBDIR += py-automaton
     SUBDIR += py-autopage
     SUBDIR += py-autoprop
     SUBDIR += py-avro
     SUBDIR += py-awesomeversion
     SUBDIR += py-aws-lambda-builders
     SUBDIR += py-aws-requests-auth
     SUBDIR += py-aws-sam-translator
     SUBDIR += py-aws-xray-sdk
     SUBDIR += py-awscli
     SUBDIR += py-awscrt
     SUBDIR += py-azure-appconfiguration
     SUBDIR += py-azure-batch
     SUBDIR += py-azure-core
     SUBDIR += py-azure-cosmos
     SUBDIR += py-azure-data-tables
     SUBDIR += py-azure-datalake-store
     SUBDIR += py-azure-functions-devops-build
     SUBDIR += py-azure-graphrbac
     SUBDIR += py-azure-identity
     SUBDIR += py-azure-keyvault
     SUBDIR += py-azure-keyvault-administration
     SUBDIR += py-azure-loganalytics
     SUBDIR += py-azure-mgmt-advisor
     SUBDIR += py-azure-mgmt-apimanagement
     SUBDIR += py-azure-mgmt-appconfiguration
     SUBDIR += py-azure-mgmt-appcontainers
     SUBDIR += py-azure-mgmt-applicationinsights
     SUBDIR += py-azure-mgmt-authorization
     SUBDIR += py-azure-mgmt-batch
     SUBDIR += py-azure-mgmt-batchai
     SUBDIR += py-azure-mgmt-billing
     SUBDIR += py-azure-mgmt-botservice
     SUBDIR += py-azure-mgmt-cdn
     SUBDIR += py-azure-mgmt-cognitiveservices
     SUBDIR += py-azure-mgmt-compute
     SUBDIR += py-azure-mgmt-consumption
     SUBDIR += py-azure-mgmt-containerinstance
     SUBDIR += py-azure-mgmt-containerregistry
     SUBDIR += py-azure-mgmt-containerservice
     SUBDIR += py-azure-mgmt-core
     SUBDIR += py-azure-mgmt-cosmosdb
     SUBDIR += py-azure-mgmt-databoxedge
     SUBDIR += py-azure-mgmt-datalake-analytics
     SUBDIR += py-azure-mgmt-datalake-store
     SUBDIR += py-azure-mgmt-datamigration
     SUBDIR += py-azure-mgmt-deploymentmanager
     SUBDIR += py-azure-mgmt-devtestlabs
     SUBDIR += py-azure-mgmt-dns
     SUBDIR += py-azure-mgmt-eventgrid
     SUBDIR += py-azure-mgmt-eventhub
     SUBDIR += py-azure-mgmt-extendedlocation
     SUBDIR += py-azure-mgmt-hdinsight
     SUBDIR += py-azure-mgmt-imagebuilder
     SUBDIR += py-azure-mgmt-iotcentral
     SUBDIR += py-azure-mgmt-iothub
     SUBDIR += py-azure-mgmt-iothubprovisioningservices
     SUBDIR += py-azure-mgmt-keyvault
     SUBDIR += py-azure-mgmt-kusto
     SUBDIR += py-azure-mgmt-loganalytics
     SUBDIR += py-azure-mgmt-managedservices
     SUBDIR += py-azure-mgmt-managementgroups
     SUBDIR += py-azure-mgmt-maps
     SUBDIR += py-azure-mgmt-marketplaceordering
     SUBDIR += py-azure-mgmt-media
     SUBDIR += py-azure-mgmt-monitor
     SUBDIR += py-azure-mgmt-msi
     SUBDIR += py-azure-mgmt-netapp
     SUBDIR += py-azure-mgmt-network
     SUBDIR += py-azure-mgmt-policyinsights
     SUBDIR += py-azure-mgmt-privatedns
     SUBDIR += py-azure-mgmt-rdbms
     SUBDIR += py-azure-mgmt-recoveryservices
     SUBDIR += py-azure-mgmt-recoveryservicesbackup
     SUBDIR += py-azure-mgmt-redhatopenshift
     SUBDIR += py-azure-mgmt-redis
     SUBDIR += py-azure-mgmt-relay
     SUBDIR += py-azure-mgmt-reservations
     SUBDIR += py-azure-mgmt-resource
     SUBDIR += py-azure-mgmt-search
     SUBDIR += py-azure-mgmt-security
     SUBDIR += py-azure-mgmt-servicebus
     SUBDIR += py-azure-mgmt-servicefabric
     SUBDIR += py-azure-mgmt-servicefabricmanagedclusters
     SUBDIR += py-azure-mgmt-servicelinker
     SUBDIR += py-azure-mgmt-signalr
     SUBDIR += py-azure-mgmt-sql
     SUBDIR += py-azure-mgmt-sqlvirtualmachine
     SUBDIR += py-azure-mgmt-storage
     SUBDIR += py-azure-mgmt-synapse
     SUBDIR += py-azure-mgmt-trafficmanager
     SUBDIR += py-azure-mgmt-web
     SUBDIR += py-azure-multiapi-storage
     SUBDIR += py-azure-storage-blob
     SUBDIR += py-azure-storage-common
     SUBDIR += py-azure-synapse-accesscontrol
     SUBDIR += py-azure-synapse-artifacts
     SUBDIR += py-azure-synapse-managedprivateendpoints
     SUBDIR += py-azure-synapse-spark
     SUBDIR += py-b2sdk
     SUBDIR += py-babel
     SUBDIR += py-babelfish
     SUBDIR += py-babi_grammars
     SUBDIR += py-backcall
     SUBDIR += py-backoff
     SUBDIR += py-backports
     SUBDIR += py-backports.cached-property
     SUBDIR += py-backports.csv
     SUBDIR += py-backports.entry-points-selectable
     SUBDIR += py-backports.tarfile
     SUBDIR += py-backports.zoneinfo
     SUBDIR += py-banal
     SUBDIR += py-bandit
     SUBDIR += py-bcdoc
     SUBDIR += py-beartype
     SUBDIR += py-beautifultable
     SUBDIR += py-behave
     SUBDIR += py-beniget
     SUBDIR += py-bidict
     SUBDIR += py-billiard
     SUBDIR += py-binary_file_search
     SUBDIR += py-binaryornot
     SUBDIR += py-biplist
     SUBDIR += py-bitarray
     SUBDIR += py-bitstring
     SUBDIR += py-black
     SUBDIR += py-blessed
     SUBDIR += py-blessings
     SUBDIR += py-blinker
     SUBDIR += py-blist
     SUBDIR += py-bluelet
     SUBDIR += py-boltons
     SUBDIR += py-boolean.py
     SUBDIR += py-boto
     SUBDIR += py-botocore
     SUBDIR += py-bps-restpy
     SUBDIR += py-breathe
     SUBDIR += py-bsd
     SUBDIR += py-btest
     SUBDIR += py-build
     SUBDIR += py-buildbot
     SUBDIR += py-buildbot-console-view
     SUBDIR += py-buildbot-grid-view
     SUBDIR += py-buildbot-pkg
     SUBDIR += py-buildbot-react-console-view
     SUBDIR += py-buildbot-waterfall-view
     SUBDIR += py-buildbot-worker
     SUBDIR += py-buildbot-www
     SUBDIR += py-bullet3
     SUBDIR += py-bump2version
     SUBDIR += py-bytecode
     SUBDIR += py-cabby
     SUBDIR += py-cached-property
     SUBDIR += py-cachetools
     SUBDIR += py-cacheyou
     SUBDIR += py-cachy
     SUBDIR += py-cadquery-pywrap
     SUBDIR += py-calver
     SUBDIR += py-canonicaljson
     SUBDIR += py-capstone
     SUBDIR += py-capturer
     SUBDIR += py-case
     SUBDIR += py-castellan
     SUBDIR += py-catalogue
     SUBDIR += py-cattrs
     SUBDIR += py-cbor
     SUBDIR += py-cbor2
     SUBDIR += py-cclib
     SUBDIR += py-cdg
     SUBDIR += py-celery
     SUBDIR += py-celery-progress
     SUBDIR += py-celery-singleton
     SUBDIR += py-cerberus
     SUBDIR += py-certsrv
     SUBDIR += py-cffi
     SUBDIR += py-cfgv
     SUBDIR += py-cfn-lint
     SUBDIR += py-cftime
     SUBDIR += py-chai
     SUBDIR += py-chainmap
     SUBDIR += py-characteristic
     SUBDIR += py-check-jsonschema
     SUBDIR += py-check-manifest
     SUBDIR += py-check-sdist
     SUBDIR += py-cheetah3
     SUBDIR += py-circuitbreaker
     SUBDIR += py-circuits
     SUBDIR += py-ciso8601
     SUBDIR += py-ckanapi
     SUBDIR += py-clang
     SUBDIR += py-cld
     SUBDIR += py-cle
     SUBDIR += py-cleo
     SUBDIR += py-cli-helpers
     SUBDIR += py-cliapp
     SUBDIR += py-click
     SUBDIR += py-click-completion
     SUBDIR += py-click-creds
     SUBDIR += py-click-default-group
     SUBDIR += py-click-default-group-wheel
     SUBDIR += py-click-didyoumean
     SUBDIR += py-click-help-colors
     SUBDIR += py-click-log
     SUBDIR += py-click-option-group
     SUBDIR += py-click-plugins
     SUBDIR += py-click-repl
     SUBDIR += py-click-threading
     SUBDIR += py-click7
     SUBDIR += py-cliff
     SUBDIR += py-cligj
     SUBDIR += py-clikit
     SUBDIR += py-clint
     SUBDIR += py-clldutils
     SUBDIR += py-cloudpathlib
     SUBDIR += py-cloudpickle
     SUBDIR += py-cluster
     SUBDIR += py-cmd2
     SUBDIR += py-cmdtest
     SUBDIR += py-codecov
     SUBDIR += py-codegen
     SUBDIR += py-cog
     SUBDIR += py-collective.monkeypatcher
     SUBDIR += py-colorama
     SUBDIR += py-colored-traceback
     SUBDIR += py-coloredlogs
     SUBDIR += py-colorful
     SUBDIR += py-colorlog
     SUBDIR += py-colorspacious
     SUBDIR += py-columnize
     SUBDIR += py-comm
     SUBDIR += py-commandlines
     SUBDIR += py-conditional
     SUBDIR += py-confection
     SUBDIR += py-configargparse
     SUBDIR += py-configobj
     SUBDIR += py-configparser
     SUBDIR += py-configupdater
     SUBDIR += py-confusable_homoglyphs
     SUBDIR += py-confuse
     SUBDIR += py-connection_pool
     SUBDIR += py-connexion
     SUBDIR += py-cons
     SUBDIR += py-constantly
     SUBDIR += py-construct
     SUBDIR += py-construct-classes
     SUBDIR += py-contextlib-chdir
     SUBDIR += py-contextlib2
     SUBDIR += py-convertdate
     SUBDIR += py-cookiecutter
     SUBDIR += py-copier
     SUBDIR += py-coreapi
     SUBDIR += py-coreschema
     SUBDIR += py-country
     SUBDIR += py-cov-core
     SUBDIR += py-covdefaults
     SUBDIR += py-coverage
     SUBDIR += py-coverage_enable_subprocess
     SUBDIR += py-coveralls
     SUBDIR += py-cppheaderparser
     SUBDIR += py-cppy
     SUBDIR += py-crank
     SUBDIR += py-crashtest
     SUBDIR += py-crc32c
     SUBDIR += py-crcmod
     SUBDIR += py-crick
     SUBDIR += py-crontab
     SUBDIR += py-cson
     SUBDIR += py-csv23
     SUBDIR += py-ctags
     SUBDIR += py-ctypesgen
     SUBDIR += py-curio
     SUBDIR += py-cursive
     SUBDIR += py-curtsies
     SUBDIR += py-custodian
     SUBDIR += py-cvss
     SUBDIR += py-cwcwidth
     SUBDIR += py-cxx
     SUBDIR += py-cycler
     SUBDIR += py-cykhash
     SUBDIR += py-cymbal
     SUBDIR += py-cymem
     SUBDIR += py-cysignals
     SUBDIR += py-cython-test-exception-raiser
     SUBDIR += py-cytoolz
     SUBDIR += py-d2to1
     SUBDIR += py-daemon
     SUBDIR += py-daemon-runner
     SUBDIR += py-daemonize
     SUBDIR += py-daemons
     SUBDIR += py-dal
     SUBDIR += py-darts.util.lru
     SUBDIR += py-dask
     SUBDIR += py-dask-expr
     SUBDIR += py-dask-histogram
     SUBDIR += py-dataclass-array
     SUBDIR += py-dataclasses-json
     SUBDIR += py-datadog
     SUBDIR += py-datapackage
     SUBDIR += py-datasette
     SUBDIR += py-datatest
     SUBDIR += py-dateparser
     SUBDIR += py-dateutils
     SUBDIR += py-datrie
     SUBDIR += py-dbt-extractor
     SUBDIR += py-dbus
     SUBDIR += py-ddsketch
     SUBDIR += py-ddt
     SUBDIR += py-ddtrace
     SUBDIR += py-debtcollector
     SUBDIR += py-debugpy
     SUBDIR += py-debugtools
     SUBDIR += py-decli
     SUBDIR += py-decopatch
     SUBDIR += py-decorator
     SUBDIR += py-decoratortools
     SUBDIR += py-deepdiff
     SUBDIR += py-deepmerge
     SUBDIR += py-defusedxml
     SUBDIR += py-demjson
     SUBDIR += py-dep-logic
     SUBDIR += py-deprecat
     SUBDIR += py-deprecated
     SUBDIR += py-deprecation
     SUBDIR += py-deptry
     SUBDIR += py-devtools
     SUBDIR += py-dexml2
     SUBDIR += py-diazo
     SUBDIR += py-diff-cover
     SUBDIR += py-dill
     SUBDIR += py-dirspec
     SUBDIR += py-dirty-equals
     SUBDIR += py-diskcache
     SUBDIR += py-distlib
     SUBDIR += py-distributed
     SUBDIR += py-django-rq
     SUBDIR += py-dm-tree
     SUBDIR += py-docformatter
     SUBDIR += py-dockerpty
     SUBDIR += py-docopt
     SUBDIR += py-doctest-ignore-unicode
     SUBDIR += py-dodgy
     SUBDIR += py-dogpile.cache
     SUBDIR += py-doit
     SUBDIR += py-domdf-python-tools
     SUBDIR += py-donut-shellcode
     SUBDIR += py-dotted
     SUBDIR += py-dotty-dict
     SUBDIR += py-dpcontracts
     SUBDIR += py-dtfabric
     SUBDIR += py-dukpy
     SUBDIR += py-dulwich
     SUBDIR += py-dunamai
     SUBDIR += py-durus
     SUBDIR += py-dynrules
     SUBDIR += py-easydict
     SUBDIR += py-easyprocess
     SUBDIR += py-editables
     SUBDIR += py-editdistance
     SUBDIR += py-eggtestinfo
     SUBDIR += py-ejson
     SUBDIR += py-enlighten
     SUBDIR += py-entrypoint2
     SUBDIR += py-entrypoints
     SUBDIR += py-enum-compat
     SUBDIR += py-envier
     SUBDIR += py-envisage
     SUBDIR += py-envs
     SUBDIR += py-epc
     SUBDIR += py-epdb
     SUBDIR += py-epsilon
     SUBDIR += py-etils
     SUBDIR += py-etuples
     SUBDIR += py-evdev
     SUBDIR += py-eventlib
     SUBDIR += py-ewah-bool-utils
     SUBDIR += py-ewmh
     SUBDIR += py-exam
     SUBDIR += py-exceptiongroup
     SUBDIR += py-executing
     SUBDIR += py-expandvars
     SUBDIR += py-expecttest
     SUBDIR += py-expiringdict
     SUBDIR += py-extras
     SUBDIR += py-extremes
     SUBDIR += py-fabric
     SUBDIR += py-fabric3
     SUBDIR += py-face
     SUBDIR += py-factory-boy
     SUBDIR += py-fam
     SUBDIR += py-fastbencode
     SUBDIR += py-fastcache
     SUBDIR += py-fasteners
     SUBDIR += py-fastentrypoints
     SUBDIR += py-fastf1
     SUBDIR += py-fastimport
     SUBDIR += py-fastjsonschema
     SUBDIR += py-fastnumbers
     SUBDIR += py-fastprogress
     SUBDIR += py-fbprophet
     SUBDIR += py-fields
     SUBDIR += py-filebytes
     SUBDIR += py-filedepot
     SUBDIR += py-filemagic
     SUBDIR += py-filetype
     SUBDIR += py-find-libpython
     SUBDIR += py-findlibs
     SUBDIR += py-findpython
     SUBDIR += py-fire
     SUBDIR += py-fireREST
     SUBDIR += py-first
     SUBDIR += py-fixtures
     SUBDIR += py-flake8
     SUBDIR += py-flake8-black
     SUBDIR += py-flake8-bugbear
     SUBDIR += py-flake8-builtins
     SUBDIR += py-flake8-comprehensions
     SUBDIR += py-flake8-docstrings
     SUBDIR += py-flake8-future-annotations
     SUBDIR += py-flake8-import-order
     SUBDIR += py-flake8-polyfill
     SUBDIR += py-flake8-print
     SUBDIR += py-flake8-pyi
     SUBDIR += py-flake8-quotes
     SUBDIR += py-flake8_simplify
     SUBDIR += py-flaky
     SUBDIR += py-flask-babel
     SUBDIR += py-flatbuffers
     SUBDIR += py-flatdict
     SUBDIR += py-flatten-dict
     SUBDIR += py-flex
     SUBDIR += py-flexmock
     SUBDIR += py-flit
     SUBDIR += py-flit-core
     SUBDIR += py-flit-scm
     SUBDIR += py-fluent
     SUBDIR += py-fluent-logger
     SUBDIR += py-flufl.i18n
     SUBDIR += py-flufl.lock
     SUBDIR += py-flynt
     SUBDIR += py-foolscap
     SUBDIR += py-freebsd
     SUBDIR += py-freebsd-sysctl
     SUBDIR += py-freenas.utils
     SUBDIR += py-freezegun
     SUBDIR += py-frictionless
     SUBDIR += py-frictionless-ckan-mapper
     SUBDIR += py-frozendict
     SUBDIR += py-frozenlist
     SUBDIR += py-fs
     SUBDIR += py-fs2
     SUBDIR += py-fsspec
     SUBDIR += py-fudge
     SUBDIR += py-funcparserlib
     SUBDIR += py-funcsigs
     SUBDIR += py-funcy
     SUBDIR += py-furl
     SUBDIR += py-fusepy
     SUBDIR += py-future
     SUBDIR += py-futurist
     SUBDIR += py-fuzzywuzzy
     SUBDIR += py-fypp
     SUBDIR += py-game
     SUBDIR += py-game_sdl2
     SUBDIR += py-gapic-generator
     SUBDIR += py-gast
     SUBDIR += py-gcsfs
     SUBDIR += py-gelidum
     SUBDIR += py-genson
     SUBDIR += py-genty
     SUBDIR += py-geocoder
     SUBDIR += py-geojson
     SUBDIR += py-get-reader
     SUBDIR += py-gevent
     SUBDIR += py-geventhttpclient
     SUBDIR += py-git-semver
     SUBDIR += py-git-up
     SUBDIR += py-git-url-parse
     SUBDIR += py-gitdb
     SUBDIR += py-gitlab-webhook-handler
     SUBDIR += py-gitless
     SUBDIR += py-gitpython
     SUBDIR += py-giturlparse
     SUBDIR += py-glance-store
     SUBDIR += py-glob2
     SUBDIR += py-glom
     SUBDIR += py-gobject3
     SUBDIR += py-google-cloud-iam
     SUBDIR += py-google-crc32c
     SUBDIR += py-google-i18n-address
     SUBDIR += py-google-pasta
     SUBDIR += py-google-re2
     SUBDIR += py-googleapis-common-protos
     SUBDIR += py-gptscript
     SUBDIR += py-gpxpy
     SUBDIR += py-grab
     SUBDIR += py-graphene
     SUBDIR += py-graphene-django
     SUBDIR += py-graphene-django300
     SUBDIR += py-graphene-sqlalchemy
     SUBDIR += py-graphene2
     SUBDIR += py-graphql-core
     SUBDIR += py-graphql-core2
     SUBDIR += py-graphql-relay
     SUBDIR += py-graphql-relay2
     SUBDIR += py-greenlet
     SUBDIR += py-grizzled
     SUBDIR += py-grpc-google-iam-v1
     SUBDIR += py-grpc-stubs
     SUBDIR += py-grpcio
     SUBDIR += py-grpcio-gcp
     SUBDIR += py-grpcio-status
     SUBDIR += py-grpcio-tools
     SUBDIR += py-gs_api_client
     SUBDIR += py-guppy3
     SUBDIR += py-gyp
     SUBDIR += py-hacking
     SUBDIR += py-hammett
     SUBDIR += py-hash_ring
     SUBDIR += py-hatch
     SUBDIR += py-hatch-autorun
     SUBDIR += py-hatch-fancy-pypi-readme
     SUBDIR += py-hatch-jupyter-builder
     SUBDIR += py-hatch-mypyc
     SUBDIR += py-hatch-nodejs-version
     SUBDIR += py-hatch-requirements-txt
     SUBDIR += py-hatch-semver
     SUBDIR += py-hatch-vcs
     SUBDIR += py-hatchling
     SUBDIR += py-heapdict
     SUBDIR += py-helpdev
     SUBDIR += py-hg-evolve
     SUBDIR += py-hglib
     SUBDIR += py-hgtools
     SUBDIR += py-hidraw
     SUBDIR += py-hishel
     SUBDIR += py-holidays
     SUBDIR += py-hologram
     SUBDIR += py-homebase
     SUBDIR += py-http-prompt
     SUBDIR += py-humanize
     SUBDIR += py-hunter
     SUBDIR += py-hupper
     SUBDIR += py-hvac
     SUBDIR += py-hypothesis
     SUBDIR += py-hypothesmith
     SUBDIR += py-icalendar
     SUBDIR += py-ice
     SUBDIR += py-ice37
     SUBDIR += py-identify
     SUBDIR += py-ijson
     SUBDIR += py-imgkit
     SUBDIR += py-immutabledict
     SUBDIR += py-immutables
     SUBDIR += py-importlab
     SUBDIR += py-importlib-metadata
     SUBDIR += py-importlib-metadata6
     SUBDIR += py-importlib-resources
     SUBDIR += py-incremental
     SUBDIR += py-infinity
     SUBDIR += py-inflect
     SUBDIR += py-inflection
     SUBDIR += py-iniconfig
     SUBDIR += py-inifile
     SUBDIR += py-iniparse
     SUBDIR += py-inotify-simple
     SUBDIR += py-inotifyrecursive
     SUBDIR += py-installer
     SUBDIR += py-intbitset
     SUBDIR += py-intelhex
     SUBDIR += py-interface-meta
     SUBDIR += py-intervals
     SUBDIR += py-intervaltree
     SUBDIR += py-invoke
     SUBDIR += py-ioflo
     SUBDIR += py-iopath
     SUBDIR += py-ipaddr
     SUBDIR += py-ipdb
     SUBDIR += py-ipydatawidgets
     SUBDIR += py-ipykernel
     SUBDIR += py-ipympl
     SUBDIR += py-ipyparallel
     SUBDIR += py-ipython_genutils
     SUBDIR += py-ipywidgets
     SUBDIR += py-iso8601
     SUBDIR += py-isodate
     SUBDIR += py-isoduration
     SUBDIR += py-isort
     SUBDIR += py-itanium_demangler
     SUBDIR += py-itemadapter
     SUBDIR += py-itemloaders
     SUBDIR += py-iteration-utilities
     SUBDIR += py-itertree
     SUBDIR += py-itypes
     SUBDIR += py-janus
     SUBDIR += py-jaraco.classes
     SUBDIR += py-jaraco.collections
     SUBDIR += py-jaraco.context
     SUBDIR += py-jaraco.env
     SUBDIR += py-jaraco.functools
     SUBDIR += py-jaraco.itertools
     SUBDIR += py-jaraco.logging
     SUBDIR += py-jaraco.packaging
     SUBDIR += py-jaraco.stream
     SUBDIR += py-jaraco.text
     SUBDIR += py-jaraco.timing
     SUBDIR += py-jaraco.util
     SUBDIR += py-javaproperties
     SUBDIR += py-jdcal
     SUBDIR += py-jedi
     SUBDIR += py-jeepney
     SUBDIR += py-jellyfish
     SUBDIR += py-jenkins-job-builder
     SUBDIR += py-jep
     SUBDIR += py-jinja2-ansible-filters
     SUBDIR += py-jinja2-time
     SUBDIR += py-jira
     SUBDIR += py-jitterentropy
     SUBDIR += py-jmespath
     SUBDIR += py-joblib
     SUBDIR += py-johnnydep
     SUBDIR += py-jsbeautifier
     SUBDIR += py-jschema-to-python
     SUBDIR += py-jschon
     SUBDIR += py-jsmin
     SUBDIR += py-json5
     SUBDIR += py-json_tricks
     SUBDIR += py-jsondiff
     SUBDIR += py-jsonform
     SUBDIR += py-jsonlines
     SUBDIR += py-jsonnet
     SUBDIR += py-jsonpatch
     SUBDIR += py-jsonpath-ng
     SUBDIR += py-jsonpath-rw
     SUBDIR += py-jsonpickle
     SUBDIR += py-jsonpointer
     SUBDIR += py-jsonref
     SUBDIR += py-jsonrpclib-pelix
     SUBDIR += py-jsonschema
     SUBDIR += py-jsonschema-path
     SUBDIR += py-jsonschema-spec
     SUBDIR += py-jsonschema-specifications
     SUBDIR += py-jsonschema3
     SUBDIR += py-jsonschema417
     SUBDIR += py-jsonsir
     SUBDIR += py-junitparser
     SUBDIR += py-jupyter-client
     SUBDIR += py-jupyter-collaboration
     SUBDIR += py-jupyter-core
     SUBDIR += py-jupyter-events
     SUBDIR += py-jupyter-kernel-test
     SUBDIR += py-jupyter-lsp
     SUBDIR += py-jupyter-packaging
     SUBDIR += py-jupyter-server
     SUBDIR += py-jupyter-server-fileid
     SUBDIR += py-jupyter-server-mathjax
     SUBDIR += py-jupyter-server-terminals
     SUBDIR += py-jupyter-telemetry
     SUBDIR += py-jupyter-ydoc
     SUBDIR += py-jupyter_console
     SUBDIR += py-jupyterlab
     SUBDIR += py-jupyterlab-lsp
     SUBDIR += py-jupyterlab-server
     SUBDIR += py-jupyterlab-widgets
     SUBDIR += py-jupyterlab_launcher
     SUBDIR += py-kaitaistruct
     SUBDIR += py-kaptan
     SUBDIR += py-kazoo
     SUBDIR += py-keystone-engine
     SUBDIR += py-keystoneauth1
     SUBDIR += py-keystonemiddleware
     SUBDIR += py-kitchen
     SUBDIR += py-klepto
     SUBDIR += py-knack
     SUBDIR += py-l18n
     SUBDIR += py-lark
     SUBDIR += py-launchpadlib
     SUBDIR += py-lazr.config
     SUBDIR += py-lazr.delegates
     SUBDIR += py-lazr.restfulclient
     SUBDIR += py-lazr.uri
     SUBDIR += py-lazy
     SUBDIR += py-lazy-object-proxy
     SUBDIR += py-lazy_loader
     SUBDIR += py-libcst
     SUBDIR += py-libcst03
     SUBDIR += py-libioc
     SUBDIR += py-libpeas
     SUBDIR += py-libplist
     SUBDIR += py-libtaxii
     SUBDIR += py-libtmux
     SUBDIR += py-libusb1
     SUBDIR += py-libversion
     SUBDIR += py-libvirt
     SUBDIR += py-libzfs
     SUBDIR += py-lief
     SUBDIR += py-line-profiler
     SUBDIR += py-linear-tsv
     SUBDIR += py-linecache2
     SUBDIR += py-lineedit
     SUBDIR += py-littleutils
     SUBDIR += py-livemark
     SUBDIR += py-llfuse
     SUBDIR += py-llvmcpy
     SUBDIR += py-llvmlite
     SUBDIR += py-lml
     SUBDIR += py-localstack-client
     SUBDIR += py-locket
     SUBDIR += py-lockfile
     SUBDIR += py-logan
     SUBDIR += py-logbook
     SUBDIR += py-logfury
     SUBDIR += py-logilab-common
     SUBDIR += py-loguru
     SUBDIR += py-logutils
     SUBDIR += py-logzero
     SUBDIR += py-looseversion
     SUBDIR += py-louie
     SUBDIR += py-lru-dict
     SUBDIR += py-lsprotocol
     SUBDIR += py-lunardate
     SUBDIR += py-lxml
     SUBDIR += py-lxml-stubs
     SUBDIR += py-mac-vendor-lookup
     SUBDIR += py-macholib
     SUBDIR += py-magic
     SUBDIR += py-mailcap-fix
     SUBDIR += py-makefun
     SUBDIR += py-manuel
     SUBDIR += py-marisa-trie
     SUBDIR += py-marrow.mailer
     SUBDIR += py-marrow.util
     SUBDIR += py-marshmallow
     SUBDIR += py-marshmallow-enum
     SUBDIR += py-mashumaro
     SUBDIR += py-matrix-angular-sdk
     SUBDIR += py-matrix-common
     SUBDIR += py-maturin
     SUBDIR += py-mccabe
     SUBDIR += py-mdv
     SUBDIR += py-mediafile
     SUBDIR += py-mediapy
     SUBDIR += py-medikit
     SUBDIR += py-memory-allocator
     SUBDIR += py-memory-profiler
     SUBDIR += py-mergedeep
     SUBDIR += py-methodtools
     SUBDIR += py-microversion-parse
     SUBDIR += py-milc
     SUBDIR += py-mime
     SUBDIR += py-miniKanren
     SUBDIR += py-minidump
     SUBDIR += py-minimal-snowplow-tracker
     SUBDIR += py-minimongo
     SUBDIR += py-minio
     SUBDIR += py-mmh3
     SUBDIR += py-mock
     SUBDIR += py-molecule
     SUBDIR += py-mondrian
     SUBDIR += py-mongokit
     SUBDIR += py-monkeytype
     SUBDIR += py-monotonic
     SUBDIR += py-monty
     SUBDIR += py-more-itertools
     SUBDIR += py-moreorless
     SUBDIR += py-moto
     SUBDIR += py-mox
     SUBDIR += py-mrkd
     SUBDIR += py-msal
     SUBDIR += py-msal-extensions
     SUBDIR += py-msgpack
     SUBDIR += py-msgspec
     SUBDIR += py-mulpyplexer
     SUBDIR += py-multi_key_dict
     SUBDIR += py-multipart
     SUBDIR += py-multipledispatch
     SUBDIR += py-multiprocess
     SUBDIR += py-multiset
     SUBDIR += py-multitasking
     SUBDIR += py-munch
     SUBDIR += py-murmurhash
     SUBDIR += py-mutf8
     SUBDIR += py-mutmut
     SUBDIR += py-mygpoclient
     SUBDIR += py-mypy
     SUBDIR += py-mypy-boto3-s3
     SUBDIR += py-mypy-protobuf
     SUBDIR += py-mypy_extensions
     SUBDIR += py-mystic
     SUBDIR += py-naiveBayesClassifier
     SUBDIR += py-nanobind
     SUBDIR += py-nanotime
     SUBDIR += py-natsort
     SUBDIR += py-natural
     SUBDIR += py-nbclassic
     SUBDIR += py-nbclient
     SUBDIR += py-nbconvert
     SUBDIR += py-nbdime
     SUBDIR += py-nbformat
     SUBDIR += py-nbval
     SUBDIR += py-nest-asyncio
     SUBDIR += py-node-semver
     SUBDIR += py-nodeenv
     SUBDIR += py-nose
     SUBDIR += py-nose-cov
     SUBDIR += py-nose-timer
     SUBDIR += py-nose2
     SUBDIR += py-nose3
     SUBDIR += py-noseofyeti
     SUBDIR += py-nosexcover
     SUBDIR += py-notebook-shim
     SUBDIR += py-notify2
     SUBDIR += py-num2words
     SUBDIR += py-numba
     SUBDIR += py-objgraph
     SUBDIR += py-objprint
     SUBDIR += py-objsize
     SUBDIR += py-oci
     SUBDIR += py-odfpy
     SUBDIR += py-offtrac
     SUBDIR += py-olefile
     SUBDIR += py-oletools
     SUBDIR += py-omnijson
     SUBDIR += py-omniorb
     SUBDIR += py-onigurumacffi
     SUBDIR += py-opcodes
     SUBDIR += py-openapi-codec
     SUBDIR += py-openapi-core
     SUBDIR += py-openapi-schema-validator
     SUBDIR += py-openapi-spec-validator
     SUBDIR += py-opencensus
     SUBDIR += py-opencensus-context
     SUBDIR += py-opendht
     SUBDIR += py-opengrok-tools
     SUBDIR += py-openstacksdk
     SUBDIR += py-opentelemetry-api
     SUBDIR += py-opentelemetry-sdk
     SUBDIR += py-opentelemetry-semantic-conventions
     SUBDIR += py-opentracing
     SUBDIR += py-opster
     SUBDIR += py-optik
     SUBDIR += py-optree
     SUBDIR += py-orange-canvas-core
     SUBDIR += py-orange-widget-base
     SUBDIR += py-orca
     SUBDIR += py-ordered-set
     SUBDIR += py-ordereddict
     SUBDIR += py-orderedmultidict
     SUBDIR += py-orjson
     SUBDIR += py-os-brick
     SUBDIR += py-os-client-config
     SUBDIR += py-os-service-types
     SUBDIR += py-os-vif
     SUBDIR += py-os-win
     SUBDIR += py-osc-lib
     SUBDIR += py-oslo.cache
     SUBDIR += py-oslo.concurrency
     SUBDIR += py-oslo.config
     SUBDIR += py-oslo.context
     SUBDIR += py-oslo.db
     SUBDIR += py-oslo.i18n
     SUBDIR += py-oslo.limit
     SUBDIR += py-oslo.log
     SUBDIR += py-oslo.messaging
     SUBDIR += py-oslo.metrics
     SUBDIR += py-oslo.middleware
     SUBDIR += py-oslo.policy
     SUBDIR += py-oslo.privsep
     SUBDIR += py-oslo.reports
     SUBDIR += py-oslo.rootwrap
     SUBDIR += py-oslo.serialization
     SUBDIR += py-oslo.service
     SUBDIR += py-oslo.upgradecheck
     SUBDIR += py-oslo.utils
     SUBDIR += py-oslo.versionedobjects
     SUBDIR += py-oslo.vmware
     SUBDIR += py-oslotest
     SUBDIR += py-osprofiler
     SUBDIR += py-outcome
     SUBDIR += py-overrides
     SUBDIR += py-ovs
     SUBDIR += py-ovsdbapp
     SUBDIR += py-oyaml
     SUBDIR += py-p4python
     SUBDIR += py-packaging
     SUBDIR += py-parallax
     SUBDIR += py-param
     SUBDIR += py-parameterized
     SUBDIR += py-parsedatetime
     SUBDIR += py-parsley
     SUBDIR += py-parver
     SUBDIR += py-pastel
     SUBDIR += py-patch
     SUBDIR += py-patch-ng
     SUBDIR += py-path
     SUBDIR += py-path.py
     SUBDIR += py-pathable
     SUBDIR += py-pathlib2
     SUBDIR += py-pathos
     SUBDIR += py-pathspec
     SUBDIR += py-pathtools
     SUBDIR += py-pathvalidate
     SUBDIR += py-paver
     SUBDIR += py-pbr
     SUBDIR += py-pbs-installer
     SUBDIR += py-pcodedmp
     SUBDIR += py-pcpp
     SUBDIR += py-pdm
     SUBDIR += py-pdm-autoexport
     SUBDIR += py-pdm-backend
     SUBDIR += py-pdm-pep517
     SUBDIR += py-pdoc
     SUBDIR += py-pebble
     SUBDIR += py-pefile
     SUBDIR += py-pendulum
     SUBDIR += py-pep440
     SUBDIR += py-pep517
     SUBDIR += py-pep562
     SUBDIR += py-pep621
     SUBDIR += py-pep8-naming
     SUBDIR += py-period
     SUBDIR += py-persistent
     SUBDIR += py-petname
     SUBDIR += py-pew
     SUBDIR += py-pex
     SUBDIR += py-phabricator
     SUBDIR += py-phonenumbers
     SUBDIR += py-phply
     SUBDIR += py-phpserialize
     SUBDIR += py-phx-class-registry
     SUBDIR += py-pid
     SUBDIR += py-pika
     SUBDIR += py-pika-pool
     SUBDIR += py-pinocchio
     SUBDIR += py-pint
     SUBDIR += py-pint-pandas
     SUBDIR += py-pip
     SUBDIR += py-pip-api
     SUBDIR += py-pip-audit
     SUBDIR += py-pip-licenses
     SUBDIR += py-pip-requirements-parser
     SUBDIR += py-pip-run
     SUBDIR += py-pip-shims
     SUBDIR += py-pip-tools
     SUBDIR += py-pip-tools4
     SUBDIR += py-pipdeptree
     SUBDIR += py-pipenv
     SUBDIR += py-pipreqs
     SUBDIR += py-pipx
     SUBDIR += py-pkgconfig
     SUBDIR += py-pkgutil-resolve-name
     SUBDIR += py-plac
     SUBDIR += py-plan
     SUBDIR += py-platformdirs
     SUBDIR += py-plette
     SUBDIR += py-plex
     SUBDIR += py-plucky
     SUBDIR += py-pluggy
     SUBDIR += py-pluggy0
     SUBDIR += py-pluginbase
     SUBDIR += py-plux
     SUBDIR += py-ply
     SUBDIR += py-pnio-dcp
     SUBDIR += py-pnu-libpnu
     SUBDIR += py-pockets
     SUBDIR += py-podcastparser
     SUBDIR += py-poetry
     SUBDIR += py-poetry-core
     SUBDIR += py-poetry-dynamic-versioning
     SUBDIR += py-poetry-plugin-export
     SUBDIR += py-poetry-semver
     SUBDIR += py-poetry-types
     SUBDIR += py-poetry2setup
     SUBDIR += py-polib
     SUBDIR += py-pooch
     SUBDIR += py-pop
     SUBDIR += py-pop-config
     SUBDIR += py-portalocker
     SUBDIR += py-positional
     SUBDIR += py-posix_ipc
     SUBDIR += py-pox
     SUBDIR += py-poyo
     SUBDIR += py-ppft
     SUBDIR += py-prance
     SUBDIR += py-pre-commit
     SUBDIR += py-pre-commit-hooks
     SUBDIR += py-prefixed
     SUBDIR += py-preshed
     SUBDIR += py-preshed3
     SUBDIR += py-pretend
     SUBDIR += py-prettyprinter
     SUBDIR += py-prettytable
     SUBDIR += py-prettytable0
     SUBDIR += py-printree
     SUBDIR += py-process-tests
     SUBDIR += py-proglog
     SUBDIR += py-progress
     SUBDIR += py-promise
     SUBDIR += py-prompt-toolkit
     SUBDIR += py-prompt-toolkit1
     SUBDIR += py-prompt-toolkit2
     SUBDIR += py-property-cached
     SUBDIR += py-proselint
     SUBDIR += py-prospector
     SUBDIR += py-proto-plus
     SUBDIR += py-protobuf
     SUBDIR += py-protobuf-compiler
     SUBDIR += py-proxmoxer
     SUBDIR += py-ptable
     SUBDIR += py-ptpython
     SUBDIR += py-ptvsd
     SUBDIR += py-pudb
     SUBDIR += py-pure-eval
     SUBDIR += py-purl
     SUBDIR += py-py
     SUBDIR += py-py-partiql-parser
     SUBDIR += py-py-serializable
     SUBDIR += py-py-stackexchange
     SUBDIR += py-py-ubjson
     SUBDIR += py-py3nvml
     SUBDIR += py-pyTooling
     SUBDIR += py-py_interface
     SUBDIR += py-pyaml-env
     SUBDIR += py-pyasn1
     SUBDIR += py-pyasn1-modules
     SUBDIR += py-pybind11
     SUBDIR += py-pybix
     SUBDIR += py-pycadf
     SUBDIR += py-pycalendar
     SUBDIR += py-pycallgraph
     SUBDIR += py-pycapsicum
     SUBDIR += py-pycerberus
     SUBDIR += py-pycmd
     SUBDIR += py-pycnite
     SUBDIR += py-pycocotools
     SUBDIR += py-pycodeexport
     SUBDIR += py-pycodestyle
     SUBDIR += py-pycognito
     SUBDIR += py-pycompilation
     SUBDIR += py-pycomplete
     SUBDIR += py-pycparser
     SUBDIR += py-pycrdt
     SUBDIR += py-pycrdt-websocket
     SUBDIR += py-pydantic
     SUBDIR += py-pydantic-core
     SUBDIR += py-pydantic-extra-types
     SUBDIR += py-pydantic-vault
     SUBDIR += py-pydantic-yaml
     SUBDIR += py-pydantic2
     SUBDIR += py-pydash
     SUBDIR += py-pydbus
     SUBDIR += py-pydecor
     SUBDIR += py-pydenticon
     SUBDIR += py-pydevd
     SUBDIR += py-pydispatcher
     SUBDIR += py-pydocstyle
     SUBDIR += py-pydrive
     SUBDIR += py-pyee
     SUBDIR += py-pyelftools
     SUBDIR += py-pyface
     SUBDIR += py-pyfakefs
     SUBDIR += py-pyfcm
     SUBDIR += py-pyflakes
     SUBDIR += py-pyformance
     SUBDIR += py-pygdbmi
     SUBDIR += py-pygit2
     SUBDIR += py-pygpx
     SUBDIR += py-pyhashxx
     SUBDIR += py-pyhcl
     SUBDIR += py-pyicu
     SUBDIR += py-pyina
     SUBDIR += py-pyinotify
     SUBDIR += py-pyinquirer
     SUBDIR += py-pyinstaller
     SUBDIR += py-pyinstaller-hooks-contrib
     SUBDIR += py-pyintelowl
     SUBDIR += py-pyjq
     SUBDIR += py-pyjsparser
     SUBDIR += py-pykdtree
     SUBDIR += py-pylama
     SUBDIR += py-pyleri
     SUBDIR += py-pylev
     SUBDIR += py-pylibsrtp
     SUBDIR += py-pylint-django
     SUBDIR += py-pylint-flask
     SUBDIR += py-pylint-plugin-utils
     SUBDIR += py-pylint-venv
     SUBDIR += py-pylru
     SUBDIR += py-pylru-cache
     SUBDIR += py-pyls-black
     SUBDIR += py-pymarc
     SUBDIR += py-pymaven-patch
     SUBDIR += py-pymisp
     SUBDIR += py-pympler
     SUBDIR += py-pymsgbox
     SUBDIR += py-pymtbl
     SUBDIR += py-pynest2d
     SUBDIR += py-pynvml
     SUBDIR += py-pyopencl
     SUBDIR += py-pyparsing
     SUBDIR += py-pyparsing2
     SUBDIR += py-pyperclip
     SUBDIR += py-pyperf
     SUBDIR += py-pyperscan
     SUBDIR += py-pyplusplus
     SUBDIR += py-pyproject-api
     SUBDIR += py-pyproject-flake8
     SUBDIR += py-pyproject-fmt
     SUBDIR += py-pyproject-fmt-rust
     SUBDIR += py-pyproject-metadata
     SUBDIR += py-pyproject_hooks
     SUBDIR += py-pypugjs
     SUBDIR += py-pyqtree
     SUBDIR += py-pyquery
     SUBDIR += py-pyquil
     SUBDIR += py-pyral
     SUBDIR += py-pyrepl
     SUBDIR += py-pyrfc3339
     SUBDIR += py-pyright
     SUBDIR += py-pyro
     SUBDIR += py-pyroma
     SUBDIR += py-pyrsistent
     SUBDIR += py-pyscaffold
     SUBDIR += py-pysdl2
     SUBDIR += py-pyshp
     SUBDIR += py-pysimdjson
     SUBDIR += py-pysparklines
     SUBDIR += py-pystorm
     SUBDIR += py-pyte
     SUBDIR += py-pytest
     SUBDIR += py-pytest-aiohttp
     SUBDIR += py-pytest-asyncio
     SUBDIR += py-pytest-azurepipelines
     SUBDIR += py-pytest-benchmark
     SUBDIR += py-pytest-black
     SUBDIR += py-pytest-black-multipy
     SUBDIR += py-pytest-cache
     SUBDIR += py-pytest-canonical-data
     SUBDIR += py-pytest-capturelog
     SUBDIR += py-pytest-cases
     SUBDIR += py-pytest-checkdocs
     SUBDIR += py-pytest-codspeed
     SUBDIR += py-pytest-console-scripts
     SUBDIR += py-pytest-cov
     SUBDIR += py-pytest-cpp
     SUBDIR += py-pytest-datadir
     SUBDIR += py-pytest-django
     SUBDIR += py-pytest-doctestplus
     SUBDIR += py-pytest-drop-dup-tests
     SUBDIR += py-pytest-enabler
     SUBDIR += py-pytest-env
     SUBDIR += py-pytest-factoryboy
     SUBDIR += py-pytest-fixture-config
     SUBDIR += py-pytest-flake8
     SUBDIR += py-pytest-flakes
     SUBDIR += py-pytest-flask
     SUBDIR += py-pytest-forked
     SUBDIR += py-pytest-freezer
     SUBDIR += py-pytest-helpers-namespace
     SUBDIR += py-pytest-html
     SUBDIR += py-pytest-httpbin
     SUBDIR += py-pytest-httpserver
     SUBDIR += py-pytest-httpx
     SUBDIR += py-pytest-isort
     SUBDIR += py-pytest-jupyter
     SUBDIR += py-pytest-lazy-fixture
     SUBDIR += py-pytest-lazy-fixtures
     SUBDIR += py-pytest-localserver
     SUBDIR += py-pytest-markdown
     SUBDIR += py-pytest-metadata
     SUBDIR += py-pytest-mock
     SUBDIR += py-pytest-mpl
     SUBDIR += py-pytest-mutagen
     SUBDIR += py-pytest-mypy
     SUBDIR += py-pytest-mypy-plugins
     SUBDIR += py-pytest-nunit
     SUBDIR += py-pytest-order
     SUBDIR += py-pytest-parallel
     SUBDIR += py-pytest-pep8
     SUBDIR += py-pytest-plus
     SUBDIR += py-pytest-profiling
     SUBDIR += py-pytest-pycodestyle
     SUBDIR += py-pytest-qt
     SUBDIR += py-pytest-random-order
     SUBDIR += py-pytest-randomly
     SUBDIR += py-pytest-regressions
     SUBDIR += py-pytest-regtest
     SUBDIR += py-pytest-relaxed
     SUBDIR += py-pytest-remotedata
     SUBDIR += py-pytest-rerunfailures
     SUBDIR += py-pytest-ruff
     SUBDIR += py-pytest-runner
     SUBDIR += py-pytest-services
     SUBDIR += py-pytest-shutil
     SUBDIR += py-pytest-socket
     SUBDIR += py-pytest-subprocess
     SUBDIR += py-pytest-subtests
     SUBDIR += py-pytest-sugar
     SUBDIR += py-pytest-timeout
     SUBDIR += py-pytest-tornado
     SUBDIR += py-pytest-tornasync
     SUBDIR += py-pytest-translations
     SUBDIR += py-pytest-trio
     SUBDIR += py-pytest-twisted
     SUBDIR += py-pytest-verbose-parametrize
     SUBDIR += py-pytest-virtualenv
     SUBDIR += py-pytest-watcher
     SUBDIR += py-pytest-xdist
     SUBDIR += py-pytest-xprocess
     SUBDIR += py-pytest4
     SUBDIR += py-pytest4-cache
     SUBDIR += py-pytest4-cov
     SUBDIR += py-pytest4-flakes
     SUBDIR += py-python-application
     SUBDIR += py-python-bugzilla
     SUBDIR += py-python-dateutil
     SUBDIR += py-python-dbusmock
     SUBDIR += py-python-decouple
     SUBDIR += py-python-distutils-extra
     SUBDIR += py-python-dtrace
     SUBDIR += py-python-easyconfig
     SUBDIR += py-python-editor
     SUBDIR += py-python-engineio
     SUBDIR += py-python-gflags
     SUBDIR += py-python-gilt
     SUBDIR += py-python-gist
     SUBDIR += py-python-gitlab
     SUBDIR += py-python-jenkins
     SUBDIR += py-python-json-logger
     SUBDIR += py-python-jsonrpc-server
     SUBDIR += py-python-magic
     SUBDIR += py-python-mimeparse
     SUBDIR += py-python-pcre
     SUBDIR += py-python-ptrace
     SUBDIR += py-python-rapidjson
     SUBDIR += py-python-socketio
     SUBDIR += py-python-statsd
     SUBDIR += py-python-subunit
     SUBDIR += py-python-xcaplib
     SUBDIR += py-pythonbrew
     SUBDIR += py-pythondialog
     SUBDIR += py-pythonfinder
     SUBDIR += py-pythran
     SUBDIR += py-pytimeparse
     SUBDIR += py-pytoolconfig
     SUBDIR += py-pytools
     SUBDIR += py-pytrie
     SUBDIR += py-pytvmaze
     SUBDIR += py-pytweening
     SUBDIR += py-pytz
     SUBDIR += py-pytz-deprecation-shim
     SUBDIR += py-pytzdata
     SUBDIR += py-pyudev
     SUBDIR += py-pyupgrade
     SUBDIR += py-pyusb
     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
     SUBDIR += py-pyzipper
     SUBDIR += py-q
     SUBDIR += py-qasync
     SUBDIR += py-qcs-api-client
     SUBDIR += py-qcs-sdk-python
     SUBDIR += py-qstylizer
     SUBDIR += py-qt5
     SUBDIR += py-qt5-pyqt
     SUBDIR += py-qt5-qscintilla2
     SUBDIR += py-qt5-sip
     SUBDIR += py-qt6
     SUBDIR += py-qt6-pyqt
     SUBDIR += py-qt6-qscintilla2
     SUBDIR += py-qt6-sip
     SUBDIR += py-qtbuilder
     SUBDIR += py-qtconsole
     SUBDIR += py-querystring-parser
     SUBDIR += py-questionary
     SUBDIR += py-qutip
     SUBDIR += py-qutip-qip
     SUBDIR += py-ramlfications
     SUBDIR += py-rapidfuzz
     SUBDIR += py-rapidfuzz-capi
     SUBDIR += py-ratelim
     SUBDIR += py-ratelimiter
     SUBDIR += py-rauth
     SUBDIR += py-raven
     SUBDIR += py-rchitect
     SUBDIR += py-re-assert
     SUBDIR += py-readme-renderer
     SUBDIR += py-rebulk
     SUBDIR += py-recordclass
     SUBDIR += py-recurring-ical-events
     SUBDIR += py-red-black-tree-mod
     SUBDIR += py-rednose
     SUBDIR += py-reedsolo
     SUBDIR += py-referencing
     SUBDIR += py-regress
     SUBDIR += py-remote-pdb
     SUBDIR += py-repoze.lru
     SUBDIR += py-repoze.sphinx.autointerface
     SUBDIR += py-repoze.tm2
     SUBDIR += py-repoze.who
     SUBDIR += py-repoze.xmliter
     SUBDIR += py-represent
     SUBDIR += py-requestsexceptions
     SUBDIR += py-requirements-detector
     SUBDIR += py-requirementslib
     SUBDIR += py-resolvelib
     SUBDIR += py-resolvelib05
     SUBDIR += py-resolvelib07
     SUBDIR += py-resolvelib1
     SUBDIR += py-resolver
     SUBDIR += py-resource
     SUBDIR += py-responses
     SUBDIR += py-retry2
     SUBDIR += py-retrying
     SUBDIR += py-rfc3339
     SUBDIR += py-rfc3339-validator
     SUBDIR += py-rfc3986-validator
     SUBDIR += py-rich-click
     SUBDIR += py-robotframework
     SUBDIR += py-robotframework-databaselibrary
     SUBDIR += py-robotframework-pabot
     SUBDIR += py-robotframework-pythonlibcore
     SUBDIR += py-robotframework-requests
     SUBDIR += py-robotframework-seleniumlibrary
     SUBDIR += py-robotframework-stacktrace
     SUBDIR += py-robotremoteserver
     SUBDIR += py-rope
     SUBDIR += py-rose
     SUBDIR += py-rpcq
     SUBDIR += py-rpds-py
     SUBDIR += py-rply
     SUBDIR += py-rq
     SUBDIR += py-rq-scheduler
     SUBDIR += py-rstr
     SUBDIR += py-rtree
     SUBDIR += py-rtslib-fb
     SUBDIR += py-ruamel.yaml
     SUBDIR += py-ruamel.yaml.clib
     SUBDIR += py-rubymarshal
     SUBDIR += py-ruff
     SUBDIR += py-rush
     SUBDIR += py-rx
     SUBDIR += py-rx1
     SUBDIR += py-s3fs
     SUBDIR += py-saneyaml
     SUBDIR += py-sarge
     SUBDIR += py-sarif-om
     SUBDIR += py-scantree
     SUBDIR += py-schedule
     SUBDIR += py-scheduler
     SUBDIR += py-schema
     SUBDIR += py-schematics-patched
     SUBDIR += py-scikit-base
     SUBDIR += py-scikit-build
     SUBDIR += py-scikit-build-core
     SUBDIR += py-scooby
     SUBDIR += py-scripttest
     SUBDIR += py-selection
     SUBDIR += py-semantic-version
     SUBDIR += py-semver
     SUBDIR += py-sentry-sdk
     SUBDIR += py-serializable
     SUBDIR += py-serpent
     SUBDIR += py-session-info
     SUBDIR += py-setoptconf
     SUBDIR += py-setproctitle
     SUBDIR += py-setuptools
     SUBDIR += py-setuptools-declarative-requirements
     SUBDIR += py-setuptools-gettext
     SUBDIR += py-setuptools-git
     SUBDIR += py-setuptools-git-versioning
     SUBDIR += py-setuptools-pkg
     SUBDIR += py-setuptools-rust
     SUBDIR += py-setuptools-scm
     SUBDIR += py-setuptools44
     SUBDIR += py-setuptools58
     SUBDIR += py-setuptools_git_ls_files
     SUBDIR += py-setuptools_hg
     SUBDIR += py-setuptools_scm7
     SUBDIR += py-setuptools_scm_git_archive
     SUBDIR += py-sexpdata
     SUBDIR += py-sgmllib3k
     SUBDIR += py-sh
     SUBDIR += py-shapely
     SUBDIR += py-shellingham
     SUBDIR += py-shtab
     SUBDIR += py-signalr-client-aio
     SUBDIR += py-simple-parsing
     SUBDIR += py-simple-term-menu
     SUBDIR += py-simpleeval
     SUBDIR += py-simplegeneric
     SUBDIR += py-simplejson
     SUBDIR += py-simpleparse
     SUBDIR += py-simpletal
     SUBDIR += py-simpy
     SUBDIR += py-single-version
     SUBDIR += py-sip
     SUBDIR += py-sip4
     SUBDIR += py-six
     SUBDIR += py-smmap
     SUBDIR += py-snakeviz
     SUBDIR += py-sniffio
     SUBDIR += py-sortedcontainers
     SUBDIR += py-sourcemap
     SUBDIR += py-sparse
     SUBDIR += py-speaklater
     SUBDIR += py-speg
     SUBDIR += py-spyder-kernels
     SUBDIR += py-spyder-unittest
     SUBDIR += py-sqids
     SUBDIR += py-squint
     SUBDIR += py-sre-yield
     SUBDIR += py-srsly
     SUBDIR += py-stack-data
     SUBDIR += py-statgrab
     SUBDIR += py-statsd
     SUBDIR += py-stdlib-list
     SUBDIR += py-stdlibs
     SUBDIR += py-stdnum
     SUBDIR += py-stestr
     SUBDIR += py-stevedore
     SUBDIR += py-stone
     SUBDIR += py-stopit
     SUBDIR += py-strategies
     SUBDIR += py-strawberry-graphql
     SUBDIR += py-streamparse
     SUBDIR += py-strenum
     SUBDIR += py-strict-rfc3339
     SUBDIR += py-strictyaml
     SUBDIR += py-stringbrewer
     SUBDIR += py-stringcase
     SUBDIR += py-structlog
     SUBDIR += py-subprocess-tee
     SUBDIR += py-subversion
     SUBDIR += py-sure
     SUBDIR += py-swagger-spec-validator
     SUBDIR += py-synr
     SUBDIR += py-syrupy
     SUBDIR += py-sysctl
     SUBDIR += py-sysv_ipc
     SUBDIR += py-tables
     SUBDIR += py-tabulate
     SUBDIR += py-tabulator
     SUBDIR += py-tailer
     SUBDIR += py-tapi
     SUBDIR += py-tarantool-queue
     SUBDIR += py-tartiflette
     SUBDIR += py-tartiflette-aiohttp
     SUBDIR += py-taskflow
     SUBDIR += py-taskgroup
     SUBDIR += py-tasklib
     SUBDIR += py-tblib
     SUBDIR += py-tdworkflow
     SUBDIR += py-telepath
     SUBDIR += py-tempora
     SUBDIR += py-tenacity
     SUBDIR += py-tendo
     SUBDIR += py-termcolor
     SUBDIR += py-termcolor-whl
     SUBDIR += py-termstyle
     SUBDIR += py-test-utils
     SUBDIR += py-testfixtures
     SUBDIR += py-testinfra
     SUBDIR += py-testoob
     SUBDIR += py-testpath
     SUBDIR += py-testrepository
     SUBDIR += py-testresources
     SUBDIR += py-testscenarios
     SUBDIR += py-testtools
     SUBDIR += py-thefuzz
     SUBDIR += py-thinc
     SUBDIR += py-thinc8
     SUBDIR += py-threadpoolctl
     SUBDIR += py-threema-msgapi
     SUBDIR += py-thrift
     SUBDIR += py-thriftpy2
     SUBDIR += py-tiamat
     SUBDIR += py-time-machine
     SUBDIR += py-timelib
     SUBDIR += py-timeout-decorator
     SUBDIR += py-tinyarray
     SUBDIR += py-tinynetrc
     SUBDIR += py-tinyrpc
     SUBDIR += py-tipper
     SUBDIR += py-tokenize-rt
     SUBDIR += py-toolz
     SUBDIR += py-tooz
     SUBDIR += py-toposort
     SUBDIR += py-tox
     SUBDIR += py-traceback2
     SUBDIR += py-trailrunner
     SUBDIR += py-traitlets
     SUBDIR += py-traits
     SUBDIR += py-traittypes
     SUBDIR += py-transaction
     SUBDIR += py-transitions
     SUBDIR += py-tree-format
     SUBDIR += py-tree-sitter
     SUBDIR += py-tree-sitter-languages
     SUBDIR += py-treelib
     SUBDIR += py-trimesh
     SUBDIR += py-trove-classifiers
     SUBDIR += py-ttictoc
     SUBDIR += py-ttkbootstrap
     SUBDIR += py-ttystatus
     SUBDIR += py-twiggy
     SUBDIR += py-twilio
     SUBDIR += py-twine
     SUBDIR += py-twisted
     SUBDIR += py-txaio
     SUBDIR += py-txi2p-tahoe
     SUBDIR += py-typechecks
     SUBDIR += py-typeguard
     SUBDIR += py-typer
     SUBDIR += py-types-Flask
     SUBDIR += py-types-Jinja2
     SUBDIR += py-types-MarkupSafe
     SUBDIR += py-types-Pillow
     SUBDIR += py-types-PyYAML
     SUBDIR += py-types-Werkzeug
     SUBDIR += py-types-click
     SUBDIR += py-types-cryptography
     SUBDIR += py-types-decorator
     SUBDIR += py-types-docutils
     SUBDIR += py-types-futures
     SUBDIR += py-types-jsonschema
     SUBDIR += py-types-mock
     SUBDIR += py-types-protobuf
     SUBDIR += py-types-psutil
     SUBDIR += py-types-psycopg2
     SUBDIR += py-types-python-dateutil
     SUBDIR += py-types-requests
     SUBDIR += py-types-retry
     SUBDIR += py-types-setuptools
     SUBDIR += py-types-toml
     SUBDIR += py-types-typed-ast
     SUBDIR += py-types-urllib3
     SUBDIR += py-typing-extensions
     SUBDIR += py-typing-inspect
     SUBDIR += py-tzdata
     SUBDIR += py-tzlocal
     SUBDIR += py-u-msgpack-python
     SUBDIR += py-ua_parser
     SUBDIR += py-ubelt
     SUBDIR += py-ufmt
     SUBDIR += py-uhid-freebsd
     SUBDIR += py-ujson
     SUBDIR += py-undefined
     SUBDIR += py-unearth
     SUBDIR += py-unicodecsv
     SUBDIR += py-unicodedata2
     SUBDIR += py-unidiff
     SUBDIR += py-unipath
     SUBDIR += py-unittest2
     SUBDIR += py-unittest2pytest
     SUBDIR += py-unpaddedbase64
     SUBDIR += py-untokenize
     SUBDIR += py-update_checker
     SUBDIR += py-urlimport
     SUBDIR += py-urwid
     SUBDIR += py-urwid-readline
     SUBDIR += py-urwidgets
     SUBDIR += py-urwidtrees
     SUBDIR += py-us
     SUBDIR += py-user_agents
     SUBDIR += py-userpath
     SUBDIR += py-usort
     SUBDIR += py-uvloop
     SUBDIR += py-validate-pyproject
     SUBDIR += py-validators
     SUBDIR += py-validictory
     SUBDIR += py-vcrpy
     SUBDIR += py-vcver
     SUBDIR += py-vcversioner
     SUBDIR += py-venusian
     SUBDIR += py-verboselogs
     SUBDIR += py-versioneer
     SUBDIR += py-versioneer-518
     SUBDIR += py-versioningit
     SUBDIR += py-versiontools
     SUBDIR += py-verspec
     SUBDIR += py-vine
     SUBDIR += py-virtualenv
     SUBDIR += py-virtualenv-api
     SUBDIR += py-virtualenv-clone
     SUBDIR += py-virtualenvwrapper
     SUBDIR += py-visidata
     SUBDIR += py-visitor
     SUBDIR += py-vistir
     SUBDIR += py-voluptuous
     SUBDIR += py-voluptuous-serialize
     SUBDIR += py-vsts
     SUBDIR += py-vsts-cd-manager
     SUBDIR += py-vulture
     SUBDIR += py-wadllib
     SUBDIR += py-warlock
     SUBDIR += py-watchdog
     SUBDIR += py-watchfiles
     SUBDIR += py-watchgod
     SUBDIR += py-watermark
     SUBDIR += py-wcwidth
     SUBDIR += py-weasel
     SUBDIR += py-weblib
     SUBDIR += py-websockets
     SUBDIR += py-websockify
     SUBDIR += py-wheel
     SUBDIR += py-whichcraft
     SUBDIR += py-whistle
     SUBDIR += py-widgetsnbextension
     SUBDIR += py-wimpy
     SUBDIR += py-wirerope
     SUBDIR += py-wlc
     SUBDIR += py-woops
     SUBDIR += py-wrapt
     SUBDIR += py-wsgi-intercept
     SUBDIR += py-wsgi_xmlrpc
     SUBDIR += py-wsgitools
     SUBDIR += py-wsgiutils
     SUBDIR += py-wsme
     SUBDIR += py-x-wr-timezone
     SUBDIR += py-xarray
     SUBDIR += py-xarray-einstats
     SUBDIR += py-xarray-simlab
     SUBDIR += py-xattr
     SUBDIR += py-xdg
     SUBDIR += py-xdis
     SUBDIR += py-xdoctest
     SUBDIR += py-xerox
     SUBDIR += py-xmltodict
     SUBDIR += py-xsdata
     SUBDIR += py-xstatic
     SUBDIR += py-xstatic-angular
     SUBDIR += py-xstatic-angular-bootstrap
     SUBDIR += py-xstatic-angular-fileupload
     SUBDIR += py-xstatic-angular-gettext
     SUBDIR += py-xstatic-angular-lrdragndrop
     SUBDIR += py-xstatic-angular-schema-form
     SUBDIR += py-xstatic-bootstrap-datepicker
     SUBDIR += py-xstatic-bootstrap-scss
     SUBDIR += py-xstatic-bootswatch
     SUBDIR += py-xstatic-d3
     SUBDIR += py-xstatic-font-awesome
     SUBDIR += py-xstatic-hogan
     SUBDIR += py-xstatic-jasmine
     SUBDIR += py-xstatic-jquery
     SUBDIR += py-xstatic-jquery-migrate
     SUBDIR += py-xstatic-jquery-ui
     SUBDIR += py-xstatic-jquery.quicksearch
     SUBDIR += py-xstatic-jquery.tablesorter
     SUBDIR += py-xstatic-jsencrypt
     SUBDIR += py-xstatic-mdi
     SUBDIR += py-xstatic-objectpath
     SUBDIR += py-xstatic-rickshaw
     SUBDIR += py-xstatic-roboto-fontface
     SUBDIR += py-xstatic-smart-table
     SUBDIR += py-xstatic-spin
     SUBDIR += py-xstatic-term.js
     SUBDIR += py-xstatic-tv4
     SUBDIR += py-xxhash
     SUBDIR += py-yacs
-    SUBDIR += py-yaml
     SUBDIR += py-yamllint
     SUBDIR += py-yamlordereddictloader
     SUBDIR += py-yandex-money-sdk
     SUBDIR += py-yappi
     SUBDIR += py-yapps2
     SUBDIR += py-yarg
     SUBDIR += py-yaspin
     SUBDIR += py-yattag
     SUBDIR += py-yg.lockfile
     SUBDIR += py-yunomi
     SUBDIR += py-zarr
     SUBDIR += py-zc.lockfile
     SUBDIR += py-zclockfile
     SUBDIR += py-zconfig
     SUBDIR += py-zfp
     SUBDIR += py-zict
     SUBDIR += py-zipp
     SUBDIR += py-zope.component
     SUBDIR += py-zope.configuration
     SUBDIR += py-zope.deprecation
     SUBDIR += py-zope.event
     SUBDIR += py-zope.interface
     SUBDIR += py-zope.schema
     SUBDIR += py-zope.testbrowser
     SUBDIR += py3c
     SUBDIR += pybind11
     SUBDIR += pybind11-json
     SUBDIR += pybugz
     SUBDIR += pycanberra
     SUBDIR += pycharm-ce
     SUBDIR += pycharm-pro
     SUBDIR += pycomposefile
     SUBDIR += pycos
     SUBDIR += pycount
     SUBDIR += pydbus-common
     SUBDIR += pydeps
     SUBDIR += pyderasn
     SUBDIR += pyenv
     SUBDIR += pygobject3-common
     SUBDIR += pylint
     SUBDIR += pylyzer
     SUBDIR += pymsteams
     SUBDIR += pyobfuscate
     SUBDIR += pyotherside-qt5
     SUBDIR += pyside2
     SUBDIR += pyside2-tools
     SUBDIR += pyside6
     SUBDIR += pyside6-tools
     SUBDIR += pystring
     SUBDIR += pysvn
     SUBDIR += pythontidy
     SUBDIR += pytype
     SUBDIR += qbe
     SUBDIR += qca
     SUBDIR += qconf
     SUBDIR += qcoro
     SUBDIR += qgit
     SUBDIR += qjson
     SUBDIR += qmake
     SUBDIR += qschematic
     SUBDIR += qscintilla2-designerplugin-qt5
     SUBDIR += qscintilla2-qt5
     SUBDIR += qscintilla2-qt6
     SUBDIR += qt-maybe
     SUBDIR += qt5
     SUBDIR += qt5-assistant
     SUBDIR += qt5-buildtools
     SUBDIR += qt5-concurrent
     SUBDIR += qt5-core
     SUBDIR += qt5-dbus
     SUBDIR += qt5-designer
     SUBDIR += qt5-help
     SUBDIR += qt5-linguist
     SUBDIR += qt5-linguisttools
     SUBDIR += qt5-location
     SUBDIR += qt5-qdbus
     SUBDIR += qt5-qdbusviewer
     SUBDIR += qt5-qdoc
     SUBDIR += qt5-qdoc-data
     SUBDIR += qt5-qmake
     SUBDIR += qt5-remoteobjects
     SUBDIR += qt5-script
     SUBDIR += qt5-scripttools
     SUBDIR += qt5-scxml
     SUBDIR += qt5-testlib
     SUBDIR += qt5-uitools
     SUBDIR += qt6
     SUBDIR += qt6-5compat
     SUBDIR += qt6-base
     SUBDIR += qt6-languageserver
     SUBDIR += qt6-location
     SUBDIR += qt6-positioning
     SUBDIR += qt6-remoteobjects
     SUBDIR += qt6-scxml
     SUBDIR += qt6-tools
     SUBDIR += qt6-translations
     SUBDIR += qtcreator
     SUBDIR += qtutilities
     SUBDIR += quantum
     SUBDIR += quickcheck++
     SUBDIR += quickcpplib
     SUBDIR += quilt
     SUBDIR += qxlsx
     SUBDIR += rabs
     SUBDIR += radare2
     SUBDIR += radian
     SUBDIR += ragel
     SUBDIR += raknet
     SUBDIR += random123
     SUBDIR += rang
     SUBDIR += range-v3
     SUBDIR += rapidcheck
     SUBDIR += rapidfuzz-cpp
     SUBDIR += rapidjson
     SUBDIR += rapidyaml
     SUBDIR += rationl
     SUBDIR += raylib
     SUBDIR += rbenv
     SUBDIR += rbtools
     SUBDIR += rclint
     SUBDIR += rcs
     SUBDIR += rcs57
     SUBDIR += re2
     SUBDIR += re2c
     SUBDIR += readerwriterqueue
     SUBDIR += readline
     SUBDIR += rebar
     SUBDIR += rebar3
     SUBDIR += recycle
     SUBDIR += redasm
     SUBDIR += redo
     SUBDIR += regexx
     SUBDIR += regexxer
     SUBDIR += remake
     SUBDIR += remotery
     SUBDIR += replay
     SUBDIR += replxx
     SUBDIR += reproc
     SUBDIR += resolv_wrapper
     SUBDIR += revive
     SUBDIR += rgbds
     SUBDIR += rgxg
     SUBDIR += rhtvision
     SUBDIR += rinutils
     SUBDIR += riscv32-unknown-elf-gcc
     SUBDIR += riscv64-none-elf-gcc
     SUBDIR += rkcommon
     SUBDIR += rlog
     SUBDIR += rlwrap
     SUBDIR += robin-hood-hashing
     SUBDIR += robin-map
     SUBDIR += roboctl
     SUBDIR += robodoc
     SUBDIR += root
     SUBDIR += ros-catkin
     SUBDIR += ros-catkin_pkg
     SUBDIR += ros-console_bridge
     SUBDIR += ros-rosdep
     SUBDIR += ros-rosdistro
     SUBDIR += ros-rosinstall_generator
     SUBDIR += ros-rospkg
     SUBDIR += ros-urdfdom
     SUBDIR += ros-urdfdom_headers
     SUBDIR += ros-vcstool
     SUBDIR += ros-vcstools
     SUBDIR += ros-wstool
     SUBDIR += roswell
     SUBDIR += rote
     SUBDIR += rpc2
     SUBDIR += rpclib
     SUBDIR += rsvndump
     SUBDIR += rth
     SUBDIR += rttr
     SUBDIR += ruby-bsearch
     SUBDIR += ruby-build
     SUBDIR += ruby-gems
     SUBDIR += ruby-install
     SUBDIR += ruby-rbprof
     SUBDIR += ruby-setup.rb
     SUBDIR += ruby-subversion
     SUBDIR += rubygem-CFPropertyList
     SUBDIR += rubygem-abstract
     SUBDIR += rubygem-actionpack-action_caching
     SUBDIR += rubygem-actionpack-page_caching
     SUBDIR += rubygem-actionview4
     SUBDIR += rubygem-actionview5
     SUBDIR += rubygem-actionview50
     SUBDIR += rubygem-actionview52
     SUBDIR += rubygem-actionview60
     SUBDIR += rubygem-actionview61
     SUBDIR += rubygem-actionview70
     SUBDIR += rubygem-actionview71
     SUBDIR += rubygem-active_hash
     SUBDIR += rubygem-active_scaffold
     SUBDIR += rubygem-activejob4
     SUBDIR += rubygem-activejob5
     SUBDIR += rubygem-activejob50
     SUBDIR += rubygem-activejob52
     SUBDIR += rubygem-activejob60
     SUBDIR += rubygem-activejob61
     SUBDIR += rubygem-activejob70
     SUBDIR += rubygem-activejob71
     SUBDIR += rubygem-activemessaging
     SUBDIR += rubygem-activerecord-deprecated_finders
     SUBDIR += rubygem-activesupport4
     SUBDIR += rubygem-activesupport5
     SUBDIR += rubygem-activesupport50
     SUBDIR += rubygem-activesupport52
     SUBDIR += rubygem-activesupport60
     SUBDIR += rubygem-activesupport61
     SUBDIR += rubygem-activesupport70
     SUBDIR += rubygem-activesupport71
     SUBDIR += rubygem-airborne
     SUBDIR += rubygem-akismet
     SUBDIR += rubygem-algebrick
     SUBDIR += rubygem-algorithms
     SUBDIR += rubygem-aliyun-sdk
     SUBDIR += rubygem-allison
     SUBDIR += rubygem-amazing_print
     SUBDIR += rubygem-analogger
     SUBDIR += rubygem-annoy
     SUBDIR += rubygem-ansi
     SUBDIR += rubygem-apipie-bindings
     SUBDIR += rubygem-apipie-params
     SUBDIR += rubygem-app_config
     SUBDIR += rubygem-appraisal
     SUBDIR += rubygem-arr-pm
     SUBDIR += rubygem-arrayfields
     SUBDIR += rubygem-ascii85
     SUBDIR += rubygem-asetus
     SUBDIR += rubygem-aspectr
     SUBDIR += rubygem-ast
     SUBDIR += rubygem-astrolabe
     SUBDIR += rubygem-async
     SUBDIR += rubygem-async-io
     SUBDIR += rubygem-atomic
     SUBDIR += rubygem-attic
     SUBDIR += rubygem-attr_required
     SUBDIR += rubygem-authlogic
     SUBDIR += rubygem-avro
     SUBDIR += rubygem-awesome_print
     SUBDIR += rubygem-awrence
     SUBDIR += rubygem-aws-crt
     SUBDIR += rubygem-aws-eventstream
     SUBDIR += rubygem-aws-partitions
     SUBDIR += rubygem-aws-sdk
     SUBDIR += rubygem-aws-sdk-accessanalyzer
     SUBDIR += rubygem-aws-sdk-account
     SUBDIR += rubygem-aws-sdk-acm
     SUBDIR += rubygem-aws-sdk-acmpca
     SUBDIR += rubygem-aws-sdk-alexaforbusiness
     SUBDIR += rubygem-aws-sdk-amplify
     SUBDIR += rubygem-aws-sdk-amplifybackend
     SUBDIR += rubygem-aws-sdk-amplifyuibuilder
     SUBDIR += rubygem-aws-sdk-apigateway
     SUBDIR += rubygem-aws-sdk-apigatewaymanagementapi
     SUBDIR += rubygem-aws-sdk-apigatewayv2
     SUBDIR += rubygem-aws-sdk-appconfig
     SUBDIR += rubygem-aws-sdk-appconfigdata
     SUBDIR += rubygem-aws-sdk-appfabric
     SUBDIR += rubygem-aws-sdk-appflow
     SUBDIR += rubygem-aws-sdk-appintegrationsservice
     SUBDIR += rubygem-aws-sdk-applicationautoscaling
     SUBDIR += rubygem-aws-sdk-applicationcostprofiler
     SUBDIR += rubygem-aws-sdk-applicationdiscoveryservice
     SUBDIR += rubygem-aws-sdk-applicationinsights
     SUBDIR += rubygem-aws-sdk-applicationsignals
     SUBDIR += rubygem-aws-sdk-appmesh
     SUBDIR += rubygem-aws-sdk-appregistry
     SUBDIR += rubygem-aws-sdk-apprunner
     SUBDIR += rubygem-aws-sdk-appstream
     SUBDIR += rubygem-aws-sdk-appsync
     SUBDIR += rubygem-aws-sdk-apptest
     SUBDIR += rubygem-aws-sdk-arczonalshift
     SUBDIR += rubygem-aws-sdk-artifact
     SUBDIR += rubygem-aws-sdk-athena
     SUBDIR += rubygem-aws-sdk-auditmanager
     SUBDIR += rubygem-aws-sdk-augmentedairuntime
     SUBDIR += rubygem-aws-sdk-autoscaling
     SUBDIR += rubygem-aws-sdk-autoscalingplans
     SUBDIR += rubygem-aws-sdk-b2bi
     SUBDIR += rubygem-aws-sdk-backup
     SUBDIR += rubygem-aws-sdk-backupgateway
     SUBDIR += rubygem-aws-sdk-backupstorage
     SUBDIR += rubygem-aws-sdk-batch
     SUBDIR += rubygem-aws-sdk-bcmdataexports
     SUBDIR += rubygem-aws-sdk-bedrock
     SUBDIR += rubygem-aws-sdk-bedrockagent
     SUBDIR += rubygem-aws-sdk-bedrockagentruntime
     SUBDIR += rubygem-aws-sdk-bedrockruntime
     SUBDIR += rubygem-aws-sdk-billingconductor
     SUBDIR += rubygem-aws-sdk-braket
     SUBDIR += rubygem-aws-sdk-budgets
     SUBDIR += rubygem-aws-sdk-chatbot
     SUBDIR += rubygem-aws-sdk-chime
     SUBDIR += rubygem-aws-sdk-chimesdkidentity
     SUBDIR += rubygem-aws-sdk-chimesdkmediapipelines
     SUBDIR += rubygem-aws-sdk-chimesdkmeetings
     SUBDIR += rubygem-aws-sdk-chimesdkmessaging
     SUBDIR += rubygem-aws-sdk-chimesdkvoice
     SUBDIR += rubygem-aws-sdk-cleanrooms
     SUBDIR += rubygem-aws-sdk-cleanroomsml
     SUBDIR += rubygem-aws-sdk-cloud9
     SUBDIR += rubygem-aws-sdk-cloudcontrolapi
     SUBDIR += rubygem-aws-sdk-clouddirectory
     SUBDIR += rubygem-aws-sdk-cloudformation
     SUBDIR += rubygem-aws-sdk-cloudfront
     SUBDIR += rubygem-aws-sdk-cloudfrontkeyvaluestore
     SUBDIR += rubygem-aws-sdk-cloudhsm
     SUBDIR += rubygem-aws-sdk-cloudhsmv2
     SUBDIR += rubygem-aws-sdk-cloudsearch
     SUBDIR += rubygem-aws-sdk-cloudsearchdomain
     SUBDIR += rubygem-aws-sdk-cloudtrail
     SUBDIR += rubygem-aws-sdk-cloudtraildata
     SUBDIR += rubygem-aws-sdk-cloudwatch
     SUBDIR += rubygem-aws-sdk-cloudwatchevents
     SUBDIR += rubygem-aws-sdk-cloudwatchevidently
     SUBDIR += rubygem-aws-sdk-cloudwatchlogs
     SUBDIR += rubygem-aws-sdk-cloudwatchrum
     SUBDIR += rubygem-aws-sdk-codeartifact
     SUBDIR += rubygem-aws-sdk-codebuild
     SUBDIR += rubygem-aws-sdk-codecatalyst
     SUBDIR += rubygem-aws-sdk-codecommit
     SUBDIR += rubygem-aws-sdk-codeconnections
     SUBDIR += rubygem-aws-sdk-codedeploy
     SUBDIR += rubygem-aws-sdk-codeguruprofiler
     SUBDIR += rubygem-aws-sdk-codegurureviewer
     SUBDIR += rubygem-aws-sdk-codegurusecurity
     SUBDIR += rubygem-aws-sdk-codepipeline
     SUBDIR += rubygem-aws-sdk-codestar
     SUBDIR += rubygem-aws-sdk-codestarconnections
     SUBDIR += rubygem-aws-sdk-codestarnotifications
     SUBDIR += rubygem-aws-sdk-cognitoidentity
     SUBDIR += rubygem-aws-sdk-cognitoidentityprovider
     SUBDIR += rubygem-aws-sdk-cognitosync
     SUBDIR += rubygem-aws-sdk-comprehend
     SUBDIR += rubygem-aws-sdk-comprehendmedical
     SUBDIR += rubygem-aws-sdk-computeoptimizer
     SUBDIR += rubygem-aws-sdk-configservice
     SUBDIR += rubygem-aws-sdk-connect
     SUBDIR += rubygem-aws-sdk-connectcampaignservice
     SUBDIR += rubygem-aws-sdk-connectcases
     SUBDIR += rubygem-aws-sdk-connectcontactlens
     SUBDIR += rubygem-aws-sdk-connectparticipant
     SUBDIR += rubygem-aws-sdk-connectwisdomservice
     SUBDIR += rubygem-aws-sdk-controlcatalog
     SUBDIR += rubygem-aws-sdk-controltower
     SUBDIR += rubygem-aws-sdk-core
     SUBDIR += rubygem-aws-sdk-core2
     SUBDIR += rubygem-aws-sdk-costandusagereportservice
     SUBDIR += rubygem-aws-sdk-costexplorer
     SUBDIR += rubygem-aws-sdk-costoptimizationhub
     SUBDIR += rubygem-aws-sdk-customerprofiles
     SUBDIR += rubygem-aws-sdk-databasemigrationservice
     SUBDIR += rubygem-aws-sdk-dataexchange
     SUBDIR += rubygem-aws-sdk-datapipeline
     SUBDIR += rubygem-aws-sdk-datasync
     SUBDIR += rubygem-aws-sdk-datazone
     SUBDIR += rubygem-aws-sdk-dax
     SUBDIR += rubygem-aws-sdk-deadline
     SUBDIR += rubygem-aws-sdk-detective
     SUBDIR += rubygem-aws-sdk-devicefarm
     SUBDIR += rubygem-aws-sdk-devopsguru
     SUBDIR += rubygem-aws-sdk-directconnect
     SUBDIR += rubygem-aws-sdk-directoryservice
     SUBDIR += rubygem-aws-sdk-dlm
     SUBDIR += rubygem-aws-sdk-docdb
     SUBDIR += rubygem-aws-sdk-docdbelastic
     SUBDIR += rubygem-aws-sdk-drs
     SUBDIR += rubygem-aws-sdk-dynamodb
     SUBDIR += rubygem-aws-sdk-dynamodbstreams
     SUBDIR += rubygem-aws-sdk-ebs
     SUBDIR += rubygem-aws-sdk-ec2
     SUBDIR += rubygem-aws-sdk-ec2instanceconnect
     SUBDIR += rubygem-aws-sdk-ecr
     SUBDIR += rubygem-aws-sdk-ecrpublic
     SUBDIR += rubygem-aws-sdk-ecs
     SUBDIR += rubygem-aws-sdk-efs
     SUBDIR += rubygem-aws-sdk-eks
     SUBDIR += rubygem-aws-sdk-eksauth
     SUBDIR += rubygem-aws-sdk-elasticache
     SUBDIR += rubygem-aws-sdk-elasticbeanstalk
     SUBDIR += rubygem-aws-sdk-elasticinference
     SUBDIR += rubygem-aws-sdk-elasticloadbalancing
     SUBDIR += rubygem-aws-sdk-elasticloadbalancingv2
     SUBDIR += rubygem-aws-sdk-elasticsearchservice
     SUBDIR += rubygem-aws-sdk-elastictranscoder
     SUBDIR += rubygem-aws-sdk-emr
     SUBDIR += rubygem-aws-sdk-emrcontainers
     SUBDIR += rubygem-aws-sdk-emrserverless
     SUBDIR += rubygem-aws-sdk-entityresolution
     SUBDIR += rubygem-aws-sdk-eventbridge
     SUBDIR += rubygem-aws-sdk-finspace
     SUBDIR += rubygem-aws-sdk-finspacedata
     SUBDIR += rubygem-aws-sdk-firehose
     SUBDIR += rubygem-aws-sdk-fis
     SUBDIR += rubygem-aws-sdk-fms
     SUBDIR += rubygem-aws-sdk-forecastqueryservice
     SUBDIR += rubygem-aws-sdk-forecastservice
     SUBDIR += rubygem-aws-sdk-frauddetector
     SUBDIR += rubygem-aws-sdk-freetier
     SUBDIR += rubygem-aws-sdk-fsx
     SUBDIR += rubygem-aws-sdk-gamelift
     SUBDIR += rubygem-aws-sdk-gamesparks
     SUBDIR += rubygem-aws-sdk-glacier
     SUBDIR += rubygem-aws-sdk-globalaccelerator
     SUBDIR += rubygem-aws-sdk-glue
     SUBDIR += rubygem-aws-sdk-gluedatabrew
     SUBDIR += rubygem-aws-sdk-greengrass
     SUBDIR += rubygem-aws-sdk-greengrassv2
     SUBDIR += rubygem-aws-sdk-groundstation
     SUBDIR += rubygem-aws-sdk-guardduty
     SUBDIR += rubygem-aws-sdk-health
     SUBDIR += rubygem-aws-sdk-healthlake
     SUBDIR += rubygem-aws-sdk-honeycode
     SUBDIR += rubygem-aws-sdk-iam
     SUBDIR += rubygem-aws-sdk-identitystore
     SUBDIR += rubygem-aws-sdk-imagebuilder
     SUBDIR += rubygem-aws-sdk-importexport
     SUBDIR += rubygem-aws-sdk-inspector
     SUBDIR += rubygem-aws-sdk-inspector2
     SUBDIR += rubygem-aws-sdk-inspectorscan
     SUBDIR += rubygem-aws-sdk-internetmonitor
     SUBDIR += rubygem-aws-sdk-iot
     SUBDIR += rubygem-aws-sdk-iot1clickdevicesservice
     SUBDIR += rubygem-aws-sdk-iot1clickprojects
     SUBDIR += rubygem-aws-sdk-iotanalytics
     SUBDIR += rubygem-aws-sdk-iotdataplane
     SUBDIR += rubygem-aws-sdk-iotdeviceadvisor
     SUBDIR += rubygem-aws-sdk-iotevents
     SUBDIR += rubygem-aws-sdk-ioteventsdata
     SUBDIR += rubygem-aws-sdk-iotfleethub
     SUBDIR += rubygem-aws-sdk-iotfleetwise
     SUBDIR += rubygem-aws-sdk-iotjobsdataplane
     SUBDIR += rubygem-aws-sdk-iotroborunner
     SUBDIR += rubygem-aws-sdk-iotsecuretunneling
     SUBDIR += rubygem-aws-sdk-iotsitewise
     SUBDIR += rubygem-aws-sdk-iotthingsgraph
     SUBDIR += rubygem-aws-sdk-iottwinmaker
     SUBDIR += rubygem-aws-sdk-iotwireless
     SUBDIR += rubygem-aws-sdk-ivs
     SUBDIR += rubygem-aws-sdk-ivschat
     SUBDIR += rubygem-aws-sdk-ivsrealtime
     SUBDIR += rubygem-aws-sdk-kafka
     SUBDIR += rubygem-aws-sdk-kafkaconnect
     SUBDIR += rubygem-aws-sdk-kendra
     SUBDIR += rubygem-aws-sdk-kendraranking
     SUBDIR += rubygem-aws-sdk-keyspaces
     SUBDIR += rubygem-aws-sdk-kinesis
     SUBDIR += rubygem-aws-sdk-kinesisanalytics
     SUBDIR += rubygem-aws-sdk-kinesisanalyticsv2
     SUBDIR += rubygem-aws-sdk-kinesisvideo
     SUBDIR += rubygem-aws-sdk-kinesisvideoarchivedmedia
     SUBDIR += rubygem-aws-sdk-kinesisvideomedia
     SUBDIR += rubygem-aws-sdk-kinesisvideosignalingchannels
     SUBDIR += rubygem-aws-sdk-kinesisvideowebrtcstorage
     SUBDIR += rubygem-aws-sdk-kms
     SUBDIR += rubygem-aws-sdk-lakeformation
     SUBDIR += rubygem-aws-sdk-lambda
     SUBDIR += rubygem-aws-sdk-lambdapreview
     SUBDIR += rubygem-aws-sdk-launchwizard
     SUBDIR += rubygem-aws-sdk-lex
     SUBDIR += rubygem-aws-sdk-lexmodelbuildingservice
     SUBDIR += rubygem-aws-sdk-lexmodelsv2
     SUBDIR += rubygem-aws-sdk-lexruntimev2
     SUBDIR += rubygem-aws-sdk-licensemanager
     SUBDIR += rubygem-aws-sdk-licensemanagerlinuxsubscriptions
     SUBDIR += rubygem-aws-sdk-licensemanagerusersubscriptions
     SUBDIR += rubygem-aws-sdk-lightsail
     SUBDIR += rubygem-aws-sdk-locationservice
     SUBDIR += rubygem-aws-sdk-lookoutequipment
     SUBDIR += rubygem-aws-sdk-lookoutforvision
     SUBDIR += rubygem-aws-sdk-lookoutmetrics
     SUBDIR += rubygem-aws-sdk-machinelearning
     SUBDIR += rubygem-aws-sdk-macie2
     SUBDIR += rubygem-aws-sdk-mailmanager
     SUBDIR += rubygem-aws-sdk-mainframemodernization
     SUBDIR += rubygem-aws-sdk-managedblockchain
     SUBDIR += rubygem-aws-sdk-managedblockchainquery
     SUBDIR += rubygem-aws-sdk-managedgrafana
     SUBDIR += rubygem-aws-sdk-marketplaceagreement
     SUBDIR += rubygem-aws-sdk-marketplacecatalog
     SUBDIR += rubygem-aws-sdk-marketplacecommerceanalytics
     SUBDIR += rubygem-aws-sdk-marketplacedeployment
     SUBDIR += rubygem-aws-sdk-marketplaceentitlementservice
     SUBDIR += rubygem-aws-sdk-marketplacemetering
     SUBDIR += rubygem-aws-sdk-mediaconnect
     SUBDIR += rubygem-aws-sdk-mediaconvert
     SUBDIR += rubygem-aws-sdk-medialive
     SUBDIR += rubygem-aws-sdk-mediapackage
     SUBDIR += rubygem-aws-sdk-mediapackagev2
     SUBDIR += rubygem-aws-sdk-mediapackagevod
     SUBDIR += rubygem-aws-sdk-mediastore
     SUBDIR += rubygem-aws-sdk-mediastoredata
     SUBDIR += rubygem-aws-sdk-mediatailor
     SUBDIR += rubygem-aws-sdk-medicalimaging
     SUBDIR += rubygem-aws-sdk-memorydb
     SUBDIR += rubygem-aws-sdk-mgn
     SUBDIR += rubygem-aws-sdk-migrationhub
     SUBDIR += rubygem-aws-sdk-migrationhubconfig
     SUBDIR += rubygem-aws-sdk-migrationhuborchestrator
     SUBDIR += rubygem-aws-sdk-migrationhubrefactorspaces
     SUBDIR += rubygem-aws-sdk-migrationhubstrategyrecommendations
     SUBDIR += rubygem-aws-sdk-mobile
     SUBDIR += rubygem-aws-sdk-mq
     SUBDIR += rubygem-aws-sdk-mturk
     SUBDIR += rubygem-aws-sdk-mwaa
     SUBDIR += rubygem-aws-sdk-neptune
     SUBDIR += rubygem-aws-sdk-neptunedata
     SUBDIR += rubygem-aws-sdk-neptunegraph
     SUBDIR += rubygem-aws-sdk-networkfirewall
     SUBDIR += rubygem-aws-sdk-networkmanager
     SUBDIR += rubygem-aws-sdk-networkmonitor
     SUBDIR += rubygem-aws-sdk-nimblestudio
     SUBDIR += rubygem-aws-sdk-oam
     SUBDIR += rubygem-aws-sdk-omics
     SUBDIR += rubygem-aws-sdk-opensearchserverless
     SUBDIR += rubygem-aws-sdk-opensearchservice
     SUBDIR += rubygem-aws-sdk-opsworks
     SUBDIR += rubygem-aws-sdk-opsworkscm
     SUBDIR += rubygem-aws-sdk-organizations
     SUBDIR += rubygem-aws-sdk-osis
     SUBDIR += rubygem-aws-sdk-outposts
     SUBDIR += rubygem-aws-sdk-panorama
     SUBDIR += rubygem-aws-sdk-paymentcryptography
     SUBDIR += rubygem-aws-sdk-paymentcryptographydata
     SUBDIR += rubygem-aws-sdk-pcaconnectorad
     SUBDIR += rubygem-aws-sdk-pcaconnectorscep
     SUBDIR += rubygem-aws-sdk-personalize
     SUBDIR += rubygem-aws-sdk-personalizeevents
     SUBDIR += rubygem-aws-sdk-personalizeruntime
     SUBDIR += rubygem-aws-sdk-pi
     SUBDIR += rubygem-aws-sdk-pinpoint
     SUBDIR += rubygem-aws-sdk-pinpointemail
     SUBDIR += rubygem-aws-sdk-pinpointsmsvoice
     SUBDIR += rubygem-aws-sdk-pinpointsmsvoicev2
     SUBDIR += rubygem-aws-sdk-pipes
     SUBDIR += rubygem-aws-sdk-polly
     SUBDIR += rubygem-aws-sdk-pricing
     SUBDIR += rubygem-aws-sdk-privatenetworks
     SUBDIR += rubygem-aws-sdk-prometheusservice
     SUBDIR += rubygem-aws-sdk-proton
     SUBDIR += rubygem-aws-sdk-qbusiness
     SUBDIR += rubygem-aws-sdk-qconnect
     SUBDIR += rubygem-aws-sdk-qldb
     SUBDIR += rubygem-aws-sdk-qldbsession
     SUBDIR += rubygem-aws-sdk-quicksight
     SUBDIR += rubygem-aws-sdk-ram
     SUBDIR += rubygem-aws-sdk-rds
     SUBDIR += rubygem-aws-sdk-rdsdataservice
     SUBDIR += rubygem-aws-sdk-recyclebin
     SUBDIR += rubygem-aws-sdk-redshift
     SUBDIR += rubygem-aws-sdk-redshiftdataapiservice
     SUBDIR += rubygem-aws-sdk-redshiftserverless
     SUBDIR += rubygem-aws-sdk-rekognition
     SUBDIR += rubygem-aws-sdk-repostspace
     SUBDIR += rubygem-aws-sdk-resiliencehub
     SUBDIR += rubygem-aws-sdk-resourceexplorer2
     SUBDIR += rubygem-aws-sdk-resourcegroups
     SUBDIR += rubygem-aws-sdk-resourcegroupstaggingapi
     SUBDIR += rubygem-aws-sdk-resources
     SUBDIR += rubygem-aws-sdk-resources2
     SUBDIR += rubygem-aws-sdk-robomaker
     SUBDIR += rubygem-aws-sdk-rolesanywhere
     SUBDIR += rubygem-aws-sdk-route53
     SUBDIR += rubygem-aws-sdk-route53domains
     SUBDIR += rubygem-aws-sdk-route53profiles
     SUBDIR += rubygem-aws-sdk-route53recoverycluster
     SUBDIR += rubygem-aws-sdk-route53recoverycontrolconfig
     SUBDIR += rubygem-aws-sdk-route53recoveryreadiness
     SUBDIR += rubygem-aws-sdk-route53resolver
     SUBDIR += rubygem-aws-sdk-s3
     SUBDIR += rubygem-aws-sdk-s3control
     SUBDIR += rubygem-aws-sdk-s3outposts
     SUBDIR += rubygem-aws-sdk-sagemaker
     SUBDIR += rubygem-aws-sdk-sagemakeredgemanager
     SUBDIR += rubygem-aws-sdk-sagemakerfeaturestoreruntime
     SUBDIR += rubygem-aws-sdk-sagemakergeospatial
     SUBDIR += rubygem-aws-sdk-sagemakermetrics
     SUBDIR += rubygem-aws-sdk-sagemakerruntime
     SUBDIR += rubygem-aws-sdk-savingsplans
     SUBDIR += rubygem-aws-sdk-scheduler
     SUBDIR += rubygem-aws-sdk-schemas
     SUBDIR += rubygem-aws-sdk-secretsmanager
     SUBDIR += rubygem-aws-sdk-securityhub
     SUBDIR += rubygem-aws-sdk-securitylake
     SUBDIR += rubygem-aws-sdk-serverlessapplicationrepository
     SUBDIR += rubygem-aws-sdk-servicecatalog
     SUBDIR += rubygem-aws-sdk-servicediscovery
     SUBDIR += rubygem-aws-sdk-servicequotas
     SUBDIR += rubygem-aws-sdk-ses
     SUBDIR += rubygem-aws-sdk-sesv2
     SUBDIR += rubygem-aws-sdk-shield
     SUBDIR += rubygem-aws-sdk-signer
     SUBDIR += rubygem-aws-sdk-simpledb
     SUBDIR += rubygem-aws-sdk-simspaceweaver
     SUBDIR += rubygem-aws-sdk-sms
     SUBDIR += rubygem-aws-sdk-snowball
     SUBDIR += rubygem-aws-sdk-snowdevicemanagement
     SUBDIR += rubygem-aws-sdk-sns
     SUBDIR += rubygem-aws-sdk-sqs
     SUBDIR += rubygem-aws-sdk-ssm
     SUBDIR += rubygem-aws-sdk-ssmcontacts
     SUBDIR += rubygem-aws-sdk-ssmincidents
     SUBDIR += rubygem-aws-sdk-ssmsap
     SUBDIR += rubygem-aws-sdk-ssoadmin
     SUBDIR += rubygem-aws-sdk-ssooidc
     SUBDIR += rubygem-aws-sdk-states
     SUBDIR += rubygem-aws-sdk-storagegateway
     SUBDIR += rubygem-aws-sdk-supplychain
     SUBDIR += rubygem-aws-sdk-support
     SUBDIR += rubygem-aws-sdk-supportapp
     SUBDIR += rubygem-aws-sdk-swf
     SUBDIR += rubygem-aws-sdk-synthetics
     SUBDIR += rubygem-aws-sdk-taxsettings
     SUBDIR += rubygem-aws-sdk-textract
     SUBDIR += rubygem-aws-sdk-timestreaminfluxdb
     SUBDIR += rubygem-aws-sdk-timestreamquery
     SUBDIR += rubygem-aws-sdk-timestreamwrite
     SUBDIR += rubygem-aws-sdk-tnb
     SUBDIR += rubygem-aws-sdk-transcribeservice
     SUBDIR += rubygem-aws-sdk-transcribestreamingservice
     SUBDIR += rubygem-aws-sdk-transfer
     SUBDIR += rubygem-aws-sdk-translate
     SUBDIR += rubygem-aws-sdk-trustedadvisor
     SUBDIR += rubygem-aws-sdk-verifiedpermissions
     SUBDIR += rubygem-aws-sdk-voiceid
     SUBDIR += rubygem-aws-sdk-vpclattice
     SUBDIR += rubygem-aws-sdk-waf
     SUBDIR += rubygem-aws-sdk-wafregional
     SUBDIR += rubygem-aws-sdk-wafv2
     SUBDIR += rubygem-aws-sdk-wellarchitected
     SUBDIR += rubygem-aws-sdk-workdocs
     SUBDIR += rubygem-aws-sdk-worklink
     SUBDIR += rubygem-aws-sdk-workmail
     SUBDIR += rubygem-aws-sdk-workmailmessageflow
     SUBDIR += rubygem-aws-sdk-workspaces
     SUBDIR += rubygem-aws-sdk-workspacesthinclient
     SUBDIR += rubygem-aws-sdk-workspacesweb
     SUBDIR += rubygem-aws-sdk-xray
     SUBDIR += rubygem-aws-sdk2
     SUBDIR += rubygem-aws-sigv2
     SUBDIR += rubygem-aws-sigv4
     SUBDIR += rubygem-axiom-types
     SUBDIR += rubygem-azure-storage
     SUBDIR += rubygem-azure-storage-blob
     SUBDIR += rubygem-azure-storage-common
     SUBDIR += rubygem-azure-storage-file
     SUBDIR += rubygem-azure-storage-queue
     SUBDIR += rubygem-azure-storage-table
     SUBDIR += rubygem-azure_cognitiveservices_anomalydetector
     SUBDIR += rubygem-azure_cognitiveservices_autosuggest
     SUBDIR += rubygem-azure_cognitiveservices_computervision
     SUBDIR += rubygem-azure_cognitiveservices_contentmoderator
     SUBDIR += rubygem-azure_cognitiveservices_customimagesearch
     SUBDIR += rubygem-azure_cognitiveservices_customsearch
     SUBDIR += rubygem-azure_cognitiveservices_customvisionprediction
     SUBDIR += rubygem-azure_cognitiveservices_customvisiontraining
     SUBDIR += rubygem-azure_cognitiveservices_entitysearch
     SUBDIR += rubygem-azure_cognitiveservices_face
     SUBDIR += rubygem-azure_cognitiveservices_formrecognizer
     SUBDIR += rubygem-azure_cognitiveservices_imagesearch
     SUBDIR += rubygem-azure_cognitiveservices_localsearch
     SUBDIR += rubygem-azure_cognitiveservices_luisauthoring
     SUBDIR += rubygem-azure_cognitiveservices_luisruntime
     SUBDIR += rubygem-azure_cognitiveservices_newssearch
     SUBDIR += rubygem-azure_cognitiveservices_personalizer
     SUBDIR += rubygem-azure_cognitiveservices_qnamaker
     SUBDIR += rubygem-azure_cognitiveservices_qnamakerruntime
     SUBDIR += rubygem-azure_cognitiveservices_spellcheck
     SUBDIR += rubygem-azure_cognitiveservices_textanalytics
     SUBDIR += rubygem-azure_cognitiveservices_videosearch
     SUBDIR += rubygem-azure_cognitiveservices_visualsearch
     SUBDIR += rubygem-azure_cognitiveservices_websearch
     SUBDIR += rubygem-azure_event_grid
     SUBDIR += rubygem-azure_graph_rbac
     SUBDIR += rubygem-azure_key_vault
     SUBDIR += rubygem-azure_mgmt_adhybridhealth_service
     SUBDIR += rubygem-azure_mgmt_advisor
     SUBDIR += rubygem-azure_mgmt_alerts_management
     SUBDIR += rubygem-azure_mgmt_analysis_services
     SUBDIR += rubygem-azure_mgmt_api_management
     SUBDIR += rubygem-azure_mgmt_appconfiguration
     SUBDIR += rubygem-azure_mgmt_attestation
     SUBDIR += rubygem-azure_mgmt_authorization
     SUBDIR += rubygem-azure_mgmt_automanage
     SUBDIR += rubygem-azure_mgmt_automation
     SUBDIR += rubygem-azure_mgmt_azurestack
     SUBDIR += rubygem-azure_mgmt_azurestack_hci
     SUBDIR += rubygem-azure_mgmt_batch
     SUBDIR += rubygem-azure_mgmt_batchai
     SUBDIR += rubygem-azure_mgmt_billing
     SUBDIR += rubygem-azure_mgmt_bot_service
     SUBDIR += rubygem-azure_mgmt_cdn
     SUBDIR += rubygem-azure_mgmt_cognitive_services
     SUBDIR += rubygem-azure_mgmt_commerce
     SUBDIR += rubygem-azure_mgmt_compute
     SUBDIR += rubygem-azure_mgmt_consumption
     SUBDIR += rubygem-azure_mgmt_container_instance
     SUBDIR += rubygem-azure_mgmt_container_registry
     SUBDIR += rubygem-azure_mgmt_container_service
     SUBDIR += rubygem-azure_mgmt_cosmosdb
     SUBDIR += rubygem-azure_mgmt_cost_management
     SUBDIR += rubygem-azure_mgmt_customer_insights
     SUBDIR += rubygem-azure_mgmt_data_factory
     SUBDIR += rubygem-azure_mgmt_data_migration
     SUBDIR += rubygem-azure_mgmt_databox
     SUBDIR += rubygem-azure_mgmt_datalake_analytics
     SUBDIR += rubygem-azure_mgmt_datalake_store
     SUBDIR += rubygem-azure_mgmt_datashare
     SUBDIR += rubygem-azure_mgmt_deployment_manager
     SUBDIR += rubygem-azure_mgmt_dev_spaces
     SUBDIR += rubygem-azure_mgmt_devtestlabs
     SUBDIR += rubygem-azure_mgmt_digitaltwins
     SUBDIR += rubygem-azure_mgmt_dns
     SUBDIR += rubygem-azure_mgmt_edgegateway
     SUBDIR += rubygem-azure_mgmt_event_grid
     SUBDIR += rubygem-azure_mgmt_event_hub
     SUBDIR += rubygem-azure_mgmt_features
     SUBDIR += rubygem-azure_mgmt_hanaonazure
     SUBDIR += rubygem-azure_mgmt_hdinsight
     SUBDIR += rubygem-azure_mgmt_hybrid_compute
     SUBDIR += rubygem-azure_mgmt_import_export
     SUBDIR += rubygem-azure_mgmt_iot_central
     SUBDIR += rubygem-azure_mgmt_iot_hub
     SUBDIR += rubygem-azure_mgmt_key_vault
     SUBDIR += rubygem-azure_mgmt_kubernetes_configuration
     SUBDIR += rubygem-azure_mgmt_kusto
     SUBDIR += rubygem-azure_mgmt_labservices
     SUBDIR += rubygem-azure_mgmt_links
     SUBDIR += rubygem-azure_mgmt_locks
     SUBDIR += rubygem-azure_mgmt_logic
     SUBDIR += rubygem-azure_mgmt_machine_learning
     SUBDIR += rubygem-azure_mgmt_machine_learning_services
     SUBDIR += rubygem-azure_mgmt_maintenance
     SUBDIR += rubygem-azure_mgmt_managed_applications
     SUBDIR += rubygem-azure_mgmt_mariadb
     SUBDIR += rubygem-azure_mgmt_marketplace_ordering
     SUBDIR += rubygem-azure_mgmt_media_services
     SUBDIR += rubygem-azure_mgmt_migrate
     SUBDIR += rubygem-azure_mgmt_mixedreality
     SUBDIR += rubygem-azure_mgmt_monitor
     SUBDIR += rubygem-azure_mgmt_msi
     SUBDIR += rubygem-azure_mgmt_mysql
     SUBDIR += rubygem-azure_mgmt_netapp
     SUBDIR += rubygem-azure_mgmt_network
     SUBDIR += rubygem-azure_mgmt_notification_hubs
     SUBDIR += rubygem-azure_mgmt_operational_insights
     SUBDIR += rubygem-azure_mgmt_operations_management
     SUBDIR += rubygem-azure_mgmt_peering
     SUBDIR += rubygem-azure_mgmt_policy
     SUBDIR += rubygem-azure_mgmt_policy_insights
     SUBDIR += rubygem-azure_mgmt_portal
     SUBDIR += rubygem-azure_mgmt_postgresql
     SUBDIR += rubygem-azure_mgmt_powerbi_dedicated
     SUBDIR += rubygem-azure_mgmt_powerbi_embedded
     SUBDIR += rubygem-azure_mgmt_privatedns
     SUBDIR += rubygem-azure_mgmt_recovery_services
     SUBDIR += rubygem-azure_mgmt_recovery_services_backup
     SUBDIR += rubygem-azure_mgmt_recovery_services_site_recovery
     SUBDIR += rubygem-azure_mgmt_redis
     SUBDIR += rubygem-azure_mgmt_relay
     SUBDIR += rubygem-azure_mgmt_reservations
     SUBDIR += rubygem-azure_mgmt_resource_health
     SUBDIR += rubygem-azure_mgmt_resourcegraph
     SUBDIR += rubygem-azure_mgmt_resources
     SUBDIR += rubygem-azure_mgmt_resources_management
     SUBDIR += rubygem-azure_mgmt_scheduler
     SUBDIR += rubygem-azure_mgmt_search
     SUBDIR += rubygem-azure_mgmt_security
     SUBDIR += rubygem-azure_mgmt_serialconsole
     SUBDIR += rubygem-azure_mgmt_service_bus
     SUBDIR += rubygem-azure_mgmt_service_fabric
     SUBDIR += rubygem-azure_mgmt_signalr
     SUBDIR += rubygem-azure_mgmt_sql
     SUBDIR += rubygem-azure_mgmt_sqlvirtualmachine
     SUBDIR += rubygem-azure_mgmt_stor_simple8000_series
     SUBDIR += rubygem-azure_mgmt_storage
     SUBDIR += rubygem-azure_mgmt_storagecache
     SUBDIR += rubygem-azure_mgmt_storagesync
     SUBDIR += rubygem-azure_mgmt_stream_analytics
     SUBDIR += rubygem-azure_mgmt_subscriptions
     SUBDIR += rubygem-azure_mgmt_support
     SUBDIR += rubygem-azure_mgmt_synapse
     SUBDIR += rubygem-azure_mgmt_time_series_insights
     SUBDIR += rubygem-azure_mgmt_traffic_manager
     SUBDIR += rubygem-azure_mgmt_vmware_cloudsimple
     SUBDIR += rubygem-azure_mgmt_web
     SUBDIR += rubygem-azure_sdk
     SUBDIR += rubygem-azure_service_fabric
     SUBDIR += rubygem-backports
     SUBDIR += rubygem-bacon
     SUBDIR += rubygem-baf
     SUBDIR += rubygem-batch-loader
     SUBDIR += rubygem-bcp47_spec
     SUBDIR += rubygem-benelux
     SUBDIR += rubygem-better_html-rails61
     SUBDIR += rubygem-bin_utils
     SUBDIR += rubygem-bindata
     SUBDIR += rubygem-bindex
     SUBDIR += rubygem-binding_of_caller
     SUBDIR += rubygem-bit-struct
     SUBDIR += rubygem-blankslate
     SUBDIR += rubygem-blockenspiel
     SUBDIR += rubygem-bones
     SUBDIR += rubygem-bootsnap
     SUBDIR += rubygem-bootsnap117
     SUBDIR += rubygem-bootstrap_form
     SUBDIR += rubygem-bson
     SUBDIR += rubygem-buftok
     SUBDIR += rubygem-bugspots
     SUBDIR += rubygem-builder
     SUBDIR += rubygem-byebug
     SUBDIR += rubygem-c21e
     SUBDIR += rubygem-cabin
     SUBDIR += rubygem-caesars
     SUBDIR += rubygem-cairo-gobject
     SUBDIR += rubygem-capybara
     SUBDIR += rubygem-capybara-screenshot
     SUBDIR += rubygem-cbor
     SUBDIR += rubygem-celluloid
     SUBDIR += rubygem-celluloid-essentials
     SUBDIR += rubygem-celluloid-extras
     SUBDIR += rubygem-celluloid-fsm
     SUBDIR += rubygem-celluloid-io
     SUBDIR += rubygem-celluloid-pool
     SUBDIR += rubygem-celluloid-supervision
     SUBDIR += rubygem-cf-uaa-lib
     SUBDIR += rubygem-cheffish
     SUBDIR += rubygem-childprocess
     SUBDIR += rubygem-childprocess3
     SUBDIR += rubygem-childprocess40
     SUBDIR += rubygem-childprocess41
     SUBDIR += rubygem-chronic
     SUBDIR += rubygem-chronic_duration
     SUBDIR += rubygem-claide
     SUBDIR += rubygem-claide-plugins
     SUBDIR += rubygem-clamp
     SUBDIR += rubygem-classifier
     SUBDIR += rubygem-classifier-reborn
     SUBDIR += rubygem-climate_control
     SUBDIR += rubygem-clio
     SUBDIR += rubygem-cliprompt
     SUBDIR += rubygem-cloudfiles
     SUBDIR += rubygem-cms_scanner
     SUBDIR += rubygem-cocaine
     SUBDIR += rubygem-cocoon
     SUBDIR += rubygem-coercible
     SUBDIR += rubygem-coffee-rails-rails5
     SUBDIR += rubygem-coffee-rails-rails50
     SUBDIR += rubygem-coffee-rails-rails52
     SUBDIR += rubygem-coffee-rails4
     SUBDIR += rubygem-coffee-rails41
     SUBDIR += rubygem-coffee-script
     SUBDIR += rubygem-coffee-script-source
     SUBDIR += rubygem-colorize
     SUBDIR += rubygem-colorizer
     SUBDIR += rubygem-columnize
     SUBDIR += rubygem-commander
     SUBDIR += rubygem-concurrent-ruby
     SUBDIR += rubygem-concurrent-ruby-edge
     SUBDIR += rubygem-concurrent-ruby-edge06
     SUBDIR += rubygem-concurrent-ruby-ext
     SUBDIR += rubygem-concurrent-ruby11
     SUBDIR += rubygem-configatron
     SUBDIR += rubygem-configstruct
     SUBDIR += rubygem-configuration
     SUBDIR += rubygem-console
     SUBDIR += rubygem-contracts
     SUBDIR += rubygem-contracts016
     SUBDIR += rubygem-cookbook-omnifetch
     SUBDIR += rubygem-cool.io
     SUBDIR += rubygem-corefines
     SUBDIR += rubygem-corefoundation
     SUBDIR += rubygem-cork
     SUBDIR += rubygem-countries
     SUBDIR += rubygem-cow_proxy
     SUBDIR += rubygem-crack
     SUBDIR += rubygem-cri
     SUBDIR += rubygem-csv
     SUBDIR += rubygem-cucumber
     SUBDIR += rubygem-cucumber-ci-environment
     SUBDIR += rubygem-cucumber-core
     SUBDIR += rubygem-cucumber-cucumber-expressions
     SUBDIR += rubygem-cucumber-messages
     SUBDIR += rubygem-cucumber-messages22
     SUBDIR += rubygem-cucumber-messages23
     SUBDIR += rubygem-cucumber-messages24
     SUBDIR += rubygem-cucumber-rails
     SUBDIR += rubygem-cucumber-tag-expressions
     SUBDIR += rubygem-cucumber-wire
     SUBDIR += rubygem-curses
     SUBDIR += rubygem-cyoi
     SUBDIR += rubygem-daemon_controller
     SUBDIR += rubygem-daemons
     SUBDIR += rubygem-danger
     SUBDIR += rubygem-danger-gitlab
     SUBDIR += rubygem-datadog
     SUBDIR += rubygem-datadog-ci
     SUBDIR += rubygem-date
     SUBDIR += rubygem-ddmemoize
     SUBDIR += rubygem-ddmetrics
     SUBDIR += rubygem-ddplugin
     SUBDIR += rubygem-deb_version
     SUBDIR += rubygem-debase-ruby_core_source
     SUBDIR += rubygem-debug
     SUBDIR += rubygem-debug_inspector
     SUBDIR += rubygem-debugger-linecache
     SUBDIR += rubygem-debugger-ruby_core_source
     SUBDIR += rubygem-debugger-xml
     SUBDIR += rubygem-declarative
     SUBDIR += rubygem-declarative-option
     SUBDIR += rubygem-deep_merge
     SUBDIR += rubygem-deep_test
     SUBDIR += rubygem-deface
     SUBDIR += rubygem-default_value_for
     SUBDIR += rubygem-delayed_job
     SUBDIR += rubygem-delayer
     SUBDIR += rubygem-delayer-deferred
     SUBDIR += rubygem-delegate
     SUBDIR += rubygem-deprecated
     SUBDIR += rubygem-deprecated2
     SUBDIR += rubygem-descendants_tracker
     SUBDIR += rubygem-device_detector
     SUBDIR += rubygem-devise
     SUBDIR += rubygem-devise-pwned_password
     SUBDIR += rubygem-devise-rails5
     SUBDIR += rubygem-devise-rails52
     SUBDIR += rubygem-devise-rails60
     SUBDIR += rubygem-devise-rails61
     SUBDIR += rubygem-devise-rails70
     SUBDIR += rubygem-devise-rails71
     SUBDIR += rubygem-did_you_mean
     SUBDIR += rubygem-dig_rb
     SUBDIR += rubygem-directory_watcher
     SUBDIR += rubygem-ditz
     SUBDIR += rubygem-diva
     SUBDIR += rubygem-docile
     SUBDIR += rubygem-docopt
     SUBDIR += rubygem-drb
     SUBDIR += rubygem-dry-cli
     SUBDIR += rubygem-dry-configurable
     SUBDIR += rubygem-dry-container
     SUBDIR += rubygem-dry-core
     SUBDIR += rubygem-dry-equalizer
     SUBDIR += rubygem-dry-inflector
     SUBDIR += rubygem-dry-logic
     SUBDIR += rubygem-dry-types
     SUBDIR += rubygem-drydock
     SUBDIR += rubygem-dynflow
     SUBDIR += rubygem-e2mmap
     SUBDIR += rubygem-ecma-re-validator
     SUBDIR += rubygem-edavis10-object_daddy
     SUBDIR += rubygem-elif
     SUBDIR += rubygem-emoji_regex
     SUBDIR += rubygem-english
     SUBDIR += rubygem-enumerize
     SUBDIR += rubygem-equalizer
     SUBDIR += rubygem-equatable
     SUBDIR += rubygem-erb
     SUBDIR += rubygem-errand
     SUBDIR += rubygem-error_highlight
     SUBDIR += rubygem-et-orbi
     SUBDIR += rubygem-etc
     SUBDIR += rubygem-event_emitter
     SUBDIR += rubygem-event_stream_parser
     SUBDIR += rubygem-event_stream_parser0
     SUBDIR += rubygem-eventmachine
     SUBDIR += rubygem-excon
     SUBDIR += rubygem-execjs
     SUBDIR += rubygem-extlib
     SUBDIR += rubygem-extpp
     SUBDIR += rubygem-extras
     SUBDIR += rubygem-facets
     SUBDIR += rubygem-faker
     SUBDIR += rubygem-faraday-cookie_jar
     SUBDIR += rubygem-faraday-excon
     SUBDIR += rubygem-faraday-excon1
     SUBDIR += rubygem-faraday_middleware-aws-sigv4
     SUBDIR += rubygem-faraday_middleware-aws-sigv403
     SUBDIR += rubygem-faraday_middleware-multi_json
     SUBDIR += rubygem-fast-stemmer
     SUBDIR += rubygem-fast_blank
     SUBDIR += rubygem-fast_gettext
     SUBDIR += rubygem-fast_stack
     SUBDIR += rubygem-fast_xor
     SUBDIR += rubygem-fastercsv
     SUBDIR += rubygem-fastri
     SUBDIR += rubygem-fattr
     SUBDIR += rubygem-fcntl
     SUBDIR += rubygem-ffaker
     SUBDIR += rubygem-ffi
     SUBDIR += rubygem-ffi-compiler
     SUBDIR += rubygem-ffi-libarchive
     SUBDIR += rubygem-ffi-win32-extensions
     SUBDIR += rubygem-ffi-yajl
     SUBDIR += rubygem-fiber-annotation
     SUBDIR += rubygem-fiber-local
     SUBDIR += rubygem-fiber-storage
     SUBDIR += rubygem-fiddle
     SUBDIR += rubygem-figaro
     SUBDIR += rubygem-file-tail
     SUBDIR += rubygem-filesize
     SUBDIR += rubygem-fileutils
     SUBDIR += rubygem-find
     SUBDIR += rubygem-flexmock
     SUBDIR += rubygem-flipper
     SUBDIR += rubygem-flipper-active_support_cache_store
     SUBDIR += rubygem-flipper-active_support_cache_store-rails70
     SUBDIR += rubygem-flipper-ui
     SUBDIR += rubygem-flipper026
     SUBDIR += rubygem-fluent-logger
     SUBDIR += rubygem-fog
     SUBDIR += rubygem-fog-core
     SUBDIR += rubygem-fog-core1
     SUBDIR += rubygem-fog-core210
     SUBDIR += rubygem-fog-core220
     SUBDIR += rubygem-fog-json
     SUBDIR += rubygem-font-awesome-rails
     SUBDIR += rubygem-font-awesome-rails-rails5
     SUBDIR += rubygem-font-awesome-rails-rails52
     SUBDIR += rubygem-font-awesome-rails-rails60
     SUBDIR += rubygem-foreigner
     SUBDIR += rubygem-foreman
     SUBDIR += rubygem-formatador
     SUBDIR += rubygem-forwardable
     SUBDIR += rubygem-forwardable-extended
     SUBDIR += rubygem-fugit
     SUBDIR += rubygem-fugit18
     SUBDIR += rubygem-fuubar
     SUBDIR += rubygem-fuzzy_match
     SUBDIR += rubygem-gapic-common
     SUBDIR += rubygem-gdata
     SUBDIR += rubygem-gem-compare
     SUBDIR += rubygem-gem_plugin
     SUBDIR += rubygem-gemcutter
     SUBDIR += rubygem-gemdiff
     SUBDIR += rubygem-gemnasium-parser
     SUBDIR += rubygem-gems
     SUBDIR += rubygem-generator
     SUBDIR += rubygem-generator_spec-rails4
     SUBDIR += rubygem-generator_spec-rails5
     SUBDIR += rubygem-georuby
     SUBDIR += rubygem-get_process_mem
     SUBDIR += rubygem-getopt
     SUBDIR += rubygem-getoptlong
     SUBDIR += rubygem-gettext
     SUBDIR += rubygem-gettext-setup
     SUBDIR += rubygem-gettext_i18n_rails
     SUBDIR += rubygem-gettext_i18n_rails_js
     SUBDIR += rubygem-gettext_i18n_rails_js-rails5
     SUBDIR += rubygem-gettext_i18n_rails_js-rails50
     SUBDIR += rubygem-gettext_i18n_rails_js-rails52
     SUBDIR += rubygem-gettext_i18n_rails_js-rails61
     SUBDIR += rubygem-gettext_i18n_rails_js-rails70
     SUBDIR += rubygem-gh
     SUBDIR += rubygem-gibbler
     SUBDIR += rubygem-gio2
     SUBDIR += rubygem-git
     SUBDIR += rubygem-git-version-bump
     SUBDIR += rubygem-github_api
     SUBDIR += rubygem-gitlab
     SUBDIR += rubygem-gitlab-chronic
     SUBDIR += rubygem-gitlab-dangerfiles
     SUBDIR += rubygem-gitlab-experiment
     SUBDIR += rubygem-gitlab-labkit
     SUBDIR += rubygem-gitlab-license
     SUBDIR += rubygem-gitlab-pygments.rb
     SUBDIR += rubygem-gitlab-sdk
     SUBDIR += rubygem-gitlab_chronic_duration
     SUBDIR += rubygem-gitlab_git
     SUBDIR += rubygem-gitlab_meta
     SUBDIR += rubygem-glib2
     SUBDIR += rubygem-gobject-introspection
     SUBDIR += rubygem-google-api-client
     SUBDIR += rubygem-google-apis-admin_directory_v1
     SUBDIR += rubygem-google-apis-androidpublisher_v3
     SUBDIR += rubygem-google-apis-androidpublisher_v3034
     SUBDIR += rubygem-google-apis-bigquery_v2
     SUBDIR += rubygem-google-apis-cloudbilling_v1
     SUBDIR += rubygem-google-apis-cloudkms_v1
     SUBDIR += rubygem-google-apis-cloudresourcemanager_v1
     SUBDIR += rubygem-google-apis-cloudresourcemanager_v1035
     SUBDIR += rubygem-google-apis-cloudresourcemanager_v2
     SUBDIR += rubygem-google-apis-cloudresourcemanager_v3
     SUBDIR += rubygem-google-apis-compute_v1
     SUBDIR += rubygem-google-apis-compute_v1_057
     SUBDIR += rubygem-google-apis-container_v1
     SUBDIR += rubygem-google-apis-container_v1beta1
     SUBDIR += rubygem-google-apis-core
     SUBDIR += rubygem-google-apis-core011
     SUBDIR += rubygem-google-apis-discovery_v1
     SUBDIR += rubygem-google-apis-drive_v3
     SUBDIR += rubygem-google-apis-generator
     SUBDIR += rubygem-google-apis-iam_v1
     SUBDIR += rubygem-google-apis-iam_v1050
     SUBDIR += rubygem-google-apis-iam_v2
     SUBDIR += rubygem-google-apis-iam_v2beta
     SUBDIR += rubygem-google-apis-iamcredentials_v1
     SUBDIR += rubygem-google-apis-monitoring_v3
     SUBDIR += rubygem-google-apis-playcustomapp_v1
     SUBDIR += rubygem-google-apis-pubsub_v1
     SUBDIR += rubygem-google-apis-serviceusage_v1
     SUBDIR += rubygem-google-apis-sheets_v4
     SUBDIR += rubygem-google-apis-sqladmin_v1beta4
     SUBDIR += rubygem-google-apis-sqladmin_v1beta4_041
     SUBDIR += rubygem-google-apis-storage_v1
     SUBDIR += rubygem-google-cloud-common
     SUBDIR += rubygem-google-gax
     SUBDIR += rubygem-google-iam-credentials
     SUBDIR += rubygem-google-iam-credentials-v1
     SUBDIR += rubygem-google-iam-v1
     SUBDIR += rubygem-google-protobuf
     SUBDIR += rubygem-googleapis-common-protos
     SUBDIR += rubygem-googleapis-common-protos-types
     SUBDIR += rubygem-graf
     SUBDIR += rubygem-grape
     SUBDIR += rubygem-grape-entity
     SUBDIR += rubygem-grape-path-helpers
     SUBDIR += rubygem-grape-route-helpers
     SUBDIR += rubygem-grape-swagger
     SUBDIR += rubygem-grape-swagger-entity
     SUBDIR += rubygem-grape-swagger20
     SUBDIR += rubygem-grape1
     SUBDIR += rubygem-grape20
     SUBDIR += rubygem-grape_logging
     SUBDIR += rubygem-graphiql-rails
     SUBDIR += rubygem-graphlient
     SUBDIR += rubygem-graphql
     SUBDIR += rubygem-graphql-client
     SUBDIR += rubygem-graphql-docs
     SUBDIR += rubygem-grpc-google-iam-v1
     SUBDIR += rubygem-guess_html_encoding
     SUBDIR += rubygem-gyoku
     SUBDIR += rubygem-hamster
     SUBDIR += rubygem-hana
     SUBDIR += rubygem-hashdiff
     SUBDIR += rubygem-hashery
     SUBDIR += rubygem-hashie
     SUBDIR += rubygem-hashie-forbidden_attributes
     SUBDIR += rubygem-hashie4
     SUBDIR += rubygem-health_check
     SUBDIR += rubygem-health_check-rails70
     SUBDIR += rubygem-heapy
     SUBDIR += rubygem-highline
     SUBDIR += rubygem-highline1
     SUBDIR += rubygem-highline2
     SUBDIR += rubygem-hike
     SUBDIR += rubygem-hike1
     SUBDIR += rubygem-hitimes
     SUBDIR += rubygem-hocon
     SUBDIR += rubygem-hoe
     SUBDIR += rubygem-holidays
     SUBDIR += rubygem-http_accept_language
     SUBDIR += rubygem-i18n
     SUBDIR += rubygem-i18n-tasks-rails61
     SUBDIR += rubygem-i18n_data
     SUBDIR += rubygem-icalendar
     SUBDIR += rubygem-ice_cube
     SUBDIR += rubygem-ice_nine
     SUBDIR += rubygem-inflecto
     SUBDIR += rubygem-iniparse
     SUBDIR += rubygem-insist
     SUBDIR += rubygem-inspec-core
     SUBDIR += rubygem-instance_storage
     SUBDIR += rubygem-interact
     SUBDIR += rubygem-io-console
     SUBDIR += rubygem-io-endpoint
     SUBDIR += rubygem-io-event
     SUBDIR += rubygem-io-like
     SUBDIR += rubygem-io-nonblock
     SUBDIR += rubygem-io-stream
     SUBDIR += rubygem-io-wait
     SUBDIR += rubygem-io-wait01
     SUBDIR += rubygem-iobuffer
     SUBDIR += rubygem-iostruct
     SUBDIR += rubygem-ipynbdiff
     SUBDIR += rubygem-irb
     SUBDIR += rubygem-iso8601
     SUBDIR += rubygem-jaeger-client
     SUBDIR += rubygem-jammit
     SUBDIR += rubygem-jaro_winkler
     SUBDIR += rubygem-jasmine-core
     SUBDIR += rubygem-jbuilder
     SUBDIR += rubygem-jbuilder-rails5
     SUBDIR += rubygem-jbuilder-rails50
     SUBDIR += rubygem-jbuilder-rails52
     SUBDIR += rubygem-jbuilder-rails60
     SUBDIR += rubygem-jbuilder-rails61
     SUBDIR += rubygem-jbuilder-rails71
     SUBDIR += rubygem-jekyll-coffeescript
     SUBDIR += rubygem-jenkins_api_client
     SUBDIR += rubygem-jeweler
     SUBDIR += rubygem-jira-ruby
     SUBDIR += rubygem-jmespath
     SUBDIR += rubygem-jquery-ui-themes
     SUBDIR += rubygem-jruby-jars
     SUBDIR += rubygem-json
     SUBDIR += rubygem-json-canonicalization
     SUBDIR += rubygem-json-schema
     SUBDIR += rubygem-json1
     SUBDIR += rubygem-json26
     SUBDIR += rubygem-json_pure
     SUBDIR += rubygem-json_pure1
     SUBDIR += rubygem-json_schema
     SUBDIR += rubygem-json_schemer
     SUBDIR += rubygem-jsonapi-renderer
     SUBDIR += rubygem-jsonpath
     SUBDIR += rubygem-kafo
     SUBDIR += rubygem-kafo_parsers
     SUBDIR += rubygem-kafo_wizards
     SUBDIR += rubygem-kgio
     SUBDIR += rubygem-kt-paperclip-rails61
     SUBDIR += rubygem-language_server-protocol
     SUBDIR += rubygem-launchy
     SUBDIR += rubygem-launchy2
     SUBDIR += rubygem-lazy_priority_queue
     SUBDIR += rubygem-libdatadog
     SUBDIR += rubygem-libddprof
     SUBDIR += rubygem-libddwaf
     SUBDIR += rubygem-librarian
     SUBDIR += rubygem-librarianp
     SUBDIR += rubygem-libyajl2
     SUBDIR += rubygem-license_finder
     SUBDIR += rubygem-licensee
     SUBDIR += rubygem-listen
     SUBDIR += rubygem-little-plugger
     SUBDIR += rubygem-local_time
     SUBDIR += rubygem-local_time-rails5
     SUBDIR += rubygem-locale
     SUBDIR += rubygem-lockfile
     SUBDIR += rubygem-logger
     SUBDIR += rubygem-logging
     SUBDIR += rubygem-logster
     SUBDIR += rubygem-loquacious
     SUBDIR += rubygem-lrama
     SUBDIR += rubygem-lru_redux
     SUBDIR += rubygem-lumberjack
     SUBDIR += rubygem-main
     SUBDIR += rubygem-makara61
     SUBDIR += rubygem-manpages
     SUBDIR += rubygem-map
     SUBDIR += rubygem-marcel
     SUBDIR += rubygem-memo_wise
     SUBDIR += rubygem-memoist
     SUBDIR += rubygem-memoizable
     SUBDIR += rubygem-memoize
     SUBDIR += rubygem-memory_profiler
     SUBDIR += rubygem-mercenary
     SUBDIR += rubygem-message_bus
     SUBDIR += rubygem-metaclass
     SUBDIR += rubygem-metaid
     SUBDIR += rubygem-metasm
     SUBDIR += rubygem-method_source
     SUBDIR += rubygem-micromachine
     SUBDIR += rubygem-middleware
     SUBDIR += rubygem-mini_histogram
     SUBDIR += rubygem-mini_portile2
     SUBDIR += rubygem-mini_portile2-25
     SUBDIR += rubygem-minitest
     SUBDIR += rubygem-mixlib-archive
     SUBDIR += rubygem-mixlib-authentication
     SUBDIR += rubygem-mixlib-cli
     SUBDIR += rubygem-mixlib-config
     SUBDIR += rubygem-mixlib-install
     SUBDIR += rubygem-mixlib-log
     SUBDIR += rubygem-mixlib-shellout
     SUBDIR += rubygem-mixlib-versioning
     SUBDIR += rubygem-mize
     SUBDIR += rubygem-mkrf
     SUBDIR += rubygem-mmap2
     SUBDIR += rubygem-mocha
     SUBDIR += rubygem-molinillo
     SUBDIR += rubygem-moneta
     SUBDIR += rubygem-mongo
     SUBDIR += rubygem-mono_logger
     SUBDIR += rubygem-ms_rest
     SUBDIR += rubygem-ms_rest_azure
     SUBDIR += rubygem-msgpack
     SUBDIR += rubygem-mspec
     SUBDIR += rubygem-multi_json
     SUBDIR += rubygem-multi_json114
     SUBDIR += rubygem-multi_test
     SUBDIR += rubygem-murmurhash3
     SUBDIR += rubygem-mustache
     SUBDIR += rubygem-mustache-sinatra
     SUBDIR += rubygem-mustermann
     SUBDIR += rubygem-mustermann-grape
     SUBDIR += rubygem-mustermann-grape10
     SUBDIR += rubygem-mutex_m
     SUBDIR += rubygem-mutter
     SUBDIR += rubygem-nakayoshi_fork
     SUBDIR += rubygem-nap
     SUBDIR += rubygem-native-package-installer
     SUBDIR += rubygem-naught
     SUBDIR += rubygem-necromancer
     SUBDIR += rubygem-needle
     SUBDIR += rubygem-nenv
     SUBDIR += rubygem-nesty
     SUBDIR += rubygem-netaddr
     SUBDIR += rubygem-newrelic-grape
     SUBDIR += rubygem-newrelic_rpm
     SUBDIR += rubygem-nice-ffi
     SUBDIR += rubygem-nice_partials
     SUBDIR += rubygem-nio4r
     SUBDIR += rubygem-nori
     SUBDIR += rubygem-notiffany
     SUBDIR += rubygem-notify
     SUBDIR += rubygem-nprogress-rails
     SUBDIR += rubygem-nsa-rails5
     SUBDIR += rubygem-nsa-rails61
     SUBDIR += rubygem-numerizer
     SUBDIR += rubygem-observer
     SUBDIR += rubygem-oci
     SUBDIR += rubygem-octopress-hooks
     SUBDIR += rubygem-oj
     SUBDIR += rubygem-oj-introspect
     SUBDIR += rubygem-oj313
     SUBDIR += rubygem-omniauth_crowd
     SUBDIR += rubygem-omnibus
     SUBDIR += rubygem-open3
     SUBDIR += rubygem-open3_backport
     SUBDIR += rubygem-open4
     SUBDIR += rubygem-opentelemetry-api
     SUBDIR += rubygem-opentelemetry-common
     SUBDIR += rubygem-opentelemetry-exporter-otlp
     SUBDIR += rubygem-opentelemetry-helpers-sql-obfuscation
     SUBDIR += rubygem-opentelemetry-instrumentation-action_pack
     SUBDIR += rubygem-opentelemetry-instrumentation-action_view
     SUBDIR += rubygem-opentelemetry-instrumentation-active_job
     SUBDIR += rubygem-opentelemetry-instrumentation-active_record
     SUBDIR += rubygem-opentelemetry-instrumentation-active_support
     SUBDIR += rubygem-opentelemetry-instrumentation-aws_sdk
     SUBDIR += rubygem-opentelemetry-instrumentation-base
     SUBDIR += rubygem-opentelemetry-instrumentation-concurrent_ruby
     SUBDIR += rubygem-opentelemetry-instrumentation-ethon
     SUBDIR += rubygem-opentelemetry-instrumentation-excon
     SUBDIR += rubygem-opentelemetry-instrumentation-faraday
     SUBDIR += rubygem-opentelemetry-instrumentation-grape
     SUBDIR += rubygem-opentelemetry-instrumentation-graphql
     SUBDIR += rubygem-opentelemetry-instrumentation-http
     SUBDIR += rubygem-opentelemetry-instrumentation-http_client
     SUBDIR += rubygem-opentelemetry-instrumentation-net_http
     SUBDIR += rubygem-opentelemetry-instrumentation-pg
     SUBDIR += rubygem-opentelemetry-instrumentation-rack
     SUBDIR += rubygem-opentelemetry-instrumentation-rails
     SUBDIR += rubygem-opentelemetry-instrumentation-rake
     SUBDIR += rubygem-opentelemetry-instrumentation-redis
     SUBDIR += rubygem-opentelemetry-instrumentation-sidekiq
     SUBDIR += rubygem-opentelemetry-registry
     SUBDIR += rubygem-opentelemetry-sdk
     SUBDIR += rubygem-opentelemetry-semantic_conventions
     SUBDIR += rubygem-opentracing
     SUBDIR += rubygem-opt_parse_validator
     SUBDIR += rubygem-optimist
     SUBDIR += rubygem-optparse
     SUBDIR += rubygem-orm_adapter
     SUBDIR += rubygem-os
     SUBDIR += rubygem-ostruct
     SUBDIR += rubygem-p4ruby
     SUBDIR += rubygem-pagy
     SUBDIR += rubygem-paint
     SUBDIR += rubygem-pairing_heap
     SUBDIR += rubygem-parser
     SUBDIR += rubygem-pastel
     SUBDIR += rubygem-patch_finder
     SUBDIR += rubygem-pathname
     SUBDIR += rubygem-pathspec
     SUBDIR += rubygem-pathutil
     SUBDIR += rubygem-pdk
     SUBDIR += rubygem-pedump
     SUBDIR += rubygem-peek
     SUBDIR += rubygem-peek-gc-rails52
     SUBDIR += rubygem-peek-host
     SUBDIR += rubygem-peek-performance_bar
     SUBDIR += rubygem-peek-rails4
     SUBDIR += rubygem-peek-rails52
     SUBDIR += rubygem-peek-rails60
     SUBDIR += rubygem-peek-rails61
     SUBDIR += rubygem-peek-rails70
     SUBDIR += rubygem-peek-rblineprof-rails52
     SUBDIR += rubygem-peek-redis-rails52
     SUBDIR += rubygem-phonelib
     SUBDIR += rubygem-pkg-config
     SUBDIR += rubygem-platform
     SUBDIR += rubygem-pleaserun
     SUBDIR += rubygem-plist
     SUBDIR += rubygem-pluggaloid
     SUBDIR += rubygem-polyamorous
     SUBDIR += rubygem-polyglot
     SUBDIR += rubygem-popen4
     SUBDIR += rubygem-posix-spawn
     SUBDIR += rubygem-power_assert
     SUBDIR += rubygem-powerbar
     SUBDIR += rubygem-powerpack
     SUBDIR += rubygem-pp
     SUBDIR += rubygem-pqueue
     SUBDIR += rubygem-prettier_print
     SUBDIR += rubygem-prettyprint
     SUBDIR += rubygem-profile
     SUBDIR += rubygem-progressbar
     SUBDIR += rubygem-prometheus-client-mmap
     SUBDIR += rubygem-protected_attributes
     SUBDIR += rubygem-protobuf-cucumber
     SUBDIR += rubygem-protocol
     SUBDIR += rubygem-pry
     SUBDIR += rubygem-pry-byebug
     SUBDIR += rubygem-pry-rails
     SUBDIR += rubygem-pry-remote
     SUBDIR += rubygem-pry-remote-em
     SUBDIR += rubygem-pstore
     SUBDIR += rubygem-ptreloaded
     SUBDIR += rubygem-puppet-resource_api
     SUBDIR += rubygem-pygments.rb
     SUBDIR += rubygem-que
     SUBDIR += rubygem-que-scheduler
     SUBDIR += rubygem-r18n-core
     SUBDIR += rubygem-r18n-desktop
     SUBDIR += rubygem-r18n-rails
     SUBDIR += rubygem-r18n-rails-api
     SUBDIR += rubygem-rabl
     SUBDIR += rubygem-rabl-rails50
     SUBDIR += rubygem-racc
     SUBDIR += rubygem-rack-mini-profiler
     SUBDIR += rubygem-rack-raw-upload
     SUBDIR += rubygem-rails-deprecated_sanitizer
     SUBDIR += rubygem-rails-deprecated_sanitizer-rails5
     SUBDIR += rubygem-rails-deprecated_sanitizer-rails50
     SUBDIR += rubygem-rails-i18n-rails5
     SUBDIR += rubygem-rails-i18n-rails50
     SUBDIR += rubygem-rails-i18n-rails52
     SUBDIR += rubygem-rails-i18n-rails60
     SUBDIR += rubygem-rails-i18n-rails61
     SUBDIR += rubygem-rails-i18n-rails70
     SUBDIR += rubygem-rails-i18n-rails71
     SUBDIR += rubygem-rails-observers
     SUBDIR += rubygem-rainbow
     SUBDIR += rubygem-rake
     SUBDIR += rubygem-rake-compiler
     SUBDIR += rubygem-rake-compiler-dock
     SUBDIR += rubygem-rake-contrib
     SUBDIR += rubygem-ransack
     SUBDIR += rubygem-rapt
     SUBDIR += rubygem-rash
     SUBDIR += rubygem-rash_alt
     SUBDIR += rubygem-rb-fsevent
     SUBDIR += rubygem-rb-inotify
     SUBDIR += rubygem-rb-kqueue
     SUBDIR += rubygem-rblineprof
     SUBDIR += rubygem-rbs
     SUBDIR += rubygem-rbs_json_schema
     SUBDIR += rubygem-rbtrace
     SUBDIR += rubygem-rbtree
     SUBDIR += rubygem-rdoc
     SUBDIR += rubygem-re2
     SUBDIR += rubygem-react-rails
     SUBDIR += rubygem-react-rails-rails5
     SUBDIR += rubygem-readline
     SUBDIR += rubygem-readline-ext
     SUBDIR += rubygem-readwritesettings
     SUBDIR += rubygem-recaptcha
     SUBDIR += rubygem-recursive-open-struct
     SUBDIR += rubygem-red-datasets
     SUBDIR += rubygem-redis-activesupport
     SUBDIR += rubygem-redis-activesupport-rails5
     SUBDIR += rubygem-redis-activesupport-rails50
     SUBDIR += rubygem-redis-activesupport-rails52
     SUBDIR += rubygem-redis-activesupport-rails60
     SUBDIR += rubygem-redis-activesupport-rails61
     SUBDIR += rubygem-redis-store
     SUBDIR += rubygem-redlock
     SUBDIR += rubygem-redlock1
     SUBDIR += rubygem-redmine_plugin_support
     SUBDIR += rubygem-reentrant_flock
     SUBDIR += rubygem-ref
     SUBDIR += rubygem-reline
     SUBDIR += rubygem-request_store
     SUBDIR += rubygem-request_store15
     SUBDIR += rubygem-require_all
     SUBDIR += rubygem-resque
     SUBDIR += rubygem-resque-scheduler
     SUBDIR += rubygem-retriable
     SUBDIR += rubygem-retryable
     SUBDIR += rubygem-rgen
     SUBDIR += rubygem-rgl
     SUBDIR += rubygem-rice
     SUBDIR += rubygem-rinda
     SUBDIR += rubygem-rodzilla
     SUBDIR += rubygem-rotp
     SUBDIR += rubygem-rr
     SUBDIR += rubygem-rrd-ffi
     SUBDIR += rubygem-rscm
     SUBDIR += rubygem-rsec
     SUBDIR += rubygem-rspec
     SUBDIR += rubygem-rspec-core
     SUBDIR += rubygem-rspec-expectations
     SUBDIR += rubygem-rspec-its
     SUBDIR += rubygem-rspec-logsplit
     SUBDIR += rubygem-rspec-mocks
     SUBDIR += rubygem-rspec-rails
     SUBDIR += rubygem-rspec-support
     SUBDIR += rubygem-rspec_junit_formatter
     SUBDIR += rubygem-rubocop
     SUBDIR += rubygem-rubocop-ast
     SUBDIR += rubygem-rubocop-capybara
     SUBDIR += rubygem-rubocop-factory_bot
     SUBDIR += rubygem-rubocop-performance
     SUBDIR += rubygem-rubocop-rails
     SUBDIR += rubygem-rubocop-rake
     SUBDIR += rubygem-rubocop-rspec
     SUBDIR += rubygem-rubocop-rspec_rails
     SUBDIR += rubygem-ruby-atmos-pure
     SUBDIR += rubygem-ruby-bugzilla
     SUBDIR += rubygem-ruby-enum
     SUBDIR += rubygem-ruby-filemagic
     SUBDIR += rubygem-ruby-fogbugz
     SUBDIR += rubygem-ruby-libvirt
     SUBDIR += rubygem-ruby-lsp
     SUBDIR += rubygem-ruby-lsp-rails
     SUBDIR += rubygem-ruby-lsp-rspec
     SUBDIR += rubygem-ruby-macho
     SUBDIR += rubygem-ruby-magic
     SUBDIR += rubygem-ruby-ole
     SUBDIR += rubygem-ruby-prof
     SUBDIR += rubygem-ruby-progressbar
     SUBDIR += rubygem-ruby-statistics
     SUBDIR += rubygem-ruby2_keywords
     SUBDIR += rubygem-ruby2ruby
     SUBDIR += rubygem-ruby_memcheck
     SUBDIR += rubygem-ruby_parser
     SUBDIR += rubygem-rubygems-mirror
     SUBDIR += rubygem-rubygems-tasks
     SUBDIR += rubygem-rubygems-test
     SUBDIR += rubygem-rubyinline
     SUBDIR += rubygem-rubyinlineaccel
     SUBDIR += rubygem-rubytree
     SUBDIR += rubygem-rufus-scheduler
     SUBDIR += rubygem-rugged
     SUBDIR += rubygem-runt
     SUBDIR += rubygem-ruport
     SUBDIR += rubygem-safe_yaml
     SUBDIR += rubygem-scanf
     SUBDIR += rubygem-schash
     SUBDIR += rubygem-scientist
     SUBDIR += rubygem-sd_notify
     SUBDIR += rubygem-sdoc
     SUBDIR += rubygem-semantic_puppet
     SUBDIR += rubygem-semantic_range
     SUBDIR += rubygem-semi_semantic
     SUBDIR += rubygem-semver2
     SUBDIR += rubygem-semver_dialects
     SUBDIR += rubygem-semver_dialects2
     SUBDIR += rubygem-semverse
     SUBDIR += rubygem-sentry-rails
     SUBDIR += rubygem-sentry-raven
     SUBDIR += rubygem-sentry-ruby
     SUBDIR += rubygem-sentry-ruby-core
     SUBDIR += rubygem-sentry-sidekiq
     SUBDIR += rubygem-sequel
     SUBDIR += rubygem-server_sent_events
     SUBDIR += rubygem-set
     SUBDIR += rubygem-settingslogic
     SUBDIR += rubygem-sexp_processor
     SUBDIR += rubygem-shell
     SUBDIR += rubygem-shoulda
     SUBDIR += rubygem-shoulda-context
     SUBDIR += rubygem-shoulda-matchers
     SUBDIR += rubygem-sidekiq
     SUBDIR += rubygem-sidekiq-bulk
     SUBDIR += rubygem-sidekiq-cron
     SUBDIR += rubygem-sidekiq-cron-rails70
     SUBDIR += rubygem-sidekiq-scheduler
     SUBDIR += rubygem-sidekiq-unique-jobs
     SUBDIR += rubygem-sidekiq71
     SUBDIR += rubygem-sidetiq
     SUBDIR += rubygem-sigdump
     SUBDIR += rubygem-simple-navigation
     SUBDIR += rubygem-simple-navigation-rails50
     SUBDIR += rubygem-simple-navigation-rails61
     SUBDIR += rubygem-simple_form
     SUBDIR += rubygem-simple_form-rails5
     SUBDIR += rubygem-simple_form-rails50
     SUBDIR += rubygem-simple_form-rails61
     SUBDIR += rubygem-simple_po_parser
     SUBDIR += rubygem-simplecov
     SUBDIR += rubygem-simplecov_json_formatter
     SUBDIR += rubygem-singleton
     SUBDIR += rubygem-skiptrace
     SUBDIR += rubygem-slack-messenger
     SUBDIR += rubygem-slack-notifier
     SUBDIR += rubygem-slim
     SUBDIR += rubygem-slop
     SUBDIR += rubygem-slop3
     SUBDIR += rubygem-slow_enumerator_tools
     SUBDIR += rubygem-smart_properties
     SUBDIR += rubygem-snaky_hash
     SUBDIR += rubygem-snowplow-tracker
     SUBDIR += rubygem-soap4r
     SUBDIR += rubygem-solve
     SUBDIR += rubygem-sorbet-runtime
     SUBDIR += rubygem-sorted_set
     SUBDIR += rubygem-spring
     SUBDIR += rubygem-spring-watcher-listen
     SUBDIR += rubygem-sprockets
     SUBDIR += rubygem-sprockets-es6
     SUBDIR += rubygem-sprockets-helpers
     SUBDIR += rubygem-sprockets-rails-rails4
     SUBDIR += rubygem-sprockets-rails-rails5
     SUBDIR += rubygem-sprockets-rails-rails50
     SUBDIR += rubygem-sprockets-rails-rails52
     SUBDIR += rubygem-sprockets-rails-rails60
     SUBDIR += rubygem-sprockets-rails-rails61
     SUBDIR += rubygem-sprockets-rails-rails70
     SUBDIR += rubygem-sprockets-rails-rails71
     SUBDIR += rubygem-sprockets-sass
     SUBDIR += rubygem-sprockets2
     SUBDIR += rubygem-sprockets3
     SUBDIR += rubygem-spruz
     SUBDIR += rubygem-stackprof
     SUBDIR += rubygem-state_machine
     SUBDIR += rubygem-state_machines
     SUBDIR += rubygem-statsd
     SUBDIR += rubygem-statsd-instrument
     SUBDIR += rubygem-statsd-ruby
     SUBDIR += rubygem-stella
     SUBDIR += rubygem-stemmer
     SUBDIR += rubygem-stomp
     SUBDIR += rubygem-stoplight
     SUBDIR += rubygem-storable
     SUBDIR += rubygem-stream
     SUBDIR += rubygem-streetaddress
     SUBDIR += rubygem-stringex
     SUBDIR += rubygem-stringio
     SUBDIR += rubygem-strings
     SUBDIR += rubygem-strings-ansi
     SUBDIR += rubygem-strong_migrations
     SUBDIR += rubygem-strong_migrations61
     SUBDIR += rubygem-strptime
     SUBDIR += rubygem-strscan
     SUBDIR += rubygem-structured_warnings
     SUBDIR += rubygem-stud
     SUBDIR += rubygem-subexec
     SUBDIR += rubygem-sucker_punch
     SUBDIR += rubygem-sugar-high
     SUBDIR += rubygem-sumbur
     SUBDIR += rubygem-sundawg_country_codes
     SUBDIR += rubygem-sus
     SUBDIR += rubygem-svn2git
     SUBDIR += rubygem-swagger-blocks
     SUBDIR += rubygem-sync
     SUBDIR += rubygem-syntax_suggest
     SUBDIR += rubygem-syntax_tree
     SUBDIR += rubygem-sysinfo
     SUBDIR += rubygem-syslog
     SUBDIR += rubygem-systemu
     SUBDIR += rubygem-table_print
     SUBDIR += rubygem-tdiff
     SUBDIR += rubygem-telesign
     SUBDIR += rubygem-telesignenterprise
     SUBDIR += rubygem-tempfile
     SUBDIR += rubygem-templater
     SUBDIR += rubygem-temple
     SUBDIR += rubygem-term-ansicolor
     SUBDIR += rubygem-terrapin
     SUBDIR += rubygem-test-unit
     SUBDIR += rubygem-thor
     SUBDIR += rubygem-thor0
     SUBDIR += rubygem-thor12
     SUBDIR += rubygem-thread-local
     SUBDIR += rubygem-thread_safe
     SUBDIR += rubygem-thrift
     SUBDIR += rubygem-thwait
     SUBDIR += rubygem-tilt
     SUBDIR += rubygem-tilt1
     SUBDIR += rubygem-time
     SUBDIR += rubygem-timecop
     SUBDIR += rubygem-timeliness
     SUBDIR += rubygem-timeout
     SUBDIR += rubygem-timers
     SUBDIR += rubygem-tins
     SUBDIR += rubygem-titlecase
     SUBDIR += rubygem-tmpdir
     SUBDIR += rubygem-to_regexp
     SUBDIR += rubygem-tool
     SUBDIR += rubygem-tracer
     SUBDIR += rubygem-traces
     SUBDIR += rubygem-trailblazer-option
     SUBDIR += rubygem-transaction-simple
     SUBDIR += rubygem-travis
     SUBDIR += rubygem-travis-gh
     SUBDIR += rubygem-treetop
     SUBDIR += rubygem-trollop
     SUBDIR += rubygem-trollop1
     SUBDIR += rubygem-tsort
     SUBDIR += rubygem-tty
     SUBDIR += rubygem-tty-box
     SUBDIR += rubygem-tty-color
     SUBDIR += rubygem-tty-command
     SUBDIR += rubygem-tty-config
     SUBDIR += rubygem-tty-cursor
     SUBDIR += rubygem-tty-editor
     SUBDIR += rubygem-tty-file
     SUBDIR += rubygem-tty-font
     SUBDIR += rubygem-tty-logger
     SUBDIR += rubygem-tty-markdown
     SUBDIR += rubygem-tty-pager
     SUBDIR += rubygem-tty-pie
     SUBDIR += rubygem-tty-platform
     SUBDIR += rubygem-tty-progressbar
     SUBDIR += rubygem-tty-prompt
     SUBDIR += rubygem-tty-reader
     SUBDIR += rubygem-tty-screen
     SUBDIR += rubygem-tty-spinner
     SUBDIR += rubygem-tty-table
     SUBDIR += rubygem-tty-tree
     SUBDIR += rubygem-tty-which
     SUBDIR += rubygem-turn
     SUBDIR += rubygem-typed-array
     SUBDIR += rubygem-typeprof
     SUBDIR += rubygem-tzinfo
     SUBDIR += rubygem-tzinfo-data
     SUBDIR += rubygem-tzinfo1
     SUBDIR += rubygem-uber
     SUBDIR += rubygem-un
     SUBDIR += rubygem-unicode
     SUBDIR += rubygem-unicode-display_width
     SUBDIR += rubygem-unicode-emoji
     SUBDIR += rubygem-unicode-version
     SUBDIR += rubygem-unicode_utils
     SUBDIR += rubygem-unleash
     SUBDIR += rubygem-useragent
     SUBDIR += rubygem-uuid
     SUBDIR += rubygem-uuidtools
     SUBDIR += rubygem-valid
     SUBDIR += rubygem-validatable
     SUBDIR += rubygem-validate_email
     SUBDIR += rubygem-validate_url
     SUBDIR += rubygem-validates_timeliness
     SUBDIR += rubygem-version_gem
     SUBDIR += rubygem-versionomy
     SUBDIR += rubygem-view_component-rails70
     SUBDIR += rubygem-virtus
     SUBDIR += rubygem-vite_rails-rails70
     SUBDIR += rubygem-vite_ruby
     SUBDIR += rubygem-vite_ruby33
     SUBDIR += rubygem-warbler
     SUBDIR += rubygem-warden
     SUBDIR += rubygem-warning
     SUBDIR += rubygem-wdm
     SUBDIR += rubygem-weakref
     SUBDIR += rubygem-web-console-rails60
     SUBDIR += rubygem-web-console-rails61
     SUBDIR += rubygem-web-console-rails71
     SUBDIR += rubygem-web-console2
     SUBDIR += rubygem-web-console3-rails5
     SUBDIR += rubygem-web-console3-rails50
     SUBDIR += rubygem-web-console3-rails52
     SUBDIR += rubygem-webby
     SUBDIR += rubygem-webfinger
     SUBDIR += rubygem-webpacker-rails60
     SUBDIR += rubygem-webpacker-rails61
     SUBDIR += rubygem-webpacker4-rails60
     SUBDIR += rubygem-will_paginate
     SUBDIR += rubygem-windows_error
     SUBDIR += rubygem-wisper
     SUBDIR += rubygem-wisper2
     SUBDIR += rubygem-with_advisory_lock61
     SUBDIR += rubygem-with_env
     SUBDIR += rubygem-wmi-lite
     SUBDIR += rubygem-xdg
     SUBDIR += rubygem-xdg2
     SUBDIR += rubygem-xdg7
     SUBDIR += rubygem-xorcist
     SUBDIR += rubygem-xpath
     SUBDIR += rubygem-xxhash
     SUBDIR += rubygem-yajl-ruby
     SUBDIR += rubygem-yui-compressor
     SUBDIR += rubygem-zeitwerk
     SUBDIR += rubygem-zentest
     SUBDIR += rubygem-zhexdump
     SUBDIR += rubygem-zlib
     SUBDIR += rubygem-zstd-ruby
     SUBDIR += rubymine
     SUBDIR += rudeconfig
     SUBDIR += rudiments
     SUBDIR += ruff
     SUBDIR += rust-analyzer
     SUBDIR += rust-bindgen-cli
     SUBDIR += rust-cbindgen
     SUBDIR += rust-mode
     SUBDIR += rust-script
     SUBDIR += rustc-demangle
     SUBDIR += rvi
     SUBDIR += rvm
     SUBDIR += rxcpp
     SUBDIR += rye
     SUBDIR += sabre
     SUBDIR += safe-iop
     SUBDIR += samurai
     SUBDIR += sasm
     SUBDIR += sbt
     SUBDIR += scalatest
     SUBDIR += scandoc
     SUBDIR += scc
     SUBDIR += sccache
     SUBDIR += sccs
     SUBDIR += schilybase
     SUBDIR += scons
     SUBDIR += sd-mux-ctrl
     SUBDIR += sdbus-cpp
     SUBDIR += sdl12
     SUBDIR += sdl12-compat
     SUBDIR += sdl20
     SUBDIR += sdl2pp
     SUBDIR += sdl3
     SUBDIR += sdl_console
     SUBDIR += sdlmm
     SUBDIR += sdlskk
     SUBDIR += sdsl-lite
     SUBDIR += sedsed
     SUBDIR += seer-gdb
     SUBDIR += selene
     SUBDIR += sentry-cli
     SUBDIR += serd
     SUBDIR += serdisplib
     SUBDIR += sfml
     SUBDIR += sfml1
     SUBDIR += sfsexp
     SUBDIR += sgb
     SUBDIR += shadered
     SUBDIR += shapelib
     SUBDIR += shards
     SUBDIR += shedskin
     SUBDIR += shell-toolbox
     SUBDIR += shflags
     SUBDIR += shfmt
     SUBDIR += shiboken2
     SUBDIR += shiboken6
     SUBDIR += shmap
     SUBDIR += shroud
     SUBDIR += shtk
     SUBDIR += shtool
     SUBDIR += shunit2
     SUBDIR += sigar
     SUBDIR += signal-fts5-extension
     SUBDIR += sigslot
     SUBDIR += silc-toolkit
     SUBDIR += silentbob
     SUBDIR += simavr
     SUBDIR += simde
     SUBDIR += simdjson
     SUBDIR += simgear
     SUBDIR += simian
     SUBDIR += simpleini
     SUBDIR += sjasmplus
     SUBDIR += skalibs
     SUBDIR += skypat
     SUBDIR += slf4j
     SUBDIR += slibtool
     SUBDIR += smake
     SUBDIR += smc
     SUBDIR += smooth
     SUBDIR += smv
     SUBDIR += snazy
     SUBDIR += snitch
     SUBDIR += soapui
     SUBDIR += sobjectizer
     SUBDIR += socket_wrapper
     SUBDIR += soft-serve
     SUBDIR += sol2
     SUBDIR += sonar-scanner-cli
     SUBDIR += sonarqube-ant-task
     SUBDIR += sonarqube-community
     SUBDIR += sope
     SUBDIR += sope2
     SUBDIR += sord
     SUBDIR += spark
     SUBDIR += sparsebitset
     SUBDIR += sparsehash
     SUBDIR += spatialindex
     SUBDIR += spdlog
     SUBDIR += spice-protocol
     SUBDIR += spin
     SUBDIR += spirv-llvm-translator
     SUBDIR += splint
     SUBDIR += spr
     SUBDIR += spread-sheet-widget
     SUBDIR += spyder
     SUBDIR += srecord
     SUBDIR += st
     SUBDIR += stack
     SUBDIR += staf
     SUBDIR += statcvs
     SUBDIR += statik
     SUBDIR += statsvn
     SUBDIR += stb
     SUBDIR += stdman
     SUBDIR += stdx-allocator
     SUBDIR += stfl
     SUBDIR += stlfilt
     SUBDIR += stlink
     SUBDIR += str
     SUBDIR += string_theory
     SUBDIR += stringencoders
     SUBDIR += stuffbin
     SUBDIR += stxxl
     SUBDIR += stylua
     SUBDIR += styx
     SUBDIR += subprocess
     SUBDIR += subversion
     SUBDIR += subversion-book
     SUBDIR += subversion-lts
     SUBDIR += subversive
     SUBDIR += sunpromake
     SUBDIR += svk
     SUBDIR += svn2git
     SUBDIR += svn_load_dirs
     SUBDIR += svntrac
     SUBDIR += swank-clojure
     SUBDIR += swig
     SUBDIR += swig40
     SUBDIR += sysconftool
     SUBDIR += sysfsutils
     SUBDIR += systemc
     SUBDIR += t1lib
     SUBDIR += ta-lib
     SUBDIR += tabby
     SUBDIR += tablist
     SUBDIR += tabulate
     SUBDIR += tagref
     SUBDIR += tailor
     SUBDIR += talloc
     SUBDIR += taskctl
     SUBDIR += taskflow
     SUBDIR += tass64
     SUBDIR += tbb
     SUBDIR += tcl-memchan
     SUBDIR += tcl-mmap
     SUBDIR += tcl-signal
     SUBDIR += tcl-trf
     SUBDIR += tclap
     SUBDIR += tclap12
     SUBDIR += tclbsd
     SUBDIR += tclcheck
     SUBDIR += tcllauncher
     SUBDIR += tcllib
     SUBDIR += tcllibc
     SUBDIR += tclreadline
     SUBDIR += tclthread
     SUBDIR += tcltls
     SUBDIR += tclvfs
     SUBDIR += tclxml
     SUBDIR += tdl
     SUBDIR += template-glib
     SUBDIR += termbox
     SUBDIR += termcolor
     SUBDIR += terminality
     SUBDIR += test-drive
     SUBDIR += tevent
     SUBDIR += tex-kpathsea
     SUBDIR += tex-libtexlua
     SUBDIR += tex-libtexluajit
     SUBDIR += tex-synctex
     SUBDIR += tex-web2c
     SUBDIR += texlab
     SUBDIR += the-way
     SUBDIR += thonny
     SUBDIR += thrift
     SUBDIR += thrift-c_glib
     SUBDIR += thrift-cpp
     SUBDIR += thrust
     SUBDIR += thunar-vcs-plugin
     SUBDIR += ticcutils
     SUBDIR += tig
     SUBDIR += tigcc
     SUBDIR += tijmp
     SUBDIR += tinycbor
     SUBDIR += tinygo
     SUBDIR += tinylaf
     SUBDIR += tkcon
     SUBDIR += tkcvs
     SUBDIR += tkp4
     SUBDIR += tl-expected
     SUBDIR += tllist
     SUBDIR += tlsh
     SUBDIR += tlx
     SUBDIR += tnt
     SUBDIR += tokei
     SUBDIR += tokio-console
     SUBDIR += toml11
     SUBDIR += tomlplusplus
     SUBDIR += tortoisehg
     SUBDIR += tpasm
     SUBDIR += tradcpp
     SUBDIR += transient
     SUBDIR += transient-devel
     SUBDIR += transwarp
     SUBDIR += tree-sitter
     SUBDIR += tree-sitter-graph
     SUBDIR += treefmt
     SUBDIR += treepy.el
     SUBDIR += trellis
     SUBDIR += trio
     SUBDIR += trompeloeil
     SUBDIR += truc
     SUBDIR += tup
     SUBDIR += twiggy
     SUBDIR += typeshare
     SUBDIR += ua_parser-core
     SUBDIR += uclcmd
     SUBDIR += ucommon
     SUBDIR += ucpp
     SUBDIR += udis86
     SUBDIR += uid_wrapper
     SUBDIR += ultragetopt
     SUBDIR += umbrello
     SUBDIR += umlgraph
     SUBDIR += undead
     SUBDIR += unibilium
     SUBDIR += universal-ctags
     SUBDIR += unordered-dense
     SUBDIR += upnp
     SUBDIR += upp
     SUBDIR += urjtag
     SUBDIR += ut
     SUBDIR += utf8cpp
     SUBDIR += utf8cpp3
     SUBDIR += uthash
     SUBDIR += util-linux
     SUBDIR += uv
     SUBDIR += valgrind
     SUBDIR += valgrind-devel
     SUBDIR += vasm
     SUBDIR += vc
     SUBDIR += vc-intrinsics
     SUBDIR += vcglib
     SUBDIR += venom
     SUBDIR += vera++
     SUBDIR += vexcl
     SUBDIR += viewvc-devel
     SUBDIR += violet
     SUBDIR += vipack
     SUBDIR += vitables
     SUBDIR += volk
     SUBDIR += vstr
     SUBDIR += vxlog
     SUBDIR += wand-libconfig
     SUBDIR += wandio
     SUBDIR += wasi-compiler-rt
     SUBDIR += wasi-compiler-rt12
     SUBDIR += wasi-compiler-rt13
     SUBDIR += wasi-compiler-rt14
     SUBDIR += wasi-compiler-rt15
     SUBDIR += wasi-compiler-rt16
     SUBDIR += wasi-compiler-rt17
     SUBDIR += wasi-compiler-rt18
     SUBDIR += wasi-libc
     SUBDIR += wasi-libcxx
     SUBDIR += wasi-libcxx12
     SUBDIR += wasi-libcxx13
     SUBDIR += wasi-libcxx14
     SUBDIR += wasi-libcxx15
     SUBDIR += wasi-libcxx16
     SUBDIR += wasi-libcxx17
     SUBDIR += wasi-libcxx18
     SUBDIR += wasm3
     SUBDIR += wasmer
     SUBDIR += websocketpp
     SUBDIR += websvn
     SUBDIR += wf-config
     SUBDIR += wininfo
     SUBDIR += wizardkit
     SUBDIR += woff2
     SUBDIR += wrangler
     SUBDIR += wxformbuilder
     SUBDIR += xa65
     SUBDIR += xbyak
     SUBDIR += xc3sprog
     SUBDIR += xcscope.el
     SUBDIR += xdg-dbus-proxy
     SUBDIR += xdg-user-dirs
     SUBDIR += xdg-utils
     SUBDIR += xdgpaths
     SUBDIR += xelfviewer
     SUBDIR += xeus
     SUBDIR += xeus-cling
     SUBDIR += xeus-zmq
     SUBDIR += xfce4-dev-tools
     SUBDIR += xmake
     SUBDIR += xmltooling
     SUBDIR += xopcodecalc
     SUBDIR += xorg-macros
     SUBDIR += xparam
     SUBDIR += xpeviewer
     SUBDIR += xsd
     SUBDIR += xsimd
     SUBDIR += xtensa-esp32-elf
     SUBDIR += xtl
     SUBDIR += xtl-quant-stack
     SUBDIR += xwpe
     SUBDIR += xxgdb
     SUBDIR += xxhash
     SUBDIR += xxl
     SUBDIR += yaegi
     SUBDIR += yaggo
     SUBDIR += yajl
     SUBDIR += yajl-tcl
     SUBDIR += yaml-cpp
     SUBDIR += yaml2argdata
     SUBDIR += yasm
     SUBDIR += yder
     SUBDIR += youcompleteme
     SUBDIR += yuck
     SUBDIR += yyjson
     SUBDIR += z80-asm
     SUBDIR += z80asm
     SUBDIR += z80ex
     SUBDIR += z88dk
     SUBDIR += zanata-cli
     SUBDIR += zapcc
     SUBDIR += zeal
     SUBDIR += zfp
     SUBDIR += zix
     SUBDIR += zls
     SUBDIR += zookeeper
     SUBDIR += zthread
     SUBDIR += zug
     SUBDIR += zycore-c
     SUBDIR += zydis
     SUBDIR += zziplib
 
 .include <bsd.port.subdir.mk>
diff --git a/devel/eric6/Makefile b/devel/eric6/Makefile
index 7402ad580f59..80e03b282a98 100644
--- a/devel/eric6/Makefile
+++ b/devel/eric6/Makefile
@@ -1,77 +1,77 @@
 .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
 
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}virtualenv>=15.2:devel/py-virtualenv@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>=0.14:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}editorconfig>=0.12.0:editors/py-editorconfig@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}send2trash>=1.5:deskutils/py-send2trash@${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} \
 		${PYTHON_PKGNAMEPREFIX}virtualenv>=15.2:devel/py-virtualenv@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>=0.14:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}editorconfig>=0.12.0:editors/py-editorconfig@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}send2trash>=1.5:deskutils/py-send2trash@${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-/}
 
 USES+=		desktop-file-utils python pyqt:5 shebangfix
 USE_PYTHON=	flavors
 USE_PYQT=	qscintilla2 webengine \
 		pyqt5
 INSTALL_PY=	install.py -c -f eric6config.freebsd -i ${STAGEDIR}
 SHEBANG_FILES=	*.py eric/eric6/*.py eric/scripts/*.py
 SUB_FILES=	eric6.desktop
 MASTERPORT=	yes
 
 PORTDATA=	*
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	${RM} ${WRKSRC}/eric/i18n/*.qm ${WRKSRC}/eric/i18n/*.ts
 
 do-configure:
 	${SED}  -e 's,PYTHON_SITELIBDIR,${PYTHON_SITELIBDIR},' \
 		-e 's,PREFIX,${PREFIX},' \
 		-e 's,DATADIR,${DATADIR},' \
 		-e 's,LOCALBASE,${LOCALBASE},' \
 		-e 's,DOCSDIR,${DOCSDIR},' \
 		-e 's,EXAMPLESDIR,${EXAMPLESDIR},' \
 		< ${FILESDIR}/config > ${WRKSRC}/eric6config.freebsd
 
 do-install:
 	@(cd ${WRKSRC}; \
 	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_PY})
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/eric6.desktop ${STAGEDIR}${PREFIX}/share/applications/
 	${LN} -sf ${DATADIR:C|${PREFIX}(/share(/pixmaps)?)?||:C|/[^/]+|../|g}eric6/icons/default/eric.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/eric6.png
 	@${MKDIR} ${STAGEDIR}${DATADIR}/i18n
 	${REINPLACE_CMD} -e 's|${STAGEDIR}|${DATADIR}|g' \
 			 -e 's|${WRKSRC}|${DATADIR}|g' \
 			${STAGEDIR}/${DATADIR}/eric6install.json
 	@${RM}	${STAGEDIR}/${DATADIR}/eric6install.json.bak
 
 .include <bsd.port.mk>
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,39 +1,40 @@
 PORTNAME=	oci-cli
 DISTVERSION=	3.43.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ale_sagra@hotmail.com
 COMMENT=	Command Line Interface for Oracle Cloud Infrastructure
 WWW=		https://github.com/oracle/oci-cli/
 
 LICENSE=	APACHE20 UPL
 LICENSE_COMB=	dual
 LICENSE_GROUPS_UPL=	FSF GPL OSI
 LICENSE_NAME_UPL=	Universal Permissive License
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE.txt
 LICENSE_FILE_UPL=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS_UPL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}arrow>=1.0.0:devel/py-arrow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=8.0.4:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jmespath>=0.10.0:devel/py-jmespath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oci>=2.128.1:devel/py-oci@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>=22.1.0:security/py-openssl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=3.0.29:devel/py-prompt-toolkit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.5.3:devel/py-python-dateutil@${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
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
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,28 +1,29 @@
 PORTNAME=	acstore
 PORTVERSION=	20230519
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI \
 		https://github.com/log2timeline/acstore/releases/download/${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	antoine@FreeBSD.org
 COMMENT=	Attribute Container Storage
 WWW=		https://github.com/log2timeline/acstore
 
 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
 USE_PYTHON=	distutils autoplist concurrent
 DO_MAKE_TEST=	${SETENV} ${TEST_ENV} ${PYTHON_CMD}
 TEST_TARGET=	run_tests.py
 
 post-patch:
 	${REINPLACE_CMD} "s,share/doc/acstore,${DOCSDIR_REL}," ${WRKSRC}/setup.py
 	${REINPLACE_CMD} "/pip/d" ${WRKSRC}/requirements.txt
 
 .include <bsd.port.mk>
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
@@ -1,30 +1,30 @@
 PORTNAME=	apispec
 DISTVERSION=	6.6.1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	meka@tilda.center
 COMMENT=	Pluggable API specification generator
 WWW=		https://github.com/marshmallow-code/apispec
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flit>0:devel/py-flit@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prance>0:devel/py-prance@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}marshmallow>0:devel/py-marshmallow@${PY_FLAVOR} \
 		${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
 
 TEST_ENV=	PYTHONPATH=${WRKSRC}/src
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
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,19 +1,20 @@
 PORTNAME=	aspy.yaml
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Extensions to pyyaml
 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
 
 .include <bsd.port.mk>
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,27 +1,28 @@
 PORTNAME=	awscli
 PORTVERSION=	1.29.81
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	otis@FreeBSD.org
 COMMENT=	Universal Command Line Interface for Amazon Web Services
 WWW=		https://aws.amazon.com/cli/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}botocore>=1.31.35:devel/py-botocore@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorama>=0.2.5:devel/py-colorama@${PY_FLAVOR} \
 		${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
 
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 
 .include <bsd.port.mk>
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,39 +1,40 @@
 PORTNAME=	bandit
 DISTVERSION=	1.7.9
+PORTREVISION=	1
 CATEGORIES=	devel security python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Tool for finding common security issues in Python code
 WWW=		https://github.com/PyCQA/bandit
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorama>=0.3.9:devel/py-colorama@${PY_FLAVOR} \
 		${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} \
 		${PYTHON_PKGNAMEPREFIX}flake8>=4.0.0:devel/py-flake8@${PY_FLAVOR} \
 		pylint${PYTHON_PKGNAMESUFFIX}>=1.9.4:devel/pylint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}testscenarios>=0.5.0:devel/py-testscenarios@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}testtools>=2.3.0:devel/py-testtools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tomli>=1.1.0:textproc/py-tomli@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils pytest # 1 test fails, see https://github.com/PyCQA/bandit/issues/1083
 
 NO_ARCH=	yes
 
 MAKE_ENV+=	PBR_VERSION=${PORTVERSION}
 TEST_ENV=	${MAKE_ENV} \
 		PATH=${STAGEDIR}${PREFIX}/bin:${PATH} \
 		PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 .include <bsd.port.mk>
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,74 +1,75 @@
 PORTNAME=	buildbot
 DISTVERSION=	3.11.5
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Continuous Integration Framework
 WWW=		https://buildbot.net
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}alembic>=1.6.0:databases/py-alembic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}autobahn>=0.16.0:www/py-autobahn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}buildbot-www>=${PORTVERSION}:devel/py-buildbot-www@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}croniter2>=1.3.0:sysutils/py-croniter2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=1.5:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}importlib-resources>=5:devel/py-importlib-resources@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>=0.6.0:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=1.3.0<1.5:databases/py-sqlalchemy14@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${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} \
 		${PYTHON_PKGNAMEPREFIX}lz4>=0:archivers/py-lz4@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}moto>0:devel/py-moto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}parameterized>0:devel/py-parameterized@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyjade>0:textproc/py-pyjade@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}treq>0:www/py-treq@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-futures>0:www/py-requests-futures@${PY_FLAVOR}
 
 USES=		cpe python
 USE_PYTHON=	autoplist concurrent distutils
 USE_RC_SUBR=	buildbot
 
 USERS=	${PORTNAME}
 GROUPS=	${PORTNAME}
 
 NO_ARCH=	yes
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
 		PYTHON_VER=${PYTHON_VER}
 
 # the directory was removed, but MANIFEST.in still references it
 # https://github.com/buildbot/buildbot/commit/9251a994e7ba5f8ab9e678b49920bdc38cd52b3d
 BUILDBOT_REMOVE_ME=	${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/buildbot/reporters/templates
 POST_PLIST+=		fix-plist
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|twisted_ver = ">= 18.7.0, <=23.10.0"|twisted_ver = ">= 18.7.0"|g' \
 		${WRKSRC}/setup.py
 
 fix-plist:
 	${REINPLACE_CMD} -e 's|^${BUILDBOT_REMOVE_ME}$$||' ${TMPPLIST}
 
 post-install:
 	${RM} -r ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/buildbot/reporters/templates
 
 do-test:
 	@cd ${WRKSRC} && PYTHONPATH=${WRKSRC} TZ=UTC ${LOCALBASE}/bin/trial-${PYTHON_VER} buildbot
 
 # Old invocation that we will probably need later
 # ${MKDIR} ${WRKDIR}/tmp
 # cd ${WRKDIR}/tmp && TZ=UTC LANG=C PYTHONPATH=${WRKSRC} ${PYTHON_CMD} -m twisted.trial buildbot.test
 
 .include <bsd.port.mk>
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,34 +1,35 @@
 PORTNAME=	cfn-lint
 DISTVERSION=	0.87.6
+PORTREVISION=	1
 CATEGORIES=	devel python textproc
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME:S/-/_/}-${DISTVERSIONFULL}
 
 MAINTAINER=	nork@FreeBSD.org
 COMMENT=	AWS CloudFormation Linter
 WWW=		https://pypi.org/project/cfn-lint/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aws-sam-translator>=1.89.0:devel/py-aws-sam-translator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jschema-to-python>=1.2.3:devel/py-jschema-to-python@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=3.0<5:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}junit-xml>=1.9:textproc/py-junit-xml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.4,2<4,2:math/py-networkx@${PY_FLAVOR} \
 		${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}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils unittest
 TEST_ENV=	${MAKE_ENV} \
 		PATH=${STAGEDIR}${PREFIX}/bin:${PATH} \
 		PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR}
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-cliapp/Makefile b/devel/py-cliapp/Makefile
index a1eb1c272e03..2b116156d3fd 100644
--- a/devel/py-cliapp/Makefile
+++ b/devel/py-cliapp/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	cliapp
 PORTVERSION=	1.20180812.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp/snapshot/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Python framework for command line utilities
 WWW=		https://liw.fi/cliapp/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 NO_ARCH=	yes
 
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/devel/py-cliff/Makefile b/devel/py-cliff/Makefile
index 8832ab5d841d..a25c45c4aa56 100644
--- a/devel/py-cliff/Makefile
+++ b/devel/py-cliff/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	cliff
 PORTVERSION=	4.7.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Command Line Interface Formulation Framework
 WWW=		https://docs.openstack.org/cliff/latest/ \
 		https://github.com/openstack/cliff
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}autopage>=0.4.0:devel/py-autopage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cmd2>=1.0.0:devel/py-cmd2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prettytable0>=0.7.2:devel/py-prettytable0@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.12:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stevedore>=2.0.1:devel/py-stevedore@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 31000
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.4:devel/py-importlib-metadata@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-configargparse/Makefile b/devel/py-configargparse/Makefile
index e6ecd78bfb0c..d491bd34dfeb 100644
--- a/devel/py-configargparse/Makefile
+++ b/devel/py-configargparse/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	configargparse
 PORTVERSION=	1.5.3
 PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	ConfigArgParse-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Drop-in replacement for argparse
 WWW=		https://github.com/bw2/ConfigArgParse
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${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 unittest
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-confuse/Makefile b/devel/py-confuse/Makefile
index b865404da318..c8934756b913 100644
--- a/devel/py-confuse/Makefile
+++ b/devel/py-confuse/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	confuse
 DISTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Configuration library for Python that uses YAML
 WWW=		https://github.com/beetbox/confuse
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flit-core>=2<4:devel/py-flit-core@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flake8>=3.6:devel/py-flake8@${PY_FLAVOR} \
 
 USES=		python
 USE_PYTHON=	autoplist pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-connexion/Makefile b/devel/py-connexion/Makefile
index 006cd21f7b4c..87e1d5f1c385 100644
--- a/devel/py-connexion/Makefile
+++ b/devel/py-connexion/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	connexion
 PORTVERSION=	3.1.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI # no tests
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Connexion: API first applications with OpenAPI/Swagger
 WWW=		https://connexion.readthedocs.io/en/latest/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>0:devel/py-poetry-core@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0.0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}asgiref>=3.4:www/py-asgiref@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httpx>=0.23:www/py-httpx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}inflection>=0.3.1:devel/py-inflection@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=4.17.3:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-multipart>=0.0.5:www/py-python-multipart@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.27:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}starlette>=0.35:www/py-starlette@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.6.1:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}werkzeug>=2.2.1:www/py-werkzeug@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	pep517 autoplist pytest # 3 tests fail, see https://github.com/youknowone/wirerope/issues/22
 
 #USE_GITHUB=	yes
 #GH_ACCOUNT=	spec-first
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-cookiecutter/Makefile b/devel/py-cookiecutter/Makefile
index cd0058713299..862bc24a7f44 100644
--- a/devel/py-cookiecutter/Makefile
+++ b/devel/py-cookiecutter/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	cookiecutter
 PORTVERSION=	2.6.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Create projects from cookiecutters (project templates)
 WWW=		https://pypi.org/project/cookiecutter/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}binaryornot>=0.4.4:devel/py-binaryornot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=7.0<9.0.0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}poyo>=0:devel/py-poyo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-slugify>=4.0.0:textproc/py-python-slugify@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.23.0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.3.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}arrow>=0:devel/py-arrow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rich>=0:textproc/py-rich@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		git:devel/git
 
 USES=		cpe python
 USE_PYTHON=	autoplist concurrent distutils pytest
 
 CPE_VENDOR=	cookiecutter_project
 
 NO_ARCH=	yes
 
 # pytest needs a UTF-8 environment, and it will try and write outside
 # ${WRKDIR} unless told not to.
 
 TEST_ENV=	HOME=${WRKDIR} \
 		LANG=C.UTF-8 \
 		LC_ALL=C.UTF-8 \
 		TMPDIR=${WRKDIR}
 
 # Windows specific test
 PYTEST_IGNORED_TESTS= test_run_shell_hooks_win
 
 .include <bsd.port.mk>
diff --git a/devel/py-copier/Makefile b/devel/py-copier/Makefile
index 24b4112ebd35..cde2e877a9df 100644
--- a/devel/py-copier/Makefile
+++ b/devel/py-copier/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	copier
 PORTVERSION=	8.3.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Library for rendering project templates
 WWW=		https://github.com/copier-org/copier
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}poetry-dynamic-versioning>=0:devel/py-poetry-dynamic-versioning@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorama>=0.4.3:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}decorator>=5.1.1:devel/py-decorator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dunamai>=1.7.0:devel/py-dunamai@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}funcy>=1.17:devel/py-funcy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jinja2-ansible-filters>=1.3.1:devel/py-jinja2-ansible-filters@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=23.0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pathspec>=0.9.0:devel/py-pathspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plumbum>=1.6.9:sysutils/py-plumbum@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydantic2>=2.0.3:devel/py-pydantic2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.7.1:textproc/py-pygments@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.3.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml-include>=1.2:devel/py-pyyaml-include@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}questionary>=1.8.1:devel/py-questionary@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-dask/Makefile b/devel/py-dask/Makefile
index c785969f087b..2e77f5d8d6ad 100644
--- a/devel/py-dask/Makefile
+++ b/devel/py-dask/Makefile
@@ -1,56 +1,57 @@
 PORTNAME=	dask
 PORTVERSION=	2024.6.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Parallel PyData with Task Scheduling
 WWW=		https://dask.org/ \
 		https://github.com/dask/dask
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=62.6:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}versioneer>=0.29:devel/py-versioneer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=8.1:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cloudpickle>=1.5.0:devel/py-cloudpickle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fsspec>=2021.09.0:devel/py-fsspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}partd>=1.2.0:databases/py-partd@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.3.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toolz>=0.10.0:devel/py-toolz@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pre-commit>=0:devel/py-pre-commit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-rerunfailures>=0:devel/py-pytest-rerunfailures@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-timeout>=0:devel/py-pytest-timeout@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist@${PY_FLAVOR}
 
 USES=		cpe python:3.9+
 USE_PYTHON=	autoplist concurrent pep517 pytest
 
 NO_ARCH=	yes
 
 CPE_VENDOR=	anaconda
 
 OPTIONS_DEFINE=	ARRAY DATAFRAME DIAGNOSTICS
 ARRAY_DESC=	Subset of the NumPy ndarray interface
 DATAFRAME_DESC=	Composed of many smaller Pandas DataFrames
 DATAFRAME_IMPLIES=	ARRAY
 DIAGNOSTICS_DESC=	Profile and inspect parallel codes
 
 ARRAY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.21,1:math/py-numpy@${PY_FLAVOR} \
 DATAFRAME_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dask-expr>=1.1<1.2:devel/py-dask-expr@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pandas>=1.3,1:math/py-pandas@${PY_FLAVOR}
 DIAGNOSTICS_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}bokeh>=2.4.2<3:www/py-bokeh@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.3:devel/py-Jinja2@${PY_FLAVOR}
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 31200
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.13.0:devel/py-importlib-metadata@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-datasette/Makefile b/devel/py-datasette/Makefile
index fa8f8167d4db..8f0acc4d719c 100644
--- a/devel/py-datasette/Makefile
+++ b/devel/py-datasette/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	datasette
 PORTVERSION=	0.64.8
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Open source multi-tool for exploring and publishing data
 WWW=		https://datasette.io/ \
 		https://github.com/simonw/datasette
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiofiles>=0.4:devel/py-aiofiles@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}asgi-csrf>=0.9:www/py-asgi-csrf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}asgiref>=3.2.10:www/py-asgiref@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=7.1.1:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click-default-group>=1.2.3:devel/py-click-default-group@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httpx>=0.20:www/py-httpx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hupper>=1.9:devel/py-hupper@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}itsdangerous>=1.1:security/py-itsdangerous@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}janus>=0.6.2:devel/py-janus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.3:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mergedeep>=1.1.1:devel/py-mergedeep@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pint>=0.9:devel/py-pint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pluggy>=1.0:devel/py-pluggy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.3:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.3:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}uvicorn>=0.11:www/py-uvicorn@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-ddt/Makefile b/devel/py-ddt/Makefile
index d2805efffbbb..13c404d71af8 100644
--- a/devel/py-ddt/Makefile
+++ b/devel/py-ddt/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	ddt
 PORTVERSION=	1.7.2
 PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Data-Driven Tests for Python Unittest
 WWW=		https://readthedocs.org/projects/ddt/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${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 unittest
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-deepdiff/Makefile b/devel/py-deepdiff/Makefile
index 051e2dd5cfe9..e13eb531cc90 100644
--- a/devel/py-deepdiff/Makefile
+++ b/devel/py-deepdiff/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	deepdiff
 DISTVERSION=	7.0.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Deep difference and search of any Python object/data
 WWW=		https://github.com/seperman/deepdiff
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=8.1.7:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ordered-set>=4.0.2:devel/py-ordered-set@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=6.0.1:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=6.0.1:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpickle>0:devel/py-jsonpickle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydantic>0:devel/py-pydantic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}types-PyYAML>=0:devel/py-types-PyYAML@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 do-test: # 3 tests fail, see https://github.com/seperman/deepdiff/issues/323
 	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest
 
 .include <bsd.port.mk>
diff --git a/devel/py-distributed/Makefile b/devel/py-distributed/Makefile
index 07dbcba88e75..99c307ae5958 100644
--- a/devel/py-distributed/Makefile
+++ b/devel/py-distributed/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	distributed
 PORTVERSION=	2024.6.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Distributed scheduler for Dask
 WWW=		https://distributed.dask.org/en/stable/ \
 		https://github.com/dask/distributed
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=62.6:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}versioneer>=0.29:devel/py-versioneer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=8.0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cloudpickle>=1.5.0:devel/py-cloudpickle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dask>=${PORTVERSION}<${PORTVERSION}_99:devel/py-dask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.3:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}locket>=1.0.0:devel/py-locket@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.0:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.7.2:sysutils/py-psutil@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.3.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sortedcontainers>=2.0.5:devel/py-sortedcontainers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tblib>=1.6.0:devel/py-tblib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toolz>=0.10.0:devel/py-toolz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tornado>=6.0.4:www/py-tornado@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.24.3,1:net/py-urllib3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zict>=3.0.0:devel/py-zict@${PY_FLAVOR}
 
 USES=		python:3.9+
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-dtfabric/Makefile b/devel/py-dtfabric/Makefile
index 8b06ca9942f0..d8abf535ec55 100644
--- a/devel/py-dtfabric/Makefile
+++ b/devel/py-dtfabric/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	dtfabric
 PORTVERSION=	20230520
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI \
 		https://github.com/libyal/dtfabric/releases/download/${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	antoine@FreeBSD.org
 COMMENT=	Tooling for data type and structure management
 WWW=		https://github.com/libyal/dtfabric
 
 LICENSE=	APACHE20
 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}
 
 NO_ARCH=	yes
 USES=		python
 USE_PYTHON=	distutils autoplist concurrent
 DO_MAKE_TEST=	${SETENV} ${TEST_ENV} ${PYTHON_CMD}
 TEST_TARGET=	run_tests.py
 
 post-patch:
 	${REINPLACE_CMD} "s,share/doc/dtfabric,${DOCSDIR_REL}," ${WRKSRC}/setup.py
 	${REINPLACE_CMD} "/pip/d" ${WRKSRC}/requirements.txt
 
 .include <bsd.port.mk>
diff --git a/devel/py-flex/Makefile b/devel/py-flex/Makefile
index b177c69dba2a..c00b54e9470c 100644
--- a/devel/py-flex/Makefile
+++ b/devel/py-flex/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	flex
 DISTVERSION=	6.14.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Swagger schema validation
 WWW=		https://github.com/pipermerriam/flex
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=3.3:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpointer>=1.7:devel/py-jsonpointer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rfc3987>=1.3.4:www/py-rfc3987@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.7.3:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}strict-rfc3339>=0.7:devel/py-strict-rfc3339@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}validate_email>=1.2:mail/py-validate_email@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.11:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils concurrent autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-frictionless/Makefile b/devel/py-frictionless/Makefile
index 1c3dfba0c5a3..f6c7e824471a 100644
--- a/devel/py-frictionless/Makefile
+++ b/devel/py-frictionless/Makefile
@@ -1,82 +1,83 @@
 PORTNAME=	frictionless
 PORTVERSION=	5.17.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Framework to describe, extract, validate, and transform tabular data
 WWW=		https://github.com/frictionlessdata/frictionless-py
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>=22.2.0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>=3.0,1:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}humanize>=4.2:devel/py-humanize@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}isodate>=0.6:devel/py-isodate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=4.20:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}marko>=1.0:textproc/py-marko@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}petl>=1.6:textproc/py-petl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydantic2>=2.0:devel/py-pydantic2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-slugify>=1.2:textproc/py-python-slugify@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.3:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.3:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.10:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rfc3986>=1.4:www/py-rfc3986@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}simpleeval>=0.9.11:devel/py-simpleeval@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stringcase>=1.2:devel/py-stringcase@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tabulate>=0.8.9:devel/py-tabulate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typer>=0.12:devel/py-typer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.3:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}validators>=0.18:devel/py-validators@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	AWS BIGQUERY CKAN DATASETTE EXCEL GITHUB GSHEETS HTML JSON MYSQL PANDAS PARQUET POSTGRESQL SQL VISIDATA WKT
 AWS_DESC=	AWS S3 support
 BIGQUERY_DESC=	BigQuery support
 CKAN_DESC=	CKAN API support
 DATASETTE_DESC=	Datasette support
 EXCEL_DESC=	Excel file support
 GITHUB_DESC=	GitHub support
 GSHEETS_DESC=	Google Sheets support
 HTML_DESC=	HTML file support
 JSON_DESC=	JSON file support
 PANDAS_DESC=	Pandas support
 PARQUET_DESC=	Parquet file format support
 POSTGRESQL_DESC=PostgreSQL database support
 SQL_DESC=	SQL databases support
 VISIDATA_DESC=	VisiData support
 WKT_DESC=	Well-known text (WKT) support
 
 AWS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto3>=1.9:www/py-boto3@${PY_FLAVOR}
 BIGQUERY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.12.1:www/py-google-api-python-client@${PY_FLAVOR}
 CKAN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}frictionless-ckan-mapper>=1.0:devel/py-frictionless-ckan-mapper@${PY_FLAVOR}
 DATASETTE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}datasette>=0.64.2:devel/py-datasette@${PY_FLAVOR}
 EXCEL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openpyxl>=3.0:textproc/py-openpyxl@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}tableschema-to-template>=0.0:textproc/py-tableschema-to-template@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}xlrd>=1.2:textproc/py-xlrd@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}xlwt>=1.2:textproc/py-xlwt@${PY_FLAVOR}
 GITHUB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}PyGithub>=1.50:devel/py-PyGithub@${PY_FLAVOR}
 GSHEETS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygsheets>=2.0:www/py-pygsheets@${PY_FLAVOR}
 HTML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyquery>=1.4:devel/py-pyquery@${PY_FLAVOR}
 JSON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ijson>=3.0:devel/py-ijson@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}jsonlines>=1.2:devel/py-jsonlines@${PY_FLAVOR}
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymysql>=1.0:databases/py-pymysql@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}sqlalchemy20>=1.4:databases/py-sqlalchemy20@${PY_FLAVOR}
 PANDAS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>=1.0,1:math/py-pandas@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pyarrow>=14.0:databases/py-pyarrow@${PY_FLAVOR}
 PARQUET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fastparquet>=0.8:databases/py-fastparquet@${PY_FLAVOR}
 POSTGRESQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg>=3.0:databases/py-psycopg@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}sqlalchemy20>=1.4:databases/py-sqlalchemy20@${PY_FLAVOR}
 SQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy20>=1.4:databases/py-sqlalchemy20@${PY_FLAVOR}
 VISIDATA_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}visidata>=2.10:devel/py-visidata@${PY_FLAVOR}
 WKT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}grako>=3.99:textproc/py-grako@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-gapic-generator/Makefile b/devel/py-gapic-generator/Makefile
index c7abe1d19667..309a02372fb6 100644
--- a/devel/py-gapic-generator/Makefile
+++ b/devel/py-gapic-generator/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	gapic-generator
 PORTVERSION=	1.18.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python client library generator for APIs defined by protocolbuffers
 WWW=		https://github.com/googleapis/gapic-generator-python
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=6.7:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}google-api-core>=2.11.0:www/py-google-api-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}googleapis-common-protos>=1.55.0:devel/py-googleapis-common-protos@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}grpc-google-iam-v1>=0.12.4<1.0.0:devel/py-grpc-google-iam-v1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}grpcio>=1.24.3:devel/py-grpcio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}inflection>=0.5.1<1.0.0:devel/py-inflection@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libcst>=0.4.9<2.0.0:devel/py-libcst@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.11:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=3.19.5,1<6.0.0,1:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pypandoc>=1.4:textproc/py-pypandoc@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.1.1:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1.1:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-http-prompt/Makefile b/devel/py-http-prompt/Makefile
index fb13156d80b3..3c99be9eb5bc 100644
--- a/devel/py-http-prompt/Makefile
+++ b/devel/py-http-prompt/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	http-prompt
 PORTVERSION=	2.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Interactive HTTP command-line client
 WWW=		https://github.com/httpie/http-prompt
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=5.0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httpie>=2.4.0:www/py-httpie@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}parsimonious>=0.6.2:textproc/py-parsimonious@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prompt-toolkit2>=2.0.0<3.0.0:devel/py-prompt-toolkit2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.1.0:textproc/py-pygments@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.0:devel/py-pyyaml@${PY_FLAVOR} \
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 SUB_FILES=	pkg-message
 
 .include <bsd.port.mk>
diff --git a/devel/py-jenkins-job-builder/Makefile b/devel/py-jenkins-job-builder/Makefile
index 1d6cb545eb82..7342d0a83d8b 100644
--- a/devel/py-jenkins-job-builder/Makefile
+++ b/devel/py-jenkins-job-builder/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	jenkins-job-builder
 PORTVERSION=	6.3.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Manage Jenkins jobs with YAML
 WWW=		https://jenkins-job-builder.readthedocs.io/en/latest/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stevedore>0:devel/py-stevedore@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-jenkins>0:devel/py-python-jenkins@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fasteners>0:devel/py-fasteners@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/devel/py-jinja2-ansible-filters/Makefile b/devel/py-jinja2-ansible-filters/Makefile
index beaab6c438d8..78a0282583ef 100644
--- a/devel/py-jinja2-ansible-filters/Makefile
+++ b/devel/py-jinja2-ansible-filters/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	jinja2-ansible-filters
 PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Port of Ansible's jinja2 filters without requiring ansible core
 WWW=		https://gitlab.com/dreamer-labs/libraries/jinja2-ansible-filters
 
 LICENSE=	BSD2CLAUSE GPLv3
 LICENSE_COMB=	dual
 LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${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
 
 NO_ARCH=	yes
 
 post-patch:
 	@${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/VERSION
 
 .include <bsd.port.mk>
diff --git a/devel/py-jsonnet/Makefile b/devel/py-jsonnet/Makefile
index 5cbd3749e2e7..f992e0100460 100644
--- a/devel/py-jsonnet/Makefile
+++ b/devel/py-jsonnet/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	jsonnet
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.20.0
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	timp87@gmail.com
 COMMENT=	Python bindings for Jsonnet - The data templating language
 WWW=		https://github.com/google/jsonnet
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libjsonnet.so:devel/jsonnet
 
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		compiler:c++17-lang python localbase
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
 
 USE_PYTHON=	distutils autoplist
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_jsonnet${PYTHON_EXT_SUFFIX}.so
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs
 
 .include	<bsd.port.mk>
diff --git a/devel/py-jsonschema-path/Makefile b/devel/py-jsonschema-path/Makefile
index 964e3eb52a6f..4d7f3dc4e50d 100644
--- a/devel/py-jsonschema-path/Makefile
+++ b/devel/py-jsonschema-path/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	jsonschema-path
 PORTVERSION=	0.3.3
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	jsonschema_path-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	JSONSchema Spec with object-oriented paths
 WWW=		https://github.com/p1c2u/jsonschema-path
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pathable>=0.4.1<0.5:devel/py-pathable@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}referencing>=0.28.0<0.36.0:devel/py-referencing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.31.0<3:www/py-requests@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-jsonschema-spec/Makefile b/devel/py-jsonschema-spec/Makefile
index 1f8cc34746b0..3c21b01972c8 100644
--- a/devel/py-jsonschema-spec/Makefile
+++ b/devel/py-jsonschema-spec/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	jsonschema-spec
 PORTVERSION=	0.2.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	jsonschema_spec-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	JSONSchema Spec with object-oriented paths
 WWW=		https://github.com/p1c2u/jsonschema-path
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pathable>=0.4.1<0.5:devel/py-pathable@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}referencing>=0.28.0<0.36.0:devel/py-referencing@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-jupyter-events/Makefile b/devel/py-jupyter-events/Makefile
index 77c03bebe4fe..43a532145dc7 100644
--- a/devel/py-jupyter-events/Makefile
+++ b/devel/py-jupyter-events/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	jupyter-events
 PORTVERSION=	0.10.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	jupyter_events-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Jupyter Event System library
 WWW=		https://jupyter-events.readthedocs.io/en/latest/ \
 		https://github.com/jupyter/jupyter_events
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatchling>=1.5:devel/py-hatchling@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=4.18.0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-json-logger>=2.0.4:devel/py-python-json-logger@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.3:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.3:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}referencing>=0:devel/py-referencing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rfc3339-validator>=0:devel/py-rfc3339-validator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rfc3986-validator>=0.1.1:devel/py-rfc3986-validator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}traitlets>=5.3:devel/py-traitlets@${PY_FLAVOR}
 # jsonschema[format-nongpl]
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}fqdn>=0:www/py-fqdn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}idna>=0:dns/py-idna@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}isoduration>=0:devel/py-isoduration@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpointer>=1.13:devel/py-jsonpointer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rfc3339-validator>=0:devel/py-rfc3339-validator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rfc3986-validator>=0.1.0:devel/py-rfc3986-validator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}uri-template>=0:net/py-uri-template@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}webcolors>=1.11:graphics/py-webcolors@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-kaptan/Makefile b/devel/py-kaptan/Makefile
index 42497855a653..0cc7b156a98d 100644
--- a/devel/py-kaptan/Makefile
+++ b/devel/py-kaptan/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	kaptan
 PORTVERSION=	0.5.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python config parser for json, yaml
 WWW=		https://github.com/emre/kaptan
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=3.13:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-knack/Makefile b/devel/py-knack/Makefile
index 5f31cd8f168f..a4e5cad0d937 100644
--- a/devel/py-knack/Makefile
+++ b/devel/py-knack/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	knack
 DISTVERSION=	0.11.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	Command line interface framework
 WWW=		https://github.com/Microsoft/knack
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argcomplete>0:devel/py-argcomplete@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${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}
 
 USES=		python
 USE_PYTHON=	autoplist distutils concurrent
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-libcst/Makefile b/devel/py-libcst/Makefile
index a179d3d5b070..b1e81021c98f 100644
--- a/devel/py-libcst/Makefile
+++ b/devel/py-libcst/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	libcst
 PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Concrete syntax tree with AST-like properties
 WWW=		https://github.com/Instagram/LibCST
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-rust>=0:devel/py-setuptools-rust@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=0:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=5.2:devel/py-yaml@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=5.2:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		cargo dos2unix python:3.9+
 USE_PYTHON=	autoplist concurrent pep517
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 CARGO_BUILD=	no
 CARGO_CARGOLOCK=${WRKSRC}/native/Cargo.lock
 CARGO_CARGOTOML=${WRKSRC}/native/Cargo.toml
 CARGO_INSTALL=	no
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}libcst03
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/devel/py-libcst03/Makefile b/devel/py-libcst03/Makefile
index 1182ce78f3ae..ab5cc77ff7e7 100644
--- a/devel/py-libcst03/Makefile
+++ b/devel/py-libcst03/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	libcst
 PORTVERSION=	0.3.23
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	03
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Concrete syntax tree with AST-like properties
 WWW=		https://github.com/Instagram/LibCST
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=0:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=5.2:devel/py-yaml@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=5.2:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.7.4.2:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-inspect>=0.4.0:devel/py-typing-inspect@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}libcst
 
 PORTSCOUT=	limit:^0\.3\.
 
 .include <bsd.port.mk>
diff --git a/devel/py-livemark/Makefile b/devel/py-livemark/Makefile
index 1d7353358036..f47f9ced3522 100644
--- a/devel/py-livemark/Makefile
+++ b/devel/py-livemark/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	livemark
 PORTVERSION=	0.110.8
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Data presentation framework for Python
 WWW=		https://livemark.frictionlessdata.io/ \
 		https://github.com/frictionlessdata/livemark
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>=22.0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cached-property>=1.5:devel/py-cached-property@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}deepmerge>=0.3:devel/py-deepmerge@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docstring-parser>=0.10:textproc/py-docstring-parser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}frictionless>=4.0:devel/py-frictionless@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gitpython>=3.1:devel/py-gitpython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}giturlparse>=0.10:devel/py-giturlparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}livereload>=2.6:www/py-livereload@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}marko>=1.0:textproc/py-marko@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyquery>=1.0:devel/py-pyquery@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.3:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.3:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typer>=0.12:devel/py-typer@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-mdv/Makefile b/devel/py-mdv/Makefile
index 4e3ff18d0f1b..f2fd84eb29aa 100644
--- a/devel/py-mdv/Makefile
+++ b/devel/py-mdv/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	mdv
 PORTVERSION=	1.7.5
+PORTREVISION=	1
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Terminal markdown viewer
 WWW=		https://pypi.org/project/mdv/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:textproc/py-markdown@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${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}
 
 USES=		python
 USE_GITHUB=	yes
 GH_ACCOUNT=	axiros
 GH_PROJECT=	terminal_markdown_viewer
 GH_TAGNAME=	435b688
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-molecule/Makefile b/devel/py-molecule/Makefile
index 002d55a980e3..468f09a18b95 100644
--- a/devel/py-molecule/Makefile
+++ b/devel/py-molecule/Makefile
@@ -1,72 +1,73 @@
 PORTNAME=	molecule
 PORTVERSION=	5.0.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Aid for the development and testing of Ansible roles
 WWW=		https://molecule.readthedocs.io/en/latest/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>=19.3.1:devel/py-pip@${PY_FLAVOR} \
 	${PY_SETUPTOOLS} \
 	${PYTHON_PKGNAMEPREFIX}setuptools-scm>=7.0.0:devel/py-setuptools-scm@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}wheel>=0.33.6:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansi2html>=1.8.0:textproc/py-ansi2html@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ansible-compat>=2.2.1:sysutils/py-ansible-compat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=8.0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click-help-colors>=0.9:devel/py-click-help-colors@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cookiecutter>=1.7.3:devel/py-cookiecutter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}enrich>=1.2.7:textproc/py-enrich@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=4.9.1:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.11.3:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pluggy>=0.7.1:devel/py-pluggy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rich>=9.5.1:textproc/py-rich@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR}
 # ansi2html >= 1.6.0
 # pytest-cov >= 2.10.1
 # pytest-testinfra >= 6.1.0
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=6.2:devel/py-coverage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}filelock>0:sysutils/py-filelock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pexpect>=4.8.0:misc/py-pexpect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>=2.9.0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-html>=3.0.0:devel/py-pytest-html@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-mock>=3.3.1:devel/py-pytest-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-plus>=0.2:devel/py-pytest-plus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=2.1.0:devel/py-pytest-xdist@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517 pytest
 
 # Note: we're only running the unit tests here.  Upstream acknowledges
 # that functional tests are still a work in progress.
 #
 # Test failures. Only three tests fail:
 #  test/unit/test_util.py ......FFF.......................   [ 23%]
 #
 # The click module demands a UTF-8 locale when used with python-3.x
 TEST_ENV=	LANG=en_US.UTF-8 \
 		LC_ALL=en_US.UTF-8
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		DOCKER DOCS LINT
 OPTIONS_DEFAULT=	LINT
 DOCKER_DESC=		For testing on Docker Platform(Remote)
 LINT_DESC=		For linting molecule itself
 DOCKER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docker>=2.0.0:sysutils/py-docker@${PY_FLAVOR}
 # sphinx-ansible-theme >= 0.8.0, < 0.10.0
 # sphinx-notfound-page >= 0.7.1
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.11.3:devel/py-Jinja2@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}ansible-core>=2.12.0:sysutils/py-ansible-core@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}simplejson>=3.17.2:devel/py-simplejson@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}sphinx>=5.0.0:textproc/py-sphinx@${PY_FLAVOR}
 LINT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flake8>=3.8.4:devel/py-flake8@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pre-commit>=2.10.1:devel/py-pre-commit@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}yamllint>0:devel/py-yamllint@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-moto/Makefile b/devel/py-moto/Makefile
index 8745f78e8ed7..02298f3dcf82 100644
--- a/devel/py-moto/Makefile
+++ b/devel/py-moto/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	moto
 PORTVERSION=	5.0.10
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI \
 		https://github.com/getmoto/moto/releases/download/${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Allow your python tests to easily mock out the boto library
 WWW=		https://docs.getmoto.org/en/latest/ \
 		https://github.com/getmoto/moto
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=40.6.0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto3>=1.9.201:www/py-boto3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}botocore>=1.14.0:devel/py-botocore@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.1<3.0.0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.5:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}responses>=0.15.0:devel/py-responses@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}werkzeug>=0.5:www/py-werkzeug@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xmltodict>=0:devel/py-xmltodict@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}antlr4-python3-runtime>=0:devel/py-antlr4-python3-runtime@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}aws-xray-sdk>=0.93:devel/py-aws-xray-sdk@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cfn-lint>=0.40.0:devel/py-cfn-lint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docker>=3.0.0:sysutils/py-docker@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ecdsa>=0:security/py-ecdsa@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flask>=2.2.2:www/py-flask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask-Cors>=0:www/py-flask-cors@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}graphql-core>=0:devel/py-graphql-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}joserfc>=0.9.0:security/py-joserfc@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsondiff>=1.1.2:devel/py-jsondiff@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpath-ng>=0:devel/py-jsonpath-ng@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}multipart>=0:devel/py-multipart@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openapi-spec-validator>=0.5.0:devel/py-openapi-spec-validator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}py-partiql-parser>=0.5.5:devel/py-py-partiql-parser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=3.0.7:devel/py-pyparsing@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent cryptography pep517 pytest
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-msgspec/Makefile b/devel/py-msgspec/Makefile
index ad36cdd42ab1..37b24fd22eaa 100644
--- a/devel/py-msgspec/Makefile
+++ b/devel/py-msgspec/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	msgspec
 PORTVERSION=	0.18.6
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Fast serialization and validation library
 WWW=		https://jcristharif.com/msgspec/ \
 		https://github.com/jcrist/msgspec
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 #NO_ARCH=	yes
 
 OPTIONS_DEFINE=	TOML YAML
 OPTIONS_DEFAULT=TOML YAML
 
 TOML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tomli-w>=0:textproc/py-tomli-w@${PY_FLAVOR}
-YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
+YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MTOML} && ${PYTHON_REL} < 31100
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-tomli@${PY_FLAVOR}
 .endif
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-opengrok-tools/Makefile b/devel/py-opengrok-tools/Makefile
index 0cdef2e574e1..5e4b491f295f 100644
--- a/devel/py-opengrok-tools/Makefile
+++ b/devel/py-opengrok-tools/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	opengrok-tools
 DISTVERSION=		1.12.23
+PORTREVISION=	1
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	OpenGrok tools for synchronization and mirroring
 WWW=		https://oracle.github.io/opengrok/
 
 LICENSE=	CDDL
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR}
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=2.6.0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.20.0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}resource>=0.2.0:devel/py-resource@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}filelock>0:sysutils/py-filelock@${PY_FLAVOR}
 
 # According to the vendor, Python3 is required
 USES=		python
 USE_GITHUB=	yes
 GH_ACCOUNT=	oracle
 GH_PROJECT=	opengrok
 USE_PYTHON=	autoplist distutils noflavors
 
 NO_ARCH=	yes
 
 BUILD_WRKSRC=	${WRKSRC}/tools
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 .include <bsd.port.mk>
diff --git a/devel/py-openstacksdk/Makefile b/devel/py-openstacksdk/Makefile
index 1dbc42fb3036..5035acfa48b6 100644
--- a/devel/py-openstacksdk/Makefile
+++ b/devel/py-openstacksdk/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	openstacksdk
 PORTVERSION=	3.1.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	SDK for building applications to work with OpenStack
 WWW=		https://docs.openstack.org/openstacksdk/latest/ \
 		https://github.com/openstack/openstacksdk
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}decorator>=4.4.1:devel/py-decorator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.6.5:devel/py-dogpile.cache@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jmespath>=0.9.0:devel/py-jmespath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpatch>=1.16:devel/py-jsonpatch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.18.0:devel/py-keystoneauth1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.4:net/py-netifaces@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}os-service-types>=1.7.0:devel/py-os-service-types@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}platformdirs>=3:devel/py-platformdirs@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.13:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requestsexceptions>=1.2.0:devel/py-requestsexceptions@${PY_FLAVOR}
 
 USES=		python shebangfix
 USE_PYTHON=	autoplist concurrent cryptography pep517
 
 NO_ARCH=	yes
 
 SHEBANG_GLOB=	*.sh
 
 .include <bsd.port.mk>
diff --git a/devel/py-oslo.config/Makefile b/devel/py-oslo.config/Makefile
index 328c76772a96..d15243957cfa 100644
--- a/devel/py-oslo.config/Makefile
+++ b/devel/py-oslo.config/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	oslo.config
 PORTVERSION=	9.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Oslo Configuration library
 WWW=		https://docs.openstack.org/oslo.config/latest/ \
 		https://github.com/openstack/oslo.config
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rfc3986>=1.2.0:www/py-rfc3986@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 post-patch:
 	@${GREP} -lr /etc ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e 's|/etc|${PREFIX}&|g'
 
 .include <bsd.port.mk>
diff --git a/devel/py-oslo.messaging/Makefile b/devel/py-oslo.messaging/Makefile
index 1e0ea1d3c4fd..c2a54a05247a 100644
--- a/devel/py-oslo.messaging/Makefile
+++ b/devel/py-oslo.messaging/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	oslo.messaging
 PORTVERSION=	14.8.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Oslo Messaging API
 WWW=		https://docs.openstack.org/oslo.messaging/latest/ \
 		https://github.com/openstack/oslo.messaging
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}amqp>=2.5.2:net/py-amqp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cachetools>=2.0.0:devel/py-cachetools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}futurist>=1.2.0:devel/py-futurist@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}kombu>=4.6.6:net/py-kombu@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.context>=5.3.0:devel/py-oslo.context@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.metrics>=0.2.1:devel/py-oslo.metrics@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.31.0:devel/py-oslo.middleware@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.service>=1.24.0:devel/py-oslo.service@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.37.0:devel/py-oslo.utils@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.13:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}webob>=1.7.1:www/py-webob@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-oslo.policy/Makefile b/devel/py-oslo.policy/Makefile
index 14af368062c9..ec9486d0a65e 100644
--- a/devel/py-oslo.policy/Makefile
+++ b/devel/py-oslo.policy/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	oslo.policy
 PORTVERSION=	4.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Oslo Policy library
 WWW=		https://docs.openstack.org/oslo.policy/latest/ \
 		https://github.com/openstack/oslo.policy
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}oslo.config>=6.0.0:devel/py-oslo.config@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.context>=2.22.0:devel/py-oslo.context@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.40.0:devel/py-oslo.utils@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-oslo.utils/Makefile b/devel/py-oslo.utils/Makefile
index 17786e362db9..e018739c324c 100644
--- a/devel/py-oslo.utils/Makefile
+++ b/devel/py-oslo.utils/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	oslo.utils
 PORTVERSION=	7.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Oslo Utility library
 WWW=		https://docs.openstack.org/oslo.utils/latest/ \
 		https://github.com/openstack/oslo.utils
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.4:net/py-netifaces@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=20.4:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.0:devel/py-pyparsing@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.13:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tzdata>=2022.4:devel/py-tzdata@${PY_FLAVOR}
 
 USES=		python:3.9+
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-oslo.vmware/Makefile b/devel/py-oslo.vmware/Makefile
index 71e9d0d0eddb..9c84e8bab79c 100644
--- a/devel/py-oslo.vmware/Makefile
+++ b/devel/py-oslo.vmware/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	oslo.vmware
 PORTVERSION=	4.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Oslo VMware library
 WWW=		https://docs.openstack.org/oslo.vmware/latest/ \
 		https://github.com/openstack/oslo.vmware
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}defusedxml>=0.7.1:devel/py-defusedxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}eventlet>=0.18.2:net/py-eventlet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=4.5.0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.26.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.context>=2.19.2:devel/py-oslo.context@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.13:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}suds>=0.6:net/py-suds@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1,1:net/py-urllib3@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-oyaml/Makefile b/devel/py-oyaml/Makefile
index 049466cd9658..69e6739223c1 100644
--- a/devel/py-oyaml/Makefile
+++ b/devel/py-oyaml/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	oyaml
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Ordered YAML: drop-in replacement for PyYAML which preserves dict ordering
 WWW=		https://github.com/wimglenn/oyaml
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-pop/Makefile b/devel/py-pop/Makefile
index 01cebfc2c00b..48b3cdaff551 100644
--- a/devel/py-pop/Makefile
+++ b/devel/py-pop/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	pop
 PORTVERSION=	20.1.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	krion@FreeBSD.org
 COMMENT=	Plugin Oriented Programming interface for Python
 WWW=		https://pop.readthedocs.io
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiofiles>=0:devel/py-aiofiles@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}aiologger>=0:devel/py-aiologger@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dict-toolbox>=0:sysutils/py-dict-toolbox@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pop-config>0:devel/py-pop-config@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python shebangfix
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	saltstack/pop
 GL_TAGNAME=	58d846bdd196b71348910aea77cd0139f70c4f12
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-pre-commit/Makefile b/devel/py-pre-commit/Makefile
index 187d6c4f7888..05b57a311cde 100644
--- a/devel/py-pre-commit/Makefile
+++ b/devel/py-pre-commit/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	pre-commit
 DISTVERSION=	3.7.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pre_commit-${PORTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Framework for managing and maintaining multi-language pre-commit hooks
 WWW=		https://pre-commit.com/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cfgv>=2.0.0:devel/py-cfgv@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}identify>=1.0.0:devel/py-identify@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nodeenv>=0.11.1:devel/py-nodeenv@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}virtualenv>=20.10.0:devel/py-virtualenv@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python shebangfix
 USE_PYTHON=	autoplist distutils
 
 SHEBANG_FILES=	pre_commit/resources/hook-tmpl
 
 NO_ARCH=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 30900
 IGNORE=	python-3.9 or higher is required
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-prospector/Makefile b/devel/py-prospector/Makefile
index 0b8b56cef419..dbdc90e0e531 100644
--- a/devel/py-prospector/Makefile
+++ b/devel/py-prospector/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	prospector
 PORTVERSION=	1.10.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Analyse Python code by aggregating the result of other tools
 WWW=		https://github.com/landscapeio/prospector
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dodgy>=0.2.1<0.3.0:devel/py-dodgy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gitpython>=3.1.27<4.0.0:devel/py-gitpython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mccabe>=0.7.0<0.8:devel/py-mccabe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pep8-naming>=0.3.3:devel/py-pep8-naming@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.9.0:devel/py-pycodestyle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydocstyle>=2.0.0:devel/py-pydocstyle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyflakes>=2.2.0:devel/py-pyflakes@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pylint-django>=2.5<2.6:devel/py-pylint-django@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pylint-flask>=0.6<0.6_99:devel/py-pylint-flask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pylint-plugin-utils>=0.7:devel/py-pylint-plugin-utils@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requirements-detector>=1.2.0:devel/py-requirements-detector@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setoptconf>=0.3.0<0.4:devel/py-setoptconf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toml>=0.10.2<0.11.0:textproc/py-toml@${PY_FLAVOR} \
 		pylint${PYTHON_PKGNAMESUFFIX}>=2.8.3:devel/pylint
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	BANDIT MYPY PYRIGHT PYROMA VULTURE
 OPTIONS_DEFAULT=BANDIT MYPY PYRIGHT PYROMA VULTURE
 BANDIT_DESC=	Optional tools via bandit
 MYPY_DESC=	Optional tools via mypy
 PYRIGHT_DESC=	Optional tools via pyright
 PYROMA_DESC=	Optional tools via pyroma
 VULTURE_DESC=	Optional tools via vulture
 
 BANDIT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bandit>=1.5.1:devel/py-bandit@${PY_FLAVOR}
 MYPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mypy>=0.600:devel/py-mypy@${PY_FLAVOR}
 PYRIGHT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyright>=1.1.3:devel/py-pyright@${PY_FLAVOR}
 PYROMA_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyroma>=2.4:devel/py-pyroma@${PY_FLAVOR}
 VULTURE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vulture>=1.5:devel/py-vulture@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-pyaml-env/Makefile b/devel/py-pyaml-env/Makefile
index ce29ecc8e062..b0868f53b17f 100644
--- a/devel/py-pyaml-env/Makefile
+++ b/devel/py-pyaml-env/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	pyaml-env
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pyaml_env-${PORTVERSION}
 
 MAINTAINER=	DtxdF@disroot.org
 COMMENT=	Provides yaml file parsing with environment variable resolution
 WWW=		https://github.com/mkaranasou/pyaml_env
 
 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
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-pydrive/Makefile b/devel/py-pydrive/Makefile
index d30c4d5652ad..4c9179227ba8 100644
--- a/devel/py-pydrive/Makefile
+++ b/devel/py-pydrive/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	pydrive
 PORTVERSION=	1.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	PyDrive-${PORTVERSION}
 
 MAINTAINER=	paul@gromit.dlib.vt.edu
 COMMENT=	Google drive api made easy
 WWW=		https://github.com/googledrive/PyDrive
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.5.2:www/py-google-api-python-client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oauth2client>=4.0.0:security/py-oauth2client@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.11:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/devel/py-pytest-mypy-plugins/Makefile b/devel/py-pytest-mypy-plugins/Makefile
index 45a3036c1e17..7aee6ec3c893 100644
--- a/devel/py-pytest-mypy-plugins/Makefile
+++ b/devel/py-pytest-mypy-plugins/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	pytest-mypy-plugins
 PORTVERSION=	3.1.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	pytest plugin for writing tests for mypy plugins
 WWW=		https://github.com/typeddjango/pytest-mypy-plugins
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mypy>=1.3:devel/py-mypy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>=7.0.0,1:devel/py-pytest@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tomlkit>=0.11:textproc/py-tomlkit@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-pytest-regressions/Makefile b/devel/py-pytest-regressions/Makefile
index 3325dc8d186c..facacff498d1 100644
--- a/devel/py-pytest-regressions/Makefile
+++ b/devel/py-pytest-regressions/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	pytest-regressions
 PORTVERSION=	2.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI \
 		https://github.com/ESSS/pytest-regressions/releases/download/${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Easy to use fixtures to write regression tests
 WWW=		https://github.com/ESSS/pytest-regressions
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=0:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=6.2.0,1:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-datadir>=1.2.0:devel/py-pytest-datadir@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517 pytest
 
 NO_ARCH=	yes
 TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR}
 
 OPTIONS_DEFINE=	DATAFRAME IMAGE NUM
 DATAFRAME_DESC=	Pandas dataframe regression
 IMAGE_DESC=	Image objects regression
 NUM_DESC=	Numeric data regression
 
 DATAFRAME_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
 IMAGE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR}
 NUM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-python-easyconfig/Makefile b/devel/py-python-easyconfig/Makefile
index 5da58fb58a43..28cc47eeb0dc 100644
--- a/devel/py-python-easyconfig/Makefile
+++ b/devel/py-python-easyconfig/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	python-easyconfig
 PORTVERSION=	0.1.7
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Python-EasyConfig-${PORTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Library for loading configurations easily in Python
 WWW=		https://github.com/RussellLuo/easyconfig
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>3.10:devel/py-yaml@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>3.10:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>1.9.0:devel/py-six@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/devel/py-python-gilt/Makefile b/devel/py-python-gilt/Makefile
index 43dc776dee61..82a5ca13c034 100644
--- a/devel/py-python-gilt/Makefile
+++ b/devel/py-python-gilt/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	python-gilt
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	GIT layering tool
 WWW=		https://pypi.org/project/python-gilt/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fasteners>0:devel/py-fasteners@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}git-url-parse>0:devel/py-git-url-parse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sh>0:devel/py-sh@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-helpers-namespace>0:devel/py-pytest-helpers-namespace@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yapf>=0.16.3:textproc/py-yapf@${PY_FLAVOR} \
 		git:devel/git
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 # All tests pass except one:
 #
 # test/test_shell.py F                                              [ 76%]
 #
 # And then the test program errors out with 'INTERNALERROR'
 
 TEST_ENV=	TMPDIR=${WRKDIR}
 
 do-test:
 	@cd ${WRKSRC} && \
 	${SETENV} ${TEST_ENV} ${LOCALBASE}/bin/py.test-${PYTHON_VER} -vv --runslow --cov-report=term-missing --cov=${WRKSRC}/gilt/ --no-cov-on-fail test
 
 .include <bsd.port.mk>
diff --git a/devel/py-python-gitlab/Makefile b/devel/py-python-gitlab/Makefile
index d10b4673b3cf..2d95f79df812 100644
--- a/devel/py-python-gitlab/Makefile
+++ b/devel/py-python-gitlab/Makefile
@@ -1,64 +1,65 @@
 PORTNAME=	python-gitlab
 DISTVERSION=	4.7.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME?=	${PORTNAME:S/-/_/}-${DISTVERSIONFULL}
 
 MAINTAINER=	dereks@lifeofadishwasher.com
 COMMENT=	Interact with GitLab API
 WWW=		https://github.com/python-gitlab/python-gitlab
 
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=61.0.0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=1.0.0:www/py-requests-toolbelt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.32.0:www/py-requests@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-console-scripts>0:devel/py-pytest-console-scripts@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		AUTOCOMPLETE DOCS YAML
 OPTIONS_DEFAULT=	AUTOCOMPLETE YAML
 
 AUTOCOMPLETE_DESC=	Autocompletion via argcomplete
 YAML_DESC=		YAML output
 
 AUTOCOMPLETE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argcomplete>=1.10.0<4:devel/py-argcomplete@${PY_FLAVOR}
 
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}furo>0:textproc/py-furo@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}myst-parser>0:textproc/py-myst-parser@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.10.1:www/py-requests-toolbelt@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}requests>=2.25.0:www/py-requests@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}sphinx>=4.3.1,1:textproc/py-sphinx@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}sphinxcontrib-autoprogram>0:textproc/py-sphinxcontrib-autoprogram@${PY_FLAVOR}
 DOCS_PORTDOCS=		*
 
-YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=5.2:devel/py-yaml@${PY_FLAVOR}
+YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=5.2:devel/py-pyyaml@${PY_FLAVOR}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}/etc|g' ${WRKSRC}/gitlab/config.py
 
 do-build-DOCS-on::
 	(cd ${WRKSRC} && sphinx-build -j auto -n -W --keep-going -b html docs build/sphinx/html)
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/build/sphinx/html && \
 	${RM} -r .doctrees && \
 	${RM} .buildinfo objects.inv && \
 	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts= tests/unit
 
 .include <bsd.port.mk>
diff --git a/devel/py-pyyaml-include/Makefile b/devel/py-pyyaml-include/Makefile
index f1af94ddcd4d..fac502189536 100644
--- a/devel/py-pyyaml-include/Makefile
+++ b/devel/py-pyyaml-include/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	pyyaml-include
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Extending PyYAML with a custom constructor for including YAML files within YAML files
 WWW=		https://pyyaml-include.readthedocs.io/en/latest/ \
 		https://github.com/tanbro/pyyaml-include
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=8:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>=2021.04.0:devel/py-fsspec@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=6.0<7.0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=6.0<7.0:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	TOML
 OPTIONS_DEFAULT=TOML
 TOML_DESC=	TOML (Tom's Obvious, Minimal Language) support
 
 TOML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR}
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 31100
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-yaml/Makefile b/devel/py-pyyaml/Makefile
similarity index 98%
rename from devel/py-yaml/Makefile
rename to devel/py-pyyaml/Makefile
index 2cfd30cc7bf1..eafcac314d7c 100644
--- a/devel/py-yaml/Makefile
+++ b/devel/py-pyyaml/Makefile
@@ -1,47 +1,47 @@
-PORTNAME=	yaml
+PORTNAME=	pyyaml
 PORTVERSION=	6.0.1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	PyYAML-${PORTVERSION}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Python YAML parser
 WWW=		https://pyyaml.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		python
 USE_PYTHON=	autoplist concurrent cython distutils
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}pyyaml5
 
 OPTIONS_DEFINE=	LIBYAML EXAMPLES
 OPTIONS_DEFAULT=LIBYAML
 LIBYAML_DESC=	Use textproc/libyaml for faster parsing
 
 LIBYAML_LIB_DEPENDS=	libyaml.so:textproc/libyaml
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MLIBYAML}
 PYDISTUTILS_SETUP+=		--with-libyaml
 PYDISTUTILS_BUILD_TARGET=	build_ext
 PYDISTUTILS_BUILDARGS+=		--include-dirs=${LOCALBASE}/include \
 				--library-dirs=${LOCALBASE}/lib
 .else
 PYDISTUTILS_SETUP+=		--without-libyaml
 NO_ARCH=			yes
 .endif
 
 post-install-EXAMPLES-on:
 	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/)
 
 post-install-LIBYAML-on:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/yaml/_yaml*.so
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-yaml/distinfo b/devel/py-pyyaml/distinfo
similarity index 100%
rename from devel/py-yaml/distinfo
rename to devel/py-pyyaml/distinfo
diff --git a/devel/py-yaml/pkg-descr b/devel/py-pyyaml/pkg-descr
similarity index 100%
rename from devel/py-yaml/pkg-descr
rename to devel/py-pyyaml/pkg-descr
diff --git a/devel/py-yaml/pkg-plist b/devel/py-pyyaml/pkg-plist
similarity index 100%
rename from devel/py-yaml/pkg-plist
rename to devel/py-pyyaml/pkg-plist
diff --git a/devel/py-pyyaml_env_tag/Makefile b/devel/py-pyyaml_env_tag/Makefile
index 1c06a6bc7369..b539eb64509e 100644
--- a/devel/py-pyyaml_env_tag/Makefile
+++ b/devel/py-pyyaml_env_tag/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	pyyaml_env_tag
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Custom YAML tag for referencing environment variables in YAML files
 WWW=		https://github.com/waylan/pyyaml-env-tag
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flit-core>=2<4:devel/py-flit-core@${PY_FLAVOR}
-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 concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-ramlfications/Makefile b/devel/py-ramlfications/Makefile
index d38f6e6b6d93..6a81f5bf94f6 100644
--- a/devel/py-ramlfications/Makefile
+++ b/devel/py-ramlfications/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	ramlfications
 PORTVERSION=	0.1.9
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	grembo@FreeBSD.org
 COMMENT=	Python parser for RAML
 WWW=		https://github.com/spotify/ramlfications
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>=16.0.0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonref>=0.1:devel/py-jsonref@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown2>=2.3.2:textproc/py-markdown2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xmltodict>=0.10.1:devel/py-xmltodict@${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 distutils
 
 .include <bsd.port.mk>
diff --git a/devel/py-responses/Makefile b/devel/py-responses/Makefile
index 993af63bee62..121c62d42b7f 100644
--- a/devel/py-responses/Makefile
+++ b/devel/py-responses/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	responses
 PORTVERSION=	0.25.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel www python
 MASTER_SITES=	PYPI \
 		https://github.com/getsentry/responses/releases/download/${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Utility library for mocking out the requests Python library
 WWW=		https://github.com/getsentry/responses
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.30.0<3.0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.25.10,1<3.0,1:net/py-urllib3@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=6.0.0:devel/py-coverage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mypy>=0:devel/py-mypy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-httpserver>=0:devel/py-pytest-httpserver@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tomli-w>=0:textproc/py-tomli-w@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}types-PyYAML>=0:devel/py-types-PyYAML@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}types-requests>=0:devel/py-types-requests@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517 pytest
 
 NO_ARCH=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 31100
 TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-tomli@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-saneyaml/Makefile b/devel/py-saneyaml/Makefile
index bb23c94c5dee..90a9eba692ce 100644
--- a/devel/py-saneyaml/Makefile
+++ b/devel/py-saneyaml/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	saneyaml
 DISTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Dump readable YAML and load safely any YAML data
 WWW=		https://github.com/nexB/saneyaml
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/apache-2.0.LICENSE
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=4:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
-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 pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-setoptconf/Makefile b/devel/py-setoptconf/Makefile
index aa5bb52bbf94..a38358c16339 100644
--- a/devel/py-setoptconf/Makefile
+++ b/devel/py-setoptconf/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	setoptconf
 PORTVERSION=	0.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Retrieve program settings from various sources in a consistant method
 WWW=		https://github.com/jayclassless/setoptconf
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	YAML
 
-YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
+YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-simple-parsing/Makefile b/devel/py-simple-parsing/Makefile
index 34ca6b5d6a03..6959a8255c7c 100644
--- a/devel/py-simple-parsing/Makefile
+++ b/devel/py-simple-parsing/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	simple-parsing
 PORTVERSION=	0.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	simple_parsing-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Small utility for simplifying and cleaning up argument parsing scripts
 WWW=		https://github.com/lebrice/SimpleParsing
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docstring-parser>=0.15<1:textproc/py-docstring-parser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.5.0:devel/py-typing-extensions@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	TOML YAML
 OPTIONS_DEFAULT=TOML YAML
 
 TOML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-tomli@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}tomli-w>=0:textproc/py-tomli-w@${PY_FLAVOR}
-YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
+YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-stestr/Makefile b/devel/py-stestr/Makefile
index 6a2495683cbb..0ea2ad25e5a1 100644
--- a/devel/py-stestr/Makefile
+++ b/devel/py-stestr/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	stestr
 PORTVERSION=	4.1.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Parallel Python test runner built around subunit
 WWW=		https://stestr.readthedocs.io/en/latest/ \
 		https://github.com/mtreinish/stestr
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cliff>=2.8.0:devel/py-cliff@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}extras>=1.0.0:devel/py-extras@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fixtures>=3.0.0:devel/py-fixtures@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-subunit>=1.3.0:devel/py-python-subunit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}testtools>=2.2.0:devel/py-testtools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tomlkit>=0.11.6:textproc/py-tomlkit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}voluptuous>=0.8.9:devel/py-voluptuous@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.10.0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-swagger-spec-validator/Makefile b/devel/py-swagger-spec-validator/Makefile
index 8481869fb14b..377f537c5b56 100644
--- a/devel/py-swagger-spec-validator/Makefile
+++ b/devel/py-swagger-spec-validator/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	swagger-spec-validator
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.7.4
+PORTREVISION=	1
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Validation of Swagger specifications
 WWW=		https://github.com/Yelp/swagger_spec_validator
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
 
 USES=		python
 USE_GITHUB=	yes
 GH_ACCOUNT=	Yelp
 GH_PROJECT=	swagger_spec_validator
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 # Skip test "test_raise_SwaggerValidationError_on_urlopen_error" as it tries
 # to open network connections to non-existent URLs.
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs \
 		-k 'not test_raise_SwaggerValidationError_on_urlopen_error'
 
 .include <bsd.port.mk>
diff --git a/devel/py-ua_parser/Makefile b/devel/py-ua_parser/Makefile
index ad0a92af6b38..540306bcfcd3 100644
--- a/devel/py-ua_parser/Makefile
+++ b/devel/py-ua_parser/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	ua_parser
 PORTVERSION=	0.7.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME:S/_/-/}-${PORTVERSION}
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Python port of Browserscope's user agent parser
 WWW=		https://github.com/ua-parser/uap-python
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 RUN_DEPENDS=	${LOCALBASE}/share/ua_parser/regexes.yaml:devel/ua_parser-core \
-		${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 SUB_FILES=	pkg-message
 
 .include <bsd.port.mk>
diff --git a/devel/py-vcrpy/Makefile b/devel/py-vcrpy/Makefile
index 601182ac5178..9e5fc1cdcd06 100644
--- a/devel/py-vcrpy/Makefile
+++ b/devel/py-vcrpy/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	vcrpy
 DISTVERSION=	6.0.1
+PORTREVISION=	1
 CATEGORIES=	devel www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Automatically mock HTTP interactions to simplify and speed up testing
 WWW=		https://github.com/kevin1024/vcrpy
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yarl>0:www/py-yarl@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils pytest
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-watchdog/Makefile b/devel/py-watchdog/Makefile
index 34c8f9c197f2..e1eada080feb 100644
--- a/devel/py-watchdog/Makefile
+++ b/devel/py-watchdog/Makefile
@@ -1,50 +1,51 @@
 PORTNAME=	watchdog
 DISTVERSION=	4.0.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Python API library to monitor file system events
 WWW=		https://github.com/gorakhargosh/watchdog
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=63.1.0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0.42.0:devel/py-wheel@${PY_FLAVOR}
 LIB_DEPENDS=	libinotify.so:devel/libinotify
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=3.10:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eventlet>0:net/py-eventlet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flaky>0:devel/py-flaky@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}isort>=5.13.2:devel/py-isort@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mypy>=1.8.0:devel/py-mypy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}types-PyYAML>=6.0.12.12:devel/py-types-PyYAML@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517 pytest
 
 TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
 NO_ARCH=	yes
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 
 post-build-DOCS-on:
 	(cd ${WRKSRC}/docs ; ${MAKE_CMD} SPHINXBUILD=sphinx-build-${PYTHON_VER} html)
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/docs/build/html ; \
 	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "-not -name .buildinfo")
 
 .include <bsd.port.mk>
diff --git a/devel/py-yacs/Makefile b/devel/py-yacs/Makefile
index 814c6b17e800..4ef7756a6da9 100644
--- a/devel/py-yacs/Makefile
+++ b/devel/py-yacs/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	yacs
 PORTVERSION=	0.1.8
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yet Another Configuration System
 WWW=		https://github.com/rbgirshick/yacs
 
 LICENSE=	APACHE20
 
-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 concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-yamllint/Makefile b/devel/py-yamllint/Makefile
index 324e6f05e5dc..dfcbc8ada5bf 100644
--- a/devel/py-yamllint/Makefile
+++ b/devel/py-yamllint/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	yamllint
 PORTVERSION=	1.35.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Linter for YAML files
 WWW=		https://github.com/adrienverge/yamllint
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pathspec>=0.5.3:devel/py-pathspec@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517 pytest
 
 NO_ARCH=	yes
 
 PYTEST_BROKEN_TESTS=	test_run_with_user_global_config_file
 
 .include <bsd.port.mk>
diff --git a/devel/py-yamlordereddictloader/Makefile b/devel/py-yamlordereddictloader/Makefile
index e57bb0323253..544dded2e0a7 100644
--- a/devel/py-yamlordereddictloader/Makefile
+++ b/devel/py-yamlordereddictloader/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	yamlordereddictloader
 DISTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sergey@akhmatov.ru
 COMMENT=	Loader and a dumper for PyYAML allowing to keep items order
 WWW=		https://pypi.python.org/pypi/yamlordereddictloader
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/pycomposefile/Makefile b/devel/pycomposefile/Makefile
index 09dc61e30552..54e072c1e5bc 100644
--- a/devel/pycomposefile/Makefile
+++ b/devel/pycomposefile/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	pycomposefile
 DISTVERSION=	0.0.30
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	Structured deserialization of Docker Compose files for Python
 WWW=		https://pypi.org/project/pycomposefile/
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=6.0:devel/py-yaml@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=6.0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 post-patch:
 	@${RM} -r ${WRKSRC}/tests/
 
 .include <bsd.port.mk>
diff --git a/devel/ros-rosdep/Makefile b/devel/ros-rosdep/Makefile
index 409e06eedd67..d1621685f78c 100644
--- a/devel/ros-rosdep/Makefile
+++ b/devel/ros-rosdep/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	ros-rosdep
 DISTVERSION=	0.21.0
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	trueos@norwegianrockcat.com
 COMMENT=	Multi-package manager system dependency tool for ROS
 WWW=		https://docs.ros.org/independent/api/rosdep/html/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ros-catkin_pkg>=0.4.0:devel/ros-catkin_pkg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ros-rospkg>=1:devel/ros-rospkg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ros-rosdistro>=0:devel/ros-rosdistro@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 
 USE_PYTHON=	autoplist distutils
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ros-infrastructure
 GH_PROJECT=	rosdep
 
 .include <bsd.port.mk>
diff --git a/devel/ros-rosdistro/Makefile b/devel/ros-rosdistro/Makefile
index 6de3c15a0a28..2c5b0153d153 100644
--- a/devel/ros-rosdistro/Makefile
+++ b/devel/ros-rosdistro/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	ros-rosdistro
 DISTVERSION=	0.9.0
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	trueos@norwegianrockcat.com
 COMMENT=	Tools to work with catkinized rosdistro files
 WWW=		https://github.com/ros-infrastructure/rosdistro
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ros-catkin_pkg>=0.4.0:devel/ros-catkin_pkg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}argparse>=1:devel/py-argparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ros-rospkg>=1:devel/ros-rospkg@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3:devel/py-pyyaml@${PY_FLAVOR}
 
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unittest2pytest>0:devel/py-unittest2pytest@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 USE_GITHUB=	yes
 GH_ACCOUNT=	ros-infrastructure
 GH_PROJECT=	rosdistro
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/ros-rosinstall_generator/Makefile b/devel/ros-rosinstall_generator/Makefile
index 519346f6dcd7..448935a7163a 100644
--- a/devel/ros-rosinstall_generator/Makefile
+++ b/devel/ros-rosinstall_generator/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	ros-rosinstall_generator
 DISTVERSION=	0.1.22
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	trueos@norwegianrockcat.com
 COMMENT=	Generator tool for a ROS install distro
 WWW=		https://github.com/ros-infrastructure/rosinstall_generator
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argparse>=1:devel/py-argparse@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 USE_GITHUB=	yes
 GH_ACCOUNT=	ros-infrastructure
 GH_PROJECT=	rosinstall_generator
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/ros-rospkg/Makefile b/devel/ros-rospkg/Makefile
index 63e9d02341e5..f48e90102a42 100644
--- a/devel/ros-rospkg/Makefile
+++ b/devel/ros-rospkg/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	ros-rospkg
 DISTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	trueos@norwegianrockcat.com
 COMMENT=	Python library for ROS packaging system
 WWW=		https://wiki.ros.org/rospkg
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argparse>=1:devel/py-argparse@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=	python
 USE_PYTHON=	distutils autoplist
 USE_GITHUB=	yes
 GH_ACCOUNT=	ros-infrastructure
 GH_PROJECT=	rospkg
 
 .include <bsd.port.mk>
diff --git a/devel/ros-vcstool/Makefile b/devel/ros-vcstool/Makefile
index 4b1d846a8398..0398d5c068ff 100644
--- a/devel/ros-vcstool/Makefile
+++ b/devel/ros-vcstool/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	ros-vcstool
 DISTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	trueos@norwegianrockcat.com
 COMMENT=	Version control system (VCS) tool for ROS
 WWW=		https://wiki.ros.org/vcstool
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3:devel/py-yaml@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=3:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dirk-thomas
 GH_PROJECT=	vcstool
 
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/devel/ros-vcstools/Makefile b/devel/ros-vcstools/Makefile
index 6aaede070ad2..eb400d42d868 100644
--- a/devel/ros-vcstools/Makefile
+++ b/devel/ros-vcstools/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	ros-vcstools
 DISTVERSION=	0.1.42
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	trueos@norwegianrockcat.com
 COMMENT=	Python library for interacting with various VCS systems
 WWW=		https://wiki.ros.org/vcstools
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-dateutil>=2:devel/py-python-dateutil@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=	python
 USE_PYTHON=	distutils autoplist
 USE_GITHUB=	yes
 GH_ACCOUNT=	vcstools
 GH_PROJECT=	vcstools
 
 .include <bsd.port.mk>
diff --git a/devel/ros-wstool/Makefile b/devel/ros-wstool/Makefile
index 4a50c9afb6cb..8c6409577f41 100644
--- a/devel/ros-wstool/Makefile
+++ b/devel/ros-wstool/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	ros-wstool
 DISTVERSION=	0.1.18
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	trueos@norwegianrockcat.com
 COMMENT=	Tool for managing a workspace of heterogenous SCM repositories
 WWW=		https://github.com/vcstools/wstool
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ros-vcstools>=0:devel/ros-vcstools@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=	python
 USE_PYTHON=	distutils autoplist
 USE_GITHUB=	yes
 GH_ACCOUNT=	vcstools
 GH_PROJECT=	wstool
 
 .include <bsd.port.mk>
diff --git a/devel/shroud/Makefile b/devel/shroud/Makefile
index 0c5f090c4305..6bdcc741b4f6 100644
--- a/devel/shroud/Makefile
+++ b/devel/shroud/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	shroud
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.13.0
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-wrapper-generator
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fortran and Python wrapper generator for C and C++ libraries
 WWW=		https://github.com/LLNL/shroud
 
 LICENSE=	BSD3CLAUSE
 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=	distutils autoplist noflavors
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	LLNL
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/dns/py-cloudflare/Makefile b/dns/py-cloudflare/Makefile
index 2995f75b9382..70179af240dc 100644
--- a/dns/py-cloudflare/Makefile
+++ b/dns/py-cloudflare/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	cloudflare
 PORTVERSION=	2.19.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Wrapper for the Cloudflare v4 API
 WWW=		https://github.com/cloudflare/python-cloudflare
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}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}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/dns/py-dns-lexicon/Makefile b/dns/py-dns-lexicon/Makefile
index 6cb2137214f1..38daff6146da 100644
--- a/dns/py-dns-lexicon/Makefile
+++ b/dns/py-dns-lexicon/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	dns-lexicon
 PORTVERSION=	3.17.0
+PORTREVISION=	1
 CATEGORIES=	dns python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	dns_lexicon-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Manipulate DNS records on various DNS providers in a standardized way
 WWW=		https://github.com/AnalogJ/lexicon
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dnspython>=2,1:dns/py-dnspython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyotp>=2:security/py-pyotp@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tldextract>=2:dns/py-tldextract@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent cryptography pep517
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	GRANSY LOCALZONE OCI ROUTE53 SOFTLAYER
 GRANSY_DESC=	Gransy support
 LOCALZONE_DESC=	localzone support
 OCI_DESC=	Oracle Cloud Infrastructure (OCI) support
 ROUTE53_DESC=	Route 53 support
 SOFTLAYER_DESC=	SoftLayer (IBM Cloud) support
 
 GRANSY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zeep>=3:net/py-zeep@${PY_FLAVOR}
 LOCALZONE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}localzone>=0.9.8:dns/py-localzone@${PY_FLAVOR}
 OCI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}oci>=2:devel/py-oci@${PY_FLAVOR}
 ROUTE53_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto3>=1.28:www/py-boto3@${PY_FLAVOR}
 SOFTLAYER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}softlayer>=5:net/py-softlayer@${PY_FLAVOR}
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 31000
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.6:devel/py-importlib-metadata@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/games/naev/Makefile b/games/naev/Makefile
index de5938b82e5b..c35fea69a7ed 100644
--- a/games/naev/Makefile
+++ b/games/naev/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	naev
 PORTVERSION=	0.10.6
 DISTVERSIONSUFFIX=	-source
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	games
 MASTER_SITES=	https://github.com/naev/naev/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	2D action/RPG space game
 WWW=		https://naev.org/
 
 LICENSE=	GPLv2 GPLv3 CC-BY-3.0 CC-BY-SA-3.0 PD
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 LIB_DEPENDS=	libamd.so:math/suitesparse-amd \
 		libbacktrace.so:devel/libbacktrace \
 		libblas.so:math/blas \
 		libcholmod.so:math/suitesparse-cholmod \
 		libcolamd.so:math/suitesparse-colamd \
 		libcxsparse.so:math/suitesparse-cxsparse \
 		libenet.so:net/enet \
 		libfreetype.so:print/freetype2 \
 		libglpk.so:math/glpk \
 		libopenblas.so:math/openblas \
 		libpcre2-8.so:devel/pcre2 \
 		libphysfs.so:devel/physfs \
 		libpng.so:graphics/png \
 		libunibreak.so:textproc/libunibreak \
 		libvorbisfile.so:audio/libvorbis \
 		libwebp.so:graphics/webp \
  		libzip.so:archivers/libzip
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		desktop-file-utils gettext gl gnome localbase:ldflags \
 		luajit:luajit-openresty meson openal pkgconfig python sdl \
 		shebangfix tar:xz
 USE_GL=		gl glu
 USE_GNOME=	intltool libxml2
 USE_SDL=	sdl2 image2
 
 SHEBANG_GLOB=	*.py *.sh
 
 MESON_ARGS=	-Ddocs_c=disabled -Ddocs_lua=disabled
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/games/open-adventure/Makefile b/games/open-adventure/Makefile
index ffd7f41d0f64..ab21fb9e9f49 100644
--- a/games/open-adventure/Makefile
+++ b/games/open-adventure/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	open-adventure
 PORTVERSION=	1.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 
 MAINTAINER=	se@FreeBSD.org
 COMMENT=	Modernized version of the original Colossal Cave Adventure game
 WWW=		http://www.catb.org/~esr/open-adventure/
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${PYTHONPREFIX_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		a2x:textproc/asciidoc
 
 USES=		gmake libedit pkgconfig python:build
 USE_GITLAB=	yes
 GL_ACCOUNT=	esr
 GL_TAGNAME=	${PORTVERSION}
 
 MAKE_ENV=	CCFLAGS="${CFLAGS}"
 ALL_TARGET=	advent
 
 PLIST_FILES=	bin/advent \
 		share/man/man6/advent.6.gz
 
 pre-build:
 		cd ${WRKSRC}; ${PYTHON_CMD} make_dungeon.py; a2x -f manpage advent.adoc
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/advent ${STAGEDIR}${PREFIX}/bin
 		${INSTALL_MAN} ${WRKSRC}/advent.6 ${STAGEDIR}${PREFIX}/share/man/man6
 
 .include <bsd.port.mk>
diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile
index 7924a8449f29..2217a10489c7 100644
--- a/games/stonesoup/Makefile
+++ b/games/stonesoup/Makefile
@@ -1,103 +1,104 @@
 PORTNAME=	stonesoup
 DISTVERSION=	0.31.0
+PORTREVISION=	1
 CATEGORIES=	games
 
 MAINTAINER=	fuz@FreeBSD.org
 COMMENT=	Dungeon Crawl Stone Soup - a fun, free rogue-like game
 WWW=		https://crawl.develz.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/../../LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 FLAVORS=	console sdl
 FLAVOR?=	${FLAVORS[1]}
 sdl_PKGNAMESUFFIX=	-sdl
 
 USES=		bison compiler:c++11-lib gmake lua:51 perl5 pkgconfig \
 		python:build shebangfix sqlite tar:xz
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	crawl
 GH_PROJECT=	crawl
 
 USE_PERL5=	build
 SHEBANG_FILES=	util/gen-mi-enum \
 		util/good-depfile \
 		util/species-gen.py \
 		util/txc
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 SAVEDIR=	\~/.stonesoup
 WRKSRC_SUBDIR=	crawl-ref/source
 GAME=${PORTNAME}${PKGNAMESUFFIX}
 
 SUB_FILES=	pkg-message
 PLIST_SUB=	SAVEDIR="${SAVEDIR}" GAME="${GAME}" SDL=${"${FLAVOR}" == "sdl":?"":"@comment "}
 
 MAKE_ARGS=	prefix=${PREFIX} \
 		DATADIR=${DATADIR} \
 		DESTDIR=${STAGEDIR} \
 		FORCE_CC=${CC} \
 		FORCE_CXX=${CXX} \
 		GAME=${GAME} \
 		INSTALL_UGRP=root:games \
 		LUA_PACKAGE=lua-5.1 \
 		NO_AUTO_OPT=YesPlease \
 		NO_OPTIMIZE=YesPlease \
 		NO_TRY_GOLD=YesPlease \
 		POSIX=YesPlease \
 		PYTHON=${PYTHON_CMD} \
 		SAVEDIR=${SAVEDIR} \
 		SQLITE_INCLUDE_DIR=${LOCALBASE}/include \
 		SQLITE_LIB=-lsqlite3 \
 		V=yes
 
 OPTIONS_DEFINE=	LUA NOWIZARD SOUND
 OPTIONS_DEFAULT=LUA
 OPTIONS_SUB=	yes
 
 NOWIZARD_DESC=	Disable Wizard mode
 LUA_DESC=	Bindings for LUA user scripts
 
 .if ${FLAVOR} == sdl
 USES+=		gl sdl
 USE_SDL=	sdl2 image2 mixer2
 USE_GL=		gl glu
 MAKE_ARGS+=	TILES=y SOUND=y
 BUILD_DEPENDS+=	\
 		fc-list:x11-fonts/fontconfig \
 		${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
 RUN_DEPENDS+=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
 LIB_DEPENDS+=libpng.so:graphics/png \
 		libfreetype.so:print/freetype2
 DESKTOP_ENTRIES=	"Dungeon Crawl Stone Soup" "${COMMENT}" "${DATADIR}/dat/tiles/stone_soup_icon-512x512.png" "${GAME}" "Game;" false
 .else
 USES+=		ncurses
 OPTIONS_DEFINE+=	SOUND
 SOUND_DESC=	Sound support
 SOUND_MAKE_ARGS=	SOUND=y
 SOUND_RUN_DEPENDS=	sox:audio/sox
 .endif
 
 NOWIZARD_MAKE_ARGS=	NOWIZARD=y
 LUA_MAKE_ARGS_OFF=	NO_LUA_BINDINGS=yes
 
 post-patch-SOUND-on:
 	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/sound.h
 	@${REINPLACE_CMD} -e "s,%%SOUND%%,," ${WRKSRC}/sound.h
 
 post-patch-SOUND-off:
 	@${REINPLACE_CMD} -e "s,%%SOUND%%,// ," ${WRKSRC}/sound.h
 
 pre-build:
 	@${ECHO} ${PKGVERSION} > ${WRKSRC}/util/release_ver
 
 pre-install:
 	@${FIND} ${WRKSRC}/dat -type f -name '*.orig' -delete
 
 post-install:
 	@${RM} -r ${STAGEDIR}${DATADIR}/settings/mac
 
 .include <bsd.port.mk>
diff --git a/games/unknown-horizons/Makefile b/games/unknown-horizons/Makefile
index 0a619108a16f..055402e31d57 100644
--- a/games/unknown-horizons/Makefile
+++ b/games/unknown-horizons/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	unknown-horizons
 PORTVERSION=	2019.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 
 MAINTAINER=	fiziologus@gmail.com
 COMMENT=	Real time simulation game
 WWW=		https://www.unknown-horizons.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/doc/licenses/GPL
 
 BUILD_DEPENDS=	${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fife>0:games/py-fife@${PY_FLAVOR} \
 		${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}
 
 USES=		gettext-tools gnome python shebangfix
 USE_GITHUB=	yes
 USE_GNOME=	intltool
 USE_PYTHON=	autoplist distutils noflavors
 SHEBANG_FILES=	run_uh.py
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		ENET NLS
 OPTIONS_DEFAULT=	ENET
 
 ENET_DESC=		Multipliplayer support through pyenet
 ENET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyenet>0:net/py-pyenet@${PY_FLAVOR}
 
 post-patch-ENET-off:
 	@${REINPLACE_CMD} -e 's|import enet|return None|' ${WRKSRC}/horizons/network/__init__.py
 
 post-patch-NLS-off:
 	@${REINPLACE_CMD} -e '/build.sub_commands.append.*build_i18n/ d' ${WRKSRC}/setup.py
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} UH_USER_DIR=${WRKSRC} ${PYTHON_CMD} horizons/engine/generate_atlases.py 2048
 
 post-install-NLS-off:
 	@${RM} -r ${STAGEDIR}${PREFIX}/share/locale
 
 .include <bsd.port.mk>
diff --git a/graphics/py-albumentations/Makefile b/graphics/py-albumentations/Makefile
index 6f3ca260b611..4d68853f193b 100644
--- a/graphics/py-albumentations/Makefile
+++ b/graphics/py-albumentations/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	albumentations
 DISTVERSION=	1.4.5
+PORTREVISION=	1
 CATEGORIES=	graphics python # machine-learning
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast image augmentation library and wrapper around other libraries
 WWW=		https://albumentations.ai/
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pydantic2>=2.6.4:devel/py-pydantic2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>0:graphics/py-scikit-image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=1.3.2:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.10.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.9.0:devel/py-typing-extensions@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}deepdiff>0:devel/py-deepdiff@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytorch>0:misc/py-pytorch@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist pytest # 10 errors in tests
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-glooey/Makefile b/graphics/py-glooey/Makefile
index ae93da3a25cb..a402dc1aefe5 100644
--- a/graphics/py-glooey/Makefile
+++ b/graphics/py-glooey/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	glooey
 PORTVERSION=	0.3.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics x11-toolkits python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Cross-platform windowing and multimedia library
 WWW=		https://pypi.org/project/glooey
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 # see https://github.com/kxgames/glooey/issues/56 regarding pyglet2 support
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyglet1>0:graphics/py-pyglet1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}vecrec>0:graphics/py-vecrec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}autoprop>0:devel/py-autoprop@${PY_FLAVOR}  \
 		${PYTHON_PKGNAMEPREFIX}debugtools>0:devel/py-debugtools@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		display:test python
 USE_PYTHON=	autoplist distutils pytest
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-pygeoapi/Makefile b/graphics/py-pygeoapi/Makefile
index 4b0aacc4f082..370545857365 100644
--- a/graphics/py-pygeoapi/Makefile
+++ b/graphics/py-pygeoapi/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	pygeoapi
 PORTVERSION=	0.15.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics geography python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	OGC API server implementation
 WWW=		https://pygeoapi.io/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unicodecsv>0:devel/py-unicodecsv@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flask>0:www/py-flask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask-Cors>0:www/py-flask-cors@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>0:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rasterio>0:graphics/py-rasterio@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 .include <bsd.port.mk>
diff --git a/graphics/py-urbanaccess/Makefile b/graphics/py-urbanaccess/Makefile
index 969e8bbaefe3..570e52558291 100644
--- a/graphics/py-urbanaccess/Makefile
+++ b/graphics/py-urbanaccess/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	urbanaccess
 PORTVERSION=	0.2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Tool for creating GTFS transit and OSM pedestrian networks
 WWW=		https://github.com/UDST/urbanaccess
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/License.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}geopy>=1.11.0:net/py-geopy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.11,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}osmnet>=0.1.4:graphics/py-osmnet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandana>=0.2.0:graphics/py-pandana@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.17.0,1:math/py-pandas@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.11:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.17.1:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.11:devel/py-six@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-urbansim/Makefile b/graphics/py-urbansim/Makefile
index d9467d798f77..52ba7dc0014d 100644
--- a/graphics/py-urbansim/Makefile
+++ b/graphics/py-urbansim/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	urbansim
 PORTVERSION=	3.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Platform for building statistical models of cities and regions
 WWW=		https://github.com/UDST/urbansim
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.8.0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}orca>=1.1:devel/py-orca@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.17.0,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}patsy>=0.4.1:math/py-patsy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prettytable>=0.7.2:devel/py-prettytable@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.10:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}statsmodels>=0.8:math/py-statsmodels@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toolz>=0.8.1:devel/py-toolz@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile
index 2137504d77f6..1fcd51ddc623 100644
--- a/graphics/qgis-ltr/Makefile
+++ b/graphics/qgis-ltr/Makefile
@@ -1,195 +1,196 @@
 PORTNAME=	qgis
 DISTVERSION=	3.34.8
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://qgis.org/downloads/
 PKGNAMESUFFIX=	-ltr
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Free and Open Source Geographic Information System
 WWW=		https://qgis.org/en/site/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 BUILD_DEPENDS=	gpsbabel>=1.7.0:astro/gpsbabel \
 		opencl>=0:devel/opencl \
 		${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.11.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8.2:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.20.2:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.18.1:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.2:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=2.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4.3:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=4.0.3:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.27.2:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=5.10.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=22.2.2:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=4.14.3:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.13.0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=3.4.0:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.5:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.28.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.16.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.16:databases/py-sqlite3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.4.1:devel/py-pyyaml@${PY_FLAVOR}
 LIB_DEPENDS=	libabsl_log_internal_check_op.so:devel/abseil \
 		libdraco.so:archivers/draco \
 		libexiv2.so:graphics/exiv2 \
 		libexpat.so:textproc/expat2 \
 		libfreexl.so:textproc/freexl \
 		libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libgsl.so:math/gsl \
 		libhdf5.so:science/hdf5 \
 		libmdal.so:math/mdal \
 		libminizip.so:archivers/minizip \
 		libnetcdf.so:science/netcdf \
 		libOpenCL.so:devel/ocl-icd \
 		libpdalcpp.so:math/pdal \
 		libproj.so:graphics/proj \
 		libprotobuf-lite.so:devel/protobuf \
 		libqjson-qt5.so:devel/qjson \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libqt5keychain.so:security/qtkeychain@qt5 \
 		libqwt.so:x11-toolkits/qwt6@qt5 \
 		librttopo.so:devel/librttopo \
 		libspatialindex.so:devel/spatialindex \
 		libspatialite.so:databases/spatialite \
 		libsz.so:science/libaec \
 		libxerces-c.so:textproc/xerces-c3 \
 		libzip.so:archivers/libzip \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	astyle:devel/astyle \
 		opencl>=0:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}black>=22.10:devel/py-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.11.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8.2:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Fiona>=1.8.21:graphics/py-fiona@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gdal>=3.5.2:graphics/py-gdal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geopandas>=0.11.1:graphics/py-geopandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.20.2:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.18.1:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.2:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}laspy>=2.5.1:misc/py-laspy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=2.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4.3:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=4.0.3:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>=5.7.0:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netCDF4>=1.6.2:science/py-netCDF4@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.8.8:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nltk>=3.7:textproc/py-nltk@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.27.2:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.5.0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=5.10.0:devel/py-pbr@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pip>=22.2.2:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=4.14.3:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.9.2:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.9.4:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.13.0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=3.4.0:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.4.1:graphics/py-pyrsgis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.5:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rasterio>=1.3.2:graphics/py-rasterio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.28.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>=0.19.3:graphics/py-scikit-image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=1.1.3:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}shapely>=1.8.5:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.16.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.16:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=2.1.0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xcffib>=0.11.1:x11/py-xcffib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=2.0.1:textproc/py-xlrd@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.4.1:devel/py-pyyaml@${PY_FLAVOR}
 
 ### Fortran is needed by numpy, GRASS, etc.
 USES=		bison cmake compiler:features desktop-file-utils \
 		fortran gl gmake gnome iconv pgsql pyqt:5 python qca qt:5 \
 		shebangfix sqlite:3 tar:bz2
 USE_GL=		gl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_PYQT=	pyqt5 qscintilla2 pysip sip
 USE_QT=		3d buildtools:build core concurrent dbus declarative \
 		designer:build qdoc:build gamepad gui linguist:build location \
 		multimedia network printsupport qmake:build script serialport \
 		sql sql-pgsql sql-sqlite3 svg testlib uitools:build \
 		webengine widgets xml
 
 SHEBANG_FILES=	src/plugins/grass/scripts/*.py
 
 # Python_EXECUTABLE: Use the default version if multiple Pythons are available
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DHAVE_PGCONFIG=1 \
 		-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
 		-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
 		-DPython_EXECUTABLE=${PYTHON_CMD} \
 		-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
 		-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
 		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt.so \
 		-DQGIS_MANUAL_SUBDIR:PATH=share/man
 CMAKE_ON=	USE_OPENCL WITH_ASTYLE WITH_BINDINGS WITH_COPC \
 		WITH_CUSTOM_WIDGETS WITH_DRACO WITH_EPT \
 		WITH_INTERNAL_LAZPERF WITH_POSTGRESQL
 CMAKE_OFF=	ENABLE_TESTS WITH_INTERNAL_MDAL WITH_QTWEBKIT WITH_QWTPOLAR
 
 # math/pdal fails in pdal_wrench() with "undefined reference to symbol 'pthread_create@@FBSD_1.0'"
 #CXXFLAGS+=	-pthread
 
 CONFLICTS_INSTALL=	qgis
 
 PLIST_SUB=	DISTVERSION=${PORTVERSION}
 
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-Wno-dev
 CMAKE_OFF+=	SUPPRESS_QT_WARNINGS
 .endif
 
 OPTIONS_DEFINE=		SERVER GRASS
 OPTIONS_DEFAULT=	SERVER GRASS
 NO_OPTIONS_SORT=	yes
 OPTIONS_SUB=		yes
 
 GRASS_DESC=		Add GRASS GIS to processing tools
 SERVER_DESC=		Enable QGIS server
 
 GRASS_BUILD_DEPENDS=	grass8:databases/grass8
 GRASS_RUN_DEPENDS=	${GRASS_BUILD_DEPENDS}
 GRASS_CMAKE_BOOL=	WITH_GRASS8
 SERVER_LIB_DEPENDS=	libfcgi.so:www/fcgi
 SERVER_CMAKE_BOOL=	WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE
 
 .include <bsd.port.pre.mk>
 
 pre-patch:
 	# Only PostgreSQL Client headers, not Server
 	@${REINPLACE_CMD} -e 's|set(POSTGRES_INCLUDE_DIR \$${PostgreSQL_INCLUDE_DIRS})|set(POSTGRES_INCLUDE ${LOCALBASE}/include)|g' \
 		${WRKSRC}/cmake/FindPostgres.cmake
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/cmake/FindGRASS.cmake
 # On i386, '-mllvm -inline-threshold=128' does not build under all circumstances
 # See bugs 242557 and 241687.
 .if ${OPSYS} == FreeBSD && ${ARCH} == "i386"
 	@${REINPLACE_CMD} -e 's|"-mllvm -inline-threshold=128"|"-O1"|g' \
 		${WRKSRC}/src/core/CMakeLists.txt
 .endif
 
 pre-configure:
 	${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3
 
 post-install:
 	@${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak
 	@${FIND} ${STAGEDIR}${LOCALBASE} -name "__pycache__" -delete
 	@${RM} /tmp/srs.db
 
 check:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.post.mk>
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index c86f0eaabbb9..5613e3b3a2fb 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -1,191 +1,192 @@
 PORTNAME=	qgis
 DISTVERSION=	3.38.0
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://qgis.org/downloads/
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Free and Open Source Geographic Information System
 WWW=		https://qgis.org/en/site/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 BUILD_DEPENDS=	gpsbabel>=1.7.0:astro/gpsbabel \
 		opencl>=0:devel/opencl \
 		${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.11.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8.2:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.20.2:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.18.1:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.2:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=2.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4.3:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=4.0.3:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.27.2:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=5.10.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=22.2.2:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=4.14.3:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.13.0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=3.4.0:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.5:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.28.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.16.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.16:databases/py-sqlite3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.4.1:devel/py-pyyaml@${PY_FLAVOR}
 LIB_DEPENDS=	libabsl_log_internal_check_op.so:devel/abseil \
 		libdraco.so:archivers/draco \
 		libexiv2.so:graphics/exiv2 \
 		libexpat.so:textproc/expat2 \
 		libfreexl.so:textproc/freexl \
 		libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libgsl.so:math/gsl \
 		libhdf5.so:science/hdf5 \
 		libmdal.so:math/mdal \
 		libminizip.so:archivers/minizip \
 		libnetcdf.so:science/netcdf \
 		libOpenCL.so:devel/ocl-icd \
 		libpdalcpp.so:math/pdal \
 		libproj.so:graphics/proj \
 		libprotobuf-lite.so:devel/protobuf \
 		libqjson-qt5.so:devel/qjson \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libqt5keychain.so:security/qtkeychain@qt5 \
 		libqwt.so:x11-toolkits/qwt6@qt5 \
 		librttopo.so:devel/librttopo \
 		libspatialindex.so:devel/spatialindex \
 		libspatialite.so:databases/spatialite \
 		libsz.so:science/libaec \
 		libxerces-c.so:textproc/xerces-c3 \
 		libzip.so:archivers/libzip \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	astyle:devel/astyle \
 		opencl>=0:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}black>=22.10:devel/py-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cycler>=0.11.0:devel/py-cycler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8.2:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Fiona>=1.8.21:graphics/py-fiona@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gdal>=3.5.2:graphics/py-gdal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geojson>=2.3.0:devel/py-geojson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geopandas>=0.11.1:graphics/py-geopandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.20.2:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.18.1:devel/py-jedi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.2:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}laspy>=2.5.1:misc/py-laspy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=2.1.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4.3:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=4.0.3:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>=5.7.0:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netCDF4>=1.6.2:science/py-netCDF4@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.8.8:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nltk>=3.7:textproc/py-nltk@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.27.2:graphics/py-OWSLib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.5.0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=5.10.0:devel/py-pbr@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pip>=22.2.2:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=4.14.3:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.9.2:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.9.4:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.13.0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=3.4.0:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.4.1:graphics/py-pyrsgis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2020.5:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rasterio>=1.3.2:graphics/py-rasterio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.28.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>=0.19.3:graphics/py-scikit-image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=1.1.3:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}shapely>=1.8.5:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.16.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.16:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=2.1.0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xcffib>=0.11.1:x11/py-xcffib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=2.0.1:textproc/py-xlrd@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.4.1:devel/py-pyyaml@${PY_FLAVOR}
 
 ### Fortran is needed by numpy, GRASS, etc.
 USES=		bison cmake compiler:features desktop-file-utils \
 		fortran gl gmake gnome iconv pgsql pyqt:5 python qca qt:5 \
 		shebangfix sqlite:3 tar:bz2
 USE_GL=		gl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_PYQT=	pyqt5 qscintilla2 pysip sip
 USE_QT=		3d buildtools:build core concurrent dbus declarative \
 		designer:build qdoc:build gamepad gui linguist:build location \
 		multimedia network printsupport qmake:build script serialport \
 		sql sql-pgsql sql-sqlite3 svg testlib uitools:build \
 		webengine widgets xml
 
 SHEBANG_FILES=	src/plugins/grass/scripts/*.py
 
 # Python_EXECUTABLE: Use the default version if multiple Pythons are available
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DHAVE_PGCONFIG=1 \
 		-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
 		-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
 		-DPython_EXECUTABLE=${PYTHON_CMD} \
 		-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
 		-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
 		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt.so \
 		-DQGIS_MANUAL_SUBDIR:PATH=share/man
 CMAKE_ON=	USE_OPENCL WITH_ASTYLE WITH_BINDINGS WITH_COPC \
 		WITH_CUSTOM_WIDGETS WITH_DRACO WITH_EPT \
 		WITH_INTERNAL_LAZPERF WITH_POSTGRESQL
 CMAKE_OFF=	ENABLE_TESTS WITH_INTERNAL_MDAL WITH_QTWEBKIT WITH_QWTPOLAR
 
 CONFLICTS_INSTALL=	qgis-ltr
 
 PLIST_SUB=	DISTVERSION=${PORTVERSION}
 
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-Wno-dev
 CMAKE_OFF+=	SUPPRESS_QT_WARNINGS
 .endif
 
 OPTIONS_DEFINE=		SERVER GRASS
 OPTIONS_DEFAULT=	SERVER GRASS
 NO_OPTIONS_SORT=	yes
 OPTIONS_SUB=		yes
 
 GRASS_DESC=		Add GRASS GIS to processing tools
 SERVER_DESC=		Enable QGIS server
 
 GRASS_BUILD_DEPENDS=	grass8:databases/grass8
 GRASS_RUN_DEPENDS=	${GRASS_BUILD_DEPENDS}
 GRASS_CMAKE_BOOL=	WITH_GRASS8
 SERVER_LIB_DEPENDS=	libfcgi.so:www/fcgi
 SERVER_CMAKE_BOOL=	WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE
 
 .include <bsd.port.pre.mk>
 
 pre-patch:
 	# Only PostgreSQL Client headers, not Server
 	@${REINPLACE_CMD} -e 's|set(POSTGRES_INCLUDE_DIR \$${PostgreSQL_INCLUDE_DIRS})|set(POSTGRES_INCLUDE ${LOCALBASE}/include)|g' \
 		${WRKSRC}/cmake/FindPostgres.cmake
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/cmake/FindGRASS.cmake
 # On i386, '-mllvm -inline-threshold=128' does not build under all circumstances
 # See bugs 242557 and 241687.
 .if ${OPSYS} == FreeBSD && ${ARCH} == "i386"
 	@${REINPLACE_CMD} -e 's|"-mllvm -inline-threshold=128"|"-O1"|g' \
 		${WRKSRC}/src/core/CMakeLists.txt
 .endif
 
 pre-configure:
 	${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3
 
 post-install:
 	@${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak
 	@${FIND} ${STAGEDIR}${LOCALBASE} -name "__pycache__" -delete
 	@${RM} /tmp/srs.db
 
 check:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.post.mk>
diff --git a/lang/rizin/Makefile b/lang/rizin/Makefile
index 196527695727..39fe6f104023 100644
--- a/lang/rizin/Makefile
+++ b/lang/rizin/Makefile
@@ -1,55 +1,56 @@
 PORTNAME=	rizin
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.7.3
+PORTREVISION=	1
 CATEGORIES=	lang security shells
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	UNIX-like reverse engineering framework and command-line toolset
 WWW=		https://rizin.re/
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3 =	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL3 =	${WRKSRC}/COPYING.LESSER
 
 NOT_FOR_ARCHS=	armv6 armv7
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 LIB_DEPENDS=	libcapstone.so:devel/capstone \
 		libmspack.so:archivers/libmspack \
 		libxxhash.so:devel/xxhash \
 		libpcre2-8.so:devel/pcre2 \
 		libtree-sitter.so:devel/tree-sitter \
 		liblz4.so:archivers/liblz4 \
 		libzip.so:archivers/libzip \
 		libzstd.so:archivers/zstd
 
 USES=		localbase meson pkgconfig python:build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rizinorg
 GH_TUPLE=	rizinorg:rz-libdemangle:0031d1a:libdemangle/subprojects/libdemangle \
 		rizinorg:tree-sitter-c:81d96d8:tree_sitter_c/subprojects/tree-sitter-c \
 		BLAKE3-team:BLAKE3:54930c9:blake3/subprojects/blake3
 
 MESON_ARGS=	-D use_sys_capstone=enabled \
 		-D use_sys_magic=enabled \
 		-D use_sys_libzip=enabled \
 		-D use_sys_zlib=enabled \
 		-D use_sys_lz4=enabled \
 		-D use_sys_lzma=enabled \
 		-D use_sys_xxhash=enabled \
 		-D use_sys_pcre2=enabled \
 		-D use_sys_libmspack=enabled \
 		-D use_sys_tree_sitter=enabled \
 		-D enable_rz_test=false \
 		-D use_sys_libzstd=enabled \
 
 TESTING_UNSAFE=	requires additional test input files
 
 post-extract:
 	${CP} -r ${WRKSRC}/subprojects/packagefiles/blake3 ${WRKSRC}/subprojects
 	${CP} -r ${WRKSRC}/subprojects/packagefiles/tree-sitter-c ${WRKSRC}/subprojects
 	${CP} ${WRKSRC}/librz/debug/p/native/linux/reg/linux-ppc64.h ${WRKSRC}/librz/debug/p/native/reg/kfbsd-ppc64.h
 
 .include <bsd.port.mk>
diff --git a/mail/py-postfix-mta-sts-resolver/Makefile b/mail/py-postfix-mta-sts-resolver/Makefile
index 3ef30af6df59..61a29fd3faeb 100644
--- a/mail/py-postfix-mta-sts-resolver/Makefile
+++ b/mail/py-postfix-mta-sts-resolver/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	postfix-mta-sts-resolver
 PORTVERSION=	1.1.2
 DISTVERSIONPREFIX=v
+PORTREVISION=	1
 CATEGORIES=	mail python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nork@FreeBSD.org
 COMMENT=	TLS client policy for Postfix according to domain MTA-STS policy
 WWW=		https://pypi.python.org/pypi/postfix-mta-sts-resolver
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiodns>=3.0.0:dns/py-aiodns@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}aiohttp>=3.4.4:www/py-aiohttp@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.12:devel/py-pyyaml@${PY_FLAVOR} \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 USES=		python
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist distutils
 
 GH_ACCOUNT=	Snawoot
 
 OPTIONS_DEFINE=	REDIS SQLITE UVLOOP
 
 REDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aioredis>=1.2.0:databases/py-aioredis@${PY_FLAVOR}
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiosqlite>=1.10.0:databases/py-aiosqlite@${PY_FLAVOR}
 UVLOOP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}uvloop>=0.11.0:devel/py-uvloop@${PY_FLAVOR}
 
 USE_RC_SUBR=	mta_sts
 
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
 PLIST_FILES=	"@sample etc/mta-sts-daemon.yml.sample"
 
 post-extract:
 	${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|' \
 		${WRKSRC}/postfix_mta_sts_resolver/defaults.py
 
 post-install:
 	${CP} ${WRKSRC}/config_examples/mta-sts-daemon.yml.internal ${STAGEDIR}${PREFIX}/etc/mta-sts-daemon.yml.sample
 
 .include <bsd.port.mk>
diff --git a/mail/py-pyspf/Makefile b/mail/py-pyspf/Makefile
index f7e75d0d2437..ccae8db7cd2b 100644
--- a/mail/py-pyspf/Makefile
+++ b/mail/py-pyspf/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	pyspf
 PORTVERSION=	2.0.14
 PORTREVISION=	2
 CATEGORIES=	mail python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	SPF (Sender Policy Framework) implemented in Python
 WWW=		https://github.com/sdgathman/pyspf
 
 LICENSE=	PSFL
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}authres>=0:mail/py-authres@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dnspython>=1.16.0,1:dns/py-dnspython@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python shebangfix
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 PLIST_FILES=	bin/spf.py
 
 SHEBANG_FILES=	spf.py
 
 # Make the tests run as a module
 post-patch:
 	@${TOUCH} ${WRKSRC}/test/__init__.py
 
 post-install:
 	${CHMOD} ${BINMODE} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/spf.py
 	${RLN} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/spf.py ${STAGEDIR}${PREFIX}/bin/
 
 do-test:
 	cd ${WRKSRC}/ && ${PYTHON_CMD} -m test.testspf
 
 .include <bsd.port.mk>
diff --git a/mail/slimta/Makefile b/mail/slimta/Makefile
index 8eb7a8902444..98963a2d85ea 100644
--- a/mail/slimta/Makefile
+++ b/mail/slimta/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	slimta
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	PYPI
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	Configurable MTA based on the python-slimta libraries
 WWW=		https://www.slimta.org/
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-slimta>0:mail/py-python-slimta@${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
 USE_RC_SUBR=	${PORTNAME}
 REINPLACE_ARGS=	-i ''
 NO_ARCH=	yes
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
 
 PLIST_FILES=	"@sample etc/slimta/logging.yaml.sample" \
 		"@sample etc/slimta/slimta.yaml.sample"
 
 post-patch:
 .for file in setup main state
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/${PORTNAME}/app/${file}.py
 .endfor
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}
 .for file in logging ${PORTNAME}
 	@${CP} ${WRKSRC}/${PORTNAME}/app/etc/${file}.yaml.sample ${STAGEDIR}${PREFIX}/etc/${PORTNAME}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/math/py-flax/Makefile b/math/py-flax/Makefile
index 7342aaa5d3e3..279f66f29067 100644
--- a/math/py-flax/Makefile
+++ b/math/py-flax/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	flax
 PORTVERSION=	0.6.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Neural network library for JAX designed for flexibility
 WWW=		https://github.com/google/flax
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jax>=0.4.2:math/py-jax@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.12,1:math/py-numpy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.4.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rich>=11.1:textproc/py-rich@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.1.1:devel/py-typing-extensions@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-fvcore/Makefile b/math/py-fvcore/Makefile
index 50b508012db5..43edc03b0fd7 100644
--- a/math/py-fvcore/Makefile
+++ b/math/py-fvcore/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	fvcore
 PORTVERSION=	0.1.5.post20220512
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Shared code among different Facebook research projects
 WWW=		https://github.com/facebookresearch/fvcore
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}iopath>0:devel/py-iopath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yacs>0:devel/py-yacs@${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
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/math/py-mathics-scanner/Makefile b/math/py-mathics-scanner/Makefile
index b7ba66eff737..05068004895d 100644
--- a/math/py-mathics-scanner/Makefile
+++ b/math/py-mathics-scanner/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	Mathics_Scanner
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Tokeniser, char tables, & conversion routines for the Wolfram Language
 WWW=		https://mathics.org/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ujson>0:devel/py-ujson@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ujson>0:devel/py-ujson@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	gmake:devel/gmake	\
 		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 #USE_GITHUB=	yes
 #GH_ACCOUNT=	Mathics3
 
 USES=		python shebangfix
 USE_PYTHON=	distutils noflavors
 
 NO_ARCH=	yes
 MAKE_ENV+=	PYTHON=${PYTHON_CMD}
 PLIST_SUB+=	VER=${PORTVERSION}
 TEST_TARGET=	check
 TEST_ENV=	${MAKE_ENV}
 
 do-test: install
 	(cd ${TEST_WRKSRC} &&	\
 	${SETENV} ${TEST_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${TEST_TARGET})
 
 .include <bsd.port.mk>
diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile
index 2b80adb042bb..04bcf5383cc8 100644
--- a/math/py-networkx/Makefile
+++ b/math/py-networkx/Makefile
@@ -1,70 +1,71 @@
 PORTNAME=	networkx
 DISTVERSION=	3.3
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Tools for complex networks
 WWW=		https://networkx.github.io/
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 #RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}decorator>=4.3.0:devel/py-decorator@${PY_FLAVOR}
 
 USES=		cpe python shebangfix
 USE_PYTHON=	autoplist concurrent pep517 pytest
 
 SHEBANG_GLOB=	*.py
 NO_ARCH=	yes
 CPE_VENDOR=	python
 
 #PLIST_SUB+=	PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER}
 
 OPTIONS_DEFINE=	EXAMPLES GDAL LXML PANDAS PYDOT YAML
 OPTIONS_GROUP=	MATRIX RENDER
 OPTIONS_GROUP_MATRIX=	NUMPY SCIPY
 OPTIONS_GROUP_RENDER=	MPL GRAPHVIZ
 OPTIONS_DEFAULT=	NUMPY SCIPY MPL GDAL GRAPHVIZ LXML PANDAS PYDOT YAML
 
 NUMPY_DESC=	Matrix representation of graphs
 NUMPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.20.0,1:math/py-numpy@${PY_FLAVOR}
 
 SCIPY_DESC=	Sparse matrix representation of graphs
 SCIPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>=1.8:science/py-scipy@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}scikit-sparse>=0.2:science/py-scikit-sparse@${PY_FLAVOR}
 
 MPL_DESC=	Flexible graph rendering
 MPL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4.0:math/py-matplotlib@${PY_FLAVOR}
 
 GDAL_DESC=	Support of raster geospatial data formats
 GDAL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdal>=0:graphics/py-gdal@${PY_FLAVOR}
 
 GRAPHVIZ_DESC=	Additional graph layout and rendering algorithms
 GRAPHVIZ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.2:graphics/py-pygraphviz@${PY_FLAVOR}
 
 LXML_DESC=	Binding for the libxml2 and libxslt libraries
 LXML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR}
 
 PANDAS_DESC=	Data analysis
 PANDAS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>=1.3:math/py-pandas@${PY_FLAVOR}
 
 PYDOT_DESC=	Graphviz Dot language
 PYDOT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot@${PY_FLAVOR}
 
 YAML_DESC=	Reading and writing YAML files
-YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
+YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 PORTEXAMPLES=	*
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 do-test: install
 	(cd ${WRKSRC} && py.test)
 
 .include <bsd.port.mk>
diff --git a/math/py-rvlib/Makefile b/math/py-rvlib/Makefile
index 3a665d513ffb..1234a44a34d3 100644
--- a/math/py-rvlib/Makefile
+++ b/math/py-rvlib/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	rvlib
 PORTVERSION=	0.0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Probability distributions mimicking Distrbutions.jl
 WWW=		https://github.com/QuantEcon/rvlib
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numba>=0.49:devel/py-numba@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${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
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/misc/orange3/Makefile b/misc/orange3/Makefile
index 990856e98b9a..486813ad8170 100644
--- a/misc/orange3/Makefile
+++ b/misc/orange3/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	orange3
 DISTVERSION=	3.29.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	misc python
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Component-based data mining software
 WWW=		https://orange.biolab.si/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}AnyQt>=0.0.11:x11-toolkits/py-AnyQt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}baycomp>=1.0.2:math/py-baycomp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}bottleneck>=1.0.0:math/py-bottleneck@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>=3.0.2:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}joblib>=0.9.4:devel/py-joblib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httpx>=0.14.0:www/py-httpx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keyrings.alt>0:security/py-keyrings.alt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.0.0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openTSNE>=0.6.0:math/py-openTSNE@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}orange-canvas-core>=0.1.19:devel/py-orange-canvas-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}orange-widget-base>=4.13.0:devel/py-orange-widget-base@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openpyxl>0:textproc/py-openpyxl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.0.0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=9.0:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-louvain>=0.13:math/py-python-louvain@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyqtgraph>=0.11.1:graphics/py-pyqtgraph@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.22.0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.16.1:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}serverfiles>0:misc/py-serverfiles@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=0.9.2:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python pyqt:5
 USE_PYTHON=	distutils cython autoplist noflavors
 USE_PYQT=	pyqt5:run webengine:run
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	biolab
 
 CFLAGS+=	-DQSORT_R_STYLE_BSD=yes
 LDFLAGS+=	-Xlinker -strip-all # strip, stage-qa doesn't catch that it isn't stripped
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386
 USE_PYQT+=	webengine:run
 .else
 USE_PYQT+=	webkit:run
 .endif
 
 xpost-install:
 	@${REINPLACE_CMD} -e 's|^"${PREFIX}/|| ; s|"$$||' ${_PYTHONPKGLIST} # https://github.com/biolab/orange3/issues/3060
 	@${REINPLACE_CMD} -e 's|import sys|& ; from OpenGL import GL|' ${STAGEDIR}${PREFIX}/bin/orange-canvas # https://github.com/biolab/orange3/issues/3062
 
 .include <bsd.port.mk>
diff --git a/misc/pubs/Makefile b/misc/pubs/Makefile
index 02d69b245da8..d8aea4c9960b 100644
--- a/misc/pubs/Makefile
+++ b/misc/pubs/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	pubs
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc python
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Your bibliography on the command line
 WWW=		https://github.com/pubs/pubs
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/license
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}bibtexparser>=1.0:textproc/py-bibtexparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${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}
 
 USES=		python
 USE_GITHUB=	yes
 USE_PYTHON=	distutils autoplist noflavors
 NO_ARCH=	yes
 
 PORTSCOUT=	skipv:show_and_search
 
 .include <bsd.port.mk>
diff --git a/misc/py-accelerate/Makefile b/misc/py-accelerate/Makefile
index 4964ef8169e3..25fdbddf6b6a 100644
--- a/misc/py-accelerate/Makefile
+++ b/misc/py-accelerate/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	accelerate
 DISTVERSION=	0.32.1
+PORTREVISION=	1
 CATEGORIES=	misc # machine-learning
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	PyTorch: simple way to launch, train, use PyTorch models on any device
 WWW=		https://huggingface.co/docs/accelerate/index
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}huggingface-hub>0:misc/py-huggingface-hub@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytorch>=1.10.0:misc/py-pytorch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}safetensors>=0.3.1:misc/py-safetensors@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}parameterized>0:devel/py-parameterized@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}torchvision>0:misc/py-torchvision@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	pep517 autoplist pytest # tests fail because they depend on the module 'transformers' that depends on 'accelerate' and isn't yet ported
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/py-apache-beam/Makefile b/misc/py-apache-beam/Makefile
index 29b2f241f5b8..007bfa13f7ab 100644
--- a/misc/py-apache-beam/Makefile
+++ b/misc/py-apache-beam/Makefile
@@ -1,61 +1,61 @@
 PORTNAME=	apache-beam
 DISTVERSION=	2.43.0
 PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Apache Beam SDK for Python
 WWW=		https://beam.apache.org/
 
 LICENSE=	APACHE20
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cloudpickle>=2.2.0:devel/py-cloudpickle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}crcmod>=1.7:devel/py-crcmod@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8.0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dill>=0.3.1.1:devel/py-dill@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fastavro>=0.23.6:textproc/py-fastavro@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fasteners>=0.3:devel/py-fasteners@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}grpcio>=1.33.1>0:devel/py-grpcio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hdfs>=2.1.0:www/py-hdfs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.8:www/py-httplib2@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}orjson<4.0:devel/py-orjson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}objsize>=0.5.2:devel/py-objsize@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}proto-plus>=1.7.1:devel/py-proto-plus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=3.12.2:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydot>=1.2.0:graphics/py-pydot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pymongo>=3.8.0:databases/py-pymongo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2018.3:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}regex>=2020.6.8:textproc/py-regex@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.24.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.7.0:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zstandard>=0.18.0:archivers/py-zstandard@${PY_FLAVOR}
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
 		${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}freezegun>=0.3.12:devel/py-freezegun@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}joblib>=0.3.12:devel/py-joblib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}parameterized>=0.7.1:devel/py-parameterized@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.5:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyHamcrest>=1.9:textproc/py-pyhamcrest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-timeout>=1.3.3:devel/py-pytest-timeout@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.29.0:devel/py-pytest-xdist@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-mock>=1.7:www/py-requests-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tenacity>=5.0.2:devel/py-tenacity@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.20.0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=1.3:databases/py-sqlalchemy14@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.12:devel/py-pyyaml@${PY_FLAVOR}
 		# testcontainers[mysql]>=3.0.3 is also required
 
 USES=		python zip
 USE_PYTHON=	autoplist concurrent cryptography_test cython distutils pytest # 5 tests fail, depending on pyarrow, MySqlContainer, threadpoolctl
 
 post-install:
 	# strip binaries
 	@${FIND} ${STAGEDIR}${PREFIX} -name "*${PYTHON_EXT_SUFFIX}.so" | ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/misc/py-huggingface-hub/Makefile b/misc/py-huggingface-hub/Makefile
index b732ba269dfe..40af797d4489 100644
--- a/misc/py-huggingface-hub/Makefile
+++ b/misc/py-huggingface-hub/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	huggingface-hub
 DISTVERSION=	0.23.4
+PORTREVISION=	1
 CATEGORIES=	misc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME:S/-/_/}-${DISTVERSION}
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Official Python client for the Huggingface Hub
 WWW=		https://github.com/huggingface/huggingface_hub
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}filelock>0:sysutils/py-filelock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fsspec>=2023.5.0:devel/py-fsspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=20.9:devel/py-packaging@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>=4.42.1:misc/py-tqdm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.7.4.3:devel/py-typing-extensions@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/misc/py-mmcv/Makefile b/misc/py-mmcv/Makefile
index 6de8135c6d7e..e95de468aad7 100644
--- a/misc/py-mmcv/Makefile
+++ b/misc/py-mmcv/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	mmcv
 #DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	misc # machine-learning
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	OpenMMLab: Foundational library for computer vision research
 WWW=		https://mmcv.readthedocs.io/en/latest/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	ninja:devel/ninja \
 		${PREFIX}/include/pybind11/pybind11.h:devel/pybind11 \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pytorch>0:misc/py-pytorch@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}addict>0:devel/py-addict@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mmengine>=0.3.0:misc/py-mmengine@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}yapf>0:textproc/py-yapf@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		compiler:c++17-lang localbase python
 USE_PYTHON=	distutils cython autoplist # pytest: many test dependencies are missing
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/mmcv/_ext${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/misc/py-mmengine/Makefile b/misc/py-mmengine/Makefile
index ebbe7b061df6..b0e666d4d175 100644
--- a/misc/py-mmengine/Makefile
+++ b/misc/py-mmengine/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	mmengine
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.10.4
+PORTREVISION=	1
 CATEGORIES=	misc # machine-learning
 #MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Engine of OpenMMLab projects: training PyTorch deep learning models
 WWW=		https://mmengine.readthedocs.io/en/latest/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}addict>0:devel/py-addict@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}rich>0:textproc/py-rich@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yapf>0:textproc/py-yapf@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist # pytest: many test dependencies are missing
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	open-mmlab
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/py-onnx-tf/Makefile b/misc/py-onnx-tf/Makefile
index 604833ccffef..8e62c95cf3e9 100644
--- a/misc/py-onnx-tf/Makefile
+++ b/misc/py-onnx-tf/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	onnx-tf
 DISTVERSION=	1.10.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc python # machine-learning
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Tensorflow backend for ONNX (Open Neural Network Exchange)
 WWW=		https://github.com/onnx/onnx-tensorflow/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}onnx>0:misc/py-onnx@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils concurrent autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/py-optuna/Makefile b/misc/py-optuna/Makefile
index 937ea459fe3f..e4e37980ad08 100644
--- a/misc/py-optuna/Makefile
+++ b/misc/py-optuna/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	optuna
 DISTVERSION=	3.6.1
+PORTREVISION=	1
 CATEGORIES=	misc # machine-learning
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Hyperparameter optimization framework
 WWW=		https://optuna.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}alembic>=1.5.0:databases/py-alembic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorlog>0:devel/py-colorlog@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=1.3.0:databases/py-sqlalchemy14@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fakeredis>=0:databases/py-fakeredis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}moto>=0:devel/py-moto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytorch>=0:misc/py-pytorch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.9.2:science/py-scipy@${PY_FLAVOR}
 		# tests also depend on Kaleido but it isn't clear how to build it
 
 USES=		python
 USE_PYTHON=	pep517 concurrent autoplist pytest
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/py-papermill/Makefile b/misc/py-papermill/Makefile
index 3f0ef83777ce..497f9f7d819c 100644
--- a/misc/py-papermill/Makefile
+++ b/misc/py-papermill/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	papermill
 DISTVERSION=	2.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc python
 #MASTER_SITES=	PYPI using the latest revision
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Parameterize, execute, and analyze notebooks
 WWW=		https://papermill.readthedocs.io/en/latest/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansicolors>0:textproc/py-ansicolors@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}entrypoints>0:devel/py-entrypoints@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbclient>=0.2.0:devel/py-nbclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>=5.2.0:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tenacity>=5.0.2:devel/py-tenacity@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>=4.32.2:misc/py-tqdm@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}azure-datalake-store>=0.0.30:devel/py-azure-datalake-store@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-storage-blob>=12.1.0:devel/py-azure-storage-blob@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}moto>0:devel/py-moto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbclient>0:devel/py-nbclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>0:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-env>0:devel/py-pytest-env@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	nteract
 
 NO_ARCH=	yes
 
 PORTSCOUT=	limit:^.*[0-9]\.[0-9].*$$ # prevent tags like push
 
 .include <bsd.port.mk>
diff --git a/misc/py-pytorch-lightning/Makefile b/misc/py-pytorch-lightning/Makefile
index 40fdae428f7c..40ab438d6be9 100644
--- a/misc/py-pytorch-lightning/Makefile
+++ b/misc/py-pytorch-lightning/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	pytorch-lightning
 DISTVERSION=	2.3.2
+PORTREVISION=	1
 CATEGORIES=	misc python # machine-learning
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Lightweight PyTorch wrapper for ML researchers
 WWW=		https://lightning.ai/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>=2022.5.0:devel/py-fsspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lightning-utilities>=0.8.0:misc/py-lightning-utilities@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytorch>=2.0.0:misc/py-pytorch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}torchmetrics>=0.7.0:misc/py-torchmetrics@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>=4.57.0:misc/py-tqdm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.4.0:devel/py-typing-extensions@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.4:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.4:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	pep517 autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/py-pytorch/Makefile b/misc/py-pytorch/Makefile
index d69d72d7887e..c259cedd4fa0 100644
--- a/misc/py-pytorch/Makefile
+++ b/misc/py-pytorch/Makefile
@@ -1,83 +1,83 @@
 PORTNAME=	pytorch
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc # machine-learning
 MASTER_SITES=	https://github.com/pytorch/pytorch/releases/download/v${DISTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	${PORTNAME}-${DISTVERSIONFULL}${EXTRACT_SUFX} # the main tarball disappears when GH_xx tags are added w/out this line
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	PyTorch: Tensors and dynamic neural networks in Python
 WWW=		https://pytorch.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=	build fails: CMake Error at third_party/QNNPACK/CMakeLists.txt:47 (MESSAGE): Unrecognized CMAKE_SYSTEM_NAME = FreeBSD
 BROKEN_i386=	build fails: DispatchStub.cpp:162:29: [0m[0;1;31merror: [0m[1muse of undeclared identifier 'AVX2'[0m
 
 BUILD_DEPENDS=	cmake:devel/cmake-core \
 		gmake:devel/gmake \
 		pybind11>0:devel/pybind11 \
 		${PYNUMPY} \
 		${LOCALBASE}/include/fxdiv.h:devel/fxdiv \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 LIB_DEPENDS=	libabsl_flags.so:devel/abseil \
 		libblis.so:math/blis \
 		libmpi_cxx.so:net/openmpi4 \
 		libonnx.so:misc/onnx \
 		libopenblas.so:math/openblas \
 		libpthreadpool.so:devel/pthreadpool \
 		libprotobuf.so:devel/protobuf \
 		libsleef.so:math/sleef
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}filelock>0:sysutils/py-filelock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dill>0:devel/py-dill@${PY_FLAVOR} # optional dependency
 
 USES=		compiler:c++17-lang localbase:ldflags python
 USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	nodefault
 GH_TUPLE=	pytorch:cpuinfo:3a3b76bc8845d0f4a2ea3108e256313458c5de03:cpuinfo/cpuinfo-with-freebsd-support # https://github.com/pytorch/cpuinfo/pull/230/commits
 
 MAKE_ENV=	USE_NINJA=no # ninja breaks for some reason
 MAKE_ENV+=	BUILD_TEST=0 # ninja breaks for some reason
 MAKE_ENV+=	USE_MKLDNN=0 # disable MKLDNN that doesn't exist, see https://github.com/pytorch/pytorch/issues/100957
 MAKE_ENV+=	USE_CUDNN=0
 MAKE_ENV+=	USE_LAPACK=1 # needed on FreeBSD to run w/out GPU
 LDFLAGS+=	-lexecinfo
 
 BINARY_ALIAS=	make=${GMAKE}
 
 POST_PLIST=	fix-plist
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 USES+=	llvm:max=15
 .endif
 
 post-patch:
 	@cd ${WRKSRC} && \
 		${RM} -r third_party/cpuinfo third_party/fbgemm/third_party/cpuinfo && \
 		${CP} -r cpuinfo-with-freebsd-support third_party/cpuinfo && \
 		${CP} -r cpuinfo-with-freebsd-support third_party/fbgemm/third_party/cpuinfo
 
 post-install: # strip binaries
 	@${STRIP_CMD} \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/torch/bin/torch_shm_manager \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/torch/_C${PYTHON_EXT_SUFFIX}.so \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/functorch/_C${PYTHON_EXT_SUFFIX}.so \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/torch/lib/lib*.so
 
 fix-plist: # remove the stray %%PYTHON_SITELIBDIR%%/caffe2 file
 	@${REINPLACE_CMD} -e "s|.*/caffe2$$||" ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/misc/py-sigopt/Makefile b/misc/py-sigopt/Makefile
index 15b42a096259..bb28cf457214 100644
--- a/misc/py-sigopt/Makefile
+++ b/misc/py-sigopt/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	sigopt
 DISTVERSION=	8.8.3
+PORTREVISION=	1
 CATEGORIES=	misc python # machine-learning
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	SigOpt Python API client
 WWW=		https://sigopt.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}backoff>=1.10.0:devel/py-backoff@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=8.0.0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gitpython>=2.0.0:devel/py-gitpython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=21.3:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}png>0:graphics/py-png@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.25.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.26.5:net/py-urllib3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	pep517 autoplist # pytest - missing dependencies, like hyperopt
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/py-spdx-tools/Makefile b/misc/py-spdx-tools/Makefile
index fae1b2b1157f..b3fcfba595f3 100644
--- a/misc/py-spdx-tools/Makefile
+++ b/misc/py-spdx-tools/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	spdx-tools
 DISTVERSION=	0.7.1
+PORTREVISION=	1
 CATEGORIES=	misc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Parses, validates and creates SPDX documents
 WWW=		https://github.com/spdx/tools-python
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=3.4.3:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xmltodict>=0:devel/py-xmltodict@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rdflib>=0:textproc/py-rdflib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typeguard>=2.13.3:devel/py-typeguard@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}uritools>=0:net/py-uritools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}license-expression>=0:textproc/py-license-expression@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517 pytest
 
 TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} LC_ALL=en_US.UTF-8
 
 CONFLICTS_INSTALL=	py??-spdx
 NO_ARCH=		yes
 PORTEXAMPLES=		*
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${FIND} ${WRKSRC}/examples -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${EXAMPLESDIR} \;
 
 .include <bsd.port.mk>
diff --git a/misc/py-timm/Makefile b/misc/py-timm/Makefile
index 5cf9a3bec037..42a6cc722f48 100644
--- a/misc/py-timm/Makefile
+++ b/misc/py-timm/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	timm
 DISTVERSION=	0.9.16
+PORTREVISION=	1
 CATEGORIES=	misc python # machine-learning
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	PyTorch Image Models
 WWW=		https://huggingface.co/docs/timm/index
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pdm-backend>0:devel/py-pdm-backend@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}huggingface-hub>=0:misc/py-huggingface-hub@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytorch>0:misc/py-pytorch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}torchvision>0:misc/py-torchvision@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}safetensors>0:misc/py-safetensors@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}expecttest>0:devel/py-expecttest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-forked>0:devel/py-pytest-forked@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	pep517 autoplist pytest # some tests fail, tests consume gigabytes of disk space
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/py-toil/Makefile b/misc/py-toil/Makefile
index c5308ae9cfe6..d63b4572d0d4 100644
--- a/misc/py-toil/Makefile
+++ b/misc/py-toil/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	toil
 DISTVERSION=	7.0.0
+PORTREVISION=	1
 CATEGORIES=	misc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Pipeline management software for clusters
 WWW=		https://github.com/DataBiosphere/toil
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}addict>=2.2.1:devel/py-addict@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}coloredlogs>=15:devel/py-coloredlogs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configargparse>0:devel/py-configargparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dill>=0.3.2:devel/py-dill@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docker>0:sysutils/py-docker@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}enlighten>=1.5.2:devel/py-enlighten@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=3.0.1:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyPubSub>=4.0.3:devel/py-PyPubSub@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2012:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.31.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.15:devel/py-ruamel.yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tes>0:misc/py-tes@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.6.2:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.26.0:net/py-urllib3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=6:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=6:devel/py-pyyaml@${PY_FLAVOR}
 #RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mypy-boto3-s3>=1.28.3:devel/py-mypy-boto3-s3@${PY_FLAVOR} \
 #		${PYTHON_PKGNAMEPREFIX}boto3-stubs>=1.28.3:www/py-boto3-stubs@${PY_FLAVOR} \
 #		${PYTHON_PKGNAMEPREFIX}moto>=5.0.3:devel/py-moto@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:net/py-libcloud@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils concurrent autoplist pytest
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/py-wandb/Makefile b/misc/py-wandb/Makefile
index 0f58f45a821d..6c7e3567ec25 100644
--- a/misc/py-wandb/Makefile
+++ b/misc/py-wandb/Makefile
@@ -1,60 +1,61 @@
 PORTNAME=	wandb
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.17.4
+PORTREVISION=	1
 CATEGORIES=	misc # machine-learning
 #MASTER_SITES=	PYPI # no tests
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	CLI and library for interacting with the Weights and Biases API
 WWW=		https://wandb.ai/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	compilation fails: Go fails: cannot use math.MaxInt64 (untyped int constant 9223372036854775807) as int value in argument to strconv.Itoa (overflows)
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
 		go122:lang/go122
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.3:devel/py-appdirs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=7.1:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docker-pycreds>=0.4.0:security/py-docker-pycreds@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gitpython>=1.0.0:devel/py-gitpython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pathtools>0:devel/py-pathtools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}platformdirs>0:devel/py-platformdirs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=3.19.0:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.0.0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.0.0,<3:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sentry-sdk>=1.0.0:devel/py-sentry-sdk@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setproctitle>0:devel/py-setproctitle@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>0:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydantic>0:devel/py-pydantic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>0:science/py-scikit-learn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bokeh>0:www/py-bokeh@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbclient>0:devel/py-nbclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>0:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}parameterized>0:devel/py-parameterized@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-flask>0:devel/py-pytest-flask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-mock>=1.10.4:devel/py-pytest-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-rerunfailures>0:devel/py-pytest-rerunfailures@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses@${PY_FLAVOR}
 
 USES=		python shebangfix
 USE_PYTHON=	pep517 concurrent autoplist pytest # tests fail because some test dependencies are missing, see https://github.com/wandb/wandb/issues/7826
 USE_GITHUB=	yes
 
 SHEBANG_GLOB=	*.py
 
 BINARY_ALIAS=	go=go122
 
 .include <bsd.port.mk>
diff --git a/misc/pytorch/Makefile b/misc/pytorch/Makefile
index 7ec1e06209a3..6b7859879002 100644
--- a/misc/pytorch/Makefile
+++ b/misc/pytorch/Makefile
@@ -1,82 +1,82 @@
 PORTNAME=	pytorch
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc # machine-learning
 MASTER_SITES=	https://github.com/pytorch/pytorch/releases/download/v${DISTVERSION}/
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Tensors and dynamic neural networks in Python (C++ library)
 WWW=		https://pytorch.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	compilation fails: error: use of undeclared identifier 'AVX2'
 
 BUILD_DEPENDS=	gmake:devel/gmake \
 		${LOCALBASE}/include/fxdiv.h:devel/fxdiv \
 		${PY_SETUPTOOLS}
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libblis.so:math/blis \
 		libopenblas.so:math/openblas \
 		libmpi_cxx.so:net/openmpi4 \
 		libonnx.so:misc/onnx \
 		libpthreadpool.so:devel/pthreadpool \
 		libprotobuf.so:devel/protobuf \
 		libsleef.so:math/sleef
 
 USES=		compiler:c++17-lang cmake localbase:ldflags python # requires python even with PYTHON=off
 
 CMAKE_OFF=	BUILD_CUSTOM_PROTOBUF USE_CUDA USE_ROCM  USE_NNPACK USE_QNNPACK USE_PYTORCH_QNNPACK \
 		USE_FBGEMM # workaround recommended by the upstream here: https://github.com/pytorch/pytorch/issues/28337
 CMAKE_ON=	USE_SYSTEM_PYBIND11 \
 		USE_SYSTEM_SLEEF \
 		USE_SYSTEM_ONNX # see other USE_SYSTEM_xx in CMakeLists.txt
 CMAKE_ON+=	ONNX_USE_LITE_PROTO # workaround for the protobuf-related failure described here: https://github.com/onnx/optimizer/issues/38
 CMAKE_ARGS=	-DPSIMD_SOURCE_DIR=${WRKSRC}/third_party/psimd \
 		-DPYTHON_EXECUTABLE=${PYTHON_CMD}
 
 MAKE_ENV=	USE_NINJA=no # ninja breaks for some reason
 LDFLAGS+=	-lexecinfo \
 		-pthread
 
 BINARY_ALIAS=	make=${GMAKE} git=true
 
 OPTIONS_DEFINE=		PYTHON # PYTHON only provides python support for the py-PyTorch port - it's not a python binding
 OPTIONS_DEFAULT=	PYTHON
 OPTIONS_SUB=		yes
 
 PYTHON_CMAKE_BOOL=	BUILD_PYTHON
 PYTHON_PY_DEPENDS=	${PYNUMPY} \
 			${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+			${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 PYTHON_BUILD_DEPENDS=	${PYTHON_PY_DEPENDS} \
 			${PY_SETUPTOOLS} \
 			pybind11>0:devel/pybind11
 PYTHON_RUN_DEPENDS=	${PYTHON_PY_DEPENDS}
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 PLIST_SUB+=	AMD64=""
 .else
 PLIST_SUB+=	AMD64="@comment "
 .endif
 
 post-patch:
 	# replace malloc.h -> stdlib.h in many places
 	@cd ${WRKSRC} && for f in $$(${GREP} -rl "include <malloc\.h>" * | ${GREP} -E "\.(c|cpp|h|hpp)$$"); do \
 	  ${REINPLACE_CMD} -i'' -E "s|include <malloc\.h>|include <stdlib.h>|" $$f; \
 	done
 	# remove bundled fmt
 	@${RM} -r ${WRKSRC}/third_party/fmt
 
 post-install:
 	# functorch.so is installed back into the source directory, see https://github.com/pytorch/pytorch/issues/91524
 	@${RM} $$(${FIND} ${STAGEDIR} -name functorch.so)
 	# https://github.com/pytorch/pytorch/issues/24417
 	@${FIND} ${STAGEDIR} -type d -empty -delete
 
 .include <bsd.port.post.mk>
diff --git a/misc/snakemake/Makefile b/misc/snakemake/Makefile
index 902dd4689ca4..3e011231a5ab 100644
--- a/misc/snakemake/Makefile
+++ b/misc/snakemake/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	snakemake
 DISTVERSION=	6.15.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc python
 MASTER_SITES=	PYPI
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Workflow management system
 WWW=		https://github.com/snakemake/snakemake
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}connection_pool>=0.0.3>0:devel/py-connection_pool@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configargparse>0:devel/py-configargparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}datrie>0:devel/py-datrie@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}filelock>0:sysutils/py-filelock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gitpython>0:devel/py-gitpython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbformat>0:devel/py-nbformat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PuLP>=2.0:math/py-PuLP@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ratelimiter>0:devel/py-ratelimiter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}smart-open>=3.0:net/py-smart-open@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stopit>0:devel/py-stopit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toposort>0:devel/py-toposort@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils noflavors autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/net-im/py-apprise/Makefile b/net-im/py-apprise/Makefile
index 196f27608ae5..bb52e28e9f21 100644
--- a/net-im/py-apprise/Makefile
+++ b/net-im/py-apprise/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	apprise
 DISTVERSION=	1.8.0
+PORTREVISION=	1
 CATEGORIES=	net-im python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nick@kirby.cx
 COMMENT=	Push Notifications that work with just about every platform!
 WWW=		https://github.com/caronc/apprise
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gntp>0:net/py-gntp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paho-mqtt>0:net/py-paho-mqtt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>0:www/py-requests-oauthlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR}
 
 USES=		pytest python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile
index 87d744e8256a..3f492d3148d5 100644
--- a/net-im/py-matrix-synapse/Makefile
+++ b/net-im/py-matrix-synapse/Makefile
@@ -1,109 +1,109 @@
 PORTNAME=	matrix-synapse
 DISTVERSION=	1.105.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	${PORTNAME:S/-/_/}-${DISTVERSION}.tar.gz
 
 MAINTAINER=	ports@skyforge.at
 COMMENT=	Matrix protocol reference homeserver
 WWW=		https://www.matrix.org
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.1.0<=1.9.0:devel/py-poetry-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-rust>=1.3<=1.9.0:devel/py-setuptools-rust@${PY_FLAVOR}
 # Keep the RUN_DEPENDS layout similar to the pyproject.toml file
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=3.0.0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}immutabledict>=2.0:devel/py-immutabledict@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=2.1.0:devel/py-unpaddedbase64@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}canonicaljson>=2.0.0<3.0.0:devel/py-canonicaljson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}signedjson>=1.1.0<2.0.0:security/py-signedjson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}service-identity>=18.1.0:security/py-service-identity@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}twisted>=18.9.0:devel/py-twisted@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}treq>=15.1:www/py-treq@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.13:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.7:devel/py-pyasn1-modules@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}bcrypt>=3.1.7:security/py-bcrypt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=10.0.1:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sortedcontainers>=1.5.2:devel/py-sortedcontainers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pymacaroons>=0.13.0:security/py-pymacaroons@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>=0.5.2:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}phonenumbers>=8.2.0:devel/py-phonenumbers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prometheus-client>=0.4.0:net-mgmt/py-prometheus-client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}attrs>=19.2.0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0.0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}bleach>=1.4.3:www/py-bleach@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.10.0.1:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ijson>=3.1.4:devel/py-ijson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matrix-common>=1.3.0<2.0.0:devel/py-matrix-common@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydantic>=1.7.4:devel/py-pydantic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pysaml2>=4.5.0:security/py-pysaml2@${PY_FLAVOR} \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}virtualenv>=15.0:devel/py-virtualenv@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tox>=2.3.1:devel/py-tox@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}parameterized>=0.7.4:devel/py-parameterized@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}authlib>=0.15.1:security/py-authlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna@${PY_FLAVOR}
 
 USES=		cargo python
 USE_PYTHON=	autoplist cryptography distutils
 USE_RC_SUBR=	synapse
 WRKSRC=		${WRKDIR}/${PORTNAME:S/-/_/}-${DISTVERSION}
 CARGO_CONFIGURE=	yes
 CARGO_BUILD=	no
 CARGO_TEST=	no
 CARGO_INSTALL=	no
 CARGO_CARGOTOML=	${WRKSRC}/rust/Cargo.toml
 
 SUB_FILES=	pkg-message log.config
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} DBDIR=${DBDIR} LOGDIR=${LOGDIR} PIDDIR=${PIDDIR} USERS=${USERS}
 
 USERS=		synapse
 GROUPS=		synapse
 
 DBDIR?=		/var/db/${PORTNAME}
 LOGDIR?=	/var/log/${PORTNAME}
 PIDDIR?=	/var/run/${PORTNAME}
 
 PLIST_FILES=	"@sample ${ETCDIR}/log.config.sample" \
 		%%PYTHON_SITELIBDIR%%/synapse/synapse_rust.abi3.so
 DOCS=		README.rst UPGRADE.rst CHANGES.md docs/postgres.md
 PORTDOCS=	${DOCS:T}
 
 OPTIONS_DEFINE=		DOCS JWT LDAP OIDC PGSQL REDIS SQLITE URLPREVIEW
 OPTIONS_DEFAULT=	PGSQL SQLITE
 
 JWT_DESC=		Add dependencies for JSON web tokens
 OIDC_DESC=		Add dependencies for OpenID Connect based logins
 REDIS_DESC=		Add support replication over Redis for synapse workers
 URLPREVIEW_DESC=	Add dependencies necessary for URL previews
 
 JWT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}authlib>=0.15.1:security/py-authlib@${PY_FLAVOR}
 LDAP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matrix-synapse-ldap3>=0.1:net/py-matrix-synapse-ldap3@${PY_FLAVOR}
 OIDC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}authlib>=0.15.1:security/py-authlib@${PY_FLAVOR}
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>2.8:databases/py-psycopg2@${PY_FLAVOR}
 REDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hiredis>=0:databases/py-hiredis@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}txredisapi>=1.4.7:databases/py-txredisapi@${PY_FLAVOR}
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 URLPREVIEW_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=4.2.0:devel/py-lxml@${PY_FLAVOR}
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKDIR}/log.config ${STAGEDIR}${ETCDIR}/log.config.sample
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 do-test:
 	cd ${WRKSRC} && PYTHONPATH="${STAGEDIR}/${PYTHON_SITELIBDIR}:." trial-${PYTHON_VER} -j 4 tests
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/crmsh/Makefile b/net-mgmt/crmsh/Makefile
index 1d544892ce66..c54ac2b03d63 100644
--- a/net-mgmt/crmsh/Makefile
+++ b/net-mgmt/crmsh/Makefile
@@ -1,59 +1,59 @@
 PORTNAME=	crmsh
 DISTVERSION=	4.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt python
 
 MAINTAINER=	flo@FreeBSD.org
 COMMENT=	Command-line interface for High-Availability cluster management
 WWW=		https://crmsh.github.io
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 # Set the build/run depends on setuptools instead of adding distutils to USE_PYTHON
 # because the crmsh build uses autotools which then calls setup.py.
 BUILD_DEPENDS=	${PY_SETUPTOOLS}
 RUN_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}parallax>0:devel/py-parallax@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		autoreconf cpe gmake python shebangfix
 CPE_VENDOR=	clusterlabs
 USE_GITHUB=	yes
 GH_ACCOUNT=	ClusterLabs
 SHEBANG_FILES=	bin/crm scripts/*/*.py test/cib-tests.sh test/evaltest.sh \
 		test/features/steps/behave_agent.py \
 		test/list-undocumented-commands.py test/run-functional-tests \
 		test/testcases/confbasic-xml.filter \
 		test/update-expected-output.sh utils/crm_clean.py \
 		utils/crm_pkg.py utils/crm_rpmcheck.py
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--with-ocf-root=${PREFIX}/lib/ocf
 
 CONFLICTS_INSTALL=	crm114 # bin/crm
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		DOCS MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=		yes
 
 DOCS_BUILD_DEPENDS=	asciidoc:textproc/asciidoc
 
 MANPAGES_BUILD_DEPENDS=	${DOCS_BUILD_DEPENDS}
 
 post-patch:
 	@${REINPLACE_CMD} 's,%%DATADIR%%,${DATADIR},g' ${WRKSRC}/setup.py
 	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/crmsh/corosync.py
 	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/crmsh/utils.py
 	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/scripts/health/collect.py
 	@${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/utils/crm_init.py
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/etc/crm/crm.conf \
 		${STAGEDIR}${PREFIX}/etc/crm/crm.conf.sample
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/netbox/Makefile b/net-mgmt/netbox/Makefile
index 79f7dd6328ea..c2235a20f051 100644
--- a/net-mgmt/netbox/Makefile
+++ b/net-mgmt/netbox/Makefile
@@ -1,110 +1,110 @@
 PORTNAME=	netbox
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.7.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt python
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	IP address management tool
 WWW=		https://github.com/netbox-community/netbox
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 # NetBox has fixed Python package dependencies listed in "requirements.txt"
 # which are not checked during build/runtime because they're usually installed
 # via devel/py-pip.
 #
 # As a rule, slight deviations are usually not a problem, but there are a few
 # Django packages that are known for regressions in conjunction with NetBox and
 # should therefore only be updated with caution.
 #
 # - devel/py-dj42-django-rq
 # - www/py-dj42-django-filter
 # - www/py-dj42-django-tables2
 # - www/py-dj42-djangorestframework
 #
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django42>=4.2.11<4.3:www/py-django42@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-cors-headers>=4.3.1<5:www/py-django-cors-headers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-debug-toolbar>=4.3.0<5:www/py-django-debug-toolbar@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-filter>=23.5<25:www/py-django-filter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-graphiql-debug-toolbar>=0.2.0<1:www/py-django-graphiql-debug-toolbar@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-mptt>=0.14.0<0.17:www/py-django-mptt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-prometheus>=2.3.1<2.4:www/py-django-prometheus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-redis>=5.4.0<6:www/py-django-redis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-rich>=1.8.0<2:www/py-django-rich@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-rq>=2.10.2<2.11:devel/py-django-rq@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-tables2>=2.7.0<2.8:www/py-django-tables2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-taggit>=5.0.1<6:www/py-django-taggit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-timezone-field>=6.1.0<7:www/py-django-timezone-field@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}djangorestframework>=3.14.0,1<3.15.0,1:www/py-djangorestframework@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}drf-spectacular>=0.27.2<1:www/py-drf-spectacular@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}drf-spectacular-sidecar>=2024.5.1:www/py-drf-spectacular-sidecar@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}graphene-django300>=3.0.0<3.0.0_99:devel/py-graphene-django300@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-pglocks>=1.0.4<1.1:www/py-django-pglocks@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}bleach>=6.1.0<7:www/py-bleach@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}feedparser>=6.0.11<7:textproc/py-feedparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.3<4:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>=3.5.2<3.7:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mkdocs-material>=9.5.18<10:textproc/py-mkdocs-material@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mkdocstrings>=0.25.1<1:textproc/py-mkdocstrings@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mkdocstrings-python-legacy>0:textproc/py-mkdocstrings-python-legacy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>=1.2.1<2:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=10.3.0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg>=3.1.18<4:databases/py-psycopg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.31.0<3:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}social-auth-app-django>=5.4.1<6:www/py-social-auth-app-django@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}social-auth-core>=4.5.3<5:security/py-social-auth-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}svgwrite>=1.4.3<2:graphics/py-svgwrite@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tablib>=3.6.1<4:textproc/py-tablib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tzdata>=2024.1:devel/py-tzdata@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=6.0.1<7:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=6.0.1<7:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gunicorn>=21.2.0<23:www/py-gunicorn@${PY_FLAVOR}
 
 USES=		cpe pgsql:12+ python
 CPE_VENDOR=	netbox
 USE_GITHUB=	yes
 GH_ACCOUNT=	netbox-community
 
 SUB_FILES=	850.netbox-housekeeping.sample netbox_rq.sample netboxrc.sample pkg-message
 SUB_LIST=	DATADIR=${DATADIR} PYTHON_CMD=${PYTHON_CMD} PYTHON_VER=${PYTHON_VER} WWWOWN=${WWWOWN}
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	EXAMPLES
 OPTIONS_GROUP=	BACKENDS
 OPTIONS_GROUP_BACKENDS=	GIT LDAP S3 SENTRY
 
 GIT_DESC=	Git backend support
 LDAP_DESC=	LDAP backend support
 S3_DESC=	Amazon S3 backend support
 SENTRY_DESC=	Sentry monitoring support
 
 GIT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dulwich>0:devel/py-dulwich@${PY_FLAVOR}
 LDAP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django-auth-ldap>0:www/py-django-auth-ldap
 S3_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR}
 SENTRY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sentry-sdk>0:devel/py-sentry-sdk@${PY_FLAVOR}
 
 do-install:
 	cd ${WRKSRC}/netbox ; \
 	for src in $$( ${FIND} . ! -name '*.bak' -a ! -name '*.orig' ) ; do \
 		dst=${STAGEDIR}${DATADIR}$${src#.} ; \
 		if ${TEST} -d "$$src" ; then \
 			${MKDIR} "$$dst" ; \
 		else \
 			${INSTALL_DATA} "$$src" "$$dst" ; \
 		fi \
 	done
 	cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/mkdocs.yml ${STAGEDIR}${DATADIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKDIR}/850.netbox-housekeeping.sample ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKDIR}/netbox_rq.sample ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKDIR}/netboxrc.sample ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/contrib/apache.conf ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/contrib/gunicorn.py ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/contrib/nginx.conf ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/netdata/Makefile b/net-mgmt/netdata/Makefile
index 0bf8c69594d9..fb741f8540e1 100644
--- a/net-mgmt/netdata/Makefile
+++ b/net-mgmt/netdata/Makefile
@@ -1,116 +1,116 @@
 PORTNAME=	netdata
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.43.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	nk@nkeor.me
 COMMENT=	Scalable distributed realtime performance and health monitoring
 WWW=		https://github.com/netdata/netdata
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		libyaml.so:textproc/libyaml \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libuv.so:devel/libuv
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		bash:shells/bash \
 		curl:ftp/curl
 
 USES=		autoreconf compiler:c++17-lang cpe gmake localbase:ldflags pathfix \
 		pkgconfig:both python shebangfix ssl
 USE_RC_SUBR=	${PORTNAME}
 SHEBANG_GLOB=	*
 BINARY_ALIAS=	ar=llvm-ar ranlib=llvm-ranlib
 
 # Libs that you can't unbundle...
 # SQLite3, --exclude database/sqlite/sqlite3*
 # (lib)judy, --exclude libnetdata/libjudy
 EXTRACT_AFTER_ARGS=	--exclude ml/dlib --exclude web/server/h2o
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-h2o --disable-unit-tests --with-user=netdata
 
 INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-D_WANT_VMMETER
 USE_CXXSTD=	c++17
 
 SUB_FILES=	${PORTNAME}.conf.sample
 SUB_LIST=	NETDATA_CACHE=${NETDATA_CACHE} \
 		NETDATA_LOG=${NETDATA_LOG} \
 		NETDATA_PERST=${NETDATA_PERST}
 
 USERS=		netdata
 GROUPS=		netdata
 
 PLIST_SUB=	NETDATA_CACHE=${NETDATA_CACHE} \
 		NETDATA_LOG=${NETDATA_LOG} \
 		NETDATA_PERST=${NETDATA_PERST}
 
 OPTIONS_DEFINE=		CLOUD CUPS DBENGINE FREEIPMI GOPLUGIN LTO ML
 OPTIONS_DEFAULT=	CLOUD DBENGINE LTO ML
 OPTIONS_EXCLUDE_riscv64=	LTO
 OPTIONS_SUB=		YES
 
 CLOUD_DESC=		Enable cloud functionality
 CUPS_DESC=		Enable support for cups
 DBENGINE_DESC=		Enable support for database engine
 FREEIPMI_DESC=		Enable support for freeipmi
 GOPLUGIN_DESC=		Enable the go collector plugin
 ML_DESC=			Enable anomaly detection via dlib
 
 CLOUD_LIB_DEPENDS=		libprotobuf.so:devel/protobuf
 CLOUD_CONFIGURE_OFF=		--disable-cloud
 CUPS_LIB_DEPENDS=		libcups.so:print/cups
 CUPS_CONFIGURE_ENABLE=		plugin-cups
 DBENGINE_LIB_DEPENDS=		liblz4.so:archivers/liblz4
 DBENGINE_CONFIGURE_ENABLE=	dbengine
 FREEIPMI_LIB_DEPENDS=		libfreeipmi.so:sysutils/freeipmi
 FREEIPMI_CONFIGURE_ENABLE=	plugin-freeipmi
 GOPLUGIN_RUN_DEPENDS=		${LOCALBASE}/libexec/netdata/plugins.d/god.plugin:net-mgmt/netdata-go
 LTO_USES=			compiler:c11
 LTO_CONFIGURE_ENABLE=		lto
 ML_BUILD_DEPENDS=		${LOCALBASE}/include/dlib/matrix.h:science/dlib-cpp
 ML_CONFIGURE_ENABLE=		ml
 
 NETDATA_CACHE=	/var/cache/${PORTNAME}
 NETDATA_LOG=	/var/log/${PORTNAME}
 NETDATA_PERST=	/var/db/${PORTNAME}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION}|g' \
 	    ${PATCH_WRKSRC}/configure.ac
 	@${REINPLACE_CMD} -e 's|%%NETDATA_CACHE%%|${NETDATA_CACHE}|g' \
 	    ${PATCH_WRKSRC}/configure.ac
 	@${REINPLACE_CMD} -e 's|%%NETDATA_LOG%%|${NETDATA_LOG}|g' \
 	    ${PATCH_WRKSRC}/configure.ac
 	@${REINPLACE_CMD} -e 's|%%NETDATA_PERST%%|${NETDATA_PERST}|g' \
 	    ${PATCH_WRKSRC}/configure.ac
 	@${REINPLACE_CMD} -e 's|%%ETCDIR%%|${ETCDIR}|g' \
 	    ${PATCH_WRKSRC}/configure.ac
 	@${REINPLACE_CMD} -e 's|%%PYTHON%%|${PYTHON_CMD}|g' \
 	    ${PATCH_WRKSRC}/collectors/python.d.plugin/python.d.plugin.in
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKDIR}/netdata.conf.sample ${STAGEDIR}${ETCDIR}/netdata.conf.sample
 	${TOUCH} ${STAGEDIR}${ETCDIR}/.opt-out-from-anonymous-statistics
 	${MKDIR} ${STAGEDIR}${NETDATA_CACHE}
 	${MKDIR} ${STAGEDIR}${NETDATA_LOG}
 	${MKDIR} ${STAGEDIR}${NETDATA_PERST}
 	(for fi in 	${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*.conf \
 			${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*/*.conf \
 			${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*/*.txt ; do \
 		${MV} $$fi $$fi".sample"; \
 	done)
 	${RM} ${STAGEDIR}${ETCDIR}/netdata-updater.conf
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/netdata/system
 
 post-install-CLOUD-off:
 	rm ${STAGEDIR}${PREFIX}/sbin/netdata-claim.sh
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/py-arouteserver/Makefile b/net-mgmt/py-arouteserver/Makefile
index 42293db8b55f..bf0e3a39ae6b 100644
--- a/net-mgmt/py-arouteserver/Makefile
+++ b/net-mgmt/py-arouteserver/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	arouteserver
 PORTVERSION=	1.15.1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Tool to automatically build configurations for BGP route servers
 WWW=		https://github.com/pierky/arouteserver
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aggregate6>=1.0.12:net-mgmt/py-aggregate6@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.9.4:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.13:devel/py-pyyaml@${PY_FLAVOR} \
 		bash>0:shells/bash \
 		bgpq4>0:net-mgmt/bgpq4 \
 		ca_root_nss>0:security/ca_root_nss
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.3.7:devel/py-nose@${PY_FLAVOR}
 
 USES=		python shebangfix
 USE_PYTHON=	autoplist concurrent distutils
 
 SHEBANG_FILES=	pierky/arouteserver/config.d/rtt_getter.sh
 NO_ARCH=	yes
 
 do-test:
 	@(cd ${WRKSRC} && ${SETENV} nosetests -vs --tests=tests/external_resources/)
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/py-junos-eznc/Makefile b/net-mgmt/py-junos-eznc/Makefile
index 5f1097266dac..c02653b226bf 100644
--- a/net-mgmt/py-junos-eznc/Makefile
+++ b/net-mgmt/py-junos-eznc/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	junos-eznc
 DISTVERSION=	2.7.0
+PORTREVISION=	1
 CATEGORIES=	net-mgmt python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sergey@akhmatov.ru
 COMMENT=	Junos easy automation for non-programmers
 WWW=		https://github.com/Juniper/py-junos-eznc
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=3.2.4:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ncclient>=0.6.15:net-mgmt/py-ncclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paramiko>=1.15.2:security/py-paramiko@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scp>=0.7.0:security/py-scp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}transitions>0:devel/py-transitions@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR}	\
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}yamlordereddictloader>0:devel/py-yamlordereddictloader@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/py-napalm-logs/Makefile b/net-mgmt/py-napalm-logs/Makefile
index e28cd8027129..10de95124fde 100644
--- a/net-mgmt/py-napalm-logs/Makefile
+++ b/net-mgmt/py-napalm-logs/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	napalm-logs
 DISTVERSION=	0.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Cross-vendor normalisation for network syslog messages
 WWW=		https://github.com/napalm-automation/napalm-logs
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pynacl>0:security/py-pynacl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}u-msgpack-python>0:devel/py-u-msgpack-python@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prometheus-client>0:net-mgmt/py-prometheus-client@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python
 USE_GITHUB=	yes
 GH_ACCOUNT=	napalm-automation
 USE_PYTHON=	distutils concurrent autoplist
 
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	PREFIX=${PREFIX} PYTHON_VER=${PYTHON_VER}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
 		${WRKSRC}/napalm_logs/config/__init__.py
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -c /dev/null
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/py-napalm/Makefile b/net-mgmt/py-napalm/Makefile
index ff5f6fd00cd4..dc24f73cb156 100644
--- a/net-mgmt/py-napalm/Makefile
+++ b/net-mgmt/py-napalm/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	napalm
 DISTVERSION=	5.0.0
+PORTREVISION=	1
 CATEGORIES=	net-mgmt python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Net Automation and Progr. Abstraction Layer with Multivendor support
 WWW=		https://github.com/napalm-automation/napalm
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=4.3.0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}textfsm>=1.1.2:textproc/py-textfsm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}junos-eznc>=2.7.0:net-mgmt/py-junos-eznc@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ncclient>0:net-mgmt/py-ncclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netutils>=1.0.0:net-mgmt/py-netutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netmiko>=4.1.0:security/py-netmiko@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paramiko>=2.6.0:security/py-paramiko@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ttp>0:textproc/py-ttp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ttp-templates>0:textproc/py-ttp-templates@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.3.0:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyeapi>=1.0.2:net-mgmt/py-pyeapi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scp>0:security/py-scp@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cffi>=1.11.3:devel/py-cffi@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ddt>=1.2.0:devel/py-ddt@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils pytest
 USE_GITHUB=	yes
 GH_ACCOUNT=	napalm-automation
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/py-opn-cli/Makefile b/net-mgmt/py-opn-cli/Makefile
index a613b4ae4da3..bbacd0eaab02 100644
--- a/net-mgmt/py-opn-cli/Makefile
+++ b/net-mgmt/py-opn-cli/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	opn-cli
 DISTVERSION=	1.7.0
+PORTREVISION=	1
 CATEGORIES=	net-mgmt python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	freebsd@moov.de
 COMMENT=	OPNsense CLI written in Python
 WWW=		https://github.com/andeman/opn-cli
 
 LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${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} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ptable>=0:devel/py-ptable@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${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 distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/py-pynetbox/Makefile b/net-mgmt/py-pynetbox/Makefile
index 1235f25ac282..fa63cc7867e3 100644
--- a/net-mgmt/py-pynetbox/Makefile
+++ b/net-mgmt/py-pynetbox/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	pynetbox
 DISTVERSION=	7.3.3
 PORTREVISION=	1
 CATEGORIES=	net-mgmt python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	NetBox API client library
 WWW=		https://github.com/netbox-community/pynetbox
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.20<3:www/py-requests@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils pytest
 
 # Skip integration tests as they require Docker and a checked out git repository
 PYTEST_IGNORED_TESTS=	integration
 
 NO_ARCH=	yes
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0<2.0.0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
 DOCS_VARS=		PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/build/sphinx/html && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 			"! -name .buildinfo -and ! -name objects.inv")
 
 .include <bsd.port.mk>
diff --git a/net/cloud-init-devel/Makefile b/net/cloud-init-devel/Makefile
index 637360102f6f..9eaa99fae502 100644
--- a/net/cloud-init-devel/Makefile
+++ b/net/cloud-init-devel/Makefile
@@ -1,69 +1,70 @@
 PORTNAME=	cloud-init
 DISTVERSION=	23.4-319
 DISTVERSIONSUFFIX=	-gec384da45
+PORTREVISION=	1
 CATEGORIES=	net python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	freebsd@igalic.co
 COMMENT=	Init scripts for use on cloud images, development version
 WWW=		https://cloud-init.io/
 
 LICENSE=	APACHE20 GPLv3
 LICENSE_COMB=	dual
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-Apache2.0
 LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSE-GPLv3
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		sudo>0:security/sudo
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}responses>=0:devel/py-responses@${PY_FLAVOR} \
 		bash:shells/bash
 
 USES=		python shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	canonical
 USE_PYTHON=	autoplist distutils
 PYDISTUTILS_INSTALLARGS+=	"--init-system=sysvinit_freebsd"
 
 SHEBANG_FILES=	tools/hook-hotplug tools/read-dependencies tools/read-version \
 		tools/validate-yaml.py
 
 TEST_ENV=	${MAKE_ENV} \
 		PYTHON=${PYTHON_VERSION}
 TEST_TARGET=	check
 
 # Conflicts
 CONFLICTS_INSTALL=	cloud-init
 
 # Standard bsd.port.mk variables
 ETCDIR=		${PREFIX}/etc/cloud
 
 NO_ARCH=	yes
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g' ${WRKSRC}/setup.py
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/cloudinit/settings.py
 	${REINPLACE_CMD} -e 's|@@PACKAGED_VERSION@@|${DISTVERSION}${DISTVERSIONSUFFIX}|g' ${WRKSRC}/cloudinit/version.py
 	${RM} ${WRKSRC}/config/cloud.cfg.d/99_freebsd.cfg.orig
 
 post-install:
 	${MV} ${STAGEDIR}${ETCDIR}/cloud.cfg ${STAGEDIR}${ETCDIR}/cloud.cfg.sample
 	${MV} ${STAGEDIR}${ETCDIR}/cloud.cfg.d/05_logging.cfg ${STAGEDIR}${ETCDIR}/cloud.cfg.d/05_logging.cfg.sample
 	${MV} ${STAGEDIR}${ETCDIR}/cloud.cfg.d/99_freebsd.cfg ${STAGEDIR}${ETCDIR}/cloud.cfg.d/99_freebsd.cfg.sample
 	${REINPLACE_CMD} -e 's|^.*\.cfg$$|@sample &.sample|'  \
 		-e 's|${ETCDIR}/clean.d|@dir ${ETCDIR}/clean.d|' \
 		${_PYTHONPKGLIST}
 
 .include <bsd.port.mk>
diff --git a/net/cloud-init/Makefile b/net/cloud-init/Makefile
index 9642d035128f..5a80ee776479 100644
--- a/net/cloud-init/Makefile
+++ b/net/cloud-init/Makefile
@@ -1,59 +1,60 @@
 PORTNAME=	cloud-init
 DISTVERSION=	24.1.4
+PORTREVISION=	1
 CATEGORIES=	net python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	andrey@bsdnir.info
 COMMENT=	Init scripts for use on cloud images
 WWW=		https://cloud-init.io/
 
 LICENSE=	APACHE20 GPLv3
 LICENSE_COMB=	dual
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-Apache2.0
 LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSE-GPLv3
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		sudo>0:security/sudo
 
 USES=		python shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	canonical
 USE_PYTHON=	autoplist distutils
 PYDISTUTILS_INSTALLARGS+=	"--init-system=sysvinit_freebsd"
 
 SHEBANG_FILES=	tools/hook-hotplug tools/read-dependencies tools/read-version \
 		tools/validate-yaml.py
 
 # Conflicts
 CONFLICTS_INSTALL=	cloud-init-devel
 
 # Standard bsd.port.mk variables
 ETCDIR=		${PREFIX}/etc/cloud
 
 NO_ARCH=	yes
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g' ${WRKSRC}/setup.py
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/cloudinit/settings.py
 	${REINPLACE_CMD} -e 's|@@PACKAGED_VERSION@@|${DISTVERSION}${DISTVERSIONSUFFIX}|g' ${WRKSRC}/cloudinit/version.py
 	${RM} ${WRKSRC}/config/cloud.cfg.d/99_freebsd.cfg.orig
 
 post-install:
 	${MV} ${STAGEDIR}${ETCDIR}/cloud.cfg ${STAGEDIR}${ETCDIR}/cloud.cfg.sample
 	${MV} ${STAGEDIR}${ETCDIR}/cloud.cfg.d/05_logging.cfg ${STAGEDIR}${ETCDIR}/cloud.cfg.d/05_logging.cfg.sample
 	${MV} ${STAGEDIR}${ETCDIR}/cloud.cfg.d/99_freebsd.cfg ${STAGEDIR}${ETCDIR}/cloud.cfg.d/99_freebsd.cfg.sample
 	${REINPLACE_CMD} -e 's|^.*\.cfg$$|@sample &.sample|'  \
 		-e 's|${ETCDIR}/clean.d|@dir ${ETCDIR}/clean.d|' \
 		${_PYTHONPKGLIST}
 
 .include <bsd.port.mk>
diff --git a/net/irrd/Makefile b/net/irrd/Makefile
index 74e18dd3935a..7cb4983a371b 100644
--- a/net/irrd/Makefile
+++ b/net/irrd/Makefile
@@ -1,86 +1,87 @@
 PORTNAME=	irrd
 PORTVERSION=	4.2.9
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	net python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	4
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Internet Routing Registry database server v4
 WWW=		http://www.irrd.net/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	\
 		${PYTHON_PKGNAMEPREFIX}alembic>=1.7.7:databases/py-alembic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ariadne>=0.13.0:devel/py-ariadne@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}asgiref>=3.4.1:www/py-asgiref@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}beautifultable>=0.8.0:devel/py-beautifultable@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}daemon>=2.3.0:devel/py-daemon@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}datrie>=0.8.2:devel/py-datrie@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hiredis>=2.0.0:databases/py-hiredis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipy>=1.01:net-mgmt/py-ipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ordered-set>=4.0.2:devel/py-ordered-set@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}passlib>=1.7.4:security/py-passlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pid>=3.0.4:devel/py-pid@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.8.0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.9.1:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2cffi>=2.9.0:databases/py-psycopg2cffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydantic>=1.8.2:devel/py-pydantic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-gnupg>=0.4.8:security/py-python-gnupg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2021.1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}redis>=3.5.3:databases/py-redis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.26.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setproctitle>=1.2.2:devel/py-setproctitle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.13.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=1.3.24:databases/py-sqlalchemy14@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}starlette>=0.14.2:www/py-starlette@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ujson>=4.1.0:devel/py-ujson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}uvicorn>=0.15.0:www/py-uvicorn@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.4.1:devel/py-pyyaml@${PY_FLAVOR}
 #python-graphql-client==0.4.2
 TEST_DEPENDS=	\
 		${PYTHON_PKGNAMEPREFIX}coverage>=6.0:devel/py-coverage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>=2.12.1:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}twisted>=21.7.0:devel/py-twisted@${PY_FLAVOR}
 
 USES=		python
 USE_GITHUB=	yes
 GH_ACCOUNT=	irrdnet
 GH_PROJECT=	${PORTNAME}
 USE_PYTHON=	autoplist concurrent distutils pytest
 USE_RC_SUBR=	irrd4
 
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	GROUPS=${GROUPS} \
 		PGSQL_DEFAULT=${PGSQL_DEFAULT} \
 		PYTHON_CMD="${PYTHON_CMD}" \
 		USERS=${USERS}
 
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 
 PLIST_FILES=	"@sample etc/${PORTNAME}${PKGNAMESUFFIX}.yaml.sample"
 
 OPTIONS_DEFINE=		DOCS
 #sphinxcontrib-spelling==7.3.2
 #sphinx-material==0.0.35
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=4.3.2:textproc/py-sphinx@${PY_FLAVOR}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/irrd.yaml|${PREFIX}/etc/irrd.yaml|g' \
 		${WRKSRC}/docs/users/mirroring.rst \
 		${WRKSRC}/docs/admins/configuration.rst \
 		${WRKSRC}/docs/admins/deployment.rst \
 		${WRKSRC}/irrd/conf/__init__.py
 
 post-install:
 	${INSTALL_DATA} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/conf/default_config.yaml \
 		${STAGEDIR}${PREFIX}/etc/${PORTNAME}${PKGNAMESUFFIX}.yaml.sample
 
 do-test:
 	@(cd ${TEST_WRKSRC} && ${SETENV} pytest ${PORTNAME})
 
 .include <bsd.port.mk>
diff --git a/net/onionprobe/Makefile b/net/onionprobe/Makefile
index 6c064b8223d4..df65c93d5d24 100644
--- a/net/onionprobe/Makefile
+++ b/net/onionprobe/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	onionprobe
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	egypcio@FreeBSD.org
 COMMENT=	Test and monitor the status of Tor Onion Services
 WWW=		https://pypi.org/project/onionprobe
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}poetry-core>=0:devel/py-poetry-core@${PY_FLAVOR} \
 		${PY_SETUPTOOLS}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}prometheus-client>=0:net-mgmt/py-prometheus-client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stem>=0:security/py-stem@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		tor:security/tor
 
 USES=		python shebangfix
 USE_PYTHON=	autoplist cryptography distutils
 
 NO_ARCH=	yes
 
 SHEBANG_FILES=	packages/*.py \
 		packages/onionprobe/*.py
 
 OPTIONS_DEFINE=		MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 
 MANPAGES_PLIST_FILES=	share/man/man1/onionprobe.1.md.gz
 
 post-patch:
 	${REINPLACE_CMD} "s|%%ETCDIR%%|${ETCDIR}|g" \
 	  ${WRKSRC}/docs/man/onionprobe.1.md \
 	  ${WRKSRC}/packages/onionprobe/config.py
 	${CP} ${FILESDIR}/extras-setup.py ${WRKSRC}/setup.py \
 	  && ${REINPLACE_CMD} "s|%%NAME%%|${PORTNAME}|g; s|%%VERSION%%|${PORTVERSION}|g" ${WRKSRC}/setup.py
 
 post-install-MANPAGES-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/man/man1 \
 	  && ${INSTALL_MAN} ${WRKSRC}/docs/man/onionprobe.1.md ${STAGEDIR}${PREFIX}/share/man/man1/.
 
 .include <bsd.port.mk>
diff --git a/net/py-python-heatclient/Makefile b/net/py-python-heatclient/Makefile
index 13cad5ede95d..92d6a0d87a20 100644
--- a/net/py-python-heatclient/Makefile
+++ b/net/py-python-heatclient/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	python-heatclient
 PORTVERSION=	3.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	OpenStack Orchestration API Client Library
 WWW=		https://docs.openstack.org/python-heatclient/latest/ \
 		https://github.com/openstack/python-heatclient
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cliff>=2.8.0:devel/py-cliff@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.8.0:devel/py-keystoneauth1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}osc-lib>=1.14.0:devel/py-osc-lib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prettytable>=0.7.2:devel/py-prettytable@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-swiftclient>=3.2.0:databases/py-python-swiftclient@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.13:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${PY_FLAVOR}
 
 USES=		python shebangfix
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 SHEBANG_GLOB=	*.sh
 
 .include <bsd.port.mk>
diff --git a/net/py-ripe.atlas.tools/Makefile b/net/py-ripe.atlas.tools/Makefile
index c3baebb4df7f..714277cb6b87 100644
--- a/net/py-ripe.atlas.tools/Makefile
+++ b/net/py-ripe.atlas.tools/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	ripe.atlas.tools
 DISTVERSION=	3.1.1
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Official command-line client for RIPE Atlas
 WWW=		https://github.com/RIPE-NCC/ripe-atlas-tools
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ripe.atlas.cousteau>=2.0.0:net/py-ripe.atlas.cousteau@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ripe.atlas.sagan>=1.3.1:net/py-ripe.atlas.sagan@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.10.0:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tzlocal>0:devel/py-tzlocal@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipy>0:net-mgmt/py-ipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist pep517 pytest
 PYTEST_IGNORED_TESTS=	test_arg_radius test_html_documentation \
 			test_text_documentation test_basic #WIP
 
 CONFLICTS_INSTALL=	c-ares # bin/adig
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/reprise/Makefile b/ports-mgmt/reprise/Makefile
index a09b55ee5f89..1af79dcc2f1f 100644
--- a/ports-mgmt/reprise/Makefile
+++ b/ports-mgmt/reprise/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	reprise
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt python
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Port testing system
 WWW=		https://github.com/AMDmi3/reprise
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiohttp>=0:www/py-aiohttp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonslicer>=0:textproc/py-jsonslicer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydantic>=0:devel/py-pydantic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=0:devel/py-termcolor@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR}
 
 USES=		python:3.9+
 USE_GITHUB=	yes
 GH_ACCOUNT=	AMDmi3
 USE_PYTHON=	autoplist distutils noflavors
 NO_ARCH=	yes
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG.md ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/
 
 do-test:
 	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs
 
 .include <bsd.port.mk>
diff --git a/print/py-fontbakery/Makefile b/print/py-fontbakery/Makefile
index 1aed308c4c9d..a3e61be218b1 100644
--- a/print/py-fontbakery/Makefile
+++ b/print/py-fontbakery/Makefile
@@ -1,85 +1,86 @@
 PORTNAME=	fontbakery
 PORTVERSION=	0.12.7
+PORTREVISION=	1
 CATEGORIES=	print python
 MASTER_SITES=	PYPI \
 		https://github.com/fonttools/fontbakery/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Well designed Font QA tool
 WWW=		https://font-bakery.readthedocs.io/en/latest/ \
 		https://github.com/fonttools/fontbakery
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=61.0:devel/py-setuptools@${PY_FLAVOR} \
 		${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}beziers>=0.6.0<0.7:graphics/py-beziers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cmarkgfm>=0.4:textproc/py-cmarkgfm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fonttools>=4.46.0:print/py-fonttools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}freetype-py>=0:print/py-freetype-py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0.0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}munkres>=0:math/py-munkres@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}opentype-sanitizer>=9.1.0<10:x11-fonts/py-opentype-sanitizer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}opentypespec>=0:x11-fonts/py-opentypespec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip-api>=0:devel/py-pip-api@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.19:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rich>=0:textproc/py-rich@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}uharfbuzz>=0:print/py-uharfbuzz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}vharfbuzz>=0.2.0:print/py-vharfbuzz@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 # fontbakery[adobefonts] and fontbakery[iso15008] are empty
 OPTIONS_DEFINE=	FONTVAL FONTWERK GOOGLEFONTS NOTOFONTS SHAPING TYPENETWORK UFO
 OPTIONS_DEFAULT=FONTVAL FONTWERK GOOGLEFONTS NOTOFONTS SHAPING TYPENETWORK UFO
 FONTVAL_DESC=		Checks for Font Validator
 FONTWERK_DESC=		Checks for Fontwerk.com
 FONTWERK_IMPLIES=	GOOGLEFONTS
 GOOGLEFONTS_DESC=	Checks for Google Fonts
 GOOGLEFONTS_IMPLIES=	SHAPING UFO
 NOTOFONTS_DESC=		Checks for Noto fonts
 NOTOFONTS_IMPLIES=	GOOGLEFONTS
 SHAPING_DESC=		Checks for shaping
 TYPENETWORK_DESC=	Checks for Type Network
 UFO_DESC=		Checks for UFO sources
 
 FONTVAL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR}
 GOOGLEFONTS_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}axisregistry>=0.4.9<0.5:x11-fonts/py-axisregistry@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.7.1:www/py-beautifulsoup@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}dehinter>=3.1.0:print/py-dehinter@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}fonttools>=0:print/py-fonttools@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}gflanguages>=0.6.1<0.7:x11-fonts/py-gflanguages@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}gfsubsets>=2024.5.9:x11-fonts/py-gfsubsets@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}glyphsets>=1.0.0<2:print/py-glyphsets@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}protobuf>=3.7.0,1:devel/py-protobuf@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}shaperglot>=0.5.0<0.6:x11-fonts/py-shaperglot@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}unicodedata2>=0:devel/py-unicodedata2@${PY_FLAVOR}
 SHAPING_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}collidoscope>=0.5.2:print/py-collidoscope@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}shaperglot>=0.3.0<0.6.0:x11-fonts/py-shaperglot@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}stringbrewer>=0:devel/py-stringbrewer@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}ufo2ft>=2.25.2:x11-fonts/py-ufo2ft@${PY_FLAVOR}
 TYPENETWORK_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.7.1:www/py-beautifulsoup@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}shaperglot>=0.3.0<0.6.0:x11-fonts/py-shaperglot@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}ufo2ft>=2.25.2:x11-fonts/py-ufo2ft@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}unicodedata2>=0:devel/py-unicodedata2@${PY_FLAVOR}
 UFO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}defcon>=0:x11-fonts/py-defcon@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}fonttools>=0:print/py-fonttools@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}ufo2ft>=2.25.2:x11-fonts/py-ufo2ft@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}ufolint>=0:x11-fonts/py-ufolint@${PY_FLAVOR}
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 31100
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/print/py-glyphsets/Makefile b/print/py-glyphsets/Makefile
index f3a49724375d..427075f30eea 100644
--- a/print/py-glyphsets/Makefile
+++ b/print/py-glyphsets/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	glyphsets
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	print python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python API for evaluating coverage of glyph sets in font projects
 WWW=		https://github.com/googlefonts/glyphsets
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=8.0.4<8.1:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}defcon>=0:x11-fonts/py-defcon@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fonttools>=0:print/py-fonttools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gflanguages>=0.6.0:x11-fonts/py-gflanguages@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}glyphsLib>=0:x11-fonts/py-glyphsLib@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unicodedata2>=0:devel/py-unicodedata2@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/print/py-relatorio/Makefile b/print/py-relatorio/Makefile
index a0dfd009d392..e87db444e173 100644
--- a/print/py-relatorio/Makefile
+++ b/print/py-relatorio/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	relatorio
 PORTVERSION=	0.10.2
+PORTREVISION=	1
 CATEGORIES=	print python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Templating library able to output odt and pdf files
 WWW=		https://docs.tryton.org/relatorio/latest/ \
 		https://github.com/tryton/relatorio
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:textproc/py-genshi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=2.0:devel/py-lxml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517 unittest
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	CHART FODT
 OPTIONS_DEFAULT=CHART FODT
 CHART_DESC=	Chart support
 FODT_DESC=	OpenDocument support
 
 CHART_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycha>=0.4.0:graphics/py-pycha@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
+			${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 FODT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-magic>=0:devel/py-python-magic@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/science/dvc/Makefile b/science/dvc/Makefile
index b122e045c3ca..3e8564d70035 100644
--- a/science/dvc/Makefile
+++ b/science/dvc/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	dvc
 DISTVERSION=	0.30.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Git for data scientists: manage code and data together
 WWW=		https://dvc.org/
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.3:devel/py-appdirs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}asciimatics>=1.10.0:devel/py-asciimatics@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorama>=0.3.9:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configparser>=3.5.0:devel/py-configparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}distro>=1.3.0:sysutils/py-distro@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gitpython>=2.1.8:devel/py-gitpython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}grandalf==0.7:math/py-grandalf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpath-rw>0:devel/py-jsonpath-rw@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nanotime>=0.5.2:devel/py-nanotime@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.1:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ply>=3.9:devel/py-ply@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyasn1>=0.4.1:devel/py-pyasn1@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.12:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}schema>=0.6.7:devel/py-schema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zclockfile>0:devel/py-zclockfile@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist noflavors
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-PyNE/Makefile b/science/py-PyNE/Makefile
index 1eda9655b2d2..b3c6b4cc2062 100644
--- a/science/py-PyNE/Makefile
+++ b/science/py-PyNE/Makefile
@@ -1,88 +1,88 @@
 PORTNAME=	PyNE
 DISTVERSION=	0.7.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science # physics
 MASTER_SITES=	https://raw.githubusercontent.com/pyne/data/master/:decay \
 		https://raw.githubusercontent.com/pyne/data/master/:cram \
 		https://raw.githubusercontent.com/pyne/data/master/:dlc \
 		https://raw.githubusercontent.com/pyne/data/master/:clc \
 		https://raw.githubusercontent.com/pyne/data/master/:nuc_data
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	decay.tar.gz:decay \
 		cram.tar.gz:cram \
 		decay-linux-clang.tar.gz:dlc \
 		cram-linux-clang.tar.gz:clc \
 		prebuilt_nuc_data.h5:nuc_data
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	PyNE: The Nuclear Engineering Toolkit
 WWW=		https://pyne.io/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 BROKEN_armv7=	clang runs out of memory
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}progress>0:devel/py-progress@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tables>0:devel/py-tables@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tables>0:devel/py-tables@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} # the dependency list is only in ubuntu.sh, see https://github.com/pyne/pyne/issues/1518
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} # the dependency list is only in ubuntu.sh, see https://github.com/pyne/pyne/issues/1518
 PY_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}OpenMC>0:science/py-OpenMC@${PY_FLAVOR}
 BUILD_DEPENDS=	cmake:devel/cmake-core \
 		${PY_DEPENDS}
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libMOAB.so:math/moab
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		compiler:c++17-lang fortran python
 USE_PYTHON=	distutils cython flavors
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pyne
 GH_PROJECT=	pyne
 
 MAKE_ENV=	DESTDIR=${STAGEDIR}
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 FFLAGS+=	-fallow-argument-mismatch
 
 # all arguments are described here: http://pyne.io/install/source.html#source
 PY_EXTRA_ARGS=	--slow	# this chooses slow compilation of sources from {decay,cram}.tar.gz
 			# over incompatible pre-compiled assembly from {decay,cram}-linux-clang.tar.gz
 PY_EXTRA_ARGS+=	${_MAKE_JOBS}
 PY_EXTRA_ARGS+=	--hdf5 ${LOCALBASE}
 PY_EXTRA_ARGS+=	--moab ${LOCALBASE}
 
 PYDISTUTILS_CONFIGUREARGS=	${PY_EXTRA_ARGS}
 PYDISTUTILS_BUILDARGS=		${PY_EXTRA_ARGS}
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 post-extract:
 .for f in decay.tar.gz cram.tar.gz decay-linux-clang.tar.gz cram-linux-clang.tar.gz
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSRC}/src
 .endfor
 
 do-install:
 	# install project
 	cd ${INSTALL_WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET}
 	# also install nuc_data.h5 because it is referred to in the code and is required by Jupyter notebooks
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/prebuilt_nuc_data.h5 ${STAGEDIR}${PYTHON_SITELIBDIR}/pyne/nuc_data.h5
 	# remove stray files
 	${RM} ${STAGEDIR}${PREFIX}/bin/ubuntu.sh
 	# strip
 	${STRIP_CMD} \
 		${STAGEDIR}${LOCALBASE}/lib/lib*.so \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/pyne/*.so \
 		${STAGEDIR}${PYTHON_SITELIBDIR}/pyne/xs/models.so
 
 # CAVEAT: due to the failure to find MOAB-5.5.1 the file pyne/source_sampling.so isn't built, and is removed from plist
 #         - see https://github.com/pyne/pyne/issues/1537
 
 .include <bsd.port.mk>
diff --git a/science/py-abipy/Makefile b/science/py-abipy/Makefile
index 3b012f8ff461..0753f00bcd33 100644
--- a/science/py-abipy/Makefile
+++ b/science/py-abipy/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	abipy
 DISTVERSION=	0.9.6
+PORTREVISION=	1
 CATEGORIES=	science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for analyzing the results produced by ABINIT
 WWW=		https://abinit.github.io/abipy/
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}apscheduler>0:devel/py-apscheduler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chart-studio>0:graphics/py-chart-studio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}html2text>0:textproc/py-html2text@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}monty>0:devel/py-monty@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netCDF4>0:science/py-netCDF4@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>0:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydispatcher>=2.0.5:devel/py-pydispatcher@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pymatgen>=2022.0.14:science/py-pymatgen@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}seaborn>0:math/py-seaborn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spglib>0:science/py-spglib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.11:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python shebangfix
 USE_PYTHON=	distutils concurrent autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	abinit
 
 SHEBANG_GLOB=	*.py
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-asdf/Makefile b/science/py-asdf/Makefile
index b7833976410e..a79580d716cd 100644
--- a/science/py-asdf/Makefile
+++ b/science/py-asdf/Makefile
@@ -1,48 +1,49 @@
 PORTNAME=	asdf
 PORTVERSION=	3.2.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python tools to handle ASDF files
 WWW=		https://asdf.readthedocs.io/en/latest/ \
 		https://github.com/asdf-format/asdf
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=60:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=3.4:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asdf-standard>=1.1.0:science/py-asdf-standard@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}asdf-transform-schemas>=0.3:science/py-asdf-transform-schemas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}attrs>=20.1.0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.11.4:devel/py-importlib-metadata@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jmespath>=0.6.2:devel/py-jmespath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.22,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=19:devel/py-packaging@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.4.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}semantic-version>=2.8:devel/py-semantic-version@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>=2022.8.2:devel/py-fsspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lz4>=0.10:archivers/py-lz4@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-doctestplus>=0:devel/py-pytest-doctestplus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-remotedata>=0:devel/py-pytest-remotedata@${PY_FLAVOR}
 # fsspec[http]
 TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}aiohttp>=0:www/py-aiohttp@${PY_FLAVOR}
 
 USES=		python:3.9+ shebangfix
 USE_PYTHON=	autoplist concurrent pep517 pytest
 
 NO_ARCH=	yes
 
 SHEBANG_FILES=	asdf/_jsonschema/json/bin/jsonschema_suite
 
 OPTIONS_DEFINE=	ALL
 OPTIONS_DEFAULT=ALL
 ALL_DESC=	Lz4 compression algorithm support
 
 ALL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lz4>=0.10:archivers/py-lz4@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/science/py-kliff/Makefile b/science/py-kliff/Makefile
index 43151d999c44..b9a5d41323ef 100644
--- a/science/py-kliff/Makefile
+++ b/science/py-kliff/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	kliff
 DISTVERSION=	0.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	KIM-based Learning-Integrated Fitting Framework
 WWW=		https://github.com/mjwen/kliff
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}kimpy>0:science/py-kimpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}loguru>0:devel/py-loguru@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}monty>0:devel/py-monty@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		compiler:c++11-lang python
 USE_PYTHON=	distutils autoplist pytest # tests fail to run, see https://github.com/openkim/kliff/issues/81
 
 post-install:
 	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name "*.so" | ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/science/py-phono3py/Makefile b/science/py-phono3py/Makefile
index b8e795d5c517..af0d8d8670cb 100644
--- a/science/py-phono3py/Makefile
+++ b/science/py-phono3py/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	phono3py
 DISTVERSION=	1.22.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Software to calculate phonon-phonon interaction and related properties
 WWW=		https://atztogo.github.io/phono3py/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}phonopy>=2.9.3:science/py-phonopy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spglib>0:science/py-spglib@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		blaslapack:openblas fortran localbase python
 USE_PYTHON=	distutils cython autoplist
 
 .include <bsd.port.mk>
diff --git a/science/py-phonopy/Makefile b/science/py-phonopy/Makefile
index d16adc0ed5bf..d084defe8d3b 100644
--- a/science/py-phonopy/Makefile
+++ b/science/py-phonopy/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	phonopy
 DISTVERSION=	2.24.3
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Package for phonon calculations at harmonic and quasi-harmonic levels
 WWW=		https://phonopy.github.io/phonopy/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.2:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spglib>=2.3:science/py-spglib@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hiphive>0:science/py-hiphive@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils cython autoplist pytest
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_WRKSRC=	${WRKSRC}/test
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/phonopy/_phonopy${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/science/py-pygeometa/Makefile b/science/py-pygeometa/Makefile
index d04695972bd2..0f00e24139cf 100644
--- a/science/py-pygeometa/Makefile
+++ b/science/py-pygeometa/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	pygeometa
 PORTVERSION=	0.15.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Generate metadata for geospatial datasets
 WWW=		https://geopython.github.io/pygeometa/ \
 		https://github.com/geopython/pygeometa
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0:graphics/py-OWSLib@${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
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-pyked/Makefile b/science/py-pyked/Makefile
index d4a12790c74d..8466abba5482 100644
--- a/science/py-pyked/Makefile
+++ b/science/py-pyked/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	pyked
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4.1-16
-PORTREVISION=	1
 DISTVERSIONSUFFIX=	-gfcccaf8
+PORTREVISION=	2
 CATEGORIES=	science python
 #MASTER_SITES=	PYPI 0.4.1 is broken there
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Package for manipulating Chemical Kinetics Experimental Data files
 WWW=		https://pr-omethe-us.github.io/PyKED/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}Cerberus>=1.0.0:devel/py-cerberus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}habanero>=0.6.0:www/py-habanero@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pint>=0.7.2:devel/py-pint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}uncertainties>=3.0.1:math/py-uncertainties@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.12:devel/py-pyyaml@${PY_FLAVOR} \
 
 USES=		python
 USE_PYTHON=	distutils concurrent autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pr-omethe-us
 GH_PROJECT=	PyKED
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/science/py-qcengine/Makefile b/science/py-qcengine/Makefile
index 061bb94f0d82..4a2f0ada93a6 100644
--- a/science/py-qcengine/Makefile
+++ b/science/py-qcengine/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	qcengine
 DISTVERSION=	0.30.0
+PORTREVISION=	1
 CATEGORIES=	science python # chemistry
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Quantum chemistry program executor and IO standardizer (QCSchema)
 WWW=		https://github.com/MolSSI/QCEngine
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}py-cpuinfo>0:sysutils/py-py-cpuinfo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydantic2>=1.8.2:devel/py-pydantic2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qcelemental>=0.24.0:science/py-qcelemental@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		dftd3:science/dftd3 \
 		dftd4:science/dftd4 \
 		mctc-gcp:science/gcp \
 		mopac:science/mopac \
 		mp2d:science/mp2d \
 		mrchem:science/py-mrchem@${PY_FLAVOR} \
 		nwchem:science/nwchem \
 		psi4:science/psi4 \
 		rdkit>0:science/rdkit \
 		s-dftd3:science/simple-dftd3 \
 		xtb:science/xtb \
 		${PYTHON_PKGNAMEPREFIX}dftd4>0:science/py-dftd4@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>0:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyberny>0:science/py-pyberny@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geometric>0:science/py-geometric@${PY_FLAVOR}
 		# last dependencies above are for specific quantum chemistry packages to test with TODO torchani,openmm,torsiondrive,mdi
 
 USES=		python
 USE_PYTHON=	distutils concurrent autoplist pytest # 1 tests fails, see https://github.com/MolSSI/QCEngine/issues/377#issuecomment-2191948293
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/security/caldera/Makefile b/security/caldera/Makefile
index 4e087d01cfb6..600de9541cb5 100644
--- a/security/caldera/Makefile
+++ b/security/caldera/Makefile
@@ -1,163 +1,163 @@
 PORTNAME=	caldera
 DISTVERSION=	5.0.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	security python
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Automated Adversary Emulation Platform
 WWW=		https://github.com/mitre/caldera
 
 CONFLICTS=	caldera4
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	npm-node18>0:www/npm-node18
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}aiohttp-jinja2>0:www/py-aiohttp-jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}aiohttp-session>0:www/py-aiohttp-session@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}aiohttp-security>0:security/py-aiohttp-security@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}aiohttp-apispec>0:devel/py-aiohttp-apispec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}websockets>0:devel/py-websockets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}myst-parser>0:textproc/py-myst-parser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}marshmallow>0:devel/py-marshmallow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dirhash>0:security/py-dirhash@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docker>0:sysutils/py-docker@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}donut-shellcode>0:devel/py-donut-shellcode@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}marshmallow-enum>0:devel/py-marshmallow-enum@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ldap3>0:net/py-ldap3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}svglib>0:converters/py-svglib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}asyncssh>0:security/py-asyncssh@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}aioftp>0:ftp/py-aioftp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyautogui>0:x11/py-pyautogui@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}selenium>0:www/py-selenium@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}webdriver_manager>0:www/py-webdriver_manager@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \
 		upx>0:archivers/upx \
 		base64>0:converters/base64 \
 		git>0:devel/git \
 		bash>0:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mitre
 GH_PROJECT=	${PORTNAME}
 GH_TUPLE=	mitre:access:775181b:access/plugins/access \
 		mitre:atomic:4f489bb:atomic/plugins/atomic \
 		mitre:builder:de24b68:builder/plugins/builder \
 		mitre:compass:85e2ebf:compass/plugins/compass \
 		mitre:debrief:eba44d5:debrief/plugins/debrief \
 		mitre:emu:7215768:emu/plugins/emu \
 		mitre:fieldmanual:cb53f2b:fieldmanual/plugins/fieldmanual \
 		mitre:gameboard:dacb6ce:gameboard/plugins/gameboard \
 		mitre:human:0e344ea:human/plugins/human \
 		mitre:magma:99f0056:magma/plugins/magma \
 		mitre:manx:a7e83a6:manx/plugins/manx \
 		mitre:response:8ea6ab5:response/plugins/response \
 		mitre:sandcat:b408f3f:sandcat/plugins/sandcat \
 		mitre:ssl:1ae8431:ssl/plugins/ssl \
 		mitre:stockpile:fe0c5b7:stockpile/plugins/stockpile \
 		mitre:training:37f998f:training/plugins/training
 
 USES=		dos2unix go:run nodejs:18,build python
 USE_PYTHON=	cryptography
 
 NO_ARCH=	yes
 
 DOS2UNIX_REGEX= .*\.([yml])
 CALDERA_USER=	caldera
 CALDERA_GROUP=	caldera
 USERS=		${CALDERA_USER}
 GROUPS=		${CALDERA_GROUP}
 
 PLIST=		${WRKDIR}/pkg-plist
 USE_RC_SUBR=	${PORTNAME:S/-/_/}
 SUB_FILES=	pkg-message
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
 		WWWDIR=${WWWDIR}
 
 OPTIONS_DEFINE=	HAPROXY
 OPTIONS_DEFAULT=HAPROXY
 HAPROXY_DESC=	Support for HTTPS
 HAPROXY_RUN_DEPENDS=haproxy24>0:net/haproxy24
 
 NPM_BIN=	${LOCALBASE}/bin/npm
 
 # to rebuild the deps archive:
 #   1. set DEV_UPDATE_MODE=yes
 #   2. make makesum build
 #   3. upload the *-cache archive
 #   4. set DEV_UPDATE_MODE=no
 #   5. make clean makesum
 
 DEV_UPDATE_MODE=	no
 DEPS_CACHE_DIR=		${WRKSRC}/plugins/magma
 
 .if (${DEV_UPDATE_MODE} == "yes")
 NPM_ARGS=	install
 post-build:
 	@cd ${DEPS_CACHE_DIR} && ${TAR} czf ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX} node_modules
 	@${ECHO} "(!!!) Please upload the cache archive: ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX}"
 .else
 MASTER_SITES+=	LOCAL/acm/caldera/:npm_cache
 DISTFILES+=	${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX}:npm_cache \
 		${PORTNAME}-freebsd-logos.tar.gz:npm_cache
 NPM_ARGS=	run build
 
 post-extract:
 	@${MV} ${WRKDIR}/node_modules ${WRKSRC}/plugins/magma/
 	@${MV} ${WRKDIR}/freebsd.red.svg ${WRKSRC}/plugins/magma/src/assets/img/graph/freebsd-icon-privileged.svg
 	@${MV} ${WRKDIR}/freebsd.black.svg ${WRKSRC}/plugins/magma/src/assets/img/graph/freebsd-icon.svg
 	${RM} -R ${WRKSRC}/.github
 	cd ${WRKSRC} && ${RM} .coveragerc .dockerignore .eslintrc.js .flake8 \
 		.git* .pre* .stylelintrc.json Dockerfile
 .endif
 
 post-patch:
 	cd ${WRKSRC} && \
 		${FIND} . -type f -name "*.orig" -exec ${RM} "{}" \;
 	${REINPLACE_CMD} -i "" -e 's|4.2.0|${PORTVERSION}|g' ${WRKSRC}/app/version.py
 
 do-build:
 	@cd ${WRKSRC}/plugins/magma && \
 		${NPM_BIN} ${NPM_ARGS}
 
 post-build:
 	${RM} -r ${WRKSRC}/plugins/magma/node_modules
 
 pre-install:
 	@${RM} -f ${PLIST}
 
 	@${ECHO_CMD} "@mode 640" > ${PLIST}
 	@${ECHO_CMD} "@owner caldera" >> ${PLIST}
 	@${ECHO_CMD} "@group caldera" >> ${PLIST}
 
 	@cd ${WRKSRC} && \
 		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%WWWDIR%%/|' >> ${PLIST}
 
 	@${ECHO_CMD} "@mode 750" >> ${PLIST}
 	@${ECHO_CMD} "@owner caldera" >> ${PLIST}
 	@${ECHO_CMD} "@group caldera" >> ${PLIST}
 
 	@cd ${WRKSRC} && \
 		${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|@dir %%WWWDIR%%/|' >> ${PLIST}
 
 	@${ECHO_CMD} "@mode" >> ${PLIST}
 	@${ECHO_CMD} "@owner" >> ${PLIST}
 	@${ECHO_CMD} "@group" >> ${PLIST}
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}
 
 .include <bsd.port.mk>
diff --git a/security/caldera4/Makefile b/security/caldera4/Makefile
index bac7a58bb24e..910385fdbb04 100644
--- a/security/caldera4/Makefile
+++ b/security/caldera4/Makefile
@@ -1,105 +1,105 @@
 PORTNAME=	caldera
 DISTVERSION=	4.2.0
-PORTREVISION=	10
+PORTREVISION=	11
 PKGNAMESUFFIX=	4
 CATEGORIES=	security python
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Automated Adversary Emulation Platform
 WWW=		https://github.com/mitre/caldera
 
 CONFLICTS=	caldera
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}aiohttp-jinja2>0:www/py-aiohttp-jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}aiohttp-session>0:www/py-aiohttp-session@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}aiohttp-security>0:security/py-aiohttp-security@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}aiohttp-apispec>0:devel/py-aiohttp-apispec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}websockets>0:devel/py-websockets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}myst-parser>0:textproc/py-myst-parser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}marshmallow>0:devel/py-marshmallow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dirhash>0:security/py-dirhash@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docker>0:sysutils/py-docker@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}donut-shellcode>0:devel/py-donut-shellcode@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}marshmallow-enum>0:devel/py-marshmallow-enum@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ldap3>0:net/py-ldap3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}svglib>0:converters/py-svglib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}asyncssh>0:security/py-asyncssh@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}aioftp>0:ftp/py-aioftp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyautogui>0:x11/py-pyautogui@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}selenium>0:www/py-selenium@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}webdriver_manager>0:www/py-webdriver_manager@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \
 		upx>0:archivers/upx \
 		base64>0:converters/base64 \
 		git>0:devel/git \
 		bash>0:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mitre
 GH_PROJECT=	${PORTNAME}
 GH_TUPLE=	mitre:access:0e67776:access/plugins/access \
 		mitre:atomic:9e2c958:atomic/plugins/atomic \
 		mitre:builder:f2ce67c:builder/plugins/builder \
 		mitre:compass:fb88e02:compass/plugins/compass \
 		mitre:debrief:e4d4f9e:debrief/plugins/debrief \
 		mitre:emu:02a0f3e:emu/plugins/emu \
 		mitre:fieldmanual:c286e77:fieldmanual/plugins/fieldmanual \
 		mitre:gameboard:3d98c32:gameboard/plugins/gameboard \
 		mitre:human:4368dea:human/plugins/human \
 		mitre:manx:e7205ea:manx/plugins/manx \
 		mitre:response:889213a:response/plugins/response \
 		mitre:sandcat:7c326bd:sandcat/plugins/sandcat \
 		mitre:ssl:ac5bfcb:ssl/plugins/ssl \
 		mitre:stockpile:960f9ad:stockpile/plugins/stockpile \
 		mitre:training:b058b67:training/plugins/training
 
 USES=		dos2unix go:run python
 USE_PYTHON=	cryptography
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 DOS2UNIX_REGEX= .*\.([yml])
 CALDERA_USER=	caldera
 CALDERA_GROUP=	caldera
 USERS=		${CALDERA_USER}
 GROUPS=		${CALDERA_GROUP}
 
 USE_RC_SUBR=	${PORTNAME:S/-/_/}
 SUB_FILES=	pkg-message
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
 		WWWDIR=${WWWDIR}
 
 OPTIONS_DEFINE=	HAPROXY
 OPTIONS_DEFAULT=HAPROXY
 HAPROXY_DESC=	Support for HTTPS
 HAPROXY_RUN_DEPENDS=haproxy24>0:net/haproxy24
 
 post-extract:
 	${RM} -R ${WRKSRC}/.github
 	cd ${WRKSRC} && ${RM} .coveragerc .dockerignore .eslintrc.js .flake8 \
 		.git* .pre* .stylelintrc.json Dockerfile
 
 post-patch:
 	cd ${WRKSRC} && \
 		${FIND} . -type f -name "*.orig" -exec ${RM} "{}" \;
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}
 
 .include <bsd.port.mk>
diff --git a/security/liboqs/Makefile b/security/liboqs/Makefile
index c4038966d029..ed043ba56a08 100644
--- a/security/liboqs/Makefile
+++ b/security/liboqs/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	liboqs
 DISTVERSION=	0.10.1
 CATEGORIES=	security
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C library for quantum-resistant cryptography
 WWW=		https://openquantumsafe.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		bash:shells/bash
 
 USES=		cmake:testing python:test shebangfix ssl
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	open-quantum-safe
 
 SHEBANG_GLOB=	*.sh
 
 CMAKE_ON=	BUILD_SHARED_LIBS OQS_DIST_BUILD \
 		OQS_PERMIT_UNSUPPORTED_ARCHITECTURE # trying to build on i386, powerpc, armv6, riscv64
 
 CMAKE_TESTING_TARGET=	run_tests
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64
 PLIST_SUB+=	KEM_BIKE="" # BIKE algorithm is limited by architecture in .CMake/alg_support.cmake
 .else
 PLIST_SUB+=	KEM_BIKE="@comment "
 .endif
 
 .include <bsd.port.mk>
diff --git a/security/py-artifacts/Makefile b/security/py-artifacts/Makefile
index 289161cad579..744d42ab7c0d 100644
--- a/security/py-artifacts/Makefile
+++ b/security/py-artifacts/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	artifacts
 PORTVERSION=	20230928
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	PYPI \
 		https://github.com/ForensicArtifacts/artifacts/releases/download/${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	antoine@FreeBSD.org
 COMMENT=	ForensicArtifacts.com Artifact Repository
 WWW=		https://github.com/ForensicArtifacts/artifacts
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=3.10:devel/py-pyyaml@${PY_FLAVOR}
 
 NO_ARCH=	yes
 USES=		python
 USE_PYTHON=	distutils autoplist concurrent
 DO_MAKE_TEST=	${SETENV} ${TEST_ENV} ${PYTHON_CMD}
 TEST_TARGET=	run_tests.py
 
 post-patch:
 	${REINPLACE_CMD} "s,share/artifacts,${DATADIR_REL}, ; \
 		s,share/doc/artifacts,${DOCSDIR_REL}," ${WRKSRC}/setup.py
 	${REINPLACE_CMD} "/pip/d" ${WRKSRC}/requirements.txt
 
 .include <bsd.port.mk>
diff --git a/security/py-certomancer/Makefile b/security/py-certomancer/Makefile
index ac3ef27c6896..712135d5f735 100644
--- a/security/py-certomancer/Makefile
+++ b/security/py-certomancer/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	certomancer
 PORTVERSION=	0.12.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PKI testing tool
 WWW=		https://github.com/MatthiasValvekens/certomancer
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asn1crypto>=1.5.0<1.6:devel/py-asn1crypto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=7.1.2:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8.1:devel/py-python-dateutil@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.4.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tzlocal>=2.1:devel/py-tzlocal@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent cryptography pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/security/py-detect-secrets/Makefile b/security/py-detect-secrets/Makefile
index 4d4478164f0c..276afaefebfa 100644
--- a/security/py-detect-secrets/Makefile
+++ b/security/py-detect-secrets/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	detect-secrets
 PORTVERSION=	1.5.0
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	detect_secrets-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Tool for detecting secrets in the codebase
 WWW=		https://github.com/Yelp/detect-secrets
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/security/py-dfvfs/Makefile b/security/py-dfvfs/Makefile
index 8b37bc7cf8cc..448defd41cc9 100644
--- a/security/py-dfvfs/Makefile
+++ b/security/py-dfvfs/Makefile
@@ -1,59 +1,60 @@
 PORTNAME=	dfvfs
 PORTVERSION=	20231208
+PORTREVISION=	1
 CATEGORIES=	security devel python
 MASTER_SITES=	https://github.com/log2timeline/dfvfs/releases/download/${PORTVERSION}/ \
 		LOCAL/antoine
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	antoine@FreeBSD.org
 COMMENT=	Digital Forensics Virtual File System
 WWW=		https://github.com/log2timeline/dfvfs
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	libbde>=a:devel/libbde \
 		libewf>=0:devel/libewf \
 		libfsapfs>=e:devel/libfsapfs \
 		libfsext>=e:devel/libfsext \
 		libfsfat>=e:devel/libfsfat \
 		libfshfs>=e:devel/libfshfs \
 		libfsntfs>=e:devel/libfsntfs \
 		libfsxfs>=e:devel/libfsxfs \
 		libfvde>=0:sysutils/libfvde \
 		libfwnt>=e:devel/libfwnt \
 		libluksde>=e:devel/libluksde \
 		libmodi>=e:devel/libmodi \
 		libphdi>=e:devel/libphdi \
 		libqcow>=a:devel/libqcow \
 		libsigscan>=e:devel/libsigscan \
 		libsmdev>=a:devel/libsmdev \
 		libsmraw>=a:devel/libsmraw \
 		libvhdi>=e:devel/libvhdi \
 		libvmdk>=e:devel/libvmdk \
 		libvsapm>=e:devel/libvsapm \
 		libvsgpt>=e:devel/libvsgpt \
 		libvshadow>=0:devel/libvshadow \
 		libvslvm>=e:devel/libvslvm \
 		${PYTHON_PKGNAMEPREFIX}dfdatetime>=0:security/py-dfdatetime@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dtfabric>=0:devel/py-dtfabric@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytsk>=0:sysutils/py-pytsk@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xattr>=0:devel/py-xattr@${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_LOCALE=	en_US.UTF-8
 USE_PYTHON=	autoplist concurrent cryptography distutils
 DO_MAKE_TEST=	${SETENV} ${TEST_ENV} ${PYTHON_CMD}
 TEST_TARGET=	run_tests.py
 
 NO_ARCH=	yes
 
 # Upstream archive contains files with UTF-8 names
 EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
 
 post-patch:
 	${REINPLACE_CMD} "/cffi/d" ${WRKSRC}/requirements.txt
 
 .include <bsd.port.mk>
diff --git a/security/py-dfwinreg/Makefile b/security/py-dfwinreg/Makefile
index 82412590ba16..2c424dcd3c51 100644
--- a/security/py-dfwinreg/Makefile
+++ b/security/py-dfwinreg/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	dfwinreg
 PORTVERSION=	20221218
+PORTREVISION=	1
 CATEGORIES=	security devel python
 MASTER_SITES=	https://github.com/log2timeline/dfwinreg/releases/download/${PORTVERSION}/ \
 		LOCAL/antoine
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	antoine@FreeBSD.org
 COMMENT=	Digital Forensics Windows Registry
 WWW=		https://github.com/log2timeline/dfwinreg
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	libcreg>=e:devel/libcreg \
 		libregf>=a:devel/libregf \
 		${PYTHON_PKGNAMEPREFIX}dtfabric>=0:devel/py-dtfabric@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dfdatetime>=0:security/py-dfdatetime@${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=	distutils autoplist concurrent
 DO_MAKE_TEST=	${SETENV} ${TEST_ENV} ${PYTHON_CMD}
 TEST_TARGET=	run_tests.py
 
 NO_ARCH=	yes
 
 post-patch:
 	${REINPLACE_CMD} "s,share/doc/dfwinreg,${DOCSDIR_REL}," ${WRKSRC}/setup.py
 	${REINPLACE_CMD} "/pip/d" ${WRKSRC}/requirements.txt
 
 .include <bsd.port.mk>
diff --git a/security/py-netmiko/Makefile b/security/py-netmiko/Makefile
index 14f5a17ef36c..91176b4ad1c6 100644
--- a/security/py-netmiko/Makefile
+++ b/security/py-netmiko/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	netmiko
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security net-mgmt python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Multi-vendor library to simplify SSH connections to network devices
 WWW=		https://github.com/ktbyers/netmiko
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.3.2:devel/py-poetry-core@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ntc-templates>=2.0.0:textproc/py-ntc-templates@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paramiko>=2.9.5:security/py-paramiko@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyserial>=3.3:comms/py-pyserial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scp>=0.13.6:security/py-scp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}textfsm>=1.1.3:textproc/py-textfsm@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=6.0.1:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=6.0.1:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python shebangfix
 USE_PYTHON=	autoplist concurrent pep517 pytest
 USE_GITHUB=	yes
 GH_ACCOUNT=	ktbyers
 SHEBANG_FILES=	netmiko/cli_tools/netmiko_cfg.py \
 		netmiko/cli_tools/netmiko_grep.py \
 		netmiko/cli_tools/netmiko_show.py
 
 TEST_ARGS=	tests/test_import_netmiko.py
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/security/py-plaso/Makefile b/security/py-plaso/Makefile
index 44f6044d04b4..6adab0f07cd5 100644
--- a/security/py-plaso/Makefile
+++ b/security/py-plaso/Makefile
@@ -1,79 +1,79 @@
 PORTNAME=	plaso
 PORTVERSION=	20231224
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security python
 MASTER_SITES=	https://github.com/log2timeline/plaso/releases/download/${PORTVERSION}/ \
 		LOCAL/antoine
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	antoine@FreeBSD.org
 COMMENT=	Automatic creation of a super timeline
 WWW=		https://github.com/log2timeline/plaso/wiki
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	libcaes>=a:security/libcaes \
 		libesedb>=e:devel/libesedb \
 		libevt>=a:devel/libevt \
 		libevtx>=a:devel/libevtx \
 		libfwsi>=e:devel/libfwsi \
 		liblnk>=0:devel/liblnk \
 		libmsiecf>=a:devel/libmsiecf \
 		libolecf>=a:devel/libolecf \
 		libregf>=a:devel/libregf \
 		libscca>=a:devel/libscca \
 		libsigscan>=e:devel/libsigscan \
 		${PYTHON_PKGNAMEPREFIX}acstore>=0:devel/py-acstore@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}artifacts>=0:security/py-artifacts@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}bencode.py>=0:converters/py-bencode.py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dfdatetime>=0:security/py-dfdatetime@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dfvfs>=0:security/py-dfvfs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dfwinreg>=0:security/py-dfwinreg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dtfabric>=0:devel/py-dtfabric@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flor>=0:textproc/py-flor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lz4>=0:archivers/py-lz4@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}opensearch-py>=0:textproc/py-opensearch-py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pefile>=0:devel/py-pefile@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytsk>=0:sysutils/py-pytsk@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzmq>=0:net/py-pyzmq@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}redis>=0:databases/py-redis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xattr>=0:devel/py-xattr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}XlsxWriter>=0:textproc/py-xlsxwriter@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yara>=0:security/py-yara@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zstd>=0:archivers/py-zstd@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fakeredis>=0:databases/py-fakeredis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR}
 
 USES=		python
 USE_LOCALE=	en_US.UTF-8
 USE_PYTHON=	autoplist concurrent cryptography distutils
 # Upstream archive contains files with UTF-8 names
 EXTRACT_CMD=	${SETENV} LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE} ${TAR}
 DO_MAKE_TEST=	${SETENV} ${TEST_ENV} ${PYTHON_CMD}
 TEST_TARGET=	run_tests.py
 
 NO_ARCH=	yes
 
 post-patch:
 	${REINPLACE_CMD} "s|'share', 'artifacts'|'share', '${PYTHON_PKGNAMEPREFIX}artifacts'|" \
 		${WRKSRC}/plaso/cli/helpers/artifact_definitions.py
 	${REINPLACE_CMD} "s|'share', 'plaso'|'share', '${PYTHON_PKGNAMEPREFIX}plaso'|" \
 		${WRKSRC}/plaso/cli/helpers/data_location.py
 	${REINPLACE_CMD} "s|share/plaso|${DATADIR_REL}|" \
 		${WRKSRC}/setup.py
 	${REINPLACE_CMD} "/cffi/d" ${WRKSRC}/requirements.txt
 
 .include <bsd.port.mk>
diff --git a/security/py-pyaff4/Makefile b/security/py-pyaff4/Makefile
index 6cae39fec297..8c863bfde810 100644
--- a/security/py-pyaff4/Makefile
+++ b/security/py-pyaff4/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	pyaff4
 DISTVERSION=	0.26.post6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	antoine@FreeBSD.org
 COMMENT=	Python Advanced Forensic Format Version 4 library
 WWW=		https://www.aff4.org/
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-snappy>=0.5.1:archivers/py-python-snappy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rdflib>=4.2.2:textproc/py-rdflib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}intervaltree>=2.1.0:devel/py-intervaltree@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}expiringdict>=1.1.4:devel/py-expiringdict@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}html5lib>=0:www/py-html5lib@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pynacl>0:security/py-pynacl@${PY_FLAVOR}
 
 NO_ARCH=	yes
 USES=		python zip
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/security/py-pyhanko/Makefile b/security/py-pyhanko/Makefile
index 0b23bf7b0864..a166880f9f1b 100644
--- a/security/py-pyhanko/Makefile
+++ b/security/py-pyhanko/Makefile
@@ -1,57 +1,58 @@
 PORTNAME=	pyhanko
 PORTVERSION=	0.23.2
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	PYPI \
 		https://github.com/MatthiasValvekens/pyHanko/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pyHanko-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Tools for stamping and signing PDF files
 WWW=		https://pyhanko.readthedocs.io/en/latest/ \
 		https://github.com/MatthiasValvekens/pyHanko
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asn1crypto>=1.5.1:devel/py-asn1crypto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=8.1.3:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyhanko-certvalidator>=0.26.2<0.27:security/py-pyhanko-certvalidator@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=6.0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=6.0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qrcode>=7.3.1:textproc/py-qrcode@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.31.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tzlocal>=4.2:devel/py-tzlocal@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent cryptography pep517
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	ASYNC_HTTP ETSI IMAGE_SUPPORT OPENTYPE PKGCS11 XMP
 ASYNC_HTTP_DESC=Asynchronous support
 ETSI_DESC=	European Telecommunications Standards Institute (ETSI)
 IMAGE_SUPPORT_DESC=	Image handling support
 OPENTYPE_DESC=	OpenType/TrueType support
 PKGCS11_DESC=	PKGCS\#11 support
 XMP_DESC=	XMP (Extensible Metadata Platform) support
 
 ASYNC_HTTP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiohttp>=3.9.0<3.10:www/py-aiohttp@${PY_FLAVOR}
 ETSI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xsdata>=23.8<25.0:devel/py-xsdata@${PY_FLAVOR}
 IMAGE_SUPPORT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>=7.2.0:graphics/py-pillow@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}python-barcode>=0.15.1<0.15.1_99:graphics/py-python-barcode@${PY_FLAVOR}
 OPENTYPE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fonttools>=4.33.3:print/py-fonttools@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}uharfbuzz>=0.25.0<0.40.0:print/py-uharfbuzz@${PY_FLAVOR}
 PKGCS11_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-pkcs11>=0.7.0<0.8:security/py-python-pkcs11@${PY_FLAVOR}
 XMP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}defusedxml>=0.7.1<0.8:devel/py-defusedxml@${PY_FLAVOR}
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 30900
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}backports.zoneinfo>=0:devel/py-backports.zoneinfo@${PY_FLAVOR}
 # backports.zoneinfo[tzdata]
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tzdata>=0:devel/py-tzdata@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/security/suricata/Makefile b/security/suricata/Makefile
index 0eb4ac9bfa16..a3e0e3082933 100644
--- a/security/suricata/Makefile
+++ b/security/suricata/Makefile
@@ -1,127 +1,127 @@
 PORTNAME=	suricata
 DISTVERSION=	7.0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	https://www.openinfosecfoundation.org/download/
 
 MAINTAINER=	franco@opnsense.org
 COMMENT=	High Performance Network IDS, IPS and Security Monitoring engine
 WWW=		https://suricata.io
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	rustc:lang/${RUST_DEFAULT}
 LIB_DEPENDS=	libjansson.so:devel/jansson \
 		liblz4.so:archivers/liblz4 \
 		libnet.so:net/libnet \
 		libpcre2-8.so:devel/pcre2 \
 		libyaml.so:textproc/libyaml
 
 USES=		autoreconf cpe gmake iconv:translit libtool localbase pathfix \
 		pkgconfig shebangfix
 SHEBANG_FILES=	python/suricata/sc/suricatasc.py
 
 CPE_VENDOR=	openinfosecfoundation
 
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	${PORTNAME}
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-gccmarch-native \
 			--enable-bundled-htp \
 			--enable-gccprotect
 MAKE_ENV=		RUSTFLAGS="${RUSTFLAGS} -C linker=${CC:Q} ${LDFLAGS:C/.+/-C link-arg=&/}"
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 CONFLICTS_INSTALL=	libhtp
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		GEOIP IPFW NETMAP NSS PORTS_PCAP PYTHON REDIS TESTS
 OPTIONS_DEFINE_amd64=	HYPERSCAN
 OPTIONS_DEFAULT=	IPFW NETMAP PYTHON
 
 OPTIONS_RADIO=		SCRIPTS
 OPTIONS_RADIO_SCRIPTS=	LUA LUAJIT
 
 OPTIONS_SUB=	yes
 
 GEOIP_DESC=		GeoIP support
 HYPERSCAN_DESC=		Hyperscan support
 IPFW_DESC=		IPFW and IP Divert support for inline IDP
 LUAJIT_DESC=		LuaJIT scripting support
 LUA_DESC=		LUA scripting support
 NETMAP_DESC=		Netmap support for inline IDP
 NSS_DESC=		File checksums and SSL/TLS fingerprinting
 PORTS_PCAP_DESC=	Use libpcap from ports
 PYTHON_DESC=		Python-based update and control utilities
 REDIS_DESC=		Redis output support
 SCRIPTS_DESC=		Scripting
 TESTS_DESC=		Unit tests in suricata binary
 
 GEOIP_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 GEOIP_CONFIGURE_ON=	--enable-geoip
 
 HYPERSCAN_LIB_DEPENDS=	libhs.so:devel/hyperscan
 
 IPFW_CONFIGURE_ON=	--enable-ipfw
 
 LUAJIT_USES=		luajit
 LUAJIT_CONFIGURE_ON=	--enable-luajit
 
 LUA_USES=		lua:51
 LUA_CONFIGURE_ON=	--enable-lua
 
 NETMAP_CONFIGURE_ENABLE=	netmap
 
 NSS_LIB_DEPENDS=	libnspr4.so:devel/nspr \
 			libnss3.so:security/nss
 NSS_CONFIGURE_OFF=	--disable-nspr \
 			--disable-nss
 
 PORTS_PCAP_LIB_DEPENDS=	libpcap.so.1:net/libpcap
 
 PYTHON_BUILD_DEPENDS=		${PYTHON_RUN_DEPENDS}
-PYTHON_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+PYTHON_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 PYTHON_USES=			python
 PYTHON_CONFIGURE_ENABLE=	python
 
 REDIS_LIB_DEPENDS=	libevent_pthreads.so:devel/libevent \
 			libhiredis.so:databases/hiredis
 REDIS_CONFIGURE_ON=	--enable-hiredis
 TESTS_CONFIGURE_ENABLE=	unittests
 
 pre-patch:
 	@${CP} ${FILESDIR}/ax_check_compile_flag.m4 ${WRKSRC}/m4
 
 post-patch:
 # Disable vendor checksums
 	@${REINPLACE_CMD} 's,"files":{[^}]*},"files":{},' \
 		${WRKSRC}/rust/vendor/*/.cargo-checksum.json
 
 post-patch-PYTHON-on:
 	@${REINPLACE_CMD} -e "/AC_PATH_PROGS.*HAVE_PYTHON/ s/python[^,]*,/${PYTHON_VERSION},/g" \
 		${WRKSRC}/configure.ac
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}/var/log/suricata
 .for f in classification.config reference.config
 	@${MV} ${STAGEDIR}${DATADIR}/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
 .endfor
 .for f in suricata.yaml threshold.config
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
 .endfor
 
 post-install-PYTHON-on:
 	(cd ${STAGEDIR}${PREFIX} \
 	&& ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 	-d /usr/local/lib/suricata/python -f lib/suricata/python)
 .for f in disable.conf drop.conf enable.conf modify.conf threshold.in update.yaml
 	${INSTALL_DATA} ${WRKSRC}/suricata-update/suricata/update/configs/${f} \
 	${STAGEDIR}${PREFIX}/lib/suricata/python/suricata/update/configs
 .endfor
 
 .include <bsd.port.mk>
diff --git a/sysutils/conan/Makefile b/sysutils/conan/Makefile
index 55dfe6b373b6..36a27416cd31 100644
--- a/sysutils/conan/Makefile
+++ b/sysutils/conan/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	conan
 DISTVERSION=	2.2.3
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	PYPI
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C/C++ package manager
 WWW=		https://conan.io/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 PY_DEPENDS=	\
 		${PYTHON_PKGNAMEPREFIX}bottle>=0.12.8:www/py-bottle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorama>=0.4.3<0.5.0:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8.0<3:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}deprecation>=2.0:devel/py-deprecation@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}distro>1.4.0:sysutils/py-distro@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fasteners>=0.15:devel/py-fasteners@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.16.0<0.19.0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}node-semver>=0.6.1:devel/py-node-semver@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}patch-ng>=1.17.4<1.18:devel/py-patch-ng@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pluginbase>=0.5:devel/py-pluginbase@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.0<3.0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyjwt>=2.4.0<3.0.0:www/py-pyjwt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.25<3.0.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.26.6,1<1.27,1:net/py-urllib3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>=4.28.1<5:misc/py-tqdm@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=6.0<7.0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=6.0<7.0:devel/py-pyyaml@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python
 USE_PYTHON=	distutils noflavors autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index c6f459d9f38d..82654d701d8b 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -1,166 +1,167 @@
 PORTNAME=	conky
 PORTVERSION=	1.21.4
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	fernape@FreeBSD.org
 COMMENT?=	Advanced, highly configurable system monitor for X11
 WWW=		https://github.com/brndnmtthws/conky
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	gperf:devel/gperf \
 		gsed:textproc/gsed
 LIB_DEPENDS=	libinotify.so:devel/libinotify
 
 USES=		cmake compiler:c++11-lib cpe gettext-runtime iconv \
 		localbase:ldflags lua:53 pkgconfig tar:bzip2
 USE_GITHUB=	yes
 GH_ACCOUNT=	brndnmtthws
 
 CMAKE_ARGS=	-DAPP_SED=${LOCALBASE}/bin/gsed \
 		-DBUILD_AUDACIOUS:BOOL=false \
 		-DBUILD_HDDTEMP:BOOL=false \
 		-DBUILD_IBM:BOOL=false \
 		-DBUILD_IOSTATS:BOOL=false \
 		-DBUILD_PORT_MONITORS:BOOL=false
 CONFLICTS?=	conky-awesome
 
 SLAVEDIRS=	sysutils/conky-awesome
 PLIST_FILES=	bin/conky
 PORTDOCS=	config_settings.yaml lua.yaml variables.yaml
 PORTEXAMPLES=	conky.conf conky_no_x11.conf convert.lua
 
 OPTIONS_DEFINE=	APCUPSD CURL DOCS EXAMPLES IPV6 MANPAGES METAR MOC MPD NCURSES \
 		RSS WAYLAND X11 XOAP
 
 OPTIONS_DEFAULT?=	ARGB DOUBLE_BUFFER LUA_CAIRO MANPAGES MOUSE_EVENTS \
 			WAYLAND X11 XFT
 OPTIONS_GROUP?=		X11
 OPTIONS_GROUP_X11=	ARGB DOUBLE_BUFFER IMLIB2 LUA_CAIRO LUA_IMLIB2 LUA_RSVG \
 			MOUSE_EVENTS XFT XINERAMA
 
 APCUPSD_DESC=		Monitor APCUPSD
 ARGB_DESC=		Use an ARGB visual to draw on X11
 DOUBLE_BUFFER_DESC=	X11 double buffering
 LUA_CAIRO_DESC=		Lua-Cairo binding
 LUA_IMLIB2_DESC=	Lua-Imlib2 binding
 LUA_RSVG_DESC=		Lua-rsvg binding
 METAR_DESC=		Display METAR weather reports
 MOC_DESC=		Control MOC (Music On Console)
 MOUSE_EVENTS_DESC=	Support generating mouse events
 MPD_DESC=		Control MPD (Music Player Daemon)
 NCURSES_DESC=		Use ncurses to draw on terminals
 RSS_DESC=		Display RSS feeds
 XOAP_DESC=		Display XOAP weather reports
 
 APCUPSD_CMAKE_BOOL=	BUILD_APCUPSD
 
 ARGB_IMPLIES=		X11
 ARGB_CMAKE_BOOL=	BUILD_ARGB
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CMAKE_BOOL=	BUILD_CURL
 
 DOUBLE_BUFFER_IMPLIES=		X11
 DOUBLE_BUFFER_CMAKE_BOOL=	BUILD_XDBE
 
 IMLIB2_IMPLIES=		X11
 IMLIB2_LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 IMLIB2_USE=		XORG=ice,sm
 IMLIB2_CMAKE_BOOL=	BUILD_IMLIB2
 
 IPV6_CMAKE_BOOL=	BUILD_IPV6
 
 LUA_CAIRO_IMPLIES=	X11
 LUA_CAIRO_USES=		gnome
 LUA_CAIRO_USE=		GNOME=cairo
 LUA_CAIRO_CMAKE_BOOL=	BUILD_LUA_CAIRO
 LUA_CAIRO_PLIST_FILES=	lib/conky/libcairo.so \
 			lib/conky/libcairo_xlib.so
 
 LUA_IMLIB2_IMPLIES=	IMLIB2 X11
 LUA_IMLIB2_CMAKE_BOOL=	BUILD_LUA_IMLIB2
 LUA_IMLIB2_PLIST_FILES=	lib/conky/libimlib2.so
 
 LUA_RSVG_IMPLIES=	X11
 LUA_RSVG_USES=		gnome
 LUA_RSVG_USE=		GNOME=librsvg2
 LUA_RSVG_CMAKE_BOOL=	BUILD_LUA_RSVG
 LUA_RSVG_PLIST_FILES=	lib/conky/librsvg.so
 
 MANPAGES_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 			pandoc:textproc/hs-pandoc
 MANPAGES_USES=		python:build
 MANPAGES_CMAKE_BOOL=	BUILD_DOCS
 MANPAGES_PLIST_FILES=	share/man/man1/conky.1.gz
 
 METAR_IMPLIES=		CURL
 METAR_CMAKE_BOOL=	BUILD_WEATHER_METAR
 
 MOC_CMAKE_BOOL=	BUILD_MOC
 
 MOUSE_EVENTS_IMPLIES=		X11
 MOUSE_EVENTS_CMAKE_BOOL=	BUILD_MOUSE_EVENTS
 
 MPD_CMAKE_BOOL=	BUILD_MPD
 
 NCURSES_USES=		ncurses:port
 NCURSES_CMAKE_BOOL=	BUILD_NCURSES
 
 RSS_IMPLIES=	CURL
 RSS_USES=	gnome
 RSS_USE=	GNOME=libxml2
 RSS_CMAKE_BOOL=	BUILD_RSS
 
 WAYLAND_CATEGORIES=	wayland
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>=1.13:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 			libfontconfig.so:x11-fonts/fontconfig \
 			libwayland-client.so:graphics/wayland
 WAYLAND_USES=		gnome
 WAYLAND_USE=		GNOME=cairo,pango
 WAYLAND_CMAKE_BOOL=	BUILD_WAYLAND
 WAYLAND_LDFLAGS=	-Wl,--as-needed # pangoft2 deps: glib20, freetype2, harfbuzz
 
 X11_USES=	xorg
 X11_USE=	XORG=x11,xdamage,xext,xfixes,xi
 X11_CMAKE_BOOL=	BUILD_X11 OWN_WINDOW
 
 XFT_IMPLIES=	X11
 XFT_USE=	XORG=xft
 XFT_CMAKE_BOOL=	BUILD_XFT
 
 XINERAMA_IMPLIES=	X11
 XINERAMA_USE=		XORG=xinerama
 XINERAMA_CMAKE_BOOL=	BUILD_XINERAMA
 
 XOAP_IMPLIES=		CURL METAR
 XOAP_USES=		gnome
 XOAP_USE=		GNOME=libxml2
 XOAP_CMAKE_BOOL=	BUILD_WEATHER_XOAP
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLUA_CAIRO} && ${PORT_OPTIONS:MLUA_IMLIB2}
 PLIST_FILES+=	lib/conky/libcairo_imlib2_helper.so
 .endif
 
 # disable apm on non-x86 archs
 .if ${ARCH} != amd64 && ${ARCH} != i386
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src_CMakeLists.txt
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,^set(INCLUDE_SEARCH_PATH \(.*\)),set(INCLUDE_SEARCH_PATH \1 ${LUA_INCDIR}),' \
 		${WRKSRC}/cmake/ConkyPlatformChecks.cmake
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for FILE in ${PORTDOCS}
 	${INSTALL_MAN} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/sysutils/datadog-agent/Makefile b/sysutils/datadog-agent/Makefile
index 4d2a45bc098e..e9618bb9c8e0 100644
--- a/sysutils/datadog-agent/Makefile
+++ b/sysutils/datadog-agent/Makefile
@@ -1,430 +1,430 @@
 PORTNAME=	datadog-agent
 DISTVERSION=	7.24.1
-PORTREVISION=	21
+PORTREVISION=	22
 CATEGORIES=	sysutils net www
 
 MAINTAINER=	uros@gruber.si
 COMMENT=	Datadog Agent: collect metrics and events from your systems and apps
 WWW=		https://www.datadoghq.com/
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN=		SHA256 Checksum mismatch for kubernetes-client-go-bec269661e48_GH0.tar.gz
 BROKEN_i386=	fails to build: vendor/github.com/DataDog/gopsutil/process/process_freebsd.go:95:9: cannot use k.Start.Sec * 1000 (value of type int32) as type int64 in return statement
 DEPRECATED=	Unfetchable and marked BROKEN for several months
 EXPIRATION_DATE=2024-05-31
 
 BUILD_DEPENDS=	cmake-core>=3.12:devel/cmake-core \
 		go-bindata>0:devel/go-bindata
 
 USES=		go:modules python
 
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	datadog
 GH_TUPLE=	\
 		DataDog:agent-payload:v4.46.0:datadog_agent_payload/vendor/github.com/DataDog/agent-payload \
 		DataDog:cast:1ee8c8bd14a3:datadog_cast/vendor/github.com/spf13/cast \
 		DataDog:datadog-go:v3.5.0:datadog_datadog_go/vendor/github.com/DataDog/datadog-go \
 		DataDog:datadog-operator:9c71245c6822:datadog_datadog_operator/vendor/github.com/DataDog/datadog-operator \
 		DataDog:dd-trace-go:v1.23.1:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \
 		DataDog:ebpf:a91a2d800994:datadog_ebpf/vendor/github.com/DataDog/ebpf \
 		DataDog:gobpf:5f8313cb4d71:datadog_gobpf/vendor/github.com/iovisor/gobpf \
 		DataDog:gohai:e17d616e422a:datadog_gohai/vendor/github.com/DataDog/gohai \
 		DataDog:gopsutil:1b53412ef321:datadog_gopsutil/vendor/github.com/DataDog/gopsutil \
 		DataDog:mmh3:f5b682d8c981:datadog_mmh3/vendor/github.com/DataDog/mmh3 \
 		DataDog:viper:v1.8.0:datadog_viper/vendor/github.com/spf13/viper \
 		DataDog:watermarkpodautoscaler:v0.1.0:datadog_watermarkpodautoscaler/vendor/github.com/DataDog/watermarkpodautoscaler \
 		DataDog:zstd:2bf71ec48360:datadog_zstd/vendor/github.com/DataDog/zstd \
 		Knetic:govaluate:v3.0.0:knetic_govaluate/vendor/gopkg.in/Knetic/govaluate.v3 \
 		Masterminds:goutils:v1.1.0:masterminds_goutils/vendor/github.com/Masterminds/goutils \
 		Masterminds:semver:v1.5.0:masterminds_semver/vendor/github.com/Masterminds/semver \
 		Masterminds:sprig:v2.22.0:masterminds_sprig/vendor/github.com/Masterminds/sprig \
 		Microsoft:go-winio:fc70bd9a86b5:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \
 		Microsoft:hcsshim:v0.8.7:microsoft_hcsshim/vendor/github.com/Microsoft/hcsshim \
 		NYTimes:gziphandler:v1.1.1:nytimes_gziphandler/vendor/github.com/NYTimes/gziphandler \
 		PuerkitoBio:purell:v1.1.1:puerkitobio_purell/vendor/github.com/PuerkitoBio/purell \
 		PuerkitoBio:urlesc:de5bf2ad4578:puerkitobio_urlesc/vendor/github.com/PuerkitoBio/urlesc \
 		StackExchange:wmi:e0a55b97c705:stackexchange_wmi/vendor/github.com/StackExchange/wmi \
 		alecthomas:participle:v0.4.4:alecthomas_participle/vendor/github.com/alecthomas/participle \
 		alecthomas:repr:d37bc2a10ba1:alecthomas_repr/vendor/github.com/alecthomas/repr \
 		armon:go-metrics:v0.3.0:armon_go_metrics/vendor/github.com/armon/go-metrics \
 		avast:retry-go:v2.7.0:avast_retry_go/vendor/github.com/avast/retry-go \
 		aws:aws-sdk-go:v1.30.5:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
 		beevik:ntp:v0.3.0:beevik_ntp/vendor/github.com/beevik/ntp \
 		benesch:cgosymbolizer:bec6fe6e597b:benesch_cgosymbolizer/vendor/github.com/benesch/cgosymbolizer \
 		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
 		bhmj:jsonslice:92c3edaad8e2:bhmj_jsonslice/vendor/github.com/bhmj/jsonslice \
 		blabber:go-freebsd-sysctl:503969f39d8f:blabber_go_freebsd_sysctl/vendor/github.com/blabber/go-freebsd-sysctl \
 		blang:semver:v3.5.1:blang_semver/vendor/github.com/blang/semver \
 		bmizerany:pat:6226ea591a40:bmizerany_pat/vendor/github.com/bmizerany/pat \
 		cenkalti:backoff:v2.2.1:cenkalti_backoff/vendor/github.com/cenkalti/backoff \
 		census-instrumentation:opencensus-go:v0.22.2:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
 		cespare:xxhash:v1.1.0:cespare_xxhash/vendor/github.com/cespare/xxhash \
 		cihub:seelog:d2c6e5aa9fbf:cihub_seelog/vendor/github.com/cihub/seelog \
 		clbanning:mxj:v1.8.4:clbanning_mxj/vendor/github.com/clbanning/mxj \
 		cloudfoundry:bbs:d7bc971db0db:cloudfoundry_bbs/vendor/code.cloudfoundry.org/bbs \
 		cloudfoundry:cfhttp:v2.0.0:cloudfoundry_cfhttp/vendor/code.cloudfoundry.org/cfhttp/v2 \
 		cloudfoundry:garden:061eda450ad9:cloudfoundry_garden/vendor/code.cloudfoundry.org/garden \
 		cloudfoundry:lager:v2.0.0:cloudfoundry_lager/vendor/code.cloudfoundry.org/lager \
 		cloudfoundry:tlsconfig:bbe0f8da39b3:cloudfoundry_tlsconfig/vendor/code.cloudfoundry.org/tlsconfig \
 		cobaugh:osrelease:a93a0a55a249:cobaugh_osrelease/vendor/github.com/cobaugh/osrelease \
 		containerd:cgroups:b44481373989:containerd_cgroups/vendor/github.com/containerd/cgroups \
 		containerd:containerd:v1.2.13:containerd_containerd/vendor/github.com/containerd/containerd \
 		containerd:continuity:0f16d7a0959c:containerd_continuity/vendor/github.com/containerd/continuity \
 		containerd:fifo:ff969a566b00:containerd_fifo/vendor/github.com/containerd/fifo \
 		containerd:typeurl:v1.0.0:containerd_typeurl/vendor/github.com/containerd/typeurl \
 		coreos:etcd:v3.3.15:coreos_etcd/vendor/github.com/coreos/etcd \
 		coreos:go-semver:v0.3.0:coreos_go_semver/vendor/github.com/coreos/go-semver \
 		coreos:go-systemd:40e2722dffea:coreos_go_systemd/vendor/github.com/coreos/go-systemd \
 		coreos:pkg:399ea9e2e55f:coreos_pkg/vendor/github.com/coreos/pkg \
 		datadog:extendeddaemonset:94ec1f3a5192:datadog_extendeddaemonset/vendor/github.com/datadog/extendeddaemonset \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
 		dgraph-io:ristretto:v0.0.3:dgraph_io_ristretto/vendor/github.com/dgraph-io/ristretto \
 		dgryski:go-jump:e1f439676b57:dgryski_go_jump/vendor/github.com/dgryski/go-jump \
 		docker:distribution:0ac367fd6bee:docker_distribution/vendor/github.com/docker/distribution \
 		docker:go-connections:v0.4.0:docker_go_connections/vendor/github.com/docker/go-connections \
 		docker:go-events:e31b211e4f1c:docker_go_events/vendor/github.com/docker/go-events \
 		docker:go-units:v0.4.0:docker_go_units/vendor/github.com/docker/go-units \
 		docker:spdystream:449fdfce4d96:docker_spdystream/vendor/github.com/docker/spdystream \
 		dsnet:compress:v0.0.1:dsnet_compress/vendor/github.com/dsnet/compress \
 		dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
 		elastic:go-libaudit:v0.4.0:elastic_go_libaudit/vendor/github.com/elastic/go-libaudit \
 		emicklei:go-restful-swagger12:7524189396c6:emicklei_go_restful_swagger12/vendor/github.com/emicklei/go-restful-swagger12 \
 		emicklei:go-restful:v2.9.6:emicklei_go_restful/vendor/github.com/emicklei/go-restful \
 		etcd-io:etcd:3cf2f69b5738:etcd_io_etcd/vendor/go.etcd.io/etcd \
 		evanphx:json-patch:v4.5.0:evanphx_json_patch/vendor/github.com/evanphx/json-patch \
 		fatih:color:v1.9.0:fatih_color/vendor/github.com/fatih/color \
 		florianl:go-conntrack:v0.2.0:florianl_go_conntrack/vendor/github.com/florianl/go-conntrack \
 		florianl:go-tc:v0.2.0:florianl_go_tc/vendor/github.com/florianl/go-tc \
 		freddierice:go-losetup:fc9adea44124:freddierice_go_losetup/vendor/github.com/freddierice/go-losetup \
 		fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
 		ghodss:yaml:25d852aebe32:ghodss_yaml/vendor/github.com/ghodss/yaml \
 		go-inf:inf:v0.9.1:go_inf_inf/vendor/gopkg.in/inf.v0 \
 		go-ini:ini:v1.55.0:go_ini_ini/vendor/github.com/go-ini/ini \
 		go-ole:go-ole:v1.2.4:go_ole_go_ole/vendor/github.com/go-ole/go-ole \
 		go-openapi:jsonpointer:v0.19.3:go_openapi_jsonpointer/vendor/github.com/go-openapi/jsonpointer \
 		go-openapi:jsonreference:v0.19.2:go_openapi_jsonreference/vendor/github.com/go-openapi/jsonreference \
 		go-openapi:spec:v0.19.8:go_openapi_spec/vendor/github.com/go-openapi/spec \
 		go-openapi:swag:v0.19.5:go_openapi_swag/vendor/github.com/go-openapi/swag \
 		go-yaml:yaml:v2.2.8:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
 		gobwas:glob:v0.2.3:gobwas_glob/vendor/github.com/gobwas/glob \
 		godbus:dbus:v4.1.0:godbus_dbus/vendor/github.com/godbus/dbus \
 		gogo:googleapis:v1.3.2:gogo_googleapis/vendor/github.com/gogo/googleapis \
 		gogo:protobuf:v1.3.1:gogo_protobuf/vendor/github.com/gogo/protobuf \
 		golang:appengine:v1.6.5:golang_appengine/vendor/google.golang.org/appengine \
 		golang:crypto:75b288015ac9:golang_crypto/vendor/golang.org/x/crypto \
 		golang:glog:23def4e6c14b:golang_glog/vendor/github.com/golang/glog \
 		golang:groupcache:8c9f03a8e57e:golang_groupcache/vendor/github.com/golang/groupcache \
 		golang:mobile:d2bd2a29d028:golang_mobile/vendor/golang.org/x/mobile \
 		golang:net:c89045814202:golang_net/vendor/golang.org/x/net \
 		golang:oauth2:bf48bf16ab8d:golang_oauth2/vendor/golang.org/x/oauth2 \
 		golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \
 		golang:snappy:v0.0.1:golang_snappy/vendor/github.com/golang/snappy \
 		golang:sync:cd5d95a43a6e:golang_sync/vendor/golang.org/x/sync \
 		golang:sys:196b9ba8737a:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
 		golang:time:555d28b269f0:golang_time/vendor/golang.org/x/time \
 		golang:tools:82bb89366a1e:golang_tools/vendor/golang.org/x/tools \
 		golang:xerrors:5ec99f83aff1:golang_xerrors/vendor/golang.org/x/xerrors \
 		gomodules:jsonpatch:v3.0.1:gomodules_jsonpatch/vendor/gomodules.xyz/jsonpatch/v3 \
 		gomodules:orderedmap:v0.1.0:gomodules_orderedmap/vendor/gomodules.xyz/orderedmap \
 		google:go-cmp:v0.4.0:google_go_cmp/vendor/github.com/google/go-cmp \
 		google:go-genproto:09dca8ec2884:google_go_genproto/vendor/google.golang.org/genproto \
 		google:gofuzz:v1.0.0:google_gofuzz/vendor/github.com/google/gofuzz \
 		google:gopacket:v1.1.17:google_gopacket/vendor/github.com/google/gopacket \
 		google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \
 		googleapis:gnostic:v0.3.1:googleapis_gnostic/vendor/github.com/googleapis/gnostic \
 		gorilla:mux:v1.7.4:gorilla_mux/vendor/github.com/gorilla/mux \
 		grpc-ecosystem:go-grpc-middleware:v1.2.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \
 		grpc-ecosystem:go-grpc-prometheus:v1.2.0:grpc_ecosystem_go_grpc_prometheus/vendor/github.com/grpc-ecosystem/go-grpc-prometheus \
 		grpc-ecosystem:grpc-gateway:v1.12.2:grpc_ecosystem_grpc_gateway/vendor/github.com/grpc-ecosystem/grpc-gateway \
 		grpc:grpc-go:v1.26.0:grpc_grpc_go/vendor/google.golang.org/grpc \
 		hashicorp:consul:v1.4.0:hashicorp_consul_api/vendor/github.com/hashicorp/consul \
 		hashicorp:errwrap:v1.0.0:hashicorp_errwrap/vendor/github.com/hashicorp/errwrap \
 		hashicorp:go-cleanhttp:v0.5.1:hashicorp_go_cleanhttp/vendor/github.com/hashicorp/go-cleanhttp \
 		hashicorp:go-hclog:v0.12.0:hashicorp_go_hclog/vendor/github.com/hashicorp/go-hclog \
 		hashicorp:go-immutable-radix:v1.1.0:hashicorp_go_immutable_radix/vendor/github.com/hashicorp/go-immutable-radix \
 		hashicorp:go-multierror:v1.1.0:hashicorp_go_multierror/vendor/github.com/hashicorp/go-multierror \
 		hashicorp:go-rootcerts:v1.0.2:hashicorp_go_rootcerts/vendor/github.com/hashicorp/go-rootcerts \
 		hashicorp:golang-lru:v0.5.4:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
 		hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \
 		hashicorp:serf:v0.8.5:hashicorp_serf/vendor/github.com/hashicorp/serf \
 		hectane:go-acl:da78bae5fc95:hectane_go_acl/vendor/github.com/hectane/go-acl \
 		huandu:xstrings:v1.2.0:huandu_xstrings/vendor/github.com/huandu/xstrings \
 		ianlancetaylor:cgosymbolizer:f5072df9c550:ianlancetaylor_cgosymbolizer/vendor/github.com/ianlancetaylor/cgosymbolizer \
 		imdario:mergo:v0.3.7:imdario_mergo/vendor/github.com/imdario/mergo \
 		inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
 		itchyny:astgen-go:aaa595cf980e:itchyny_astgen_go/vendor/github.com/itchyny/astgen-go \
 		itchyny:gojq:v0.10.2:itchyny_gojq/vendor/github.com/itchyny/gojq \
 		jmespath:go-jmespath:v0.3.0:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \
 		json-iterator:go:v1.1.9:json_iterator_go/vendor/github.com/json-iterator/go \
 		kardianos:osext:2bc1f35cddc0:kardianos_osext/vendor/github.com/kardianos/osext \
 		konsorten:go-windows-terminal-sequences:v1.0.3:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
 		kubernetes-incubator:custom-metrics-apiserver:3d9be26a50eb:kubernetes_incubator_custom_metrics_apiserver/vendor/github.com/kubernetes-incubator/custom-metrics-apiserver \
 		kubernetes-sigs:controller-runtime:v0.5.2:kubernetes_sigs_controller_runtime/vendor/sigs.k8s.io/controller-runtime \
 		kubernetes-sigs:structured-merge-diff:6149e4549fca:kubernetes_sigs_structured_merge_diff/vendor/sigs.k8s.io/structured-merge-diff \
 		kubernetes-sigs:yaml:v1.1.0:kubernetes_sigs_yaml/vendor/sigs.k8s.io/yaml \
 		kubernetes:api:35e52d86657a:kubernetes_api/vendor/k8s.io/api \
 		kubernetes:apiextensions-apiserver:5357c4baaf65:kubernetes_apiextensions_apiserver/vendor/k8s.io/apiextensions-apiserver \
 		kubernetes:apimachinery:a2eda9f80ab8:kubernetes_apimachinery/vendor/k8s.io/apimachinery \
 		kubernetes:apiserver:5190913f932d:kubernetes_apiserver/vendor/k8s.io/apiserver \
 		kubernetes:autoscaler:fa95810cfc1e:kubernetes_autoscaler/vendor/k8s.io/autoscaler/vertical-pod-autoscaler \
 		kubernetes:client-go:bec269661e48:kubernetes_client_go/vendor/k8s.io/client-go \
 		kubernetes:cloud-provider:20453efc2458:kubernetes_cloud_provider/vendor/k8s.io/cloud-provider \
 		kubernetes:component-base:039242c015a9:kubernetes_component_base/vendor/k8s.io/component-base \
 		kubernetes:cri-api:608eb1dad4ac:kubernetes_cri_api/vendor/k8s.io/cri-api \
 		kubernetes:klog:4ad0115ba9e4:kubernetes_klog/vendor/k8s.io/klog \
 		kubernetes:kube-openapi:30be4d16710a:kubernetes_kube_openapi/vendor/k8s.io/kube-openapi \
 		kubernetes:kube-state-metrics:dbbe062e36a4:kubernetes_kube_state_metrics/vendor/k8s.io/kube-state-metrics \
 		kubernetes:kubernetes:v1.16.2:kubernetes_kubernetes/vendor/k8s.io/kubernetes \
 		kubernetes:metrics:3b1a734dba6e:kubernetes_metrics/vendor/k8s.io/metrics \
 		kubernetes:utils:94aeca20bf09:kubernetes_utils/vendor/k8s.io/utils \
 		lestrrat-go:strftime:v1.0.1:lestrrat_go_strftime/vendor/github.com/lestrrat-go/strftime \
 		lxn:walk:02935bac0ab8:lxn_walk/vendor/github.com/lxn/walk \
 		lxn:win:2da648fda5b4:lxn_win/vendor/github.com/lxn/win \
 		magiconair:properties:v1.8.1:magiconair_properties/vendor/github.com/magiconair/properties \
 		mailru:easyjson:b2ccc519800e:mailru_easyjson/vendor/github.com/mailru/easyjson \
 		mattn:go-colorable:v0.1.6:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
 		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
 		mdlayher:netlink:v1.1.0:mdlayher_netlink/vendor/github.com/mdlayher/netlink \
 		mholt:archiver:26cf5bb32d07:mholt_archiver/vendor/github.com/mholt/archiver \
 		miekg:dns:v1.1.31:miekg_dns/vendor/github.com/miekg/dns \
 		mitchellh:copystructure:v1.0.0:mitchellh_copystructure/vendor/github.com/mitchellh/copystructure \
 		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
 		mitchellh:mapstructure:v1.1.2:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
 		mitchellh:reflectwalk:v1.0.0:mitchellh_reflectwalk/vendor/github.com/mitchellh/reflectwalk \
 		moby:moby:v17.12.0-ce:moby_moby/vendor/github.com/docker/docker \
 		moby:sys:mountinfo/v0.1.3:moby_sys_mountinfo/vendor/github.com/moby/sys \
 		modern-go:concurrent:bacd9c7ef1dd:modern_go_concurrent/vendor/github.com/modern-go/concurrent \
 		modern-go:reflect2:v1.0.1:modern_go_reflect2/vendor/github.com/modern-go/reflect2 \
 		munnerz:goautoneg:a547fc61f48d:munnerz_goautoneg/vendor/github.com/munnerz/goautoneg \
 		natefinch:lumberjack:v2.0.0:natefinch_lumberjack/vendor/gopkg.in/natefinch/lumberjack.v2 \
 		nwaples:rardecode:v1.1.0:nwaples_rardecode/vendor/github.com/nwaples/rardecode \
 		opencontainers:go-digest:v1.0.0-rc1:opencontainers_go_digest/vendor/github.com/opencontainers/go-digest \
 		opencontainers:image-spec:v1.0.1:opencontainers_image_spec/vendor/github.com/opencontainers/image-spec \
 		opencontainers:runc:6cc515888830:opencontainers_runc/vendor/github.com/opencontainers/runc \
 		opencontainers:runtime-spec:v1.0.2:opencontainers_runtime_spec/vendor/github.com/opencontainers/runtime-spec \
 		openshift:api:32369d4db2ad:openshift_api/vendor/github.com/openshift/api \
 		patrickmn:go-cache:v2.1.0:patrickmn_go_cache/vendor/github.com/patrickmn/go-cache \
 		pbnjay:strptime:5c05b0d668c9:pbnjay_strptime/vendor/github.com/pbnjay/strptime \
 		pborman:uuid:v1.2.0:pborman_uuid/vendor/github.com/pborman/uuid \
 		pelletier:go-toml:v1.2.0:pelletier_go_toml/vendor/github.com/pelletier/go-toml \
 		philhofer:fwd:v1.0.0:philhofer_fwd/vendor/github.com/philhofer/fwd \
 		pierrec:lz4:v2.5.0:pierrec_lz4/vendor/github.com/pierrec/lz4 \
 		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
 		prometheus:client_golang:v0.9.2:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
 		prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
 		prometheus:common:v0.9.1:prometheus_common/vendor/github.com/prometheus/common \
 		prometheus:procfs:v0.0.6:prometheus_procfs/vendor/github.com/prometheus/procfs \
 		robfig:cron:v3.0.0:robfig_cron_v3/vendor/github.com/robfig/cron/v3 \
 		samuel:go-zookeeper:2cc03de413da:samuel_go_zookeeper/vendor/github.com/samuel/go-zookeeper \
 		shirou:gopsutil:v2.20.3:shirou_gopsutil/vendor/github.com/shirou/gopsutil \
 		shirou:w32:bb4de0191aa4:shirou_w32/vendor/github.com/shirou/w32 \
 		shuLhan:go-bindata:v3.4.0:shulhan_go_bindata/vendor/github.com/shuLhan/go-bindata \
 		sirupsen:logrus:v1.6.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
 		soniah:gosnmp:v1.26.0:soniah_gosnmp/vendor/github.com/soniah/gosnmp \
 		spf13:afero:v1.2.2:spf13_afero/vendor/github.com/spf13/afero \
 		spf13:cobra:v1.0.0:spf13_cobra/vendor/github.com/spf13/cobra \
 		spf13:jwalterweatherman:v1.1.0:spf13_jwalterweatherman/vendor/github.com/spf13/jwalterweatherman \
 		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
 		stretchr:objx:v0.2.0:stretchr_objx/vendor/github.com/stretchr/objx \
 		stretchr:testify:v1.5.1:stretchr_testify/vendor/github.com/stretchr/testify \
 		syndtr:gocapability:d98352740cb2:syndtr_gocapability/vendor/github.com/syndtr/gocapability \
 		tedsuo:rata:v1.0.0:tedsuo_rata/vendor/github.com/tedsuo/rata \
 		tinylib:msgp:v1.1.2:tinylib_msgp/vendor/github.com/tinylib/msgp \
 		twmb:murmur3:v1.1.3:twmb_murmur3/vendor/github.com/twmb/murmur3 \
 		uber-go:atomic:v1.6.0:uber_go_atomic/vendor/go.uber.org/atomic \
 		uber-go:automaxprocs:v1.2.0:uber_go_automaxprocs/vendor/go.uber.org/automaxprocs \
 		uber-go:multierr:v1.5.0:uber_go_multierr/vendor/go.uber.org/multierr \
 		uber-go:zap:v1.14.1:uber_go_zap/vendor/go.uber.org/zap \
 		ulikunitz:xz:v0.5.7:ulikunitz_xz/vendor/github.com/ulikunitz/xz \
 		urfave:negroni:v1.0.0:urfave_negroni/vendor/github.com/urfave/negroni \
 		vishvananda:netlink:v1.1.0:vishvananda_netlink \
 		vishvananda:netns:0a2b9b5464df:vishvananda_netns/vendor/github.com/vishvananda/netns \
 		vito:go-sse:v1.0.0:vito_go_sse/vendor/github.com/vito/go-sse \
 		vmihailenco:msgpack:v4.3.11:vmihailenco_msgpack_v4/vendor/github.com/vmihailenco/msgpack/v4 \
 		vmihailenco:tagparser:v0.1.1:vmihailenco_tagparser/vendor/github.com/vmihailenco/tagparser \
 		zorkian:go-datadog-api:v2.29.0:zorkian_go_datadog_api/vendor/gopkg.in/zorkian/go-datadog-api.v2
 
 DATADOG_PREFIX=	${PREFIX}/bin/${PORTNAME}
 ETCDIR=		${PREFIX}/etc/datadog
 LOGDIR=		/var/log/datadog
 RUNDIR=		/var/run/datadog
 
 USERS=	datadog
 GROUPS=	${USERS}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	RUNDIR=${RUNDIR} \
 		LOGDIR=${LOGDIR} \
 		PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} \
 		PYTHON_CMD=${PYTHON_CMD} \
 		USER=${USERS} \
 		PORTNAME=${PORTNAME} \
 		DATADOG_PREFIX=${DATADOG_PREFIX}
 
 PLIST_SUB+=	RUNDIR=${RUNDIR} \
 		LOGDIR=${LOGDIR} \
 		USER=${USERS} \
 		GROUP=${GROUPS} \
 		PORTNAME=${PORTNAME} \
 		DATADOG_PREFIX=${DATADOG_PREFIX}
 
 OPTIONS_DEFINE=	DOCS PYTHON SECRETS JMX ZSTD
 OPTIONS_DEFAULT=	PYTHON PROCESS LOG
 
 OPTIONS_GROUP=		AGENTS STORE META
 OPTIONS_GROUP_AGENTS=	LOG APM PROCESS DOGSTATSD
 OPTIONS_GROUP_STORE=	CONSUL ZK ETCD
 OPTIONS_GROUP_META=	EC2 GCE
 
 DOCS_DESC=	Install documentation
 PYTHON_DESC=	Embed the Python interpreter
 SECRETS_DESC=	Enable secrets support in configuration files
 CONSUL_DESC=	Enable consul as a configuration store
 ZK_DESC=	Enable Zookeeper as a configuration store
 ETCD_DESC=	Enable Etcd as a configuration store
 EC2_DESC=	Enable EC2 hostname detection and metadata collection
 GCE_DESC=	Enable GCE hostname detection and metadata collection
 JMX_DESC=	Enable the JMX-fetch bridge
 LOG_DESC=	Enable the log agent
 APM_DESC=	Build the APM agent
 PROCESS_DESC=	Build the process agent
 DOGSTATSD_DESC=	Build the dogstatsd agent
 ZSTD_DESC=	Use Zstandard instead of Zlib
 
 PYTHON_VARS=	agent_build_tags+=python
 SECRETS_VARS=	agent_build_tags+=secrets
 CONSUL_VARS=	agent_build_tags+=consul
 ZSTD_VARS=	agent_build_tags+=zstd
 ZK_VARS=	agent_build_tags+=zk
 ETCD_VARS=	agent_build_tags+=etcd
 EC2_VARS=	agent_build_tags+=ec2
 GCE_VARS=	agent_build_tags+=gce
 JMX_VARS=	agent_build_tags+=jmx
 LOG_VARS=	agent_build_tags+=log
 APM_VARS=	agent_build_tags+=apm use_rc_subr+=datadog-trace-agent
 PROCESS_VARS=	agent_build_tags+=process use_rc_subr+=datadog-process-agent
 DOGSTATSD_VARS=	use_rc_subr+=datadog-dogstatsd
 
 OPTIONS_SUB=	yes
 
-PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 ALL_TARGET=		./cmd/agent
 APM_ALL_TARGET=		./cmd/trace-agent
 PROCESS_ALL_TARGET=	./cmd/process-agent
 DOGSTATSD_ALL_TARGET=	./cmd/dogstatsd
 GO_TARGET=	${ALL_TARGET}
 NO_CCACHE=		yes
 
 USE_RC_SUBR=	${PORTNAME}
 
 CGO_CFLAGS=	-w -I. -I${WRKSRC}/rtloader/include -I${WRKSRC}/rtloader/common
 CGO_LDFLAGS=	-L${WRKSRC}/rtloader/rtloader
 GO_BUILDFLAGS=	-tags '${AGENT_BUILD_TAGS}' \
     -ldflags="-s -X 'github.com/DataDog/${GH_PROJECT}/pkg/version.AgentVersion=${DISTVERSION}' -X 'github.com/DataDog/${GH_PROJECT}/pkg/config.DefaultPython=3'"
 
 post-patch:
 	@${REINPLACE_CMD} 's|/etc/datadog-agent|${ETCDIR}|g' \
 		${WRKSRC}/pkg/config/config_template.yaml \
 		${WRKSRC}/cmd/agent/common/common_nix.go \
 		${WRKSRC}/pkg/config/config_nix.go \
 		${WRKSRC}/cmd/system-probe/main_linux.go \
 		${WRKSRC}/cmd/process-agent/main.go \
 		${WRKSRC}/pkg/config/config.go
 
 	@${REINPLACE_CMD} 's|/opt/datadog-agent/run|${RUNDIR}|g' \
 		${WRKSRC}/pkg/config/config.go \
 		${WRKSRC}/pkg/config/config_nix.go  \
 		${WRKSRC}/pkg/config/config_template.yaml
 
 	@${REINPLACE_CMD} 's|/opt/datadog-agent/etc|${ETCDIR}|g' \
 		${WRKSRC}/pkg/trace/flags/flags_nix.go
 
 	@${REINPLACE_CMD} 's|/opt/datadog-agent/embedded/bin|${DATADOG_PREFIX}|g' \
 		${WRKSRC}/cmd/agent/dist/conf.d/process_agent.yaml.default \
 		${WRKSRC}/cmd/agent/dist/conf.d/apm.yaml.default
 
 	@${REINPLACE_CMD} -e 's|/opt/datadog-agent/bin/agent|${DATADOG_PREFIX}|g' \
 		${WRKSRC}/pkg/trace/config/config_nix.go \
 		${WRKSRC}/pkg/process/config/config_nix.go
 
 pre-build:
 # Build rtloader (Previously called six)
 	(cd ${WRKSRC}/rtloader && \
 		${SETENV} ${MAKE_ENV} ${BUILD_ENV} ${LOCALBASE}/bin/cmake \
 		-DBUILD_DEMO:BOOL=OFF -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \
 		-DDISABLE_PYTHON2:BOOL=ON -DDISABLE_PYTHON3:BOOL=OFF && \
 		${MAKE_CMD} -C .)
 
 # Generate go source from templates
 	${SETENV} ${MAKE_ENV} ${GO_ENV} GOCACHE=${TMPDIR} GO111MODULE=off GOFLAGS="-mod=vendor" ${GO_CMD} generate ${WRKSRC}/pkg/status/render.go
 	${SETENV} ${MAKE_ENV} ${GO_ENV} GOCACHE=${TMPDIR} GO111MODULE=off GOFLAGS="-mod=vendor" ${GO_CMD} generate ${WRKSRC}/cmd/agent/gui/gui.go
 
 post-build:
 # Generate config files
 	${SETENV} ${MAKE_ENV} ${GO_ENV} GOCACHE=${TMPDIR} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go agent-py3 \
 		${WRKSRC}/pkg/config/config_template.yaml \
 		${WRKSRC}/cmd/agent/dist/datadog.yaml
 
 	${SETENV} ${MAKE_ENV} ${GO_ENV} GOCACHE=${TMPDIR} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go system-probe \
 		${WRKSRC}/pkg/config/config_template.yaml \
 		${WRKSRC}/cmd/agent/dist/system-probe.yaml
 
 	${SETENV} ${MAKE_ENV} ${GO_ENV} GOCACHE=${TMPDIR} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go dogstatsd \
 		${WRKSRC}/pkg/config/config_template.yaml \
 		${WRKSRC}/cmd/agent/dist/dogstatsd.yaml
 
 do-install:
 	${MKDIR} \
 		${STAGEDIR}${DATADOG_PREFIX} \
 		${STAGEDIR}${ETCDIR}/conf.d \
 		${STAGEDIR}${LOGDIR} \
 		${STAGEDIR}${DOCSDIR} \
 		${STAGEDIR}${RUNDIR}
 
 .for doc in README.md CHANGELOG.rst CONTRIBUTING.md LICENSE
 	(${INSTALL_MAN} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR})
 .endfor
 
 	# Install dist config
 .for conf in cpu.d file_handle.d go_expvar.d io.d jmx.d load.d memory.d ntp.d tcp_queue_length.d uptime.d
 	(cd ${WRKSRC}/cmd/agent/dist/conf.d && ${COPYTREE_SHARE} ${conf} ${STAGEDIR}${ETCDIR}/conf.d)
 .endfor
 
 	cd ${WRKSRC}/cmd/agent/dist/conf.d && \
 		${CP} apm.yaml.default process_agent.yaml.default ${STAGEDIR}${ETCDIR}/conf.d
 
 	# Install rtloader library
 	${MAKE_CMD} -C ${WRKSRC}/rtloader ${INSTALL} DESTDIR=${STAGEDIR}
 
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/agent ${STAGEDIR}${DATADOG_PREFIX}/agent
 
 do-install-APM-on:
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/trace-agent ${STAGEDIR}${DATADOG_PREFIX}/trace-agent
 
 do-install-PROCESS-on:
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/process-agent ${STAGEDIR}${DATADOG_PREFIX}/process-agent
 
 do-install-DOGSTATSD-on:
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/dogstatsd ${STAGEDIR}${DATADOG_PREFIX}/dogstatsd
 
 post-install:
 	# Install configuration files
 	${INSTALL_DATA} ${WRKSRC}/cmd/agent/dist/datadog.yaml \
 		${STAGEDIR}${ETCDIR}/datadog.yaml.sample
 
 	${INSTALL_DATA} ${WRKSRC}/cmd/agent/dist/system-probe.yaml \
 		${STAGEDIR}${ETCDIR}/system-probe.yaml.sample
 
 	${INSTALL_DATA} ${WRKSRC}/cmd/agent/dist/system-probe.yaml \
 		${STAGEDIR}${ETCDIR}/dogstatsd.yaml.sample
 
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*so*
 
 .include <bsd.port.mk>
diff --git a/sysutils/datadog-integrations/Makefile b/sysutils/datadog-integrations/Makefile
index b9c676d3b43a..545763f59d52 100644
--- a/sysutils/datadog-integrations/Makefile
+++ b/sysutils/datadog-integrations/Makefile
@@ -1,130 +1,130 @@
 PORTNAME=	datadog-integrations
 DISTVERSION=	7.24.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 
 MAINTAINER=	uros@gruber.si
 COMMENT=	Datadog Agent Integrations
 WWW=		https://www.datadoghq.com/
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 DEPRECATED=	Depends on expired sysutils/datadog-agent
 EXPIRATION_DATE=2024-07-11
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS}
 
 RUN_DEPENDS=	datadog-agent>=7.24.1:sysutils/datadog-agent \
 		${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pysocks>0:net/py-pysocks@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-unixsocket>0:www/py-requests-unixsocket@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-toolbelt>0:www/py-requests-toolbelt@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}uptime>0:sysutils/py-uptime@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	cryptography
 USE_GITHUB=	yes
 GH_ACCOUNT=	DataDog
 GH_PROJECT=	integrations-core
 
 ETCDIR=		${PREFIX}/etc/datadog
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 USERS=		datadog
 GROUPS=		${USERS}
 
 PLIST_SUB+=	USER=${USERS} \
 		GROUP=${GROUPS}
 
 OPTIONS_DEFINE=	APACHE CONSUL COREDNS DIRECTORY DISK DNS MYSQL NETWORK NGINX PHP POSTFIX PROCESS REDIS SSH SYS_CORE SYS_SWAP TCP TLS
 
 OPTIONS_SUB=	yes
 
 APACHE_DESC=	Apache check integration
 CONSUL_DESC=	Consul check integration
 COREDNS_DESC=	CoreDNS check integration
 DIRECTORY_DESC=	Directory check integration
 DISK_DESC=	Disk check integration
 DNS_DESC=	DNS check integration
 MYSQL_DESC=	MySQL check integration
 NETWORK_DESC=	Network check integration
 NGINX_DESC=	Nginx check integration
 PHP_DESC=	PHP-fpm check integration
 POSTFIX_DESC=	Postfix check integration
 PROCESS_DESC=	Process check integration
 REDIS_DESC=	Redis check integration
 SSH_DESC=	SSH check integration
 SYS_CORE_DESC=	System Core check integration
 SYS_SWAP_DESC=	System Swap check integration
 TCP_DESC=	TCP check integration
 TLS_DESC=	TLS check integration
 
 APACHE_VARS=	integrations+=apache conffiles+=apache
 CONSUL_VARS=	integrations+=consul conffiles+=consul
 COREDNS_VARS=	integrations+=coredns conffiles+=coredns
 DIRECTORY_VARS=	integrations+=directory conffiles+=directory
 DISK_VARS=	integrations+=disk conffiles+=disk
 DNS_VARS=	integrations+=dns_check conffiles+=dns_check
 MYSQL_VARS=	integrations+=mysql conffiles+=mysql
 NETWORK_VARS=	integrations+=network conffiles+=network
 NGINX_VARS=	integrations+=nginx conffiles+=nginx
 PHP_VARS=	integrations+=php_fpm conffiles+=php_fpm
 POSTFIX_VARS=	integrations+=postfix conffiles+=postfix
 PROCESS_VARS=	integrations+=process conffiles+=process
 REDIS_VARS=	integrations+=redisdb conffiles+=redisdb
 SSH_VARS=	integrations+=ssh_check conffiles+=ssh_check
 SYS_CORE_VARS=	integrations+=system_core conffiles+=system_core
 SYS_SWAP_VARS=	integrations+=system_swap conffiles+=system_swap
 TCP_VARS=	integrations+=tcp_check conffiles+=tcp_check
 TLS_VARS=	integrations+=tls conffiles+=tls
 
 # find integrations-core -name setup.py | awk -F\/ '{print $2}' | sort | uniq | grep -v datadog_checks_dev | tr '\n' ' '
 INTEGRATIONS=	datadog_checks_base
 
 # find integrations-core -name conf.yaml.example | awk -F\/ '{print $2}' | sort | uniq | grep -v datadog_checks_dev | tr '\n' ' '
 CONFFILES=
 
 DIRECTORY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scandir>0:sysutils/py-scandir@${PY_FLAVOR}
 DISK_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}
 DNS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${PY_FLAVOR}
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymysql>0:databases/py-pymysql@${PY_FLAVOR}
 NETWORK_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}
 PHP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup6>0:www/py-flup6@${PY_FLAVOR}
 PROCESS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}
 REDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis@${PY_FLAVOR}
 SSH_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR}
 SYS_CORE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}
 SYS_SWAP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}
 TLS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}service-identity>0:security/py-service-identity@${PY_FLAVOR}
 
 .include <bsd.port.options.mk>
 
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
 
 # Install core-integrations
 .for dir in ${INTEGRATIONS}
 	(cd ${WRKSRC}/${dir}; \
 	${PYTHON_CMD} setup.py bdist; \
 	${TAR} -xzf dist/*.tar.gz -C ${STAGEDIR})
 .endfor
 
 post-install:
 # Install core-integrations
 .for dir in ${CONFFILES}
 	(cd ${WRKSRC}/${dir}; \
 	${MV} datadog_checks/${dir}/data ${STAGEDIR}${ETCDIR}/conf.d/${dir}.d)
 .endfor
 
 .include <bsd.port.mk>
diff --git a/sysutils/docker-compose/Makefile b/sysutils/docker-compose/Makefile
index 4828ae40ac0c..e0d7c6dc20e4 100644
--- a/sysutils/docker-compose/Makefile
+++ b/sysutils/docker-compose/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	docker-compose
 PORTVERSION=	1.24.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils python
 MASTER_SITES=	PYPI
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Define and run multi-container applications with Docker
 WWW=		https://github.com/docker/compose/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cached-property>=1.2.0:devel/py-cached-property@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorama>=0.3.7:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docker>=3.6.0:sysutils/py-docker@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dockerpty>=0.4.1:devel/py-dockerpty@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:devel/py-docopt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}texttable>=0.9.0:textproc/py-texttable@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}websocket-client>=0.32.0:www/py-websocket-client@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.11:devel/py-pyyaml@${PY_FLAVOR}
 
 NO_ARCH=	yes
 USES=		python
 USE_PYTHON=	distutils autoplist concurrent optsuffix
 
 .include <bsd.port.mk>
diff --git a/sysutils/hid-tools/Makefile b/sysutils/hid-tools/Makefile
index df69734b8b32..782f52134707 100644
--- a/sysutils/hid-tools/Makefile
+++ b/sysutils/hid-tools/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	hid-tools
 DISTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 
 MAINTAINER=	wulf@FreeBSD.org
 COMMENT=	Python scripts to manipulate HID data
 WWW=		https://gitlab.freedesktop.org/libevdev/hid-tools
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}parse>=0:textproc/py-parse@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pyudev>=0:devel/py-pyudev@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 			${RUN_DEPENDS_${OPSYS}_${OSREL:R}}
 
 USES=		python shebangfix
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.freedesktop.org/
 GL_ACCOUNT=	libevdev
 GL_TAGNAME=	0f71fd65d83b28b744a2fe0a6cc1e3139921c721
 USE_PYTHON=	autoplist distutils
 
 OPTIONS_DEFINE=		MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 
 MANPAGES_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pypandoc>=0:textproc/py-pypandoc@${PY_FLAVOR}
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-ansible-compat/Makefile b/sysutils/py-ansible-compat/Makefile
index f5a0722c24ee..95bb04d0b68d 100644
--- a/sysutils/py-ansible-compat/Makefile
+++ b/sysutils/py-ansible-compat/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	ansible-compat
 PORTVERSION=	4.1.2
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Ansible compatibility goodies
 WWW=		https://github.com/ansible-community/ansible-compat
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=7.0.0:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansible-core>=2.12:sysutils/py-ansible-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}subprocess-tee>=0.4.1:devel/py-subprocess-tee@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=4.6.0:devel/py-jsonschema@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip-tools>0:devel/py-pip-tools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>=7.2.0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-plus>0:devel/py-pytest-plus@${PY_FLAVOR}
 
 USES=		python:3.9+
 USE_PYTHON=	autoplist pep517 pytest
 
 TEST_ENV=	LC_ALL=C.UTF-8 PYTHONPATH=${WRKSRC}/src TMPDIR=${WRKDIR}/
 
 NO_ARCH=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 31000
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.5.0:devel/py-typing-extensions@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/py-ansible-core/Makefile b/sysutils/py-ansible-core/Makefile
index fd5c1698d7ef..49e08e43b0cb 100644
--- a/sysutils/py-ansible-core/Makefile
+++ b/sysutils/py-ansible-core/Makefile
@@ -1,83 +1,84 @@
 PORTNAME=	ansible-core
 DISTVERSION=	2.15.6
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Radically simple IT automation
 WWW=		https://www.ansible.com/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0.0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}resolvelib>=0.5.3<1.1.0:devel/py-resolvelib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toml>0:textproc/py-toml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycryptodome>=0:security/py-pycryptodome@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		git:devel/git
 
 USES=		ansible:env cpe python:3.9+ shebangfix
 CPE_VENDOR=	redhat
 CPE_PRODUCT=	ansible
 USE_PYTHON=	autoplist concurrent cryptography pep517
 
 SHEBANG_REGEX=	[.]/test/.*[.]py
 
 # Pass MAKE_ENV to TEST_ENV so that binary aliases via an updated PATH.
 TEST_ENV=	${MAKE_ENV}
 
 # The "python" binary alias is needed for the tests.
 BINARY_ALIAS=	python=${PYTHON_CMD}
 NO_ARCH=	yes
 
 post-patch:
 # Preserve the original paths in
 # test/units/cli/galaxy/test_execute_list_collection.py.
 # Replacing /usr/share/ansible breaks tests.
 	${FIND} ${WRKSRC} -not -regex '${WRKSRC}/test/units/cli/galaxy/test_execute_list_collection.py' -type f -print0 | \
 		${XARGS} -0 ${REINPLACE_CMD} \
 			-e 's|/etc/ansible|${ETCDIR}|g' \
 			-e 's|/usr/share/ansible|${DATADIR}|g'
 	${FIND} ${WRKSRC} -type f -name "*.bak" -delete
 
 post-stage:
 	${FIND} ${STAGEDIR}${PREFIX}/bin -type l -name ansible-\* -lname ansible \
 		-execdir ${RLN} ansible-${PYTHON_VER} {} \;
 # USE_PYTHON=autoplist doesn't add this file to pkg-plist.
 	${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ansible_test/_data/injector/ansible-inventory
 
 pre-test:
 # This one file does not get its paths replaced correctly in post-patch.
 	${REINPLACE_CMD} 's|"/etc"|"${ETCDIR:H}"|g' \
 		${WRKSRC}/test/units/playbook/test_helpers.py
 # This test constructs a Python script inline and uses an invalid path to it.
 	${REINPLACE_CMD} 's|/usr/bin/python|${PYTHON_CMD}|' \
 		${WRKSRC}/test/units/modules/test_async_wrapper.py
 # Skip the SELinux tests, it's not present on FreeBSD.
 	${RM} ${WRKSRC}/test/units/module_utils/basic/test_selinux.py
 # Disable some failing tests. They fail to detect that emoji are of width 2 istead of 1.
 	${RM} ${WRKSRC}/test/units/utils/test_display.py
 
 do-test:
 	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ./bin/ansible-test units -v --python ${PYTHON_VER}
 
 .include <bsd.port.mk>
 
 # Make sure that we override the unique DATADIR and ETCDIR set
 # by the implicit USES=uniquefiles.
 DATADIR=	${ANSIBLE_DATADIR}
 ETCDIR=		${ANSIBLE_ETCDIR}
diff --git a/sysutils/py-ansible-lint/Makefile b/sysutils/py-ansible-lint/Makefile
index dddd6e986e25..c1b0592c1207 100644
--- a/sysutils/py-ansible-lint/Makefile
+++ b/sysutils/py-ansible-lint/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	ansible-lint
 PORTVERSION=	6.17.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Checks playbooks for sub-optimal practices and behaviour
 WWW=		https://github.com/willthames/ansible-lint
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansible-core>=2.12.0:sysutils/py-ansible-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ansible-compat>=4.0.5:sysutils/py-ansible-compat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}black>=22.8.0:devel/py-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}filelock>=3.3.0:sysutils/py-filelock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=4.10.0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=21.3:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pathspec>=0.10.3:devel/py-pathspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rich>=12.0.0:textproc/py-rich@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.17.0:devel/py-ruamel.yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}subprocess-tee>=0.4.1:devel/py-subprocess-tee@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wcmatch>=8.1.2:textproc/py-wcmatch@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.4.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yamllint>=1.30.0:devel/py-yamllint@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=7.0.5:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage_enable_subprocess>=0:devel/py-coverage_enable_subprocess@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}coverage>=6.4.4:devel/py-coverage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jmespath>=0:devel/py-jmespath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mypy>=0:devel/py-mypy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR} \
 		pylint${PYTHON_PKGNAMESUFFIX}>=0:devel/pylint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>=7.2.2:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-plus>=0.2:devel/py-pytest-plus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=2.1.0:devel/py-pytest-xdist@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.17.31:devel/py-ruamel.yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ruamel.yaml.clib>=0:devel/py-ruamel.yaml.clib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}spdx-tools>=0.7.1:misc/py-spdx-tools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}types-jsonschema>=0:devel/py-types-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}types-PyYAML>=0:devel/py-types-PyYAML@${PY_FLAVOR} \
 		bash:shells/bash
 
 USES=		python:3.9+
 USE_PYTHON=	autoplist concurrent pep517 pytest
 
 TEST_ENV=	LC_ALL=C.UTF-8 PYTHONPATH=${WRKSRC}/src TMPDIR=${WRKDIR}/
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-ansible-runner/Makefile b/sysutils/py-ansible-runner/Makefile
index a375621f628b..394140a83f27 100644
--- a/sysutils/py-ansible-runner/Makefile
+++ b/sysutils/py-ansible-runner/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	ansible-runner
 DISTVERSION=	2.3.2
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dch@FreeBSD.org
 COMMENT=	Extensible embeddable ansible job runner
 WWW=		https://ansible-runner.readthedocs.io/
 
 LICENSE=	APACHE20
 
 BROKEN_armv6=	fails to build: Child process terminated abnormally: Segmentation fault
 BROKEN_armv7=	fails to build: Child process terminated abnormally: Segmentation fault
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansible>2.0:sysutils/ansible@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}daemon>0:devel/py-daemon@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pexpect>4.5:misc/py-pexpect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>5.0:sysutils/py-psutil@${PY_FLAVOR} \
 		${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}
 
 USES=		cpe python
 USE_PYTHON=	autoplist concurrent distutils
 
 CPE_VENDOR=	redhat
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-azure-cli-core/Makefile b/sysutils/py-azure-cli-core/Makefile
index e21532e0f77c..9b95f708f2d0 100644
--- a/sysutils/py-azure-cli-core/Makefile
+++ b/sysutils/py-azure-cli-core/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	azure-cli-core
 PORTVERSION=	2.55.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	Microsoft Azure Command-Line Tools Core Module
 WWW=		https://pypi.org/project/azure-cli-core/
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argcomplete>=3.1.1:devel/py-argcomplete@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-telemetry>=1.1.0:sysutils/py-azure-cli-telemetry@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}humanfriendly>=10.0:textproc/py-humanfriendly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jmespath>=0:devel/py-jmespath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}knack>=0.11.0:devel/py-knack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msal>=1.24.0.b2:devel/py-msal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msal-extensions>=1.0.0:devel/py-msal-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paramiko>=2.0.8<4.0.0:security/py-paramiko@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyjwt>=2.1.0:www/py-pyjwt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>=17.1.0:security/py-openssl@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.22:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0.30.0:devel/py-wheel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pkginfo>=1.5.0.1:sysutils/py-pkginfo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-core>=1.2.0<2.0.0:devel/py-azure-mgmt-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.9:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msrestazure>=0.6.4:net-mgmt/py-msrestazure@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=20.9:devel/py-packaging@${PY_FLAVOR}
 
 USES=		azurepy python
 USE_PYTHON=	autoplist concurrent cryptography distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-azure-cli/Makefile b/sysutils/py-azure-cli/Makefile
index 651653b784ce..4ecc487724b2 100644
--- a/sysutils/py-azure-cli/Makefile
+++ b/sysutils/py-azure-cli/Makefile
@@ -1,125 +1,125 @@
 PORTNAME=	azure-cli
 PORTVERSION=	2.55.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	Microsoft Azure Command-Line Tools
 WWW=		https://docs.microsoft.com/en-us/cli/azure/?view=azure-cli-latest
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	bash:shells/bash \
 		${PYTHON_PKGNAMEPREFIX}antlr4-python3-runtime>=4.9:devel/py-antlr4-python3-runtime@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-appconfiguration>=1.1.1:devel/py-azure-appconfiguration@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-batch>=14.0.0:devel/py-azure-batch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cli-core>=${PORTVERSION}:sysutils/py-azure-cli-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-cosmos>=3.0.2:devel/py-azure-cosmos@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-datalake-store>=0.0.49:devel/py-azure-datalake-store@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-graphrbac>=0.60.0:devel/py-azure-graphrbac@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-keyvault-administration>=4.4.0.b2:devel/py-azure-keyvault-administration@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-keyvault-certificates>=4.7.0:security/py-azure-keyvault-certificates@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-keyvault-keys>=4.9.0.b3:security/py-azure-keyvault-keys@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-keyvault-secrets>=4.7.0:security/py-azure-keyvault-secrets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-loganalytics>=0.1.1:devel/py-azure-loganalytics@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-advisor>=9.0.0:devel/py-azure-mgmt-advisor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-apimanagement>=4.0.0:devel/py-azure-mgmt-apimanagement@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-applicationinsights>=1.0.0:devel/py-azure-mgmt-applicationinsights@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-appconfiguration>=3.0.0:devel/py-azure-mgmt-appconfiguration@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-appcontainers>=2.0.0:devel/py-azure-mgmt-appcontainers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-authorization>=4.0.0:devel/py-azure-mgmt-authorization@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-batch>=17.0.0:devel/py-azure-mgmt-batch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-batchai>=7.0.0.b1:devel/py-azure-mgmt-batchai@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-billing>=6.0.0:devel/py-azure-mgmt-billing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-botservice>=2.0.0.b3:devel/py-azure-mgmt-botservice@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-cdn>=12.0.0:devel/py-azure-mgmt-cdn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-cognitiveservices>=13.5.0:devel/py-azure-mgmt-cognitiveservices@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-compute>=30.3.0:devel/py-azure-mgmt-compute@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-containerinstance>=10.1.0:devel/py-azure-mgmt-containerinstance@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-containerregistry>=10.1.0:devel/py-azure-mgmt-containerregistry@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-containerservice>=28.0.0:devel/py-azure-mgmt-containerservice@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-cosmosdb>=9.3.0:devel/py-azure-mgmt-cosmosdb@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-databoxedge>=1.0.0:devel/py-azure-mgmt-databoxedge@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-datalake-store>=0.5.0:devel/py-azure-mgmt-datalake-store@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-datamigration>=10.0.0:devel/py-azure-mgmt-datamigration@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-devtestlabs>=4.0:devel/py-azure-mgmt-devtestlabs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-dns>=8.0.0:devel/py-azure-mgmt-dns@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-eventgrid>=10.2.0.b2:devel/py-azure-mgmt-eventgrid@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-eventhub>=10.1.0:devel/py-azure-mgmt-eventhub@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-extendedlocation>=1.0.0.b2:devel/py-azure-mgmt-extendedlocation@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-hdinsight>=9.0.0:devel/py-azure-mgmt-hdinsight@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-imagebuilder>=1.2.0:devel/py-azure-mgmt-imagebuilder@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-iotcentral>=10.0.0.b1:devel/py-azure-mgmt-iotcentral@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-iothub>=3.0.0:devel/py-azure-mgmt-iothub@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-iothubprovisioningservices>=1.1.0:devel/py-azure-mgmt-iothubprovisioningservices@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-keyvault>=10.3.0:devel/py-azure-mgmt-keyvault@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-kusto>=0.3.0:devel/py-azure-mgmt-kusto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-loganalytics>=13.0.0.b4:devel/py-azure-mgmt-loganalytics@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-managedservices>=1.0:devel/py-azure-mgmt-managedservices@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-managementgroups>=1.0.0:devel/py-azure-mgmt-managementgroups@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-maps>=2.0.0:devel/py-azure-mgmt-maps@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-marketplaceordering>=1.1.0:devel/py-azure-mgmt-marketplaceordering@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-media>=9.0:devel/py-azure-mgmt-media@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-monitor>=5.0.0:devel/py-azure-mgmt-monitor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-msi>=7.0.0:devel/py-azure-mgmt-msi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-netapp>=10.1.0:devel/py-azure-mgmt-netapp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-policyinsights>=1.1.0.b4:devel/py-azure-mgmt-policyinsights@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-privatedns>=1.0.0:devel/py-azure-mgmt-privatedns@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-rdbms>=10.2.0.b12:devel/py-azure-mgmt-rdbms@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-recoveryservices>=2.5.0:devel/py-azure-mgmt-recoveryservices@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-recoveryservicesbackup>=7.0.0:devel/py-azure-mgmt-recoveryservicesbackup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-redhatopenshift>=1.4.0:devel/py-azure-mgmt-redhatopenshift@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-redis>=14.1.0:devel/py-azure-mgmt-redis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-resource>=23.1.0.b2:devel/py-azure-mgmt-resource@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-search>=9.0.0:devel/py-azure-mgmt-search@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-security>=5.0.0:devel/py-azure-mgmt-security@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-servicebus>=8.2.0:devel/py-azure-mgmt-servicebus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-servicefabric>=1.0.0:devel/py-azure-mgmt-servicefabric@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-servicefabricmanagedclusters>=1.0.0:devel/py-azure-mgmt-servicefabricmanagedclusters@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-servicelinker>=1.2.0.b1:devel/py-azure-mgmt-servicelinker@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-signalr>=2.0.0.b1:devel/py-azure-mgmt-signalr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-sql>=4.0.0.b13:devel/py-azure-mgmt-sql@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-sqlvirtualmachine>=1.0.0.b5:devel/py-azure-mgmt-sqlvirtualmachine@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-storage>=21.1.0:devel/py-azure-mgmt-storage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-trafficmanager>=1.0.0:devel/py-azure-mgmt-trafficmanager@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-web>=7.0.0:devel/py-azure-mgmt-web@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-mgmt-synapse>=2.1.0.b5:devel/py-azure-mgmt-synapse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-multiapi-storage>=1.2.0:devel/py-azure-multiapi-storage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-storage-common>=1.4:devel/py-azure-storage-common@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-synapse-accesscontrol>=0.5.0:devel/py-azure-synapse-accesscontrol@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-synapse-artifacts>=0.17.0:devel/py-azure-synapse-artifacts@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-synapse-managedprivateendpoints>=0.4.0:devel/py-azure-synapse-managedprivateendpoints@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}azure-synapse-spark>=0.2.0:devel/py-azure-synapse-spark@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorama>=0.4.4:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fabric>=2.4:devel/py-fabric@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paramiko>=2.0.8:security/py-paramiko@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.4:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>=17.1.0:security/py-openssl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=20.9:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycomposefile>=0.0.30:devel/pycomposefile@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scp>=0.13.2:security/py-scp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.12:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sshtunnel>=0.1.4:net/py-sshtunnel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.18:net/py-urllib3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}websocket-client>=0.56.0:www/py-websocket-client@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xmltodict>=0.12:devel/py-xmltodict@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}javaproperties>=0.5.1:devel/py-javaproperties@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsondiff>=2.0.0:devel/py-jsondiff@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}semver>=2.13.0:devel/py-semver@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyGithub>=1.55:devel/py-PyGithub@${PY_FLAVOR}
 
 USES=		azurepy python
 USE_PYTHON=	autoplist concurrent cryptography distutils
 
 NO_ARCH=	yes
 
 PLIST_FILES=	${PYTHON_SITELIBDIR}/azure/cli/__main__.py
 
 post-patch:
 	@${REINPLACE_CMD} -e "s#python#${PYTHON_CMD}#g" ${WRKSRC}/az
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-elf_diff/Makefile b/sysutils/py-elf_diff/Makefile
index cdfd318287af..57d292ceecd1 100644
--- a/sysutils/py-elf_diff/Makefile
+++ b/sysutils/py-elf_diff/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	elf_diff
 DISTVERSIONPREFIX=v
 DISTVERSION=	0.7.1
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	Tool to Compare Elf Binaries
 WWW=		https://github.com/noseglasses/elf_diff
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools-git>0:devel/py-setuptools-git@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}progressbar2>0:misc/py-progressbar2@${PY_FLAVOR} \
 		${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}gitpython>0:devel/py-gitpython@${PY_FLAVOR} \
 		git:devel/git
 
 USES=		python
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist concurrent distutils
 
 GH_ACCOUNT=	noseglasses
 
 BINARY_ALIAS=	objdump=llvm-objdump
 NO_ARCH=	yes
 
 do-test:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} tests/test_main.py
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-focker/Makefile b/sysutils/py-focker/Makefile
index dcb8c2ca53a7..b9b3ce08df1b 100644
--- a/sysutils/py-focker/Makefile
+++ b/sysutils/py-focker/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	focker
 DISTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	FreeBSD image orchestration tool in the vein of Docker
 WWW=		https://github.com/sadaszewski/focker
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing@${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}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python
 USE_GITHUB=	yes # PyPi package is at 0.91
 USE_PYTHON=	autoplist concurrent distutils
 
 GH_ACCOUNT=	sadaszewski
 GH_TAGNAME=	1f2d790
 
 NO_ARCH=	yes
 
 # some tests assume `focker` is installed. Tests
 # need refactor to test against WRKSRC build
 do-test:
 	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts=
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-rdiff-backup/Makefile b/sysutils/py-rdiff-backup/Makefile
index 363f28bfab1f..1e2df92e95af 100644
--- a/sysutils/py-rdiff-backup/Makefile
+++ b/sysutils/py-rdiff-backup/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	rdiff-backup
 DISTVERSION=	2.2.6
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	uzsolt@FreeBSD.org
 COMMENT=	Easy to use and efficient backup and restore utility
 WWW=		https://rdiff-backup.net/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${RUN_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \
 		rubygem-asciidoctor>0:textproc/rubygem-asciidoctor
 LIB_DEPENDS=	librsync.so:net/librsync
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		localbase:ldflags python
 USE_LDCONFIG=	yes
 USE_PYTHON=	autoplist concurrent distutils
 
 CONFLICTS=	rdiff-backup-devel rdiff-backup-1.0*
 
 PORTSCOUT=	limitw:1,even
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/rdiff_backup/_librsync*.so
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/rdiff_backup/C*.so
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile
index 65c9b363ccc6..3f6b98567d0a 100644
--- a/sysutils/py-salt/Makefile
+++ b/sysutils/py-salt/Makefile
@@ -1,129 +1,129 @@
 PORTNAME=	salt
 PORTVERSION=	3006.8
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	krion@FreeBSD.org
 COMMENT=	Distributed remote execution and configuration management system
 WWW=		https://pypi.org/project/salt/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>0:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}distro>=1.5.0:sysutils/py-distro@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:net/py-libcloud@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=0.3.0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}looseversion>0:devel/py-looseversion@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}
 
 USES=		cpe python
 
 CPE_VENDOR=	saltstack
 CPE_PRODUCT=	salt
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 CONFLICTS=	py[0-9]*-salt-2019*
 
 # we must pass these options before the target name, and python.mk has no
 # early-arguments variable, so we have to manipulate the target
 PYDISTUTILS_INSTALL_TARGET=\
 	--salt-root-dir=/ \
 	--salt-config-dir=${ETCDIR} \
 	--salt-cache-dir=/var/cache/salt \
 	--salt-sock-dir=/var/run/salt \
 	--salt-srv-root-dir=${ETCDIR} \
 	--salt-base-file-roots-dir=${ETCDIR}/states \
 	--salt-base-pillar-roots-dir=${ETCDIR}/pillar \
 	--salt-base-master-roots-dir=${ETCDIR}/salt-master \
 	--salt-logs-dir=/var/log/salt \
 	--salt-pidfile-dir=/var/run \
 	install
 
 USE_RC_SUBR=	salt_api \
 		salt_master \
 		salt_minion \
 		salt_proxy \
 		salt_syndic
 
 SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
 
 SUB_FILES=	pkg-message
 
 # Upstream archive contains files with UTF-8 names
 EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
 
 OPTIONS_DEFINE=	AWS BASH FISH TCP ZEROMQ ZSH
 OPTIONS_DEFAULT=	BASH FISH ZEROMQ ZSH
 
 AWS_DESC=	Install dependencies required for Amazon Web Services
 TCP_DESC=	Install dependencies required for TCP transport
 ZEROMQ_DESC=	Install dependencies required for ZeroMQ transport
 
 # AWS dependencies (Note: the devel/py-botocore port is updated very frequently)
 AWS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}boto>=2.32.1:devel/py-boto@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore@${PY_FLAVOR}
 
 TCP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycryptodomex>=3.9.7:security/py-pycryptodomex@${PY_FLAVOR}
 
 ZEROMQ_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${PY_FLAVOR}
 ZEROMQ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pycryptodomex>=3.9.7:security/py-pycryptodomex@${PY_FLAVOR}
 
 BASH_PLIST_FILES=	share/bash-completion/completions/salt
 FISH_PLIST_FILES=	share/fish/completions/salt-call.fish \
 					share/fish/completions/salt-cp.fish \
 					share/fish/completions/salt-key.fish \
 					share/fish/completions/salt-master.fish \
 					share/fish/completions/salt-minion.fish \
 					share/fish/completions/salt-run.fish \
 					share/fish/completions/salt-syndic.fish \
 					share/fish/completions/salt.fish \
 					share/fish/completions/salt_common.fish
 ZSH_PLIST_FILES=	share/zsh/site-functions/_salt
 
 post-patch:
 .for file in conf/minion conf/master doc/man/salt-key.1 \
 	doc/man/salt-cp.1 doc/man/salt-minion.1 doc/man/salt-syndic.1 \
 	doc/man/salt-master.1 doc/man/salt-run.1 doc/man/salt.7 doc/man/salt.1 \
 	doc/man/salt-call.1 salt/modules/mysql.py salt/modules/tls.py salt/modules/postgres.py
 	@${REINPLACE_CMD} -e 's|/etc/salt|${ETCDIR}|' \
 		-e 's|/srv/salt|${ETCDIR}/states|' \
 		-e 's|/srv/pillar|${ETCDIR}/pillar|' ${WRKSRC}/${file}
 .endfor
 	@${REINPLACE_CMD} -e 's|yumpkg5|pkgng|' ${WRKSRC}/conf/minion
 	@${REINPLACE_CMD} -e 's|"/usr/bin/python3"|"${PYTHON_CMD}"|' ${WRKSRC}/salt/auth/pam.py
 
 do-install-BASH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions/
 	${INSTALL_DATA} ${WRKSRC}/pkg/common/salt.bash \
 		${STAGEDIR}${PREFIX}/share/bash-completion/completions/salt
 
 do-install-FISH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions/
 	${INSTALL_DATA} ${WRKSRC}/pkg/common/fish-completions/*.fish \
 		${STAGEDIR}${PREFIX}/share/fish/completions
 
 do-install-ZSH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/pkg/common/salt.zsh \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_salt
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}${ETCDIR}/master.sample
 	${INSTALL_DATA} ${WRKSRC}/conf/minion ${STAGEDIR}${ETCDIR}/minion.sample
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-tmuxp/Makefile b/sysutils/py-tmuxp/Makefile
index 3f66e481dabc..3cb27197c772 100644
--- a/sysutils/py-tmuxp/Makefile
+++ b/sysutils/py-tmuxp/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	tmuxp
 PORTVERSION=	1.47.0
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Session manager for tmux
 WWW=		https://tmuxp.git-pull.com/ \
 		https://github.com/tmux-python/tmuxp
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorama>=0.3.9:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libtmux>=0.37.0<0.38:devel/py-libtmux@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=6.0<7:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=6.0<7:devel/py-pyyaml@${PY_FLAVOR} \
 		tmux:sysutils/tmux
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/zsm/Makefile b/sysutils/zsm/Makefile
index cf8b8afca26f..4c3e899d71e6 100644
--- a/sysutils/zsm/Makefile
+++ b/sysutils/zsm/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	zsm
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	PYPI
 
 MAINTAINER=	mattias.lindvall@gmail.com
 COMMENT=	ZFS Snapshot Manager
 WWW=		https://zsm.rtfd.io/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=8.0.1:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pid>=3.0.4:devel/py-pid@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.4.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}marshmallow>=3.13.0:devel/py-marshmallow@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}freezegun>=>0:devel/py-freezegun@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils noflavors
 
 NO_ARCH=	yes
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest
 
 .include <bsd.port.mk>
diff --git a/textproc/json2yaml/Makefile b/textproc/json2yaml/Makefile
index 791df1d4e994..de7b5c66ba1d 100644
--- a/textproc/json2yaml/Makefile
+++ b/textproc/json2yaml/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	json2yaml
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Convert JSON to YAML or vice versa
 WWW=		https://github.com/drbild/json2yaml
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docopt>=0:devel/py-docopt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyaml>=0:textproc/py-pyaml@${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 noflavors pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/lookatme/Makefile b/textproc/lookatme/Makefile
index 1f2b60065d01..b9427ab27898 100644
--- a/textproc/lookatme/Makefile
+++ b/textproc/lookatme/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	lookatme
 PORTVERSION=	2.5.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Interactive, terminal-based markdown presenter
 WWW=		https://github.com/d0c-s4vage/lookatme
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}marshmallow>=0:devel/py-marshmallow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mistune0>=0.8<1:textproc/py-mistune0@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urwid>=0:devel/py-urwid@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
 
 USES=		cpe python
 CPE_VENDOR=	${PORTNAME}_project
 USE_PYTHON=	autoplist distutils noflavors pytest
 NO_ARCH=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|>.*||' ${WRKSRC}/requirements.txt
 
 .include <bsd.port.mk>
diff --git a/textproc/py-dparse/Makefile b/textproc/py-dparse/Makefile
index d36de4ddc963..89ccca8a91b1 100644
--- a/textproc/py-dparse/Makefile
+++ b/textproc/py-dparse/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	dparse
 DISTVERSION=	0.6.3
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Parser for Python dependency files
 WWW=		https://github.com/pyupio/dparse
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}
 
 USES=		cpe python
 CPE_VENDOR=	pyup
 CPE_PRODUCT=	dependency_parser
 USE_PYTHON=	autoplist distutils pytest
 
 TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		CONDA PIPENV
 OPTIONS_DEFAULT=	CONDA PIPENV
 
 CONDA_DESC=	Enable support for Conda YML parsing
 PIPENV_DESC=	Enable support to update Python Pipfiles
 
-CONDA_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+CONDA_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 PIPENV_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pipenv>=2022.12.19:devel/py-pipenv@${PY_FLAVOR}
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 31100
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tomli>0:textproc/py-tomli@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/py-elasticsearch-curator/Makefile b/textproc/py-elasticsearch-curator/Makefile
index 3640f5ebb647..17ce5fa6f97a 100644
--- a/textproc/py-elasticsearch-curator/Makefile
+++ b/textproc/py-elasticsearch-curator/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	elasticsearch-curator
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.8.4
+PORTREVISION=	1
 CATEGORIES=	textproc python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	elastic@FreeBSD.org
 COMMENT=	Python index manager for Elasticsearch
 WWW=		https://curator.readthedocs.org/en/master/
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto3>=1.7.24:www/py-boto3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}certifi>=2018.10.15:security/py-certifi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click7>=7.1.2:devel/py-click7@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}elasticsearch>=7.15.1:textproc/py-elasticsearch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-aws4auth>=0.9:www/py-requests-aws4auth@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.26.4:net/py-urllib3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}voluptuous>=0.9.3:devel/py-voluptuous@${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_GITHUB=	yes
 GH_ACCOUNT=	elastic
 GH_PROJECT=	curator
 USE_PYTHON=	autoplist distutils
 
 CONFLICTS_INSTALL=	curator # bin/curator
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-elasticsearch/Makefile b/textproc/py-elasticsearch/Makefile
index 63bbad3e854c..16a62ccc38c3 100644
--- a/textproc/py-elasticsearch/Makefile
+++ b/textproc/py-elasticsearch/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	elasticsearch
 PORTVERSION=	7.17.9
 PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Official Python low-level client for Elasticsearch
 WWW=		https://www.elastic.co/guide/en/elasticsearch/client/python-api/current/index.html \
 		https://github.com/elastic/elasticsearch-py
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1,1<2,1:net/py-urllib3@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>=0,1:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.0.0<3.0.0:www/py-requests@${PY_FLAVOR}
 
 USES=		cpe python
 USE_PYTHON=	autoplist concurrent nose pep517
 
 NO_ARCH=	yes
 
 CPE_VENDOR=	elastic
 
 OPTIONS_DEFINE=	ASYNC REQUESTS
 OPTIONS_DEFAULT=REQUESTS
 ASYNC_DESC=	Asynchronous support
 REQUESTS_DESC=	Enable requests support
 
 ASYNC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiohttp>=3<4:www/py-aiohttp@${PY_FLAVOR}
 REQUESTS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.4.0<3.0.0:www/py-requests@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/textproc/py-elasticsearch6/Makefile b/textproc/py-elasticsearch6/Makefile
index e2688d1e6152..c58c4b39efef 100644
--- a/textproc/py-elasticsearch6/Makefile
+++ b/textproc/py-elasticsearch6/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	elasticsearch
 PORTVERSION=	6.8.2
 PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	6
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Official Python low-level client for Elasticsearch
 WWW=		https://github.com/elastic/elasticsearch-py
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1,1:net/py-urllib3@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR}
 
 USES=		cpe python
 USE_PYTHON=	autoplist concurrent nose pep517
 
 NO_ARCH=	yes
 
 CPE_VENDOR=	elastic
 
 OPTIONS_DEFINE=	REQUESTS
 OPTIONS_DEFAULT=REQUESTS
 REQUESTS_DESC=	Enable requests support
 
 REQUESTS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.4.0:www/py-requests@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/textproc/py-j2cli/Makefile b/textproc/py-j2cli/Makefile
index abfdf2b0e0c4..30e14b447b8b 100644
--- a/textproc/py-j2cli/Makefile
+++ b/textproc/py-j2cli/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=		j2cli
 DISTVERSIONPREFIX=	v
 DISTVERSION=		0.3.12b
+PORTREVISION=	1
 CATEGORIES=		textproc python
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=		vendion@gmail.com
 COMMENT=		Jinja2 Command-Line Tool, reworked
 WWW=		https://github.com/kolypto/j2cli
 
 LICENSE=		BSD2CLAUSE
 LICENSE_FILE=		${WRKSRC}/LICENSE
 
 RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR}
 
 TEST_DEPENDS=		${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR}
 
 USES=			python
 
 OPTIONS_DEFINE=		TEST YAML
 OPTIONS_DEFAULT=	TEST YAML
 
-YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 .include <bsd.port.options.mk>
 
 USE_PYTHON=		autoplist concurrent distutils
 USE_GITHUB=		yes
 GH_ACCOUNT=		kolypto
 .if ${PORT_OPTIONS:MTEST}
 TEST_TARGET=		test
 .endif
 
 NO_ARCH=		yes
 
 TEST_ENV=		TMPDIR=${WKRDIR}
 
 do-test:
 	@cd ${WRKSRC} && \
 	${SETENV} ${TEST_ENV} ${LOCALBASE}/bin/tox-${PYTHON_VER} -v
 
 .include <bsd.port.mk>
diff --git a/textproc/py-jinja2-cli/Makefile b/textproc/py-jinja2-cli/Makefile
index bef606ad7b44..6f0bce664bee 100644
--- a/textproc/py-jinja2-cli/Makefile
+++ b/textproc/py-jinja2-cli/Makefile
@@ -1,46 +1,47 @@
 PORTNAME=		jinja2-cli
 PORTVERSION=		0.8.2
+PORTREVISION=	1
 CATEGORIES=		textproc python
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=		otis@FreeBSD.org
 COMMENT=		Jinja2 CLI tool
 WWW=		https://github.com/mattrobenolt/jinja2-cli
 
 LICENSE=		BSD2CLAUSE
 LICENSE_FILE=		${WRKSRC}/LICENSE
 
 RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}markupsafe>0:textproc/py-markupsafe@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR}
 TEST_DEPENDS=		${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR}
 
 USES=			python
 
 OPTIONS_DEFINE=		TEST TOML XML YAML
 OPTIONS_DEFAULT=	TEST TOML XML YAML
 
 TOML_DESC=		TOML format or parser support
 TOML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}toml>0:textproc/py-toml@${PY_FLAVOR}
 
 XML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xmltodict>0:devel/py-xmltodict@${PY_FLAVOR}
 
-YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 .include <bsd.port.options.mk>
 
 USE_PYTHON=		autoplist concurrent distutils
 USE_GITHUB=		yes
 GH_ACCOUNT=		mattrobenolt
 .if ${PORT_OPTIONS:MTEST}
 TEST_TARGET=		test
 .endif
 
 NO_ARCH=		yes
 
 TEST_ENV=	       TMPDIR=${WRKDIR}
 
 do-test:
 	@cd ${WRKSRC} && \
 	${SETENV} ${TEST_ENV} ${LOCALBASE}/bin/tox-${PYTHON_VER} -v
 
 .include <bsd.port.mk>
diff --git a/textproc/py-markdown/Makefile b/textproc/py-markdown/Makefile
index 942f4fb4efba..f5675bff6833 100644
--- a/textproc/py-markdown/Makefile
+++ b/textproc/py-markdown/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	markdown
 PORTVERSION=	3.6
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Markdown-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python implementation of Markdown
 WWW=		https://python-markdown.github.io/ \
 		https://github.com/Python-Markdown/markdown
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=61.2:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${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 unittest
 
 NO_ARCH=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 31000
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.4:devel/py-importlib-metadata@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/py-markups/Makefile b/textproc/py-markups/Makefile
index dd8a6bdfb630..9c253d6f94fc 100644
--- a/textproc/py-markups/Makefile
+++ b/textproc/py-markups/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	markups
 PORTVERSION=	4.0.0
 PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Markups-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Wrapper around various text markup languages
 WWW=		https://github.com/retext-project/pymarkups
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=61.2:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-markdown-math>=0:textproc/py-python-markdown-math@${PY_FLAVOR}
 TEST_DEPENDS=	asciidoc>=0:textproc/asciidoc \
 		${PYTHON_PKGNAMEPREFIX}docutils>=0,1:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>=3:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pymdown-extensions>=0:textproc/py-pymdown-extensions@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}textile>=0:www/py-textile@${PY_FLAVOR}
 
 USES=		python:3.9+
 USE_PYTHON=	autoplist concurrent pep517 unittest
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-mike/Makefile b/textproc/py-mike/Makefile
index 431d50a2856d..252f082f5ee8 100644
--- a/textproc/py-mike/Makefile
+++ b/textproc/py-mike/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	mike
 PORTVERSION=	2.1.2
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI \
 		https://github.com/jimporter/mike/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Manage multiple versions of your MkDocs-powered documentation
 WWW=		https://github.com/jimporter/mike
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}importlib-resources>=0:devel/py-importlib-resources@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mkdocs>=1.0:textproc/py-mkdocs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=3.0:devel/py-pyparsing@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml_env_tag>=0:devel/py-pyyaml_env_tag@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}verspec>=0:devel/py-verspec@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-mkdocs-get-deps/Makefile b/textproc/py-mkdocs-get-deps/Makefile
index 1bf4ce339ca5..658d8daf69e6 100644
--- a/textproc/py-mkdocs-get-deps/Makefile
+++ b/textproc/py-mkdocs-get-deps/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	mkdocs-get-deps
 DISTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	mkdocs_get_deps-${DISTVERSION}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	MkDocs extension that lists all dependencies according to a mkdocs.yml
 WWW=		https://github.com/mkdocs/get-deps
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mergedeep>=1.3.4:devel/py-mergedeep@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}platformdirs>=2.2.0:devel/py-platformdirs@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517 pytest
 
 TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 NO_ARCH=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 31000
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.4:devel/py-importlib-metadata@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/py-mkdocs/Makefile b/textproc/py-mkdocs/Makefile
index 8f1cf58ff43b..3b1b26ef7870 100644
--- a/textproc/py-mkdocs/Makefile
+++ b/textproc/py-mkdocs/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	mkdocs
 DISTVERSION=	1.6.0
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Project documentation with Markdown
 WWW=		https://www.mkdocs.org
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Babel>=2.9.0:devel/py-babel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=7.0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ghp-import>=1.0:www/py-ghp-import@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.11.1:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>=3.3.6:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=2.0.1:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mergedeep>=1.3.4:devel/py-mergedeep@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mkdocs-get-deps>=0.2.0:textproc/py-mkdocs-get-deps@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=20.5:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pathspec>=0.11.1:devel/py-pathspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}platformdirs>=2.2.0:devel/py-platformdirs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml_env_tag>=0.1:devel/py-pyyaml_env_tag@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}watchdog>=2.0:devel/py-watchdog@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		cpe python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		I18N
 OPTIONS_DEFAULT=	I18N
 
 I18N_DESC=	Support for theme localization
 I18N_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=2.9.0:devel/py-babel@${PY_FLAVOR}
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 31000
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.4:devel/py-importlib-metadata@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/py-myst-parser/Makefile b/textproc/py-myst-parser/Makefile
index 5b5345f8f609..a535d26a64a1 100644
--- a/textproc/py-myst-parser/Makefile
+++ b/textproc/py-myst-parser/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	myst-parser
 PORTVERSION=	3.0.1
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	myst_parser-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Extended commonmark compliant parser with bridges to docutils & sphinx
 WWW=		https://myst-parser.readthedocs.io/en/latest/ \
 		https://github.com/executablebooks/MyST-Parser
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flit-core>=3.4<4:devel/py-flit-core@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0.18,1<0.22,1:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown-it-py>=3.0<4:textproc/py-markdown-it-py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mdit-py-plugins>=0.4<1:textproc/py-mdit-py-plugins@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx>=5,1<8,1:textproc/py-sphinx@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	LINKIFY
 LINKIFY_DESC=	Linkify extension
 
 LINKIFY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}linkify-it-py>=2.0<3:textproc/py-linkify-it-py@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/textproc/py-ntc-templates/Makefile b/textproc/py-ntc-templates/Makefile
index 1cdf83625ae7..c82d7aa356e5 100644
--- a/textproc/py-ntc-templates/Makefile
+++ b/textproc/py-ntc-templates/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	ntc-templates
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.1.0
 CATEGORIES=	textproc net-mgmt python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	TextFSM Templates for Network Devices
 WWW=		https://github.com/networktocode/ntc-templates
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}textfsm>=1.1.0<2.0.0:textproc/py-textfsm@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}invoke>0:devel/py-invoke@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ruamel.yaml>0:devel/py-ruamel.yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}toml>0:textproc/py-toml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_GITHUB=	yes
 GH_ACCOUNT=	networktocode
 USE_PYTHON=	autoplist pep517 pytest
 
 TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-os-api-ref/Makefile b/textproc/py-os-api-ref/Makefile
index c0da5833ea55..9f3e0406d68a 100644
--- a/textproc/py-os-api-ref/Makefile
+++ b/textproc/py-os-api-ref/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	os-api-ref
 DISTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Sphinx Extensions to support API reference sites in OpenStack
 WWW=		https://docs.openstack.org/os-api-ref/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.12:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx>=4.0.0,1:textproc/py-sphinx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openstackdocstheme>=2.2.1:textproc/py-openstackdocstheme@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-pyaml/Makefile b/textproc/py-pyaml/Makefile
index 6714c4f5a9a7..4c484bf6380b 100644
--- a/textproc/py-pyaml/Makefile
+++ b/textproc/py-pyaml/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	pyaml
 PORTVERSION=	24.4.0
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Produce pretty and readable YAML-serialized data
 WWW=		https://github.com/mk-fg/pretty-yaml
 
 LICENSE=	WTFPL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
-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 concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-pybtex/Makefile b/textproc/py-pybtex/Makefile
index 291c40183dbf..0a8909bd43b5 100644
--- a/textproc/py-pybtex/Makefile
+++ b/textproc/py-pybtex/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	pybtex
 PORTVERSION=	0.24.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	BibTeX-compatible bibliography processor in Python
 WWW=		https://pybtex.org/ \
 		https://bitbucket.org/pybtex-devs/pybtex/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}latexcodec>=1.0.4:textproc/py-latexcodec@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.01:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.01:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-pymdown-extensions/Makefile b/textproc/py-pymdown-extensions/Makefile
index e9296aa0fc0e..b45ba41d5150 100644
--- a/textproc/py-pymdown-extensions/Makefile
+++ b/textproc/py-pymdown-extensions/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	pymdown-extensions
 DISTVERSION=	10.7.1
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pymdown_extensions-${DISTVERSION}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Extension pack for Python Markdown
 WWW=		https://github.com/facelessuser/pymdown-extensions
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatchling>=0.21.1:devel/py-hatchling@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}markdown>=3.5:textproc/py-markdown@${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 pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-reno/Makefile b/textproc/py-reno/Makefile
index aab7cf005aa4..35d6b7b33fbe 100644
--- a/textproc/py-reno/Makefile
+++ b/textproc/py-reno/Makefile
@@ -1,25 +1,26 @@
 PORTNAME=	reno
 DISTVERSION=	4.1.0
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	RElease NOtes manager
 WWW=		https://docs.openstack.org/reno/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dulwich>=0.15.0:devel/py-dulwich@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=20.4:devel/py-packaging@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.3.1:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils concurrent autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-sphinx-autoapi/Makefile b/textproc/py-sphinx-autoapi/Makefile
index aa90ce5248ac..88bcf815c0f9 100644
--- a/textproc/py-sphinx-autoapi/Makefile
+++ b/textproc/py-sphinx-autoapi/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	sphinx-autoapi
 DISTVERSION=	2.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	andreas@bilke.org
 COMMENT=	Sphinx API documentation generator
 WWW=		https://sphinx-autoapi.readthedocs.io/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}anyascii>0:textproc/py-anyascii@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}astroid2>=2.7:devel/py-astroid2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx>=5.2.0:textproc/py-sphinx@${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
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-tableschema-to-template/Makefile b/textproc/py-tableschema-to-template/Makefile
index d75da013f776..298d1398b779 100644
--- a/textproc/py-tableschema-to-template/Makefile
+++ b/textproc/py-tableschema-to-template/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	tableschema-to-template
 PORTVERSION=	0.0.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Generate an Excel template with input validation from Frictionless Table Schema
 WWW=		https://github.com/hubmapconsortium/tableschema-to-template
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=1.0.0:devel/py-jsonschema@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.13:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}XlsxWriter>=1.2.8:textproc/py-xlsxwriter@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 post-patch:
 	@${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/VERSION
 
 .include <bsd.port.mk>
diff --git a/textproc/py-tablib/Makefile b/textproc/py-tablib/Makefile
index f96d09d8b6ff..8eb9c644cd7b 100644
--- a/textproc/py-tablib/Makefile
+++ b/textproc/py-tablib/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	tablib
 PORTVERSION=	3.6.1
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Format agnostic tabular data library (XLS, JSON, YAML, CSV)
 WWW=		https://github.com/jazzband/tablib
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.2:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 
 USES=		cpe python
 CPE_VENDOR=	python
 USE_PYTHON=	autoplist pep517 pytest
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	CLI ODS PANDAS XLS XLSX YAML
 OPTIONS_DEFAULT=CLI ODS PANDAS XLS XLSX YAML
 
 CLI_DESC=	Command-line support
 ODS_DESC=	Open Document .ods support
 PANDAS_DESC=	Pandas Dataframe support
 XLS_DESC=	Microsoft Excel .xls support
 XLSX_DESC=	Microsoft Excel .xlsx support
 YAML_DESC=	YAML format support
 
 CLI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tabulate>=0:devel/py-tabulate@${PY_FLAVOR}
 ODS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}odfpy>=0:devel/py-odfpy@${PY_FLAVOR}
 PANDAS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>=0:math/py-pandas@${PY_FLAVOR}
 XLS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlrd>=0:textproc/py-xlrd@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}xlwt>=0:textproc/py-xlwt@${PY_FLAVOR}
 XLSX_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openpyxl>=2.6.0:textproc/py-openpyxl@${PY_FLAVOR}
-YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
+YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/textproc/py-tomlkit/Makefile b/textproc/py-tomlkit/Makefile
index 75178dfbf949..c47ac096f270 100644
--- a/textproc/py-tomlkit/Makefile
+++ b/textproc/py-tomlkit/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	tomlkit
 PORTVERSION=	0.12.5
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI \
 		https://github.com/sdispater/tomlkit/releases/download/${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Style-preserving TOML library
 WWW=		https://tomlkit.readthedocs.io/en/latest/ \
 		https://github.com/python-poetry/tomlkit
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python shebangfix
 USE_PYTHON=	autoplist concurrent pep517 pytest
 
 NO_ARCH=	yes
 
 SHEBANG_FILES=	tests/toml-test/gen-multi.py
 
 post-patch:
 	@${MV} ${WRKSRC}/tests ${WRKSRC}/tomlkit
 
 .include <bsd.port.mk>
diff --git a/textproc/py-wavedrom/Makefile b/textproc/py-wavedrom/Makefile
index f741cff978e1..192c922e7c8c 100644
--- a/textproc/py-wavedrom/Makefile
+++ b/textproc/py-wavedrom/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	wavedrom
 DISTVERSION=	2.0.3.post3
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	WaveDrom compatible Python command line
 WWW=		https://github.com/wallento/wavedrompy
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}svgwrite>0:graphics/py-svgwrite@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairosvg>0:graphics/py-cairosvg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xmldiff>0:textproc/py-xmldiff@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils pytest
 PYTEST_IGNORED_TESTS=	test_upstream # Requires git and an internet connection
 
 TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/xml2rfc/Makefile b/textproc/xml2rfc/Makefile
index 71b330dc1763..af97995a6ef2 100644
--- a/textproc/xml2rfc/Makefile
+++ b/textproc/xml2rfc/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	xml2rfc
 PORTVERSION=	3.22.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Tool to create RFCs and related documents from XML
 WWW=		https://xml2rfc.tools.ietf.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=4.9.0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.5.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}country>=22.3.5:devel/py-country@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}intervaltree>=3.1.0:devel/py-intervaltree@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}google-i18n-address>=3.0.0:devel/py-google-i18n-address@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configargparse>=1.2.3:devel/py-configargparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.2:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.3.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}wcwidth>=0.2.5:devel/py-wcwidth@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}platformdirs>=3.6.0:devel/py-platformdirs@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist concurrent optsuffix
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/www/flexget/Makefile b/www/flexget/Makefile
index 32dcad4de840..dc1caf04faed 100644
--- a/www/flexget/Makefile
+++ b/www/flexget/Makefile
@@ -1,61 +1,61 @@
 PORTNAME=	FlexGet
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.9.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Multipurpose automation tool for all of your media
 WWW=		https://flexget.com/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy20>0:databases/py-sqlalchemy20@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rebulk>=2.0.0:devel/py-rebulk@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rpyc>=5.0:devel/py-RPyC@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}apscheduler>=3.2.0:devel/py-apscheduler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorama>=0.4.4:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=2.0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}loguru>=0.4.1:devel/py-loguru@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=21.3:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.4.7:devel/py-pyparsing@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=4.2:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=4.2:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}guessit>=3.2.0:multimedia/py-guessit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pynzb>0:news/py-pynzb@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zxcvbn>0:security/py-zxcvbn@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plumbum>=1.2:sysutils/py-plumbum@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.8.0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}feedparser>=6.0.2:textproc/py-feedparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rich>=9.0.0:textproc/py-rich@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyrss2gen>0:textproc/py-pyrss2gen@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5:www/py-beautifulsoup@${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} \
 		${PYTHON_PKGNAMEPREFIX}Flask-Cors>=2.1.2:www/py-flask-cors@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask-Login>=0.4.0:www/py-flask-login@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flask-restx>=0.5.1:www/py-flask-restx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}html5lib>=0.11:www/py-html5lib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.20.0:www/py-requests@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vcrpy>0:devel/py-vcrpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pysftp>0:ftp/py-sftp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR}
 
 USES=		python
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist pep517 pytest
 GH_PROJECT=	Flexget
 NO_ARCH=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 31000
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/mod_gnutls/Makefile b/www/mod_gnutls/Makefile
index d0a970d4dbc9..7af081b2c6e1 100644
--- a/www/mod_gnutls/Makefile
+++ b/www/mod_gnutls/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	mod_gnutls
 PORTVERSION=	0.12.1
+PORTREVISION=	1
 CATEGORIES=	www security
 MASTER_SITES=	https://mod.gnutls.org/downloads/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Extension for Apache httpd using GnuTLS library to provide HTTPS
 WWW=		https://mod.gnutls.org
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=3.13:devel/py-pyyaml@${PY_FLAVOR}
 LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 GNU_CONFIGURE=	yes
 USES=		apache compiler:c++11-lang cpe libtool pkgconfig python tar:bzip2
 CPE_VENDOR=	${PORTNAME}_project
 
 BINARY_ALIAS=	python3=${PYTHON_CMD} python=${PYTHON_CMD}
 
 DBDIR=		${PREFIX}/var/db/${PORTNAME}
 PLIST_SUB=	SED="${SED}" WWWGRP=${WWWGRP} WWWOWN=${WWWOWN}
 SUB_FILES=	pkg-message
 SUB_LIST=	DBDIR="${DBDIR}"
 
 CFLAGS+=	-Wno-deprecated-declarations -Wno-null-pointer-subtraction
 CONFIGURE_ARGS=	--with-apxs="${APXS}"
 
 INSTALL_TARGET=	install-strip
 
 post-install:
 	${MKDIR} "${STAGEDIR}${DBDIR}"
 
 .include <bsd.port.mk>
diff --git a/www/py-bokeh/Makefile b/www/py-bokeh/Makefile
index 6c75420274f2..8ba006199841 100644
--- a/www/py-bokeh/Makefile
+++ b/www/py-bokeh/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	bokeh
 PORTVERSION=	2.4.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Interactive Web Plotting for Python
 WWW=		https://bokeh.pydata.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=16.8:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.1:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PY_PILLOW} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.10:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tornado>=5:www/py-tornado@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.7.4:devel/py-typing-extensions@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils concurrent
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/www/py-bravado-core/Makefile b/www/py-bravado-core/Makefile
index c357dd3e6c9f..87266caadab0 100644
--- a/www/py-bravado-core/Makefile
+++ b/www/py-bravado-core/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	bravado-core
 DISTVERSIONPREFIX=	v
 DISTVERSION=	6.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 #MASTER_SITES=	PYPI # no tests
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for adding Swagger support to clients and servers
 WWW=		https://github.com/Yelp/bravado-core
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonref>0:devel/py-jsonref@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>=0.5.2:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}swagger-spec-validator>=2.0.1:devel/py-swagger-spec-validator@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mypy>0:devel/py-mypy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-benchmark>0:devel/py-pytest-benchmark@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Yelp
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_WRKSRC=	${WRKSRC}/tests # tests hang, see https://github.com/Yelp/bravado-core/issues/396
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/www/py-bravado/Makefile b/www/py-bravado/Makefile
index af3cfbceb8af..cc7e310fe34b 100644
--- a/www/py-bravado/Makefile
+++ b/www/py-bravado/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	bravado
 DISTVERSION=	11.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	PYPI # no tests
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for accessing Swagger-enabled APIs
 WWW=		https://github.com/Yelp/bravado
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bravado-core>=5.16.1:www/py-bravado-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}monotonic>0:devel/py-monotonic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.17:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bottle>0:www/py-bottle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ephemeral-port-reserve>0:net/py-ephemeral-port-reserve@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils concurrent autoplist pytest
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/www/py-drf-spectacular/Makefile b/www/py-drf-spectacular/Makefile
index ec1fe26820f0..20fb1d469709 100644
--- a/www/py-drf-spectacular/Makefile
+++ b/www/py-drf-spectacular/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	drf-spectacular
 DISTVERSION=	0.27.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Sane/flexible OpenAPI 3 schema generation for Django REST framework
 WWW=		https://github.com/tfranzel/drf-spectacular
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django42>=2.2:www/py-django42@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}djangorestframework>=3.10.3:www/py-djangorestframework@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}inflection>=0.3.1:devel/py-inflection@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=2.6.0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}uritemplate>=2.0.0:net/py-uritemplate@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}*${PORTNAME}
 
 NO_ARCH=		yes
 
 OPTIONS_DEFINE=		SIDECAR
 OPTIONS_DEFAULT=	SIDECAR
 
 SIDECAR_DESC=	Enable self-contained Swagger/Redoc UI installation
 SIDECAR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}drf-spectacular-sidecar>0:www/py-drf-spectacular-sidecar@${PY_FLAVOR}
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 31000
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/py-drf-yasg/Makefile b/www/py-drf-yasg/Makefile
index 921e1149f5e9..ce32923a8589 100644
--- a/www/py-drf-yasg/Makefile
+++ b/www/py-drf-yasg/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	drf-yasg
 DISTVERSION=	1.21.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Yet Another Swagger Generator
 WWW=		https://github.com/axnsan12/drf-yasg
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools-scm>=3.0.6:devel/py-setuptools-scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django42>=2.2.16:www/py-django42@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}djangorestframework>=3.10.3:www/py-djangorestframework@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}inflection>=0.3.1:devel/py-inflection@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2021.1:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}uritemplate>=3.0.0:net/py-uritemplate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=21.0:devel/py-packaging@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}*${PORTNAME}
 
 NO_ARCH=		yes
 
 OPTIONS_DEFINE=		COREAPI VALIDATION
 OPTIONS_DEFAULT=	VALIDATION
 
 COREAPI_DESC=		Enable CoreAPI validation mechanisms
 VALIDATION_DESC=	Enable built-in OpenAPI validation mechanisms
 
 COREAPI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coreapi>=2.3.3:devel/py-coreapi@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}coreschema>=0.0.4:devel/py-coreschema@${PY_FLAVOR}
 VALIDATION_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}swagger-spec-validator>=2.1.0:devel/py-swagger-spec-validator@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/www/py-falcon/Makefile b/www/py-falcon/Makefile
index 33e45e4b580b..0b4791d55e84 100644
--- a/www/py-falcon/Makefile
+++ b/www/py-falcon/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	falcon
 PORTVERSION=	3.0.1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	lichray@gmail.com
 COMMENT=	High-performance Python framework for building cloud APIs
 WWW=		https://falconframework.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-mimeparse>=1.5.2:devel/py-python-mimeparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pecan>=0:www/py-pecan@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist cython
 
 post-install:
 	@${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/falcon/ -name '*.so' -exec ${STRIP_CMD} {} +
 
 do-test:
 		@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest --ignore=freenit/project/ -v -rs -o addopts= \
 			--ignore-glob='*test_media_handlers*' \
 			--ignore-glob='*test_functional*' \
 			--ignore-glob='*test_cmd_print_api*' \
 			--ignore-glob='*test_cython*'
 
 .include <bsd.port.mk>
diff --git a/www/py-flasgger/Makefile b/www/py-flasgger/Makefile
index 0b34f4dc6166..fb86a44811b8 100644
--- a/www/py-flasgger/Makefile
+++ b/www/py-flasgger/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	flasgger
 DISTVERSION=	0.9.7.1
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Extract swagger specs from your flask project
 WWW=		http://flasgger.pythonanywhere.com/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}apispec>0:devel/py-apispec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flask>=0.10:www/py-flask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=3.0.1:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mistune>=0:textproc/py-mistune@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}werkzeug>=0:www/py-werkzeug@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.0:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}apispec-webframeworks>0:devel/py-apispec-webframeworks@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}apispec>=1.0.0b5:devel/py-apispec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}coveralls>0:devel/py-coveralls@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flake8>=3.8.4:devel/py-flake8@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask-JWT>0:www/py-flask-jwt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask-RESTful>0:www/py-flask-restful@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flex>0:devel/py-flex@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}marshmallow>0:devel/py-marshmallow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>=4.6:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}twine>=1.11.0:devel/py-twine@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist pytest # tests fail to run, see https://github.com/flasgger/flasgger/issues/605
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/www/py-flask-flatpages/Makefile b/www/py-flask-flatpages/Makefile
index 70b880d5276d..eb559ce72bef 100644
--- a/www/py-flask-flatpages/Makefile
+++ b/www/py-flask-flatpages/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	Flask-FlatPages
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	oleg@bsdpower.com
 COMMENT=	Provides flat static pages to a Flask application
 WWW=		https://github.com/SimonSapin/Flask-FlatPages
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flask>=0:www/py-flask@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}  \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}  \
 		${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/www/py-gandi.cli/Makefile b/www/py-gandi.cli/Makefile
index f61816e13460..0899763d262d 100644
--- a/www/py-gandi.cli/Makefile
+++ b/www/py-gandi.cli/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	gandi.cli
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Gandi command line interface
 WWW=		https://github.com/Gandi/gandi.cli
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 DEPRECATED=	Upstream no longer continuing
 # Should be removed along with python38
 EXPIRATION_DATE=	2024-10-31
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=7.0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ipy>0:net-mgmt/py-ipy@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} > 30900
 BROKEN=		python-3.9 is not supported
 .endif
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs
 
 .include <bsd.port.post.mk>
diff --git a/www/py-graphite-api/Makefile b/www/py-graphite-api/Makefile
index d213cfa59be7..24c39022ad96 100644
--- a/www/py-graphite-api/Makefile
+++ b/www/py-graphite-api/Makefile
@@ -1,69 +1,69 @@
 PORTNAME=	graphite-api
 PORTVERSION=	1.1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dch@FreeBSD.org
 COMMENT=	Graphite-web, without the interface - just the rendering HTTP API
 WWW=		https://github.com/brutasse/graphite-api
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	\
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flask>=0.10.1:www/py-flask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask-Cache>=0.13.1:www/py-flask-cache@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tzlocal>=1.1.1:devel/py-tzlocal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}structlog>=16.0.0:devel/py-structlog@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.0:devel/py-pyparsing@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>3.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>3.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cairocffi>=0.7.2:graphics/py-cairocffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gunicorn>=19.4.1:www/py-gunicorn@${PY_FLAVOR} \
 		xorg-fonts-truetype>=0:x11-fonts/xorg-fonts-truetype
 
 USES=		python
 USE_PYTHON=	distutils py3kplist
 
 NO_ARCH=	yes
 
 GRAPHITEAPI_APP=	graphiteapi
 
 SUB_FILES=	pkg-message
 SUB_LIST=	PYTHON_VER=${PYTHON_VER} \
 		PYTHON_VERSION=${PYTHON_VERSION} \
 		GRAPHITEAPI_APP=${GRAPHITEAPI_APP} \
 		GRAPHITEAPI_USER=${GRAPHITEAPI_USER} \
 		GRAPHITEAPI_GROUP=${GRAPHITEAPI_GROUP} \
 		GRAPHITEAPI_LOGDIR=${GRAPHITEAPI_LOGDIR} \
 		GRAPHITEAPI_TMPDIR=${GRAPHITEAPI_TMPDIR} \
 		GRAPHITEAPI_PIDFILE=${GRAPHITEAPI_PIDFILE}
 
 PLIST_SUB=	GRAPHITEAPI_APP=${GRAPHITEAPI_APP} \
 		GRAPHITEAPI_USER=${GRAPHITEAPI_USER} \
 		GRAPHITEAPI_GROUP=${GRAPHITEAPI_GROUP} \
 		GRAPHITEAPI_LOGDIR=${GRAPHITEAPI_LOGDIR} \
 		GRAPHITEAPI_TMPDIR=${GRAPHITEAPI_TMPDIR} \
 		GRAPHITEAPI_PIDFILE=${GRAPHITEAPI_PIDFILE}
 
 GRAPHITEAPI_USER?=	carbon
 GRAPHITEAPI_GROUP?=	carbon
 
 LOCALSTATEDIR=	/var
 USE_RC_SUBR=	${GRAPHITEAPI_APP}
 
 GRAPHITEAPI_LOGDIR=	${LOCALSTATEDIR}/log/${GRAPHITEAPI_APP}
 GRAPHITEAPI_TMPDIR=	${LOCALSTATEDIR}/run/${GRAPHITEAPI_APP}
 GRAPHITEAPI_PIDFILE=	${LOCALSTATEDIR}/run/${GRAPHITEAPI_APP}/${GRAPHITEAPI_APP}.pid
 
 post-install:
 	${MKDIR} \
 	    ${STAGEDIR}${ETCDIR} \
 	    ${STAGEDIR}${GRAPHITEAPI_TMPDIR} \
 	    ${STAGEDIR}${GRAPHITEAPI_LOGDIR}
 	${INSTALL_DATA} \
 	    ${FILESDIR}/${GRAPHITEAPI_APP}.yaml.sample \
 	    ${STAGEDIR}${ETCDIR}/${GRAPHITEAPI_APP}.yaml.sample
 
 .include <bsd.port.mk>
diff --git a/www/py-habanero/Makefile b/www/py-habanero/Makefile
index 1aee1bc9aaae..230af1c8ef1c 100644
--- a/www/py-habanero/Makefile
+++ b/www/py-habanero/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	habanero
 DISTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Low-level client for Crossref search API
 WWW=		https://github.com/sckott/habanero
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}codecov>0:devel/py-codecov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-issuetracker>0:textproc/py-sphinxcontrib-issuetracker@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}vcrpy>0:devel/py-vcrpy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/www/py-horizon/Makefile b/www/py-horizon/Makefile
index 55d86960df15..920b369fd9e1 100644
--- a/www/py-horizon/Makefile
+++ b/www/py-horizon/Makefile
@@ -1,107 +1,107 @@
 PORTNAME=	horizon
 PORTVERSION=	23.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	OpenStack Dashboard (Horizon)
 WWW=		https://docs.openstack.org/horizon/latest/ \
 		https://github.com/openstack/horizon
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=2.6.0:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django_compressor>=2.4.1:www/py-django_compressor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-debreach>=1.4.2:www/py-django-debreach@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-pyscss>=2.0.2:www/py-django-pyscss@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django42>=3.2<4.3:www/py-django42@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}enmerkar>=0.7.1:www/py-enmerkar@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}futurist>=1.2.0:devel/py-futurist@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=4.3.1:devel/py-keystoneauth1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=4.5.0:devel/py-oslo.concurrency@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.config>=8.8.0:devel/py-oslo.config@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=5.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.policy>=3.11.0:devel/py-oslo.policy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=4.3.0:devel/py-oslo.serialization@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.upgradecheck>=1.5.0:devel/py-oslo.upgradecheck@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=4.12.0:devel/py-oslo.utils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}osprofiler>=3.4.2:devel/py-osprofiler@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=5.5.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pymongo>=3.0.2:databases/py-pymongo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyscss>=1.4.0:textproc/py-pyscss@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-cinderclient>=8.0.0:net/py-python-cinderclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-glanceclient>=2.8.0:net/py-python-glanceclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.22.0:net/py-python-keystoneclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-neutronclient>=8.1.0:net/py-python-neutronclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-novaclient>=9.1.0:net/py-python-novaclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-swiftclient>=3.2.0:databases/py-python-swiftclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2013.6,1: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}requests>=2.25.1:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}semantic-version>=2.3.1:devel/py-semantic-version@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.16.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic>=1.0.3:devel/py-xstatic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-angular>=1.8.2.2:devel/py-xstatic-angular@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-angular-bootstrap>=2.2.0.0:devel/py-xstatic-angular-bootstrap@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-angular-fileupload>=12.0.4.0:devel/py-xstatic-angular-fileupload@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-angular-gettext>=2.3.8.0:devel/py-xstatic-angular-gettext@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-angular-lrdragndrop>=1.0.2.2:devel/py-xstatic-angular-lrdragndrop@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-angular-schema-form>=0.8.13.0:devel/py-xstatic-angular-schema-form@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-bootstrap-datepicker>=1.3.1.0:devel/py-xstatic-bootstrap-datepicker@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-bootstrap-scss>=3.3.7.1:devel/py-xstatic-bootstrap-scss@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-bootswatch>=3.3.7.0:devel/py-xstatic-bootswatch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-d3>=3.5.17.0:devel/py-xstatic-d3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-font-awesome>=4.7.0.0:devel/py-xstatic-font-awesome@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-hogan>=2.0.0.2:devel/py-xstatic-hogan@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-jasmine>=2.4.1.1:devel/py-xstatic-jasmine@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-jquery>=3.5.1.1:devel/py-xstatic-jquery@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-jquery-migrate>=3:devel/py-xstatic-jquery-migrate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-jquery-ui>=1.12.1.1:devel/py-xstatic-jquery-ui@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-jquery.quicksearch>=2.0.3.1:devel/py-xstatic-jquery.quicksearch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-jquery.tablesorter>=2.14.5.1:devel/py-xstatic-jquery.tablesorter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-jsencrypt>=2.3.1.1:devel/py-xstatic-jsencrypt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-mdi>=1.6.50.2:devel/py-xstatic-mdi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-objectpath>=1.2.1.0:devel/py-xstatic-objectpath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-rickshaw>=1.5.0.0:devel/py-xstatic-rickshaw@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-roboto-fontface>=0.5.0.0:devel/py-xstatic-roboto-fontface@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-smart-table>=1.4.13.2:devel/py-xstatic-smart-table@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-spin>=1.2.5.2:devel/py-xstatic-spin@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-term.js>=0.0.7.0:devel/py-xstatic-term.js@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xstatic-tv4>=1.2.7.0:devel/py-xstatic-tv4@${PY_FLAVOR}
 
 USES=		cpe python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 USERS=		horizon
 GROUPS=		horizon
 
 SUB_FILES=	pkg-message
 SUB_LIST=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
 
 CONFLICTS_INSTALL=	py[0-9]*-horizon
 
 CPE_VENDOR=	openstack
 
 PORTSCOUT=	skipv:2012.2.3,2012.2.4,2013.1,2013.1.1,2013.1.2,2013.1.3,2013.1.4,2013.1.5,2013.2,2013.2.1,2013.2.2,2013.2.3,2013.2.4,2014.1,2014.1.1,2014.1.2,2014.1.3,2014.1.4,2014.1.5,2014.2,2014.2.1,2014.2.2,2014.2.3,2014.2.4,2015.1.0,2015.1.1,2015.1.2,2015.1.3,2015.1.4
 
 OPTIONS_RADIO=	CACHE
 OPTIONS_RADIO_CACHE=	MEMCACHED REDIS
 OPTIONS_DEFAULT=MEMCACHED
 MEMCACHED_DESC=	Use memcached as caching backend
 REDIS_DESC=	Use Redis as caching backend
 
 MEMCACHED_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-memcached>=0:databases/py-python-memcached@${PY_FLAVOR}
 REDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>=0:databases/py-redis@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/www/py-python-multipart/Makefile b/www/py-python-multipart/Makefile
index 08902aefdf8f..1d2737e65273 100644
--- a/www/py-python-multipart/Makefile
+++ b/www/py-python-multipart/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	python-multipart
 PORTVERSION=	0.0.9
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	python_multipart-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Streaming multipart parser for Python
 WWW=		https://kludex.github.io/python-multipart/ \
 		https://github.com/Kludex/python-multipart
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${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
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/www/py-quilt3/Makefile b/www/py-quilt3/Makefile
index 6d1465e25d6c..6475da64136a 100644
--- a/www/py-quilt3/Makefile
+++ b/www/py-quilt3/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	quilt3
 PORTVERSION=	5.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python client for Quilt data hub
 WWW=		https://github.com/quiltdata/quilt
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aws-requests-auth>=0.4.2:devel/py-aws-requests-auth@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}boto3>=1.10.0:www/py-boto3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonlines>=1.2.0:devel/py-jsonlines@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=3<5:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}platformdirs>=2:devel/py-platformdirs@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.12.4:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-futures>=1.0.0:www/py-requests-futures@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tenacity>=5.1.1:devel/py-tenacity@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>=4.32:misc/py-tqdm@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	ANNDATA
 ANNDATA_DESC=	Annotated data support
 
 ANNDATA_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}anndata>=0.8.0:devel/py-anndata@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/www/py-seafdav/Makefile b/www/py-seafdav/Makefile
index 541821ece51b..aa755958d900 100644
--- a/www/py-seafdav/Makefile
+++ b/www/py-seafdav/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	seafdav
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${SEAHUB_VER}
 DISTVERSIONSUFFIX=	-server
+PORTREVISION=	1
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ultima@FreeBSD.org
 COMMENT=	Python library for accessing seafile data model
 WWW=		https://github.com/haiwen/seafdav
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}defusedxml>=0.5:devel/py-defusedxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}json5>=0.8.5:devel/py-json5@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-pam>=1.8:security/py-python-pam@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.12:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=0:databases/py-sqlalchemy14@${PY_FLAVOR}
 
 USES=		python shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	haiwen
 USE_PYTHON=	flavors
 SHEBANG_FILES=	*.py *.template wsgidav/dc/*.py
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITEPACKAGEDIR}/wsgidav
 	(cd ${WRKSRC}/wsgidav && \
 		${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 			-d ${WRKSRC}/wsgidav \
 			-f ${WRKSRC}/wsgidav && \
 		${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 			-d ${WRKSRC}/wsgidav \
 			-f ${WRKSRC}/wsgidav)
 	(cd ${WRKSRC}/wsgidav && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SITEPACKAGEDIR}/wsgidav)
 
 .include "${.CURDIR}/../../net-mgmt/seafile-server/Makefile.include"
 
 .include <bsd.port.mk>
diff --git a/www/py-slumber/Makefile b/www/py-slumber/Makefile
index 106d0db39d41..c3246afeb2cf 100644
--- a/www/py-slumber/Makefile
+++ b/www/py-slumber/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	slumber
 PORTVERSION=	0.7.1
+PORTREVISION=	1
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Library that makes consuming a REST API easier and more convenient
 WWW=		https://github.com/samgiles/slumber
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
 
 OPTIONS_DEFINE=	YAML
 
 YAML_DESC=		YAML serializer support
-YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist distutils
 
 GH_ACCOUNT=	samgiles
 
 NO_ARCH=	yes
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.mk>
diff --git a/www/py-spyne/Makefile b/www/py-spyne/Makefile
index 2ec47709d49a..1c338bc6b4e0 100644
--- a/www/py-spyne/Makefile
+++ b/www/py-spyne/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	spyne
 PORTVERSION=	2.14.0
 PORTREVISION=	3
 CATEGORIES=	www devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Transport and architecture agnostic RPC library
 WWW=		http://spyne.io/ \
 		https://github.com/arskom/spyne
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0,1:devel/py-pytz@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django42>=0:www/py-django42@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=3.6:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>=1:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0,1:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.2:devel/py-pyparsing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyramid>=0:www/py-pyramid@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-django>=0:devel/py-pytest-django@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-twisted>=0:devel/py-pytest-twisted@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-subunit>=0:devel/py-python-subunit@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzmq>=0:net/py-pyzmq@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=0:databases/py-sqlalchemy14@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}suds>=0:net/py-suds@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}webtest>=0:www/py-webtest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}werkzeug>=0:www/py-werkzeug@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zeep>=0:net/py-zeep@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517 pytest
 
 NO_ARCH=	yes
 TEST_ENV=	DJANGO_SETTINGS_MODULE=rpctest.settings PYTHONPATH=examples/django
 
 .include <bsd.port.mk>
diff --git a/www/py-starlette/Makefile b/www/py-starlette/Makefile
index 97a4393927b5..6556abc1e832 100644
--- a/www/py-starlette/Makefile
+++ b/www/py-starlette/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	starlette
 PORTVERSION=	0.37.2
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Lightweight ASGI framework/toolkit
 WWW=		https://www.starlette.io/ \
 		https://github.com/encode/starlette
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}anyio>=3.4.0<5:devel/py-anyio@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	FULL
 OPTIONS_DEFAULT=FULL
 FULL_DESC=	Full dependencies
 
 FULL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}itsdangerous>=0:security/py-itsdangerous@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}python-multipart>=0.0.7:www/py-python-multipart@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 31000
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.10.0:devel/py-typing-extensions@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/py-urlwatch/Makefile b/www/py-urlwatch/Makefile
index 8745a68b65a6..4b0005e8f6cd 100644
--- a/www/py-urlwatch/Makefile
+++ b/www/py-urlwatch/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	urlwatch
 DISTVERSION=	2.28
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Monitors webpages and sends notifications about changes
 WWW=		https://github.com/thp/urlwatch
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}minidb>=2.0.6:databases/py-minidb@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pdftotext>0:textproc/py-pdftotext@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycodestyle>0:devel/py-pycodestyle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jq>0:textproc/py-jq@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytesseract>0:graphics/py-pytesseract@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils pytest
 
 NO_ARCH=	yes
 
 PORTEXAMPLES=	hooks.py.example urls.yaml.example
 
 OPTIONS_DEFINE=		DOCS EXAMPLES
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 DOCS_PORTDOCS=		html/* text/*
 DOCS_VARS=		BINARY_ALIAS=sphinx-build=sphinx-build-${PYTHON_VER} MAKE_JOBS_UNSAFE=yes USES+=gmake
 
 post-build-DOCS-on:
 		cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -j${MAKE_JOBS_NUMBER} html text
 
 post-install-DOCS-on:
 		${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 		${MKDIR} ${STAGEDIR}${DOCSDIR}/text
 		(cd ${WRKSRC}/docs/build && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR} "! -name .buildinfo")
 		(cd ${WRKSRC}/docs/build && ${COPYTREE_SHARE} text ${STAGEDIR}${DOCSDIR})
 
 post-install-EXAMPLES-on:
 		${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 		cd ${WRKSRC}/share/urlwatch/examples && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/www/py-uvicorn/Makefile b/www/py-uvicorn/Makefile
index 9e7e9b7edda7..38def552b851 100644
--- a/www/py-uvicorn/Makefile
+++ b/www/py-uvicorn/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	uvicorn
 PORTVERSION=	0.30.1
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Lightning-fast ASGI server
 WWW=		https://www.uvicorn.org/ \
 		https://github.com/encode/uvicorn
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=7.0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}h11>=0.8:net/py-h11@${PY_FLAVOR}
 
 USES=		cpe python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 CPE_VENDOR=	encode
 
 OPTIONS_DEFINE=	STANDARD
 STANDARD_DESC=	Standard extra requirements
 
 STANDARD_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}httptools>=0.5.0:www/py-httptools@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}python-dotenv>=0.13:www/py-python-dotenv@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}uvloop>=0.14.0:devel/py-uvloop@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}watchfiles>=0.13:devel/py-watchfiles@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}websockets>=10.4:devel/py-websockets@${PY_FLAVOR}
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 31100
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.0:devel/py-typing-extensions@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/py-woob/Makefile b/www/py-woob/Makefile
index 02fbbd8445e4..fd50680f9c7f 100644
--- a/www/py-woob/Makefile
+++ b/www/py-woob/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	woob
 PORTVERSION=	3.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Web Outside of Browsers
 WWW=		https://woob.tech/
 
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=23.0:devel/py-packaging@${PY_FLAVOR} \
 		${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}html2text>=3.200:textproc/py-html2text@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyExecJS>=0:devel/py-PyExecJS@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=23.0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${PY_FLAVOR} \
 		${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} \
 		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pycountry>0:textproc/py-pycountry@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}html2text>=3.200:textproc/py-html2text@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} \
 		wget:ftp/wget \
 		gpg2:security/gnupg \
 		yt-dlp:www/yt-dlp
 
 USES=		python
 USE_PYTHON=	autoplist pep517
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		CLICOLOR NSS
 OPTIONS_DEFAULT=	CLICOLOR NSS
 
 CLICOLOR_DESC=		Color command line interface
 CLICOLOR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR}
 
 NSS_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \
 			${PYTHON_PKGNAMEPREFIX}python-nss>0:security/py-python-nss@${PY_FLAVOR}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/ssl/certs|${LOCALBASE}/etc/ssl|g' ${WRKSRC}/woob/browser/nss.py
 
 .include <bsd.port.mk>
diff --git a/www/py-wsgidav/Makefile b/www/py-wsgidav/Makefile
index e40fb04c7cff..f0717c7487b6 100644
--- a/www/py-wsgidav/Makefile
+++ b/www/py-wsgidav/Makefile
@@ -1,60 +1,61 @@
 PORTNAME=	WsgiDAV
 DISTVERSION=	4.3.2
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ultima@FreeBSD.org
 COMMENT=	WSGI based WebDAV server for sharing resources
 WWW=		https://github.com/mar10/wsgidav
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}defusedxml>=0.5:devel/py-defusedxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}json5>=0.8.5:devel/py-json5@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.12:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.2:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.2:devel/py-pyyaml@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}defusedxml>=0.5:devel/py-defusedxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}json5>=0.8.5:devel/py-json5@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.12:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.2:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.2:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheroot>=6.0:www/py-cheroot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>=2.7:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>=1.8:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-html>=1.8:devel/py-pytest-html@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tox>=2.0:devel/py-tox@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}webtest>=2.0:www/py-webtest@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	CHEROOT CHERRYPY FLUP PASTE WSGIUTILS
 OPTIONS_DEFAULT=	CHEROOT
 
 CHEROOT_DESC=		Cheroot server support
 CHERRYPY_DESC=		Cherrypy server support
 FLUP_DESC=		Flup server support
 PASTE_DESC=		Paste server support
 WSGIUTILS_DESC=		Wsgiutils server support
 
 CHEROOT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheroot>=0:www/py-cheroot@${PY_FLAVOR}
 
 CHERRYPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cherrypy>=0:www/py-cherrypy@${PY_FLAVOR}
 
 FLUP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup6>=0:www/py-flup6@${PY_FLAVOR}
 
 PASTE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste@${PY_FLAVOR}
 
 WSGIUTILS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wsgiutils>=0:devel/py-wsgiutils@${PY_FLAVOR}
 
 # In order to run tests, need to switch to the GitHub
 # repo, else will succeed with 0 test runs.
 do-test:
 	(cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test)
 
 .include <bsd.port.mk>
diff --git a/www/qutebrowser/Makefile b/www/qutebrowser/Makefile
index 2f87eaa4f455..24ec488c0762 100644
--- a/www/qutebrowser/Makefile
+++ b/www/qutebrowser/Makefile
@@ -1,72 +1,73 @@
 PORTNAME=	qutebrowser
 DISTVERSION=	3.2.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	PYPI
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Keyboard-focused browser with a minimal GUI
 WWW=		https://www.qutebrowser.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py-colorama@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=0:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 FLAVORS=	qt6 qt5
 FLAVOR?=	${FLAVORS:[1]}
 
 USES=		cpe desktop-file-utils python
 USE_PYQT=	webengine
 USE_PYTHON=	autoplist noflavors pep517
 
 qt5_PKGNAMESUFFIX=	-qt5
 qt5_CONFLICTS_INSTALL=	${PORTNAME}
 
 qt6_CONFLICTS_INSTALL=	${PORTNAME}-qt5
 
 .if ${FLAVOR:U} == "qt5"
 USES+=		pyqt:5 qt:5
 USE_PYQT+=	pyqt5
 USE_QT=		sql-sqlite3
 .else
 USES+=		pyqt:6 qt:6
 USE_PYQT+=	pyqt6
 USE_QT=		base declarative quick3d sqldriver-sqlite:run webengine \
 		websockets tools:build
 .endif
 
 # Upstream archive contains files with UTF-8 names
 EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 ${TAR}
 NO_ARCH=	yes
 PLIST_FILES=	share/applications/${PORTNAME}-${PYTHON_VER}.desktop \
 		share/man/man1/${PORTNAME}.1.gz
 
 OPTIONS_DEFINE_amd64=	ADBLOCK
 OPTIONS_DEFAULT_amd64=	ADBLOCK
 
 ADBLOCK_DESC=	Enable the newer adblocking support
 
 ADBLOCK_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}adblock>=0.4.2:www/py-adblock@${PY_FLAVOR}
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 30900
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-resources>0:devel/py-importlib-resources@${PY_FLAVOR}
 .endif
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/misc/org.qutebrowser.qutebrowser.desktop \
 		${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}-${PYTHON_VER}.desktop
 
 	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 \
 		${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.post.mk>
diff --git a/www/searx/Makefile b/www/searx/Makefile
index 41b056540bb2..12f1e10f9b62 100644
--- a/www/searx/Makefile
+++ b/www/searx/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	searx
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Privacy-respecting, hackable metasearch engine
 WWW=		https://asciimoo.github.io/searx/
 
 LICENSE=	AGPLv3
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flask>0:www/py-flask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flask-babel>0:devel/py-flask-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}idna>0:dns/py-idna@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ndg-httpsclient>0:net/py-ndg-httpsclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httpx>0:www/py-httpx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}brotli>0:archivers/py-brotli@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}uvloop>0:devel/py-uvloop@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}langdetect>0:textproc/py-langdetect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setproctitle>0:devel/py-setproctitle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httpx-socks>0:www/py-httpx-socks@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}splinter>0:www/py-splinter@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug@${PY_FLAVOR}
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		python
 USE_GITHUB=	yes
 GH_ACCOUNT=	asciimoo
 USE_PYTHON=	distutils autoplist noflavors
 USE_RC_SUBR=	searx
 
 NO_ARCH=	yes
 
 SUB_FILES=	searx pkg-message
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
 
 post-patch: # expect dependencies to be backwards-compatible, otherwise it is difficult to have a port
 	@${REINPLACE_CMD} -e 's|==|>=|' ${WRKSRC}/requirements.txt
 
 post-install:
 	# move settings to etc/ /usr/local/lib/python3.x/site-packages/searx/settings.yml
 	@${MV} ${STAGEDIR}${PYTHON_SITELIBDIR}/searx/settings.yml ${STAGEDIR}${PREFIX}/etc/${PORTNAME}-settings.yml.sample
 	@${LN} -s ${PREFIX}/etc/${PORTNAME}-settings.yml ${STAGEDIR}${PYTHON_SITELIBDIR}/searx/settings.yml
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/py-shaperglot/Makefile b/x11-fonts/py-shaperglot/Makefile
index 7950a18ef0b0..da5dfdf159eb 100644
--- a/x11-fonts/py-shaperglot/Makefile
+++ b/x11-fonts/py-shaperglot/Makefile
@@ -1,32 +1,33 @@
 PORTNAME=	shaperglot
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Test font files for OpenType language support
 WWW=		https://github.com/googlefonts/shaperglot
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=45:devel/py-setuptools@${PY_FLAVOR} \
 		${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}gflanguages>=0.4.7:x11-fonts/py-gflanguages@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}num2words>=0.5<0.6:devel/py-num2words@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=3.19.4,1:devel/py-protobuf@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}strictyaml>=0:devel/py-strictyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ufo2ft>=0:x11-fonts/py-ufo2ft@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}vharfbuzz>=0<1:print/py-vharfbuzz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}youseedee>=0:textproc/py-youseedee@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-wm/nscde/Makefile b/x11-wm/nscde/Makefile
index 444c5a9d89f0..255958492540 100644
--- a/x11-wm/nscde/Makefile
+++ b/x11-wm/nscde/Makefile
@@ -1,104 +1,105 @@
 PORTNAME=	nscde
 DISTVERSION=	2.3
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://github.com/NsCDE/NsCDE/releases/download/${DISTVERSION}/
 
 MAINTAINER=	freebsd@ny-central.org
 COMMENT=	Modern CDE clone based on fvwm
 WWW=		https://github.com/NsCDE/NsCDE
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.11:devel/py-pyyaml@${PY_FLAVOR} \
 		dunst:sysutils/dunst \
 		font-bh-lucidatypewriter-100dpi>0:x11-fonts/font-bh-lucidatypewriter-100dpi \
 		fvwm2:x11-wm/fvwm2 \
 		gsed:textproc/gsed \
 		ksh93:shells/ksh \
 		qt5-style-plugins>=5.0.0:x11-themes/qt5-style-plugins \
 		roboto-fonts-ttf>0:x11-fonts/roboto-fonts-ttf \
 		stalonetray:x11/stalonetray \
 		xclip:x11/xclip \
 		xdotool:x11/xdotool \
 		xdpyinfo:x11/xdpyinfo \
 		xrandr>0:x11/xrandr \
 		xrdb:x11/xrdb \
 		xrefresh:x11/xrefresh \
 		xscreensaver:x11/xscreensaver \
 		xsettingsd:x11/xsettingsd \
 		xterm:x11/xterm
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.11:devel/py-pyyaml@${PY_FLAVOR} \
 		dunst:sysutils/dunst \
 		font-bh-lucidatypewriter-100dpi>0:x11-fonts/font-bh-lucidatypewriter-100dpi \
 		fvwm2:x11-wm/fvwm2 \
 		gsed:textproc/gsed \
 		qt5-style-plugins>=5.0.0:x11-themes/qt5-style-plugins \
 		roboto-fonts-ttf>0:x11-fonts/roboto-fonts-ttf \
 		stalonetray:x11/stalonetray \
 		xclip:x11/xclip \
 		xdotool:x11/xdotool \
 		xdpyinfo:x11/xdpyinfo \
 		xrandr>0:x11/xrandr \
 		xrdb:x11/xrdb \
 		xrefresh:x11/xrefresh \
 		xscreensaver:x11/xscreensaver \
 		xsettingsd:x11/xsettingsd \
 		xterm:x11/xterm
 
 USES=		desktop-file-utils gettext magick pkgconfig:build pyqt:5 \
 		python shebangfix xorg
 USE_PYQT=	pyqt5
 USE_XORG=	x11 xext xpm
 
 SHEBANG_FILES=	doc/examples/fvwm3-per-monitor/nitrowrapper
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-python-shebang="${PYTHON_CMD}"
 
 DOCSDIR=	${PREFIX}/share/doc/nscde
 SUB_FILES=	pkg-message
 SUB_LIST=	EXAMPLESDIR=${EXAMPLESDIR} \
 		PREFIX=${PREFIX}
 
 WRKSRC=		${WRKDIR}/NsCDE-${DISTVERSION}
 
 OPTIONS_DEFINE=			DOCS EXAMPLES
 OPTIONS_DEFAULT=		DOCS EXAMPLES KSH2020 SUDO
 OPTIONS_SINGLE=			IMGMAG KSHOPT ROOTAUTH
 OPTIONS_SINGLE_KSHOPT=		ASTKSH KSH2020
 OPTIONS_SINGLE_ROOTAUTH=	DOAS SUDO
 ASTKSH_DESC=			AT&T KSH93
 DOAS_DESC=			Use doas to elevate privileges
 KSH2020_DESC=			Updated AT&T KSH93 (arm64 compatible)
 KSHOPT_DESC=			KSH version
 ROOTAUTH_DESC=			Root authorization
 SUDO_DESC=			Use sudo to elevate privileges
 
 ASTKSH_RUN_DEPENDS=	ksh93:shells/ast-ksh93
 DOAS_RUN_DEPENDS=	doas:security/doas
 KSH2020_RUN_DEPENDS=	ksh93:shells/ksh
 SUDO_RUN_DEPENDS=	sudo:security/sudo
 
 _SUDOFILES=	data/fvwm/Functions.fvwmconf.in lib/scripts/SysActionDialog
 
 .include <bsd.port.pre.mk>
 
 UNAME_M_CMD=	${UNAME} -m
 PLIST_SUB+=	ARCH="$$(${UNAME_M_CMD})"
 
 post-patch-DOAS-on:
 	( for SUDOF in ${_SUDOFILES}; do ${REINPLACE_CMD} -e "s@sudo \\-n@doas@g" ${WRKSRC}/$${SUDOF}; done )
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/share/examples/${PORTNAME}
 	${MV} ${STAGEDIR}/${PREFIX}/share/doc/nscde/examples/* ${STAGEDIR}/${PREFIX}/share/examples/${PORTNAME}/
 
 post-install-EXAMPLES-off:
 	${RM} -fr ${STAGEDIR}/${PREFIX}/share/doc/nscde/examples/*
 
 .include <bsd.port.post.mk>
diff --git a/x11/libei/Makefile b/x11/libei/Makefile
index 95d27494bddd..b731c0b61ae7 100644
--- a/x11/libei/Makefile
+++ b/x11/libei/Makefile
@@ -1,59 +1,59 @@
 PORTNAME=	libei
 DISTVERSION=	1.2.1
 CATEGORIES=	x11
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Library for Emulated Input
 WWW=		https://gitlab.freedesktop.org/libinput/libei
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		${PYTHON_PKGNAMEPREFIX}attrs>0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR}
 LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 		libevdev.so:devel/libevdev
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}structlog>0:devel/py-structlog@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		compiler:c11 localbase meson pkgconfig python:build
 USE_GITHUB=	nodefault
 USE_GITLAB=	yes
 USE_LDCONFIG=	yes
 GH_TUPLE=	nemequ:munit:v0.2.0-38-gfbbdf14:munit/subprojects/munit
 GL_SITE=	https://gitlab.freedesktop.org
 GL_ACCOUNT=	libinput
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 MESON_ARGS=	-Dsd-bus-provider=basu -Dtests=disabled
 
 OPTIONS_DEFINE=	BASU
 OPTIONS_DEFAULT=BASU
 OPTIONS_SUB=	yes
 
 BASU_DESC=		XDG RemoteDesktop portal via basu
 BASU_LIB_DEPENDS=	libbasu.so:devel/basu
 BASU_MESON_ENABLED=	liboeffis
 
 .ifdef GH_TUPLE
 post-configure:
 	@${REINPLACE_CMD} 's/meson install/& \
 		--skip-subprojects/' ${BUILD_WRKSRC}/build.ninja
 .endif
 
 pre-test:
 	@if [ ! -e ${WRKDIR}/.meson_build_tests ]; then \
 		${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \
 		${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure -Dtests=enabled"; \
 		${TOUCH} ${WRKDIR}/.meson_build_tests; \
 	fi
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 31100
 TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}StrEnum>0:devel/py-strenum@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>