*/*: sync with upstream

Taken from: FreeBSD
2024-11-04 08:48:13 +01:00 · 2024-11-04 08:48:13 +01:00 · 2a9ae9eae0
commit 2a9ae9eae0
parent 0a04fb5182
4022 changed files with 38378 additions and 34297 deletions
--- a/accessibility/wl-gammarelay-rs/Makefile
+++ b/accessibility/wl-gammarelay-rs/Makefile
@ -1,7 +1,6 @@
 PORTNAME=	wl-gammarelay-rs
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.4.1
-PORTREVISION=	5
+DISTVERSION=	1.0.0
 CATEGORIES=	accessibility wayland

 MAINTAINER=	jbeich@FreeBSD.org
--- a/accessibility/wl-gammarelay-rs/Makefile.crates
+++ b/accessibility/wl-gammarelay-rs/Makefile.crates
@ -1,38 +1,39 @@
-CARGO_CRATES=	anstyle-1.0.6 \
-		anyhow-1.0.81 \
-		autocfg-1.1.0 \
-		bitflags-2.4.2 \
-		bytemuck-1.15.0 \
+CARGO_CRATES=	anstyle-1.0.10 \
+		anyhow-1.0.92 \
+		autocfg-1.4.0 \
+		bitflags-2.6.0 \
+		bytemuck-1.19.0 \
 		cfg-if-1.0.0 \
 		cfg_aliases-0.1.1 \
-		clap-4.5.3 \
-		clap_builder-4.5.2 \
-		clap_derive-4.5.3 \
-		clap_lex-0.7.0 \
+		clap-4.5.20 \
+		clap_builder-4.5.20 \
+		clap_derive-4.5.18 \
+		clap_lex-0.7.2 \
 		equivalent-1.0.1 \
-		hashbrown-0.14.3 \
+		hashbrown-0.15.0 \
 		heck-0.5.0 \
-		indexmap-2.2.5 \
-		libc-0.2.153 \
-		memchr-2.7.1 \
-		memmap2-0.9.4 \
-		memoffset-0.9.0 \
+		indexmap-2.6.0 \
+		libc-0.2.161 \
+		memchr-2.7.4 \
+		memmap2-0.9.5 \
+		memoffset-0.9.1 \
 		nix-0.28.0 \
-		proc-macro-crate-3.1.0 \
-		proc-macro2-1.0.79 \
-		quick-xml-0.31.0 \
-		quote-1.0.35 \
+		proc-macro-crate-3.2.0 \
+		proc-macro2-1.0.89 \
+		quick-xml-0.36.2 \
+		quote-1.0.37 \
 		shmemfdrs2-1.0.0 \
-		syn-2.0.53 \
-		thiserror-1.0.58 \
-		thiserror-impl-1.0.58 \
-		toml_datetime-0.6.5 \
-		toml_edit-0.21.1 \
-		unicode-ident-1.0.12 \
-		wayrs-client-1.0.3 \
-		wayrs-proto-parser-2.0.0 \
-		wayrs-protocols-0.13.2 \
-		wayrs-scanner-0.13.2 \
-		winnow-0.5.40 \
+		syn-2.0.86 \
+		thiserror-1.0.66 \
+		thiserror-impl-1.0.66 \
+		toml_datetime-0.6.8 \
+		toml_edit-0.22.22 \
+		unicode-ident-1.0.13 \
+		wayrs-client-1.1.2 \
+		wayrs-core-1.0.3 \
+		wayrs-proto-parser-2.0.3 \
+		wayrs-protocols-0.14.3 \
+		wayrs-scanner-0.15.0 \
+		winnow-0.6.20 \
 		rustbus-service,rustbus-service-macros@git+https://github.com/MaxVerevkin/rustbus-service?rev=1bd3aef\#1bd3aef5fe2a646685c8e640c0f67a645eeaf41d \
 		rustbus,rustbus_derive@git+https://github.com/KillingSpark/rustbus?rev=5875f1f\#5875f1fefc054ed4e2d91641f59a55b9eaee5be9
--- a/accessibility/wl-gammarelay-rs/distinfo
+++ b/accessibility/wl-gammarelay-rs/distinfo
@ -1,79 +1,81 @@
-TIMESTAMP = 1711040534
-SHA256 (rust/crates/anstyle-1.0.6.crate) = 8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc
-SIZE (rust/crates/anstyle-1.0.6.crate) = 14604
-SHA256 (rust/crates/anyhow-1.0.81.crate) = 0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247
-SIZE (rust/crates/anyhow-1.0.81.crate) = 45142
-SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
-SIZE (rust/crates/autocfg-1.1.0.crate) = 13272
-SHA256 (rust/crates/bitflags-2.4.2.crate) = ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf
-SIZE (rust/crates/bitflags-2.4.2.crate) = 42602
-SHA256 (rust/crates/bytemuck-1.15.0.crate) = 5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15
-SIZE (rust/crates/bytemuck-1.15.0.crate) = 47672
+TIMESTAMP = 1730498292
+SHA256 (rust/crates/anstyle-1.0.10.crate) = 55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9
+SIZE (rust/crates/anstyle-1.0.10.crate) = 15725
+SHA256 (rust/crates/anyhow-1.0.92.crate) = 74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13
+SIZE (rust/crates/anyhow-1.0.92.crate) = 47459
+SHA256 (rust/crates/autocfg-1.4.0.crate) = ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26
+SIZE (rust/crates/autocfg-1.4.0.crate) = 17712
+SHA256 (rust/crates/bitflags-2.6.0.crate) = b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de
+SIZE (rust/crates/bitflags-2.6.0.crate) = 45357
+SHA256 (rust/crates/bytemuck-1.19.0.crate) = 8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d
+SIZE (rust/crates/bytemuck-1.19.0.crate) = 50363
 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
 SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
 SHA256 (rust/crates/cfg_aliases-0.1.1.crate) = fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e
 SIZE (rust/crates/cfg_aliases-0.1.1.crate) = 6009
-SHA256 (rust/crates/clap-4.5.3.crate) = 949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813
-SIZE (rust/crates/clap-4.5.3.crate) = 55388
-SHA256 (rust/crates/clap_builder-4.5.2.crate) = ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4
-SIZE (rust/crates/clap_builder-4.5.2.crate) = 163566
-SHA256 (rust/crates/clap_derive-4.5.3.crate) = 90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f
-SIZE (rust/crates/clap_derive-4.5.3.crate) = 29043
-SHA256 (rust/crates/clap_lex-0.7.0.crate) = 98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce
-SIZE (rust/crates/clap_lex-0.7.0.crate) = 11915
+SHA256 (rust/crates/clap-4.5.20.crate) = b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8
+SIZE (rust/crates/clap-4.5.20.crate) = 56376
+SHA256 (rust/crates/clap_builder-4.5.20.crate) = 19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54
+SIZE (rust/crates/clap_builder-4.5.20.crate) = 163812
+SHA256 (rust/crates/clap_derive-4.5.18.crate) = 4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab
+SIZE (rust/crates/clap_derive-4.5.18.crate) = 30131
+SHA256 (rust/crates/clap_lex-0.7.2.crate) = 1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97
+SIZE (rust/crates/clap_lex-0.7.2.crate) = 12805
 SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5
 SIZE (rust/crates/equivalent-1.0.1.crate) = 6615
-SHA256 (rust/crates/hashbrown-0.14.3.crate) = 290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604
-SIZE (rust/crates/hashbrown-0.14.3.crate) = 141425
+SHA256 (rust/crates/hashbrown-0.15.0.crate) = 1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb
+SIZE (rust/crates/hashbrown-0.15.0.crate) = 136460
 SHA256 (rust/crates/heck-0.5.0.crate) = 2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea
 SIZE (rust/crates/heck-0.5.0.crate) = 11517
-SHA256 (rust/crates/indexmap-2.2.5.crate) = 7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4
-SIZE (rust/crates/indexmap-2.2.5.crate) = 81498
-SHA256 (rust/crates/libc-0.2.153.crate) = 9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd
-SIZE (rust/crates/libc-0.2.153.crate) = 740614
-SHA256 (rust/crates/memchr-2.7.1.crate) = 523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149
-SIZE (rust/crates/memchr-2.7.1.crate) = 96307
-SHA256 (rust/crates/memmap2-0.9.4.crate) = fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322
-SIZE (rust/crates/memmap2-0.9.4.crate) = 32752
-SHA256 (rust/crates/memoffset-0.9.0.crate) = 5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c
-SIZE (rust/crates/memoffset-0.9.0.crate) = 9033
+SHA256 (rust/crates/indexmap-2.6.0.crate) = 707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da
+SIZE (rust/crates/indexmap-2.6.0.crate) = 85204
+SHA256 (rust/crates/libc-0.2.161.crate) = 8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1
+SIZE (rust/crates/libc-0.2.161.crate) = 765389
+SHA256 (rust/crates/memchr-2.7.4.crate) = 78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3
+SIZE (rust/crates/memchr-2.7.4.crate) = 96670
+SHA256 (rust/crates/memmap2-0.9.5.crate) = fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f
+SIZE (rust/crates/memmap2-0.9.5.crate) = 33280
+SHA256 (rust/crates/memoffset-0.9.1.crate) = 488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a
+SIZE (rust/crates/memoffset-0.9.1.crate) = 9032
 SHA256 (rust/crates/nix-0.28.0.crate) = ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4
 SIZE (rust/crates/nix-0.28.0.crate) = 311086
-SHA256 (rust/crates/proc-macro-crate-3.1.0.crate) = 6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284
-SIZE (rust/crates/proc-macro-crate-3.1.0.crate) = 11084
-SHA256 (rust/crates/proc-macro2-1.0.79.crate) = e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e
-SIZE (rust/crates/proc-macro2-1.0.79.crate) = 47200
-SHA256 (rust/crates/quick-xml-0.31.0.crate) = 1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33
-SIZE (rust/crates/quick-xml-0.31.0.crate) = 172236
-SHA256 (rust/crates/quote-1.0.35.crate) = 291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef
-SIZE (rust/crates/quote-1.0.35.crate) = 28136
+SHA256 (rust/crates/proc-macro-crate-3.2.0.crate) = 8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b
+SIZE (rust/crates/proc-macro-crate-3.2.0.crate) = 11164
+SHA256 (rust/crates/proc-macro2-1.0.89.crate) = f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e
+SIZE (rust/crates/proc-macro2-1.0.89.crate) = 49446
+SHA256 (rust/crates/quick-xml-0.36.2.crate) = f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe
+SIZE (rust/crates/quick-xml-0.36.2.crate) = 185201
+SHA256 (rust/crates/quote-1.0.37.crate) = b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af
+SIZE (rust/crates/quote-1.0.37.crate) = 28558
 SHA256 (rust/crates/shmemfdrs2-1.0.0.crate) = 70a05cf957f811e44f99c629e6d34025429912ffb2333f2960372669e670f54c
 SIZE (rust/crates/shmemfdrs2-1.0.0.crate) = 7919
-SHA256 (rust/crates/syn-2.0.53.crate) = 7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032
-SIZE (rust/crates/syn-2.0.53.crate) = 254828
-SHA256 (rust/crates/thiserror-1.0.58.crate) = 03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297
-SIZE (rust/crates/thiserror-1.0.58.crate) = 21025
-SHA256 (rust/crates/thiserror-impl-1.0.58.crate) = c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7
-SIZE (rust/crates/thiserror-impl-1.0.58.crate) = 15645
-SHA256 (rust/crates/toml_datetime-0.6.5.crate) = 3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1
-SIZE (rust/crates/toml_datetime-0.6.5.crate) = 10910
-SHA256 (rust/crates/toml_edit-0.21.1.crate) = 6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1
-SIZE (rust/crates/toml_edit-0.21.1.crate) = 101661
-SHA256 (rust/crates/unicode-ident-1.0.12.crate) = 3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b
-SIZE (rust/crates/unicode-ident-1.0.12.crate) = 42168
-SHA256 (rust/crates/wayrs-client-1.0.3.crate) = ae384b841a260a5d86f471b21c22639a6fd41fe37c407be72a6d714fd3433bae
-SIZE (rust/crates/wayrs-client-1.0.3.crate) = 54704
-SHA256 (rust/crates/wayrs-proto-parser-2.0.0.crate) = 1406ebeb6ba4a201745a92c221eca3dcec5b404fcbe948acf8a166b323582fa9
-SIZE (rust/crates/wayrs-proto-parser-2.0.0.crate) = 4475
-SHA256 (rust/crates/wayrs-protocols-0.13.2.crate) = b37562eeb522e6cbc9fb9e4e96a8622e10d0f31fec780ed5c12c1fc15d127a47
-SIZE (rust/crates/wayrs-protocols-0.13.2.crate) = 161400
-SHA256 (rust/crates/wayrs-scanner-0.13.2.crate) = e387d47549e37bd2a6f03973a77578bb003f661559a096c9274b5b9bcd78bf1f
-SIZE (rust/crates/wayrs-scanner-0.13.2.crate) = 7925
-SHA256 (rust/crates/winnow-0.5.40.crate) = f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876
-SIZE (rust/crates/winnow-0.5.40.crate) = 159316
+SHA256 (rust/crates/syn-2.0.86.crate) = e89275301d38033efb81a6e60e3497e734dfcc62571f2854bf4b16690398824c
+SIZE (rust/crates/syn-2.0.86.crate) = 276473
+SHA256 (rust/crates/thiserror-1.0.66.crate) = 5d171f59dbaa811dbbb1aee1e73db92ec2b122911a48e1390dfe327a821ddede
+SIZE (rust/crates/thiserror-1.0.66.crate) = 21844
+SHA256 (rust/crates/thiserror-impl-1.0.66.crate) = b08be0f17bd307950653ce45db00cd31200d82b624b36e181337d9c7d92765b5
+SIZE (rust/crates/thiserror-impl-1.0.66.crate) = 16131
+SHA256 (rust/crates/toml_datetime-0.6.8.crate) = 0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41
+SIZE (rust/crates/toml_datetime-0.6.8.crate) = 12028
+SHA256 (rust/crates/toml_edit-0.22.22.crate) = 4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5
+SIZE (rust/crates/toml_edit-0.22.22.crate) = 106387
+SHA256 (rust/crates/unicode-ident-1.0.13.crate) = e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe
+SIZE (rust/crates/unicode-ident-1.0.13.crate) = 43279
+SHA256 (rust/crates/wayrs-client-1.1.2.crate) = 38de237bedae071e5557d126e1baa1b88ae7512c725fdd54617453f3b544f3e0
+SIZE (rust/crates/wayrs-client-1.1.2.crate) = 50847
+SHA256 (rust/crates/wayrs-core-1.0.3.crate) = e8bb65fd8a7197918772a8622547b380d4ca62c53a6c43c2b176dcb3f8b69246
+SIZE (rust/crates/wayrs-core-1.0.3.crate) = 9380
+SHA256 (rust/crates/wayrs-proto-parser-2.0.3.crate) = 076ab8342497b77753c4f882f6d1654e1f8f4bd648ce72d045f237b8a727f4c9
+SIZE (rust/crates/wayrs-proto-parser-2.0.3.crate) = 5292
+SHA256 (rust/crates/wayrs-protocols-0.14.3.crate) = 28591a3ed941f8db9a747f4256ac65efda2cfae983315fd8cbe046bea91f2518
+SIZE (rust/crates/wayrs-protocols-0.14.3.crate) = 185879
+SHA256 (rust/crates/wayrs-scanner-0.15.0.crate) = 21f171cbfea7942eb5a4648496730cc7757536fa5ac77774652a13b1570085c5
+SIZE (rust/crates/wayrs-scanner-0.15.0.crate) = 8982
+SHA256 (rust/crates/winnow-0.6.20.crate) = 36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b
+SIZE (rust/crates/winnow-0.6.20.crate) = 163617
 SHA256 (MaxVerevkin-rustbus-service-1bd3aef5fe2a646685c8e640c0f67a645eeaf41d_GH0.tar.gz) = 2c8b9a1f96582a811ce82d91b05699c9ba3ddb30e037f87d367aa24c484f9a54
 SIZE (MaxVerevkin-rustbus-service-1bd3aef5fe2a646685c8e640c0f67a645eeaf41d_GH0.tar.gz) = 7267
 SHA256 (KillingSpark-rustbus-5875f1fefc054ed4e2d91641f59a55b9eaee5be9_GH0.tar.gz) = 687911471c0259cab103b683b1c7772600728b0a41d48c1401571d66d50817f3
 SIZE (KillingSpark-rustbus-5875f1fefc054ed4e2d91641f59a55b9eaee5be9_GH0.tar.gz) = 94248
-SHA256 (MaxVerevkin-wl-gammarelay-rs-v0.4.1_GH0.tar.gz) = 42eec83de003c5f8c9c6c5abce3f0eadb80f5abb027d266bcc77183ecce14edc
-SIZE (MaxVerevkin-wl-gammarelay-rs-v0.4.1_GH0.tar.gz) = 27220
+SHA256 (MaxVerevkin-wl-gammarelay-rs-v1.0.0_GH0.tar.gz) = ca95f990b5dec2fcb87a20a6136fdae11d5f0d3ff63e3d3c0f55767e24d697ec
+SIZE (MaxVerevkin-wl-gammarelay-rs-v1.0.0_GH0.tar.gz) = 27611
--- a/archivers/Makefile
+++ b/archivers/Makefile
@ -184,6 +184,7 @@
    SUBDIR += ppunpack
    SUBDIR += py-acefile
    SUBDIR += py-bitshuffle
+    SUBDIR += py-blosc
    SUBDIR += py-blosc2
    SUBDIR += py-borgbackup
    SUBDIR += py-borgbackup12
@ -222,7 +223,6 @@
    SUBDIR += rar
    SUBDIR += rpm2cpio
    SUBDIR += rpm4
-    SUBDIR += rubygem-archive-tar-minitar
    SUBDIR += rubygem-archive-zip
    SUBDIR += rubygem-bzip2-ffi
    SUBDIR += rubygem-bzip2-ruby
--- a/archivers/libarchive/Makefile
+++ b/archivers/libarchive/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	libarchive
-DISTVERSION=	3.7.6
+DISTVERSION=	3.7.7
 PORTEPOCH=	1
 CATEGORIES=	archivers
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ \
--- a/archivers/libarchive/distinfo
+++ b/archivers/libarchive/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1727106643
-SHA256 (libarchive-3.7.6.tar.xz) = 0a2efdcb185da2eb1e7cd8421434cb9a6119f72417a13335cca378d476fd3ba0
-SIZE (libarchive-3.7.6.tar.xz) = 5458552
+TIMESTAMP = 1728812283
+SHA256 (libarchive-3.7.7.tar.xz) = 879acd83c3399c7caaee73fe5f7418e06087ab2aaf40af3e99b9e29beb29faee
+SIZE (libarchive-3.7.7.tar.xz) = 5480580
--- a/archivers/libarchive/pkg-plist
+++ b/archivers/libarchive/pkg-plist
@ -6,7 +6,7 @@ include/archive.h
 include/archive_entry.h
 lib/libarchive.so
 lib/libarchive.so.13
-lib/libarchive.so.13.7.6
+lib/libarchive.so.13.7.7
 libdata/pkgconfig/libarchive.pc
 share/man/man1/bsdcat.1.gz
 share/man/man1/bsdcpio.1.gz
--- a/archivers/nfpm/Makefile
+++ b/archivers/nfpm/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	nfpm
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.40.0
+DISTVERSION=	2.41.0
 CATEGORIES=	archivers

 MAINTAINER=	yuri@FreeBSD.org
--- a/archivers/nfpm/distinfo
+++ b/archivers/nfpm/distinfo
@ -1,5 +1,5 @@
-TIMESTAMP = 1726442444
-SHA256 (go/archivers_nfpm/nfpm-v2.40.0/v2.40.0.mod) = 6db1070a90678afc07091275276e26a55336108eaa06e11c67922187376b7b7a
-SIZE (go/archivers_nfpm/nfpm-v2.40.0/v2.40.0.mod) = 3385
-SHA256 (go/archivers_nfpm/nfpm-v2.40.0/v2.40.0.zip) = 36b73752ec85126fc82ec4ec8bfcf99cabf8158804332555e1d4a32a82b68259
-SIZE (go/archivers_nfpm/nfpm-v2.40.0/v2.40.0.zip) = 555580
+TIMESTAMP = 1729922466
+SHA256 (go/archivers_nfpm/nfpm-v2.41.0/v2.41.0.mod) = 4ce474815fa27981ece8de27919c878af7ab00c59728e6c74a5286fd63c82208
+SIZE (go/archivers_nfpm/nfpm-v2.41.0/v2.41.0.mod) = 3386
+SHA256 (go/archivers_nfpm/nfpm-v2.41.0/v2.41.0.zip) = 7b2a077321b0e2a482d6e0ba681773ab56b4f589bb67e5d5cad97d351b4b40c4
+SIZE (go/archivers_nfpm/nfpm-v2.41.0/v2.41.0.zip) = 556136
--- a/archivers/py-blosc/Makefile
+++ b/archivers/py-blosc/Makefile
@ -0,0 +1,33 @@
+PORTNAME=	blosc
+PORTVERSION=	1.11.2
+CATEGORIES=	archivers python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Blosc data compressor
+WWW=		https://www.blosc.org/python-blosc/python-blosc.html \
+		https://github.com/Blosc/python-blosc
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}py-cpuinfo>=0:sysutils/py-py-cpuinfo@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}scikit-build>=0:devel/py-scikit-build@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+LIB_DEPENDS=	libblosc.so:archivers/c-blosc
+
+USES=		cmake:indirect python
+USE_PYTHON=	autoplist concurrent pep517
+
+MAKE_ENV=	USE_SYSTEM_BLOSC=1
+
+post-patch:
+# Clean up bundled libraries
+	@${RM} -r ${WRKSRC}/blosc/c-blosc/
+
+post-install:
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
+
+.include <bsd.port.mk>
--- a/archivers/py-blosc/distinfo
+++ b/archivers/py-blosc/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1730540888
+SHA256 (blosc-1.11.2.tar.gz) = ac5e7c1bfc1c7232b900be94cddb5ffcf9ea49f313c8ae98a7ca0dd87b872bf4
+SIZE (blosc-1.11.2.tar.gz) = 1434010
--- a/archivers/py-blosc/files/patch-pyproject.toml
+++ b/archivers/py-blosc/files/patch-pyproject.toml
@ -0,0 +1,6 @@
+--- pyproject.toml.orig	2024-06-24 16:59:37 UTC
+++ pyproject.toml
+@@ -1,2 +1,2 @@
+ [build-system]
+-requires = ["setuptools", "scikit-build", "cmake", "ninja", "py-cpuinfo"]
+requires = ["setuptools", "scikit-build", "py-cpuinfo"]
--- a/archivers/py-blosc/pkg-descr
+++ b/archivers/py-blosc/pkg-descr
@ -0,0 +1,9 @@
+Blosc is a high performance compressor optimized for binary data. It has been
+designed to transmit data to the processor cache faster than the traditional,
+non-compressed, direct memory fetch approach via a memcpy() OS call.
+
+Blosc works well for compressing numerical arrays that contains data with
+relatively low entropy, like sparse data, time series, grids with regular-spaced
+values, etc.
+
+python-blosc a Python package that wraps Blosc.
--- a/archivers/rubygem-archive-tar-minitar/Makefile
+++ b/archivers/rubygem-archive-tar-minitar/Makefile
@ -1,23 +0,0 @@
-PORTNAME=	archive-tar-minitar
-PORTVERSION=	0.12
-CATEGORIES=	archivers rubygems
-MASTER_SITES=	RG
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Library and command-line utility for tar archives
-WWW=		https://github.com/halostatue/minitar
-
-LICENSE=	BSD2CLAUSE RUBY
-LICENSE_COMB=	dual
-
-DEPRECATED=	archive-tar-minitar has been deprecated. Use archivers/rubygem-minitar instead
-EXPIRATION_DATE=2024-10-31
-
-RUN_DEPENDS=	rubygem-minitar0>=${PORTVERSION}<1:archivers/rubygem-minitar0 \
-		rubygem-minitar-cli0>=${PORTVERSION}<1:archivers/rubygem-minitar-cli0
-
-USES=		gem
-
-NO_ARCH=	yes
-
-.include <bsd.port.mk>
--- a/archivers/rubygem-archive-tar-minitar/distinfo
+++ b/archivers/rubygem-archive-tar-minitar/distinfo
@ -1,3 +0,0 @@
-TIMESTAMP = 1727314616
-SHA256 (rubygem/archive-tar-minitar-0.12.gem) = bfdbbf5b5af12eb4eadfe70238214b3de224204c4caa5259fe020fb87bd8dcb2
-SIZE (rubygem/archive-tar-minitar-0.12.gem) = 4608
--- a/archivers/rubygem-archive-tar-minitar/pkg-descr
+++ b/archivers/rubygem-archive-tar-minitar/pkg-descr
@ -1,10 +0,0 @@
-The minitar (previously called Archive::Tar::Minitar) library is a pure-Ruby
-library that provides the ability to deal with POSIX tar(1) archive files.
-
-This is release 0.6+, providing a number of bug fixes including a directory
-traversal vulnerability, CVE-2016-10173. This release starts the migration and
-modernization of the code:
- the minitar command-line program has been separated into the minitar-cli gem;
-  and
- the archive-tar-minitar gem now points to the minitar and minitar-cli gems and
-  discourages its installation.
--- a/archivers/snappy-java/Makefile
+++ b/archivers/snappy-java/Makefile
@ -5,6 +5,7 @@
 PORTNAME=	snappy
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.10.5
+PORTREVISION=	1
 CATEGORIES=	archivers java
 MASTER_SITES=	LOCAL/otis:repo
 PKGNAMESUFFIX=	java
@ -21,9 +22,6 @@ WWW=		https://github.com/xerial/snappy-java

 LICENSE=	APACHE20

-BROKEN_armv6=	fails to build: maven-assembly-plugin: Failed to retrieve numeric file attributes
-BROKEN_armv7=	fails to build: maven-assembly-plugin: Failed to retrieve numeric file attributes
-
 BUILD_DEPENDS=	cmake:devel/cmake-core \
 		sbt:devel/sbt

@ -75,6 +73,8 @@ PLATFORM_DIR_SUFFIX=	FreeBSD-x86_64
 PLATFORM_DIR_SUFFIX=	FreeBSD-x86
 . elif ${ARCH} == aarch64
 PLATFORM_DIR_SUFFIX=	FreeBSD-aarch64
+. elif ${ARCH} == armv6 || ${ARCH} == armv7
+PLATFORM_DIR_SUFFIX=	FreeBSD-arm
 . elif ${ARCH} == powerpc64
 PLATFORM_DIR_SUFFIX=	FreeBSD-ppc64
 . elif ${ARCH} == powerpc64le
--- a/archivers/snappy-java/files/patch-Makefile.common
+++ b/archivers/snappy-java/files/patch-Makefile.common
@ -1,6 +1,6 @@
 --- Makefile.common.orig	2023-09-27 02:22:20 UTC
 +++ Makefile.common
-@@ -29,8 +29,13 @@ IBM_JDK_LIB := lib/inc_ibm
+@@ -29,8 +29,13 @@ else
 ifeq ($(OS_NAME),Mac)
 ENDIANESS:="Little Endian"
 else
@ -20,11 +20,11 @@
 
 # To support new CPU architecture, add a new target name here
 -known_os_archs := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-android-aarch64 Linux-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 Mac-aarch64 FreeBSD-x86_64 Windows-x86 Windows-x86_64 Windows-aarch64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64 Linux-riscv Linux-riscv64
-+known_os_archs := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-android-aarch64 Linux-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 Mac-aarch64 FreeBSD-aarch64 FreeBSD-ppc64 FreeBSD-ppc64le FreeBSD-x86 FreeBSD-x86_64 Windows-x86 Windows-x86_64 Windows-aarch64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64 Linux-riscv Linux-riscv64
+known_os_archs := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-android-aarch64 Linux-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 Mac-aarch64 FreeBSD-arm FreeBSD-aarch64 FreeBSD-ppc64 FreeBSD-ppc64le FreeBSD-x86 FreeBSD-x86_64 Windows-x86 Windows-x86_64 Windows-aarch64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64 Linux-riscv Linux-riscv64
 os_arch := $(OS_NAME)-$(OS_ARCH)
 IBM_JDK_7 := $(findstring IBM, $(shell $(JAVA) -version 2>&1 | grep IBM | grep "JRE 1.7"))
 
-@@ -262,6 +267,34 @@ Mac-x86_64_CXXFLAGS  := -Ilib/inc_mac -I$(JAVA_HOME)/i
+@@ -262,6 +267,41 @@ Mac-x86_64_SNAPPY_FLAGS  :=
 Mac-x86_64_LINKFLAGS := -dynamiclib
 Mac-x86_64_LIBNAME   := libsnappyjava.dylib
 Mac-x86_64_SNAPPY_FLAGS  :=
@ -36,6 +36,13 @@
 +FreeBSD-aarch64_LIBNAME      := libsnappyjava.so
 +FreeBSD-aarch64_SNAPPY_FLAGS :=
 +
+FreeBSD-arm_CXX          := $(CROSS_PREFIX)g++
+FreeBSD-arm_STRIP        := $(CROSS_PREFIX)strip
+FreeBSD-arm_CXXFLAGS     := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
+FreeBSD-arm_LINKFLAGS    := -shared -static-libgcc
+FreeBSD-arm_LIBNAME      := libsnappyjava.so
+FreeBSD-arm_SNAPPY_FLAGS :=
+
 +FreeBSD-ppc64_CXX          := $(CROSS_PREFIX)g++
 +FreeBSD-ppc64_STRIP        := $(CROSS_PREFIX)strip
 +FreeBSD-ppc64_CXXFLAGS     := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
--- a/archivers/stormlib/Makefile
+++ b/archivers/stormlib/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	stormlib
-PORTVERSION=	9.26
+PORTVERSION=	9.30
 DISTVERSIONPREFIX=	v
 CATEGORIES=	archivers

--- a/archivers/stormlib/distinfo
+++ b/archivers/stormlib/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1718026668
-SHA256 (ladislav-zezula-StormLib-v9.26_GH0.tar.gz) = 252efd25430aeba2fea4e0ffd99015c51b3ccedd16efa0c5ec73fd00550d8270
-SIZE (ladislav-zezula-StormLib-v9.26_GH0.tar.gz) = 610223
+TIMESTAMP = 1730558310
+SHA256 (ladislav-zezula-StormLib-v9.30_GH0.tar.gz) = a709a6b034d206404f5297d85e474371203ff5483639955195d99b737bbf7dfe
+SIZE (ladislav-zezula-StormLib-v9.30_GH0.tar.gz) = 617848
--- a/archivers/tartest/Makefile
+++ b/archivers/tartest/Makefile
@ -2,7 +2,7 @@ PORTNAME=	tartest
 CATEGORIES=	archivers devel

 COMMENT=	Test tar archive for POSIX.1-1990 compliance
-WWW=		https://schilytools.sourceforge.net/
+WWW=		https://codeberg.org/schilytools/schilytools

 MASTERDIR=	${.CURDIR}/../../devel/schilybase
 COMPONENTS=	tartest
--- a/astro/kosmindoormap/Makefile
+++ b/astro/kosmindoormap/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	kosmindoormap
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	astro kde kde-applications

 MAINTAINER=	kde@FreeBSD.org
--- a/astro/libosmpbf/Makefile
+++ b/astro/libosmpbf/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	libosmpbf
 PORTVERSION=	1.5.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	astro geography devel

 MAINTAINER=	amdmi3@FreeBSD.org
--- a/astro/marble/Makefile
+++ b/astro/marble/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	marble
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	astro education kde kde-applications

 MAINTAINER=	kde@FreeBSD.org
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	merkaartor
 PORTVERSION=	0.19.0
-PORTREVISION=	24
+PORTREVISION=	25
 CATEGORIES=	astro

 MAINTAINER=	dev2@heesakkers.info
--- a/astro/p5-Astro-Catalog/Makefile
+++ b/astro/p5-Astro-Catalog/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	Astro-Catalog
-PORTVERSION=	4.37
+PORTVERSION=	4.38
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/astro/p5-Astro-Catalog/distinfo
+++ b/astro/p5-Astro-Catalog/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1682354622
-SHA256 (Astro-Catalog-4.37.tar.gz) = 10a6b82509e4ffa2d5c5c7a0ee1647f3a9357645908d60d3d6dfafdd42084ceb
-SIZE (Astro-Catalog-4.37.tar.gz) = 277514
+TIMESTAMP = 1730387158
+SHA256 (Astro-Catalog-4.38.tar.gz) = 6b62a823316e55fda16915c9bf0a0abc1b976523a78f82f68b20b203902b2319
+SIZE (Astro-Catalog-4.38.tar.gz) = 278662
--- a/astro/p5-Astro-Coords/Makefile
+++ b/astro/p5-Astro-Coords/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	Astro-Coords
-PORTVERSION=	0.21
+PORTVERSION=	0.22
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/astro/p5-Astro-Coords/distinfo
+++ b/astro/p5-Astro-Coords/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1681918890
-SHA256 (Astro-Coords-0.21.tar.gz) = 37dc8dc183ce2723738f3a9d0d68a468eda801b3db3b392a37815fd37279c7c6
-SIZE (Astro-Coords-0.21.tar.gz) = 138574
+TIMESTAMP = 1730540906
+SHA256 (Astro-Coords-0.22.tar.gz) = b16f5c0a45d5fea9ba90eecf362b93d7d5a98a886e409f7a90fc6e47850bcca0
+SIZE (Astro-Coords-0.22.tar.gz) = 138816
--- a/astro/p5-Astro-WaveBand/Makefile
+++ b/astro/p5-Astro-WaveBand/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	Astro-WaveBand
-PORTVERSION=	0.11
+PORTVERSION=	0.12
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/astro/p5-Astro-WaveBand/distinfo
+++ b/astro/p5-Astro-WaveBand/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1701083352
-SHA256 (Astro-WaveBand-0.11.tar.gz) = f7c383c01ef5781e27676b72c6842f43a943bf87fdff6e574387d71c265598fb
-SIZE (Astro-WaveBand-0.11.tar.gz) = 14647
+TIMESTAMP = 1730387080
+SHA256 (Astro-WaveBand-0.12.tar.gz) = 71b892f68aa491f8b9b59b2c71a0f340ee50329c999cefaa57711d14aa8e5b32
+SIZE (Astro-WaveBand-0.12.tar.gz) = 16193
--- a/audio/Makefile
+++ b/audio/Makefile
@ -39,7 +39,6 @@
    SUBDIR += atunes
    SUBDIR += aubio
    SUBDIR += audacity
-    SUBDIR += audiere
    SUBDIR += audiocd-kio
    SUBDIR += audiowmark
    SUBDIR += aumix
@ -199,7 +198,6 @@
    SUBDIR += freepats
    SUBDIR += ft2-clone
    SUBDIR += ft2play
-    SUBDIR += funktrackergold
    SUBDIR += furnace
    SUBDIR += ganv
    SUBDIR += gbsplay
@ -382,7 +380,6 @@
    SUBDIR += libopusenc
    SUBDIR += libremidi
    SUBDIR += libsamplerate
-    SUBDIR += libshairport
    SUBDIR += libshout
    SUBDIR += libsidplay
    SUBDIR += libsidplayfp
@ -601,6 +598,7 @@
    SUBDIR += picard
    SUBDIR += picard-plugins
    SUBDIR += pipewire-module-xrdp
+    SUBDIR += pipewire-spa-oss
    SUBDIR += pithos
    SUBDIR += plasma5-kpipewire
    SUBDIR += plasma5-oxygen-sounds
--- a/audio/ardour/Makefile
+++ b/audio/ardour/Makefile
@ -1,12 +1,11 @@
 PORTNAME=	ardour
-DISTVERSION=	8.6.0
-PORTREVISION=	2
+DISTVERSION=	8.10.0
 CATEGORIES=	audio
 # Official source download is tailored to browsers, downloads from github are
 # deliberately made empty. Put the badly named distfile into a subdirectory.
 MASTER_SITES=	https://community.ardour.org/download/release/
 DISTNAME=	Ardour-${DISTVERSION}
-DISTFILES=	574
+DISTFILES=	598
 DIST_SUBDIR=	${DISTNAME}

 MAINTAINER=	dev@submerge.ch
@ -16,7 +15,8 @@ WWW=		https://ardour.org/
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING

-BUILD_DEPENDS=	lv2>=1.18.0:audio/lv2 \
+BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
+		lv2>=1.18.0:audio/lv2 \
 		itstool>2.0.0:textproc/itstool \
 		${BUILD_DEPENDS_${ARCH}}
 BUILD_DEPENDS_aarch64=	as:devel/binutils
@ -33,7 +33,6 @@ LIB_DEPENDS=	libserd-0.so:devel/serd \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
-		libboost_date_time.so:devel/boost-libs \
 		libvamp-hostsdk.so:audio/vamp-plugin-sdk \
 		libsamplerate.so:audio/libsamplerate \
 		libsndfile.so:audio/libsndfile \
@ -45,11 +44,13 @@ LIB_DEPENDS=	libserd-0.so:devel/serd \
 		libFLAC.so:audio/flac \
 		libwebsockets.so:net/libwebsockets

+# libboost_date_time.so:devel/boost-libs
+
 USES=		compiler:c++11-lang desktop-file-utils gettext gnome \
-		libarchive pkgconfig python:build readline tar:bzip2 \
+		libarchive pkgconfig python:build readline ssl tar:bzip2 \
 		waf xorg shared-mime-info
 USE_CXXSTD=	c++11
-USE_GNOME=	atk cairo cairomm gdkpixbuf2 glib20 glibmm gtk20 gtkmm24 pango
+USE_GNOME=	atk cairo cairomm gdkpixbuf2 glib20 glibmm gtk20 gtkmm24 libxml2 pango
 USE_LDCONFIG=	yes
 USE_XORG=	x11

--- a/audio/ardour/distinfo
+++ b/audio/ardour/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1713026350
-SHA256 (Ardour-8.6.0/574) = e19740e980b162ecd22379b735000741609f89c7553796b75f47b75e2f1e0a8e
-SIZE (Ardour-8.6.0/574) = 17588463
+TIMESTAMP = 1729206695
+SHA256 (Ardour-8.10.0/598) = ef7a9db00d80f114f8d0869ea3cdc202fdaa1202f273755f1219ff757880881c
+SIZE (Ardour-8.10.0/598) = 17811275
--- a/audio/ardour/files/patch-libs_surfaces_websockets_message.cc
+++ b/audio/ardour/files/patch-libs_surfaces_websockets_message.cc
@ -1,32 +0,0 @@
-commit f94bde59d740d65e67c5cd13af4d7ea51453aeaa
-Author: Fabio Pesari <posta@parallelo.eu>
-Date:   Sun Sep 15 11:04:30 2024 +0200
-
-    Fix for Boost 1.8.5
-    
-    Recent boost prevents calls to `get_child` with temporary
-    default values.
-
-diff --git libs/surfaces/websockets/message.cc libs/surfaces/websockets/message.cc
-index eff8e48ac3..0aee14d0df 100644
--- libs/surfaces/websockets/message.cc
-+++ libs/surfaces/websockets/message.cc
-@@ -58,14 +58,16 @@ NodeStateMessage::NodeStateMessage (void* buf, size_t len)
- 
- 		_state = NodeState (root.get<std::string> ("node"));
- 
-		pt::ptree addr = root.get_child ("addr", pt::ptree ());
-+		pt::ptree addr = pt::ptree ();
-+		addr = root.get_child ("addr", addr);
- 
- 		for (pt::ptree::iterator it = addr.begin (); it != addr.end (); ++it) {
- 			// throws if datatype not uint32_t
- 			_state.add_addr (boost::lexical_cast<uint32_t> (it->second.data ()));
- 		}
- 
-		pt::ptree val = root.get_child ("val", pt::ptree ());
-+		pt::ptree val = pt::ptree ();
-+		val = root.get_child ("val", val);
- 
- 		for (pt::ptree::iterator it = val.begin (); it != val.end (); ++it) {
- 			std::string val = it->second.data ();
--- a/audio/ardour/pkg-plist
+++ b/audio/ardour/pkg-plist
@ -98,6 +98,7 @@ lib/%%ARDOUR_MAJOR%%/surfaces/libardour_faderport2.so
 lib/%%ARDOUR_MAJOR%%/surfaces/libardour_faderport8.so
 lib/%%ARDOUR_MAJOR%%/surfaces/libardour_generic_midi.so
 lib/%%ARDOUR_MAJOR%%/surfaces/libardour_launch_control_xl.so
+lib/%%ARDOUR_MAJOR%%/surfaces/libardour_launchkey_4.so
 lib/%%ARDOUR_MAJOR%%/surfaces/libardour_launchpad_mini.so
 lib/%%ARDOUR_MAJOR%%/surfaces/libardour_launchpad_pro.so
 lib/%%ARDOUR_MAJOR%%/surfaces/libardour_launchpad_x.so
@ -189,6 +190,8 @@ share/applications/%%ARDOUR_MAJOR%%.desktop
 %%DATADIR%%/icons/launchpad-mini.png
 %%DATADIR%%/icons/launchpad-pro.png
 %%DATADIR%%/icons/launchpad-x.png
+%%DATADIR%%/icons/lkmk4.png
+%%DATADIR%%/icons/lkmk4mini.png
 %%DATADIR%%/icons/mezzforte.png
 %%DATADIR%%/icons/mezzoforte.png
 %%DATADIR%%/icons/mezzopiano.png
@ -310,6 +313,7 @@ share/applications/%%ARDOUR_MAJOR%%.desktop
 %%DATADIR%%/midi_maps/AKAI_MPK249.map
 %%DATADIR%%/midi_maps/AKAI_MPK61.map
 %%DATADIR%%/midi_maps/AKAI_MPKmini.map
+%%DATADIR%%/midi_maps/AKAI_MPKmini_mk3.map
 %%DATADIR%%/midi_maps/AKAI_MPKminiplus.map
 %%DATADIR%%/midi_maps/Alesis_Q49v2.map
 %%DATADIR%%/midi_maps/Alesis_QX25.map
@ -328,6 +332,7 @@ share/applications/%%ARDOUR_MAJOR%%.desktop
 %%DATADIR%%/midi_maps/Korg_taktile.map
 %%DATADIR%%/midi_maps/M-Audio_Axiom25.map
 %%DATADIR%%/midi_maps/M-Audio_Axiom61.map
+%%DATADIR%%/midi_maps/M-Audio_Axiom_49_mkII.map
 %%DATADIR%%/midi_maps/M-Audio_Axiom_AIR_Mini_32.map
 %%DATADIR%%/midi_maps/M-Audio_Axiom_Air_25_2015_Model_Transport_Only.map
 %%DATADIR%%/midi_maps/M-Audio_Oxygen49.map
@ -578,6 +583,7 @@ share/applications/%%ARDOUR_MAJOR%%.desktop
 %%DATADIR%%/patchfiles/Korg_Wavestation_SR.midnam
 %%DATADIR%%/patchfiles/Korg_X2_3_3R.midnam
 %%DATADIR%%/patchfiles/Korg_X5(D).midnam
+%%DATADIR%%/patchfiles/Korg_X50.midnam
 %%DATADIR%%/patchfiles/Korg_X5DR.midnam
 %%DATADIR%%/patchfiles/Korg_Z1.midnam
 %%DATADIR%%/patchfiles/Korg_iSeries.midnam
@ -591,6 +597,7 @@ share/applications/%%ARDOUR_MAJOR%%.desktop
 %%DATADIR%%/patchfiles/Kurzweil_K2500_2600_Expansion.midnam
 %%DATADIR%%/patchfiles/Kurzweil_K2600.midnam
 %%DATADIR%%/patchfiles/Kurzweil_K2661.midnam
+%%DATADIR%%/patchfiles/Kurzweil_K2700.midnam
 %%DATADIR%%/patchfiles/Kurzweil_Mark_12_152.midnam
 %%DATADIR%%/patchfiles/Kurzweil_Micro_Piano.midnam
 %%DATADIR%%/patchfiles/Kurzweil_PC2_PC2r_w_Orch.midnam
@ -843,6 +850,8 @@ share/applications/%%ARDOUR_MAJOR%%.desktop
 %%DATADIR%%/scripts/collapse_playlists.lua
 %%DATADIR%%/scripts/create_drum_tracks.lua
 %%DATADIR%%/scripts/delete_xrun_markers.lua
+%%DATADIR%%/scripts/dm10studio.lua
+%%DATADIR%%/scripts/duplicate_to_grid.lua
 %%DATADIR%%/scripts/export_mp4chaps.lua
 %%DATADIR%%/scripts/jump_to_marker.lua
 %%DATADIR%%/scripts/lfo_automation.lua
@ -864,6 +873,7 @@ share/applications/%%ARDOUR_MAJOR%%.desktop
 %%DATADIR%%/scripts/preare_record_example.lua
 %%DATADIR%%/scripts/raptor_arp.lua
 %%DATADIR%%/scripts/record_now.lua
+%%DATADIR%%/scripts/remove_sysex_from_region.lua
 %%DATADIR%%/scripts/remove_unknown_procs.lua
 %%DATADIR%%/scripts/reset_mixer.lua
 %%DATADIR%%/scripts/reverse_midi.lua
@ -896,6 +906,7 @@ share/applications/%%ARDOUR_MAJOR%%.desktop
 %%DATADIR%%/scripts/scl_to_mts.lua
 %%DATADIR%%/scripts/scope.lua
 %%DATADIR%%/scripts/select_every_2nd_region.lua
+%%DATADIR%%/scripts/select_regions_at_playhead.lua
 %%DATADIR%%/scripts/send_to_bus.lua
 %%DATADIR%%/scripts/session_template_advanced.lua
 %%DATADIR%%/scripts/session_template_record.lua
@ -918,6 +929,7 @@ share/applications/%%ARDOUR_MAJOR%%.desktop
 %%DATADIR%%/themes/adwaita_dark-ardour.colors
 %%DATADIR%%/themes/blueberry_milk-ardour.colors
 %%DATADIR%%/themes/caineville-ardour.colors
+%%DATADIR%%/themes/captain_light-ardour.colors
 %%DATADIR%%/themes/clear_gray-ardour.colors
 %%DATADIR%%/themes/cubasish-ardour.colors
 %%DATADIR%%/themes/dark-ardour.colors
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	audacity
 DISTVERSIONPREFIX=	Audacity-
-DISTVERSION=	3.6.4
+DISTVERSION=	3.7.0
 CATEGORIES=	audio
 MASTER_SITES+=	https://github.com/${PORTNAME}/${PORTNAME}-manual/releases/download/v${DISTVERSION}/:manual
 DISTFILES+=	${PORTNAME}-manual-${DISTVERSION}.tar.gz:manual
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@ -1,5 +1,5 @@
-TIMESTAMP = 1726810916
-SHA256 (audacity-manual-3.6.4.tar.gz) = cea3f236057bf798dd7ad9fa49c3da3e8a328163d4984ca81458afe6bcee6a83
-SIZE (audacity-manual-3.6.4.tar.gz) = 26238332
-SHA256 (audacity-audacity-Audacity-3.6.4_GH0.tar.gz) = e7d82eaae65081a1118a899751ff50ddf76a1cc0f056882eeaffcedb86c12aec
-SIZE (audacity-audacity-Audacity-3.6.4_GH0.tar.gz) = 61319349
+TIMESTAMP = 1730523950
+SHA256 (audacity-manual-3.7.0.tar.gz) = b5465f43c7185f90a9186e500fbd2ebeeb7ac83c90f06d66a0c3fbe48c4fdb42
+SIZE (audacity-manual-3.7.0.tar.gz) = 26206196
+SHA256 (audacity-audacity-Audacity-3.7.0_GH0.tar.gz) = c872dd5d3d59d3985a52d2aac9d430c3c736eed1b43f94ecee1f0868788eb769
+SIZE (audacity-audacity-Audacity-3.7.0_GH0.tar.gz) = 61647412
--- a/audio/audacity/pkg-plist
+++ b/audio/audacity/pkg-plist
@ -1,8 +1,10 @@
 bin/audacity
+lib/audacity/lib-audacity-application-logic.so
 lib/audacity/lib-audio-devices.so
 lib/audacity/lib-audio-graph.so
 lib/audacity/lib-audio-io.so
 lib/audacity/lib-basic-ui.so
+lib/audacity/lib-builtin-effects.so
 lib/audacity/lib-channel.so
 lib/audacity/lib-command-parameters.so
 lib/audacity/lib-components.so
@ -19,6 +21,7 @@ lib/audacity/lib-files.so
 lib/audacity/lib-graphics.so
 lib/audacity/lib-import-export.so
 lib/audacity/lib-ipc.so
+lib/audacity/lib-label-track.so
 %%LADSPA%%lib/audacity/lib-ladspa.so
 lib/audacity/lib-lv2.so
 lib/audacity/lib-math.so
@ -28,6 +31,7 @@ lib/audacity/lib-module-manager.so
 lib/audacity/lib-music-information-retrieval.so
 lib/audacity/lib-note-track.so
 lib/audacity/lib-numeric-formats.so
+lib/audacity/lib-nyquist-effects.so
 lib/audacity/lib-playable-track.so
 lib/audacity/lib-preference-pages.so
 lib/audacity/lib-preferences.so
@ -58,7 +62,9 @@ lib/audacity/lib-utility.so
 lib/audacity/lib-uuid.so
 lib/audacity/lib-viewport.so
 lib/audacity/lib-vst.so
+lib/audacity/lib-wave-track-fft.so
 lib/audacity/lib-wave-track-paint.so
+lib/audacity/lib-wave-track-settings.so
 lib/audacity/lib-wave-track.so
 lib/audacity/lib-wx-init.so
 lib/audacity/lib-wx-wrappers.so
@ -129,25 +135,23 @@ share/applications/audacity.desktop
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/0/0b/timeline_default_scale_with_scrub_ruler.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/0/0c/editmenuclipboundaries_splitnew_02.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/0/0c/export_ac3_3_4_0.png
+%%MANUAL%%%%DATADIR%%/help/manual/m/images/0/0c/import_menu_3_7_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/0/0c/prefs_settings_for_importing_malformed_mp3_files.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/0/0c/recording_meter_gradient_full_height.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/0/0c/spectral_edit_shelves.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/0/0d/spectral_01.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/0/0e/editmenulabeledaudio_split_2.png
-%%MANUAL%%%%DATADIR%%/help/manual/m/images/0/0e/save_project_menu_3_6_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/0/0e/selectmenuclipboundaries_prevtocursor_2.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/0/0e/silence_3_5_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/0/0e/waveform_sample_rates.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/0/0e/zoom9.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/0/0f/ex2a_cutexpanded.png
-%%MANUAL%%%%DATADIR%%/help/manual/m/images/0/0f/view_zoom_3_6_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/1/10/crossfade_tracks_effect_completed.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/1/10/gunshot.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/1/10/timer_record_w10.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/1/11/chirp_3_5_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/1/11/compressor_parameters_smoothing_spectrum_no_smoothing.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/1/11/crossfade_selected_region.png
-%%MANUAL%%%%DATADIR%%/help/manual/m/images/1/11/edit_remove_special_3_4_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/1/11/editmenuclipboundaries_detach_01.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/1/11/spectral_02.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/1/12/audio_setup_recording_device.png
@ -175,6 +179,7 @@ share/applications/audacity.desktop
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/1/16/exportaudiounitpresetsdialog.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/1/16/floated_toolbars_3_6_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/1/16/multi_view_mono_spectral_selection.png
+%%MANUAL%%%%DATADIR%%/help/manual/m/images/1/16/save_project_menu_3_7_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/1/16/set_envelope.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/1/16/timer_record_progress_stop_confirm_w10.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/1/16/tool_edit_silence.png
@ -328,6 +333,7 @@ share/applications/audacity.desktop
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/3/3c/audio_track_dropdown_menu_3_6_0_mult_view_selection.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/3/3c/punch_in_tracks002.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/3/3c/silence_finder.png
+%%MANUAL%%%%DATADIR%%/help/manual/m/images/3/3c/view_skip_to_3_7_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/3/3d/erremptyproject.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/3/3d/invert.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/3/3d/risset_drum_3_5_0.png
@ -345,6 +351,7 @@ share/applications/audacity.desktop
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/4/41/labeltrack7.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/4/41/pasteinwhitespace_cannotmove_after.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/4/42/exportmultipleexample04.png
+%%MANUAL%%%%DATADIR%%/help/manual/m/images/4/42/view_zoom_3_7_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/4/43/compare_audio.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/4/43/label_right_click_dropdown_context_menu.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/4/43/labeltrack2.png
@ -379,9 +386,7 @@ share/applications/audacity.desktop
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/4/48/timer_record_completion_w10.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/4/48/tracks_mute_unmutemenu.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/4/48/tutorial3linedup.png
-%%MANUAL%%%%DATADIR%%/help/manual/m/images/4/48/view_skip_to_3_6_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/4/48/waveform_colorway_3_1_0.png
-%%MANUAL%%%%DATADIR%%/help/manual/m/images/4/49/edit_labeled_audio_3_4_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/4/49/export_wav_3_4_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/4/49/extra_devicemenu.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/4/49/glitch_repair_after.png
@ -443,7 +448,6 @@ share/applications/audacity.desktop
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/5/57/note_track_vscale_context_menu_2.3.2.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/5/57/sound_finder.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/5/57/status_bar_disc_space_remaining.png
-%%MANUAL%%%%DATADIR%%/help/manual/m/images/5/57/view_menu_3_6_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/5/58/multi_view_stereo_default_50_50.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/5/58/splitting_and_joining_stereo_tracks_04.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/5/59/spectraledit_01.png
@ -641,6 +645,7 @@ share/applications/audacity.desktop
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/9/90/custom_ffmpeg_format_options_w10.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/9/90/export_multiple_3_4_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/9/90/play.png
+%%MANUAL%%%%DATADIR%%/help/manual/m/images/9/91/view_menu_3_7_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/9/92/compressor_parameters_smoothing_spectrum.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/9/92/hostwin7basic.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/9/92/macro_command_selection.png
@ -681,6 +686,7 @@ share/applications/audacity.desktop
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/9/9c/preferences_effects.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/9/9c/tone_3_5_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/9/9c/unsuitable_fat_drive_for_open.png
+%%MANUAL%%%%DATADIR%%/help/manual/m/images/9/9c/view_track_size_3_7_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/9/9c/waveform.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/9/9d/compressor_rt_with_graph_3_6_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/9/9d/export_to_cloud_or_computer.png
@ -719,8 +725,8 @@ share/applications/audacity.desktop
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/a/a5/render_clip_speed.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/a/a5/spectraleditparametric2000hz_10.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/a/a6/error_saving_project_disk_full.png
-%%MANUAL%%%%DATADIR%%/help/manual/m/images/a/a6/import_menu_3_6_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/a/a6/tracks_align_tracksmenu.png
+%%MANUAL%%%%DATADIR%%/help/manual/m/images/a/a7/edit_remove_special_3_7_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/a/a7/extra_scriptables_imenu.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/a/a7/normalize_3_5_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/a/a7/track_collapse_button.png
@ -728,7 +734,6 @@ share/applications/audacity.desktop
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/a/a8/errorexporting.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/a/a8/speaker.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/a/a9/dither_in_quality_preferences.png
-%%MANUAL%%%%DATADIR%%/help/manual/m/images/a/a9/file_menu_with_clouds_3_6_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/a/a9/trackdropdown.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/a/a9/tracks_panmenu.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/a/aa/help.png
@ -856,6 +861,7 @@ share/applications/audacity.desktop
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/c/c8/warning_to_save_project.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/c/c9/copy_3_2_3.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/c/c9/export_custom_ffmpeg_3_4_0.png
+%%MANUAL%%%%DATADIR%%/help/manual/m/images/c/c9/file_menu_3_7_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/c/c9/high_pass_filter_3_5_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/c/c9/label_sounds_leading.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/c/c9/labeltrack1.png
@ -950,9 +956,9 @@ share/applications/audacity.desktop
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/e/e0/manage_plugins_category_3_5_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/e/e0/select_spectral_menu_3_2_3.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/e/e0/tool_edit_zoomin.png
+%%MANUAL%%%%DATADIR%%/help/manual/m/images/e/e1/edit_labeled_audio_3_7_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/e/e1/exportmultipleexample02.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/e/e1/sltg_edits_11.png
-%%MANUAL%%%%DATADIR%%/help/manual/m/images/e/e1/view_track_size_3_6_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/e/e2/waveform_digital.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/e/e3/earbud_by_mic.jpg
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/e/e3/ex1b_before.png
@ -1028,6 +1034,7 @@ share/applications/audacity.desktop
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/f/f8/noise_gate_3_5_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/f/f8/spectraleditmultilp2000.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/f/f9/high_curve.png
+%%MANUAL%%%%DATADIR%%/help/manual/m/images/f/f9/label_interval.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/f/f9/label_track_3_6_0.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/f/f9/mono_track_example.png
 %%MANUAL%%%%DATADIR%%/help/manual/m/images/f/f9/pointlabeltextselected_w10.png
--- a/audio/audiere/Makefile
+++ b/audio/audiere/Makefile
@ -1,77 +0,0 @@
-PORTNAME=	audiere
-PORTVERSION=	1.9.4
-PORTREVISION=	7
-CATEGORIES=	audio
-MASTER_SITES=	SF
-
-MAINTAINER=	amdmi3@FreeBSD.org
-COMMENT=	High-level audio API
-WWW=		https://audiere.sourceforge.net/
-
-LICENSE=	LGPL21
-LICENSE_FILE=	${WRKSRC}/doc/license.txt
-
-DEPRECATED=	last release in 2006, no consumers in the Ports tree
-EXPIRATION_DATE=2024-10-31
-
-USES=		autoreconf gmake libtool
-GNU_CONFIGURE=	yes
-USE_CXXSTD=	c++98
-USE_LDCONFIG=	yes
-
-CONFIGURE_ENV=	PTHREAD_LIBS="-lpthread"
-CPPFLAGS+=	-I${LOCALBASE}/include/speex -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-PORTDOCS=	changelog.txt cvs.txt dependencies.txt faq.txt glossary.txt \
-		license.txt overview.txt readme.txt release-howto.txt \
-		tutorial.txt
-
-OPTIONS_DEFINE=		DUMB CDAUDIO VORBIS SPEEX DOCS
-OPTIONS_DEFAULT=	DUMB CDAUDIO VORBIS SPEEX
-
-DUMB_DESC=	DUMB support
-CDAUDIO_DESC=	libcdaudio support
-
-# since dumb is a static lib and it depends on ogg, we should
-# link audiere with ogg as well
-DUMB_IMPLIES=	VORBIS
-
-DUMB_BUILD_DEPENDS=	${LOCALBASE}/lib/libdumb.a:audio/dumb
-CDAUDIO_LIB_DEPENDS=	libcdaudio.so:audio/libcdaudio
-VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
-			libogg.so:audio/libogg
-SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
-
-post-patch:
-# could be an option, but build is broken with recent FLAC
-	@${REINPLACE_CMD} -e '/AC_CHECK_LIB/ s|FLAC|no_&|; \
-		s|wx_config|no_&|' \
-		${WRKSRC}/configure.in
-
-post-patch-DUMB-off:
-	@${REINPLACE_CMD} -e '/AC_CHECK_LIB/ s|dumb|no_&|' \
-		${WRKSRC}/configure.in
-
-post-patch-CDAUDIO-off:
-	@${REINPLACE_CMD} -e '/AC_CHECK_LIB/ s|cdaudio|no_&|' \
-		${WRKSRC}/configure.in
-
-post-patch-VORBIS-off:
-	@${REINPLACE_CMD} -e '/AC_CHECK_HEADER/ s|vorbis|no_&|' \
-		${WRKSRC}/configure.in
-
-post-patch-SPEEX-off:
-	@${REINPLACE_CMD} -e '/AC_CHECK_HEADER/ s|speex|no_&|' \
-		${WRKSRC}/configure.in
-
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudiere.so
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}
-.endfor
-
-.include <bsd.port.mk>
--- a/audio/audiere/distinfo
+++ b/audio/audiere/distinfo
@ -1,2 +0,0 @@
-SHA256 (audiere-1.9.4.tar.gz) = 74538fbc2f1ef467b3e1376c6ff4e0f40b664fca1dbfb1fcaa2fb823d5f5a219
-SIZE (audiere-1.9.4.tar.gz) = 453279
--- a/audio/audiere/files/patch-src_debug.cpp
+++ b/audio/audiere/files/patch-src_debug.cpp
@ -1,14 +0,0 @@
--- src/debug.cpp.orig	2006-02-14 04:57:01 UTC
-+++ src/debug.cpp
-@@ -1,8 +1,11 @@
- #ifdef WIN32
-   #include <windows.h>
-+#else
-+  #include "unistd.h"
- #endif
- 
- #include "debug.h"
-+#include <cstdlib>
- 
- 
- namespace audiere {
--- a/audio/audiere/files/patch-src_speexfile_speexfile.cpp
+++ b/audio/audiere/files/patch-src_speexfile_speexfile.cpp
@ -1,11 +0,0 @@
--- src/speexfile/speexfile.cpp.orig	2006-02-14 04:57:01 UTC
-+++ src/speexfile/speexfile.cpp
-@@ -871,7 +871,7 @@ int speexfile::initfile ()
- void *speexfile::header_to_decoder ( SpeexHeader *header, int enh_enabled, int *frame_size, int *rate, int *nframes, int forceMode, int *channels, SpeexStereoState *stereo )
- {
-     void *st;
-    SpeexMode *mode;
-+    const SpeexMode *mode;
-     SpeexCallback callback;
-     int modeID;
- 
--- a/audio/audiere/files/patch-src_utility.h
+++ b/audio/audiere/files/patch-src_utility.h
@ -1,10 +0,0 @@
--- src/utility.h.orig	2006-02-14 04:57:01 UTC
-+++ src/utility.h
-@@ -10,6 +10,7 @@
- #include <map>
- #include <string>
- #include <utility>
-+#include <cstdlib>
- #include "audiere.h"
- #include "types.h"
- 
--- a/audio/audiere/pkg-descr
+++ b/audio/audiere/pkg-descr
@ -1,15 +0,0 @@
-Audiere is a high-level audio API. It can play Ogg Vorbis, MP3,
-FLAC, uncompressed WAV, AIFF, MOD, S3M, XM, and IT files. For audio
-output, Audiere supports DirectSound or WinMM in Windows, OSS on
-Linux and Cygwin, and SGI AL on IRIX.
-
-Audiere is open source and licensed under the LGPL. This means that
-you may freely use Audiere in commercial products, as long as you
-do not modify the source code. If you do modify Audiere and release
-a product that uses your modifications, you must release your changes
-to the code under the LGPL as well.
-
-Audiere is portable. It is tested on Windows, Linux-i386, Cygwin,
-and IRIX with at least three major compilers. Most of Audiere is
-endian-independent, so I expect it would work with few modifications
-on other architectures.
--- a/audio/audiere/pkg-plist
+++ b/audio/audiere/pkg-plist
@ -1,5 +0,0 @@
-bin/audiere-config
-include/audiere.h
-lib/libaudiere-1.9.4.so
-lib/libaudiere.a
-lib/libaudiere.so
--- a/audio/baresip/Makefile
+++ b/audio/baresip/Makefile
@ -1,6 +1,7 @@
 PORTNAME=	baresip
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.16.0
+PORTREVISION=	1
 CATEGORIES=	audio

 MAINTAINER=	ports@FreeBSD.org
--- a/audio/bespokesynth/Makefile
+++ b/audio/bespokesynth/Makefile
@ -11,6 +11,8 @@ WWW=		https://www.bespokesynth.com/
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE

+BROKEN_FreeBSD_15=	compilation broken with clang-19: see https://github.com/BespokeSynth/BespokeSynth/issues/1687
+
 BUILD_DEPENDS=	juce706>0:devel/juce706 \
 		pybind11>0:devel/pybind11
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
--- a/audio/calf-lv2/Makefile
+++ b/audio/calf-lv2/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	calf
-DISTVERSION=	0.90.3.20210427
-PORTREVISION=	3
+DISTVERSION=	0.90.4
 CATEGORIES=	audio
 #MASTER_SITES=	http://calf-studio-gear.org/files/
 PKGNAMESUFFIX=	-lv2
--- a/audio/calf-lv2/distinfo
+++ b/audio/calf-lv2/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1639344411
-SHA256 (calf-studio-gear-calf-0.90.3.20210427-648f05e85287cf08af198bdd9e52baba95b502ec_GH0.tar.gz) = c3fea992cc75c4d2677ae11c9d05145857ea01b0cc06dc0297318cb57c7ce2d2
-SIZE (calf-studio-gear-calf-0.90.3.20210427-648f05e85287cf08af198bdd9e52baba95b502ec_GH0.tar.gz) = 15914975
+TIMESTAMP = 1730607181
+SHA256 (calf-studio-gear-calf-0.90.4-648f05e85287cf08af198bdd9e52baba95b502ec_GH0.tar.gz) = c3fea992cc75c4d2677ae11c9d05145857ea01b0cc06dc0297318cb57c7ce2d2
+SIZE (calf-studio-gear-calf-0.90.4-648f05e85287cf08af198bdd9e52baba95b502ec_GH0.tar.gz) = 15914975
--- a/audio/cardinal/Makefile
+++ b/audio/cardinal/Makefile
@ -7,11 +7,13 @@ MASTER_SITES=	https://github.com/DISTRHO/Cardinal/releases/download/${DISTVERSIO

 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Plugin wrapper around VCV Rack
-WWW=		https://cardinal.kx.studio/
+WWW=		https://cardinal.kx.studio/ \
+		https://github.com/DISTRHO/Cardinal

 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE

+BROKEN_FreeBSD_15=	compilation fails, error: static assertion failed due to requirement 'is_arithmetic<rack::simd::Vector<float, 4>>::value', see https://github.com/DISTRHO/Cardinal/issues/726
 BROKEN_armv7=	compilation fails due to the variable name conflict with base header, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=279134

 BUILD_DEPENDS=	${LOCALBASE}/include/FuzzySearchDatabase.hpp:textproc/fuzzysearchdatabase \
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	cmus
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.11.0
+DISTVERSION=	2.12.0
 CATEGORIES=	audio

 MAINTAINER=	eduardo@FreeBSD.org
--- a/audio/cmus/distinfo
+++ b/audio/cmus/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1715540075
-SHA256 (cmus-cmus-v2.11.0_GH0.tar.gz) = 2bbdcd6bbbae301d734214eab791e3755baf4d16db24a44626961a489aa5e0f7
-SIZE (cmus-cmus-v2.11.0_GH0.tar.gz) = 335367
+TIMESTAMP = 1729948815
+SHA256 (cmus-cmus-v2.12.0_GH0.tar.gz) = 44b96cd5f84b0d84c33097c48454232d5e6a19cd33b9b6503ba9c13b6686bfc7
+SIZE (cmus-cmus-v2.12.0_GH0.tar.gz) = 348685
--- a/audio/drumkv1-lv2/Makefile
+++ b/audio/drumkv1-lv2/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	drumkv1
-DISTVERSION=	1.1.2
+DISTVERSION=	1.1.3
 CATEGORIES=	audio
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-lv2
--- a/audio/drumkv1-lv2/distinfo
+++ b/audio/drumkv1-lv2/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1727896418
-SHA256 (drumkv1-1.1.2.tar.gz) = a6a0c1971be39131f9c44b838b796de355863abd478b1a2293fdf616c92a5678
-SIZE (drumkv1-1.1.2.tar.gz) = 280051
+TIMESTAMP = 1730427172
+SHA256 (drumkv1-1.1.3.tar.gz) = 0c15ecb3b9b44810fd8ca90d58523eb01d392b0c4060648a328a3ea7c9447891
+SIZE (drumkv1-1.1.3.tar.gz) = 278594
--- a/audio/faudio/Makefile
+++ b/audio/faudio/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	FAudio
-DISTVERSION=	24.08
+DISTVERSION=	24.11
 CATEGORIES=	audio

 MAINTAINER=	multimedia@FreeBSD.org
--- a/audio/faudio/distinfo
+++ b/audio/faudio/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1725172429
-SHA256 (FNA-XNA-FAudio-24.08_GH0.tar.gz) = 7c116d79d24abbca192e63de2d7ee42a679e1994f0a2e79200731b9878fdacca
-SIZE (FNA-XNA-FAudio-24.08_GH0.tar.gz) = 1125131
+TIMESTAMP = 1730624832
+SHA256 (FNA-XNA-FAudio-24.11_GH0.tar.gz) = 7aa5fdc762e1abbf4721e793de589eced46eef872ee2b9a03ab79ac81b64082c
+SIZE (FNA-XNA-FAudio-24.11_GH0.tar.gz) = 1126428
--- a/audio/faudio/pkg-plist
+++ b/audio/faudio/pkg-plist
@ -6,8 +6,8 @@ include/FAPOBase.h
 include/FAPOFX.h
 include/FAudio.h
 include/FAudioFX.h
-lib/cmake/FAudio/FAudio-targets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/FAudio/FAudio-targets.cmake
+lib/cmake/FAudio/FAudio-targets-shared-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/FAudio/FAudio-targets-shared.cmake
 lib/cmake/FAudio/FAudioConfig.cmake
 lib/libFAudio.so
 lib/libFAudio.so.0
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	fluidsynth
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.3.6
+DISTVERSION=	2.4.0
 CATEGORIES=	audio

 MAINTAINER=	multimedia@FreeBSD.org
@ -26,7 +26,7 @@ CMAKE_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Doxygen \
 		enable-waveout \
 		enable-winmidi

-OPTIONS_DEFINE=		ALSA DBUS JACK LADSPA LASH PIPEWIRE PORTAUDIO \
+OPTIONS_DEFINE=		ALSA DBUS JACK LADSPA PIPEWIRE PORTAUDIO \
 			PULSEAUDIO READLINE SDL SNDFILE
 OPTIONS_DEFAULT=	JACK READLINE

@ -49,10 +49,6 @@ LADSPA_RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 LADSPA_USES=		localbase
 LADSPA_CMAKE_BOOL=	enable-ladspa

-LASH_LIB_DEPENDS=	liblash.so:audio/lash
-LASH_CMAKE_BOOL=	enable-lash
-LASH_CMAKE_OFF=		-DCMAKE_DISABLE_FIND_PACKAGE_LASH:BOOL=True
-
 PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
 PIPEWIRE_CMAKE_BOOL=	enable-pipewire
 PIPEWIRE_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_PipeWire:BOOL=True
--- a/audio/fluidsynth/distinfo
+++ b/audio/fluidsynth/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1725183622
-SHA256 (FluidSynth-fluidsynth-v2.3.6_GH0.tar.gz) = 3340d73286b28fe6e5150fbe12648d4640e86c64c228878b572773bd08cac531
-SIZE (FluidSynth-fluidsynth-v2.3.6_GH0.tar.gz) = 1776510
+TIMESTAMP = 1730559312
+SHA256 (FluidSynth-fluidsynth-v2.4.0_GH0.tar.gz) = fd4d216a3030abc56a339985ab0506328660cd77b2d71dd98c240c58c03d8f7f
+SIZE (FluidSynth-fluidsynth-v2.4.0_GH0.tar.gz) = 1780676
--- a/audio/fluidsynth/pkg-plist
+++ b/audio/fluidsynth/pkg-plist
@ -23,6 +23,6 @@ lib/cmake/fluidsynth/FluidSynthTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/fluidsynth/FluidSynthTargets.cmake
 lib/libfluidsynth.so
 lib/libfluidsynth.so.3
-lib/libfluidsynth.so.3.2.4
+lib/libfluidsynth.so.3.3.0
 libdata/pkgconfig/fluidsynth.pc
 share/man/man1/fluidsynth.1.gz
--- a/audio/funktrackergold/Makefile
+++ b/audio/funktrackergold/Makefile
@ -1,38 +0,0 @@
-PORTNAME=	funktrackergold
-DISTVERSION=	1.5-2
-PORTREVISION=	9
-CATEGORIES=	audio
-MASTER_SITES=	SUNSITE/apps/sound/players
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Curses MOD/FNK music tracker
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-DEPRECATED=	Software looks abandoned: last release is in 1999 and WWW link had nothing to do with the software. Does not build with GCC 14.2
-EXPIRATION_DATE=2024-10-30
-
-BROKEN_armv6=		fails to compile: function definition is not allowed here
-BROKEN_armv7=		fails to compile: function definition is not allowed here
-
-USES=		compiler:nestedfct ncurses tar:tgz
-
-WRKSRC=		${WRKDIR}/funkgold
-MAKE_ARGS=	EXTRA_LDFLAGS="-lpthread"
-
-PORTDOCS=	INSTALL
-PLIST_FILES=	bin/funkgold
-
-OPTIONS_DEFINE=	DOCS
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/funkgold ${STAGEDIR}${PREFIX}/bin
-
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for docs in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${docs} ${STAGEDIR}${DOCSDIR}
-.endfor
-
-.include <bsd.port.mk>
--- a/audio/funktrackergold/distinfo
+++ b/audio/funktrackergold/distinfo
@ -1,2 +0,0 @@
-SHA256 (funktrackergold-1.5-2.tgz) = 7b0a3755d7cc26db369af95a2afd8495d2b3824afc2ce664ad7d2d2d9286ee8c
-SIZE (funktrackergold-1.5-2.tgz) = 256540
--- a/audio/funktrackergold/files/patch-Makefile
+++ b/audio/funktrackergold/files/patch-Makefile
@ -1,76 +0,0 @@
--- Makefile.orig	Mon Jun 22 20:24:17 1998
-+++ Makefile	Sun Apr  1 20:44:19 2001
-@@ -5,53 +5,10 @@
- # FunktrackerGOLD now comes under the GNU General Public License. Please
- # read the COPYING notice in this distribution.
- ############################################################################
-CC	= gcc
-OPTIONS = -Wall -O2 -pipe -fomit-frame-pointer
-LIB	= -lpthread -lncurses -lm
-+LDFLAGS+=$(EXTRA_LDFLAGS) -lncurses -lm
-+CFLAGS+=$(EXTRA_CFLAGS)
- 
-ifeq ($(OSTYPE),Linux)
-  OPTIONS += -DLinux
-else
-  ifeq ($(OSTYPE),FreeBSD)
-    OPTIONS += -DFreeBSD
-    LIB += -ltermcap #-lmytinfo
-  else
-    OPTIONS += -DLinux
-  endif
-endif
-
-HOST_SAFE = 0
-
-ifeq ($(HOSTTYPE),i386)
-  HOST_SAFE = 1
-endif
-
-ifeq ($(HOSTTYPE),i486)
-  HOST_SAFE = 1
-endif
-
-ifeq ($(HOSTTYPE),i586)
-  HOST_SAFE = 1
-endif
-
-ifeq ($(HOSTTYPE),i686)
-  HOST_SAFE = 1
-endif
-
-###############################
-all:
-	@if [ $(HOST_SAFE) = '1' ]; then \
-	  make funkgold; \
-	else \
-	  echo "***********************************************"; \
-	  echo "This is not an INTEL based machine. As the Funktracker"; \
-	  echo "format is in Intel byte sex (and i haven't yet made"; \
-	  echo "provisions for other processors), trying to play"; \
-	  echo "funktracker songs on this machine will be dangerous."; \
-	  echo ""; \
-	  echo "Refer to INSTALL file."; \
-	  echo "***********************************************"; \
-	fi
-+all: funkgold
- 
- ###############################
- OBJ_FT		= dsp_mixxer.o funktracker.o funkload.o funkgold_misc.o \
-@@ -59,7 +16,7 @@
- 		funkgold_trac.o funkgold.o
- 
- funkgold: $(OBJ_FT)
-	$(CC) $(OPTIONS) -o funkgold $(OBJ_FT) $(LIB)
-+	$(CC) -o funkgold $(OBJ_FT) $(LDFLAGS)
- 	strip funkgold
- 
- ###############################
-@@ -69,7 +26,3 @@
- release:
- 	make
- 	rm -f *.o
-
-###############################
-%.o: %.c %.h
-	$(CC) $(OPTIONS) -c $< -o $@
--- a/audio/funktrackergold/files/patch-dsp_mixxer.c
+++ b/audio/funktrackergold/files/patch-dsp_mixxer.c
@ -1,50 +0,0 @@
--- dsp_mixxer.c.orig	Mon Jun 22 12:39:39 1998
-+++ dsp_mixxer.c	Sat Jul 14 21:55:28 2007
-@@ -15,15 +15,11 @@
- ***************************************************************************/
- #include <stdio.h>
- #include <math.h>
-#include <malloc.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-#ifdef Linux
- #include <sys/soundcard.h>
-#elif FreeBSD
- #include <machine/soundcard.h>
-#endif
-+#include <sys/soundcard.h>
- #include "funktracker_defs.h"
- #include "funktracker.h"
- #include "funkload.h"
-@@ -301,12 +297,12 @@
- 
-   for(sample_no = 0;sample_no < mix_buffer_size;sample_no++)
-   {
-    if(chmix[chan_no].funkctrl & 0x2)
-+    if(chmix[chan_no].funkctrl & 0x2) {
- #pragma pack(1)
-       sam = *((sDB *)chmix[chan_no].sample_addr +
-             (unsigned long)chmix[chan_no].sample_ptr);
- #pragma pack()
-    else
-+    } else
-       sam = 0;
- 
- #ifdef DIGITAL_ECHOING
-@@ -363,12 +359,12 @@
-   shift_t = 8 + shift_table[funk_info.no_active_channels];
-   for(sample_no = 0;sample_no < mix_buffer_size;sample_no++)
-   {
-    if(chmix[chan_no].funkctrl & 0x2)
-+    if(chmix[chan_no].funkctrl & 0x2) {
- #pragma pack(1)
-       sam = *((sDW *)chmix[chan_no].sample_addr +
-             (unsigned long)chmix[chan_no].sample_ptr);
- #pragma pack()
-    else
-+    } else
-       sam = 0;
- #ifdef DIGITAL_ECHOING
-     sam_reverb = *(chmix[chan_no].echo_buffer +
--- a/audio/funktrackergold/files/patch-funkgold__misc.c
+++ b/audio/funktrackergold/files/patch-funkgold__misc.c
@ -1,26 +0,0 @@
--- funkgold_misc.c.orig	Thu Apr 14 17:48:48 2005
-+++ funkgold_misc.c	Thu Apr 14 17:49:42 2005
-@@ -30,22 +30,7 @@
- 
- void get_environment(void)
- {
-  char *os_type = getenv("OSTYPE");
-  register int x;
-  char *os_tt[] = {
-    "Linux",
-    "FreeBSD"
-  };
-
-  for(x = 0;x < SO_TT_SIZE;x++)
-    if(strcmp(os_tt[x],os_type) == 0)
-      break;
-  switch(x)
-  {
-    case 0:  funk_info.funk_cpu_type = FKCPU_LINUX; break;
-    case 1:  funk_info.funk_cpu_type = FKCPU_FREEBSD; break;
-    default: funk_info.funk_cpu_type = FKCPU_UNKNOWN; break;
-  }
-+  funk_info.funk_cpu_type = FKCPU_FREEBSD;
- }
- 
- /***************************************************************************
--- a/audio/funktrackergold/files/patch-headers
+++ b/audio/funktrackergold/files/patch-headers
@ -1,53 +0,0 @@
--- ../funkgold-orig/funkgold.c	Sun Jun 21 22:10:54 1998
-+++ funkgold.c	Sun Apr  1 17:53:18 2001
-@@ -23,7 +23,7 @@
- ***************************************************************************/
- #include <curses.h>
- #include <unistd.h>
-#include <malloc.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <signal.h>
- #include <sys/time.h>
--- ../funkgold-orig/funkgold_dir.c	Wed Dec  2 22:01:23 1998
-+++ funkgold_dir.c	Sun Apr  1 18:05:59 2001
-@@ -18,7 +18,6 @@
- #include <unistd.h>
- #include <dirent.h>
- #include <sys/stat.h>
-#include <malloc.h>
- #include <string.h>
- #include <stdlib.h>
- #include "funktracker_defs.h"
--- ../funkgold-orig/funkgold_misc.c	Sun Jun 21 15:56:46 1998
-+++ funkgold_misc.c	Sun Apr  1 17:53:30 2001
-@@ -17,7 +17,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/time.h>
-#include <malloc.h>
- #include "funktracker_defs.h"
- #include "dsp_mixxer.h"
- #include "funktracker.h"
--- ../funkgold-orig/funkgold_sm.c	Sun Jun 21 15:57:07 1998
-+++ funkgold_sm.c	Sun Apr  1 17:53:44 2001
-@@ -16,7 +16,7 @@
- ***************************************************************************/
- #include <curses.h>
- #include <unistd.h>
-#include <malloc.h>
-+#include <stdlib.h>
- #include "funktracker_defs.h"
- #include "dsp_mixxer.h"
- #include "funktracker.h"
--- ../funkgold-orig/funkload.c	Sun Jun 21 15:57:21 1998
-+++ funkload.c	Sun Apr  1 17:53:51 2001
-@@ -15,7 +15,7 @@
- ***************************************************************************/
- #include <stdio.h>
- #include <string.h>
-#include <malloc.h>
-+#include <stdlib.h>
- #include "funktracker_defs.h"
- #include "dsp_mixxer.h"
- #include "funktracker.h"
--- a/audio/funktrackergold/pkg-descr
+++ b/audio/funktrackergold/pkg-descr
@ -1,3 +0,0 @@
-FunktrackerGOLD is a curses based tracker for the MOD and FNK file
-formats. Information on using Funktracker can be found in
-share/doc/funktrackergold/README
--- a/audio/libopenmpt/Makefile
+++ b/audio/libopenmpt/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	libopenmpt
-DISTVERSION=	0.7.10
+DISTVERSION=	0.7.11
 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 = 1727103594
-SHA256 (libopenmpt-0.7.10+release.autotools.tar.gz) = 093713c1c1024f4f10c4779a66ceb2af51fb7c908a9e99feb892d04019220ba1
-SIZE (libopenmpt-0.7.10+release.autotools.tar.gz) = 1671289
+TIMESTAMP = 1730102700
+SHA256 (libopenmpt-0.7.11+release.autotools.tar.gz) = 53a798b8c6e2e1f695e8ad05e93a0c1b53199e5aa9981837c41696b370520767
+SIZE (libopenmpt-0.7.11+release.autotools.tar.gz) = 1671784
--- a/audio/libshairport/Makefile
+++ b/audio/libshairport/Makefile
@ -1,23 +0,0 @@
-PORTNAME=	libshairport
-PORTVERSION=	1.2.0.20310
-PORTREVISION=	2
-CATEGORIES=	audio
-MASTER_SITES=	http://mirrors.xbmc.org/build-deps/darwin-libs/
-DISTNAME=	libshairport-${PORTVERSION}_lib
-
-MAINTAINER=	manuel.creach@icloud.com
-COMMENT=	Airport Extreme Emulator
-WWW=		https://github.com/amejia1/libshairport
-
-DEPRECATED=	Abandonware, project removed upstream and hasn't seen development since 2011
-EXPIRATION_DATE=2024-10-31
-
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
-USES=		autoreconf gmake libtool ssl
-USE_LDCONFIG=	yes
-
-CPPFLAGS+=	-isystem${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-.include <bsd.port.mk>
--- a/audio/libshairport/distinfo
+++ b/audio/libshairport/distinfo
@ -1,2 +0,0 @@
-SHA256 (libshairport-1.2.0.20310_lib.tar.gz) = 61602402d846a50e8ddf82c3fb5b81984de95ed56abfe0f1e22426d1901c564f
-SIZE (libshairport-1.2.0.20310_lib.tar.gz) = 32759
--- a/audio/libshairport/files/patch-configure.in
+++ b/audio/libshairport/files/patch-configure.in
@ -1,20 +0,0 @@
--- configure.in.orig	2011-09-23 20:56:46 UTC
-+++ configure.in
-@@ -11,8 +11,9 @@ AC_PROG_LIBTOOL
- 
- # Checks for libraries.
- #AC_CHECK_LIB([c],   [main])
-#AC_CHECK_LIB([m],   [main])
-+AC_CHECK_LIB([m],   [main])
- AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library))
-+AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([pthread], [main],, AC_MSG_ERROR($missing_library))
- 
- OUTPUT_FILES="Makefile"
-@@ -21,4 +22,4 @@ LIBDIR=$PREFIX
- 
- AC_CONFIG_FILES([${OUTPUT_FILES}])
- AC_OUTPUT(Makefile src/Makefile)
-AC_OUTPUT
-\ No newline at end of file
-+AC_OUTPUT
--- a/audio/libshairport/files/patch-src_Makefile.am
+++ b/audio/libshairport/files/patch-src_Makefile.am
@ -1,12 +0,0 @@
--- src/Makefile.am.orig	2011-09-23 21:14:39 UTC
-+++ src/Makefile.am
-@@ -1,7 +1,7 @@
- lib_LTLIBRARIES=libshairport.la
- 
-library_includedir=$(includedir)
-library_include_HEADERS = shairport.h
-+library_includedir=$(includedir)/shairport
-+library_include_HEADERS = shairport.h ao.h socketlib.h
- 
- libshairport_la_SOURCES=shairport.c hairtunes.c socketlib.c alac.c
- libshairport_la_LDFLAGS=-dynamiclib
--- a/audio/libshairport/files/patch-src_alac.c
+++ b/audio/libshairport/files/patch-src_alac.c
@ -1,47 +0,0 @@
--- src/alac.c.orig	2011-08-20 22:06:21 UTC
-+++ src/alac.c
-@@ -804,7 +804,7 @@ void decode_frame(alac_file *alac,
-             }
-             else
-             {
-                fprintf(stderr, "FIXME: unhandled predicition type: %i\n", prediction_type);
-+                xprintf("FIXME: unhandled predicition type: %i\n", prediction_type);
-                 /* i think the only other prediction type (or perhaps this is just a
-                  * boolean?) runs adaptive fir twice.. like:
-                  * predictor_decompress_fir_adapt(predictor_error, tempout, ...)
-@@ -885,7 +885,7 @@ void decode_frame(alac_file *alac,
-         }
-         case 20:
-         case 32:
-            fprintf(stderr, "FIXME: unimplemented sample size %i\n", alac->setinfo_sample_size);
-+            xprintf("FIXME: unimplemented sample size %i\n", alac->setinfo_sample_size);
-             break;
-         default:
-             break;
-@@ -1004,7 +1004,7 @@ void decode_frame(alac_file *alac,
-             }
-             else
-             { /* see mono case */
-                fprintf(stderr, "FIXME: unhandled predicition type: %i\n", prediction_type_a);
-+                xprintf("FIXME: unhandled predicition type: %i\n", prediction_type_a);
-             }
- 
-             /* channel 2 */
-@@ -1029,7 +1029,7 @@ void decode_frame(alac_file *alac,
-             }
-             else
-             {
-                fprintf(stderr, "FIXME: unhandled predicition type: %i\n", prediction_type_b);
-+                xprintf("FIXME: unhandled predicition type: %i\n", prediction_type_b);
-             }
-         }
-         else
-@@ -1106,7 +1106,7 @@ void decode_frame(alac_file *alac,
-         }
-         case 20:
-         case 32:
-            fprintf(stderr, "FIXME: unimplemented sample size %i\n", alac->setinfo_sample_size);
-+            xprintf("FIXME: unimplemented sample size %i\n", alac->setinfo_sample_size);
-             break;
-         default:
-             break;
--- a/audio/libshairport/files/patch-src_ao.h
+++ b/audio/libshairport/files/patch-src_ao.h
@ -1,161 +0,0 @@
--- src/ao.h.orig	2016-07-26 15:10:45 UTC
-+++ src/ao.h
-@@ -0,0 +1,158 @@
-+/*
-+ *
-+ *  ao.h 
-+ *
-+ *  Original Copyright (C) Aaron Holtzman - May 1999
-+ *      Modifications Copyright (C) Stan Seibert - July 2000, July 2001
-+ *      More Modifications Copyright (C) Jack Moffitt - October 2000
-+ *
-+ *  This file is part of libao, a cross-platform audio outputlibrary.  See
-+ *  README for a history of this source code.
-+ *
-+ *  libao is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation; either version 2, or (at your option)
-+ *  any later version.
-+ *
-+ *  libao is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with GNU Make; see the file COPYING.  If not, write to
-+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ */
-+#ifndef __AO_H__
-+#define __AO_H__
-+
-+#ifdef __cplusplus
-+extern "C"
-+{
-+#endif /* __cplusplus */
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <stdint.h>
-+#include <errno.h>
-+
-+/* --- Constants ---*/
-+
-+#define AO_TYPE_LIVE 1
-+#define AO_TYPE_FILE 2
-+
-+
-+#define AO_ENODRIVER   1
-+#define AO_ENOTFILE    2
-+#define AO_ENOTLIVE    3
-+#define AO_EBADOPTION  4
-+#define AO_EOPENDEVICE 5
-+#define AO_EOPENFILE   6
-+#define AO_EFILEEXISTS 7
-+#define AO_EBADFORMAT  8
-+
-+#define AO_EFAIL       100
-+
-+
-+#define AO_FMT_LITTLE 1
-+#define AO_FMT_BIG    2
-+#define AO_FMT_NATIVE 4
-+
-+/* --- Structures --- */
-+
-+typedef struct ao_info {
-+  int  type; /* live output or file output? */
-+  char *name; /* full name of driver */
-+  char *short_name; /* short name of driver */
-+        char *author; /* driver author */
-+  char *comment; /* driver comment */
-+  int  preferred_byte_format;
-+  int  priority;
-+  char **options;
-+  int  option_count;
-+} ao_info;
-+
-+typedef struct ao_functions ao_functions;
-+typedef struct ao_device ao_device;
-+
-+typedef struct ao_sample_format {
-+  int  bits; /* bits per sample */
-+  int  rate; /* samples per second (in a single channel) */
-+  int  channels; /* number of audio channels */
-+  int  byte_format; /* Byte ordering in sample, see constants below */
-+        char *matrix; /* input channel location/ordering */
-+} ao_sample_format;
-+
-+typedef struct ao_option {
-+  char *key;
-+  char *value;
-+  struct ao_option *next;
-+} ao_option;
-+
-+#if defined(AO_BUILDING_LIBAO)
-+#include "ao_private.h"
-+#endif
-+
-+/* --- Functions --- */
-+
-+/* library setup/teardown */
-+void ao_initialize(void);
-+void ao_shutdown(void);
-+
-+/* device setup/playback/teardown */
-+int   ao_append_global_option(const char *key,
-+                              const char *value);
-+int          ao_append_option(ao_option **options,
-+                              const char *key,
-+                              const char *value);
-+void          ao_free_options(ao_option *options);
-+
-+char* ao_get_option(ao_option *options, const char* key);
-+
-+ao_device*       ao_open_live(int driver_id,
-+                              ao_sample_format *format,
-+                              ao_option *option);
-+ao_device*       ao_open_file(int driver_id,
-+                              const char *filename,
-+                              int overwrite,
-+                              ao_sample_format *format,
-+                              ao_option *option);
-+
-+int                   ao_play(ao_device *device,
-+                              char *output_samples,
-+                              uint32_t num_bytes);
-+int                  ao_close(ao_device *device);
-+
-+/* driver information */
-+int              ao_driver_id(const char *short_name);
-+int      ao_default_driver_id(void);
-+ao_info       *ao_driver_info(int driver_id);
-+ao_info **ao_driver_info_list(int *driver_count);
-+char       *ao_file_extension(int driver_id);
-+
-+/* miscellaneous */
-+int          ao_is_big_endian(void);
-+
-+
-+#ifdef __cplusplus
-+}
-+#endif /* __cplusplus */
-+
-+#endif  /* __AO_H__ */
-+
-+extern struct AudioOutput g_ao;
-+struct AudioOutput                                                                                                                                                                                              
-+  {                                                                                                                                                                                                              
-+      void (*ao_initialize)(void);                                                                                                                                                                               
-+      int (*ao_play)(ao_device *, char *, uint32_t);                                                                                                                                                             
-+      int (*ao_default_driver_id)(void);                                                                                                                                                                         
-+      ao_device* (*ao_open_live)( int, ao_sample_format *, ao_option *);                                                                                                                                         
-+      int (*ao_close)(ao_device *);                                                                                                                                                                              
-+      /* -- Device Setup/Playback/Teardown -- */                                                                                                                                                                 
-+      int (*ao_append_option)(ao_option **, const char *, const char *);                                                                                                                                         
-+      void (*ao_free_options)(ao_option *);                                                                                                                                                                      
-+      char* (*ao_get_option)(ao_option *, const char* );
-+      void (*ao_set_metadata)(const char *buffer, unsigned int size);                                                                                                                                                         
-+      void (*ao_set_metadata_coverart)(const char *buffer, unsigned int size);
-+  }; 
--- a/audio/libshairport/files/patch-src_hairtunes.c
+++ b/audio/libshairport/files/patch-src_hairtunes.c
@ -1,233 +0,0 @@
--- src/hairtunes.c.orig	2011-09-23 19:55:48 UTC
-+++ src/hairtunes.c
-@@ -25,7 +25,7 @@
-  */
- 
- #define XBMC
-//#defined HAS_AO
-+#define HAS_AO
- 
- #include <stdio.h>
- #include <stdlib.h>
-@@ -45,7 +45,7 @@
- #include <sys/signal.h>
- #include <fcntl.h>
- #ifdef HAS_AO
-#include <ao/ao.h>
-+#include "ao.h"
- #endif
- 
- #ifdef FANCY_RESAMPLING
-@@ -89,7 +89,6 @@ int pipe_handle = -1;
- // maximal resampling shift - conservative
- #define OUTFRAME_BYTES (4*(frame_size+3))
- 
-
- alac_file *decoder_info;
- 
- #ifdef FANCY_RESAMPLING
-@@ -122,8 +121,8 @@ pthread_mutex_t ab_mutex;
- pthread_cond_t ab_buffer_ready;
- 
- static void die(char *why) {
-    fprintf(stderr, "FATAL: %s\n", why);
-    exit(1);
-+    xprintf("FATAL: %s\n", why);
-+    //exit(1);
- }
- 
- static int hex2bin(unsigned char *buf, char *hex) {
-@@ -246,13 +245,13 @@ int hairtunes_init(char *pAeskey, char *
-             continue;
-         }
-         if (!strcmp(line, "exit\n")) {
-            exit(0);
-+            ;//exit(0);
-         }
-         if (!strcmp(line, "flush\n")) {
-             hairtunes_flush();
-         }
-     }
-    fprintf(stderr, "bye!\n");
-+    xprintf("bye!\n");
-     fflush(stderr);
- #endif
- 
-@@ -263,18 +262,28 @@ void hairtunes_setvolume(float f)
- {
-   assert(f<=0);
-   if (debug)
-      fprintf(stderr, "VOL: %lf\n", f);
-+      xprintf("VOL: %lf\n", f);
-   volume = pow(10.0,0.05*f);
-   fix_volume = 65536.0 * volume;
- }
- 
-+void hairtunes_set_metadata(const char *buffer, unsigned int size)
-+{
-+  g_ao.ao_set_metadata(buffer, size);
-+}
-+
-+void hairtunes_set_metadata_coverart(const char *buffer, unsigned int size)
-+{
-+  g_ao.ao_set_metadata_coverart(buffer, size);
-+}
-+
- void hairtunes_flush(void)
- {
-   pthread_mutex_lock(&ab_mutex);
-   ab_resync();
-   pthread_mutex_unlock(&ab_mutex);
-   if (debug)
-      fprintf(stderr, "FLUSH\n");
-+      xprintf("FLUSH\n");
- }
- 
- #ifdef HAIRTUNES_STANDALONE
-@@ -424,7 +433,7 @@ static void buffer_put_packet(seq_t seqn
-     } else if (seq_order(ab_read, seqno)) {     // late but not yet played
-         abuf = audio_buffer + BUFIDX(seqno);
-     } else {    // too late.
-        fprintf(stderr, "\nlate packet %04X (%04X:%04X)\n", seqno, ab_read, ab_write);
-+        xprintf("\nlate packet %04X (%04X:%04X)\n", seqno, ab_read, ab_write);
-     }
-     buf_fill = ab_write - ab_read;
-     pthread_mutex_unlock(&ab_mutex);
-@@ -521,7 +530,7 @@ static void rtp_request_resend(seq_t fir
-     if (seq_order(last, first))
-         return;
- 
-    fprintf(stderr, "requesting resend on %d packets (port %d)\n", last-first+1, controlport);
-+    xprintf("requesting resend on %d packets (port %d)\n", last-first+1, controlport);
- 
-     char req[8];    // *not* a standard RTCP NACK
-     req[0] = 0x80;
-@@ -605,8 +614,8 @@ static int init_rtp(void) {
-         port += 3;
-     }
- 
-    printf("port: %d\n", port); // let our handler know where we end up listening
-    printf("cport: %d\n", port+1);
-+    xprintf("port: %d\n", port); // let our handler know where we end up listening
-+    xprintf("cport: %d\n", port+1);
- 
-     rtp_sockets[0] = sock;
-     rtp_sockets[1] = csock;
-@@ -709,7 +718,7 @@ void bf_est_update(short fill) {
-     bf_est_drift = biquad_filt(&bf_drift_lpf, CONTROL_B*(bf_est_err*CONTROL_A + err_deriv) + bf_est_drift);
- 
-     if (debug)
-        fprintf(stderr, "bf %d err %f drift %f desiring %f ed %f estd %f\r", fill, bf_est_err, bf_est_drift, desired_fill, err_deriv, err_deriv + CONTROL_A*bf_est_err);
-+        xprintf("bf %d err %f drift %f desiring %f ed %f estd %f\r", fill, bf_est_err, bf_est_drift, desired_fill, err_deriv, err_deriv + CONTROL_A*bf_est_err);
-     bf_playback_rate = 1.0 + CONTROL_A*bf_est_err + bf_est_drift;
- 
-     bf_last_err = bf_est_err;
-@@ -725,7 +734,7 @@ short *buffer_get_frame(void) {
-     buf_fill = ab_write - ab_read;
-     if (buf_fill < 1 || !ab_synced || ab_buffering) {    // init or underrun. stop and wait
-         if (ab_synced)
-          fprintf(stderr, "\nunderrun\n");
-+          xprintf("\nunderrun\n");
- 
-         ab_buffering = 1;
-         pthread_cond_wait(&ab_buffer_ready, &ab_mutex);
-@@ -737,7 +746,7 @@ short *buffer_get_frame(void) {
-         return 0;
-     }
-     if (buf_fill >= BUFFER_FRAMES) {   // overrunning! uh-oh. restart at a sane distance
-        fprintf(stderr, "\noverrun.\n");
-+        xprintf("\noverrun.\n");
-         ab_read = ab_write - START_FILL;
-     }
-     read = ab_read;
-@@ -749,7 +758,7 @@ short *buffer_get_frame(void) {
- 
-     volatile abuf_t *curframe = audio_buffer + BUFIDX(read);
-     if (!curframe->ready) {
-        fprintf(stderr, "\nmissing frame.\n");
-+        xprintf("\nmissing frame.\n");
-         memset(curframe->data, 0, FRAME_BYTES);
-     }
-     curframe->ready = 0;
-@@ -776,13 +785,13 @@ int stuff_buffer(double playback_rate, s
-     if (stuff) {
-         if (stuff==1) {
-             if (debug)
-                fprintf(stderr, "+++++++++\n");
-+                xprintf("+++++++++\n");
-             // interpolate one sample
-             *outptr++ = dithered_vol(((long)inptr[-2] + (long)inptr[0]) >> 1);
-             *outptr++ = dithered_vol(((long)inptr[-1] + (long)inptr[1]) >> 1);
-         } else if (stuff==-1) {
-             if (debug)
-                fprintf(stderr, "---------\n");
-+                xprintf("---------\n");
-             inptr++;
-             inptr++;
-         }
-@@ -849,6 +858,11 @@ void *audio_thread_func(void *arg) {
-             inbuf = buffer_get_frame();
-         } while (!inbuf && audio_running);
- 
-+        if(!audio_running)
-+        {
-+          return 0; //don't access inbuf if audio stopped
-+        }
-+
- #ifdef FANCY_RESAMPLING
-         if (fancy_resampling) {
- 	        int i;
-@@ -881,7 +895,7 @@ void *audio_thread_func(void *arg) {
-             }
- #ifdef HAS_AO
-         } else {
-            ao_play(dev, (char *)outbuf, play_samples*4);
-+            g_ao.ao_play(dev, (char *)outbuf, play_samples*4);
- #endif
-         }
-     }
-@@ -906,7 +920,7 @@ void init_pipe(char* pipe) {
- ao_device *dev;
- 
- void* init_ao() {
-    ao_initialize();
-+    g_ao.ao_initialize();
- 
-     int driver;
- #ifndef XBMC
-@@ -921,7 +935,7 @@ void* init_ao() {
- #endif
-     {
-         // otherwise choose the default
-        driver = ao_default_driver_id();
-+        driver = g_ao.ao_default_driver_id();
-     }
- 
-     ao_sample_format fmt;
-@@ -944,9 +958,9 @@ void* init_ao() {
-     }
- #endif
- 
-    ao_append_option(&ao_opts, "name", "Streaming...");
-+    g_ao.ao_append_option(&ao_opts, "name", "Streaming...");
- 
-    dev = ao_open_live(driver, &fmt, ao_opts);
-+    dev = g_ao.ao_open_live(driver, &fmt, ao_opts);
-     if (dev == NULL) {
-         die("Could not open ao device");
-     }
-@@ -985,12 +999,13 @@ void clean_output(void)
-   audio_running = 0;
-   pthread_join(audio_thread, NULL);
- #ifdef HAS_AO
-  ao_close(dev);
-+  g_ao.ao_close(dev);
- #endif
- }
- 
- void hairtunes_cleanup(void)
- {
-+  pthread_cond_signal(&ab_buffer_ready);
-   clean_output();
-   clean_rtp();
-   clean_buffer();
--- a/audio/libshairport/files/patch-src_hairtunes.h
+++ b/audio/libshairport/files/patch-src_hairtunes.h
@ -1,11 +0,0 @@
--- src/hairtunes.h.orig	2011-08-20 22:06:21 UTC
-+++ src/hairtunes.h
-@@ -4,6 +4,8 @@
- int hairtunes_init(char *pAeskey, char *pAesiv, char *pFmtpstr, int pCtrlPort, int pTimingPort,
-          int pDataPort, char *pRtpHost, char*pPipeName, char *pLibaoDriver, char *pLibaoDeviceName, char *pLibaoDeviceId);
- void hairtunes_setvolume(float vol);
-+void hairtunes_set_metadata(const char *buffer, unsigned int size);
-+void hairtunes_set_metadata_coverart(const char *buffer, unsigned int size);
- void hairtunes_flush(void);
- void hairtunes_cleanup(void);
- 
--- a/audio/libshairport/files/patch-src_shairport.c
+++ b/audio/libshairport/files/patch-src_shairport.c
@ -1,691 +0,0 @@
--- src/shairport.c.orig	2011-08-20 23:57:56 UTC
-+++ src/shairport.c
-@@ -31,6 +31,27 @@
- #include "shairport.h"
- #include "hairtunes.h"
- 
-+static struct printfPtr g_printf={NULL};
-+
-+int xprintf(const char *format, ...)
-+{
-+  char dbg[2048];
-+  va_list args;
-+  va_start(args, format);
-+  vsnprintf(dbg, sizeof(dbg), format, args);
-+  va_end(args);
-+  if(g_printf.extprintf)
-+  {
-+    g_printf.extprintf(dbg, sizeof(dbg));
-+  }
-+  else 
-+  {
-+    printf(dbg);
-+  }
-+
-+  return 1;
-+}
-+
- #ifndef TRUE
- #define TRUE (-1)
- #endif
-@@ -92,13 +113,26 @@ static struct addrinfo *tAddrInfo;
- static char tPassword[56] = "";
- static char tHWID[HWID_SIZE] = {0,51,52,53,54,55};
- 
-+#ifdef XBMC
-+struct AudioOutput g_ao;
-+void shairport_set_ao(struct AudioOutput *ao)
-+{
-+ g_ao=*ao;
-+}
-+
-+void shairport_set_printf(struct printfPtr *funcPtr)
-+{
-+  g_printf = *funcPtr;
-+}
-+#endif
-+
- #ifndef XBMC
- int main(int argc, char **argv)
- #else
- int shairport_main(int argc, char **argv)
- #endif
- {
-  printf("initializing shairport\n");
-+  xprintf("initializing shairport\n",NULL);
-   char tHWID_Hex[HWID_SIZE * 2 + 1];
-   char tKnownHwid[32];
- 
-@@ -177,22 +211,22 @@ int shairport_main(int argc, char **argv
-     }    
-     else if(!strcmp(arg, "-h") || !strcmp(arg, "--help"))
-     {
-      slog(LOG_INFO, "ShairPort version 0.05 C port - Airport Express emulator\n");
-      slog(LOG_INFO, "Usage:\nshairport [OPTION...]\n\nOptions:\n");
-      slog(LOG_INFO, "  -a, --apname=AirPort    Sets Airport name\n");
-      slog(LOG_INFO, "  -p, --password=secret   Sets Password (not working)\n");
-      slog(LOG_INFO, "  -o, --server_port=5000  Sets Port for Avahi/dns-sd\n");
-      slog(LOG_INFO, "  -b, --buffer=282        Sets Number of frames to buffer before beginning playback\n");
-      slog(LOG_INFO, "  -d                      Daemon mode\n");
-      slog(LOG_INFO, "  -q, --quiet             Supresses all output.\n");
-      slog(LOG_INFO, "  -v,-v2,-v3,-vv          Various debugging levels\n");
-      slog(LOG_INFO, "\n");
-+      xprintf("ShairPort version 0.05 C port - Airport Express emulator\n");
-+      xprintf("Usage:\nshairport [OPTION...]\n\nOptions:\n");
-+      xprintf("  -a, --apname=AirPort    Sets Airport name\n");
-+      xprintf("  -p, --password=secret   Sets Password (not working)\n");
-+      xprintf("  -o, --server_port=5000  Sets Port for Avahi/dns-sd\n");
-+      xprintf("  -b, --buffer=282        Sets Number of frames to buffer before beginning playback\n");
-+      xprintf("  -d                      Daemon mode\n");
-+      xprintf("  -q, --quiet             Supresses all output.\n");
-+      xprintf("  -v,-v2,-v3,-vv          Various debugging levels\n");
-+      xprintf("\n");
-       return 0;
-     }    
-   }
- 
-   if ( buffer_start_fill < 30 || buffer_start_fill > BUFFER_FRAMES ) { 
-     fprintf(stderr, "buffer value must be > 30 and < %d\n", BUFFER_FRAMES);
-+     xprintf("buffer value must be > 30 and < %d\n", BUFFER_FRAMES);
-      return(0);
-   }
- 
-@@ -201,11 +235,11 @@ int shairport_main(int argc, char **argv
-     int tPid = fork();
-     if(tPid < 0)
-     {
-      exit(1); // Error on fork
-+      //exit(1); // Error on fork
-     }
-     else if(tPid > 0)
-     {
-      exit(0);
-+      //exit(0);
-     }
-     else
-     {
-@@ -246,10 +280,10 @@ int shairport_main(int argc, char **argv
-     sscanf(tHWID_Hex, "%02X%02X%02X%02X%02X%02X", &tHWID[0], &tHWID[1], &tHWID[2], &tHWID[3], &tHWID[4], &tHWID[5]);
-   }
- 
-  slog(LOG_INFO, "LogLevel: %d\n", kCurrentLogLevel);
-  slog(LOG_INFO, "AirName: %s\n", tServerName);
-  slog(LOG_INFO, "HWID: %.*s\n", HWID_SIZE, tHWID+1);
-  slog(LOG_INFO, "HWID_Hex(%d): %s\n", strlen(tHWID_Hex), tHWID_Hex);
-+  xprintf("LogLevel: %d\n", kCurrentLogLevel);
-+  xprintf("AirName: %s\n", tServerName);
-+  xprintf("HWID: %.*s\n", HWID_SIZE, tHWID+1);
-+  xprintf("HWID_Hex(%d): %s\n", strlen(tHWID_Hex), tHWID_Hex);
- 
-   if(tSimLevel >= 1)
-   {
-@@ -263,12 +297,12 @@ int shairport_main(int argc, char **argv
- #ifndef XBMC
-     startAvahi(tHWID_Hex, tServerName, tPort);
- #endif
-    slog(LOG_DEBUG_V, "Starting connection server: specified server port: %d\n", tPort);
-+    xprintf("Starting connection server: specified server port: %d\n", tPort);
-     tServerSock = setupListenServer(&tAddrInfo, tPort);
-     if(tServerSock < 0)
-     {
-       freeaddrinfo(tAddrInfo);
-      slog(LOG_INFO, "Error setting up server socket on port %d, try specifying a different port\n", tPort);
-+      xprintf("Error setting up server socket on port %d, try specifying a different port\n", tPort);
-       return 0;
-     }
- 
-@@ -295,7 +329,7 @@ int shairport_loop(void)
- 
-     int readsock;
- 
-    slog(LOG_DEBUG_V, "Waiting for clients to connect\n");
-+    xprintf("Waiting for clients to connect\n");
- 
-     while(m_running)
-     {
-@@ -327,7 +361,7 @@ int shairport_loop(void)
-         {
-           freeaddrinfo(tAddrInfo);
-           tAddrInfo = NULL;
-          slog(LOG_DEBUG, "...Accepted Client Connection..\n");
-+          xprintf("...Accepted Client Connection..\n");
-           close(tServerSock);
-           handleClient(tClientSock, tPassword, tHWID);
-           //close(tClientSock);
-@@ -335,11 +369,11 @@ int shairport_loop(void)
-         }
-         else
-         {
-          slog(LOG_DEBUG_VV, "Child now busy handling new client\n");
-+          xprintf("Child now busy handling new client\n");
-           close(tClientSock);
-         }
- #else
-      slog(LOG_DEBUG, "...Accepted Client Connection..\n");
-+      xprintf("...Accepted Client Connection..\n");
-       handleClient(tClientSock, tPassword, tHWID);
- #endif
-       }
-@@ -349,7 +383,7 @@ int shairport_loop(void)
-       }
-   }
- 
-  slog(LOG_DEBUG_VV, "Finished\n");
-+  xprintf("Finished\n");
-   if(tAddrInfo != NULL)
-   {
-     freeaddrinfo(tAddrInfo);
-@@ -360,6 +394,7 @@ int shairport_loop(void)
- void shairport_exit(void)
- {
-   m_running = 0;
-+  close(tServerSock);
- }
- 
- int shairport_is_running(void)
-@@ -407,7 +442,7 @@ int findEnd(char *tReadBuf)
- 
- void handleClient(int pSock, char *pPassword, char *pHWADDR)
- {
-  slog(LOG_DEBUG_VV, "In Handle Client\n");
-+  xprintf("In Handle Client\n");
-   fflush(stdout);
- 
-   socklen_t len;
-@@ -426,7 +461,7 @@ void handleClient(int pSock, char *pPass
- 
-   // deal with both IPv4 and IPv6:
-   if (addr.ss_family == AF_INET) {
-      slog(LOG_DEBUG_V, "Constructing ipv4 address\n");
-+      xprintf("Constructing ipv4 address\n");
-       struct sockaddr_in *s = (struct sockaddr_in *)&addr;
-       port = ntohs(s->sin_port);
-       inet_ntop(AF_INET, &s->sin_addr, ipstr, sizeof ipstr);
-@@ -446,20 +481,20 @@ void handleClient(int pSock, char *pPass
-       if(memcmp(&addr.bin[0], "\x00\x00\x00\x00" "\x00\x00\x00\x00" "\x00\x00\xff\xff", 12) == 0)
-       {
-         // its ipv4...
-        slog(LOG_DEBUG_V, "Constructing ipv4 from ipv6 address\n");
-+        xprintf("Constructing ipv4 from ipv6 address\n");
-         memcpy(ipbin, &addr.bin[12], 4);
-         ipbinlen = 4;
-       }
-       else
-       {
-        slog(LOG_DEBUG_V, "Constructing ipv6 address\n");
-+        xprintf("Constructing ipv6 address\n");
-         memcpy(ipbin, &s->sin6_addr, 16);
-         ipbinlen = 16;
-       }
-   }
- 
-  slog(LOG_DEBUG_V, "Peer IP address: %s\n", ipstr);
-  slog(LOG_DEBUG_V, "Peer port      : %d\n", port);
-+  xprintf("Peer IP address: %s\n", ipstr);
-+  xprintf("Peer port      : %d\n", port);
- 
-   int tMoreDataNeeded = 1;
-   struct keyring     tKeys;
-@@ -478,18 +513,19 @@ void handleClient(int pSock, char *pPass
-     while(1 == tMoreDataNeeded)
-     {
-       tError = readDataFromClient(pSock, &(tConn.recv));
-      if(!tError && strlen(tConn.recv.data) > 0)
-+      //if(!tError && strlen(tConn.recv.data) > 0)
-+      if(!tError && tConn.recv.current > 0)
-       {
-        slog(LOG_DEBUG_VV, "Finished Reading some data from client\n");
-+        xprintf("Finished Reading some data from client\n");
-         // parse client request
-         tMoreDataNeeded = parseMessage(&tConn, ipbin, ipbinlen, pHWADDR);
-         if(1 == tMoreDataNeeded)
-         {
-          slog(LOG_DEBUG_VV, "\n\nNeed to read more data\n");
-+          xprintf("\n\nNeed to read more data\n");
-         }
-         else if(-1 == tMoreDataNeeded) // Forked process down below ended.
-         {
-          slog(LOG_DEBUG_V, "Forked Process ended...cleaning up\n");
-+          xprintf("Forked Process ended...cleaning up\n");
-           cleanup(&tConn);
-           // pSock was already closed
-           return;
-@@ -498,13 +534,13 @@ void handleClient(int pSock, char *pPass
-       }
-       else
-       {
-        slog(LOG_DEBUG, "Error reading from socket, closing client\n");
-+        xprintf("Error reading from socket, closing client\n");
-         // Error reading data....quit.
-         cleanup(&tConn);
-         return;
-       }
-     }
-    slog(LOG_DEBUG_VV, "Writing: %d chars to socket\n", tConn.resp.current);
-+    xprintf("Writing: %d chars to socket\n", tConn.resp.current);
-     //tConn->resp.data[tConn->resp.current-1] = '\0';
-     writeDataToClient(pSock, &(tConn.resp));
-    // Finished reading one message...
-@@ -517,9 +553,9 @@ void handleClient(int pSock, char *pPass
- 
- void writeDataToClient(int pSock, struct shairbuffer *pResponse)
- {
-  slog(LOG_DEBUG_VV, "\n----Beg Send Response Header----\n%.*s\n", pResponse->current, pResponse->data);
-+  xprintf("\n----Beg Send Response Header----\n%.*s\n", pResponse->current, pResponse->data);
-   send(pSock, pResponse->data, pResponse->current,0);
-  slog(LOG_DEBUG_VV, "----Send Response Header----\n");
-+  xprintf("----Send Response Header----\n");
- }
- 
- int readDataFromClient(int pSock, struct shairbuffer *pClientBuffer)
-@@ -532,7 +568,7 @@ int readDataFromClient(int pSock, struct
-   while(tRetval > 0 && tEnd < 0)
-   {
-      // Read from socket until \n\n, \r\n\r\n, or \r\r is found
-      slog(LOG_DEBUG_V, "Waiting To Read...\n");
-+      xprintf("Waiting To Read...\n");
-       fflush(stdout);
-       tRetval = read(pSock, tReadBuf, MAX_SIZE);
-       // if new buffer contains the end of request string, only copy partial buffer?
-@@ -543,40 +579,40 @@ int readDataFromClient(int pSock, struct
-         {
-           pClientBuffer->marker = tEnd+1; // Marks start of content
-         }
-        slog(SOCKET_LOG_LEVEL, "Found end of http request at: %d\n", tEnd);
-+        xprintf("Found end of http request at: %d\n", tEnd);
-         fflush(stdout);        
-       }
-       else
-       {
-         tEnd = MAX_SIZE;
-        slog(SOCKET_LOG_LEVEL, "Read %d of data so far\n%s\n", tRetval, tReadBuf);
-+        xprintf("Read %d of data so far\n%s\n", tRetval, tReadBuf);
-         fflush(stdout);
-       }
-       if(tRetval > 0)
-       {
-         // Copy read data into tReceive;
-        slog(SOCKET_LOG_LEVEL, "Read %d data, using %d of it\n", tRetval, tEnd);
-+        xprintf("Read %d data, using %d of it\n", tRetval, tEnd);
-         addNToShairBuffer(pClientBuffer, tReadBuf, tRetval);
-        slog(LOG_DEBUG_VV, "Finished copying data\n");
-+        xprintf("Finished copying data\n");
-       }
-       else
-       {
-        slog(LOG_DEBUG, "Error reading data from socket, got: %d bytes", tRetval);
-+        xprintf("Error reading data from socket, got: %d bytes", tRetval);
-         return tRetval;
-       }
-   }
-   if(tEnd + 1 != tRetval)
-   {
-    slog(SOCKET_LOG_LEVEL, "Read more data after end of http request. %d instead of %d\n", tRetval, tEnd+1);
-+    xprintf("Read more data after end of http request. %d instead of %d\n", tRetval, tEnd+1);
-   }
-  slog(SOCKET_LOG_LEVEL, "Finished Reading Data:\n%s\nEndOfData\n", pClientBuffer->data);
-+  xprintf("Finished Reading Data:\n%s\nEndOfData\n", pClientBuffer->data);
-   fflush(stdout);
-   return 0;
- }
- 
- char *getFromBuffer(char *pBufferPtr, const char *pField, int pLenAfterField, int *pReturnSize, char *pDelims)
- {
-  slog(LOG_DEBUG_V, "GettingFromBuffer: %s\n", pField);
-+  xprintf("GettingFromBuffer: %s\n", pField);
-   char* tFound = strstr(pBufferPtr, pField);
-   int tSize = 0;
-   if(tFound != NULL)
-@@ -597,7 +633,7 @@ char *getFromBuffer(char *pBufferPtr, co
-     }
-     
-     tSize = (int) (tShortest - tFound);
-    slog(LOG_DEBUG_VV, "Found %.*s  length: %d\n", tSize, tFound, tSize);
-+    xprintf("Found %s  length: %d\n",tFound, tSize);
-     if(pReturnSize != NULL)
-     {
-       *pReturnSize = tSize;
-@@ -605,7 +641,7 @@ char *getFromBuffer(char *pBufferPtr, co
-   }
-   else
-   {
-    slog(LOG_DEBUG_V, "Not Found\n");
-+    xprintf("Not Found\n");
-   }
-   return tFound;
- }
-@@ -639,10 +675,10 @@ int buildAppleResponse(struct connection
-   {
-     char tTrim[tFoundSize + 2];
-     getTrimmed(tFound, tFoundSize, TRUE, TRUE, tTrim);
-    slog(LOG_DEBUG_VV, "HeaderChallenge:  [%s] len: %d  sizeFound: %d\n", tTrim, strlen(tTrim), tFoundSize);
-+    xprintf("HeaderChallenge:  [%s] len: %d  sizeFound: %d\n", tTrim, strlen(tTrim), tFoundSize);
-     int tChallengeDecodeSize = 16;
-     char *tChallenge = decode_base64((unsigned char *)tTrim, tFoundSize, &tChallengeDecodeSize);
-    slog(LOG_DEBUG_VV, "Challenge Decode size: %d  expected 16\n", tChallengeDecodeSize);
-+    xprintf("Challenge Decode size: %d  expected 16\n", tChallengeDecodeSize);
- 
-     int tCurSize = 0;
-     unsigned char tChalResp[38];
-@@ -664,7 +700,7 @@ int buildAppleResponse(struct connection
-     }
- 
-     char *tTmp = encode_base64((unsigned char *)tChalResp, tCurSize);
-    slog(LOG_DEBUG_VV, "Full sig: %s\n", tTmp);
-+    xprintf("Full sig: %s\n", tTmp);
-     free(tTmp);
- 
-     // RSA Encrypt
-@@ -709,15 +745,15 @@ int parseMessage(struct connection *pCon
-   if(tContent != NULL)
-   {
-     int tContentSize = atoi(tContent);
-    if(pConn->recv.marker == 0 || strlen(pConn->recv.data+pConn->recv.marker) != tContentSize)
-+    if(pConn->recv.marker == 0 || pConn->recv.current-pConn->recv.marker != tContentSize)
-     {
-       if(isLogEnabledFor(HEADER_LOG_LEVEL))
-       {
-        slog(HEADER_LOG_LEVEL, "Content-Length: %s value -> %d\n", tContent, tContentSize);
-+        xprintf("Content-Length: %s value -> %d\n", tContent, tContentSize);
-         if(pConn->recv.marker != 0)
-         {
-          slog(HEADER_LOG_LEVEL, "ContentPtr has %d, but needs %d\n", 
-                  strlen(pConn->recv.data+pConn->recv.marker), tContentSize);
-+          xprintf("ContentPtr has %d, but needs %d\n", 
-+                  (pConn->recv.current-pConn->recv.marker), tContentSize);
-         }
-       }
-       // check if value in tContent > 2nd read from client.
-@@ -726,7 +762,7 @@ int parseMessage(struct connection *pCon
-   }
-   else
-   {
-    slog(LOG_DEBUG_VV, "No content, header only\n");
-+    xprintf("No content, header only\n");
-   }
- 
-   // "Creates" a new Response Header for our response message
-@@ -739,7 +775,7 @@ int parseMessage(struct connection *pCon
-     {
-       tLen = 20;
-     }
-    slog(LOG_INFO, "********** RECV %.*s **********\n", tLen, pConn->recv.data);
-+    xprintf("********** RECV %.*s **********\n", tLen, pConn->recv.data);
-   }
- 
-   if(pConn->password != NULL)
-@@ -749,7 +785,7 @@ int parseMessage(struct connection *pCon
- 
-   if(buildAppleResponse(pConn, pIpBin, pIpBinLen, pHWID)) // need to free sig
-   {
-    slog(LOG_DEBUG_V, "Added AppleResponse to Apple-Challenge request\n");
-+    xprintf("Added AppleResponse to Apple-Challenge request\n");
-   }
- 
-   // Find option, then based on option, do different actions.
-@@ -769,14 +805,14 @@ int parseMessage(struct connection *pCon
-       int tKeySize = 0;
-       char tEncodedAesIV[tSize + 2];
-       getTrimmed(tHeaderVal, tSize, TRUE, TRUE, tEncodedAesIV);
-      slog(LOG_DEBUG_VV, "AESIV: [%.*s] Size: %d  Strlen: %d\n", tSize, tEncodedAesIV, tSize, strlen(tEncodedAesIV));
-+      xprintf("AESIV: [%.*s] Size: %d  Strlen: %d\n", tSize, tEncodedAesIV, tSize, strlen(tEncodedAesIV));
-       char *tDecodedIV =  decode_base64((unsigned char*) tEncodedAesIV, tSize, &tSize);
- 
-       // grab the key, copy it out of the receive buffer
-       tHeaderVal = getFromContent(tContent, "a=rsaaeskey", &tKeySize);
-       char tEncodedAesKey[tKeySize + 2]; // +1 for nl, +1 for \0
-       getTrimmed(tHeaderVal, tKeySize, TRUE, TRUE, tEncodedAesKey);
-      slog(LOG_DEBUG_VV, "AES KEY: [%s] Size: %d  Strlen: %d\n", tEncodedAesKey, tKeySize, strlen(tEncodedAesKey));
-+      xprintf("AES KEY: [%s] Size: %d  Strlen: %d\n", tEncodedAesKey, tKeySize, strlen(tEncodedAesKey));
-       // remove base64 coding from key
-       char *tDecodedAesKey = decode_base64((unsigned char*) tEncodedAesKey,
-                               tKeySize, &tKeySize);  // Need to free DecodedAesKey
-@@ -785,7 +821,7 @@ int parseMessage(struct connection *pCon
-       int tFmtpSize = 0;
-       char *tFmtp = getFromContent(tContent, "a=fmtp", &tFmtpSize);  // Don't need to free
-       tFmtp = getTrimmedMalloc(tFmtp, tFmtpSize, TRUE, FALSE); // will need to free
-      slog(LOG_DEBUG_VV, "Format: %s\n", tFmtp);
-+      xprintf("Format: %s\n", tFmtp);
- 
-       RSA *rsa = loadKey();
-       // Decrypt the binary aes key
-@@ -794,11 +830,11 @@ int parseMessage(struct connection *pCon
-       if(RSA_private_decrypt(tKeySize, (unsigned char *)tDecodedAesKey, 
-       (unsigned char*) tDecryptedKey, rsa, RSA_PKCS1_OAEP_PADDING) >= 0)
-       {
-        slog(LOG_DEBUG, "Decrypted AES key from RSA Successfully\n");
-+        xprintf("Decrypted AES key from RSA Successfully\n");
-       }
-       else
-       {
-        slog(LOG_INFO, "Error Decrypting AES key from RSA\n");
-+        xprintf("Error Decrypting AES key from RSA\n");
-       }
-       free(tDecodedAesKey);
-       RSA_free(rsa);
-@@ -814,13 +850,13 @@ int parseMessage(struct connection *pCon
- //    struct comms *tComms = pConn->hairtunes;
- //   if (! (pipe(tComms->in) == 0 && pipe(tComms->out) == 0))
- //    {
-//      slog(LOG_INFO, "Error setting up hairtunes communications...some things probably wont work very well.\n");
-+//      xprintf("Error setting up hairtunes communications...some things probably wont work very well.\n");
- //    }
-     
-     // Setup fork
-     char tPort[8] = "6000";  // get this from dup()'d stdout of child pid
- 
-    printf("******** SETUP!!!!!\n");
-+    xprintf("******** SETUP!!!!!\n",NULL);
- #ifndef XBMC
-     int tPid = fork();
-     if(tPid == 0)
-@@ -836,11 +872,11 @@ int parseMessage(struct connection *pCon
-       tFound = getFromSetup(pConn->recv.data, "timing_port", &tSize);
-       getTrimmed(tFound, tSize, 1, 0, tTPortStr);
- 
-      slog(LOG_DEBUG_VV, "converting %s and %s from str->int\n", tCPortStr, tTPortStr);
-+      xprintf("converting %s and %s from str->int\n", tCPortStr, tTPortStr);
-       int tControlport = atoi(tCPortStr);
-       int tTimingport = atoi(tTPortStr);
- 
-      slog(LOG_DEBUG_V, "Got %d for CPort and %d for TPort\n", tControlport, tTimingport);
-+      xprintf("Got %d for CPort and %d for TPort\n", tControlport, tTimingport);
-       char *tRtp = NULL;
-       char *tPipe = NULL;
-       char *tAoDriver = NULL;
-@@ -875,7 +911,7 @@ int parseMessage(struct connection *pCon
-                       tDataport, tRtp, tPipe, tAoDriver, tAoDeviceName, tAoDeviceId);
- #ifndef XBMC
-       // Quit when finished.
-      slog(LOG_DEBUG, "Returned from hairtunes init....returning -1, should close out this whole side of the fork\n");
-+      xprintf("Returned from hairtunes init....returning -1, should close out this whole side of the fork\n");
-       return -1;
-     }
-     else if(tPid >0)
-@@ -888,7 +924,7 @@ int parseMessage(struct connection *pCon
-       int tRead = read(tComms->out[0], tFromHairtunes, 80);
-       if(tRead <= 0)
-       {
-        slog(LOG_INFO, "Error reading port from hairtunes function, assuming default port: %d\n", tPort);
-+        xprintf("Error reading port from hairtunes function, assuming default port: %d\n", tPort);
-       }
-       else
-       {
-@@ -900,7 +936,7 @@ int parseMessage(struct connection *pCon
-         }
-         else
-         {
-          slog(LOG_INFO, "Read %d bytes, Error translating %s into a port\n", tRead, tFromHairtunes);
-+          xprintf("Read %d bytes, Error translating %s into a port\n", tRead, tFromHairtunes);
-         }
-       }
- 
-@@ -921,7 +957,7 @@ int parseMessage(struct connection *pCon
-     }
-     else
-     {
-      slog(LOG_INFO, "Error forking process....dere' be errors round here.\n");
-+      xprintf("Error forking process....dere' be errors round here.\n");
-       return -1;
-     }
- #endif
-@@ -933,7 +969,7 @@ int parseMessage(struct connection *pCon
-     propogateCSeq(pConn);
- #ifndef XBMC
-     close(pConn->hairtunes->in[1]);
-    slog(LOG_DEBUG, "Tearing down connection, closing pipes\n");
-+    xprintf("Tearing down connection, closing pipes\n");
- #else
-     hairtunes_cleanup();
- #endif
-@@ -954,21 +990,73 @@ int parseMessage(struct connection *pCon
-   {
-     propogateCSeq(pConn);
-     int tSize = 0;
-+    char *buffer = NULL;
-+    char *contentType = getFromHeader(pConn->recv.data, "Content-Type", &tSize);
-+    char *tContent = getFromHeader(pConn->recv.data, "Content-Length", NULL);
-+    int iContentSize = 0;
-+    int isJpg = 0;
-+    
-+    if(tContent != NULL)
-+    {
-+      iContentSize = atoi(tContent);
-+    }
-+
-+    if( tSize > 1 && 
-+        (strncmp(contentType, "application/x-dmap-tagged", tSize) == 0) ||
-+        (strncmp(contentType, "image/jpeg", tSize) == 0)                 )
-+    {
-+      if( (pConn->recv.current - pConn->recv.marker) == iContentSize && pConn->recv.marker != 0)
-+      {
-+        if(strncmp(contentType, "image/jpeg", tSize) == 0)
-+        {
-+          isJpg = 1;
-+        }
-+        buffer = (char *)malloc(iContentSize * sizeof(char));
-+        memcpy(buffer, pConn->recv.data + pConn->recv.marker, iContentSize);                                                                                                                                     
-+      }
-+      else
-+      {
-+        iContentSize = 0;
-+      }
-+    }
-+    else
-+    {
-+      iContentSize = 0;
-+    }
-     char *tVol = getFromHeader(pConn->recv.data, "volume", &tSize);
-    slog(LOG_DEBUG_VV, "About to write [vol: %.*s] data to hairtunes\n", tSize, tVol);
-+    if( tVol)
-+    {
-+      xprintf("About to write [vol: %.*s] data to hairtunes\n", tSize, tVol);
-+    }
-     // TBD VOLUME
- #ifndef XBMC
-     write(pConn->hairtunes->in[1], "vol: ", 5);
-     write(pConn->hairtunes->in[1], tVol, tSize);
-     write(pConn->hairtunes->in[1], "\n", 1);
- #else
-    hairtunes_setvolume(atof(tVol));
-+    if(tVol)
-+    {
-+      hairtunes_setvolume(atof(tVol));
-+    }
-+    
-+    if(iContentSize)
-+    {
-+      if(isJpg)
-+      {
-+        hairtunes_set_metadata_coverart(buffer, iContentSize);      
-+      }
-+      else
-+      {
-+        hairtunes_set_metadata(buffer, iContentSize);
-+      }
-+      free(buffer);
-+    }
- #endif
-    slog(LOG_DEBUG_VV, "Finished writing data write data to hairtunes\n");
-+    xprintf("Finished writing data write data to hairtunes\n");
-   }
-   else
-   {
-    slog(LOG_DEBUG, "\n\nUn-Handled recv: %s\n", pConn->recv.data);
-+    xprintf("\n\nUn-Handled recv: %s\n", pConn->recv.data);
-     propogateCSeq(pConn);
-   }
-   addToShairBuffer(&(pConn->resp), "\r\n");
-@@ -1047,7 +1135,7 @@ int startAvahi(const char *pHWStr, const
-     char tName[100 + HWID_SIZE + 3];
-     if(strlen(pServerName) > tMaxServerName)
-     {
-      slog(LOG_INFO,"Hey dog, we see you like long server names, "
-+      xprintf("Hey dog, we see you like long server names, "
-               "so we put a strncat in our command so we don't buffer overflow, while you listen to your flow.\n"
-               "We just used the first %d characters.  Pick something shorter if you want\n", tMaxServerName);
-     }
-@@ -1058,7 +1146,7 @@ int startAvahi(const char *pHWStr, const
-     strcat(tName, pHWStr);
-     strcat(tName, "@");
-     strncat(tName, pServerName, tMaxServerName);
-    slog(AVAHI_LOG_LEVEL, "Avahi/DNS-SD Name: %s\n", tName);
-+    xprintf("Avahi/DNS-SD Name: %s\n", tName);
-     
-     execlp("avahi-publish-service", "avahi-publish-service", tName,
-          "_raop._tcp", tPort, "tp=UDP","sm=false","sv=false","ek=1","et=0,1",
-@@ -1070,12 +1158,12 @@ int startAvahi(const char *pHWStr, const
-             perror("error");
-     }
- 
-    slog(LOG_INFO, "Bad error... couldn't find or failed to run: avahi-publish-service OR dns-sd\n");
-    exit(1);
-+    xprintf("Bad error... couldn't find or failed to run: avahi-publish-service OR dns-sd\n");
-+    //exit(1);
-   }
-   else
-   {
-    slog(LOG_DEBUG_VV, "Avahi/DNS-SD started on PID: %d\n", tPid);
-+    xprintf("Avahi/DNS-SD started on PID: %d\n", tPid);
-   }
-   return tPid;
- }
-@@ -1083,7 +1171,7 @@ int startAvahi(const char *pHWStr, const
- 
- void printBufferInfo(struct shairbuffer *pBuf, int pLevel)
- {
-  slog(pLevel, "Buffer: [%s]  size: %d  maxchars:%d\n", pBuf->data, pBuf->current, pBuf->maxsize/sizeof(char));
-+  xprintf("Buffer: [%s]  size: %d  maxchars:%d\n", pBuf->data, pBuf->current, pBuf->maxsize/sizeof(char));
- }
- 
- int getAvailChars(struct shairbuffer *pBuf)
-@@ -1164,7 +1252,8 @@ void slog(int pLevel, char *pFormat, ...
-   {
-     va_list argp;
-     va_start(argp, pFormat);
-    vprintf(pFormat, argp);
-+    xprintf(pFormat, argp);
-+    //vprintf(pFormat, argp);
-     va_end(argp);
-   }
-   //#endif
-@@ -1218,9 +1307,9 @@ void initBuffer(struct shairbuffer *pBuf
- {
-   if(pBuf->data != NULL)
-   {
-    slog(LOG_DEBUG_VV, "Hrm, buffer wasn't cleaned up....trying to free\n");
-+    xprintf("Hrm, buffer wasn't cleaned up....trying to free\n");
-     free(pBuf->data);
-    slog(LOG_DEBUG_VV, "Free didn't seem to seg fault....huzzah\n");
-+    xprintf("Free didn't seem to seg fault....huzzah\n");
-   }
-   pBuf->current = 0;
-   pBuf->marker = 0;
-@@ -1278,6 +1367,6 @@ RSA *loadKey()
-   BIO *tBio = BIO_new_mem_buf(AIRPORT_PRIVATE_KEY, -1);
-   RSA *rsa = PEM_read_bio_RSAPrivateKey(tBio, NULL, NULL, NULL); //NULL, NULL, NULL);
-   BIO_free(tBio);
-  slog(RSA_LOG_LEVEL, "RSA Key: %d\n", RSA_check_key(rsa));
-+  xprintf("RSA Key: %d\n", RSA_check_key(rsa));
-   return rsa;
- }
--- a/audio/libshairport/files/patch-src_shairport.h
+++ b/audio/libshairport/files/patch-src_shairport.h
@ -1,51 +0,0 @@
--- src/shairport.h.orig	2011-08-20 23:58:11 UTC
-+++ src/shairport.h
-@@ -11,14 +11,22 @@
- #include <regex.h>
- #include <sys/types.h>
- #include <regex.h>
-+#include "ao.h"
- 
- 
- #define HWID_SIZE 6
- #define SHAIRPORT_LOG 1
-#define LOG_INFO     1
-#define LOG_DEBUG    5
-#define LOG_DEBUG_V  6
-#define LOG_DEBUG_VV 7
-+
-+#ifndef LOG_INFO
-+#define LOG_INFO     5
-+#endif
-+
-+#ifndef LOG_DEBUG
-+#define LOG_DEBUG    6
-+#endif
-+
-+#define LOG_DEBUG_V  7
-+#define LOG_DEBUG_VV 8
- 
- struct shairbuffer
- {
-@@ -58,13 +66,21 @@ extern "C"
- {
- #endif /* __cplusplus */
- 
-+struct printfPtr
-+{
-+  int (*extprintf)(const char* msg, size_t msgSize);
-+};
-+
- int shairport_main(int argc, char **argv);
- void shairport_exit(void);
- int shairport_loop(void);
- int shairport_is_running(void);
-+void shairport_set_ao(struct AudioOutput *ao);
-+void shairport_set_printf(struct printfPtr *funcPtr);
- 
- #ifdef __cplusplus
- }
- #endif /* __cplusplus */
- 
- #endif
-+
--- a/audio/libshairport/files/patch-src_socketlib.c
+++ b/audio/libshairport/files/patch-src_socketlib.c
@ -1,58 +0,0 @@
--- src/socketlib.c.orig	2011-09-23 20:00:48 UTC
-+++ src/socketlib.c
-@@ -48,7 +48,7 @@ int common_setup(struct addrinfo *pAddrI
-   if((tSock==-1) && (pAddrInfo->ai_family == AF_INET6) && (errno == EAFNOSUPPORT))
-   {
-     //Fallback to ipv4
-    perror("Failed to create ipv6 socket. Trying ipv4");
-+    xprintf("Failed to create ipv6 socket. Trying ipv4");
-     pAddrInfo->ai_family = AF_INET;
-     tSock = socket(pAddrInfo->ai_family, pAddrInfo->ai_socktype, 0);
-   }
-@@ -82,7 +82,7 @@ int setup_client(struct addrinfo *server
-       delay(RETRY_DELAY, &tRes);
-     }
-   }
-  printf("%d Retry attempts exceeded\n", RETRY_COUNT);
-+  xprintf("%d Retry attempts exceeded\n", RETRY_COUNT);
-   return ERROR;
- }
- 
-@@ -102,7 +102,7 @@ int getAddr(char *pHostname, char *pServ
-   tError = getaddrinfo(pHostname, pService, &hints, pAddrInfo);
-   if(tError != 0)
-   {
-    printf("Error getting address info\n");
-+    xprintf("Error getting address info\n");
-   }
-   return tError;
- }
-@@ -158,8 +158,8 @@ int setupListenServer(struct addrinfo **
-     sprintf(tService, "%d", pPort); // copies port to string
-     int tFamily = AF_INET;
-     #ifdef AF_INET6
-    //printf("Listening on IPv6 Socket\n");
-    //tFamily = AF_INET6;
-+    xprintf("Listening on IPv6 Socket\n");
-+    tFamily = AF_INET6;
-     #else
-     //printf("Listening on IPv4 Socket");
-     #endif
-@@ -200,7 +200,7 @@ static int getCorrectedEncodeSize(int pS
-   else
-   {
-     // Invalid encoded data, no other cases are possible.
-    printf("Unrecoverable error....base64 values are incorrectly encoded\n");
-+    xprintf("Unrecoverable error....base64 values are incorrectly encoded\n");
-     return pSize;
-   }
- }
-@@ -226,7 +226,7 @@ char *decode_base64(unsigned char *pInpu
-     memset(input, 0, length);
-     memcpy(input, pInput, pLength);
-     memset(input+pLength, '=', length-pLength);
-    printf("Fixed value: [%.*s]\n", length, input);
-+    xprintf("Fixed value: [%.*s]\n", length, input);
-   }
-   char *buffer = (char *)malloc(length);
-   memset(buffer, 0, length);
--- a/audio/libshairport/pkg-descr
+++ b/audio/libshairport/pkg-descr
@ -1,15 +0,0 @@
-libshairport
-============
-Created by Team XBMC
-
-This is a fork of ShairPort written by James Laird <jhl@mafipulation.org>. The
-XBMC team decided to fork ShairPort and make it into a library.
-
-What it is
----------
-This program emulates an AirPort Express for the purpose of streaming music from
-iTunes and compatible iPods. It implements a server for the Apple RAOP protocol.
-ShairPort does not support AirPlay v2 (video and photo streaming).
-
-It supports multiple simultaneous streams, if your audio output chain (as
-detected by libao) does so.
--- a/audio/libshairport/pkg-plist
+++ b/audio/libshairport/pkg-plist
@ -1,6 +0,0 @@
-lib/libshairport.so
-lib/libshairport.so.0
-lib/libshairport.so.0.0.0
-include/shairport/shairport.h
-include/shairport/ao.h
-include/shairport/socketlib.h
--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	mixxx
 DISTVERSION=	2.4.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio

 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	mpg123
-DISTVERSION=	1.32.7
+DISTVERSION=	1.32.8
 CATEGORIES=	audio
 MASTER_SITES=	SF \
 		https://www.mpg123.de/download/
--- a/audio/mpg123/distinfo
+++ b/audio/mpg123/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1723267631
-SHA256 (mpg123-1.32.7.tar.bz2) = 3c8919243707951cac0e3c39bbf28653bcaffc43c98ff16801a27350db8f0f21
-SIZE (mpg123-1.32.7.tar.bz2) = 1117057
+TIMESTAMP = 1730223392
+SHA256 (mpg123-1.32.8.tar.bz2) = feee1374c79540e0e405df0bc45fde20ad67011425c361a2759e2146894a27a7
+SIZE (mpg123-1.32.8.tar.bz2) = 1117529
--- a/audio/mumble-server/Makefile
+++ b/audio/mumble-server/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	mumble-server
 DISTVERSION=	1.5.634
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio net
 MASTER_SITES=	https://github.com/${PORTNAME:S/-server//}-voip/${PORTNAME:S/-server//}/releases/download/v${DISTVERSION}/
 DISTNAME=	${PORTNAME:S/-server//}-${DISTVERSION}
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	mumble
 DISTVERSION=	1.5.634
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/${PORTNAME}-voip/${PORTNAME}/releases/download/v${DISTVERSION}/

--- a/audio/murmur/Makefile
+++ b/audio/murmur/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	murmur
 DISTVERSION=	1.3.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio net

 MAINTAINER=	vvd@FreeBSD.org
--- a/audio/musescore3/Makefile
+++ b/audio/musescore3/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	${GH_PROJECT:tl}3
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio

 MAINTAINER=	adridg@FreeBSD.org
--- a/audio/musescore3/files/patch-thirdparty_dtl_dtl_Diff.hpp
+++ b/audio/musescore3/files/patch-thirdparty_dtl_dtl_Diff.hpp
@ -0,0 +1,17 @@
+--- thirdparty/dtl/dtl/Diff.hpp.orig	2024-10-29 20:20:10 UTC
+++ thirdparty/dtl/dtl/Diff.hpp
+@@ -162,14 +162,6 @@ namespace dtl {
+             return trivial;
+         }
+         
+-        void enableTrivial () const {
+-            this->trivial = true;
+-        }
+-        
+-        void disableTrivial () {
+-            this->trivial = false;
+-        }
+-        
+         void editDistanceOnlyEnabled () {
+             this->editDistanceOnly = true;
+         }
--- a/audio/opustags/Makefile
+++ b/audio/opustags/Makefile
@ -9,6 +9,8 @@ WWW=		https://github.com/fmang/opustags
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE

+BROKEN_FreeBSD_15=	compilation is broken with clang-19, see https://github.com/fmang/opustags/issues/73
+
 LIB_DEPENDS=	libogg.so:audio/libogg

 USES=		cmake compiler:c++20-lang iconv pkgconfig
--- a/audio/padthv1-lv2/Makefile
+++ b/audio/padthv1-lv2/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	padthv1
-DISTVERSION=	1.1.2
+DISTVERSION=	1.1.3
 CATEGORIES=	audio
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-lv2
--- a/audio/padthv1-lv2/distinfo
+++ b/audio/padthv1-lv2/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1727896422
-SHA256 (padthv1-1.1.2.tar.gz) = 17fdbadc2114d3f460214d7b1c1a11e7e7c5d638f3ef522674f96a2dd2eb3a06
-SIZE (padthv1-1.1.2.tar.gz) = 243029
+TIMESTAMP = 1730427174
+SHA256 (padthv1-1.1.3.tar.gz) = da40332357bec28d7478bcd4b72a9cd7cde9b089b9835786dea10327c2542e8f
+SIZE (padthv1-1.1.3.tar.gz) = 244531
--- a/audio/pipewire-spa-oss/Makefile
+++ b/audio/pipewire-spa-oss/Makefile
@ -0,0 +1,119 @@
+PORTNAME=	pipewire-spa-oss
+DISTVERSION=	g20241030
+CATEGORIES=	audio
+
+MAINTAINER=	arrowd@FreeBSD.org
+COMMENT=	PipeWire SPA plugin implementing a FreeBSD OSS backend
+WWW=		https://github.com/shkhln/pw-oss
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+ONLY_FOR_ARCHS=	aarch64 amd64 riscv64 riscv64sf
+
+LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
+
+USES=		cargo llvm:lib,noexport
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	shkhln
+GH_PROJECT=	pw-oss
+GH_TAGNAME=	f174398a4b5f16f1bc5752666d90bf101f86c7c8
+
+CARGO_CRATES=	aho-corasick-1.1.3 \
+		annotate-snippets-0.9.2 \
+		autocfg-1.3.0 \
+		bindgen-0.69.4 \
+		bitflags-2.6.0 \
+		cc-1.1.21 \
+		cexpr-0.6.0 \
+		cfg-expr-0.15.8 \
+		cfg-if-1.0.0 \
+		clang-sys-1.8.1 \
+		convert_case-0.6.0 \
+		cookie-factory-0.3.3 \
+		either-1.13.0 \
+		equivalent-1.0.1 \
+		futures-0.3.30 \
+		futures-channel-0.3.30 \
+		futures-core-0.3.30 \
+		futures-executor-0.3.30 \
+		futures-io-0.3.30 \
+		futures-macro-0.3.30 \
+		futures-sink-0.3.30 \
+		futures-task-0.3.30 \
+		futures-util-0.3.30 \
+		glob-0.3.1 \
+		hashbrown-0.14.5 \
+		heck-0.5.0 \
+		indexmap-2.5.0 \
+		itertools-0.12.1 \
+		lazy_static-1.5.0 \
+		lazycell-1.3.0 \
+		libc-0.2.159 \
+		libloading-0.8.5 \
+		memchr-2.7.4 \
+		minimal-lexical-0.2.1 \
+		nix-0.27.1 \
+		nom-7.1.3 \
+		pin-project-lite-0.2.14 \
+		pin-utils-0.1.0 \
+		pkg-config-0.3.31 \
+		proc-macro2-1.0.86 \
+		quote-1.0.37 \
+		regex-1.10.6 \
+		regex-automata-0.4.7 \
+		regex-syntax-0.8.4 \
+		rustc-hash-1.1.0 \
+		serde-1.0.210 \
+		serde_derive-1.0.210 \
+		serde_spanned-0.6.7 \
+		shlex-1.3.0 \
+		slab-0.4.9 \
+		smallvec-1.13.2 \
+		syn-2.0.77 \
+		system-deps-6.2.2 \
+		target-lexicon-0.12.16 \
+		toml-0.8.19 \
+		toml_datetime-0.6.8 \
+		toml_edit-0.22.22 \
+		uds-0.4.2 \
+		unicode-ident-1.0.13 \
+		unicode-segmentation-1.12.0 \
+		unicode-width-0.1.14 \
+		version-compare-0.2.0 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		windows-targets-0.52.6 \
+		windows_aarch64_gnullvm-0.52.6 \
+		windows_aarch64_msvc-0.52.6 \
+		windows_i686_gnu-0.52.6 \
+		windows_i686_gnullvm-0.52.6 \
+		windows_i686_msvc-0.52.6 \
+		windows_x86_64_gnu-0.52.6 \
+		windows_x86_64_gnullvm-0.52.6 \
+		windows_x86_64_msvc-0.52.6 \
+		winnow-0.6.19 \
+		yansi-term-0.1.2 \
+		libspa,libspa-sys@git+https://gitlab.freedesktop.org/pipewire/pipewire-rs.git?rev=016e554768ae251c8de3724ea4b06f4749a8dd00\#016e554768ae251c8de3724ea4b06f4749a8dd00
+
+PLIST_FILES=	lib/spa-0.2/libspa_freebsd_oss.so \
+		share/pipewire/pipewire.conf.d/oss.conf \
+		share/wireplumber/scripts/monitors/oss.lua \
+		share/wireplumber/wireplumber.conf.d/oss.conf
+
+do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/spa-0.2
+	${INSTALL_LIB} ${WRKDIR}/target/release/libspa_freebsd_oss.so ${STAGEDIR}${PREFIX}/lib/spa-0.2
+
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/pipewire/pipewire.conf.d
+	${INSTALL_DATA} ${WRKSRC}/conf/pipewire/pipewire.conf.d/oss.conf ${STAGEDIR}${PREFIX}/share/pipewire/pipewire.conf.d
+
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/wireplumber/wireplumber.conf.d
+	${INSTALL_DATA} ${WRKSRC}/conf/wireplumber/wireplumber.conf.d/oss.conf ${STAGEDIR}${PREFIX}/share/wireplumber/wireplumber.conf.d
+
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/wireplumber/scripts/monitors
+	${INSTALL_DATA} ${WRKSRC}/share/wireplumber/scripts/monitors/oss.lua ${STAGEDIR}${PREFIX}/share/wireplumber/scripts/monitors
+
+.include <bsd.port.mk>
--- a/audio/pipewire-spa-oss/distinfo
+++ b/audio/pipewire-spa-oss/distinfo
@ -0,0 +1,157 @@
+TIMESTAMP = 1730474257
+SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916
+SIZE (rust/crates/aho-corasick-1.1.3.crate) = 183311
+SHA256 (rust/crates/annotate-snippets-0.9.2.crate) = ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e
+SIZE (rust/crates/annotate-snippets-0.9.2.crate) = 32065
+SHA256 (rust/crates/autocfg-1.3.0.crate) = 0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0
+SIZE (rust/crates/autocfg-1.3.0.crate) = 16524
+SHA256 (rust/crates/bindgen-0.69.4.crate) = a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0
+SIZE (rust/crates/bindgen-0.69.4.crate) = 221092
+SHA256 (rust/crates/bitflags-2.6.0.crate) = b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de
+SIZE (rust/crates/bitflags-2.6.0.crate) = 45357
+SHA256 (rust/crates/cc-1.1.21.crate) = 07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0
+SIZE (rust/crates/cc-1.1.21.crate) = 83463
+SHA256 (rust/crates/cexpr-0.6.0.crate) = 6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766
+SIZE (rust/crates/cexpr-0.6.0.crate) = 17966
+SHA256 (rust/crates/cfg-expr-0.15.8.crate) = d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02
+SIZE (rust/crates/cfg-expr-0.15.8.crate) = 42108
+SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
+SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
+SHA256 (rust/crates/clang-sys-1.8.1.crate) = 0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4
+SIZE (rust/crates/clang-sys-1.8.1.crate) = 44009
+SHA256 (rust/crates/convert_case-0.6.0.crate) = ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca
+SIZE (rust/crates/convert_case-0.6.0.crate) = 18675
+SHA256 (rust/crates/cookie-factory-0.3.3.crate) = 9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2
+SIZE (rust/crates/cookie-factory-0.3.3.crate) = 19084
+SHA256 (rust/crates/either-1.13.0.crate) = 60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0
+SIZE (rust/crates/either-1.13.0.crate) = 19169
+SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5
+SIZE (rust/crates/equivalent-1.0.1.crate) = 6615
+SHA256 (rust/crates/futures-0.3.30.crate) = 645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0
+SIZE (rust/crates/futures-0.3.30.crate) = 53828
+SHA256 (rust/crates/futures-channel-0.3.30.crate) = eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78
+SIZE (rust/crates/futures-channel-0.3.30.crate) = 31736
+SHA256 (rust/crates/futures-core-0.3.30.crate) = dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d
+SIZE (rust/crates/futures-core-0.3.30.crate) = 14071
+SHA256 (rust/crates/futures-executor-0.3.30.crate) = a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d
+SIZE (rust/crates/futures-executor-0.3.30.crate) = 17744
+SHA256 (rust/crates/futures-io-0.3.30.crate) = a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1
+SIZE (rust/crates/futures-io-0.3.30.crate) = 8910
+SHA256 (rust/crates/futures-macro-0.3.30.crate) = 87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac
+SIZE (rust/crates/futures-macro-0.3.30.crate) = 11278
+SHA256 (rust/crates/futures-sink-0.3.30.crate) = 9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5
+SIZE (rust/crates/futures-sink-0.3.30.crate) = 7852
+SHA256 (rust/crates/futures-task-0.3.30.crate) = 38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004
+SIZE (rust/crates/futures-task-0.3.30.crate) = 11126
+SHA256 (rust/crates/futures-util-0.3.30.crate) = 3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48
+SIZE (rust/crates/futures-util-0.3.30.crate) = 159977
+SHA256 (rust/crates/glob-0.3.1.crate) = d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b
+SIZE (rust/crates/glob-0.3.1.crate) = 18880
+SHA256 (rust/crates/hashbrown-0.14.5.crate) = e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1
+SIZE (rust/crates/hashbrown-0.14.5.crate) = 141498
+SHA256 (rust/crates/heck-0.5.0.crate) = 2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea
+SIZE (rust/crates/heck-0.5.0.crate) = 11517
+SHA256 (rust/crates/indexmap-2.5.0.crate) = 68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5
+SIZE (rust/crates/indexmap-2.5.0.crate) = 85919
+SHA256 (rust/crates/itertools-0.12.1.crate) = ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569
+SIZE (rust/crates/itertools-0.12.1.crate) = 137761
+SHA256 (rust/crates/lazy_static-1.5.0.crate) = bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe
+SIZE (rust/crates/lazy_static-1.5.0.crate) = 14025
+SHA256 (rust/crates/lazycell-1.3.0.crate) = 830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55
+SIZE (rust/crates/lazycell-1.3.0.crate) = 12502
+SHA256 (rust/crates/libc-0.2.159.crate) = 561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5
+SIZE (rust/crates/libc-0.2.159.crate) = 755366
+SHA256 (rust/crates/libloading-0.8.5.crate) = 4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4
+SIZE (rust/crates/libloading-0.8.5.crate) = 28902
+SHA256 (rust/crates/memchr-2.7.4.crate) = 78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3
+SIZE (rust/crates/memchr-2.7.4.crate) = 96670
+SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a
+SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841
+SHA256 (rust/crates/nix-0.27.1.crate) = 2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053
+SIZE (rust/crates/nix-0.27.1.crate) = 286494
+SHA256 (rust/crates/nom-7.1.3.crate) = d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a
+SIZE (rust/crates/nom-7.1.3.crate) = 117570
+SHA256 (rust/crates/pin-project-lite-0.2.14.crate) = bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02
+SIZE (rust/crates/pin-project-lite-0.2.14.crate) = 28817
+SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184
+SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580
+SHA256 (rust/crates/pkg-config-0.3.31.crate) = 953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2
+SIZE (rust/crates/pkg-config-0.3.31.crate) = 20880
+SHA256 (rust/crates/proc-macro2-1.0.86.crate) = 5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77
+SIZE (rust/crates/proc-macro2-1.0.86.crate) = 48958
+SHA256 (rust/crates/quote-1.0.37.crate) = b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af
+SIZE (rust/crates/quote-1.0.37.crate) = 28558
+SHA256 (rust/crates/regex-1.10.6.crate) = 4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619
+SIZE (rust/crates/regex-1.10.6.crate) = 253894
+SHA256 (rust/crates/regex-automata-0.4.7.crate) = 38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df
+SIZE (rust/crates/regex-automata-0.4.7.crate) = 617582
+SHA256 (rust/crates/regex-syntax-0.8.4.crate) = 7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b
+SIZE (rust/crates/regex-syntax-0.8.4.crate) = 347577
+SHA256 (rust/crates/rustc-hash-1.1.0.crate) = 08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2
+SIZE (rust/crates/rustc-hash-1.1.0.crate) = 9331
+SHA256 (rust/crates/serde-1.0.210.crate) = c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a
+SIZE (rust/crates/serde-1.0.210.crate) = 78338
+SHA256 (rust/crates/serde_derive-1.0.210.crate) = 243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f
+SIZE (rust/crates/serde_derive-1.0.210.crate) = 56020
+SHA256 (rust/crates/serde_spanned-0.6.7.crate) = eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d
+SIZE (rust/crates/serde_spanned-0.6.7.crate) = 9164
+SHA256 (rust/crates/shlex-1.3.0.crate) = 0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64
+SIZE (rust/crates/shlex-1.3.0.crate) = 18713
+SHA256 (rust/crates/slab-0.4.9.crate) = 8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67
+SIZE (rust/crates/slab-0.4.9.crate) = 17108
+SHA256 (rust/crates/smallvec-1.13.2.crate) = 3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67
+SIZE (rust/crates/smallvec-1.13.2.crate) = 35216
+SHA256 (rust/crates/syn-2.0.77.crate) = 9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed
+SIZE (rust/crates/syn-2.0.77.crate) = 268784
+SHA256 (rust/crates/system-deps-6.2.2.crate) = a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349
+SIZE (rust/crates/system-deps-6.2.2.crate) = 25546
+SHA256 (rust/crates/target-lexicon-0.12.16.crate) = 61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1
+SIZE (rust/crates/target-lexicon-0.12.16.crate) = 26488
+SHA256 (rust/crates/toml-0.8.19.crate) = a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e
+SIZE (rust/crates/toml-0.8.19.crate) = 50974
+SHA256 (rust/crates/toml_datetime-0.6.8.crate) = 0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41
+SIZE (rust/crates/toml_datetime-0.6.8.crate) = 12028
+SHA256 (rust/crates/toml_edit-0.22.22.crate) = 4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5
+SIZE (rust/crates/toml_edit-0.22.22.crate) = 106387
+SHA256 (rust/crates/uds-0.4.2.crate) = 885c31f06fce836457fe3ef09a59f83fe8db95d270b11cd78f40a4666c4d1661
+SIZE (rust/crates/uds-0.4.2.crate) = 47387
+SHA256 (rust/crates/unicode-ident-1.0.13.crate) = e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe
+SIZE (rust/crates/unicode-ident-1.0.13.crate) = 43279
+SHA256 (rust/crates/unicode-segmentation-1.12.0.crate) = f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493
+SIZE (rust/crates/unicode-segmentation-1.12.0.crate) = 106323
+SHA256 (rust/crates/unicode-width-0.1.14.crate) = 7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af
+SIZE (rust/crates/unicode-width-0.1.14.crate) = 271615
+SHA256 (rust/crates/version-compare-0.2.0.crate) = 852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b
+SIZE (rust/crates/version-compare-0.2.0.crate) = 13942
+SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
+SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
+SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
+SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
+SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
+SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
+SHA256 (rust/crates/windows-targets-0.52.6.crate) = 9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973
+SIZE (rust/crates/windows-targets-0.52.6.crate) = 6403
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.6.crate) = 32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3
+SIZE (rust/crates/windows_aarch64_gnullvm-0.52.6.crate) = 435718
+SHA256 (rust/crates/windows_aarch64_msvc-0.52.6.crate) = 09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469
+SIZE (rust/crates/windows_aarch64_msvc-0.52.6.crate) = 832615
+SHA256 (rust/crates/windows_i686_gnu-0.52.6.crate) = 8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b
+SIZE (rust/crates/windows_i686_gnu-0.52.6.crate) = 880402
+SHA256 (rust/crates/windows_i686_gnullvm-0.52.6.crate) = 0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66
+SIZE (rust/crates/windows_i686_gnullvm-0.52.6.crate) = 475940
+SHA256 (rust/crates/windows_i686_msvc-0.52.6.crate) = 240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66
+SIZE (rust/crates/windows_i686_msvc-0.52.6.crate) = 901163
+SHA256 (rust/crates/windows_x86_64_gnu-0.52.6.crate) = 147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78
+SIZE (rust/crates/windows_x86_64_gnu-0.52.6.crate) = 836363
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d
+SIZE (rust/crates/windows_x86_64_gnullvm-0.52.6.crate) = 435707
+SHA256 (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec
+SIZE (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 832564
+SHA256 (rust/crates/winnow-0.6.19.crate) = c52ac009d615e79296318c1bcce2d422aaca15ad08515e344feeda07df67a587
+SIZE (rust/crates/winnow-0.6.19.crate) = 163565
+SHA256 (rust/crates/yansi-term-0.1.2.crate) = fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1
+SIZE (rust/crates/yansi-term-0.1.2.crate) = 14342
+SHA256 (pipewire-pipewire-rs-016e554768ae251c8de3724ea4b06f4749a8dd00_GL0.tar.gz) = 64cc560c9127b1adf5e42f64b901336b3d190ea2c96fd0a128ae9dd4f2514549
+SIZE (pipewire-pipewire-rs-016e554768ae251c8de3724ea4b06f4749a8dd00_GL0.tar.gz) = 114265
+SHA256 (shkhln-pw-oss-g20241030-f174398a4b5f16f1bc5752666d90bf101f86c7c8_GH0.tar.gz) = 197fd0aca13b2e4ef3169f82daae0c7011b08b4c9f6bf565097b310237eddd6e
+SIZE (shkhln-pw-oss-g20241030-f174398a4b5f16f1bc5752666d90bf101f86c7c8_GH0.tar.gz) = 28209
--- a/audio/pipewire-spa-oss/pkg-descr
+++ b/audio/pipewire-spa-oss/pkg-descr
@ -0,0 +1 @@
+PipeWire module implementing an OSS backend.
--- a/audio/praat/Makefile
+++ b/audio/praat/Makefile
@ -1,6 +1,6 @@
 PORTNAME=		praat
 DISTVERSIONPREFIX=	v
-DISTVERSION=		6.4.22
+DISTVERSION=		6.4.23
 CATEGORIES=		audio science

 MAINTAINER=	adridg@FreeBSD.org
--- a/audio/praat/distinfo
+++ b/audio/praat/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1728847102
-SHA256 (praat-praat-v6.4.22_GH0.tar.gz) = c66049b8ff4845183437bbc23b1b35bdb426ae08a7eee9514c7d7a565d093eb8
-SIZE (praat-praat-v6.4.22_GH0.tar.gz) = 61257341
+TIMESTAMP = 1730230968
+SHA256 (praat-praat-v6.4.23_GH0.tar.gz) = 1284d97fc2724142cacd6ef73ec9c146f1b10662865dd47b6e9e758c33f2f256
+SIZE (praat-praat-v6.4.23_GH0.tar.gz) = 61260316
--- a/audio/praat/files/patch-melder_melder__strvec.h
+++ b/audio/praat/files/patch-melder_melder__strvec.h
@ -0,0 +1,15 @@
+--- melder/melder_strvec.h.orig	2024-10-29 19:53:40 UTC
+++ melder/melder_strvec.h
+@@ -192,12 +192,6 @@ class _autostringautovector { (public)
+ 		return _autostringvectorview<T> (our elements + (firstPosition - 1), newSize);
+ 	}
+ 	_autostringautovector&& move () noexcept { return static_cast <_autostringautovector&&> (*this); }   // enable construction and assignment for l-values (variables) via explicit move()
+-	void initWithCapacity (integer capacity) {
+-		if (capacity > 0)
+-			our cells = MelderArray:: _alloc <_autostring <T>> (capacity, MelderArray::kInitializationType::ZERO);
+-		our size = 0;
+-		our _capacity = capacity;
+-	}
+ 	void resize (integer newSize) {
+ 		if (newSize > our _capacity) {
+ 			/*
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`PipeWire module implementing an OSS backend.`