Merge remote-tracking branch 'origin/pristine'

* origin/pristine: (2419 commits) devel/arduino-irremote: Update to 4.4.3 graphics/rigsofrods-pagedgeometry: Rename to graphics/pagedgeometry, switch upstream with fix build with ogre3d 1.14 devel/py-buildbot: Update version 3.11.9=>4.3.0 devel/py-buildbot-worker: Update version 3.11.9=>4.3.0 devel/py-buildbot-www: Update version 3.11.9=>4.3.0 devel/py-buildbot-wsgi-dashboards: New port devel/py-buildbot-waterfall-view: Update version 3.11.9=>4.3.0 devel/py-buildbot-react-console-view: Update version 3.11.9=>4.0.4 devel/py-buildbot-grid-view: Update version 3.11.9=>4.3.0 devel/py-buildbot-console-view: Update version 3.11.9=>4.3.0 devel/py-buildbot-badges: Update version 3.11.9=>4.3.0 devel/gitea-act_runner: Update version 0.2.11=>0.2.12 multimedia/photofilmstrip: Return to pool net/liblinphone: Update version 5.4.4=>5.4.25 net/mediastreamer: Update version 5.4.2=>5.4.24 security/lime: Update version 5.4.2=>5.4.24 security/bzrtp: Update version 5.4.2=>5.4.24 net/belle-sip: Update version 5.4.2=>5.4.24 deskutils/belcard: Update version 5.4.2=>5.4.24 net/ortp: Update version 5.4.2=>5.4.24 ...
2025-06-30 22:24:42 +02:00 · 2025-06-30 22:24:42 +02:00 · 13b47da7c8
commit 13b47da7c8
parent 848b41665b fa7072a013
4507 changed files with 147896 additions and 129296 deletions
--- a/.portsignore
+++ b/.portsignore
@ -1424,6 +1424,7 @@ databases/libgda5-ldap
 databases/libgda5-mysql
 databases/libgda5-postgresql
 databases/libgda5-ui
+databases/libgda6
 databases/linux-c7-sqlite3
 databases/linux-c7-unixODBC
 databases/linux-oracle-instantclient-basic
@ -1498,6 +1499,9 @@ databases/rubygem-postgres_ext
 databases/rubygem-redis-actionpack-rails-gitlab
 databases/rubygem-redis-actionpack-rails5
 databases/rubygem-redis-actionpack-rails50
+databases/rubygem-seed-fu-gitlab
+databases/rubygem-state_machines-activemodel-gitlab
+databases/rubygem-state_machines-activerecord-gitlab
 databases/sequeler
 databases/spatialite_gui
 databases/spatialite-tools
@ -1575,6 +1579,7 @@ deskutils/gnome-shell-extension-dashtodock
 deskutils/gnome-shell-extension-filesmenu
 deskutils/gnome-shell-extension-hidetopbar
 deskutils/gnome-shell-extension-lockkeys
+deskutils/gnome-shell-extension-manager
 deskutils/gnome-shell-extension-mediaplayer
 deskutils/gnome-shell-extension-openweather
 deskutils/gnome-shell-extension-panel-osd
@ -2050,6 +2055,7 @@ devel/libmatheval
 devel/libnest2d-ultimaker
 devel/libopencm3
 devel/libpeas
+devel/libpeas1
 devel/libqt6xdg
 devel/libqtxdg
 devel/libr3
@ -2275,6 +2281,7 @@ devel/py-in-n-out
 devel/py-jaxtyping
 devel/py-jsbeautifier
 devel/py-libpeas
+devel/py-libpeas1
 devel/py-llvmlite
 devel/py-memory-allocator
 devel/py-merossiot
@ -2321,6 +2328,7 @@ devel/py-xarray-simlab
 devel/py-xstatic-svg-edit-moin
 devel/py-zarr
 devel/py-zfp
+devel/pycharm
 devel/pycharm-ce
 devel/pycharm-pro
 devel/pyotherside-qt5
@ -2436,6 +2444,7 @@ devel/rubygem-coffee-rails41
 devel/rubygem-cucumber-messages25
 devel/rubygem-cucumber-rails
 devel/rubygem-cyoi
+devel/rubygem-danger-gitlab
 devel/rubygem-devise
 devel/rubygem-devise-rails-gitlab
 devel/rubygem-devise-rails52
@ -2454,13 +2463,20 @@ devel/rubygem-gettext_i18n_rails_js-rails50
 devel/rubygem-gettext_i18n_rails_js-rails52
 devel/rubygem-gettext_i18n_rails_js-rails61
 devel/rubygem-gettext_i18n_rails_js-rails70
+devel/rubygem-gitlab
 devel/rubygem-gitlab-dangerfiles
 devel/rubygem-gitlab-labkit
+devel/rubygem-grape_logging-gitlab
+devel/rubygem-grape-path-helpers
+devel/rubygem-grape-swagger
+devel/rubygem-grape-swagger-entity
+devel/rubygem-grape20
 devel/rubygem-health_check-rails-gitlab
 devel/rubygem-jbuilder
 devel/rubygem-jbuilder-rails5
 devel/rubygem-jbuilder-rails50
 devel/rubygem-jbuilder-rails52
+devel/rubygem-jira-ruby-gitlab
 devel/rubygem-local_time-rails5
 devel/rubygem-mini_portile2-25
 devel/rubygem-mmap2
@ -2568,6 +2584,7 @@ dns/noip
 dns/pear-Horde_Idna
 dns/py-dnspython1
 dns/qmdnsengine
+dns/rubygem-validates_hostname-gitlab
 editors/2bsd-vi
 editors/abiword
 editors/abiword-docs
@ -2605,6 +2622,7 @@ editors/ecrire
 editors/elementary-code
 editors/emacs-devel
 editors/encryptpad
+editors/enter-tex
 editors/featherpad
 editors/fileobj
 editors/flim
@ -3046,12 +3064,14 @@ filesystems/darling-dmg
 filesystems/dsbmc
 filesystems/gvfs
 filesystems/kio-fuse
+filesystems/libgedit-gfls
 filesystems/linux-c7-dosfstools
 filesystems/openzfs
 filesystems/pear-Horde_Vfs
 filesystems/py-kerchunk
 filesystems/securefs
 filesystems/smbnetfs
+filesystems/vzvol
 finance/alkimia
 finance/electrs
 finance/electrum
@ -4350,6 +4370,7 @@ graphics/clutter-gtk3
 graphics/cluttermm
 graphics/colmap
 graphics/colord-gtk
+graphics/colord-kde
 graphics/compupic
 graphics/converseen
 graphics/curtail
@ -4647,6 +4668,7 @@ graphics/p5-Imager-QRCode
 graphics/p5-OpenGL
 graphics/p5-SWF-Builder
 graphics/p5-Tk-JPEG-Lite
+graphics/pagedgeometry
 graphics/panoglview
 graphics/partio
 graphics/pcl-pointclouds
@ -5163,6 +5185,7 @@ japanese/qkc
 japanese/qolibri
 japanese/quit
 japanese/R-cran-zipangu
+japanese/radish-play
 japanese/roget-fpw
 japanese/rogue_s
 japanese/ruby-romkan
@ -5210,6 +5233,7 @@ japanese/timidity++-slang
 japanese/today
 japanese/tomoe
 japanese/uim-anthy
+japanese/uim-anthy-unicode
 japanese/uim-mozc
 japanese/uim-tomoe-gtk
 japanese/vera-fpw
@ -6177,6 +6201,7 @@ math/py-ecos
 math/py-fenics-basix
 math/py-flax
 math/py-formulaic
+math/py-formulaic-contrasts
 math/py-GridDataFormats
 math/py-hdbscan
 math/py-hepstats
@ -6772,6 +6797,7 @@ multimedia/rubygem-av
 multimedia/rubygem-clutter-gstreamer
 multimedia/shotcut
 multimedia/shotcut-qt6
+multimedia/showtime
 multimedia/simplescreenrecorder
 multimedia/smplayer
 multimedia/smplayer-skins
@ -7261,6 +7287,7 @@ net/rssguard
 net/rubygem-activestorage-gitlab
 net/rubygem-activestorage52
 net/rubygem-apollo_upload_server
+net/rubygem-app_store_connect
 net/rubygem-asset_sync
 net/rubygem-fog-google-gitlab
 net/rubygem-fog-vmfusion
@ -7269,6 +7296,7 @@ net/rubygem-lita-gems
 net/rubygem-omniauth_openid_connect
 net/rubygem-omniauth-kerberos
 net/rubygem-omniauth-ultraauth
+net/rubygem-openid_connect
 net/rubygem-rabbiter
 net/rude
 net/sacc
@ -8200,6 +8228,7 @@ security/py-angr
 security/py-flask-saml
 security/py-passhole
 security/py-pwntools
+security/qgpgme
 security/qt-sudo
 security/qtkeychain
 security/rpm-sequoia
@ -8213,6 +8242,7 @@ security/rubygem-doorkeeper-rails5
 security/rubygem-doorkeeper-rails50
 security/rubygem-gitlab-cloud-connector
 security/rubygem-net-ssh5
+security/rubygem-rack-oauth2-gitlab
 security/seahorse
 security/secpanel
 security/sectok
@ -8635,6 +8665,7 @@ textproc/ruby-rttool
 textproc/rubygem-actionpack-xml_parser-rails5
 textproc/rubygem-actionpack-xml_parser-rails52
 textproc/rubygem-actiontext-gitlab
+textproc/rubygem-html-pipeline-gitlab
 textproc/rubygem-html-proofer
 textproc/rubygem-jekyll-assets
 textproc/rubygem-jekyll-gist
@ -8774,6 +8805,7 @@ www/grr
 www/gtkhtml4
 www/iridium
 www/janus
+www/jmeter
 www/kdsoap
 www/kdsoap-ws-discovery-client
 www/kf5-khtml
@ -8944,6 +8976,7 @@ www/rubygem-chosen-rails
 www/rubygem-chromedriver-helper
 www/rubygem-cssbundling-rails-rails-gitlab
 www/rubygem-d3_rails
+www/rubygem-deckar01-task_list-gitlab
 www/rubygem-dropzonejs-rails
 www/rubygem-gitlab-turbolinks-classic
 www/rubygem-goldfinger
@ -8962,6 +8995,7 @@ www/rubygem-jquery-rails-rails50
 www/rubygem-jquery-scrollto-rails
 www/rubygem-jquery-turbolinks
 www/rubygem-jquery-ui-rails-rails4
+www/rubygem-json-jwt-gitlab
 www/rubygem-kaminari
 www/rubygem-kaminari-actionview
 www/rubygem-kaminari-actionview-rails-gitlab
@ -9901,6 +9935,7 @@ x11-toolkits/rubygem-vte3
 x11-toolkits/rubygem-vte4
 x11-toolkits/scenefx02
 x11-toolkits/scenefx03
+x11-toolkits/scenefx04
 x11-toolkits/scintilla
 x11-toolkits/sdl2_pango
 x11-toolkits/shared-desktop-ontologies
--- a/9
+++ b/9
@ -10,6 +10,15 @@ in the release notes and/or placed into UPDATING.

 All ports committers are allowed to commit to this file.

+20250619:
+AUTHOR: python@FreeBSD.org
+
+  PYTHON_EXT_SUFFIX has been renamed to PYTHON_TAG due to semantic
+  ambiguity between existing ports usage and PEP 3147 and PEP 3149's
+  specifications. Especially with Python 3.13's free-threaded mode,
+  the tags between bytecode and compiled extension modules do not
+  necessarily match. See python.mk for details.
+
 20250307:
 AUTHOR: python@FreeBSD.org

--- a/14
+++ b/14
@ -311,8 +311,8 @@ velbustcpd:*:367:
 sshesame:*:368:
 neo4j:*:369:
 _wsdd:*:370:
-# free: 371
-# free: 372
+reposilite:*:371:
+beam:*:372:
 # free: 373
 # free: 374
 # free: 375
@ -337,7 +337,7 @@ ldap:*:389:
 # free: 394
 # free: 395
 # free: 396
-# free: 397
+rtorrent:*:397:
 tiarra:*:398:
 # free: 399
 # free: 400
@ -731,7 +731,7 @@ stirlingpdf:*:785:
 # free: 787
 # free: 788
 # free: 789
-# free: 790
+healthchecks:*:790:
 # free: 791
 # free: 792
 # free: 793
@ -775,9 +775,9 @@ cirrus:*:828:
 # free: 831
 beehive:*:832:
 # free: 833
-# free: 834
+pocket-id:*:834:
 filebrowser:*:835:
-# free: 836
+tinyauth:*:836:
 # free: 837
 # free: 838
 # free: 839
@ -799,7 +799,7 @@ ebusd:*:854:
 opensearch:*:855:
 # free: 856
 # free: 857
-# free: 858
+umurmur:*:858:
 kanidm:*:859:
 plocate:*:860:
 rekor:*:861:
--- a/113
+++ b/113
@ -4472,8 +4472,6 @@ sysutils/py-upt-cpan||2025-06-02|Has expired: Depends on expired sysutils/py-upt
 sysutils/py-upt-freebsd||2025-06-02|Has expired: Depends on expired sysutils/py-upt
 sysutils/py-upt-rubygems||2025-06-02|Has expired: Depends on expired sysutils/py-upt
 sysutils/py-upt-pypi||2025-06-02|Has expired: Depends on expired sysutils/py-upt
-devel/py-pytest-cases||2025-06-02|Has expired: Depends on expired devel/py-makefun
-devel/py-decopatch||2025-06-02|Has expired: Depends on expired devel/py-makefun
 graphics/rubygem-ezprint||2025-06-02|Has expired: Depends on expired graphics/rubygem-pdfkit
 databases/datasette||2025-06-02|Has expired: Depends on expired devel/py-pytest-runner
 www/py-pydrive2||2025-06-02|Has expired: Depends on expired security/py-oauth2client
@ -4484,7 +4482,6 @@ misc/mxnet||2025-06-02|Has expired: Project has been retired by Apache, see http
 sysutils/py-upt||2025-06-02|Has expired: Depends on expired misc/py-spdx-lookup
 misc/py-spdx-lookup||2025-06-02|Has expired: Upstream repository has been archived on Nov 13, 2020
 misc/py-spdx||2025-06-02|Has expired: Upstream repository has been archived on Nov 13, 2020
-devel/py-makefun||2025-06-02|Has expired: Depends on expired devel/py-pytest-runner
 security/mbedtls2||2025-06-02|Has expired: Upstream support ends at the end of 2024
 graphics/rubygem-pdfkit||2025-06-02|Has expired: Depends on expired converters/wkhtmltopdf
 security/racoon2||2025-06-02|Has expired: Requested removal by PR/286981
@ -4512,3 +4509,113 @@ dns/linux-rl9-libidn2|emulators/linux_base-rl9|2025-06-10|Merged into emulators/
 dns/linux-rl9-libpsl|emulators/linux_base-rl9|2025-06-10|Merged into emulators/linux_base-rl9
 databases/linux-rl9-sqlite3|emulators/linux_base-rl9|2025-06-10|Merged into emulators/linux_base-rl9
 x11-fonts/gentium-plus|x11-fonts/gentium|2025-06-10|Renamed to track upstream changes
