*/*: sync with upstream

Taken from: FreeBSD
2024-07-17 10:06:02 +02:00 · 2024-07-17 10:06:02 +02:00 · 6f95ba715d
commit 6f95ba715d
parent d77939a126
1816 changed files with 21216 additions and 17511 deletions
--- a/arabic/libreoffice/distinfo
+++ b/arabic/libreoffice/distinfo
@ -1,5 +1,5 @@
-TIMESTAMP = 1718374552
-SHA256 (libreoffice/i18n/LibreOffice_24.2.4_Linux_x86-64_deb_langpack_ar.tar.gz) = fec3da5460040f9007426a6e6e7fe79f400aeff5d6828436b35e7fef57ca4b36
-SIZE (libreoffice/i18n/LibreOffice_24.2.4_Linux_x86-64_deb_langpack_ar.tar.gz) = 1764065
-SHA256 (libreoffice/i18n/LibreOffice_24.2.4_Linux_x86-64_deb_helppack_ar.tar.gz) = d11814a83e531284173446b4e960296033a8126a31b6d70bc5015648d8fb8395
-SIZE (libreoffice/i18n/LibreOffice_24.2.4_Linux_x86-64_deb_helppack_ar.tar.gz) = 2375986
+TIMESTAMP = 1720797530
+SHA256 (libreoffice/i18n/LibreOffice_24.2.5_Linux_x86-64_deb_langpack_ar.tar.gz) = 2b61d054a0d086922cf5ec1c93c6fb4b68fe9e63ec56026599a36defee6dfef9
+SIZE (libreoffice/i18n/LibreOffice_24.2.5_Linux_x86-64_deb_langpack_ar.tar.gz) = 1763108
+SHA256 (libreoffice/i18n/LibreOffice_24.2.5_Linux_x86-64_deb_helppack_ar.tar.gz) = 8304e264742f547bef33f907df90cc54ce20d4187eeb4856318c93cce11af3ac
+SIZE (libreoffice/i18n/LibreOffice_24.2.5_Linux_x86-64_deb_helppack_ar.tar.gz) = 2375867
--- a/archivers/amigadepacker/Makefile
+++ b/archivers/amigadepacker/Makefile
@ -1,24 +1,25 @@
 PORTNAME=	amigadepacker
-PORTVERSION=	0.04
-PORTREVISION=	1
+DISTVERSION=	0.04
+PORTREVISION=	2
 CATEGORIES=	archivers
 MASTER_SITES=	http://zakalwe.fi/~shd/foss/amigadepacker/ \
 		LOCAL/ehaupt

 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Tool for depacking some compressed Amiga formats
-WWW=		https://zakalwe.fi/~shd/opensource.html
+WWW=		https://gitlab.com/heikkiorsila/amigadepacker

 LICENSE=	GPLv2

 USES=		tar:bzip2
-HAS_CONFIGURE=	yes
 USE_CSTD=	gnu89

+HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
-ALL_TARGET=	${PORTNAME}
+ALL_TARGET=		${PORTNAME}

-PLIST_FILES=	bin/amigadepacker share/man/man1/amigadepacker.1.gz
+PLIST_FILES=	bin/amigadepacker \
+		share/man/man1/amigadepacker.1.gz

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin
--- a/archivers/nfpm/Makefile
+++ b/archivers/nfpm/Makefile
@ -1,7 +1,6 @@
 PORTNAME=	nfpm
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.37.1
-PORTREVISION=	3
+DISTVERSION=	2.38.0
 CATEGORIES=	archivers

 MAINTAINER=	yuri@FreeBSD.org
--- a/archivers/nfpm/distinfo
+++ b/archivers/nfpm/distinfo
@ -1,5 +1,5 @@
-TIMESTAMP = 1715316234
-SHA256 (go/archivers_nfpm/nfpm-v2.37.1/v2.37.1.mod) = 0550154e5c230ca2945e98c55126ba4c3f123f7e34737c3ed771d57ff51b51f8
-SIZE (go/archivers_nfpm/nfpm-v2.37.1/v2.37.1.mod) = 3385
-SHA256 (go/archivers_nfpm/nfpm-v2.37.1/v2.37.1.zip) = f2545befe9a19818010e356f0fe52ca205097bb06d7b369eff4df047d0e57f59
-SIZE (go/archivers_nfpm/nfpm-v2.37.1/v2.37.1.zip) = 559578
+TIMESTAMP = 1721026492
+SHA256 (go/archivers_nfpm/nfpm-v2.38.0/v2.38.0.mod) = da6809d10683f2a788f24ecdaaa2662b90fbe93282d20b06f195b52229fada73
+SIZE (go/archivers_nfpm/nfpm-v2.38.0/v2.38.0.mod) = 3385
+SHA256 (go/archivers_nfpm/nfpm-v2.38.0/v2.38.0.zip) = 71bf98a4df019348b8c49a8938e4f8a263f46ee42e3ecb67a169b1b6209290a5
+SIZE (go/archivers_nfpm/nfpm-v2.38.0/v2.38.0.zip) = 554848
--- a/archivers/py-zstandard/Makefile
+++ b/archivers/py-zstandard/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	zstandard
-DISTVERSION=	0.22.0
+DISTVERSION=	0.23.0
 CATEGORIES=	archivers python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/archivers/py-zstandard/distinfo
+++ b/archivers/py-zstandard/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1699201957
-SHA256 (zstandard-0.22.0.tar.gz) = 8226a33c542bcb54cd6bd0a366067b610b41713b64c9abec1bc4533d69f51e70
-SIZE (zstandard-0.22.0.tar.gz) = 660738
+TIMESTAMP = 1721029661
+SHA256 (zstandard-0.23.0.tar.gz) = b2d8c62d08e7255f68f7a740bae85b3c9b8e5466baa9cbf7f57f1cde0ac6bc09
+SIZE (zstandard-0.23.0.tar.gz) = 681701
--- a/astro/gnuastro/Makefile
+++ b/astro/gnuastro/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	gnuastro
-PORTVERSION=	0.22
-PORTREVISION=	1
+PORTVERSION=	0.23
 CATEGORIES=	astro
 MASTER_SITES=	GNU

@ -17,9 +16,8 @@ LIB_DEPENDS=	libcfitsio.so:astro/cfitsio \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff

-USES=		gmake jpeg libtool:build localbase tar:lz
+USES=		ghostscript gmake jpeg libtool:build localbase pathfix tar:lz
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
--- a/astro/gnuastro/distinfo
+++ b/astro/gnuastro/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1706990074
-SHA256 (gnuastro-0.22.tar.lz) = 1fbb8492f571dd50c990c52527eb660681fd923ff2e213a2ddbea55e43973497
-SIZE (gnuastro-0.22.tar.lz) = 4767059
+TIMESTAMP = 1720895780
+SHA256 (gnuastro-0.23.tar.lz) = d8533dda444e4e3b3577875ed1598992b6cc0983c80954adb0016d45e304a1a3
+SIZE (gnuastro-0.23.tar.lz) = 4867093
--- a/astro/gnuastro/pkg-plist
+++ b/astro/gnuastro/pkg-plist
@ -26,26 +26,26 @@ bin/astsegment
 bin/aststatistics
 bin/asttable
 bin/astwarp
-@sample etc/astarithmetic.conf.sample
-@sample etc/astbuildprog.conf.sample
-@sample etc/astconvertt.conf.sample
-@sample etc/astconvolve.conf.sample
-@sample etc/astcosmiccal.conf.sample
-@sample etc/astcrop.conf.sample
-@sample etc/astfits.conf.sample
-@sample etc/astmatch.conf.sample
-@sample etc/astmkcatalog.conf.sample
-@sample etc/astmkprof-3d.conf.sample
-@sample etc/astmkprof.conf.sample
-@sample etc/astnoisechisel-3d.conf.sample
-@sample etc/astnoisechisel.conf.sample
-@sample etc/astquery.conf.sample
-@sample etc/astsegment-3d.conf.sample
-@sample etc/astsegment.conf.sample
-@sample etc/aststatistics.conf.sample
-@sample etc/asttable.conf.sample
-@sample etc/astwarp.conf.sample
-@sample etc/gnuastro.conf.sample
+@sample etc/gnuastro/astarithmetic.conf.sample
+@sample etc/gnuastro/astbuildprog.conf.sample
+@sample etc/gnuastro/astconvertt.conf.sample
+@sample etc/gnuastro/astconvolve.conf.sample
+@sample etc/gnuastro/astcosmiccal.conf.sample
+@sample etc/gnuastro/astcrop.conf.sample
+@sample etc/gnuastro/astfits.conf.sample
+@sample etc/gnuastro/astmatch.conf.sample
+@sample etc/gnuastro/astmkcatalog.conf.sample
+@sample etc/gnuastro/astmkprof-3d.conf.sample
+@sample etc/gnuastro/astmkprof.conf.sample
+@sample etc/gnuastro/astnoisechisel-3d.conf.sample
+@sample etc/gnuastro/astnoisechisel.conf.sample
+@sample etc/gnuastro/astquery.conf.sample
+@sample etc/gnuastro/astsegment-3d.conf.sample
+@sample etc/gnuastro/astsegment.conf.sample
+@sample etc/gnuastro/aststatistics.conf.sample
+@sample etc/gnuastro/asttable.conf.sample
+@sample etc/gnuastro/astwarp.conf.sample
+@sample etc/gnuastro/gnuastro.conf.sample
 include/gnuastro/arithmetic.h
 include/gnuastro/array.h
 include/gnuastro/binary.h
@ -87,12 +87,12 @@ include/gnuastro/warp.h
 include/gnuastro/wcs.h
 lib/libgnuastro.a
 lib/libgnuastro.so
-lib/libgnuastro.so.20
-lib/libgnuastro.so.20.0.0
+lib/libgnuastro.so.21
+lib/libgnuastro.so.21.0.0
 lib/libgnuastro_make.a
 lib/libgnuastro_make.so
-lib/libgnuastro_make.so.20
-lib/libgnuastro_make.so.20.0.0
+lib/libgnuastro_make.so.21
+lib/libgnuastro_make.so.21.0.0
 libdata/pkgconfig/gnuastro.pc
 %%DATADIR%%/astscript-fits-view.desktop
 %%DATADIR%%/completion.bash
--- a/astro/phd2/Makefile
+++ b/astro/phd2/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	phd2
 DISTVERSIONPREFIX=v
 DISTVERSION=	2.6.10
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	astro

 MAINTAINER=	acm@FreeBSD.org
--- a/audio/cava/Makefile
+++ b/audio/cava/Makefile
@ -77,6 +77,8 @@ VT_BUILD_DEPENDS=	psf2bdf:x11-fonts/psftools
 VT_CONFIGURE_ENABLE=	cava-font
 VT_PLIST_FILES=		${DATADIR}/cava.fnt

+CPPFLAGS+=	-I${PREFIX}/include/iniparser
+
 pre-configure:
 	${ECHO_CMD} ${DISTVERSION} > ${WRKSRC}/version

--- a/audio/deadbeef/Makefile
+++ b/audio/deadbeef/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	deadbeef
 PORTVERSION=	0.7.2
-PORTREVISION=	27
+PORTREVISION=	28
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/

--- a/audio/dexed/Makefile
+++ b/audio/dexed/Makefile
@ -1,8 +1,6 @@
 PORTNAME=	dexed
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.9.6-16
-DISTVERSIONSUFFIX=	-g1df9a58
-PORTREVISION=	7
+DISTVERSION=	0.9.7
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-synth

@ -27,30 +25,32 @@ USES=		cmake dos2unix localbase:ldflags pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	asb2m10

-GH_TUPLE=	steinbergmedia:vst3sdk:2cc517019a2681fccf211e6a95776a0af1e16d04:steinbergmedia_vst3sdk/libs/vst3sdk \
-		steinbergmedia:vst3_base:985fe019276ee03c2751a1736ba3b390678e29f2:asb2m10_vst3_base/libs/vst3sdk/base \
-		steinbergmedia:vst3_cmake:31b3f3c3e5c4e1bcfee221e5076b6b56296214d7:asb2m10_vst3_cmake/libs/vst3sdk/cmake \
-		steinbergmedia:vst3_doc:a3ad6a147ed8347c802dd2a946d84939a3572164:asb2m10_vst3_doc/libs/vst3sdk/doc \
-		steinbergmedia:vst3_pluginterfaces:93cef1afb7061e488625045ba5a82abaa83d27fe:asb2m10_vst3_pluginterfaces/libs/vst3sdk/pluginterfaces \
-		steinbergmedia:vst3_public_sdk:9589800ed94573354bc29de45eec5744523fbfcb:asb2m10_vst3_public_sdk/libs/vst3sdk/public.sdk \
-		steinbergmedia:vstgui:6c48e17c174abaf2f1dc8ae41e5fab70599eca6c:asb2m10_vstgui/libs/vst3sdk/vstgui4 \
-		surge-synthesizer:tuning-library:b3069450045fe439206628f08220300864e5a958:surge_synthesizer_tuning_library/libs/tuning-library \
+GH_TUPLE= \
+		steinbergmedia:vst3sdk:e9895dc9ef20bedd93a0fde5ad664bc8b56d4338:steinbergmedia_vst3sdk/libs/vst3sdk \
+		surge-synthesizer:tuning-library:601c0eabff31fff8a543b49d3e48073f338f413c:surge_synthesizer_tuning_library/libs/tuning-library \
 		surge-synthesizer:surgesynthteam_tuningui:54f9a74cd55cdb33fb4d32d706067626857cfc75:surge_synthesizer_surgesynthteam_tuningui/libs/surgesynthteam_tuningui \
-		juce-framework:JUCE:2f980209cc4091a4490bb1bafc5d530f16834e58:juce_framework_JUCE/libs/JUCE
+		ODDSound:MTS-ESP:514ed958b38e5ab501999f902a2427ebe6232a78:ODDSound_MTS_ESP/libs/MTS-ESP \
+		juce-framework:JUCE:d054f0d14dcac387aebda44ce5d792b5e7a625b3:juce_framework_JUCE/libs/JUCE \
+		free-audio:clap-juce-extensions:4491bc30223cecf8ff495de943510863b71a7a81:free_audio_clap_juce_extensions/libs/clap-juce-extensions \
+		free-audio:clap:df8f16c69ba1c1a15fb105f0c5a2e5b9ac6be742:free_audio_clap/libs/clap-juce-extensions/clap-libs/clap \
+		free-audio:clap-helpers:7b53a685e11465154b4ccba3065224dbcbf8a893:free_audio_clap_helpers/libs/clap-juce-extensions/clap-libs/clap-helpers

 DOS2UNIX_GLOB=	*.cpp *.h

 PLIST_FILES=	bin/Dexed

 OPTIONS_DEFINE=		VST3
-OPTIONS_DEFAULT=	VST3
+#OPTIONS_DEFAULT=	VST3

 VST3_DESC=		Build the VST3 plugin
 VST3_BUILD_DEPENDS=	vst3sdk>0:audio/vst3sdk
 VST3_CXXFLAGS=		-DJUCE_CUSTOM_VST3_SDK=1 -fPIC
 VST3_PLIST_FILES=	lib/vst3/Dexed.so
+VST3_BROKEN=		VST3 plugin fails to build, see https://github.com/asb2m10/dexed/issues/433

 CXXFLAGS+=	-DJUCE_INCLUDE_PNGLIB_CODE=0 # to fix build on powerpc64le, see bug#265446, https://github.com/juce-framework/JUCE/issues/1094
+CXXFLAGS+=	-fPIC # workaround for ld: error: relocation R_X86_64_PC32 cannot be used against symbol 'BinaryData::LFO_36_26_png'; recompile with -fPIC
+#CXXFLAGS+=	-DJUCE_CUSTOM_VST3_SDK=1
 LDFLAGS+=	-lpng16

 PORTSCOUT=	skipv:nightly
--- a/audio/dexed/distinfo
+++ b/audio/dexed/distinfo
@ -1,23 +1,19 @@
-TIMESTAMP = 1649816149
-SHA256 (asb2m10-dexed-v0.9.6-16-g1df9a58_GH0.tar.gz) = ae42f20fa0df1fbd962d3dc05bd09968d51b218468914a7a5840cadd35d14f3a
-SIZE (asb2m10-dexed-v0.9.6-16-g1df9a58_GH0.tar.gz) = 15500918
-SHA256 (steinbergmedia-vst3sdk-2cc517019a2681fccf211e6a95776a0af1e16d04_GH0.tar.gz) = 35f5f3cde3972760cc0c5ad6786a00960f77c58f9399d3d856279354ff750a42
-SIZE (steinbergmedia-vst3sdk-2cc517019a2681fccf211e6a95776a0af1e16d04_GH0.tar.gz) = 413675
-SHA256 (surge-synthesizer-tuning-library-b3069450045fe439206628f08220300864e5a958_GH0.tar.gz) = 633bb38381161a32896899b109a202be9ed11c8bdba01a40cd61fd7caa81c102
-SIZE (surge-synthesizer-tuning-library-b3069450045fe439206628f08220300864e5a958_GH0.tar.gz) = 140085
+TIMESTAMP = 1720976597
+SHA256 (asb2m10-dexed-v0.9.7_GH0.tar.gz) = 0b2c90ecc14768c10c9e06f1fe0678738d71ca733f896579105391ce49c6c103
+SIZE (asb2m10-dexed-v0.9.7_GH0.tar.gz) = 15966257
+SHA256 (steinbergmedia-vst3sdk-e9895dc9ef20bedd93a0fde5ad664bc8b56d4338_GH0.tar.gz) = 8e2e5cb30bc57f2503bdfef5946e72a3a166b527f8b63775dbcde5c232ac9801
+SIZE (steinbergmedia-vst3sdk-e9895dc9ef20bedd93a0fde5ad664bc8b56d4338_GH0.tar.gz) = 416373
+SHA256 (surge-synthesizer-tuning-library-601c0eabff31fff8a543b49d3e48073f338f413c_GH0.tar.gz) = c714bbcafb695315bd56a6e82f3d2db4a0923a76895b4b59e615987cb7b58000
+SIZE (surge-synthesizer-tuning-library-601c0eabff31fff8a543b49d3e48073f338f413c_GH0.tar.gz) = 152641
 SHA256 (surge-synthesizer-surgesynthteam_tuningui-54f9a74cd55cdb33fb4d32d706067626857cfc75_GH0.tar.gz) = c95f5610f9f965bfea6b3cdf14a54a0479486ed8ba82c0c0830da7ee9cd07da0
 SIZE (surge-synthesizer-surgesynthteam_tuningui-54f9a74cd55cdb33fb4d32d706067626857cfc75_GH0.tar.gz) = 10997
-SHA256 (juce-framework-JUCE-2f980209cc4091a4490bb1bafc5d530f16834e58_GH0.tar.gz) = 4d695ead0f90b2a01de910ae80809ae92dead7527c01589518c78f8626a9dde2
-SIZE (juce-framework-JUCE-2f980209cc4091a4490bb1bafc5d530f16834e58_GH0.tar.gz) = 18707714
-SHA256 (steinbergmedia-vst3_base-985fe019276ee03c2751a1736ba3b390678e29f2_GH0.tar.gz) = 7eaf215f5f95fcdda6261b4e1c45a0d24e4bfb68dc2292ad3c0156b7a8d99f2a
-SIZE (steinbergmedia-vst3_base-985fe019276ee03c2751a1736ba3b390678e29f2_GH0.tar.gz) = 62213
-SHA256 (steinbergmedia-vst3_cmake-31b3f3c3e5c4e1bcfee221e5076b6b56296214d7_GH0.tar.gz) = 284132980df8f318b2d1b2ee1237c99aa0927e266d79bde7fb367d4522ec6108
-SIZE (steinbergmedia-vst3_cmake-31b3f3c3e5c4e1bcfee221e5076b6b56296214d7_GH0.tar.gz) = 19278
-SHA256 (steinbergmedia-vst3_doc-a3ad6a147ed8347c802dd2a946d84939a3572164_GH0.tar.gz) = e223c0433aabd8a3fec377c6ef76e4576422c72f817ea8cd179a9363c941ba8c
-SIZE (steinbergmedia-vst3_doc-a3ad6a147ed8347c802dd2a946d84939a3572164_GH0.tar.gz) = 41607026
-SHA256 (steinbergmedia-vst3_pluginterfaces-93cef1afb7061e488625045ba5a82abaa83d27fe_GH0.tar.gz) = 152f37370d1c284f0eda9e4e43db54e1c0bf5fc3cf1ef6f5fabc9a3314c38f73
-SIZE (steinbergmedia-vst3_pluginterfaces-93cef1afb7061e488625045ba5a82abaa83d27fe_GH0.tar.gz) = 95833
-SHA256 (steinbergmedia-vst3_public_sdk-9589800ed94573354bc29de45eec5744523fbfcb_GH0.tar.gz) = d5519df35613c1e7047ffa4570f1b2a99bd82d2028156b4c5b461a55991c5c7a
-SIZE (steinbergmedia-vst3_public_sdk-9589800ed94573354bc29de45eec5744523fbfcb_GH0.tar.gz) = 12335277
-SHA256 (steinbergmedia-vstgui-6c48e17c174abaf2f1dc8ae41e5fab70599eca6c_GH0.tar.gz) = 4f020e77c2170b2dcfae09da5623271e8253f2f09be03e4a2264c0c20a26c876
-SIZE (steinbergmedia-vstgui-6c48e17c174abaf2f1dc8ae41e5fab70599eca6c_GH0.tar.gz) = 3669983
+SHA256 (ODDSound-MTS-ESP-514ed958b38e5ab501999f902a2427ebe6232a78_GH0.tar.gz) = c184c81aa83cb533e5d05ceeeccad716e4d294b87a12510ec9d43be682b60f6c
+SIZE (ODDSound-MTS-ESP-514ed958b38e5ab501999f902a2427ebe6232a78_GH0.tar.gz) = 1328114
+SHA256 (juce-framework-JUCE-d054f0d14dcac387aebda44ce5d792b5e7a625b3_GH0.tar.gz) = c1a16c614787a8666896392bdff9e24571b6b0893be8db6a963ed629c8e5b058
+SIZE (juce-framework-JUCE-d054f0d14dcac387aebda44ce5d792b5e7a625b3_GH0.tar.gz) = 19419992
+SHA256 (free-audio-clap-juce-extensions-4491bc30223cecf8ff495de943510863b71a7a81_GH0.tar.gz) = ba84419c9691741add29d241e1a2578677528971eee1d7a0b2eccc77e1c86223
+SIZE (free-audio-clap-juce-extensions-4491bc30223cecf8ff495de943510863b71a7a81_GH0.tar.gz) = 69038
+SHA256 (free-audio-clap-df8f16c69ba1c1a15fb105f0c5a2e5b9ac6be742_GH0.tar.gz) = 8d683a56092447b3be59e794e693dee61e2965fb4fbbeb2f97888389a6454818
+SIZE (free-audio-clap-df8f16c69ba1c1a15fb105f0c5a2e5b9ac6be742_GH0.tar.gz) = 2342648
+SHA256 (free-audio-clap-helpers-7b53a685e11465154b4ccba3065224dbcbf8a893_GH0.tar.gz) = eaf5869b2b40dcfc71a1e3f73167a2255c2fc2d53f553f813b6c051e54df1374
+SIZE (free-audio-clap-helpers-7b53a685e11465154b4ccba3065224dbcbf8a893_GH0.tar.gz) = 38227
--- a/audio/dexed/files/patch-CMakeLists.txt
+++ b/audio/dexed/files/patch-CMakeLists.txt
@ -1,12 +0,0 @@
- from Bug 265342 - audio/dexed: fix build on armv7 arm64
-
--- CMakeLists.txt.orig	2022-07-20 04:50:04 UTC
-+++ CMakeLists.txt
-@@ -52,7 +52,6 @@ target_compile_options(${PROJECT_NAME} PUBLIC
-         )
- elseif(UNIX AND NOT APPLE)
- target_compile_options(${PROJECT_NAME} PUBLIC
-        -Werror
-         -Wno-deprecated-declarations
-         -Wno-unused-value
-         )
--- a/audio/dexed/files/patch-Source_PluginProcessor.h
+++ b/audio/dexed/files/patch-Source_PluginProcessor.h
@ -1,8 +1,8 @@
 - from Bug 265342 - audio/dexed: fix build on armv7 arm64 

--- Source/PluginProcessor.h.orig	2022-07-20 04:35:43 UTC
+--- Source/PluginProcessor.h.orig	2024-07-14 16:47:34 UTC
 +++ Source/PluginProcessor.h
-@@ -120,7 +120,7 @@ class DexedAudioProcessor  : public AudioProcessor, pu
+@@ -129,7 +129,7 @@ class DexedAudioProcessor  : public AudioProcessor, pu
     EngineOpl engineOpl;
     
     char clipboard[161];
--- a/audio/dexed/files/patch-libs_JUCE_modules_juceaudioprocessors_format__types_VST3__SDK_pluginterfaces_base_fplatform.h
+++ b/audio/dexed/files/patch-libs_JUCE_modules_juceaudioprocessors_format__types_VST3__SDK_pluginterfaces_base_fplatform.h
@ -1,17 +1,17 @@
--- libs/JUCE/modules/juce_audio_processors/format_types/VST3_SDK/pluginterfaces/base/fplatform.h.orig	2022-02-28 13:41:31 UTC
+--- libs/JUCE/modules/juce_audio_processors/format_types/VST3_SDK/pluginterfaces/base/fplatform.h.orig	2024-07-14 16:47:34 UTC
 +++ libs/JUCE/modules/juce_audio_processors/format_types/VST3_SDK/pluginterfaces/base/fplatform.h
-@@ -95,7 +95,7 @@
+@@ -128,7 +128,7 @@
 //-----------------------------------------------------------------------------
 // LINUX
 //-----------------------------------------------------------------------------
 -#elif __gnu_linux__ || __linux__
 +#elif __gnu_linux__ || __linux__ || defined(__FreeBSD__)
- 	#define SMTG_OS_LINUX	1
- 	#define SMTG_OS_MACOS	0
- 	#define SMTG_OS_WINDOWS	0
-@@ -107,7 +107,7 @@
- 	#define SMTG_CPU_ARM	__arm__
- 	#define SMTG_CPU_ARM_64	__aarch64__
+ 	#define SMTG_OS_LINUX		1
+ 	#define SMTG_OS_MACOS		0
+ 	#define SMTG_OS_WINDOWS		0
+@@ -150,7 +150,7 @@
+ 	#endif
+ 	#define SMTG_CPU_ARM_64EC 0
 
 -	#include <endian.h>
 +	#include <sys/endian.h>
--- a/audio/dexed/files/patch-libs_JUCE_modules_juce__core_juce__core.cpp
+++ b/audio/dexed/files/patch-libs_JUCE_modules_juce__core_juce__core.cpp
@ -1,11 +0,0 @@
--- libs/JUCE/modules/juce_core/juce_core.cpp.orig	2022-04-12 19:06:54 UTC
-+++ libs/JUCE/modules/juce_core/juce_core.cpp
-@@ -42,7 +42,7 @@
- #include <thread>
- 
- #if ! JUCE_ANDROID
- #include <sys/timeb.h>
-+// #include <sys/timeb.h>
-  #include <cwctype>
- #endif
- 
--- a/audio/dexed/files/patch-libs_JUCE_modules_juce__core_native_jucelinuxFiles.cpp
+++ b/audio/dexed/files/patch-libs_JUCE_modules_juce__core_native_jucelinuxFiles.cpp
@ -1,24 +0,0 @@
- otherwise it fails with unknown 'environ' symbol, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=263265
-
--- libs/JUCE/modules/juce_core/native/juce_linux_Files.cpp.orig	2022-08-15 18:29:17 UTC
-+++ libs/JUCE/modules/juce_core/native/juce_linux_Files.cpp
-@@ -21,7 +21,9 @@
- */
- 
- #if JUCE_BSD
-extern char** environ;
-+//extern char** environ; // this is broken on FreeBSD, see https://reviews.freebsd.org/D30842
-+#include <dlfcn.h>
-+static char*** environ_ptr = (char***)dlsym(RTLD_DEFAULT, "environ"); // workaround for the above
- #endif
- 
- namespace juce
-@@ -229,7 +231,7 @@ bool Process::openDocument (const String& fileName, co
-         setsid();
- 
-         // Child process
-        execve (argv[0], (char**) argv, environ);
-+        execve (argv[0], (char**) argv, *environ_ptr);
-         exit (0);
-     }
- 
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	libgpod
 PORTVERSION=	0.8.3
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	audio
 MASTER_SITES=	SF/gtkpod/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}

