diff --git a/build/jam/repositories/HaikuPorts/x86_64 b/build/jam/repositories/HaikuPorts/x86_64
index 9c5511ddc2..284b064478 100644
--- a/build/jam/repositories/HaikuPorts/x86_64
+++ b/build/jam/repositories/HaikuPorts/x86_64
@@ -6,7 +6,7 @@ RemotePackageRepository HaikuPorts
 	be_book-2008_10_26-3
 	ca_root_certificates-2021_01_19-1
 	gnu_efi_kernel-3.0.10-1
-	haikuporter-1.2.3-2
+	haikuporter-1.2.4-1
 	noto-20200106-1
 	noto_sans_cjk_jp-1.004-2
 	timgmsoundfont-fixed-5
@@ -27,20 +27,20 @@ RemotePackageRepository HaikuPorts
 	cdrtools_devel-3.02~a09-1
 	coreutils-8.29-2
 	ctags-5.8-5
-	curl-7.74.0-1
-	curl_devel-7.74.0-1
+	curl-7.76.1-1
+	curl_devel-7.76.1-1
 	dav1d-0.8.2-1
 	dav1d_devel-0.8.2-1
 	diffutils-3.7-1
 	enca-1.19-2
 	enca_devel-1.19-2
-	expat-2.2.10-1
-	expat_devel-2.2.10-1
-	fdk_aac-2.0.1-1
+	expat-2.4.1-1
+	expat_devel-2.4.1-1
+	fdk_aac-2.0.2-1
 	ffmpeg-4.2.2-9
 	ffmpeg_devel-4.2.2-9
-	file-5.39-2
-	file_data-5.39-2
+	file-5.40-1
+	file_data-5.40-1
 	findutils-4.8.0-1
 	flex-2.6.4-2
 	fluidlite-1.0.0-3
@@ -55,9 +55,9 @@ RemotePackageRepository HaikuPorts
 	game_music_emu_devel-0.6.3-1
 	gettext-0.19.8.1-7
 	gettext_libintl-0.19.8.1-7
-	gcc-8.3.0_2019_05_24-9
-	gcc_syslibs-8.3.0_2019_05_24-9
-	gcc_syslibs_devel-8.3.0_2019_05_24-9
+	gcc-8.3.0_2019_05_24-10
+	gcc_syslibs-8.3.0_2019_05_24-10
+	gcc_syslibs_devel-8.3.0_2019_05_24-10
 	giflib-5.2.1-1
 	giflib_devel-5.2.1-1
 	git-2.30.2-2
@@ -73,8 +73,8 @@ RemotePackageRepository HaikuPorts
 	graphite2_devel-1.3.14-1
 	grep-3.6-2
 	groff-1.22.4-1
-	gutenprint8-5.3.1-1
-	gutenprint8_devel-5.3.1-1
+	gutenprint8-5.3.1-2
+	gutenprint8_devel-5.3.1-2
 	gzip-1.10-1
 	haikuwebkit-1.7.1-1
 	haikuwebkit_devel-1.7.1-1
@@ -88,17 +88,17 @@ RemotePackageRepository HaikuPorts
 	keymapswitcher-1.2.7.15-1
 	lame-3.100-3
 	lame_devel-3.100-3
-	lcms-2.9-6
-	lcms_devel-2.9-6
-	less-551-1
-	libass-0.15.0-2
-	libass_devel-0.15.0-2
-	libbluray-1.2.1-1
-	libbluray_devel-1.2.1-1
-	libdvdnav-6.0.1-3
-	libdvdnav_devel-6.0.1-3
-	libdvdread-6.1.1-1
-	libdvdread_devel-6.1.1-1
+	lcms-2.12-1
+	lcms_devel-2.12-1
+	less-581.2-1
+	libass-0.15.1-1
+	libass_devel-0.15.1-1
+	libbluray-1.3.0-1
+	libbluray_devel-1.3.0-1
+	libdvdnav-6.1.1-1
+	libdvdnav_devel-6.1.1-1
+	libdvdread-6.1.2-1
+	libdvdread_devel-6.1.2-1
 	libedit-20210419_3.1-1
 	libedit_devel-20210419_3.1-1
 	libexecinfo-1.1-5
@@ -109,16 +109,16 @@ RemotePackageRepository HaikuPorts
 	libicns-0.8.1-8
 	libicns_devel-0.8.1-8
 	libidn2-2.0.5-2
-	libjpeg_turbo-2.0.6-1
-	libjpeg_turbo_devel-2.0.6-1
+	libjpeg_turbo-2.1.0-1
+	libjpeg_turbo_devel-2.1.0-1
 	libmodplug-0.8.9.0-1