+net/rabbiteer|net/amqpcat|2025-06-10|No longer maintained, use net/amqpcat instead as a functional replacement
+editors/gnome-latex|editors/enter-tex|2025-06-10|Renamed uspstream
+net/landrop||2025-06-14|Has expired: Unmaintained version and the newer version turned to close source
+lang/frawk||2025-06-15|Abandoned upstream; fails to build; was labeled broken for over a year
+science/R-cran-eco||2025-06-16|Has expired: Unsupported upstream
+devel/bugzilla44||2025-06-16|Has expired: Upstream support ended 20250103
+german/bugzilla44||2025-06-16|Removed, localized version of devel/bugzilla44
+japanese/bugzilla44||2025-06-16|Removed, localized version of devel/bugzilla44
+russian/bugzilla44||2025-06-16|Removed, localized version of devel/bugzilla44
+sysutils/plasma6-drkonqi||2025-06-17|Removed, requires Systemd
+devel/artifactory||2025-06-17|Has expired: Outdated with known vulnerabilities and marked as forbidden in 2023
+devel/m17n-inscript2||2025-06-23|Now included in devel/m17n-db
+devel/py-pytest4-cov||2025-06-23|Has expired: Depends on expiring devel/py-pytest4
+devel/py-spyder-unittest||2025-06-23|Has expired: Depends on expiring devel/spyder
+comms/py-pynitrokey||2025-06-23|Has expired: Depends on expiring comms/py-spsdk
+devel/bit||2025-06-23|Has expired: Upstream ceased development
+biology/py-orange3-single-cell||2025-06-23|Has expired: Depends on expired math/py-fastdtw and expiring misc/orange3
+biology/py-orange3-bioinformatics||2025-06-23|Has expired: Depends on expiring misc/orange3
+textproc/py-orange3-text||2025-06-23|Has expired: Depends on expiring misc/orange3
+misc/py-orange3-datafusion||2025-06-23|Has expired: Depends on expiring misc/orange3
+misc/py-orange3-timeseries||2025-06-23|Has expired: Depends on expiring misc/orange3
+misc/py-orange3-educational||2025-06-23|Has expired: Depends on expiring misc/orange3
+misc/py-orange3-associate||2025-06-23|Has expired: Depends on expiring misc/orange3
+misc/py-orange3-network||2025-06-23|Has expired: Depends on expiring misc/orange3
+www/onionshare||2025-06-23|Has expired: Depends on expired devel/py-atomicwrites
+deskutils/py-todoman||2025-06-23|Has expired: Depends on expired devel/py-atomicwrites
+deskutils/py-khard||2025-06-23|Has expired: Depends on expired devel/py-atomicwrites
+devel/py-pytest4-flakes||2025-06-23|Has expired: Depends on expiring devel/py-pytest4
+devel/py-pytest-pep8||2025-06-23|Has expired: Depends on expiring devel/py-pytest4
+devel/py-pytest4-cache||2025-06-23|Has expired: Depends on expiring devel/py-pytest4
+devel/py-pytest4||2025-06-23|Has expired: Depends on expired devel/py-atomicwrites
+math/py-fastdtw||2025-06-23|Has expired: Depends on expired devel/py-pytest-runner
+devel/spyder||2025-06-23|Has expired: Depends on expired devel/py-atomicwrites
+misc/orange3||2025-06-23|Has expired: Depends on expiring devel/py-orange-canvas-core
+devel/py-orange-widget-base||2025-06-23|Has expired: Depends on expiring devel/py-orange-canvas-core
+devel/py-orange-canvas-core||2025-06-23|Has expired: Depends on expired misc/py-dictdiffer
+misc/py-dictdiffer||2025-06-23|Has expired: Depends on expired devel/py-pytest-runner
+net-im/biboumi||2025-06-23|Has expired: Depends on expired security/botan2
+sysutils/daggy||2025-06-23|Has expired: Depends on expired security/botan2
+java/jdom||2025-06-23|Has expired: Depends on exired java/jaxen
+java/jaxen||2025-06-23|Has expired: Outdated, unsupported upstream and unmaintained in tree for years
+devel/py-atomicwrites||2025-06-23|Has expired: Upstream repository has been archived on Jul 16, 2022. Upstream suggests os.replace and os.rename instead
+devel/py-pytest-runner||2025-06-23|Has expired: pytest-runner depends on deprecated features of setuptools
+x11-toolkits/scenefx03|x11-toolkits/scenefx04|2025-06-24|No consumers in ports
+net/ziina|net/zmate|2025-06-24|Renamed upstream
+security/py-gpgme|security/py-gpg|2025-06-24|Gpgme Python bindings have been split into a separate project
+security/gpgme-cpp|security/gpgmepp|2025-06-24|Gpgme C++ bindings have been split into a separate project
+security/gpgme-qt@qt5|security/qgpgme@qt5|2025-06-24|Gpgme Qt5 bindings have been split into a separate project
+security/gpgme-qt@qt6|security/qgpgme@qt6|2025-06-24|Gpgme Qt6 bindings have been split into a separate project
+textproc/py-libxml2|textproc/libxml2-python|2025-06-28|Use correct Python package name
+audio/carla||2025-06-29|Remove expired port. Depends on expired audio/py-pyliblo
+audio/lmms||2025-06-29|Remove expired port. Depends on expiring audio/carla
+audio/py-pyliblo||2025-06-29|Remove expired port. Upstream is inactive for over 9 years
+japanese/anthy|japanese/anthy-unicode|2025-06-29|Has expired: Use japanese/anthy-unicode instead
+japanese/kasumi|japanese/kasumi-unicode|2025-06-29|Has expired: Use japanese/kasumi-unicode instead
+japanese/uim-anthy|japanese/uim-anthy-unicode|2025-06-29|Has expired: Use japanese/uim-anthy-unicode instead
+japanese/fcitx-anthy@original|japanese/fcitx-anthy|2025-06-29|Has unflavorized: japanese/anthy was removed and only japanese/anthy-unicode is supported
+japanese/fcitx-anthy@unicode|japanese/fcitx-anthy|2025-06-29|Has unflavorized: japanese/anthy was removed and only japanese/anthy-unicode is supported
+japanese/fcitx5-anthy@original|japanese/fcitx5-anthy|2025-06-29|Has unflavorized: japanese/anthy was removed and only japanese/anthy-unicode is supported
+japanese/fcitx5-anthy@unicode|japanese/fcitx5-anthy|2025-06-29|Has unflavorized: japanese/anthy was removed and only japanese/anthy-unicode is supported
+japanese/ibus-anthy@original|japanese/ibus-anthy|2025-06-29|Has unflavorized: japanese/anthy was removed and only japanese/anthy-unicode is supported
+japanese/ibus-anthy@unicode|japanese/ibus-anthy|2025-06-29|Has unflavorized: japanese/anthy was removed and only japanese/anthy-unicode is supported
+net/vtun||2025-06-30|Has expired: Upstream is dead and last release in 2016
+java/mx4j||2025-06-30|Has expired: Abandoned upstream, no activity since 2010
+devel/inilib||2025-06-30|Has expired: Abandonware, last update upstream in 2005
+textproc/py-jtextfsm|textproc/py-textfsm|2025-06-30|Has expired: Upstream inactive for 9+ years and the port is now obsolete. Please use textproc/py-textfsm instead
+net-mgmt/unifi8|net-mgmt/unifi9|2025-06-30|Has expired: No longer supported by upstream
+devel/openwince-include||2025-06-30|Has expired: Abandoned, last release in 2005 and no consumers in tree
+net/zillion||2025-06-30|Has expired: Unmaintained upstream as last release was in 2003
+devel/libPropList||2025-06-30|Has expired: Deprecated and unsupported upstream
+net-mgmt/zabbix5-agent||2025-06-30|Has expired: Upstream EOL reaches on 2025-05-31
+sysutils/x86info||2025-06-30|Has expired: Abandoned upstream, fails to identify anything remotely new according to upstream issue reports
+math/libsharp2||2025-06-30|Has expired: Deprecated upstream in 2021, upstream recommends migrating to ducc0
+devel/glui||2025-06-30|Has expired: Abandoned upstream, outdated, last release in 2015 and upstream activity in 2019
+databases/gnats4||2025-06-30|Has expired: Abandoned upstream, last release in 2015 and last activity about 9 years ago
+databases/gnatsweb4||2025-06-30|Has expired: Abandoned upstream, last release in 2015 and no active development in the last 10 years
+security/libcryptui||2025-06-30|Has expired: abandoned project
+devel/ksql||2025-06-30|Has expired: Last activity upstream 7 years ago, unmaintained in tree for several years and no consumers
+emulators/qemu8|emulators/qemu|2025-06-30|Has expired: No value in maintaining older QEMU versions on FreeBSD
+devel/electron33||2025-06-30|Has expired: EOLed upstream, switch to newer version
+devel/exercisix||2025-06-30|Has expired: Abandonware, upstream is gone and last release 10+ years ago
+devel/dfuife-curses||2025-06-30|Has expired: Depends on deprecated port devel/libaura
+devel/gpm||2025-06-30|Has expired: Unmaintained upstream and no longer works as intended
+devel/libdfui||2025-06-30|Has expired: Depends on deprecated port devel/libaura
+devel/firmware-utils||2025-06-30|Has expired: Outdated and unsupported upstream
+net/sobby||2025-06-30|Has expired: Abandoned upstream, repo archived Nov 26, 2020
+devel/gvp||2025-06-30|Has expired: Unmaintained upstream and no longer works as intended
+net-mgmt/zabbix5-proxy||2025-06-30|Has expired: Upstream EOL reaches on 2025-05-31
+devel/obby||2025-06-30|Has expired: Abandoned upstream, repo archived Nov 26, 2020
+filesystems/vzvol||2025-06-30|Has expired: Abandoned upstream, no activity in 5+ years and multiple unresolved issue reports upstream
+devel/ireport||2025-06-30|Has expired: Outdated, unsupported upstream and unmaintained for years in tree
+www/ffsend||2025-06-30|Has expired: fails to build with rust 1.87.0
+devel/cgilib||2025-06-30|Has expired: Last upstream release in 2009, last upstream activity in 2017 and no consumers in tree
+security/sectok||2025-06-30|Has expired: Last upstream release in 2003 and no longer maintained
+security/libsectok||2025-06-30|Has expired: Last upstream release in 2003 and no longer maintained
+devel/libdnsres||2025-06-30|Has expired: No consumers in tree, last release in 2005 by upstream
+devel/libaura||2025-06-30|Has expired: Abandonware, upstream is gone and last release in 2005
+net-mgmt/zabbix5-java||2025-06-30|Has expired: Upstream EOL reaches on 2025-05-31
+devel/libcli||2025-06-30|Has expired: Outdated and unmaintained in tree for years
+lang/spl||2025-06-30|Has expired: dead upstream
+devel/glrparser||2025-06-30|Has expired: Unfetchable, unmaintained and upstream is gone
+devel/kyra||2025-06-30|Has expired: Abandonware, last release in 2006 and depdends on deprecated libraries
+devel/libmimedir||2025-06-30|Has expired: Last release in 2008, no consumers in tree and unmaintained for years
+devel/py-openapi-codec|devel/py-openapi-core|2025-06-30|Has expired: Upstream archived the repository. Please use devel/py-openapi-core instead
+devel/linenoise-ng||2025-06-30|Has expired: Upstream repo archived Oct 28, 2020
+devel/libflatarray||2025-06-30|Has expired: Last activity from upstream 5 years ago and last release in 2016
+devel/bogofilter-bdb||2025-06-30|Has expired: The Berkeley DB interface is obsolete. Read UPDATING and use one of the other devel/bogofilter* ports instead
+misc/e2fsprogs-libuuid||2025-06-30|Use misc/libuuid (from util-linux) instead
+filesystems/e2fsprogs-libblkid||2025-06-30|Use filesystems/libblkid (from util-linux) instead
+graphics/rigsofrods-pagedgeometry|graphics/pagedgeometry|2025-06-30|Switch to the upstream version
--- a/Mk/Scripts/qa.sh
+++ b/Mk/Scripts/qa.sh
@ -631,9 +631,9 @@ proxydeps() {
 		sed -e 's/^\.//')
 	EOT

-	# Check whether all files in LIB_DPEENDS are actually linked against
+	# Check whether all files in LIB_DEPENDS are actually linked against
 	for _library in ${WANTED_LIBRARIES} ; do
-		if ! listcontains ${_library} "${dep_lib_files}" ; then
+		if ! listcontains ${_library%%.so*}.so "${dep_lib_files}" ; then
 			warn "you might not need LIB_DEPENDS on ${_library}"
 		fi
 	done
--- a/Mk/Uses/fortran.mk
+++ b/Mk/Uses/fortran.mk
@ -30,6 +30,10 @@ FCFLAGS+=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER}
 LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \
 		-L${LOCALBASE}/lib/gcc${_GCC_VER}
 CFLAGS_F2018=	-I${LOCALBASE}/include/gcc${_GCC_VER}
+# Only needed on riscv64? See PR 287211
+.    if ${ARCH} == "riscv64"
+FCFLAGS+=  -B${LOCALBASE}/lib/gcc${_GCC_VER}
+.    endif
 .  else
 IGNORE=		USES=fortran: invalid arguments: ${fortran_ARGS}
 .  endif
--- a/Mk/Uses/gnome.mk
+++ b/Mk/Uses/gnome.mk
@ -76,16 +76,16 @@ _USE_GNOME_ALL+= cairo \
 _USE_GNOME_ALL+=dconf evolutiondataserver3 gnomecontrolcenter3 gnomedesktop3 \
 		gnomemenus3 gsound gtk30 gtkhtml4 gtksourceview3 \
 		gtksourceview4 libgda5 \
-		libgda5-ui libgnomekbd libwnck3 \
+		libgda5-ui libgda6 libgnomekbd libwnck3 \
 		pygobject3 vte3

 # GNOME 40 components
-_USE_GNOME_ALL+=gtk40 libadwaita gtksourceview5 gnomedesktop4
+_USE_GNOME_ALL+=gtk40 libadwaita gtksourceview5 gnomedesktop4 nautilus4

 # C++ bindings
-_USE_GNOME_ALL+=cairomm gconfmm26 glibmm glibmm26 gtkmm24 \
-		gtkmm30 gtksourceviewmm3 libgdamm5 libxml++26 libsigc++20 \
-		libsigc++30 pangomm
+_USE_GNOME_ALL+=cairomm cairomm11 gconfmm26 glibmm glibmm26 gtkmm24 \
+		gtkmm30 gtkmm40 gtksourceviewmm3 libgdamm5 libxml++26 libsigc++20 \
+		libsigc++30 pangomm pangomm24

 # glib-mkenums often fails with C locale
 # https://gitlab.gnome.org/GNOME/glib/issues/1430
@ -110,6 +110,9 @@ cairo_LIB_DEPENDS=	libcairo.so:graphics/cairo
 cairomm_LIB_DEPENDS=	libcairomm-1.0.so:graphics/cairomm
 cairomm_USE_GNOME_IMPL=	cairo libsigc++20

+cairomm11_LIB_DEPENDS=	libcairomm-1.16.so:graphics/cairomm11
+cairomm11_USE_GNOME_IMPL=	cairo libsigc++30
+
 gconfmm26_LIB_DEPENDS=		libgconfmm-2.6.so:devel/gconfmm26
 gconfmm26_USE_GNOME_IMPL=	glibmm gconf2

@ -130,6 +133,9 @@ gtkmm24_USE_GNOME_IMPL=	glibmm cairomm pangomm gtk20
 gtkmm30_LIB_DEPENDS=	libgtkmm-3.0.so:x11-toolkits/gtkmm30
 gtkmm30_USE_GNOME_IMPL=	cairomm gdkpixbuf glibmm gtk30 pangomm

+gtkmm40_LIB_DEPENDS=	libgtkmm-4.0.so:x11-toolkits/gtkmm40
+gtkmm40_USE_GNOME_IMPL=	cairomm11 gdkpixbuf glibmm26 gtk40 pangomm24
+
 gtksourceviewmm3_LIB_DEPENDS=		libgtksourceviewmm-3.0.so:x11-toolkits/gtksourceviewmm3
 gtksourceviewmm3_USE_GNOME_IMPL=	gtkmm30 gtksourceview3

@ -143,6 +149,9 @@ libsigc++30_LIB_DEPENDS=	libsigc-3.0.so:devel/libsigc++30
 pangomm_LIB_DEPENDS=	libpangomm-1.4.so:x11-toolkits/pangomm
 pangomm_USE_GNOME_IMPL=	pango glibmm cairomm