--- a/audio/libgpod/files/patch-tools_ipod-lockdown.c
+++ b/audio/libgpod/files/patch-tools_ipod-lockdown.c
@ -0,0 +1,33 @@
+Deprecated method plist_dict_insert_item() has been removed and
+replaced by plist_dict_set_item() in devel/libplist >= 2.3.0.
+
+--- tools/ipod-lockdown.c.orig	2013-07-10 13:57:39 UTC
+++ tools/ipod-lockdown.c
+@@ -100,7 +100,7 @@ read_sysinfo_extended_by_uuid (const char *uuid)
+ 	plist_get_string_val(ptr, &str);
+ 	if (str != NULL) {
+ 	    ptr = plist_new_string(str);
+-	    plist_dict_insert_item(value, "SerialNumber", ptr);
+	    plist_dict_set_item(value, "SerialNumber", ptr);
+ 	    free(str);
+ 	}
+ 
+@@ -112,15 +112,15 @@ read_sysinfo_extended_by_uuid (const char *uuid)
+ 	plist_get_string_val(ptr, &str);
+ 	if (str != NULL) {
+ 	    ptr = plist_new_string(str);
+-	    plist_dict_insert_item(value, "VisibleBuildID", ptr);
+	    plist_dict_set_item(value, "VisibleBuildID", ptr);
+ 	    free(str);
+ 	}
+ 
+ 	ptr = plist_new_string(uuid);
+-	plist_dict_insert_item(value, "FireWireGUID", ptr);
+	plist_dict_set_item(value, "FireWireGUID", ptr);
+ 
+ 	ptr = plist_new_string(uuid);
+-	plist_dict_insert_item(value, "UniqueDeviceID", ptr);
+	plist_dict_set_item(value, "UniqueDeviceID", ptr);
+ 
+ 	plist_to_xml(value, &xml, &xml_length);
+ 
--- a/audio/libsidplayfp/Makefile
+++ b/audio/libsidplayfp/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	libsidplayfp
-DISTVERSION=	2.7.1
+DISTVERSION=	2.8.0
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/

@ -23,6 +23,9 @@ CONFIGURE_ARGS=	--disable-static \

 INSTALL_TARGET=	install-strip

+SIDPLAYFP_SHLIB_VERSION=        6.4.32
+STILVIEW_SHLIB_VERSION=         0.0.5
+
 PLIST_SUB+=	SIDPLAYFP_SHLIB_VER=${SIDPLAYFP_SHLIB_VERSION:C/\.[[:digit:].]+//} \
 		SIDPLAYFP_SHLIB_VERSION=${SIDPLAYFP_SHLIB_VERSION} \
 		STILVIEW_SHLIB_VER=${STILVIEW_SHLIB_VERSION:C/\.[[:digit:].]+//} \
@ -46,11 +49,11 @@ CONFIGURE_ARGS+=	--with-simd=neon
 .endif

 .if ${ARCH} == "amd64"
-CONFIGURE_ARGS+=	--with-simd=sse2
+.if !defined(CPUTYPE)
+CFLAGS+=	-march=penryn
+.endif
+CONFIGURE_ARGS+=	--with-simd=sse4
 .endif
-
-SIDPLAYFP_SHLIB_VERSION=	6.4.31
-STILVIEW_SHLIB_VERSION=		0.0.4

 post-build-DOXYGEN-on:
 	${MAKE_CMD} doc -C ${WRKSRC}
--- a/audio/libsidplayfp/distinfo
+++ b/audio/libsidplayfp/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1717352921
-SHA256 (libsidplayfp-2.7.1.tar.gz) = 416df16c09b0ab058c21adc1792abfac8524a27b0dac0034afc040057f6346ba
-SIZE (libsidplayfp-2.7.1.tar.gz) = 806267
+TIMESTAMP = 1719728064
+SHA256 (libsidplayfp-2.8.0.tar.gz) = cd929e69a62e880d88213fb4c2acd50e49e9454c084965b0d2d1b0e0d639d858
+SIZE (libsidplayfp-2.8.0.tar.gz) = 805758
--- a/audio/logitechmediaserver/Makefile
+++ b/audio/logitechmediaserver/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	logitechmediaserver
-DISTVERSION=	8.5.1
+DISTVERSION=	8.5.2
 CATEGORIES=	audio

 MAINTAINER=	trueos@norwegianrockcat.com
@ -22,7 +22,7 @@ RUN_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL

 USES=		gettext-runtime gmake perl5 shebangfix
 USE_GITHUB=	yes
-GH_TUPLE=	LMS-Community:slimserver:3b46196 \
+GH_TUPLE=	LMS-Community:slimserver:88ba56f \
 		LMS-Community:slimserver-vendor:384095c:vendor
 USE_RC_SUBR=	logitechmediaserver
 SHEBANG_FILES=	Bin/darwin/check-update.pl \
@ -37,6 +37,8 @@ SHEBANG_FILES=	Bin/darwin/check-update.pl \
 		slimserver.pl \
 		${WRKSRC_vendor}/CPAN/hints/darwin.pl

+PORTSCOUT=	skipv:10.0.3,10.0.4
+
 SUB_FILES=	Custom.pm \
 		custom-convert.conf \
 		logitechmediaserver.conf
--- a/audio/logitechmediaserver/distinfo
+++ b/audio/logitechmediaserver/distinfo
@ -1,5 +1,5 @@
-TIMESTAMP = 1713596232
-SHA256 (LMS-Community-slimserver-8.5.1-3b46196_GH0.tar.gz) = 21c91c5f5893212cc97afa8227dd453e1e2b148adca255b1a0f3b325e6fe44b4
-SIZE (LMS-Community-slimserver-8.5.1-3b46196_GH0.tar.gz) = 157018003
+TIMESTAMP = 1717674739
+SHA256 (LMS-Community-slimserver-8.5.2-88ba56f_GH0.tar.gz) = 4e512115a4e1d98d9c5fff66f6bf2b79d421fe54bf32cfaf040b69c9cc57bf2d
+SIZE (LMS-Community-slimserver-8.5.2-88ba56f_GH0.tar.gz) = 157020387
 SHA256 (LMS-Community-slimserver-vendor-384095c_GH0.tar.gz) = 8e597e560b699401baac0c352d9538a70bd7b54be4e78a8952f594efb213cf2a
 SIZE (LMS-Community-slimserver-vendor-384095c_GH0.tar.gz) = 184535265
--- a/audio/owntone/Makefile
+++ b/audio/owntone/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	owntone
 DISTVERSION=	28.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/owntone/owntone-server/releases/download/${DISTVERSION}/

--- a/audio/plasma5-oxygen-sounds/Makefile
+++ b/audio/plasma5-oxygen-sounds/Makefile
@ -11,7 +11,7 @@ LICENSE_COMB=	multi

 USES=		cmake:noninja kde:5 qt:5 tar:xz
 USE_KDE=	ecm:build
-USE_QT=		buildtools:build qmake:build
+USE_QT=		buildtools:build core:build qmake:build
 NO_ARCH=	yes

 .include <bsd.port.mk>
--- a/audio/py-pocketsphinx/Makefile
+++ b/audio/py-pocketsphinx/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	pocketsphinx
 PORTVERSION=	0.1.15
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -12,7 +12,7 @@ WWW=	https://github.com/bambocher/pocketsphinx-python
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE

-BUILD_DEPENDS=	swig>0:devel/swig
+BUILD_DEPENDS=	swig40>0:devel/swig40
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libpulse-simple.so:audio/pulseaudio \
 		libpulse.so:audio/pulseaudio
@ -20,6 +20,7 @@ LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 USES=	python
 USE_PYTHON=	distutils

+BINARY_ALIAS=	swig=swig40
 CFLAGS+=	-I${LOCALBASE}/include

 post-install:
--- a/audio/shairport-sync/Makefile
+++ b/audio/shairport-sync/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	shairport-sync
 DISTVERSION=	4.3.4
+PORTREVISION=	1
 CATEGORIES=	audio

 MAINTAINER=	ehaupt@FreeBSD.org
--- a/audio/shuriken/files/patch-Shuriken.pro
+++ b/audio/shuriken/files/patch-Shuriken.pro
@ -0,0 +1,13 @@
+--- Shuriken.pro.orig	2024-07-14 17:04:28 UTC
+++ Shuriken.pro
+@@ -13,9 +13,7 @@
+         }
+     }
+ }
+-QMAKE_CXXFLAGS += -msse \
+-    -msse2 \
+-    -std=c++11
+QMAKE_CXXFLAGS += -std=c++11
+ nowarning: QMAKE_CXXFLAGS += -Wno-misleading-indentation \
+     -Wno-unused-parameter
+ nopie: QMAKE_LFLAGS += -no-pie
--- a/audio/surge-synthesizer-xt-lv2/Makefile
+++ b/audio/surge-synthesizer-xt-lv2/Makefile
@ -1,10 +1,14 @@
 PORTNAME=	surge-synthesizer-xt
 DISTVERSIONPREFIX=	release_xt_
-DISTVERSION=	1.0.1
-PORTREVISION=	1
+DISTVERSION=	1.3.2
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2

+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES=	8a2fb0c5522d9872b79aa6053253cf252dcf81fa.patch:-p1 \
+		373971b24477abb1b7f5a18657b0fb48ef5177ca.patch:-p1 \
+		90e36f5be98ba12a513e53401c89732ae7fd11b3.patch:-p1
+
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Surge Synthesizer (XT) LV2 and VST plug-in
 WWW=		https://surge-synthesizer.github.io/
@ -12,8 +16,8 @@ WWW=		https://surge-synthesizer.github.io/
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE

-NOT_FOR_ARCHS=	riscv64 # see https://github.com/surge-synthesizer/surge/issues/6363
-NOT_FOR_ARCHS_REASON=	simde doesn't support riscv64
+NOT_FOR_ARCHS=	armv7 i386 powerpc riscv64 # see https://github.com/surge-synthesizer/surge/issues/6363
+NOT_FOR_ARCHS_REASON=	32 Bit Builds are only available on Windows; simde doesn't support riscv64

 BUILD_DEPENDS=	lv2>0:audio/lv2 \
 		${LOCALBASE}/include/nanosvg.h:graphics/nanosvg \
@ -23,7 +27,6 @@ BUILD_DEPENDS=	lv2>0:audio/lv2 \
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libjack.so:audio/jack \
-		libmidifile.so:audio/midifile \
 		libsamplerate.so:audio/libsamplerate \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxcb-cursor.so:x11/xcb-util-cursor \
@ -41,25 +44,41 @@ GH_PROJECT=	surge

 DATADIR=	${PREFIX}/share/surge-xt

+CMAKE_ON=	SURGE_BUILD_LV2 \
+		SURGE_SKIP_VST3
 CMAKE_OFF=	JUCE_PLUGINHOST_VST3 JUCE_PLUGINHOST_VST

-CXXFLAGS+=	-I${LOCALBASE}/include/midifile # see https://github.com/surge-synthesizer/surge/issues/4358
 CXXFLAGS+=	-DPLUGIN_API="" -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -Dstrnicmp16=strncasecmp # for Juce
-LDFLAGS+=	-lmidifile

-GH_TUPLE=	surge-synthesizer:tuning-library:bdb107f58ea22720bfa2a6d7a910fc77e69d72fc:surge_synthesizer_tuning_library/libs/tuning-library \
-		pybind:pybind11:30eb39ed79d1e2eeff15219ac00773034300a5e6:pybind_pybind11/libs/pybind11 \
-		surge-synthesizer:eurorack:1b46769c2404ab88d988bd91f5772d79ac6d5353:surge_synthesizer_eurorack/libs/eurorack/eurorack \
-		gulrak:filesystem:8166dd1546c620cfdd4f1bc1d1cd723a91b8f390:gulrak_filesystem/libs/filesystem/ghc-filesystem \
-		ODDSound:MTS-ESP:2ec61b536fd1329bf358771eb3f15615a4be7154:ODDSound_MTS_ESP/libs/oddsound-mts/MTS-ESP \
+.if !defined(WITH_DEBUG)
+CFLAGS+=	-O3 -ffast-math
+CXXFLAGS+=	-O3 -ffast-math
+.endif
+
+GH_TUPLE=	surge-synthesizer:eurorack:f7614460cd3e295f6f6132f9052984c7bca9a69d:surge_synthesizer_eurorack/libs/eurorack/eurorack \
+		fmtlib:fmt:67c0c0c09cf74d407d71a29c194761981614df3e:fmtlib_fmt/libs/fmt \
+		surge-synthesizer:JUCE:cf5754b:surge_synthesizer_JUCE/libs/JUCE \
 		libsndfile:libsamplerate:d0ea53db94a329bce56e9382852e0931d7744651:libsndfile_libsamplerate/libs/libsamplerate \
 		LuaJIT:LuaJIT:ec6edc5c39c25e4eb3fca51b753f9995e97215da:LuaJIT_LuaJIT/libs/LuaJitLib/LuaJIT \
-		surge-synthesizer:JUCE:086b21be1b08442631dcb58a9abc12acd48fce0a:surge_synthesizer_JUCE/libs/JUCE \
-		fmtlib:fmt:d58d19ba323582841cbf552d1b9230817b61ed01:fmtlib_fmt/libs/fmt \
+		simd-everywhere:simde:71fd833d9666141edcd1d3c109a80e228303d8d7:simd_everywhere_simde/libs/simde \
+		surge-synthesizer:tuning-library:4cbe55f2da86c0302368a681406553a1dd7074dd:surge_synthesizer_tuning_library/libs/tuning-library \
+		ODDSound:MTS-ESP:3eb56f2452244b343ce738efd067d1082b67f9b4:ODDSound_MTS_ESP/libs/oddsound-mts/MTS-ESP \
 		taocpp:PEGTL:64af78c6a7959cd5753ad165ec9f65591aa96f2d:taocpp_PEGTL/libs/PEGTL \
+		surge-synthesizer:pffft:96292e6965f74d5e08108f5f717df0bf8aa06b57:surge_synthesizer_pffft/libs/pffft \
+		pybind:pybind11:0bd8896a4010f2d91b2340570c24fa08606ec406:pybind_pybind11/libs/pybind11 \
+		surge-synthesizer:sst-basic-blocks:42675840a0dd18bfd997f6394b874e0ec984b651:surge_synthesizer_sst_basic_blocks/libs/sst/sst-basic-blocks \
+		surge-synthesizer:sst-cpputils:9418be4d6e059e236db43f99925f46492203ec55:surge_synthesizer_sst_cpputils/libs/sst/sst-cpputils \
+		surge-synthesizer:sst-effects:e63fe46e38166ca0658639b66e706f740b468c44:surge_synthesizer_sst_effects/libs/sst/sst-effects \
+		surge-synthesizer:sst-filters:1733117d051b2b1d09296547af28dec0bcb3dc69:surge_synthesizer_sst_filters/libs/sst/sst-filters \
+		surge-synthesizer:sst-plugininfra:49ee7eb761bc06d0c0a012659f975d59b868e3e8:surge_synthesizer_sst_plugininfra/libs/sst/sst-plugininfra \
+		surge-synthesizer:sst-waveshapers:42bfa678e4f2447d0f4c9a51b7ba7ea68f6da108:surge_synthesizer_sst_waveshapers/libs/sst/sst-waveshapers \
+		sudara:melatonin_inspector:b7a0f2de07ed8692963605561fe1a3793885994b:sudara_melatonin_inspector/libs/melatonin_inspector \
+		free-audio:clap:df8f16c69ba1c1a15fb105f0c5a2e5b9ac6be742:free_audio_clap/libs/clap-juce-extensions/clap-libs/clap \
+		free-audio:clap-helpers:7b53a685e11465154b4ccba3065224dbcbf8a893:free_audio_clap_helpers/libs/clap-juce-extensions/clap-libs/clap-helpers \
+		free-audio:clap-juce-extensions:087dd16e2d17e6b3f1c9a92817a8a7348ea08168:free_audio_clap_juce_extensions/libs/clap-juce-extensions \
 		nemequ:munit:da8f73412998e4f1adf1100dc187533a51af77fd:nemequ_munit/libs/simde/test/munit \
-		free-audio:clap:ac37c9ab03f26f639e1fc78cf29c6cab9cc65890:free_audio_clap/libs/clap-juce-extensions/clap-libs/clap \
-		free-audio:clap-helpers:0b9f7ae5e24e370a4047fd1d6b5d3b83fa0ae7ee:free_audio_clap_helpers/libs/clap-juce-extensions/clap-libs/clap-helpers
+		gulrak:filesystem:614bbe87b80435d87ab8791564370e0c1d13627d:gulrak_filesystem/libs/sst/sst-plugininfra/libs/filesystem/ghc-filesystem \
+		richgel999:miniz:16413c213de38e703d883006193734e8b1178d5d:richgel999_miniz/libs/sst/sst-plugininfra/libs/miniz

 BINARY_ALIAS=	python=${PYTHON_CMD}

@ -75,8 +94,8 @@ CMAKE_ARGS+=	-DARM_NATIVE=native # based on https://github.com/surge-synthesizer

 post-patch:
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
-	@${REINPLACE_CMD} -e 's|move (group)|std::move (group)|g' \
-		${WRKSRC}/libs/JUCE/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.cpp
+	#@${REINPLACE_CMD} -e 's|move (group)|std::move (group)|g' \
+	#	${WRKSRC}/libs/JUCE/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.cpp
 .endif

 .include <bsd.port.post.mk>
--- a/audio/surge-synthesizer-xt-lv2/distinfo
+++ b/audio/surge-synthesizer-xt-lv2/distinfo
@ -1,29 +1,57 @@
-TIMESTAMP = 1647753146
-SHA256 (surge-synthesizer-surge-release_xt_1.0.1_GH0.tar.gz) = f748dce4f8046d39d2c38caffa38abb83ec9a66189b19dc2425ae988ed85b286
-SIZE (surge-synthesizer-surge-release_xt_1.0.1_GH0.tar.gz) = 142963705
-SHA256 (surge-synthesizer-tuning-library-bdb107f58ea22720bfa2a6d7a910fc77e69d72fc_GH0.tar.gz) = f71574af921e45b0912392304293f1b98c16e3ce7d96726d531602df5b69f750
-SIZE (surge-synthesizer-tuning-library-bdb107f58ea22720bfa2a6d7a910fc77e69d72fc_GH0.tar.gz) = 150192
-SHA256 (pybind-pybind11-30eb39ed79d1e2eeff15219ac00773034300a5e6_GH0.tar.gz) = 2e748579ea1903d55b8abe9d314fd5c3cf9f4e5734c525444e4d2aed146efc9e
-SIZE (pybind-pybind11-30eb39ed79d1e2eeff15219ac00773034300a5e6_GH0.tar.gz) = 637726
-SHA256 (surge-synthesizer-eurorack-1b46769c2404ab88d988bd91f5772d79ac6d5353_GH0.tar.gz) = 6e4da428de5c0c9efdf608840d77903b2ef10876bba3a8486a88ba430f1492bc
-SIZE (surge-synthesizer-eurorack-1b46769c2404ab88d988bd91f5772d79ac6d5353_GH0.tar.gz) = 435986
-SHA256 (gulrak-filesystem-8166dd1546c620cfdd4f1bc1d1cd723a91b8f390_GH0.tar.gz) = 4c82237bacfb1985de654cf2a93c19dc2968c5edf676c01142cb5f7df260bfc2
-SIZE (gulrak-filesystem-8166dd1546c620cfdd4f1bc1d1cd723a91b8f390_GH0.tar.gz) = 169666
-SHA256 (ODDSound-MTS-ESP-2ec61b536fd1329bf358771eb3f15615a4be7154_GH0.tar.gz) = 4559936750104dd0ca960b396f18b498f9c0cb530b3dcae1bda0db34f0c5945d
-SIZE (ODDSound-MTS-ESP-2ec61b536fd1329bf358771eb3f15615a4be7154_GH0.tar.gz) = 1113373
+TIMESTAMP = 1720645370
+SHA256 (surge-synthesizer-surge-release_xt_1.3.2_GH0.tar.gz) = fbffb8cfd23af8f11a8c695fa10d722f9bf6c306198ad3c4b1084973b4fcab3f
+SIZE (surge-synthesizer-surge-release_xt_1.3.2_GH0.tar.gz) = 278603004
+SHA256 (surge-synthesizer-eurorack-f7614460cd3e295f6f6132f9052984c7bca9a69d_GH0.tar.gz) = c59a242525c94b648ed614463061cd648a76b7dd36268ba870faefbb0d3c3458
+SIZE (surge-synthesizer-eurorack-f7614460cd3e295f6f6132f9052984c7bca9a69d_GH0.tar.gz) = 577831
+SHA256 (fmtlib-fmt-67c0c0c09cf74d407d71a29c194761981614df3e_GH0.tar.gz) = af750af8635751938b87f6b4f40f58410c6bf87bd8d2ec53e2725b773b883e53
+SIZE (fmtlib-fmt-67c0c0c09cf74d407d71a29c194761981614df3e_GH0.tar.gz) = 854998
+SHA256 (surge-synthesizer-JUCE-cf5754b_GH0.tar.gz) = 30c6e6e0329b9b577fa8d3997b5e166572fa36df8d6cedac55e4a59b84b1eadb
+SIZE (surge-synthesizer-JUCE-cf5754b_GH0.tar.gz) = 19484230
 SHA256 (libsndfile-libsamplerate-d0ea53db94a329bce56e9382852e0931d7744651_GH0.tar.gz) = 98634e656c521e7f9d34a3c75ceb9cb5949ef8aceb114766ad2dd7a2eaf3a574
 SIZE (libsndfile-libsamplerate-d0ea53db94a329bce56e9382852e0931d7744651_GH0.tar.gz) = 3954604
 SHA256 (LuaJIT-LuaJIT-ec6edc5c39c25e4eb3fca51b753f9995e97215da_GH0.tar.gz) = 64ac400317bc02a4d10ddd6759370898280421bcb1d20b52601ca289f57aa65d
 SIZE (LuaJIT-LuaJIT-ec6edc5c39c25e4eb3fca51b753f9995e97215da_GH0.tar.gz) = 1037515
-SHA256 (surge-synthesizer-JUCE-086b21be1b08442631dcb58a9abc12acd48fce0a_GH0.tar.gz) = b9e373c9617039af9e831e8d605f51772df32ed902d2b39b2003427a567ab352
-SIZE (surge-synthesizer-JUCE-086b21be1b08442631dcb58a9abc12acd48fce0a_GH0.tar.gz) = 18705490
-SHA256 (fmtlib-fmt-d58d19ba323582841cbf552d1b9230817b61ed01_GH0.tar.gz) = 2d0c60059b3ac4a073f7421c6c44834a7fd58fed1e304bc126d9f7a1b4a017bd
-SIZE (fmtlib-fmt-d58d19ba323582841cbf552d1b9230817b61ed01_GH0.tar.gz) = 814069
+SHA256 (simd-everywhere-simde-71fd833d9666141edcd1d3c109a80e228303d8d7_GH0.tar.gz) = 72b2c14a487560b7eb203795f2c2fead5c7499662e639944cca2a9bb19f09029
+SIZE (simd-everywhere-simde-71fd833d9666141edcd1d3c109a80e228303d8d7_GH0.tar.gz) = 7481259
+SHA256 (surge-synthesizer-tuning-library-4cbe55f2da86c0302368a681406553a1dd7074dd_GH0.tar.gz) = 1d4d58888be16b9805a288a0658f9cab328d4e37d58be72b6b2e843cab101373
+SIZE (surge-synthesizer-tuning-library-4cbe55f2da86c0302368a681406553a1dd7074dd_GH0.tar.gz) = 152138
+SHA256 (ODDSound-MTS-ESP-3eb56f2452244b343ce738efd067d1082b67f9b4_GH0.tar.gz) = 7239fb2b94cb3ad6aaa5799fcce31bd2c50955133db0fdad7d02fab4a4e52e1e
+SIZE (ODDSound-MTS-ESP-3eb56f2452244b343ce738efd067d1082b67f9b4_GH0.tar.gz) = 1326536
 SHA256 (taocpp-PEGTL-64af78c6a7959cd5753ad165ec9f65591aa96f2d_GH0.tar.gz) = a6e98bed5730eb88afd0a5cac5d9a3eae7ebaa196f01f2f30d0148c951c2d578
 SIZE (taocpp-PEGTL-64af78c6a7959cd5753ad165ec9f65591aa96f2d_GH0.tar.gz) = 201511