-	libogg-1.3.4-1
-	libogg_devel-1.3.4-1
-	libopenmpt-0.5.5-1
-	libopenmpt_devel-0.5.5-1
+	libogg-1.3.5-1
+	libogg_devel-1.3.5-1
+	libopenmpt-0.5.9-1
+	libopenmpt_devel-0.5.9-1
 	libpcap-1.8.1-4
 	libpcap_devel-1.8.1-4
-	libpcre2-10.36-1
+	libpcre2-10.37-1
 	libpcre-8.44-1
 	libpcre_devel-8.44-1
 	libpng16-1.6.37-1
@@ -134,13 +134,13 @@ RemotePackageRepository HaikuPorts
 	libunistring-0.9.10-1
 	libvorbis-1.3.7-1
 	libvorbis_devel-1.3.7-1
-	libvpx-1.8.2-1
-	libvpx_devel-1.8.2-1
+	libvpx-1.10.0-1
+	libvpx_devel-1.10.0-1
 	libuuid-1.3.1-4
 	libwebp-1.1.0-2
 	libwebp_devel-1.1.0-2
-	libxml2-2.9.10-4
-	libxml2_devel-2.9.10-4
+	libxml2-2.9.12-1
+	libxml2_devel-2.9.12-1
 	libxslt-1.1.34-3
 	live555-2016.06.22-5
 	live555_devel-2016.06.22-5
@@ -169,19 +169,19 @@ RemotePackageRepository HaikuPorts
 	openexr_devel-2.4.1-1
 	openjpeg-2.4.0-1
 	openjpeg_devel-2.4.0-1
-	openssh-8.4p1-2
+	openssh-8.6p1-1
 	openssl-1.1.1k-1
 	openssl_devel-1.1.1k-1
 	opus-1.3.1-1
 	opus_devel-1.3.1-1
 	p7zip-17.04-2
 	patch-2.7.6-2
-	pdflib-5.0.3-3
-	pdfwriter-1.0-3
+	pdflib-5.0.3-4
+	pdfwriter-1.0-4
 	pe-2.4.5-8
 	perl-5.32.1-1
 	pkgconfig-0.29.2-4
-	python3-3.7.10-1
+	python3-3.7.10-4
 	qrencode_kdl_devel-3.4.4-2
 	readline-8.1-1
 	sed-4.8-1
@@ -204,7 +204,7 @@ RemotePackageRepository HaikuPorts
 	tiff4_devel-4.2.0-1
 	tnftp-20151004-6
 	unzip-6.10c23-4
-	vision-0.10.4-1
+	vision-0.10.6-1
 	wavpack-5.4.0-1
 	wavpack_devel-5.4.0-1
 	wget-1.21.1-1
diff --git a/build/jam/repositories/HaikuPorts/x86_gcc2 b/build/jam/repositories/HaikuPorts/x86_gcc2
index 1695f2d83f..4ff0c2fee6 100644
--- a/build/jam/repositories/HaikuPorts/x86_gcc2
+++ b/build/jam/repositories/HaikuPorts/x86_gcc2
@@ -6,7 +6,7 @@ RemotePackageRepository HaikuPorts
 	be_book-2008_10_26-3
 	ca_root_certificates-2021_01_19-1
 	gnu_efi_kernel-3.0.10-1
-	haikuporter-1.2.3-2
+	haikuporter-1.2.4-1
 	noto-20200106-1
 	noto_sans_cjk_jp-1.004-2
 	timgmsoundfont-fixed-5
@@ -27,15 +27,15 @@ RemotePackageRepository HaikuPorts
 	cdrtools_devel-3.02~a09-1
 	ctags-5.8-5
 	coreutils-8.24-2
-	curl-7.74.0-1
-	curl_devel-7.74.0-1
+	curl-7.76.1-1
+	curl_devel-7.76.1-1
 	diffutils-3.7-1
-	expat-2.2.10-1
-	expat_devel-2.2.10-1
+	expat-2.4.1-1
+	expat_devel-2.4.1-1
 	ffmpeg-4.2.2-9
 	ffmpeg_devel-4.2.2-9
-	file-5.39-2
-	file_data-5.39-2
+	file-5.40-1
+	file_data-5.40-1
 	findutils-4.6.0-1
 	flex-2.6.4-2
 	fluidlite_devel-1.0.0-3
@@ -55,8 +55,8 @@ RemotePackageRepository HaikuPorts
 	glu-9.0.0-7
 	glu_devel-9.0.0-7
 	groff-1.20.1-4
