*/*: sync with upstream

Taken from: FreeBSD

archivers/file-roller/Makefile

@@ -1,8 +1,7 @@
 # Created by: Anders Nordby <anders@FreeBSD.org>
 
 PORTNAME=	file-roller
-PORTVERSION=	3.40.0
+PORTVERSION=	3.42.0
-PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	GNOME
@@ -16,14 +15,15 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib \
-		libnotify.so:devel/libnotify
+		libnotify.so:devel/libnotify \
+		libhandy-1.so:x11-toolkits/libhandy
 RUN_DEPENDS=	gtar:archivers/gtar
 
 PORTSCOUT=	limitw:1,even
 
 USES=		cpe desktop-file-utils gettext gnome libarchive localbase \
 		meson pkgconfig python:3.5+,build tar:xz
-USE_GNOME=	cairo gtk30
+USE_GNOME=	cairo gdkpixbuf2 gtk30
 USE_LDCONFIG=	yes
 MESON_ARGS=	-Dpackagekit=false
 BINARY_ALIAS=	python3=${PYTHON_VERSION}

archivers/file-roller/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1620122753
+TIMESTAMP = 1650649866
-SHA256 (gnome/file-roller-3.40.0.tar.xz) = 4a2886a3966200fb0a9cbba4e2b79f8dad9d26556498aacdaed71775590b3c0d
+SHA256 (gnome/file-roller-3.42.0.tar.xz) = 1c438e6d53ec10ff4f2eb5b22d7bbf28a7c2a84957ab64a751c1cdf3c52302c7
-SIZE (gnome/file-roller-3.40.0.tar.xz) = 876424
+SIZE (gnome/file-roller-3.42.0.tar.xz) = 878968

archivers/file-roller/pkg-plist

@@ -118,6 +118,22 @@ share/help/es/file-roller/supported-formats.page
 share/help/es/file-roller/test-integrity.page
 share/help/es/file-roller/troubleshooting-archive-open.page
 share/help/es/file-roller/troubleshooting-password.page
+share/help/eu/file-roller/archive-create.page
+share/help/eu/file-roller/archive-edit.page
+share/help/eu/file-roller/archive-extract-advanced-options.page
+share/help/eu/file-roller/archive-extract.page
+share/help/eu/file-roller/archive-open.page
+share/help/eu/file-roller/archive-view.page
+share/help/eu/file-roller/figures/org.gnome.ArchiveManager.svg
+share/help/eu/file-roller/index.page
+share/help/eu/file-roller/introduction.page
+share/help/eu/file-roller/keyboard-shortcuts.page
+share/help/eu/file-roller/legal.xml
+share/help/eu/file-roller/password-protection.page
+share/help/eu/file-roller/supported-formats.page
+share/help/eu/file-roller/test-integrity.page
+share/help/eu/file-roller/troubleshooting-archive-open.page
+share/help/eu/file-roller/troubleshooting-password.page
 share/help/fi/file-roller/archive-create.page
 share/help/fi/file-roller/archive-edit.page
 share/help/fi/file-roller/archive-extract-advanced-options.page

archivers/py-zstd/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	zstd
-DISTVERSION=	1.5.1.0
+DISTVERSION=	1.5.2.4
 CATEGORIES=	archivers python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

archivers/py-zstd/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1641229595
+TIMESTAMP = 1650669996
-SHA256 (zstd-1.5.1.0.tar.gz) = 9519bb0cd91c4498cd8cf66ef88fb22e5d6a442317704e6afd00b12726d17d0a
+SHA256 (zstd-1.5.2.4.tar.gz) = a4665202c690e0dbad948b62e352a839972e6cd64db47ad29db4108fa37513a6
-SIZE (zstd-1.5.1.0.tar.gz) = 604039
+SIZE (zstd-1.5.2.4.tar.gz) = 606443

audio/Makefile

@@ -419,6 +419,7 @@
     SUBDIR += libsndfile
     SUBDIR += libsonic
     SUBDIR += libsoxr
+    SUBDIR += libspecbleach
     SUBDIR += libtremor
     SUBDIR += libumidi
     SUBDIR += libvorbis

audio/artyfx-lv2/Makefile

@@ -28,7 +28,6 @@ OPTIONS_DEFAULT_i386=	SSE
 
 SSE_CMAKE_ON=	-DPORT_SIMD_FLAGS:STRING="-msse -msse2 -mfpmath=sse"
 
-CXXFLAGS_powerpc64=	-maltivec
 CXXFLAGS_powerpc=	-maltivec
 
 post-patch:

audio/asterisk-espeak/Makefile

@@ -9,6 +9,9 @@ COMMENT=	Espeak dialplan application for Asterisk
 
 LICENSE=	GPLv2
 
+DEPRECATED=	Depends on deprecated audio/espeaak
+EXPIRATION_DATE=2022-06-30
+
 LIB_DEPENDS=	libespeak.so:audio/espeak \
 		libsamplerate.so:audio/libsamplerate
 

audio/csound/Makefile

@@ -27,7 +27,6 @@ CONFLICTS_INSTALL= clearsilver go-cs libextractor outguess
 
 CFLAGS_powerpc=	-maltivec
 CFLAGS_powerpcspe=	-DPFFFT_SIMD_DISABLE
-CFLAGS_powerpc64=	-maltivec
 CMAKE_ARGS=	-DBUILD_CSOUNDVST:BOOL=OFF \
 		-DBUILD_PD_CLASS:BOOL=OFF \
 		-DPYTHON_MODULE_INSTALL_DIR:PATH="${PYTHONPREFIX_SITELIBDIR}" \

audio/dexed/Makefile

@@ -48,7 +48,7 @@ VST3_BUILD_DEPENDS=	vst3sdk>0:audio/vst3sdk
 VST3_CXXFLAGS=		-DJUCE_CUSTOM_VST3_SDK=1 -fPIC
 VST3_PLIST_FILES=	lib/vst3/Dexed.so
 
-PORTSCOUT=	skipv:Nightly
+PORTSCOUT=	skipv:nightly
 
 post-patch-VST3-off:
 	@${REINPLACE_CMD} -e 's/FORMATS AU VST3 Standalone/FORMATS AU Standalone/' ${WRKSRC}/Source/CMakeLists.txt

audio/espeak/Makefile

@@ -12,6 +12,9 @@ COMMENT=	Software speech synthesizer
 
 LICENSE=	GPLv3
 
+DEPRECATED=	Last release in 2014 and deprecated upstream
+EXPIRATION_DATE=2022-06-30
+
 CONFLICTS=	speak-1.[0-9]
 
 USES=		gmake zip

audio/forked-daapd/Makefile

@@ -12,6 +12,9 @@ COMMENT=	DAAP (iTunes), MPD (Music Player Daemon) and RSP (Roku) media server
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+DEPRECATED=	Deprecated upstream, project is now called OwnTone
+EXPIRATION_DATE=2022-06-30
+
 LIB_DEPENDS=	libantlr3c.so:devel/libantlr3c \
 		libavahi-client.so:net/avahi-app \
 		libavcodec.so:multimedia/ffmpeg \

audio/libopenmpt/Makefile

@@ -1,7 +1,7 @@
 # Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
 
 PORTNAME=	libopenmpt
-PORTVERSION=	0.6.2
+PORTVERSION=	0.6.3
 DISTVERSIONSUFFIX=	+release.autotools
 CATEGORIES=	audio
 MASTER_SITES=	https://lib.openmpt.org/files/libopenmpt/src/ \

audio/libopenmpt/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1647275291
+TIMESTAMP = 1650908723
-SHA256 (libopenmpt-0.6.2+release.autotools.tar.gz) = 50c0d62ff2d9afefa36cce9f29042cb1fb8d4f0b386b81a0fc7734f35e21e6b6
+SHA256 (libopenmpt-0.6.3+release.autotools.tar.gz) = a410afeb7cd5970b16b9a6ce7daccf495b1a5e9121a9d6442de0c028fd54a25b
-SIZE (libopenmpt-0.6.2+release.autotools.tar.gz) = 1514140
+SIZE (libopenmpt-0.6.3+release.autotools.tar.gz) = 1514410

audio/libspecbleach/Makefile

@@ -0,0 +1,26 @@
+PORTNAME=	libspecbleach
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.1.2
+CATEGORIES=	audio
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	C library for audio noise reduction
+
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3
+LIB_DEPENDS=	libfftw3f.so:math/fftw3-float
+
+USES=		meson pkgconfig
+USE_LDCONFIG=	yes
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	lucianodato
+
+PLIST_FILES=	include/specbleach_adenoiser.h \
+		include/specbleach_denoiser.h \
+		lib/libspecbleach.so \
+		libdata/pkgconfig/libspecbleach.pc
+
+.include <bsd.port.mk>

audio/libspecbleach/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1650817916
+SHA256 (lucianodato-libspecbleach-v0.1.2_GH0.tar.gz) = 4ffe9cfbc9852440340afe46ba4a028fe19a4a049dfed94025c516b285c41751
+SIZE (lucianodato-libspecbleach-v0.1.2_GH0.tar.gz) = 33530

audio/libspecbleach/pkg-descr

@@ -0,0 +1,6 @@
+C library for audio noise reduction and other spectral effects.
+
+libspecbleach is based on the algorithms that were used in
+noise-repellent.
+
+WWW: https://github.com/lucianodato/libspecbleach

audio/lmms/Makefile

@@ -3,7 +3,7 @@
 PORTNAME=	lmms
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.2
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	2
 CATEGORIES=	audio
 

audio/lmms/files/patch-plugins_carlabase_carla.h

@@ -0,0 +1,15 @@
+--- plugins/carlabase/carla.h.orig	2022-04-24 08:49:10 UTC
++++ plugins/carlabase/carla.h
+@@ -34,10 +34,10 @@
+     #include "CarlaBackend.h"
+     #include "CarlaNative.h"
+     #include "CarlaUtils.h"
+-    CARLA_EXPORT
++    CARLA_PLUGIN_EXPORT
+     const NativePluginDescriptor* carla_get_native_patchbay_plugin();
+ 
+-    CARLA_EXPORT
++    CARLA_PLUGIN_EXPORT
+     const NativePluginDescriptor* carla_get_native_rack_plugin();
+ #endif
+ 

audio/noise-repellent-lv2/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	noise-repellent
-DISTVERSION=	0.1.5-3
+DISTVERSIONPREFIX=	v
-DISTVERSIONSUFFIX=	-g7f5a8fb
+DISTVERSION=	0.2.1
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2
 
@@ -10,16 +10,12 @@ COMMENT=	LV2 plugin for broadband noise reduction
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	lv2>0:audio/lv2 \
+BUILD_DEPENDS=	lv2>0:audio/lv2
-		${LOCALBASE}/include/fftw3.h:math/fftw3
+LIB_DEPENDS=	libspecbleach.so:audio/libspecbleach
-LIB_DEPENDS=	libfftw3f.so:math/fftw3-float
 
 USES=		meson pkgconfig
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	lucianodato
 
-PLIST_FILES=	lib/lv2/nrepel.lv2/manifest.ttl \
-		lib/lv2/nrepel.lv2/nrepel.so \
-		lib/lv2/nrepel.lv2/nrepel.ttl
-
 .include <bsd.port.mk>

audio/noise-repellent-lv2/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1578362766
+TIMESTAMP = 1650763106
-SHA256 (lucianodato-noise-repellent-0.1.5-3-g7f5a8fb_GH0.tar.gz) = 544cd29d1542ca94a6638cf7907dd1b0bcd264bcce1f7692eece74f98a38bf96
+SHA256 (lucianodato-noise-repellent-v0.2.1_GH0.tar.gz) = 6de5f835b48c3636a70a847761fec344b35d75bc561ef1feb4f354912c9581e6
-SIZE (lucianodato-noise-repellent-0.1.5-3-g7f5a8fb_GH0.tar.gz) = 30284
+SIZE (lucianodato-noise-repellent-v0.2.1_GH0.tar.gz) = 13148

audio/noise-repellent-lv2/files/patch-meson.build

@@ -1,20 +0,0 @@
---- meson.build.orig	2020-01-07 01:30:53 UTC
-+++ meson.build
-@@ -25,8 +25,8 @@ current_os = build_machine.system()
- current_arch = build_machine.cpu_family()
- cflags = []
- 
--# Add x86_64 optimization where appropriate (not for ARM)
--if current_arch != 'aarch64'
-+# Add x86_64 optimization where appropriate
-+if current_arch == 'x86' or current_arch == 'x86_64'
-     cflags += ['-msse','-msse2','-mfpmath=sse']
- endif
- 
-@@ -82,4 +82,4 @@ nrepel_ttl = custom_target('nrepel_ttl',
- if sord_validate.found()
- 	test('LV2 validation', sord_validate,
- 		args : [run_command('find','./lv2 -name "*.ttl"').stdout(), run_command('find','. -name "*.ttl"').stdout()])
--endif
-\ No newline at end of file
-+endif

audio/noise-repellent-lv2/pkg-plist

@@ -0,0 +1,7 @@
+lib/lv2/nrepellent.lv2/manifest.ttl
+lib/lv2/nrepellent.lv2/nrepellent#stereo.ttl
+lib/lv2/nrepellent.lv2/nrepellent-adaptive#stereo.ttl
+lib/lv2/nrepellent.lv2/nrepellent-adaptive.so
+lib/lv2/nrepellent.lv2/nrepellent-adaptive.ttl
+lib/lv2/nrepellent.lv2/nrepellent.so
+lib/lv2/nrepellent.lv2/nrepellent.ttl

audio/py-zita-audiotools/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	zita-audiotools
-DISTVERSION=	1.0.0
+DISTVERSION=	1.3.0
 CATEGORIES=	audio python
 MASTER_SITES=	https://kokkinizita.linuxaudio.org/linuxaudio/downloads/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,6 +18,6 @@ USE_PYTHON=	autoplist distutils
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}fmoo-audiotools
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/audiotools/*.so
+	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/zita_audiotools/*.so
 
 .include <bsd.port.mk>

audio/py-zita-audiotools/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1627409086
+TIMESTAMP = 1650642572
-SHA256 (zita-audiotools-1.0.0.tar.bz2) = f81fd466def0bbe1385973d38d7c51b6a9b7f7a8a37faf126feb9a14f2c14b2f
+SHA256 (zita-audiotools-1.3.0.tar.bz2) = 10fcff708fe63985f78cc1608807970f3dfec72bd901d2fa8aacfd62f13f213d
-SIZE (zita-audiotools-1.0.0.tar.bz2) = 8810
+SIZE (zita-audiotools-1.3.0.tar.bz2) = 124042

audio/py-zita-jacktools/Makefile

@@ -1,6 +1,5 @@
 PORTNAME=	zita-jacktools
-DISTVERSION=	1.5.3
+DISTVERSION=	1.6.0
-PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	https://kokkinizita.linuxaudio.org/linuxaudio/downloads/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -23,6 +22,6 @@ USES=		localbase python:3.6+ tar:bz2
 USE_PYTHON=	autoplist distutils
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/jacktools/*.so
+	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/zita_jacktools/*.so
 
 .include <bsd.port.mk>

audio/py-zita-jacktools/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1627411500
+TIMESTAMP = 1650642655
-SHA256 (zita-jacktools-1.5.3.tar.bz2) = 0e62af4eeb6e6d288860912ee3696c2d3693faa4a9f7afe1446c6b2ee30e2596
+SHA256 (zita-jacktools-1.6.0.tar.bz2) = a658361e84a6ee5137aa00ddbc3086d0f3104c7ed4072dc3a6e9c921fffdb6be
-SIZE (zita-jacktools-1.5.3.tar.bz2) = 86893
+SIZE (zita-jacktools-1.6.0.tar.bz2) = 93962

audio/stymulator/Makefile

@@ -1,8 +1,8 @@
 # Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
 
 PORTNAME=	stymulator
-DISTVERSION=	0.21a
+PORTVERSION=	0.21a
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://atariarea.krap.pl/stymulator/files/ \
 		LOCAL/ehaupt

benchmarks/inferno/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	inferno
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.11.1
+DISTVERSION=	0.11.2
 CATEGORIES=	benchmarks
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -24,12 +24,13 @@ CARGO_CRATES=	adler32-1.2.0 \
 		bitflags-1.3.2 \
 		bstr-0.2.17 \
 		bumpalo-3.9.1 \
-		bytemuck-1.8.0 \
+		bytemuck-1.9.1 \
 		cast-0.2.7 \
 		cfg-if-1.0.0 \
 		clap-2.34.0 \
-		clap-3.1.6 \
+		clap-3.1.12 \
-		clap_derive-3.1.4 \
+		clap_derive-3.1.7 \
+		clap_lex-0.1.1 \
 		crc32fast-1.3.2 \
 		criterion-0.3.5 \
 		criterion-plot-0.4.4 \
@@ -46,22 +47,22 @@ CARGO_CRATES=	adler32-1.2.0 \
 		doc-comment-0.3.3 \
 		either-1.6.1 \
 		env_logger-0.9.0 \
-		getrandom-0.2.5 \
+		getrandom-0.2.6 \
 		half-1.8.2 \
 		hashbrown-0.11.2 \
 		heck-0.4.0 \
 		hermit-abi-0.1.19 \
-		indexmap-1.8.0 \
+		indexmap-1.8.1 \
 		itertools-0.10.3 \
 		itoa-0.4.8 \
 		itoa-1.0.1 \
-		js-sys-0.3.56 \
+		js-sys-0.3.57 \
 		lazy_static-1.4.0 \
-		libc-0.2.121 \
+		libc-0.2.124 \
-		libflate-1.1.2 \
+		libflate-1.2.0 \
 		libflate_lz77-1.1.0 \
-		lock_api-0.4.6 \
+		lock_api-0.4.7 \
-		log-0.4.14 \
+		log-0.4.16 \
 		maplit-1.0.2 \
 		memchr-2.4.1 \
 		memoffset-0.6.5 \
@@ -74,7 +75,7 @@ CARGO_CRATES=	adler32-1.2.0 \
 		os_str_bytes-6.0.0 \
 		output_vt100-0.1.3 \
 		parking_lot-0.12.0 \
-		parking_lot_core-0.9.1 \
+		parking_lot_core-0.9.2 \
 		plotters-0.3.1 \
 		plotters-backend-0.3.2 \
 		plotters-svg-0.3.1 \
@@ -82,18 +83,18 @@ CARGO_CRATES=	adler32-1.2.0 \
 		predicates-2.1.1 \
 		predicates-core-1.0.3 \
 		predicates-tree-1.0.5 \
-		pretty_assertions-1.2.0 \
+		pretty_assertions-1.2.1 \
 		proc-macro-error-1.0.4 \
 		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.36 \
+		proc-macro2-1.0.37 \
 		quick-xml-0.22.0 \
-		quote-1.0.16 \
+		quote-1.0.18 \
 		rand-0.8.5 \
 		rand_chacha-0.3.1 \
 		rand_core-0.6.3 \
-		rayon-1.5.1 \
+		rayon-1.5.2 \
-		rayon-core-1.9.1 \
+		rayon-core-1.9.2 \
-		redox_syscall-0.2.11 \
+		redox_syscall-0.2.13 \
 		regex-1.5.5 \
 		regex-automata-0.1.10 \
 		regex-syntax-0.6.25 \
@@ -103,7 +104,7 @@ CARGO_CRATES=	adler32-1.2.0 \
 		ryu-1.0.9 \
 		same-file-1.0.6 \
 		scopeguard-1.1.0 \
-		semver-1.0.6 \
+		semver-1.0.7 \
 		serde-1.0.136 \
 		serde_cbor-0.11.2 \
 		serde_derive-1.0.136 \
@@ -111,7 +112,7 @@ CARGO_CRATES=	adler32-1.2.0 \
 		smallvec-1.8.0 \
 		str_stack-0.1.0 \
 		strsim-0.10.0 \
-		syn-1.0.89 \
+		syn-1.0.91 \
 		termcolor-1.1.3 \
 		termtree-0.2.4 \
 		testing_logger-0.1.1 \
@@ -124,26 +125,27 @@ CARGO_CRATES=	adler32-1.2.0 \
 		wait-timeout-0.2.0 \
 		walkdir-2.3.2 \
 		wasi-0.10.2+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.79 \
+		wasm-bindgen-0.2.80 \
-		wasm-bindgen-backend-0.2.79 \
+		wasm-bindgen-backend-0.2.80 \
-		wasm-bindgen-macro-0.2.79 \
+		wasm-bindgen-macro-0.2.80 \
-		wasm-bindgen-macro-support-0.2.79 \
+		wasm-bindgen-macro-support-0.2.80 \
-		wasm-bindgen-shared-0.2.79 \
+		wasm-bindgen-shared-0.2.80 \
-		web-sys-0.3.56 \
+		web-sys-0.3.57 \
 		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.32.0 \
+		windows-sys-0.34.0 \
-		windows_aarch64_msvc-0.32.0 \
+		windows_aarch64_msvc-0.34.0 \
-		windows_i686_gnu-0.32.0 \
+		windows_i686_gnu-0.34.0 \
-		windows_i686_msvc-0.32.0 \
+		windows_i686_msvc-0.34.0 \
-		windows_x86_64_gnu-0.32.0 \
+		windows_x86_64_gnu-0.34.0 \
-		windows_x86_64_msvc-0.32.0
+		windows_x86_64_msvc-0.34.0
 EXECUTABLES=	inferno-collapse-dtrace \
 		inferno-collapse-guess \
 		inferno-collapse-perf \
 		inferno-collapse-sample \
+		inferno-collapse-vsprof \
 		inferno-collapse-vtune \
 		inferno-diff-folded \
 		inferno-flamegraph

benchmarks/inferno/distinfo

@@ -1,4 +1,4 @@
-TIMESTAMP = 1647731479
+TIMESTAMP = 1650914024
 SHA256 (rust/crates/adler32-1.2.0.crate) = aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234
 SIZE (rust/crates/adler32-1.2.0.crate) = 6411
 SHA256 (rust/crates/ahash-0.7.6.crate) = fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47
@@ -19,18 +19,20 @@ SHA256 (rust/crates/bstr-0.2.17.crate) = ba3569f383e8f1598449f1a423e72e99569137b
 SIZE (rust/crates/bstr-0.2.17.crate) = 330350
 SHA256 (rust/crates/bumpalo-3.9.1.crate) = a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899
 SIZE (rust/crates/bumpalo-3.9.1.crate) = 77507
-SHA256 (rust/crates/bytemuck-1.8.0.crate) = 0e851ca7c24871e7336801608a4797d7376545b6928a10d32d75685687141ead
+SHA256 (rust/crates/bytemuck-1.9.1.crate) = cdead85bdec19c194affaeeb670c0e41fe23de31459efd1c174d049269cf02cc
-SIZE (rust/crates/bytemuck-1.8.0.crate) = 29406
+SIZE (rust/crates/bytemuck-1.9.1.crate) = 34517
 SHA256 (rust/crates/cast-0.2.7.crate) = 4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a
 SIZE (rust/crates/cast-0.2.7.crate) = 11222
 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
 SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
 SHA256 (rust/crates/clap-2.34.0.crate) = a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c
 SIZE (rust/crates/clap-2.34.0.crate) = 202210
-SHA256 (rust/crates/clap-3.1.6.crate) = d8c93436c21e4698bacadf42917db28b23017027a4deccb35dbe47a7e7840123
+SHA256 (rust/crates/clap-3.1.12.crate) = 7c167e37342afc5f33fd87bbc870cedd020d2a6dffa05d45ccd9241fbdd146db
-SIZE (rust/crates/clap-3.1.6.crate) = 202211
+SIZE (rust/crates/clap-3.1.12.crate) = 206752
-SHA256 (rust/crates/clap_derive-3.1.4.crate) = da95d038ede1a964ce99f49cbe27a7fb538d1da595e4b4f70b8c8f338d17bf16
+SHA256 (rust/crates/clap_derive-3.1.7.crate) = a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1
-SIZE (rust/crates/clap_derive-3.1.4.crate) = 25358
+SIZE (rust/crates/clap_derive-3.1.7.crate) = 25363
+SHA256 (rust/crates/clap_lex-0.1.1.crate) = 189ddd3b5d32a70b35e7686054371742a937b0d99128e76dde6340210e966669
+SIZE (rust/crates/clap_lex-0.1.1.crate) = 9603
 SHA256 (rust/crates/crc32fast-1.3.2.crate) = b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d
 SIZE (rust/crates/crc32fast-1.3.2.crate) = 38661
 SHA256 (rust/crates/criterion-0.3.5.crate) = 1604dafd25fba2fe2d5895a9da139f8dc9b319a5fe5354ca137cbbce4e178d10
@@ -63,8 +65,8 @@ SHA256 (rust/crates/either-1.6.1.crate) = e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227
 SIZE (rust/crates/either-1.6.1.crate) = 13641
 SHA256 (rust/crates/env_logger-0.9.0.crate) = 0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3
 SIZE (rust/crates/env_logger-0.9.0.crate) = 33573
-SHA256 (rust/crates/getrandom-0.2.5.crate) = d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77
+SHA256 (rust/crates/getrandom-0.2.6.crate) = 9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad
-SIZE (rust/crates/getrandom-0.2.5.crate) = 27719
+SIZE (rust/crates/getrandom-0.2.6.crate) = 28043
 SHA256 (rust/crates/half-1.8.2.crate) = eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7
 SIZE (rust/crates/half-1.8.2.crate) = 41874
 SHA256 (rust/crates/hashbrown-0.11.2.crate) = ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e
@@ -73,28 +75,28 @@ SHA256 (rust/crates/heck-0.4.0.crate) = 2540771e65fc8cb83cd6e8a237f70c319bd5c29f
 SIZE (rust/crates/heck-0.4.0.crate) = 11161
 SHA256 (rust/crates/hermit-abi-0.1.19.crate) = 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33
 SIZE (rust/crates/hermit-abi-0.1.19.crate) = 9979
-SHA256 (rust/crates/indexmap-1.8.0.crate) = 282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223
+SHA256 (rust/crates/indexmap-1.8.1.crate) = 0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee
-SIZE (rust/crates/indexmap-1.8.0.crate) = 52583
+SIZE (rust/crates/indexmap-1.8.1.crate) = 53220
 SHA256 (rust/crates/itertools-0.10.3.crate) = a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3
 SIZE (rust/crates/itertools-0.10.3.crate) = 118661
 SHA256 (rust/crates/itoa-0.4.8.crate) = b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4
 SIZE (rust/crates/itoa-0.4.8.crate) = 11926
 SHA256 (rust/crates/itoa-1.0.1.crate) = 1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35
 SIZE (rust/crates/itoa-1.0.1.crate) = 11059
-SHA256 (rust/crates/js-sys-0.3.56.crate) = a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04
+SHA256 (rust/crates/js-sys-0.3.57.crate) = 671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397
-SIZE (rust/crates/js-sys-0.3.56.crate) = 70520
+SIZE (rust/crates/js-sys-0.3.57.crate) = 78605
 SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
 SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
-SHA256 (rust/crates/libc-0.2.121.crate) = efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f
+SHA256 (rust/crates/libc-0.2.124.crate) = 21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50
-SIZE (rust/crates/libc-0.2.121.crate) = 574702
+SIZE (rust/crates/libc-0.2.124.crate) = 577742
-SHA256 (rust/crates/libflate-1.1.2.crate) = d2d57e534717ac3e0b8dc459fe338bdfb4e29d7eea8fd0926ba649ddd3f4765f
+SHA256 (rust/crates/libflate-1.2.0.crate) = 05605ab2bce11bcfc0e9c635ff29ef8b2ea83f29be257ee7d730cac3ee373093
-SIZE (rust/crates/libflate-1.1.2.crate) = 40865
+SIZE (rust/crates/libflate-1.2.0.crate) = 40864
 SHA256 (rust/crates/libflate_lz77-1.1.0.crate) = 39a734c0493409afcd49deee13c006a04e3586b9761a03543c6272c9c51f2f5a
 SIZE (rust/crates/libflate_lz77-1.1.0.crate) = 5729
-SHA256 (rust/crates/lock_api-0.4.6.crate) = 88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b
+SHA256 (rust/crates/lock_api-0.4.7.crate) = 327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53
-SIZE (rust/crates/lock_api-0.4.6.crate) = 25215
+SIZE (rust/crates/lock_api-0.4.7.crate) = 25371
-SHA256 (rust/crates/log-0.4.14.crate) = 51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710
+SHA256 (rust/crates/log-0.4.16.crate) = 6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8
-SIZE (rust/crates/log-0.4.14.crate) = 34582
+SIZE (rust/crates/log-0.4.16.crate) = 37758
 SHA256 (rust/crates/maplit-1.0.2.crate) = 3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d
 SIZE (rust/crates/maplit-1.0.2.crate) = 8871
 SHA256 (rust/crates/memchr-2.4.1.crate) = 308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a
@@ -119,8 +121,8 @@ SHA256 (rust/crates/output_vt100-0.1.3.crate) = 628223faebab4e3e40667ee0b2336d34
 SIZE (rust/crates/output_vt100-0.1.3.crate) = 4473
 SHA256 (rust/crates/parking_lot-0.12.0.crate) = 87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58
 SIZE (rust/crates/parking_lot-0.12.0.crate) = 39761
-SHA256 (rust/crates/parking_lot_core-0.9.1.crate) = 28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954
+SHA256 (rust/crates/parking_lot_core-0.9.2.crate) = 995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37
-SIZE (rust/crates/parking_lot_core-0.9.1.crate) = 32234
+SIZE (rust/crates/parking_lot_core-0.9.2.crate) = 32254
 SHA256 (rust/crates/plotters-0.3.1.crate) = 32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a
 SIZE (rust/crates/plotters-0.3.1.crate) = 8595577
 SHA256 (rust/crates/plotters-backend-0.3.2.crate) = d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c
@@ -135,30 +137,30 @@ SHA256 (rust/crates/predicates-core-1.0.3.crate) = da1c2388b1513e1b605fcec39a95e
 SIZE (rust/crates/predicates-core-1.0.3.crate) = 7757
 SHA256 (rust/crates/predicates-tree-1.0.5.crate) = 4d86de6de25020a36c6d3643a86d9a6a9f552107c0559c60ea03551b5e16c032
 SIZE (rust/crates/predicates-tree-1.0.5.crate) = 8126
-SHA256 (rust/crates/pretty_assertions-1.2.0.crate) = 57c038cb5319b9c704bf9c227c261d275bfec0ad438118a2787ce47944fb228b
+SHA256 (rust/crates/pretty_assertions-1.2.1.crate) = c89f989ac94207d048d92db058e4f6ec7342b0971fc58d1271ca148b799b3563
-SIZE (rust/crates/pretty_assertions-1.2.0.crate) = 79143
+SIZE (rust/crates/pretty_assertions-1.2.1.crate) = 79474
 SHA256 (rust/crates/proc-macro-error-1.0.4.crate) = da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c
 SIZE (rust/crates/proc-macro-error-1.0.4.crate) = 25293
 SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869
 SIZE (rust/crates/proc-macro-error-attr-1.0.4.crate) = 7971
-SHA256 (rust/crates/proc-macro2-1.0.36.crate) = c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029
+SHA256 (rust/crates/proc-macro2-1.0.37.crate) = ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1
-SIZE (rust/crates/proc-macro2-1.0.36.crate) = 41411
+SIZE (rust/crates/proc-macro2-1.0.37.crate) = 41378
 SHA256 (rust/crates/quick-xml-0.22.0.crate) = 8533f14c8382aaad0d592c812ac3b826162128b65662331e1127b45c3d18536b
 SIZE (rust/crates/quick-xml-0.22.0.crate) = 132066
-SHA256 (rust/crates/quote-1.0.16.crate) = b4af2ec4714533fcdf07e886f17025ace8b997b9ce51204ee69b6da831c3da57
+SHA256 (rust/crates/quote-1.0.18.crate) = a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1
-SIZE (rust/crates/quote-1.0.16.crate) = 27566
+SIZE (rust/crates/quote-1.0.18.crate) = 28911
 SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404
 SIZE (rust/crates/rand-0.8.5.crate) = 87113
 SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
 SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251
 SHA256 (rust/crates/rand_core-0.6.3.crate) = d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7
 SIZE (rust/crates/rand_core-0.6.3.crate) = 21938
-SHA256 (rust/crates/rayon-1.5.1.crate) = c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90
+SHA256 (rust/crates/rayon-1.5.2.crate) = fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221
-SIZE (rust/crates/rayon-1.5.1.crate) = 160424
+SIZE (rust/crates/rayon-1.5.2.crate) = 165456
-SHA256 (rust/crates/rayon-core-1.9.1.crate) = d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e
+SHA256 (rust/crates/rayon-core-1.9.2.crate) = 9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4
-SIZE (rust/crates/rayon-core-1.9.1.crate) = 64961
+SIZE (rust/crates/rayon-core-1.9.2.crate) = 65221
-SHA256 (rust/crates/redox_syscall-0.2.11.crate) = 8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c
+SHA256 (rust/crates/redox_syscall-0.2.13.crate) = 62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42
-SIZE (rust/crates/redox_syscall-0.2.11.crate) = 24032
+SIZE (rust/crates/redox_syscall-0.2.13.crate) = 23759
 SHA256 (rust/crates/regex-1.5.5.crate) = 1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286
 SIZE (rust/crates/regex-1.5.5.crate) = 238119
 SHA256 (rust/crates/regex-automata-0.1.10.crate) = 6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132
@@ -177,8 +179,8 @@ SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e
 SIZE (rust/crates/same-file-1.0.6.crate) = 10183
 SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd
 SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470
-SHA256 (rust/crates/semver-1.0.6.crate) = a4a3381e03edd24287172047536f20cabde766e2cd3e65e6b00fb3af51c4f38d
+SHA256 (rust/crates/semver-1.0.7.crate) = d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4
-SIZE (rust/crates/semver-1.0.6.crate) = 29941
+SIZE (rust/crates/semver-1.0.7.crate) = 30064
 SHA256 (rust/crates/serde-1.0.136.crate) = ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789
 SIZE (rust/crates/serde-1.0.136.crate) = 76158
 SHA256 (rust/crates/serde_cbor-0.11.2.crate) = 2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5
@@ -193,8 +195,8 @@ SHA256 (rust/crates/str_stack-0.1.0.crate) = 9091b6114800a5f2141aee1d1b9d6ca3592
 SIZE (rust/crates/str_stack-0.1.0.crate) = 7977
 SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623
 SIZE (rust/crates/strsim-0.10.0.crate) = 11355
-SHA256 (rust/crates/syn-1.0.89.crate) = ea297be220d52398dcc07ce15a209fce436d361735ac1db700cab3b6cdfb9f54
+SHA256 (rust/crates/syn-1.0.91.crate) = b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d
-SIZE (rust/crates/syn-1.0.89.crate) = 235966
+SIZE (rust/crates/syn-1.0.91.crate) = 235996
 SHA256 (rust/crates/termcolor-1.1.3.crate) = bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755
 SIZE (rust/crates/termcolor-1.1.3.crate) = 17242
 SHA256 (rust/crates/termtree-0.2.4.crate) = 507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b
@@ -219,18 +221,18 @@ SHA256 (rust/crates/walkdir-2.3.2.crate) = 808cf2735cd4b6866113f648b791c6adc5714
 SIZE (rust/crates/walkdir-2.3.2.crate) = 23516
 SHA256 (rust/crates/wasi-0.10.2+wasi-snapshot-preview1.crate) = fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6
 SIZE (rust/crates/wasi-0.10.2+wasi-snapshot-preview1.crate) = 27505
-SHA256 (rust/crates/wasm-bindgen-0.2.79.crate) = 25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06
+SHA256 (rust/crates/wasm-bindgen-0.2.80.crate) = 27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad
-SIZE (rust/crates/wasm-bindgen-0.2.79.crate) = 164276
+SIZE (rust/crates/wasm-bindgen-0.2.80.crate) = 164576
-SHA256 (rust/crates/wasm-bindgen-backend-0.2.79.crate) = 8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca
+SHA256 (rust/crates/wasm-bindgen-backend-0.2.80.crate) = 53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4
-SIZE (rust/crates/wasm-bindgen-backend-0.2.79.crate) = 25776
+SIZE (rust/crates/wasm-bindgen-backend-0.2.80.crate) = 25741
-SHA256 (rust/crates/wasm-bindgen-macro-0.2.79.crate) = 2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01
+SHA256 (rust/crates/wasm-bindgen-macro-0.2.80.crate) = 17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5
-SIZE (rust/crates/wasm-bindgen-macro-0.2.79.crate) = 11806
+SIZE (rust/crates/wasm-bindgen-macro-0.2.80.crate) = 11805
-SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.79.crate) = bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc
+SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.80.crate) = 99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b
-SIZE (rust/crates/wasm-bindgen-macro-support-0.2.79.crate) = 17861
+SIZE (rust/crates/wasm-bindgen-macro-support-0.2.80.crate) = 17857
-SHA256 (rust/crates/wasm-bindgen-shared-0.2.79.crate) = 3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2
+SHA256 (rust/crates/wasm-bindgen-shared-0.2.80.crate) = d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744
-SIZE (rust/crates/wasm-bindgen-shared-0.2.79.crate) = 7204
+SIZE (rust/crates/wasm-bindgen-shared-0.2.80.crate) = 7204
-SHA256 (rust/crates/web-sys-0.3.56.crate) = c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb
+SHA256 (rust/crates/web-sys-0.3.57.crate) = 7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283
-SIZE (rust/crates/web-sys-0.3.56.crate) = 666465
+SIZE (rust/crates/web-sys-0.3.57.crate) = 686563
 SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
 SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
 SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
@@ -239,17 +241,17 @@ SHA256 (rust/crates/winapi-util-0.1.5.crate) = 70ec6ce85bb158151cae5e5c87f95a8e9
 SIZE (rust/crates/winapi-util-0.1.5.crate) = 10164
 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
-SHA256 (rust/crates/windows-sys-0.32.0.crate) = 3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6
+SHA256 (rust/crates/windows-sys-0.34.0.crate) = 5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825
-SIZE (rust/crates/windows-sys-0.32.0.crate) = 3361554
+SIZE (rust/crates/windows-sys-0.34.0.crate) = 3369228
-SHA256 (rust/crates/windows_aarch64_msvc-0.32.0.crate) = d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5
+SHA256 (rust/crates/windows_aarch64_msvc-0.34.0.crate) = 17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d
-SIZE (rust/crates/windows_aarch64_msvc-0.32.0.crate) = 673810
+SIZE (rust/crates/windows_aarch64_msvc-0.34.0.crate) = 674445
-SHA256 (rust/crates/windows_i686_gnu-0.32.0.crate) = 6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615
+SHA256 (rust/crates/windows_i686_gnu-0.34.0.crate) = 2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed
-SIZE (rust/crates/windows_i686_gnu-0.32.0.crate) = 772251
+SIZE (rust/crates/windows_i686_gnu-0.34.0.crate) = 772343
-SHA256 (rust/crates/windows_i686_msvc-0.32.0.crate) = 146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172
+SHA256 (rust/crates/windows_i686_msvc-0.34.0.crate) = 9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956
-SIZE (rust/crates/windows_i686_msvc-0.32.0.crate) = 733422
+SIZE (rust/crates/windows_i686_msvc-0.34.0.crate) = 733497
-SHA256 (rust/crates/windows_x86_64_gnu-0.32.0.crate) = c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc
+SHA256 (rust/crates/windows_x86_64_gnu-0.34.0.crate) = cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4
-SIZE (rust/crates/windows_x86_64_gnu-0.32.0.crate) = 744209
+SIZE (rust/crates/windows_x86_64_gnu-0.34.0.crate) = 744301
-SHA256 (rust/crates/windows_x86_64_msvc-0.32.0.crate) = 504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316
+SHA256 (rust/crates/windows_x86_64_msvc-0.34.0.crate) = d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9
-SIZE (rust/crates/windows_x86_64_msvc-0.32.0.crate) = 669835
+SIZE (rust/crates/windows_x86_64_msvc-0.34.0.crate) = 669900
-SHA256 (jonhoo-inferno-v0.11.1_GH0.tar.gz) = bc3639aff0a1b27184f1b86eac0c5462db01d31c25c26f46d3f946002fba4192
+SHA256 (jonhoo-inferno-v0.11.2_GH0.tar.gz) = 965677f3a7d3b7030164e26479d8e5b990d8023ab1df446edd4b0fb38f900f40
-SIZE (jonhoo-inferno-v0.11.1_GH0.tar.gz) = 597576
+SIZE (jonhoo-inferno-v0.11.2_GH0.tar.gz) = 605505

benchmarks/siege/Makefile

@@ -1,7 +1,7 @@
 # Created by: Mark Pulford <mark@kyne.com.au>
 
 PORTNAME=	siege
-PORTVERSION=	4.1.2
+PORTVERSION=	4.1.3
 CATEGORIES=	benchmarks www
 MASTER_SITES=	http://download.joedog.org/siege/ \
 		http://fossies.org/linux/www/

benchmarks/siege/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1647949223
+TIMESTAMP = 1650583322
-SHA256 (siege-4.1.2.tar.gz) = e472abe19c5a93f6be5bfd64dff26f668da2c6d210af8213b60c9c0db17eca79
+SHA256 (siege-4.1.3.tar.gz) = 2250bca8fca539f1a4e4cbe5ba89afd32c4739b2fbc60c7ca6168d9a782f790a
-SIZE (siege-4.1.2.tar.gz) = 527676
+SIZE (siege-4.1.3.tar.gz) = 541195

biology/checkm/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	CheckM
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.1.9
+DISTVERSION=	1.1.11
 CATEGORIES=	biology python
 
 MAINTAINER=	yuri@FreeBSD.org

biology/checkm/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1650042779
+TIMESTAMP = 1650914068
-SHA256 (Ecogenomics-CheckM-v1.1.9_GH0.tar.gz) = 4ec395e1dfce2aa9cb5059dd899d4b4160c2d46ea0b32a72c86ddd964595c743
+SHA256 (Ecogenomics-CheckM-v1.1.11_GH0.tar.gz) = 60f2c763b03874a0fc79c317ad6205abf740dbea27d348368a9d5968bbe27538
-SIZE (Ecogenomics-CheckM-v1.1.9_GH0.tar.gz) = 1016612
+SIZE (Ecogenomics-CheckM-v1.1.11_GH0.tar.gz) = 1016667

biology/diamond/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	diamond
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.0.14
+DISTVERSION=	2.0.15
 CATEGORIES=	biology
 
 MAINTAINER=	jrm@FreeBSD.org

biology/diamond/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1642094227
+TIMESTAMP = 1650821944
-SHA256 (bbuchfink-diamond-v2.0.14_GH0.tar.gz) = 3eaef2b957e4ba845eac27a2ca3249aae4259ff1fe0ff5a21b094481328fdc53
+SHA256 (bbuchfink-diamond-v2.0.15_GH0.tar.gz) = cc8e1f3fd357d286cf6585b21321bd25af69aae16ae1a8f605ea603c1886ffa4
-SIZE (bbuchfink-diamond-v2.0.14_GH0.tar.gz) = 1489596
+SIZE (bbuchfink-diamond-v2.0.15_GH0.tar.gz) = 1489731

biology/hyphy/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	hyphy
-DISTVERSION=	2.5.36
+DISTVERSION=	2.5.38
 CATEGORIES=	biology
 
 MAINTAINER=	jrm@FreeBSD.org

biology/hyphy/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1643865503
+TIMESTAMP = 1650376110
-SHA256 (veg-hyphy-2.5.36_GH0.tar.gz) = c48a077deff3e06cadffa94cd5e91ab659b0ebc6cb60a0d090747bfeff69aae1
+SHA256 (veg-hyphy-2.5.38_GH0.tar.gz) = 1b66af17f9f7dd0e9951a9bd3b106b95bf5915a78523973ba79af64f970770d6
-SIZE (veg-hyphy-2.5.36_GH0.tar.gz) = 5362425
+SIZE (veg-hyphy-2.5.38_GH0.tar.gz) = 5365153

biology/hyphy/files/patch-src_core_include_function__templates.h

@@ -1,10 +0,0 @@
---- src/core/include/function_templates.h.orig	2022-02-21 19:44:45 UTC
-+++ src/core/include/function_templates.h
-@@ -156,7 +156,6 @@ void ArrayForEach(ARG_TYPE *array, unsigned long dimen
- template <typename ARG_TYPE>
- void InitializeArray(ARG_TYPE *array, unsigned long dimension,
-                      ARG_TYPE &&value) {
--  #pragma clang loop unroll_count(8)
-   #pragma GCC unroll 4
-   for (unsigned long i = 0UL; i < dimension; i++) {
-     array[i] = value;

biology/hyphy/files/patch-src_core_matrix.cpp

@@ -1,6 +1,6 @@
---- src/core/matrix.cpp.orig	2022-02-21 19:46:34 UTC
+--- src/core/matrix.cpp.orig	2022-04-24 18:04:11 UTC
 +++ src/core/matrix.cpp
-@@ -3391,7 +3391,6 @@ void    _Matrix::AddMatrix  (_Matrix& storage, _Matrix
+@@ -3405,7 +3405,6 @@ void    _Matrix::AddMatrix  (_Matrix& storage, _Matrix
          #pragma GCC unroll 4
          #pragma clang loop vectorize(enable)
          #pragma clang loop interleave(enable)
@@ -8,31 +8,7 @@
          #pragma GCC ivdep
          #pragma ivdep
                 for (long idx = 0; idx < upto; idx+=16) {
-@@ -3410,7 +3409,6 @@ void    _Matrix::AddMatrix  (_Matrix& storage, _Matrix
+@@ -3909,7 +3908,6 @@ void    _Matrix::Multiply  (_Matrix& storage, _Matrix 
-         #pragma GCC unroll 4
-         #pragma clang loop vectorize(enable)
-         #pragma clang loop interleave(enable)
--        #pragma clang loop unroll(enable)
-         #pragma GCC ivdep
-         #pragma ivdep
-                for (long idx = 0; idx < upto; idx+=8) {
-@@ -3440,7 +3438,6 @@ void    _Matrix::AddMatrix  (_Matrix& storage, _Matrix
-             #pragma GCC unroll 4
-             #pragma clang loop vectorize(enable)
-             #pragma clang loop interleave(enable)
--            #pragma clang loop unroll(enable)
-                  for (long idx = 0; idx < upto; idx+=16) {
-                      CELL_OP (idx);
-                      CELL_OP (idx+4);
-@@ -3454,7 +3451,6 @@ void    _Matrix::AddMatrix  (_Matrix& storage, _Matrix
-         #pragma GCC unroll 4
-         #pragma clang loop vectorize(enable)
-         #pragma clang loop interleave(enable)
--        #pragma clang loop unroll(enable)
-         #pragma GCC ivdep
-         #pragma ivdep
-                for (long idx = 0; idx < upto; idx+=8) {
-@@ -3895,7 +3891,6 @@ void    _Matrix::Multiply  (_Matrix& storage, _Matrix 
                                   #pragma GCC unroll 4
                                   #pragma clang loop vectorize(enable)
                                   #pragma clang loop interleave(enable)
@@ -40,7 +16,7 @@
                                   for (long k = 0; k < vDim; k+=4) {
                                        __m256d D4, B4;
                                        DO_GROUP_OP (D4, B4, k);
-@@ -3946,7 +3941,6 @@ void    _Matrix::Multiply  (_Matrix& storage, _Matrix 
+@@ -3960,7 +3958,6 @@ void    _Matrix::Multiply  (_Matrix& storage, _Matrix 
                                    #pragma GCC unroll 4
                                    #pragma clang loop vectorize(enable)
                                    #pragma clang loop interleave(enable)
@@ -48,15 +24,7 @@
                                    for (long k = 0; k < vDim; k+=2) {
                                        __m128d D4, B4;
                                        DO_GROUP_OP1 (D4, B4, k);
-@@ -3998,7 +3992,6 @@ void    _Matrix::Multiply  (_Matrix& storage, _Matrix 
+@@ -4177,7 +4174,6 @@ void    _Matrix::Multiply  (_Matrix& storage, _Matrix 
-                             #pragma GCC unroll 4
-                             #pragma clang loop vectorize(enable)
-                             #pragma clang loop interleave(enable)
--                            #pragma clang loop unroll(enable)
-                             for (long k = 0; k < vDim; k+=2) {
-                                 float64x2_t D4, B4;
-                                 DO_GROUP_OP1 (D4, B4, k);
-@@ -4163,7 +4156,6 @@ void    _Matrix::Multiply  (_Matrix& storage, _Matrix 
                              #pragma GCC unroll 4
                              #pragma clang loop vectorize(enable)
                              #pragma clang loop interleave(enable)
@@ -64,7 +32,7 @@
                                for (long k = 0; k < dimm4; k+=4) {
                                    __m256d D4, B4;
                                    DO_GROUP_OP (D4, B4, k);
-@@ -4271,7 +4263,6 @@ void    _Matrix::Multiply  (_Matrix& storage, _Matrix 
+@@ -4285,7 +4281,6 @@ void    _Matrix::Multiply  (_Matrix& storage, _Matrix 
                                          #pragma GCC unroll 4
                                          #pragma clang loop vectorize(enable)
                                          #pragma clang loop interleave(enable)
@@ -72,15 +40,7 @@
                                          for (long k = 0; k < dimm4; k+=2) {
                                              __m128d D4, B4;
                                              DO_GROUP_OP1 (D4, B4, k);
-@@ -4380,7 +4371,6 @@ void    _Matrix::Multiply  (_Matrix& storage, _Matrix 
+@@ -4455,7 +4450,6 @@ void    _Matrix::Multiply  (_Matrix& storage, _Matrix 
-                                   #pragma GCC unroll 4
-                                   #pragma clang loop vectorize(enable)
-                                   #pragma clang loop interleave(enable)
--                                  #pragma clang loop unroll(enable)
-                                   for (long k = 0; k < dimm4; k+=2) {
-                                       float64x2_t D4, B4;
-                                       DO_GROUP_OP1 (D4, B4, k);
-@@ -4441,7 +4431,6 @@ void    _Matrix::Multiply  (_Matrix& storage, _Matrix 
                          #pragma GCC unroll 8
                          #pragma clang loop vectorize(enable)
                          #pragma clang loop interleave(enable)
@@ -88,19 +48,3 @@
                          for (long k = 0, column = j*hDim; k < vDim; k++, column ++) {
                              resCell += row[k] * secondArg.theData [column];
                          }
-@@ -5822,7 +5811,6 @@ _Matrix*    _Matrix::Exponentiate (hyFloat scale_to, b
-                     #pragma GCC unroll 4
-                     #pragma clang loop vectorize(enable)
-                     #pragma clang loop interleave(enable)
--                    #pragma clang loop unroll(enable)
-                     for (long c = from; c < compressedIndex[r]; c++, i++) {
-                         theIndex[i] = compressedIndex[c+hDim] * vDim + r;
-                     }
-@@ -6988,7 +6976,6 @@ hyFloat        _Matrix::Sqr (hyFloat* _hprestrict_ sta
-                         #pragma GCC unroll 4
-                         #pragma clang loop vectorize(enable)
-                         #pragma clang loop interleave(enable)
--                        #pragma clang loop unroll(enable)
-                         #pragma GCC ivdep
-                         #pragma ivdep
-                         for (long k = 0; k < loopBound; k+=4) {

biology/hyphy/files/patch-src_core_tree__evaluator.cpp

@@ -1,154 +0,0 @@
---- src/core/tree_evaluator.cpp.orig	2022-02-21 19:48:41 UTC
-+++ src/core/tree_evaluator.cpp
-@@ -127,7 +127,6 @@ inline double _sse_sum_2 (__m128d const & x) {
- template<long D> inline void __ll_handle_matrix_transpose (hyFloat const * __restrict transitionMatrix, hyFloat * __restrict tMatrixT) {
-     long i = 0L;
-     for (long r = 0L; r < D; r++) {
--        #pragma unroll(4)
-         #pragma GCC unroll 4
-         for (long c = 0L; c < D; c++, i++) {
-             tMatrixT[c*D+r] = transitionMatrix[i];
-@@ -154,7 +153,6 @@ template<long D> inline bool __ll_handle_conditional_a
-                 }
-             }*/
-             
--            #pragma unroll(4)
-             #pragma GCC unroll 4
-             for (long k = 0L; k < D; k++) {
-                 parentConditionals[k] *= tMatrix[siteState+D*k];
-@@ -172,7 +170,6 @@ template<long D> inline bool __ll_handle_conditional_a
-     } else {
-         if (tcc) {
-             if (__builtin_expect((tcc->list_data[currentTCCIndex] & bitMaskArray.masks[currentTCCBit]) > 0 && siteID > siteFrom,0)) {
--                #pragma unroll(4)
-                 #pragma GCC unroll 4
-                 for (long k = 0L; k < D; k++) {
-                     childVector[k] = lastUpdatedSite[k];
-@@ -200,7 +197,6 @@ inline bool __ll_handle_conditional_array_initializati
-         }
-         if (__builtin_expect(siteState >= 0L,1)) {
-             // a single character state; sweep down the appropriate column
--            #pragma unroll(4)
-             #pragma GCC unroll 4
-             for (long k = 0L; k < D; k++) {
-                 parentConditionals[k] *= tMatrix[siteState+D*k];
-@@ -212,7 +208,6 @@ inline bool __ll_handle_conditional_array_initializati
-     } else {
-         if (tcc) {
-             if (__builtin_expect((tcc->list_data[currentTCCIndex] & bitMaskArray.masks[currentTCCBit]) > 0 && siteID > siteFrom,0)) {
--                #pragma unroll(4)
-                 #pragma GCC unroll 4
-                 for (long k = 0L; k < D; k++) {
-                     childVector[k] = lastUpdatedSite[k];
-@@ -542,7 +537,6 @@ template<long D> inline void __ll_product_sum_loop (hy
-         #pragma GCC unroll 8
-         #pragma clang loop vectorize(enable)
-         #pragma clang loop interleave(enable)
--        #pragma clang loop unroll(enable)
-         for (long c = 0; c < D; c++)
-             accumulator +=  tMatrix[c]   * childVector[c];
-         
-@@ -558,7 +552,6 @@ inline void __ll_product_sum_loop_generic (hyFloat con
-         #pragma GCC unroll 8
-         #pragma clang loop vectorize(enable)
-         #pragma clang loop interleave(enable)
--        #pragma clang loop unroll(enable)
-         for (long c = 0; c < D; c++)
-             accumulator +=  tMatrix[c]   * childVector[c];
-         
-@@ -595,7 +588,6 @@ template<long D, bool ADJUST> inline void __ll_loop_ha
-             fprintf (stderr, "UP %ld (%ld) %lg\n", didScale, parentCode, scaler);
-         }*/
-         if (didScale) {
--            #pragma unroll(4)
-             #pragma GCC unroll 4
-             for (long c = 0; c < D; c++) {
-                 parentConditionals [c] *= scaler;
-@@ -626,7 +618,6 @@ template<long D, bool ADJUST> inline void __ll_loop_ha
-                 }*/
-                 
-                 if (didScale) {
--                    #pragma unroll(4)
-                     #pragma GCC unroll 4
-                     for (long c = 0; c < D; c++) {
-                         parentConditionals [c] *= scaler;
-@@ -657,7 +648,6 @@ template<bool ADJUST> inline void __ll_loop_handle_sca
-         hyFloat scaler = _computeBoostScaler(scalingAdjustments [parentCode*siteCount + siteID] * _lfScalerUpwards, sum, didScale);
-         
-         if (didScale) {
--            #pragma unroll(8)
-             #pragma GCC unroll 8
-             for (long c = 0; c < D; c++) {
-                 parentConditionals [c] *= scaler;
-@@ -679,7 +669,6 @@ template<bool ADJUST> inline void __ll_loop_handle_sca
-                 hyFloat scaler = _computeReductionScaler (scalingAdjustments [parentCode*siteCount + siteID] * _lfScalingFactorThreshold, sum, didScale);
-                 
-                 if (didScale) {
--                    #pragma unroll(8)
-                     #pragma GCC unroll 8
-                     for (long c = 0; c < D; c++) {
-                          parentConditionals [c] *= scaler;
-@@ -707,7 +696,6 @@ template<long D> inline void __ll_loop_handle_leaf_cas
-     } else {
-         for (long k = siteFrom; k < siteTo; k++, pp += D) {
-             hyFloat lsf = localScalingFactor[k];
--#pragma unroll(4)
- #pragma GCC unroll 4
-             for (long s = 0; s < D; s++) {
-                 pp[s] = lsf;
-@@ -1585,7 +1573,6 @@ hyFloat      _TheTree::ComputeTreeBlockByBranch  (    
-             accumulator         = rootConditionals[rootIndex + rootState] * theProbs[rootState];
-             rootIndex           += alphabetDimension;
-         } else {
--            #pragma unroll(4)
-             #pragma GCC unroll 4
-             for (long p = 0; p < alphabetDimension; p++,rootIndex++) {
-                 accumulator += rootConditionals[rootIndex] * theProbs[p];
-@@ -1644,7 +1631,6 @@ template<long D> inline bool __lcache_loop_preface (bo
-         long siteState = lNodeFlags[nodeCode*siteCount + siteOrdering.list_data[siteID]] ;
-         if (siteState >= 0L) {
-             unsigned long target_index = siteState;
--            #pragma unroll(4)
-             #pragma GCC unroll 4
-             for (long k = 0L; k < D; k++, target_index+=D) {
-                 parentConditionals[k]   *= tMatrix[target_index];
-@@ -1659,7 +1645,6 @@ template<long D> inline bool __lcache_loop_preface (bo
-             if ((tcc->list_data[currentTCCIndex] & bitMaskArray.masks[currentTCCBit]) > 0 && siteID > siteFrom)
-                 // the value of this conditional vector needs to be copied from a previously stored site
-                 // subtree duplication
--                #pragma unroll(4)
-                 #pragma GCC unroll 4
-                 for (long k = 0UL; k < D; k++) {
-                     childVector[k] = lastUpdatedSite[k];
-@@ -1688,7 +1673,6 @@ inline bool __lcache_loop_preface_generic (bool isLeaf
-         long siteState = lNodeFlags[nodeCode*siteCount + siteOrdering.list_data[siteID]] ;
-         if (siteState >= 0L) {
-             unsigned long target_index = siteState;
--            #pragma unroll(4)
-             #pragma GCC unroll 4
-             for (long k = 0L; k < D; k++, target_index+=D) {
-                 parentConditionals[k]   *= tMatrix[target_index];
-@@ -1704,7 +1688,6 @@ inline bool __lcache_loop_preface_generic (bool isLeaf
-             if ((tcc->list_data[currentTCCIndex] & bitMaskArray.masks[currentTCCBit]) > 0 && siteID > siteFrom)
-                 // the value of this conditional vector needs to be copied from a previously stored site
-                 // subtree duplication
--                #pragma unroll(4)
-                 #pragma GCC unroll 4
-                 for (long k = 0UL; k < D; k++) {
-                     childVector[k] = lastUpdatedSite[k];
-@@ -1966,7 +1949,6 @@ void            _TheTree::ComputeBranchCache    (
-                 unsigned long k3     = 0UL;
-                 for (unsigned long k = siteFrom; k < siteTo; k++) {
-                     hyFloat scaler = localScalingFactor[k];
--                    #pragma unroll(4)
-                     #pragma GCC unroll 4
-                     for (unsigned long k2 = 0UL; k2 < alphabetDimension; k2++, k3++) {
-                         parentConditionals [k3] = scaler;
-@@ -2474,7 +2456,6 @@ void            _TheTree::ComputeBranchCache    (
-                     #pragma GCC unroll 8
-                     #pragma clang loop vectorize(enable)
-                     #pragma clang loop interleave(enable)
--                    #pragma clang loop unroll(enable)
-                     for (long k = 0; k < alphabetDimension; k++) {
-                         sum += parentConditionals[k];
-                     }

biology/libnuml/Makefile

@@ -1,7 +1,6 @@
 PORTNAME=	libnuml
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.1.5
+DISTVERSION=	1.1.6
-PORTREVISION=	1
 CATEGORIES=	biology devel
 
 MAINTAINER=	yuri@FreeBSD.org

biology/libnuml/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1649355866
+TIMESTAMP = 1650763295
-SHA256 (NuML-NuML-v1.1.5_GH0.tar.gz) = ae67c85d9323f855856a17685ed3e542e90350f25df1c7d727009ee998fe63e2
+SHA256 (NuML-NuML-v1.1.6_GH0.tar.gz) = 1b51cd51bfe7e9c4e0bcd69f86d8199a23ebe9ea931d4f112b3f6e1666e4f2c8
-SIZE (NuML-NuML-v1.1.5_GH0.tar.gz) = 3424995
+SIZE (NuML-NuML-v1.1.6_GH0.tar.gz) = 3425639

biology/libnuml/pkg-plist

@@ -41,4 +41,4 @@ lib/cmake/numl-static-config.cmake
 lib/libnuml-static.a
 lib/libnuml.so
 lib/libnuml.so.1
-lib/libnuml.so.1.1.5
+lib/libnuml.so.1.1.6

biology/libsedml/Makefile

@@ -1,7 +1,6 @@
 PORTNAME=	libsedml
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.0.30
+DISTVERSION=	2.0.31
-PORTREVISION=	1
 CATEGORIES=	biology devel
 
 MAINTAINER=	yuri@FreeBSD.org

biology/libsedml/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1649357439
+TIMESTAMP = 1650649359
-SHA256 (fbergmann-libSEDML-v2.0.30_GH0.tar.gz) = ba0111f7cc991ecc460f68e85182da75d62937522c9259c76e79a917e0fb9c24
+SHA256 (fbergmann-libSEDML-v2.0.31_GH0.tar.gz) = f61954df7ead556eced3d8559e58fd01c9bb89766196aedbd1518ec640ed2a06
-SIZE (fbergmann-libSEDML-v2.0.30_GH0.tar.gz) = 964155
+SIZE (fbergmann-libSEDML-v2.0.31_GH0.tar.gz) = 965714

biology/libsedml/pkg-plist

@@ -114,4 +114,4 @@ lib/cmake/sedml-static-config.cmake
 lib/libsedml-static.a
 lib/libsedml.so
 lib/libsedml.so.2
-lib/libsedml.so.2.0.30
+lib/libsedml.so.2.0.31

biology/py-libnuml/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	libnuml
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.1.5
+DISTVERSION=	1.1.6
 CATEGORIES=	biology devel
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 

biology/py-libnuml/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1649356300
+TIMESTAMP = 1650763370
-SHA256 (NuML-NuML-v1.1.5_GH0.tar.gz) = ae67c85d9323f855856a17685ed3e542e90350f25df1c7d727009ee998fe63e2
+SHA256 (NuML-NuML-v1.1.6_GH0.tar.gz) = 1b51cd51bfe7e9c4e0bcd69f86d8199a23ebe9ea931d4f112b3f6e1666e4f2c8
-SIZE (NuML-NuML-v1.1.5_GH0.tar.gz) = 3424995
+SIZE (NuML-NuML-v1.1.6_GH0.tar.gz) = 3425639

biology/py-libsedml/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	libsedml
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.0.30
+DISTVERSION=	2.0.31
 CATEGORIES=	biology devel
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 

biology/py-libsedml/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1649357873
+TIMESTAMP = 1650649576
-SHA256 (fbergmann-libSEDML-v2.0.30_GH0.tar.gz) = ba0111f7cc991ecc460f68e85182da75d62937522c9259c76e79a917e0fb9c24
+SHA256 (fbergmann-libSEDML-v2.0.31_GH0.tar.gz) = f61954df7ead556eced3d8559e58fd01c9bb89766196aedbd1518ec640ed2a06
-SIZE (fbergmann-libSEDML-v2.0.30_GH0.tar.gz) = 964155
+SIZE (fbergmann-libSEDML-v2.0.31_GH0.tar.gz) = 965714

biology/seqan-apps/Makefile

@@ -14,7 +14,7 @@ LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs
 
-USES=		cmake
+USES=		cmake compiler:c++14-lang
 USE_GITHUB=	yes
 GH_ACCOUNT=	seqan
 GH_PROJECT=	seqan
@@ -37,8 +37,4 @@ PLIST_SUB+=	RM_I386="@comment "
 PLIST_SUB+=	RM_I386=""
 .endif
 
-.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
-USE_GCC=	yes
-.endif
-
 .include <bsd.port.post.mk>

comms/gqrx/Makefile

@@ -1,7 +1,7 @@
 # Created by: Ganael Laplanche <ganael.laplanche@martymac.org>
 
 PORTNAME=	gqrx
-PORTVERSION=	2.15.8
+PORTVERSION=	2.15.9
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	comms hamradio

comms/gqrx/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1643922945
+TIMESTAMP = 1650730345
-SHA256 (gqrx-sdr-gqrx-v2.15.8_GH0.tar.gz) = 72184e48a87b70dbfa55b67944c601a26a001db01f7f62b373b349cb73c1d0bd
+SHA256 (gqrx-sdr-gqrx-v2.15.9_GH0.tar.gz) = 4a826b468b2fb38a59cbe1f1b566e62c3114509186a7a25ba27dc92833f3eb44
-SIZE (gqrx-sdr-gqrx-v2.15.8_GH0.tar.gz) = 3608013
+SIZE (gqrx-sdr-gqrx-v2.15.9_GH0.tar.gz) = 3608134

comms/uird/Makefile

@@ -6,7 +6,7 @@ CATEGORIES=	comms
 MASTER_SITES=	http://kbinstuff.googlepages.com/ \
 		http://redundancy.redundancy.org/mirror/
 
-MAINTAINER=	lx@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Universal IR Receiver Daemon
 
 USES=		perl5 gmake tar:tgz

converters/yj/Makefile

@@ -1,7 +1,6 @@
 PORTNAME=	yj
-PORTVERSION=	5.0.0
+PORTVERSION=	5.1.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	converters
 DIST_SUBDIR=	yj
 
@@ -13,15 +12,13 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 USE_GITHUB=	yes
-
 GH_ACCOUNT=	sclevine
+GH_TUPLE=	BurntSushi:toml:v1.1.0:burntsushi_toml/vendor/github.com/BurntSushi/toml \
+		hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \
+		go-yaml:yaml:496545a:go_yaml_yaml/vendor/gopkg.in/yaml.v3
 
 CONFLICTS_INSTALL=	yj-bruceadams
 
 PLIST_FILES=	bin/yj
 
-GH_TUPLE=	go-yaml:yaml:eeeca48fe776:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \
-		hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \
-		sclevine:go-toml:ed50a274ac56:sclevine_go_toml/vendor/github.com/pelletier/go-toml
-
 .include <bsd.port.mk>

converters/yj/distinfo

@@ -1,9 +1,9 @@
-TIMESTAMP = 1601900820
+TIMESTAMP = 1650723194
-SHA256 (yj/sclevine-yj-v5.0.0_GH0.tar.gz) = df9a4f5b6d067842ea3da68ff92c374b98560dce1086337d39963a1346120574
+SHA256 (yj/sclevine-yj-v5.1.0_GH0.tar.gz) = 9a3e9895181d1cbd436a1b02ccf47579afacd181c73f341e697a8fe74f74f99d
-SIZE (yj/sclevine-yj-v5.0.0_GH0.tar.gz) = 17668
+SIZE (yj/sclevine-yj-v5.1.0_GH0.tar.gz) = 18149
-SHA256 (yj/go-yaml-yaml-eeeca48fe776_GH0.tar.gz) = 77e421545f853bf0b0431ed5026f10ebeeadd436334ac156169b78f82e86bdf5
+SHA256 (yj/BurntSushi-toml-v1.1.0_GH0.tar.gz) = 91d03c925082c1282636fe9f2c69fd6d54410ac56f2b6d7492ba56c00ada626d
-SIZE (yj/go-yaml-yaml-eeeca48fe776_GH0.tar.gz) = 88787
+SIZE (yj/BurntSushi-toml-v1.1.0_GH0.tar.gz) = 91871
 SHA256 (yj/hashicorp-hcl-v1.0.0_GH0.tar.gz) = 50632428210503070fd2fde748c88b7414bf84a6a0eadebf9d8e596a033bead2
 SIZE (yj/hashicorp-hcl-v1.0.0_GH0.tar.gz) = 70658
-SHA256 (yj/sclevine-go-toml-ed50a274ac56_GH0.tar.gz) = 8318e8c5008e0c65129a77c7a9a108c5400dbdc584404bbecc0395ed06822c5f
+SHA256 (yj/go-yaml-yaml-496545a_GH0.tar.gz) = 98554ce519149ce86d039d56ebb013f0a52b7bca608a1c7e70fcd69d964064d6
-SIZE (yj/sclevine-go-toml-ed50a274ac56_GH0.tar.gz) = 98507
+SIZE (yj/go-yaml-yaml-496545a_GH0.tar.gz) = 90131

converters/yj/files/patch-toml_encoder.go

@@ -1,11 +0,0 @@
---- toml/encoder.go.orig	2020-07-25 19:25:50 UTC
-+++ toml/encoder.go
-@@ -15,7 +15,7 @@ type Encoder struct {
- 	NaN, PosInf, NegInf interface{}
- }
- 
--func (e *Encoder) Encode(normal interface{}) (yaml interface{}, err error) {
-+func (e *Encoder) Encode(normal interface{}) (toml interface{}, err error) {
- 	defer catchFailure(&err)
- 	et := encodeTracker{Encoder: e}
- 	return et.denormalize(normal), nil

databases/evolution-data-server/Makefile

@@ -1,8 +1,7 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 
 PORTNAME=	evolution-data-server
-DISTVERSION=	3.44.0
+DISTVERSION=	3.44.1
-PORTREVISION=	2
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome

databases/evolution-data-server/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1648572456
+TIMESTAMP = 1650647078
-SHA256 (gnome/evolution-data-server-3.44.0.tar.xz) = 0d8881b5c51e1b91761b1945db264a46aabf54a73eea1ca8f448b207815d582e
+SHA256 (gnome/evolution-data-server-3.44.1.tar.xz) = 6e05a90204a276f99d932097f1032cc17dd1d8e265c7c56727c63240fd4c0ccf
-SIZE (gnome/evolution-data-server-3.44.0.tar.xz) = 4782136
+SIZE (gnome/evolution-data-server-3.44.1.tar.xz) = 4782040

databases/mysql55-server/Makefile

@@ -13,7 +13,7 @@ COMMENT?=	Multithreaded SQL database (server)
 LICENSE=	GPLv2
 
 SLAVEDIRS=	databases/mysql55-client
-USES=		cmake:insource,noninja cpe readline shebangfix
+USES=		cmake:insource,noninja compiler:c++11-lang cpe readline shebangfix
 CXXFLAGS+=	${CPPFLAGS}
 NO_OPTIONS_SORT=yes
 
@@ -51,14 +51,6 @@ SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
 
 .include <bsd.port.options.mk>
 
-.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2
-USES+=		compiler:gcc-c++11-lib
-USE_CXXSTD=	gnu++11
-.else
-USES+=		compiler:c++11-lang
-USE_CXXSTD=	gnu++98
-.endif
-
 .if ${PORT_OPTIONS:MSSL}
 CMAKE_ARGS+=	-DWITH_SSL=bundled
 .endif

databases/mysql56-server/Makefile

@@ -15,8 +15,8 @@ LICENSE=	GPLv2
 BROKEN_armv6=	qemu: uncaught target signal 11 (Segmentation fault) - core dumped
 
 SLAVEDIRS=	databases/mysql56-client
-USES=		bison:build cmake:noninja cpe groff:run libedit localbase \
+USES=		bison:build cmake:noninja compiler:c++11-lib cpe groff:run \
-		perl5 shebangfix ssl
+		libedit localbase perl5 shebangfix ssl
 
 CPE_VENDOR=	oracle
 
@@ -135,16 +135,6 @@ FEDERATED_SUB_LIST+=		FEDER="--federated"
 FEDERATED_SUB_LIST_OFF+=	FEDER=""
 .endif
 
-.include <bsd.port.options.mk>
-
-.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2
-USES+=		compiler:gcc-c++11-lib
-USE_CXXSTD=	gnu++11
-.else
-USES+=		compiler:c++11-lib
-USE_CXXSTD=	c++11
-.endif
-
 .include <bsd.port.pre.mk>
 
 post-patch:

databases/puppetdb-terminus6/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	puppetdb-terminus
-PORTVERSION=	6.20.2
+PORTVERSION=	6.21.0
 CATEGORIES=	databases ruby
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	6

databases/puppetdb-terminus6/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1645241655
+TIMESTAMP = 1650667243
-SHA256 (puppetdb-6.20.2.tar.gz) = ebbb70bd629c6aa6375f03fa7fee380b28651668a770fb4d082b98712a237c04
+SHA256 (puppetdb-6.21.0.tar.gz) = add14d3ef781a15c857a7f6ea18b89b422457428fa65d1223ecfd05a2c1852fb
-SIZE (puppetdb-6.20.2.tar.gz) = 48359562
+SIZE (puppetdb-6.21.0.tar.gz) = 48757121

databases/puppetdb-terminus7/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	puppetdb-terminus
-PORTVERSION=	7.10.0
+PORTVERSION=	7.10.1
 CATEGORIES=	databases ruby
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	7

databases/puppetdb-terminus7/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1648009493
+TIMESTAMP = 1650667257
-SHA256 (puppetdb-7.10.0.tar.gz) = d29fcacc05a775415cdcaed4d667e5a9d9d44b1bd843cea459c054809a6b2f49
+SHA256 (puppetdb-7.10.1.tar.gz) = 48e08772549c97ff477e0b88b4a5f9eaca8ff2d65883f743dbe62bc002e01709
-SIZE (puppetdb-7.10.0.tar.gz) = 48764663
+SIZE (puppetdb-7.10.1.tar.gz) = 48769606

databases/puppetdb6/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	puppetdb
-PORTVERSION=	6.20.2
+PORTVERSION=	6.21.0
 CATEGORIES=	databases java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	6

databases/puppetdb6/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1645241635
+TIMESTAMP = 1650667141
-SHA256 (puppetdb-6.20.2.tar.gz) = ebbb70bd629c6aa6375f03fa7fee380b28651668a770fb4d082b98712a237c04
+SHA256 (puppetdb-6.21.0.tar.gz) = add14d3ef781a15c857a7f6ea18b89b422457428fa65d1223ecfd05a2c1852fb
-SIZE (puppetdb-6.20.2.tar.gz) = 48359562
+SIZE (puppetdb-6.21.0.tar.gz) = 48757121

databases/puppetdb7/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	puppetdb
-PORTVERSION=	7.10.0
+PORTVERSION=	7.10.1
 CATEGORIES=	databases java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	7

databases/puppetdb7/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1648009480
+TIMESTAMP = 1650667219
-SHA256 (puppetdb-7.10.0.tar.gz) = d29fcacc05a775415cdcaed4d667e5a9d9d44b1bd843cea459c054809a6b2f49
+SHA256 (puppetdb-7.10.1.tar.gz) = 48e08772549c97ff477e0b88b4a5f9eaca8ff2d65883f743dbe62bc002e01709
-SIZE (puppetdb-7.10.0.tar.gz) = 48764663
+SIZE (puppetdb-7.10.1.tar.gz) = 48769606

databases/py-alembic16/Makefile

@@ -27,6 +27,8 @@ CONFLICTS_INSTALL=	py*-alembic14
 
 NO_ARCH=	yes
 
+PORTSCOUT=	limit:^1\.6
+
 do-test:
 	@cd ${WRKSRC} && ${LOCALBASE}/bin/tox -e ${PY_FLAVOR}
 

databases/py-pg8000/Makefile

@@ -1,7 +1,7 @@
 # Created by: Wen Heping <wenheping@gmail.com>
 
 PORTNAME=	pg8000
-PORTVERSION=	1.24.2
+PORTVERSION=	1.26.1
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

databases/py-pg8000/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1650093019
+TIMESTAMP = 1650842876
-SHA256 (pg8000-1.24.2.tar.gz) = ab7fc048a56fcac4d9c247b22a8356e608dd9a03d4835f1c87fba2e4f26284a5
+SHA256 (pg8000-1.26.1.tar.gz) = ccd2b6fe190addd74c093a62be0730b9e99f3ea03aa0ef7ab95ed1b7ff69d257
-SIZE (pg8000-1.24.2.tar.gz) = 118893
+SIZE (pg8000-1.26.1.tar.gz) = 116994

databases/py-pypuppetdb/Makefile

@@ -1,6 +1,5 @@
 PORTNAME=	pypuppetdb
-PORTVERSION=	2.5.1
+PORTVERSION=	2.5.2
-DISTVERSIONPREFIX=	v
 CATEGORIES=	databases python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 

databases/py-pypuppetdb/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1638552254
+TIMESTAMP = 1650330810
-SHA256 (voxpupuli-pypuppetdb-v2.5.1_GH0.tar.gz) = 7db55ff499e6a8f6c87adea829958bb3d9a15142bf59c06b4a8bb5aacf803915
+SHA256 (voxpupuli-pypuppetdb-2.5.2_GH0.tar.gz) = f93885028aa272a348b1b104d20c0cb29ba0d75fa830eb0301c12a27ade05ef2
-SIZE (voxpupuli-pypuppetdb-v2.5.1_GH0.tar.gz) = 53638
+SIZE (voxpupuli-pypuppetdb-2.5.2_GH0.tar.gz) = 54732

databases/rocksdb-lite/Makefile

@@ -2,7 +2,7 @@
 
 PORTREVISION=	0
 
-MAINTAINER=	lx@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Persistent key-value store for fast storage environments (lite version)
 
 LITE=		yes

deskutils/ausweisapp2/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	ausweisapp2
-DISTVERSION=	1.22.2
+DISTVERSION=	1.22.5
 CATEGORIES=	deskutils security
 
 MAINTAINER=	freebsd@sysctl.cz
@@ -19,8 +19,9 @@ USES=		cmake compiler:c++17-lang pkgconfig qmake qt:5 ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	Governikus
 GH_PROJECT=	AusweisApp2
-USE_QT=		concurrent core declarative gui network quickcontrols2 svg \
+USE_QT=		concurrent core declarative graphicaleffects gui network \
-		websockets widgets buildtools_build linguisttools_build
+		quickcontrols2 svg websockets widgets \
+		buildtools_build linguisttools_build
 
 # The VENDOR variable controls the name of the directory in ${PREFIX}/share.
 CMAKE_ARGS=	-DVENDOR=${PORTNAME}

deskutils/ausweisapp2/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1640361535
+TIMESTAMP = 1650884872
-SHA256 (Governikus-AusweisApp2-1.22.2_GH0.tar.gz) = 79d637a976dc1dc5445757a43324f4fe609d844bf90f11c0f62a46c39dc4fea6
+SHA256 (Governikus-AusweisApp2-1.22.5_GH0.tar.gz) = 09787d23663861673a3f7e604a5212ebc9575d149d6b5bd24519417de6d22ccf
-SIZE (Governikus-AusweisApp2-1.22.2_GH0.tar.gz) = 10886670
+SIZE (Governikus-AusweisApp2-1.22.5_GH0.tar.gz) = 11251263

deskutils/ausweisapp2/files/patch-cmake_Libraries.cmake

@@ -1,17 +1,17 @@
---- cmake/Libraries.cmake.orig	2021-12-24 17:02:28 UTC
+--- cmake/Libraries.cmake.orig	2022-04-25 13:11:06 +0200
 +++ cmake/Libraries.cmake
-@@ -122,11 +122,9 @@ elseif(MAC)
+@@ -124,11 +124,9 @@
- 	find_library(OSX_FOUNDATION Foundation)
- 	find_library(OSX_SERVICEMANAGEMENT ServiceManagement)
  elseif(UNIX)
+ 	find_package(PkgConfig REQUIRED)
+ 
 -	if(LINUX)
--		find_library(LIBUDEV NAMES udev ludev libudev)
+-		pkg_check_modules(UDEV IMPORTED_TARGET libudev)
--		if(NOT LIBUDEV)
+-		if(NOT TARGET PkgConfig::UDEV)
 -			message(STATUS "Hardware detection disabled - Missing libudev")
 -		endif()
-+	find_library(LIBUDEV NAMES udev ludev libudev)
++	pkg_check_modules(UDEV IMPORTED_TARGET libudev)
-+	if(NOT LIBUDEV)
++	if(NOT TARGET PkgConfig::UDEV)
 +		message(STATUS "Hardware detection disabled - Missing libudev")
  	endif()
  
- 	find_package(PkgConfig REQUIRED)
+ 	pkg_check_modules(PCSC REQUIRED libpcsclite)

deskutils/bitcollider/Makefile

@@ -9,6 +9,9 @@ MASTER_SITES=	SF/${PORTNAME}/Bitcollider/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Bitzi metadata generator
 
+DEPRECATED=	bitzi.com is no longer available, closed down in 2013
+EXPIRATION_DATE=2022-06-30
+
 GNU_CONFIGURE=	yes
 USES=		libtool
 INSTALL_TARGET=	install-strip

deskutils/calibre/Makefile

@@ -1,8 +1,7 @@
 # Created by: stas
 
 PORTNAME=	calibre
-PORTVERSION=	5.40.0
+PORTVERSION=	5.41.0
-PORTREVISION=	2
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/
 

deskutils/calibre/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1648800889
+TIMESTAMP = 1650612087
-SHA256 (calibre-5.40.0.tar.xz) = e0ec0e2352926f165f4b9cbe67666ea2bd181f7cb702e98487391168a099d794
+SHA256 (calibre-5.41.0.tar.xz) = 6343576c8febc87a91e81b222373d18423e07f427325b84a570e82909b7e52b8
-SIZE (calibre-5.40.0.tar.xz) = 38395684
+SIZE (calibre-5.41.0.tar.xz) = 38461752

deskutils/calibre/pkg-plist

@@ -930,6 +930,8 @@ lib/calibre/calibre/gui2/search_restriction_mixin.py
 lib/calibre/calibre/gui2/shortcuts.py
 lib/calibre/calibre/gui2/splash_screen.py
 lib/calibre/calibre/gui2/store/__init__.py
+lib/calibre/calibre/gui2/store/amazon_base.py
+lib/calibre/calibre/gui2/store/amazon_live.py
 lib/calibre/calibre/gui2/store/basic_config.py
 lib/calibre/calibre/gui2/store/basic_config_widget_ui.py
 lib/calibre/calibre/gui2/store/config/__init__.py
@@ -1184,6 +1186,7 @@ lib/calibre/calibre/ptempfile.py
 lib/calibre/calibre/rpdb.py
 lib/calibre/calibre/scraper/__init__.py
 lib/calibre/calibre/scraper/simple.py
+lib/calibre/calibre/scraper/simple_backend.py
 lib/calibre/calibre/spell/__init__.py
 lib/calibre/calibre/spell/break_iterator.py
 lib/calibre/calibre/spell/dictionary.py
@@ -1799,6 +1802,7 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/mozilla-ca-certs.pem
 %%DATADIR%%/pdf-mathjax-loader.js
 %%DATADIR%%/pdf-preprint.js
+%%DATADIR%%/pin-template.svg
 %%DATADIR%%/quick_start/deu.epub
 %%DATADIR%%/quick_start/eng.epub
 %%DATADIR%%/quick_start/fra.epub

devel/Makefile

@@ -4378,6 +4378,7 @@
     SUBDIR += py-cog
     SUBDIR += py-collective.monkeypatcher
     SUBDIR += py-colorama
+    SUBDIR += py-colored-traceback
     SUBDIR += py-coloredlogs
     SUBDIR += py-colorful
     SUBDIR += py-colorlog
@@ -6206,6 +6207,8 @@
     SUBDIR += rubygem-childprocess40
     SUBDIR += rubygem-chronic
     SUBDIR += rubygem-chronic_duration
+    SUBDIR += rubygem-claide
+    SUBDIR += rubygem-claide-plugins
     SUBDIR += rubygem-clamp
     SUBDIR += rubygem-clamp11
     SUBDIR += rubygem-classifier
@@ -6239,6 +6242,7 @@
     SUBDIR += rubygem-cookbook-omnifetch
     SUBDIR += rubygem-cool.io
     SUBDIR += rubygem-corefines
+    SUBDIR += rubygem-cork
     SUBDIR += rubygem-countries
     SUBDIR += rubygem-crack
     SUBDIR += rubygem-cri
@@ -6259,6 +6263,8 @@
     SUBDIR += rubygem-cyoi
     SUBDIR += rubygem-daemon_controller
     SUBDIR += rubygem-daemons
+    SUBDIR += rubygem-danger
+    SUBDIR += rubygem-danger-gitlab
     SUBDIR += rubygem-date
     SUBDIR += rubygem-ddmemoize
     SUBDIR += rubygem-ddmetrics
@@ -6408,7 +6414,9 @@
     SUBDIR += rubygem-git
     SUBDIR += rubygem-git-version-bump
     SUBDIR += rubygem-github_api
+    SUBDIR += rubygem-gitlab
     SUBDIR += rubygem-gitlab-chronic
+    SUBDIR += rubygem-gitlab-dangerfiles
     SUBDIR += rubygem-gitlab-experiment
     SUBDIR += rubygem-gitlab-labkit
     SUBDIR += rubygem-gitlab-license
@@ -6594,6 +6602,7 @@
     SUBDIR += rubygem-mutex_m
     SUBDIR += rubygem-mutter
     SUBDIR += rubygem-nakayoshi_fork
+    SUBDIR += rubygem-nap
     SUBDIR += rubygem-native-package-installer
     SUBDIR += rubygem-naught
     SUBDIR += rubygem-necromancer

devel/R-cran-future/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	future
-PORTVERSION=	1.24.0
+PORTVERSION=	1.25.0
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 

devel/R-cran-future/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1645572476
+TIMESTAMP = 1650800677
-SHA256 (future_1.24.0.tar.gz) = 7b8b212ba0e9d6303bfc15c512e6cf9b5db3a7aa0b2462d2e15cdd84dd09b276
+SHA256 (future_1.25.0.tar.gz) = d6242ece0fb45f0bf492e8219eae790a448255540ee39ef930a2752fdc821847
-SIZE (future_1.24.0.tar.gz) = 354681
+SIZE (future_1.25.0.tar.gz) = 359794

devel/R-cran-parallelly/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	parallelly
-PORTVERSION=	1.31.0
+PORTVERSION=	1.31.1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 

devel/R-cran-parallelly/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1649425645
+TIMESTAMP = 1650727791
-SHA256 (parallelly_1.31.0.tar.gz) = bdb79fa3edbc9bf2bbde4b888cf9368abbd4bd1df3fb16f2ed4b5e6afbeb5c4e
+SHA256 (parallelly_1.31.1.tar.gz) = 40c7fc3d842fa928448e574091a521bead2367bf97545c744ca78ea9af3117da
-SIZE (parallelly_1.31.0.tar.gz) = 120943
+SIZE (parallelly_1.31.1.tar.gz) = 121211

devel/atlas-devel/Makefile

@@ -19,7 +19,6 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_ARGS=	docdir=${DOCSDIR}
 
-CXXFLAGS_powerpc64=	-Wno-error=deprecated
 CXXFLAGS_powerpc=	-Wno-error=deprecated
 CXXFLAGS_powerpcspe=	-Wno-error=deprecated
 CXXFLAGS_mips=		-Wno-error=deprecated

devel/bsddialog/Makefile

@@ -1,5 +1,5 @@
 PORTNAME=	bsddialog
-PORTVERSION=	0.0.0.g20211213
+PORTVERSION=	0.2
 CATEGORIES=	devel
 
 MAINTAINER=	bapt@FreeBSD.org
@@ -9,7 +9,20 @@ LICENSE=	BSD2CLAUSE
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	alfix
-GL_COMMIT=	98afee468ccd515c9082dc668f80092ca4553825
+GL_COMMIT=	c4b7fed3cd5ce3b6a5aa77ff194e0a86f830bf4c
+
+LIBDIR=	${WRKSRC}/lib
+HEADERS=	${LIBDIR}/bsddialog.h \
+		${LIBDIR}/bsddialog_progressview.h \
+		${LIBDIR}/bsddialog_theme.h
+
+do-install:
+	${INSTALL_DATA} ${HEADERS} ${STAGEDIR}${PREFIX}/include
+	${INSTALL_LIB} ${LIBDIR}/lib${PORTNAME}.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/
+	${INSTALL} -l rs ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
+	${INSTALL_DATA} ${LIBDIR}/lib${PORTNAME}.a ${STAGEDIR}/${PREFIX}/lib
+	${INSTALL_MAN} ${LIBDIR}/${PORTNAME}.3 ${STAGEDIR}${MAN3PREFIX}/man/man3/
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
 
 .include <bsd.port.mk>
-

devel/bsddialog/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1642434705
+TIMESTAMP = 1649359564
-SHA256 (alfix-bsddialog-98afee468ccd515c9082dc668f80092ca4553825_GL0.tar.gz) = 9e1e64137b9c93e1c305e8a9f17e5fc16984fe797a0c90b036a3bbbdf4583b67
+SHA256 (alfix-bsddialog-c4b7fed3cd5ce3b6a5aa77ff194e0a86f830bf4c_GL0.tar.gz) = af5fd0a4cca5f109e6bdcc0d7a6ac73e4f959c50056e6f331c52899036cc2bc7
-SIZE (alfix-bsddialog-98afee468ccd515c9082dc668f80092ca4553825_GL0.tar.gz) = 51722
+SIZE (alfix-bsddialog-c4b7fed3cd5ce3b6a5aa77ff194e0a86f830bf4c_GL0.tar.gz) = 60929

devel/bsddialog/files/patch-Makefile

@@ -1,37 +1,11 @@
---- Makefile.orig	2021-11-22 01:09:04 UTC
+--- Makefile.orig	2022-04-07 21:39:48 UTC
 +++ Makefile
-@@ -7,15 +7,15 @@ OUTPUT=  bsddialog
+@@ -15,7 +15,7 @@ CFLAGS+= -I${LIBPATH} -std=gnu99 -Wall -Wextra -Werror
- SOURCES= bsddialog.c
+ CFLAGS= -g -Wall -I${LIBPATH}
- OBJECTS= ${SOURCES:.c=.o}
+ LIBDEBUG= -DDEBUG
- LIBPATH= ${.CURDIR}/lib
+ .endif
--LIBBSDDIALOG= ${LIBPATH}/libbsddialog.so
+-LDFLAGS+= -Wl,-rpath=${LIBPATH} -L${LIBPATH} -lbsddialog
-+LIBBSDDIALOG= ${LIBPATH}/libbsddialog.a
- 
--CFLAGS= -Wall -I${LIBPATH}
--LDFLAGS= -Wl,-rpath=${LIBPATH} -L${LIBPATH} -lbsddialog
-+CFLAGS+= -Wall -I${LIBPATH}
 +LDFLAGS+= -L${LIBPATH} -lbsddialog
  
--BINDIR= /usr/local/bin
+ BINDIR= /usr/local/bin
-+BINDIR= ${PREFIX}/bin
  MAN= ${OUTPUT}.1
- GZIP= gzip -cn
--MANDIR= /usr/local/share/man/man1
-+MANDIR= ${PREFIX}/share/man/man1
- 
- INSTALL= install
- RM= rm -f
-@@ -36,9 +36,10 @@ ${LIBBSDDIALOG}:
- 	${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
- 
- install:
--	${INSTALL} -s -m 555 ${OUTPUT} ${BINDIR}
--	${GZIP} ${MAN} > ${MAN}.gz
--	${INSTALL} -m 444 ${MAN}.gz ${MANDIR}
-+	${INSTALL} -s -m 555 ${OUTPUT} ${DESTDIR}${BINDIR}
-+	${MAKE} -C ${LIBPATH} install
-+	#${GZIP} ${MAN} > ${MAN}.gz
-+	#${INSTALL} -m 444 ${MAN}.gz ${DESTDIR}${MANDIR}
- 
- unistall:
- 	${RM} ${BINDIR}/${OUTPUT}

devel/bsddialog/files/patch-lib_Makefile

@@ -1,60 +0,0 @@
---- lib/Makefile.orig	2021-11-22 01:09:04 UTC
-+++ lib/Makefile
-@@ -6,6 +6,7 @@
- VERSION = 0.1
- LIBRARY = bsddialog
- LIBRARY_SO = lib${LIBRARY:=.so}
-+LIBRARY_A = lib${LIBRARY:=.a}
- HEADERS = bsddialog.h bsddialog_theme.h
- SOURCES = barbox.c editorbox.c formbox.c lib_util.c menubox.c textbox.c \
- 	timebox.c commandbox.c filebox.c infobox.c libbsddialog.c messagebox.c \
-@@ -13,8 +14,8 @@ SOURCES = barbox.c editorbox.c formbox.c lib_util.c me
- OBJECTS= ${SOURCES:.c=.o}
- FBSDFLAGS= -O2 -pipe -std=gnu99 -Wno-format-zero-length \
- 	-fstack-protector-strong -Qunused-arguments
--CFLAGS = -I/usr/local/include -fPIC -Wall -Wextra ${FBSDFLAGS}
--LDFLAGS = -fstack-protector-strong -shared -Wl,-x -Wl,--fatal-warnings \
-+CFLAGS += -fPIC -Wall -Wextra ${FBSDFLAGS}
-+LDFLAGS += -fstack-protector-strong -shared -Wl,-x -Wl,--fatal-warnings \
- 	-Wl,--warn-shared-textrel -Wl,-soname,${LIBRARY_SO}.${VERSION} 
- 
- INSTALL_PREFIX=/usr/local
-@@ -43,11 +44,18 @@ RM= rm -f
- #all : man ${LIBRARY}
- all : ${LIBRARY}
- 
--${LIBRARY}: ${OBJECTS}
-+${LIBRARY}: ${LIBRARY_SO} ${LIBRARY_A}
-+
-+${LIBRARY_SO}.${VERSION}: ${OBJECTS}
- 	${CC} ${LDFLAGS} ${.ALLSRC} -o ${LIBRARY_SO}.${VERSION}
--	# LN for devel
-+
-+${LIBRARY_SO}: ${LIBRARY_SO}.${VERSION}
- 	${LN} ${LIBRARY_SO}.${VERSION} ${LIBRARY_SO}
- 
-+${LIBRARY_A}: ${OBJECTS}
-+	${AR} cr ${.TARGET} ${OBJECTS}
-+	${RANLIB} ${.TARGET}
-+
- .c.o:
- 	${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
- 
-@@ -59,11 +67,12 @@ clean:
- 
- 
- install:
--	${CP} ${LIBRARY}.h ${INSTALL_PREFIX}/include
--	${CP} ${LIBRARY_SO}.${VERSION} ${INSTALL_PREFIX}/lib/
--	${LN} ${INSTALL_PREFIX}/lib/${LIBRARY_SO}.${VERSION} ${INSTALL_PREFIX}/lib/${LIBRARY_SO}
--	${LDCONFIG} ${INSTALL_PREFIX}/lib
--	${CP} ${LIBRARY}.3.gz ${INSTALL_PREFIX}/man/man3/
-+	${INSTALL} -m 644 ${HEADERS} ${DESTDIR}${INSTALL_PREFIX}/include
-+	${INSTALL} -m 644 -s ${LIBRARY_SO}.${VERSION} ${DESTDIR}${INSTALL_PREFIX}/lib/
-+	${INSTALL} -l rs ${DESTDIR}${INSTALL_PREFIX}/lib/${LIBRARY_SO}.${VERSION} ${DESTDIR}${INSTALL_PREFIX}/lib/${LIBRARY_SO}
-+	${INSTALL} -m 644 ${LIBRARY_A} ${DESTDIR}/${INSTALL_PREFIX}/lib
-+	#${LDCONFIG} ${INSTALL_PREFIX}/lib
-+	#${CP} ${LIBRARY}.3.gz ${INSTALL_PREFIX}/man/man3/
- 
- unistall:
- 	${RM} ${INSTALL_PREFIX}/include/${LIBRARY}.h

devel/bsddialog/pkg-plist

@@ -1,6 +1,9 @@
 bin/bsddialog
 include/bsddialog.h
+include/bsddialog_progressview.h
 include/bsddialog_theme.h
 lib/libbsddialog.a
 lib/libbsddialog.so
-lib/libbsddialog.so.0.0.1
+lib/libbsddialog.so.0.2
+man/man1/bsddialog.1.gz
+man/man3/bsddialog.3.gz

devel/etl/Makefile

@@ -5,7 +5,7 @@ PORTVERSION=	1.4.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel lang
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Voria Extended Class and Template Library
 
 LICENSE=	GPLv2+

devel/flatbuffers/Makefile

@@ -3,6 +3,7 @@
 PORTNAME=	flatbuffers
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.5
+PORTEPOCH=	1
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org

devel/gitaly/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	gitaly
-DISTVERSION=	14.9.3
+DISTVERSION=	14.10.0
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -19,7 +19,7 @@ MY_DEPENDS=	git>=2.35.1:devel/git \
 		rubygem-rugged>=1.2<2:devel/rubygem-rugged \
 		rubygem-github-linguist>=7.12.1<8:textproc/rubygem-github-linguist \
 		rubygem-gitlab-markup>=1.8.0<1.9.0:textproc/rubygem-gitlab-markup \
-		rubygem-activesupport61>=6.1.4.6<6.1.5:devel/rubygem-activesupport61 \
+		rubygem-activesupport61>=6.1.4.7<6.1.5:devel/rubygem-activesupport61 \
 		rubygem-rdoc>=6.3.2<7.0:devel/rubygem-rdoc \
 		rubygem-gitlab-gollum-lib>=4.2.7.10.gitlab.2<4.2.8:www/rubygem-gitlab-gollum-lib \
 		rubygem-gitlab-gollum-rugged_adapter>=0.4.4.4.gitlab.1<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \
@@ -49,7 +49,7 @@ MAKE_ENV+=	${GO_ENV}
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
-GL_COMMIT=	b17cdf96c4a7ec7a81b44fd5ffdb964c596d7fcd
+GL_COMMIT=	1478932866d068186c3a8af85fa11e5a97f5558e
 
 # for go dependencies
 USE_GITHUB=	nodefault
@@ -115,7 +115,7 @@ GH_TUPLE=	\
 		golang:sync:036812b2e83c:golang_sync/vendor/golang.org/x/sync \
 		golang:sys:4dd72447c267:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.6:golang_text/vendor/golang.org/x/text \
-		golang:time:f8bda1e9f3ba:golang_time/vendor/golang.org/x/time \
+		golang:time:0e9765cccd65:golang_time/vendor/golang.org/x/time \
 		golang:tools:v0.1.0:golang_tools/vendor/golang.org/x/tools \
 		golang:xerrors:5ec99f83aff1:golang_xerrors/vendor/golang.org/x/xerrors \
 		google:go-cloud:v0.23.0:google_go_cloud/vendor/gocloud.dev \

devel/gitaly/distinfo

@@ -1,4 +1,4 @@
-TIMESTAMP = 1649991821
+TIMESTAMP = 1650541273
 SHA256 (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 99bd58f4a07dd02d9615e3638b3bb6dbfad80ef678ccdb8e17e3fa2b0fef343e
 SIZE (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 17102
 SHA256 (Azure-azure-storage-blob-go-v0.13.0_GH0.tar.gz) = 6bf7145210331efa3f0417f6684cf764c22743cf23122048ec136600daebf443
@@ -117,8 +117,8 @@ SHA256 (golang-sys-4dd72447c267_GH0.tar.gz) = 046e3dfe88c8788c03df268704fe3477de
 SIZE (golang-sys-4dd72447c267_GH0.tar.gz) = 1222385
 SHA256 (golang-text-v0.3.6_GH0.tar.gz) = f66bebcf21985b0a713d67c6c35dfc9800d3b6d00d62b83ed0ce5b2ed4cb9760
 SIZE (golang-text-v0.3.6_GH0.tar.gz) = 8351095
-SHA256 (golang-time-f8bda1e9f3ba_GH0.tar.gz) = e068a34e54894c9c189ba2c2e5b7ea9116ed661f6a7c0d0e744d8e0066017ebb
+SHA256 (golang-time-0e9765cccd65_GH0.tar.gz) = ef4874b5cdfc2d21bb17e38c9a691e9e66c924cea852c8999fea7b08a649aab7
-SIZE (golang-time-f8bda1e9f3ba_GH0.tar.gz) = 9656
+SIZE (golang-time-0e9765cccd65_GH0.tar.gz) = 10226
 SHA256 (golang-tools-v0.1.0_GH0.tar.gz) = 88f66c1a7ff0f7fce20c0808d2769baa977f56f74197c9681cd864d0977e97a2
 SIZE (golang-tools-v0.1.0_GH0.tar.gz) = 2683055
 SHA256 (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 71975d658357e170fd6a41f92539cde8b39c9cd8bfe5931b6311bc5f5c0da0d7
@@ -281,8 +281,8 @@ SHA256 (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 7ce80a93d0fdbeb6760f97d6d166d11c215
 SIZE (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 8421
 SHA256 (gonum-gonum-v0.8.2_GH0.tar.gz) = a2aad1ac038d36d568939910f39eb0c58cae3c6f0b18df3ca74a8daa954d1663
 SIZE (gonum-gonum-v0.8.2_GH0.tar.gz) = 3226037
-SHA256 (gitlab-org-gitaly-b17cdf96c4a7ec7a81b44fd5ffdb964c596d7fcd_GL0.tar.gz) = e494a0019aaba164863f086a1896611dcf3a3603b270121d7c55b5bd9a7fe731
+SHA256 (gitlab-org-gitaly-1478932866d068186c3a8af85fa11e5a97f5558e_GL0.tar.gz) = 3d00f3ad8471908b0088aedd73d46dd17b19029e6fd40a10a71b6db1bb17f96a
-SIZE (gitlab-org-gitaly-b17cdf96c4a7ec7a81b44fd5ffdb964c596d7fcd_GL0.tar.gz) = 3850512
+SIZE (gitlab-org-gitaly-1478932866d068186c3a8af85fa11e5a97f5558e_GL0.tar.gz) = 3880674
 SHA256 (gitlab-org-gitlab-shell-50da611814d256c77e689977265ec7e07633a4dc_GL0.tar.gz) = a00e10d3dbe50e7c70b75c5fcf7d42a039a24c13b0b751a0339bb18261ac50af
 SIZE (gitlab-org-gitlab-shell-50da611814d256c77e689977265ec7e07633a4dc_GL0.tar.gz) = 124516
 SHA256 (gitlab-org-labkit-397363e2404ac0276b1959373a1c1c2bc1610d67_GL0.tar.gz) = e48dae8ea183f946189a9ac7e4cbe4bc0fa583e6baafb0074a3463a879565ecb

devel/gitaly/files/patch-Makefile

@@ -1,24 +1,24 @@
---- Makefile.orig	2022-03-21 09:11:43 UTC
+--- Makefile.orig	2022-04-21 05:54:57 UTC
 +++ Makefile
-@@ -314,7 +314,7 @@ help:
+@@ -271,7 +271,7 @@ build: ${SOURCE_DIR}/.ruby-bundle ${GITALY_EXECUTABLES
+ gitaly:            GO_BUILD_TAGS = ${SERVER_BUILD_TAGS}
+ praefect:          GO_BUILD_TAGS = ${SERVER_BUILD_TAGS}
+ gitaly-git2go-v14: GO_BUILD_TAGS = ${GIT2GO_BUILD_TAGS}
+-gitaly-git2go-v14: libgit2
++#gitaly-git2go-v14: libgit2
  
- .PHONY: build
+ .PHONY: ${GITALY_EXECUTABLES}
- ## Build Go binaries and install required Ruby Gems.
+ ${GITALY_EXECUTABLES}:
--build: ${SOURCE_DIR}/.ruby-bundle libgit2
+@@ -283,7 +283,7 @@ ${GITALY_EXECUTABLES}:
-+build: ${SOURCE_DIR}/.ruby-bundle
- 	@ # We used to install Gitaly binaries into the source directory by default when executing
- 	@ # "make" or "make all", which has been changed in v14.5 to only build binaries into
- 	@ # `_build/bin`. In order to quickly fail in case any source install still refers to these
-@@ -345,7 +345,7 @@ $(call find_commands):
  	@ # This fallback is unique but non-deterministic, making it sufficient to avoid generating the
  	@ # GNU build-id from the empty string and causing guaranteed collisions.
- 	GO_BUILD_ID=$$( go tool buildid $(addprefix ${BUILD_DIR}/bin/, $@) || openssl rand -hex 32 ) && \
+ 	${Q}GO_BUILD_ID=$$( go tool buildid $(addprefix ${BUILD_DIR}/bin/, $@) || openssl rand -hex 32 ) && \
 -	GNU_BUILD_ID=$$( echo $$GO_BUILD_ID | sha1sum | cut -d' ' -f1 ) && \
 +	GNU_BUILD_ID=$$( echo $$GO_BUILD_ID | sha1 | cut -d' ' -f1 ) && \
  	go install -ldflags '${GO_LDFLAGS}'" -B 0x$$GNU_BUILD_ID" -tags "${GO_BUILD_TAGS}" $(addprefix ${GITALY_PACKAGE}/cmd/, $@)
- endif
  
-@@ -559,7 +559,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
+ .PHONY: install
+@@ -482,7 +482,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
  # step. Both Omnibus and CNG assume it is in the Gitaly root, not in
  # _build. Hence the '../' in front.
  ${SOURCE_DIR}/.ruby-bundle: ${GITALY_RUBY_DIR}/Gemfile.lock ${GITALY_RUBY_DIR}/Gemfile

devel/gitaly/files/patch-ruby_Gemfile

@@ -1,4 +1,4 @@
---- ruby/Gemfile.orig	2022-02-21 12:41:47 UTC
+--- ruby/Gemfile.orig	2022-04-20 09:55:22 UTC
 +++ ruby/Gemfile
 @@ -2,7 +2,7 @@ source 'https://rubygems.org'
  
@@ -6,7 +6,7 @@
  gem 'github-linguist', '~> 7.12', require: 'linguist'
 -gem 'gitlab-markup', '~> 1.7.1'
 +gem 'gitlab-markup', '~> 1.8.0'
- gem 'activesupport', '~> 6.1.4.6'
+ gem 'activesupport', '~> 6.1.4.7'
  gem 'rdoc', '~> 6.0'
  gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.2', require: false
 @@ -13,29 +13,10 @@ gem 'faraday', '~> 1.0'