+SHA256 (surge-synthesizer-pffft-96292e6965f74d5e08108f5f717df0bf8aa06b57_GH0.tar.gz) = 30feb3c31df04eac257730aeab9e2d7a3d8d845f9abafd30dc65ae5ff66e7316
+SIZE (surge-synthesizer-pffft-96292e6965f74d5e08108f5f717df0bf8aa06b57_GH0.tar.gz) = 178920
+SHA256 (pybind-pybind11-0bd8896a4010f2d91b2340570c24fa08606ec406_GH0.tar.gz) = da8d650ff0e5905481ad1c15bde8324e377e691cd083320d17859ac21f8b7022
+SIZE (pybind-pybind11-0bd8896a4010f2d91b2340570c24fa08606ec406_GH0.tar.gz) = 740557
+SHA256 (surge-synthesizer-sst-basic-blocks-42675840a0dd18bfd997f6394b874e0ec984b651_GH0.tar.gz) = aa127bc40c3409bdea752e1e10b81818aae1f97fc806701dbece348f98fc6ef9
+SIZE (surge-synthesizer-sst-basic-blocks-42675840a0dd18bfd997f6394b874e0ec984b651_GH0.tar.gz) = 197968
+SHA256 (surge-synthesizer-sst-cpputils-9418be4d6e059e236db43f99925f46492203ec55_GH0.tar.gz) = c3fdba3c2b50d142b817b0a55ccd8e3721f9b7995c8d611a74d52bd72ea4f4c1
+SIZE (surge-synthesizer-sst-cpputils-9418be4d6e059e236db43f99925f46492203ec55_GH0.tar.gz) = 172396
+SHA256 (surge-synthesizer-sst-effects-e63fe46e38166ca0658639b66e706f740b468c44_GH0.tar.gz) = a8bc791f48770fc0d5eab855d796d505ef369b2117946795eac50f40d2364cae
+SIZE (surge-synthesizer-sst-effects-e63fe46e38166ca0658639b66e706f740b468c44_GH0.tar.gz) = 206851
+SHA256 (surge-synthesizer-sst-filters-1733117d051b2b1d09296547af28dec0bcb3dc69_GH0.tar.gz) = b07830c832eb7101d7ab6c12cce937bd19e87c2e3694425169dc3953032ee670
+SIZE (surge-synthesizer-sst-filters-1733117d051b2b1d09296547af28dec0bcb3dc69_GH0.tar.gz) = 238933
+SHA256 (surge-synthesizer-sst-plugininfra-49ee7eb761bc06d0c0a012659f975d59b868e3e8_GH0.tar.gz) = 8e4bdcd68aa1face31263a9a54990157d9afd2f1b0e17de9c99f55deaec8c32b
+SIZE (surge-synthesizer-sst-plugininfra-49ee7eb761bc06d0c0a012659f975d59b868e3e8_GH0.tar.gz) = 217174
+SHA256 (surge-synthesizer-sst-waveshapers-42bfa678e4f2447d0f4c9a51b7ba7ea68f6da108_GH0.tar.gz) = 6e69e3a0a139a6d09c3d8fcd4a09a875dfd3c87df1e9512d99bcccda1bca5053
+SIZE (surge-synthesizer-sst-waveshapers-42bfa678e4f2447d0f4c9a51b7ba7ea68f6da108_GH0.tar.gz) = 190186
+SHA256 (sudara-melatonin_inspector-b7a0f2de07ed8692963605561fe1a3793885994b_GH0.tar.gz) = a480b1e54e11419637a593f36c3479b1bc3b616d16270573e4152513c87ddf4e
+SIZE (sudara-melatonin_inspector-b7a0f2de07ed8692963605561fe1a3793885994b_GH0.tar.gz) = 149356
+SHA256 (free-audio-clap-df8f16c69ba1c1a15fb105f0c5a2e5b9ac6be742_GH0.tar.gz) = 8d683a56092447b3be59e794e693dee61e2965fb4fbbeb2f97888389a6454818
+SIZE (free-audio-clap-df8f16c69ba1c1a15fb105f0c5a2e5b9ac6be742_GH0.tar.gz) = 2342648
+SHA256 (free-audio-clap-helpers-7b53a685e11465154b4ccba3065224dbcbf8a893_GH0.tar.gz) = eaf5869b2b40dcfc71a1e3f73167a2255c2fc2d53f553f813b6c051e54df1374
+SIZE (free-audio-clap-helpers-7b53a685e11465154b4ccba3065224dbcbf8a893_GH0.tar.gz) = 38227
+SHA256 (free-audio-clap-juce-extensions-087dd16e2d17e6b3f1c9a92817a8a7348ea08168_GH0.tar.gz) = c6e54577e17aa7c88634a66781ba9fb2983aab6635df09b26cd7729ee95c4355
+SIZE (free-audio-clap-juce-extensions-087dd16e2d17e6b3f1c9a92817a8a7348ea08168_GH0.tar.gz) = 65802
 SHA256 (nemequ-munit-da8f73412998e4f1adf1100dc187533a51af77fd_GH0.tar.gz) = 835a9ee03e3b9560af5a2e4465394e00337398f5baba9d686083b8e1d93f0c30
 SIZE (nemequ-munit-da8f73412998e4f1adf1100dc187533a51af77fd_GH0.tar.gz) = 27727
-SHA256 (free-audio-clap-ac37c9ab03f26f639e1fc78cf29c6cab9cc65890_GH0.tar.gz) = 632ca1a525f60bbe788ca77518b12869c8d461acbe3f4bed015b280dbe80852d
-SIZE (free-audio-clap-ac37c9ab03f26f639e1fc78cf29c6cab9cc65890_GH0.tar.gz) = 29622
-SHA256 (free-audio-clap-helpers-0b9f7ae5e24e370a4047fd1d6b5d3b83fa0ae7ee_GH0.tar.gz) = 800ebdb771d2e0009bc22ab364c53d1bcbb0a9918c4bdfd2ce7ce7ed697c40e2
-SIZE (free-audio-clap-helpers-0b9f7ae5e24e370a4047fd1d6b5d3b83fa0ae7ee_GH0.tar.gz) = 17269
+SHA256 (gulrak-filesystem-614bbe87b80435d87ab8791564370e0c1d13627d_GH0.tar.gz) = 203360b131364acd24eac25842cda5d1bcc53d12756bd7adfa1031f06aa5dabf
+SIZE (gulrak-filesystem-614bbe87b80435d87ab8791564370e0c1d13627d_GH0.tar.gz) = 177009
+SHA256 (richgel999-miniz-16413c213de38e703d883006193734e8b1178d5d_GH0.tar.gz) = e80e4eab8cfb529e53beefa2021cb47f302a2519d81b4660a6b2cdc5dd791fb9
+SIZE (richgel999-miniz-16413c213de38e703d883006193734e8b1178d5d_GH0.tar.gz) = 283946
+SHA256 (8a2fb0c5522d9872b79aa6053253cf252dcf81fa.patch) = 4bc631f9af589264c6114edc9da881df3127bb1ffdfc5662d7ccfebf6b964182
+SIZE (8a2fb0c5522d9872b79aa6053253cf252dcf81fa.patch) = 1704
+SHA256 (373971b24477abb1b7f5a18657b0fb48ef5177ca.patch) = 4ac0ce951e3855cdcf2ff6dcbd5fdcb8d1ec68a1c55048d85bd0978ca594affa
+SIZE (373971b24477abb1b7f5a18657b0fb48ef5177ca.patch) = 794
+SHA256 (90e36f5be98ba12a513e53401c89732ae7fd11b3.patch) = 8cc97c2bbb49f8ed92ae8ac862ee9736bac0235eda3b09373886230ee0bb4b60
+SIZE (90e36f5be98ba12a513e53401c89732ae7fd11b3.patch) = 1899
--- a/audio/surge-synthesizer-xt-lv2/files/patch-libs_JUCE_modules_juceaudioprocessors_format__types_VST3__SDK_base_source_fstring.cpp
+++ b/audio/surge-synthesizer-xt-lv2/files/patch-libs_JUCE_modules_juceaudioprocessors_format__types_VST3__SDK_base_source_fstring.cpp
@ -1,4 +1,4 @@
--- libs/JUCE/modules/juce_audio_processors/format_types/VST3_SDK/base/source/fstring.cpp.orig	2022-03-20 14:18:51 UTC
+--- libs/JUCE/modules/juce_audio_processors/format_types/VST3_SDK/base/source/fstring.cpp.orig	2024-07-10 14:20:15 UTC
 +++ libs/JUCE/modules/juce_audio_processors/format_types/VST3_SDK/base/source/fstring.cpp
@@ -44,6 +44,7 @@
 #include <cctype>
@ -6,5 +6,5 @@
 #include <cstdarg>
 +#include <cwctype>
 #include <utility>
- 
- #if SMTG_OS_WINDOWS
+ #include <complex>
+ #include <cmath>
--- a/audio/surge-synthesizer-xt-lv2/files/patch-libs_JUCE_modules_juceaudioprocessors_format__types_VST3__SDK_pluginterfaces_base_fplatform.h
+++ b/audio/surge-synthesizer-xt-lv2/files/patch-libs_JUCE_modules_juceaudioprocessors_format__types_VST3__SDK_pluginterfaces_base_fplatform.h
@ -1,6 +1,6 @@
--- libs/JUCE/modules/juce_audio_processors/format_types/VST3_SDK/pluginterfaces/base/fplatform.h.orig	2022-02-23 15:06:22 UTC
+--- libs/JUCE/modules/juce_audio_processors/format_types/VST3_SDK/pluginterfaces/base/fplatform.h.orig	2024-07-10 14:20:15 UTC
 +++ libs/JUCE/modules/juce_audio_processors/format_types/VST3_SDK/pluginterfaces/base/fplatform.h
-@@ -19,7 +19,7 @@
+@@ -20,7 +20,7 @@
 #define kLittleEndian	0
 #define kBigEndian		1
 
@ -9,18 +9,18 @@
 
 #if !defined (__INTEL_CXX11_MODE__)
 #define SMTG_INTEL_CXX11_MODE 0
-@@ -95,7 +95,7 @@
+@@ -128,7 +128,7 @@
 //-----------------------------------------------------------------------------
 // LINUX
 //-----------------------------------------------------------------------------
 -#elif __gnu_linux__ || __linux__
 +#elif __gnu_linux__ || __linux__ || defined(__FreeBSD__)
- 	#define SMTG_OS_LINUX	1
- 	#define SMTG_OS_MACOS	0
- 	#define SMTG_OS_WINDOWS	0
-@@ -107,7 +107,7 @@
- 	#define SMTG_CPU_ARM	__arm__
- 	#define SMTG_CPU_ARM_64	__aarch64__
+ 	#define SMTG_OS_LINUX		1
+ 	#define SMTG_OS_MACOS		0
+ 	#define SMTG_OS_WINDOWS		0
+@@ -150,7 +150,7 @@
+ 	#endif
+ 	#define SMTG_CPU_ARM_64EC 0
 
 -	#include <endian.h>
 +	#include <sys/endian.h>
--- a/audio/surge-synthesizer-xt-lv2/files/patch-libs_JUCE_modules_juce__core_juce__core.cpp
+++ b/audio/surge-synthesizer-xt-lv2/files/patch-libs_JUCE_modules_juce__core_juce__core.cpp
@ -1,11 +0,0 @@
--- libs/JUCE/modules/juce_core/juce_core.cpp.orig	2022-03-20 05:03:46 UTC
-+++ libs/JUCE/modules/juce_core/juce_core.cpp
-@@ -42,7 +42,7 @@
- #include <thread>
- 
- #if ! JUCE_ANDROID
- #include <sys/timeb.h>
-+ //#include <sys/timeb.h>
-  #include <cwctype>
- #endif
- 
--- a/audio/surge-synthesizer-xt-lv2/files/patch-src_CMakeLists.txt
+++ b/audio/surge-synthesizer-xt-lv2/files/patch-src_CMakeLists.txt
@ -1,11 +0,0 @@
--- src/CMakeLists.txt.orig	2022-03-28 01:18:40 UTC
-+++ src/CMakeLists.txt
-@@ -44,7 +44,7 @@ target_compile_definitions(surge-juce INTERFACE
-   JUCE_CATCH_UNHANDLED_EXCEPTIONS=0
-   )
- 
-set(SURGE_JUCE_FORMATS VST3)
-+set(SURGE_JUCE_FORMATS Standalone)
- 
- if (CLAP_JUCE_EXTENSIONS_ROOT)
-   add_subdirectory(${CLAP_JUCE_EXTENSIONS_ROOT} clap-extensions)
--- a/audio/surge-synthesizer-xt-lv2/files/patch-src_cmake_pluginval.cmake
+++ b/audio/surge-synthesizer-xt-lv2/files/patch-src_cmake_pluginval.cmake
@ -1,13 +0,0 @@
--- src/cmake/pluginval.cmake.orig	2022-03-28 01:22:52 UTC
-+++ src/cmake/pluginval.cmake
-@@ -35,8 +35,8 @@
-     add_dependencies(surge-pluginval-all ${name})
-   endfunction()
- 
-  create_pluginval_target(surge-xt-pluginval-vst3 surge-xt_VST3 "Surge XT.vst3")
-  create_pluginval_target(surge-fx-pluginval-vst3 surge-fx_VST3 "${SURGE_FX_PRODUCT_NAME}.vst3")
-+  #create_pluginval_target(surge-xt-pluginval-vst3 surge-xt_VST3 "Surge XT.vst3")
-+  #create_pluginval_target(surge-fx-pluginval-vst3 surge-fx_VST3 "${SURGE_FX_PRODUCT_NAME}.vst3")
- 
-   if (APPLE)
-     create_pluginval_target(surge-xt-pluginval-au surge-xt_AU "Surge XT.component")
--- a/audio/surge-synthesizer-xt-lv2/pkg-plist
+++ b/audio/surge-synthesizer-xt-lv2/pkg-plist
@ -1,5 +1,16 @@
 bin/Surge XT
 bin/Surge XT Effects
+bin/surge-xt-cli
+lib/clap/Surge XT Effects.clap
+lib/clap/Surge XT.clap
+lib/lv2/Surge XT Effects.lv2/dsp.ttl
+lib/lv2/Surge XT Effects.lv2/libSurge XT Effects.so
+lib/lv2/Surge XT Effects.lv2/manifest.ttl
+lib/lv2/Surge XT Effects.lv2/ui.ttl
+lib/lv2/Surge XT.lv2/dsp.ttl
+lib/lv2/Surge XT.lv2/libSurge XT.so
+lib/lv2/Surge XT.lv2/manifest.ttl
+lib/lv2/Surge XT.lv2/ui.ttl
 %%DATADIR%%/WHERE TO PLACE USER DATA.txt
 %%DATADIR%%/fx_presets/Airwindows/Ambience/Bright Ambience.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Ambience/Chamber.srgfx
@ -7,6 +18,7 @@ bin/Surge XT Effects
 %%DATADIR%%/fx_presets/Airwindows/Ambience/Infinity.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Ambience/MatrixVerb.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Ambience/Melt.srgfx
+%%DATADIR%%/fx_presets/Airwindows/Ambience/Nonlinear Space.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Ambience/Pocket Verbs.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Ambience/Star Child.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Ambience/Verbity.srgfx
@ -26,24 +38,40 @@ bin/Surge XT Effects
 %%DATADIR%%/fx_presets/Airwindows/Dynamics/Surge.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Dynamics/Vari-Mu.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Filter/Air.srgfx
+%%DATADIR%%/fx_presets/Airwindows/Filter/Cabs.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Filter/Capacitor.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Filter/De-Bess.srgfx
+%%DATADIR%%/fx_presets/Airwindows/Filter/Dub Center.srgfx
+%%DATADIR%%/fx_presets/Airwindows/Filter/Dub Sub.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Filter/Hombre.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Filter/MackEQ.srgfx
+%%DATADIR%%/fx_presets/Airwindows/Filter/Pafnuty.srgfx
+%%DATADIR%%/fx_presets/Airwindows/Filter/YBandpass.srgfx
+%%DATADIR%%/fx_presets/Airwindows/Filter/YHighpass.srgfx
+%%DATADIR%%/fx_presets/Airwindows/Filter/YLowpass.srgfx
+%%DATADIR%%/fx_presets/Airwindows/Filter/YNotch.srgfx
+%%DATADIR%%/fx_presets/Airwindows/Filter/ZBandpass.srgfx
+%%DATADIR%%/fx_presets/Airwindows/Filter/ZHighpass.srgfx
+%%DATADIR%%/fx_presets/Airwindows/Filter/ZLowpass.srgfx
+%%DATADIR%%/fx_presets/Airwindows/Filter/ZNotch.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Lo-Fi/Bit Glitter.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Lo-Fi/Crunchy Groove Wear.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Lo-Fi/DeRez.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Lo-Fi/Deck Wrecka.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Lo-Fi/Groove Wear.srgfx
+%%DATADIR%%/fx_presets/Airwindows/Lo-Fi/To Vinyl.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Noise/Dust Bunny.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Noise/Noise.srgfx
+%%DATADIR%%/fx_presets/Airwindows/Noise/Tape Dust.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Noise/Voice Of The Starship.srgfx
+%%DATADIR%%/fx_presets/Airwindows/Pitch/Glitch Shifter.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Saturation And More/Apicolypse.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Saturation And More/Bass Drive.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Saturation And More/Buss Colors.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Saturation And More/Cojones.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Saturation And More/Density.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Saturation And More/Drive.srgfx
+%%DATADIR%%/fx_presets/Airwindows/Saturation And More/Fire Amp.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Saturation And More/Focus.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Saturation And More/Fracture.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Saturation And More/Hard Vacuum.srgfx
@ -51,12 +79,20 @@ bin/Surge XT Effects
 %%DATADIR%%/fx_presets/Airwindows/Saturation And More/Mackity.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Saturation And More/Mojo.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Saturation And More/NC-17.srgfx
+%%DATADIR%%/fx_presets/Airwindows/Saturation And More/Power Sag.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Saturation And More/Single-Ended Triode.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Saturation And More/Spiral.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Saturation And More/Unbox.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Stereo/Triple Spread.srgfx
+%%DATADIR%%/fx_presets/Airwindows/Tape/Chrome Oxide.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Tape/Iron Oxide.srgfx
 %%DATADIR%%/fx_presets/Airwindows/Tape/To Tape.srgfx
+%%DATADIR%%/fx_presets/Bonsai/Burnt.srgfx
+%%DATADIR%%/fx_presets/Bonsai/Deep Bass.srgfx
+%%DATADIR%%/fx_presets/Bonsai/Excessive Bass.srgfx
+%%DATADIR%%/fx_presets/Bonsai/Soft.srgfx
+%%DATADIR%%/fx_presets/Bonsai/Subtle.srgfx
+%%DATADIR%%/fx_presets/Bonsai/Subtler.srgfx
 %%DATADIR%%/fx_presets/CHOW/Anomaly.srgfx
 %%DATADIR%%/fx_presets/Chorus/Ambient.srgfx
 %%DATADIR%%/fx_presets/Chorus/Analog Warmth.srgfx
@ -272,6 +308,13 @@ bin/Surge XT Effects
 %%DATADIR%%/modulator_presets/Envelope/4th Note Delay.modpreset
 %%DATADIR%%/modulator_presets/Envelope/8th Note Delay.modpreset
 %%DATADIR%%/modulator_presets/Envelope/Basic ADSR.modpreset
+%%DATADIR%%/modulator_presets/Formula/8x Noise.modpreset
+%%DATADIR%%/modulator_presets/Formula/8x S&H.modpreset
+%%DATADIR%%/modulator_presets/Formula/8x Saw.modpreset
+%%DATADIR%%/modulator_presets/Formula/8x Sine.modpreset
+%%DATADIR%%/modulator_presets/Formula/8x Square.modpreset
+%%DATADIR%%/modulator_presets/Formula/8x Triangle.modpreset
+%%DATADIR%%/modulator_presets/Formula/Lorenz Attractor.modpreset
 %%DATADIR%%/modulator_presets/LFO/8th Note S&H.modpreset
 %%DATADIR%%/modulator_presets/LFO/Delayed Vibrato.modpreset
 %%DATADIR%%/modulator_presets/LFO/Noise.modpreset
@ -360,6 +403,27 @@ bin/Surge XT Effects
 %%DATADIR%%/modulator_presets/Step Seq/Waveforms/Quantized Ramp.modpreset
 %%DATADIR%%/modulator_presets/Step Seq/Waveforms/Quantized Saw.modpreset
 %%DATADIR%%/modulator_presets/Step Seq/Waveforms/Quantized Triangle.modpreset
+%%DATADIR%%/patches_3rdparty/A.Liv/Basses/808er Than 808.fxp
+%%DATADIR%%/patches_3rdparty/A.Liv/Basses/Amen Polska.fxp
+%%DATADIR%%/patches_3rdparty/A.Liv/Basses/Bonsai 808.fxp
+%%DATADIR%%/patches_3rdparty/A.Liv/Basses/Dynamo Square.fxp
+%%DATADIR%%/patches_3rdparty/A.Liv/Basses/Move Like A Bucket Truck.fxp
+%%DATADIR%%/patches_3rdparty/A.Liv/Basses/Raspy Ring On It.fxp
+%%DATADIR%%/patches_3rdparty/A.Liv/Basses/Seek And Ye Shall Find.fxp
+%%DATADIR%%/patches_3rdparty/A.Liv/Basses/Sqweird.fxp
+%%DATADIR%%/patches_3rdparty/A.Liv/Basses/Sub Wrap Example.fxp
+%%DATADIR%%/patches_3rdparty/A.Liv/Keys/ Grant Me....fxp
+%%DATADIR%%/patches_3rdparty/A.Liv/Keys/I See I Saw.fxp
+%%DATADIR%%/patches_3rdparty/A.Liv/Keys/July.fxp
+%%DATADIR%%/patches_3rdparty/A.Liv/Keys/March.fxp
+%%DATADIR%%/patches_3rdparty/A.Liv/Keys/November.fxp
+%%DATADIR%%/patches_3rdparty/A.Liv/Leads/Hurdy Pardner!.fxp
+%%DATADIR%%/patches_3rdparty/A.Liv/Leads/Let Life Give Limes.fxp
+%%DATADIR%%/patches_3rdparty/A.Liv/Leads/Novuo.fxp
+%%DATADIR%%/patches_3rdparty/A.Liv/Plucks/Cute 1.fxp
+%%DATADIR%%/patches_3rdparty/A.Liv/Plucks/Cute 2.fxp
+%%DATADIR%%/patches_3rdparty/A.Liv/Plucks/Cute 3.fxp
+%%DATADIR%%/patches_3rdparty/A.Liv/Plucks/Taped Plucks.fxp
 %%DATADIR%%/patches_3rdparty/Altenberg/Basses/Aggressive.fxp
 %%DATADIR%%/patches_3rdparty/Altenberg/Basses/Ancient FM.fxp
 %%DATADIR%%/patches_3rdparty/Altenberg/Basses/Ayay.fxp
@ -434,9 +498,6 @@ bin/Surge XT Effects
 %%DATADIR%%/patches_3rdparty/Argitoth/Rhythms/Psyence Loop.fxp
 %%DATADIR%%/patches_3rdparty/Argitoth/Rhythms/Raindrops.fxp
 %%DATADIR%%/patches_3rdparty/Argitoth/Rhythms/Scrooz Loop.fxp
-%%DATADIR%%/patches_3rdparty/Argitoth/Templates/Dirty Saw Init.fxp
-%%DATADIR%%/patches_3rdparty/Argitoth/Templates/Surge FX True Stereo 1.fxp
-%%DATADIR%%/patches_3rdparty/Argitoth/Templates/Surge FX True Stereo 2.fxp
 %%DATADIR%%/patches_3rdparty/Argitoth/Winds/Arabian Flute.fxp
 %%DATADIR%%/patches_3rdparty/Argitoth/Winds/Asian Flute.fxp
 %%DATADIR%%/patches_3rdparty/Argitoth/Winds/Block.fxp
@ -610,7 +671,7 @@ bin/Surge XT Effects
 %%DATADIR%%/patches_3rdparty/Cybersoda/Keys/Tape Keys.fxp
 %%DATADIR%%/patches_3rdparty/Cybersoda/Keys/Vintage EP.fxp
 %%DATADIR%%/patches_3rdparty/Cybersoda/Keys/Wurli.fxp
-%%DATADIR%%/patches_3rdparty/Cybersoda/Leads/Agressve Brass Lead.fxp
+%%DATADIR%%/patches_3rdparty/Cybersoda/Leads/Aggressive Brass Lead.fxp
 %%DATADIR%%/patches_3rdparty/Cybersoda/Leads/Destroyed 808.fxp
 %%DATADIR%%/patches_3rdparty/Cybersoda/Leads/FMey 808.fxp
 %%DATADIR%%/patches_3rdparty/Cybersoda/Leads/Funky Sine.fxp
@ -983,20 +1044,6 @@ bin/Surge XT Effects
 %%DATADIR%%/patches_3rdparty/Emu/Synths/Piercing Trumpet Morph.fxp
 %%DATADIR%%/patches_3rdparty/Emu/Synths/Strange Declarations.fxp
 %%DATADIR%%/patches_3rdparty/Emu/Synths/Wonky Game Pad.fxp
-%%DATADIR%%/patches_3rdparty/Emu/Templates/FM Faux Filter.fxp
-%%DATADIR%%/patches_3rdparty/Emu/Templates/FM Saw.fxp
-%%DATADIR%%/patches_3rdparty/Emu/Templates/FM Square.fxp
-%%DATADIR%%/patches_3rdparty/Emu/Templates/FM Triangle.fxp
-%%DATADIR%%/patches_3rdparty/Emu/Templates/FM Woodwind Maker.fxp
-%%DATADIR%%/patches_3rdparty/Emu/Templates/FM100 Routing #2.fxp
-%%DATADIR%%/patches_3rdparty/Emu/Templates/FM100 Routing #3.fxp
-%%DATADIR%%/patches_3rdparty/Emu/Templates/FM100 Routing #4.fxp
-%%DATADIR%%/patches_3rdparty/Emu/Templates/FM100 Routing #5.fxp
-%%DATADIR%%/patches_3rdparty/Emu/Templates/FM100 Routing #7.fxp
-%%DATADIR%%/patches_3rdparty/Emu/Templates/FM100 Routing #8.fxp
-%%DATADIR%%/patches_3rdparty/Emu/Templates/WT Env Morph.fxp
-%%DATADIR%%/patches_3rdparty/Emu/Templates/WT Mod Morph.fxp
-%%DATADIR%%/patches_3rdparty/Emu/Templates/WT Ramp Up Morph.fxp
 %%DATADIR%%/patches_3rdparty/Giana Brotherz/Basses/Black Swarm.fxp
 %%DATADIR%%/patches_3rdparty/Giana Brotherz/Basses/Dark Notch.fxp
 %%DATADIR%%/patches_3rdparty/Giana Brotherz/Basses/Dark Trancer.fxp
@ -1555,36 +1602,93 @@ bin/Surge XT Effects
 %%DATADIR%%/patches_3rdparty/Jacky Ligon/Templates/Twist.fxp
 %%DATADIR%%/patches_3rdparty/Jacky Ligon/Templates/Wavetable.fxp
 %%DATADIR%%/patches_3rdparty/Jacky Ligon/Templates/Window.fxp
-%%DATADIR%%/patches_3rdparty/John Valentine/Basses/AF Analog Bass.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Basses/Analog Bass Imaged.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Basses/Axel's Analog Bass.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Basses/Distorted Power Bass Guitar.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Basses/Guitarp Slap Bass.fxp
 %%DATADIR%%/patches_3rdparty/John Valentine/Basses/Power Buzz.fxp
 %%DATADIR%%/patches_3rdparty/John Valentine/Basses/Speaking Synth Bass.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Basses/Sweet Bass Guitar.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Brass/French Horn.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Brass/Orchestral Brass.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Brass/Trumpet.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/FX/Cavern Water Drips.fxp
 %%DATADIR%%/patches_3rdparty/John Valentine/FX/Cicada Forest.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/FX/DTMF MF4 Telephone Dialler.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/FX/Distant Thunder Rumble.fxp
 %%DATADIR%%/patches_3rdparty/John Valentine/FX/Fireworks - Bang And Fizzle.fxp
 %%DATADIR%%/patches_3rdparty/John Valentine/FX/Fireworks - Launch.fxp
 %%DATADIR%%/patches_3rdparty/John Valentine/FX/Fireworks - Screamers.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/FX/Grandfather Clock Ticking.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/FX/Low-Passing Jet Airplane Flyby.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/FX/Mission Control Space Radio.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/FX/Pebble Beach Breaking Ocean Waves And Cave.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/FX/Windy Trees Environment.fxp
 %%DATADIR%%/patches_3rdparty/John Valentine/Guitars/Distorted Electric Guitar.fxp
 %%DATADIR%%/patches_3rdparty/John Valentine/Guitars/Nylon Acoustic Guitar.fxp
