*/*: sync with upstream

Taken from: FreeBSD
2023-05-30 10:59:29 +02:00 · 2023-05-30 10:59:29 +02:00 · c7fad71ac0
parent 3621c620a2
commit c7fad71ac0
2363 changed files with 42205 additions and 66417 deletions
--- a/accessibility/rubygem-atk/Makefile
+++ b/accessibility/rubygem-atk/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	atk
-PORTVERSION=	4.1.4
+PORTVERSION=	4.1.6
 CATEGORIES=	accessibility rubygems
 MASTER_SITES=	RG

--- a/accessibility/rubygem-atk/distinfo
+++ b/accessibility/rubygem-atk/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1683227709
-SHA256 (rubygem/atk-4.1.4.gem) = 7f9c5c2f185459e358b037c06f7b4b87ddba6ca6c987e4fdf4bc132c63de013b
-SIZE (rubygem/atk-4.1.4.gem) = 15872
+TIMESTAMP = 1685162414
+SHA256 (rubygem/atk-4.1.6.gem) = 2fb7e261ea42d0813e6f1121c4012a255431de497d7e1bb86c53554bf43be120
+SIZE (rubygem/atk-4.1.6.gem) = 15872
--- a/accessibility/wlsunset/Makefile
+++ b/accessibility/wlsunset/Makefile
@ -1,11 +1,8 @@
 PORTNAME=	wlsunset
-DISTVERSION=	0.2.0
+DISTVERSION=	0.3.0
 CATEGORIES=	accessibility wayland
 MASTER_SITES=	https://git.sr.ht/~kennylevinsen/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/

-PATCH_SITES=	https://git.sr.ht/~kennylevinsen/${PORTNAME}/commit/
-PATCHFILES+=	601dfc87ff6e.patch:-p1 # https://lists.sr.ht/~kennylevinsen/wlsunset-devel/patches/26904
-
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Day/night gamma adjustments for Wayland
 WWW=		https://sr.ht/~kennylevinsen/wlsunset
--- a/accessibility/wlsunset/distinfo
+++ b/accessibility/wlsunset/distinfo
@ -1,5 +1,3 @@
-TIMESTAMP = 1650165989
-SHA256 (wlsunset-0.2.0.tar.gz) = 0aaf5fc414170e5300a83962de2582dc8f10e3fbd6a0c2ca79dc806a581adc36
-SIZE (wlsunset-0.2.0.tar.gz) = 12622
-SHA256 (601dfc87ff6e.patch) = 761ac0b7831f8111f3b4950f62d589b953e6e5893b2cae685a62eb59e4336c70
-SIZE (601dfc87ff6e.patch) = 1289
+TIMESTAMP = 1684939663
+SHA256 (wlsunset-0.3.0.tar.gz) = 9ece2570c3427888a493cd33a129e82634475e6e9286ed729af24fba07ab5424
+SIZE (wlsunset-0.3.0.tar.gz) = 16533
--- a/archivers/c-blosc2/Makefile
+++ b/archivers/c-blosc2/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	c-blosc2
-PORTVERSION=	2.8.0
+PORTVERSION=	2.9.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	archivers

--- a/archivers/c-blosc2/distinfo
+++ b/archivers/c-blosc2/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1680726020
-SHA256 (Blosc-c-blosc2-v2.8.0_GH0.tar.gz) = be608cdf68deb02e0d3ee62e183942a0fe5d5d3185375b9b6566e2ae35a9bdbd
-SIZE (Blosc-c-blosc2-v2.8.0_GH0.tar.gz) = 2757219
+TIMESTAMP = 1685162060
+SHA256 (Blosc-c-blosc2-v2.9.2_GH0.tar.gz) = 5d1b7269f2f9e4ed521a980bdb7e3895e77358723af06b7d269f65686efe9732
+SIZE (Blosc-c-blosc2-v2.9.2_GH0.tar.gz) = 2790821
--- a/archivers/c-blosc2/pkg-plist
+++ b/archivers/c-blosc2/pkg-plist
@ -5,6 +5,8 @@ include/blosc2/blosc2-export.h
 include/blosc2/blosc2-stdio.h
 include/blosc2/codecs-registry.h
 include/blosc2/filters-registry.h
+include/blosc2/plugins-utils.h
+include/blosc2/tuners-registry.h
 lib/libblosc2.a
 lib/libblosc2.so
 lib/libblosc2.so.2
--- a/archivers/py-blosc2/Makefile
+++ b/archivers/py-blosc2/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	blosc2
-PORTVERSION=	2.2.0
-PORTREVISION=	1
+PORTVERSION=	2.2.3
 CATEGORIES=	archivers python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -12,7 +11,8 @@ WWW=		https://github.com/Blosc/python-blosc2
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt

-BUILD_DEPENDS=	cmake:devel/cmake-core \
+BUILD_DEPENDS=	c-blosc2>=2.9.1:archivers/c-blosc2 \
+		cmake:devel/cmake-core \
 		ninja:devel/ninja \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-build>=0:devel/py-scikit-build@${PY_FLAVOR} \
@ -29,9 +29,6 @@ USE_PYTHON=	autoplist concurrent cython pep517

 MAKE_ENV=	CMAKE_ARGS=-DUSE_SYSTEM_BLOSC2=ON

-post-extract:
-	@${RM} ${WRKSRC}/blosc2/c-blosc2/blosc/shuffle-avx2.c.orig
-
 post-patch:
 # Clean up bundled libraries
 	@${RM} -r ${WRKSRC}/blosc2/c-blosc2/
--- a/archivers/py-blosc2/distinfo
+++ b/archivers/py-blosc2/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1681052880
-SHA256 (blosc2-2.2.0.tar.gz) = 4cf3893fe85da4bd899ecf7a457fd09b2212fad256182100108de7a92b88aa87
-SIZE (blosc2-2.2.0.tar.gz) = 4135248
+TIMESTAMP = 1685162062
+SHA256 (blosc2-2.2.3.tar.gz) = 5ccd4ee21ef1e25ac54119c4a525b6bc2ba2a9a747448de1b27cf8240ce94fff
+SIZE (blosc2-2.2.3.tar.gz) = 4168877
--- a/archivers/py-blosc2/files/patch-pyproject.toml
+++ b/archivers/py-blosc2/files/patch-pyproject.toml
@ -1,9 +1,9 @@
--- pyproject.toml.orig	2023-04-04 10:26:30 UTC
+--- pyproject.toml.orig	2023-05-11 11:46:32 UTC
 +++ pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
 -requires = ["setuptools", "scikit-build", "cython", "cmake", "ninja", "oldest-supported-numpy"]
 +requires = ["setuptools", "scikit-build", "cython", "numpy"]
 
- [tool.cibuildwheel]
- skip = "cp36-* cp37-* pp37-* *-manylinux_i686 *_ppc64le *_s390x *-musllinux*"
+ [project]
+ name = "blosc2"
--- a/archivers/py-python-lzo/Makefile
+++ b/archivers/py-python-lzo/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	python-lzo
-DISTVERSION=	1.14
+DISTVERSION=	1.15
 CATEGORIES=	archivers python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -14,6 +14,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	liblzo2.so:archivers/lzo2

 USES=		localbase python:3.6+
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist distutils pytest
+
+TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}

 .include <bsd.port.mk>
--- a/archivers/py-python-lzo/distinfo
+++ b/archivers/py-python-lzo/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1640837881
-SHA256 (python-lzo-1.14.tar.gz) = 83cbd8ecaae284735250e31d6c0ecc18ac08763fab2a8c910dc5a6910db6250c
-SIZE (python-lzo-1.14.tar.gz) = 14050
+TIMESTAMP = 1684985041
+SHA256 (python-lzo-1.15.tar.gz) = a57aaa00c5c3a0515dd9f7426ba2cf601767dc19dc023d8b99d4a13b0a327b49
+SIZE (python-lzo-1.15.tar.gz) = 17633
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	rar
-PORTVERSION=	6.20
+PORTVERSION=	6.21
 PORTEPOCH=	3
 CATEGORIES=	archivers
 MASTER_SITES=	https://www.rarlab.com/rar/
--- a/archivers/rar/distinfo
+++ b/archivers/rar/distinfo
@ -1,5 +1,5 @@
-TIMESTAMP = 1675190919
-SHA256 (rarbsd-x32-620.tar.gz) = f51fd6042bd97ca565a94c48b569e7b689f72a33c4bf403a7942a5210b90684e
-SIZE (rarbsd-x32-620.tar.gz) = 576446
-SHA256 (rarbsd-x64-620.tar.gz) = 3ba680709bcced2b907062fbc352537aed43d9590ea2c30548797dff8417b328
-SIZE (rarbsd-x64-620.tar.gz) = 617919
+TIMESTAMP = 1684104298
+SHA256 (rarbsd-x32-621.tar.gz) = dd970156da918bf795c590f295f9a5f9154be68d6e4f4fed571a299eb2579a05
+SIZE (rarbsd-x32-621.tar.gz) = 576573
+SHA256 (rarbsd-x64-621.tar.gz) = 40ab10c7e075e83f534aafb85691b5ed2011558c7c09b30c45702f7cd01e4667
+SIZE (rarbsd-x64-621.tar.gz) = 617909
--- a/archivers/streamvbyte/Makefile
+++ b/archivers/streamvbyte/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	streamvbyte
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.5.2
+DISTVERSION=	1.0.0
 CATEGORIES=	archivers

 MAINTAINER=	jwb@FreeBSD.org
@ -10,17 +10,20 @@ WWW=		https://github.com/lemire/streamvbyte
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE

+# From 0.5.2.  Retest with 1.0.0.
 BROKEN_powerpc=		test fails on big-endian systems
 BROKEN_powerpc64=	test fails on big-endian systems

 USES=		cmake
 USE_GITHUB=	yes
-USE_LDCONFIG=	yes

 GH_ACCOUNT=	lemire

 CFLAGS+=	-fPIC	# For vbz-compression using static lib

+PLIST_FILES=	include/streamvbyte.h include/streamvbyte_zigzag.h \
+		include/streamvbytedelta.h lib/libstreamvbyte.a
+
 do-test:
 	cd ${WRKDIR}/.build && ./unit

--- a/archivers/streamvbyte/distinfo
+++ b/archivers/streamvbyte/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1675965569
-SHA256 (lemire-streamvbyte-v0.5.2_GH0.tar.gz) = 6c64b1bcd69515e77111df274db9cbc471c5d65cb9769c7b95d3b56941b622dd
-SIZE (lemire-streamvbyte-v0.5.2_GH0.tar.gz) = 75802
+TIMESTAMP = 1684850111
+SHA256 (lemire-streamvbyte-v1.0.0_GH0.tar.gz) = 6b1920e9865146ba444cc317aa61cd39cdf760236e354ef7956011a9fe577882
+SIZE (lemire-streamvbyte-v1.0.0_GH0.tar.gz) = 77895
--- a/archivers/streamvbyte/pkg-plist
+++ b/archivers/streamvbyte/pkg-plist
@ -1,7 +0,0 @@
-include/streamvbyte.h
-include/streamvbyte_zigzag.h
-include/streamvbytedelta.h
-lib/libstreamvbyte.so
-lib/libstreamvbyte.so.1
-lib/libstreamvbyte.so.1.0.0
-lib/libstreamvbyte_static.a
--- a/archivers/unrar/Makefile
+++ b/archivers/unrar/Makefile
@ -1,9 +1,9 @@
 PORTNAME=	unrar
-PORTVERSION=	6.20
+PORTVERSION=	6.21
 PORTEPOCH=	6
 CATEGORIES+=	archivers
 MASTER_SITES=	https://www.rarlab.com/rar/
-DISTNAME=	unrarsrc-6.2.4
+DISTNAME=	unrarsrc-6.2.6

 MAINTAINER?=	sunpoet@FreeBSD.org
 COMMENT=	Extract, view & test RAR archives
--- a/archivers/unrar/distinfo
+++ b/archivers/unrar/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1675190921
-SHA256 (unrarsrc-6.2.4.tar.gz) = 22e0a37444c6beb194d4dfafdce480d1143547eb1102fd65430e1e9522a545ad
-SIZE (unrarsrc-6.2.4.tar.gz) = 245672
+TIMESTAMP = 1684104300
+SHA256 (unrarsrc-6.2.6.tar.gz) = 0c2d4cbc8b34d0e3bec7b474e0f52bbcc6c4320ec089b4141223ee355f63c318
+SIZE (unrarsrc-6.2.6.tar.gz) = 246212
--- a/archivers/upx/Makefile
+++ b/archivers/upx/Makefile
@ -1,37 +1,25 @@
 PORTNAME=	upx
-PORTVERSION=	3.96
+PORTVERSION=	4.0.2
 MASTER_SITES=	https://github.com/upx/upx/releases/download/v${PORTVERSION}/
 CATEGORIES=	archivers
 DISTVERSIONSUFFIX=	-src

 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Ultimate Packer for eXecutables
-WWW=		https://upx.github.io/
+WWW=		https://upx.github.io/ \
+		https://github.com/upx/upx

 LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${WRKSRC}/COPYING

 LIB_DEPENDS=	libucl.so:archivers/ucl

-USES=		cpe gmake perl5 tar:xz
-USE_PERL5=	build
+USES=		cmake compiler:c++17-lang cpe tar:xz

-MAKE_ENV=	UPX_UCLDIR=${LOCALBASE} \
-		target=freebsd
-
-PLIST_FILES=	bin/upx \
-		man/man1/upx.1.gz
+CMAKE_ON=	UPX_CONFIG_DISABLE_GITREV UPX_CONFIG_DISABLE_SANITIZE UPX_CONFIG_DISABLE_SELF_PACK_TEST UPX_CONFIG_DISABLE_WERROR

 CPE_VENDOR=	upx_project

-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS

-.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
-CFLAGS+=       -Wno-error=unused-but-set-variable
-.endif
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/upx.out ${STAGEDIR}${PREFIX}/bin/upx
-	${INSTALL_MAN} ${WRKSRC}/doc/upx.1 ${STAGEDIR}${PREFIX}/man/man1
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/archivers/upx/distinfo
+++ b/archivers/upx/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1643382492
-SHA256 (upx-3.96-src.tar.xz) = 47774df5c958f2868ef550fb258b97c73272cb1f44fe776b798e393465993714
-SIZE (upx-3.96-src.tar.xz) = 792524
+TIMESTAMP = 1684104302
+SHA256 (upx-4.0.2-src.tar.xz) = 1221e725b1a89e06739df27fae394d6bc88aedbe12f137c630ec772522cbc76f
+SIZE (upx-4.0.2-src.tar.xz) = 1191960
--- a/archivers/upx/files/patch-src-bele.h
+++ b/archivers/upx/files/patch-src-bele.h
@ -0,0 +1,22 @@
+--- src/bele.h.orig	2023-01-30 10:18:06 UTC
+++ src/bele.h
+@@ -84,19 +84,6 @@ static forceinline unsigned bswap16(unsigned v) { retu
+ static forceinline unsigned bswap32(unsigned v) { return (unsigned) _byteswap_ulong(v); }
+ static forceinline upx_uint64_t bswap64(upx_uint64_t v) { return _byteswap_uint64(v); }
+ 
+-#else
+-
+-static forceinline constexpr unsigned bswap16(unsigned v) {
+-    // return __builtin_bswap16((upx_uint16_t) (v & 0xffff));
+-    // return (unsigned) __builtin_bswap64((upx_uint64_t) v << 48);
+-    return __builtin_bswap32(v << 16);
+-}
+-static forceinline constexpr unsigned bswap32(unsigned v) {
+-    // return (unsigned) __builtin_bswap64((upx_uint64_t) v << 32);
+-    return __builtin_bswap32(v);
+-}
+-static forceinline constexpr upx_uint64_t bswap64(upx_uint64_t v) { return __builtin_bswap64(v); }
+-
+ #endif
+ 
+ static forceinline constexpr unsigned no_bswap16(unsigned v) {
--- a/archivers/upx/files/patch-src-miniacc.h
+++ b/archivers/upx/files/patch-src-miniacc.h
@ -1,8 +1,8 @@
--- src/miniacc.h.orig	2020-01-22 21:29:58 UTC
+--- src/miniacc.h.orig	2023-01-30 10:18:06 UTC
 +++ src/miniacc.h
-@@ -2547,11 +2547,11 @@ ACC_COMPILE_TIME_ASSERT_HEADER(ACC_SIZEOF_PTRDIFF_T ==
- #elif !(ACC_ABI_BIG_ENDIAN) && !(ACC_ABI_LITTLE_ENDIAN)
- #if (ACC_ARCH_ALPHA) && (ACC_ARCH_CRAY_MPP)
+@@ -2563,11 +2563,11 @@ ACC_COMPILE_TIME_ASSERT_HEADER(ACC_SIZEOF_PTRDIFF_T ==
+ #  define ACC_ABI_LITTLE_ENDIAN     1
+ #elif (ACC_ARCH_ALPHA) && (ACC_ARCH_CRAY_MPP)
 #  define ACC_ABI_BIG_ENDIAN        1
 -#elif (ACC_ARCH_IA64) && (ACC_OS_POSIX_LINUX || ACC_OS_WIN64)
 +#elif (ACC_ARCH_IA64) && (ACC_OS_POSIX_LINUX || ACC_OS_POSIX_FREEBSD || ACC_OS_WIN64)
--- a/archivers/upx/files/patch-src-packer.h
+++ b/archivers/upx/files/patch-src-packer.h
@ -0,0 +1,11 @@
+--- src/packer.h.orig	2023-01-30 10:18:06 UTC
+++ src/packer.h
+@@ -225,7 +225,7 @@ class Packer { (protected)
+     void addLoader(C, C, C, C, C, C, C, C, C);
+     void addLoader(C, C, C, C, C, C, C, C, C, C);
+ #undef C
+-#if (ACC_CC_CLANG || ACC_CC_GNUC)
+#if 0 && (ACC_CC_CLANG || ACC_CC_GNUC)
+     void addLoaderVA(const char *s, ...) __attribute__((__sentinel__));
+ #else
+     void addLoaderVA(const char *s, ...);
--- a/archivers/upx/files/patch-src_Makefile
+++ b/archivers/upx/files/patch-src_Makefile
@ -1,24 +0,0 @@
--- src/Makefile.orig	2017-05-12 11:01:20 UTC
-+++ src/Makefile
-@@ -48,7 +48,7 @@ endif
- # we need UCL and zlib - you can set envvar UPX_UCLDIR
- ifneq ($(wildcard $(UPX_UCLDIR)/include/ucl/ucl.h),)
- INCLUDES += -I$(UPX_UCLDIR)/include
-LIBS += $(addprefix -L,$(dir $(wildcard $(UPX_UCLDIR)/libucl$(libext) $(UPX_UCLDIR)/src/.libs/libucl$(libext))))
-+LIBS += -L$(UPX_UCLDIR)/lib
- endif
- LIBS += -lucl -lz
- # LZMA from https://github.com/upx/upx-lzma-sdk
-@@ -62,9 +62,9 @@ CXXFLAGS_OPTIMIZE ?= -O2
- endif
- CXXFLAGS += $(CXXFLAGS_OPTIMIZE)
- # protect against security threats caused by misguided C++ compiler "optimizations"
-ifeq ($(findstring clang,$(CXX)),)
-CXXFLAGS += -fno-delete-null-pointer-checks
-endif
-+# ifeq ($(findstring clang,$(CXX)),)
-+# CXXFLAGS += -fno-delete-null-pointer-checks
-+# endif
- CXXFLAGS += -fno-strict-aliasing -fwrapv
- CXXFLAGS += -funsigned-char
- CXXFLAGS += -Wall -W -Wcast-align -Wcast-qual -Wmissing-declarations -Wpointer-arith -Wshadow -Wvla -Wwrite-strings
--- a/archivers/upx/files/patch-src_lzma-sdk_C_7zip_Compress_LZMA_LZMAEncoder.cpp
+++ b/archivers/upx/files/patch-src_lzma-sdk_C_7zip_Compress_LZMA_LZMAEncoder.cpp
@ -1,11 +0,0 @@
--- src/lzma-sdk/C/7zip/Compress/LZMA/LZMAEncoder.cpp.orig	2016-11-20 12:55:06 UTC
-+++ src/lzma-sdk/C/7zip/Compress/LZMA/LZMAEncoder.cpp
-@@ -968,7 +968,7 @@ HRESULT CEncoder::GetOptimum(UInt32 position, UInt32 &
-         startLen = lenTest + 1;
- 
-       // if (_maxMode)
-        {
-+      {
-           UInt32 lenTest2 = lenTest + 1;
-           UInt32 limit = MyMin(numAvailableBytesFull, lenTest2 + _numFastBytes);
-           for (; lenTest2 < limit &&
--- a/archivers/upx/files/patch-src_p__mach.cpp
+++ b/archivers/upx/files/patch-src_p__mach.cpp
@ -1,11 +0,0 @@
--- src/p_mach.cpp.orig	2020-01-22 21:29:58 UTC
-+++ src/p_mach.cpp
-@@ -467,7 +467,7 @@ PackMachBase<T>::compare_segment_command(void const *c
-     if (a->vmsize)             return -1;  // 'a' is first
-     if (b->vmsize)             return  1;  // 'a' is last
-     // What could remain?
-                               return  0;
-+    return  0;
- }
- 
- #undef PAGE_MASK
--- a/archivers/upx/files/patch-src_p__wcle.cpp
+++ b/archivers/upx/files/patch-src_p__wcle.cpp
@ -1,10 +0,0 @@
--- src/p_wcle.cpp.orig	2018-08-26 02:58:09 UTC
-+++ src/p_wcle.cpp
-@@ -763,6 +763,7 @@ void PackWcle::decodeEntryTable()
-     }
- 
-     //if (Opt_debug) printf("\n%d entries decoded.\n",n);
-+    UNUSED(n);
- 
-     soentries = ptr_diff(p, ientries) + 1;
-     oentries = ientries;
--- a/archivers/upx/files/patch-src_packer.h
+++ b/archivers/upx/files/patch-src_packer.h
@ -1,11 +0,0 @@
--- src/packer.h.orig	2013-09-30 15:51:00 UTC
-+++ src/packer.h
-@@ -238,7 +238,7 @@ protected:
-     void addLoader(C,C,C,C,C,C,C,C); void addLoader(C,C,C,C,C,C,C,C,C);
-     void addLoader(C,C,C,C,C,C,C,C,C,C);
- #undef C
-#if 1 && (ACC_CC_CLANG || (ACC_CC_GNUC >= 0x040100))
-+#if 0 && (ACC_CC_CLANG || (ACC_CC_GNUC >= 0x040100))
-     void __acc_cdecl_va addLoaderVA(const char *s, ...) __attribute__((__sentinel__));
- #else
-     void __acc_cdecl_va addLoaderVA(const char *s, ...);
--- a/archivers/upx/pkg-plist
+++ b/archivers/upx/pkg-plist
@ -0,0 +1,9 @@
+bin/upx
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/upx-doc.html
+%%PORTDOCS%%%%DOCSDIR%%/upx-doc.txt
+share/man/man1/upx.1.gz
--- a/archivers/vbz-compression/Makefile
+++ b/archivers/vbz-compression/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	vbz-compression
-DISTVERSION=	1.0.2
-PORTREVISION=	2
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.0.3
 CATEGORIES=	archivers

 MAINTAINER=	jwb@FreeBSD.org
@ -25,7 +25,7 @@ CMAKE_ARGS=	-DENABLE_CONAN=OFF \
 		-DENABLE_PERF_TESTING=OFF \
 		-DENABLE_PYTHON=OFF \
 		-DSTREAMVBYTE_INSTALL_DIR=${LOCALBASE} \
-		-DSTREAMVBYTE_STATIC_LIB=${LOCALBASE}/lib/libstreamvbyte_static.a
+		-DSTREAMVBYTE_STATIC_LIB=${LOCALBASE}/lib/libstreamvbyte.a

 PLIST_FILES=	hdf5/lib/plugin/libvbz_hdf_plugin.so

--- a/archivers/vbz-compression/distinfo
+++ b/archivers/vbz-compression/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1651234735
-SHA256 (nanoporetech-vbz_compression-1.0.2_GH0.tar.gz) = f803929c79dbf04c041768bf9d3c351e79eb13b8b8f01c63258f8a514d6aad5d
-SIZE (nanoporetech-vbz_compression-1.0.2_GH0.tar.gz) = 5339733
+TIMESTAMP = 1661638684
+SHA256 (nanoporetech-vbz_compression-v1.0.3_GH0.tar.gz) = a7450e076db628681bbc0e2b3f941c6c21cc2981a7e1c78628807ffdf1b34f31
+SIZE (nanoporetech-vbz_compression-v1.0.3_GH0.tar.gz) = 5339759
--- a/archivers/vbz-compression/pkg-descr
+++ b/archivers/vbz-compression/pkg-descr
@ -1,6 +1,5 @@
 VBZ Compression uses variable byte integer encoding to compress Oxford
 Nanopore signal data.
-
 The performance of VBZ is achieved by taking advantage of the properties of the
 raw signal and therefore is most effective when applied to the signal dataset.
 Other datasets you may have in your Fast5 files will not be able to take
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	merkaartor
 PORTVERSION=	0.19.0
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	astro

 MAINTAINER=	dev2@heesakkers.info
--- a/astro/py-metar/Makefile
+++ b/astro/py-metar/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	metar
-PORTVERSION=	1.9.0
+PORTVERSION=	1.10.0
 CATEGORIES=	astro python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/astro/py-metar/distinfo
+++ b/astro/py-metar/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1642102227
-SHA256 (metar-1.9.0.tar.gz) = ef58a29e1ef8fed034ed493dc874aa4fbd40313e578640287dbf5c55d89886c5
-SIZE (metar-1.9.0.tar.gz) = 211599
+TIMESTAMP = 1685162094
+SHA256 (metar-1.10.0.tar.gz) = 3c43f65fc86b52fb592e0e5ed8034636eabc9f9a1c6930a2de406aab6ba96f0e
+SIZE (metar-1.10.0.tar.gz) = 213693
--- a/astro/py-metpy/Makefile
+++ b/astro/py-metpy/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	metpy
-PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTVERSION=	1.5.0
 CATEGORIES=	astro python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/astro/py-metpy/distinfo
+++ b/astro/py-metpy/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1679498632
-SHA256 (MetPy-1.4.1.tar.gz) = a13dd2da360ebfd856270e41746e4fd54badca9dcdbd801229e80382ce31dbb9
-SIZE (MetPy-1.4.1.tar.gz) = 9906351
+TIMESTAMP = 1685162096
+SHA256 (MetPy-1.5.0.tar.gz) = 1897b276097053aeda615e3e23bf497b7704e4536b1f8e2788bb02911646353d
+SIZE (MetPy-1.5.0.tar.gz) = 10564009
--- a/astro/qmapshack/Makefile
+++ b/astro/qmapshack/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	qmapshack
 PORTVERSION=	1.16.1
-PORTREVISION=	7
+PORTREVISION=	8
 DISTVERSIONPREFIX=	V_
 CATEGORIES=	astro

--- a/audio/alsa-plugins/Makefile
+++ b/audio/alsa-plugins/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	alsa-plugins
 PORTVERSION=	1.2.2
-PORTREVISION=	9
+PORTREVISION=	10
 DISTVERSIONPREFIX=	v
 CATEGORIES=	audio
 MASTER_SITES=	GH
@ -39,8 +39,10 @@ BLKCNT_P2_CFLAGS=	-DFREEBSD_OSS_BLKCNT_P2
 BUFSZ_P2_CFLAGS=	-DFREEBSD_OSS_BUFSZ_P2
 VERBOSE_CFLAGS=		-DALSA_OSS_DEBUG_VERBOSE

-FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS=		libavcodec.so.58:multimedia/ffmpeg4
 FFMPEG_CONFIGURE_ENABLE=	libav
+FFMPEG_CONFIGURE_ENV+=		PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig"
+FFMPEG_MAKE_ENV+=		PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig"

 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_ENABLE=	jack
--- a/audio/amberol/Makefile
+++ b/audio/amberol/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	amberol
-DISTVERSION=	0.10.2
+DISTVERSION=	0.10.3
 CATEGORIES=	audio

 MAINTAINER=	jbeich@FreeBSD.org
@ -21,7 +21,7 @@ USE_GNOME=	gdkpixbuf2 gtk40 libadwaita
 USE_GSTREAMER=	bad good libav
 GL_SITE=	https://gitlab.gnome.org
 GL_ACCOUNT=	World
-GL_COMMIT=	a11feabf354bc39816b77aabf4aa1376153fbd1e
+GL_COMMIT=	31137155adb25a2e3a80de83b09e723dc2d78f4a
 MAKE_ENV=	${CARGO_ENV}
 CARGO_BUILD=	no
 CARGO_INSTALL=	no
--- a/audio/amberol/Makefile.crates
+++ b/audio/amberol/Makefile.crates
@ -96,7 +96,7 @@ CARGO_CRATES=	adler-1.0.2 \
 		gstreamer-sys-0.20.0 \
 		gstreamer-video-0.20.3 \
 		gstreamer-video-sys-0.20.0 \
-		gtk4-0.6.4 \
+		gtk4-0.6.6 \
 		gtk4-macros-0.6.5 \
 		gtk4-sys-0.6.3 \
 		hashbrown-0.12.3 \
--- a/audio/amberol/distinfo
+++ b/audio/amberol/distinfo
@ -1,4 +1,4 @@
-TIMESTAMP = 1682721980
+TIMESTAMP = 1684868266
 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
 SIZE (rust/crates/adler-1.0.2.crate) = 12778
 SHA256 (rust/crates/aho-corasick-0.7.20.crate) = cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac
@ -195,8 +195,8 @@ SHA256 (rust/crates/gstreamer-video-0.20.3.crate) = 467cddb6a4135e72fefb6ba21262
 SIZE (rust/crates/gstreamer-video-0.20.3.crate) = 111459
 SHA256 (rust/crates/gstreamer-video-sys-0.20.0.crate) = 66ddb6112d438aac0004d2db6053a572f92b1c5e0e9d6ff6c71d9245f7f73e46
 SIZE (rust/crates/gstreamer-video-sys-0.20.0.crate) = 59182
-SHA256 (rust/crates/gtk4-0.6.4.crate) = 1e30e124b5a605f6f5513db13958bfcd51d746607b20bc7bb718b33e303274ed
-SIZE (rust/crates/gtk4-0.6.4.crate) = 472996
+SHA256 (rust/crates/gtk4-0.6.6.crate) = b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b
+SIZE (rust/crates/gtk4-0.6.6.crate) = 473518
 SHA256 (rust/crates/gtk4-macros-0.6.5.crate) = f041a797fb098bfb06e432c61738133604bfa3af57f13f1da3b9d46271422ef0
 SIZE (rust/crates/gtk4-macros-0.6.5.crate) = 16106
 SHA256 (rust/crates/gtk4-sys-0.6.3.crate) = 5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f
@ -467,5 +467,5 @@ SHA256 (rust/crates/zvariant-3.11.0.crate) = 903169c05b9ab948ee93fefc9127d08930d
 SIZE (rust/crates/zvariant-3.11.0.crate) = 71214
 SHA256 (rust/crates/zvariant_derive-3.11.0.crate) = cce76636e8fab7911be67211cf378c252b115ee7f2bae14b18b84821b39260b5
 SIZE (rust/crates/zvariant_derive-3.11.0.crate) = 12364
-SHA256 (World-amberol-a11feabf354bc39816b77aabf4aa1376153fbd1e_GL0.tar.gz) = e75b8c13adfe4b105348a16bf4ecdeceec820cee08bba93dca7f62ec9bb863de
-SIZE (World-amberol-a11feabf354bc39816b77aabf4aa1376153fbd1e_GL0.tar.gz) = 1145080
+SHA256 (World-amberol-31137155adb25a2e3a80de83b09e723dc2d78f4a_GL0.tar.gz) = fa04cbf8d4b08fe220dbf4ffcebab4bd568b847e2d1286e12149ddbcf64c78bf
+SIZE (World-amberol-31137155adb25a2e3a80de83b09e723dc2d78f4a_GL0.tar.gz) = 1145074
--- a/audio/avldrums-lv2/Makefile
+++ b/audio/avldrums-lv2/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	avldrums
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.0
+DISTVERSION=	0.6.1
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2

--- a/audio/avldrums-lv2/distinfo
+++ b/audio/avldrums-lv2/distinfo
@ -1,5 +1,5 @@
-TIMESTAMP = 1678931085
-SHA256 (x42-avldrums.lv2-v0.6.0_GH0.tar.gz) = ed8084917ac71750eb9dcef9738efeda8bfa512b3e5c944ddd8f3c24782d6c78
-SIZE (x42-avldrums.lv2-v0.6.0_GH0.tar.gz) = 76564354
+TIMESTAMP = 1685314444
+SHA256 (x42-avldrums.lv2-v0.6.1_GH0.tar.gz) = d0a941375773676eaab5c8d18723271eab4e2783531badb7b8ec9993be35a328
+SIZE (x42-avldrums.lv2-v0.6.1_GH0.tar.gz) = 76563878
 SHA256 (x42-robtk-1e82c83_GH0.tar.gz) = d92ba2f7b9f57328b97b52b30aa9c4744ca466698a38ee23e6ca102c5f964499
 SIZE (x42-robtk-1e82c83_GH0.tar.gz) = 118286
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@ -10,8 +10,6 @@ WWW=		http://www.denemo.org/

 LICENSE=	GPLv3+

-BROKEN_armv6=	fails to package: tar: Pathname cannot be converted from UTF-8 to current locale
-BROKEN_armv7=	fails to package: tar: Pathname cannot be converted from UTF-8 to current locale
 BROKEN_mips=	fails to package: tar: Pathname cannot be converted from UTF-8 to current locale

 LIB_DEPENDS=	libaubio.so:audio/aubio \
--- a/audio/gmsynth-lv2/Makefile
+++ b/audio/gmsynth-lv2/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	gmsynth
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.5.2
+DISTVERSION=	0.5.3
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2

--- a/audio/gmsynth-lv2/distinfo
+++ b/audio/gmsynth-lv2/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1668973378
-SHA256 (x42-gmsynth.lv2-v0.5.2_GH0.tar.gz) = 6019cbf497bdcf720031111ec3f20e1ffce3ed674dda2dada439f76bb5a7d6e3
-SIZE (x42-gmsynth.lv2-v0.5.2_GH0.tar.gz) = 28951255
+TIMESTAMP = 1685314370
+SHA256 (x42-gmsynth.lv2-v0.5.3_GH0.tar.gz) = 2268badcfe38857d9b8c08526fb97bf169f98d1f2c75747d80d827230ef1b426
+SIZE (x42-gmsynth.lv2-v0.5.3_GH0.tar.gz) = 28951271
--- a/audio/gtultra/Makefile
+++ b/audio/gtultra/Makefile
@ -1,9 +1,7 @@
 PORTNAME=		gtultra
 DISTVERSIONPREFIX=	v
-DISTVERSION=		1.5.1
+DISTVERSION=		1.5.2
 CATEGORIES=		audio
-PATCH_SITES=		https://github.com/jpage8580/GTUltra/commit/
-PATCHFILES=		214f43896352e07f09f4c0f2250eb0a3511812f3.patch:-p1

 MAINTAINER=	zirias@FreeBSD.org
 COMMENT=	Music tracker for the C64, fork of goattracker
--- a/audio/gtultra/distinfo
+++ b/audio/gtultra/distinfo
@ -1,5 +1,3 @@
-TIMESTAMP = 1684780534
-SHA256 (jpage8580-GTUltra-v1.5.1_GH0.tar.gz) = 56aabf0a60d1dd1d902ea1d176cf2d31031755caee3f9a9c184d196792b8d030
-SIZE (jpage8580-GTUltra-v1.5.1_GH0.tar.gz) = 3806692
-SHA256 (214f43896352e07f09f4c0f2250eb0a3511812f3.patch) = 81e6ec34798fb2fb0b3e1f5d8f70ac093bf10b400cc14123e4d71c917034ec60
-SIZE (214f43896352e07f09f4c0f2250eb0a3511812f3.patch) = 243400
+TIMESTAMP = 1684870805
+SHA256 (jpage8580-GTUltra-v1.5.2_GH0.tar.gz) = 065a177a3f9cc9be679d87452bca0edce98633b2f793be6f96573ba8b3995249
+SIZE (jpage8580-GTUltra-v1.5.2_GH0.tar.gz) = 3807053
--- a/audio/jacktrip/Makefile
+++ b/audio/jacktrip/Makefile
@ -1,7 +1,6 @@
 PORTNAME=	jacktrip
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.8.1
-PORTREVISION=	1
+DISTVERSION=	1.9.0
 CATEGORIES=	audio

 MAINTAINER=	yuri@FreeBSD.org
--- a/audio/jacktrip/distinfo
+++ b/audio/jacktrip/distinfo
@ -1,5 +1,5 @@
-TIMESTAMP = 1681113045
-SHA256 (jacktrip-jacktrip-v1.8.1_GH0.tar.gz) = fb6ffa17cdaf3ee8a4cc8ec5af6aaf48408b2806e848f37a3c9ba6c4248959db
-SIZE (jacktrip-jacktrip-v1.8.1_GH0.tar.gz) = 5827678
+TIMESTAMP = 1684773492
+SHA256 (jacktrip-jacktrip-v1.9.0_GH0.tar.gz) = 7d6127e24c0a878eb1a7256c6aba9d5deb0fdd98724c67ebf7fd5a7f82b0b1c2
+SIZE (jacktrip-jacktrip-v1.9.0_GH0.tar.gz) = 5853889
 SHA256 (x42-weakjack-cddbeec_GH0.tar.gz) = 752b48f022c34a28ff97dbd66715b3fe83532257884ea0b3146d790bafe21124
 SIZE (x42-weakjack-cddbeec_GH0.tar.gz) = 7983
--- a/audio/mclk-lv2/Makefile
+++ b/audio/mclk-lv2/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	mclk
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.2.2
+DISTVERSION=	0.2.3
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2

--- a/audio/mclk-lv2/distinfo
+++ b/audio/mclk-lv2/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1667863752
-SHA256 (x42-mclk.lv2-v0.2.2_GH0.tar.gz) = a591aabfee91250c4f7342fdc8ce2a75c8a79ae96af524856e63cc02daa2f977
-SIZE (x42-mclk.lv2-v0.2.2_GH0.tar.gz) = 371352
+TIMESTAMP = 1685314590
+SHA256 (x42-mclk.lv2-v0.2.3_GH0.tar.gz) = 13140a27f022845374df5f3683fa1be15792fded01cde9540ab3b418c1628774
+SIZE (x42-mclk.lv2-v0.2.3_GH0.tar.gz) = 371403
--- a/audio/moc/Makefile
+++ b/audio/moc/Makefile
@ -21,7 +21,9 @@ INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}
 LDFLAGS+=	-L${LOCALBASE}/lib -L${BDB_LIB_DIR}

-OPTIONS_DEFINE=	AAC CURL DEBUG FFMPEG FLAC JACK MODPLUG MP3 MUSEPACK RCC \
+CONFIGURE_ARGS=	--without-ffmpeg
+
+OPTIONS_DEFINE=	AAC CURL DEBUG FLAC JACK MODPLUG MP3 MUSEPACK RCC \
 		SAMPLERATE SIDPLAY2 SNDFILE SPEEX VORBIS WAVPACK
 OPTIONS_DEFAULT=	MP3 VORBIS FLAC CURL WAVPACK
 CURL_DESC=	curl support (Internet streams)
@ -37,10 +39,6 @@ CURL_CONFIGURE_OFF=	--without-curl

 DEBUG_CONFIGURE_OFF=	--enable-debug=no

-FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
-FFMPEG_PLIST_FILES=	lib/moc/decoder_plugins/libffmpeg_decoder.so
-FFMPEG_CONFIGURE_OFF=	--without-ffmpeg
-
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_PLIST_FILES=	lib/moc/decoder_plugins/libflac_decoder.so
 FLAC_CONFIGURE_OFF=	--without-flac
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	musicpd
-PORTVERSION=	0.23.12
-PORTREVISION=	3
+PORTVERSION=	0.23.13
 CATEGORIES=	audio
 MASTER_SITES=	https://www.musicpd.org/download/mpd/${PORTVERSION:R}/
 DISTNAME=	mpd-${PORTVERSION}
@ -169,7 +168,7 @@ SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 # Input plugins
 CDPARANOIA_MESON_ENABLED=	cdio_paranoia
 CDPARANOIA_LIB_DEPENDS=	libcdio_paranoia.so:sysutils/libcdio-paranoia
-CURL_MESON_ENABLED=	curl
+CURL_MESON_ENABLED=	curl webdav
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 SMB_MESON_ENABLED=	smbclient
 SMB_USES=		samba:lib
--- a/audio/musicpd/distinfo
+++ b/audio/musicpd/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1674389526
-SHA256 (mpd-0.23.12.tar.xz) = b7fca62284ecc25a681ea6a07abc49200af5353be42cb5a31e3173be9d8702e7
-SIZE (mpd-0.23.12.tar.xz) = 774708
+TIMESTAMP = 1684823682
+SHA256 (mpd-0.23.13.tar.xz) = a96b01e6fbbb7e8ab25eb7c15d5c811c62eb19b76d143a802f51674791f1d519
+SIZE (mpd-0.23.13.tar.xz) = 776668
--- a/audio/musicpd/files/patch-doc_mpdconf.example
+++ b/audio/musicpd/files/patch-doc_mpdconf.example
@ -1,4 +1,4 @@
--- doc/mpdconf.example.orig	2021-11-11 09:16:36 UTC
+--- doc/mpdconf.example.orig	2023-05-22 17:46:38 UTC
 +++ doc/mpdconf.example
@@ -10,14 +10,14 @@
 # be disabled and audio files will only be accepted over ipc socket (using
@ -80,13 +80,13 @@
 #
 #database {
 #       plugin "simple"
-#       path "~/.local/share/mpd/db
+-#       path "~/.local/share/mpd/db"
 -#       cache_directory "~/.local/share/mpd/cache"
-+#       path "/var/mpd/.local/share/mpd/db
+#       path "/var/mpd/.local/share/mpd/db"
 +#       cache_directory "/var/mpd/.local/share/mpd/cache"
 #}
 #
- # An example of database config for a sattelite setup
+ # An example of database config for a satellite setup
@@ -227,14 +227,14 @@ input {
 #
 # An example of an OSS output:
--- a/audio/ncspot/Makefile
+++ b/audio/ncspot/Makefile
@ -1,7 +1,6 @@
 PORTNAME=	ncspot
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.13.0
-PORTREVISION=	2
+DISTVERSION=	0.13.2
 CATEGORIES=	audio

 MAINTAINER=	rodrigo@FreeBSD.org
@ -13,402 +12,19 @@ LICENSE_FILE=	${WRKSRC}/LICENSE

 LIB_DEPENDS=	libdbus-1.so:devel/dbus

-USES=		cargo ncurses ssl
+USES=		cargo ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	hrkfdn

-CARGO_CRATES=	addr2line-0.19.0 \
-		adler-1.0.2 \
-		aes-0.6.0 \
-		aes-ctr-0.6.0 \
-		aes-soft-0.6.4 \
-		aesni-0.10.0 \
-		ahash-0.8.3 \
-		aho-corasick-0.7.20 \
-		alsa-0.6.0 \
-		alsa-sys-0.3.1 \
-		android_system_properties-0.1.5 \
-		async-trait-0.1.66 \
-		autocfg-1.1.0 \
-		backtrace-0.3.67 \
-		base64-0.13.1 \
-		base64-0.21.0 \
-		bindgen-0.61.0 \
-		bitflags-1.3.2 \
-		block-0.1.6 \
-		block-buffer-0.9.0 \
-		block-buffer-0.10.4 \
-		bumpalo-3.12.0 \
-		bytecount-0.6.3 \
-		byteorder-1.4.3 \
-		bytes-1.4.0 \
-		cc-1.0.79 \
-		cesu8-1.1.0 \
-		cexpr-0.6.0 \
-		cfg-if-1.0.0 \
-		chrono-0.4.23 \
-		cipher-0.2.5 \
-		clang-sys-1.6.0 \
-		clap-4.1.8 \
-		clap_complete-4.1.4 \
-		clap_lex-0.3.2 \
-		clap_mangen-0.2.9 \
-		clipboard-0.5.0 \
-		clipboard-win-2.2.0 \
-		codespan-reporting-0.11.1 \
-		combine-4.6.6 \
-		cookie-0.16.2 \
-		cookie_store-0.19.0 \
-		core-foundation-0.9.3 \
-		core-foundation-sys-0.8.3 \
-		coreaudio-rs-0.10.0 \
-		coreaudio-sys-0.2.11 \
-		cpal-0.13.5 \
-		cpufeatures-0.2.5 \
-		crossbeam-channel-0.5.7 \
-		crossbeam-utils-0.8.15 \
-		crypto-common-0.1.6 \
-		crypto-mac-0.11.1 \
-		ctr-0.6.0 \
-		cursive-0.20.0 \
-		cursive_buffered_backend-0.6.1 \
-		cursive_core-0.3.7 \
-		cxx-1.0.92 \
-		cxx-build-1.0.92 \
-		cxxbridge-flags-1.0.92 \
-		cxxbridge-macro-1.0.92 \
-		darling-0.13.4 \
-		darling-0.14.3 \
-		darling_core-0.13.4 \
-		darling_core-0.14.3 \
-		darling_macro-0.13.4 \
-		darling_macro-0.14.3 \
-		dbus-0.9.7 \
-		dbus-tree-0.9.2 \
-		derive-new-0.5.9 \
-		digest-0.9.0 \
-		digest-0.10.6 \
-		dirs-next-1.0.2 \
-		dirs-next-2.0.0 \
-		dirs-sys-next-0.1.2 \
-		downcast-rs-1.2.0 \
-		encoding_rs-0.8.32 \
-		enum-map-2.4.2 \
-		enum-map-derive-0.11.0 \
-		enum_dispatch-0.3.11 \
-		enumset-1.0.12 \
-		enumset_derive-0.6.1 \
-		errno-0.2.8 \
-		errno-dragonfly-0.1.2 \
-		fastrand-1.9.0 \
-		fern-0.6.1 \
-		fixedbitset-0.4.2 \
-		fnv-1.0.7 \
-		foreign-types-0.3.2 \
-		foreign-types-shared-0.1.1 \
-		form_urlencoded-1.1.0 \
-		futures-0.3.26 \
-		futures-channel-0.3.26 \
-		futures-core-0.3.26 \
-		futures-executor-0.3.26 \
-		futures-io-0.3.26 \
-		futures-macro-0.3.26 \
-		futures-sink-0.3.26 \
-		futures-task-0.3.26 \
-		futures-util-0.3.26 \
-		generic-array-0.14.6 \
-		getrandom-0.2.8 \
-		gimli-0.27.2 \
-		glob-0.3.1 \
-		h2-0.3.16 \
-		half-1.8.2 \
-		hashbrown-0.12.3 \
-		headers-0.3.8 \
-		headers-core-0.2.0 \
-		heck-0.3.3 \
-		heck-0.4.1 \
-		hermit-abi-0.2.6 \
-		hermit-abi-0.3.1 \
-		hmac-0.11.0 \
-		http-0.2.9 \
-		http-body-0.4.5 \
-		httparse-1.8.0 \
-		httpdate-1.0.2 \
-		hyper-0.14.24 \
-		hyper-proxy-0.9.1 \
-		hyper-tls-0.5.0 \
-		iana-time-zone-0.1.53 \
-		iana-time-zone-haiku-0.1.1 \
-		ident_case-1.0.1 \
-		idna-0.3.0 \
-		indexmap-1.9.2 \
-		instant-0.1.12 \
-		io-lifetimes-1.0.6 \
-		ioctl-rs-0.2.0 \
-		ipnet-2.7.1 \
-		is-terminal-0.4.4 \
-		itoa-1.0.6 \
-		jni-0.19.0 \
-		jni-sys-0.3.0 \
-		jobserver-0.1.26 \
-		js-sys-0.3.61 \
-		lazy_static-1.4.0 \
-		lazycell-1.3.0 \
-		lewton-0.10.2 \
-		libc-0.2.140 \
-		libdbus-sys-0.2.4 \
-		libloading-0.7.4 \
-		libm-0.2.6 \
-		libpulse-binding-2.27.1 \
-		libpulse-simple-binding-2.27.1 \
-		libpulse-simple-sys-1.20.1 \
-		libpulse-sys-1.20.1 \
-		librespot-audio-0.4.2 \
-		librespot-core-0.4.2 \
-		librespot-metadata-0.4.2 \
-		librespot-playback-0.4.2 \
-		librespot-protocol-0.4.2 \
-		link-cplusplus-1.0.8 \
-		linux-raw-sys-0.1.4 \
-		lock_api-0.4.9 \
-		log-0.4.17 \
-		mac-notification-sys-0.5.6 \
-		mach-0.3.2 \
-		malloc_buf-0.0.6 \
-		maplit-1.0.2 \
-		maybe-async-0.2.7 \
-		memchr-2.5.0 \
-		memoffset-0.6.5 \
-		mime-0.3.16 \
-		minimal-lexical-0.2.1 \
-		miniz_oxide-0.6.2 \
-		mio-0.8.6 \
-		native-tls-0.2.11 \
-		ncurses-5.101.0 \
-		ndk-0.6.0 \
-		ndk-context-0.1.1 \
-		ndk-glue-0.6.2 \
-		ndk-macro-0.3.0 \
-		ndk-sys-0.3.0 \
-		nix-0.23.2 \
-		nix-0.24.3 \
-		nom-7.1.3 \
-		notify-rust-4.8.0 \
-		num-0.2.1 \
-		num-0.4.0 \
-		num-bigint-0.2.6 \
-		num-bigint-0.4.3 \
-		num-complex-0.2.4 \
-		num-complex-0.4.3 \
-		num-derive-0.3.3 \
-		num-integer-0.1.45 \
-		num-iter-0.1.43 \
-		num-rational-0.2.4 \
-		num-rational-0.4.1 \
-		num-traits-0.2.15 \
-		num_cpus-1.15.0 \
-		num_enum-0.5.11 \
-		num_enum_derive-0.5.11 \
-		num_threads-0.1.6 \
-		numtoa-0.1.0 \
-		objc-0.2.7 \
-		objc-foundation-0.1.1 \
-		objc_id-0.1.1 \
-		object-0.30.3 \
-		oboe-0.4.6 \
-		oboe-sys-0.4.5 \
-		ogg-0.8.0 \
-		once_cell-1.17.1 \
-		opaque-debug-0.3.0 \
-		openssl-0.10.45 \
-		openssl-macros-0.1.0 \
-		openssl-probe-0.1.5 \
-		openssl-sys-0.9.80 \
-		os_pipe-1.1.3 \
-		os_str_bytes-6.4.1 \
-		owning_ref-0.4.1 \
-		pancurses-0.17.0 \
-		parking_lot-0.11.2 \
-		parking_lot-0.12.1 \
-		parking_lot_core-0.8.6 \
-		parking_lot_core-0.9.7 \
-		parse_duration-2.1.1 \
-		pbkdf2-0.8.0 \
-		pdcurses-sys-0.7.1 \
-		peeking_take_while-0.1.2 \
-		percent-encoding-2.2.0 \
-		petgraph-0.6.3 \
-		pin-project-lite-0.2.9 \
-		pin-utils-0.1.0 \
-		pkg-config-0.3.26 \
-		platform-dirs-0.3.0 \
-		portaudio-rs-0.3.2 \
-		portaudio-sys-0.1.1 \
-		ppv-lite86-0.2.17 \
-		priority-queue-1.3.1 \
-		proc-macro-crate-1.3.1 \
-		proc-macro2-1.0.51 \
-		protobuf-2.28.0 \
-		protobuf-codegen-2.28.0 \
-		protobuf-codegen-pure-2.28.0 \
-		quick-xml-0.23.1 \
-		quote-1.0.23 \
-		rand-0.8.5 \
-		rand_chacha-0.3.1 \
-		rand_core-0.6.4 \
-		rand_distr-0.4.3 \
-		redox_syscall-0.2.16 \
-		redox_termios-0.1.2 \
-		redox_users-0.4.3 \
-		regex-1.7.1 \
-		regex-syntax-0.6.28 \
-		reqwest-0.11.14 \
-		ring-0.16.20 \
-		rodio-0.15.0 \
-		roff-0.2.1 \
-		rspotify-0.11.6 \
-		rspotify-http-0.11.6 \
-		rspotify-macros-0.11.6 \
-		rspotify-model-0.11.6 \
-		rustc-demangle-0.1.21 \
-		rustc-hash-1.1.0 \
-		rustc-serialize-0.3.24 \
-		rustc_version-0.4.0 \
-		rustix-0.36.9 \
-		rustls-0.20.8 \
-		rustversion-1.0.12 \
-		ryu-1.0.13 \
-		same-file-1.0.6 \
-		schannel-0.1.21 \
-		scopeguard-1.1.0 \
-		scratch-1.0.5 \
-		sct-0.7.0 \
-		security-framework-2.8.2 \
-		security-framework-sys-2.8.0 \
-		semver-1.0.16 \
-		serde-1.0.154 \
-		serde_cbor-0.11.2 \
-		serde_derive-1.0.154 \
-		serde_json-1.0.94 \
-		serde_spanned-0.6.1 \
-		serde_urlencoded-0.7.1 \
-		sha-1-0.9.8 \
-		sha1-0.10.5 \
-		sha2-0.10.6 \
-		shannon-0.2.0 \
-		shell-words-1.1.0 \
-		shlex-1.1.0 \
-		signal-hook-0.3.15 \
-		signal-hook-registry-1.4.1 \
-		slab-0.4.8 \
-		smallvec-1.10.0 \
-		socket2-0.4.9 \
-		spin-0.5.2 \
-		stable_deref_trait-1.2.0 \
-		stdweb-0.1.3 \
-		strsim-0.10.0 \
-		strum-0.22.0 \
-		strum-0.24.1 \
-		strum_macros-0.22.0 \
-		strum_macros-0.24.3 \
-		subtle-2.4.1 \
-		syn-1.0.109 \
-		tauri-winrt-notification-0.1.0 \
-		tempfile-3.4.0 \
-		term_size-0.3.2 \
-		termcolor-1.2.0 \
-		termion-1.5.6 \
-		thiserror-1.0.39 \
-		thiserror-impl-1.0.39 \
-		thread-id-4.0.0 \
-		time-0.1.45 \
-		time-0.3.20 \
-		time-core-0.1.0 \
-		time-macros-0.2.8 \
-		tinyvec-1.6.0 \
-		tinyvec_macros-0.1.1 \
-		tokio-1.26.0 \
-		tokio-macros-1.8.2 \
-		tokio-native-tls-0.3.1 \
-		tokio-stream-0.1.12 \
-		tokio-util-0.7.7 \
-		toml-0.7.2 \
-		toml_datetime-0.6.1 \
-		toml_edit-0.19.4 \
-		tower-service-0.3.2 \
-		tracing-0.1.37 \
-		tracing-core-0.1.30 \
-		tree_magic_mini-3.0.3 \
-		try-lock-0.2.4 \
-		typenum-1.16.0 \
-		unicode-bidi-0.3.11 \
-		unicode-ident-1.0.8 \
-		unicode-normalization-0.1.22 \
-		unicode-segmentation-1.10.1 \
-		unicode-width-0.1.10 \
-		untrusted-0.7.1 \
-		ureq-2.6.2 \
-		url-2.3.1 \
-		uuid-1.3.0 \
-		vcpkg-0.2.15 \
-		vergen-3.2.0 \
-		version_check-0.9.4 \
-		walkdir-2.3.2 \
-		want-0.3.0 \
-		wasi-0.10.0+wasi-snapshot-preview1 \
-		wasi-0.11.0+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.84 \
-		wasm-bindgen-backend-0.2.84 \
-		wasm-bindgen-futures-0.4.34 \
-		wasm-bindgen-macro-0.2.84 \
-		wasm-bindgen-macro-support-0.2.84 \
-		wasm-bindgen-shared-0.2.84 \
-		wayland-client-0.29.5 \
-		wayland-commons-0.29.5 \
-		wayland-protocols-0.29.5 \
-		wayland-scanner-0.29.5 \
-		wayland-sys-0.29.5 \
-		web-sys-0.3.61 \
-		webpki-0.22.0 \
-		webpki-roots-0.22.6 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		windows-0.39.0 \
-		windows-sys-0.42.0 \
-		windows-sys-0.45.0 \
-		windows-targets-0.42.1 \
-		windows_aarch64_gnullvm-0.42.1 \
-		windows_aarch64_msvc-0.39.0 \
-		windows_aarch64_msvc-0.42.1 \
-		windows_i686_gnu-0.39.0 \
-		windows_i686_gnu-0.42.1 \
-		windows_i686_msvc-0.39.0 \
-		windows_i686_msvc-0.42.1 \
-		windows_x86_64_gnu-0.39.0 \
-		windows_x86_64_gnu-0.42.1 \
-		windows_x86_64_gnullvm-0.42.1 \
-		windows_x86_64_msvc-0.39.0 \
-		windows_x86_64_msvc-0.42.1 \
-		winnow-0.3.5 \
-		winreg-0.5.1 \
-		winreg-0.10.1 \
-		wl-clipboard-rs-0.7.0 \
-		x11-clipboard-0.3.3 \
-		xcb-0.8.2 \
-		xi-unicode-0.3.0 \
-		xml-rs-0.8.4 \
-		zerocopy-0.6.1 \
-		zerocopy-derive-0.3.2
-
-CARGO_FEATURES=	--no-default-features cursive/pancurses-backend
+CARGO_FEATURES=	--no-default-features termion_backend

 PLIST_FILES=	bin/ncspot
 PORTDOCS=	README.md

-OPTIONS_DEFINE=		CLIPBOARD DOCS MPRIS NOTIFY PORTAUDIO PULSEAUDIO
+OPTIONS_DEFINE=		CLIPBOARD DOCS MPRIS NOTIFY
 OPTIONS_DEFAULT=	CLIPBOARD MPRIS NOTIFY PORTAUDIO
+OPTIONS_MULTI=		BACKEND
+OPTIONS_MULTI_BACKEND=	PORTAUDIO PULSEAUDIO

 CLIPBOARD_DESC=	Support for accessing X11 clipboard
 MPRIS_DESC=	D-Bus MPRIS support
--- a/audio/ncspot/Makefile.crates
+++ b/audio/ncspot/Makefile.crates
@ -0,0 +1,435 @@
+CARGO_CRATES=	addr2line-0.19.0 \
+		adler-1.0.2 \
+		aes-0.6.0 \
+		aes-ctr-0.6.0 \
+		aes-soft-0.6.4 \
+		aesni-0.10.0 \
+		ahash-0.8.3 \
+		aho-corasick-1.0.1 \
+		alsa-0.6.0 \
+		alsa-sys-0.3.1 \
+		android_system_properties-0.1.5 \
+		anstream-0.3.2 \
+		anstyle-1.0.0 \
+		anstyle-parse-0.2.0 \
+		anstyle-query-1.0.0 \
+		anstyle-wincon-1.0.1 \
+		async-broadcast-0.5.1 \
+		async-channel-1.8.0 \
+		async-executor-1.5.1 \
+		async-fs-1.6.0 \
+		async-io-1.13.0 \
+		async-lock-2.7.0 \
+		async-recursion-1.0.4 \
+		async-task-4.4.0 \
+		async-trait-0.1.68 \
+		atomic-waker-1.1.1 \
+		autocfg-1.1.0 \
+		backtrace-0.3.67 \
+		base64-0.13.1 \
+		base64-0.21.0 \
+		bindgen-0.64.0 \
+		bitflags-1.3.2 \
+		block-0.1.6 \
+		block-buffer-0.9.0 \
+		block-buffer-0.10.4 \
+		blocking-1.3.1 \
+		bumpalo-3.12.0 \
+		bytecount-0.6.3 \
+		byteorder-1.4.3 \
+		bytes-1.4.0 \
+		cc-1.0.79 \
+		cesu8-1.1.0 \
+		cexpr-0.6.0 \
+		cfg-if-1.0.0 \
+		chrono-0.4.24 \
+		cipher-0.2.5 \
+		clang-sys-1.6.1 \
+		clap-4.2.7 \
+		clap_builder-4.2.7 \
+		clap_complete-4.2.1 \
+		clap_lex-0.4.1 \
+		clap_mangen-0.2.10 \
+		clipboard-0.5.0 \
+		clipboard-win-2.2.0 \
+		codespan-reporting-0.11.1 \
+		colorchoice-1.0.0 \
+		combine-4.6.6 \
+		concurrent-queue-2.2.0 \
+		cookie-0.16.2 \
+		cookie_store-0.19.0 \
+		core-foundation-0.9.3 \
+		core-foundation-sys-0.8.4 \
+		coreaudio-rs-0.10.0 \
+		coreaudio-sys-0.2.12 \
+		cpal-0.13.5 \
+		cpufeatures-0.2.6 \
+		crossbeam-channel-0.5.7 \
+		crossbeam-utils-0.8.15 \
+		crypto-common-0.1.6 \
+		crypto-mac-0.11.1 \
+		ctr-0.6.0 \
+		cursive-0.20.0 \
+		cursive_buffered_backend-0.6.1 \
+		cursive_core-0.3.7 \
+		cxx-1.0.94 \
+		cxx-build-1.0.94 \
+		cxxbridge-flags-1.0.94 \
+		cxxbridge-macro-1.0.94 \
+		darling-0.13.4 \
+		darling-0.14.4 \
+		darling_core-0.13.4 \
+		darling_core-0.14.4 \
+		darling_macro-0.13.4 \
+		darling_macro-0.14.4 \
+		derivative-2.2.0 \
+		derive-new-0.5.9 \
+		digest-0.9.0 \
+		digest-0.10.6 \
+		dirs-4.0.0 \
+		dirs-next-1.0.2 \
+		dirs-next-2.0.0 \
+		dirs-sys-0.3.7 \
+		dirs-sys-next-0.1.2 \
+		downcast-rs-1.2.0 \
+		encoding_rs-0.8.32 \
+		enum-map-2.5.0 \
+		enum-map-derive-0.11.0 \
+		enum_dispatch-0.3.11 \
+		enumflags2-0.7.6 \
+		enumflags2_derive-0.7.6 \
+		enumset-1.0.12 \
+		enumset_derive-0.6.1 \
+		errno-0.3.0 \
+		errno-dragonfly-0.1.2 \
+		event-listener-2.5.3 \
+		fastrand-1.9.0 \
+		fern-0.6.2 \
+		fixedbitset-0.4.2 \
+		fnv-1.0.7 \
+		foreign-types-0.3.2 \
+		foreign-types-shared-0.1.1 \
+		form_urlencoded-1.1.0 \
+		futures-0.3.28 \
+		futures-channel-0.3.28 \
+		futures-core-0.3.28 \
+		futures-executor-0.3.28 \
+		futures-io-0.3.28 \
+		futures-lite-1.13.0 \
+		futures-macro-0.3.28 \
+		futures-sink-0.3.28 \
+		futures-task-0.3.28 \
+		futures-util-0.3.28 \
+		generic-array-0.14.7 \
+		getrandom-0.2.8 \
+		gimli-0.27.2 \
+		glob-0.3.1 \
+		h2-0.3.16 \
+		half-1.8.2 \
+		hashbrown-0.12.3 \
+		headers-0.3.8 \
+		headers-core-0.2.0 \
+		heck-0.3.3 \
+		heck-0.4.1 \
+		hermit-abi-0.2.6 \
+		hermit-abi-0.3.1 \
+		hex-0.4.3 \
+		hmac-0.11.0 \
+		http-0.2.9 \
+		http-body-0.4.5 \
+		httparse-1.8.0 \
+		httpdate-1.0.2 \
+		hyper-0.14.25 \
+		hyper-proxy-0.9.1 \
+		hyper-tls-0.5.0 \
+		iana-time-zone-0.1.56 \
+		iana-time-zone-haiku-0.1.1 \
+		ident_case-1.0.1 \
+		idna-0.3.0 \
+		indexmap-1.9.3 \
+		instant-0.1.12 \
+		io-lifetimes-1.0.10 \
+		ioctl-rs-0.2.0 \
+		ipnet-2.7.2 \
+		is-terminal-0.4.6 \
+		itoa-1.0.6 \
+		jni-0.19.0 \
+		jni-sys-0.3.0 \
+		jobserver-0.1.26 \
+		js-sys-0.3.61 \
+		lazy_static-1.4.0 \
+		lazycell-1.3.0 \
+		lewton-0.10.2 \
+		libc-0.2.142 \
+		libloading-0.7.4 \
+		libm-0.2.6 \
+		libpulse-binding-2.27.1 \
+		libpulse-simple-binding-2.27.1 \
+		libpulse-simple-sys-1.20.1 \
+		libpulse-sys-1.20.1 \
+		librespot-audio-0.4.2 \
+		librespot-core-0.4.2 \
+		librespot-metadata-0.4.2 \
+		librespot-playback-0.4.2 \
+		librespot-protocol-0.4.2 \
+		link-cplusplus-1.0.8 \
+		linux-raw-sys-0.3.1 \
+		lock_api-0.4.9 \
+		log-0.4.17 \
+		mac-notification-sys-0.5.6 \
+		mach-0.3.2 \
+		malloc_buf-0.0.6 \
+		maplit-1.0.2 \
+		maybe-async-0.2.7 \
+		memchr-2.5.0 \
+		memoffset-0.6.5 \
+		memoffset-0.7.1 \
+		mime-0.3.17 \
+		minimal-lexical-0.2.1 \
+		miniz_oxide-0.6.2 \
+		mio-0.8.6 \
+		native-tls-0.2.11 \
+		ncurses-5.101.0 \
+		ndk-0.6.0 \
+		ndk-context-0.1.1 \
+		ndk-glue-0.6.2 \
+		ndk-macro-0.3.0 \
+		ndk-sys-0.3.0 \
+		nix-0.23.2 \
+		nix-0.24.3 \
+		nix-0.26.2 \
+		nom-7.1.3 \
+		notify-rust-4.8.0 \
+		num-0.2.1 \
+		num-0.4.0 \
+		num-bigint-0.2.6 \
+		num-bigint-0.4.3 \
+		num-complex-0.2.4 \
+		num-complex-0.4.3 \
+		num-derive-0.3.3 \
+		num-integer-0.1.45 \
+		num-iter-0.1.43 \
+		num-rational-0.2.4 \
+		num-rational-0.4.1 \
+		num-traits-0.2.15 \
+		num_cpus-1.15.0 \
+		num_enum-0.5.11 \
+		num_enum_derive-0.5.11 \
+		num_threads-0.1.6 \
+		numtoa-0.1.0 \
+		objc-0.2.7 \
+		objc-foundation-0.1.1 \
+		objc_id-0.1.1 \
+		object-0.30.3 \
+		oboe-0.4.6 \
+		oboe-sys-0.4.5 \
+		ogg-0.8.0 \
+		once_cell-1.17.1 \
+		opaque-debug-0.3.0 \
+		openssl-0.10.49 \
+		openssl-macros-0.1.1 \
+		openssl-probe-0.1.5 \
+		openssl-sys-0.9.84 \
+		ordered-stream-0.2.0 \
+		os_pipe-1.1.3 \
+		owning_ref-0.4.1 \
+		pancurses-0.17.0 \
+		parking-2.1.0 \
+		parking_lot-0.11.2 \
+		parking_lot-0.12.1 \
+		parking_lot_core-0.8.6 \
+		parking_lot_core-0.9.7 \
+		parse_duration-2.1.1 \
+		pbkdf2-0.8.0 \
+		pdcurses-sys-0.7.1 \
+		peeking_take_while-0.1.2 \
+		percent-encoding-2.2.0 \
+		petgraph-0.6.3 \
+		pin-project-lite-0.2.9 \
+		pin-utils-0.1.0 \
+		pkg-config-0.3.26 \
+		platform-dirs-0.3.0 \
+		polling-2.8.0 \
+		portaudio-rs-0.3.2 \
+		portaudio-sys-0.1.1 \
+		ppv-lite86-0.2.17 \
+		priority-queue-1.3.1 \
+		proc-macro-crate-1.3.1 \
+		proc-macro2-1.0.56 \
+		protobuf-2.28.0 \
+		protobuf-codegen-2.28.0 \
+		protobuf-codegen-pure-2.28.0 \
+		quick-xml-0.23.1 \
+		quote-1.0.26 \
+		rand-0.8.5 \
+		rand_chacha-0.3.1 \
+		rand_core-0.6.4 \
+		rand_distr-0.4.3 \
+		redox_syscall-0.2.16 \
+		redox_syscall-0.3.5 \
+		redox_termios-0.1.2 \
+		redox_users-0.4.3 \
+		regex-1.8.1 \
+		regex-syntax-0.7.1 \
+		reqwest-0.11.17 \
+		ring-0.16.20 \
+		rodio-0.15.0 \
+		roff-0.2.1 \
+		rspotify-0.11.6 \
+		rspotify-http-0.11.6 \
+		rspotify-macros-0.11.6 \
+		rspotify-model-0.11.6 \
+		rustc-demangle-0.1.22 \
+		rustc-hash-1.1.0 \
+		rustc-serialize-0.3.24 \
+		rustc_version-0.4.0 \
+		rustix-0.37.7 \
+		rustls-0.20.8 \
+		rustversion-1.0.12 \
+		ryu-1.0.13 \
+		same-file-1.0.6 \
+		schannel-0.1.21 \
+		scopeguard-1.1.0 \
+		scratch-1.0.5 \
+		sct-0.7.0 \
+		security-framework-2.8.2 \
+		security-framework-sys-2.8.0 \
+		semver-1.0.17 \
+		serde-1.0.159 \
+		serde_cbor-0.11.2 \
+		serde_derive-1.0.159 \
+		serde_json-1.0.95 \
+		serde_repr-0.1.12 \
+		serde_spanned-0.6.1 \
+		serde_urlencoded-0.7.1 \
+		sha-1-0.9.8 \
+		sha1-0.10.5 \
+		sha2-0.10.6 \
+		shannon-0.2.0 \
+		shell-words-1.1.0 \
+		shlex-1.1.0 \
+		signal-hook-0.3.15 \
+		signal-hook-registry-1.4.1 \
+		slab-0.4.8 \
+		smallvec-1.10.0 \
+		socket2-0.4.9 \
+		spin-0.5.2 \
+		stable_deref_trait-1.2.0 \
+		static_assertions-1.1.0 \
+		stdweb-0.1.3 \
+		strsim-0.10.0 \
+		strum-0.22.0 \
+		strum-0.24.1 \
+		strum_macros-0.22.0 \
+		strum_macros-0.24.3 \
+		subtle-2.4.1 \
+		syn-1.0.109 \
+		syn-2.0.13 \
+		tauri-winrt-notification-0.1.0 \
+		tempfile-3.5.0 \
+		term_size-0.3.2 \
+		termcolor-1.2.0 \
+		termion-1.5.6 \
+		thiserror-1.0.40 \
+		thiserror-impl-1.0.40 \
+		thread-id-4.0.0 \
+		time-0.1.45 \
+		time-0.3.20 \
+		time-core-0.1.0 \
+		time-macros-0.2.8 \
+		tinyvec-1.6.0 \
+		tinyvec_macros-0.1.1 \
+		tokio-1.28.0 \
+		tokio-macros-2.1.0 \
+		tokio-native-tls-0.3.1 \
+		tokio-stream-0.1.14 \
+		tokio-util-0.7.8 \
+		toml-0.7.3 \
+		toml_datetime-0.6.1 \
+		toml_edit-0.19.8 \
+		tower-service-0.3.2 \
+		tracing-0.1.37 \
+		tracing-attributes-0.1.23 \
+		tracing-core-0.1.30 \
+		tree_magic_mini-3.0.3 \
+		try-lock-0.2.4 \
+		typenum-1.16.0 \
+		uds_windows-1.0.2 \
+		unicode-bidi-0.3.13 \
+		unicode-ident-1.0.8 \
+		unicode-normalization-0.1.22 \
+		unicode-segmentation-1.10.1 \
+		unicode-width-0.1.10 \
+		untrusted-0.7.1 \
+		ureq-2.6.2 \
+		url-2.3.1 \
+		utf8parse-0.2.1 \
+		uuid-1.3.0 \
+		vcpkg-0.2.15 \
+		vergen-3.2.0 \
+		version_check-0.9.4 \
+		waker-fn-1.1.0 \
+		walkdir-2.3.3 \
+		want-0.3.0 \
+		wasi-0.10.0+wasi-snapshot-preview1 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.84 \
+		wasm-bindgen-backend-0.2.84 \
+		wasm-bindgen-futures-0.4.34 \
+		wasm-bindgen-macro-0.2.84 \
+		wasm-bindgen-macro-support-0.2.84 \
+		wasm-bindgen-shared-0.2.84 \
+		wayland-client-0.29.5 \
+		wayland-commons-0.29.5 \
+		wayland-protocols-0.29.5 \
+		wayland-scanner-0.29.5 \
+		wayland-sys-0.29.5 \
+		web-sys-0.3.61 \
+		webpki-0.22.0 \
+		webpki-roots-0.22.6 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		windows-0.39.0 \
+		windows-0.48.0 \
+		windows-sys-0.42.0 \
+		windows-sys-0.45.0 \
+		windows-sys-0.48.0 \
+		windows-targets-0.42.2 \
+		windows-targets-0.48.0 \
+		windows_aarch64_gnullvm-0.42.2 \
+		windows_aarch64_gnullvm-0.48.0 \
+		windows_aarch64_msvc-0.39.0 \
+		windows_aarch64_msvc-0.42.2 \
+		windows_aarch64_msvc-0.48.0 \
+		windows_i686_gnu-0.39.0 \
+		windows_i686_gnu-0.42.2 \
+		windows_i686_gnu-0.48.0 \
+		windows_i686_msvc-0.39.0 \
+		windows_i686_msvc-0.42.2 \
+		windows_i686_msvc-0.48.0 \
+		windows_x86_64_gnu-0.39.0 \
+		windows_x86_64_gnu-0.42.2 \
+		windows_x86_64_gnu-0.48.0 \
+		windows_x86_64_gnullvm-0.42.2 \
+		windows_x86_64_gnullvm-0.48.0 \
+		windows_x86_64_msvc-0.39.0 \
+		windows_x86_64_msvc-0.42.2 \
+		windows_x86_64_msvc-0.48.0 \
+		winnow-0.4.1 \
+		winreg-0.5.1 \
+		winreg-0.10.1 \
+		wl-clipboard-rs-0.7.0 \
+		x11-clipboard-0.3.3 \
+		xcb-0.8.2 \
+		xi-unicode-0.3.0 \
+		xml-rs-0.8.4 \
+		zbus-3.11.1 \
+		zbus_macros-3.11.1 \
+		zbus_names-2.5.0 \
+		zerocopy-0.6.1 \
+		zerocopy-derive-0.3.2 \
+		zvariant-3.12.0 \
+		zvariant_derive-3.12.0 \
+		zvariant_utils-1.0.0
--- a/audio/ncspot/distinfo
+++ b/audio/ncspot/distinfo
@ -1,4 +1,4 @@
-TIMESTAMP = 1678481342
+TIMESTAMP = 1685263961
 SHA256 (rust/crates/addr2line-0.19.0.crate) = a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97
 SIZE (rust/crates/addr2line-0.19.0.crate) = 33210
 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
@ -13,16 +13,44 @@ SHA256 (rust/crates/aesni-0.10.0.crate) = ea2e11f5e94c2f7d386164cc2aa1f97823fed6
 SIZE (rust/crates/aesni-0.10.0.crate) = 100248
 SHA256 (rust/crates/ahash-0.8.3.crate) = 2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f
 SIZE (rust/crates/ahash-0.8.3.crate) = 42416
-SHA256 (rust/crates/aho-corasick-0.7.20.crate) = cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac
-SIZE (rust/crates/aho-corasick-0.7.20.crate) = 111440
+SHA256 (rust/crates/aho-corasick-1.0.1.crate) = 67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04
+SIZE (rust/crates/aho-corasick-1.0.1.crate) = 167320
 SHA256 (rust/crates/alsa-0.6.0.crate) = 5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b
 SIZE (rust/crates/alsa-0.6.0.crate) = 68171
 SHA256 (rust/crates/alsa-sys-0.3.1.crate) = db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527
 SIZE (rust/crates/alsa-sys-0.3.1.crate) = 32748
 SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311
 SIZE (rust/crates/android_system_properties-0.1.5.crate) = 5243
-SHA256 (rust/crates/async-trait-0.1.66.crate) = b84f9ebcc6c1f5b8cb160f6990096a5c127f423fcb6e1ccc46c370cbdfb75dfc
-SIZE (rust/crates/async-trait-0.1.66.crate) = 28599
+SHA256 (rust/crates/anstream-0.3.2.crate) = 0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163
+SIZE (rust/crates/anstream-0.3.2.crate) = 19504
+SHA256 (rust/crates/anstyle-1.0.0.crate) = 41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d
+SIZE (rust/crates/anstyle-1.0.0.crate) = 13972
+SHA256 (rust/crates/anstyle-parse-0.2.0.crate) = e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee
+SIZE (rust/crates/anstyle-parse-0.2.0.crate) = 24361
+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-1.0.1.crate) = 180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188
+SIZE (rust/crates/anstyle-wincon-1.0.1.crate) = 11718
+SHA256 (rust/crates/async-broadcast-0.5.1.crate) = 7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b
+SIZE (rust/crates/async-broadcast-0.5.1.crate) = 20134
+SHA256 (rust/crates/async-channel-1.8.0.crate) = cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833
+SIZE (rust/crates/async-channel-1.8.0.crate) = 13534
+SHA256 (rust/crates/async-executor-1.5.1.crate) = 6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb
+SIZE (rust/crates/async-executor-1.5.1.crate) = 18615
+SHA256 (rust/crates/async-fs-1.6.0.crate) = 279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06
+SIZE (rust/crates/async-fs-1.6.0.crate) = 16506
+SHA256 (rust/crates/async-io-1.13.0.crate) = 0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af
+SIZE (rust/crates/async-io-1.13.0.crate) = 37191
+SHA256 (rust/crates/async-lock-2.7.0.crate) = fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7
+SIZE (rust/crates/async-lock-2.7.0.crate) = 23631
+SHA256 (rust/crates/async-recursion-1.0.4.crate) = 0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba
+SIZE (rust/crates/async-recursion-1.0.4.crate) = 11521
+SHA256 (rust/crates/async-task-4.4.0.crate) = ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae
+SIZE (rust/crates/async-task-4.4.0.crate) = 35178
+SHA256 (rust/crates/async-trait-0.1.68.crate) = b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842
+SIZE (rust/crates/async-trait-0.1.68.crate) = 28625
+SHA256 (rust/crates/atomic-waker-1.1.1.crate) = 1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3
+SIZE (rust/crates/atomic-waker-1.1.1.crate) = 11551
 SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
 SIZE (rust/crates/autocfg-1.1.0.crate) = 13272
 SHA256 (rust/crates/backtrace-0.3.67.crate) = 233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca
@ -31,8 +59,8 @@ SHA256 (rust/crates/base64-0.13.1.crate) = 9e1b586273c5702936fe7b7d6896644d8be71
 SIZE (rust/crates/base64-0.13.1.crate) = 61002
 SHA256 (rust/crates/base64-0.21.0.crate) = a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a
 SIZE (rust/crates/base64-0.21.0.crate) = 72180
-SHA256 (rust/crates/bindgen-0.61.0.crate) = 8a022e58a142a46fea340d68012b9201c094e93ec3d033a944a24f8fd4a4f09a
-SIZE (rust/crates/bindgen-0.61.0.crate) = 199472
+SHA256 (rust/crates/bindgen-0.64.0.crate) = c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4
+SIZE (rust/crates/bindgen-0.64.0.crate) = 204700
 SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
 SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
 SHA256 (rust/crates/block-0.1.6.crate) = 0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a
@ -41,6 +69,8 @@ SHA256 (rust/crates/block-buffer-0.9.0.crate) = 4152116fd6e9dadb291ae18fc1ec3575
 SIZE (rust/crates/block-buffer-0.9.0.crate) = 7108
 SHA256 (rust/crates/block-buffer-0.10.4.crate) = 3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71
 SIZE (rust/crates/block-buffer-0.10.4.crate) = 10538
+SHA256 (rust/crates/blocking-1.3.1.crate) = 77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65
+SIZE (rust/crates/blocking-1.3.1.crate) = 19040
 SHA256 (rust/crates/bumpalo-3.12.0.crate) = 0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535
 SIZE (rust/crates/bumpalo-3.12.0.crate) = 81604
 SHA256 (rust/crates/bytecount-0.6.3.crate) = 2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c
@ -57,44 +87,50 @@ SHA256 (rust/crates/cexpr-0.6.0.crate) = 6fac387a98bb7c37292057cffc56d62ecb62990
 SIZE (rust/crates/cexpr-0.6.0.crate) = 17966
 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
 SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
-SHA256 (rust/crates/chrono-0.4.23.crate) = 16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f
-SIZE (rust/crates/chrono-0.4.23.crate) = 187259
+SHA256 (rust/crates/chrono-0.4.24.crate) = 4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b
+SIZE (rust/crates/chrono-0.4.24.crate) = 191330
 SHA256 (rust/crates/cipher-0.2.5.crate) = 12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801
 SIZE (rust/crates/cipher-0.2.5.crate) = 13099
-SHA256 (rust/crates/clang-sys-1.6.0.crate) = 77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a
-SIZE (rust/crates/clang-sys-1.6.0.crate) = 41211
-SHA256 (rust/crates/clap-4.1.8.crate) = c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5
-SIZE (rust/crates/clap-4.1.8.crate) = 207175
-SHA256 (rust/crates/clap_complete-4.1.4.crate) = 501ff0a401473ea1d4c3b125ff95506b62c5bc5768d818634195fbb7c4ad5ff4
-SIZE (rust/crates/clap_complete-4.1.4.crate) = 33288
-SHA256 (rust/crates/clap_lex-0.3.2.crate) = 350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09
-SIZE (rust/crates/clap_lex-0.3.2.crate) = 9650
-SHA256 (rust/crates/clap_mangen-0.2.9.crate) = bb0f09a0ca8f0dd8ac92c546b426f466ef19828185c6d504c80c48c9c2768ed9
-SIZE (rust/crates/clap_mangen-0.2.9.crate) = 14623
+SHA256 (rust/crates/clang-sys-1.6.1.crate) = c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f
+SIZE (rust/crates/clang-sys-1.6.1.crate) = 41346
+SHA256 (rust/crates/clap-4.2.7.crate) = 34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938
+SIZE (rust/crates/clap-4.2.7.crate) = 54028
+SHA256 (rust/crates/clap_builder-4.2.7.crate) = 914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd
+SIZE (rust/crates/clap_builder-4.2.7.crate) = 162405
+SHA256 (rust/crates/clap_complete-4.2.1.crate) = 1a19591b2ab0e3c04b588a0e04ddde7b9eaa423646d1b4a8092879216bf47473
+SIZE (rust/crates/clap_complete-4.2.1.crate) = 34008
+SHA256 (rust/crates/clap_lex-0.4.1.crate) = 8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1
+SIZE (rust/crates/clap_lex-0.4.1.crate) = 12122
+SHA256 (rust/crates/clap_mangen-0.2.10.crate) = 4237e29de9c6949982ba87d51709204504fb8ed2fd38232fcb1e5bf7d4ba48c8
+SIZE (rust/crates/clap_mangen-0.2.10.crate) = 14945
 SHA256 (rust/crates/clipboard-0.5.0.crate) = 25a904646c0340239dcf7c51677b33928bf24fdf424b79a57909c0109075b2e7
 SIZE (rust/crates/clipboard-0.5.0.crate) = 10009
 SHA256 (rust/crates/clipboard-win-2.2.0.crate) = e3a093d6fed558e5fe24c3dfc85a68bb68f1c824f440d3ba5aca189e2998786b
 SIZE (rust/crates/clipboard-win-2.2.0.crate) = 11079
 SHA256 (rust/crates/codespan-reporting-0.11.1.crate) = 3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e
 SIZE (rust/crates/codespan-reporting-0.11.1.crate) = 48963
+SHA256 (rust/crates/colorchoice-1.0.0.crate) = acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7
+SIZE (rust/crates/colorchoice-1.0.0.crate) = 6857
 SHA256 (rust/crates/combine-4.6.6.crate) = 35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4
 SIZE (rust/crates/combine-4.6.6.crate) = 132428
+SHA256 (rust/crates/concurrent-queue-2.2.0.crate) = 62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c
+SIZE (rust/crates/concurrent-queue-2.2.0.crate) = 19971
 SHA256 (rust/crates/cookie-0.16.2.crate) = e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb
 SIZE (rust/crates/cookie-0.16.2.crate) = 34632
 SHA256 (rust/crates/cookie_store-0.19.0.crate) = bca9b3c618262fc0c85ecbc814c144e04be9c6eec08b315e7cd1cfbe0bb6ca84
 SIZE (rust/crates/cookie_store-0.19.0.crate) = 31091
 SHA256 (rust/crates/core-foundation-0.9.3.crate) = 194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146
 SIZE (rust/crates/core-foundation-0.9.3.crate) = 27059
-SHA256 (rust/crates/core-foundation-sys-0.8.3.crate) = 5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc
-SIZE (rust/crates/core-foundation-sys-0.8.3.crate) = 17519
+SHA256 (rust/crates/core-foundation-sys-0.8.4.crate) = e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa
+SIZE (rust/crates/core-foundation-sys-0.8.4.crate) = 17725
 SHA256 (rust/crates/coreaudio-rs-0.10.0.crate) = 11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88
 SIZE (rust/crates/coreaudio-rs-0.10.0.crate) = 34487
-SHA256 (rust/crates/coreaudio-sys-0.2.11.crate) = 1a9444b94b8024feecc29e01a9706c69c1e26bfee480221c90764200cfd778fb
-SIZE (rust/crates/coreaudio-sys-0.2.11.crate) = 5432
+SHA256 (rust/crates/coreaudio-sys-0.2.12.crate) = f034b2258e6c4ade2f73bf87b21047567fb913ee9550837c2316d139b0262b24
+SIZE (rust/crates/coreaudio-sys-0.2.12.crate) = 5433
 SHA256 (rust/crates/cpal-0.13.5.crate) = 74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116
 SIZE (rust/crates/cpal-0.13.5.crate) = 93790
-SHA256 (rust/crates/cpufeatures-0.2.5.crate) = 28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320
-SIZE (rust/crates/cpufeatures-0.2.5.crate) = 11251
+SHA256 (rust/crates/cpufeatures-0.2.6.crate) = 280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181
+SIZE (rust/crates/cpufeatures-0.2.6.crate) = 11467
 SHA256 (rust/crates/crossbeam-channel-0.5.7.crate) = cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c
 SIZE (rust/crates/crossbeam-channel-0.5.7.crate) = 90257
 SHA256 (rust/crates/crossbeam-utils-0.8.15.crate) = 3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b
@ -111,64 +147,72 @@ SHA256 (rust/crates/cursive_buffered_backend-0.6.1.crate) = e902dfdc09ca6729606f
 SIZE (rust/crates/cursive_buffered_backend-0.6.1.crate) = 6420
 SHA256 (rust/crates/cursive_core-0.3.7.crate) = 4db3b58161228d0dcb45c7968c5e74c3f03ad39e8983e58ad7d57061aa2cd94d
 SIZE (rust/crates/cursive_core-0.3.7.crate) = 159235
-SHA256 (rust/crates/cxx-1.0.92.crate) = 9a140f260e6f3f79013b8bfc65e7ce630c9ab4388c6a89c71e07226f49487b72
-SIZE (rust/crates/cxx-1.0.92.crate) = 195895
-SHA256 (rust/crates/cxx-build-1.0.92.crate) = da6383f459341ea689374bf0a42979739dc421874f112ff26f829b8040b8e613
-SIZE (rust/crates/cxx-build-1.0.92.crate) = 84461
-SHA256 (rust/crates/cxxbridge-flags-1.0.92.crate) = 90201c1a650e95ccff1c8c0bb5a343213bdd317c6e600a93075bca2eff54ec97
-SIZE (rust/crates/cxxbridge-flags-1.0.92.crate) = 5254
-SHA256 (rust/crates/cxxbridge-macro-1.0.92.crate) = 0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56
-SIZE (rust/crates/cxxbridge-macro-1.0.92.crate) = 59533
+SHA256 (rust/crates/cxx-1.0.94.crate) = f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93
+SIZE (rust/crates/cxx-1.0.94.crate) = 196058
+SHA256 (rust/crates/cxx-build-1.0.94.crate) = 12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b
+SIZE (rust/crates/cxx-build-1.0.94.crate) = 84842
+SHA256 (rust/crates/cxxbridge-flags-1.0.94.crate) = 7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb
+SIZE (rust/crates/cxxbridge-flags-1.0.94.crate) = 5253
+SHA256 (rust/crates/cxxbridge-macro-1.0.94.crate) = 2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5
+SIZE (rust/crates/cxxbridge-macro-1.0.94.crate) = 59873
 SHA256 (rust/crates/darling-0.13.4.crate) = a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c
 SIZE (rust/crates/darling-0.13.4.crate) = 20895
-SHA256 (rust/crates/darling-0.14.3.crate) = c0808e1bd8671fb44a113a14e13497557533369847788fa2ae912b6ebfce9fa8
-SIZE (rust/crates/darling-0.14.3.crate) = 25124
+SHA256 (rust/crates/darling-0.14.4.crate) = 7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850
+SIZE (rust/crates/darling-0.14.4.crate) = 25168
 SHA256 (rust/crates/darling_core-0.13.4.crate) = 859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610
 SIZE (rust/crates/darling_core-0.13.4.crate) = 52937
-SHA256 (rust/crates/darling_core-0.14.3.crate) = 001d80444f28e193f30c2f293455da62dcf9a6b29918a4253152ae2b1de592cb
-SIZE (rust/crates/darling_core-0.14.3.crate) = 56254
+SHA256 (rust/crates/darling_core-0.14.4.crate) = 109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0
+SIZE (rust/crates/darling_core-0.14.4.crate) = 57485
 SHA256 (rust/crates/darling_macro-0.13.4.crate) = 9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835
 SIZE (rust/crates/darling_macro-0.13.4.crate) = 1910
-SHA256 (rust/crates/darling_macro-0.14.3.crate) = b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685
-SIZE (rust/crates/darling_macro-0.14.3.crate) = 1896
-SHA256 (rust/crates/dbus-0.9.7.crate) = 1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b
-SIZE (rust/crates/dbus-0.9.7.crate) = 104206
-SHA256 (rust/crates/dbus-tree-0.9.2.crate) = f456e698ae8e54575e19ddb1f9b7bce2298568524f215496b248eb9498b4f508
-SIZE (rust/crates/dbus-tree-0.9.2.crate) = 24235
+SHA256 (rust/crates/darling_macro-0.14.4.crate) = a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e
+SIZE (rust/crates/darling_macro-0.14.4.crate) = 1896
+SHA256 (rust/crates/derivative-2.2.0.crate) = fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b
+SIZE (rust/crates/derivative-2.2.0.crate) = 48076
 SHA256 (rust/crates/derive-new-0.5.9.crate) = 3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535
 SIZE (rust/crates/derive-new-0.5.9.crate) = 7733
 SHA256 (rust/crates/digest-0.9.0.crate) = d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066
 SIZE (rust/crates/digest-0.9.0.crate) = 13247
 SHA256 (rust/crates/digest-0.10.6.crate) = 8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f
 SIZE (rust/crates/digest-0.10.6.crate) = 19527
+SHA256 (rust/crates/dirs-4.0.0.crate) = ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059
+SIZE (rust/crates/dirs-4.0.0.crate) = 12503
 SHA256 (rust/crates/dirs-next-1.0.2.crate) = cf36e65a80337bea855cd4ef9b8401ffce06a7baedf2e85ec467b1ac3f6e82b6
 SIZE (rust/crates/dirs-next-1.0.2.crate) = 12979
 SHA256 (rust/crates/dirs-next-2.0.0.crate) = b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1
 SIZE (rust/crates/dirs-next-2.0.0.crate) = 11689
+SHA256 (rust/crates/dirs-sys-0.3.7.crate) = 1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6
+SIZE (rust/crates/dirs-sys-0.3.7.crate) = 10597
 SHA256 (rust/crates/dirs-sys-next-0.1.2.crate) = 4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d
 SIZE (rust/crates/dirs-sys-next-0.1.2.crate) = 10681
 SHA256 (rust/crates/downcast-rs-1.2.0.crate) = 9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650
 SIZE (rust/crates/downcast-rs-1.2.0.crate) = 11670
 SHA256 (rust/crates/encoding_rs-0.8.32.crate) = 071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394
 SIZE (rust/crates/encoding_rs-0.8.32.crate) = 1370046
-SHA256 (rust/crates/enum-map-2.4.2.crate) = 50c25992259941eb7e57b936157961b217a4fc8597829ddef0596d6c3cd86e1a
-SIZE (rust/crates/enum-map-2.4.2.crate) = 18042
+SHA256 (rust/crates/enum-map-2.5.0.crate) = 988f0d17a0fa38291e5f41f71ea8d46a5d5497b9054d5a759fae2cbb819f2356
+SIZE (rust/crates/enum-map-2.5.0.crate) = 18271
 SHA256 (rust/crates/enum-map-derive-0.11.0.crate) = 2a4da76b3b6116d758c7ba93f7ec6a35d2e2cf24feda76c6e38a375f4d5c59f2
 SIZE (rust/crates/enum-map-derive-0.11.0.crate) = 8218
 SHA256 (rust/crates/enum_dispatch-0.3.11.crate) = 11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2
 SIZE (rust/crates/enum_dispatch-0.3.11.crate) = 22247
+SHA256 (rust/crates/enumflags2-0.7.6.crate) = 0044ebdf7fbb2a772e0c0233a9d3173c5cd8af8ae7078d4c5188af44ffffaa4b
+SIZE (rust/crates/enumflags2-0.7.6.crate) = 15065
+SHA256 (rust/crates/enumflags2_derive-0.7.6.crate) = 9d2c772ccdbdfd1967b4f5d79d17c98ebf92009fdcc838db7aa434462f600c26
+SIZE (rust/crates/enumflags2_derive-0.7.6.crate) = 7898
 SHA256 (rust/crates/enumset-1.0.12.crate) = 19be8061a06ab6f3a6cf21106c873578bf01bd42ad15e0311a9c76161cb1c753
 SIZE (rust/crates/enumset-1.0.12.crate) = 20341
 SHA256 (rust/crates/enumset_derive-0.6.1.crate) = 03e7b551eba279bf0fa88b83a46330168c1560a52a94f5126f892f0b364ab3e0
 SIZE (rust/crates/enumset_derive-0.6.1.crate) = 10713
-SHA256 (rust/crates/errno-0.2.8.crate) = f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1
-SIZE (rust/crates/errno-0.2.8.crate) = 9276
+SHA256 (rust/crates/errno-0.3.0.crate) = 50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0
+SIZE (rust/crates/errno-0.3.0.crate) = 10268
 SHA256 (rust/crates/errno-dragonfly-0.1.2.crate) = aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf
 SIZE (rust/crates/errno-dragonfly-0.1.2.crate) = 1810
+SHA256 (rust/crates/event-listener-2.5.3.crate) = 0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0
+SIZE (rust/crates/event-listener-2.5.3.crate) = 15392
 SHA256 (rust/crates/fastrand-1.9.0.crate) = e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be
 SIZE (rust/crates/fastrand-1.9.0.crate) = 11910
-SHA256 (rust/crates/fern-0.6.1.crate) = 3bdd7b0849075e79ee9a1836df22c717d1eba30451796fdc631b04565dd11e2a
-SIZE (rust/crates/fern-0.6.1.crate) = 300402
+SHA256 (rust/crates/fern-0.6.2.crate) = d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee
+SIZE (rust/crates/fern-0.6.2.crate) = 304626
 SHA256 (rust/crates/fixedbitset-0.4.2.crate) = 0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80
 SIZE (rust/crates/fixedbitset-0.4.2.crate) = 15954
 SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
@ -179,26 +223,28 @@ SHA256 (rust/crates/foreign-types-shared-0.1.1.crate) = 00b0228411908ca8685dba7f
 SIZE (rust/crates/foreign-types-shared-0.1.1.crate) = 5672
 SHA256 (rust/crates/form_urlencoded-1.1.0.crate) = a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8
 SIZE (rust/crates/form_urlencoded-1.1.0.crate) = 8734
-SHA256 (rust/crates/futures-0.3.26.crate) = 13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84
-SIZE (rust/crates/futures-0.3.26.crate) = 52163
-SHA256 (rust/crates/futures-channel-0.3.26.crate) = 2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5
-SIZE (rust/crates/futures-channel-0.3.26.crate) = 32283
-SHA256 (rust/crates/futures-core-0.3.26.crate) = ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608
-SIZE (rust/crates/futures-core-0.3.26.crate) = 14708
-SHA256 (rust/crates/futures-executor-0.3.26.crate) = e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e
-SIZE (rust/crates/futures-executor-0.3.26.crate) = 17747
-SHA256 (rust/crates/futures-io-0.3.26.crate) = bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531
-SIZE (rust/crates/futures-io-0.3.26.crate) = 8913
-SHA256 (rust/crates/futures-macro-0.3.26.crate) = 95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70
-SIZE (rust/crates/futures-macro-0.3.26.crate) = 11257
-SHA256 (rust/crates/futures-sink-0.3.26.crate) = f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364
-SIZE (rust/crates/futures-sink-0.3.26.crate) = 7853
-SHA256 (rust/crates/futures-task-0.3.26.crate) = dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366
-SIZE (rust/crates/futures-task-0.3.26.crate) = 11855
-SHA256 (rust/crates/futures-util-0.3.26.crate) = 9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1
-SIZE (rust/crates/futures-util-0.3.26.crate) = 156709
-SHA256 (rust/crates/generic-array-0.14.6.crate) = bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9
-SIZE (rust/crates/generic-array-0.14.6.crate) = 15889
+SHA256 (rust/crates/futures-0.3.28.crate) = 23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40
+SIZE (rust/crates/futures-0.3.28.crate) = 53229
+SHA256 (rust/crates/futures-channel-0.3.28.crate) = 955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2
+SIZE (rust/crates/futures-channel-0.3.28.crate) = 32281
+SHA256 (rust/crates/futures-core-0.3.28.crate) = 4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c
+SIZE (rust/crates/futures-core-0.3.28.crate) = 14780
+SHA256 (rust/crates/futures-executor-0.3.28.crate) = ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0
+SIZE (rust/crates/futures-executor-0.3.28.crate) = 17743
+SHA256 (rust/crates/futures-io-0.3.28.crate) = 4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964
+SIZE (rust/crates/futures-io-0.3.28.crate) = 8910
+SHA256 (rust/crates/futures-lite-1.13.0.crate) = 49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce
+SIZE (rust/crates/futures-lite-1.13.0.crate) = 37058
+SHA256 (rust/crates/futures-macro-0.3.28.crate) = 89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72
+SIZE (rust/crates/futures-macro-0.3.28.crate) = 11272
+SHA256 (rust/crates/futures-sink-0.3.28.crate) = f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e
+SIZE (rust/crates/futures-sink-0.3.28.crate) = 7852
+SHA256 (rust/crates/futures-task-0.3.28.crate) = 76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65
+SIZE (rust/crates/futures-task-0.3.28.crate) = 11848
+SHA256 (rust/crates/futures-util-0.3.28.crate) = 26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533
+SIZE (rust/crates/futures-util-0.3.28.crate) = 158510
+SHA256 (rust/crates/generic-array-0.14.7.crate) = 85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a
+SIZE (rust/crates/generic-array-0.14.7.crate) = 15950
 SHA256 (rust/crates/getrandom-0.2.8.crate) = c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31
 SIZE (rust/crates/getrandom-0.2.8.crate) = 30553
 SHA256 (rust/crates/gimli-0.27.2.crate) = ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4
@ -223,6 +269,8 @@ SHA256 (rust/crates/hermit-abi-0.2.6.crate) = ee512640fe35acbfb4bb779db6f0d80704
 SIZE (rust/crates/hermit-abi-0.2.6.crate) = 13027
 SHA256 (rust/crates/hermit-abi-0.3.1.crate) = fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286
 SIZE (rust/crates/hermit-abi-0.3.1.crate) = 13793
+SHA256 (rust/crates/hex-0.4.3.crate) = 7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70
+SIZE (rust/crates/hex-0.4.3.crate) = 13299
 SHA256 (rust/crates/hmac-0.11.0.crate) = 2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b
 SIZE (rust/crates/hmac-0.11.0.crate) = 11385
 SHA256 (rust/crates/http-0.2.9.crate) = bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482
@ -233,32 +281,32 @@ SHA256 (rust/crates/httparse-1.8.0.crate) = d897f394bad6a705d5f4104762e116a75639
 SIZE (rust/crates/httparse-1.8.0.crate) = 29954
 SHA256 (rust/crates/httpdate-1.0.2.crate) = c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421
 SIZE (rust/crates/httpdate-1.0.2.crate) = 10673
-SHA256 (rust/crates/hyper-0.14.24.crate) = 5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c
-SIZE (rust/crates/hyper-0.14.24.crate) = 186392
+SHA256 (rust/crates/hyper-0.14.25.crate) = cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899
+SIZE (rust/crates/hyper-0.14.25.crate) = 195127
 SHA256 (rust/crates/hyper-proxy-0.9.1.crate) = ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc
 SIZE (rust/crates/hyper-proxy-0.9.1.crate) = 10317
 SHA256 (rust/crates/hyper-tls-0.5.0.crate) = d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905
 SIZE (rust/crates/hyper-tls-0.5.0.crate) = 13257
-SHA256 (rust/crates/iana-time-zone-0.1.53.crate) = 64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765
-SIZE (rust/crates/iana-time-zone-0.1.53.crate) = 20176
+SHA256 (rust/crates/iana-time-zone-0.1.56.crate) = 0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c
+SIZE (rust/crates/iana-time-zone-0.1.56.crate) = 19517
 SHA256 (rust/crates/iana-time-zone-haiku-0.1.1.crate) = 0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca
 SIZE (rust/crates/iana-time-zone-haiku-0.1.1.crate) = 7200
 SHA256 (rust/crates/ident_case-1.0.1.crate) = b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39
 SIZE (rust/crates/ident_case-1.0.1.crate) = 3492
 SHA256 (rust/crates/idna-0.3.0.crate) = e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6
 SIZE (rust/crates/idna-0.3.0.crate) = 271128
-SHA256 (rust/crates/indexmap-1.9.2.crate) = 1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399
-SIZE (rust/crates/indexmap-1.9.2.crate) = 54627
+SHA256 (rust/crates/indexmap-1.9.3.crate) = bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99
+SIZE (rust/crates/indexmap-1.9.3.crate) = 54653
 SHA256 (rust/crates/instant-0.1.12.crate) = 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c
 SIZE (rust/crates/instant-0.1.12.crate) = 6128
-SHA256 (rust/crates/io-lifetimes-1.0.6.crate) = cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3
-SIZE (rust/crates/io-lifetimes-1.0.6.crate) = 36068
+SHA256 (rust/crates/io-lifetimes-1.0.10.crate) = 9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220
+SIZE (rust/crates/io-lifetimes-1.0.10.crate) = 37294
 SHA256 (rust/crates/ioctl-rs-0.2.0.crate) = 607b0d5e3c8affe6744655ccd713c5d3763c09407e191cea94705f541fd45151
 SIZE (rust/crates/ioctl-rs-0.2.0.crate) = 4214
-SHA256 (rust/crates/ipnet-2.7.1.crate) = 30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146
-SIZE (rust/crates/ipnet-2.7.1.crate) = 26989
-SHA256 (rust/crates/is-terminal-0.4.4.crate) = 21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857
-SIZE (rust/crates/is-terminal-0.4.4.crate) = 7744
+SHA256 (rust/crates/ipnet-2.7.2.crate) = 12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f
+SIZE (rust/crates/ipnet-2.7.2.crate) = 27044
+SHA256 (rust/crates/is-terminal-0.4.6.crate) = 256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8
+SIZE (rust/crates/is-terminal-0.4.6.crate) = 7856
 SHA256 (rust/crates/itoa-1.0.6.crate) = 453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6
 SIZE (rust/crates/itoa-1.0.6.crate) = 10410
 SHA256 (rust/crates/jni-0.19.0.crate) = c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec
@ -275,10 +323,8 @@ SHA256 (rust/crates/lazycell-1.3.0.crate) = 830d08ce1d1d941e6b30645f1a0eb5643013
 SIZE (rust/crates/lazycell-1.3.0.crate) = 12502
 SHA256 (rust/crates/lewton-0.10.2.crate) = 777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030
 SIZE (rust/crates/lewton-0.10.2.crate) = 68807
-SHA256 (rust/crates/libc-0.2.140.crate) = 99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c
-SIZE (rust/crates/libc-0.2.140.crate) = 669153
-SHA256 (rust/crates/libdbus-sys-0.2.4.crate) = 9f8d7ae751e1cb825c840ae5e682f59b098cdfd213c350ac268b61449a5f58a0
-SIZE (rust/crates/libdbus-sys-0.2.4.crate) = 1556924
+SHA256 (rust/crates/libc-0.2.142.crate) = 6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317
+SIZE (rust/crates/libc-0.2.142.crate) = 679343
 SHA256 (rust/crates/libloading-0.7.4.crate) = b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f
 SIZE (rust/crates/libloading-0.7.4.crate) = 27580
 SHA256 (rust/crates/libm-0.2.6.crate) = 348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb
@ -303,8 +349,8 @@ SHA256 (rust/crates/librespot-protocol-0.4.2.crate) = 5d6d3ac6196ac0ea67bbe039f5
 SIZE (rust/crates/librespot-protocol-0.4.2.crate) = 12192
 SHA256 (rust/crates/link-cplusplus-1.0.8.crate) = ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5
 SIZE (rust/crates/link-cplusplus-1.0.8.crate) = 7674
-SHA256 (rust/crates/linux-raw-sys-0.1.4.crate) = f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4
-SIZE (rust/crates/linux-raw-sys-0.1.4.crate) = 878981
+SHA256 (rust/crates/linux-raw-sys-0.3.1.crate) = d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f
+SIZE (rust/crates/linux-raw-sys-0.3.1.crate) = 932203
 SHA256 (rust/crates/lock_api-0.4.9.crate) = 435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df
 SIZE (rust/crates/lock_api-0.4.9.crate) = 25685
 SHA256 (rust/crates/log-0.4.17.crate) = abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e
@ -323,8 +369,10 @@ SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2c
 SIZE (rust/crates/memchr-2.5.0.crate) = 65812
 SHA256 (rust/crates/memoffset-0.6.5.crate) = 5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce
 SIZE (rust/crates/memoffset-0.6.5.crate) = 7686
-SHA256 (rust/crates/mime-0.3.16.crate) = 2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d
-SIZE (rust/crates/mime-0.3.16.crate) = 15206
+SHA256 (rust/crates/memoffset-0.7.1.crate) = 5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4
+SIZE (rust/crates/memoffset-0.7.1.crate) = 8556
+SHA256 (rust/crates/mime-0.3.17.crate) = 6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a
+SIZE (rust/crates/mime-0.3.17.crate) = 15712
 SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a
 SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841
 SHA256 (rust/crates/miniz_oxide-0.6.2.crate) = b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa
@ -349,6 +397,8 @@ SHA256 (rust/crates/nix-0.23.2.crate) = 8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5
 SIZE (rust/crates/nix-0.23.2.crate) = 242042
 SHA256 (rust/crates/nix-0.24.3.crate) = fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069
 SIZE (rust/crates/nix-0.24.3.crate) = 266843
+SHA256 (rust/crates/nix-0.26.2.crate) = bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a
+SIZE (rust/crates/nix-0.26.2.crate) = 277973
 SHA256 (rust/crates/nom-7.1.3.crate) = d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a
 SIZE (rust/crates/nom-7.1.3.crate) = 117570
 SHA256 (rust/crates/notify-rust-4.8.0.crate) = 2bfa211d18e360f08e36c364308f394b5eb23a6629150690e109a916dc6f610e
@ -405,22 +455,24 @@ SHA256 (rust/crates/once_cell-1.17.1.crate) = b7e5500299e16ebb147ae15a00a942af26
 SIZE (rust/crates/once_cell-1.17.1.crate) = 32856
 SHA256 (rust/crates/opaque-debug-0.3.0.crate) = 624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5
 SIZE (rust/crates/opaque-debug-0.3.0.crate) = 5767
-SHA256 (rust/crates/openssl-0.10.45.crate) = b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1
-SIZE (rust/crates/openssl-0.10.45.crate) = 234763
-SHA256 (rust/crates/openssl-macros-0.1.0.crate) = b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c
-SIZE (rust/crates/openssl-macros-0.1.0.crate) = 5566
+SHA256 (rust/crates/openssl-0.10.49.crate) = 4d2f106ab837a24e03672c59b1239669a0596406ff657c3c0835b6b7f0f35a33
+SIZE (rust/crates/openssl-0.10.49.crate) = 251699
+SHA256 (rust/crates/openssl-macros-0.1.1.crate) = a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c
+SIZE (rust/crates/openssl-macros-0.1.1.crate) = 5601
 SHA256 (rust/crates/openssl-probe-0.1.5.crate) = ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf
 SIZE (rust/crates/openssl-probe-0.1.5.crate) = 7227
-SHA256 (rust/crates/openssl-sys-0.9.80.crate) = 23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7
-SIZE (rust/crates/openssl-sys-0.9.80.crate) = 61687
+SHA256 (rust/crates/openssl-sys-0.9.84.crate) = 3a20eace9dc2d82904039cb76dcf50fb1a0bba071cfd1629720b5d6f1ddba0fa
+SIZE (rust/crates/openssl-sys-0.9.84.crate) = 63137
+SHA256 (rust/crates/ordered-stream-0.2.0.crate) = 9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50
+SIZE (rust/crates/ordered-stream-0.2.0.crate) = 19077
 SHA256 (rust/crates/os_pipe-1.1.3.crate) = a53dbb20faf34b16087a931834cba2d7a73cc74af2b7ef345a4c8324e2409a12
 SIZE (rust/crates/os_pipe-1.1.3.crate) = 11438
-SHA256 (rust/crates/os_str_bytes-6.4.1.crate) = 9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee
-SIZE (rust/crates/os_str_bytes-6.4.1.crate) = 23101
 SHA256 (rust/crates/owning_ref-0.4.1.crate) = 6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce
 SIZE (rust/crates/owning_ref-0.4.1.crate) = 12658
 SHA256 (rust/crates/pancurses-0.17.0.crate) = 0352975c36cbacb9ee99bfb709b9db818bed43af57751797f8633649759d13db
 SIZE (rust/crates/pancurses-0.17.0.crate) = 34656
+SHA256 (rust/crates/parking-2.1.0.crate) = 14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e
+SIZE (rust/crates/parking-2.1.0.crate) = 9491
 SHA256 (rust/crates/parking_lot-0.11.2.crate) = 7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99
 SIZE (rust/crates/parking_lot-0.11.2.crate) = 39869
 SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f
@ -449,6 +501,8 @@ SHA256 (rust/crates/pkg-config-0.3.26.crate) = 6ac9a59f73473f1b8d852421e59e64809
 SIZE (rust/crates/pkg-config-0.3.26.crate) = 18662
 SHA256 (rust/crates/platform-dirs-0.3.0.crate) = e188d043c1a692985f78b5464853a263f1a27e5bd6322bad3a4078ee3c998a38
 SIZE (rust/crates/platform-dirs-0.3.0.crate) = 6744
+SHA256 (rust/crates/polling-2.8.0.crate) = 4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce
+SIZE (rust/crates/polling-2.8.0.crate) = 43554
 SHA256 (rust/crates/portaudio-rs-0.3.2.crate) = cdb6b5eff96ccc9bf44d34c379ab03ae944426d83d1694345bdf8159d561d562
 SIZE (rust/crates/portaudio-rs-0.3.2.crate) = 13267
 SHA256 (rust/crates/portaudio-sys-0.1.1.crate) = 5194a4fa953b4ffd851c320ef6f0484cd7278cb7169ea9d6c433e49b23f7b7f5
@ -459,8 +513,8 @@ SHA256 (rust/crates/priority-queue-1.3.1.crate) = 5ca9c6be70d989d21a136eb86c2d83
 SIZE (rust/crates/priority-queue-1.3.1.crate) = 33880
 SHA256 (rust/crates/proc-macro-crate-1.3.1.crate) = 7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919
 SIZE (rust/crates/proc-macro-crate-1.3.1.crate) = 9678
-SHA256 (rust/crates/proc-macro2-1.0.51.crate) = 5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6
-SIZE (rust/crates/proc-macro2-1.0.51.crate) = 41804
+SHA256 (rust/crates/proc-macro2-1.0.56.crate) = 2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435
+SIZE (rust/crates/proc-macro2-1.0.56.crate) = 44454
 SHA256 (rust/crates/protobuf-2.28.0.crate) = 106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94
 SIZE (rust/crates/protobuf-2.28.0.crate) = 167541
 SHA256 (rust/crates/protobuf-codegen-2.28.0.crate) = 033460afb75cf755fcfc16dfaed20b86468082a2ea24e05ac35ab4a099a017d6
@ -469,8 +523,8 @@ SHA256 (rust/crates/protobuf-codegen-pure-2.28.0.crate) = 95a29399fc94bcd3eeaa95
 SIZE (rust/crates/protobuf-codegen-pure-2.28.0.crate) = 58102
 SHA256 (rust/crates/quick-xml-0.23.1.crate) = 11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea
 SIZE (rust/crates/quick-xml-0.23.1.crate) = 161488
-SHA256 (rust/crates/quote-1.0.23.crate) = 8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b
-SIZE (rust/crates/quote-1.0.23.crate) = 28058
+SHA256 (rust/crates/quote-1.0.26.crate) = 4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc
+SIZE (rust/crates/quote-1.0.26.crate) = 28397
 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
@ -481,16 +535,18 @@ SHA256 (rust/crates/rand_distr-0.4.3.crate) = 32cb0b9bc82b0a0876c2dd994a7e7a2683
 SIZE (rust/crates/rand_distr-0.4.3.crate) = 58255
 SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a
 SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012
+SHA256 (rust/crates/redox_syscall-0.3.5.crate) = 567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29
+SIZE (rust/crates/redox_syscall-0.3.5.crate) = 23404
 SHA256 (rust/crates/redox_termios-0.1.2.crate) = 8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f
 SIZE (rust/crates/redox_termios-0.1.2.crate) = 3268
 SHA256 (rust/crates/redox_users-0.4.3.crate) = b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b
 SIZE (rust/crates/redox_users-0.4.3.crate) = 15353
-SHA256 (rust/crates/regex-1.7.1.crate) = 48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733
-SIZE (rust/crates/regex-1.7.1.crate) = 239648
-SHA256 (rust/crates/regex-syntax-0.6.28.crate) = 456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848
-SIZE (rust/crates/regex-syntax-0.6.28.crate) = 299288
-SHA256 (rust/crates/reqwest-0.11.14.crate) = 21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9
-SIZE (rust/crates/reqwest-0.11.14.crate) = 145216
+SHA256 (rust/crates/regex-1.8.1.crate) = af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370
+SIZE (rust/crates/regex-1.8.1.crate) = 248412
+SHA256 (rust/crates/regex-syntax-0.7.1.crate) = a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c
+SIZE (rust/crates/regex-syntax-0.7.1.crate) = 339705
+SHA256 (rust/crates/reqwest-0.11.17.crate) = 13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91
+SIZE (rust/crates/reqwest-0.11.17.crate) = 153775
 SHA256 (rust/crates/ring-0.16.20.crate) = 3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc
 SIZE (rust/crates/ring-0.16.20.crate) = 5082615
 SHA256 (rust/crates/rodio-0.15.0.crate) = ec0939e9f626e6c6f1989adb6226a039c855ca483053f0ee7c98b90e41cf731e
@ -505,16 +561,16 @@ SHA256 (rust/crates/rspotify-macros-0.11.6.crate) = 0c86521fc751c75235937f0014df
 SIZE (rust/crates/rspotify-macros-0.11.6.crate) = 2628
 SHA256 (rust/crates/rspotify-model-0.11.6.crate) = 3b03296b02fc44c9b792635cf8156d13b9d0edf629d74e80c4f551a97a1b83cd
 SIZE (rust/crates/rspotify-model-0.11.6.crate) = 23223
-SHA256 (rust/crates/rustc-demangle-0.1.21.crate) = 7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342
-SIZE (rust/crates/rustc-demangle-0.1.21.crate) = 27920
+SHA256 (rust/crates/rustc-demangle-0.1.22.crate) = d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b
+SIZE (rust/crates/rustc-demangle-0.1.22.crate) = 29044
 SHA256 (rust/crates/rustc-hash-1.1.0.crate) = 08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2
 SIZE (rust/crates/rustc-hash-1.1.0.crate) = 9331
 SHA256 (rust/crates/rustc-serialize-0.3.24.crate) = dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda
 SIZE (rust/crates/rustc-serialize-0.3.24.crate) = 45926
 SHA256 (rust/crates/rustc_version-0.4.0.crate) = bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366
 SIZE (rust/crates/rustc_version-0.4.0.crate) = 12175
-SHA256 (rust/crates/rustix-0.36.9.crate) = fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc
-SIZE (rust/crates/rustix-0.36.9.crate) = 293797
+SHA256 (rust/crates/rustix-0.37.7.crate) = 2aae838e49b3d63e9274e1c01833cc8139d3fec468c3b84688c628f44b1ae11d
+SIZE (rust/crates/rustix-0.37.7.crate) = 307751
 SHA256 (rust/crates/rustls-0.20.8.crate) = fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f
 SIZE (rust/crates/rustls-0.20.8.crate) = 270142
 SHA256 (rust/crates/rustversion-1.0.12.crate) = 4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06
@ -535,16 +591,18 @@ SHA256 (rust/crates/security-framework-2.8.2.crate) = a332be01508d814fed64bf28f7
 SIZE (rust/crates/security-framework-2.8.2.crate) = 77045
 SHA256 (rust/crates/security-framework-sys-2.8.0.crate) = 31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4
 SIZE (rust/crates/security-framework-sys-2.8.0.crate) = 17911
-SHA256 (rust/crates/semver-1.0.16.crate) = 58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a
-SIZE (rust/crates/semver-1.0.16.crate) = 29850
-SHA256 (rust/crates/serde-1.0.154.crate) = 8cdd151213925e7f1ab45a9bbfb129316bd00799784b174b7cc7bcd16961c49e
-SIZE (rust/crates/serde-1.0.154.crate) = 76802
+SHA256 (rust/crates/semver-1.0.17.crate) = bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed
+SIZE (rust/crates/semver-1.0.17.crate) = 29685
+SHA256 (rust/crates/serde-1.0.159.crate) = 3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065
+SIZE (rust/crates/serde-1.0.159.crate) = 77014
 SHA256 (rust/crates/serde_cbor-0.11.2.crate) = 2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5
 SIZE (rust/crates/serde_cbor-0.11.2.crate) = 44570
-SHA256 (rust/crates/serde_derive-1.0.154.crate) = 4fc80d722935453bcafdc2c9a73cd6fac4dc1938f0346035d84bf99fa9e33217
-SIZE (rust/crates/serde_derive-1.0.154.crate) = 55185
-SHA256 (rust/crates/serde_json-1.0.94.crate) = 1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea
-SIZE (rust/crates/serde_json-1.0.94.crate) = 144406
+SHA256 (rust/crates/serde_derive-1.0.159.crate) = 4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585
+SIZE (rust/crates/serde_derive-1.0.159.crate) = 55039
+SHA256 (rust/crates/serde_json-1.0.95.crate) = d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744
+SIZE (rust/crates/serde_json-1.0.95.crate) = 144618
+SHA256 (rust/crates/serde_repr-0.1.12.crate) = bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab
+SIZE (rust/crates/serde_repr-0.1.12.crate) = 9549
 SHA256 (rust/crates/serde_spanned-0.6.1.crate) = 0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4
 SIZE (rust/crates/serde_spanned-0.6.1.crate) = 7828
 SHA256 (rust/crates/serde_urlencoded-0.7.1.crate) = d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd
@ -575,6 +633,8 @@ SHA256 (rust/crates/spin-0.5.2.crate) = 6e63cff320ae2c57904679ba7cb63280a3dc4613
 SIZE (rust/crates/spin-0.5.2.crate) = 12004
 SHA256 (rust/crates/stable_deref_trait-1.2.0.crate) = a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3
 SIZE (rust/crates/stable_deref_trait-1.2.0.crate) = 8054
+SHA256 (rust/crates/static_assertions-1.1.0.crate) = a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f
+SIZE (rust/crates/static_assertions-1.1.0.crate) = 18480
 SHA256 (rust/crates/stdweb-0.1.3.crate) = ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e
 SIZE (rust/crates/stdweb-0.1.3.crate) = 90221
 SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623
@ -591,20 +651,22 @@ SHA256 (rust/crates/subtle-2.4.1.crate) = 6bdef32e8150c2a081110b42772ffe7d7c9032
 SIZE (rust/crates/subtle-2.4.1.crate) = 12630
 SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237
 SIZE (rust/crates/syn-1.0.109.crate) = 237611
+SHA256 (rust/crates/syn-2.0.13.crate) = 4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec
+SIZE (rust/crates/syn-2.0.13.crate) = 240619
 SHA256 (rust/crates/tauri-winrt-notification-0.1.0.crate) = c58de036c4d2e20717024de2a3c4bf56c301f07b21bc8ef9b57189fce06f1f3b
 SIZE (rust/crates/tauri-winrt-notification-0.1.0.crate) = 41529
-SHA256 (rust/crates/tempfile-3.4.0.crate) = af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95
-SIZE (rust/crates/tempfile-3.4.0.crate) = 30591
+SHA256 (rust/crates/tempfile-3.5.0.crate) = b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998
+SIZE (rust/crates/tempfile-3.5.0.crate) = 31129
 SHA256 (rust/crates/term_size-0.3.2.crate) = 1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9
 SIZE (rust/crates/term_size-0.3.2.crate) = 10917
 SHA256 (rust/crates/termcolor-1.2.0.crate) = be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6
 SIZE (rust/crates/termcolor-1.2.0.crate) = 17917
 SHA256 (rust/crates/termion-1.5.6.crate) = 077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e
 SIZE (rust/crates/termion-1.5.6.crate) = 22677
-SHA256 (rust/crates/thiserror-1.0.39.crate) = a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c
-SIZE (rust/crates/thiserror-1.0.39.crate) = 18729
-SHA256 (rust/crates/thiserror-impl-1.0.39.crate) = 5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e
-SIZE (rust/crates/thiserror-impl-1.0.39.crate) = 15057
+SHA256 (rust/crates/thiserror-1.0.40.crate) = 978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac
+SIZE (rust/crates/thiserror-1.0.40.crate) = 18709
+SHA256 (rust/crates/thiserror-impl-1.0.40.crate) = f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f
+SIZE (rust/crates/thiserror-impl-1.0.40.crate) = 15138
 SHA256 (rust/crates/thread-id-4.0.0.crate) = 5fdfe0627923f7411a43ec9ec9c39c3a9b4151be313e0922042581fb6c9b717f
 SIZE (rust/crates/thread-id-4.0.0.crate) = 8045
 SHA256 (rust/crates/time-0.1.45.crate) = 1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a
@ -619,26 +681,28 @@ SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a465126
 SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991
 SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20
 SIZE (rust/crates/tinyvec_macros-0.1.1.crate) = 5865
-SHA256 (rust/crates/tokio-1.26.0.crate) = 03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64
-SIZE (rust/crates/tokio-1.26.0.crate) = 646327
-SHA256 (rust/crates/tokio-macros-1.8.2.crate) = d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8
-SIZE (rust/crates/tokio-macros-1.8.2.crate) = 10071
+SHA256 (rust/crates/tokio-1.28.0.crate) = c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f
+SIZE (rust/crates/tokio-1.28.0.crate) = 660469
+SHA256 (rust/crates/tokio-macros-2.1.0.crate) = 630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e
+SIZE (rust/crates/tokio-macros-2.1.0.crate) = 11472
 SHA256 (rust/crates/tokio-native-tls-0.3.1.crate) = bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2
 SIZE (rust/crates/tokio-native-tls-0.3.1.crate) = 20676
-SHA256 (rust/crates/tokio-stream-0.1.12.crate) = 8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313
-SIZE (rust/crates/tokio-stream-0.1.12.crate) = 33839
-SHA256 (rust/crates/tokio-util-0.7.7.crate) = 5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2
-SIZE (rust/crates/tokio-util-0.7.7.crate) = 100405
-SHA256 (rust/crates/toml-0.7.2.crate) = f7afcae9e3f0fe2c370fd4657108972cbb2fa9db1b9f84849cefd80741b01cb6
-SIZE (rust/crates/toml-0.7.2.crate) = 47107
+SHA256 (rust/crates/tokio-stream-0.1.14.crate) = 397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842
+SIZE (rust/crates/tokio-stream-0.1.14.crate) = 35881
+SHA256 (rust/crates/tokio-util-0.7.8.crate) = 806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d
+SIZE (rust/crates/tokio-util-0.7.8.crate) = 101644
+SHA256 (rust/crates/toml-0.7.3.crate) = b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21
+SIZE (rust/crates/toml-0.7.3.crate) = 47227
 SHA256 (rust/crates/toml_datetime-0.6.1.crate) = 3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622
 SIZE (rust/crates/toml_datetime-0.6.1.crate) = 10765
-SHA256 (rust/crates/toml_edit-0.19.4.crate) = 9a1eb0622d28f4b9c90adc4ea4b2b46b47663fde9ac5fafcb14a1369d5508825
-SIZE (rust/crates/toml_edit-0.19.4.crate) = 94210
+SHA256 (rust/crates/toml_edit-0.19.8.crate) = 239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13
+SIZE (rust/crates/toml_edit-0.19.8.crate) = 94457
 SHA256 (rust/crates/tower-service-0.3.2.crate) = b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52
 SIZE (rust/crates/tower-service-0.3.2.crate) = 6847
 SHA256 (rust/crates/tracing-0.1.37.crate) = 8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8
 SIZE (rust/crates/tracing-0.1.37.crate) = 73888
+SHA256 (rust/crates/tracing-attributes-0.1.23.crate) = 4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a
+SIZE (rust/crates/tracing-attributes-0.1.23.crate) = 30450
 SHA256 (rust/crates/tracing-core-0.1.30.crate) = 24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a
 SIZE (rust/crates/tracing-core-0.1.30.crate) = 60351
 SHA256 (rust/crates/tree_magic_mini-3.0.3.crate) = 91adfd0607cacf6e4babdb870e9bec4037c1c4b151cfd279ccefc5e0c7feaa6d
@ -647,8 +711,10 @@ SHA256 (rust/crates/try-lock-0.2.4.crate) = 3528ecfd12c466c6f163363caf2d02a71161
 SIZE (rust/crates/try-lock-0.2.4.crate) = 4467
 SHA256 (rust/crates/typenum-1.16.0.crate) = 497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba
 SIZE (rust/crates/typenum-1.16.0.crate) = 42477
-SHA256 (rust/crates/unicode-bidi-0.3.11.crate) = 524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c
-SIZE (rust/crates/unicode-bidi-0.3.11.crate) = 43762
+SHA256 (rust/crates/uds_windows-1.0.2.crate) = ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d
+SIZE (rust/crates/uds_windows-1.0.2.crate) = 16206
+SHA256 (rust/crates/unicode-bidi-0.3.13.crate) = 92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460
+SIZE (rust/crates/unicode-bidi-0.3.13.crate) = 44477
 SHA256 (rust/crates/unicode-ident-1.0.8.crate) = e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4
 SIZE (rust/crates/unicode-ident-1.0.8.crate) = 41962
 SHA256 (rust/crates/unicode-normalization-0.1.22.crate) = 5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921
@ -663,6 +729,8 @@ SHA256 (rust/crates/ureq-2.6.2.crate) = 338b31dd1314f68f3aabf3ed57ab922df95ffcd9
 SIZE (rust/crates/ureq-2.6.2.crate) = 105924
 SHA256 (rust/crates/url-2.3.1.crate) = 0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643
 SIZE (rust/crates/url-2.3.1.crate) = 72777
+SHA256 (rust/crates/utf8parse-0.2.1.crate) = 711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a
+SIZE (rust/crates/utf8parse-0.2.1.crate) = 13435
 SHA256 (rust/crates/uuid-1.3.0.crate) = 1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79
 SIZE (rust/crates/uuid-1.3.0.crate) = 53736
 SHA256 (rust/crates/vcpkg-0.2.15.crate) = accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426
@ -671,8 +739,10 @@ SHA256 (rust/crates/vergen-3.2.0.crate) = e7141e445af09c8919f1d5f8a20dae0b20c3b5
 SIZE (rust/crates/vergen-3.2.0.crate) = 16897
 SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f
 SIZE (rust/crates/version_check-0.9.4.crate) = 14895
-SHA256 (rust/crates/walkdir-2.3.2.crate) = 808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56
-SIZE (rust/crates/walkdir-2.3.2.crate) = 23516
+SHA256 (rust/crates/waker-fn-1.1.0.crate) = 9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca
+SIZE (rust/crates/waker-fn-1.1.0.crate) = 7114
+SHA256 (rust/crates/walkdir-2.3.3.crate) = 36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698
+SIZE (rust/crates/walkdir-2.3.3.crate) = 23125
 SHA256 (rust/crates/want-0.3.0.crate) = 1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0
 SIZE (rust/crates/want-0.3.0.crate) = 6550
 SHA256 (rust/crates/wasi-0.10.0+wasi-snapshot-preview1.crate) = 1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f
@ -717,38 +787,58 @@ SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1
 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
 SHA256 (rust/crates/windows-0.39.0.crate) = f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a
 SIZE (rust/crates/windows-0.39.0.crate) = 12776691
+SHA256 (rust/crates/windows-0.48.0.crate) = e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f
+SIZE (rust/crates/windows-0.48.0.crate) = 11864177
 SHA256 (rust/crates/windows-sys-0.42.0.crate) = 5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7
 SIZE (rust/crates/windows-sys-0.42.0.crate) = 3006791
 SHA256 (rust/crates/windows-sys-0.45.0.crate) = 75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0
 SIZE (rust/crates/windows-sys-0.45.0.crate) = 2568659
-SHA256 (rust/crates/windows-targets-0.42.1.crate) = 8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7
-SIZE (rust/crates/windows-targets-0.42.1.crate) = 5524
-SHA256 (rust/crates/windows_aarch64_gnullvm-0.42.1.crate) = 8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608
-SIZE (rust/crates/windows_aarch64_gnullvm-0.42.1.crate) = 362795
+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.42.2.crate) = 8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071
+SIZE (rust/crates/windows-targets-0.42.2.crate) = 5492
+SHA256 (rust/crates/windows-targets-0.48.0.crate) = 7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5
+SIZE (rust/crates/windows-targets-0.48.0.crate) = 7466
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8
+SIZE (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 364071
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.48.0.crate) = 91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc
+SIZE (rust/crates/windows_aarch64_gnullvm-0.48.0.crate) = 366543
 SHA256 (rust/crates/windows_aarch64_msvc-0.39.0.crate) = ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2
 SIZE (rust/crates/windows_aarch64_msvc-0.39.0.crate) = 661960
-SHA256 (rust/crates/windows_aarch64_msvc-0.42.1.crate) = 4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7
-SIZE (rust/crates/windows_aarch64_msvc-0.42.1.crate) = 664655
+SHA256 (rust/crates/windows_aarch64_msvc-0.42.2.crate) = e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43
+SIZE (rust/crates/windows_aarch64_msvc-0.42.2.crate) = 666981
+SHA256 (rust/crates/windows_aarch64_msvc-0.48.0.crate) = b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3
+SIZE (rust/crates/windows_aarch64_msvc-0.48.0.crate) = 671479
 SHA256 (rust/crates/windows_i686_gnu-0.39.0.crate) = 763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b
 SIZE (rust/crates/windows_i686_gnu-0.39.0.crate) = 818115
-SHA256 (rust/crates/windows_i686_gnu-0.42.1.crate) = de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640
-SIZE (rust/crates/windows_i686_gnu-0.42.1.crate) = 733428
+SHA256 (rust/crates/windows_i686_gnu-0.42.2.crate) = c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f
+SIZE (rust/crates/windows_i686_gnu-0.42.2.crate) = 736236
+SHA256 (rust/crates/windows_i686_gnu-0.48.0.crate) = 622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241
+SIZE (rust/crates/windows_i686_gnu-0.48.0.crate) = 741490
 SHA256 (rust/crates/windows_i686_msvc-0.39.0.crate) = 7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106
 SIZE (rust/crates/windows_i686_msvc-0.39.0.crate) = 724575
-SHA256 (rust/crates/windows_i686_msvc-0.42.1.crate) = bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605
-SIZE (rust/crates/windows_i686_msvc-0.42.1.crate) = 722583
+SHA256 (rust/crates/windows_i686_msvc-0.42.2.crate) = 44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060
+SIZE (rust/crates/windows_i686_msvc-0.42.2.crate) = 724951
+SHA256 (rust/crates/windows_i686_msvc-0.48.0.crate) = 4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00
+SIZE (rust/crates/windows_i686_msvc-0.48.0.crate) = 730056
 SHA256 (rust/crates/windows_x86_64_gnu-0.39.0.crate) = 6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65
 SIZE (rust/crates/windows_x86_64_gnu-0.39.0.crate) = 790933
-SHA256 (rust/crates/windows_x86_64_gnu-0.42.1.crate) = c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45
-SIZE (rust/crates/windows_x86_64_gnu-0.42.1.crate) = 697614
-SHA256 (rust/crates/windows_x86_64_gnullvm-0.42.1.crate) = 628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463
-SIZE (rust/crates/windows_x86_64_gnullvm-0.42.1.crate) = 362788
+SHA256 (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36
+SIZE (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 699373
+SHA256 (rust/crates/windows_x86_64_gnu-0.48.0.crate) = ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1
+SIZE (rust/crates/windows_x86_64_gnu-0.48.0.crate) = 703595
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3
+SIZE (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 364068
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.48.0.crate) = 7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953
+SIZE (rust/crates/windows_x86_64_gnullvm-0.48.0.crate) = 366536
 SHA256 (rust/crates/windows_x86_64_msvc-0.39.0.crate) = 5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809
 SIZE (rust/crates/windows_x86_64_msvc-0.39.0.crate) = 662005
-SHA256 (rust/crates/windows_x86_64_msvc-0.42.1.crate) = 447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd
-SIZE (rust/crates/windows_x86_64_msvc-0.42.1.crate) = 664606
-SHA256 (rust/crates/winnow-0.3.5.crate) = ee7b2c67f962bf5042bfd8b6a916178df33a26eec343ae064cb8e069f638fa6f
-SIZE (rust/crates/winnow-0.3.5.crate) = 176638
+SHA256 (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0
+SIZE (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 666936
+SHA256 (rust/crates/windows_x86_64_msvc-0.48.0.crate) = 1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a
+SIZE (rust/crates/windows_x86_64_msvc-0.48.0.crate) = 671422
+SHA256 (rust/crates/winnow-0.4.1.crate) = ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28
+SIZE (rust/crates/winnow-0.4.1.crate) = 138177
 SHA256 (rust/crates/winreg-0.5.1.crate) = a27a759395c1195c4cc5cda607ef6f8f6498f64e78f7900f5de0a127a424704a
 SIZE (rust/crates/winreg-0.5.1.crate) = 17693
 SHA256 (rust/crates/winreg-0.10.1.crate) = 80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d
@ -763,9 +853,21 @@ SHA256 (rust/crates/xi-unicode-0.3.0.crate) = a67300977d3dc3f8034dae89778f502b6b
 SIZE (rust/crates/xi-unicode-0.3.0.crate) = 87001
 SHA256 (rust/crates/xml-rs-0.8.4.crate) = d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3
 SIZE (rust/crates/xml-rs-0.8.4.crate) = 52690
+SHA256 (rust/crates/zbus-3.11.1.crate) = 3dc29e76f558b2cb94190e8605ecfe77dd40f5df8c072951714b4b71a97f5848
+SIZE (rust/crates/zbus-3.11.1.crate) = 142580
+SHA256 (rust/crates/zbus_macros-3.11.1.crate) = 62a80fd82c011cd08459eaaf1fd83d3090c1b61e6d5284360074a7475af3a85d
+SIZE (rust/crates/zbus_macros-3.11.1.crate) = 25824
+SHA256 (rust/crates/zbus_names-2.5.0.crate) = f34f314916bd89bdb9934154627fab152f4f28acdda03e7c4c68181b214fe7e3
+SIZE (rust/crates/zbus_names-2.5.0.crate) = 9861
 SHA256 (rust/crates/zerocopy-0.6.1.crate) = 332f188cc1bcf1fe1064b8c58d150f497e697f49774aa846f2dc949d9a25f236
 SIZE (rust/crates/zerocopy-0.6.1.crate) = 23933
 SHA256 (rust/crates/zerocopy-derive-0.3.2.crate) = 6505e6815af7de1746a08f69c69606bb45695a17149517680f3b2149713b19a3
 SIZE (rust/crates/zerocopy-derive-0.3.2.crate) = 515746
-SHA256 (hrkfdn-ncspot-v0.13.0_GH0.tar.gz) = 35210f8237a20eb894dc6b7cc517e60c82c2e93ff5940c267fe0bf673eccc411
-SIZE (hrkfdn-ncspot-v0.13.0_GH0.tar.gz) = 233688
+SHA256 (rust/crates/zvariant-3.12.0.crate) = 46fe4914a985446d6fd287019b5fceccce38303d71407d9e6e711d44954a05d8
+SIZE (rust/crates/zvariant-3.12.0.crate) = 71199
+SHA256 (rust/crates/zvariant_derive-3.12.0.crate) = 34c20260af4b28b3275d6676c7e2a6be0d4332e8e0aba4616d34007fd84e462a
+SIZE (rust/crates/zvariant_derive-3.12.0.crate) = 10828
+SHA256 (rust/crates/zvariant_utils-1.0.0.crate) = 53b22993dbc4d128a17a3b6c92f1c63872dd67198537ee728d8b5d7c40640a8b
+SIZE (rust/crates/zvariant_utils-1.0.0.crate) = 6230
+SHA256 (hrkfdn-ncspot-v0.13.2_GH0.tar.gz) = c329fc3fe229c47c2b3490555b4c8df550a3e2bbe3d0ade4e07f59434fa14e77
+SIZE (hrkfdn-ncspot-v0.13.2_GH0.tar.gz) = 238534
--- a/audio/py-pulsectl/Makefile
+++ b/audio/py-pulsectl/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	pulsectl
-DISTVERSION=	23.5.1
+DISTVERSION=	23.5.2
 CATEGORIES=	audio python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/audio/py-pulsectl/distinfo
+++ b/audio/py-pulsectl/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1683791250
-SHA256 (pulsectl-23.5.1.tar.gz) = 8efc260ed7212ee4f9e50a8b856c84911265f4eac42cc6c02c7b37c851a2834b
-SIZE (pulsectl-23.5.1.tar.gz) = 41131
+TIMESTAMP = 1684981145
+SHA256 (pulsectl-23.5.2.tar.gz) = e911d398eaf0539cf3c63b4217357b51a3d1b7e4a50607d1591cf2b49f5d2c6a
+SIZE (pulsectl-23.5.2.tar.gz) = 41119
--- a/audio/virtual_oss/Makefile
+++ b/audio/virtual_oss/Makefile
@ -1,7 +1,6 @@
 PORTNAME=	virtual_oss
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.3.0
-PORTREVISION=	2
+DISTVERSION=	1.3.1
 CATEGORIES=	audio

 MAINTAINER=	hselasky@FreeBSD.org
--- a/audio/virtual_oss/distinfo
+++ b/audio/virtual_oss/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1669555793
-SHA256 (hselasky-virtual_oss-v1.3.0_GH0.tar.gz) = 6faf812059c2831c10c7bfbf145147133acc58f022f31e561e3c70b4c27e626a
-SIZE (hselasky-virtual_oss-v1.3.0_GH0.tar.gz) = 72081
+TIMESTAMP = 1685186028
+SHA256 (hselasky-virtual_oss-v1.3.1_GH0.tar.gz) = d4aa8a1b1362c7d0f1f5478545871da5334717965a6ed351266b993d934d8912
+SIZE (hselasky-virtual_oss-v1.3.1_GH0.tar.gz) = 72082
--- a/audio/x42-plugins-lv2/Makefile
+++ b/audio/x42-plugins-lv2/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	x42-plugins
-DISTVERSION=	20230315 # the version is published here: http://gareus.org/misc/x42-plugins.php
-PORTREVISION=	1
+DISTVERSION=	20230512 # the version is published here: http://gareus.org/misc/x42-plugins.php
 CATEGORIES=	audio
 MASTER_SITES=	http://gareus.org/misc/x42-plugins/
 PKGNAMESUFFIX=	-lv2
--- a/audio/x42-plugins-lv2/distinfo
+++ b/audio/x42-plugins-lv2/distinfo
@ -1,5 +1,5 @@
-TIMESTAMP = 1679243637
-SHA256 (x42-plugins-20230315.tar.xz) = 97b5a0f86efde62e10148f7834770f0e7bc931871f40e35490825ec97d9b668b
-SIZE (x42-plugins-20230315.tar.xz) = 3595100
+TIMESTAMP = 1684992169
+SHA256 (x42-plugins-20230512.tar.xz) = b91d654372e6569b8cd4d0c484dfedbe4a343d47542672a89cd9523778a62635
+SIZE (x42-plugins-20230512.tar.xz) = 3559392
 SHA256 (x42-convoLV2-ff291a3_GH0.tar.gz) = 7cd61bad49daeb94de35aca9eb847575f25068d9d9fc9adda7d05ba87fb98a99
 SIZE (x42-convoLV2-ff291a3_GH0.tar.gz) = 60157
--- a/audio/x42-plugins-lv2/pkg-plist
+++ b/audio/x42-plugins-lv2/pkg-plist
@ -17,9 +17,6 @@ lib/lv2/controlfilter.lv2/controlfilter.so
 lib/lv2/controlfilter.lv2/controlfilter.ttl
 lib/lv2/controlfilter.lv2/manifest.ttl
 lib/lv2/controlfilter.lv2/presets.ttl
-lib/lv2/convo.lv2/convoLV2.so
-lib/lv2/convo.lv2/convoLV2.ttl
-lib/lv2/convo.lv2/manifest.ttl
 lib/lv2/darc.lv2/darc.so
 lib/lv2/darc.lv2/darc.ttl
 lib/lv2/darc.lv2/darcUI_gl.so
--- a/benchmarks/ddosify/Makefile
+++ b/benchmarks/ddosify/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	ddosify
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.16.7
+DISTVERSION=	1.0.1
 CATEGORIES=	benchmarks

 MAINTAINER=	0xdutra@gmail.com
--- a/benchmarks/ddosify/distinfo
+++ b/benchmarks/ddosify/distinfo
@ -1,6 +1,6 @@
-TIMESTAMP = 1682822174
-SHA256 (ddosify-ddosify-v0.16.7_GH0.tar.gz) = 025029a312debd41c82baa373275e6ede169a93b1beb869142319fa60f4b5c0c
-SIZE (ddosify-ddosify-v0.16.7_GH0.tar.gz) = 1208687
+TIMESTAMP = 1684895665
+SHA256 (ddosify-ddosify-v1.0.1_GH0.tar.gz) = b02a11310e47009912d070079fb725bfd762ee639f77139ab039761ac17f48b3
+SIZE (ddosify-ddosify-v1.0.1_GH0.tar.gz) = 1236413
 SHA256 (antchfx-xmlquery-v1.3.13_GH0.tar.gz) = e882143ac161874fc3d9a91f1e19ab78271b5aa37a7d8541e728b566c405e36c
 SIZE (antchfx-xmlquery-v1.3.13_GH0.tar.gz) = 21490
 SHA256 (antchfx-xpath-v1.2.1_GH0.tar.gz) = cd9962512d4b3611b500621c1aeaf12780648845f7c976050c2bcba5c5d222c4
--- a/biology/hyphy/Makefile
+++ b/biology/hyphy/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	hyphy
-DISTVERSION=	2.5.50
+DISTVERSION=	2.5.51hf
 CATEGORIES=	biology

 MAINTAINER=	jrm@FreeBSD.org
--- a/biology/hyphy/distinfo
+++ b/biology/hyphy/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1681919231
-SHA256 (veg-hyphy-2.5.50_GH0.tar.gz) = c7597db75275cf017a64719d3134c5a0dca38e04c2e70b9d518f49bbb5f83032
-SIZE (veg-hyphy-2.5.50_GH0.tar.gz) = 5648743
+TIMESTAMP = 1685303680
+SHA256 (veg-hyphy-2.5.51hf_GH0.tar.gz) = 403a5d07a4e7e67d3d8136fa83649713ad28223a2519e5fba3aa82697a03375f
+SIZE (veg-hyphy-2.5.51hf_GH0.tar.gz) = 5620954
--- a/biology/libcombine/files/patch-CMakeLists.txt
+++ b/biology/libcombine/files/patch-CMakeLists.txt
@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2022-12-07 09:35:06 UTC
+++ CMakeLists.txt
+@@ -44,7 +44,7 @@ set(LIBCOMBINE_VERSION "${LIBCOMBINE_VERSION_MAJOR}.${
+ set(PACKAGE_NAME "libCombine")
+ 
+ project(libCombine VERSION "${LIBCOMBINE_VERSION_MAJOR}.${LIBCOMBINE_VERSION_MINOR}.${LIBCOMBINE_VERSION_PATCH}"
+-                   LANGUAGES CXX)
+                   LANGUAGES C CXX)
+ 
+ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
--- a/biology/libsbml/Makefile
+++ b/biology/libsbml/Makefile
@ -1,9 +1,7 @@
 PORTNAME=	libsbml
-PORTVERSION=	5.19.0
-PORTREVISION=	2
+PORTVERSION=	5.20.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	biology devel
-MASTER_SITES=	SF/sbml/libsbml/${PORTVERSION}/stable
-DISTNAME=	libSBML-${PORTVERSION}-core-src

 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	API Library for Working with SBML File
@ -14,22 +12,46 @@ WWW=		https://sbml.org/software/libsbml/ \
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.txt

-USES=		cmake iconv:build pathfix
+USES=		cmake:testing iconv:build pathfix

-CMAKE_OFF=	EXIT_ON_ERROR LIBSBML_USE_STRICT_INCLUDES PYTHON_USE_API2_WARNINGS WITH_ALL_PACKAGES WITH_CHECK WITH_CPP_NAMESPACE WITH_CSHARP WITH_DOXYGEN WITH_JAVA WITH_JAVASCRIPT WITH_MATLAB WITH_OCTAVE WITH_PERL WITH_PHP WITH_R WITH_STABLE_PACKAGES WITH_WALL
-CMAKE_ON=	LIBSBML_SHARED_VERSION WITH_BZIP2 WITH_SWIG WITH_ZLIB
+CMAKE_OFF=	EXIT_ON_ERROR \
+		LIBSBML_USE_STRICT_INCLUDES \
+		PYTHON_USE_API2_WARNINGS \
+		WITH_ALL_PACKAGES \
+		WITH_CHECK \
+		WITH_CPP_NAMESPACE \
+		WITH_CSHARP \
+		WITH_DOXYGEN \
+		WITH_JAVA \
+		WITH_JAVASCRIPT \
+		WITH_MATLAB \
+		WITH_OCTAVE \
+		WITH_PERL \
+		WITH_PHP \
+		WITH_R \
+		WITH_STABLE_PACKAGES \
+		WITH_WALL
+CMAKE_ON=	LIBSBML_SHARED_VERSION \
+		WITH_BZIP2 \
+		WITH_SWIG \
+		WITH_THREADSAFE_PARSER \
+		WITH_ZLIB
+CMAKE_TESTING_ON=	WITH_CHECK
 USE_CXXSTD=	c++98
 USE_LDCONFIG=	yes
-WRKSRC=		${WRKDIR}/libsbml-${PORTVERSION}

 PLIST_SUB=	PORTVERSION=${PORTVERSION}

+USE_GITHUB=	yes
+GH_ACCOUNT=	sbmlteam
+
 OPTIONS_DEFINE=	EXAMPLES PYTHON RUBY
 OPTIONS_SINGLE=	XML
 OPTIONS_SINGLE_XML=	EXPAT LIBXML2 XERCES
 OPTIONS_DEFAULT=LIBXML2 PYTHON
 OPTIONS_SUB=	yes

+EXAMPLES_CMAKE_BOOL=	WITH_EXAMPLES
 EXPAT_CMAKE_BOOL=	WITH_EXPAT
 EXPAT_LIB_DEPENDS=	libexpat.so:textproc/expat2
 LIBXML2_CMAKE_BOOL=	WITH_LIBXML
@ -37,7 +59,7 @@ LIBXML2_USE=		GNOME=libxml2
 LIBXML2_USES=		gnome
 PYTHON_BUILD_DEPENDS=	swig:devel/swig
 PYTHON_CMAKE_BOOL=	WITH_PYTHON
-PYTHON_USES=		python:3.6+
+PYTHON_USES=		python:3.7+
 PYTHON_CMAKE_ON=	WITH_SWIG
 RUBY_BUILD_DEPENDS=	swig:devel/swig
 RUBY_CMAKE_BOOL=	WITH_RUBY
@ -49,7 +71,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/CMakeLists.txt

 post-install-EXAMPLES-on:
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} '! -name *Makefile*'
+	${MV} ${STAGEDIR}${DATADIR}/examples ${STAGEDIR}${EXAMPLESDIR}
+	${RMDIR} ${STAGEDIR}${DATADIR}

 .include <bsd.port.mk>
--- a/biology/libsbml/distinfo
+++ b/biology/libsbml/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1607539653
-SHA256 (libSBML-5.19.0-core-src.tar.gz) = 9d2837378e77a8732588d481327bb10c721ec06dd6cd72f8041d67d3b53d4e56
-SIZE (libSBML-5.19.0-core-src.tar.gz) = 14600103
+TIMESTAMP = 1684104306
+SHA256 (sbmlteam-libsbml-v5.20.0_GH0.tar.gz) = 400f1e1039ef0fc9addc99660a3a2559fefe9cb2c8315b1b488014b6101c438f
+SIZE (sbmlteam-libsbml-v5.20.0_GH0.tar.gz) = 28776286
--- a/biology/libsbml/files/patch-CMakeLists.txt
+++ b/biology/libsbml/files/patch-CMakeLists.txt
@ -1,9 +1,56 @@
--- CMakeLists.txt.orig	2020-11-19 11:17:49 UTC
+--- CMakeLists.txt.orig	2023-04-03 10:48:28 UTC
 +++ CMakeLists.txt
-@@ -1297,22 +1297,6 @@ endif()
+@@ -430,8 +430,6 @@ if(WITH_EXPAT)
+     set(LIBSBML_XML_LIBRARY_INCLUDE ${EXPAT_INCLUDE_DIR})
+     set(LIBSBML_XML_LIBRARY_LIBS ${EXPAT_LIBRARY})
+ 
+-    list(APPEND LIBSBML_FIND_MODULES "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/FindEXPAT.cmake")
+-
+ endif(WITH_EXPAT)
+ 
+ 
+@@ -452,8 +450,6 @@ if(WITH_LIBXML)
+   set(LIBSBML_XML_LIBRARY_INCLUDE ${LIBXML_INCLUDE_DIR})
+   set(LIBSBML_XML_LIBRARY_LIBS ${LIBXML_LIBRARY})
+ 
+-  list(APPEND LIBSBML_FIND_MODULES "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/FindLIBXML.cmake")
+-
+ endif(WITH_LIBXML)
+ 
+ 
+@@ -473,8 +469,6 @@ if(WITH_XERCES)
+     set(LIBSBML_XML_LIBRARY_INCLUDE ${XERCES_INCLUDE_DIR})
+     set(LIBSBML_XML_LIBRARY_LIBS ${XERCES_LIBRARY})
+ 
+-    list(APPEND LIBSBML_FIND_MODULES "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/FindXERCES.cmake")
+-
+ endif(WITH_XERCES)
 
 ###############################################################################
- #
+@@ -498,7 +492,6 @@ if(WITH_BZIP2)
+   set(USE_BZ2 ON)
+   add_definitions( -DUSE_BZ2 )
+   list(APPEND SWIG_EXTRA_ARGS -DUSE_BZ2)
+-  list(APPEND LIBSBML_FIND_MODULES "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/FindBZ2.cmake")
+ endif(WITH_BZIP2)
+ 
+ 
+@@ -608,8 +601,6 @@ valid. It should contain the file zlib.h, but it does 
+       INTERFACE_INCLUDE_DIRECTORIES "${LIBZ_INCLUDE_DIR}")
+   endif()
+ 
+-  list(APPEND LIBSBML_FIND_MODULES "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/FindZLIB.cmake")
+-
+ endif(WITH_ZLIB)
+ 
+ # install find scripts only for used dependencies
+@@ -981,22 +972,6 @@ if(WITH_DOXYGEN)
+     add_subdirectory(docs)
+ endif()
+ 
+-
+-###############################################################################
+-#
 -# Install documentation
 -#
 -
@ -17,9 +64,6 @@
 -)
 -
 -install(FILES ${DOCUMENTATION_FILES} DESTINATION ${MISC_PREFIX})
-
-###############################################################################
-#
- # Write libsbml.pc
- #
 
+ ###############################################################################
+ #
--- a/biology/libsbml/files/patch-src-bindings-python-doc-converter-rewrite_pydoc.py
+++ b/biology/libsbml/files/patch-src-bindings-python-doc-converter-rewrite_pydoc.py
@ -1,279 +0,0 @@
-Obtained from:	https://github.com/sbmlteam/libsbml/commit/4f01a15fde1d8afa9eaffb4c13dfc83a3404f183 (based on)
-
--- src/bindings/python/doc-converter/rewrite_pydoc.py.orig	2020-11-25 11:03:01 UTC
-+++ src/bindings/python/doc-converter/rewrite_pydoc.py
-@@ -118,7 +118,273 @@ import re
- import sys
- import os
- import textwrap
-from formatter import NullWriter, AbstractFormatter
-+try:
-+    from formatter import NullWriter, AbstractFormatter
-+except Exception:
-+    # issue 173 these classes have been removed in 3.10, so 
-+    # as per the 3.10 release notes: Existing users should copy whatever 
-+    # classes they use into their code. (Contributed by Dong-hee Na and 
-+    # Terry J. Reedy in bpo-42299.)
-+    #
-+    # So here they are:
-+
-+
-+    class NullWriter:
-+        """Minimal writer interface to use in testing & inheritance.
-+
-+        A writer which only provides the interface definition; no actions are
-+        taken on any methods.  This should be the base class for all writers
-+        which do not need to inherit any implementation methods.
-+
-+        """
-+        def __init__(self): pass
-+        def flush(self): pass
-+        def new_alignment(self, align): pass
-+        def new_font(self, font): pass
-+        def new_margin(self, margin, level): pass
-+        def new_spacing(self, spacing): pass
-+        def new_styles(self, styles): pass
-+        def send_paragraph(self, blankline): pass
-+        def send_line_break(self): pass
-+        def send_hor_rule(self, *args, **kw): pass
-+        def send_label_data(self, data): pass
-+        def send_flowing_data(self, data): pass
-+        def send_literal_data(self, data): pass
-+
-+    class AbstractFormatter:
-+        """The standard formatter.
-+
-+        This implementation has demonstrated wide applicability to many writers,
-+        and may be used directly in most circumstances.  It has been used to
-+        implement a full-featured World Wide Web browser.
-+
-+        """
-+
-+        #  Space handling policy:  blank spaces at the boundary between elements
-+        #  are handled by the outermost context.  "Literal" data is not checked
-+        #  to determine context, so spaces in literal data are handled directly
-+        #  in all circumstances.
-+
-+        def __init__(self, writer):
-+            self.writer = writer            # Output device
-+            self.align = None               # Current alignment
-+            self.align_stack = []           # Alignment stack
-+            self.font_stack = []            # Font state
-+            self.margin_stack = []          # Margin state
-+            self.spacing = None             # Vertical spacing state
-+            self.style_stack = []           # Other state, e.g. color
-+            self.nospace = 1                # Should leading space be suppressed
-+            self.softspace = 0              # Should a space be inserted
-+            self.para_end = 1               # Just ended a paragraph
-+            self.parskip = 0                # Skipped space between paragraphs?
-+            self.hard_break = 1             # Have a hard break
-+            self.have_label = 0
-+
-+        def end_paragraph(self, blankline):
-+            if not self.hard_break:
-+                self.writer.send_line_break()
-+                self.have_label = 0
-+            if self.parskip < blankline and not self.have_label:
-+                self.writer.send_paragraph(blankline - self.parskip)
-+                self.parskip = blankline
-+                self.have_label = 0
-+            self.hard_break = self.nospace = self.para_end = 1
-+            self.softspace = 0
-+
-+        def add_line_break(self):
-+            if not (self.hard_break or self.para_end):
-+                self.writer.send_line_break()
-+                self.have_label = self.parskip = 0
-+            self.hard_break = self.nospace = 1
-+            self.softspace = 0
-+
-+        def add_hor_rule(self, *args, **kw):
-+            if not self.hard_break:
-+                self.writer.send_line_break()
-+            self.writer.send_hor_rule(*args, **kw)
-+            self.hard_break = self.nospace = 1
-+            self.have_label = self.para_end = self.softspace = self.parskip = 0
-+
-+        def add_label_data(self, format, counter, blankline = None):
-+            if self.have_label or not self.hard_break:
-+                self.writer.send_line_break()
-+            if not self.para_end:
-+                self.writer.send_paragraph((blankline and 1) or 0)
-+            if isinstance(format, str):
-+                self.writer.send_label_data(self.format_counter(format, counter))
-+            else:
-+                self.writer.send_label_data(format)
-+            self.nospace = self.have_label = self.hard_break = self.para_end = 1
-+            self.softspace = self.parskip = 0
-+
-+        def format_counter(self, format, counter):
-+            label = ''
-+            for c in format:
-+                if c == '1':
-+                    label = label + ('%d' % counter)
-+                elif c in 'aA':
-+                    if counter > 0:
-+                        label = label + self.format_letter(c, counter)
-+                elif c in 'iI':
-+                    if counter > 0:
-+                        label = label + self.format_roman(c, counter)
-+                else:
-+                    label = label + c
-+            return label
-+
-+        def format_letter(self, case, counter):
-+            label = ''
-+            while counter > 0:
-+                counter, x = divmod(counter-1, 26)
-+                # This makes a strong assumption that lowercase letters
-+                # and uppercase letters form two contiguous blocks, with
-+                # letters in order!
-+                s = chr(ord(case) + x)
-+                label = s + label
-+            return label
-+
-+        def format_roman(self, case, counter):
-+            ones = ['i', 'x', 'c', 'm']
-+            fives = ['v', 'l', 'd']
-+            label, index = '', 0
-+            # This will die of IndexError when counter is too big
-+            while counter > 0:
-+                counter, x = divmod(counter, 10)
-+                if x == 9:
-+                    label = ones[index] + ones[index+1] + label
-+                elif x == 4:
-+                    label = ones[index] + fives[index] + label
-+                else:
-+                    if x >= 5:
-+                        s = fives[index]
-+                        x = x-5
-+                    else:
-+                        s = ''
-+                    s = s + ones[index]*x
-+                    label = s + label
-+                index = index + 1
-+            if case == 'I':
-+                return label.upper()
-+            return label
-+
-+        def add_flowing_data(self, data):
-+            if not data: return
-+            prespace = data[:1].isspace()
-+            postspace = data[-1:].isspace()
-+            data = " ".join(data.split())
-+            if self.nospace and not data:
-+                return
-+            elif prespace or self.softspace:
-+                if not data:
-+                    if not self.nospace:
-+                        self.softspace = 1
-+                        self.parskip = 0
-+                    return
-+                if not self.nospace:
-+                    data = ' ' + data
-+            self.hard_break = self.nospace = self.para_end = \
-+                            self.parskip = self.have_label = 0
-+            self.softspace = postspace
-+            self.writer.send_flowing_data(data)
-+
-+        def add_literal_data(self, data):
-+            if not data: return
-+            if self.softspace:
-+                self.writer.send_flowing_data(" ")
-+            self.hard_break = data[-1:] == '\n'
-+            self.nospace = self.para_end = self.softspace = \
-+                        self.parskip = self.have_label = 0
-+            self.writer.send_literal_data(data)
-+
-+        def flush_softspace(self):
-+            if self.softspace:
-+                self.hard_break = self.para_end = self.parskip = \
-+                                self.have_label = self.softspace = 0
-+                self.nospace = 1
-+                self.writer.send_flowing_data(' ')
-+
-+        def push_alignment(self, align):
-+            if align and align != self.align:
-+                self.writer.new_alignment(align)
-+                self.align = align
-+                self.align_stack.append(align)
-+            else:
-+                self.align_stack.append(self.align)
-+
-+        def pop_alignment(self):
-+            if self.align_stack:
-+                del self.align_stack[-1]
-+            if self.align_stack:
-+                self.align = align = self.align_stack[-1]
-+                self.writer.new_alignment(align)
-+            else:
-+                self.align = None
-+                self.writer.new_alignment(None)
-+
-+        def push_font(self, font):
-+            size, i, b, tt = font
-+            if self.softspace:
-+                self.hard_break = self.para_end = self.softspace = 0
-+                self.nospace = 1
-+                self.writer.send_flowing_data(' ')
-+            if self.font_stack:
-+                csize, ci, cb, ctt = self.font_stack[-1]
-+                if size is AS_IS: size = csize
-+                if i is AS_IS: i = ci
-+                if b is AS_IS: b = cb
-+                if tt is AS_IS: tt = ctt
-+            font = (size, i, b, tt)
-+            self.font_stack.append(font)
-+            self.writer.new_font(font)
-+
-+        def pop_font(self):
-+            if self.font_stack:
-+                del self.font_stack[-1]
-+            if self.font_stack:
-+                font = self.font_stack[-1]
-+            else:
-+                font = None
-+            self.writer.new_font(font)
-+
-+        def push_margin(self, margin):
-+            self.margin_stack.append(margin)
-+            fstack = filter(None, self.margin_stack)
-+            if not margin and fstack:
-+                margin = fstack[-1]
-+            self.writer.new_margin(margin, len(fstack))
-+
-+        def pop_margin(self):
-+            if self.margin_stack:
-+                del self.margin_stack[-1]
-+            fstack = filter(None, self.margin_stack)
-+            if fstack:
-+                margin = fstack[-1]
-+            else:
-+                margin = None
-+            self.writer.new_margin(margin, len(fstack))
-+
-+        def set_spacing(self, spacing):
-+            self.spacing = spacing
-+            self.writer.new_spacing(spacing)
-+
-+        def push_style(self, *styles):
-+            if self.softspace:
-+                self.hard_break = self.para_end = self.softspace = 0
-+                self.nospace = 1
-+                self.writer.send_flowing_data(' ')
-+            for style in styles:
-+                self.style_stack.append(style)
-+            self.writer.new_styles(tuple(self.style_stack))
-+
-+        def pop_style(self, n=1):
-+            del self.style_stack[-n:]
-+            self.writer.new_styles(tuple(self.style_stack))
-+
-+        def assert_line_data(self, flag=1):
-+            self.nospace = self.hard_break = not flag
-+            self.para_end = self.parskip = self.have_label = 0
-+    
-+
- try:
-     from htmllib import HTMLParser
- except Exception:
--- a/biology/libsbml/pkg-plist
+++ b/biology/libsbml/pkg-plist
@ -75,6 +75,7 @@ include/sbml/compress/zip.h
 include/sbml/compress/zipfstream.h
 include/sbml/conversion/ConversionOption.h
 include/sbml/conversion/ConversionProperties.h
+include/sbml/conversion/ExpressionAnalyser.h
 include/sbml/conversion/SBMLConverter.h
 include/sbml/conversion/SBMLConverterRegister.h
 include/sbml/conversion/SBMLConverterRegistry.h
@ -87,6 +88,7 @@ include/sbml/conversion/SBMLLevel1Version1Converter.h
 include/sbml/conversion/SBMLLevelVersionConverter.h
 include/sbml/conversion/SBMLLocalParameterConverter.h
 include/sbml/conversion/SBMLRateOfConverter.h
+include/sbml/conversion/SBMLRateRuleConverter.h
 include/sbml/conversion/SBMLReactionConverter.h
 include/sbml/conversion/SBMLRuleConverter.h
 include/sbml/conversion/SBMLStripPackageConverter.h
@ -196,24 +198,68 @@ include/sbml/xml/XercesHandler.h
 include/sbml/xml/XercesNamespaces.h
 include/sbml/xml/XercesParser.h
 include/sbml/xml/XercesTranscode.h
+lib/cmake/sbml-config-version.cmake
+lib/cmake/sbml-config.cmake
+lib/cmake/sbml-static-config-version.cmake
+lib/cmake/sbml-static-config.cmake
+lib/cmake/sbml-static-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/sbml-static-targets.cmake
+lib/cmake/sbml-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/sbml-targets.cmake
 lib/libsbml-static.a
 lib/libsbml.so
 lib/libsbml.so.5
 lib/libsbml.so.%%PORTVERSION%%
-libdata/pkgconfig/libsbml.pc
-lib/cmake/sbml-config-release.cmake
-lib/cmake/sbml-config-version.cmake
-lib/cmake/sbml-config.cmake
-lib/cmake/sbml-static-config-release.cmake
-lib/cmake/sbml-static-config-version.cmake
-lib/cmake/sbml-static-config.cmake
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libsbml.pth
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libsbml/_libsbml.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libsbml/libsbml.py
+%%PYTHON_SITELIBDIR%%/libsbml.pth
+%%PYTHON_SITELIBDIR%%/libsbml/_libsbml.so
+%%PYTHON_SITELIBDIR%%/libsbml/libsbml.py
 %%RUBY%%%%RUBY_SITEARCHLIBDIR%%/libSBML.so
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/CMakeLists.txt
+libdata/pkgconfig/libsbml.pc
+@comment share/cmake/Modules/FindBZ2.cmake
+@comment share/cmake/Modules/FindCHECK.cmake
+@comment share/cmake/Modules/FindEXPAT.cmake
+share/cmake/Modules/FindLIBSBML.cmake
+@comment share/cmake/Modules/FindLIBXML.cmake
+@comment share/cmake/Modules/FindXERCES.cmake
+@comment share/cmake/Modules/FindZLIB.cmake
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/CMakeLists.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/addCVTerms.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/addCustomValidator.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/addModelHistory.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/addingEvidenceCodes_1.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/addingEvidenceCodes_2.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/appendAnnotation.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/callExternalValidator.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/convertReactions.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/convertSBML.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/convertToL1V1.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/createExampleSBML.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/echoSBML.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/getAllElementsWithNotes.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/inferUnits.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/inlineFunctionDefintions.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/printAnnotation.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/printMath.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/printNotes.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/printRegisteredPackages.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/printSBML.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/printSupported.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/printUnits.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/promoteParameters.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/readSBML.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/renameSId.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/rngvalidator.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/setAnnotation.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/setIdFromNames.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/setNamesFromIds.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/stripPackage.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/translateL3Math.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/translateMath.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/unsetAnnotation.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/unsetNotes.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/util.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/util.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/validateSBML.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/FormulaGraphvizFormatter.h
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/addCVTerms.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/addModelHistory.c
@ -242,265 +288,67 @@ lib/cmake/sbml-static-config.cmake
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/util.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/util.h
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/validateSBML.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/CMakeLists.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/addCVTerms.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/addCustomValidator.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/addModelHistory.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/addingEvidenceCodes_1.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/addingEvidenceCodes_2.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/appendAnnotation.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/callExternalValidator.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/convertReactions.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/convertSBML.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/convertToL1V1.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/createExampleSBML.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/echoSBML.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/getAllElementsWithNotes.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/inferUnits.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/inlineFunctionDefintions.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/layout/CMakeLists.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/layout/addLayout.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/layout/convertLayout.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/layout/example1-L3.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/layout/example1.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/layout/example2-L3.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/layout/example2.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/layout/example3-L3.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/layout/example3.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/printAnnotation.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/printMath.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/printNotes.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/printRegisteredPackages.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/printSBML.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/printSupported.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/printUnits.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/promoteParameters.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/readSBML.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/renameSId.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/rngvalidator.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/setIdFromNames.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/setNamesFromIds.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/stripPackage.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/translateL3Math.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/translateMath.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/unsetAnnotation.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/unsetNotes.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/util.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/util.h
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/validateSBML.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/CMakeLists.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/GetAllElementsWithNotes.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/SetIdFromNames.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/addCVTerms.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/addCustomValidator.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/addModelHistory.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/addingEvidenceCodes_1.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/addingEvidenceCodes_2.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/appendAnnotation.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/callExternalValidator.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/convertSBML.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/createExampleSBML.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/echoSBML.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/evaluateCustomMath.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/inlineInitialAssignments.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/layout/CMakeLists.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/layout/example1-L3.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/printAnnotation.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/printMath.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/printNotes.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/printRegisteredPackages.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/printSBML.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/printUnits.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/printsupported.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/promoteParameters.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/readSBML.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/replaceOneFD.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/stripPackage.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/translateMath.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/unsetAnnotation.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/unsetNotes.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csharp/validateSBML.cs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/CMakeLists.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/README.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/addCVTerms.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/addCustomValidator.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/addModelHistory.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/addingEvidenceCodes_1.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/addingEvidenceCodes_2.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/appendAnnotation.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/callExternalValidator.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/convertSBML.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/createExampleSBML.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/echoSBML.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/evaluateCustomMath.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/evaluateMath.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/getAllElementsWithNotes.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/inlineInitialAssignments.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/layout/CMakeLists.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/layout/SimpleLayoutConverter.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/layout/layout_example1.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/layout/layout_example1_L3.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/printAnnotation.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/printMath.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/printNotes.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/printRegisteredPackages.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/printSBML.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/printUnits.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/printsupported.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/promoteParameters.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/readSBML.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/replaceOneFD.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/setIdFromNames.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/stripPackage.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/translateMath.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/unsetAnnotation.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/unsetNotes.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/validateSBML.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/addCVTerms.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/addModelHistory.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/addingEvidenceCodes_1.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/addingEvidenceCodes_2.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/appendAnnotation.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/callExternalValidator.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/convertSBML.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/createExampleSBML.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/echoSBML.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/printAnnotation.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/printMath.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/printNotes.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/printRegisteredPackages.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/printSBML.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/printUnits.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/printsupported.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/promoteParameters.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/readSBML.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/stripPackage.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/translateMath.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/unsetAnnotation.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/unsetNotes.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/javascript/validateSBML.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/layout-package.cmake
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/layout/README.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/addCVTerms.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/addCustomValidator.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/addModelHistory.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/addingEvidenceCodes_1.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/addingEvidenceCodes_2.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/appendAnnotation.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/callExternalValidator.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/convertSBML.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/createExampleSBML.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/echoSBML.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/evaluateMath.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/extractReactionInfo.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/extractReactions.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/layout/example1-L3.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/printAnnotation.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/printMath.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/printNotes.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/printRegisteredPackages.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/printSBML.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/printUnits.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/printsupported.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/promoteParameters.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/readSBML.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/renameSId.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/stripPackage.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/translateMath.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/unsetAnnotation.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/unsetNotes.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perl/validateSBML.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/php/createExampleSBML.php
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/php/echoSBML.php
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/php/validateSBML.php
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/addCVTerms.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/addCustomValidator.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/addModelHistory.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/addingEvidenceCodes_1.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/addingEvidenceCodes_2.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/append_to_note.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/appendAnnotation.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/callExternalValidator.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/convertSBML.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/createExampleSBML.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/createSimpleModel.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/echoSBML.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/evaluateCustomMath.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/getAllElementsWithNotes.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/inlineFunctionDefinitions.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/inlineInitialAssignments.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/layout/convertLayout.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/layout/example1-L3.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/layout/example1.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/printAnnotation.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/printMath.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/printNotes.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/printRegisteredPackages.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/printSBML.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/printUnits.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/printsupported.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/promoteParameters.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/readSBML.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/renameSId.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/replaceOneFD.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/setIdFromNames.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/stringInput.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/stripPackage.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/translateMath.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/unsetAnnotation.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/unsetNotes.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/validateSBML.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/validateSBMLWithCallback.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/r/addCVTerms.R
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/r/addModelHistory.R
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/r/addingEvidenceCodes_1.R
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/r/addingEvidenceCodes_2.R
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/r/appendAnnotation.R
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/r/convertSBML.R
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/r/createExampleSBML.R
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/r/echoSBML.R
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/r/evaluateMath.R
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/r/printAnnotation.R
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/r/printMath.R
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/r/printNotes.R
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/r/printRegisteredPackages.R
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/r/printSBML.R
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/r/printSupported.R
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/r/printUnits.R
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/r/promoteParameters.R
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/r/readSBML.R
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/r/stripPackage.R
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/r/translateMath.R
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/r/unsetAnnotation.R
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/r/unsetNotes.R
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/r/validateSBML.R
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/addCVTerms.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/addCustomValidator.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/addModelHistory.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/addingEvidenceCodes_1.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/addingEvidenceCodes_2.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/appendAnnotation.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/callExternalValidator.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/convertSBML.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/createExampleSBML.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/echoSBML.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/layout/example1-L3.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/printAnnotation.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/printMath.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/printNotes.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/printRegisteredPackages.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/printSBML.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/printUnits.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/printsupported.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/promoteParameters.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/readSBML.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/stripPackage.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/translateMath.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/unsetAnnotation.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/unsetNotes.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruby/validateSBML.rb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample-models/README.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample-models/from-spec/level-2/README.txt
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/addCVTerms.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/addCustomValidator.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/addModelHistory.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/add_function_definition.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/addingEvidenceCodes_1.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/addingEvidenceCodes_2.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/appendAnnotation.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/append_to_note.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/callExternalValidator.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/convertSBML.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/createExampleSBML.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/createSimpleModel.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/echoSBML.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/evaluateCustomMath.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/getAllElementsWithNotes.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/inlineFunctionDefinitions.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/inlineInitialAssignments.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/printAnnotation.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/printMath.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/printNotes.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/printRegisteredPackages.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/printSBML.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/printUnits.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/printsupported.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/promoteParameters.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/readSBML.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/renameSId.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/replaceOneFD.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/setIdFromNames.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/setNamesFromIds.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/stringInput.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/stripPackage.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/translateMath.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/unsetAnnotation.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/unsetNotes.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/validateSBML.py
+%%PORTEXAMPLES%%%%PYTHON%%%%EXAMPLESDIR%%/python/validateSBMLWithCallback.py
+%%PORTEXAMPLES%%%%RUBY%%%%EXAMPLESDIR%%/ruby/addCVTerms.rb
+%%PORTEXAMPLES%%%%RUBY%%%%EXAMPLESDIR%%/ruby/addCustomValidator.rb
+%%PORTEXAMPLES%%%%RUBY%%%%EXAMPLESDIR%%/ruby/addModelHistory.rb
+%%PORTEXAMPLES%%%%RUBY%%%%EXAMPLESDIR%%/ruby/addingEvidenceCodes_1.rb
+%%PORTEXAMPLES%%%%RUBY%%%%EXAMPLESDIR%%/ruby/addingEvidenceCodes_2.rb
+%%PORTEXAMPLES%%%%RUBY%%%%EXAMPLESDIR%%/ruby/appendAnnotation.rb
+%%PORTEXAMPLES%%%%RUBY%%%%EXAMPLESDIR%%/ruby/callExternalValidator.rb
+%%PORTEXAMPLES%%%%RUBY%%%%EXAMPLESDIR%%/ruby/convertSBML.rb
+%%PORTEXAMPLES%%%%RUBY%%%%EXAMPLESDIR%%/ruby/createExampleSBML.rb
+%%PORTEXAMPLES%%%%RUBY%%%%EXAMPLESDIR%%/ruby/echoSBML.rb
+%%PORTEXAMPLES%%%%RUBY%%%%EXAMPLESDIR%%/ruby/printAnnotation.rb
+%%PORTEXAMPLES%%%%RUBY%%%%EXAMPLESDIR%%/ruby/printMath.rb
+%%PORTEXAMPLES%%%%RUBY%%%%EXAMPLESDIR%%/ruby/printNotes.rb
+%%PORTEXAMPLES%%%%RUBY%%%%EXAMPLESDIR%%/ruby/printRegisteredPackages.rb
+%%PORTEXAMPLES%%%%RUBY%%%%EXAMPLESDIR%%/ruby/printSBML.rb
+%%PORTEXAMPLES%%%%RUBY%%%%EXAMPLESDIR%%/ruby/printUnits.rb
+%%PORTEXAMPLES%%%%RUBY%%%%EXAMPLESDIR%%/ruby/printsupported.rb
+%%PORTEXAMPLES%%%%RUBY%%%%EXAMPLESDIR%%/ruby/promoteParameters.rb
+%%PORTEXAMPLES%%%%RUBY%%%%EXAMPLESDIR%%/ruby/readSBML.rb
+%%PORTEXAMPLES%%%%RUBY%%%%EXAMPLESDIR%%/ruby/stripPackage.rb
+%%PORTEXAMPLES%%%%RUBY%%%%EXAMPLESDIR%%/ruby/translateMath.rb
+%%PORTEXAMPLES%%%%RUBY%%%%EXAMPLESDIR%%/ruby/unsetAnnotation.rb
+%%PORTEXAMPLES%%%%RUBY%%%%EXAMPLESDIR%%/ruby/unsetNotes.rb
+%%PORTEXAMPLES%%%%RUBY%%%%EXAMPLESDIR%%/ruby/validateSBML.rb
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample-models/from-spec/level-2/algebraicrules.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample-models/from-spec/level-2/assignmentrules.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample-models/from-spec/level-2/boundarycondition.xml
@ -513,7 +361,6 @@ lib/cmake/sbml-static-config.cmake
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample-models/from-spec/level-2/overdetermined.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample-models/from-spec/level-2/twodimensional.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample-models/from-spec/level-2/units.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample-models/from-spec/level-3/README.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample-models/from-spec/level-3/algebraicrules.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample-models/from-spec/level-3/assignmentrules.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample-models/from-spec/level-3/boundarycondition.xml
@ -531,4 +378,3 @@ lib/cmake/sbml-static-config.cmake
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample-models/from-spec/level-3/overdetermined.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample-models/from-spec/level-3/twoalgebraicrules.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample-models/from-spec/level-3/twodimensional.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xslt/layout/layout2svg.xsl
--- a/biology/libsedml/files/patch-CMakeLists.txt
+++ b/biology/libsedml/files/patch-CMakeLists.txt
@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2022-06-07 11:34:09 UTC
+++ CMakeLists.txt
+@@ -73,7 +73,7 @@ set(LIBSEDML_DOTTED_VERSION ${LIBSEDML_VERSION})
+ set(PACKAGE_NAME "libSEDML")
+ 
+ project (libsedml VERSION "${LIBSEDML_VERSION_MAJOR}.${LIBSEDML_VERSION_MINOR}.${LIBSEDML_VERSION_PATCH}"
+-                  LANGUAGES CXX)
+                  LANGUAGES C CXX)
+ 
+ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_STANDARD_REQUIRED YES)
--- a/biology/ncbi-blast+/Makefile
+++ b/biology/ncbi-blast+/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	ncbi-blast+
-DISTVERSION=	2.12.0
-PORTREVISION=	10
+DISTVERSION=	2.14.0
 CATEGORIES=	biology perl5 python
 MASTER_SITES=	https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/LATEST/ \
 		https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${PORTVERSION}/
@ -8,11 +7,14 @@ DISTNAME=	ncbi-blast-${PORTVERSION}+-src

 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	NCBI implementation of Basic Local Alignment Search Tool
-WWW=		http://blast.ncbi.nlm.nih.gov
+WWW=		https://blast.ncbi.nlm.nih.gov

 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/scripts/projects/blast/LICENSE

+ONLY_FOR_ARCHS=		aarch64 amd64 powerpc64 powerpc64le riscv64
+ONLY_FOR_ARCHS_REASON=	Requires 64-bit processor
+
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		liblmdb.so:databases/lmdb \
 		liblzo2.so:archivers/lzo2 \
@ -29,7 +31,9 @@ LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libsqlite3.so:databases/sqlite3 \
 		libuv.so:devel/libuv \
 		libnghttp2.so:www/libnghttp2 \
-		libgrpc.so:devel/grpc
+		libgrpc.so:devel/grpc \
+		libzstd.so:archivers/zstd \
+		libdw.so:devel/elfutils
 RUN_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
 		p5-JSON>=0:converters/p5-JSON

--- a/biology/ncbi-blast+/distinfo
+++ b/biology/ncbi-blast+/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1625068343
-SHA256 (ncbi-blast-2.12.0+-src.tar.gz) = fda3c9c9d488cad6c1880a98a236d842bcf3610e3e702af61f7a48cf0a714b88
-SIZE (ncbi-blast-2.12.0+-src.tar.gz) = 58245348
+TIMESTAMP = 1685108714
+SHA256 (ncbi-blast-2.14.0+-src.tar.gz) = bf477f1b0c3b82f0b7a7094bf003a9a83e37e3b0716c1df799060c4feab17500
+SIZE (ncbi-blast-2.14.0+-src.tar.gz) = 28200227
--- a/biology/ncbi-blast+/files/patch-src_objtools_blast_seqdb__reader_test_seqdb__perf.cpp
+++ b/biology/ncbi-blast+/files/patch-src_objtools_blast_seqdb__reader_test_seqdb__perf.cpp
@ -1,21 +1,21 @@
--- src/objtools/blast/seqdb_reader/test/seqdb_perf.cpp.orig	2021-01-10 02:28:53 UTC
+--- src/objtools/blast/seqdb_reader/test/seqdb_perf.cpp.orig	2021-10-14 12:36:57 UTC
 +++ src/objtools/blast/seqdb_reader/test/seqdb_perf.cpp
-@@ -137,7 +137,8 @@ CSeqDBPerfApp::x_ScanDatabase()
-     }
+@@ -138,7 +138,8 @@ CSeqDBPerfApp::x_ScanDatabase()
     LOG_POST(Info << "Will go over " << oids2iterate.size() << " sequences");
 
-#if defined(NCBI_COMPILER_GCC) && (NCBI_COMPILER_VERSION >= 900)
-+#if defined(NCBI_COMPILER_GCC) && (NCBI_COMPILER_VERSION >= 900) || \
+ #if (defined(NCBI_COMPILER_GCC) && (NCBI_COMPILER_VERSION >= 900)) || \
+-    (defined(NCBI_COMPILER_ICC) && (NCBI_COMPILER_VERSION >= 2100))
+    (defined(NCBI_COMPILER_ICC) && (NCBI_COMPILER_VERSION >= 2100)) || \
 +    defined(NCBI_COMPILER_LLVM_CLANG)
     #pragma omp parallel default(none) num_threads(m_DbHandles.size()) \
                          shared(oids2iterate,kScanUncompressed) if(m_DbHandles.size() > 1)
 #else
-@@ -208,7 +209,8 @@ CSeqDBPerfApp::x_InitApplicationData()
- 
+@@ -210,7 +211,8 @@ CSeqDBPerfApp::x_InitApplicationData()
 
     if (args["multi_threaded_creation"]) {
-#if defined(NCBI_COMPILER_GCC) && (NCBI_COMPILER_VERSION >= 900)
-+#if defined(NCBI_COMPILER_GCC) && (NCBI_COMPILER_VERSION >= 900) || \
+ #if (defined(NCBI_COMPILER_GCC) && (NCBI_COMPILER_VERSION >= 900)) || \
+-    (defined(NCBI_COMPILER_ICC) && (NCBI_COMPILER_VERSION >= 2100))
+    (defined(NCBI_COMPILER_ICC) && (NCBI_COMPILER_VERSION >= 2100)) ||
 +    defined(NCBI_COMPILER_LLVM_CLANG)
         #pragma omp parallel default(none) shared(kDbName, kNumThreads, kSeqType) num_threads(kNumThreads)
 #else
--- a/biology/ncbi-blast+/pkg-plist
+++ b/biology/ncbi-blast+/pkg-plist
--- a/biology/py-pysam/Makefile
+++ b/biology/py-pysam/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	pysam
 DISTVERSION=	0.20.0
+PORTREVISION=	1
 CATEGORIES=	biology python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -11,12 +12,15 @@ WWW=		https://github.com/pysam-developers/pysam
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING

+LIB_DEPENDS=	libhts.so:biology/htslib
+
 USES=		gmake python:3.6-3.9
 USE_PYTHON=	autoplist distutils cython cython_run pytest

-CFLAGS+=	-fPIC # workaround for https://github.com/pysam-developers/pysam/issues/1146
-
 BINARY_ALIAS=	make=${GMAKE}
+MAKE_ENV=	HTSLIB_MODE=external \
+		HTSLIB_LIBRARY_DIR=${LOCALBASE}/lib \
+		HTSLIB_INCLUDE_DIR=${LOCALBASE}/include

 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pysam/lib*${PYTHON_EXT_SUFFIX}.so
--- a/biology/seqtk/Makefile
+++ b/biology/seqtk/Makefile
@ -1,6 +1,6 @@
 PORTNAME=		seqtk
 DISTVERSIONPREFIX=	v
-DISTVERSION=		1.3
+DISTVERSION=		1.4
 CATEGORIES=		biology

 MAINTAINER=	jwb@FreeBSD.org
--- a/biology/seqtk/distinfo
+++ b/biology/seqtk/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1639855187
-SHA256 (lh3-seqtk-v1.3_GH0.tar.gz) = 5a1687d65690f2f7fa3f998d47c3c5037e792f17ce119dab52fff3cfdca1e563
-SIZE (lh3-seqtk-v1.3_GH0.tar.gz) = 21196
+TIMESTAMP = 1684848703
+SHA256 (lh3-seqtk-v1.4_GH0.tar.gz) = d124604ec24f29ed14ce127426ab90e0f3a2c0280c80d1a3ff8b1c09feede19c
+SIZE (lh3-seqtk-v1.4_GH0.tar.gz) = 23748
--- a/cad/PrusaSlicer/Makefile
+++ b/cad/PrusaSlicer/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	PrusaSlicer
 DISTVERSIONPREFIX=version_
 DISTVERSION=	2.5.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	cad

 MAINTAINER=	teodorsigaev@gmail.com
--- a/cad/hs-verismith/Makefile
+++ b/cad/hs-verismith/Makefile
@ -14,6 +14,8 @@ WWW=		https://github.com/ymherklotz/verismith
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE

+BUILD_DEPENDS=	ghc-9.2.7:lang/ghc92
+
 USES=		cabal

 USE_CABAL=	OneTuple-0.3.1_3 \
--- a/cad/sumo/Makefile
+++ b/cad/sumo/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	sumo
 DISTVERSION=	1.2.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dlr.de/ts/en/Portaldata/16/Resources/projekte/sumo/
 DISTFILES=	${PORTNAME}-src-${DISTVERSIONFULL}${EXTRACT_SUFX}
--- a/cad/surelog/Makefile
+++ b/cad/surelog/Makefile
@ -1,6 +1,7 @@
 PORTNAME=	surelog
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.59
+PORTREVISION=	1
 CATEGORIES=	cad

 MAINTAINER=	yuri@FreeBSD.org
@ -50,6 +51,7 @@ OPTIONS_SUB=	yes

 PYTHON_USES=		python
 PYTHON_USES_OFF=	python:build
+PYTHON_BUILD_DEPENDS=	swig:devel/swig
 PYTHON_CMAKE_BOOL=	SURELOG_WITH_PYTHON
 PYTHON_CMAKE_ON=	-DFREEBSD_PYTHON_DISTVERSION=${PYTHON_DISTVERSION}

--- a/cad/surelog/pkg-plist
+++ b/cad/surelog/pkg-plist
@ -83,4 +83,7 @@ lib/cmake/Surelog/SurelogTargets.cmake
 lib/surelog/libantlr4-runtime.a
 lib/surelog/libflatbuffers.a
 lib/surelog/libsurelog.so
+%%PYTHON%%lib/surelog/python/slSV3_1aPythonListener.py
+%%PYTHON%%lib/surelog/python/slformatmsg.py
+%%PYTHON%%lib/surelog/python/slwaivers.py
 libdata/pkgconfig/Surelog.pc
--- a/cad/xyce/Makefile
+++ b/cad/xyce/Makefile
@ -1,4 +1,5 @@
 PORTNAME=	xyce
+DISTVERSIONPREFIX=	Release-
 DISTVERSION=	7.6.0
 PORTREVISION=	3
 CATEGORIES=	cad
@ -32,7 +33,6 @@ USE_PERL5=	test
 USE_GITHUB=	yes
 GH_ACCOUNT=	Xyce
 GH_PROJECT=	Xyce
-GH_TAGNAME=	Release-${DISTVERSION}

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	LEX=/usr/bin/flex \
--- a/cad/xyce/distinfo
+++ b/cad/xyce/distinfo
@ -1,3 +1,3 @@
 TIMESTAMP = 1668286152
-SHA256 (Xyce-Xyce-7.6.0-Release-7.6.0_GH0.tar.gz) = fc25557e2edc82adbe0436a15fca2929a2f9ab08ddf91f1a47aab5e8b27ec88c
-SIZE (Xyce-Xyce-7.6.0-Release-7.6.0_GH0.tar.gz) = 23269498
+SHA256 (Xyce-Xyce-Release-7.6.0_GH0.tar.gz) = fc25557e2edc82adbe0436a15fca2929a2f9ab08ddf91f1a47aab5e8b27ec88c
+SIZE (Xyce-Xyce-Release-7.6.0_GH0.tar.gz) = 23269498
--- a/comms/chirp/Makefile
+++ b/comms/chirp/Makefile
@ -36,6 +36,7 @@ WX_COMPS=	python:run
 PLIST_FILES=	share/applications/${PORTNAME}.desktop \
 		share/pixmaps/${PORTNAME}.png

+PORTSCOUT=	ignore:1
 NO_ARCH=	yes

 post-patch:
--- a/converters/hs-dhall-json/Makefile
+++ b/converters/hs-dhall-json/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	dhall-json
-PORTVERSION=	1.7.10
-PORTREVISION=	1
+PORTVERSION=	1.7.12
 CATEGORIES=	converters lang haskell

 MAINTAINER=	malcolm.matalka@acsl.se
@ -9,74 +8,79 @@ WWW=		https://dhall-lang.org/

 LICENSE=	BSD3CLAUSE

+BUILD_DEPENDS=	ghc-8.10.7:lang/ghc810
+
 USES=		cabal

 USE_CABAL=	Diff-0.4.1 \
-		OneTuple-0.3.1_3 \
+		OneTuple-0.4.1.1 \
 		QuickCheck-2.14.2 \
 		StateVar-1.2.2 \
-		aeson-2.0.3.0 \
+		aeson-2.1.2.1_3 \
 		aeson-pretty-0.8.9_2 \
 		aeson-yaml-1.1.0.1_3 \
-		ansi-terminal-0.11.3 \
-		ansi-wl-pprint-0.6.9_3 \
+		ansi-terminal-0.11.5 \
+		ansi-terminal-types-0.11.5_1 \
+		ansi-wl-pprint-0.6.9_4 \
 		appar-0.1.8 \
 		asn1-encoding-0.9.6_2 \
 		asn1-parse-0.9.5 \
 		asn1-types-0.3.4 \
-		assoc-1.0.2_3 \
-		async-2.2.4_2 \
+		assoc-1.1 \
+		async-2.2.4_3 \
 		atomic-write-0.2.0.7 \
-		attoparsec-0.14.4_2 \
-		base-compat-0.12.2 \
-		base-compat-batteries-0.12.2 \
-		base-orphans-0.8.7 \
+		attoparsec-0.14.4_3 \
+		base-compat-0.13.0 \
+		base-compat-batteries-0.13.0 \
+		base-orphans-0.9.0 \
 		base16-bytestring-1.0.2.0 \
 		base64-bytestring-1.2.1.0 \
 		basement-0.0.15 \
-		bifunctors-5.5.13 \
+		bifunctors-5.6.1 \
 		blaze-builder-0.4.2.2_1 \
 		byteorder-1.0.4 \
-		cabal-doctest-1.0.9_2 \
+		cabal-doctest-1.0.9_3 \
 		case-insensitive-1.2.1.0 \
-		cborg-0.2.8.0_1 \
+		cborg-0.2.9.0 \
 		cborg-json-0.2.5.0_1 \
 		cereal-0.5.8.3 \
 		charset-0.3.9 \
-		cmdargs-0.10.21 \
+		cmdargs-0.10.22 \
 		colour-2.3.6 \
 		comonad-5.0.8_1 \
 		connection-0.3.1_1 \
 		contravariant-1.5.5 \
-		cookie-0.4.5 \
-		cryptohash-sha256-0.11.102.1_1 \
+		cookie-0.4.6 \
+		cryptohash-sha256-0.11.102.1_2 \
 		cryptonite-0.30 \
+		data-array-byte-0.1.0.1_1 \
 		data-default-class-0.1.2.0 \
-		data-fix-0.3.2_3 \
-		dhall-1.41.2_3 \
+		data-fix-0.3.2_4 \
+		dhall-1.42.0_1 \
 		distributive-0.6.2.1_1 \
 		dlist-1.0 \
 		dotgen-0.4.3 \
-		either-5.0.2 \
-		generically-0.1 \
+		either-5.0.2_1 \
+		foldable1-classes-compat-0.1_2 \
+		generically-0.1.1_1 \
 		half-0.3.1 \
-		hashable-1.4.1.0 \
+		hashable-1.4.2.0_1 \
 		hourglass-0.2.12 \
-		hsc2hs-0.68.8_1 \
-		http-client-0.7.13.1 \
+		hsc2hs-0.68.9 \
+		http-client-0.7.13.1_1 \
 		http-client-tls-0.3.6.1 \
 		http-types-0.12.3 \
-		indexed-traversable-0.1.2_2 \
-		indexed-traversable-instances-0.1.1.1 \
-		integer-logarithms-1.0.3.1_3 \
+		indexed-traversable-0.1.2.1 \
+		indexed-traversable-instances-0.1.1.2_1 \
+		integer-logarithms-1.0.3.1_4 \
 		iproute-1.7.12 \
 		lens-family-core-2.1.2 \
-		megaparsec-9.2.2 \
+		megaparsec-9.2.1_1 \
 		memory-0.18.0 \
 		mime-types-0.1.1.0 \
 		mmorph-1.2.0_3 \
-		network-3.1.2.7 \
-		network-uri-2.6.4.1 \
+		network-3.1.3.0 \
+		network-uri-2.6.4.2 \
 		optparse-applicative-0.17.0.0 \
 		parser-combinators-1.3.0 \
 		parsers-0.12.11 \
@ -84,43 +88,41 @@ USE_CABAL=	Diff-0.4.1 \
 		pretty-simple-4.1.2.0 \
 		prettyprinter-1.7.1 \
 		prettyprinter-ansi-terminal-1.1.3 \
-		primitive-0.7.4.0 \
-		profunctors-5.6.2_2 \
+		primitive-0.8.0.0 \
+		profunctors-5.6.2_3 \
 		random-1.2.1.1 \
 		repline-0.4.2.0 \
-		scientific-0.3.7.0_3 \
-		semialign-1.2.0.1_3 \
-		semigroupoids-5.3.7 \
-		serialise-0.2.6.0_1 \
+		scientific-0.3.7.0_5 \
+		semialign-1.3 \
+		semigroupoids-6.0.0.1 \
+		serialise-0.2.6.0_3 \
 		socks-0.6.1 \
-		splitmix-0.1.0.4_1 \
-		streaming-commons-0.2.2.5 \
-		strict-0.4.0.1_4 \
-		tagged-0.8.6.1_3 \
+		splitmix-0.1.0.4_2 \
+		streaming-commons-0.2.2.6 \
+		strict-0.5 \
+		tagged-0.8.7 \
 		temporary-1.3 \
 		text-manipulate-0.3.1.0 \
-		text-short-0.1.5_1 \
-		th-abstraction-0.4.5.0 \
-		th-compat-0.1.4 \
-		th-lift-0.8.2_2 \
+		text-short-0.1.5_2 \
+		th-abstraction-0.5.0.0 \
+		th-compat-0.1.4_2 \
+		th-lift-0.8.3 \
 		th-lift-instances-0.1.20 \
-		these-1.1.1.1_6 \
-		time-compat-1.9.6.1_4 \
+		these-1.2 \
+		time-compat-1.9.6.1_5 \
 		tls-1.6.0 \
 		transformers-compat-0.7.2 \
 		unix-compat-0.6_1 \
-		unordered-containers-0.2.19.1_1 \
-		uri-encode-1.5.0.7_2 \
-		utf8-string-1.0.2 \
-		uuid-types-1.0.5_3 \
-		vector-0.12.3.1_2 \
-		vector-stream-0.1.0.0_1 \
-		witherable-0.4.2_3 \
+		unordered-containers-0.2.19.1_2 \
+		uuid-types-1.0.5_4 \
+		vector-0.13.0.0_3 \
+		vector-stream-0.1.0.0_2 \
+		witherable-0.4.2_4 \
 		x509-1.7.7 \
 		x509-store-1.6.9 \
 		x509-system-1.6.7 \
 		x509-validation-1.6.12 \
-		zlib-0.6.3.0
+		zlib-0.6.3.0_1

 CABAL_EXECUTABLES=	dhall-to-json json-to-dhall
 CABAL_PROJECT=		remove
--- a/converters/hs-dhall-json/distinfo
+++ b/converters/hs-dhall-json/distinfo
@ -1,18 +1,18 @@
-TIMESTAMP = 1668538115
-SHA256 (cabal/dhall-json-1.7.10/dhall-json-1.7.10.tar.gz) = e15cd486b287ed281cd56da8d0603bb70dbfa33f2b3e107682d82935dad3f785
-SIZE (cabal/dhall-json-1.7.10/dhall-json-1.7.10.tar.gz) = 33378
+TIMESTAMP = 1684510587
+SHA256 (cabal/dhall-json-1.7.12/dhall-json-1.7.12.tar.gz) = ca48cd434380cbd979dbb12889f90da8fdc1ea90bc266cab14f061c60e19d5fa
+SIZE (cabal/dhall-json-1.7.12/dhall-json-1.7.12.tar.gz) = 33823
 SHA256 (cabal/Diff-0.4.1/Diff-0.4.1.tar.gz) = fd5e4aaac7219bcbb14834fb8580ebe0aae905958d0ad74f5338ea290b372670
 SIZE (cabal/Diff-0.4.1/Diff-0.4.1.tar.gz) = 8759
-SHA256 (cabal/OneTuple-0.3.1/OneTuple-0.3.1.tar.gz) = 98853682d52fb4cc37a45cd186fbd77cf2565d3df5171acc4cf026427e103eef
-SIZE (cabal/OneTuple-0.3.1/OneTuple-0.3.1.tar.gz) = 5148
-SHA256 (cabal/OneTuple-0.3.1/revision/3.cabal) = fc32cb744477befa450a538ea4975cc523f0a2f1585cb5a36e9936a3d18e9a3c
-SIZE (cabal/OneTuple-0.3.1/revision/3.cabal) = 2276
+SHA256 (cabal/OneTuple-0.4.1.1/OneTuple-0.4.1.1.tar.gz) = c9e764d4ee1e57cad8341bd5d0de33ba3a52b6793fc1309679f2bf60c030bb2b
+SIZE (cabal/OneTuple-0.4.1.1/OneTuple-0.4.1.1.tar.gz) = 5601
 SHA256 (cabal/QuickCheck-2.14.2/QuickCheck-2.14.2.tar.gz) = d87b6c85696b601175274361fa62217894401e401e150c3c5d4013ac53cd36f3
 SIZE (cabal/QuickCheck-2.14.2/QuickCheck-2.14.2.tar.gz) = 75246
 SHA256 (cabal/StateVar-1.2.2/StateVar-1.2.2.tar.gz) = 5e4b39da395656a59827b0280508aafdc70335798b50e5d6fd52596026251825
 SIZE (cabal/StateVar-1.2.2/StateVar-1.2.2.tar.gz) = 5048
-SHA256 (cabal/aeson-2.0.3.0/aeson-2.0.3.0.tar.gz) = 19760a2b84764fa3cee65c63df0c80d45497e2f0c3b95d4e6dc2083b8604b325
-SIZE (cabal/aeson-2.0.3.0/aeson-2.0.3.0.tar.gz) = 297283
+SHA256 (cabal/aeson-2.1.2.1/aeson-2.1.2.1.tar.gz) = 5d4042b903ce181ee023bbf908f37a3f55e820c5f0df102683b87f963e3522c6
+SIZE (cabal/aeson-2.1.2.1/aeson-2.1.2.1.tar.gz) = 335908
+SHA256 (cabal/aeson-2.1.2.1/revision/3.cabal) = 5b8d62a60963a925c4d123a46e42a8e235a32188522c9f119f64ac228c2612a7
+SIZE (cabal/aeson-2.1.2.1/revision/3.cabal) = 6359
 SHA256 (cabal/aeson-pretty-0.8.9/aeson-pretty-0.8.9.tar.gz) = 5dbc4f451dfa1e667b2c6ec5170714fed1905dc9cae6a1134b3376f355fa2a08
 SIZE (cabal/aeson-pretty-0.8.9/aeson-pretty-0.8.9.tar.gz) = 5802
 SHA256 (cabal/aeson-pretty-0.8.9/revision/2.cabal) = f7b1808efab1b9edd0efbdfc2cd47e7dfe8bbd42ee970d1d3780112a4de125a1
@ -21,12 +21,16 @@ SHA256 (cabal/aeson-yaml-1.1.0.1/aeson-yaml-1.1.0.1.tar.gz) = 44b44e2ea2d3c7def8
 SIZE (cabal/aeson-yaml-1.1.0.1/aeson-yaml-1.1.0.1.tar.gz) = 6973
 SHA256 (cabal/aeson-yaml-1.1.0.1/revision/3.cabal) = c6a23e7d81ce0adb95a1c701647e4655a1e2ef9f489cb93666d1523de7a95987
 SIZE (cabal/aeson-yaml-1.1.0.1/revision/3.cabal) = 2103
-SHA256 (cabal/ansi-terminal-0.11.3/ansi-terminal-0.11.3.tar.gz) = f4d563ecf71fb1d304bcdcad478d97efd9f61f6d9d4797a5d56e7722a92a9e6b
-SIZE (cabal/ansi-terminal-0.11.3/ansi-terminal-0.11.3.tar.gz) = 37868
+SHA256 (cabal/ansi-terminal-0.11.5/ansi-terminal-0.11.5.tar.gz) = 5b4acedc55eb558381f0b694c2d31a50c332856b823db44cbbf2df78e8c097cb
+SIZE (cabal/ansi-terminal-0.11.5/ansi-terminal-0.11.5.tar.gz) = 41123
+SHA256 (cabal/ansi-terminal-types-0.11.5/ansi-terminal-types-0.11.5.tar.gz) = bf7b230389f43105100a6d5740822598a88b38eaaf7d042de595ccf72db4fdd1
+SIZE (cabal/ansi-terminal-types-0.11.5/ansi-terminal-types-0.11.5.tar.gz) = 4660
+SHA256 (cabal/ansi-terminal-types-0.11.5/revision/1.cabal) = f78440dfd95c4509e88855ac7cc2d9566ddf956a92c1290404cac93ad1a1b00a
+SIZE (cabal/ansi-terminal-types-0.11.5/revision/1.cabal) = 1482
 SHA256 (cabal/ansi-wl-pprint-0.6.9/ansi-wl-pprint-0.6.9.tar.gz) = a7b2e8e7cd3f02f2954e8b17dc60a0ccd889f49e2068ebb15abfa1d42f7a4eac
 SIZE (cabal/ansi-wl-pprint-0.6.9/ansi-wl-pprint-0.6.9.tar.gz) = 16723
-SHA256 (cabal/ansi-wl-pprint-0.6.9/revision/3.cabal) = 212144ea0623b1170807a4162db05d87f26cf10b334aeadd0edb377aba06a1ce
-SIZE (cabal/ansi-wl-pprint-0.6.9/revision/3.cabal) = 2425
+SHA256 (cabal/ansi-wl-pprint-0.6.9/revision/4.cabal) = fb737bc96e2aef34ad595d54ced7a73f648c521ebcb00fe0679aff45ccd49212
+SIZE (cabal/ansi-wl-pprint-0.6.9/revision/4.cabal) = 2448
 SHA256 (cabal/appar-0.1.8/appar-0.1.8.tar.gz) = c4ceeddc26525b58d82c41b6d3e32141371a200a6794aae185b6266ccc81631f
 SIZE (cabal/appar-0.1.8/appar-0.1.8.tar.gz) = 4037
 SHA256 (cabal/asn1-encoding-0.9.6/asn1-encoding-0.9.6.tar.gz) = d9f8deabd3b908e5cf83c0d813c08dc0143b3ec1c0d97f660d2cfa02c1c8da0a
@ -37,34 +41,32 @@ SHA256 (cabal/asn1-parse-0.9.5/asn1-parse-0.9.5.tar.gz) = 8f1fe1344d30b39dc594d7
 SIZE (cabal/asn1-parse-0.9.5/asn1-parse-0.9.5.tar.gz) = 2951
 SHA256 (cabal/asn1-types-0.3.4/asn1-types-0.3.4.tar.gz) = 78ee92a251379298ca820fa53edbf4b33c539b9fcd887c86f520c30e3b4e21a8
 SIZE (cabal/asn1-types-0.3.4/asn1-types-0.3.4.tar.gz) = 6472
-SHA256 (cabal/assoc-1.0.2/assoc-1.0.2.tar.gz) = d8988dc6e8718c7a3456515b769c9336aeeec730cf86fc5175247969ff8f144f
-SIZE (cabal/assoc-1.0.2/assoc-1.0.2.tar.gz) = 3047
-SHA256 (cabal/assoc-1.0.2/revision/3.cabal) = 93b8d43aa081e4205116a139f7cf690f608968161d19ebfb23d884d19b082b57
-SIZE (cabal/assoc-1.0.2/revision/3.cabal) = 1253
+SHA256 (cabal/assoc-1.1/assoc-1.1.tar.gz) = 7aa2e6548b3d9d49a286ac20639479aaf6c47a1446113ed784d98737c5f60df4
+SIZE (cabal/assoc-1.1/assoc-1.1.tar.gz) = 3193
 SHA256 (cabal/async-2.2.4/async-2.2.4.tar.gz) = 484df85be0e76c4fed9376451e48e1d0c6e97952ce79735b72d54297e7e0a725
 SIZE (cabal/async-2.2.4/async-2.2.4.tar.gz) = 14148
-SHA256 (cabal/async-2.2.4/revision/2.cabal) = 2b9409023536823233ce3134558565d01b3382e651fa54ac8cb8a99967e023c9
-SIZE (cabal/async-2.2.4/revision/2.cabal) = 3095
+SHA256 (cabal/async-2.2.4/revision/3.cabal) = 46367dc0c8326dcbeb7b93f200b567491c2f6029bccf822b8bb26ee660397e08
+SIZE (cabal/async-2.2.4/revision/3.cabal) = 3112
 SHA256 (cabal/atomic-write-0.2.0.7/atomic-write-0.2.0.7.tar.gz) = b5f5c77884bc0332306fab89acf1c8a8582d76eabaa303c91b1c4072621c960d
 SIZE (cabal/atomic-write-0.2.0.7/atomic-write-0.2.0.7.tar.gz) = 7199
 SHA256 (cabal/attoparsec-0.14.4/attoparsec-0.14.4.tar.gz) = 3f337fe58624565de12426f607c23e60c7b09c86b4e3adfc827ca188c9979e6c
 SIZE (cabal/attoparsec-0.14.4/attoparsec-0.14.4.tar.gz) = 160701
-SHA256 (cabal/attoparsec-0.14.4/revision/2.cabal) = c0569d86c02cadd403017ea414dcb5e4f7de5380de0d8a92b9337cad84cd5e02
-SIZE (cabal/attoparsec-0.14.4/revision/2.cabal) = 5811
-SHA256 (cabal/base-compat-0.12.2/base-compat-0.12.2.tar.gz) = a62adc883a5ac436f80e4ae02c3c56111cf1007492f267c291139a668d2150bd
-SIZE (cabal/base-compat-0.12.2/base-compat-0.12.2.tar.gz) = 36393
-SHA256 (cabal/base-compat-batteries-0.12.2/base-compat-batteries-0.12.2.tar.gz) = ede9092e07f904e0759160bf1ecd3fb7eb043bae6dc89a37c3dc94829ec5eb99
-SIZE (cabal/base-compat-batteries-0.12.2/base-compat-batteries-0.12.2.tar.gz) = 17645
-SHA256 (cabal/base-orphans-0.8.7/base-orphans-0.8.7.tar.gz) = 888fd67f0dbe932778f5b170922ce80d0dcab1680ee98f1d6fcc362f20d9e447
-SIZE (cabal/base-orphans-0.8.7/base-orphans-0.8.7.tar.gz) = 25083
+SHA256 (cabal/attoparsec-0.14.4/revision/3.cabal) = 50475b722305175f57a3ee3dbaee10aa4b91f61c9717b85b718a7df37c223fb2
+SIZE (cabal/attoparsec-0.14.4/revision/3.cabal) = 5679
+SHA256 (cabal/base-compat-0.13.0/base-compat-0.13.0.tar.gz) = 8bf66075da849a037974a7feb9d7ecd81ce57e4522a0df40daf11db14fcea30d
+SIZE (cabal/base-compat-0.13.0/base-compat-0.13.0.tar.gz) = 40057
+SHA256 (cabal/base-compat-batteries-0.13.0/base-compat-batteries-0.13.0.tar.gz) = 3768af40d1d64f9b0845a8ddb18e63ba3a4c765d0d96db9dc28b5b66d1232f98
+SIZE (cabal/base-compat-batteries-0.13.0/base-compat-batteries-0.13.0.tar.gz) = 19320
+SHA256 (cabal/base-orphans-0.9.0/base-orphans-0.9.0.tar.gz) = 613ed4d8241ed5a648a59ae6569a6962990bb545711d020d49fb83fa12d16e62
+SIZE (cabal/base-orphans-0.9.0/base-orphans-0.9.0.tar.gz) = 26025
 SHA256 (cabal/base16-bytestring-1.0.2.0/base16-bytestring-1.0.2.0.tar.gz) = 1d5a91143ef0e22157536093ec8e59d226a68220ec89378d5dcaeea86472c784
 SIZE (cabal/base16-bytestring-1.0.2.0/base16-bytestring-1.0.2.0.tar.gz) = 7219
 SHA256 (cabal/base64-bytestring-1.2.1.0/base64-bytestring-1.2.1.0.tar.gz) = fbf8ed30edde271eb605352021431d8f1b055f95a56af31fe2eacf6bdfdc49c9
 SIZE (cabal/base64-bytestring-1.2.1.0/base64-bytestring-1.2.1.0.tar.gz) = 13743
 SHA256 (cabal/basement-0.0.15/basement-0.0.15.tar.gz) = 56c2afb6754e8d16a627331a8a5d473b3d26fd04ba5c9e0fb3475f595b915db4
 SIZE (cabal/basement-0.0.15/basement-0.0.15.tar.gz) = 135169
-SHA256 (cabal/bifunctors-5.5.13/bifunctors-5.5.13.tar.gz) = 26cc27ade3796cf03bd680f98ebb7b8c0d7fd1b67c1894dc3635f734fba7dbd7
-SIZE (cabal/bifunctors-5.5.13/bifunctors-5.5.13.tar.gz) = 46171
+SHA256 (cabal/bifunctors-5.6.1/bifunctors-5.6.1.tar.gz) = 06381471b5be16516a1b2c4b21a5101a3d991038bface8e0cad144c0044d57fc
+SIZE (cabal/bifunctors-5.6.1/bifunctors-5.6.1.tar.gz) = 38170
 SHA256 (cabal/blaze-builder-0.4.2.2/blaze-builder-0.4.2.2.tar.gz) = 2cdc998c021d3a5f2a66a95138b93386271c26a117e7676d78264a90e536af67
 SIZE (cabal/blaze-builder-0.4.2.2/blaze-builder-0.4.2.2.tar.gz) = 60707
 SHA256 (cabal/blaze-builder-0.4.2.2/revision/1.cabal) = f0017df374c330de0ebe0eb15eae8c48427bddefa1d81a3cb31c0a4812ecdb08
@ -73,14 +75,12 @@ SHA256 (cabal/byteorder-1.0.4/byteorder-1.0.4.tar.gz) = bd20bbb586947f99c38a4c93
 SIZE (cabal/byteorder-1.0.4/byteorder-1.0.4.tar.gz) = 2030
 SHA256 (cabal/cabal-doctest-1.0.9/cabal-doctest-1.0.9.tar.gz) = 5556088496111d33810c4ae6c4a065bb37fa3315e9e8891e8000b1ab6707ba73
 SIZE (cabal/cabal-doctest-1.0.9/cabal-doctest-1.0.9.tar.gz) = 10770
-SHA256 (cabal/cabal-doctest-1.0.9/revision/2.cabal) = 21823c6227a483b4faf210d7a55d435563ff69ddf94b48b8af1bba878196c820
-SIZE (cabal/cabal-doctest-1.0.9/revision/2.cabal) = 1502
+SHA256 (cabal/cabal-doctest-1.0.9/revision/3.cabal) = 6dea0dbd1457f43d96ce1cfb1bab8b9f55d4fb82940e2bfa5aad78e6e2260656
+SIZE (cabal/cabal-doctest-1.0.9/revision/3.cabal) = 1517
 SHA256 (cabal/case-insensitive-1.2.1.0/case-insensitive-1.2.1.0.tar.gz) = 296dc17e0c5f3dfb3d82ced83e4c9c44c338ecde749b278b6eae512f1d04e406
 SIZE (cabal/case-insensitive-1.2.1.0/case-insensitive-1.2.1.0.tar.gz) = 53609
-SHA256 (cabal/cborg-0.2.8.0/cborg-0.2.8.0.tar.gz) = 2e59c827c273b57af0fcbbfb62f6d15faeb399e0d89d57baf8adcc60e62ab01e
-SIZE (cabal/cborg-0.2.8.0/cborg-0.2.8.0.tar.gz) = 91143
-SHA256 (cabal/cborg-0.2.8.0/revision/1.cabal) = a6778307362f87689afb872c893c28ef4f56eb304428405ad2e5ed4b33d4a28e
-SIZE (cabal/cborg-0.2.8.0/revision/1.cabal) = 5308
+SHA256 (cabal/cborg-0.2.9.0/cborg-0.2.9.0.tar.gz) = dcb48d1723f06c0340ddad0cf0140dd6da528601605db3faaa8322e0c16afcaa
+SIZE (cabal/cborg-0.2.9.0/cborg-0.2.9.0.tar.gz) = 91929
 SHA256 (cabal/cborg-json-0.2.5.0/cborg-json-0.2.5.0.tar.gz) = 58c373453f06fd8558e062c4fbe6dd862cb0ae28ac3c02ba3b607573bd077cd4
 SIZE (cabal/cborg-json-0.2.5.0/cborg-json-0.2.5.0.tar.gz) = 4246
 SHA256 (cabal/cborg-json-0.2.5.0/revision/1.cabal) = cff332b1d68fc6aff042b96f63f6430714107e8c8797fad4e1b826eacd15f67f
@ -89,8 +89,8 @@ SHA256 (cabal/cereal-0.5.8.3/cereal-0.5.8.3.tar.gz) = 99905220661b26e5bd91130bd9
 SIZE (cabal/cereal-0.5.8.3/cereal-0.5.8.3.tar.gz) = 20166
 SHA256 (cabal/charset-0.3.9/charset-0.3.9.tar.gz) = cb4f8781491d1e346e7eef7b33bfadae96642c81777165ec585a05591abc998b
 SIZE (cabal/charset-0.3.9/charset-0.3.9.tar.gz) = 13660
-SHA256 (cabal/cmdargs-0.10.21/cmdargs-0.10.21.tar.gz) = f7d8ea5c4e6af368d9b5d2eb994fc29235406fbe91916a6dc63bd883025eca75
-SIZE (cabal/cmdargs-0.10.21/cmdargs-0.10.21.tar.gz) = 64892
+SHA256 (cabal/cmdargs-0.10.22/cmdargs-0.10.22.tar.gz) = b8b12e7f8795cf13037bb062d453b86c788eae62558586f59e9419aabe6e9bef
+SIZE (cabal/cmdargs-0.10.22/cmdargs-0.10.22.tar.gz) = 65154
 SHA256 (cabal/colour-2.3.6/colour-2.3.6.tar.gz) = 2cd35dcd6944a5abc9f108a5eb5ee564b6b1fa98a9ec79cefcc20b588991f871
 SIZE (cabal/colour-2.3.6/colour-2.3.6.tar.gz) = 20675
 SHA256 (cabal/comonad-5.0.8/comonad-5.0.8.tar.gz) = ef6cdf2cc292cc43ee6aa96c581b235fdea8ab44a0bffb24dc79ae2b2ef33d13
@ -103,24 +103,28 @@ SHA256 (cabal/connection-0.3.1/revision/1.cabal) = 65da1c055610095733bcd228d85df
 SIZE (cabal/connection-0.3.1/revision/1.cabal) = 1554
 SHA256 (cabal/contravariant-1.5.5/contravariant-1.5.5.tar.gz) = 062fd66580d7aad0b5ba93e644ffa7feee69276ef50f20d4ed9f1deb7642dffa
 SIZE (cabal/contravariant-1.5.5/contravariant-1.5.5.tar.gz) = 13815
-SHA256 (cabal/cookie-0.4.5/cookie-0.4.5.tar.gz) = 707f94d1b31018b91d6a1e9e19ef5413e20d02cab00ad93a5fd7d7b3b46a3583
-SIZE (cabal/cookie-0.4.5/cookie-0.4.5.tar.gz) = 6048
+SHA256 (cabal/cookie-0.4.6/cookie-0.4.6.tar.gz) = 8c41a956c32b9733d525a53d43b0338a236a34d36658ecc4364c8249a6664baa
+SIZE (cabal/cookie-0.4.6/cookie-0.4.6.tar.gz) = 6219
 SHA256 (cabal/cryptohash-sha256-0.11.102.1/cryptohash-sha256-0.11.102.1.tar.gz) = 73a7dc7163871a80837495039a099967b11f5c4fe70a118277842f7a713c6bf6
 SIZE (cabal/cryptohash-sha256-0.11.102.1/cryptohash-sha256-0.11.102.1.tar.gz) = 15707
-SHA256 (cabal/cryptohash-sha256-0.11.102.1/revision/1.cabal) = facd0c04925ef925ec05243471fd16055229fdf51f64db1a1049de0cc6c6dfc3
-SIZE (cabal/cryptohash-sha256-0.11.102.1/revision/1.cabal) = 5671
+SHA256 (cabal/cryptohash-sha256-0.11.102.1/revision/2.cabal) = 72ce9095872eae653addca5f412ac8070d6282d8e1c8578c2237c33f2cbbf4bc
+SIZE (cabal/cryptohash-sha256-0.11.102.1/revision/2.cabal) = 5452
 SHA256 (cabal/cryptonite-0.30/cryptonite-0.30.tar.gz) = 56099c8a8aa01d2ee914b670c97c1f818186dbb886e2025b73d9c2afe3496b1d
 SIZE (cabal/cryptonite-0.30/cryptonite-0.30.tar.gz) = 621062
+SHA256 (cabal/data-array-byte-0.1.0.1/data-array-byte-0.1.0.1.tar.gz) = 1bb6eca0b3e02d057fe7f4e14c81ef395216f421ab30fdaa1b18017c9c025600
+SIZE (cabal/data-array-byte-0.1.0.1/data-array-byte-0.1.0.1.tar.gz) = 6784
+SHA256 (cabal/data-array-byte-0.1.0.1/revision/1.cabal) = 2ef1bd3511e82ba56f7f23cd793dd2da84338a1e7c2cbea5b151417afe3baada
+SIZE (cabal/data-array-byte-0.1.0.1/revision/1.cabal) = 1989
 SHA256 (cabal/data-default-class-0.1.2.0/data-default-class-0.1.2.0.tar.gz) = 4f01b423f000c3e069aaf52a348564a6536797f31498bb85c3db4bd2d0973e56
 SIZE (cabal/data-default-class-0.1.2.0/data-default-class-0.1.2.0.tar.gz) = 2522
 SHA256 (cabal/data-fix-0.3.2/data-fix-0.3.2.tar.gz) = 3a172d3bc0639c327345e965f9d9023e099425814b28dcdb7b60ff66d66219cc
 SIZE (cabal/data-fix-0.3.2/data-fix-0.3.2.tar.gz) = 5842
-SHA256 (cabal/data-fix-0.3.2/revision/3.cabal) = bdea17f6b17c1d327f53ae6806e1bc3ca7813b46742a93c6088c72837c8ae77c
-SIZE (cabal/data-fix-0.3.2/revision/3.cabal) = 1706
-SHA256 (cabal/dhall-1.41.2/dhall-1.41.2.tar.gz) = 6a9a026e698e5c1a1e103fcb376e8494615b03ef2450f0b6c5e6b43877cea592
-SIZE (cabal/dhall-1.41.2/dhall-1.41.2.tar.gz) = 640162
-SHA256 (cabal/dhall-1.41.2/revision/3.cabal) = 21ba5384d9806b936f3eaa3baf0bb61f4447cae5a9295a200d6fff2ecd8310c9
-SIZE (cabal/dhall-1.41.2/revision/3.cabal) = 16281
+SHA256 (cabal/data-fix-0.3.2/revision/4.cabal) = c27b354476175581925217323e0f559d35ceff26907ceaa03cb65c6df38e3de9
+SIZE (cabal/data-fix-0.3.2/revision/4.cabal) = 1720
+SHA256 (cabal/dhall-1.42.0/dhall-1.42.0.tar.gz) = 9cb8a82382613cb5206ffdd76670f2bd6d2db51cfd93daef70f816a1f671d37b
+SIZE (cabal/dhall-1.42.0/dhall-1.42.0.tar.gz) = 672458
+SHA256 (cabal/dhall-1.42.0/revision/1.cabal) = c44634b66e138d1a0edbef7caf1f1ffcb14ffa223f573e0cb49ab3de3ba76e07
+SIZE (cabal/dhall-1.42.0/revision/1.cabal) = 17216
 SHA256 (cabal/distributive-0.6.2.1/distributive-0.6.2.1.tar.gz) = d7351392e078f58caa46630a4b9c643e1e2e9dddee45848c5c8358e7b1316b91
 SIZE (cabal/distributive-0.6.2.1/distributive-0.6.2.1.tar.gz) = 8140
 SHA256 (cabal/distributive-0.6.2.1/revision/1.cabal) = 0f99f5541cca04acf89b64432b03422b6408e830a8dff30e6c4334ef1a48680c
@ -131,40 +135,52 @@ SHA256 (cabal/dotgen-0.4.3/dotgen-0.4.3.tar.gz) = da1c78f7daf0470465ce095fd0f3b3
 SIZE (cabal/dotgen-0.4.3/dotgen-0.4.3.tar.gz) = 4955
 SHA256 (cabal/either-5.0.2/either-5.0.2.tar.gz) = bfa45b967fd77b1c7c952e156377441e3c42b6dc873ab1f06a7421a3222287be
 SIZE (cabal/either-5.0.2/either-5.0.2.tar.gz) = 7983
-SHA256 (cabal/generically-0.1/generically-0.1.tar.gz) = d5b72880e1d00b24b6c221978d060bea620acc412cdcb62521f3016cbd3f2b71
-SIZE (cabal/generically-0.1/generically-0.1.tar.gz) = 2572
+SHA256 (cabal/either-5.0.2/revision/1.cabal) = fb3d130c37df6b4c7aa5f093e83bb4527fe13d8a72f94bce3d6ab00764ee59f0
+SIZE (cabal/either-5.0.2/revision/1.cabal) = 2015
+SHA256 (cabal/foldable1-classes-compat-0.1/foldable1-classes-compat-0.1.tar.gz) = d057c3f358e1a6b72c73519bc64ba6aa959f066c08fed69f73258555ef95ff12
+SIZE (cabal/foldable1-classes-compat-0.1/foldable1-classes-compat-0.1.tar.gz) = 10484
+SHA256 (cabal/foldable1-classes-compat-0.1/revision/2.cabal) = 851225c0d4ccf6ca5e4df17347490945c9928548e431f15e7e7d80c240bc4d17
+SIZE (cabal/foldable1-classes-compat-0.1/revision/2.cabal) = 3782
+SHA256 (cabal/generically-0.1.1/generically-0.1.1.tar.gz) = 04c5a436bec4b041f71a733f56a1bd7f435f63dde8d3eb5c1f48d55b4dbc43cf
+SIZE (cabal/generically-0.1.1/generically-0.1.1.tar.gz) = 2870
+SHA256 (cabal/generically-0.1.1/revision/1.cabal) = 2b9b5efb6eea2fb65377565d53d85b0ccc5b37404fba4bef1d60277caa877e5e
+SIZE (cabal/generically-0.1.1/revision/1.cabal) = 1155
 SHA256 (cabal/half-0.3.1/half-0.3.1.tar.gz) = e2afc32724e11bf5c695d797b9169d9d9b2dc62a530aed31284c8187af1615d1
 SIZE (cabal/half-0.3.1/half-0.3.1.tar.gz) = 8514
-SHA256 (cabal/hashable-1.4.1.0/hashable-1.4.1.0.tar.gz) = e1b305c280e66ad827edeaedd6933b9fc4174f626882877eab2a08344e665e87
-SIZE (cabal/hashable-1.4.1.0/hashable-1.4.1.0.tar.gz) = 25599
+SHA256 (cabal/hashable-1.4.2.0/hashable-1.4.2.0.tar.gz) = 1b4000ea82b81f69d46d0af4152c10c6303873510738e24cfc4767760d30e3f8
+SIZE (cabal/hashable-1.4.2.0/hashable-1.4.2.0.tar.gz) = 25094
+SHA256 (cabal/hashable-1.4.2.0/revision/1.cabal) = 585792335d5541dba78fa8dfcb291a89cd5812a281825ff7a44afa296ab5d58a
+SIZE (cabal/hashable-1.4.2.0/revision/1.cabal) = 4520
 SHA256 (cabal/hourglass-0.2.12/hourglass-0.2.12.tar.gz) = 44335b5c402e80c60f1db6a74462be4ea29d1a9043aa994334ffee1164f1ca4a
 SIZE (cabal/hourglass-0.2.12/hourglass-0.2.12.tar.gz) = 25797
-SHA256 (cabal/hsc2hs-0.68.8/hsc2hs-0.68.8.tar.gz) = 78341efbc917a84a07f2143bee9203e2555072054d495717aa73d89d9df77a52
-SIZE (cabal/hsc2hs-0.68.8/hsc2hs-0.68.8.tar.gz) = 40207
-SHA256 (cabal/hsc2hs-0.68.8/revision/1.cabal) = 988c29f9b25293f44a29cf5164e2ec07a9f95e8d92c4ab3985e4915abf213a69
-SIZE (cabal/hsc2hs-0.68.8/revision/1.cabal) = 2976
+SHA256 (cabal/hsc2hs-0.68.9/hsc2hs-0.68.9.tar.gz) = c95b10ce0b2c881480e35118d738dcc9cefc435ec72baa0031af81d0d4d3bc0a
+SIZE (cabal/hsc2hs-0.68.9/hsc2hs-0.68.9.tar.gz) = 40442
 SHA256 (cabal/http-client-0.7.13.1/http-client-0.7.13.1.tar.gz) = c98e86a0382fa877e320d83dbbd173c41c966a60a32c9bc597058929a7aa0e27
 SIZE (cabal/http-client-0.7.13.1/http-client-0.7.13.1.tar.gz) = 95306
+SHA256 (cabal/http-client-0.7.13.1/revision/1.cabal) = 6480749144f27919547733262f06a6ae3c759b57b692af53f9beb309d05a1699
+SIZE (cabal/http-client-0.7.13.1/revision/1.cabal) = 5777
 SHA256 (cabal/http-client-tls-0.3.6.1/http-client-tls-0.3.6.1.tar.gz) = b19fff86a41b6035cbd97271a5d6965e43dcc4bedbe4c03dd586fed65fbac80d
 SIZE (cabal/http-client-tls-0.3.6.1/http-client-tls-0.3.6.1.tar.gz) = 7850
 SHA256 (cabal/http-types-0.12.3/http-types-0.12.3.tar.gz) = 4e8a4a66477459fa436a331c75e46857ec8026283df984d54f90576cd3024016
 SIZE (cabal/http-types-0.12.3/http-types-0.12.3.tar.gz) = 13547
-SHA256 (cabal/indexed-traversable-0.1.2/indexed-traversable-0.1.2.tar.gz) = 516858ee7198b1fed1b93c665157f9855fd947379db7f115d48c1b0d670e698d
-SIZE (cabal/indexed-traversable-0.1.2/indexed-traversable-0.1.2.tar.gz) = 8685
-SHA256 (cabal/indexed-traversable-0.1.2/revision/2.cabal) = 52a1b708abd921f91a5977f6ae53c4aa2b33f7c30be0fff17173f658b34c5350
-SIZE (cabal/indexed-traversable-0.1.2/revision/2.cabal) = 2533
-SHA256 (cabal/indexed-traversable-instances-0.1.1.1/indexed-traversable-instances-0.1.1.1.tar.gz) = 895ee5063d59e2b58930ca6fa54885bb11f19c8b7c7ba6c7b014f9431cdcc0b0
-SIZE (cabal/indexed-traversable-instances-0.1.1.1/indexed-traversable-instances-0.1.1.1.tar.gz) = 3751
+SHA256 (cabal/indexed-traversable-0.1.2.1/indexed-traversable-0.1.2.1.tar.gz) = fe854c10285debc7d6fe3e09da0928a740ebc091ad2911ae695bb007e6f746a4
+SIZE (cabal/indexed-traversable-0.1.2.1/indexed-traversable-0.1.2.1.tar.gz) = 8905
+SHA256 (cabal/indexed-traversable-instances-0.1.1.2/indexed-traversable-instances-0.1.1.2.tar.gz) = 0f9b4e895ccc819f74d15f913c93613cc74cab74dbb05d7e305aa387bdbe374a
+SIZE (cabal/indexed-traversable-instances-0.1.1.2/indexed-traversable-instances-0.1.1.2.tar.gz) = 3769
+SHA256 (cabal/indexed-traversable-instances-0.1.1.2/revision/1.cabal) = b493ed83623a7cba498d31a9d36beec233406f20377f1be3bb51d4ce3bd2ceef
+SIZE (cabal/indexed-traversable-instances-0.1.1.2/revision/1.cabal) = 2536
 SHA256 (cabal/integer-logarithms-1.0.3.1/integer-logarithms-1.0.3.1.tar.gz) = 9b0a9f9fab609b15cd015865721fb05f744a1bc77ae92fd133872de528bbea7f
 SIZE (cabal/integer-logarithms-1.0.3.1/integer-logarithms-1.0.3.1.tar.gz) = 9023
-SHA256 (cabal/integer-logarithms-1.0.3.1/revision/3.cabal) = d59bfd1d39808217af2b68789d3c0e57cb7199d47405a276060d88fef4f4017d
-SIZE (cabal/integer-logarithms-1.0.3.1/revision/3.cabal) = 3246
+SHA256 (cabal/integer-logarithms-1.0.3.1/revision/4.cabal) = 336fb40c3af19a59dbeb4e5b7bffe4b4c7fa04ab06006a8d4b70b1febc1bb4ca
+SIZE (cabal/integer-logarithms-1.0.3.1/revision/4.cabal) = 3262
 SHA256 (cabal/iproute-1.7.12/iproute-1.7.12.tar.gz) = f1751d1579fcbc1d9f86d9d1c9ede48cb71cbeb1d7b2043491c6216e4f236b63
 SIZE (cabal/iproute-1.7.12/iproute-1.7.12.tar.gz) = 17864
 SHA256 (cabal/lens-family-core-2.1.2/lens-family-core-2.1.2.tar.gz) = 1b5a997276c8b77a96f99f48b95b204d34f3bb84fa3691747cd30bc8c76873b6
 SIZE (cabal/lens-family-core-2.1.2/lens-family-core-2.1.2.tar.gz) = 17987
-SHA256 (cabal/megaparsec-9.2.2/megaparsec-9.2.2.tar.gz) = a48b03e55c0b9efcc88ce4236186fb6eee3acb64336987dd9c98daf4d96aa234
-SIZE (cabal/megaparsec-9.2.2/megaparsec-9.2.2.tar.gz) = 61325
+SHA256 (cabal/megaparsec-9.2.1/megaparsec-9.2.1.tar.gz) = 6b278397baa4ae66d613330465c919e909ced077ec308b18827b43cf6715e9ff
+SIZE (cabal/megaparsec-9.2.1/megaparsec-9.2.1.tar.gz) = 61210
+SHA256 (cabal/megaparsec-9.2.1/revision/1.cabal) = d3756f634324f4d3ae57088bbf544723871cdb584508fc9b5c9e33ad9de3d313
+SIZE (cabal/megaparsec-9.2.1/revision/1.cabal) = 3354
 SHA256 (cabal/memory-0.18.0/memory-0.18.0.tar.gz) = fd4eb6f638e24b81b4e6cdd68772a531726f2f67686c8969d3407d82f7862e3e
 SIZE (cabal/memory-0.18.0/memory-0.18.0.tar.gz) = 41957
 SHA256 (cabal/mime-types-0.1.1.0/mime-types-0.1.1.0.tar.gz) = ebd01ed4e37142cb3233d4ffe55fe879b64d4a0b5802c8bc6afa1c7670f9e11b
@ -173,10 +189,10 @@ SHA256 (cabal/mmorph-1.2.0/mmorph-1.2.0.tar.gz) = 61338058eb676b466a462ca45d59f4
 SIZE (cabal/mmorph-1.2.0/mmorph-1.2.0.tar.gz) = 6861
 SHA256 (cabal/mmorph-1.2.0/revision/3.cabal) = df9b213ec18f811cb3137b478d148f3f1680ee43f841cb775835fa282fdb0295
 SIZE (cabal/mmorph-1.2.0/revision/3.cabal) = 1083
-SHA256 (cabal/network-3.1.2.7/network-3.1.2.7.tar.gz) = 7f7620fef1a1af3d3d6747f510e73223a5c600e7d7fd9ace073d1222bdc63d85
-SIZE (cabal/network-3.1.2.7/network-3.1.2.7.tar.gz) = 139973
-SHA256 (cabal/network-uri-2.6.4.1/network-uri-2.6.4.1.tar.gz) = 57856db93608a4d419f681b881c9b8d4448800d5a687587dc37e8a9e0b223584
-SIZE (cabal/network-uri-2.6.4.1/network-uri-2.6.4.1.tar.gz) = 32373
+SHA256 (cabal/network-3.1.3.0/network-3.1.3.0.tar.gz) = 326c74aba0cdf049da0b6faabbc035cb70dc91dacb4f94e39129e6f3fce927a1
+SIZE (cabal/network-3.1.3.0/network-3.1.3.0.tar.gz) = 139436
+SHA256 (cabal/network-uri-2.6.4.2/network-uri-2.6.4.2.tar.gz) = 9c188973126e893250b881f20e8811dca06c223c23402b06f7a1f2e995797228
+SIZE (cabal/network-uri-2.6.4.2/network-uri-2.6.4.2.tar.gz) = 31309
 SHA256 (cabal/optparse-applicative-0.17.0.0/optparse-applicative-0.17.0.0.tar.gz) = 825b2e4d3dafe0ba64a073366a88062b3712b81f851793d9ce2327bee70af724
 SIZE (cabal/optparse-applicative-0.17.0.0/optparse-applicative-0.17.0.0.tar.gz) = 59409
 SHA256 (cabal/parser-combinators-1.3.0/parser-combinators-1.3.0.tar.gz) = 9310ef0d49f8a8922acda10b1cded9854cbee04dea717effc6ee5983072e4447
@ -191,72 +207,64 @@ SHA256 (cabal/prettyprinter-1.7.1/prettyprinter-1.7.1.tar.gz) = 5e6ea6903114fa11
 SIZE (cabal/prettyprinter-1.7.1/prettyprinter-1.7.1.tar.gz) = 56907
 SHA256 (cabal/prettyprinter-ansi-terminal-1.1.3/prettyprinter-ansi-terminal-1.1.3.tar.gz) = 813739308ad6050620578994effe21058a170a341716acf52573fae42b5b1db3
 SIZE (cabal/prettyprinter-ansi-terminal-1.1.3/prettyprinter-ansi-terminal-1.1.3.tar.gz) = 8879
-SHA256 (cabal/primitive-0.7.4.0/primitive-0.7.4.0.tar.gz) = 5b2d6dc2812eb2f6a115f05fcbe3e723d3aeff7894b012c617e075130581add5
-SIZE (cabal/primitive-0.7.4.0/primitive-0.7.4.0.tar.gz) = 56575
+SHA256 (cabal/primitive-0.8.0.0/primitive-0.8.0.0.tar.gz) = 5553c21b4a789f9b591eed69e598cc58484c274af29250e517b5a8bcc62b995f
+SIZE (cabal/primitive-0.8.0.0/primitive-0.8.0.0.tar.gz) = 57222
 SHA256 (cabal/profunctors-5.6.2/profunctors-5.6.2.tar.gz) = 65955d7b50525a4a3bccdab1d982d2ae342897fd38140d5a94b5ef3800d8c92a
 SIZE (cabal/profunctors-5.6.2/profunctors-5.6.2.tar.gz) = 28522
-SHA256 (cabal/profunctors-5.6.2/revision/2.cabal) = 3d3685119243a7ebf984fa6af03299d156ab7674a432e2e15ecee2a4fd420fb6
-SIZE (cabal/profunctors-5.6.2/revision/2.cabal) = 2483
+SHA256 (cabal/profunctors-5.6.2/revision/3.cabal) = e178ba4468982326656626e2089e296f64485e68fdddc9f4476dcd5d612b4f78
+SIZE (cabal/profunctors-5.6.2/revision/3.cabal) = 2484
 SHA256 (cabal/random-1.2.1.1/random-1.2.1.1.tar.gz) = 3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76
 SIZE (cabal/random-1.2.1.1/random-1.2.1.1.tar.gz) = 47109
 SHA256 (cabal/repline-0.4.2.0/repline-0.4.2.0.tar.gz) = 6181b3f106b4059eb1c86c4a442083c29335a1d9a3e7cfffecb962ec05b08d5a
 SIZE (cabal/repline-0.4.2.0/repline-0.4.2.0.tar.gz) = 9719
 SHA256 (cabal/scientific-0.3.7.0/scientific-0.3.7.0.tar.gz) = a3a121c4b3d68fb8b9f8c709ab012e48f090ed553609247a805ad070d6b343a9
 SIZE (cabal/scientific-0.3.7.0/scientific-0.3.7.0.tar.gz) = 24723
-SHA256 (cabal/scientific-0.3.7.0/revision/3.cabal) = 517444c944dad9db8235d7b311d7b9a0839a519ee3178288b5a9606256e0c7d8
-SIZE (cabal/scientific-0.3.7.0/revision/3.cabal) = 4840
-SHA256 (cabal/semialign-1.2.0.1/semialign-1.2.0.1.tar.gz) = d900697041ae4b0cca3243273a2b3e80bcf74d937405d6a5ff34dc33ee952132
-SIZE (cabal/semialign-1.2.0.1/semialign-1.2.0.1.tar.gz) = 10371
-SHA256 (cabal/semialign-1.2.0.1/revision/3.cabal) = ee3468e349e72ec0a604ae05573a4de7181d97d10366254244a0cca8a76d6c35
-SIZE (cabal/semialign-1.2.0.1/revision/3.cabal) = 2852
-SHA256 (cabal/semigroupoids-5.3.7/semigroupoids-5.3.7.tar.gz) = 6d45cdb6c58c75ca588859b80b2c92b6f48590a03e065c24ce5d767a6a963799
-SIZE (cabal/semigroupoids-5.3.7/semigroupoids-5.3.7.tar.gz) = 35349
+SHA256 (cabal/scientific-0.3.7.0/revision/5.cabal) = 26d8109106963a345368011081453d25ee1dfa6afae2b1f57b426b4bcd392d91
+SIZE (cabal/scientific-0.3.7.0/revision/5.cabal) = 4854
+SHA256 (cabal/semialign-1.3/semialign-1.3.tar.gz) = 628e43319f584a8dd46c124ee0685cac586e0f6f877c5ceff37c3dbb2e3cc56c
+SIZE (cabal/semialign-1.3/semialign-1.3.tar.gz) = 10543
+SHA256 (cabal/semigroupoids-6.0.0.1/semigroupoids-6.0.0.1.tar.gz) = 7da38a9891bdf8205fd6522cdb712956b8c0bf5c52983da60295c8e057d77934
+SIZE (cabal/semigroupoids-6.0.0.1/semigroupoids-6.0.0.1.tar.gz) = 36222
 SHA256 (cabal/serialise-0.2.6.0/serialise-0.2.6.0.tar.gz) = 93ff1888e1972999f14663072b38efcfd0c1481b4ec8e30ddc9c5ce97681a516
 SIZE (cabal/serialise-0.2.6.0/serialise-0.2.6.0.tar.gz) = 75077
-SHA256 (cabal/serialise-0.2.6.0/revision/1.cabal) = c98de52c5758da4dc5141d44bd2195dcd3232ca3aee8ebc4542d348125899a66
-SIZE (cabal/serialise-0.2.6.0/revision/1.cabal) = 8776
+SHA256 (cabal/serialise-0.2.6.0/revision/3.cabal) = eba4aae0ae552e58c4e1f27186764551b98591e3bd92e852c40655e3b35924c9
+SIZE (cabal/serialise-0.2.6.0/revision/3.cabal) = 8776
 SHA256 (cabal/socks-0.6.1/socks-0.6.1.tar.gz) = 734447558bb061ce768f53a0df1f2401902c6bee396cc96ce627edd986ef6a73
 SIZE (cabal/socks-0.6.1/socks-0.6.1.tar.gz) = 9759
 SHA256 (cabal/splitmix-0.1.0.4/splitmix-0.1.0.4.tar.gz) = 6d065402394e7a9117093dbb4530a21342c9b1e2ec509516c8a8d0ffed98ecaa
 SIZE (cabal/splitmix-0.1.0.4/splitmix-0.1.0.4.tar.gz) = 22382
-SHA256 (cabal/splitmix-0.1.0.4/revision/1.cabal) = 804e2574bc7e32d08cbab91e47ee6287b4df7d50851d73f9e778f94a9a7814c7
-SIZE (cabal/splitmix-0.1.0.4/revision/1.cabal) = 6521
-SHA256 (cabal/streaming-commons-0.2.2.5/streaming-commons-0.2.2.5.tar.gz) = ca50819bdb2b248ced790e9faab07a3a5369ef702d9f9a932f26438bbeeca704
-SIZE (cabal/streaming-commons-0.2.2.5/streaming-commons-0.2.2.5.tar.gz) = 84415
-SHA256 (cabal/strict-0.4.0.1/strict-0.4.0.1.tar.gz) = dff6abc08ad637e51891bb8b475778c40926c51219eda60fd64f0d9680226241
-SIZE (cabal/strict-0.4.0.1/strict-0.4.0.1.tar.gz) = 12488
-SHA256 (cabal/strict-0.4.0.1/revision/4.cabal) = d6205a748eb8db4cd17a7179be970c94598809709294ccfa43159c7f3cc4bf5d
-SIZE (cabal/strict-0.4.0.1/revision/4.cabal) = 4187
-SHA256 (cabal/tagged-0.8.6.1/tagged-0.8.6.1.tar.gz) = f5e0fcf95f0bb4aa63f428f2c01955a41ea1a42cfcf39145ed631f59a9616c02
-SIZE (cabal/tagged-0.8.6.1/tagged-0.8.6.1.tar.gz) = 9842
-SHA256 (cabal/tagged-0.8.6.1/revision/3.cabal) = 8a24aef29b8e35447ccc56658ea07c2aded30bfa8130ea057e382936e17c74a6
-SIZE (cabal/tagged-0.8.6.1/revision/3.cabal) = 2874
+SHA256 (cabal/splitmix-0.1.0.4/revision/2.cabal) = db25c2e17967aa6b6046ab8b1b96ba3f344ca59a62b60fb6113d51ea305a3d8e
+SIZE (cabal/splitmix-0.1.0.4/revision/2.cabal) = 6537
+SHA256 (cabal/streaming-commons-0.2.2.6/streaming-commons-0.2.2.6.tar.gz) = 0180958a882eb0f6262b812fe886c2b1b8285474b5b958f814ae4f05409fbf79
+SIZE (cabal/streaming-commons-0.2.2.6/streaming-commons-0.2.2.6.tar.gz) = 37959
+SHA256 (cabal/strict-0.5/strict-0.5.tar.gz) = 3f4f0995dec2d520d0e321542f71412dac023658fdab603db04364d75269a0fd
+SIZE (cabal/strict-0.5/strict-0.5.tar.gz) = 12564
+SHA256 (cabal/tagged-0.8.7/tagged-0.8.7.tar.gz) = 6414eeac27a1633f49e2f78199ced99ce8ce3d70b658cf6d55b1d81ff60cb961
+SIZE (cabal/tagged-0.8.7/tagged-0.8.7.tar.gz) = 10082
 SHA256 (cabal/temporary-1.3/temporary-1.3.tar.gz) = 8c442993694b5ffca823ce864af95bd2841fb5264ee511c61cf48cc71d879890
 SIZE (cabal/temporary-1.3/temporary-1.3.tar.gz) = 5686
 SHA256 (cabal/text-manipulate-0.3.1.0/text-manipulate-0.3.1.0.tar.gz) = 9a67efef74bf8a0166436e11bc5b668c10a943c5454fdac3c8de366668a306bc
 SIZE (cabal/text-manipulate-0.3.1.0/text-manipulate-0.3.1.0.tar.gz) = 13107
 SHA256 (cabal/text-short-0.1.5/text-short-0.1.5.tar.gz) = a35ec6cde2ada084c1a050dc5885be5ab01f851b93d744cf0facbc1c18002dda
 SIZE (cabal/text-short-0.1.5/text-short-0.1.5.tar.gz) = 25113
-SHA256 (cabal/text-short-0.1.5/revision/1.cabal) = ebb77383743e214138cf9387875bc7d2665c5584b2e489fe1461240f19e7b53e
-SIZE (cabal/text-short-0.1.5/revision/1.cabal) = 3161
-SHA256 (cabal/th-abstraction-0.4.5.0/th-abstraction-0.4.5.0.tar.gz) = 00d5e24f247e328bd9898d5af5915c1e86b134b4d40baa680258635f95031526
-SIZE (cabal/th-abstraction-0.4.5.0/th-abstraction-0.4.5.0.tar.gz) = 39515
+SHA256 (cabal/text-short-0.1.5/revision/2.cabal) = c296eb2289dc5bf39912989c295cb82ef05ae5f84ee83ea5dc21f48da80e7052
+SIZE (cabal/text-short-0.1.5/revision/2.cabal) = 3202
+SHA256 (cabal/th-abstraction-0.5.0.0/th-abstraction-0.5.0.0.tar.gz) = 8258dc3ab7188af5826e2467032b52a931a3af4d8a93d4a094210e240a8a9964
+SIZE (cabal/th-abstraction-0.5.0.0/th-abstraction-0.5.0.0.tar.gz) = 40093
 SHA256 (cabal/th-compat-0.1.4/th-compat-0.1.4.tar.gz) = d8f97ac14ab47b6b8a7b0fdb4ff95426322ec56badd01652ac15da4a44d4bab8
 SIZE (cabal/th-compat-0.1.4/th-compat-0.1.4.tar.gz) = 14838
-SHA256 (cabal/th-lift-0.8.2/th-lift-0.8.2.tar.gz) = 3a5927037a10ae63e605c02228c4027c32b7bab1985ae7b5379e6363b3cd5ce4
-SIZE (cabal/th-lift-0.8.2/th-lift-0.8.2.tar.gz) = 14385
-SHA256 (cabal/th-lift-0.8.2/revision/2.cabal) = f135f67b018c22889e68b094773273dcf8f9e16fcfa330bf4778f84fce8925e9
-SIZE (cabal/th-lift-0.8.2/revision/2.cabal) = 2677
+SHA256 (cabal/th-compat-0.1.4/revision/2.cabal) = e5ae7c083ef3a22248558f8451669bb1c55ea8090f5908b86b9033743c161730
+SIZE (cabal/th-compat-0.1.4/revision/2.cabal) = 3224
+SHA256 (cabal/th-lift-0.8.3/th-lift-0.8.3.tar.gz) = 25d57bf5f8e7deefeb4ace0539805ae1e90b1ba5a034ebcc36141846408c6b75
+SIZE (cabal/th-lift-0.8.3/th-lift-0.8.3.tar.gz) = 14643
 SHA256 (cabal/th-lift-instances-0.1.20/th-lift-instances-0.1.20.tar.gz) = f533c3f95addcca461a0ccd1aafef75dd801bfa6599c0d1184d54bfffb61d870
 SIZE (cabal/th-lift-instances-0.1.20/th-lift-instances-0.1.20.tar.gz) = 6721
-SHA256 (cabal/these-1.1.1.1/these-1.1.1.1.tar.gz) = d798c9f56e17def441e8f51e54cc11afdb3e76c6a9d1e9ee154e9a78da0bf508
-SIZE (cabal/these-1.1.1.1/these-1.1.1.1.tar.gz) = 9804
-SHA256 (cabal/these-1.1.1.1/revision/6.cabal) = 2991c13e264b0c35c696c8f5f85c428c53bc42e93b1dfbd19a582052112d948a
-SIZE (cabal/these-1.1.1.1/revision/6.cabal) = 2748
+SHA256 (cabal/these-1.2/these-1.2.tar.gz) = a8ed7174b7f790764360f48aab72fea382a6093ed369c7bc6881fae1abacd4b8
+SIZE (cabal/these-1.2/these-1.2.tar.gz) = 10606
 SHA256 (cabal/time-compat-1.9.6.1/time-compat-1.9.6.1.tar.gz) = ad07bb00eb9678c2136d3680752b00acc4cbc522654bb3199bf31c61ef1e6b80
 SIZE (cabal/time-compat-1.9.6.1/time-compat-1.9.6.1.tar.gz) = 59964
-SHA256 (cabal/time-compat-1.9.6.1/revision/4.cabal) = 5cf5fa19d32742816fa1423085cbfd626aef433101c0b97bf0e8f720a6f369d8
-SIZE (cabal/time-compat-1.9.6.1/revision/4.cabal) = 5047
+SHA256 (cabal/time-compat-1.9.6.1/revision/5.cabal) = dd4de1fa0d6b7108982efc7ac41938569e4c9b06230bb87d34aae007c52ddb67
+SIZE (cabal/time-compat-1.9.6.1/revision/5.cabal) = 5062
 SHA256 (cabal/tls-1.6.0/tls-1.6.0.tar.gz) = d29d20afc1c1b852a3c39b076ec853cb596ac888cf521e54144441dec689e498
 SIZE (cabal/tls-1.6.0/tls-1.6.0.tar.gz) = 158619
 SHA256 (cabal/transformers-compat-0.7.2/transformers-compat-0.7.2.tar.gz) = b62c7304c9f3cbc9463d0739aa85cb9489f217ea092b9d625d417514fbcc9d6a
@ -267,30 +275,24 @@ SHA256 (cabal/unix-compat-0.6/revision/1.cabal) = 0f5d0929d838077909d397c7c83b71
 SIZE (cabal/unix-compat-0.6/revision/1.cabal) = 3583
 SHA256 (cabal/unordered-containers-0.2.19.1/unordered-containers-0.2.19.1.tar.gz) = 1b27bec5e0d522b27a6029ebf4c4a6d40acbc083c787008e32fb55c4b1d128d2
 SIZE (cabal/unordered-containers-0.2.19.1/unordered-containers-0.2.19.1.tar.gz) = 58030
-SHA256 (cabal/unordered-containers-0.2.19.1/revision/1.cabal) = db11042bb0356c0adea277d0794743829125b4c99455af6af2bd5f7bd5e88a39
-SIZE (cabal/unordered-containers-0.2.19.1/revision/1.cabal) = 3797
-SHA256 (cabal/uri-encode-1.5.0.7/uri-encode-1.5.0.7.tar.gz) = c79c624257833841a22890e4d2b0ab07e4be88e0f99474d328223815c0814252
-SIZE (cabal/uri-encode-1.5.0.7/uri-encode-1.5.0.7.tar.gz) = 3506
-SHA256 (cabal/uri-encode-1.5.0.7/revision/2.cabal) = f255fed3d51f87016d2ca65cbc8c31d0af7618b3f48dccc50faf3e53e2daf50e
-SIZE (cabal/uri-encode-1.5.0.7/revision/2.cabal) = 2341
-SHA256 (cabal/utf8-string-1.0.2/utf8-string-1.0.2.tar.gz) = ee48deada7600370728c4156cb002441de770d0121ae33a68139a9ed9c19b09a
-SIZE (cabal/utf8-string-1.0.2/utf8-string-1.0.2.tar.gz) = 10726
+SHA256 (cabal/unordered-containers-0.2.19.1/revision/2.cabal) = 9ad8972c2e913c37b1d4f0e1261517fd7a1b8c8a58077e057be69837e3dbaa00
+SIZE (cabal/unordered-containers-0.2.19.1/revision/2.cabal) = 3822
 SHA256 (cabal/uuid-types-1.0.5/uuid-types-1.0.5.tar.gz) = ad68b89b7a64c07dd5c250a11be2033ee929318ff51ec7b4e4b54e1b4deba7dd
 SIZE (cabal/uuid-types-1.0.5/uuid-types-1.0.5.tar.gz) = 11922
-SHA256 (cabal/uuid-types-1.0.5/revision/3.cabal) = 9ca76986e3950af5e908502be2373e2292d6dc57ec10f5aeb41d7dc3a1961782
-SIZE (cabal/uuid-types-1.0.5/revision/3.cabal) = 2622
-SHA256 (cabal/vector-0.12.3.1/vector-0.12.3.1.tar.gz) = fb4a53c02bd4d7fdf155c0604da9a5bb0f3b3bfce5d9960aea11c2ae235b9f35
-SIZE (cabal/vector-0.12.3.1/vector-0.12.3.1.tar.gz) = 151420
-SHA256 (cabal/vector-0.12.3.1/revision/2.cabal) = fffbd00912d69ed7be9bc7eeb09f4f475e0d243ec43f916a9fd5bbd219ce7f3e
-SIZE (cabal/vector-0.12.3.1/revision/2.cabal) = 8238
+SHA256 (cabal/uuid-types-1.0.5/revision/4.cabal) = e4662609522f093b86c5ae86aa9781afc69338cf102d42e5b5c196c320d95621
+SIZE (cabal/uuid-types-1.0.5/revision/4.cabal) = 2636
+SHA256 (cabal/vector-0.13.0.0/vector-0.13.0.0.tar.gz) = c5d3167d15e12f52e00879ddf304a591672a74e369cc47bc5c7fa1d5a8d15b4f
+SIZE (cabal/vector-0.13.0.0/vector-0.13.0.0.tar.gz) = 154509
+SHA256 (cabal/vector-0.13.0.0/revision/3.cabal) = fa5cac81a17a5af388716792e8b99c24b3b66770086756d0d8b23f8272a0244c
+SIZE (cabal/vector-0.13.0.0/revision/3.cabal) = 9112
 SHA256 (cabal/vector-stream-0.1.0.0/vector-stream-0.1.0.0.tar.gz) = a888210f6467f155090653734be5cc920406a07227e0d3adb59096716fdb806c
 SIZE (cabal/vector-stream-0.1.0.0/vector-stream-0.1.0.0.tar.gz) = 12377
-SHA256 (cabal/vector-stream-0.1.0.0/revision/1.cabal) = 09b0f8dc4e51936b9d6b04791f0aa03f7c9759b5fb7140eac8a9461cda1e55a3
-SIZE (cabal/vector-stream-0.1.0.0/revision/1.cabal) = 1404
+SHA256 (cabal/vector-stream-0.1.0.0/revision/2.cabal) = f5d6d5291cd1b5f2f063403593f1f5c8127d692c888eedeb3e1eb40497a88dca
+SIZE (cabal/vector-stream-0.1.0.0/revision/2.cabal) = 1404
 SHA256 (cabal/witherable-0.4.2/witherable-0.4.2.tar.gz) = 790d2bb274283419173bd89104439860675a9410f70f21912973ecd9098b4104
 SIZE (cabal/witherable-0.4.2/witherable-0.4.2.tar.gz) = 11876
-SHA256 (cabal/witherable-0.4.2/revision/3.cabal) = cccb36175e088abb4291ee5044b8c04d71acd5c36636902d2520f91508dd4bb8
-SIZE (cabal/witherable-0.4.2/revision/3.cabal) = 2294
+SHA256 (cabal/witherable-0.4.2/revision/4.cabal) = cec516b35df0ff53ab0068e70a912a0ba7b65c672fbc554727183faa195ad3b8
+SIZE (cabal/witherable-0.4.2/revision/4.cabal) = 2342
 SHA256 (cabal/x509-1.7.7/x509-1.7.7.tar.gz) = 59c6920fe5d53f1e6a15176bd853f1a18422be87cd8496772ff4571828a568fe
 SIZE (cabal/x509-1.7.7/x509-1.7.7.tar.gz) = 21707
 SHA256 (cabal/x509-store-1.6.9/x509-store-1.6.9.tar.gz) = c59213520cf31a0a18611a60b8a4d2d7aa6cb206c0545d857b98dcb90fc5c8da
@ -301,3 +303,5 @@ SHA256 (cabal/x509-validation-1.6.12/x509-validation-1.6.12.tar.gz) = 0d8e44e199
 SIZE (cabal/x509-validation-1.6.12/x509-validation-1.6.12.tar.gz) = 19733
 SHA256 (cabal/zlib-0.6.3.0/zlib-0.6.3.0.tar.gz) = 9eaa989ad4534438b5beb51c1d3a4c8f6a088fdff0b259a5394fbf39aaee04da
 SIZE (cabal/zlib-0.6.3.0/zlib-0.6.3.0.tar.gz) = 369595
+SHA256 (cabal/zlib-0.6.3.0/revision/1.cabal) = 9adce39e4ca0b7a87d45df0a243134816c57059a08e28cff5469c98ae1f54dfc
+SIZE (cabal/zlib-0.6.3.0/revision/1.cabal) = 5367
--- a/converters/hs-dhall-yaml/Makefile
+++ b/converters/hs-dhall-yaml/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	dhall-yaml
-PORTVERSION=	1.2.10
-PORTREVISION=	1
+PORTVERSION=	1.2.12
 CATEGORIES=	converters lang haskell

 MAINTAINER=	malcolm.matalka@acsl.se
@ -12,74 +11,76 @@ LICENSE=	BSD3CLAUSE
 USES=		cabal

 USE_CABAL=	Diff-0.4.1 \
-		HsYAML-0.2.1.1_1 \
-		HsYAML-aeson-0.2.0.1_5 \
-		OneTuple-0.3.1_3 \
+		HsYAML-0.2.1.1_2 \
+		HsYAML-aeson-0.2.0.1_6 \
+		OneTuple-0.4.1.1 \
 		QuickCheck-2.14.2 \
 		StateVar-1.2.2 \
-		aeson-2.0.3.0 \
+		aeson-2.1.2.1_3 \
 		aeson-pretty-0.8.9_2 \
 		aeson-yaml-1.1.0.1_3 \
-		ansi-terminal-0.11.3 \
-		ansi-wl-pprint-0.6.9_3 \
+		ansi-terminal-0.11.5 \
+		ansi-terminal-types-0.11.5_1 \
+		ansi-wl-pprint-0.6.9_4 \
 		appar-0.1.8 \
 		asn1-encoding-0.9.6_2 \
 		asn1-parse-0.9.5 \
 		asn1-types-0.3.4 \
-		assoc-1.0.2_3 \
-		async-2.2.4_2 \
+		assoc-1.1 \
+		async-2.2.4_3 \
 		atomic-write-0.2.0.7 \
-		attoparsec-0.14.4_2 \
-		base-compat-0.12.2 \
-		base-compat-batteries-0.12.2 \
-		base-orphans-0.8.7 \
+		attoparsec-0.14.4_3 \
+		base-compat-0.13.0 \
+		base-compat-batteries-0.13.0 \
+		base-orphans-0.9.0 \
 		base16-bytestring-1.0.2.0 \
 		base64-bytestring-1.2.1.0 \
 		basement-0.0.15 \
-		bifunctors-5.5.13 \
+		bifunctors-5.6.1 \
 		blaze-builder-0.4.2.2_1 \
 		byteorder-1.0.4 \
-		cabal-doctest-1.0.9_2 \
+		cabal-doctest-1.0.9_3 \
 		case-insensitive-1.2.1.0 \
-		cborg-0.2.8.0_1 \
+		cborg-0.2.9.0 \
 		cborg-json-0.2.5.0_1 \
 		cereal-0.5.8.3 \
 		charset-0.3.9 \
-		cmdargs-0.10.21 \
+		cmdargs-0.10.22 \
 		colour-2.3.6 \
 		comonad-5.0.8_1 \
 		connection-0.3.1_1 \
 		contravariant-1.5.5 \
-		cookie-0.4.5 \
-		cryptohash-sha256-0.11.102.1_1 \
+		cookie-0.4.6 \
+		cryptohash-sha256-0.11.102.1_2 \
 		cryptonite-0.30 \
 		data-default-class-0.1.2.0 \
-		data-fix-0.3.2_3 \
-		dhall-1.41.2_3 \
+		data-fix-0.3.2_4 \
+		dhall-1.41.2_5 \
 		dhall-json-1.7.11_1 \
 		distributive-0.6.2.1_1 \
 		dlist-1.0 \
 		dotgen-0.4.3 \
-		either-5.0.2 \
-		generically-0.1 \
+		either-5.0.2_1 \
+		foldable1-classes-compat-0.1_2 \
+		generically-0.1.1_1 \
 		half-0.3.1 \
-		hashable-1.4.1.0 \
+		hashable-1.4.2.0_1 \
 		hourglass-0.2.12 \
-		hsc2hs-0.68.8_1 \
-		http-client-0.7.13.1 \
+		hsc2hs-0.68.9 \
+		http-client-0.7.13.1_1 \
 		http-client-tls-0.3.6.1 \
 		http-types-0.12.3 \
-		indexed-traversable-0.1.2_2 \
-		indexed-traversable-instances-0.1.1.1 \
-		integer-logarithms-1.0.3.1_3 \
+		indexed-traversable-0.1.2.1 \
+		indexed-traversable-instances-0.1.1.2_1 \
+		integer-logarithms-1.0.3.1_4 \
 		iproute-1.7.12 \
 		lens-family-core-2.1.2 \
-		megaparsec-9.2.2 \
+		megaparsec-9.3.1 \
 		memory-0.18.0 \
 		mime-types-0.1.1.0 \
 		mmorph-1.2.0_3 \
-		network-3.1.2.7 \
-		network-uri-2.6.4.1 \
+		network-3.1.3.0 \
+		network-uri-2.6.4.2 \
 		optparse-applicative-0.17.0.0 \
 		parser-combinators-1.3.0 \
 		parsers-0.12.11 \
@ -87,43 +88,43 @@ USE_CABAL=	Diff-0.4.1 \
 		pretty-simple-4.1.2.0 \
 		prettyprinter-1.7.1 \
 		prettyprinter-ansi-terminal-1.1.3 \
-		primitive-0.7.4.0 \
-		profunctors-5.6.2_2 \
+		primitive-0.8.0.0 \
+		profunctors-5.6.2_3 \
 		random-1.2.1.1 \
 		repline-0.4.2.0 \
-		scientific-0.3.7.0_3 \
-		semialign-1.2.0.1_3 \
-		semigroupoids-5.3.7 \
-		serialise-0.2.6.0_1 \
+		scientific-0.3.7.0_5 \
+		semialign-1.3 \
+		semigroupoids-6.0.0.1 \
+		serialise-0.2.6.0_3 \
 		socks-0.6.1 \
-		splitmix-0.1.0.4_1 \
-		streaming-commons-0.2.2.5 \
-		strict-0.4.0.1_4 \
-		tagged-0.8.6.1_3 \
+		splitmix-0.1.0.4_2 \
+		streaming-commons-0.2.2.6 \
+		strict-0.5 \
+		tagged-0.8.7 \
 		temporary-1.3 \
 		text-manipulate-0.3.1.0 \
-		text-short-0.1.5_1 \
-		th-abstraction-0.4.5.0 \
-		th-compat-0.1.4 \
-		th-lift-0.8.2_2 \
+		text-short-0.1.5_2 \
+		th-abstraction-0.5.0.0 \
+		th-compat-0.1.4_2 \
+		th-lift-0.8.3 \
 		th-lift-instances-0.1.20 \
-		these-1.1.1.1_6 \
-		time-compat-1.9.6.1_4 \
+		these-1.2 \
+		time-compat-1.9.6.1_5 \
 		tls-1.6.0 \
 		transformers-compat-0.7.2 \
-		unix-compat-0.6_1 \
-		unordered-containers-0.2.19.1_1 \
+		unix-compat-0.7 \
+		unordered-containers-0.2.19.1_2 \
 		uri-encode-1.5.0.7_2 \
 		utf8-string-1.0.2 \
-		uuid-types-1.0.5_3 \
-		vector-0.12.3.1_2 \
-		vector-stream-0.1.0.0_1 \
-		witherable-0.4.2_3 \
+		uuid-types-1.0.5_4 \
+		vector-0.13.0.0_3 \
+		vector-stream-0.1.0.0_2 \
+		witherable-0.4.2_4 \
 		x509-1.7.7 \
 		x509-store-1.6.9 \
 		x509-system-1.6.7 \
 		x509-validation-1.6.12 \
-		zlib-0.6.3.0
+		zlib-0.6.3.0_1

 CABAL_EXECUTABLES=	dhall-to-yaml-ng yaml-to-dhall
 CABAL_PROJECT=		remove
--- a/converters/hs-dhall-yaml/distinfo
+++ b/converters/hs-dhall-yaml/distinfo
@ -1,26 +1,26 @@
-TIMESTAMP = 1668538254
-SHA256 (cabal/dhall-yaml-1.2.10/dhall-yaml-1.2.10.tar.gz) = d6228d330ca593c98a1882f4d0f201917dff395b09b7bfd23e78d1940e416fa8
-SIZE (cabal/dhall-yaml-1.2.10/dhall-yaml-1.2.10.tar.gz) = 20498
+TIMESTAMP = 1684499338
+SHA256 (cabal/dhall-yaml-1.2.12/dhall-yaml-1.2.12.tar.gz) = e288091b568cfba756eb458716fb84745eb2599a848326b3eb3b45a5aa0008ea
+SIZE (cabal/dhall-yaml-1.2.12/dhall-yaml-1.2.12.tar.gz) = 20884
 SHA256 (cabal/Diff-0.4.1/Diff-0.4.1.tar.gz) = fd5e4aaac7219bcbb14834fb8580ebe0aae905958d0ad74f5338ea290b372670
 SIZE (cabal/Diff-0.4.1/Diff-0.4.1.tar.gz) = 8759
 SHA256 (cabal/HsYAML-0.2.1.1/HsYAML-0.2.1.1.tar.gz) = 465bb4fc90979c19bedf6db2053f9ac54537b4912d5827d7e2135d42ef5ef628
 SIZE (cabal/HsYAML-0.2.1.1/HsYAML-0.2.1.1.tar.gz) = 84104
-SHA256 (cabal/HsYAML-0.2.1.1/revision/1.cabal) = bbde5ec41f2903fdca2ec1a743dc40bfedf8ca12fb7f3351cb7431ee657eab4a
-SIZE (cabal/HsYAML-0.2.1.1/revision/1.cabal) = 5691
+SHA256 (cabal/HsYAML-0.2.1.1/revision/2.cabal) = a681b3b73c88207d24216017ced2a564e735c029f13021b7f08e56684d825e64
+SIZE (cabal/HsYAML-0.2.1.1/revision/2.cabal) = 5723
 SHA256 (cabal/HsYAML-aeson-0.2.0.1/HsYAML-aeson-0.2.0.1.tar.gz) = b9782d414af1e60711b5454f23b36de9eee112849ad597f7f4284f7840c3308d
 SIZE (cabal/HsYAML-aeson-0.2.0.1/HsYAML-aeson-0.2.0.1.tar.gz) = 11954
-SHA256 (cabal/HsYAML-aeson-0.2.0.1/revision/5.cabal) = 24340936b00e50bf76963b4f344dbc596ac06edf30a7b249f7c73454ecdc681b
-SIZE (cabal/HsYAML-aeson-0.2.0.1/revision/5.cabal) = 2618
-SHA256 (cabal/OneTuple-0.3.1/OneTuple-0.3.1.tar.gz) = 98853682d52fb4cc37a45cd186fbd77cf2565d3df5171acc4cf026427e103eef
-SIZE (cabal/OneTuple-0.3.1/OneTuple-0.3.1.tar.gz) = 5148
-SHA256 (cabal/OneTuple-0.3.1/revision/3.cabal) = fc32cb744477befa450a538ea4975cc523f0a2f1585cb5a36e9936a3d18e9a3c
-SIZE (cabal/OneTuple-0.3.1/revision/3.cabal) = 2276
+SHA256 (cabal/HsYAML-aeson-0.2.0.1/revision/6.cabal) = 99491821ffbfc5a0d3e38ab2b3096df07c93e0a9716a723ee84ef1141140fbb0
+SIZE (cabal/HsYAML-aeson-0.2.0.1/revision/6.cabal) = 2600
+SHA256 (cabal/OneTuple-0.4.1.1/OneTuple-0.4.1.1.tar.gz) = c9e764d4ee1e57cad8341bd5d0de33ba3a52b6793fc1309679f2bf60c030bb2b
+SIZE (cabal/OneTuple-0.4.1.1/OneTuple-0.4.1.1.tar.gz) = 5601
 SHA256 (cabal/QuickCheck-2.14.2/QuickCheck-2.14.2.tar.gz) = d87b6c85696b601175274361fa62217894401e401e150c3c5d4013ac53cd36f3
 SIZE (cabal/QuickCheck-2.14.2/QuickCheck-2.14.2.tar.gz) = 75246
 SHA256 (cabal/StateVar-1.2.2/StateVar-1.2.2.tar.gz) = 5e4b39da395656a59827b0280508aafdc70335798b50e5d6fd52596026251825
 SIZE (cabal/StateVar-1.2.2/StateVar-1.2.2.tar.gz) = 5048
-SHA256 (cabal/aeson-2.0.3.0/aeson-2.0.3.0.tar.gz) = 19760a2b84764fa3cee65c63df0c80d45497e2f0c3b95d4e6dc2083b8604b325
-SIZE (cabal/aeson-2.0.3.0/aeson-2.0.3.0.tar.gz) = 297283
+SHA256 (cabal/aeson-2.1.2.1/aeson-2.1.2.1.tar.gz) = 5d4042b903ce181ee023bbf908f37a3f55e820c5f0df102683b87f963e3522c6
+SIZE (cabal/aeson-2.1.2.1/aeson-2.1.2.1.tar.gz) = 335908
+SHA256 (cabal/aeson-2.1.2.1/revision/3.cabal) = 5b8d62a60963a925c4d123a46e42a8e235a32188522c9f119f64ac228c2612a7
+SIZE (cabal/aeson-2.1.2.1/revision/3.cabal) = 6359
 SHA256 (cabal/aeson-pretty-0.8.9/aeson-pretty-0.8.9.tar.gz) = 5dbc4f451dfa1e667b2c6ec5170714fed1905dc9cae6a1134b3376f355fa2a08
 SIZE (cabal/aeson-pretty-0.8.9/aeson-pretty-0.8.9.tar.gz) = 5802
 SHA256 (cabal/aeson-pretty-0.8.9/revision/2.cabal) = f7b1808efab1b9edd0efbdfc2cd47e7dfe8bbd42ee970d1d3780112a4de125a1
@ -29,12 +29,16 @@ SHA256 (cabal/aeson-yaml-1.1.0.1/aeson-yaml-1.1.0.1.tar.gz) = 44b44e2ea2d3c7def8
 SIZE (cabal/aeson-yaml-1.1.0.1/aeson-yaml-1.1.0.1.tar.gz) = 6973
 SHA256 (cabal/aeson-yaml-1.1.0.1/revision/3.cabal) = c6a23e7d81ce0adb95a1c701647e4655a1e2ef9f489cb93666d1523de7a95987
 SIZE (cabal/aeson-yaml-1.1.0.1/revision/3.cabal) = 2103
-SHA256 (cabal/ansi-terminal-0.11.3/ansi-terminal-0.11.3.tar.gz) = f4d563ecf71fb1d304bcdcad478d97efd9f61f6d9d4797a5d56e7722a92a9e6b
-SIZE (cabal/ansi-terminal-0.11.3/ansi-terminal-0.11.3.tar.gz) = 37868
+SHA256 (cabal/ansi-terminal-0.11.5/ansi-terminal-0.11.5.tar.gz) = 5b4acedc55eb558381f0b694c2d31a50c332856b823db44cbbf2df78e8c097cb
+SIZE (cabal/ansi-terminal-0.11.5/ansi-terminal-0.11.5.tar.gz) = 41123
+SHA256 (cabal/ansi-terminal-types-0.11.5/ansi-terminal-types-0.11.5.tar.gz) = bf7b230389f43105100a6d5740822598a88b38eaaf7d042de595ccf72db4fdd1
+SIZE (cabal/ansi-terminal-types-0.11.5/ansi-terminal-types-0.11.5.tar.gz) = 4660
+SHA256 (cabal/ansi-terminal-types-0.11.5/revision/1.cabal) = f78440dfd95c4509e88855ac7cc2d9566ddf956a92c1290404cac93ad1a1b00a
+SIZE (cabal/ansi-terminal-types-0.11.5/revision/1.cabal) = 1482
 SHA256 (cabal/ansi-wl-pprint-0.6.9/ansi-wl-pprint-0.6.9.tar.gz) = a7b2e8e7cd3f02f2954e8b17dc60a0ccd889f49e2068ebb15abfa1d42f7a4eac
 SIZE (cabal/ansi-wl-pprint-0.6.9/ansi-wl-pprint-0.6.9.tar.gz) = 16723
-SHA256 (cabal/ansi-wl-pprint-0.6.9/revision/3.cabal) = 212144ea0623b1170807a4162db05d87f26cf10b334aeadd0edb377aba06a1ce
-SIZE (cabal/ansi-wl-pprint-0.6.9/revision/3.cabal) = 2425
+SHA256 (cabal/ansi-wl-pprint-0.6.9/revision/4.cabal) = fb737bc96e2aef34ad595d54ced7a73f648c521ebcb00fe0679aff45ccd49212
+SIZE (cabal/ansi-wl-pprint-0.6.9/revision/4.cabal) = 2448
 SHA256 (cabal/appar-0.1.8/appar-0.1.8.tar.gz) = c4ceeddc26525b58d82c41b6d3e32141371a200a6794aae185b6266ccc81631f
 SIZE (cabal/appar-0.1.8/appar-0.1.8.tar.gz) = 4037
 SHA256 (cabal/asn1-encoding-0.9.6/asn1-encoding-0.9.6.tar.gz) = d9f8deabd3b908e5cf83c0d813c08dc0143b3ec1c0d97f660d2cfa02c1c8da0a
@ -45,34 +49,32 @@ SHA256 (cabal/asn1-parse-0.9.5/asn1-parse-0.9.5.tar.gz) = 8f1fe1344d30b39dc594d7
 SIZE (cabal/asn1-parse-0.9.5/asn1-parse-0.9.5.tar.gz) = 2951
 SHA256 (cabal/asn1-types-0.3.4/asn1-types-0.3.4.tar.gz) = 78ee92a251379298ca820fa53edbf4b33c539b9fcd887c86f520c30e3b4e21a8
 SIZE (cabal/asn1-types-0.3.4/asn1-types-0.3.4.tar.gz) = 6472
-SHA256 (cabal/assoc-1.0.2/assoc-1.0.2.tar.gz) = d8988dc6e8718c7a3456515b769c9336aeeec730cf86fc5175247969ff8f144f
-SIZE (cabal/assoc-1.0.2/assoc-1.0.2.tar.gz) = 3047
-SHA256 (cabal/assoc-1.0.2/revision/3.cabal) = 93b8d43aa081e4205116a139f7cf690f608968161d19ebfb23d884d19b082b57
-SIZE (cabal/assoc-1.0.2/revision/3.cabal) = 1253
+SHA256 (cabal/assoc-1.1/assoc-1.1.tar.gz) = 7aa2e6548b3d9d49a286ac20639479aaf6c47a1446113ed784d98737c5f60df4
+SIZE (cabal/assoc-1.1/assoc-1.1.tar.gz) = 3193
 SHA256 (cabal/async-2.2.4/async-2.2.4.tar.gz) = 484df85be0e76c4fed9376451e48e1d0c6e97952ce79735b72d54297e7e0a725
 SIZE (cabal/async-2.2.4/async-2.2.4.tar.gz) = 14148
-SHA256 (cabal/async-2.2.4/revision/2.cabal) = 2b9409023536823233ce3134558565d01b3382e651fa54ac8cb8a99967e023c9
-SIZE (cabal/async-2.2.4/revision/2.cabal) = 3095
+SHA256 (cabal/async-2.2.4/revision/3.cabal) = 46367dc0c8326dcbeb7b93f200b567491c2f6029bccf822b8bb26ee660397e08
+SIZE (cabal/async-2.2.4/revision/3.cabal) = 3112
 SHA256 (cabal/atomic-write-0.2.0.7/atomic-write-0.2.0.7.tar.gz) = b5f5c77884bc0332306fab89acf1c8a8582d76eabaa303c91b1c4072621c960d
 SIZE (cabal/atomic-write-0.2.0.7/atomic-write-0.2.0.7.tar.gz) = 7199
 SHA256 (cabal/attoparsec-0.14.4/attoparsec-0.14.4.tar.gz) = 3f337fe58624565de12426f607c23e60c7b09c86b4e3adfc827ca188c9979e6c
 SIZE (cabal/attoparsec-0.14.4/attoparsec-0.14.4.tar.gz) = 160701
-SHA256 (cabal/attoparsec-0.14.4/revision/2.cabal) = c0569d86c02cadd403017ea414dcb5e4f7de5380de0d8a92b9337cad84cd5e02
-SIZE (cabal/attoparsec-0.14.4/revision/2.cabal) = 5811
-SHA256 (cabal/base-compat-0.12.2/base-compat-0.12.2.tar.gz) = a62adc883a5ac436f80e4ae02c3c56111cf1007492f267c291139a668d2150bd
-SIZE (cabal/base-compat-0.12.2/base-compat-0.12.2.tar.gz) = 36393
-SHA256 (cabal/base-compat-batteries-0.12.2/base-compat-batteries-0.12.2.tar.gz) = ede9092e07f904e0759160bf1ecd3fb7eb043bae6dc89a37c3dc94829ec5eb99
-SIZE (cabal/base-compat-batteries-0.12.2/base-compat-batteries-0.12.2.tar.gz) = 17645
-SHA256 (cabal/base-orphans-0.8.7/base-orphans-0.8.7.tar.gz) = 888fd67f0dbe932778f5b170922ce80d0dcab1680ee98f1d6fcc362f20d9e447
-SIZE (cabal/base-orphans-0.8.7/base-orphans-0.8.7.tar.gz) = 25083
+SHA256 (cabal/attoparsec-0.14.4/revision/3.cabal) = 50475b722305175f57a3ee3dbaee10aa4b91f61c9717b85b718a7df37c223fb2
+SIZE (cabal/attoparsec-0.14.4/revision/3.cabal) = 5679
+SHA256 (cabal/base-compat-0.13.0/base-compat-0.13.0.tar.gz) = 8bf66075da849a037974a7feb9d7ecd81ce57e4522a0df40daf11db14fcea30d
+SIZE (cabal/base-compat-0.13.0/base-compat-0.13.0.tar.gz) = 40057
+SHA256 (cabal/base-compat-batteries-0.13.0/base-compat-batteries-0.13.0.tar.gz) = 3768af40d1d64f9b0845a8ddb18e63ba3a4c765d0d96db9dc28b5b66d1232f98
+SIZE (cabal/base-compat-batteries-0.13.0/base-compat-batteries-0.13.0.tar.gz) = 19320
+SHA256 (cabal/base-orphans-0.9.0/base-orphans-0.9.0.tar.gz) = 613ed4d8241ed5a648a59ae6569a6962990bb545711d020d49fb83fa12d16e62
+SIZE (cabal/base-orphans-0.9.0/base-orphans-0.9.0.tar.gz) = 26025
 SHA256 (cabal/base16-bytestring-1.0.2.0/base16-bytestring-1.0.2.0.tar.gz) = 1d5a91143ef0e22157536093ec8e59d226a68220ec89378d5dcaeea86472c784
 SIZE (cabal/base16-bytestring-1.0.2.0/base16-bytestring-1.0.2.0.tar.gz) = 7219
 SHA256 (cabal/base64-bytestring-1.2.1.0/base64-bytestring-1.2.1.0.tar.gz) = fbf8ed30edde271eb605352021431d8f1b055f95a56af31fe2eacf6bdfdc49c9
 SIZE (cabal/base64-bytestring-1.2.1.0/base64-bytestring-1.2.1.0.tar.gz) = 13743
 SHA256 (cabal/basement-0.0.15/basement-0.0.15.tar.gz) = 56c2afb6754e8d16a627331a8a5d473b3d26fd04ba5c9e0fb3475f595b915db4
 SIZE (cabal/basement-0.0.15/basement-0.0.15.tar.gz) = 135169
-SHA256 (cabal/bifunctors-5.5.13/bifunctors-5.5.13.tar.gz) = 26cc27ade3796cf03bd680f98ebb7b8c0d7fd1b67c1894dc3635f734fba7dbd7
-SIZE (cabal/bifunctors-5.5.13/bifunctors-5.5.13.tar.gz) = 46171
+SHA256 (cabal/bifunctors-5.6.1/bifunctors-5.6.1.tar.gz) = 06381471b5be16516a1b2c4b21a5101a3d991038bface8e0cad144c0044d57fc
+SIZE (cabal/bifunctors-5.6.1/bifunctors-5.6.1.tar.gz) = 38170
 SHA256 (cabal/blaze-builder-0.4.2.2/blaze-builder-0.4.2.2.tar.gz) = 2cdc998c021d3a5f2a66a95138b93386271c26a117e7676d78264a90e536af67
 SIZE (cabal/blaze-builder-0.4.2.2/blaze-builder-0.4.2.2.tar.gz) = 60707
 SHA256 (cabal/blaze-builder-0.4.2.2/revision/1.cabal) = f0017df374c330de0ebe0eb15eae8c48427bddefa1d81a3cb31c0a4812ecdb08
@ -81,14 +83,12 @@ SHA256 (cabal/byteorder-1.0.4/byteorder-1.0.4.tar.gz) = bd20bbb586947f99c38a4c93
 SIZE (cabal/byteorder-1.0.4/byteorder-1.0.4.tar.gz) = 2030
 SHA256 (cabal/cabal-doctest-1.0.9/cabal-doctest-1.0.9.tar.gz) = 5556088496111d33810c4ae6c4a065bb37fa3315e9e8891e8000b1ab6707ba73
 SIZE (cabal/cabal-doctest-1.0.9/cabal-doctest-1.0.9.tar.gz) = 10770
-SHA256 (cabal/cabal-doctest-1.0.9/revision/2.cabal) = 21823c6227a483b4faf210d7a55d435563ff69ddf94b48b8af1bba878196c820
-SIZE (cabal/cabal-doctest-1.0.9/revision/2.cabal) = 1502
+SHA256 (cabal/cabal-doctest-1.0.9/revision/3.cabal) = 6dea0dbd1457f43d96ce1cfb1bab8b9f55d4fb82940e2bfa5aad78e6e2260656
+SIZE (cabal/cabal-doctest-1.0.9/revision/3.cabal) = 1517
 SHA256 (cabal/case-insensitive-1.2.1.0/case-insensitive-1.2.1.0.tar.gz) = 296dc17e0c5f3dfb3d82ced83e4c9c44c338ecde749b278b6eae512f1d04e406
 SIZE (cabal/case-insensitive-1.2.1.0/case-insensitive-1.2.1.0.tar.gz) = 53609
-SHA256 (cabal/cborg-0.2.8.0/cborg-0.2.8.0.tar.gz) = 2e59c827c273b57af0fcbbfb62f6d15faeb399e0d89d57baf8adcc60e62ab01e
-SIZE (cabal/cborg-0.2.8.0/cborg-0.2.8.0.tar.gz) = 91143
-SHA256 (cabal/cborg-0.2.8.0/revision/1.cabal) = a6778307362f87689afb872c893c28ef4f56eb304428405ad2e5ed4b33d4a28e
-SIZE (cabal/cborg-0.2.8.0/revision/1.cabal) = 5308
+SHA256 (cabal/cborg-0.2.9.0/cborg-0.2.9.0.tar.gz) = dcb48d1723f06c0340ddad0cf0140dd6da528601605db3faaa8322e0c16afcaa
+SIZE (cabal/cborg-0.2.9.0/cborg-0.2.9.0.tar.gz) = 91929
 SHA256 (cabal/cborg-json-0.2.5.0/cborg-json-0.2.5.0.tar.gz) = 58c373453f06fd8558e062c4fbe6dd862cb0ae28ac3c02ba3b607573bd077cd4
 SIZE (cabal/cborg-json-0.2.5.0/cborg-json-0.2.5.0.tar.gz) = 4246
 SHA256 (cabal/cborg-json-0.2.5.0/revision/1.cabal) = cff332b1d68fc6aff042b96f63f6430714107e8c8797fad4e1b826eacd15f67f
@ -97,8 +97,8 @@ SHA256 (cabal/cereal-0.5.8.3/cereal-0.5.8.3.tar.gz) = 99905220661b26e5bd91130bd9
 SIZE (cabal/cereal-0.5.8.3/cereal-0.5.8.3.tar.gz) = 20166
 SHA256 (cabal/charset-0.3.9/charset-0.3.9.tar.gz) = cb4f8781491d1e346e7eef7b33bfadae96642c81777165ec585a05591abc998b
 SIZE (cabal/charset-0.3.9/charset-0.3.9.tar.gz) = 13660
-SHA256 (cabal/cmdargs-0.10.21/cmdargs-0.10.21.tar.gz) = f7d8ea5c4e6af368d9b5d2eb994fc29235406fbe91916a6dc63bd883025eca75
-SIZE (cabal/cmdargs-0.10.21/cmdargs-0.10.21.tar.gz) = 64892
+SHA256 (cabal/cmdargs-0.10.22/cmdargs-0.10.22.tar.gz) = b8b12e7f8795cf13037bb062d453b86c788eae62558586f59e9419aabe6e9bef
+SIZE (cabal/cmdargs-0.10.22/cmdargs-0.10.22.tar.gz) = 65154
 SHA256 (cabal/colour-2.3.6/colour-2.3.6.tar.gz) = 2cd35dcd6944a5abc9f108a5eb5ee564b6b1fa98a9ec79cefcc20b588991f871
 SIZE (cabal/colour-2.3.6/colour-2.3.6.tar.gz) = 20675
 SHA256 (cabal/comonad-5.0.8/comonad-5.0.8.tar.gz) = ef6cdf2cc292cc43ee6aa96c581b235fdea8ab44a0bffb24dc79ae2b2ef33d13
@ -111,24 +111,24 @@ SHA256 (cabal/connection-0.3.1/revision/1.cabal) = 65da1c055610095733bcd228d85df
 SIZE (cabal/connection-0.3.1/revision/1.cabal) = 1554
 SHA256 (cabal/contravariant-1.5.5/contravariant-1.5.5.tar.gz) = 062fd66580d7aad0b5ba93e644ffa7feee69276ef50f20d4ed9f1deb7642dffa
 SIZE (cabal/contravariant-1.5.5/contravariant-1.5.5.tar.gz) = 13815
-SHA256 (cabal/cookie-0.4.5/cookie-0.4.5.tar.gz) = 707f94d1b31018b91d6a1e9e19ef5413e20d02cab00ad93a5fd7d7b3b46a3583
-SIZE (cabal/cookie-0.4.5/cookie-0.4.5.tar.gz) = 6048
+SHA256 (cabal/cookie-0.4.6/cookie-0.4.6.tar.gz) = 8c41a956c32b9733d525a53d43b0338a236a34d36658ecc4364c8249a6664baa
+SIZE (cabal/cookie-0.4.6/cookie-0.4.6.tar.gz) = 6219
 SHA256 (cabal/cryptohash-sha256-0.11.102.1/cryptohash-sha256-0.11.102.1.tar.gz) = 73a7dc7163871a80837495039a099967b11f5c4fe70a118277842f7a713c6bf6
 SIZE (cabal/cryptohash-sha256-0.11.102.1/cryptohash-sha256-0.11.102.1.tar.gz) = 15707
-SHA256 (cabal/cryptohash-sha256-0.11.102.1/revision/1.cabal) = facd0c04925ef925ec05243471fd16055229fdf51f64db1a1049de0cc6c6dfc3
-SIZE (cabal/cryptohash-sha256-0.11.102.1/revision/1.cabal) = 5671
+SHA256 (cabal/cryptohash-sha256-0.11.102.1/revision/2.cabal) = 72ce9095872eae653addca5f412ac8070d6282d8e1c8578c2237c33f2cbbf4bc
+SIZE (cabal/cryptohash-sha256-0.11.102.1/revision/2.cabal) = 5452
 SHA256 (cabal/cryptonite-0.30/cryptonite-0.30.tar.gz) = 56099c8a8aa01d2ee914b670c97c1f818186dbb886e2025b73d9c2afe3496b1d
 SIZE (cabal/cryptonite-0.30/cryptonite-0.30.tar.gz) = 621062
 SHA256 (cabal/data-default-class-0.1.2.0/data-default-class-0.1.2.0.tar.gz) = 4f01b423f000c3e069aaf52a348564a6536797f31498bb85c3db4bd2d0973e56
 SIZE (cabal/data-default-class-0.1.2.0/data-default-class-0.1.2.0.tar.gz) = 2522
 SHA256 (cabal/data-fix-0.3.2/data-fix-0.3.2.tar.gz) = 3a172d3bc0639c327345e965f9d9023e099425814b28dcdb7b60ff66d66219cc
 SIZE (cabal/data-fix-0.3.2/data-fix-0.3.2.tar.gz) = 5842
-SHA256 (cabal/data-fix-0.3.2/revision/3.cabal) = bdea17f6b17c1d327f53ae6806e1bc3ca7813b46742a93c6088c72837c8ae77c
-SIZE (cabal/data-fix-0.3.2/revision/3.cabal) = 1706
+SHA256 (cabal/data-fix-0.3.2/revision/4.cabal) = c27b354476175581925217323e0f559d35ceff26907ceaa03cb65c6df38e3de9
+SIZE (cabal/data-fix-0.3.2/revision/4.cabal) = 1720
 SHA256 (cabal/dhall-1.41.2/dhall-1.41.2.tar.gz) = 6a9a026e698e5c1a1e103fcb376e8494615b03ef2450f0b6c5e6b43877cea592
 SIZE (cabal/dhall-1.41.2/dhall-1.41.2.tar.gz) = 640162
-SHA256 (cabal/dhall-1.41.2/revision/3.cabal) = 21ba5384d9806b936f3eaa3baf0bb61f4447cae5a9295a200d6fff2ecd8310c9
-SIZE (cabal/dhall-1.41.2/revision/3.cabal) = 16281
+SHA256 (cabal/dhall-1.41.2/revision/5.cabal) = 8c34d0a39931686b3f8a5ff029ed79b1ad1a4ef64c8adc9f58be531bffe7104a
+SIZE (cabal/dhall-1.41.2/revision/5.cabal) = 16281
 SHA256 (cabal/dhall-json-1.7.11/dhall-json-1.7.11.tar.gz) = 26c2acf33bfc597f4d2ac333a431180c9929d7a9b4ef7cf70c4bd45eba65ef28
 SIZE (cabal/dhall-json-1.7.11/dhall-json-1.7.11.tar.gz) = 33773
 SHA256 (cabal/dhall-json-1.7.11/revision/1.cabal) = be0e259e141f61034ae3d6e4e794b5f849c1ef3b5f565c927d4a1e19d8b3ba54
@ -143,40 +143,50 @@ SHA256 (cabal/dotgen-0.4.3/dotgen-0.4.3.tar.gz) = da1c78f7daf0470465ce095fd0f3b3
 SIZE (cabal/dotgen-0.4.3/dotgen-0.4.3.tar.gz) = 4955
 SHA256 (cabal/either-5.0.2/either-5.0.2.tar.gz) = bfa45b967fd77b1c7c952e156377441e3c42b6dc873ab1f06a7421a3222287be
 SIZE (cabal/either-5.0.2/either-5.0.2.tar.gz) = 7983
-SHA256 (cabal/generically-0.1/generically-0.1.tar.gz) = d5b72880e1d00b24b6c221978d060bea620acc412cdcb62521f3016cbd3f2b71
-SIZE (cabal/generically-0.1/generically-0.1.tar.gz) = 2572
+SHA256 (cabal/either-5.0.2/revision/1.cabal) = fb3d130c37df6b4c7aa5f093e83bb4527fe13d8a72f94bce3d6ab00764ee59f0
+SIZE (cabal/either-5.0.2/revision/1.cabal) = 2015
+SHA256 (cabal/foldable1-classes-compat-0.1/foldable1-classes-compat-0.1.tar.gz) = d057c3f358e1a6b72c73519bc64ba6aa959f066c08fed69f73258555ef95ff12
+SIZE (cabal/foldable1-classes-compat-0.1/foldable1-classes-compat-0.1.tar.gz) = 10484
+SHA256 (cabal/foldable1-classes-compat-0.1/revision/2.cabal) = 851225c0d4ccf6ca5e4df17347490945c9928548e431f15e7e7d80c240bc4d17
+SIZE (cabal/foldable1-classes-compat-0.1/revision/2.cabal) = 3782
+SHA256 (cabal/generically-0.1.1/generically-0.1.1.tar.gz) = 04c5a436bec4b041f71a733f56a1bd7f435f63dde8d3eb5c1f48d55b4dbc43cf
+SIZE (cabal/generically-0.1.1/generically-0.1.1.tar.gz) = 2870
+SHA256 (cabal/generically-0.1.1/revision/1.cabal) = 2b9b5efb6eea2fb65377565d53d85b0ccc5b37404fba4bef1d60277caa877e5e
+SIZE (cabal/generically-0.1.1/revision/1.cabal) = 1155
 SHA256 (cabal/half-0.3.1/half-0.3.1.tar.gz) = e2afc32724e11bf5c695d797b9169d9d9b2dc62a530aed31284c8187af1615d1
 SIZE (cabal/half-0.3.1/half-0.3.1.tar.gz) = 8514
-SHA256 (cabal/hashable-1.4.1.0/hashable-1.4.1.0.tar.gz) = e1b305c280e66ad827edeaedd6933b9fc4174f626882877eab2a08344e665e87
-SIZE (cabal/hashable-1.4.1.0/hashable-1.4.1.0.tar.gz) = 25599
+SHA256 (cabal/hashable-1.4.2.0/hashable-1.4.2.0.tar.gz) = 1b4000ea82b81f69d46d0af4152c10c6303873510738e24cfc4767760d30e3f8
+SIZE (cabal/hashable-1.4.2.0/hashable-1.4.2.0.tar.gz) = 25094
+SHA256 (cabal/hashable-1.4.2.0/revision/1.cabal) = 585792335d5541dba78fa8dfcb291a89cd5812a281825ff7a44afa296ab5d58a
+SIZE (cabal/hashable-1.4.2.0/revision/1.cabal) = 4520
 SHA256 (cabal/hourglass-0.2.12/hourglass-0.2.12.tar.gz) = 44335b5c402e80c60f1db6a74462be4ea29d1a9043aa994334ffee1164f1ca4a
 SIZE (cabal/hourglass-0.2.12/hourglass-0.2.12.tar.gz) = 25797
-SHA256 (cabal/hsc2hs-0.68.8/hsc2hs-0.68.8.tar.gz) = 78341efbc917a84a07f2143bee9203e2555072054d495717aa73d89d9df77a52
-SIZE (cabal/hsc2hs-0.68.8/hsc2hs-0.68.8.tar.gz) = 40207
-SHA256 (cabal/hsc2hs-0.68.8/revision/1.cabal) = 988c29f9b25293f44a29cf5164e2ec07a9f95e8d92c4ab3985e4915abf213a69
-SIZE (cabal/hsc2hs-0.68.8/revision/1.cabal) = 2976
+SHA256 (cabal/hsc2hs-0.68.9/hsc2hs-0.68.9.tar.gz) = c95b10ce0b2c881480e35118d738dcc9cefc435ec72baa0031af81d0d4d3bc0a
+SIZE (cabal/hsc2hs-0.68.9/hsc2hs-0.68.9.tar.gz) = 40442
 SHA256 (cabal/http-client-0.7.13.1/http-client-0.7.13.1.tar.gz) = c98e86a0382fa877e320d83dbbd173c41c966a60a32c9bc597058929a7aa0e27
 SIZE (cabal/http-client-0.7.13.1/http-client-0.7.13.1.tar.gz) = 95306
+SHA256 (cabal/http-client-0.7.13.1/revision/1.cabal) = 6480749144f27919547733262f06a6ae3c759b57b692af53f9beb309d05a1699
+SIZE (cabal/http-client-0.7.13.1/revision/1.cabal) = 5777
 SHA256 (cabal/http-client-tls-0.3.6.1/http-client-tls-0.3.6.1.tar.gz) = b19fff86a41b6035cbd97271a5d6965e43dcc4bedbe4c03dd586fed65fbac80d
 SIZE (cabal/http-client-tls-0.3.6.1/http-client-tls-0.3.6.1.tar.gz) = 7850
 SHA256 (cabal/http-types-0.12.3/http-types-0.12.3.tar.gz) = 4e8a4a66477459fa436a331c75e46857ec8026283df984d54f90576cd3024016
 SIZE (cabal/http-types-0.12.3/http-types-0.12.3.tar.gz) = 13547
-SHA256 (cabal/indexed-traversable-0.1.2/indexed-traversable-0.1.2.tar.gz) = 516858ee7198b1fed1b93c665157f9855fd947379db7f115d48c1b0d670e698d
-SIZE (cabal/indexed-traversable-0.1.2/indexed-traversable-0.1.2.tar.gz) = 8685
-SHA256 (cabal/indexed-traversable-0.1.2/revision/2.cabal) = 52a1b708abd921f91a5977f6ae53c4aa2b33f7c30be0fff17173f658b34c5350
-SIZE (cabal/indexed-traversable-0.1.2/revision/2.cabal) = 2533
-SHA256 (cabal/indexed-traversable-instances-0.1.1.1/indexed-traversable-instances-0.1.1.1.tar.gz) = 895ee5063d59e2b58930ca6fa54885bb11f19c8b7c7ba6c7b014f9431cdcc0b0
-SIZE (cabal/indexed-traversable-instances-0.1.1.1/indexed-traversable-instances-0.1.1.1.tar.gz) = 3751
+SHA256 (cabal/indexed-traversable-0.1.2.1/indexed-traversable-0.1.2.1.tar.gz) = fe854c10285debc7d6fe3e09da0928a740ebc091ad2911ae695bb007e6f746a4
+SIZE (cabal/indexed-traversable-0.1.2.1/indexed-traversable-0.1.2.1.tar.gz) = 8905
+SHA256 (cabal/indexed-traversable-instances-0.1.1.2/indexed-traversable-instances-0.1.1.2.tar.gz) = 0f9b4e895ccc819f74d15f913c93613cc74cab74dbb05d7e305aa387bdbe374a
+SIZE (cabal/indexed-traversable-instances-0.1.1.2/indexed-traversable-instances-0.1.1.2.tar.gz) = 3769
+SHA256 (cabal/indexed-traversable-instances-0.1.1.2/revision/1.cabal) = b493ed83623a7cba498d31a9d36beec233406f20377f1be3bb51d4ce3bd2ceef
+SIZE (cabal/indexed-traversable-instances-0.1.1.2/revision/1.cabal) = 2536
 SHA256 (cabal/integer-logarithms-1.0.3.1/integer-logarithms-1.0.3.1.tar.gz) = 9b0a9f9fab609b15cd015865721fb05f744a1bc77ae92fd133872de528bbea7f
 SIZE (cabal/integer-logarithms-1.0.3.1/integer-logarithms-1.0.3.1.tar.gz) = 9023
-SHA256 (cabal/integer-logarithms-1.0.3.1/revision/3.cabal) = d59bfd1d39808217af2b68789d3c0e57cb7199d47405a276060d88fef4f4017d
-SIZE (cabal/integer-logarithms-1.0.3.1/revision/3.cabal) = 3246
+SHA256 (cabal/integer-logarithms-1.0.3.1/revision/4.cabal) = 336fb40c3af19a59dbeb4e5b7bffe4b4c7fa04ab06006a8d4b70b1febc1bb4ca
+SIZE (cabal/integer-logarithms-1.0.3.1/revision/4.cabal) = 3262
 SHA256 (cabal/iproute-1.7.12/iproute-1.7.12.tar.gz) = f1751d1579fcbc1d9f86d9d1c9ede48cb71cbeb1d7b2043491c6216e4f236b63
 SIZE (cabal/iproute-1.7.12/iproute-1.7.12.tar.gz) = 17864
 SHA256 (cabal/lens-family-core-2.1.2/lens-family-core-2.1.2.tar.gz) = 1b5a997276c8b77a96f99f48b95b204d34f3bb84fa3691747cd30bc8c76873b6
 SIZE (cabal/lens-family-core-2.1.2/lens-family-core-2.1.2.tar.gz) = 17987
-SHA256 (cabal/megaparsec-9.2.2/megaparsec-9.2.2.tar.gz) = a48b03e55c0b9efcc88ce4236186fb6eee3acb64336987dd9c98daf4d96aa234
-SIZE (cabal/megaparsec-9.2.2/megaparsec-9.2.2.tar.gz) = 61325
+SHA256 (cabal/megaparsec-9.3.1/megaparsec-9.3.1.tar.gz) = e3f0689b5c103f5b54c3f399d09ccabf2762259ef0fea5014f522cad753ab701
+SIZE (cabal/megaparsec-9.3.1/megaparsec-9.3.1.tar.gz) = 63921
 SHA256 (cabal/memory-0.18.0/memory-0.18.0.tar.gz) = fd4eb6f638e24b81b4e6cdd68772a531726f2f67686c8969d3407d82f7862e3e
 SIZE (cabal/memory-0.18.0/memory-0.18.0.tar.gz) = 41957
 SHA256 (cabal/mime-types-0.1.1.0/mime-types-0.1.1.0.tar.gz) = ebd01ed4e37142cb3233d4ffe55fe879b64d4a0b5802c8bc6afa1c7670f9e11b
@ -185,10 +195,10 @@ SHA256 (cabal/mmorph-1.2.0/mmorph-1.2.0.tar.gz) = 61338058eb676b466a462ca45d59f4
 SIZE (cabal/mmorph-1.2.0/mmorph-1.2.0.tar.gz) = 6861
 SHA256 (cabal/mmorph-1.2.0/revision/3.cabal) = df9b213ec18f811cb3137b478d148f3f1680ee43f841cb775835fa282fdb0295
 SIZE (cabal/mmorph-1.2.0/revision/3.cabal) = 1083
-SHA256 (cabal/network-3.1.2.7/network-3.1.2.7.tar.gz) = 7f7620fef1a1af3d3d6747f510e73223a5c600e7d7fd9ace073d1222bdc63d85
-SIZE (cabal/network-3.1.2.7/network-3.1.2.7.tar.gz) = 139973
-SHA256 (cabal/network-uri-2.6.4.1/network-uri-2.6.4.1.tar.gz) = 57856db93608a4d419f681b881c9b8d4448800d5a687587dc37e8a9e0b223584
-SIZE (cabal/network-uri-2.6.4.1/network-uri-2.6.4.1.tar.gz) = 32373
+SHA256 (cabal/network-3.1.3.0/network-3.1.3.0.tar.gz) = 326c74aba0cdf049da0b6faabbc035cb70dc91dacb4f94e39129e6f3fce927a1
+SIZE (cabal/network-3.1.3.0/network-3.1.3.0.tar.gz) = 139436
+SHA256 (cabal/network-uri-2.6.4.2/network-uri-2.6.4.2.tar.gz) = 9c188973126e893250b881f20e8811dca06c223c23402b06f7a1f2e995797228
+SIZE (cabal/network-uri-2.6.4.2/network-uri-2.6.4.2.tar.gz) = 31309
 SHA256 (cabal/optparse-applicative-0.17.0.0/optparse-applicative-0.17.0.0.tar.gz) = 825b2e4d3dafe0ba64a073366a88062b3712b81f851793d9ce2327bee70af724
 SIZE (cabal/optparse-applicative-0.17.0.0/optparse-applicative-0.17.0.0.tar.gz) = 59409
 SHA256 (cabal/parser-combinators-1.3.0/parser-combinators-1.3.0.tar.gz) = 9310ef0d49f8a8922acda10b1cded9854cbee04dea717effc6ee5983072e4447
@ -203,84 +213,74 @@ SHA256 (cabal/prettyprinter-1.7.1/prettyprinter-1.7.1.tar.gz) = 5e6ea6903114fa11
 SIZE (cabal/prettyprinter-1.7.1/prettyprinter-1.7.1.tar.gz) = 56907
 SHA256 (cabal/prettyprinter-ansi-terminal-1.1.3/prettyprinter-ansi-terminal-1.1.3.tar.gz) = 813739308ad6050620578994effe21058a170a341716acf52573fae42b5b1db3
 SIZE (cabal/prettyprinter-ansi-terminal-1.1.3/prettyprinter-ansi-terminal-1.1.3.tar.gz) = 8879
-SHA256 (cabal/primitive-0.7.4.0/primitive-0.7.4.0.tar.gz) = 5b2d6dc2812eb2f6a115f05fcbe3e723d3aeff7894b012c617e075130581add5
-SIZE (cabal/primitive-0.7.4.0/primitive-0.7.4.0.tar.gz) = 56575
+SHA256 (cabal/primitive-0.8.0.0/primitive-0.8.0.0.tar.gz) = 5553c21b4a789f9b591eed69e598cc58484c274af29250e517b5a8bcc62b995f
+SIZE (cabal/primitive-0.8.0.0/primitive-0.8.0.0.tar.gz) = 57222
 SHA256 (cabal/profunctors-5.6.2/profunctors-5.6.2.tar.gz) = 65955d7b50525a4a3bccdab1d982d2ae342897fd38140d5a94b5ef3800d8c92a
 SIZE (cabal/profunctors-5.6.2/profunctors-5.6.2.tar.gz) = 28522
-SHA256 (cabal/profunctors-5.6.2/revision/2.cabal) = 3d3685119243a7ebf984fa6af03299d156ab7674a432e2e15ecee2a4fd420fb6
-SIZE (cabal/profunctors-5.6.2/revision/2.cabal) = 2483
+SHA256 (cabal/profunctors-5.6.2/revision/3.cabal) = e178ba4468982326656626e2089e296f64485e68fdddc9f4476dcd5d612b4f78
+SIZE (cabal/profunctors-5.6.2/revision/3.cabal) = 2484
 SHA256 (cabal/random-1.2.1.1/random-1.2.1.1.tar.gz) = 3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76
 SIZE (cabal/random-1.2.1.1/random-1.2.1.1.tar.gz) = 47109
 SHA256 (cabal/repline-0.4.2.0/repline-0.4.2.0.tar.gz) = 6181b3f106b4059eb1c86c4a442083c29335a1d9a3e7cfffecb962ec05b08d5a
 SIZE (cabal/repline-0.4.2.0/repline-0.4.2.0.tar.gz) = 9719
 SHA256 (cabal/scientific-0.3.7.0/scientific-0.3.7.0.tar.gz) = a3a121c4b3d68fb8b9f8c709ab012e48f090ed553609247a805ad070d6b343a9
 SIZE (cabal/scientific-0.3.7.0/scientific-0.3.7.0.tar.gz) = 24723
-SHA256 (cabal/scientific-0.3.7.0/revision/3.cabal) = 517444c944dad9db8235d7b311d7b9a0839a519ee3178288b5a9606256e0c7d8
-SIZE (cabal/scientific-0.3.7.0/revision/3.cabal) = 4840
-SHA256 (cabal/semialign-1.2.0.1/semialign-1.2.0.1.tar.gz) = d900697041ae4b0cca3243273a2b3e80bcf74d937405d6a5ff34dc33ee952132
-SIZE (cabal/semialign-1.2.0.1/semialign-1.2.0.1.tar.gz) = 10371
-SHA256 (cabal/semialign-1.2.0.1/revision/3.cabal) = ee3468e349e72ec0a604ae05573a4de7181d97d10366254244a0cca8a76d6c35
-SIZE (cabal/semialign-1.2.0.1/revision/3.cabal) = 2852
-SHA256 (cabal/semigroupoids-5.3.7/semigroupoids-5.3.7.tar.gz) = 6d45cdb6c58c75ca588859b80b2c92b6f48590a03e065c24ce5d767a6a963799
-SIZE (cabal/semigroupoids-5.3.7/semigroupoids-5.3.7.tar.gz) = 35349
+SHA256 (cabal/scientific-0.3.7.0/revision/5.cabal) = 26d8109106963a345368011081453d25ee1dfa6afae2b1f57b426b4bcd392d91
+SIZE (cabal/scientific-0.3.7.0/revision/5.cabal) = 4854
+SHA256 (cabal/semialign-1.3/semialign-1.3.tar.gz) = 628e43319f584a8dd46c124ee0685cac586e0f6f877c5ceff37c3dbb2e3cc56c
+SIZE (cabal/semialign-1.3/semialign-1.3.tar.gz) = 10543
+SHA256 (cabal/semigroupoids-6.0.0.1/semigroupoids-6.0.0.1.tar.gz) = 7da38a9891bdf8205fd6522cdb712956b8c0bf5c52983da60295c8e057d77934
+SIZE (cabal/semigroupoids-6.0.0.1/semigroupoids-6.0.0.1.tar.gz) = 36222
 SHA256 (cabal/serialise-0.2.6.0/serialise-0.2.6.0.tar.gz) = 93ff1888e1972999f14663072b38efcfd0c1481b4ec8e30ddc9c5ce97681a516
 SIZE (cabal/serialise-0.2.6.0/serialise-0.2.6.0.tar.gz) = 75077
-SHA256 (cabal/serialise-0.2.6.0/revision/1.cabal) = c98de52c5758da4dc5141d44bd2195dcd3232ca3aee8ebc4542d348125899a66
-SIZE (cabal/serialise-0.2.6.0/revision/1.cabal) = 8776
+SHA256 (cabal/serialise-0.2.6.0/revision/3.cabal) = eba4aae0ae552e58c4e1f27186764551b98591e3bd92e852c40655e3b35924c9
+SIZE (cabal/serialise-0.2.6.0/revision/3.cabal) = 8776
 SHA256 (cabal/socks-0.6.1/socks-0.6.1.tar.gz) = 734447558bb061ce768f53a0df1f2401902c6bee396cc96ce627edd986ef6a73
 SIZE (cabal/socks-0.6.1/socks-0.6.1.tar.gz) = 9759
 SHA256 (cabal/splitmix-0.1.0.4/splitmix-0.1.0.4.tar.gz) = 6d065402394e7a9117093dbb4530a21342c9b1e2ec509516c8a8d0ffed98ecaa
 SIZE (cabal/splitmix-0.1.0.4/splitmix-0.1.0.4.tar.gz) = 22382
-SHA256 (cabal/splitmix-0.1.0.4/revision/1.cabal) = 804e2574bc7e32d08cbab91e47ee6287b4df7d50851d73f9e778f94a9a7814c7
-SIZE (cabal/splitmix-0.1.0.4/revision/1.cabal) = 6521
-SHA256 (cabal/streaming-commons-0.2.2.5/streaming-commons-0.2.2.5.tar.gz) = ca50819bdb2b248ced790e9faab07a3a5369ef702d9f9a932f26438bbeeca704
-SIZE (cabal/streaming-commons-0.2.2.5/streaming-commons-0.2.2.5.tar.gz) = 84415
-SHA256 (cabal/strict-0.4.0.1/strict-0.4.0.1.tar.gz) = dff6abc08ad637e51891bb8b475778c40926c51219eda60fd64f0d9680226241
-SIZE (cabal/strict-0.4.0.1/strict-0.4.0.1.tar.gz) = 12488
-SHA256 (cabal/strict-0.4.0.1/revision/4.cabal) = d6205a748eb8db4cd17a7179be970c94598809709294ccfa43159c7f3cc4bf5d
-SIZE (cabal/strict-0.4.0.1/revision/4.cabal) = 4187
-SHA256 (cabal/tagged-0.8.6.1/tagged-0.8.6.1.tar.gz) = f5e0fcf95f0bb4aa63f428f2c01955a41ea1a42cfcf39145ed631f59a9616c02
-SIZE (cabal/tagged-0.8.6.1/tagged-0.8.6.1.tar.gz) = 9842
-SHA256 (cabal/tagged-0.8.6.1/revision/3.cabal) = 8a24aef29b8e35447ccc56658ea07c2aded30bfa8130ea057e382936e17c74a6
-SIZE (cabal/tagged-0.8.6.1/revision/3.cabal) = 2874
+SHA256 (cabal/splitmix-0.1.0.4/revision/2.cabal) = db25c2e17967aa6b6046ab8b1b96ba3f344ca59a62b60fb6113d51ea305a3d8e
+SIZE (cabal/splitmix-0.1.0.4/revision/2.cabal) = 6537
+SHA256 (cabal/streaming-commons-0.2.2.6/streaming-commons-0.2.2.6.tar.gz) = 0180958a882eb0f6262b812fe886c2b1b8285474b5b958f814ae4f05409fbf79
+SIZE (cabal/streaming-commons-0.2.2.6/streaming-commons-0.2.2.6.tar.gz) = 37959
+SHA256 (cabal/strict-0.5/strict-0.5.tar.gz) = 3f4f0995dec2d520d0e321542f71412dac023658fdab603db04364d75269a0fd
+SIZE (cabal/strict-0.5/strict-0.5.tar.gz) = 12564
+SHA256 (cabal/tagged-0.8.7/tagged-0.8.7.tar.gz) = 6414eeac27a1633f49e2f78199ced99ce8ce3d70b658cf6d55b1d81ff60cb961
+SIZE (cabal/tagged-0.8.7/tagged-0.8.7.tar.gz) = 10082
 SHA256 (cabal/temporary-1.3/temporary-1.3.tar.gz) = 8c442993694b5ffca823ce864af95bd2841fb5264ee511c61cf48cc71d879890
 SIZE (cabal/temporary-1.3/temporary-1.3.tar.gz) = 5686
 SHA256 (cabal/text-manipulate-0.3.1.0/text-manipulate-0.3.1.0.tar.gz) = 9a67efef74bf8a0166436e11bc5b668c10a943c5454fdac3c8de366668a306bc
 SIZE (cabal/text-manipulate-0.3.1.0/text-manipulate-0.3.1.0.tar.gz) = 13107
 SHA256 (cabal/text-short-0.1.5/text-short-0.1.5.tar.gz) = a35ec6cde2ada084c1a050dc5885be5ab01f851b93d744cf0facbc1c18002dda
 SIZE (cabal/text-short-0.1.5/text-short-0.1.5.tar.gz) = 25113
-SHA256 (cabal/text-short-0.1.5/revision/1.cabal) = ebb77383743e214138cf9387875bc7d2665c5584b2e489fe1461240f19e7b53e
-SIZE (cabal/text-short-0.1.5/revision/1.cabal) = 3161
-SHA256 (cabal/th-abstraction-0.4.5.0/th-abstraction-0.4.5.0.tar.gz) = 00d5e24f247e328bd9898d5af5915c1e86b134b4d40baa680258635f95031526
-SIZE (cabal/th-abstraction-0.4.5.0/th-abstraction-0.4.5.0.tar.gz) = 39515
+SHA256 (cabal/text-short-0.1.5/revision/2.cabal) = c296eb2289dc5bf39912989c295cb82ef05ae5f84ee83ea5dc21f48da80e7052
+SIZE (cabal/text-short-0.1.5/revision/2.cabal) = 3202
+SHA256 (cabal/th-abstraction-0.5.0.0/th-abstraction-0.5.0.0.tar.gz) = 8258dc3ab7188af5826e2467032b52a931a3af4d8a93d4a094210e240a8a9964
+SIZE (cabal/th-abstraction-0.5.0.0/th-abstraction-0.5.0.0.tar.gz) = 40093
 SHA256 (cabal/th-compat-0.1.4/th-compat-0.1.4.tar.gz) = d8f97ac14ab47b6b8a7b0fdb4ff95426322ec56badd01652ac15da4a44d4bab8
 SIZE (cabal/th-compat-0.1.4/th-compat-0.1.4.tar.gz) = 14838
-SHA256 (cabal/th-lift-0.8.2/th-lift-0.8.2.tar.gz) = 3a5927037a10ae63e605c02228c4027c32b7bab1985ae7b5379e6363b3cd5ce4
-SIZE (cabal/th-lift-0.8.2/th-lift-0.8.2.tar.gz) = 14385
-SHA256 (cabal/th-lift-0.8.2/revision/2.cabal) = f135f67b018c22889e68b094773273dcf8f9e16fcfa330bf4778f84fce8925e9
-SIZE (cabal/th-lift-0.8.2/revision/2.cabal) = 2677
+SHA256 (cabal/th-compat-0.1.4/revision/2.cabal) = e5ae7c083ef3a22248558f8451669bb1c55ea8090f5908b86b9033743c161730
+SIZE (cabal/th-compat-0.1.4/revision/2.cabal) = 3224
+SHA256 (cabal/th-lift-0.8.3/th-lift-0.8.3.tar.gz) = 25d57bf5f8e7deefeb4ace0539805ae1e90b1ba5a034ebcc36141846408c6b75
+SIZE (cabal/th-lift-0.8.3/th-lift-0.8.3.tar.gz) = 14643
 SHA256 (cabal/th-lift-instances-0.1.20/th-lift-instances-0.1.20.tar.gz) = f533c3f95addcca461a0ccd1aafef75dd801bfa6599c0d1184d54bfffb61d870
 SIZE (cabal/th-lift-instances-0.1.20/th-lift-instances-0.1.20.tar.gz) = 6721
-SHA256 (cabal/these-1.1.1.1/these-1.1.1.1.tar.gz) = d798c9f56e17def441e8f51e54cc11afdb3e76c6a9d1e9ee154e9a78da0bf508
-SIZE (cabal/these-1.1.1.1/these-1.1.1.1.tar.gz) = 9804
-SHA256 (cabal/these-1.1.1.1/revision/6.cabal) = 2991c13e264b0c35c696c8f5f85c428c53bc42e93b1dfbd19a582052112d948a
-SIZE (cabal/these-1.1.1.1/revision/6.cabal) = 2748
+SHA256 (cabal/these-1.2/these-1.2.tar.gz) = a8ed7174b7f790764360f48aab72fea382a6093ed369c7bc6881fae1abacd4b8
+SIZE (cabal/these-1.2/these-1.2.tar.gz) = 10606
 SHA256 (cabal/time-compat-1.9.6.1/time-compat-1.9.6.1.tar.gz) = ad07bb00eb9678c2136d3680752b00acc4cbc522654bb3199bf31c61ef1e6b80
 SIZE (cabal/time-compat-1.9.6.1/time-compat-1.9.6.1.tar.gz) = 59964
-SHA256 (cabal/time-compat-1.9.6.1/revision/4.cabal) = 5cf5fa19d32742816fa1423085cbfd626aef433101c0b97bf0e8f720a6f369d8
-SIZE (cabal/time-compat-1.9.6.1/revision/4.cabal) = 5047
+SHA256 (cabal/time-compat-1.9.6.1/revision/5.cabal) = dd4de1fa0d6b7108982efc7ac41938569e4c9b06230bb87d34aae007c52ddb67
+SIZE (cabal/time-compat-1.9.6.1/revision/5.cabal) = 5062
 SHA256 (cabal/tls-1.6.0/tls-1.6.0.tar.gz) = d29d20afc1c1b852a3c39b076ec853cb596ac888cf521e54144441dec689e498
 SIZE (cabal/tls-1.6.0/tls-1.6.0.tar.gz) = 158619
 SHA256 (cabal/transformers-compat-0.7.2/transformers-compat-0.7.2.tar.gz) = b62c7304c9f3cbc9463d0739aa85cb9489f217ea092b9d625d417514fbcc9d6a
 SIZE (cabal/transformers-compat-0.7.2/transformers-compat-0.7.2.tar.gz) = 46485
-SHA256 (cabal/unix-compat-0.6/unix-compat-0.6.tar.gz) = b4cd823a6543ad3aca8e740ecf5f44aabde60f1452b5a55655db5c8b7a44d5f8
-SIZE (cabal/unix-compat-0.6/unix-compat-0.6.tar.gz) = 15777
-SHA256 (cabal/unix-compat-0.6/revision/1.cabal) = 0f5d0929d838077909d397c7c83b711b89db4ed3d4dafea46af19c04b389b53c
-SIZE (cabal/unix-compat-0.6/revision/1.cabal) = 3583
+SHA256 (cabal/unix-compat-0.7/unix-compat-0.7.tar.gz) = 2b75ca79e0f7368f915f01ca6a5201f7df58ada46b9e4869bca1b92d853f2e3e
+SIZE (cabal/unix-compat-0.7/unix-compat-0.7.tar.gz) = 15210
 SHA256 (cabal/unordered-containers-0.2.19.1/unordered-containers-0.2.19.1.tar.gz) = 1b27bec5e0d522b27a6029ebf4c4a6d40acbc083c787008e32fb55c4b1d128d2
 SIZE (cabal/unordered-containers-0.2.19.1/unordered-containers-0.2.19.1.tar.gz) = 58030
-SHA256 (cabal/unordered-containers-0.2.19.1/revision/1.cabal) = db11042bb0356c0adea277d0794743829125b4c99455af6af2bd5f7bd5e88a39
-SIZE (cabal/unordered-containers-0.2.19.1/revision/1.cabal) = 3797
+SHA256 (cabal/unordered-containers-0.2.19.1/revision/2.cabal) = 9ad8972c2e913c37b1d4f0e1261517fd7a1b8c8a58077e057be69837e3dbaa00
+SIZE (cabal/unordered-containers-0.2.19.1/revision/2.cabal) = 3822
 SHA256 (cabal/uri-encode-1.5.0.7/uri-encode-1.5.0.7.tar.gz) = c79c624257833841a22890e4d2b0ab07e4be88e0f99474d328223815c0814252
 SIZE (cabal/uri-encode-1.5.0.7/uri-encode-1.5.0.7.tar.gz) = 3506
 SHA256 (cabal/uri-encode-1.5.0.7/revision/2.cabal) = f255fed3d51f87016d2ca65cbc8c31d0af7618b3f48dccc50faf3e53e2daf50e
@ -289,20 +289,20 @@ SHA256 (cabal/utf8-string-1.0.2/utf8-string-1.0.2.tar.gz) = ee48deada7600370728c
 SIZE (cabal/utf8-string-1.0.2/utf8-string-1.0.2.tar.gz) = 10726
 SHA256 (cabal/uuid-types-1.0.5/uuid-types-1.0.5.tar.gz) = ad68b89b7a64c07dd5c250a11be2033ee929318ff51ec7b4e4b54e1b4deba7dd
 SIZE (cabal/uuid-types-1.0.5/uuid-types-1.0.5.tar.gz) = 11922
-SHA256 (cabal/uuid-types-1.0.5/revision/3.cabal) = 9ca76986e3950af5e908502be2373e2292d6dc57ec10f5aeb41d7dc3a1961782
-SIZE (cabal/uuid-types-1.0.5/revision/3.cabal) = 2622
-SHA256 (cabal/vector-0.12.3.1/vector-0.12.3.1.tar.gz) = fb4a53c02bd4d7fdf155c0604da9a5bb0f3b3bfce5d9960aea11c2ae235b9f35
-SIZE (cabal/vector-0.12.3.1/vector-0.12.3.1.tar.gz) = 151420
-SHA256 (cabal/vector-0.12.3.1/revision/2.cabal) = fffbd00912d69ed7be9bc7eeb09f4f475e0d243ec43f916a9fd5bbd219ce7f3e
-SIZE (cabal/vector-0.12.3.1/revision/2.cabal) = 8238
+SHA256 (cabal/uuid-types-1.0.5/revision/4.cabal) = e4662609522f093b86c5ae86aa9781afc69338cf102d42e5b5c196c320d95621
+SIZE (cabal/uuid-types-1.0.5/revision/4.cabal) = 2636
+SHA256 (cabal/vector-0.13.0.0/vector-0.13.0.0.tar.gz) = c5d3167d15e12f52e00879ddf304a591672a74e369cc47bc5c7fa1d5a8d15b4f
+SIZE (cabal/vector-0.13.0.0/vector-0.13.0.0.tar.gz) = 154509
+SHA256 (cabal/vector-0.13.0.0/revision/3.cabal) = fa5cac81a17a5af388716792e8b99c24b3b66770086756d0d8b23f8272a0244c
+SIZE (cabal/vector-0.13.0.0/revision/3.cabal) = 9112
 SHA256 (cabal/vector-stream-0.1.0.0/vector-stream-0.1.0.0.tar.gz) = a888210f6467f155090653734be5cc920406a07227e0d3adb59096716fdb806c
 SIZE (cabal/vector-stream-0.1.0.0/vector-stream-0.1.0.0.tar.gz) = 12377
-SHA256 (cabal/vector-stream-0.1.0.0/revision/1.cabal) = 09b0f8dc4e51936b9d6b04791f0aa03f7c9759b5fb7140eac8a9461cda1e55a3
-SIZE (cabal/vector-stream-0.1.0.0/revision/1.cabal) = 1404
+SHA256 (cabal/vector-stream-0.1.0.0/revision/2.cabal) = f5d6d5291cd1b5f2f063403593f1f5c8127d692c888eedeb3e1eb40497a88dca
+SIZE (cabal/vector-stream-0.1.0.0/revision/2.cabal) = 1404
 SHA256 (cabal/witherable-0.4.2/witherable-0.4.2.tar.gz) = 790d2bb274283419173bd89104439860675a9410f70f21912973ecd9098b4104
 SIZE (cabal/witherable-0.4.2/witherable-0.4.2.tar.gz) = 11876
-SHA256 (cabal/witherable-0.4.2/revision/3.cabal) = cccb36175e088abb4291ee5044b8c04d71acd5c36636902d2520f91508dd4bb8
-SIZE (cabal/witherable-0.4.2/revision/3.cabal) = 2294
+SHA256 (cabal/witherable-0.4.2/revision/4.cabal) = cec516b35df0ff53ab0068e70a912a0ba7b65c672fbc554727183faa195ad3b8
+SIZE (cabal/witherable-0.4.2/revision/4.cabal) = 2342
 SHA256 (cabal/x509-1.7.7/x509-1.7.7.tar.gz) = 59c6920fe5d53f1e6a15176bd853f1a18422be87cd8496772ff4571828a568fe
 SIZE (cabal/x509-1.7.7/x509-1.7.7.tar.gz) = 21707
 SHA256 (cabal/x509-store-1.6.9/x509-store-1.6.9.tar.gz) = c59213520cf31a0a18611a60b8a4d2d7aa6cb206c0545d857b98dcb90fc5c8da
@ -313,3 +313,5 @@ SHA256 (cabal/x509-validation-1.6.12/x509-validation-1.6.12.tar.gz) = 0d8e44e199
 SIZE (cabal/x509-validation-1.6.12/x509-validation-1.6.12.tar.gz) = 19733
 SHA256 (cabal/zlib-0.6.3.0/zlib-0.6.3.0.tar.gz) = 9eaa989ad4534438b5beb51c1d3a4c8f6a088fdff0b259a5394fbf39aaee04da
 SIZE (cabal/zlib-0.6.3.0/zlib-0.6.3.0.tar.gz) = 369595
+SHA256 (cabal/zlib-0.6.3.0/revision/1.cabal) = 9adce39e4ca0b7a87d45df0a243134816c57059a08e28cff5469c98ae1f54dfc
+SIZE (cabal/zlib-0.6.3.0/revision/1.cabal) = 5367
--- a/databases/Makefile
+++ b/databases/Makefile
@ -102,6 +102,7 @@
    SUBDIR += hashtypes
    SUBDIR += hiredis
    SUBDIR += hsqldb
+    SUBDIR += immudb
    SUBDIR += influxdb
    SUBDIR += influxdb2-cli
    SUBDIR += innotop
@ -176,8 +177,6 @@
    SUBDIR += mariadb-connector-odbc
    SUBDIR += mariadb1011-client
    SUBDIR += mariadb1011-server
-    SUBDIR += mariadb103-client
-    SUBDIR += mariadb103-server
    SUBDIR += mariadb104-client
    SUBDIR += mariadb104-server
    SUBDIR += mariadb105-client
--- a/databases/diesel/Makefile
+++ b/databases/diesel/Makefile
@ -1,7 +1,6 @@
 PORTNAME=	diesel
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.0.3
-PORTREVISION=	3
+DISTVERSION=	2.1.0
 CATEGORIES=	databases
 PKGNAMESUFFIX=	-cli

@ -21,58 +20,67 @@ GH_ACCOUNT=	diesel-rs

 CARGO_BUILD_ARGS=	--package=diesel_cli
 CARGO_INSTALL_PATH=	diesel_cli
-CARGO_CRATES=	aho-corasick-0.7.20 \
+CARGO_CRATES=	aho-corasick-1.0.1 \
 		android_system_properties-0.1.5 \
-		ansi_term-0.12.1 \
+		anstream-0.3.2 \
+		anstyle-1.0.0 \
+		anstyle-parse-0.2.0 \
+		anstyle-query-1.0.0 \
+		anstyle-wincon-1.0.1 \
+		argon2-0.5.0 \
 		assert_matches-1.5.0 \
-		atty-0.2.14 \
 		autocfg-1.1.0 \
-		base64-0.13.1 \
-		bcrypt-0.10.1 \
-		bigdecimal-0.3.0 \
+		base64ct-1.6.0 \
+		bigdecimal-0.3.1 \
 		bitflags-1.3.2 \
-		blowfish-0.8.0 \
-		bumpalo-3.12.0 \
+		bitflags-2.3.1 \
+		blake2-0.10.6 \
+		block-buffer-0.10.4 \
+		bumpalo-3.13.0 \
 		byteorder-1.4.3 \
-		cc-1.0.78 \
+		cc-1.0.79 \
 		cfg-if-1.0.0 \
-		chrono-0.4.23 \
-		cipher-0.3.0 \
-		clap-2.34.0 \
-		clap-3.2.23 \
-		clap_complete-3.2.5 \
-		clap_lex-0.2.4 \
-		codespan-reporting-0.11.1 \
-		core-foundation-sys-0.8.3 \
-		cxx-1.0.87 \
-		cxx-build-1.0.87 \
-		cxxbridge-flags-1.0.87 \
-		cxxbridge-macro-1.0.87 \
-		difference-2.0.0 \
+		chrono-0.4.24 \
+		clap-4.3.0 \
+		clap_builder-4.3.0 \
+		clap_complete-4.3.0 \
+		clap_derive-4.3.0 \
+		clap_lex-0.5.0 \
+		colorchoice-1.0.0 \
+		console-0.15.7 \
+		core-foundation-sys-0.8.4 \
+		crypto-common-0.1.6 \
 		diffy-0.3.0 \
-		dotenvy-0.15.6 \
+		digest-0.10.7 \
+		dotenvy-0.15.7 \
+		encode_unicode-0.3.6 \
 		env_logger-0.8.4 \
-		fastrand-1.8.0 \
+		errno-0.3.1 \
+		errno-dragonfly-0.1.2 \
+		fastrand-1.9.0 \
 		form_urlencoded-1.1.0 \
-		generic-array-0.14.6 \
-		getrandom-0.2.8 \
+		generic-array-0.14.7 \
+		getrandom-0.2.9 \
 		hashbrown-0.12.3 \
-		heck-0.3.3 \
-		heck-0.4.0 \
-		hermit-abi-0.1.19 \
-		iana-time-zone-0.1.53 \
-		iana-time-zone-haiku-0.1.1 \
+		heck-0.4.1 \
+		hermit-abi-0.3.1 \
+		iana-time-zone-0.1.56 \
+		iana-time-zone-haiku-0.1.2 \
 		idna-0.3.0 \
-		indexmap-1.9.2 \
+		indexmap-1.9.3 \
+		insta-1.29.0 \
 		instant-0.1.12 \
-		ipnet-2.7.1 \
+		io-lifetimes-1.0.11 \
+		ipnet-2.7.2 \
 		ipnetwork-0.20.0 \
-		itoa-1.0.5 \
-		js-sys-0.3.60 \
+		is-terminal-0.4.7 \
+		itoa-1.0.6 \
+		js-sys-0.3.63 \
 		lazy_static-1.4.0 \
-		libc-0.2.139 \
-		libsqlite3-sys-0.25.2 \
-		link-cplusplus-1.0.8 \
+		libc-0.2.144 \
+		libsqlite3-sys-0.26.0 \
+		linked-hash-map-0.5.6 \
+		linux-raw-sys-0.3.8 \
 		lock_api-0.4.9 \
 		log-0.4.17 \
 		memchr-2.5.0 \
@ -81,82 +89,88 @@ CARGO_CRATES=	aho-corasick-0.7.20 \
 		num-bigint-0.4.3 \
 		num-integer-0.1.45 \
 		num-traits-0.2.15 \
-		once_cell-1.17.0 \
-		opaque-debug-0.3.0 \
-		os_str_bytes-6.4.1 \
+		once_cell-1.17.1 \
 		overload-0.1.1 \
 		parking_lot-0.12.1 \
-		parking_lot_core-0.9.6 \
+		parking_lot_core-0.9.7 \
+		password-hash-0.5.0 \
 		percent-encoding-2.2.0 \
-		pkg-config-0.3.26 \
+		pkg-config-0.3.27 \
 		ppv-lite86-0.2.17 \
-		pq-sys-0.4.7 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.50 \
+		pq-sys-0.4.8 \
+		proc-macro2-1.0.59 \
 		quickcheck-1.0.3 \
-		quote-1.0.23 \
+		quote-1.0.28 \
 		r2d2-0.8.10 \
 		rand-0.8.5 \
 		rand_chacha-0.3.1 \
 		rand_core-0.6.4 \
 		redox_syscall-0.2.16 \
-		regex-1.7.1 \
-		regex-syntax-0.6.28 \
-		remove_dir_all-0.5.3 \
-		ryu-1.0.12 \
-		scheduled-thread-pool-0.2.6 \
+		redox_syscall-0.3.5 \
+		regex-1.8.3 \
+		regex-syntax-0.7.2 \
+		rustix-0.37.19 \
+		ryu-1.0.13 \
+		scheduled-thread-pool-0.2.7 \
 		scopeguard-1.1.0 \
-		scratch-1.0.3 \
-		serde-1.0.152 \
-		serde_derive-1.0.152 \
-		serde_json-1.0.91 \
+		serde-1.0.163 \
+		serde_derive-1.0.163 \
+		serde_json-1.0.96 \
 		serde_regex-1.1.0 \
+		serde_spanned-0.6.2 \
+		similar-2.2.1 \
 		smallvec-1.10.0 \
-		strsim-0.8.0 \
 		strsim-0.10.0 \
-		structopt-0.3.26 \
-		structopt-derive-0.4.18 \
-		syn-1.0.107 \
-		tempfile-3.3.0 \
-		termcolor-1.2.0 \
-		textwrap-0.11.0 \
-		textwrap-0.16.0 \
-		time-0.3.17 \
-		time-core-0.1.0 \
-		time-macros-0.2.6 \
+		subtle-2.5.0 \
+		syn-2.0.18 \
+		tempfile-3.5.0 \
+		time-0.3.21 \
+		time-core-0.1.1 \
+		time-macros-0.2.9 \
 		tinyvec-1.6.0 \
-		tinyvec_macros-0.1.0 \
-		toml-0.5.11 \
+		tinyvec_macros-0.1.1 \
+		toml-0.7.4 \
+		toml_datetime-0.6.2 \
+		toml_edit-0.19.10 \
 		typenum-1.16.0 \
-		unicode-bidi-0.3.10 \
-		unicode-ident-1.0.6 \
+		unicode-bidi-0.3.13 \
+		unicode-ident-1.0.9 \
 		unicode-normalization-0.1.22 \
-		unicode-segmentation-1.10.0 \
-		unicode-width-0.1.10 \
 		url-2.3.1 \
-		uuid-1.2.2 \
+		utf8parse-0.2.1 \
+		uuid-1.3.3 \
 		vcpkg-0.2.15 \
-		vec_map-0.8.2 \
 		version_check-0.9.4 \
 		wasi-0.11.0+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.83 \
-		wasm-bindgen-backend-0.2.83 \
-		wasm-bindgen-macro-0.2.83 \
-		wasm-bindgen-macro-support-0.2.83 \
-		wasm-bindgen-shared-0.2.83 \
+		wasm-bindgen-0.2.86 \
+		wasm-bindgen-backend-0.2.86 \
+		wasm-bindgen-macro-0.2.86 \
+		wasm-bindgen-macro-support-0.2.86 \
+		wasm-bindgen-shared-0.2.86 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		windows-sys-0.42.0 \
-		windows_aarch64_gnullvm-0.42.1 \
-		windows_aarch64_msvc-0.42.1 \
-		windows_i686_gnu-0.42.1 \
-		windows_i686_msvc-0.42.1 \
-		windows_x86_64_gnu-0.42.1 \
-		windows_x86_64_gnullvm-0.42.1 \
-		windows_x86_64_msvc-0.42.1
+		windows-0.48.0 \
+		windows-sys-0.45.0 \
+		windows-sys-0.48.0 \
+		windows-targets-0.42.2 \
+		windows-targets-0.48.0 \
+		windows_aarch64_gnullvm-0.42.2 \
+		windows_aarch64_gnullvm-0.48.0 \
+		windows_aarch64_msvc-0.42.2 \
+		windows_aarch64_msvc-0.48.0 \
+		windows_i686_gnu-0.42.2 \
+		windows_i686_gnu-0.48.0 \
+		windows_i686_msvc-0.42.2 \
+		windows_i686_msvc-0.48.0 \
+		windows_x86_64_gnu-0.42.2 \
+		windows_x86_64_gnu-0.48.0 \
+		windows_x86_64_gnullvm-0.42.2 \
+		windows_x86_64_gnullvm-0.48.0 \
+		windows_x86_64_msvc-0.42.2 \
+		windows_x86_64_msvc-0.48.0 \
+		winnow-0.4.6 \
+		yaml-rust-0.4.5

 PLIST_FILES=	bin/${PORTNAME}

--- a/Show More
+++ b/Show More