+pangomm24_LIB_DEPENDS=	libpangomm-2.48.so:x11-toolkits/pangomm24
+pangomm24_USE_GNOME_IMPL=	pango glibmm26 cairomm11
+
 gnomemimedata_BUILD_DEPENDS=${LOCALBASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:misc/gnome-mime-data
 gnomemimedata_RUN_DEPENDS=${LOCALBASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:misc/gnome-mime-data

@ -248,6 +257,9 @@ librsvg2_RUN_DEPENDS=	librsvg2>=0:graphics/librsvg2
 .  endif
 librsvg2_USE_GNOME_IMPL=cairo gdkpixbuf

+nautilus4_LIB_DEPENDS=	libnautilus-extension.so:x11-fm/nautilus
+nautilus4_USE_GNOME_IMPL=glib20
+
 gnomecontrolcenter3_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-keybindings.pc:sysutils/gnome-control-center
 gnomecontrolcenter3_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-keybindings.pc:sysutils/gnome-control-center
 gnomecontrolcenter3_USE_GNOME_IMPL=	gnomedesktop4
@ -258,6 +270,9 @@ libgda5_USE_GNOME_IMPL=	glib20 libxslt
 libgda5-ui_LIB_DEPENDS=	libgda-ui-5.0.so:databases/libgda5-ui
 libgda5-ui_USE_GNOME_IMPL=glib20 libxslt libgda5

+libgda6_LIB_DEPENDS=	libgda-6.0.so:databases/libgda6
+libgda6_USE_GNOME_IMPL=	glib20 libxml2
+
 gtksourceview2_LIB_DEPENDS=	libgtksourceview-2.0.so:x11-toolkits/gtksourceview2
 gtksourceview2_USE_GNOME_IMPL=gtk20 libxml2

--- a/Mk/Uses/gstreamer.mk
+++ b/Mk/Uses/gstreamer.mk
@ -48,7 +48,7 @@ _GST_VER=	${_GST_VER_DEFAULT}
 # - multimedia/gstreamer1-rtsp-server
 # - multimedia/gstreamer1-vaapi
 # - multimedia/py-gstreamer1
-_GST1_VERSION=		1.26.1
+_GST1_VERSION=		1.26.2
 _GST1_LIB_VER=		1.0
 _GST1_SOVERSION=	0.${_GST1_VERSION:R:E}${${_GST1_VERSION:E} > 9:?:0}${_GST1_VERSION:E}.0

@ -355,7 +355,7 @@ gst-rtsp-server_IMPL=	#

 gst-rust_PORT=		multimedia/gstreamer${_GST_VER}-plugins-rust
 gst-rust_IMPL=		#
-gst-rust_GST1_VERSION=	0.13.5
+gst-rust_GST1_VERSION=	0.13.6
 gst-rust_VERSION=	${gst-rust_GST${_GST_VER}_VERSION}

 gst-smoothstreaming_PORT=	multimedia/gstreamer${_GST_VER}-plugins-smoothstreaming
--- a/Mk/Uses/mysql.mk
+++ b/Mk/Uses/mysql.mk
@ -62,7 +62,7 @@ DEFAULT_MYSQL_VER?=	${MYSQL_DEFAULT:S/.//}
 MYSQL80_LIBVER=		21
 MYSQL84_LIBVER=		24

-.  for v in 105 106 1011 114
+.  for v in 105 106 1011 114 118
 MYSQL${v}m_LIBVER=	3
 .  endfor

--- a/Mk/Uses/perl5.mk
+++ b/Mk/Uses/perl5.mk
@ -46,6 +46,8 @@ USE_PERL5?=	run build
 .include "${PORTSDIR}/lang/perl5.38/version.mk"
 .  elif ${PERL5_DEFAULT} == 5.40
 .include "${PORTSDIR}/lang/perl5.40/version.mk"
+.  elif ${PERL5_DEFAULT} == 5.42
+.include "${PORTSDIR}/lang/perl5.42/version.mk"
 .  else
 IGNORE=	Invalid perl5 version ${PERL5_DEFAULT}
 .  endif
@ -74,7 +76,9 @@ PERL_ARCH?=	mach
 # as "ports/lang: not found".
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-.  if   ${PERL_LEVEL} >= 504000
+.  if   ${PERL_LEVEL} >= 504200
+PERL_PORT?=	perl5.42
+.  elif   ${PERL_LEVEL} >= 504000
 PERL_PORT?=	perl5.40
 .  else # ${PERL_LEVEL} < 504000
 PERL_PORT?=	perl5.38
--- a/Mk/Uses/python.mk
+++ b/Mk/Uses/python.mk
@ -235,12 +235,29 @@
 #			  interpreter without dots, e.g. 27, 38, ...
 #			  Used for prefixes and suffixes.
 #
+# PYTHON_BASESUFFIX	- PYTHON_SUFFIX without the threaded ABI flag.
+#
+# PYTHON_TAG		- Defined by PEP 3147, magic tag containing
+#			  implementation name and shorthand version,
+#			  primarily for bytecode files. Includes
+#			  preceding dot, e.g. .cpython-312,
+#			  .cpython-313, ...
+#
+# PYTHON_SOABI		- Defined by PEP 3149, tag containing
+#			  implementation name, shorthand version
+#			  and ABI tags, primarily for compiled
+#			  extension modules. Includes preceding
+#			  dot, e.g. .cpython-313, .cpython-313t,
+#			  .cpython-313td, ...
+#
 # PYTHON_MAJOR_VER	- The major release version of the chosen Python
 #			  interpreter, e.g. 2, 3, ...
 #
 # PYTHON_VER		- The major-minor release version of the chosen Python
 #			  interpreter, e.g. 2.7, 3.9, ...
 #
+# PYTHON_BASEVER	- PYTHON_VER without the threaded ABI flag.
+#
 # PYTHON_ABIVER		- Additional ABI flags set by the chosen Python
 #			  interpreter, e.g. md
 #
@ -284,7 +301,9 @@
 #	PYTHON_PLATFORM=${PYTHON_PLATFORM}
 #	PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR}
 #	PYTHON_SUFFIX=${PYTHON_SUFFIX}
+#	PYTHON_BASESUFFIX=${PYTHON_BASESUFFIX}
 #	PYTHON_VER=${PYTHON_VER}
+#	PYTHON_BASEVER=${PYTHON_BASEVER}
 #	PYTHON_VERSION=${PYTHON_VERSION}
 #
 # where PYTHON_INCLUDEDIR, PYTHON_LIBDIR and PYTHON_SITELIBDIR have their PREFIX
@ -460,9 +479,9 @@ IGNORE=	uses unknown USES=python arguments: ${_PYTHON_ARGS}
 _VC=		C/^([1-9]\.)([0-9])$$/\10\2/

 .undef _PYTHON_VERSION_NONSUPPORTED
-.  if !empty(_PYTHON_VERSION_MINIMUM) && (${_PYTHON_VERSION:${_VC}} < ${_PYTHON_VERSION_MINIMUM:${_VC}})
+.  if !empty(_PYTHON_VERSION_MINIMUM) && (${_PYTHON_VERSION:${_VC}:S/t$//} < ${_PYTHON_VERSION_MINIMUM:${_VC}:S/t$//})
 _PYTHON_VERSION_NONSUPPORTED=	${_PYTHON_VERSION_MINIMUM} at least
-.  elif !empty(_PYTHON_VERSION_MAXIMUM) && (${_PYTHON_VERSION:${_VC}} > ${_PYTHON_VERSION_MAXIMUM:${_VC}})
+.  elif !empty(_PYTHON_VERSION_MAXIMUM) && (${_PYTHON_VERSION:${_VC}:S/t$//} > ${_PYTHON_VERSION_MAXIMUM:${_VC}:S/t$//})
 _PYTHON_VERSION_NONSUPPORTED=	${_PYTHON_VERSION_MAXIMUM} at most
 .  endif

@ -473,9 +492,9 @@ _PYTHON_VERSION_NONSUPPORTED=	${_PYTHON_VERSION_MAXIMUM} at most
 __VER=		${ver}
 .      if !defined(_PYTHON_VERSION) && \
 	!(!empty(_PYTHON_VERSION_MINIMUM) && ( \
-		${__VER:${_VC}} < ${_PYTHON_VERSION_MINIMUM:${_VC}})) && \
+		${__VER:${_VC}:S/t$//} < ${_PYTHON_VERSION_MINIMUM:${_VC}:S/t$//})) && \
 	!(!empty(_PYTHON_VERSION_MAXIMUM) && ( \
-		${__VER:${_VC}} > ${_PYTHON_VERSION_MAXIMUM:${_VC}}))
+		${__VER:${_VC}:S/t$//} > ${_PYTHON_VERSION_MAXIMUM:${_VC}:S/t$//}))
 _PYTHON_VERSION=	${ver}
 .      endif
 .    endfor
@ -490,9 +509,9 @@ IGNORE=		needs an unsupported version of Python
 .    for ver in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${_PYTHON_VERSIONS}
 __VER=		${ver}
 .      if !(!empty(_PYTHON_VERSION_MINIMUM) && ( \
-		${__VER:${_VC}} < ${_PYTHON_VERSION_MINIMUM:${_VC}})) && \
+		${__VER:${_VC}:S/t$//} < ${_PYTHON_VERSION_MINIMUM:${_VC}:S/t$//})) && \
 	!(!empty(_PYTHON_VERSION_MAXIMUM) && ( \
-		${__VER:${_VC}} > ${_PYTHON_VERSION_MAXIMUM:${_VC}}))
+		${__VER:${_VC}:S/t$//} > ${_PYTHON_VERSION_MAXIMUM:${_VC}:S/t$//}))
 .        if empty(_VALID_PYTHON_VERSIONS:M${ver})
 _VALID_PYTHON_VERSIONS+=	${ver}
 .        endif
@ -525,7 +544,7 @@ FLAVOR=	${FLAVORS:[1]}
 .    endif
 .  endif

-.  if ${FLAVOR:Mpy[23][0-9]}${FLAVOR:Mpy[23][1-9][0-9]}
+.  if ${FLAVOR:Mpy[23][0-9]}${FLAVOR:Mpy[23][1-9][0-9]}${FLAVOR:Mpy31[3-9]t}
 _PYTHON_VERSION=	${FLAVOR:S/py//:C/(.)/\1./}
 .  endif

@ -548,7 +567,9 @@ PYTHON_VERSION=	python${_PYTHON_VERSION}

 # Got the correct python version, set some publicly accessible variables
 PYTHON_VER=		${_PYTHON_VERSION}
+PYTHON_BASEVER=		${PYTHON_VER:S/t$//}
 PYTHON_SUFFIX=		${_PYTHON_VERSION:S/.//g}
+PYTHON_BASESUFFIX=	${PYTHON_SUFFIX:S/t$//}
 PYTHON_MAJOR_VER=	${PYTHON_VER:R}
 PYTHON_REL=		# empty
 PYTHON_ABIVER=		# empty
@ -556,12 +577,11 @@ PYTHON_PORTSDIR=	${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX}

 # Protect partial checkouts from Mk/Scripts/functions.sh:export_ports_env().
 .  if !defined(_PORTS_ENV_CHECK) || exists(${PORTSDIR}/${PYTHON_PORTSDIR})
-.include "${PORTSDIR}/${PYTHON_PORTSDIR}/Makefile.version"
+.include "${PORTSDIR}/${PYTHON_PORTSDIR:S/t$//}/Makefile.version"
 .  endif
 # Create a 5 integer version string, prefixing 0 to the minor and patch
 # tokens if it's a single character. Only use the first 3 tokens of
-# PORTVERSION to support pre-release versions (rc3, alpha4, etc) of
-# any Python port (lang/pythonXY)
+# DISTVERSION to stay consistent regardless of pre-release or ABI flags
 PYTHON_REL=	${PYTHON_DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/:C/\.([0-9])$/.0\1/:C/\.([0-9]\.[0-9]+)/.0\1/:S/.//g}

 # Might be overridden by calling ports
@ -573,9 +593,11 @@ PYTHON_ABIVER!=		${PYTHON_CMD}-config --abiflags
 .  endif

 .  if ${PYTHON_REL} >= 30807
-PYTHON_EXT_SUFFIX=	.cpython-${PYTHON_SUFFIX}
+PYTHON_TAG=	.cpython-${PYTHON_BASESUFFIX}
+PYTHON_SOABI=	.cpython-${PYTHON_SUFFIX}
 .  else
-PYTHON_EXT_SUFFIX=	# empty
+PYTHON_TAG=	# empty
+PYTHON_SOABI=	# empty
 .  endif

 .  if ${PYTHON_MAJOR_VER} < 3
@ -649,15 +671,15 @@ TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cython>=0.29.37<3:lang/cython@${PY_FLAVOR}
 .  endif

 .  if defined(_PYTHON_FEATURE_CYTHON3)
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cython3>=3.0.12<3.1:lang/cython3@${PY_FLAVOR}
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cython3>=3.1.2:lang/cython3@${PY_FLAVOR}
 .  endif

 .  if defined(_PYTHON_FEATURE_CYTHON3_RUN)
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cython3>=3.0.12<3.1:lang/cython3@${PY_FLAVOR}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cython3>=3.1.2:lang/cython3@${PY_FLAVOR}
 .  endif

 .  if defined(_PYTHON_FEATURE_CYTHON3_TEST)
-TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cython3>=3.0.12<3.1:lang/cython3@${PY_FLAVOR}
+TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cython3>=3.1.2:lang/cython3@${PY_FLAVOR}
 .  endif

 .  if defined(_PYTHON_FEATURE_CONCURRENT)
@ -809,7 +831,7 @@ add-plist-pymod:
 # When Python version is 3.2+ we rewrite all the filenames
 # of TMPPLIST that end with .py[co], so that they conform
 # to PEP 3147 (see https://www.python.org/dev/peps/pep-3147/)
-PYMAGICTAG=		${PYTHON_CMD} -c 'import sys; print(sys.implementation.cache_tag)'
+_PYMAGICTAG=		${PYTHON_CMD} -c 'import sys; print(sys.implementation.cache_tag)'
 _USES_stage+=	935:add-plist-python
 add-plist-python:
 	@${AWK} '\
@ -818,7 +840,7 @@ add-plist-python:
 		/^@dirrmtry / {d = substr($$0, 11); if (d in dirs) {print $$0 "/" pc}; print $$0; next} \
 		{print} \
 		' \
-		pc="__pycache__" mt="$$(${PYMAGICTAG})" pyo="opt-1.pyc" \
+		pc="__pycache__" mt="$$(${_PYMAGICTAG})" pyo="opt-1.pyc" \
 		${TMPPLIST} > ${TMPPLIST}.pyc_tmp
 	@${MV} ${TMPPLIST}.pyc_tmp ${TMPPLIST}
 .    endif # ${PYTHON_REL} >= 30200 && defined(_PYTHON_FEATURE_PY3KPLIST)
@ -846,7 +868,7 @@ PY_SETUPTOOLS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAV
 # Common Python modules that can be needed but only for some versions of Python.
 .  if ${PYTHON_REL} < 31100
 PY_EXCEPTIONGROUP=	${PYTHON_PKGNAMEPREFIX}exceptiongroup>=1.1.1:devel/py-exceptiongroup@${PY_FLAVOR}
-PY_TOMLI=	${PYTHON_PKGNAMEPREFIX}tomli>=2.0.2<3:textproc/py-tomli@${PY_FLAVOR}
+PY_TOMLI=		${PYTHON_PKGNAMEPREFIX}tomli>=2.2.1<3:textproc/py-tomli@${PY_FLAVOR}
 PY_TYPING_EXTENSIONS=	${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR}
 .  endif

@ -882,8 +904,11 @@ SUB_LIST+=	PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR} \
 		PYTHON_PLATFORM=${PYTHON_PLATFORM} \
 		PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR} \
 		PYTHON_SUFFIX=${PYTHON_SUFFIX} \
-		PYTHON_EXT_SUFFIX=${PYTHON_EXT_SUFFIX} \
+		PYTHON_BASESUFFIX=${PYTHON_BASESUFFIX} \
+		PYTHON_TAG=${PYTHON_TAG} \
+		PYTHON_SOABI=${PYTHON_SOABI} \
 		PYTHON_VER=${PYTHON_VER} \
+		PYTHON_BASEVER=${PYTHON_BASEVER} \
 		PYTHON_VERSION=${PYTHON_VERSION}

 # Substitutions for pkg-plist
@ -894,8 +919,11 @@ PLIST_SUB+=	PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;} \
 		PYTHON_PLATFORM=${PYTHON_PLATFORM} \
 		PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} \
 		PYTHON_SUFFIX=${PYTHON_SUFFIX} \
-		PYTHON_EXT_SUFFIX=${PYTHON_EXT_SUFFIX} \
+		PYTHON_BASESUFFIX=${PYTHON_BASESUFFIX} \
+		PYTHON_TAG=${PYTHON_TAG} \
+		PYTHON_SOABI=${PYTHON_SOABI} \
 		PYTHON_VER=${PYTHON_VER} \
+		PYTHON_BASEVER=${PYTHON_BASEVER} \
 		PYTHON_VERSION=${PYTHON_VERSION}
 .  if ${PYTHON_MAJOR_VER} < 3
 SUB_LIST+=	PYTHON2="" PYTHON3="@comment "
--- a/Mk/Uses/qt-dist.mk
+++ b/Mk/Uses/qt-dist.mk
@ -108,25 +108,25 @@ DIST_SUBDIR=			KDE/Qt/${_QT_VERSION}
 .  if ${_QT_VER:M5}
 # KDE maintains a repository with a patched Qt5 distribution.
 _KDE_3d=		0
-_KDE_base=		130
+_KDE_base=		123
 _KDE_charts=		0
-_KDE_connectivity=	1
+_KDE_connectivity=	2
 _KDE_datavis3d=		0
-_KDE_declarative=	22
+_KDE_declarative=	21
 _KDE_gamepad=		0
 _KDE_graphicaleffects=	0
 _KDE_imageformats=	2
 _KDE_location=		7
 _KDE_multimedia=	2
-_KDE_networkauth=	1
+_KDE_networkauth=	0
 _KDE_quick3d=		1
 _KDE_quickcontrols=	0
 _KDE_quickcontrols2=	5
 _KDE_quicktimeline=	0
 _KDE_remoteobjects=	0
 _KDE_script=		0
-_KDE_script_ORIGIN_TAG=	v5.15.18-lts
-_KDE_script_VERSION=	5.15.18
+_KDE_script_ORIGIN_TAG=	v5.15.19-lts
+_KDE_script_VERSION=	5.15.19
 _KDE_scxml=		0
 _KDE_sensors=		0
 _KDE_serialbus=		0
@ -136,14 +136,14 @@ _KDE_svg=		5
 _KDE_tools=		3
 _KDE_translations=	0
 _KDE_virtualkeyboard=	0
-_KDE_wayland=		59
+_KDE_wayland=		57
 _KDE_webchannel=	3
 # We track the 5.15 branch for www/qt5-webengine to make it easier to
 # stay on top of Chromium security patches.
-_KDE_webengine=			7
+_KDE_webengine=			0
 _KDE_webengine_BRANCH=		5.15
-_KDE_webengine_ORIGIN_TAG=	v5.15.18-lts
-_KDE_webengine_VERSION=		5.15.18
+_KDE_webengine_ORIGIN_TAG=	v5.15.19-lts
+_KDE_webengine_VERSION=		5.15.19
 _KDE_webglplugin=	0
 _KDE_websockets=	2
 _KDE_webview=		0
--- a/Mk/Uses/qt.mk
+++ b/Mk/Uses/qt.mk
@ -22,7 +22,7 @@ _QT_MK_INCLUDED=	qt.mk

 # Qt versions currently supported by the framework.
 _QT_SUPPORTED?=		5 6
-QT5_VERSION?=		5.15.16
+QT5_VERSION?=		5.15.17
 QT6_VERSION?=		6.9.1
 PYSIDE6_VERSION?=	6.9.1

--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@ -109,7 +109,7 @@ NINJA_DEFAULT?=		ninja
 NODEJS_DEFAULT?=	lts
 # Possible value: 25, 26
 OPENLDAP_DEFAULT?=	26
-# Possible values: 5.38, 5.40
+# Possible values: 5.38, 5.40, 5.42
 .  if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \
    defined(PACKAGE_BUILDING))
 # When changing the default here, make sure the DEPRECATED/EXPIRATION lines in
--- a/Tools/scripts/rmport
+++ b/Tools/scripts/rmport
@ -4,7 +4,7 @@
 #
 # Copyright 2006-2007 Vasil Dimov
 # Copyright 2012-2018 Chris Rees
-# Copyright 2016-2024 René Ladan
+# Copyright 2016-2025 René Ladan
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@ -113,7 +113,7 @@ find_expired()
 		for port in $(make -C ${PORTSDIR}/${category} -V SUBDIR); do
 			DATE="$(make -C ${PORTSDIR}/${category}/${port} -V EXPIRATION_DATE)"
 			# shellcheck disable=SC2039
-			if [ -n "${DATE}" ] && [ ! "${DATE}" \> "$${TODAY}" ] ; then
+			if [ -n "${DATE}" ] && [ ! "${DATE}" \> "${TODAY}" ] ; then
 				if [ "$1" = 1 ] ; then
 					echo -n "${DATE} ${category}/${port}: "
 					make -C ${PORTSDIR}/${category}/${port} -V DEPRECATED
@ -145,9 +145,22 @@ check_dep_core()
 	err=0

 	deps=$(grep -E "${pkgname}" ${INDEX} |grep -vE "^(${rmpkgs})" || :)
-	if [ -n "${deps}" ] ; then
+	# Try to avoid false positives from INDEX when a port has just been
+	# removed but INDEX has not yet been updated.
+	# XXX this needs more work, we must look for the dependencies of catport in MOVED
+	in_MOVED=0
+	#MOVED_line="$(grep "${catport}" "${PORTSDIR}/MOVED")"
+	#if [ -z "${MOVED_line}" ] ; then
+	#	in_MOVED=2 # dependent port not found
+	#elif [ "${TODAY}" = "$(echo "${MOVED_line}" | cut -d \| -f 3)" ] ; then
+	#	in_MOVED=1 # dependent port just removed
+	#fi
+	if [ -n "${deps}" ] && [ ${in_MOVED} -eq 0 ] ; then
 		log "${catport}: some port(s) depend on ${pkgname}:"
-		echo "${deps}" >&2
+		# Skip dependencies in on-screen listing to avoid excessively
+		# long lines. Note that WWW should be field 13 according to
+		# Mk/bsd.port.mk:4492
+		echo "${deps}" | cut -d \| -f -7,10 >&2
 		err=1
 	fi

--- a/14
+++ b/14
@ -317,8 +317,8 @@ velbustcpd:*:367:367::0:0:Velbustcp Deamon:/nonexistent:/usr/sbin/nologin
 sshesame:*:368:368::0:0:Sshesame Daemon:/nonexistent:/usr/sbin/nologin
 neo4j:*:369:369::0:0:neo4j Database Daemon:/nonexistent:/usr/sbin/nologin
 _wsdd:*:370:370::0:0:Web Service Discovery Daemon:/nonexistent:/usr/sbin/nologin
-# free: 371
-# free: 372
+reposilite:*:371:371::0:0:Reposilite user:/nonexistent:/usr/sbin/nologin
+beam:*:372:372::0:0:Erlang BEAM VM user:/nonexistent:/usr/sbin/nologin
 # free: 373
 # free: 374
 # free: 375
@ -343,7 +343,7 @@ ldap:*:389:389::0:0:OpenLDAP Server:/nonexistent:/usr/sbin/nologin
 # free: 394
 # free: 395
 # free: 396
-# free: 397
+rtorrent:*:397:397::0:0:rtorrent Daemon User:/nonexistent:/usr/sbin/nologin
 tiarra:*:398:398::0:0:Tiarra IRC Proxy:/nonexistent:/usr/sbin/nologin
 # free: 399
 # free: 400
@ -737,7 +737,7 @@ stirlingpdf:*:785:785::0:0:Stirling PDF Daemon:/usr/local/stirlingpdf:/usr/sbin/
 # free: 787
 # free: 788
 # free: 789
-# free: 790
+healthchecks:*:790:790::0:0:Open-source cron and background task monitoring service:/var/db/healthchecks:/usr/sbin/nologin
 # free: 791
 # free: 792
 # free: 793
@ -781,9 +781,9 @@ cirrus:*:828:828::0:0:Cirrus CI:/usr/local/cirrus:/bin/sh
 # free: 831
 beehive:*:832:832::0:0:beehive user:/nonexistent:/usr/sbin/nologin
 # free: 833
-# free: 834
+pocket-id:*:834:834::0:0:OIDC provider that allows users to authenticate with their passkeys:/var/db/pocket-id:/usr/sbin/nologin
 filebrowser:*:835:835::0:0:Web File Browser:/var/db/filebrowser:/usr/sbin/nologin
-# free: 836
+tinyauth:*:836:836::0:0:Simplest way to protect your apps with a login screen:/nonexistent:/usr/sbin/nologin
 # free: 837
 # free: 838
 # free: 839
@ -805,7 +805,7 @@ ebusd:*:854:854::0:0:eBUS Daemon user:/nonexistent:/usr/sbin/nologin
 opensearch:*:855:855::0:0:opensearch user:/nonexistent:/usr/sbin/nologin
 # free: 856
 # free: 857
-# free: 858
+umurmur:*:858:858::0:0:uMurmur:/nonexistent:/usr/sbin/nologin
 kanidm:*:859:859::0:0:Kanidm user:/nonexistent:/usr/sbin/nologin
 # free: 860
 rekor:*:861:861::0:0:rekor user:/nonexistent:/usr/sbin/nologin
--- a/74
+++ b/74
@ -5,6 +5,80 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.

+20250630:
+  AFFECTS: users of mail/bogofilter-bdb
+  AUTHOR: mandree@FreeBSD.org
+
+  The mail/bogofilter-bdb port has expired and will be removed.
+  
+  1. BEFORE uninstallation or changing to a different mail/bogofilter*
+  variant, please use bogoutil to export all user data bases (wordlist.db)
+  to text files, bogoutil has a -d option for that.
+  2. ONLY THEN install a different variant. The base port (bogofilter)
+  uses LMDB, the -kc variant uses KyotoCabinet and -sqlite uses SQLite3
+  for their database backends.
+  3. THEN re-import the word list for each user with bogoutil -l.
+
+20250629:
+  AFFECTS: users of japanese/anthy
+  AUTHOR: nobutaka@FreeBSD.org
+
+  japanese/anthy has been removed. Please use japanese/anthy-unicode as the
+  replacement.
+
+  japanese/anthy and japanese/anthy-unicode use different user dictionary
+  file location.
+
+  japanese/anthy: ~/.anthy/private_words_default
+  japanese/anthy-unicode: ~/.config/anthy/private_words_default
+
+  You can migrate your user dictionary for japanese/anthy with
+  anthy-dic-tool-unicode.
+
+  anthy-dic-tool-unicode --migrate
+
+  If you use the japanese-anthy or japanese-anthy-uim input method on Emacs,
+  please change them in your Emacs init file such as ~/.emacs.el and ~/.emacs
+  as follows:
+
+  japanese-anthy -> japanese-anthy-unicode
+  japanese-anthy-uim -> japanese-anthy-utf8-uim
+
+20250627:
+  AFFECTS: users of finance/ktoblzcheck
+  AUTHOR: jhale@FreeBSD.org
+
+  The bank data databases have been moved to finance/ktoblzcheck-data.
+  It may be necessary to remove ktoblzcheck < 1.59 before upgrading to
+  avoid conflicts.
+
+  pkg delete -f ktoblzcheck
+
+20250622:
+  AFFECTS: users of net-mgmt/netbox
+  AUTHOR: kai@FreeBSD.org
+
+  1. Please make sure that the PostgreSQL server for the NetBox instance is
+     running version 14 or higher.  This is because Django 5.2 requires
+     PostgreSQL 14 as a minimum.
+
+  2. Please also check the pkg-message and the changelogs for further info.
+
+20250620:
+  AFFECTS: users of x11/swww
+  AUTHOR: nivit@FreeBSD.org
+
+  Starting from version 0.10 the command swww init, previously deprecated, has
+  been properly deleted. The correct way of initializing the daemon is calling
+  swww-daemon directly.
+
+20250613:
+  AFFECTS: users of devel/py-gql, games/DDNet, net/mosquitto
+  AUTHOR: michaelo@FreeBSD.org
+
+  The WEBSOCKETS option has been renamed to WEBSOCKET to match the name from
+  RFC 6455, other ports and the description from Mk/bsd.options.desc.mk.
+
 20250610:
  AFFECTS: users of devel/git
  AUTHOR: michaelo@FreeBSD.org
--- a/accessibility/libspeechprovider/Makefile
+++ b/accessibility/libspeechprovider/Makefile
@ -0,0 +1,23 @@
+PORTNAME=	libspeechprovider
+DISTVERSION=	1.0.3
+CATEGORIES=	accessibility
+
+MAINTAINER=	desktop@FreeBSD.org
+COMMENT=	Utility library for creating Spiel speech providers
+WWW=		https://project-spiel.org/libspeechprovider/
+
+LICENSE=	APACHE20
+
+USES=		gnome gstreamer meson pkgconfig python:build
+USE_GNOME=	glib20 introspection:build
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	project-spiel
+GH_TAGNAME=	07e6a2a
+
+BINARY_ALIAS=	python3=${PYTHON_VERSION}
+
+MESON_ARGS=	-Ddocs=false \
+		-Dtests=false
+
+.include <bsd.port.mk>
--- a/accessibility/libspeechprovider/distinfo
+++ b/accessibility/libspeechprovider/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1744551422
+SHA256 (project-spiel-libspeechprovider-1.0.3-07e6a2a_GH0.tar.gz) = 3f845d0921de76069f44e21cf988fb66f9972ec59f91fa6203ee515d698f0332
+SIZE (project-spiel-libspeechprovider-1.0.3-07e6a2a_GH0.tar.gz) = 159613
--- a/accessibility/libspeechprovider/pkg-descr
+++ b/accessibility/libspeechprovider/pkg-descr
@ -0,0 +1,4 @@
+The speech provider library is designed to provide some utility for
+creating speech providers. Specifically it offers a stream writer that
+can be used to send audio data interleaved with speech progress events
+(word, sentance, ssml mark, etc.).
--- a/accessibility/libspeechprovider/pkg-plist
+++ b/accessibility/libspeechprovider/pkg-plist
@ -0,0 +1,12 @@
+include/speech-provider/speech-provider-common.h
+include/speech-provider/speech-provider-dbus-enums.c
+include/speech-provider/speech-provider-dbus-enums.h
+include/speech-provider/speech-provider-stream-reader.h
+include/speech-provider/speech-provider-stream-writer.h
+include/speech-provider/speech-provider-version.h
+include/speech-provider/speech-provider.h
+lib/girepository-1.0/SpeechProvider-1.0.typelib
+lib/libspeech-provider-1.0.so
+libdata/pkgconfig/speech-provider-1.0.pc
+share/gir-1.0/SpeechProvider-1.0.gir
+share/speech-provider/org.freedesktop.Speech.Provider.xml
--- a/accessibility/libspiel/Makefile
+++ b/accessibility/libspiel/Makefile
@ -0,0 +1,27 @@
+PORTNAME=	libspiel
+DISTVERSION=	1.0.4
+CATEGORIES=	accessibility
+
+MAINTAINER=	desktop@FreeBSD.org
+COMMENT=	Speech synthesis client library
+WWW=		https://project-spiel.org/libspiel/
+
+LICENSE=	LGPL21+
+
+LIB_DEPENDS=	libspeech-provider-1.0.so:accessibility/libspeechprovider
+
+USES=		gnome gstreamer meson pkgconfig python:build
+USE_GNOME=	glib20 introspection:build
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	project-spiel
+GH_TAGNAME=	2ab0230
+
+BINARY_ALIAS=	python3=${PYTHON_VERSION}
+
+MESON_ARGS=	-Dtests=false \
+		-Ddocs=false
+
+GLIB_SCHEMAS=	org.monotonous.libspiel.gschema.xml
+
+.include <bsd.port.mk>
--- a/accessibility/libspiel/distinfo
+++ b/accessibility/libspiel/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1744552306
+SHA256 (project-spiel-libspiel-1.0.4-2ab0230_GH0.tar.gz) = 3517287609079b7dd52ad3483d23ce7458f4c5d27bf0bdd18a8a71fe3c3c689d
+SIZE (project-spiel-libspiel-1.0.4-2ab0230_GH0.tar.gz) = 192037
--- a/accessibility/libspiel/pkg-descr
+++ b/accessibility/libspiel/pkg-descr
@ -0,0 +1,10 @@
+This client library is designed to provide an ergonomic interface to
+the myriad of potential speech providers that are installed in a given
+session.
+The API is inspired by the W3C Web Speech API. It serves several purposes:
+
+- Provide an updated list of installed across all speech providers voices.
+- Offer a "speaker" abstraction where utterances can be queued to speak.
+- If no voice was explicitly chosen for an utterance, negotiate global
+  user settings and language preferences to choose the most appropriate
+  voice.
--- a/accessibility/libspiel/pkg-plist
+++ b/accessibility/libspiel/pkg-plist
@ -0,0 +1,16 @@
+bin/spiel
+include/spiel/spiel-dbus-enums.c
+include/spiel/spiel-dbus-enums.h
+include/spiel/spiel-provider.h
+include/spiel/spiel-speaker.h
+include/spiel/spiel-utterance.h
+include/spiel/spiel-version.h
+include/spiel/spiel-voice.h
+include/spiel/spiel-voices-list-model.h
+include/spiel/spiel.h
+lib/girepository-1.0/Spiel-1.0.typelib
+lib/libspiel-1.0.so
+lib/libspiel-1.0.so.1
+lib/libspiel-1.0.so.1.0.4
+libdata/pkgconfig/spiel-1.0.pc
+share/gir-1.0/Spiel-1.0.gir
--- a/archivers/Makefile
+++ b/archivers/Makefile
@ -192,6 +192,7 @@
    SUBDIR += rubygem-minitar-cli
    SUBDIR += rubygem-minitar0
    SUBDIR += rubygem-rubyzip
+    SUBDIR += rubygem-rubyzip-gitlab
    SUBDIR += rvm
    SUBDIR += rzip
    SUBDIR += sectar
--- a/archivers/c-blosc2/Makefile
+++ b/archivers/c-blosc2/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	c-blosc2
-PORTVERSION=	2.17.1
+PORTVERSION=	2.19.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	archivers

--- a/archivers/c-blosc2/distinfo
+++ b/archivers/c-blosc2/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1744288766
-SHA256 (Blosc-c-blosc2-v2.17.1_GH0.tar.gz) = 53c6ed1167683502f5db69d212106e782180548ca5495745eb580e796b7f7505
-SIZE (Blosc-c-blosc2-v2.17.1_GH0.tar.gz) = 3292519
+TIMESTAMP = 1750954148
+SHA256 (Blosc-c-blosc2-v2.19.0_GH0.tar.gz) = 6aeb448ac490dee2a82fafab97382b62622a32a0e17a2d78d085ae8507f6ddd8
+SIZE (Blosc-c-blosc2-v2.19.0_GH0.tar.gz) = 3300743
--- a/archivers/lhasa/Makefile
+++ b/archivers/lhasa/Makefile
@ -1,8 +1,7 @@
 PORTNAME=	lhasa
 DISTVERSION=	0.4.0
 CATEGORIES=	archivers
-MASTER_SITES=	https://soulsphere.org/projects/lhasa/ \
-		http://suyai.innolan.net/
+MASTER_SITES=	https://github.com/fragglet/${PORTNAME}/releases/download/v${DISTVERSION}/

 MAINTAINER=	cs@innolan.dk
 COMMENT=	Command line tool and library for parsing LHA archives
--- a/archivers/libcabinet/Makefile
+++ b/archivers/libcabinet/Makefile
@ -1,17 +1,22 @@
 PORTNAME=	libcabinet
-PORTVERSION=	0.30
-PORTREVISION=	2
+DISTVERSION=	0.31
 CATEGORIES=	archivers
-MASTER_SITES=	http://www.bsd-geek.de/FreeBSD/distfiles/
+MASTER_SITES=	https://codeberg.org/BSDforge/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/

-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	portmaster@BSDForge.com
 COMMENT=	Portable library and utility to use Microsoft cabinet files (.cab)
+WWW=		https://codeberg.org/BSDforge/libcabinet
+
+LICENSE=	ZLIB
+LICENSE_FILE=	${WRKSRC}/LICENSE

 USES=		uidfix
 USE_LDCONFIG=	yes
 SRCFILE=	${WRKSRC}/listcab.cpp
 PROGFILE=	${SRCFILE:S/.cpp$//}
-MAKE_ENV=	WITHOUT_PROFILE=yes SRCCONF=/dev/null
+MAKE_ENV=	SRCCONF=/dev/null \
+		WITHOUT_PROFILE=yes
+WRKSRC=		${WRKDIR}/${PORTNAME}

 post-build:
 	${CXX} ${CXXFLAGS} -o ${PROGFILE} ${SRCFILE} -L${WRKSRC} -lcabinet -lz
--- a/archivers/libcabinet/distinfo
+++ b/archivers/libcabinet/distinfo
@ -1,2 +1,3 @@
-SHA256 (libcabinet-0.30.tar.gz) = 775acd65262f1db7d78e34c6e1f190f448fcd20e0b851f8cc800fd7dabe7281b
-SIZE (libcabinet-0.30.tar.gz) = 116175
+TIMESTAMP = 1750731954
+SHA256 (libcabinet-0.31.tar.gz) = 0ecf6476268442344361bb6aa3a41eda509ccc229863e40d69d7484b21408308
+SIZE (libcabinet-0.31.tar.gz) = 120564
--- a/archivers/libunrar/Makefile
+++ b/archivers/libunrar/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	libunrar
-PORTVERSION=	7.1.6
+PORTVERSION=	7.1.7
 PORTEPOCH=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.rarlab.com/rar/
--- a/archivers/libunrar/distinfo
+++ b/archivers/libunrar/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1743032454
-SHA256 (unrarsrc-7.1.6.tar.gz) = ca5e1da37dd6fa1b78bb5ed675486413f79e4a917709744aa04b6f93dfd914f0
-SIZE (unrarsrc-7.1.6.tar.gz) = 267638
+TIMESTAMP = 1750150039
+SHA256 (unrarsrc-7.1.7.tar.gz) = e86ae4f1f33a13752146f41e961c57f12f0ee01580ac188ec8cc43da5c22ae92
+SIZE (unrarsrc-7.1.7.tar.gz) = 267949
--- a/archivers/py-blosc2/Makefile
+++ b/archivers/py-blosc2/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	blosc2
-PORTVERSION=	3.3.4
+PORTVERSION=	3.5.0
 CATEGORIES=	archivers python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -12,7 +12,7 @@ WWW=		https://www.blosc.org/python-blosc2/ \
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt

-BUILD_DEPENDS=	c-blosc2>=2.17.1:archivers/c-blosc2 \
+BUILD_DEPENDS=	c-blosc2>=2.17.2:archivers/c-blosc2 \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-build-core>=0:devel/py-scikit-build-core@${PY_FLAVOR}
 LIB_DEPENDS=	libblosc2.so:archivers/c-blosc2
@ -24,7 +24,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR}

 USES=		cmake:indirect pkgconfig python:3.10+
-USE_PYTHON=	autoplist concurrent cython pep517
+USE_PYTHON=	autoplist concurrent cython3 pep517

 MAKE_ENV=	USE_SYSTEM_BLOSC2=1

--- a/archivers/py-blosc2/distinfo
+++ b/archivers/py-blosc2/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1748495749
-SHA256 (blosc2-3.3.4.tar.gz) = ebc8c80852361e1ea4ea5048c8ff09d0b7b5ea3797e29c72caec59d990a4d3f2
-SIZE (blosc2-3.3.4.tar.gz) = 3645196
+TIMESTAMP = 1750954150
+SHA256 (blosc2-3.5.0.tar.gz) = 40d4d87d4cdf9f00997cd5cde21e6a8e99bf3120a153f791f5f5c0c7d2877950
+SIZE (blosc2-3.5.0.tar.gz) = 3651627
--- a/archivers/py-blosc2/files/patch-pyproject.toml
+++ b/archivers/py-blosc2/files/patch-pyproject.toml
@ -1,12 +1,10 @@
--- pyproject.toml.orig	2024-12-12 13:22:18 UTC
+--- pyproject.toml.orig	2022-11-09 12:37:21 UTC
 +++ pyproject.toml
-@@ -1,8 +1,8 @@ requires = [
- [build-system]
+@@ -2,7 +2,7 @@ requires = [
 requires = [
     "scikit-build-core",
-    "cython>=3",
+     "cython>=3",
 -    "numpy>=2.0.0",
-+    "cython",
 +    "numpy",
 ]
 build-backend = "scikit_build_core.build"
--- a/archivers/py-borgbackup/Makefile
+++ b/archivers/py-borgbackup/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	borgbackup
 DISTVERSION=	1.4.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	archivers python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -13,7 +13,7 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE

 # note that borgbackup pins the msgpack version range per patchlevel version!
-_BB_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.3<1.1.1:devel/py-msgpack@${PY_FLAVOR}
+_BB_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.3<1.1.1_99:devel/py-msgpack@${PY_FLAVOR}
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pkgconfig>=0:devel/py-pkgconfig@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=1.7:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${_BB_DEPENDS}
@ -28,7 +28,7 @@ TEST_DEPENDS=	${RUN_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \
 		fakeroot:security/fakeroot

-USES=		pkgconfig python:3.9+ ssl
+USES=		pkgconfig python ssl
 USE_PYTHON=	autoplist distutils
 MAKE_ENV=	BORG_OPENSSL_PREFIX=${OPENSSLBASE}

--- a/archivers/py-borgbackup/files/patch-msgpack
+++ b/archivers/py-borgbackup/files/patch-msgpack
@ -0,0 +1,24 @@
+Obtained from:	https://github.com/borgbackup/borg/commit/862f19aab9780b91424bb7f9319d915751d0024f
+
+--- pyproject.toml.orig	2025-04-18 19:16:24 UTC
+++ pyproject.toml
+@@ -35,7 +35,7 @@ dependencies = [
+     # Please note:
+     # using any other msgpack version is not supported by borg development and
+     # any feedback related to issues caused by this will be ignored.
+-    "msgpack >=1.0.3, <=1.1.0",
+    "msgpack >=1.0.3, <=1.1.1",
+     "packaging",
+ ]
+ 
+--- src/borg/helpers/msgpack.py.orig	2025-04-18 19:16:24 UTC
+++ src/borg/helpers/msgpack.py
+@@ -137,7 +137,7 @@ def is_supported_msgpack():
+ def is_supported_msgpack():
+     # DO NOT CHANGE OR REMOVE! See also requirements and comments in pyproject.toml.
+     import msgpack
+-    return (1, 0, 3) <= msgpack.version <= (1, 1, 0) and \
+    return (1, 0, 3) <= msgpack.version <= (1, 1, 1) and \
+            msgpack.version not in []  # < add bad releases here to deny list
+ 
+ 
--- a/archivers/py-borgbackup12/Makefile
+++ b/archivers/py-borgbackup12/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	borgbackup
 DISTVERSION=	1.2.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	archivers python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -14,7 +14,7 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE

 # note that borgbackup pins the msgpack version range per patchlevel version!
-_BB_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.2<1.1.1:devel/py-msgpack@${PY_FLAVOR}
+_BB_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.2<1.1.1_99:devel/py-msgpack@${PY_FLAVOR}
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools-scm>=1.7:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${_BB_DEPENDS}
 LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
--- a/archivers/py-borgbackup12/files/patch-msgpack
+++ b/archivers/py-borgbackup12/files/patch-msgpack
@ -1,4 +1,5 @@
 Obtained from:	https://github.com/borgbackup/borg/commit/7511cb6c5e0448f0b5276f4281faa4c71c2f64ac
+		https://github.com/borgbackup/borg/commit/56ddc010cbeba09b49969cf08f079ad69dd45dc2

 --- setup.py.orig	2024-03-29 17:42:23 UTC
 +++ setup.py
@ -7,7 +8,7 @@ Obtained from:	https://github.com/borgbackup/borg/commit/7511cb6c5e0448f0b5276f4
     # using any other msgpack version is not supported by borg development and
     # any feedback related to issues caused by this will be ignored.
 -    'msgpack >=0.5.6, <=1.0.8, !=1.0.1',
-+    'msgpack >=0.5.6, <=1.1.0, !=1.0.1',
+    'msgpack >=0.5.6, <=1.1.1, !=1.0.1',
     'packaging',
 ]
 
@ -18,7 +19,7 @@ Obtained from:	https://github.com/borgbackup/borg/commit/7511cb6c5e0448f0b5276f4
     # DO NOT CHANGE OR REMOVE! See also requirements and comments in setup.py.
     import msgpack
 -    return (0, 5, 6) <= msgpack.version <= (1, 0, 8) and \
-+    return (0, 5, 6) <= msgpack.version <= (1, 1, 0) and \
+    return (0, 5, 6) <= msgpack.version <= (1, 1, 1) and \
            msgpack.version not in [(1, 0, 1), ]  # < add bad releases here to deny list
 
 
--- a/archivers/rubygem-rubyzip-gitlab/Makefile
+++ b/archivers/rubygem-rubyzip-gitlab/Makefile
@ -0,0 +1,20 @@
+PORTNAME=	rubyzip
+PORTVERSION=	2.4.1
+CATEGORIES=	archivers rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	-gitlab
+
+MAINTAINER=	mfechner@FreeBSD.org
+COMMENT=	Ruby module for reading and writing zip files
+WWW=		https://github.com/rubyzip/rubyzip
+
+LICENSE=	BSD2CLAUSE RUBY
+LICENSE_COMB=	dual
+
+USES=		cpe gem
+
+NO_ARCH=	yes
+
+CPE_VENDOR=	rubyzip_project
+
+.include <bsd.port.mk>
--- a/archivers/rubygem-rubyzip-gitlab/distinfo
+++ b/archivers/rubygem-rubyzip-gitlab/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1750221497
+SHA256 (rubygem/rubyzip-2.4.1.gem) = 8577c88edc1fde8935eb91064c5cb1aef9ad5494b940cf19c775ee833e075615
+SIZE (rubygem/rubyzip-2.4.1.gem) = 41984
--- a/archivers/rubygem-rubyzip-gitlab/pkg-descr
+++ b/archivers/rubygem-rubyzip-gitlab/pkg-descr
@ -0,0 +1 @@
+Ruby module for reading and writing zip files
--- a/archivers/unarr/Makefile
+++ b/archivers/unarr/Makefile
@ -10,8 +10,6 @@ WWW=		https://github.com/selmf/unarr
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING

-BROKEN_riscv64=		fails to build: Hard-float 'd' ABI can't be used for a target that doesn't support the D instruction set extension
-
 TEST_DEPENDS=	cmocka>0:sysutils/cmocka

 USES=		cmake:testing pathfix
--- a/archivers/urbackup-client/Makefile
+++ b/archivers/urbackup-client/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	urbackup-client
 DISTVERSION=	2.5.25.0
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	https://hndl.urbackup.org/Client/${DISTVERSION:R}/

@ -38,8 +39,12 @@ CXXFLAGS+=	-DCRYPTOPP_DISABLE_ASM
 .endif

 post-patch:
-	@${SED} -i "" -e "s:%%PREFIX%%:${PREFIX}:g" \
+	${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" \
 		${WRKSRC}/urbackupclient/backup_scripts/postgresqldump
+	${FIND} ${WRKSRC} -type f -exec ${REINPLACE_CMD} \
+		-e 's|std::char_traits|std::vector|g' \
+		-e 's|std::basic_string|std::vector|g' \
+		-e 's|auto_ptr|unique_ptr|g' {} +

 post-stage:
 	${INSTALL_DATA} ${WRKDIR}/urbackupclient.conf.sample-daemon \
--- a/archivers/urbackup-server/Makefile
+++ b/archivers/urbackup-server/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	urbackup-server
 DISTVERSION=	2.5.33
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	https://hndl.urbackup.org/Server/${DISTVERSION}/

@ -38,13 +39,17 @@ USERS=		urbackup
 GROUPS=		urbackup

 post-patch:
-	@(cd ${WRKSRC} && ${REINPLACE_CMD} -e 's|/etc/urbackup|${PREFIX}/etc/urbackup|g' \
+	(cd ${WRKSRC} && ${REINPLACE_CMD} -e 's|/etc/urbackup|${PREFIX}/etc/urbackup|g' \
 		mount_helper/main.cpp \
 		urbackupserver/server.cpp \
 		urbackupserver/serverinterface/settings.cpp \
 		urbackupserver/dllmain.cpp \
 		snapshot_helper/main.cpp \
 	)
+	${FIND} ${WRKSRC} -type f -exec ${REINPLACE_CMD} \
+		-e 's|std::char_traits|std::vector|g' \
+		-e 's|std::basic_string|std::vector|g' \
+		-e 's|auto_ptr|unique_ptr|g' {} +

 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/urbackup
--- a/audio/Makefile
+++ b/audio/Makefile
@ -280,6 +280,8 @@
    SUBDIR += penguinsap
    SUBDIR += pianod2
    SUBDIR += picard-plugins
+    SUBDIR += piper
+    SUBDIR += piper-phonemize
    SUBDIR += pipewire-module-xrdp
    SUBDIR += playmidi
    SUBDIR += playumidi
--- a/audio/ezstream/Makefile
+++ b/audio/ezstream/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	ezstream
 PORTVERSION=	0.5.6
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	audio
 MASTER_SITES=	https://downloads.xiph.org/releases/ezstream/ \
 		https://ftp.osuosl.org/pub/xiph/releases/ezstream/
--- a/audio/faust/Makefile
+++ b/audio/faust/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	faust
-DISTVERSION=	2.77.3
+DISTVERSION=	2.79.3
 CATEGORIES=	audio devel

 MAINTAINER=	yuri@FreeBSD.org
--- a/audio/faust/distinfo
+++ b/audio/faust/distinfo
@ -1,6 +1,6 @@
-TIMESTAMP = 1736467606
-SHA256 (grame-cncm-faust-2.77.3_GH0.tar.gz) = 41950a896ce12147fcacab3edf58232e308e9beaf687dce3f9460c16b81c44b3
-SIZE (grame-cncm-faust-2.77.3_GH0.tar.gz) = 70946118
+TIMESTAMP = 1751224492
+SHA256 (grame-cncm-faust-2.79.3_GH0.tar.gz) = 00fb22e424d1be042166c286d4020ecfe07c9e36c2390cf699cf4471c50ee68e
+SIZE (grame-cncm-faust-2.79.3_GH0.tar.gz) = 70436284
 SHA256 (grame-cncm-faustlibraries-ef8dbf7_GH0.tar.gz) = dc9242161d82cb7ee4f3272984ab5481719eff0ca9e5751e094a1c322b569446
 SIZE (grame-cncm-faustlibraries-ef8dbf7_GH0.tar.gz) = 7910998
 SHA256 (ccrma-faust2ck-db879cb_GH0.tar.gz) = 78a4ca3deef0940122c68cb4872b9423778177ddf02d113f8f01d0e37351f816
--- a/audio/faust/files/patch-compiler_errors_exception.hh
+++ b/audio/faust/files/patch-compiler_errors_exception.hh
@ -1,15 +1,14 @@
--- compiler/errors/exception.hh.orig	2025-01-10 00:10:01 UTC
+--- compiler/errors/exception.hh.orig	2025-03-11 20:48:17 UTC
 +++ compiler/errors/exception.hh
-@@ -25,8 +25,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, U
+@@ -24,7 +24,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, U
+ #include <sstream>
 #include <stdexcept>
 #ifndef WIN32
- #include <unistd.h>
 +#  if !defined(__FreeBSD__)
 #include <alloca.h>
-#else
 +#  else
 +#include <stdlib.h>
 +#  endif
+ #include <unistd.h>
+ #else
 // #include <io.h>
- #endif
- 
--- a/audio/faust/pkg-plist
+++ b/audio/faust/pkg-plist
@ -34,6 +34,7 @@ bin/faust2firefox
 bin/faust2gen
 bin/faust2graph
 bin/faust2graphviewer
+bin/faust2hothouse
 bin/faust2ios
 bin/faust2jack
 bin/faust2jackconsole
@ -184,7 +185,6 @@ include/faust/gui/CInterface.h
 include/faust/gui/ControlSequenceUI.h
 include/faust/gui/ControlUI.h
 include/faust/gui/DaisyControlUI.h
-include/faust/gui/DaisyPatchInitControlUI.h
 include/faust/gui/DecoratorUI.h
 include/faust/gui/Esp32ControlUI.h
 include/faust/gui/Esp32Reader.h
@ -193,6 +193,7 @@ include/faust/gui/FUI.h
 include/faust/gui/GTKUI.h
 include/faust/gui/GUI.h
 include/faust/gui/HTTPDControler.h
+include/faust/gui/HothouseControlUI.h
 include/faust/gui/JSONControl.h
 include/faust/gui/JSONUI.h
 include/faust/gui/JSONUIDecoder.h
@ -276,7 +277,7 @@ lib/ios-libsndfile.a
 lib/libOSCFaust.a
 lib/libfaust.so
 lib/libfaust.so.2
-lib/libfaust.so.2.77.3
+lib/libfaust.so.2.79.3
 %%HIGHLIGHT%%share/apps/katepart/syntax/faust.xml
 %%DATADIR%%/AU/AUPublic/AUBase/AUBase.cpp
 %%DATADIR%%/AU/AUPublic/AUBase/AUBase.h
@ -436,6 +437,7 @@ lib/libfaust.so.2.77.3
 %%DATADIR%%/daisy/Makefile
 %%DATADIR%%/daisy/README.md
 %%DATADIR%%/daisy/ex_faust.cpp
+%%DATADIR%%/daisy/faust_sdram_converter.py
 %%DATADIR%%/delays.lib
 %%DATADIR%%/demos.lib
 %%DATADIR%%/dplug.d
@ -490,6 +492,9 @@ lib/libfaust.so.2.77.3
 %%DATADIR%%/filters.lib
 %%DATADIR%%/gen-json.cpp
 %%DATADIR%%/hoa.lib
+%%DATADIR%%/hothouse/Makefile
+%%DATADIR%%/hothouse/README.md
+%%DATADIR%%/hothouse/ex_faust.cpp
 %%DATADIR%%/iOS/Default-568h@2x.png
 %%DATADIR%%/iOS/Default-Landscape@2x~ipad.png
 %%DATADIR%%/iOS/Default-Landscape~ipad.png
@ -699,6 +704,10 @@ lib/libfaust.so.2.77.3
 %%DATADIR%%/max-msp/faustgen-wrapper.maxpat
 %%DATADIR%%/max-msp/max-msp.cpp
 %%DATADIR%%/max-msp/max-msp64.cpp
+%%DATADIR%%/max-msp/mc-faustgen-wrapper-poly.maxpat
+%%DATADIR%%/max-msp/mc-faustgen-wrapper.maxpat
+%%DATADIR%%/max-msp/mc-wrapper-poly.maxpat
+%%DATADIR%%/max-msp/mc-wrapper.maxpat
 %%DATADIR%%/max-msp/py2max/.gitignore
 %%DATADIR%%/max-msp/py2max/CHANGELOG.md
 %%DATADIR%%/max-msp/py2max/LICENSE
--- a/audio/gbsplay/Makefile
+++ b/audio/gbsplay/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	gbsplay
-DISTVERSION=	0.0.99
+DISTVERSION=	0.0.100
 PORTEPOCH=	1
 CATEGORIES=	audio

--- a/audio/gbsplay/distinfo
+++ b/audio/gbsplay/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1742132535
-SHA256 (mmitch-gbsplay-0.0.99_GH0.tar.gz) = aeba3f7dacdb065d839c6c40ccceae4c8a865b9dd57fcd60626a9a088f37426d
-SIZE (mmitch-gbsplay-0.0.99_GH0.tar.gz) = 208184
+TIMESTAMP = 1750674489
+SHA256 (mmitch-gbsplay-0.0.100_GH0.tar.gz) = 0818efc2fc47c363df48624569ba6c5cdb316c6d8c4dda3351293661b396e6bc
+SIZE (mmitch-gbsplay-0.0.100_GH0.tar.gz) = 211398
--- a/audio/gbsplay/files/patch-Makefile
+++ b/audio/gbsplay/files/patch-Makefile
@ -1,6 +1,6 @@
--- Makefile.orig	2025-03-15 19:44:33 UTC
+--- Makefile.orig	2025-06-13 21:28:26 UTC
 +++ Makefile
-@@ -69,7 +69,7 @@ contribdir  := $(docdir)/contrib
+@@ -70,7 +70,7 @@ contribdir  := $(docdir)/contrib
 man3dir     := $(mandir)/man3
 man5dir     := $(mandir)/man5
 contribdir  := $(docdir)/contrib
@ -9,12 +9,12 @@
 
 DISTDIR := gbsplay-$(VERSION)
 
-@@ -86,7 +86,7 @@ export Q VERBOSE CC HOSTCC BUILDCC GBSCFLAGS GBSLDFLAG
+@@ -87,7 +87,7 @@ export Q VERBOSE CC HOSTCC BUILDCC GBSCFLAGS GBSLDFLAG
 
 export Q VERBOSE CC HOSTCC BUILDCC GBSCFLAGS GBSLDFLAGS
 
 -docs               := README.md HISTORY COPYRIGHT LICENCE
 +docs               := README.md
- docs-dist          := INSTALL.md CODINGSTYLE gbsformat.txt
+ docs-dist          := INSTALL.md CODINGSTYLE gbsformat.txt PACKAGING.md
 contribs           := contrib/gbs2ogg.sh contrib/gbsplay.bashcompletion contrib/gbsplay.zshcompletion
 examples           := examples/nightmode.gbs examples/gbsplayrc_sample
--- a/audio/gbsplay/pkg-plist
+++ b/audio/gbsplay/pkg-plist
@ -6,6 +6,7 @@ bin/gbsplay
 share/man/man1/gbsinfo.1.gz
 share/man/man1/gbsplay.1.gz
 share/man/man5/gbsplayrc.5.gz
+share/man/man1/gbs2gb.1.gz
 share/applications/gbsplay.desktop
 share/applications/mimeinfo.cache
 %%PORTDOCS%%%%DOCSDIR%%/README.md
--- a/audio/icecast/Makefile
+++ b/audio/icecast/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	icecast
 PORTVERSION=	2.4.4
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	audio net
 MASTER_SITES=	https://downloads.xiph.org/releases/icecast/:source \
--- a/audio/ices/Makefile
+++ b/audio/ices/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	ices
 PORTVERSION=	2.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	audio net
 MASTER_SITES=	https://downloads.xiph.org/releases/ices/ \
--- a/audio/libgig/Makefile
+++ b/audio/libgig/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	libgig
 DISTVERSION=	4.5.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://download.linuxsampler.org/packages/ # dead?: SF/qsampler/${PORTNAME}/${PORTVERSION}

@ -11,7 +12,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING

 LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
-		libuuid.so:misc/e2fsprogs-libuuid
+		libuuid.so:misc/libuuid

 USES=		compiler:c++11-lib gmake cpe libtool localbase pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	${PREFIX}/lib/libgig
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	libgpod
 PORTVERSION=	0.8.3
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	audio
 MASTER_SITES=	SF/gtkpod/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}

--- a/audio/libkeyfinder/Makefile
+++ b/audio/libkeyfinder/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	libkeyfinder
-PORTVERSION=	2.2.6
-DISTVERSIONPREFIX=	v
+PORTVERSION=	2.2.8
 CATEGORIES=	audio

 MAINTAINER=	acm@FreeBSD.org
--- a/audio/libkeyfinder/distinfo
+++ b/audio/libkeyfinder/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1646614758
-SHA256 (mixxxdj-libkeyfinder-v2.2.6_GH0.tar.gz) = 15dfcc744fddd01f0e33473091bc34892a9889b779dc991fc1096166bbbfee0d
-SIZE (mixxxdj-libkeyfinder-v2.2.6_GH0.tar.gz) = 79371
+TIMESTAMP = 1750743449
+SHA256 (mixxxdj-libkeyfinder-2.2.8_GH0.tar.gz) = a54fc6c5ff435bb4b447f175bc97f9081fb5abf0edd5d125e6f5215c8fff4d11
+SIZE (mixxxdj-libkeyfinder-2.2.8_GH0.tar.gz) = 79473
--- a/audio/libkeyfinder/pkg-plist
+++ b/audio/libkeyfinder/pkg-plist
@ -22,5 +22,5 @@ lib/cmake/KeyFinder/KeyFinderTargets.cmake
 lib/cmake/KeyFinder/modules/FindFFTW3.cmake
 lib/libkeyfinder.so
 lib/libkeyfinder.so.2
-lib/libkeyfinder.so.2.2.6
+lib/libkeyfinder.so.2.2.8
 libdata/pkgconfig/libkeyfinder.pc
--- a/audio/libmpdclient/Makefile
+++ b/audio/libmpdclient/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	libmpdclient
-PORTVERSION=	2.22
+PORTVERSION=	2.23
 CATEGORIES=	audio
 MASTER_SITES=	https://www.musicpd.org/download/libmpdclient/2/

--- a/audio/libmpdclient/distinfo
+++ b/audio/libmpdclient/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1703495785
-SHA256 (libmpdclient-2.22.tar.xz) = eac15b82b5ba5ed0648af580221eb74657394f7fe768e966d9e9ebb27435429f
-SIZE (libmpdclient-2.22.tar.xz) = 68276
+TIMESTAMP = 1750954106
+SHA256 (libmpdclient-2.23.tar.xz) = 4a1b6c7f783d8cac3d3b8e4cbe9ad021c45491e383de3b893ea4eedefbc71607
+SIZE (libmpdclient-2.23.tar.xz) = 71180
--- a/audio/libmpdclient/pkg-plist
+++ b/audio/libmpdclient/pkg-plist
@ -10,6 +10,7 @@ include/mpd/database.h
 include/mpd/directory.h
 include/mpd/entity.h
 include/mpd/error.h
+include/mpd/feature.h
 include/mpd/fingerprint.h
 include/mpd/idle.h
 include/mpd/list.h
--- a/audio/libmusicbrainz5/Makefile
+++ b/audio/libmusicbrainz5/Makefile
@ -1,6 +1,7 @@
 PORTNAME=	libmusicbrainz
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	5.1.0-41
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g4655b57
 CATEGORIES=	audio
 PKGNAMESUFFIX=	5
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	libogg
-DISTVERSION=	1.3.5
+DISTVERSION=	1.3.6
 PORTEPOCH=	4
 CATEGORIES=	audio
 MASTER_SITES=	https://downloads.xiph.org/releases/ogg/ \
--- a/audio/libogg/distinfo
+++ b/audio/libogg/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1623267554
-SHA256 (libogg-1.3.5.tar.xz) = c4d91be36fc8e54deae7575241e03f4211eb102afb3fc0775fbbc1b740016705
-SIZE (libogg-1.3.5.tar.xz) = 429076
+TIMESTAMP = 1750171554
+SHA256 (libogg-1.3.6.tar.xz) = 5c8253428e181840cd20d41f3ca16557a9cc04bad4a3d04cce84808677fa1061
+SIZE (libogg-1.3.6.tar.xz) = 439952
--- a/audio/libogg/files/patch-configure
+++ b/audio/libogg/files/patch-configure
@ -1,6 +1,6 @@
--- configure.orig	2021-06-04 03:21:11 UTC
+--- configure.orig	2025-06-17 14:46:38 UTC
 +++ configure
-@@ -12814,7 +12814,7 @@ if test -z "$GCC"; then
+@@ -13668,7 +13668,7 @@ if test -z "$GCC"; then
 		;;
         *)
                 DEBUG="-g"
@ -9,10 +9,10 @@
                 PROFILE="-g -p"
 		;;
         esac
-@@ -12837,8 +12837,8 @@ else
+@@ -13691,8 +13691,8 @@ else
 		;;
         *)
-                 DEBUG="-g -Wall -fsigned-char"
+                 DEBUG="-g -Wall -Wextra -fsigned-char"
 -                CFLAGS="-O2 -fsigned-char"
 -                PROFILE="-O2 -g -pg -fsigned-char"
 +                CFLAGS="-fsigned-char"
--- a/audio/libogg/pkg-plist
+++ b/audio/libogg/pkg-plist
@ -4,7 +4,7 @@ include/ogg/os_types.h
 lib/libogg.a
 lib/libogg.so
 lib/libogg.so.0
-lib/libogg.so.0.8.5
+lib/libogg.so.0.8.6
 libdata/pkgconfig/ogg.pc
 share/aclocal/ogg.m4
 %%PORTDOCS%%%%DOCSDIR%%/fish_xiph_org.png
--- a/audio/libopenmpt/Makefile
+++ b/audio/libopenmpt/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	libopenmpt
-DISTVERSION=	0.8.0
+DISTVERSION=	0.8.1
 DISTVERSIONSUFFIX=	+release.autotools
 CATEGORIES=	audio
 MASTER_SITES=	https://lib.openmpt.org/files/libopenmpt/src/ \
--- a/audio/libopenmpt/distinfo
+++ b/audio/libopenmpt/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1748761924
-SHA256 (libopenmpt-0.8.0+release.autotools.tar.gz) = 553ee9c63c4b3cbc9b664d5bc31d8bc4eeb345fad8809f03cbf93147a108ab32
-SIZE (libopenmpt-0.8.0+release.autotools.tar.gz) = 1717401
+TIMESTAMP = 1750070875
+SHA256 (libopenmpt-0.8.1+release.autotools.tar.gz) = 5ccc291e4457925f3ca3e8144f5b645c4a3dcc2bc05dc9a39651132b32b83bce
+SIZE (libopenmpt-0.8.1+release.autotools.tar.gz) = 1760147
--- a/audio/mac/Makefile
+++ b/audio/mac/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	mac
-PORTVERSION=	11.10
+PORTVERSION=	11.17
 CATEGORIES=	audio
 MASTER_SITES=	https://www.monkeysaudio.com/files/
 DISTNAME=	${PORTNAME:tu}_${PORTVERSION:S|.||}_SDK
--- a/audio/mac/distinfo
+++ b/audio/mac/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1746655971
-SHA256 (MAC_1110_SDK.zip) = fe6f481e15eb03e0d4e0f8144a4fd1aff4398c77c419ff36aec99e807b38a54c
-SIZE (MAC_1110_SDK.zip) = 1695304
+TIMESTAMP = 1749964651
+SHA256 (MAC_1117_SDK.zip) = d6b221d08eb57028a452d06057b4cc74c5b5d47bc542aed36f5b79404fd16b96
+SIZE (MAC_1117_SDK.zip) = 1699779
--- a/audio/picard-plugins/pkg-plist
+++ b/audio/picard-plugins/pkg-plist
@ -1,109 +1,109 @@
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/abbreviate_artistsort%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/abbreviate_artistsort%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/acousticbrainz_tonal-rhythm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/acousticbrainz_tonal-rhythm%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/additional_artists_variables%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/additional_artists_variables%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/addrelease%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/addrelease%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/albumartist_website%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/albumartist_website%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/albumartistextension%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/albumartistextension%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/amazon%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/amazon%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/classicdiscnumber%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/classicdiscnumber%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/collect_artists%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/collect_artists%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/compatible_TXXX%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/compatible_TXXX%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/critiquebrainz%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/critiquebrainz%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/cuesheet%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/cuesheet%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/decode_cyrillic%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/decode_cyrillic%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/decode_greek1253%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/decode_greek1253%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/discnumber%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/discnumber%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/featartist%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/featartist%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/featartistsintitles%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/featartistsintitles%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/fix_tracknums%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/fix_tracknums%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/hyphen_unicode%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/hyphen_unicode%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/instruments%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/instruments%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/keep%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/keep%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/key_wheel_converter%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/key_wheel_converter%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/loadasnat%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/loadasnat%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/no_release%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/no_release%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/non_ascii_equivalents%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/non_ascii_equivalents%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/padded%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/padded%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/papercdcase%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/papercdcase%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/playlist%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/playlist%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/release_type%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/release_type%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/releasetag_aggregations%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/releasetag_aggregations%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/remove_perfect_albums%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/remove_perfect_albums%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/reorder_sides%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/reorder_sides%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/replace_forbidden_symbols%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/replace_forbidden_symbols%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/save_and_rewrite_header%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/save_and_rewrite_header%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/smart_title_case%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/smart_title_case%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/sort_multivalue_tags%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/sort_multivalue_tags%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/soundtrack%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/soundtrack%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/standardise_feat%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/standardise_feat%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/standardise_performers%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/standardise_performers%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/titlecase%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/titlecase%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/tracks2clipboard%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/tracks2clipboard%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/abbreviate_artistsort%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/abbreviate_artistsort%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/acousticbrainz_tonal-rhythm%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/acousticbrainz_tonal-rhythm%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/additional_artists_variables%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/additional_artists_variables%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/addrelease%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/addrelease%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/albumartist_website%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/albumartist_website%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/albumartistextension%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/albumartistextension%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/amazon%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/amazon%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/classicdiscnumber%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/classicdiscnumber%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/collect_artists%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/collect_artists%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/compatible_TXXX%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/compatible_TXXX%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/critiquebrainz%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/critiquebrainz%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/cuesheet%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/cuesheet%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/decode_cyrillic%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/decode_cyrillic%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/decode_greek1253%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/decode_greek1253%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/discnumber%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/discnumber%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/featartist%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/featartist%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/featartistsintitles%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/featartistsintitles%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/fix_tracknums%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/fix_tracknums%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/hyphen_unicode%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/hyphen_unicode%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/instruments%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/instruments%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/keep%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/keep%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/key_wheel_converter%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/key_wheel_converter%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/loadasnat%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/loadasnat%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/no_release%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/no_release%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/non_ascii_equivalents%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/non_ascii_equivalents%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/padded%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/padded%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/papercdcase%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/papercdcase%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/playlist%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/playlist%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/release_type%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/release_type%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/releasetag_aggregations%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/releasetag_aggregations%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/remove_perfect_albums%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/remove_perfect_albums%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/reorder_sides%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/reorder_sides%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/replace_forbidden_symbols%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/replace_forbidden_symbols%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/save_and_rewrite_header%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/save_and_rewrite_header%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/smart_title_case%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/smart_title_case%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/sort_multivalue_tags%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/sort_multivalue_tags%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/soundtrack%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/soundtrack%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/standardise_feat%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/standardise_feat%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/standardise_performers%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/standardise_performers%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/titlecase%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/titlecase%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/tracks2clipboard%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/tracks2clipboard%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/abbreviate_artistsort.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/acousticbrainz/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/acousticbrainz/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/acousticbrainz/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/acousticbrainz/__pycache__/ui_options_acousticbrainz_tags%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/acousticbrainz/__pycache__/ui_options_acousticbrainz_tags%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/acousticbrainz/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/acousticbrainz/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/acousticbrainz/__pycache__/ui_options_acousticbrainz_tags%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/acousticbrainz/__pycache__/ui_options_acousticbrainz_tags%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/acousticbrainz/ui_options_acousticbrainz_tags.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/acousticbrainz/ui_options_acousticbrainz_tags.ui
 %%PYTHON_SITELIBDIR%%/picard/plugins/acousticbrainz_tonal-rhythm.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/manifest%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/manifest%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/options%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/options%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/override_module%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/override_module%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/post_save_processor%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/post_save_processor%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/settings%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/settings%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/ui_add_to_collection_options%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/ui_add_to_collection_options%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/manifest%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/manifest%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/options%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/options%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/override_module%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/override_module%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/post_save_processor%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/post_save_processor%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/settings%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/settings%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/ui_add_to_collection_options%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/__pycache__/ui_add_to_collection_options%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/assets/settings.png
 %%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/manifest.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/options.py
@ -112,10 +112,10 @@
 %%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/settings.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/add_to_collection/ui_add_to_collection_options.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/additional_artists_details/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/additional_artists_details/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/additional_artists_details/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/additional_artists_details/__pycache__/ui_options_additional_artists_details%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/additional_artists_details/__pycache__/ui_options_additional_artists_details%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/additional_artists_details/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/additional_artists_details/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/additional_artists_details/__pycache__/ui_options_additional_artists_details%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/additional_artists_details/__pycache__/ui_options_additional_artists_details%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/additional_artists_details/options_additional_artists_details.ui
 %%PYTHON_SITELIBDIR%%/picard/plugins/additional_artists_details/ui_options_additional_artists_details.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/additional_artists_variables.py
@ -124,21 +124,21 @@
 %%PYTHON_SITELIBDIR%%/picard/plugins/albumartistextension.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/amazon.py
 %%BPM%%%%PYTHON_SITELIBDIR%%/picard/plugins/bpm/__init__.py
-%%BPM%%%%PYTHON_SITELIBDIR%%/picard/plugins/bpm/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%BPM%%%%PYTHON_SITELIBDIR%%/picard/plugins/bpm/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%BPM%%%%PYTHON_SITELIBDIR%%/picard/plugins/bpm/__pycache__/ui_options_bpm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%BPM%%%%PYTHON_SITELIBDIR%%/picard/plugins/bpm/__pycache__/ui_options_bpm%%PYTHON_EXT_SUFFIX%%.pyc
+%%BPM%%%%PYTHON_SITELIBDIR%%/picard/plugins/bpm/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%BPM%%%%PYTHON_SITELIBDIR%%/picard/plugins/bpm/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%BPM%%%%PYTHON_SITELIBDIR%%/picard/plugins/bpm/__pycache__/ui_options_bpm%%PYTHON_TAG%%.opt-1.pyc
+%%BPM%%%%PYTHON_SITELIBDIR%%/picard/plugins/bpm/__pycache__/ui_options_bpm%%PYTHON_TAG%%.pyc
 %%BPM%%%%PYTHON_SITELIBDIR%%/picard/plugins/bpm/ui_options_bpm.py
 %%BPM%%%%PYTHON_SITELIBDIR%%/picard/plugins/bpm/ui_options_bpm.ui
 %%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__pycache__/const%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__pycache__/const%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__pycache__/suffixtree%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__pycache__/suffixtree%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__pycache__/ui_options_classical_extras%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__pycache__/ui_options_classical_extras%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__pycache__/const%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__pycache__/const%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__pycache__/suffixtree%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__pycache__/suffixtree%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__pycache__/ui_options_classical_extras%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__pycache__/ui_options_classical_extras%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/const.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/options_classical_extras.ui
 %%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/suffixtree.py
@ -149,56 +149,56 @@
 %%PYTHON_SITELIBDIR%%/picard/plugins/critiquebrainz.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/cuesheet.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/decade/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/decade/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/decade/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/decade/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/decade/__pycache__/__init__%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/decode_cyrillic.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/decode_greek1253.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/__pycache__/options%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/__pycache__/options%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/__pycache__/options%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/__pycache__/options%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/deezer/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/deezer/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/deezer/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/deezer/__pycache__/client%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/deezer/__pycache__/client%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/deezer/__pycache__/obj%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/deezer/__pycache__/obj%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/deezer/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/deezer/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/deezer/__pycache__/client%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/deezer/__pycache__/client%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/deezer/__pycache__/obj%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/deezer/__pycache__/obj%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/deezer/client.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/deezer/obj.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/options.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/deezerart/options.ui
 %%PYTHON_SITELIBDIR%%/picard/plugins/discnumber.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/enhanced_titles/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/enhanced_titles/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/enhanced_titles/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/enhanced_titles/__pycache__/ui_options_enhanced_titles%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/enhanced_titles/__pycache__/ui_options_enhanced_titles%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/enhanced_titles/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/enhanced_titles/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/enhanced_titles/__pycache__/ui_options_enhanced_titles%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/enhanced_titles/__pycache__/ui_options_enhanced_titles%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/enhanced_titles/options_enhanced_titles.ui
 %%PYTHON_SITELIBDIR%%/picard/plugins/enhanced_titles/ui_options_enhanced_titles.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/fanarttv/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/fanarttv/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/fanarttv/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/fanarttv/__pycache__/ui_options_fanarttv%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/fanarttv/__pycache__/ui_options_fanarttv%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/fanarttv/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/fanarttv/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/fanarttv/__pycache__/ui_options_fanarttv%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/fanarttv/__pycache__/ui_options_fanarttv%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/fanarttv/ui_options_fanarttv.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/fanarttv/ui_options_fanarttv.ui
 %%PYTHON_SITELIBDIR%%/picard/plugins/featartist.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/featartistsintitles.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/fix_tracknums.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/format_performer_tags/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/format_performer_tags/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/format_performer_tags/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/format_performer_tags/__pycache__/ui_options_format_performer_tags%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/format_performer_tags/__pycache__/ui_options_format_performer_tags%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/format_performer_tags/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/format_performer_tags/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/format_performer_tags/__pycache__/ui_options_format_performer_tags%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/format_performer_tags/__pycache__/ui_options_format_performer_tags%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/format_performer_tags/ui_options_format_performer_tags.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/format_performer_tags/ui_options_format_performer_tags.ui
 %%PYTHON_SITELIBDIR%%/picard/plugins/genre_mapper/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/genre_mapper/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/genre_mapper/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/genre_mapper/__pycache__/ui_options_genre_mapper%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/genre_mapper/__pycache__/ui_options_genre_mapper%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/genre_mapper/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/genre_mapper/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/genre_mapper/__pycache__/ui_options_genre_mapper%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/genre_mapper/__pycache__/ui_options_genre_mapper%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/genre_mapper/options_genre_mapper.ui
 %%PYTHON_SITELIBDIR%%/picard/plugins/genre_mapper/ui_options_genre_mapper.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/hyphen_unicode.py
@ -206,50 +206,50 @@
 %%PYTHON_SITELIBDIR%%/picard/plugins/keep.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/key_wheel_converter.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/lastfm/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/lastfm/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/lastfm/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/lastfm/__pycache__/ui_options_lastfm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/lastfm/__pycache__/ui_options_lastfm%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/lastfm/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/lastfm/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/lastfm/__pycache__/ui_options_lastfm%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/lastfm/__pycache__/ui_options_lastfm%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/lastfm/ui_options_lastfm.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/lastfm/ui_options_lastfm.ui
 %%PYTHON_SITELIBDIR%%/picard/plugins/loadasnat.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/losslessfuncs/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/losslessfuncs/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/losslessfuncs/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/losslessfuncs/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/losslessfuncs/__pycache__/__init__%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/mod/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/mod/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/mod/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/mod/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/mod/__pycache__/__init__%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/moodbars/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/moodbars/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/moodbars/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/moodbars/__pycache__/ui_options_moodbar%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/moodbars/__pycache__/ui_options_moodbar%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/moodbars/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/moodbars/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/moodbars/__pycache__/ui_options_moodbar%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/moodbars/__pycache__/ui_options_moodbar%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/moodbars/ui_options_moodbar.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/moodbars/ui_options_moodbar.ui
 %%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/__pycache__/ui_options_musixmatch%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/__pycache__/ui_options_musixmatch%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/__pycache__/ui_options_musixmatch%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/__pycache__/ui_options_musixmatch%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/ui_options_musixmatch.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/no_release.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/non_ascii_equivalents.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/padded.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/papercdcase.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/persistent_variables/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/persistent_variables/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/persistent_variables/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/persistent_variables/__pycache__/ui_variables_dialog%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/persistent_variables/__pycache__/ui_variables_dialog%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/persistent_variables/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/persistent_variables/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/persistent_variables/__pycache__/ui_variables_dialog%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/persistent_variables/__pycache__/ui_variables_dialog%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/persistent_variables/ui_variables_dialog.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/playlist.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/post_tagging_actions/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/post_tagging_actions/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/post_tagging_actions/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/post_tagging_actions/__pycache__/actions_status%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/post_tagging_actions/__pycache__/actions_status%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/post_tagging_actions/__pycache__/options_post_tagging_actions%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/post_tagging_actions/__pycache__/options_post_tagging_actions%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/post_tagging_actions/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/post_tagging_actions/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/post_tagging_actions/__pycache__/actions_status%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/post_tagging_actions/__pycache__/actions_status%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/post_tagging_actions/__pycache__/options_post_tagging_actions%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/post_tagging_actions/__pycache__/options_post_tagging_actions%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/post_tagging_actions/actions_status.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/post_tagging_actions/actions_status.ui
 %%PYTHON_SITELIBDIR%%/picard/plugins/post_tagging_actions/options_post_tagging_actions.py
@ -260,23 +260,23 @@
 %%PYTHON_SITELIBDIR%%/picard/plugins/reorder_sides.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/replace_forbidden_symbols.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/replaygain2/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/replaygain2/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/replaygain2/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/replaygain2/__pycache__/ui_options_replaygain2%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/replaygain2/__pycache__/ui_options_replaygain2%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/replaygain2/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/replaygain2/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/replaygain2/__pycache__/ui_options_replaygain2%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/replaygain2/__pycache__/ui_options_replaygain2%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/replaygain2/ui_options_replaygain2.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/replaygain2/ui_options_replaygain2.ui
 %%PYTHON_SITELIBDIR%%/picard/plugins/save_and_rewrite_header.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/script_logger/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/script_logger/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/script_logger/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/script_logger/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/script_logger/__pycache__/__init__%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/search_engine_lookup/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/search_engine_lookup/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/search_engine_lookup/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/search_engine_lookup/__pycache__/ui_options_search_engine_editor%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/search_engine_lookup/__pycache__/ui_options_search_engine_editor%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/search_engine_lookup/__pycache__/ui_options_search_engine_lookup%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/search_engine_lookup/__pycache__/ui_options_search_engine_lookup%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/search_engine_lookup/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/search_engine_lookup/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/search_engine_lookup/__pycache__/ui_options_search_engine_editor%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/search_engine_lookup/__pycache__/ui_options_search_engine_editor%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/search_engine_lookup/__pycache__/ui_options_search_engine_lookup%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/search_engine_lookup/__pycache__/ui_options_search_engine_lookup%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/search_engine_lookup/ui_options_search_engine_editor.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/search_engine_lookup/ui_options_search_engine_editor.ui
 %%PYTHON_SITELIBDIR%%/picard/plugins/search_engine_lookup/ui_options_search_engine_lookup.py
@ -287,45 +287,45 @@
 %%PYTHON_SITELIBDIR%%/picard/plugins/standardise_feat.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/standardise_performers.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/submit_folksonomy_tags/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/submit_folksonomy_tags/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/submit_folksonomy_tags/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/submit_folksonomy_tags/__pycache__/ui_config%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/submit_folksonomy_tags/__pycache__/ui_config%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/submit_folksonomy_tags/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/submit_folksonomy_tags/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/submit_folksonomy_tags/__pycache__/ui_config%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/submit_folksonomy_tags/__pycache__/ui_config%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/submit_folksonomy_tags/ui_config.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/submit_isrc/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/submit_isrc/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/submit_isrc/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/submit_isrc/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/submit_isrc/__pycache__/__init__%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/tangoinfo/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/tangoinfo/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/tangoinfo/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/tangoinfo/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/tangoinfo/__pycache__/__init__%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/theaudiodb/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/theaudiodb/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/theaudiodb/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/theaudiodb/__pycache__/ui_options_theaudiodb%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/theaudiodb/__pycache__/ui_options_theaudiodb%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/theaudiodb/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/theaudiodb/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/theaudiodb/__pycache__/ui_options_theaudiodb%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/theaudiodb/__pycache__/ui_options_theaudiodb%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/theaudiodb/ui_options_theaudiodb.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/theaudiodb/ui_options_theaudiodb.ui
 %%PYTHON_SITELIBDIR%%/picard/plugins/titlecase.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/tracks2clipboard.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/viewvariables/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/viewvariables/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/viewvariables/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/viewvariables/__pycache__/ui_variables_dialog%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/viewvariables/__pycache__/ui_variables_dialog%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/viewvariables/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/viewvariables/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/viewvariables/__pycache__/ui_variables_dialog%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/viewvariables/__pycache__/ui_variables_dialog%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/viewvariables/ui_variables_dialog.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/viewvariables/ui_variables_dialog.ui
 %%PYTHON_SITELIBDIR%%/picard/plugins/wikidata/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/wikidata/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/wikidata/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/wikidata/__pycache__/ui_options_wikidata%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/wikidata/__pycache__/ui_options_wikidata%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/wikidata/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/wikidata/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/wikidata/__pycache__/ui_options_wikidata%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/wikidata/__pycache__/ui_options_wikidata%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/wikidata/ui_options_wikidata.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/wikidata/ui_options_wikidata.ui
 %%PYTHON_SITELIBDIR%%/picard/plugins/workandmovement/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/workandmovement/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/workandmovement/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/workandmovement/__pycache__/roman%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/workandmovement/__pycache__/roman%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/workandmovement/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/workandmovement/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/workandmovement/__pycache__/roman%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/workandmovement/__pycache__/roman%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/workandmovement/roman.py
 %%PORTDOCS%%%%DOCSDIR%%/add_to_collection/README.md
 %%PORTDOCS%%%%DOCSDIR%%/additional_artists_details/README.md
--- a/audio/piper-phonemize/Makefile
+++ b/audio/piper-phonemize/Makefile
@ -0,0 +1,28 @@
+PORTNAME=	piper-phonemize
+DISTVERSION=	2023.11.14
+DISTVERSIONSUFFIX=	-4
+CATEGORIES=	audio
+
+MAINTAINER=	kenrap@kennethraplee.com
+COMMENT=	Fast, local neural text to speech system
+WWW=		https://rhasspy.github.io/piper-samples/
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
+
+LIB_DEPENDS=	libespeak-ng.so:audio/espeak-ng \
+		libonnxruntime.so:misc/onnxruntime
+
+USES=		compiler:c++17-lang cmake pkgconfig tar:xz
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	rhasspy
+
+CMAKE_ARGS=	-DESPEAK_NG_DIR=${LOCALBASE} \
+		-DONNXRUNTIME_DIR=${LOCALBASE}
+
+post-stage:
+	${SED} -e 's|%%PREFIX%%|${PREFIX}|' ${FILESDIR}/piper_phonemize.pc.in \
+		> ${STAGEDIR}${PREFIX}/libdata/pkgconfig/piper_phonemize.pc
+
+.include <bsd.port.mk>
--- a/audio/piper-phonemize/distinfo
+++ b/audio/piper-phonemize/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1748849594
+SHA256 (rhasspy-piper-phonemize-2023.11.14-4_GH0.tar.gz) = 4713d62b9d639d9e27c9abb6dcc5f98ee36c9b873ae0590644d325837ebf135a
+SIZE (rhasspy-piper-phonemize-2023.11.14-4_GH0.tar.gz) = 9788151
--- a/audio/piper-phonemize/files/patch-CMakeLists.txt
+++ b/audio/piper-phonemize/files/patch-CMakeLists.txt
@ -0,0 +1,132 @@
+https://github.com/rhasspy/piper-phonemize/pull/31
+
+--- CMakeLists.txt.orig	2023-11-14 17:54:34 UTC
+++ CMakeLists.txt
+@@ -17,7 +17,7 @@ elseif(NOT APPLE)
+ 
+ elseif(NOT APPLE)
+     # Linux flags
+-    string(APPEND CMAKE_CXX_FLAGS " -Wall -Wextra -Wl,-rpath,'$ORIGIN'")
+    string(APPEND CMAKE_CXX_FLAGS " -Wall -Wextra")
+     string(APPEND CMAKE_C_FLAGS " -Wall -Wextra")
+ endif()
+ 
+@@ -34,100 +34,13 @@ set_target_properties(piper_phonemize PROPERTIES
+     SOVERSION ${PROJECT_VERSION_MAJOR}
+ )
+ 
+-# ---- onnxruntime ---
+-
+-# Look for onnxruntime files in <root>/lib
+-if(NOT DEFINED ONNXRUNTIME_DIR)
+-    if(NOT DEFINED ONNXRUNTIME_VERSION)
+-        set(ONNXRUNTIME_VERSION "1.14.1")
+-    endif()
+-
+-    if(WIN32)
+-        # Windows x86-64
+-        set(ONNXRUNTIME_PREFIX "onnxruntime-win-x64-${ONNXRUNTIME_VERSION}")
+-        set(ONNXRUNTIME_EXT "zip")
+-    elseif (APPLE)
+-        if(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
+-            # MacOS x86-64
+-            set(ONNXRUNTIME_PREFIX "onnxruntime-osx-x86_64-${ONNXRUNTIME_VERSION}")
+-        elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL arm64)
+-            # MacOS Apple Silicon
+-            set(ONNXRUNTIME_PREFIX "onnxruntime-osx-arm64-${ONNXRUNTIME_VERSION}")
+-        else()
+-            message(FATAL_ERROR "Unsupported architecture for onnxruntime")
+-        endif()
+-
+-        set(ONNXRUNTIME_EXT "tgz")
+-    else()
+-        if(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
+-            # Linux x86-64
+-            set(ONNXRUNTIME_PREFIX "onnxruntime-linux-x64-${ONNXRUNTIME_VERSION}")
+-        elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64)
+-            # Linux ARM 64-bit
+-            set(ONNXRUNTIME_PREFIX "onnxruntime-linux-aarch64-${ONNXRUNTIME_VERSION}")
+-        elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l)
+-            # Linux ARM 32-bit
+-            set(ONNXRUNTIME_PREFIX "onnxruntime-linux-arm32-${ONNXRUNTIME_VERSION}")
+-            set(ONNXRUNTIME_URL "https://github.com/synesthesiam/prebuilt-apps/releases/download/v1.0/onnxruntime-linux-arm32-${ONNXRUNTIME_VERSION}.tgz")
+-        else()
+-            message(FATAL_ERROR "Unsupported architecture for onnxruntime")
+-        endif()
+-
+-        set(ONNXRUNTIME_EXT "tgz")
+-    endif()
+-
+-    if(NOT DEFINED ONNXRUNTIME_URL)
+-        set(ONNXRUNTIME_URL "https://github.com/microsoft/onnxruntime/releases/download/v${ONNXRUNTIME_VERSION}/${ONNXRUNTIME_PREFIX}.${ONNXRUNTIME_EXT}")
+-    endif()
+-
+-    set(ONNXRUNTIME_FILENAME "${ONNXRUNTIME_PREFIX}.${ONNXRUNTIME_EXT}")
+-    set(ONNXRUNTIME_DIR "${CMAKE_CURRENT_LIST_DIR}/lib/${ONNXRUNTIME_PREFIX}")
+-
+-    if(NOT EXISTS "${ONNXRUNTIME_DIR}")
+-        if(NOT EXISTS "download/${ONNXRUNTIME_FILENAME}")
+-            # Download onnxruntime release
+-            message("Downloading ${ONNXRUNTIME_URL}")
+-            file(DOWNLOAD "${ONNXRUNTIME_URL}" "download/${ONNXRUNTIME_FILENAME}")
+-        endif()
+-
+-        # Extract .zip or .tgz to a directory like lib/onnxruntime-linux-x64-1.14.1/
+-        file(ARCHIVE_EXTRACT INPUT "download/${ONNXRUNTIME_FILENAME}" DESTINATION "${CMAKE_CURRENT_LIST_DIR}/lib")
+-    endif()
+-endif()
+-
+-# ---- espeak-ng ---
+-
+-if(NOT DEFINED ESPEAK_NG_DIR)
+-    set(ESPEAK_NG_DIR "${CMAKE_CURRENT_BINARY_DIR}/ei")
+-
+-    include(ExternalProject)
+-    ExternalProject_Add(
+-        espeak_ng_external
+-        PREFIX "${CMAKE_CURRENT_BINARY_DIR}/e"
+-        URL "https://github.com/rhasspy/espeak-ng/archive/refs/heads/master.zip"
+-        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${ESPEAK_NG_DIR}
+-        CMAKE_ARGS -DUSE_ASYNC:BOOL=OFF
+-        CMAKE_ARGS -DBUILD_SHARED_LIBS:BOOL=ON
+-        CMAKE_ARGS -DUSE_MBROLA:BOOL=OFF
+-        CMAKE_ARGS -DUSE_LIBSONIC:BOOL=OFF
+-        CMAKE_ARGS -DUSE_LIBPCAUDIO:BOOL=OFF
+-        CMAKE_ARGS -DUSE_KLATT:BOOL=OFF
+-        CMAKE_ARGS -DUSE_SPEECHPLAYER:BOOL=OFF
+-        CMAKE_ARGS -DEXTRA_cmn:BOOL=ON
+-        CMAKE_ARGS -DEXTRA_ru:BOOL=ON
+-        CMAKE_ARGS -DCMAKE_C_FLAGS="-D_FILE_OFFSET_BITS=64"
+-    )
+-    add_dependencies(piper_phonemize espeak_ng_external)
+-endif()
+-
+-
+ # ---- Declare library ----
+ 
+ target_include_directories(
+     piper_phonemize PUBLIC
+     "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>"
+     ${ESPEAK_NG_DIR}/include
+-    ${ONNXRUNTIME_DIR}/include
+    ${ONNXRUNTIME_DIR}/include/onnxruntime
+ )
+ 
+ target_link_directories(
+@@ -220,16 +133,3 @@ install(
+ install(
+     FILES ${CMAKE_SOURCE_DIR}/etc/libtashkeel_model.ort
+     TYPE DATA)
+-
+-# Dependencies
+-install(
+-    DIRECTORY ${ESPEAK_NG_DIR}/
+-    DESTINATION ${CMAKE_INSTALL_PREFIX})
+-
+-install(
+-    DIRECTORY ${ONNXRUNTIME_DIR}/include/
+-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+-
+-install(
+-    DIRECTORY ${ONNXRUNTIME_DIR}/lib/
+-    DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/audio/piper-phonemize/files/piper_phonemize.pc.in
+++ b/audio/piper-phonemize/files/piper_phonemize.pc.in
@ -0,0 +1,11 @@
+prefix=%%PREFIX%%
+bindir=${prefix}/bin
+libdir=${prefix}/lib
+includedir=${prefix}/include/piper-phonemize
+
+Name: piper-phonemize
+Description: Piper Phonemization Library
+URL: https://github.com/rhasspy/piper-phonemize
+Version: 2023.11.14-4
+Libs: -L${libdir} -lpiper_phonemize
+Cflags: -I${includedir}
--- a/audio/piper-phonemize/pkg-descr
+++ b/audio/piper-phonemize/pkg-descr
@ -0,0 +1,5 @@
+Converts text to phonemes for Piper.
+
+Uses eSpeak phonemes with the espeak_TextToPhonemesWithTerminator function.
+This function allows for Piper to preserve punctuation and detect sentence
+boundaries.
--- a/audio/piper-phonemize/pkg-plist
+++ b/audio/piper-phonemize/pkg-plist
@ -0,0 +1,12 @@
+bin/piper_phonemize
+include/piper-phonemize/json.hpp
+include/piper-phonemize/phoneme_ids.hpp
+include/piper-phonemize/phonemize.hpp
+include/piper-phonemize/shared.hpp
+include/piper-phonemize/tashkeel.hpp
+include/piper-phonemize/uni_algo.h
+lib/libpiper_phonemize.so
+lib/libpiper_phonemize.so.1
+lib/libpiper_phonemize.so.1.2.0
+libdata/pkgconfig/piper_phonemize.pc
+share/libtashkeel_model.ort
--- a/audio/piper/Makefile
+++ b/audio/piper/Makefile
@ -0,0 +1,27 @@
+PORTNAME=	piper
+DISTVERSION=	2023.11.14
+DISTVERSIONSUFFIX=	-2
+CATEGORIES=	audio
+
+MAINTAINER=	kenrap@kennethraplee.com
+COMMENT=	Fast, local text to speech system
+WWW=		https://rhasspy.github.io/piper-samples/
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
+
+LIB_DEPENDS=	libespeak-ng.so:audio/espeak-ng \
+		libfmt.so:devel/libfmt \
+		libonnxruntime.so:misc/onnxruntime \
+		libpiper_phonemize.so:audio/piper-phonemize \
+		libspdlog.so:devel/spdlog
+
+USES=		compiler:c++17-lang cmake localbase pkgconfig tar:xz xorg
+USE_XORG=	x11
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	rhasspy
+
+PLIST_FILES=	bin/piper
+
+.include <bsd.port.mk>
--- a/audio/piper/distinfo
+++ b/audio/piper/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1750142677
+SHA256 (rhasspy-piper-2023.11.14-2_GH0.tar.gz) = 8b684e102cfe23af097830db9555a8641f17735725853c531a1daeb34b6ed1a8
+SIZE (rhasspy-piper-2023.11.14-2_GH0.tar.gz) = 25602353
--- a/audio/piper/files/patch-CMakeLists.txt
+++ b/audio/piper/files/patch-CMakeLists.txt
@ -0,0 +1,139 @@
+--- CMakeLists.txt.orig	2023-11-14 17:55:22 UTC
+++ CMakeLists.txt
+@@ -13,7 +13,7 @@ if(MSVC)
+   add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
+ elseif(NOT APPLE)
+   # Linux flags
+-  string(APPEND CMAKE_CXX_FLAGS " -Wall -Wextra -Wl,-rpath,'$ORIGIN'")
+  string(APPEND CMAKE_CXX_FLAGS " -Wall -Wextra")
+   string(APPEND CMAKE_C_FLAGS " -Wall -Wextra")
+ endif()
+ 
+@@ -25,7 +25,7 @@ add_executable(test_piper src/cpp/test.cpp src/cpp/piper.cpp)
+ 
+ # ---- fmt ---
+ 
+-if(NOT DEFINED FMT_DIR)
+if(FALSE)
+   set(FMT_VERSION "10.0.0")
+   set(FMT_DIR "${CMAKE_CURRENT_BINARY_DIR}/fi")
+ 
+@@ -43,7 +43,7 @@ endif()
+ 
+ # ---- spdlog ---
+ 
+-if(NOT DEFINED SPDLOG_DIR)
+if(FALSE)
+   set(SPDLOG_DIR "${CMAKE_CURRENT_BINARY_DIR}/si")
+   set(SPDLOG_VERSION "1.12.0")
+   ExternalProject_Add(
+@@ -58,7 +58,13 @@ endif()
+ 
+ # ---- piper-phonemize ---
+ 
+-if(NOT DEFINED PIPER_PHONEMIZE_DIR)
+find_package(PkgConfig)
+pkg_check_modules(FMT REQUIRED fmt)
+pkg_check_modules(ONNXRUNTIME REQUIRED libonnxruntime)
+pkg_check_modules(PIPER_PHONEMIZE REQUIRED piper_phonemize)
+pkg_check_modules(SPDLOG REQUIRED spdlog)
+
+if(FALSE)
+   set(PIPER_PHONEMIZE_DIR "${CMAKE_CURRENT_BINARY_DIR}/pi")
+   ExternalProject_Add(
+     piper_phonemize_external
+@@ -74,9 +80,8 @@ endif()
+ 
+ if((NOT MSVC) AND (NOT APPLE))
+   # Linux flags
+-  string(APPEND CMAKE_CXX_FLAGS " -Wall -Wextra -Wl,-rpath,'$ORIGIN'")
+  string(APPEND CMAKE_CXX_FLAGS " -Wall -Wextra")
+   string(APPEND CMAKE_C_FLAGS " -Wall -Wextra")
+-  target_link_libraries(piper -static-libgcc -static-libstdc++)
+ 
+   set(PIPER_EXTRA_LIBRARIES "pthread")
+ endif()
+@@ -91,18 +96,18 @@ target_link_libraries(piper
+ )
+ 
+ target_link_directories(piper PUBLIC
+-  ${FMT_DIR}/lib
+-  ${SPDLOG_DIR}/lib
+-  ${PIPER_PHONEMIZE_DIR}/lib
+  ${FMT_LIBRARY_DIRS}
+  ${SPDLOG_LIBRARY_DIRS}
+  ${ONNXRUNTIME_LIBRARY_DIRS}
+ )
+ 
+ target_include_directories(piper PUBLIC
+-  ${FMT_DIR}/include
+-  ${SPDLOG_DIR}/include
+-  ${PIPER_PHONEMIZE_DIR}/include
+  ${FMT_INCLUDE_DIRS}
+  ${SPDLOG_INCLUDE_DIRS}
+  ${ONNXRUNTIME_INCLUDE_DIRS}
+ )
+ 
+-target_compile_definitions(piper PUBLIC _PIPER_VERSION=${piper_version})
+target_compile_definitions(piper PUBLIC _PIPER_VERSION="${piper_version}")
+ 
+ # ---- Declare test ----
+ include(CTest)
+@@ -116,16 +121,16 @@ target_compile_features(test_piper PUBLIC cxx_std_17)
+ 
+ target_include_directories(
+   test_piper PUBLIC
+-  ${FMT_DIR}/include
+-  ${SPDLOG_DIR}/include
+-  ${PIPER_PHONEMIZE_DIR}/include
+  ${FMT_INCLUDE_DIRS}
+  ${SPDLOG_INCLUDE_DIRS}
+  ${ONNXRUNTIME_INCLUDE_DIRS}
+ )
+ 
+ target_link_directories(
+   test_piper PUBLIC
+-  ${FMT_DIR}/lib
+-  ${SPDLOG_DIR}/lib
+-  ${PIPER_PHONEMIZE_DIR}/lib
+  ${FMT_LIBRARY_DIRS}
+  ${SPDLOG_LIBRARY_DIRS}
+  ${ONNXRUNTIME_LIBRARY_DIRS}
+ )
+ 
+ target_link_libraries(test_piper PUBLIC
+@@ -140,33 +145,5 @@ target_link_libraries(test_piper PUBLIC
+ 
+ install(
+   TARGETS piper
+-  DESTINATION ${CMAKE_INSTALL_PREFIX})
+-
+-# Dependencies
+-install(
+-  DIRECTORY ${PIPER_PHONEMIZE_DIR}/bin/
+-  DESTINATION ${CMAKE_INSTALL_PREFIX}
+-  USE_SOURCE_PERMISSIONS  # keep +x
+-  FILES_MATCHING
+-  PATTERN "piper_phonemize"
+-  PATTERN "espeak-ng"
+-  PATTERN "*.dll"
+-)
+-
+-install(
+-  DIRECTORY ${PIPER_PHONEMIZE_DIR}/lib/
+-  DESTINATION ${CMAKE_INSTALL_PREFIX}
+-  FILES_MATCHING
+-  PATTERN "*.dll"
+-  PATTERN "*.so*"
+-)
+-
+-install(
+-  DIRECTORY ${PIPER_PHONEMIZE_DIR}/share/espeak-ng-data
+-  DESTINATION ${CMAKE_INSTALL_PREFIX}
+-)
+-
+-install(
+-  FILES ${PIPER_PHONEMIZE_DIR}/share/libtashkeel_model.ort
+-  DESTINATION ${CMAKE_INSTALL_PREFIX}
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+ )
--- a/audio/piper/files/patch-src_cpp_piper.cpp
+++ b/audio/piper/files/patch-src_cpp_piper.cpp
@ -0,0 +1,61 @@
+--- src/cpp/piper.cpp.orig
+++ src/cpp/piper.cpp
+@@ -6,7 +6,7 @@
+ #include <stdexcept>
+ 
+ #include <espeak-ng/speak_lib.h>
+-#include <onnxruntime_cxx_api.h>
+#include <onnxruntime/onnxruntime_cxx_api.h>
+ #include <spdlog/spdlog.h>
+ 
+ #include "json.hpp"
+@@ -229,22 +229,6 @@ void initialize(PiperConfig &config) {
+     spdlog::debug("Initialized eSpeak");
+   }
+ 
+-  // Load onnx model for libtashkeel
+-  // https://github.com/mush42/libtashkeel/
+-  if (config.useTashkeel) {
+-    spdlog::debug("Using libtashkeel for diacritization");
+-    if (!config.tashkeelModelPath) {
+-      throw std::runtime_error("No path to libtashkeel model");
+-    }
+-
+-    spdlog::debug("Loading libtashkeel model from {}",
+-                  config.tashkeelModelPath.value());
+-    config.tashkeelState = std::make_unique<tashkeel::State>();
+-    tashkeel::tashkeel_load(config.tashkeelModelPath.value(),
+-                            *config.tashkeelState);
+-    spdlog::debug("Initialized libtashkeel");
+-  }
+-
+   spdlog::info("Initialized piper");
+ }
+ 
+@@ -447,15 +431,6 @@ void textToAudio(PiperConfig &config, Voice &voice, std::string text,
+         voice.synthesisConfig.sampleRate * voice.synthesisConfig.channels);
+   }
+ 
+-  if (config.useTashkeel) {
+-    if (!config.tashkeelState) {
+-      throw std::runtime_error("Tashkeel model is not loaded");
+-    }
+-
+-    spdlog::debug("Diacritizing text with libtashkeel: {}", text);
+-    text = tashkeel::tashkeel_run(text, *config.tashkeelState);
+-  }
+-
+   // Phonemes for each sentence
+   spdlog::debug("Phonemizing text: {}", text);
+   std::vector<std::vector<Phoneme>> phonemes;
+--- src/cpp/piper.hpp.orig
+++ src/cpp/piper.hpp
+@@ -8,7 +8,7 @@
+ #include <string>
+ #include <vector>
+ 
+-#include <onnxruntime_cxx_api.h>
+#include <onnxruntime/onnxruntime_cxx_api.h>
+ #include <piper-phonemize/phoneme_ids.hpp>
+ #include <piper-phonemize/phonemize.hpp>
+ #include <piper-phonemize/tashkeel.hpp>
--- a/audio/piper/pkg-descr
+++ b/audio/piper/pkg-descr
@ -0,0 +1,2 @@
+A fast, local neural text to speech system that sounds great and is optimized
+for the Raspberry Pi 4. Piper is used in a variety of projects.
--- a/audio/portmidi/Makefile
+++ b/audio/portmidi/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	portmidi
-DISTVERSION=	2.0.4
+DISTVERSION=	2.0.6
 DISTVERSIONPREFIX=v
 PORTEPOCH=	1
 CATEGORIES=	audio
--- a/audio/portmidi/distinfo
+++ b/audio/portmidi/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1711992528
-SHA256 (PortMidi-portmidi-v2.0.4_GH0.tar.gz) = 64893e823ae146cabd3ad7f9a9a9c5332746abe7847c557b99b2577afa8a607c
-SIZE (PortMidi-portmidi-v2.0.4_GH0.tar.gz) = 263225
+TIMESTAMP = 1750741030
+SHA256 (PortMidi-portmidi-v2.0.6_GH0.tar.gz) = 81d22b34051621cd56c8d5ef12908ef2a59764c9cdfba6dae47aabddb71ac914
+SIZE (PortMidi-portmidi-v2.0.6_GH0.tar.gz) = 193068
--- a/audio/portmidi/files/patch-porttime_ptlinux.c
+++ b/audio/portmidi/files/patch-porttime_ptlinux.c
@ -1,17 +1,15 @@
--- porttime/ptlinux.c.orig	2024-04-01 19:43:35.367808000 +0200
-+++ porttime/ptlinux.c	2024-04-01 19:43:57.157503000 +0200
-@@ -29,9 +29,8 @@
+--- porttime/ptlinux.c.orig	2025-06-24 04:57:11 UTC
+++ porttime/ptlinux.c
+@@ -29,7 +29,7 @@ CHANGE LOG
 #include <unistd.h>
 #include <sys/types.h>
 #include "porttime.h"
 -#include "time.h"
 +#include <time.h>
 #include "sys/resource.h"
-#include "sys/timeb.h"
 #include "pthread.h"
 
- #define TRUE 1
-@@ -80,7 +79,7 @@
+@@ -83,7 +83,7 @@ PtError Pt_Start(int resolution, PtCallback *callback,
 {
     if (time_started_flag) return ptNoError;
     /* need this set before process runs: */
@ -19,8 +17,8 @@
 +    clock_gettime(CLOCK_MONOTONIC_FAST, &time_offset);
     if (callback) {
         int res;
-         pt_callback_parameters *parms = (pt_callback_parameters *) 
-@@ -123,7 +122,7 @@
+         pt_callback_parameters *parms = (pt_callback_parameters *)
+@@ -126,7 +126,7 @@ PtTimestamp Pt_Time(void)
 {
     long seconds, ms;
     struct timespec now;
--- a/audio/portmidi/pkg-plist
+++ b/audio/portmidi/pkg-plist
@ -7,5 +7,5 @@ lib/cmake/PortMidi/PortMidiTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/PortMidi/PortMidiTargets.cmake
 lib/libportmidi.so
 lib/libportmidi.so.2
-lib/libportmidi.so.2.0.3
+lib/libportmidi.so.2.0.4
 libdata/pkgconfig/portmidi.pc
--- a/audio/py-SoundFile/pkg-plist
+++ b/audio/py-SoundFile/pkg-plist
@ -1,3 +1,3 @@
-%%PYTHON_SITELIBDIR%%/__pycache__/_soundfile%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/__pycache__/_soundfile%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/__pycache__/_soundfile%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/__pycache__/_soundfile%%PYTHON_TAG%%.pyc
 %%PYTHON_SITELIBDIR%%/_soundfile.py
--- a/audio/py-samplerate/Makefile
+++ b/audio/py-samplerate/Makefile
@ -24,10 +24,10 @@ USE_PYTHON=	flavors pytest
 TEST_WRKSRC=	${WRKSRC}/tests
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}

-PLIST_FILES=	${PYTHON_SITELIBDIR}/samplerate${PYTHON_EXT_SUFFIX}.so
+PLIST_FILES=	${PYTHON_SITELIBDIR}/samplerate${PYTHON_TAG}.so

 do-install:
 	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
-	${INSTALL_LIB} ${BUILD_WRKSRC}/samplerate${PYTHON_EXT_SUFFIX}.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
+	${INSTALL_LIB} ${BUILD_WRKSRC}/samplerate${PYTHON_TAG}.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}

 .include <bsd.port.mk>
--- a/audio/py-soxr/Makefile
+++ b/audio/py-soxr/Makefile
@ -29,7 +29,7 @@ TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}

 xpost-install:
 	# strip binary
-	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/soxr/cysoxr${PYTHON_EXT_SUFFIX}.so
+	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/soxr/cysoxr${PYTHON_TAG}.so
 	# correct version as a workaround for https://github.com/dofuuz/python-soxr/issues/21
 	@${REINPLACE_CMD} -i '' -e 's|^version |__version__ |' ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/soxr/_version.py

--- a/audio/shairport-sync/Makefile
+++ b/audio/shairport-sync/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	shairport-sync
 DISTVERSION=	4.3.7
+PORTREVISION=	1
 CATEGORIES=	audio

 MAINTAINER=	ehaupt@FreeBSD.org
@ -45,7 +46,7 @@ AIRPLAY2_LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg \
 			libgcrypt.so:security/libgcrypt \
 			libplist-2.0.so:devel/libplist \
 			libsodium.so:security/libsodium \
-			libuuid.so:misc/e2fsprogs-libuuid
+			libuuid.so:misc/libuuid
 AIRPLAY2_RUN_DEPENDS=	nqptp:net/nqptp
 AIRPLAY2_CONFIGURE_ON=	--with-airplay-2
 AIRPLAY2_SUB_FILES=	pkg-message
--- a/audio/sonicradio/Makefile
+++ b/audio/sonicradio/Makefile
@ -1,7 +1,6 @@
 PORTNAME=	sonicradio
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.14
-PORTREVISION=	1
+DISTVERSION=	0.6.15
 CATEGORIES=	audio

 MAINTAINER=	nivit@FreeBSD.org
--- a/audio/sonicradio/distinfo
+++ b/audio/sonicradio/distinfo
@ -1,5 +1,5 @@
-TIMESTAMP = 1743253633
-SHA256 (go/audio_sonicradio/sonicradio-v0.6.14/v0.6.14.mod) = e13d7c88d2c94f14eec5b9f603bc5ded2e13d9baab8eab44849479c58f0bdd6d
-SIZE (go/audio_sonicradio/sonicradio-v0.6.14/v0.6.14.mod) = 1197
-SHA256 (go/audio_sonicradio/sonicradio-v0.6.14/v0.6.14.zip) = 1e92fbff33142472229177a26e846f1601922fe99cbd1df3397a6270fb2e5d79
-SIZE (go/audio_sonicradio/sonicradio-v0.6.14/v0.6.14.zip) = 1259143
+TIMESTAMP = 1750494577
+SHA256 (go/audio_sonicradio/sonicradio-v0.6.15/v0.6.15.mod) = e13d7c88d2c94f14eec5b9f603bc5ded2e13d9baab8eab44849479c58f0bdd6d
+SIZE (go/audio_sonicradio/sonicradio-v0.6.15/v0.6.15.mod) = 1197
+SHA256 (go/audio_sonicradio/sonicradio-v0.6.15/v0.6.15.zip) = 01304694c6754ef827609a1210d019fdd3aa93c389507f05af63e5923ebf308b
+SIZE (go/audio_sonicradio/sonicradio-v0.6.15/v0.6.15.zip) = 1259135
--- a/audio/taglib/Makefile
+++ b/audio/taglib/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	taglib
-DISTVERSION=	2.0.2
+DISTVERSION=	2.1
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ \
 		https://taglib.org/releases/
@ -20,6 +20,7 @@ USES=		cmake:testing compiler:c++17-lang cpe pathfix
 USE_LDCONFIG=	yes

 CMAKE_ARGS=	-DCMAKE_CXX_VISIBILITY_PRESET=hidden
+CMAKE_OFF=	BUILD_TESTING
 CMAKE_ON=	VISIBILITY_HIDDEN

 CMAKE_TESTING_TARGET=	check
--- a/audio/taglib/distinfo
+++ b/audio/taglib/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1724497812
-SHA256 (taglib-2.0.2.tar.gz) = 0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
-SIZE (taglib-2.0.2.tar.gz) = 1446419
+TIMESTAMP = 1748765137
+SHA256 (taglib-2.1.tar.gz) = 95b788b39eaebab41f7e6d1c1d05ceee01a5d1225e4b6d11ed8976e96ba90b0c
+SIZE (taglib-2.1.tar.gz) = 1485749
--- a/audio/taglib/pkg-plist
+++ b/audio/taglib/pkg-plist
@ -70,6 +70,9 @@ include/taglib/relativevolumeframe.h
 include/taglib/rifffile.h
 include/taglib/s3mfile.h
 include/taglib/s3mproperties.h
+include/taglib/shortenfile.h
+include/taglib/shortenproperties.h
+include/taglib/shortentag.h
 include/taglib/speexfile.h
 include/taglib/speexproperties.h
 include/taglib/synchronizedlyricsframe.h
@ -77,6 +80,7 @@ include/taglib/tableofcontentsframe.h
 include/taglib/tag.h
 include/taglib/tag_c.h
 include/taglib/taglib.h
+include/taglib/taglib_config.h
 include/taglib/taglib_export.h
 include/taglib/tbytevector.h
 include/taglib/tbytevectorlist.h
@ -119,10 +123,10 @@ lib/cmake/taglib/taglib-targets.cmake
 %%STATIC%%lib/libtag.a
 %%NO_STATIC%%lib/libtag.so
 %%NO_STATIC%%lib/libtag.so.2
-%%NO_STATIC%%lib/libtag.so.2.0.2
+%%NO_STATIC%%lib/libtag.so.2.1.0
 %%STATIC%%lib/libtag_c.a
 %%NO_STATIC%%lib/libtag_c.so
 %%NO_STATIC%%lib/libtag_c.so.2
-%%NO_STATIC%%lib/libtag_c.so.2.0.2
+%%NO_STATIC%%lib/libtag_c.so.2.1.0
 libdata/pkgconfig/taglib.pc
 libdata/pkgconfig/taglib_c.pc
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`Ruby module for reading and writing zip files`