-%%DATADIR%%/patches_3rdparty/John Valentine/Keys/AF Sharp Atmosphere.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Keys/Amethyst Empathy.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Keys/Axel's Sharp Atmosphere.fxp
 %%DATADIR%%/patches_3rdparty/John Valentine/Keys/FM E-Piano Four High.fxp
-%%DATADIR%%/patches_3rdparty/John Valentine/Keys/Grand Piano 2021 (Accompaniment).fxp
-%%DATADIR%%/patches_3rdparty/John Valentine/Keys/Grand Piano 2021.fxp
-%%DATADIR%%/patches_3rdparty/John Valentine/Keys/Pipe Organ 2021.fxp
-%%DATADIR%%/patches_3rdparty/John Valentine/Leads/AF Brassy Lead.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Keys/FM Square Glassy Boops.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Keys/Grand Piano.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Keys/Harpsichord.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Keys/Pipe Organ Flutes & Reeds.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Keys/Pipe Organ Trumpet Pedal.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Leads/Axel's Brassy Lead.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Leads/Crockett's Plucked Lead.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Leads/Laser Harp.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Leads/Synced Synth Solo Lead.fxp
 %%DATADIR%%/patches_3rdparty/John Valentine/Pads/70s Fizzy String.fxp
-%%DATADIR%%/patches_3rdparty/John Valentine/Pads/AF Brassy Pad.fxp
-%%DATADIR%%/patches_3rdparty/John Valentine/Percussion/AF Synth Claps.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Pads/Axel's Brassy Pad.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Pads/Sweeping Distorted Pad.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Percussion/Axel's Synth Claps.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Percussion/Claves (Sticks).fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Percussion/Cowbell.fxp
 %%DATADIR%%/patches_3rdparty/John Valentine/Percussion/Cymbal Tap.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Percussion/Handbells.fxp
 %%DATADIR%%/patches_3rdparty/John Valentine/Percussion/Noisy Synth Kick.fxp
-%%DATADIR%%/patches_3rdparty/John Valentine/Percussion/Snare Tom.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Percussion/Orchestral Bass Drum.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Percussion/Pop Clap.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Percussion/Rainmaker.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Percussion/Snare Tom 1.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Percussion/Snare Tom 2.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Percussion/Taiko Drum.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Percussion/Timpani.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Percussion/Tongue Drum.fxp
 %%DATADIR%%/patches_3rdparty/John Valentine/Plucks/Guitarp.fxp
 %%DATADIR%%/patches_3rdparty/John Valentine/Plucks/Harpie.fxp
-%%DATADIR%%/patches_3rdparty/John Valentine/Strings/Cello 2021.fxp
-%%DATADIR%%/patches_3rdparty/John Valentine/Strings/Violin 2021.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Sequences/Crockett's Seq Filter Bass.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Strings/Dexie String Mix Pad.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Strings/Light Hammered Dulcimer.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Strings/Solo Violin.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Strings/String Cello.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Strings/String Contrabass.fxp
 %%DATADIR%%/patches_3rdparty/John Valentine/Voices/Voice Bass.fxp
 %%DATADIR%%/patches_3rdparty/John Valentine/Voices/Voice Breath Huh.fxp
 %%DATADIR%%/patches_3rdparty/John Valentine/Voices/Voice Soprano 1.fxp
 %%DATADIR%%/patches_3rdparty/John Valentine/Voices/Voice Soprano 2.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Winds/Bassoon.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Winds/Clarinet.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Winds/Cor Anglais.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Winds/Flute.fxp
 %%DATADIR%%/patches_3rdparty/John Valentine/Winds/Folky High Pipe.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Winds/Oboe.fxp
+%%DATADIR%%/patches_3rdparty/John Valentine/Winds/Recorder.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Audio In/Favorite Sidechainer.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Bass/Acid Funk Bass.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Bass/Asym Bass.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Bass/Big Fat Combinator Bass.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Bass/Character Bass.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Bass/Fresh FM Bass.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Bass/From Subs To Reeses & Back Again.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Bass/Indie Dance Saw Bass.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Bass/Modern, Dirty & Fat.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Bass/OJD Bass.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Bass/Peachfuzz Bass.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Bass/The Flat Eric Fan Club Has Its Perks.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Bass/This Resonates With Me Deeply.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Bass/Very Versitile Bass.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Bass/Wet Donk Scribbles.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Basses/Classic Organ Bass + Bonus Organ.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Basses/Everybody Needs A 303, Really.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Basses/Moogaroo.fxp
@ -1593,31 +1697,77 @@ bin/Surge XT Effects
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Basses/Wavetable FM Slapper.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Bells/Bell Labs.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/FX/8 Measure Noise & Comb Sweep.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/FX/Dissociating In An Abandoned Mall.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Guitars/Miles Of AM Radio.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Guitars/Mutant Lo-Fi Acoustic Guitar Workstation.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Guitars/Mutant Lo-Fi Electric Guitar Workstation.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Keys/70s Sci-Fi String Ensemble.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Keys/Bread & Butter Synth Brass.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Keys/Cameron Vs. Carpenter IV.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Keys/Cracks In The Sky.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Keys/Electro Steel Drum.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Keys/Fascinated With SK Brass.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Keys/Its $25 But You Gotta Haul It.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Keys/Japanese Suitcase.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Keys/Let's Start With An Accordian.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Keys/New Wave Wordy.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Keys/So Wavey.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Keys/Solo String DX Stack.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Keys/Symphonies Under My Fingertips.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Keys/The Friendliest NPC.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Keys/The Housewives of Lofi.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Leads/Brush Your Shoulders Off.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Leads/Funk Feedback Lead.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Leads/Hi, Vince Clarke!.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Leads/Raving In The Tropics.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Leads/Scratchy Detuner.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Leads/The Fabulous Chippy FM West Coast Lead.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Leads/Warehouse Lead.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Pads/Accident Prone Robot Arm.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Pads/Alias Washer.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Pads/Bell Pads Are So 90s.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Pads/City-State Of The Future.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Pads/Creamy Soap.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Pads/Inertia Pad Sounds Like Alien Seagulls.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Pads/Jarre On Cassette.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Pads/Left Town Yesterday.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Pads/Let's Make Drone Music!.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Pads/Love Theme From Skinimax.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Pads/Not Another String Machine.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Pads/Now I'm On A Cloud.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Pads/Pointillism.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Pads/Return To City-State Of The Future.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Pads/She Loves You, Answer the Phone.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Pads/Smeared Bell Engine.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Pads/Stoney Baloney.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Pads/Sunrise Breakfast At The Digital Café.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Pads/Too Huge For School.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Pads/Triumphant Wasteland.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Pads/Warm Silicon Gel.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Pads/Wavetextures™ Pro Kit.fxp
-%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Pads/What We Need Is Nothern Leadership.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Pads/What We Need Is Northern Leadership.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Percussion/808s & More.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Percussion/909ish Snare.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Percussion/All Aboard The Pulse Train.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Percussion/Clapping Out An x0x.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Percussion/Closeout Sale @ Electro Percussion Warehouse.fxp
-%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Percussion/Tuned Kicks For Days.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Percussion/Deep Cut Snare.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Percussion/Modern Electro Snare.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Percussion/Nice Kicks.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Percussion/S+H Clap.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Percussion/Tasty Hats.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Percussion/Toms With Deep Secrets.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Plucks/No Frills Harp Pluck.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Plucks/Wooden Block Pluck.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Polysynths/1985 Called.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Polysynths/Chippy Polysynth.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Polysynths/I'll Wait.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Polysynths/Mono & Poly Reverser.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Polysynths/Progressive House Like It's 2007.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Polysynths/Retrofuture Vibes.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Polysynths/Tall Morning Shadows.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Sequences/Black Lights & Nitrous Balloons.fxp
+%%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Sequences/Challenging Stage.fxp
 %%DATADIR%%/patches_3rdparty/Kinsey Dulcet/Sequences/Holy Emoji.fxp
 %%DATADIR%%/patches_3rdparty/Kuniklo/Arps/Calc.fxp
 %%DATADIR%%/patches_3rdparty/Kuniklo/Arps/Chording.fxp
@ -1681,6 +1831,97 @@ bin/Surge XT Effects
 %%DATADIR%%/patches_3rdparty/Kyurumi/Plucks/Uncertain Disclosure.fxp
 %%DATADIR%%/patches_3rdparty/Kyurumi/Rhythms/Floating In A Rhythm.fxp
 %%DATADIR%%/patches_3rdparty/Kyurumi/Rhythms/Technological Escapings.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Keys/First Creation.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Keys/Intrication 1.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Keys/Intrication 2.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Keys/Intrication 3.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Keys/Like Old Analog Gear 1.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Keys/Like Old Analog Gear 2.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Keys/Like Old Analog Gear 3.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Keys/Nanowave (2 Oscs).fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Keys/Nanowave (with Nimbus).fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Pads/Foul Throat.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Pads/Hopeful Surfer 1.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Pads/Hopeful Surfer 2.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Pads/Hydrasynth What 1.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Pads/Hydrasynth What 2.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Pads/Modulation Galore.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Pads/Thin Pulses 1.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Pads/Thin Pulses 2.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Pads/Unison Detuned 1.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Pads/Unison Detuned 2.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Pads/Unison Detuned 3.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Pads/Unison Swell 1.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Pads/Unison Swell 2.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Pads/Wandering Digits 1.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Pads/Wandering Digits 2.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Pads/Wandering Digits 3.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Pads/Washing The Podium 1.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Pads/Washing The Podium 2.fxp
+%%DATADIR%%/patches_3rdparty/Landosonic/Plucks/Nanowave 1.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Basses/Bass Guitar.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Basses/Legato Bass.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Basses/String Bass.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Brass/FM Horn.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Brass/French Horn Blip.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Brass/Miles Trumpet.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Brass/Sad Subway Horn.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Brass/Soft FM horn.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Brass/Vintage Demonic Brass Ensemble.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Guitars/Feedback Guitar.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Guitars/LP Bridge + Chorus.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Guitars/LP Bridge.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Guitars/Overdriven Guitar + Wah.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Guitars/Overdriven Guitar.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Guitars/Pedal Steel.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Guitars/Shrill Distorted Guitar.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Guitars/Stratus Clean.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Guitars/Stratus Overdriven.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Keys/Acoustic Grand.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Keys/Bell Piano.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Keys/Clavi.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Keys/DX Electric Piano.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Keys/EP + Pad.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Keys/Pulse Wave EP.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Keys/Rhody EP.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Keys/Soft Tine Piano.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Keys/Wurly EP.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Leads/Screaming Octaves.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Leads/Snarling Cat.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Leads/Theremin.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Organs/Drawbar Organ 1.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Organs/Drawbar Organ 2.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Pads/Cathedral Bell Pad.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Pads/Ghost Bell Pad.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Pads/Hammered Strings.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Pads/Pulse Wave & Filter.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Pads/Warm Pad.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Percussion/Filtered Noise Drums.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Percussion/Long Decay Toms.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Plucks/Guzhengish.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Plucks/Koto.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Plucks/Pluck And Sing.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Strings/Bowed String.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Strings/Cello.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Strings/Dark Cello.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Strings/Ensemble Strings.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Strings/Erhu.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Strings/Hurdy Gurdy.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Strings/Solo Strings.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Vox/Talking Synth (Adult).fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Vox/Talking Synth (Alien).fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Vox/Talking Synth (Child).fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Vox/Talking Synth (Young Adult).fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Winds/Bass Ocarina.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Winds/Beer Flute.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Winds/Dark Crystal Flute.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Winds/Duduk.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Winds/Flute.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Winds/Glassy Wind.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Winds/Harmonica Overdrive.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Winds/Hollow Wind Tube.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Winds/Moon Flute.fxp
+%%DATADIR%%/patches_3rdparty/LinnStrument MPE/Winds/Ocarina.fxp
 %%DATADIR%%/patches_3rdparty/Luna/Atmospheres/Alias Digital Atmosphere.fxp
 %%DATADIR%%/patches_3rdparty/Luna/Atmospheres/Alias Glass Voice 1.fxp
 %%DATADIR%%/patches_3rdparty/Luna/Atmospheres/Alias Glass Voice 2.fxp
@ -2079,15 +2320,6 @@ bin/Surge XT Effects
 %%DATADIR%%/patches_3rdparty/Rare Earth/Plucks/Mixed Feelings.fxp
 %%DATADIR%%/patches_3rdparty/Rare Earth/Plucks/Music Box.fxp
 %%DATADIR%%/patches_3rdparty/Rare Earth/Synths/Poly Drama.fxp
-%%DATADIR%%/patches_3rdparty/Roger Linn (MPE)/Keys/LS Wurly.fxp
-%%DATADIR%%/patches_3rdparty/Roger Linn (MPE)/Leads/LS Blues Harmonica.fxp
-%%DATADIR%%/patches_3rdparty/Roger Linn (MPE)/Leads/LS Hollow Tubes.fxp
-%%DATADIR%%/patches_3rdparty/Roger Linn (MPE)/Leads/LS Lead Guitar 1.fxp
-%%DATADIR%%/patches_3rdparty/Roger Linn (MPE)/Leads/LS Lead Guitar 2.fxp
-%%DATADIR%%/patches_3rdparty/Roger Linn (MPE)/Leads/LS Lead Guitar Shrill.fxp
-%%DATADIR%%/patches_3rdparty/Roger Linn (MPE)/Leads/LS Lead Guitar Y - Wah.fxp
-%%DATADIR%%/patches_3rdparty/Roger Linn (MPE)/Leads/LS Z - Filter, Y - Pulsewidth.fxp
-%%DATADIR%%/patches_3rdparty/Roger Linn (MPE)/Leads/LS Z - Octave, Y - Chorus.fxp
 %%DATADIR%%/patches_3rdparty/Rozzer/Basses/Badass D'n'B Bass 1.fxp
 %%DATADIR%%/patches_3rdparty/Rozzer/Basses/Badass D'n'B Bass 2.fxp
 %%DATADIR%%/patches_3rdparty/Rozzer/Basses/Click Bass.fxp
@ -2138,7 +2370,6 @@ bin/Surge XT Effects
 %%DATADIR%%/patches_3rdparty/Slowboat/Atmospheres/Melodic Grains.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Atmospheres/Ocean Shimmer 1.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Atmospheres/Ocean Shimmer 2.fxp
-%%DATADIR%%/patches_3rdparty/Slowboat/Atmospheres/Ocean Shimmer 3.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Atmospheres/Shimmer.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Atmospheres/Signal Particles.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Atmospheres/Simple Particles.fxp
@ -2157,9 +2388,11 @@ bin/Surge XT Effects
 %%DATADIR%%/patches_3rdparty/Slowboat/Basses/Bass Guitar 6.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Basses/Bass Guong 1.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Basses/Bass Guong 2.fxp
+%%DATADIR%%/patches_3rdparty/Slowboat/Basses/Bass Mulch.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Basses/Dirt Bass.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Basses/Dusty Bass 1.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Basses/Dusty Bass 2.fxp
+%%DATADIR%%/patches_3rdparty/Slowboat/Basses/Dystopian Tech.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Basses/Gigantic Bass 1.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Basses/Gigantic Bass 2.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Basses/Happy Bass 1.fxp
@ -2194,6 +2427,10 @@ bin/Surge XT Effects
 %%DATADIR%%/patches_3rdparty/Slowboat/FX/Cyber Deep Stab 1.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/FX/Cyber Deep Stab 2.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/FX/Electrical Interference.fxp
+%%DATADIR%%/patches_3rdparty/Slowboat/FX/FM Down.fxp
+%%DATADIR%%/patches_3rdparty/Slowboat/FX/FM FX 1.fxp
+%%DATADIR%%/patches_3rdparty/Slowboat/FX/FM FX 2.fxp
+%%DATADIR%%/patches_3rdparty/Slowboat/FX/FM Riser.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/FX/Granular Stretches.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/FX/Night Life.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/FX/Random Bass FX.fxp
@ -2208,6 +2445,7 @@ bin/Surge XT Effects
 %%DATADIR%%/patches_3rdparty/Slowboat/FX/Wild Stab 2.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Guitars/Goodbye Rock.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Guitars/Shimmer Guitar.fxp
+%%DATADIR%%/patches_3rdparty/Slowboat/Guitars/Strummed Strings.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Keys/Aquatique.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Keys/Heavy Keys.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Keys/Holiday Chords.fxp
@ -2219,15 +2457,17 @@ bin/Surge XT Effects
 %%DATADIR%%/patches_3rdparty/Slowboat/Leads/Machining.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Leads/Some Analog.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Leads/Turnout.fxp
-%%DATADIR%%/patches_3rdparty/Slowboat/Mallets/Mallet Finally!.fxp
+%%DATADIR%%/patches_3rdparty/Slowboat/Mallets/Kalimba Hang Drum.fxp
+%%DATADIR%%/patches_3rdparty/Slowboat/Mallets/Kalimba.fxp
+%%DATADIR%%/patches_3rdparty/Slowboat/Mallets/Mallet Finally! 1.fxp
+%%DATADIR%%/patches_3rdparty/Slowboat/Mallets/Mallet Finally! 2.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Pads/Choir Space .fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Pads/Deep Space.fxp
+%%DATADIR%%/patches_3rdparty/Slowboat/Pads/Retro Smooth.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Pads/Super Swell.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Percussion/Another Perc Thing.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Percussion/Djembeish 1.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Percussion/Djembeish 2.fxp
-%%DATADIR%%/patches_3rdparty/Slowboat/Percussion/Kalimba Hang Drum.fxp
-%%DATADIR%%/patches_3rdparty/Slowboat/Percussion/Kalimba.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Percussion/Tribe.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Percussion/Wind Chime.fxp
 %%DATADIR%%/patches_3rdparty/Slowboat/Plucks/Classic Arp.fxp
@ -3136,19 +3376,22 @@ bin/Surge XT Effects
 %%DATADIR%%/patches_factory/Templates/Audio In Left Scene A + Right Scene B.fxp
 %%DATADIR%%/patches_factory/Templates/Audio In Mono Osc 1.fxp
 %%DATADIR%%/patches_factory/Templates/Audio In Stereo Osc 1.fxp
-%%DATADIR%%/patches_factory/Templates/Init Emu VA.fxp
-%%DATADIR%%/patches_factory/Templates/Init Emu WT.fxp
-%%DATADIR%%/patches_factory/Templates/Init Emu.fxp
+%%DATADIR%%/patches_factory/Templates/Init Duophonic.fxp
 %%DATADIR%%/patches_factory/Templates/Init Env Per Osc.fxp
+%%DATADIR%%/patches_factory/Templates/Init Experimental.fxp
 %%DATADIR%%/patches_factory/Templates/Init FM2.fxp
 %%DATADIR%%/patches_factory/Templates/Init Karplus-Strong.fxp
+%%DATADIR%%/patches_factory/Templates/Init Modern.fxp
+%%DATADIR%%/patches_factory/Templates/Init Paraphonic.fxp
 %%DATADIR%%/patches_factory/Templates/Init Saw.fxp
 %%DATADIR%%/patches_factory/Templates/Init Sine.fxp
+%%DATADIR%%/patches_factory/Templates/Init Square.fxp
+%%DATADIR%%/patches_factory/Templates/Init Wavetable.fxp
 %%DATADIR%%/patches_factory/Tutorials/Formula Modulator/01 A Simple Formula.fxp
 %%DATADIR%%/patches_factory/Tutorials/Formula Modulator/02 Interacting With LFO Parameters.fxp
 %%DATADIR%%/patches_factory/Tutorials/Formula Modulator/03 The Init Function And State.fxp
 %%DATADIR%%/patches_factory/Tutorials/Formula Modulator/04 Vector Valued Formulae.fxp
-%%DATADIR%%/patches_factory/Tutorials/Formula Modulator/05 The Envelope And Subscriptions.fxp
+%%DATADIR%%/patches_factory/Tutorials/Formula Modulator/05 The Envelope And Its Parameters.fxp
 %%DATADIR%%/patches_factory/Tutorials/Formula Modulator/06 Macros And Voice Parameters.fxp
 %%DATADIR%%/patches_factory/Tutorials/Formula Modulator/07 The Prelude.fxp
 %%DATADIR%%/patches_factory/Tutorials/Formula Modulator/08 Quis Modulatiet Ipsos Modulates.fxp
@ -3156,6 +3399,7 @@ bin/Surge XT Effects
 %%DATADIR%%/patches_factory/Tutorials/Formula Modulator/10 Example - Both Time And Space.fxp
 %%DATADIR%%/patches_factory/Tutorials/Formula Modulator/11 Example - Reich - Piano Phase.fxp
 %%DATADIR%%/patches_factory/Tutorials/Formula Modulator/12 A Slew Limiter.fxp
+%%DATADIR%%/patches_factory/Tutorials/Formula Modulator/13 Duophony.fxp
 %%DATADIR%%/patches_factory/Vocoder/Noise.fxp
 %%DATADIR%%/patches_factory/Vocoder/Pop.fxp
 %%DATADIR%%/patches_factory/Vocoder/Solo.fxp
@ -3200,7 +3444,9 @@ bin/Surge XT Effects
 %%DATADIR%%/skins/Tutorials/09 Skin Version 2 Expansion.surge-skin/SVG/widerFilterBG.svg
 %%DATADIR%%/skins/Tutorials/09 Skin Version 2 Expansion.surge-skin/SVG/widerFilterBGHover.svg
 %%DATADIR%%/skins/Tutorials/09 Skin Version 2 Expansion.surge-skin/skin.xml
+%%DATADIR%%/skins/Tutorials/10 Adding Fonts.surge-skin/fonts/Lobster-Regular.ttf
 %%DATADIR%%/skins/Tutorials/10 Adding Fonts.surge-skin/fonts/Mrs Beasley.ttf
+%%DATADIR%%/skins/Tutorials/10 Adding Fonts.surge-skin/fonts/PlayfairDisplay.ttf
 %%DATADIR%%/skins/Tutorials/10 Adding Fonts.surge-skin/fonts/README.md
 %%DATADIR%%/skins/Tutorials/10 Adding Fonts.surge-skin/fonts/UglyTypist.ttf
 %%DATADIR%%/skins/Tutorials/10 Adding Fonts.surge-skin/skin.xml
@ -3252,7 +3498,6 @@ bin/Surge XT Effects
 %%DATADIR%%/skins/dark-mode.surge-skin/SVG/bmp00177.svg
 %%DATADIR%%/skins/dark-mode.surge-skin/SVG/bmp00178.svg
 %%DATADIR%%/skins/dark-mode.surge-skin/SVG/bmp00179.svg
-%%DATADIR%%/skins/dark-mode.surge-skin/SVG/bmp00180.svg
 %%DATADIR%%/skins/dark-mode.surge-skin/SVG/bmp00181.svg
 %%DATADIR%%/skins/dark-mode.surge-skin/SVG/bmp00182.svg
 %%DATADIR%%/skins/dark-mode.surge-skin/SVG/bmp00183.svg
@ -3260,6 +3505,9 @@ bin/Surge XT Effects
 %%DATADIR%%/skins/dark-mode.surge-skin/SVG/bmp00185.svg
 %%DATADIR%%/skins/dark-mode.surge-skin/SVG/bmp00186.svg
 %%DATADIR%%/skins/dark-mode.surge-skin/SVG/bmp00187.svg
+%%DATADIR%%/skins/dark-mode.surge-skin/SVG/bmp00189.svg
+%%DATADIR%%/skins/dark-mode.surge-skin/SVG/bmp00190.svg
+%%DATADIR%%/skins/dark-mode.surge-skin/SVG/bmp00191.svg
 %%DATADIR%%/skins/dark-mode.surge-skin/SVG/bmp00301.svg
 %%DATADIR%%/skins/dark-mode.surge-skin/SVG/bmp00302.svg
 %%DATADIR%%/skins/dark-mode.surge-skin/SVG/bmp00303.svg
@ -3312,6 +3560,9 @@ bin/Surge XT Effects
 %%DATADIR%%/skins/dark-mode.surge-skin/SVG/hover00178.svg
 %%DATADIR%%/skins/dark-mode.surge-skin/SVG/hover00183.svg
 %%DATADIR%%/skins/dark-mode.surge-skin/SVG/hover00184.svg
+%%DATADIR%%/skins/dark-mode.surge-skin/SVG/hover00189.svg
+%%DATADIR%%/skins/dark-mode.surge-skin/SVG/hover00190.svg
+%%DATADIR%%/skins/dark-mode.surge-skin/SVG/hover00191.svg
 %%DATADIR%%/skins/dark-mode.surge-skin/SVG/hover00302.svg
 %%DATADIR%%/skins/dark-mode.surge-skin/SVG/hover00303.svg
 %%DATADIR%%/skins/dark-mode.surge-skin/SVG/hover00304.svg
@ -3346,78 +3597,6 @@ bin/Surge XT Effects
 %%DATADIR%%/skins/dark-mode.surge-skin/SVG/vslider_mod_hover.svg
 %%DATADIR%%/skins/dark-mode.surge-skin/SVG/vslider_mod_ts.svg
 %%DATADIR%%/skins/dark-mode.surge-skin/skin.xml
-%%DATADIR%%/skins/default.surge-skin/SVG/bmpTS00153.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/bmpTS00157.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00112.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00113.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00114.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00117.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00118.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00119.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00120.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00121.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00122.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00123.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00125.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00126.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00132.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00134.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00140.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00143.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00144.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00145.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00146.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00148.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00149.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00151.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00152.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00153.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00157.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00160.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00161.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00162.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00164.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00166.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00167.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00168.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00169.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00171.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00172.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00173.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00174.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00175.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00176.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00177.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00178.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00183.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00184.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00302.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00303.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00304.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00305.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00306.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hover00307.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hoverOn00112.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hoverOn00113.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hoverOn00114.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hoverOn00117.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hoverOn00118.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hoverOn00120.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hoverOn00122.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hoverOn00123.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hoverOn00143.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hoverOn00144.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hoverOn00146.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hoverOn00151.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hoverOn00161.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hoverOn00162.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hoverOn00166.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hoverOn00302.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hoverOn00305.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hoverOn00307.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hoverTS00153.svg
-%%DATADIR%%/skins/default.surge-skin/SVG/hoverTS00157.svg
-%%DATADIR%%/skins/default.surge-skin/skin.xml
 %%DATADIR%%/tuning_library/Documentation.txt
 %%DATADIR%%/tuning_library/Equal Linear Temperaments 17-71/689.362 ED2-47 ELT-12.scl
 %%DATADIR%%/tuning_library/Equal Linear Temperaments 17-71/690.000 ED2-40 ELT-12.scl