-	gutenprint8-5.3.1-1
-	gutenprint8_devel-5.3.1-1
+	gutenprint8-5.3.1-2
+	gutenprint8_devel-5.3.1-2
 	gzip-1.10-1
 	icu-57.2-3
 	icu_devel-57.2-3
@@ -66,23 +66,23 @@ RemotePackageRepository HaikuPorts
 	keymapswitcher-1.2.7.15-1
 	lame-3.100-3
 	lame_devel-3.100-3
-	less-551-1
-	libedit-20180525_3.1-2
-	libedit_devel-20180525_3.1-2
+	less-581.2-1
+	libedit-20210419_3.1-1
+	libedit_devel-20210419_3.1-1
 	libffi-3.0.13-3
 	libiconv-1.16-1
 	libicns-0.8.1-8
 	libicns_devel-0.8.1-8
-	libjpeg_turbo-2.0.6-1
-	libjpeg_turbo_devel-2.0.6-1
+	libjpeg_turbo-2.1.0-1
+	libjpeg_turbo_devel-2.1.0-1
 	liblayout-1.4.1-8
 	libmodplug-0.8.9.0-1
-	libogg-1.3.4-1
-	libogg_devel-1.3.4-1
+	libogg-1.3.5-1
+	libogg_devel-1.3.5-1
 	libpcap-1.8.1-4
 	libpcap_devel-1.8.1-4
 	libpcre-8.44-1
-	libpcre2-10.36-1
+	libpcre2-10.37-1
 	libpng16-1.6.37-1
 	libpng16_devel-1.6.37-1
 	libpsl-0.21.0-1
@@ -98,8 +98,8 @@ RemotePackageRepository HaikuPorts
 	libvpx-1.0.0-2
 	libwebp-1.1.0-2
 	libwebp_devel-1.1.0-2
-	libxml2-2.9.10-4
-	libxml2_devel-2.9.10-4
+	libxml2-2.9.12-1
+	libxml2_devel-2.9.12-1
 	live555-2016.06.22-5
 	live555_devel-2016.06.22-5
 	m4-1.4.18-3
@@ -117,14 +117,14 @@ RemotePackageRepository HaikuPorts
 	openexr_devel-2.2.1-3
 	openjpeg-2.1.2-3
 	openjpeg_devel-2.1.2-3
-	openssh-8.4p1-1
+	openssh-8.6p1-1
 	openssl-1.1.1k-1
 	openssl_devel-1.1.1k-1
 	opus-1.3.1-1
 	opus_devel-1.3.1-1
 	patch-2.7.5-3
-	pdflib-5.0.3-3
-	pdfwriter-1.0-3
+	pdflib-5.0.3-4
+	pdfwriter-1.0-4
 	pe-2.4.5-8
 	perl-5.32.1-1
 	pkgconfig-0.29.2-4
@@ -143,7 +143,7 @@ RemotePackageRepository HaikuPorts
 	tiff4_devel-4.2.0-1
 	tnftp-20151004-6
 	unzip-6.10c23-4
-	vision-0.10.4-1
+	vision-0.10.6-1
 	wget-1.21.1-1
 	which-2.21-6
 	wonderbrush-2.1.2-11
@@ -158,15 +158,15 @@ RemotePackageRepository HaikuPorts
 	bzip2_x86_devel-1.0.8-1
 	cdrtools_x86-3.02~a09-1
 	cdrtools_x86_devel-3.02~a09-1
-	curl_x86-7.74.0-1
-	curl_x86_devel-7.74.0-1
+	curl_x86-7.76.1-1
+	curl_x86_devel-7.76.1-1
 	dav1d_x86-0.8.2-1
 	dav1d_x86_devel-0.8.2-1
 	enca_x86-1.19-2
 	enca_x86_devel-1.19-2
-	expat_x86-2.2.10-1
-	expat_x86_devel-2.2.10-1
-	fdk_aac_x86-2.0.1-1
+	expat_x86-2.4.1-1
+	expat_x86_devel-2.4.1-1
+	fdk_aac_x86-2.0.2-1
 	ffmpeg_x86-4.2.2-9
 	ffmpeg_x86_devel-4.2.2-9
 	fluidlite_x86_devel-1.0.0-3
@@ -178,9 +178,9 @@ RemotePackageRepository HaikuPorts
 	fribidi_x86_devel-1.0.10-1
 	game_music_emu_x86-0.6.3-1
 	game_music_emu_x86_devel-0.6.3-1