@ -3629,6 +3808,7 @@ bin/Surge XT Effects
 %%DATADIR%%/wavetables/Basic/Tri-Saw HQ.wav
 %%DATADIR%%/wavetables/Basic/Tri-Saw.wt
 %%DATADIR%%/wavetables/Basic/Triangle HQ.wav
+%%DATADIR%%/wavetables/Basic/Triangle NES.wav
 %%DATADIR%%/wavetables/Basic/Triangle.wt
 %%DATADIR%%/wavetables/Generated/Circle.wt
 %%DATADIR%%/wavetables/Generated/Cosine Inverse Power.wt
@ -3717,6 +3897,8 @@ bin/Surge XT Effects
 %%DATADIR%%/wavetables/Sampled/Cello.wt
 %%DATADIR%%/wavetables/Sampled/Choir Formant.wt
 %%DATADIR%%/wavetables/Sampled/Cluster.wt
+%%DATADIR%%/wavetables/Sampled/Digi Organ 1.wt
+%%DATADIR%%/wavetables/Sampled/Digi Organ 2.wt
 %%DATADIR%%/wavetables/Sampled/Glissy.wt
 %%DATADIR%%/wavetables/Sampled/Guitar Acoustic 1.wt
 %%DATADIR%%/wavetables/Sampled/Guitar Acoustic 2.wt
@ -3739,8 +3921,6 @@ bin/Surge XT Effects
 %%DATADIR%%/wavetables/Sampled/Music Box 2.wt
 %%DATADIR%%/wavetables/Sampled/Mystic.wt
 %%DATADIR%%/wavetables/Sampled/New Bell.wt
-%%DATADIR%%/wavetables/Sampled/Organ 1.wt
-%%DATADIR%%/wavetables/Sampled/Organ 2.wt
 %%DATADIR%%/wavetables/Sampled/Piano 1.wt
 %%DATADIR%%/wavetables/Sampled/Piano 2.wt
 %%DATADIR%%/wavetables/Sampled/Piano Dark.wt
@ -3807,6 +3987,51 @@ bin/Surge XT Effects
 %%DATADIR%%/wavetables/Waldorf/sine swee.wt
 %%DATADIR%%/wavetables/Waldorf/vs1.wt
 %%DATADIR%%/wavetables/Waldorf/vs2.wt
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Crust PD/Harmonic11.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Crust PD/Harmonic13.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Crust PD/Harmonic15.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Crust PD/Harmonic2.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Crust PD/Harmonic3.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Crust PD/Harmonic5.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Crust PD/Harmonic7.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Crust PD/Harmonic9.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Crust PD/Sine Asym.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Crust PD/Sine Sym.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Crust Wave/Crust Wave 1.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Crust Wave/Crust Wave 10.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Crust Wave/Crust Wave 2.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Crust Wave/Crust Wave 3.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Crust Wave/Crust Wave 4.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Crust Wave/Crust Wave 5.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Crust Wave/Crust Wave 6.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Crust Wave/Crust Wave 7.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Crust Wave/Crust Wave 8.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Crust Wave/Crust Wave 9.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Droplet/Droplet 1.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Droplet/Droplet 2.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Droplet/Droplet 3.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Droplet/Droplet 4.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Droplet/Droplet 5.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Exocat's Metalodon/Exocat's Metalodon 1.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Exocat's Metalodon/Exocat's Metalodon 2.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Exocat's Metalodon/Exocat's Metalodon 3.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Exocat's Metalodon/Exocat's Metalodon 4.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Exocat's Metalodon/Exocat's Metalodon 5.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/No Coast/No Coast 1.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/No Coast/No Coast 2.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/SpectRat/SpectRat 1.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/SpectRat/SpectRat 10.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/SpectRat/SpectRat 2.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/SpectRat/SpectRat 3.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/SpectRat/SpectRat 4.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/SpectRat/SpectRat 5.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/SpectRat/SpectRat 6.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/SpectRat/SpectRat 7.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/SpectRat/SpectRat 8.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/SpectRat/SpectRat 9.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Tape Wave/Tape Wave 1.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Tape Wave/Tape Wave 2.wav
+%%DATADIR%%/wavetables_3rdparty/A.Liv/Tape Wave/Tape Wave 3.wav
 %%DATADIR%%/wavetables_3rdparty/Damon Armani/Damon Armani 1.WT
 %%DATADIR%%/wavetables_3rdparty/Damon Armani/Damon Armani 10.WT
 %%DATADIR%%/wavetables_3rdparty/Damon Armani/Damon Armani 11.wt
@ -3973,7 +4198,7 @@ bin/Surge XT Effects
 %%DATADIR%%/wavetables_3rdparty/Emu/Digital Experiments/ENV Melting Organ.wt
 %%DATADIR%%/wavetables_3rdparty/Emu/Digital Experiments/FM 2 Loop.wav
 %%DATADIR%%/wavetables_3rdparty/Emu/Digital Experiments/FM 4 Loop.wt
-%%DATADIR%%/wavetables_3rdparty/Emu/Digital Experiments/FM 4.wav
+%%DATADIR%%/wavetables_3rdparty/Emu/Digital Experiments/FM 4 Pluck.wav
 %%DATADIR%%/wavetables_3rdparty/Emu/Digital Experiments/FM Pal.wt
 %%DATADIR%%/wavetables_3rdparty/Emu/Digital Experiments/Flute Bad.wav
 %%DATADIR%%/wavetables_3rdparty/Emu/Digital Experiments/Ghostly Voices.wav
@ -4166,6 +4391,108 @@ bin/Surge XT Effects
 %%DATADIR%%/wavetables_3rdparty/Layzer/Vocal/Vocal 7.wt
 %%DATADIR%%/wavetables_3rdparty/Layzer/Vocal/Vocal 8.wt
 %%DATADIR%%/wavetables_3rdparty/Layzer/Vocal/Vocal 9.wt
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Breaks/Breaks 1.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Breaks/Breaks 2.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Breaks/Breaks 3.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Breaks/Breaks 4.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Breaks/Breaks 5.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Breaks/Breaks 6.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Breaks/Breaks Info.pdf
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Combs/Combs 1.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Combs/Combs 2.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Combs/Combs 3.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Combs/Combs 4.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Combs/Combs 5.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Combs/Noisy Comb.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/FM/FM 1.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/FM/FM 2.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/FM/FM 3.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/FM/FM 4.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/FM/FM 5.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/FM/FM 6.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/FM/FM 7.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/FM/FM 8.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Filtering/Filtering 1.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Filtering/Filtering 2.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Filtering/Filtering 3.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Filtering/Filtering 4.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Filtering/Filtering 5.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Filtering/Filtering 6.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Filtering/Filtering 7.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Formant/Formant 1.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Formant/Formant 2.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Formant/Formant 3.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Formant/Formant 4.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Formant/Formant 5.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Formant/Formant 6.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Formant/Formant 7.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Formant/Formant 8.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Phase Mod/Phase Mod 1.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Phase Mod/Phase Mod 2.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Phase Mod/Phase Mod 3.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Phase Mod/Phase Mod 4.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Phase Mod/Phase Mod 5.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Phaser/Phaser 1.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Phaser/Phaser 2.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Phaser/Phaser 3.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Phaser/Phaser 4.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Ring Mod/Ring Mod 1.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Ring Mod/Ring Mod 2.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Ring Mod/Ring Mod 3.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Ring Mod/Ring Mod 4.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Ring Mod/Ring Mod 5.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Ring Mod/Ring Mod 6.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Sync/Sync 1.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Sync/Sync 2.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Sync/Sync 3.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Sync/Sync 4.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 1.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 10.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 11.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 12.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 13.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 14.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 15.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 16.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 17.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 18.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 19.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 2.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 20.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 21.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 22.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 23.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 24.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 25.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 3.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 4.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 5.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 6.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 7.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 8.wav
+%%DATADIR%%/wavetables_3rdparty/Philippe Favre/Tones/Tones 9.wav
+%%DATADIR%%/wavetables_3rdparty/Qonundrai/Abrasive Warmth.wav
+%%DATADIR%%/wavetables_3rdparty/Qonundrai/Articulate Croak.wav
+%%DATADIR%%/wavetables_3rdparty/Qonundrai/Careful Now.wav
+%%DATADIR%%/wavetables_3rdparty/Qonundrai/Chartreuse.wav
+%%DATADIR%%/wavetables_3rdparty/Qonundrai/Even To Odd Stutter.wav
+%%DATADIR%%/wavetables_3rdparty/Qonundrai/Excluded Shrieker.wav
+%%DATADIR%%/wavetables_3rdparty/Qonundrai/Frequenskitter.wav
+%%DATADIR%%/wavetables_3rdparty/Qonundrai/Gremlin Mode.wav
+%%DATADIR%%/wavetables_3rdparty/Qonundrai/Half Even Half Odd.wav
+%%DATADIR%%/wavetables_3rdparty/Qonundrai/Harmonizer Morph 1.wav
+%%DATADIR%%/wavetables_3rdparty/Qonundrai/Harmonizer Morph 2.wav
+%%DATADIR%%/wavetables_3rdparty/Qonundrai/Harmonizer Morph 3.wav
+%%DATADIR%%/wavetables_3rdparty/Qonundrai/Harmonizer Morph 4A.wav
+%%DATADIR%%/wavetables_3rdparty/Qonundrai/Harmonizer Morph 4B.wav
+%%DATADIR%%/wavetables_3rdparty/Qonundrai/Lava Flood.wav
+%%DATADIR%%/wavetables_3rdparty/Qonundrai/Murderonance.wav
+%%DATADIR%%/wavetables_3rdparty/Qonundrai/Odd Oneirid.wav
+%%DATADIR%%/wavetables_3rdparty/Qonundrai/Powerup.wav
+%%DATADIR%%/wavetables_3rdparty/Qonundrai/Qonundrum.wav
+%%DATADIR%%/wavetables_3rdparty/Qonundrai/Squarified Oneirid.wav
+%%DATADIR%%/wavetables_3rdparty/Qonundrai/Squelch Pluck.wav
+%%DATADIR%%/wavetables_3rdparty/Qonundrai/Vibrant Oneirid.wav
 %%DATADIR%%/wavetables_3rdparty/TNMG/Chemical Reaction.wav
 %%DATADIR%%/wavetables_3rdparty/TNMG/Digital Movement.wav
 %%DATADIR%%/wavetables_3rdparty/TNMG/FM Scream Redux.wav
--- a/benchmarks/apib/Makefile
+++ b/benchmarks/apib/Makefile
@ -2,7 +2,7 @@ PORTNAME=	apib
 DISTVERSIONPREFIX=	${PORTNAME:tu}_
 DISTVERSION=	1_2_1
 DISTVERSIONSUFFIX=	_RC1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	benchmarks www

 MAINTAINER=	danfe@FreeBSD.org
--- a/benchmarks/inferno/Makefile
+++ b/benchmarks/inferno/Makefile
@ -1,7 +1,6 @@
 PORTNAME=	inferno
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.11.19
-PORTREVISION=	5
+DISTVERSION=	0.11.20
 CATEGORIES=	benchmarks

 MAINTAINER=	yuri@FreeBSD.org
@ -17,148 +16,134 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	jonhoo

 CARGO_CRATES=	adler32-1.2.0 \
-		ahash-0.8.6 \
-		aho-corasick-1.1.2 \
+		ahash-0.8.11 \
+		aho-corasick-1.1.3 \
+		allocator-api2-0.2.18 \
 		anes-0.1.6 \
-		anstream-0.6.4 \
-		anstyle-1.0.4 \
-		anstyle-parse-0.2.2 \
-		anstyle-query-1.0.0 \
-		anstyle-wincon-3.0.1 \
+		anstream-0.6.14 \
+		anstyle-1.0.7 \
+		anstyle-parse-0.2.4 \
+		anstyle-query-1.1.0 \
+		anstyle-wincon-3.0.3 \
 		arrayvec-0.7.4 \
-		assert_cmd-2.0.12 \
-		atty-0.2.14 \
-		autocfg-1.1.0 \
-		bitflags-1.3.2 \
-		bitflags-2.4.1 \
-		bstr-1.8.0 \
-		bumpalo-3.14.0 \
-		bytemuck-1.14.0 \
+		assert_cmd-2.0.14 \
+		autocfg-1.3.0 \
+		bitflags-2.6.0 \
+		bstr-1.9.1 \
+		bumpalo-3.16.0 \
+		bytemuck-1.16.1 \
 		cast-0.3.0 \
 		cfg-if-1.0.0 \
-		ciborium-0.2.1 \
-		ciborium-io-0.2.1 \
-		ciborium-ll-0.2.1 \
-		clap-3.2.25 \
-		clap-4.4.8 \
-		clap_builder-4.4.8 \
+		ciborium-0.2.2 \
+		ciborium-io-0.2.2 \
+		ciborium-ll-0.2.2 \
+		clap-4.4.18 \
+		clap_builder-4.4.18 \
 		clap_derive-4.4.7 \
-		clap_lex-0.2.4 \
 		clap_lex-0.6.0 \
-		colorchoice-1.0.0 \
+		colorchoice-1.0.1 \
 		core2-0.4.0 \
-		crc32fast-1.3.2 \
-		criterion-0.4.0 \
+		crc32fast-1.4.2 \
+		criterion-0.5.1 \
 		criterion-plot-0.5.0 \
-		crossbeam-channel-0.5.8 \
-		crossbeam-deque-0.8.3 \
-		crossbeam-epoch-0.9.15 \
-		crossbeam-utils-0.8.16 \
+		crossbeam-channel-0.5.13 \
+		crossbeam-deque-0.8.5 \
+		crossbeam-epoch-0.9.18 \
+		crossbeam-utils-0.8.20 \
+		crunchy-0.2.2 \
 		dary_heap-0.3.6 \
-		dashmap-5.5.3 \
+		dashmap-6.0.1 \
 		diff-0.1.13 \
 		difflib-0.4.0 \
 		doc-comment-0.3.3 \
-		either-1.9.0 \
-		env_logger-0.10.1 \
+		either-1.13.0 \
+		env_filter-0.1.0 \
+		env_logger-0.11.3 \
 		equivalent-1.0.1 \
-		errno-0.3.7 \
-		getrandom-0.2.11 \
-		half-1.8.2 \
-		hashbrown-0.12.3 \
-		hashbrown-0.13.2 \
-		hashbrown-0.14.2 \
+		getrandom-0.2.15 \
+		half-2.4.1 \
+		hashbrown-0.14.5 \
 		heck-0.4.1 \
-		hermit-abi-0.1.19 \
-		hermit-abi-0.3.3 \
-		indexmap-1.9.3 \
-		indexmap-2.1.0 \
-		is-terminal-0.4.9 \
+		hermit-abi-0.3.9 \
+		indexmap-2.2.6 \
+		is-terminal-0.4.12 \
+		is_terminal_polyfill-1.70.0 \
 		itertools-0.10.5 \
-		itertools-0.11.0 \
-		itoa-1.0.9 \
-		js-sys-0.3.65 \
-		lazy_static-1.4.0 \
-		libc-0.2.150 \
-		libflate-2.0.0 \
-		libflate_lz77-2.0.0 \
-		linux-raw-sys-0.4.11 \
-		lock_api-0.4.11 \
-		log-0.4.20 \
+		itoa-1.0.11 \
+		js-sys-0.3.69 \
+		libc-0.2.155 \
+		libflate-2.1.0 \
+		libflate_lz77-2.1.0 \
+		lock_api-0.4.12 \
+		log-0.4.22 \
 		maplit-1.0.2 \
-		memchr-2.6.4 \
-		memoffset-0.9.0 \
+		memchr-2.7.4 \
 		num-format-0.4.4 \
-		num-traits-0.2.17 \
-		once_cell-1.18.0 \
-		oorandom-11.1.3 \
-		os_str_bytes-6.6.1 \
-		parking_lot_core-0.9.9 \
-		plotters-0.3.5 \
-		plotters-backend-0.3.5 \
-		plotters-svg-0.3.5 \
+		num-traits-0.2.19 \
+		once_cell-1.19.0 \
+		oorandom-11.1.4 \
+		parking_lot_core-0.9.10 \
+		plotters-0.3.6 \
+		plotters-backend-0.3.6 \
+		plotters-svg-0.3.6 \
 		ppv-lite86-0.2.17 \
-		predicates-3.0.4 \
+		predicates-3.1.0 \
 		predicates-core-1.0.6 \
 		predicates-tree-1.0.9 \
 		pretty_assertions-1.4.0 \
-		proc-macro2-1.0.69 \
+		proc-macro2-1.0.86 \
 		quick-xml-0.26.0 \
-		quote-1.0.33 \
+		quote-1.0.36 \
 		rand-0.8.5 \
 		rand_chacha-0.3.1 \
 		rand_core-0.6.4 \
-		rayon-1.8.0 \
-		rayon-core-1.12.0 \
-		redox_syscall-0.4.1 \
-		regex-1.10.2 \
-		regex-automata-0.4.3 \
-		regex-syntax-0.8.2 \
-		rgb-0.8.37 \
+		rayon-1.10.0 \
+		rayon-core-1.12.1 \
+		redox_syscall-0.5.2 \
+		regex-1.10.5 \
+		regex-automata-0.4.7 \
+		regex-syntax-0.8.4 \
+		rgb-0.8.44 \
 		rle-decode-fast-1.0.3 \
-		rustix-0.38.25 \
-		ryu-1.0.15 \
+		ryu-1.0.18 \
 		same-file-1.0.6 \
 		scopeguard-1.2.0 \
-		serde-1.0.193 \
-		serde_derive-1.0.193 \
-		serde_json-1.0.108 \
-		smallvec-1.11.2 \
+		serde-1.0.204 \
+		serde_derive-1.0.204 \
+		serde_json-1.0.120 \
+		smallvec-1.13.2 \
 		str_stack-0.1.0 \
 		strsim-0.10.0 \
-		syn-2.0.39 \
+		syn-2.0.71 \
 		termtree-0.4.1 \
 		testing_logger-0.1.1 \
-		textwrap-0.16.0 \
 		tinytemplate-1.2.1 \
 		unicode-ident-1.0.12 \
-		utf8parse-0.2.1 \
+		utf8parse-0.2.2 \
 		version_check-0.9.4 \
 		wait-timeout-0.2.0 \
-		walkdir-2.4.0 \
+		walkdir-2.5.0 \
 		wasi-0.11.0+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.88 \
-		wasm-bindgen-backend-0.2.88 \
-		wasm-bindgen-macro-0.2.88 \
-		wasm-bindgen-macro-support-0.2.88 \
-		wasm-bindgen-shared-0.2.88 \
-		web-sys-0.3.65 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.6 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		windows-sys-0.48.0 \
-		windows-targets-0.48.5 \
-		windows_aarch64_gnullvm-0.48.5 \
-		windows_aarch64_msvc-0.48.5 \
-		windows_i686_gnu-0.48.5 \
-		windows_i686_msvc-0.48.5 \
-		windows_x86_64_gnu-0.48.5 \
-		windows_x86_64_gnullvm-0.48.5 \
-		windows_x86_64_msvc-0.48.5 \
+		wasm-bindgen-0.2.92 \
+		wasm-bindgen-backend-0.2.92 \
+		wasm-bindgen-macro-0.2.92 \
+		wasm-bindgen-macro-support-0.2.92 \
+		wasm-bindgen-shared-0.2.92 \
+		web-sys-0.3.69 \
+		winapi-util-0.1.8 \
+		windows-sys-0.52.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 \
 		yansi-0.5.1 \
-		zerocopy-0.7.26 \
-		zerocopy-derive-0.7.26
+		zerocopy-0.7.35 \
+		zerocopy-derive-0.7.35
 EXECUTABLES=	inferno-collapse-dtrace \
 		inferno-collapse-ghcprof \
 		inferno-collapse-guess \
--- a/benchmarks/inferno/distinfo
+++ b/benchmarks/inferno/distinfo
@ -1,289 +1,261 @@
-TIMESTAMP = 1702961444
+TIMESTAMP = 1721019713
 SHA256 (rust/crates/adler32-1.2.0.crate) = aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234
 SIZE (rust/crates/adler32-1.2.0.crate) = 6411
-SHA256 (rust/crates/ahash-0.8.6.crate) = 91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a
-SIZE (rust/crates/ahash-0.8.6.crate) = 42780
-SHA256 (rust/crates/aho-corasick-1.1.2.crate) = b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0
-SIZE (rust/crates/aho-corasick-1.1.2.crate) = 183136
+SHA256 (rust/crates/ahash-0.8.11.crate) = e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011
+SIZE (rust/crates/ahash-0.8.11.crate) = 43607
+SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916
+SIZE (rust/crates/aho-corasick-1.1.3.crate) = 183311
+SHA256 (rust/crates/allocator-api2-0.2.18.crate) = 5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f
+SIZE (rust/crates/allocator-api2-0.2.18.crate) = 62504
 SHA256 (rust/crates/anes-0.1.6.crate) = 4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299
 SIZE (rust/crates/anes-0.1.6.crate) = 23857
-SHA256 (rust/crates/anstream-0.6.4.crate) = 2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44
-SIZE (rust/crates/anstream-0.6.4.crate) = 20593
-SHA256 (rust/crates/anstyle-1.0.4.crate) = 7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87
-SIZE (rust/crates/anstyle-1.0.4.crate) = 13998
-SHA256 (rust/crates/anstyle-parse-0.2.2.crate) = 317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140
-SIZE (rust/crates/anstyle-parse-0.2.2.crate) = 24696
-SHA256 (rust/crates/anstyle-query-1.0.0.crate) = 5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b
-SIZE (rust/crates/anstyle-query-1.0.0.crate) = 8620
-SHA256 (rust/crates/anstyle-wincon-3.0.1.crate) = f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628
-SIZE (rust/crates/anstyle-wincon-3.0.1.crate) = 11279
+SHA256 (rust/crates/anstream-0.6.14.crate) = 418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b
+SIZE (rust/crates/anstream-0.6.14.crate) = 29160
+SHA256 (rust/crates/anstyle-1.0.7.crate) = 038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b
+SIZE (rust/crates/anstyle-1.0.7.crate) = 15709
+SHA256 (rust/crates/anstyle-parse-0.2.4.crate) = c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4
+SIZE (rust/crates/anstyle-parse-0.2.4.crate) = 23069
+SHA256 (rust/crates/anstyle-query-1.1.0.crate) = ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391
+SIZE (rust/crates/anstyle-query-1.1.0.crate) = 9832
+SHA256 (rust/crates/anstyle-wincon-3.0.3.crate) = 61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19
+SIZE (rust/crates/anstyle-wincon-3.0.3.crate) = 12179
 SHA256 (rust/crates/arrayvec-0.7.4.crate) = 96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711
 SIZE (rust/crates/arrayvec-0.7.4.crate) = 29856
-SHA256 (rust/crates/assert_cmd-2.0.12.crate) = 88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6
-SIZE (rust/crates/assert_cmd-2.0.12.crate) = 25347
-SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
-SIZE (rust/crates/atty-0.2.14.crate) = 5470
-SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
-SIZE (rust/crates/autocfg-1.1.0.crate) = 13272
-SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
-SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
-SHA256 (rust/crates/bitflags-2.4.1.crate) = 327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07
-SIZE (rust/crates/bitflags-2.4.1.crate) = 37043
-SHA256 (rust/crates/bstr-1.8.0.crate) = 542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c
-SIZE (rust/crates/bstr-1.8.0.crate) = 380176
-SHA256 (rust/crates/bumpalo-3.14.0.crate) = 7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec
-SIZE (rust/crates/bumpalo-3.14.0.crate) = 82400
-SHA256 (rust/crates/bytemuck-1.14.0.crate) = 374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6
-SIZE (rust/crates/bytemuck-1.14.0.crate) = 44933
+SHA256 (rust/crates/assert_cmd-2.0.14.crate) = ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8
+SIZE (rust/crates/assert_cmd-2.0.14.crate) = 24591
+SHA256 (rust/crates/autocfg-1.3.0.crate) = 0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0
+SIZE (rust/crates/autocfg-1.3.0.crate) = 16524
+SHA256 (rust/crates/bitflags-2.6.0.crate) = b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de
+SIZE (rust/crates/bitflags-2.6.0.crate) = 45357
+SHA256 (rust/crates/bstr-1.9.1.crate) = 05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706
+SIZE (rust/crates/bstr-1.9.1.crate) = 380305
+SHA256 (rust/crates/bumpalo-3.16.0.crate) = 79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c
+SIZE (rust/crates/bumpalo-3.16.0.crate) = 85677
+SHA256 (rust/crates/bytemuck-1.16.1.crate) = b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e
+SIZE (rust/crates/bytemuck-1.16.1.crate) = 48321
 SHA256 (rust/crates/cast-0.3.0.crate) = 37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5
 SIZE (rust/crates/cast-0.3.0.crate) = 11452
 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
 SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
-SHA256 (rust/crates/ciborium-0.2.1.crate) = effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926
-SIZE (rust/crates/ciborium-0.2.1.crate) = 34974
-SHA256 (rust/crates/ciborium-io-0.2.1.crate) = cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656
-SIZE (rust/crates/ciborium-io-0.2.1.crate) = 6679
-SHA256 (rust/crates/ciborium-ll-0.2.1.crate) = defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b
-SIZE (rust/crates/ciborium-ll-0.2.1.crate) = 14649
-SHA256 (rust/crates/clap-3.2.25.crate) = 4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123
-SIZE (rust/crates/clap-3.2.25.crate) = 219403
-SHA256 (rust/crates/clap-4.4.8.crate) = 2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64
-SIZE (rust/crates/clap-4.4.8.crate) = 54609
-SHA256 (rust/crates/clap_builder-4.4.8.crate) = 07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc
-SIZE (rust/crates/clap_builder-4.4.8.crate) = 163164
+SHA256 (rust/crates/ciborium-0.2.2.crate) = 42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e
+SIZE (rust/crates/ciborium-0.2.2.crate) = 35611
+SHA256 (rust/crates/ciborium-io-0.2.2.crate) = 05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757
+SIZE (rust/crates/ciborium-io-0.2.2.crate) = 6697
+SHA256 (rust/crates/ciborium-ll-0.2.2.crate) = 57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9
+SIZE (rust/crates/ciborium-ll-0.2.2.crate) = 14695
+SHA256 (rust/crates/clap-4.4.18.crate) = 1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c
+SIZE (rust/crates/clap-4.4.18.crate) = 55269
+SHA256 (rust/crates/clap_builder-4.4.18.crate) = 4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7
+SIZE (rust/crates/clap_builder-4.4.18.crate) = 163538
 SHA256 (rust/crates/clap_derive-4.4.7.crate) = cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442
 SIZE (rust/crates/clap_derive-4.4.7.crate) = 29046
-SHA256 (rust/crates/clap_lex-0.2.4.crate) = 2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5
-SIZE (rust/crates/clap_lex-0.2.4.crate) = 9652
 SHA256 (rust/crates/clap_lex-0.6.0.crate) = 702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1
 SIZE (rust/crates/clap_lex-0.6.0.crate) = 12272
-SHA256 (rust/crates/colorchoice-1.0.0.crate) = acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7
-SIZE (rust/crates/colorchoice-1.0.0.crate) = 6857
+SHA256 (rust/crates/colorchoice-1.0.1.crate) = 0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422
+SIZE (rust/crates/colorchoice-1.0.1.crate) = 7895
 SHA256 (rust/crates/core2-0.4.0.crate) = b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505
 SIZE (rust/crates/core2-0.4.0.crate) = 37075
-SHA256 (rust/crates/crc32fast-1.3.2.crate) = b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d
-SIZE (rust/crates/crc32fast-1.3.2.crate) = 38661
-SHA256 (rust/crates/criterion-0.4.0.crate) = e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb
-SIZE (rust/crates/criterion-0.4.0.crate) = 108978
+SHA256 (rust/crates/crc32fast-1.4.2.crate) = a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3
+SIZE (rust/crates/crc32fast-1.4.2.crate) = 38491
+SHA256 (rust/crates/criterion-0.5.1.crate) = f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f
+SIZE (rust/crates/criterion-0.5.1.crate) = 110088
 SHA256 (rust/crates/criterion-plot-0.5.0.crate) = 6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1
 SIZE (rust/crates/criterion-plot-0.5.0.crate) = 22706
-SHA256 (rust/crates/crossbeam-channel-0.5.8.crate) = a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200
-SIZE (rust/crates/crossbeam-channel-0.5.8.crate) = 90455
-SHA256 (rust/crates/crossbeam-deque-0.8.3.crate) = ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef
-SIZE (rust/crates/crossbeam-deque-0.8.3.crate) = 21746
-SHA256 (rust/crates/crossbeam-epoch-0.9.15.crate) = ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7
-SIZE (rust/crates/crossbeam-epoch-0.9.15.crate) = 48553
-SHA256 (rust/crates/crossbeam-utils-0.8.16.crate) = 5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294
-SIZE (rust/crates/crossbeam-utils-0.8.16.crate) = 42508
+SHA256 (rust/crates/crossbeam-channel-0.5.13.crate) = 33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2
+SIZE (rust/crates/crossbeam-channel-0.5.13.crate) = 91174
+SHA256 (rust/crates/crossbeam-deque-0.8.5.crate) = 613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d
+SIZE (rust/crates/crossbeam-deque-0.8.5.crate) = 21726
+SHA256 (rust/crates/crossbeam-epoch-0.9.18.crate) = 5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e
+SIZE (rust/crates/crossbeam-epoch-0.9.18.crate) = 46875
+SHA256 (rust/crates/crossbeam-utils-0.8.20.crate) = 22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80
+SIZE (rust/crates/crossbeam-utils-0.8.20.crate) = 42487
+SHA256 (rust/crates/crunchy-0.2.2.crate) = 7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7
+SIZE (rust/crates/crunchy-0.2.2.crate) = 2995
 SHA256 (rust/crates/dary_heap-0.3.6.crate) = 7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca
 SIZE (rust/crates/dary_heap-0.3.6.crate) = 23683
-SHA256 (rust/crates/dashmap-5.5.3.crate) = 978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856
-SIZE (rust/crates/dashmap-5.5.3.crate) = 24061
+SHA256 (rust/crates/dashmap-6.0.1.crate) = 804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28
+SIZE (rust/crates/dashmap-6.0.1.crate) = 24364
 SHA256 (rust/crates/diff-0.1.13.crate) = 56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8
 SIZE (rust/crates/diff-0.1.13.crate) = 46216
 SHA256 (rust/crates/difflib-0.4.0.crate) = 6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8
 SIZE (rust/crates/difflib-0.4.0.crate) = 7638
 SHA256 (rust/crates/doc-comment-0.3.3.crate) = fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10
 SIZE (rust/crates/doc-comment-0.3.3.crate) = 4123
-SHA256 (rust/crates/either-1.9.0.crate) = a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07
-SIZE (rust/crates/either-1.9.0.crate) = 16660
-SHA256 (rust/crates/env_logger-0.10.1.crate) = 95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece
-SIZE (rust/crates/env_logger-0.10.1.crate) = 36524
+SHA256 (rust/crates/either-1.13.0.crate) = 60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0
+SIZE (rust/crates/either-1.13.0.crate) = 19169
+SHA256 (rust/crates/env_filter-0.1.0.crate) = a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea
+SIZE (rust/crates/env_filter-0.1.0.crate) = 11553
+SHA256 (rust/crates/env_logger-0.11.3.crate) = 38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9
+SIZE (rust/crates/env_logger-0.11.3.crate) = 29704
 SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5
 SIZE (rust/crates/equivalent-1.0.1.crate) = 6615
-SHA256 (rust/crates/errno-0.3.7.crate) = f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8
-SIZE (rust/crates/errno-0.3.7.crate) = 10712
-SHA256 (rust/crates/getrandom-0.2.11.crate) = fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f
-SIZE (rust/crates/getrandom-0.2.11.crate) = 35391
-SHA256 (rust/crates/half-1.8.2.crate) = eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7
-SIZE (rust/crates/half-1.8.2.crate) = 41874
-SHA256 (rust/crates/hashbrown-0.12.3.crate) = 8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888
-SIZE (rust/crates/hashbrown-0.12.3.crate) = 102968
-SHA256 (rust/crates/hashbrown-0.13.2.crate) = 43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e
-SIZE (rust/crates/hashbrown-0.13.2.crate) = 105265
-SHA256 (rust/crates/hashbrown-0.14.2.crate) = f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156
-SIZE (rust/crates/hashbrown-0.14.2.crate) = 140080
+SHA256 (rust/crates/getrandom-0.2.15.crate) = c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7
+SIZE (rust/crates/getrandom-0.2.15.crate) = 37163
+SHA256 (rust/crates/half-2.4.1.crate) = 6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888
+SIZE (rust/crates/half-2.4.1.crate) = 50892
+SHA256 (rust/crates/hashbrown-0.14.5.crate) = e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1
+SIZE (rust/crates/hashbrown-0.14.5.crate) = 141498
 SHA256 (rust/crates/heck-0.4.1.crate) = 95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8
 SIZE (rust/crates/heck-0.4.1.crate) = 11567
-SHA256 (rust/crates/hermit-abi-0.1.19.crate) = 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33
-SIZE (rust/crates/hermit-abi-0.1.19.crate) = 9979
-SHA256 (rust/crates/hermit-abi-0.3.3.crate) = d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7
-SIZE (rust/crates/hermit-abi-0.3.3.crate) = 14253
-SHA256 (rust/crates/indexmap-1.9.3.crate) = bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99
-SIZE (rust/crates/indexmap-1.9.3.crate) = 54653
-SHA256 (rust/crates/indexmap-2.1.0.crate) = d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f
-SIZE (rust/crates/indexmap-2.1.0.crate) = 68224
-SHA256 (rust/crates/is-terminal-0.4.9.crate) = cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b
-SIZE (rust/crates/is-terminal-0.4.9.crate) = 8109
+SHA256 (rust/crates/hermit-abi-0.3.9.crate) = d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024
+SIZE (rust/crates/hermit-abi-0.3.9.crate) = 16165
+SHA256 (rust/crates/indexmap-2.2.6.crate) = 168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26
+SIZE (rust/crates/indexmap-2.2.6.crate) = 82420
+SHA256 (rust/crates/is-terminal-0.4.12.crate) = f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b
+SIZE (rust/crates/is-terminal-0.4.12.crate) = 7470
+SHA256 (rust/crates/is_terminal_polyfill-1.70.0.crate) = f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800
+SIZE (rust/crates/is_terminal_polyfill-1.70.0.crate) = 7451
 SHA256 (rust/crates/itertools-0.10.5.crate) = b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473
 SIZE (rust/crates/itertools-0.10.5.crate) = 115354
-SHA256 (rust/crates/itertools-0.11.0.crate) = b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57
-SIZE (rust/crates/itertools-0.11.0.crate) = 125074
-SHA256 (rust/crates/itoa-1.0.9.crate) = af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38
-SIZE (rust/crates/itoa-1.0.9.crate) = 10492
-SHA256 (rust/crates/js-sys-0.3.65.crate) = 54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8
-SIZE (rust/crates/js-sys-0.3.65.crate) = 80725
-SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
-SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
-SHA256 (rust/crates/libc-0.2.150.crate) = 89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c
-SIZE (rust/crates/libc-0.2.150.crate) = 719359
-SHA256 (rust/crates/libflate-2.0.0.crate) = 9f7d5654ae1795afc7ff76f4365c2c8791b0feb18e8996a96adad8ffd7c3b2bf
-SIZE (rust/crates/libflate-2.0.0.crate) = 42505
-SHA256 (rust/crates/libflate_lz77-2.0.0.crate) = be5f52fb8c451576ec6b79d3f4deb327398bc05bbdbd99021a6e77a4c855d524
-SIZE (rust/crates/libflate_lz77-2.0.0.crate) = 5893
-SHA256 (rust/crates/linux-raw-sys-0.4.11.crate) = 969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829
-SIZE (rust/crates/linux-raw-sys-0.4.11.crate) = 1413981
-SHA256 (rust/crates/lock_api-0.4.11.crate) = 3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45
-SIZE (rust/crates/lock_api-0.4.11.crate) = 27487
-SHA256 (rust/crates/log-0.4.20.crate) = b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f
-SIZE (rust/crates/log-0.4.20.crate) = 38307
+SHA256 (rust/crates/itoa-1.0.11.crate) = 49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b
+SIZE (rust/crates/itoa-1.0.11.crate) = 10563
+SHA256 (rust/crates/js-sys-0.3.69.crate) = 29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d
+SIZE (rust/crates/js-sys-0.3.69.crate) = 81083
+SHA256 (rust/crates/libc-0.2.155.crate) = 97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c
+SIZE (rust/crates/libc-0.2.155.crate) = 743539
+SHA256 (rust/crates/libflate-2.1.0.crate) = 45d9dfdc14ea4ef0900c1cddbc8dcd553fbaacd8a4a282cf4018ae9dd04fb21e
+SIZE (rust/crates/libflate-2.1.0.crate) = 43366
+SHA256 (rust/crates/libflate_lz77-2.1.0.crate) = e6e0d73b369f386f1c44abd9c570d5318f55ccde816ff4b562fa452e5182863d
+SIZE (rust/crates/libflate_lz77-2.1.0.crate) = 5918
+SHA256 (rust/crates/lock_api-0.4.12.crate) = 07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17
+SIZE (rust/crates/lock_api-0.4.12.crate) = 27591
+SHA256 (rust/crates/log-0.4.22.crate) = a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24
+SIZE (rust/crates/log-0.4.22.crate) = 44027
 SHA256 (rust/crates/maplit-1.0.2.crate) = 3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d
 SIZE (rust/crates/maplit-1.0.2.crate) = 8871
-SHA256 (rust/crates/memchr-2.6.4.crate) = f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167
-SIZE (rust/crates/memchr-2.6.4.crate) = 94439
-SHA256 (rust/crates/memoffset-0.9.0.crate) = 5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c
-SIZE (rust/crates/memoffset-0.9.0.crate) = 9033
+SHA256 (rust/crates/memchr-2.7.4.crate) = 78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3
+SIZE (rust/crates/memchr-2.7.4.crate) = 96670
 SHA256 (rust/crates/num-format-0.4.4.crate) = a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3
 SIZE (rust/crates/num-format-0.4.4.crate) = 61509
-SHA256 (rust/crates/num-traits-0.2.17.crate) = 39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c
-SIZE (rust/crates/num-traits-0.2.17.crate) = 50190
-SHA256 (rust/crates/once_cell-1.18.0.crate) = dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d
-SIZE (rust/crates/once_cell-1.18.0.crate) = 32969
-SHA256 (rust/crates/oorandom-11.1.3.crate) = 0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575
-SIZE (rust/crates/oorandom-11.1.3.crate) = 10068
-SHA256 (rust/crates/os_str_bytes-6.6.1.crate) = e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1
-SIZE (rust/crates/os_str_bytes-6.6.1.crate) = 27643
-SHA256 (rust/crates/parking_lot_core-0.9.9.crate) = 4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e
-SIZE (rust/crates/parking_lot_core-0.9.9.crate) = 32445
-SHA256 (rust/crates/plotters-0.3.5.crate) = d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45
-SIZE (rust/crates/plotters-0.3.5.crate) = 143975
-SHA256 (rust/crates/plotters-backend-0.3.5.crate) = 9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609
-SIZE (rust/crates/plotters-backend-0.3.5.crate) = 13440
-SHA256 (rust/crates/plotters-svg-0.3.5.crate) = 38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab
-SIZE (rust/crates/plotters-svg-0.3.5.crate) = 6948
+SHA256 (rust/crates/num-traits-0.2.19.crate) = 071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841
+SIZE (rust/crates/num-traits-0.2.19.crate) = 51631
+SHA256 (rust/crates/once_cell-1.19.0.crate) = 3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92
+SIZE (rust/crates/once_cell-1.19.0.crate) = 33046
+SHA256 (rust/crates/oorandom-11.1.4.crate) = b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9
+SIZE (rust/crates/oorandom-11.1.4.crate) = 10201
+SHA256 (rust/crates/parking_lot_core-0.9.10.crate) = 1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8
+SIZE (rust/crates/parking_lot_core-0.9.10.crate) = 32406
+SHA256 (rust/crates/plotters-0.3.6.crate) = a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3
+SIZE (rust/crates/plotters-0.3.6.crate) = 147577
+SHA256 (rust/crates/plotters-backend-0.3.6.crate) = 414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7
+SIZE (rust/crates/plotters-backend-0.3.6.crate) = 13669
+SHA256 (rust/crates/plotters-svg-0.3.6.crate) = 81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705
+SIZE (rust/crates/plotters-svg-0.3.6.crate) = 6944
 SHA256 (rust/crates/ppv-lite86-0.2.17.crate) = 5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de
 SIZE (rust/crates/ppv-lite86-0.2.17.crate) = 22242
-SHA256 (rust/crates/predicates-3.0.4.crate) = 6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0
-SIZE (rust/crates/predicates-3.0.4.crate) = 23240
+SHA256 (rust/crates/predicates-3.1.0.crate) = 68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8
+SIZE (rust/crates/predicates-3.1.0.crate) = 23090
 SHA256 (rust/crates/predicates-core-1.0.6.crate) = b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174
 SIZE (rust/crates/predicates-core-1.0.6.crate) = 8084
 SHA256 (rust/crates/predicates-tree-1.0.9.crate) = 368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf
 SIZE (rust/crates/predicates-tree-1.0.9.crate) = 7960
 SHA256 (rust/crates/pretty_assertions-1.4.0.crate) = af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66
 SIZE (rust/crates/pretty_assertions-1.4.0.crate) = 78846
-SHA256 (rust/crates/proc-macro2-1.0.69.crate) = 134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da
-SIZE (rust/crates/proc-macro2-1.0.69.crate) = 44271
+SHA256 (rust/crates/proc-macro2-1.0.86.crate) = 5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77
+SIZE (rust/crates/proc-macro2-1.0.86.crate) = 48958
 SHA256 (rust/crates/quick-xml-0.26.0.crate) = 7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd
 SIZE (rust/crates/quick-xml-0.26.0.crate) = 116260
-SHA256 (rust/crates/quote-1.0.33.crate) = 5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae
-SIZE (rust/crates/quote-1.0.33.crate) = 28090
+SHA256 (rust/crates/quote-1.0.36.crate) = 0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7
+SIZE (rust/crates/quote-1.0.36.crate) = 28507
 SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404
 SIZE (rust/crates/rand-0.8.5.crate) = 87113
 SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
 SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251
 SHA256 (rust/crates/rand_core-0.6.4.crate) = ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c
 SIZE (rust/crates/rand_core-0.6.4.crate) = 22666
-SHA256 (rust/crates/rayon-1.8.0.crate) = 9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1
-SIZE (rust/crates/rayon-1.8.0.crate) = 170172
-SHA256 (rust/crates/rayon-core-1.12.0.crate) = 5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed
-SIZE (rust/crates/rayon-core-1.12.0.crate) = 70081
-SHA256 (rust/crates/redox_syscall-0.4.1.crate) = 4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa
-SIZE (rust/crates/redox_syscall-0.4.1.crate) = 24858
-SHA256 (rust/crates/regex-1.10.2.crate) = 380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343
-SIZE (rust/crates/regex-1.10.2.crate) = 252839
-SHA256 (rust/crates/regex-automata-0.4.3.crate) = 5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f
-SIZE (rust/crates/regex-automata-0.4.3.crate) = 617011
-SHA256 (rust/crates/regex-syntax-0.8.2.crate) = c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f
-SIZE (rust/crates/regex-syntax-0.8.2.crate) = 347228
-SHA256 (rust/crates/rgb-0.8.37.crate) = 05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8
-SIZE (rust/crates/rgb-0.8.37.crate) = 16644
+SHA256 (rust/crates/rayon-1.10.0.crate) = b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa
+SIZE (rust/crates/rayon-1.10.0.crate) = 180155
+SHA256 (rust/crates/rayon-core-1.12.1.crate) = 1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2
+SIZE (rust/crates/rayon-core-1.12.1.crate) = 70701
+SHA256 (rust/crates/redox_syscall-0.5.2.crate) = c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd
+SIZE (rust/crates/redox_syscall-0.5.2.crate) = 23957
+SHA256 (rust/crates/regex-1.10.5.crate) = b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f
+SIZE (rust/crates/regex-1.10.5.crate) = 253805
+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/rgb-0.8.44.crate) = 1aee83dc281d5a3200d37b299acd13b81066ea126a7f16f0eae70fc9aed241d9
+SIZE (rust/crates/rgb-0.8.44.crate) = 20389
 SHA256 (rust/crates/rle-decode-fast-1.0.3.crate) = 3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422
 SIZE (rust/crates/rle-decode-fast-1.0.3.crate) = 62086
-SHA256 (rust/crates/rustix-0.38.25.crate) = dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e
-SIZE (rust/crates/rustix-0.38.25.crate) = 362735
-SHA256 (rust/crates/ryu-1.0.15.crate) = 1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741
-SIZE (rust/crates/ryu-1.0.15.crate) = 46906
+SHA256 (rust/crates/ryu-1.0.18.crate) = f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f
+SIZE (rust/crates/ryu-1.0.18.crate) = 47713
 SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502
 SIZE (rust/crates/same-file-1.0.6.crate) = 10183
 SHA256 (rust/crates/scopeguard-1.2.0.crate) = 94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49
 SIZE (rust/crates/scopeguard-1.2.0.crate) = 11619
-SHA256 (rust/crates/serde-1.0.193.crate) = 25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89
-SIZE (rust/crates/serde-1.0.193.crate) = 76863
-SHA256 (rust/crates/serde_derive-1.0.193.crate) = 43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3
-SIZE (rust/crates/serde_derive-1.0.193.crate) = 55692
-SHA256 (rust/crates/serde_json-1.0.108.crate) = 3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b
-SIZE (rust/crates/serde_json-1.0.108.crate) = 146476
-SHA256 (rust/crates/smallvec-1.11.2.crate) = 4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970
-SIZE (rust/crates/smallvec-1.11.2.crate) = 34801
+SHA256 (rust/crates/serde-1.0.204.crate) = bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12
+SIZE (rust/crates/serde-1.0.204.crate) = 78253
+SHA256 (rust/crates/serde_derive-1.0.204.crate) = e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222
+SIZE (rust/crates/serde_derive-1.0.204.crate) = 55871
+SHA256 (rust/crates/serde_json-1.0.120.crate) = 4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5
+SIZE (rust/crates/serde_json-1.0.120.crate) = 147062
+SHA256 (rust/crates/smallvec-1.13.2.crate) = 3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67
+SIZE (rust/crates/smallvec-1.13.2.crate) = 35216
 SHA256 (rust/crates/str_stack-0.1.0.crate) = 9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb
 SIZE (rust/crates/str_stack-0.1.0.crate) = 7977
 SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623
 SIZE (rust/crates/strsim-0.10.0.crate) = 11355
-SHA256 (rust/crates/syn-2.0.39.crate) = 23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a
-SIZE (rust/crates/syn-2.0.39.crate) = 244129
+SHA256 (rust/crates/syn-2.0.71.crate) = b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462
+SIZE (rust/crates/syn-2.0.71.crate) = 266398
 SHA256 (rust/crates/termtree-0.4.1.crate) = 3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76
 SIZE (rust/crates/termtree-0.4.1.crate) = 4557
 SHA256 (rust/crates/testing_logger-0.1.1.crate) = 6d92b727cb45d33ae956f7f46b966b25f1bc712092aeef9dba5ac798fc89f720
 SIZE (rust/crates/testing_logger-0.1.1.crate) = 3630
-SHA256 (rust/crates/textwrap-0.16.0.crate) = 222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d
-SIZE (rust/crates/textwrap-0.16.0.crate) = 53722
 SHA256 (rust/crates/tinytemplate-1.2.1.crate) = be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc
 SIZE (rust/crates/tinytemplate-1.2.1.crate) = 26490
 SHA256 (rust/crates/unicode-ident-1.0.12.crate) = 3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b
 SIZE (rust/crates/unicode-ident-1.0.12.crate) = 42168
-SHA256 (rust/crates/utf8parse-0.2.1.crate) = 711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a
-SIZE (rust/crates/utf8parse-0.2.1.crate) = 13435
+SHA256 (rust/crates/utf8parse-0.2.2.crate) = 06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821
+SIZE (rust/crates/utf8parse-0.2.2.crate) = 13499
 SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f
 SIZE (rust/crates/version_check-0.9.4.crate) = 14895
 SHA256 (rust/crates/wait-timeout-0.2.0.crate) = 9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6
 SIZE (rust/crates/wait-timeout-0.2.0.crate) = 12441
-SHA256 (rust/crates/walkdir-2.4.0.crate) = d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee
-SIZE (rust/crates/walkdir-2.4.0.crate) = 23550
+SHA256 (rust/crates/walkdir-2.5.0.crate) = 29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b
+SIZE (rust/crates/walkdir-2.5.0.crate) = 23951
 SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423
 SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131