-	gcc_x86-8.3.0_2019_05_24-9
-	gcc_x86_syslibs-8.3.0_2019_05_24-9
-	gcc_x86_syslibs_devel-8.3.0_2019_05_24-9
+	gcc_x86-8.3.0_2019_05_24-10
+	gcc_x86_syslibs-8.3.0_2019_05_24-10
+	gcc_x86_syslibs_devel-8.3.0_2019_05_24-10
 	gettext_x86-0.19.8.1-7
 	gettext_x86_libintl-0.19.8.1-7
 	giflib_x86-5.2.1-1
@@ -193,20 +193,20 @@ RemotePackageRepository HaikuPorts
 	grep_x86-3.6-2
 	haikuwebkit_x86-1.7.1-1
 	haikuwebkit_x86_devel-1.7.1-1
-	harfbuzz_x86-2.7.4-3
-	harfbuzz_x86_devel-2.7.4-3
+	harfbuzz_x86-2.8.1-1
+	harfbuzz_x86_devel-2.8.1-1
 	icu66_x86-66.1-2
 	icu66_x86_devel-66.1-2
 	jasper_x86-2.0.16-4
 	jasper_x86_devel-2.0.16-4
 	lame_x86-3.100-3
 	lame_x86_devel-3.100-3
-	lcms_x86-2.9-6
-	lcms_x86_devel-2.9-6
-	libass_x86-0.15.0-2
-	libass_x86_devel-0.15.0-2
-	libedit_x86-20180525_3.1-2
-	libedit_x86_devel-20180525_3.1-2
+	lcms_x86-2.12-1
+	lcms_x86_devel-2.12-1
+	libass_x86-0.15.1-1
+	libass_x86_devel-0.15.1-1
+	libedit_x86-20210419_3.1-1
+	libedit_x86_devel-20210419_3.1-1
 	libexecinfo_x86-1.1-5
 	libffi_x86-3.2.1-6
 	libffi_x86_devel-3.2.1-6
@@ -217,13 +217,13 @@ RemotePackageRepository HaikuPorts
 	libicns_x86-0.8.1-8
 	libicns_x86_devel-0.8.1-8
 	libidn2_x86-2.0.5-2
-	libjpeg_turbo_x86-2.0.6-1
-	libjpeg_turbo_x86_devel-2.0.6-1
+	libjpeg_turbo_x86-2.1.0-1
+	libjpeg_turbo_x86_devel-2.1.0-1
 	libmodplug_x86-0.8.9.0-1
-	libogg_x86-1.3.4-1
-	libogg_x86_devel-1.3.4-1
-	libopenmpt_x86-0.5.5-1
-	libopenmpt_x86_devel-0.5.5-1
+	libogg_x86-1.3.5-1
+	libogg_x86_devel-1.3.5-1
+	libopenmpt_x86-0.5.9-1
+	libopenmpt_x86_devel-0.5.9-1
 	libpcre_x86-8.44-1
 	libpcre_x86_devel-8.44-1
 	libpng16_x86-1.6.37-1
@@ -238,12 +238,12 @@ RemotePackageRepository HaikuPorts
 	libunistring_x86-0.9.10-1
 	libvorbis_x86-1.3.7-1
 	libvorbis_x86_devel-1.3.7-1
-	libvpx_x86-1.8.2-1
-	libvpx_x86_devel-1.8.2-1
+	libvpx_x86-1.10.0-1
+	libvpx_x86_devel-1.10.0-1
 	libwebp_x86-1.1.0-2
 	libwebp_x86_devel-1.1.0-2
-	libxml2_x86-2.9.10-4
-	libxml2_x86_devel-2.9.10-4
+	libxml2_x86-2.9.12-1
+	libxml2_x86_devel-2.9.12-1
 	libxslt_x86-1.1.34-3
 	live555_x86-2016.06.22-5
 	live555_x86_devel-2016.06.22-5
@@ -251,7 +251,7 @@ RemotePackageRepository HaikuPorts
 	mesa_x86-17.1.10-6
 	mesa_x86_devel-17.1.10-6
 	mesa_x86_swpipe-17.1.10-6
-	nano_x86-5.5-1
+	nano_x86-5.7-1
 	nasm_x86-2.14.02-2
 	ncurses6_x86-6.2-1
 	ncurses6_x86_devel-6.2-1
@@ -269,7 +269,7 @@ RemotePackageRepository HaikuPorts
 	opus_x86_devel-1.3.1-1
 	p7zip_x86-17.04-2
 	pkgconfig_x86-0.29.2-4
-	python3_x86-3.7.10-1
+	python3_x86-3.7.10-4
 	readline_x86-8.1-1
 	sharutils_x86-4.15.2-3
 	snappy_x86-1.1.8-1