-SHA256 (rust/crates/wasm-bindgen-0.2.88.crate) = 7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce
-SIZE (rust/crates/wasm-bindgen-0.2.88.crate) = 181311
-SHA256 (rust/crates/wasm-bindgen-backend-0.2.88.crate) = e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217
-SIZE (rust/crates/wasm-bindgen-backend-0.2.88.crate) = 28181
-SHA256 (rust/crates/wasm-bindgen-macro-0.2.88.crate) = 5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2
-SIZE (rust/crates/wasm-bindgen-macro-0.2.88.crate) = 13908
-SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.88.crate) = c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907
-SIZE (rust/crates/wasm-bindgen-macro-support-0.2.88.crate) = 20008
-SHA256 (rust/crates/wasm-bindgen-shared-0.2.88.crate) = 0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b
-SIZE (rust/crates/wasm-bindgen-shared-0.2.88.crate) = 7264
-SHA256 (rust/crates/web-sys-0.3.65.crate) = 5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85
-SIZE (rust/crates/web-sys-0.3.65.crate) = 734287
-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-util-0.1.6.crate) = f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596
-SIZE (rust/crates/winapi-util-0.1.6.crate) = 12234
-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-sys-0.48.0.crate) = 677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9
-SIZE (rust/crates/windows-sys-0.48.0.crate) = 2628884
-SHA256 (rust/crates/windows-targets-0.48.5.crate) = 9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c
-SIZE (rust/crates/windows-targets-0.48.5.crate) = 6904
-SHA256 (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8
-SIZE (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 418492
-SHA256 (rust/crates/windows_aarch64_msvc-0.48.5.crate) = dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc
-SIZE (rust/crates/windows_aarch64_msvc-0.48.5.crate) = 798483
-SHA256 (rust/crates/windows_i686_gnu-0.48.5.crate) = a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e
-SIZE (rust/crates/windows_i686_gnu-0.48.5.crate) = 844891
-SHA256 (rust/crates/windows_i686_msvc-0.48.5.crate) = 8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406
-SIZE (rust/crates/windows_i686_msvc-0.48.5.crate) = 864300
-SHA256 (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e
-SIZE (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 801619
-SHA256 (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc
-SIZE (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 418486
-SHA256 (rust/crates/windows_x86_64_msvc-0.48.5.crate) = ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538
-SIZE (rust/crates/windows_x86_64_msvc-0.48.5.crate) = 798412
+SHA256 (rust/crates/wasm-bindgen-0.2.92.crate) = 4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8
+SIZE (rust/crates/wasm-bindgen-0.2.92.crate) = 184119
+SHA256 (rust/crates/wasm-bindgen-backend-0.2.92.crate) = 614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da
+SIZE (rust/crates/wasm-bindgen-backend-0.2.92.crate) = 28348
+SHA256 (rust/crates/wasm-bindgen-macro-0.2.92.crate) = a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726
+SIZE (rust/crates/wasm-bindgen-macro-0.2.92.crate) = 13835
+SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.92.crate) = e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7
+SIZE (rust/crates/wasm-bindgen-macro-support-0.2.92.crate) = 20092
+SHA256 (rust/crates/wasm-bindgen-shared-0.2.92.crate) = af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96
+SIZE (rust/crates/wasm-bindgen-shared-0.2.92.crate) = 7263
+SHA256 (rust/crates/web-sys-0.3.69.crate) = 77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef
+SIZE (rust/crates/web-sys-0.3.69.crate) = 728877
+SHA256 (rust/crates/winapi-util-0.1.8.crate) = 4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b
+SIZE (rust/crates/winapi-util-0.1.8.crate) = 12416
+SHA256 (rust/crates/windows-sys-0.52.0.crate) = 282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d
+SIZE (rust/crates/windows-sys-0.52.0.crate) = 2576877
+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/yansi-0.5.1.crate) = 09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec
 SIZE (rust/crates/yansi-0.5.1.crate) = 16525
-SHA256 (rust/crates/zerocopy-0.7.26.crate) = e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0
-SIZE (rust/crates/zerocopy-0.7.26.crate) = 128648
-SHA256 (rust/crates/zerocopy-derive-0.7.26.crate) = dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f
-SIZE (rust/crates/zerocopy-derive-0.7.26.crate) = 528381
-SHA256 (jonhoo-inferno-v0.11.19_GH0.tar.gz) = e3924e0ecae3a3e230dd1c7f550ea2ab96706bf9e4991d03a99e64fcd41d28a8
-SIZE (jonhoo-inferno-v0.11.19_GH0.tar.gz) = 655846
+SHA256 (rust/crates/zerocopy-0.7.35.crate) = 1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0
+SIZE (rust/crates/zerocopy-0.7.35.crate) = 152645
+SHA256 (rust/crates/zerocopy-derive-0.7.35.crate) = fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e
+SIZE (rust/crates/zerocopy-derive-0.7.35.crate) = 37829
+SHA256 (jonhoo-inferno-v0.11.20_GH0.tar.gz) = 70552f0c70a11ff70590bbec8f3041dcefc22a6dbd6179023d81ca8ec09b8188
+SIZE (jonhoo-inferno-v0.11.20_GH0.tar.gz) = 656511
--- a/benchmarks/p5-Dumbbench/Makefile
+++ b/benchmarks/p5-Dumbbench/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	Dumbbench
-PORTVERSION=	0.503
+PORTVERSION=	0.504
 CATEGORIES=	benchmarks perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BDFOY
--- a/benchmarks/p5-Dumbbench/distinfo
+++ b/benchmarks/p5-Dumbbench/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1650970067
-SHA256 (Dumbbench-0.503.tar.gz) = d016019a818313e704464f280cf641ef60e8771d07791b59b99e17a1ec801fa9
-SIZE (Dumbbench-0.503.tar.gz) = 33924
+TIMESTAMP = 1720608642
+SHA256 (Dumbbench-0.504.tar.gz) = 57067480f86f8ec5e9e22cbd78eb10a515edfa73b00997c5e2199d1eb6402130
+SIZE (Dumbbench-0.504.tar.gz) = 34776
--- a/biology/gatk/Makefile
+++ b/biology/gatk/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	gatk
-DISTVERSION=	4.5.0.0
+DISTVERSION=	4.6.0.0
 CATEGORIES=	biology java
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}

@ -32,8 +32,6 @@ PLIST_FILES=	bin/${PORTNAME} \

 BINARY_ALIAS=	java=${JAVA}

-# TODO additionally fetch git-lfs files: https://github.com/broadinstitute/gatk/issues/6395
-
 # to rebuild the deps archive:
 #   1. set DEV_UPDATE_MODE=yes
 #   2. make makesum build
@ -43,15 +41,20 @@ BINARY_ALIAS=	java=${JAVA}

 DEV_UPDATE_MODE=	no

-OPTIONS_DEFINE=			WITH_LARGE_FILES # probably should be default for tests, but the build doesn't seem to be affected contrary to what README says
+OPTIONS_DEFINE=			WITH_LARGE_FILES
+OPTIONS_DEFAULT=		WITH_LARGE_FILES # runtime requires large files, see the README

 WITH_LARGE_FILES_DESC=		Download large LFS files needed for build and tests
 WITH_LARGE_FILES_FETCH_DEPENDS=	git:devel/git \
 				git-lfs:devel/git-lfs

+# The large files under src/main/resources/large/ are required to build GATK, since they are packaged inside the GATK jar and used by tools at runtime. These are things like ML models and native C/C++ libraries used for acceleration of certain tools.
+# The large files under src/test/resources/large/, on the other hand, are only required by the test suite when running tests.
+
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MWITH_LARGE_FILES}
+# fetch the main distfile including git-lsf files
 do-fetch:
 	@if [ "${FORCE_FETCH_ALL}" = "true" ] || ! [ -f "${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}" ]; then \
 		${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
@ -61,15 +64,25 @@ do-fetch:
 			${MKDIR} ${WRKDIR}; \
 			HOME=${WRKDIR}; \
 			git config --global filter.lfs.smudge "git-lfs smudge -- %f" && \
-			git clone -q https://github.com/broadinstitute/gatk.git ${PORTNAME}-${DISTVERSION} && \
+			GIT_CLONE_PROTECTION_ACTIVE=false git clone -nq https://github.com/broadinstitute/gatk.git ${PORTNAME}-${DISTVERSION} && \
 			(cd ${PORTNAME}-${DISTVERSION} && git reset -q --hard ${DISTVERSION} && ${RM} -r .git) && \
 			${RM} -r ${WRKDIR} \
 		) && \
 		${FIND} ${PORTNAME}-${DISTVERSION} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \
 		${FIND} ${PORTNAME}-${DISTVERSION} -print0 | LC_ALL=C ${SORT} -z | \
-		${TAR} czf ${DISTNAME}${EXTRACT_SUFX} --format=ustar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \
+		${TAR} czf ${DISTNAME}${EXTRACT_SUFX} --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \
 		${RM} -r ${PORTNAME}-${DISTVERSION}; \
 	fi
+# fetch the deps distfile
+.  if (${DEV_UPDATE_MODE} == "no")
+	@if [ "${FORCE_FETCH_ALL}" = "true" ] || ! [ -f "${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}" ]; then \
+		${ECHO} "==> Fetching the deps distfile for ${PORTNAME}" && \
+		${SETENV} \
+			${_DO_FETCH_ENV} ${_MASTER_SITES_ENV} \
+			dp_SITE_FLAVOR=MASTER \
+			${SH} ${SCRIPTSDIR}/do-fetch.sh ${DISTFILES:M*\:deps}; \
+	fi
+.  endif
 .endif

 .if (${DEV_UPDATE_MODE} == "yes")
@ -86,7 +99,7 @@ post-extract: # need a separate extract step because the cache is in /tmp, and n
 .endif

 do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gradle \
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gradle \
 		--gradle-user-home ${DEPS_CACHE_DIR}/gradle-${PORTNAME} --project-cache-dir ${DEPS_CACHE_DIR}/gradle-${PORTNAME} \
 		${GRADLE_ARGS} --build-cache localJar

@ -94,4 +107,8 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/build/libs/gatk-package-1.0-SNAPSHOT-local.jar ${STAGEDIR}${JAVAJARDIR}/GenomeAnalysisTK-${PORTVERSION}.jar

+do-test: # tests require WITH_LARGE_FILES=ON, and they use a lot of disk space
+	@cd ${WRKSRC} && \
+		${SETENV} ${MAKE_ENV} gradle test
+
 .include <bsd.port.mk>
--- a/biology/gatk/distinfo
+++ b/biology/gatk/distinfo
@ -1,5 +1,5 @@
-TIMESTAMP = 1702890353
-SHA256 (gatk-4.5.0.0-deps.tar.gz) = b6bf2e6ff9d64198e4ba185b2c09648bef841d274206603d0f6802e134b10cf5
-SIZE (gatk-4.5.0.0-deps.tar.gz) = 883487836
-SHA256 (broadinstitute-gatk-4.5.0.0_GH0.tar.gz) = 39b09548ada317b29f19d6cbc0267301ee3565d575a5d79008a0168e679b98d2
-SIZE (broadinstitute-gatk-4.5.0.0_GH0.tar.gz) = 104455420
+TIMESTAMP = 1720732636
+SHA256 (gatk-4.6.0.0-deps.tar.gz) = 0d124af0ec3d2d93cf2d9c5119ddab4c7d02c8d0213d288695718a6e04064e24
+SIZE (gatk-4.6.0.0-deps.tar.gz) = 937753829
+SHA256 (broadinstitute-gatk-4.6.0.0_GH0.tar.gz) = 6805e831d318964787adfeddbbe8b5ce9a916104913b7e1f73d1e08095638c64
+SIZE (broadinstitute-gatk-4.6.0.0_GH0.tar.gz) = 4322587766
--- a/biology/py-biom-format/Makefile
+++ b/biology/py-biom-format/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	biom-format
-PORTVERSION=	2.1.10
-PORTREVISION=	1
+PORTVERSION=	2.1.16
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -14,14 +13,12 @@ LICENSE=	BSD3CLAUSE
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
 		${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}scipy>=1:science/py-scipy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}scipy>=1.3.1:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.20.0:math/py-pandas@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}h5py>=2.2.0:science/py-h5py@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}h5py>=2.2.0:science/py-h5py@${PY_FLAVOR}

 USES=		python
-USE_PYTHON=	autoplist concurrent cython distutils
+USE_PYTHON=	autoplist concurrent cython distutils pytest

 .include <bsd.port.pre.mk>

--- a/biology/py-biom-format/distinfo
+++ b/biology/py-biom-format/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1610333968
-SHA256 (biom-format-2.1.10.tar.gz) = f5a277a8144f0b114606852c42f657b9cfde44b3cefa0b2638ab1c1d5e1d0488
-SIZE (biom-format-2.1.10.tar.gz) = 11671341
+TIMESTAMP = 1718787972
+SHA256 (biom-format-2.1.16.tar.gz) = 47f88d57a94ecaa4d06f3578ca394e78db6d12e46ab0886634743181e67dcfc9
+SIZE (biom-format-2.1.16.tar.gz) = 11720476
--- a/biology/py-mrcfile/Makefile
+++ b/biology/py-mrcfile/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	mrcfile
-DISTVERSION=	1.5.0
+DISTVERSION=	1.5.1
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/biology/py-mrcfile/distinfo
+++ b/biology/py-mrcfile/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1705736770
-SHA256 (mrcfile-1.5.0.tar.gz) = 9e8196b8a33aa5b5237b43336cb9d08b6058b8127ea668d63b84d58bca795ec1
-SIZE (mrcfile-1.5.0.tar.gz) = 55843
+TIMESTAMP = 1720763104
+SHA256 (mrcfile-1.5.1.tar.gz) = 403c4bb0ac842410ce5ea501f4fddc91ea37c12ef869d508d3ac571868d82ac2
+SIZE (mrcfile-1.5.1.tar.gz) = 56558
--- a/biology/py-resdk/Makefile
+++ b/biology/py-resdk/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	resdk
-DISTVERSION=	21.1.0
+DISTVERSION=	21.2.0
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -15,17 +15,18 @@ BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.4.0:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	\
-		${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}aiohttp>=3.9.3:www/py-aiohttp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}botocore-stubs>0:www/py-botocore-stubs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet<=5.2.0,1:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openpyxl>0:textproc/py-openpyxl@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pandas>=1.0.0:math/py-pandas@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytz>=2018.4:devel/py-pytz@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.6.0:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}slumber>=0.7.1:www/py-slumber@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}tzlocal>=1.5.1:devel/py-tzlocal@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tzlocal>0:devel/py-tzlocal@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>0:textproc/py-xlrd@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mypy-boto3-s3>0:devel/py-mypy-boto3-s3@${PY_FLAVOR}
--- a/biology/py-resdk/distinfo
+++ b/biology/py-resdk/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1712349634
-SHA256 (resdk-21.1.0.tar.gz) = 96d5bf0721eee006360f0b1116310a509028160aded47a82e1ac1992f5fe6105
-SIZE (resdk-21.1.0.tar.gz) = 258889
+TIMESTAMP = 1720766250
+SHA256 (resdk-21.2.0.tar.gz) = bcf09bc9e2d3c0d306a478ee02e68241f41636193b41c088a6ff77ab5c766d3d
+SIZE (resdk-21.2.0.tar.gz) = 258582
--- a/biology/py-scikit-bio/Makefile
+++ b/biology/py-scikit-bio/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	scikit-bio
-DISTVERSION=	0.6.1
+DISTVERSION=	0.6.2
 CATEGORIES=	biology education python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -27,12 +27,14 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}biom-format>0:biology/py-biom-format@${PY_FL
 		${PYTHON_PKGNAMEPREFIX}pandas>=1.5.0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.20.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-learn>=0.19.1:science/py-scikit-learn@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}scipy>=1.9.0:science/py-scipy@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}scipy>=1.9.0:science/py-scipy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}statsmodels>=0.14.0:math/py-statsmodels@${PY_FLAVOR}

 USES=		python
 USE_PYTHON=	pep517 cython autoplist pytest # tests fail to run, see https://github.com/biocore/scikit-bio/issues/1846

 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
+TEST_WRKSRC=	${WRKSRC}/skbio/tests

 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}ddtrace # lib/python3.8/site-packages/benchmarks/__init__.py

--- a/biology/py-scikit-bio/distinfo
+++ b/biology/py-scikit-bio/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1718789862
-SHA256 (scikit-bio-0.6.1.tar.gz) = 2f62d90fb44990d90593f2312398989c816081868c4cc6aedba170893f397b8c
-SIZE (scikit-bio-0.6.1.tar.gz) = 2683273
+TIMESTAMP = 1720838021
+SHA256 (scikit-bio-0.6.2.tar.gz) = af217ad12243cdaeef74a8f3bebe0d04aefda2a22d963d634201a36318b1a404
+SIZE (scikit-bio-0.6.2.tar.gz) = 2699488
--- a/cad/gdstk/Makefile
+++ b/cad/gdstk/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	gdstk
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.9.52
+DISTVERSION=	0.9.53
 CATEGORIES=	cad

 MAINTAINER=	yuri@FreeBSD.org
--- a/cad/gdstk/distinfo
+++ b/cad/gdstk/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1716736841
-SHA256 (heitzmann-gdstk-v0.9.52_GH0.tar.gz) = 1369ab198b946018e3fdae1267296fc47c047b4fc9ffd059a59955406c1b1394
-SIZE (heitzmann-gdstk-v0.9.52_GH0.tar.gz) = 361499
+TIMESTAMP = 1720985146
+SHA256 (heitzmann-gdstk-v0.9.53_GH0.tar.gz) = 8fdf85e9e90838720ff1d3555e5b880868cbc18a919261f317772b0327457be0
+SIZE (heitzmann-gdstk-v0.9.53_GH0.tar.gz) = 365722
--- a/cad/gdstk/pkg-plist
+++ b/cad/gdstk/pkg-plist
@ -15,6 +15,7 @@ include/gdstk/oasis.hpp
 include/gdstk/pathcommon.hpp
 include/gdstk/polygon.hpp
 include/gdstk/property.hpp
+include/gdstk/raithdata.hpp
 include/gdstk/rawcell.hpp
 include/gdstk/reference.hpp
 include/gdstk/repetition.hpp
--- a/cad/ifcopenshell/Makefile
+++ b/cad/ifcopenshell/Makefile
@ -3,6 +3,9 @@ PORTVERSION=	0.7.0.231127
 DISTVERSIONPREFIX=	v
 CATEGORIES=	cad

+PATCH_SITES=	https://github.com/IfcOpenShell/IfcOpenShell/commit/
+PATCHFILES=	589b98053e62ee14b6817e7d2b9f5b6b527310b7.patch:-p1
+
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open source IFC library and geometry engine
 WWW=		https://ifcopenshell.org/
--- a/cad/ifcopenshell/distinfo
+++ b/cad/ifcopenshell/distinfo
@ -1,5 +1,7 @@
-TIMESTAMP = 1701077111
+TIMESTAMP = 1720893264
 SHA256 (IfcOpenShell-IfcOpenShell-v0.7.0.231127_GH0.tar.gz) = 85bc511f307df125caca320c340809e3aae372dfd7edcc5b2a4fd7d3020ae81e
 SIZE (IfcOpenShell-IfcOpenShell-v0.7.0.231127_GH0.tar.gz) = 42587594
 SHA256 (IfcOpenShell-svgfill-4d2aa7a_GH0.tar.gz) = a3b7c2071de17aff1e104d1098dfc9fc2aa9de1eee458ff707295dd728e26ab0
 SIZE (IfcOpenShell-svgfill-4d2aa7a_GH0.tar.gz) = 19877
+SHA256 (589b98053e62ee14b6817e7d2b9f5b6b527310b7.patch) = 8b5250837f93e8831a26a84bb42b16b62eea5f792008462011a688c7932f41bd
+SIZE (589b98053e62ee14b6817e7d2b9f5b6b527310b7.patch) = 1160
--- a/cad/nvc/Makefile
+++ b/cad/nvc/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	nvc
 DISTVERSIONPREFIX=	r
-DISTVERSION=	1.12.2
+DISTVERSION=	1.13.0
 CATEGORIES=	cad

 MAINTAINER=	yuri@FreeBSD.org
--- a/cad/nvc/distinfo
+++ b/cad/nvc/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1715921099
-SHA256 (nickg-nvc-r1.12.2_GH0.tar.gz) = cf5fad4ebd9f29279fad472a08672da4f3270a6e97f45401e5bd0faa681b5dab
-SIZE (nickg-nvc-r1.12.2_GH0.tar.gz) = 1932149
+TIMESTAMP = 1721024997
+SHA256 (nickg-nvc-r1.13.0_GH0.tar.gz) = 13ef550e3ca9b47022b1312494f8ec731dbe61fe51ef8e10124afbbe930588e0
+SIZE (nickg-nvc-r1.13.0_GH0.tar.gz) = 1961847
--- a/cad/nvc/pkg-plist
+++ b/cad/nvc/pkg-plist
@ -100,6 +100,7 @@ lib/nvc/nvc.08/NVC.POLYFILL
 lib/nvc/nvc.08/NVC.PSL_SUPPORT
 lib/nvc/nvc.08/NVC.PSL_SUPPORT-body
 lib/nvc/nvc.08/NVC.SIM_PKG
+lib/nvc/nvc.08/NVC.SIM_PKG-body
 lib/nvc/nvc.08/NVC.TEXT_UTIL
 lib/nvc/nvc.08/NVC.TEXT_UTIL-body
 lib/nvc/nvc.08/NVC.VERILOG
@ -112,6 +113,7 @@ lib/nvc/nvc.19/NVC.POLYFILL
 lib/nvc/nvc.19/NVC.PSL_SUPPORT
 lib/nvc/nvc.19/NVC.PSL_SUPPORT-body
 lib/nvc/nvc.19/NVC.SIM_PKG
+lib/nvc/nvc.19/NVC.SIM_PKG-body
 lib/nvc/nvc.19/NVC.TEXT_UTIL
 lib/nvc/nvc.19/NVC.TEXT_UTIL-body
 lib/nvc/nvc.19/NVC.VERILOG
@ -123,6 +125,7 @@ lib/nvc/nvc/NVC.POLYFILL-body
 lib/nvc/nvc/NVC.PSL_SUPPORT
 lib/nvc/nvc/NVC.PSL_SUPPORT-body
 lib/nvc/nvc/NVC.SIM_PKG
+lib/nvc/nvc/NVC.SIM_PKG-body
 lib/nvc/nvc/NVC.TEXT_UTIL
 lib/nvc/nvc/NVC.TEXT_UTIL-body
 lib/nvc/nvc/NVC.VERILOG
@ -135,6 +138,7 @@ lib/nvc/preload93.so
 lib/nvc/std.08/STD.ENV
 lib/nvc/std.08/STD.ENV-body
 lib/nvc/std.08/STD.STANDARD
+lib/nvc/std.08/STD.STANDARD-body
 lib/nvc/std.08/STD.TEXTIO
 lib/nvc/std.08/STD.TEXTIO-body
 lib/nvc/std.08/_NVC_LIB
@ -144,11 +148,13 @@ lib/nvc/std.19/STD.ENV-body
 lib/nvc/std.19/STD.REFLECTION
 lib/nvc/std.19/STD.REFLECTION-body
 lib/nvc/std.19/STD.STANDARD
+lib/nvc/std.19/STD.STANDARD-body
 lib/nvc/std.19/STD.TEXTIO
 lib/nvc/std.19/STD.TEXTIO-body
 lib/nvc/std.19/_NVC_LIB
 lib/nvc/std.19/_index
 lib/nvc/std/STD.STANDARD
+lib/nvc/std/STD.STANDARD-body
 lib/nvc/std/STD.TEXTIO
 lib/nvc/std/STD.TEXTIO-body
 lib/nvc/std/_NVC_LIB
@ -165,5 +171,5 @@ libexec/nvc/install-uvvm.sh
 libexec/nvc/install-vivado.sh
 libexec/nvc/install-vunit.sh
 libexec/nvc/install-xpm_vhdl.sh
-share/man/man1/nvc.1.gz
 share/bash-completion/completions/nvc.bash
+share/man/man1/nvc.1.gz
--- a/cad/py-gdstk/Makefile
+++ b/cad/py-gdstk/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	gdstk
-DISTVERSION=	0.9.52
+DISTVERSION=	0.9.53
 CATEGORIES=	cad
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -21,8 +21,9 @@ LIB_DEPENDS=	libqhull_r.so:math/qhull
 RUN_DEPENDS=	${PYNUMPY}

 USES=		compiler:c++11-lang python
-USE_PYTHON=	pep517 autoplist pytest # tests fail to run, see https://github.com/heitzmann/gdstk/issues/244
+USE_PYTHON=	pep517 autoplist pytest # tests crash, see https://github.com/heitzmann/gdstk/issues/263

 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
+TEST_WRKSRC=	${WRKSRC}/tests

 .include <bsd.port.mk>
--- a/cad/py-gdstk/distinfo
+++ b/cad/py-gdstk/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1716737479
-SHA256 (gdstk-0.9.52.tar.gz) = 42267292d272f4a4c8229091dc83a496d0a15f969cf36693b5597d3fe8efb92f
-SIZE (gdstk-0.9.52.tar.gz) = 311291
+TIMESTAMP = 1720985236
+SHA256 (gdstk-0.9.53.tar.gz) = 73c87e2e3d43911b09f2a10c90359426bd15dcdeb799606bbc1e93e49acacd90
+SIZE (gdstk-0.9.53.tar.gz) = 315746
--- a/cad/py-gdstk/files/patch-pyproject.toml
+++ b/cad/py-gdstk/files/patch-pyproject.toml
@ -1,9 +1,20 @@
--- pyproject.toml.orig	2023-08-28 16:28:32 UTC
+--- pyproject.toml.orig	2024-07-04 23:14:49 UTC
 +++ pyproject.toml
-@@ -38,5 +38,5 @@ requires = [
-     "setuptools>=42",
-     "wheel",
+@@ -1,7 +1,7 @@ requires = [
+ [build-system]
+ requires = [
+     "scikit_build_core",
+-    "numpy >= 2.0"
+    "numpy"
+ ]
+ build-backend = "scikit_build_core.build"
+ 
+@@ -29,7 +29,7 @@ dependencies = [
+ license = {file = "LICENSE"}
+ dependencies = [
     "numpy; platform_system=='Darwin'",
 -    "oldest-supported-numpy; platform_system!='Darwin'",
 +    "numpy; platform_system!='Darwin'",
+     "typing_extensions; python_version < '3.11'"
 ]
+ requires-python = ">=3.9"
--- a/cad/symbiyosys/Makefile
+++ b/cad/symbiyosys/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	symbiyosys
 DISTVERSIONPREFIX=	yosys-
-DISTVERSION=	0.42
+DISTVERSION=	0.43
 CATEGORIES=	cad
 PKGNAMEPREFIX=

--- a/cad/symbiyosys/distinfo
+++ b/cad/symbiyosys/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1717829982
-SHA256 (YosysHQ-sby-yosys-0.42_GH0.tar.gz) = 8d616f23927967a051660ca9049611cada5d8529adcb5b2f35399b6fd18d4110
-SIZE (YosysHQ-sby-yosys-0.42_GH0.tar.gz) = 199755
+TIMESTAMP = 1720600264
+SHA256 (YosysHQ-sby-yosys-0.43_GH0.tar.gz) = 14bc0eb13cddbbe3aa3f92753b8c90beb8fb4f4f9b98f70d0f394754618c8eb9
+SIZE (YosysHQ-sby-yosys-0.43_GH0.tar.gz) = 200073
--- a/cad/yosys/Makefile
+++ b/cad/yosys/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	yosys
 DISTVERSIONPREFIX=	yosys-
-DISTVERSION=	0.42
+DISTVERSION=	0.43
 CATEGORIES=	cad

 MAINTAINER=	yuri@FreeBSD.org
--- a/cad/yosys/distinfo
+++ b/cad/yosys/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1717824447
-SHA256 (YosysHQ-yosys-yosys-0.42_GH0.tar.gz) = 359714de8378665edebfacdf996b5f4f2fa55bf33071fc92ad6e08b5c4bdb648
-SIZE (YosysHQ-yosys-yosys-0.42_GH0.tar.gz) = 2807211
+TIMESTAMP = 1720600290
+SHA256 (YosysHQ-yosys-yosys-0.43_GH0.tar.gz) = e341d7c3712f58787554c28c12c9f4cb5e102f9ff154f5a5e49238c1adfb309f
+SIZE (YosysHQ-yosys-yosys-0.43_GH0.tar.gz) = 2808745
--- a/chinese/Makefile
+++ b/chinese/Makefile
@ -126,7 +126,6 @@
    SUBDIR += sourcehanserif-sc-otf
    SUBDIR += sourcehanserif-tc-otf
    SUBDIR += taipeisanstc
-    SUBDIR += tin
    SUBDIR += tintin++
    SUBDIR += ttf2pt1
    SUBDIR += ttfm
--- a/chinese/fcitx-rime/Makefile
+++ b/chinese/fcitx-rime/Makefile
@ -14,6 +14,8 @@ WWW=		https://fcitx-im.org/wiki/Fcitx

 LICENSE=	GPLv2

+BROKEN=		does not compile against currect chinese/librime
+
 BUILD_DEPENDS=	bash:shells/bash \
 		${_SCHEMA_DEPENDS}
 LIB_DEPENDS=	libfcitx-config.so:chinese/fcitx \
--- a/chinese/fcitx5-mcbopomofo/Makefile
+++ b/chinese/fcitx5-mcbopomofo/Makefile
@ -10,7 +10,8 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt

 LIB_DEPENDS=	libFcitx5Core.so:textproc/fcitx5 \
-		libfmt.so:devel/libfmt
+		libfmt.so:devel/libfmt \
+		libicuuc.so:devel/icu

 USES=		cmake compiler:c++17-lang gettext-tools kde:5 pkgconfig

--- a/chinese/libreoffice-zh_CN/distinfo
+++ b/chinese/libreoffice-zh_CN/distinfo
@ -1,5 +1,5 @@
-TIMESTAMP = 1718374710
-SHA256 (libreoffice/i18n/LibreOffice_24.2.4_Linux_x86-64_deb_langpack_zh-CN.tar.gz) = e4d0b33c01fd400bfe8fb97158a07aca0928611911d54bf6fa41002b9c96dbee
-SIZE (libreoffice/i18n/LibreOffice_24.2.4_Linux_x86-64_deb_langpack_zh-CN.tar.gz) = 809106
-SHA256 (libreoffice/i18n/LibreOffice_24.2.4_Linux_x86-64_deb_helppack_zh-CN.tar.gz) = 097401b98f3e61b13bce82360133826e532ae758dcea42eb369c3190b615ce74
-SIZE (libreoffice/i18n/LibreOffice_24.2.4_Linux_x86-64_deb_helppack_zh-CN.tar.gz) = 2596365
+TIMESTAMP = 1720797669
+SHA256 (libreoffice/i18n/LibreOffice_24.2.5_Linux_x86-64_deb_langpack_zh-CN.tar.gz) = 9b10990aced6edd87103c66588b941d55d3c485360566cfd21eae3c6709c58fd
+SIZE (libreoffice/i18n/LibreOffice_24.2.5_Linux_x86-64_deb_langpack_zh-CN.tar.gz) = 810920
+SHA256 (libreoffice/i18n/LibreOffice_24.2.5_Linux_x86-64_deb_helppack_zh-CN.tar.gz) = df2dc07afcd3f608adb82aa63e2894c42525116bb85473ed9b89bb108bed5a26
+SIZE (libreoffice/i18n/LibreOffice_24.2.5_Linux_x86-64_deb_helppack_zh-CN.tar.gz) = 2596449
--- a/chinese/libreoffice-zh_TW/distinfo
+++ b/chinese/libreoffice-zh_TW/distinfo
@ -1,5 +1,5 @@
-TIMESTAMP = 1718374712
-SHA256 (libreoffice/i18n/LibreOffice_24.2.4_Linux_x86-64_deb_langpack_zh-TW.tar.gz) = 793c3c24f7e5dfa566db4aeb612ac69023a1557d0128abf4c30acb7fe67d0903
-SIZE (libreoffice/i18n/LibreOffice_24.2.4_Linux_x86-64_deb_langpack_zh-TW.tar.gz) = 821840
-SHA256 (libreoffice/i18n/LibreOffice_24.2.4_Linux_x86-64_deb_helppack_zh-TW.tar.gz) = 427335d5518e731b0bbd5e85ac2314336c909ad02a24659a0c86b64d49549ce4
-SIZE (libreoffice/i18n/LibreOffice_24.2.4_Linux_x86-64_deb_helppack_zh-TW.tar.gz) = 2627792
+TIMESTAMP = 1720797671
+SHA256 (libreoffice/i18n/LibreOffice_24.2.5_Linux_x86-64_deb_langpack_zh-TW.tar.gz) = 02652f810ff5163a569b99ca5e9dba506ef7df1251cc949a307f3ebbc657f8df
+SIZE (libreoffice/i18n/LibreOffice_24.2.5_Linux_x86-64_deb_langpack_zh-TW.tar.gz) = 821682
+SHA256 (libreoffice/i18n/LibreOffice_24.2.5_Linux_x86-64_deb_helppack_zh-TW.tar.gz) = 0dc1462fd9dbe9e65bd10bbec22d7d63b65715152bf53d699fa549c839a474e7
+SIZE (libreoffice/i18n/LibreOffice_24.2.5_Linux_x86-64_deb_helppack_zh-TW.tar.gz) = 2627705
--- a/chinese/tin/Makefile
+++ b/chinese/tin/Makefile
@ -1,18 +0,0 @@
-CATEGORIES=	chinese
-
-MAINTAINER=	ports@FreeBSD.org
-
-CONFLICTS_INSTALL=	tin # bin/metamutt
-
-EXTRA_PATCHES=	${.CURDIR}/files/patch-attrib.c \
-		${.CURDIR}/files/patch-cook.c \
-		${.CURDIR}/files/patch-mail.c \
-		${.CURDIR}/files/patch-init.c
-
-MASTERDIR=	${.CURDIR}/../../news/tin
-
-post-patch: post-patch-zh
-post-patch-zh:
-	${REINPLACE_CMD} -e 's,iso-8859-1,Big5,g' ${WRKSRC}/doc/tin.defaults
-
-.include "${MASTERDIR}/Makefile"
--- a/chinese/tin/files/patch-attrib.c
+++ b/chinese/tin/files/patch-attrib.c
@ -1,12 +0,0 @@
--- src/attrib.c.orig	2015-11-22 01:14:29.000000000 +0100
-+++ src/attrib.c	2016-02-21 20:49:48.322143000 +0100
-@@ -593,6 +593,9 @@
- 		add_scope("*");
- 		snprintf(buf, sizeof(buf), "%s", "~/.tin/headers");
- 		set_attrib(OPT_ATTRIB_X_HEADERS, "*", "", buf);
-+		num = 25;
-+		set_attrib(OPT_ATTRIB_MM_NETWORK_CHARSET, "*", "", (char *) &num);
-+		set_attrib(OPT_ATTRIB_UNDECLARED_CHARSET, "*", "", "Big5");
- 
- 		add_scope("*sources*");
- 		num = POST_PROC_SHAR;
--- a/chinese/tin/files/patch-cook.c
+++ b/chinese/tin/files/patch-cook.c
@ -1,15 +0,0 @@
--- src/cook.c.orig	2015-12-23 19:42:27.000000000 +0100
-+++ src/cook.c	2016-02-21 20:50:33.672278000 +0100
-@@ -470,7 +470,12 @@
- 
- 		/* convert network to local charset, tex2iso, iso2asc etc. */
- 		ncharset = get_param(part->params, "charset");
-+#ifndef CHARSET_CONVERSION
- 		process_charsets(&line, &max_line_len, ncharset ? ncharset : "US-ASCII", tinrc.mm_local_charset, curr_group->attribute->tex2iso_conv && art->tex2iso);
-+#else
-+		/* use undeclared charset */
-+		process_charsets(&line, &max_line_len, get_param(part->params, "charset") ? get_param(part->params, "charset") : curr_group->attribute->undeclared_charset, tinrc.mm_local_charset, curr_group->attribute->tex2iso_conv && art->tex2iso);
-+#endif
- 
- #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE)
- 		if (IS_LOCAL_CHARSET("UTF-8"))
--- a/chinese/tin/files/patch-init.c
+++ b/chinese/tin/files/patch-init.c
@ -1,16 +0,0 @@
--- src/init.c.orig	2014-07-16 00:47:37.352661040 +0800
-+++ src/init.c	2014-07-16 00:48:08.424652944 +0800
-@@ -361,11 +361,11 @@
- #endif /* USE_INVERSE_HACK */
- 	TRUE,		/* keep_dead_articles */
- 	POSTED_FILE,	/* posted_articles_file */
-	FALSE,		/* mail_8bit_header */
-+	TRUE,		/* mail_8bit_header */
- 	FALSE,		/* mark_ignore_tags */
- 	TRUE,		/* mark_saved_read */
- 	TRUE,		/* pos_first_unread */
-	FALSE,		/* post_8bit_header */
-+	TRUE,		/* post_8bit_header */
- 	TRUE,		/* post_process_view */
- #ifndef DISABLE_PRINTING
- 	FALSE,		/* print_header */
--- a/chinese/tin/files/patch-mail.c
+++ b/chinese/tin/files/patch-mail.c
@ -1,14 +0,0 @@
--- src/mail.c.orig	2014-07-16 00:48:14.918652518 +0800
-+++ src/mail.c	2014-07-16 00:48:50.462660253 +0800
-@@ -514,7 +514,11 @@
- 			/*
- 			 * Protect against invalid character sequences.
- 			 */
-+#ifndef CHARSET_CONVERSION
- 			process_charsets(&r, &r_len, "UTF-8", tinrc.mm_local_charset, FALSE);
-+#else
-+			process_charsets(&r, &r_len, (CURR_GROUP.attribute->undeclared_charset) ? (CURR_GROUP.attribute->undeclared_charset) : "UTF-8", tinrc.mm_local_charset, FALSE);
-+#endif
- 			group->description = convert_to_printable(r, FALSE);
- 		}
- 
--- a/comms/Makefile
+++ b/comms/Makefile
@ -75,6 +75,7 @@
    SUBDIR += libfap
    SUBDIR += libfec
    SUBDIR += libimobiledevice
+    SUBDIR += libimobiledevice-glue
    SUBDIR += libirman
    SUBDIR += libmodbus
    SUBDIR += librs232
--- a/comms/flamp/Makefile
+++ b/comms/flamp/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	flamp
-DISTVERSION=	2.2.12
+DISTVERSION=	2.2.13
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/fldigi/flamp/

--- a/comms/flamp/distinfo
+++ b/comms/flamp/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1713282305
-SHA256 (flamp-2.2.12.tar.gz) = 9097f70688e9c9af38066f7118b1767f8b56ed38588609624d41d9c78c2e402d
-SIZE (flamp-2.2.12.tar.gz) = 533525
+TIMESTAMP = 1720600313
+SHA256 (flamp-2.2.13.tar.gz) = 2dafcf63176b35e5d0a236c141c42f8cd9c5d690f7691e7d6eed6f2b5d590da2
+SIZE (flamp-2.2.13.tar.gz) = 533808
--- a/comms/libimobiledevice-glue/Makefile
+++ b/comms/libimobiledevice-glue/Makefile
@ -0,0 +1,29 @@
+PORTNAME=	libimobiledevice-glue
+PORTVERSION=	1.3.0
+CATEGORIES=	comms
+MASTER_SITES=	https://github.com/libimobiledevice/${PORTNAME}/releases/download/${PORTVERSION}/
+
+MAINTAINER=	jhale@FreeBSD.org
+COMMENT=	Common code used by the libimobiledevice project
+WWW=		https://www.libimobiledevice.org
+
+LICENSE=	LGPL21+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libplist-2.0.so:devel/libplist
+
+USES=		libtool pathfix pkgconfig tar:bzip2
+USE_LDCONFIG=	yes
+
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+
+PORTDOCS=	NEWS README.md
+
+OPTIONS_DEFINE=	DOCS
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
--- a/comms/libimobiledevice-glue/distinfo
+++ b/comms/libimobiledevice-glue/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1720417820
+SHA256 (libimobiledevice-glue-1.3.0.tar.bz2) = 96ec4eb2b1e217392149eafb2b5c3cd3e7110200f0e2bb5003c37d3ead7244ef
+SIZE (libimobiledevice-glue-1.3.0.tar.bz2) = 340138
--- a/comms/libimobiledevice-glue/pkg-descr
+++ b/comms/libimobiledevice-glue/pkg-descr
@ -0,0 +1,2 @@
+Library with common code used by the libraries and tools around the
+libimobiledevice project.
--- a/comms/libimobiledevice-glue/pkg-plist
+++ b/comms/libimobiledevice-glue/pkg-plist
@ -0,0 +1,16 @@
+include/libimobiledevice-glue/cbuf.h
+include/libimobiledevice-glue/collection.h
+include/libimobiledevice-glue/glue.h
+include/libimobiledevice-glue/nskeyedarchive.h
+include/libimobiledevice-glue/opack.h
+include/libimobiledevice-glue/sha.h
+include/libimobiledevice-glue/socket.h
+include/libimobiledevice-glue/termcolors.h
+include/libimobiledevice-glue/thread.h
+include/libimobiledevice-glue/tlv.h
+include/libimobiledevice-glue/utils.h
+lib/libimobiledevice-glue-1.0.a
+lib/libimobiledevice-glue-1.0.so
+lib/libimobiledevice-glue-1.0.so.0
+lib/libimobiledevice-glue-1.0.so.0.3.0
+libdata/pkgconfig/libimobiledevice-glue-1.0.pc
--- a/comms/libimobiledevice/Makefile
+++ b/comms/libimobiledevice/Makefile
@ -1,8 +1,9 @@
 PORTNAME=	libimobiledevice
-PORTVERSION=	1.3.0
-PORTREVISION?=	1
+DISTVERSION=	1.3.0-241
+PORTREVISION?=	0
+DISTVERSIONSUFFIX=	-g2a0a6d5
 CATEGORIES?=	comms
-MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/
+#MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/

 MAINTAINER?=	jhale@FreeBSD.org
 COMMENT?=	Library to communicate with Apple iOS devices
@ -11,44 +12,42 @@ WWW=		https://www.libimobiledevice.org
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER

-SLAVE_PORT?=	no
+USES+=		autoreconf cpe libtool localbase:ldflags pathfix pkgconfig ssl
+USE_GITHUB=	yes

-USES+=		cpe libtool localbase:ldflags pathfix pkgconfig ssl tar:bzip2
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS+=openssl_CFLAGS="-I${OPENSSLINC}" \
 		openssl_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
 INSTALL_TARGET=	install-strip

+CFLAGS+=	-Wno-error=int-conversion
+
+SLAVE_PORT?=	no
+
 .if ${SLAVE_PORT} == no

 LIB_DEPENDS=	libplist-2.0.so:devel/libplist \
-		libusbmuxd-2.0.so:comms/libusbmuxd
+		libimobiledevice-glue-1.0.so:comms/libimobiledevice-glue \
+		libusbmuxd-2.0.so:comms/libusbmuxd \
+		libtatsu.so:security/libtatsu

-USES+=		gnome
-USE_GNOME=	glib20
-CONFIGURE_ARGS+=--without-cython
-USE_CSTD=	gnu89
 USE_LDCONFIG=	yes

+CONFIGURE_ARGS+=--without-cython
+
 PORTDOCS=	AUTHORS NEWS README.md

 OPTIONS_DEFINE=	DOCS

-post-patch:
-	@${REINPLACE_CMD} -e 's, *@ssl_requires@,,' \
-		${WRKSRC}/src/${PORTNAME}*.pc.in
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}

 .endif # ${SLAVE_PORT} == no

-.include <bsd.port.pre.mk>
+post-patch:
+	@${REINPLACE_CMD} -e 's| *@ssl_requires@||' \
+		${WRKSRC}/src/${PORTNAME}*.pc.in
+	@echo "${DISTVERSIONFULL}" > ${WRKSRC}/.tarball-version

-.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
-CFLAGS+=	-Wno-error=int-conversion
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/comms/libimobiledevice/distinfo
+++ b/comms/libimobiledevice/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1611089282
-SHA256 (libimobiledevice-1.3.0.tar.bz2) = 53f2640c6365cd9f302a6248f531822dc94a6cced3f17128d4479a77bd75b0f6
-SIZE (libimobiledevice-1.3.0.tar.bz2) = 733949
+TIMESTAMP = 1720418798
+SHA256 (libimobiledevice-libimobiledevice-1.3.0-241-g2a0a6d5_GH0.tar.gz) = 75e7c7b778b0b377f961b2bc642f6b30fc2e7f73221153c6a94de7e2bffc4dcf
+SIZE (libimobiledevice-libimobiledevice-1.3.0-241-g2a0a6d5_GH0.tar.gz) = 411083
--- a/comms/libimobiledevice/files/patch-configure
+++ b/comms/libimobiledevice/files/patch-configure
@ -1,13 +0,0 @@
-Remove bash-ism from configure script
-
--- configure.orig	2021-01-21 13:07:51 UTC
-+++ configure
-@@ -18422,7 +18422,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
- 
-   if test "X$flag_ok" = Xyes ; then
- 
-                  CYTHON_CFLAGS+=" -Wno-cast-function-type"
-+                  CYTHON_CFLAGS="$CYTHON_CFLAGS -Wno-cast-function-type"
- 
- 
- 
--- a/comms/libimobiledevice/files/patch-configure.ac
+++ b/comms/libimobiledevice/files/patch-configure.ac
@ -0,0 +1,13 @@
+Remove bash-ism from configure script
+
+--- configure.ac.orig	2024-07-01 16:27:27 UTC
+++ configure.ac
+@@ -139,7 +139,7 @@ if test "$build_cython" = "true"; then
+               AM_PATH_PYTHON([3.0], [
+                 CYTHON_PYTHON
+                 AS_COMPILER_FLAG([-Wno-cast-function-type -Werror], [
+-                  CYTHON_CFLAGS+=" -Wno-cast-function-type"
+                  CYTHON_CFLAGS="$CYTHON_CFLAGS -Wno-cast-function-type"
+                   AC_SUBST([CYTHON_CFLAGS])
+                 ], [])
+               ])
--- a/comms/libimobiledevice/pkg-plist
+++ b/comms/libimobiledevice/pkg-plist
@ -1,10 +1,13 @@
+bin/afcclient
 bin/idevice_id
 bin/idevicebackup
 bin/idevicebackup2
+bin/idevicebtlogger
 bin/idevicecrashreport
 bin/idevicedate
 bin/idevicedebug
 bin/idevicedebugserverproxy
+bin/idevicedevmodectl
 bin/idevicediagnostics
 bin/ideviceenterrecovery
 bin/ideviceimagemounter
@ -36,6 +39,7 @@ include/libimobiledevice/notification_proxy.h
 include/libimobiledevice/preboard.h
 include/libimobiledevice/property_list_service.h
 include/libimobiledevice/restore.h
+include/libimobiledevice/reverse_proxy.h
 include/libimobiledevice/sbservices.h
 include/libimobiledevice/screenshotr.h
 include/libimobiledevice/service.h
@ -46,13 +50,16 @@ lib/libimobiledevice-1.0.so
 lib/libimobiledevice-1.0.so.6
 lib/libimobiledevice-1.0.so.6.0.0
 libdata/pkgconfig/libimobiledevice-1.0.pc
+share/man/man1/afcclient.1.gz
 share/man/man1/idevice_id.1.gz
 share/man/man1/idevicebackup.1.gz
 share/man/man1/idevicebackup2.1.gz
+share/man/man1/idevicebtlogger.1.gz
 share/man/man1/idevicecrashreport.1.gz
 share/man/man1/idevicedate.1.gz
 share/man/man1/idevicedebug.1.gz
 share/man/man1/idevicedebugserverproxy.1.gz
+share/man/man1/idevicedevmodectl.1.gz
 share/man/man1/idevicediagnostics.1.gz
 share/man/man1/ideviceenterrecovery.1.gz
 share/man/man1/ideviceimagemounter.1.gz
--- a/comms/libusbmuxd/Makefile
+++ b/comms/libusbmuxd/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	libusbmuxd
-PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTVERSION=	2.1.0
 CATEGORIES=	comms
 MASTER_SITES=	https://github.com/libimobiledevice/${PORTNAME}/releases/download/${PORTVERSION}/

@ -11,17 +10,16 @@ WWW=		https://www.libimobiledevice.org
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING

-LIB_DEPENDS=	libplist-2.0.so:devel/libplist
-
-CONFLICTS_INSTALL=usbmuxd-1.0.[6-8]
+LIB_DEPENDS=	libimobiledevice-glue-1.0.so:comms/libimobiledevice-glue \
+		libplist-2.0.so:devel/libplist

 USES=		cpe libtool pathfix pkgconfig tar:bzip2
 CPE_VENDOR=	libimobiledevice
-GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes

+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+
 PORTDOCS=	AUTHORS README.md

 OPTIONS_DEFINE=	DOCS INOTIFY
@ -36,6 +34,6 @@ INOTIFY_LDFLAGS=	-L${LOCALBASE}/lib -linotify

 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}

 .include <bsd.port.mk>
--- a/comms/libusbmuxd/distinfo
+++ b/comms/libusbmuxd/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1611088906
-SHA256 (libusbmuxd-2.0.2.tar.bz2) = cc6a808553da4efa9fa5638be256d5ae020498795d9d260d280b87074e799b20
-SIZE (libusbmuxd-2.0.2.tar.bz2) = 340634
+TIMESTAMP = 1713935966
+SHA256 (libusbmuxd-2.1.0.tar.bz2) = c35bf68f8e248434957bd5b234c389b02206a06ecd9303a7fb931ed7a5636b16
+SIZE (libusbmuxd-2.1.0.tar.bz2) = 325055
--- a/comms/libusbmuxd/pkg-plist
+++ b/comms/libusbmuxd/pkg-plist
@ -4,8 +4,8 @@ include/usbmuxd-proto.h
 include/usbmuxd.h
 lib/libusbmuxd-2.0.a
 lib/libusbmuxd-2.0.so
-lib/libusbmuxd-2.0.so.6
-lib/libusbmuxd-2.0.so.6.0.0
+lib/libusbmuxd-2.0.so.7
+lib/libusbmuxd-2.0.so.7.0.0
 libdata/pkgconfig/libusbmuxd-2.0.pc
 share/man/man1/inetcat.1.gz
 share/man/man1/iproxy.1.gz
--- a/comms/py-libimobiledevice/Makefile
+++ b/comms/py-libimobiledevice/Makefile
@ -7,30 +7,35 @@ COMMENT=	Python bindings for libimobiledevice

 LIB_DEPENDS=	libimobiledevice-1.0.so:${MASTER_PORT} \
 		libplist-2.0.so:devel/libplist
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libplist>=2.2.0:devel/py-libplist@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libplist>=2.2.0:devel/py-libplist@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cython3>=3.0.0:lang/cython3@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libplist>=2.2.0:devel/py-libplist@${PY_FLAVOR}

+USES+=		python
+USE_PYTHON=	flavors
+
+CONFIGURE_ENV=	PYTHON_LDFLAGS="`pkg-config --libs python-${PYTHON_VER}`"
+
+BINARY_ALIAS=	cython=cython-${PYTHON_VER}
+MASTERDIR=	${.CURDIR:H:H}/comms/libimobiledevice
 PORTSCOUT=	ignore:1

-USES=		python
-USE_PYTHON=	flavors cython
-BINARY_ALIAS=	cython=cython-${PYTHON_VER}
-CONFIGURE_ENV=	PYTHON_LDFLAGS="`pkg-config --libs python-${PYTHON_VER}`"
-SLAVE_PORT=	yes
-MASTERDIR=	${.CURDIR:H:H}/comms/libimobiledevice
-
-PLIST=		${.CURDIR}/pkg-plist
 BUILD_WRKSRC=	${WRKSRC}/cython
 INSTALL_WRKSRC=	${BUILD_WRKSRC}

+PLIST=		${.CURDIR}/pkg-plist
 PLIST_FILES=	include/imobiledevice/cython/imobiledevice.pxd \
-		${PYTHONPREFIX_SITELIBDIR:S,^${PREFIX}/,,}/imobiledevice.a \
-		${PYTHONPREFIX_SITELIBDIR:S,^${PREFIX}/,,}/imobiledevice.so
+		${PYTHONPREFIX_SITELIBDIR:S|^${PREFIX}/||}/imobiledevice.a \
+		${PYTHONPREFIX_SITELIBDIR:S|^${PREFIX}/||}/imobiledevice.so

-post-patch:
+_USES_configure+=	471:post-autoreconf
+
+SLAVE_PORT=	yes
+
+post-autoreconf:
 	@${REINPLACE_CMD} \
-		-e 's,$$(top_builddir)/src/libimobiledevice-1.0.la,-limobiledevice-1.0,' \
-		-e 's/$$(imobiledevice_la_DEPENDENCIES)//' \
+		-e 's|$$(top_builddir)/src/libimobiledevice-1.0.la|-limobiledevice-1.0|' \
+		-e 's|$$(imobiledevice_la_DEPENDENCIES)||' \
 		${BUILD_WRKSRC}/Makefile.in

 post-install:
--- a/comms/scrcpy/Makefile
+++ b/comms/scrcpy/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	scrcpy
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.4
+DISTVERSION=	2.5
 CATEGORIES=	comms net
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${DISTVERSIONFULL}/:server
 DISTFILES=	${SERVER_FILE}:server
@ -44,7 +44,7 @@ post-extract:
 	${CP} ${DISTDIR}/${SERVER_FILE} ${WRKSRC}

 post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}

 .include <bsd.port.mk>
--- a/comms/scrcpy/distinfo
+++ b/comms/scrcpy/distinfo
@ -1,5 +1,5 @@
-TIMESTAMP = 1709722935
-SHA256 (scrcpy-server-v2.4) = 93c272b7438605c055e127f7444064ed78fa9ca49f81156777fd201e79ce7ba3
-SIZE (scrcpy-server-v2.4) = 69007
-SHA256 (Genymobile-scrcpy-v2.4_GH0.tar.gz) = 60596f6d4c11163083da3e6805666326873ed57f7defd8a20256b928a1d3503b
-SIZE (Genymobile-scrcpy-v2.4_GH0.tar.gz) = 411206
+TIMESTAMP = 1720664892
+SHA256 (scrcpy-server-v2.5) = 1488b1105d6aff534873a26bf610cd2aea06ee867dd7a4d9c6bb2c091396eb15
+SIZE (scrcpy-server-v2.5) = 69624
+SHA256 (Genymobile-scrcpy-v2.5_GH0.tar.gz) = 9a29ac5171dd81c250337d9b0500f1edbaf01044645b35f8993a191ffbb8597f
+SIZE (Genymobile-scrcpy-v2.5_GH0.tar.gz) = 415854
--- a/comms/usbmuxd/Makefile
+++ b/comms/usbmuxd/Makefile
@ -1,27 +1,31 @@
 PORTNAME=	usbmuxd
-DISTVERSION=	1.1.1
-PORTREVISION=	3
+DISTVERSION=	1.1.1-58
+PORTREVISION=	1
+DISTVERSIONSUFFIX=	-gbc0b91c
 CATEGORIES=	comms
-MASTER_SITES=	https://github.com/libimobiledevice/${PORTNAME}/releases/download/${PORTVERSION}/
+#MASTER_SITES=	https://github.com/libimobiledevice/${PORTNAME}/releases/download/${DISTVERSION}/

 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Daemon for multiplexing connections over USB to iPhone/iPod Touch
 WWW=		https://www.libimobiledevice.org

-LICENSE=	GPLv2 GPLv3
-LICENSE_COMB=	dual
+LICENSE=		GPLv2 GPLv3
+LICENSE_COMB=		dual
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING.GPLv2
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING.GPLv3

 LIB_DEPENDS=	libplist-2.0.so:devel/libplist \
-		libimobiledevice-1.0.so:comms/libimobiledevice
+		libimobiledevice-1.0.so:comms/libimobiledevice \
+		libimobiledevice-glue-1.0.so:comms/libimobiledevice-glue

-USES=		autoreconf cpe libtool localbase pathfix pkgconfig tar:bzip2
+USES=		autoreconf cpe libtool localbase pathfix pkgconfig
 CPE_VENDOR=	nikias_bassen

+USE_GITHUB=	yes
+GH_ACCOUNT=	libimobiledevice
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-systemd
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share

 SUB_LIST=	USERS=${USERS} \
 		GROUPS=${GROUPS}
@ -39,9 +43,12 @@ OPTIONS_DEFAULT=	DEVD
 DEVD_SUB_FILES=		${PORTNAME}.conf
 DEVD_PLIST_FILES=	etc/devd/${PORTNAME}.conf

+post-patch:
+	@echo "${DISTVERSIONFULL}" > ${WRKSRC}/.tarball-version
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}

 post-install-DEVD-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/devd
--- a/comms/usbmuxd/distinfo
+++ b/comms/usbmuxd/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1611089774
-SHA256 (usbmuxd-1.1.1.tar.bz2) = c0ec9700172bf635ccb5bed98daae607d2925c2bc3597f25706ecd9dfbfd2d9e
-SIZE (usbmuxd-1.1.1.tar.bz2) = 345290
+TIMESTAMP = 1720421685
+SHA256 (libimobiledevice-usbmuxd-1.1.1-58-gbc0b91c_GH0.tar.gz) = 2a88c8a27ba43cf00e9aed5b09791a5ce651758a87dc802954c73b0690ddacab
+SIZE (libimobiledevice-usbmuxd-1.1.1-58-gbc0b91c_GH0.tar.gz) = 65593
--- a/comms/usbmuxd/files/patch-src_client.c
+++ b/comms/usbmuxd/files/patch-src_client.c
@ -1,13 +0,0 @@
-client.c:210:18: error: use of undeclared identifier 'IPPROTO_TCP'
-        setsockopt(cfd, IPPROTO_TCP, TCP_NODELAY, (void*)&yes, sizeof(int));
-
--- src/client.c.orig	2020-06-09 16:20:07 UTC
-+++ src/client.c
-@@ -31,6 +31,7 @@
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <netinet/tcp.h>
- #include <sys/un.h>
- #include <arpa/inet.h>
--- a/comms/usbmuxd/files/usbmuxd.conf.in
+++ b/comms/usbmuxd/files/usbmuxd.conf.in
@ -16,11 +16,11 @@ notify 100 {
 };

 notify 100 {
-        match "system"          "USB";
-        match "subsystem"       "DEVICE";
-        match "type"            "DETACH";
-        match "vendor"          "0x05ac";
-	match "product"         "(0x12[9a][0-9a-f]|0x8600)";
+	match "system"		"USB";
+	match "subsystem"	"DEVICE";
+	match "type"		"DETACH";
+	match "vendor"		"0x05ac";
+	match "product"		"(0x12[9a][0-9a-f]|0x8600)";
 	action "%%PREFIX%%/sbin/usbmuxd -x";
+	action "sleep 5";
 };
-
--- a/Show more
+++ b/Show more