*/*: sync with upstream

Taken from: FreeBSD
2023-05-11 14:27:30 +02:00 · 2023-05-11 14:27:30 +02:00 · ed82f39438
parent bb948dd9f0
commit ed82f39438
225 changed files with 1990 additions and 1316 deletions
--- a/astro/R-cran-maptools/Makefile
+++ b/astro/R-cran-maptools/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	maptools
-DISTVERSION=	1.1-4
-PORTREVISION=	1
+DISTVERSION=	1.1-6
 CATEGORIES=	astro
 DISTNAME=	${PORTNAME}_${DISTVERSION}

@ -14,6 +13,6 @@ CRAN_DEPENDS=	R-cran-sp>=1.0.11:math/R-cran-sp
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}

-USES=	cran:auto-plist,compiles
+USES=		cran:auto-plist,compiles

 .include <bsd.port.mk>
--- a/astro/R-cran-maptools/distinfo
+++ b/astro/R-cran-maptools/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1650503315
-SHA256 (maptools_1.1-4.tar.gz) = f3ee25f9787d97c8373dac3651c6a198c932948eb3a6006b8618c91c6344fdc9
-SIZE (maptools_1.1-4.tar.gz) = 1643274
+TIMESTAMP = 1682398776
+SHA256 (maptools_1.1-6.tar.gz) = d6a5df52db03b2231f21921b693c67f85df3c3b376181aa13ef4f21710f69308
+SIZE (maptools_1.1-6.tar.gz) = 1575593
--- a/audio/py-pulsectl/Makefile
+++ b/audio/py-pulsectl/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	pulsectl
-DISTVERSION=	22.3.2
-PORTREVISION=	1
+DISTVERSION=	23.5.1
 CATEGORIES=	audio python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/audio/py-pulsectl/distinfo
+++ b/audio/py-pulsectl/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1653461506
-SHA256 (pulsectl-22.3.2.tar.gz) = cc174e1ceebd4e6222c5b78f4f415f12e80753c9ab75ab354159b4cb5950b084
-SIZE (pulsectl-22.3.2.tar.gz) = 40901
+TIMESTAMP = 1683791250
+SHA256 (pulsectl-23.5.1.tar.gz) = 8efc260ed7212ee4f9e50a8b856c84911265f4eac42cc6c02c7b37c851a2834b
+SIZE (pulsectl-23.5.1.tar.gz) = 41131
--- a/cad/cvc/Makefile
+++ b/cad/cvc/Makefile
@ -1,7 +1,6 @@
 PORTNAME=	cvc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.1.4
-PORTREVISION=	1
+DISTVERSION=	1.1.5
 CATEGORIES=	cad

 MAINTAINER=	yuri@FreeBSD.org
--- a/cad/cvc/distinfo
+++ b/cad/cvc/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1681885069
-SHA256 (d-m-bailey-cvc-v1.1.4_GH0.tar.gz) = 6bba53473f456d9bd89acc65770567258f86a2833dc5fa6d98566a49e1876307
-SIZE (d-m-bailey-cvc-v1.1.4_GH0.tar.gz) = 329582
+TIMESTAMP = 1683695318
+SHA256 (d-m-bailey-cvc-v1.1.5_GH0.tar.gz) = bc1a33bdfed68f5c0b85b58e43e15d6cbe9bf35cfc66fb2adb4b48e94891243d
+SIZE (d-m-bailey-cvc-v1.1.5_GH0.tar.gz) = 329571
--- a/cad/yosys/Makefile
+++ b/cad/yosys/Makefile
@ -1,7 +1,6 @@
 PORTNAME=	yosys
 DISTVERSIONPREFIX=	yosys-
-DISTVERSION=	0.28
-PORTREVISION=	1
+DISTVERSION=	0.29
 CATEGORIES=	cad

 MAINTAINER=	yuri@FreeBSD.org
--- a/cad/yosys/distinfo
+++ b/cad/yosys/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1681624634
-SHA256 (YosysHQ-yosys-yosys-0.28_GH0.tar.gz) = 36048ef3493ab43cfaac0bb89fa405715b22acd3927bf7fd3c4b25f8ad541c22
-SIZE (YosysHQ-yosys-yosys-0.28_GH0.tar.gz) = 2520436
+TIMESTAMP = 1683699968
+SHA256 (YosysHQ-yosys-yosys-0.29_GH0.tar.gz) = 475ba8cd06eec9050ebfd63a01e7a7c894d8f06c838b35459b7e29bbc89f4a22
+SIZE (YosysHQ-yosys-yosys-0.29_GH0.tar.gz) = 2524267
--- a/converters/R-cran-RJSONIO/Makefile
+++ b/converters/R-cran-RJSONIO/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	RJSONIO
-DISTVERSION=	1.3-1.6
-PORTREVISION=	1
+DISTVERSION=	1.3-1.8
 CATEGORIES=	converters
 DISTNAME=	${PORTNAME}_${DISTVERSION}

--- a/converters/R-cran-RJSONIO/distinfo
+++ b/converters/R-cran-RJSONIO/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1631914899
-SHA256 (RJSONIO_1.3-1.6.tar.gz) = 82d1c9ea7758b2a64ad683f9c46223dcba9aa8146b43c1115bf9aa76a657a09f
-SIZE (RJSONIO_1.3-1.6.tar.gz) = 1169961
+TIMESTAMP = 1682399742
+SHA256 (RJSONIO_1.3-1.8.tar.gz) = f6f0576d3c7852b16295dfc897feebca064fe5dd29cdce7592f94c56823553f5
+SIZE (RJSONIO_1.3-1.8.tar.gz) = 1170048
--- a/converters/R-cran-arabic2kansuji/Makefile
+++ b/converters/R-cran-arabic2kansuji/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	arabic2kansuji
-PORTVERSION=	0.1.2
-PORTREVISION=	1
+PORTVERSION=	0.1.3
 CATEGORIES=	converters
 DISTNAME=	${PORTNAME}_${PORTVERSION}

--- a/converters/R-cran-arabic2kansuji/distinfo
+++ b/converters/R-cran-arabic2kansuji/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1655857339
-SHA256 (arabic2kansuji_0.1.2.tar.gz) = 862bf4aab60d11c5da57b2c4508031e541e02fed13e1a71e94fc25a7b9a7f347
-SIZE (arabic2kansuji_0.1.2.tar.gz) = 5758
+TIMESTAMP = 1682399878
+SHA256 (arabic2kansuji_0.1.3.tar.gz) = b1ad5c668467e6d327424f4fb1e1d264e7106c59eeeedc09a17bd8c5e1510cb9
+SIZE (arabic2kansuji_0.1.3.tar.gz) = 6124
--- a/databases/R-cran-RMySQL/Makefile
+++ b/databases/R-cran-RMySQL/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	RMySQL
-DISTVERSION=	0.10.23
-PORTREVISION=	1
+DISTVERSION=	0.10.25
 CATEGORIES=	databases
 DISTNAME=	${PORTNAME}_${DISTVERSION}

--- a/databases/R-cran-RMySQL/distinfo
+++ b/databases/R-cran-RMySQL/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1639809642
-SHA256 (RMySQL_0.10.23.tar.gz) = f4ac7ed4fba83749819c07ce32d53ee024cf1cedebbda3b832644bff9edf4a15
-SIZE (RMySQL_0.10.23.tar.gz) = 53328
+TIMESTAMP = 1682400201
+SHA256 (RMySQL_0.10.25.tar.gz) = ed130f9bd80ea9fd5b4fdbb6fa094c35646354507de68eb3d19a3cbc8b5a4794
+SIZE (RMySQL_0.10.25.tar.gz) = 53316
--- a/databases/mongodb70/Makefile
+++ b/databases/mongodb70/Makefile
@ -1,6 +1,7 @@
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
 DISTVERSION=	7.0.0-rc0
+PORTREVISION=	1
 CATEGORIES=	databases net
 PKGNAMESUFFIX=	${DISTVERSION:R:S/.//}

@ -52,6 +53,7 @@ python_OLD_CMD=	@python_interpreter@
 MAKE_ARGS=	--cxx-std=20 \
 		--disable-warnings-as-errors \
 		--libc++ \
+		--allocator=system \
 		--runtime-hardening=on \
 		--use-system-libunwind \
 		--use-system-pcre2 \
@ -87,6 +89,14 @@ SSL_MAKE_ARGS=	--ssl

 .include <bsd.port.pre.mk>

+# MongoDB 7.0 fails on clang15.
+.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+_LLVM_VERSION=  14
+BUILD_DEPENDS+= clang${_LLVM_VERSION}:devel/llvm${_LLVM_VERSION}
+CC=             ${LOCALBASE}/bin/clang${_LLVM_VERSION}
+CXX=            ${LOCALBASE}/bin/clang++${_LLVM_VERSION}
+.endif
+
 ALL_TARGET=	install-core

 # This ports is only following the Major Release.
--- a/databases/mongodb70/files/patch-src_third__party_abseil-cpp_dist_absl_base_internal_unscaledcycleclock.cc
+++ b/databases/mongodb70/files/patch-src_third__party_abseil-cpp_dist_absl_base_internal_unscaledcycleclock.cc
@ -0,0 +1,13 @@
+--- src/third_party/abseil-cpp/dist/absl/base/internal/unscaledcycleclock.cc.orig	2023-05-10 10:35:21 UTC
+++ src/third_party/abseil-cpp/dist/absl/base/internal/unscaledcycleclock.cc
+@@ -24,8 +24,9 @@
+ #ifdef __GLIBC__
+ #include <sys/platform/ppc.h>
+ #elif defined(__FreeBSD__)
+-#include <sys/sysctl.h>
+#include "absl/base/call_once.h"
+ #include <sys/types.h>
+#include <sys/sysctl.h>
+ #endif
+ #endif
+ 
--- a/databases/redis-devel/Makefile
+++ b/databases/redis-devel/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	redis
-DISTVERSION=	7.0.10.20230320
+DISTVERSION=	7.0.11.20230511
 CATEGORIES=	databases
 PKGNAMESUFFIX=	-devel

@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES+=		compiler:c11 cpe gmake
 CPE_VENDOR=	redislabs
 USE_GITHUB=	yes
-GH_TAGNAME=	48e0d4788
+GH_TAGNAME=	aac8105c9

 MAKE_ENV=	OPTIMIZATION= \
 		V=yo
--- a/databases/redis-devel/distinfo
+++ b/databases/redis-devel/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1679378816
-SHA256 (redis-redis-7.0.10.20230320-48e0d4788_GH0.tar.gz) = ec66748034beff2735e90c0cb9531a9cb50c91ebda32397d48f4debe0dddd2dc
-SIZE (redis-redis-7.0.10.20230320-48e0d4788_GH0.tar.gz) = 3126992
+TIMESTAMP = 1683782863
+SHA256 (redis-redis-7.0.11.20230511-aac8105c9_GH0.tar.gz) = 16574d53386dbebd31846f35829d728c65c8bd023282cffe237f1c73e908227d
+SIZE (redis-redis-7.0.11.20230511-aac8105c9_GH0.tar.gz) = 3373544
--- a/databases/redis-devel/files/extra-patch-src-Makefile.lua
+++ b/databases/redis-devel/files/extra-patch-src-Makefile.lua
@ -1,7 +1,7 @@
--- src/Makefile.orig	2022-10-29 23:24:12 UTC
+--- src/Makefile.orig	2023-05-11 05:48:48 UTC
 +++ src/Makefile
-@@ -20,7 +20,7 @@
- 	REDIS_CFLAGS+=-flto
+@@ -25,7 +25,7 @@
+ 	endif
 	REDIS_LDFLAGS+=-flto
 endif
 -DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram fpconv
@ -9,7 +9,7 @@
 NODEPS:=clean distclean
 
 # Default settings
-@@ -119,8 +119,8 @@
+@@ -116,8 +116,8 @@
 # Override default settings if possible
 -include .make-settings
 
@ -18,9 +18,9 @@
 +FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
 +FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
 FINAL_LIBS=-lm
- DEBUG=-g -ggdb
 
-@@ -229,7 +229,7 @@
+ # Linux ARM32 needs -latomic at linking time
+@@ -231,7 +231,7 @@
 endif
 
 # Include paths to dependencies
@ -29,7 +29,7 @@
 
 # Determine systemd support and/or build preference (defaulting to auto-detection)
 BUILD_WITH_SYSTEMD=no
-@@ -320,6 +320,9 @@
+@@ -322,6 +322,9 @@
     endef
 endif
 
@ -39,15 +39,15 @@
 REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
 REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
 REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -341,6 +344,7 @@
+@@ -351,6 +354,7 @@
 REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX)
 REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX)
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o eval.o bio.o rio.o rand.o memtest.o syscheck.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o tracking.o socket.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o $(COMMANDS_FILENAME).o strl.o connection.o unix.o logreqres.o
+ REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o eval.o bio.o rio.o rand.o memtest.o syscheck.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o tracking.o socket.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o commands.o strl.o connection.o unix.o logreqres.o
 +REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
 REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX)
- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o redisassert.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o strl.o
+ REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o redisassert.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o strl.o cli_commands.o
 REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX)
-@@ -395,7 +399,7 @@
+@@ -405,7 +409,7 @@
 
 # redis-server
 $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
--- a/databases/redis-devel/files/extra-patch-src-Makefile.luajit
+++ b/databases/redis-devel/files/extra-patch-src-Makefile.luajit
@ -1,7 +1,7 @@
--- src/Makefile.orig	2022-10-29 23:24:12 UTC
+--- src/Makefile.orig	2023-05-11 05:54:35 UTC
 +++ src/Makefile
-@@ -20,7 +20,7 @@
- 	REDIS_CFLAGS+=-flto
+@@ -25,7 +25,7 @@
+ 	endif
 	REDIS_LDFLAGS+=-flto
 endif
 -DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram fpconv
@ -9,7 +9,7 @@
 NODEPS:=clean distclean
 
 # Default settings
-@@ -119,8 +119,8 @@
+@@ -116,8 +116,8 @@
 # Override default settings if possible
 -include .make-settings
 
@ -18,9 +18,9 @@
 +FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
 +FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
 FINAL_LIBS=-lm
- DEBUG=-g -ggdb
 
-@@ -229,7 +229,7 @@
+ # Linux ARM32 needs -latomic at linking time
+@@ -231,7 +231,7 @@
 endif
 
 # Include paths to dependencies
@ -29,7 +29,7 @@
 
 # Determine systemd support and/or build preference (defaulting to auto-detection)
 BUILD_WITH_SYSTEMD=no
-@@ -320,6 +320,9 @@
+@@ -322,6 +322,9 @@
     endef
 endif
 
@ -39,15 +39,15 @@
 REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
 REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
 REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -341,6 +344,7 @@
+@@ -351,6 +354,7 @@
 REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX)
 REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX)
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o eval.o bio.o rio.o rand.o memtest.o syscheck.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o tracking.o socket.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o $(COMMANDS_FILENAME).o strl.o connection.o unix.o logreqres.o
+ REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o eval.o bio.o rio.o rand.o memtest.o syscheck.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o tracking.o socket.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o commands.o strl.o connection.o unix.o logreqres.o
 +REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
 REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX)
- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o redisassert.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o strl.o
+ REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o redisassert.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o strl.o cli_commands.o
 REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX)
-@@ -395,7 +399,7 @@
+@@ -405,7 +409,7 @@
 
 # redis-server
 $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
--- a/databases/redis-devel/files/extra-patch-src-Makefile.luajit-or
+++ b/databases/redis-devel/files/extra-patch-src-Makefile.luajit-or
@ -1,7 +1,7 @@
--- src/Makefile.orig	2022-10-29 23:24:12 UTC
+--- src/Makefile.orig	2023-05-11 05:58:00 UTC
 +++ src/Makefile
-@@ -20,7 +20,7 @@
- 	REDIS_CFLAGS+=-flto
+@@ -25,7 +25,7 @@
+ 	endif
 	REDIS_LDFLAGS+=-flto
 endif
 -DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram fpconv
@ -9,7 +9,7 @@
 NODEPS:=clean distclean
 
 # Default settings
-@@ -119,8 +119,8 @@
+@@ -116,8 +116,8 @@
 # Override default settings if possible
 -include .make-settings
 
@ -18,9 +18,9 @@
 +FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
 +FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
 FINAL_LIBS=-lm
- DEBUG=-g -ggdb
 
-@@ -229,7 +229,7 @@
+ # Linux ARM32 needs -latomic at linking time
+@@ -231,7 +231,7 @@
 endif
 
 # Include paths to dependencies
@ -29,7 +29,7 @@
 
 # Determine systemd support and/or build preference (defaulting to auto-detection)
 BUILD_WITH_SYSTEMD=no
-@@ -320,6 +320,9 @@
+@@ -322,6 +322,9 @@
     endef
 endif
 
@ -39,15 +39,15 @@
 REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
 REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
 REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -341,6 +344,7 @@
+@@ -351,6 +354,7 @@
 REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX)
 REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX)
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o eval.o bio.o rio.o rand.o memtest.o syscheck.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o tracking.o socket.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o $(COMMANDS_FILENAME).o strl.o connection.o unix.o logreqres.o
+ REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o eval.o bio.o rio.o rand.o memtest.o syscheck.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o tracking.o socket.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o commands.o strl.o connection.o unix.o logreqres.o
 +REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
 REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX)
- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o redisassert.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o strl.o
+ REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o redisassert.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o strl.o cli_commands.o
 REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX)
-@@ -395,7 +399,7 @@
+@@ -405,7 +409,7 @@
 
 # redis-server
 $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
--- a/databases/redis-devel/files/patch-deps-Makefile
+++ b/databases/redis-devel/files/patch-deps-Makefile
@ -1,4 +1,4 @@
--- deps/Makefile.orig	2023-02-28 17:38:58 UTC
+--- deps/Makefile.orig	2023-05-11 05:14:59 UTC
 +++ deps/Makefile
@@ -83,7 +83,7 @@ LUA_LDFLAGS+= $(LDFLAGS)
 ifeq ($(LUA_DEBUG),yes)
@ -13,9 +13,9 @@
 
 jemalloc: .make-prerequisites
 	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
-	cd jemalloc && ./configure --disable-cxx --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
+-	cd jemalloc && ./configure --disable-cxx --with-version=5.3.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
 -	cd jemalloc && $(MAKE) lib/libjemalloc.a
-+	cd jemalloc && ./configure --disable-cxx --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
+	cd jemalloc && ./configure --disable-cxx --with-version=5.3.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
 +	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
 
 .PHONY: jemalloc
--- a/devel/Makefile
+++ b/devel/Makefile
@ -4402,6 +4402,7 @@
    SUBDIR += py-cdg
    SUBDIR += py-celery
    SUBDIR += py-celery-progress
+    SUBDIR += py-celery-singleton
    SUBDIR += py-cerberus
    SUBDIR += py-certsrv
    SUBDIR += py-cffi
--- a/devel/R-cran-gtools/Makefile
+++ b/devel/R-cran-gtools/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	gtools
-PORTVERSION=	3.9.3
-PORTREVISION=	1
+PORTVERSION=	3.9.4
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}

--- a/devel/R-cran-gtools/distinfo
+++ b/devel/R-cran-gtools/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1658035018
-SHA256 (gtools_3.9.3.tar.gz) = 7afb53277b382d5752f4597ae433f3c0addf5e8eb24d01a9562faf2a01e33133
-SIZE (gtools_3.9.3.tar.gz) = 240614
+TIMESTAMP = 1682395387
+SHA256 (gtools_3.9.4.tar.gz) = 59cf8b194fe98b1cc05dbb4d686810a1068f59d8b402b731548a898ece85f111
+SIZE (gtools_3.9.4.tar.gz) = 240661
--- a/devel/R-cran-gtools/pkg-descr
+++ b/devel/R-cran-gtools/pkg-descr
@ -1 +1,24 @@
-Various R programming tools
+Functions to assist in R programming, including: - assist in
+developing, updating, and maintaining R and R packages ('ask',
+'checkRVersion', 'getDependencies', 'keywords', 'scat'), - calculate
+the logit and inverse logit transformations ('logit', 'inv.logit'),
+- test if a value is missing, empty or contains only NA and NULL
+values ('invalid'), - manipulate R's .Last function ('addLast'), -
+define macros ('defmacro'), - detect odd and even integers ('odd',
+'even'), - convert strings containing non-ASCII characters (like
+single quotes) to plain ASCII ('ASCIIfy'), - perform a binary search
+('binsearch'), - sort strings containing both numeric and character
+components ('mixedsort'), - create a factor variable from the
+quantiles of a continuous variable ('quantcut'), - enumerate
+permutations and combinations ('combinations', 'permutation'), -
+calculate and convert between fold-change and log-ratio ('foldchange',
+'logratio2foldchange', 'foldchange2logratio'), - calculate probabilities
+and generate random numbers from Dirichlet distributions ('rdirichlet',
+'ddirichlet'), - apply a function over adjacent subsets of a vector
+('running'), - modify the TCP_NODELAY ('de-Nagle') flag for socket
+objects, - efficient 'rbind' of data frames, even if the column
+names don't match ('smartbind'), - generate significance stars from
+p-values ('stars.pval'), - convert characters to/from ASCII codes
+('asc', 'chr'), - convert character vector to ASCII representation
+('ASCIIfy'), - apply title capitalization rules to a character
+vector ('capwords').
--- a/devel/R-cran-sfsmisc/Makefile
+++ b/devel/R-cran-sfsmisc/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	sfsmisc
-DISTVERSION=	1.1-13
-PORTREVISION=	1
+DISTVERSION=	1.1-15
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${DISTVERSION}

--- a/devel/R-cran-sfsmisc/distinfo
+++ b/devel/R-cran-sfsmisc/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1649305756
-SHA256 (sfsmisc_1.1-13.tar.gz) = a81710357de2dcdaf00d9fa30a29cde0dd83616edc358452fd6105ea88f34218
-SIZE (sfsmisc_1.1-13.tar.gz) = 181594
+TIMESTAMP = 1683794466
+SHA256 (sfsmisc_1.1-15.tar.gz) = 4afa42cf83a287f62cac21741fc0559dee9dbd69dee59a740defce9a0e7c81e6
+SIZE (sfsmisc_1.1-15.tar.gz) = 185707
--- a/devel/forge-devel/Makefile
+++ b/devel/forge-devel/Makefile
@ -1,8 +1,7 @@
 PORTNAME=	forge
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.3.2-96
-PORTREVISION=	5
-DISTVERSIONSUFFIX=	-gba35ffc
+DISTVERSION=	0.3.2-113
+DISTVERSIONSUFFIX=	-gd2bdd2c
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}

@ -13,24 +12,24 @@ WWW=		https://github.com/magit/forge
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE

-BUILD_DEPENDS=	closql${EMACS_PKGNAMESUFFIX}>=1.2.0:databases/closql@${EMACS_FLAVOR} \
-		compat.el${EMACS_PKGNAMESUFFIX}>=28.1.1.0:misc/compat.el@${EMACS_FLAVOR} \
+BUILD_DEPENDS=	closql${EMACS_PKGNAMESUFFIX}>=1.2.1:databases/closql@${EMACS_FLAVOR} \
+		compat.el${EMACS_PKGNAMESUFFIX}>=29.1.3.4:misc/compat.el@${EMACS_FLAVOR} \
 		dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \
-		emacsql${EMACS_PKGNAMESUFFIX}>=3.0.0:databases/emacsql@${EMACS_FLAVOR} \
-		ghub-devel${EMACS_PKGNAMESUFFIX}>=3.5.4:devel/ghub-devel@${EMACS_FLAVOR} \
+		emacsql${EMACS_PKGNAMESUFFIX}>=3.1.1:databases/emacsql@${EMACS_FLAVOR} \
+		ghub-devel${EMACS_PKGNAMESUFFIX}>=3.5.6:devel/ghub-devel@${EMACS_FLAVOR} \
 		magit-devel${EMACS_PKGNAMESUFFIX}>=3.3.0:devel/magit-devel@${EMACS_FLAVOR} \
 		markdown-mode.el${EMACS_PKGNAMESUFFIX}>=2.4:textproc/markdown-mode.el@${EMACS_FLAVOR} \
-		transient-devel${EMACS_PKGNAMESUFFIX}>=0.3.6:devel/transient-devel@${EMACS_FLAVOR} \
-		yaml.el${EMACS_PKGNAMESUFFIX}>=0.3.4:textproc/yaml.el@${EMACS_FLAVOR}
-RUN_DEPENDS=	closql${EMACS_PKGNAMESUFFIX}>=1.2.0:databases/closql@${EMACS_FLAVOR} \
-		compat.el${EMACS_PKGNAMESUFFIX}>=28.1.1.0:misc/compat.el@${EMACS_FLAVOR} \
+		transient-devel${EMACS_PKGNAMESUFFIX}>=0.4.0:devel/transient-devel@${EMACS_FLAVOR} \
+		yaml.el${EMACS_PKGNAMESUFFIX}>=0.3.5:textproc/yaml.el@${EMACS_FLAVOR}
+RUN_DEPENDS=	closql${EMACS_PKGNAMESUFFIX}>=1.2.1:databases/closql@${EMACS_FLAVOR} \
+		compat.el${EMACS_PKGNAMESUFFIX}>=29.1.3.4:misc/compat.el@${EMACS_FLAVOR} \
 		dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \
-		emacsql${EMACS_PKGNAMESUFFIX}>=3.0.0:databases/emacsql@${EMACS_FLAVOR} \
-		ghub-devel${EMACS_PKGNAMESUFFIX}>=3.5.4:devel/ghub-devel@${EMACS_FLAVOR} \
+		emacsql${EMACS_PKGNAMESUFFIX}>=3.1.1:databases/emacsql@${EMACS_FLAVOR} \
+		ghub-devel${EMACS_PKGNAMESUFFIX}>=3.5.6:devel/ghub-devel@${EMACS_FLAVOR} \
 		magit-devel${EMACS_PKGNAMESUFFIX}>=3.3.0:devel/magit-devel@${EMACS_FLAVOR} \
 		markdown-mode.el${EMACS_PKGNAMESUFFIX}>=2.4:textproc/markdown-mode.el@${EMACS_FLAVOR} \
-		transient-devel${EMACS_PKGNAMESUFFIX}>=0.3.6:devel/transient-devel@${EMACS_FLAVOR} \
-		yaml.el${EMACS_PKGNAMESUFFIX}>=0.3.4:textproc/yaml.el@${EMACS_FLAVOR}
+		transient-devel${EMACS_PKGNAMESUFFIX}>=0.4.0:devel/transient-devel@${EMACS_FLAVOR} \
+		yaml.el${EMACS_PKGNAMESUFFIX}>=0.3.5:textproc/yaml.el@${EMACS_FLAVOR}

 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
--- a/devel/forge-devel/distinfo
+++ b/devel/forge-devel/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1677634769
-SHA256 (magit-forge-v0.3.2-96-gba35ffc_GH0.tar.gz) = 055eed4c94863385846d37d838df342edc31209e68bea0c9e9b595015c4b83b8
-SIZE (magit-forge-v0.3.2-96-gba35ffc_GH0.tar.gz) = 101814
+TIMESTAMP = 1683782220
+SHA256 (magit-forge-v0.3.2-113-gd2bdd2c_GH0.tar.gz) = c314cf08c5a7493672fbd667faa39a3c0b7cce23743115f365cb83af7f5c9287
+SIZE (magit-forge-v0.3.2-113-gd2bdd2c_GH0.tar.gz) = 101265
--- a/devel/ghub-devel/Makefile
+++ b/devel/ghub-devel/Makefile
@ -1,8 +1,7 @@
 PORTNAME=	ghub
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.5.6-49
-PORTREVISION=	2
-DISTVERSIONSUFFIX=	-g47b7dc9
+DISTVERSION=	3.5.6-50
+DISTVERSIONSUFFIX=	-g6a5de97
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}

@ -13,10 +12,10 @@ WWW=		https://github.com/magit/ghub
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE

-BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=28.1.1.0:misc/compat.el@${EMACS_FLAVOR} \
-		treepy.el${EMACS_PKGNAMESUFFIX}>=0.1.1:devel/treepy.el@${EMACS_FLAVOR}
-RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=28.1.1.0:misc/compat.el@${EMACS_FLAVOR} \
-		treepy.el${EMACS_PKGNAMESUFFIX}>=0.1.1:devel/treepy.el@${EMACS_FLAVOR}
+BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.3.4:misc/compat.el@${EMACS_FLAVOR} \
+		treepy.el${EMACS_PKGNAMESUFFIX}>=0.1.2:devel/treepy.el@${EMACS_FLAVOR}
+RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.3.4:misc/compat.el@${EMACS_FLAVOR} \
+		treepy.el${EMACS_PKGNAMESUFFIX}>=0.1.2:devel/treepy.el@${EMACS_FLAVOR}

 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
--- a/devel/ghub-devel/distinfo
+++ b/devel/ghub-devel/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1677634631
-SHA256 (magit-ghub-v3.5.6-49-g47b7dc9_GH0.tar.gz) = 50f4549d13a16121318f07191efd9c6ac7152cfe14d4fe507a1a7584409388ac
-SIZE (magit-ghub-v3.5.6-49-g47b7dc9_GH0.tar.gz) = 62530
+TIMESTAMP = 1683781860
+SHA256 (magit-ghub-v3.5.6-50-g6a5de97_GH0.tar.gz) = 02fbc68c515b783a7686c6bf9f26c73ac76df6bc84e6127ae79224dd112fd719
+SIZE (magit-ghub-v3.5.6-50-g6a5de97_GH0.tar.gz) = 62612
--- a/devel/liblognorm/files/pkg-message.in
+++ b/devel/liblognorm/files/pkg-message.in
@ -1,6 +1,6 @@
 [
 { type: upgrade
-  maximum_versio: 0.3.8
+  maximum_version: 0.3.8
  message: <<EOM
 The previous version of liblognorm (0.3.7) used the libee CEE support
 library in its API.
@ -12,7 +12,7 @@ no way to avoid that, obviously...).

 The current library is the result of that effort. Application developers
 are encouraged to switch to this version, as it provides the benefit of
-a simpler API. PREVIOUS VERSIONS ARE INCOMPATIBLE WITH THIS ONE
+a simpler API. PREVIOUS VERSIONS ARE INCOMPATIBLE WITH THIS ONE.
 EOM
 }
 ]
--- a/devel/libtai/files/patch-make-compileso.sh
+++ b/devel/libtai/files/patch-make-compileso.sh
@ -1,4 +0,0 @@
--- make-compileso.sh.orig	Wed Dec 31 21:00:00 1969
-+++ make-compileso.sh	Fri Jun 16 02:05:36 2000
-@@ -0,0 +1 @@
-+echo exec "$CC $CCSO" -o '¨$@¨' -c '${1+"$@"}'
--- a/devel/magit-devel/Makefile
+++ b/devel/magit-devel/Makefile
@ -1,8 +1,7 @@
 PORTNAME=	magit
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.3.0-540
-PORTREVISION=	5
-DISTVERSIONSUFFIX=	-g28bb411a
+DISTVERSION=	3.3.0-629
+DISTVERSIONSUFFIX=	-g5d91aadd
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}

@ -13,14 +12,14 @@ WWW=		https://magit.vc/
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE

-BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=28.1.1.0:misc/compat.el@${EMACS_FLAVOR} \
+BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.3.4:misc/compat.el@${EMACS_FLAVOR} \
 		dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \
-		transient-devel${EMACS_PKGNAMESUFFIX}>=0.3.7:devel/transient-devel@${EMACS_FLAVOR} \
-		with-editor-devel${EMACS_PKGNAMESUFFIX}>=3.0.5:editors/with-editor-devel@${EMACS_FLAVOR}
-RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=28.1.1.0:misc/compat.el@${EMACS_FLAVOR} \
+		transient-devel${EMACS_PKGNAMESUFFIX}>=0.4.0:devel/transient-devel@${EMACS_FLAVOR} \
+		with-editor-devel${EMACS_PKGNAMESUFFIX}>=3.2.0:editors/with-editor-devel@${EMACS_FLAVOR}
+RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.3.4:misc/compat.el@${EMACS_FLAVOR} \
 		dash.el${EMACS_PKGNAMESUFFIX}>=2.19.1:devel/dash.el@${EMACS_FLAVOR} \
-		transient-devel${EMACS_PKGNAMESUFFIX}>=0.3.7:devel/transient-devel@${EMACS_FLAVOR} \
-		with-editor-devel${EMACS_PKGNAMESUFFIX}>=3.0.5:editors/with-editor-devel@${EMACS_FLAVOR}
+		transient-devel${EMACS_PKGNAMESUFFIX}>=0.4.0:devel/transient-devel@${EMACS_FLAVOR} \
+		with-editor-devel${EMACS_PKGNAMESUFFIX}>=3.2.0:editors/with-editor-devel@${EMACS_FLAVOR}

 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
@ -29,7 +28,7 @@ MAKE_ENV+=	docdir=${DOCSDIR} \
 		infodir=${PREFIX}/${INFO_PATH} \
 		INSTALL_INFO=install-info \
 		lispdir=${PREFIX}/${ELISPDIR} \
-		LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/ghub" \
+		LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat" \
 		VERSION=${PORTVERSION}
 # Parallel build fails if Emacs is built with native compilation enabled
 MAKE_JOBS_UNSAFE=	yes
--- a/devel/magit-devel/distinfo
+++ b/devel/magit-devel/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1677634473
-SHA256 (magit-magit-v3.3.0-540-g28bb411a_GH0.tar.gz) = 4354dc223695647507faa2f707faf9b4270437e316adb90dbef6b604a14b305a
-SIZE (magit-magit-v3.3.0-540-g28bb411a_GH0.tar.gz) = 655363
+TIMESTAMP = 1683781337
+SHA256 (magit-magit-v3.3.0-629-g5d91aadd_GH0.tar.gz) = 189501956b79589f500e0a24932e8f84ca6709be666dc8d164ecffa8dff49d5d
+SIZE (magit-magit-v3.3.0-629-g5d91aadd_GH0.tar.gz) = 657540
--- a/devel/magit-devel/pkg-plist
+++ b/devel/magit-devel/pkg-plist
@ -51,8 +51,6 @@
 %%ELISPDIR%%/magit-mode.elc
 %%ELISPDIR%%/magit-notes.el
 %%ELISPDIR%%/magit-notes.elc
-%%ELISPDIR%%/magit-obsolete.el
-%%ELISPDIR%%/magit-obsolete.elc
 %%ELISPDIR%%/magit-patch.el
 %%ELISPDIR%%/magit-patch.elc
 %%ELISPDIR%%/magit-process.el
--- a/devel/osc/Makefile
+++ b/devel/osc/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	osc
-PORTVERSION=	1.1.2
+PORTVERSION=	1.1.3
 CATEGORIES=	devel

 MAINTAINER=	amdmi3@FreeBSD.org
--- a/devel/osc/distinfo
+++ b/devel/osc/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1683111887
-SHA256 (openSUSE-osc-1.1.2_GH0.tar.gz) = b2df7f9514175428a82e636365fa10c5dfed7497d742aff380e22c517064ee6a
-SIZE (openSUSE-osc-1.1.2_GH0.tar.gz) = 329844
+TIMESTAMP = 1683744186
+SHA256 (openSUSE-osc-1.1.3_GH0.tar.gz) = bf390a6b6e532ce02bc009368f21212748fa64313d9caee3d3d3f2cbdc55b3c8
+SIZE (openSUSE-osc-1.1.3_GH0.tar.gz) = 330955
--- a/devel/py-aws-sam-translator/Makefile
+++ b/devel/py-aws-sam-translator/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	aws-sam-translator
-DISTVERSION=	1.62.0
+DISTVERSION=	1.66.0
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-aws-sam-translator/distinfo
+++ b/devel/py-aws-sam-translator/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1678864696
-SHA256 (aws-sam-translator-1.62.0.tar.gz) = 2db24633fbc76b8e6eb76adaf0c1001a0d749288af91d85e7d9007e3b05479fa
-SIZE (aws-sam-translator-1.62.0.tar.gz) = 272658
+TIMESTAMP = 1683703135
+SHA256 (aws-sam-translator-1.66.0.tar.gz) = 0b9e9684ea0384fd84f5e722f7fea61896c514b95d3403aa782b69acd485dbbf
+SIZE (aws-sam-translator-1.66.0.tar.gz) = 278246
--- a/devel/py-celery-singleton/Makefile
+++ b/devel/py-celery-singleton/Makefile
@ -0,0 +1,20 @@
+PORTNAME=	celery-singleton
+PORTVERSION=	0.3.1
+CATEGORIES=	devel python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	dvl@FreeBSD.org
+COMMENT=	Prevent duplicate celery tasks
+WWW=		https://github.com/steinitzu/celery-singleton
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis@${PY_FLAVOR}
+
+USES=		python:3.6+,run
+USE_PYTHON=	autoplist distutils
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
--- a/devel/py-celery-singleton/Makefile.new
+++ b/devel/py-celery-singleton/Makefile.new
@ -0,0 +1,21 @@
+PORTNAME=	celery-singleton
+PORTVERSION=	0.3.1
+PORTREVISION=	1
+CATEGORIES=	devel python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	dvl@FreeBSD.org
+COMMENT=	Prevent duplicate celery tasks
+WWW=		https://github.com/steinitzu/celery-singleton
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis@${PY_FLAVOR}
+
+USES=		python:3.6+,run
+USE_PYTHON=	autoplist distutils
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
--- a/devel/py-celery-singleton/distinfo
+++ b/devel/py-celery-singleton/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1683049934
+SHA256 (celery-singleton-0.3.1.tar.gz) = 260ce4978e631f8682ea0ccb03d7f3b87d42bc20e04e9bd46ddb78a2f8035d1e
+SIZE (celery-singleton-0.3.1.tar.gz) = 4659
--- a/devel/py-celery-singleton/pkg-descr
+++ b/devel/py-celery-singleton/pkg-descr
@ -0,0 +1,22 @@
+celery-singleton uses the JSON representation of a task's delay() or
+apply_async() arguments to generate a unique lock and stores it in redis. By
+default it uses the redis server of the celery result backend. If you use a
+different/no result backend or want to use a different redis server for
+celery-singleton, refer the configuration section for how to customize the
+redis.
+
+import time
+from celery_singleton import Singleton
+from somewhere import celery_app
+
+@celery_app.task(base=Singleton)
+def do_stuff(*args, **kwargs):
+	time.sleep(4)
+	return 'I just woke up'
+
+# run the task as normal
+async_result = do_stuff.delay(1, 2, 3, a='b')
+async_result2 = do_stuff.delay(1, 2, 3, a='b')
+
+# These are the same, task is only queued once
+assert async_result == async_result2
--- a/devel/py-cfn-lint/Makefile
+++ b/devel/py-cfn-lint/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	cfn-lint
-DISTVERSION=	0.74.3
-PORTREVISION=	1
+DISTVERSION=	0.77.5
 CATEGORIES=	devel python textproc
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -12,17 +11,22 @@ WWW=		https://pypi.org/project/cfn-lint/
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE

-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aws-sam-translator>=1.60.1:devel/py-aws-sam-translator@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aws-sam-translator>=1.65.0:devel/py-aws-sam-translator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jschema-to-python>=1.2.3:devel/py-jschema-to-python@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}jsonschema>=3.2<5:devel/py-jsonschema@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jsonschema>=3.0<5:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}junit-xml>=1.9:textproc/py-junit-xml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=2.4,1<4,1:math/py-networkx@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}regex>0:textproc/py-regex@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sarif-om>=1.0.4:devel/py-sarif-om@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sympy>=1.0.0:math/py-sympy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>5.4:devel/py-yaml@${PY_FLAVOR}

 USES=		python:3.7+
-USE_PYTHON=	autoplist concurrent distutils
+USE_PYTHON=	autoplist concurrent distutils unittest
+TEST_ENV=	${MAKE_ENV} \
+		PATH=${STAGEDIR}${PREFIX}/bin:${PATH} \
+		PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR}

 NO_ARCH=	yes

--- a/devel/py-cfn-lint/distinfo
+++ b/devel/py-cfn-lint/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1678864705
-SHA256 (cfn-lint-0.74.3.tar.gz) = 2013186ead750eddeafaa286711c03cde44deff0fecae045de20e295160fc275
-SIZE (cfn-lint-0.74.3.tar.gz) = 2644724
+TIMESTAMP = 1683765977
+SHA256 (cfn-lint-0.77.5.tar.gz) = 4282d13ffe76a5dee6431b1f56e3641d87c28b1ef5be663afe7d8dbf13f28bdb
+SIZE (cfn-lint-0.77.5.tar.gz) = 3513226
--- a/devel/py-cfn-lint/files/patch-src_cfnlint_maintenance.py
+++ b/devel/py-cfn-lint/files/patch-src_cfnlint_maintenance.py
@ -0,0 +1,13 @@
+--- src/cfnlint/maintenance.py.orig	2023-05-08 16:34:58 UTC
+++ src/cfnlint/maintenance.py
+@@ -226,9 +226,8 @@ def update_documentation(rules):
+                 "../"
+                 + subprocess.check_output(
+                     [
+-                        "git",
+                         "grep",
+-                        "-l",
+                        "-lr",
+                         'id = "' + rule.id + '"',
+                         "src/cfnlint/rules/",
+                     ]
--- a/devel/py-python-dtrace/Makefile
+++ b/devel/py-python-dtrace/Makefile
@ -28,7 +28,7 @@ MAKE_ENV+=	FREEBSD_SRC_DIR=${SRC_BASE}
 .endif

 # Tests not included in the release tarball, uncomment if this changes.
-# TEST_DEPENDS=→${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
+# TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 #do-test:
 #	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v

--- a/devel/py-types-Pillow/Makefile
+++ b/devel/py-types-Pillow/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	types-Pillow
-PORTVERSION=	9.5.0.2
+PORTVERSION=	9.5.0.4
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-types-Pillow/distinfo
+++ b/devel/py-types-Pillow/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1682610848
-SHA256 (types-Pillow-9.5.0.2.tar.gz) = b3f9f621f259566c19c1deca21901017c8b1e3e200ed2e49e0a2d83c0a5175db
-SIZE (types-Pillow-9.5.0.2.tar.gz) = 29261
+TIMESTAMP = 1683744210
+SHA256 (types-Pillow-9.5.0.4.tar.gz) = f1b6af47abd151847ee25911ffeba784899bc7dc7f9eba8ca6a5aac522b012ef
+SIZE (types-Pillow-9.5.0.4.tar.gz) = 30875
--- a/devel/py-types-protobuf/Makefile
+++ b/devel/py-types-protobuf/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	types-protobuf
-PORTVERSION=	4.22.0.2
+PORTVERSION=	4.23.0.1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-types-protobuf/distinfo
+++ b/devel/py-types-protobuf/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1681140381
-SHA256 (types-protobuf-4.22.0.2.tar.gz) = 031a77403a8952b31869b9ff3883c9a21649dd224ca3673ee4287384e91ea2be
-SIZE (types-protobuf-4.22.0.2.tar.gz) = 46960
+TIMESTAMP = 1683744221
+SHA256 (types-protobuf-4.23.0.1.tar.gz) = 7bd5ea122a057b11a82b785d9de464932a1e9175fe977a4128adef11d7f35547
+SIZE (types-protobuf-4.23.0.1.tar.gz) = 47077
--- a/devel/py-types-psycopg2/Makefile
+++ b/devel/py-types-psycopg2/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	types-psycopg2
-PORTVERSION=	2.9.21.9
+PORTVERSION=	2.9.21.10
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-types-psycopg2/distinfo
+++ b/devel/py-types-psycopg2/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1680023410
-SHA256 (types-psycopg2-2.9.21.9.tar.gz) = 388dc36a04551632289c4aaf1fc5b91e147654b165db896d094844e216f22bf5
-SIZE (types-psycopg2-2.9.21.9.tar.gz) = 18720
+TIMESTAMP = 1683744232
+SHA256 (types-psycopg2-2.9.21.10.tar.gz) = c2600892312ae1c34e12f145749795d93dc4eac3ef7dbf8a9c1bfd45385e80d7
+SIZE (types-psycopg2-2.9.21.10.tar.gz) = 18750
--- a/devel/py-types-urllib3/Makefile
+++ b/devel/py-types-urllib3/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	types-urllib3
-PORTVERSION=	1.26.25.12
+PORTVERSION=	1.26.25.13
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-types-urllib3/distinfo
+++ b/devel/py-types-urllib3/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1683027830
-SHA256 (types-urllib3-1.26.25.12.tar.gz) = a1557355ce8d350a555d142589f3001903757d2d36c18a66f588d9659bbc917d
-SIZE (types-urllib3-1.26.25.12.tar.gz) = 11007
+TIMESTAMP = 1683744241
+SHA256 (types-urllib3-1.26.25.13.tar.gz) = 3300538c9dc11dad32eae4827ac313f5d986b8b21494801f1bf97a1ac6c03ae5
+SIZE (types-urllib3-1.26.25.13.tar.gz) = 11035
--- a/devel/ruby-install/Makefile
+++ b/devel/ruby-install/Makefile
@ -1,5 +1,5 @@
 PORTNAME=       ruby-install
-PORTVERSION=    0.8.5
+PORTVERSION=    0.9.0
 DISTVERSIONPREFIX=      v
 CATEGORIES=     devel ruby

--- a/devel/ruby-install/distinfo
+++ b/devel/ruby-install/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1669016345
-SHA256 (postmodern-ruby-install-v0.8.5_GH0.tar.gz) = 793fcf44dce375c6c191003c3bfd22ebc85fa296d751808ab315872f5ee0179b
-SIZE (postmodern-ruby-install-v0.8.5_GH0.tar.gz) = 32904
+TIMESTAMP = 1682250007
+SHA256 (postmodern-ruby-install-v0.9.0_GH0.tar.gz) = 72cc31a47b9c5cf113aee878b4120830469160119087a18037755d195ce431af
+SIZE (postmodern-ruby-install-v0.9.0_GH0.tar.gz) = 34536
--- a/devel/ruby-install/pkg-plist
+++ b/devel/ruby-install/pkg-plist
@ -8,8 +8,6 @@ share/ruby-install/logging.sh
 share/ruby-install/mruby/dependencies.txt
 share/ruby-install/mruby/functions.sh
 share/ruby-install/package_manager.sh
-share/ruby-install/rbx/dependencies.txt
-share/ruby-install/rbx/functions.sh
 share/ruby-install/ruby-install.sh
 share/ruby-install/ruby-versions.sh
 share/ruby-install/ruby/dependencies.txt
--- a/devel/transient-devel/Makefile
+++ b/devel/transient-devel/Makefile
@ -1,8 +1,7 @@
 PORTNAME=	transient
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.3.7-215
-PORTREVISION=	2
-DISTVERSIONSUFFIX=	-g0204a24
+DISTVERSION=	0.4.0
+DISTVERSIONSUFFIX=
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}

@ -20,7 +19,7 @@ USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit

-MAKE_ENV+=	LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat"
+MAKE_ENV+=	LOAD_PATH="-L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat"

 ALL_TARGET=	lisp info

--- a/devel/transient-devel/distinfo
+++ b/devel/transient-devel/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1677634053
-SHA256 (magit-transient-v0.3.7-215-g0204a24_GH0.tar.gz) = 4f7b15509ce01a3be1774726de2e367c83cfaf464485d450e6a0f6e6d6493ba7
-SIZE (magit-transient-v0.3.7-215-g0204a24_GH0.tar.gz) = 126825
+TIMESTAMP = 1683779702
+SHA256 (magit-transient-v0.4.0_GH0.tar.gz) = b968bff7e82fe7efeee8121b2707bb5807e2d1f4869227898145e199cdeb639f
+SIZE (magit-transient-v0.4.0_GH0.tar.gz) = 128429
--- a/devel/transient/Makefile
+++ b/devel/transient/Makefile
@ -1,7 +1,6 @@
 PORTNAME=	transient
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.3.7
-PORTREVISION=	7
+DISTVERSION=	0.4.0
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}

@ -12,10 +11,15 @@ WWW=		https://github.com/magit/transient
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE

+BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.4.1:misc/compat.el@${EMACS_FLAVOR}
+RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.4.1:misc/compat.el@${EMACS_FLAVOR}
+
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit

+MAKE_ENV+=	LOAD_PATH="-L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat"
+
 ALL_TARGET=	lisp info

 CONFLICTS_INSTALL=	transient-devel-emacs*
@ -24,7 +28,7 @@ NO_ARCH=	yes

 INFO=		transient

-PORTDOCS=	CHANGELOG README.md transient.html
+PORTDOCS=	CHANGELOG README.org transient.html

 OPTIONS_DEFINE=	DOCS PDF

@ -48,7 +52,7 @@ do-install:

 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.md ${WRKSRC}/docs/CHANGELOG \
+	${INSTALL_DATA} ${WRKSRC}/README.org ${WRKSRC}/CHANGELOG \
 		${WRKSRC}/docs/transient.html ${STAGEDIR}${DOCSDIR}

 do-install-PDF-on:
--- a/devel/transient/distinfo
+++ b/devel/transient/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1635206116
-SHA256 (magit-transient-v0.3.7_GH0.tar.gz) = b6b8c9432135a5b359a104a216c7ee46133c41bb70e3d1af3c77e8250245cf41
-SIZE (magit-transient-v0.3.7_GH0.tar.gz) = 103105
+TIMESTAMP = 1683772932
+SHA256 (magit-transient-v0.4.0_GH0.tar.gz) = b968bff7e82fe7efeee8121b2707bb5807e2d1f4869227898145e199cdeb639f
+SIZE (magit-transient-v0.4.0_GH0.tar.gz) = 128429
--- a/dns/noip/files/pkg-message.in
+++ b/dns/noip/files/pkg-message.in
@ -4,11 +4,11 @@
 You must have a registered host with No-IP (www.noip.com)
 to use the noip Dynamic DNS Update Client (DUC).

-You must also create the noip config file
-/usr/local/etc/no-ip2.conf before using noip. To create the
+You must also create the noip configuration file
+%%PREFIX%%/etc/no-ip2.conf before using noip. To create the
 configuration file, run as root:

-/usr/local/bin/noip2 -C
+    %%PREFIX%%/bin/noip2 -C

 You will be prompted to enter the Ethernet port that will be
 associated with the host, your No-IP account name and
@ -18,17 +18,17 @@ config file contains a unique key for the DUC to access the
 No-IP DDNS service and only root has read permission.

 If you are compiling from source using the ports tree, you
-can also “make conf” to create the config file.
+can also "make conf" to create the configuration file.

 To run noip automatically at boot, add the following line
-to /etc/rc.conf
+to /etc/rc.conf:

-noip_enable="YES"
+    noip_enable="YES"

 Refer to the following for more information:

-/usr/local/bin/noip2 --help
-/usr/local/share/doc/noip/README.FIRST
+    %%PREFIX%%/bin/noip2 --help
+    %%DOCSDIR%%/README.FIRST
 EOM
 }
 ]
--- a/editors/vscode/Makefile
+++ b/editors/vscode/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	vscode
-DISTVERSION=	1.78.0
+DISTVERSION=	1.78.1
 CATEGORIES=	editors
 MASTER_SITES=	https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:yarn_cache
 DISTFILES=	yarn-offline-cache-${DISTVERSION}${EXTRACT_SUFX}:yarn_cache \
@ -63,7 +63,7 @@ USES=		desktop-file-utils gl gmake gnome iconv:wchar_t jpeg \
 USE_GITHUB=	yes
 GH_ACCOUNT=	microsoft

-SOURCE_COMMIT_HASH=	252e5463d60e63238250799aef7375787f68b4ee
+SOURCE_COMMIT_HASH=	6a995c4f4cc2ced6e3237749973982e751cb0bf9

 BINARY_ALIAS=	python=${PYTHON_CMD}

--- a/editors/vscode/distinfo
+++ b/editors/vscode/distinfo
@ -1,7 +1,7 @@
-TIMESTAMP = 1683356189
-SHA256 (vscode/yarn-offline-cache-1.78.0.tar.gz) = c4a219c5af4d0694440a2c955193f61540091808068a4b094b826191c5588aab
-SIZE (vscode/yarn-offline-cache-1.78.0.tar.gz) = 334909091
-SHA256 (vscode/vscode-marketplace-exts-1.78.0.tar.gz) = c47419d89fa7a5b45e4d453eb65fbbd98912edac35da22550ff934f24a36f1a8
-SIZE (vscode/vscode-marketplace-exts-1.78.0.tar.gz) = 1722299
-SHA256 (vscode/microsoft-vscode-1.78.0_GH0.tar.gz) = 7ce0a9ae87c1cb3450d758f2838f53825c471bc8a536e94968b442da0e2f7634
-SIZE (vscode/microsoft-vscode-1.78.0_GH0.tar.gz) = 16370919
+TIMESTAMP = 1683719737
+SHA256 (vscode/yarn-offline-cache-1.78.1.tar.gz) = ddec95555a206b40b9d33d573896dd414ff1c1ae940605ce8e9d86426d5069b2
+SIZE (vscode/yarn-offline-cache-1.78.1.tar.gz) = 334909521
+SHA256 (vscode/vscode-marketplace-exts-1.78.1.tar.gz) = 2fa78b5c8a60ddc90f818e7ea9b018c920846c38cfcbbe5407c53026447511d9
+SIZE (vscode/vscode-marketplace-exts-1.78.1.tar.gz) = 1728643
+SHA256 (vscode/microsoft-vscode-1.78.1_GH0.tar.gz) = 6d1a6f2515e30e9ea90084454b7fc18b793d74e66bbbd51b56143fe72bbd9497
+SIZE (vscode/microsoft-vscode-1.78.1_GH0.tar.gz) = 16373384
--- a/editors/vscode/files/patch-src_vs_code_electron-main_app.ts
+++ b/editors/vscode/files/patch-src_vs_code_electron-main_app.ts
@ -1,6 +1,6 @@
--- src/vs/code/electron-main/app.ts.orig	2023-05-03 19:37:04 UTC
+--- src/vs/code/electron-main/app.ts.orig	2023-05-04 09:13:35 UTC
 +++ src/vs/code/electron-main/app.ts
-@@ -855,7 +855,7 @@ export class CodeApplication extends Disposable {
+@@ -864,7 +864,7 @@ export class CodeApplication extends Disposable {
 				services.set(IUpdateService, new SyncDescriptor(Win32UpdateService));
 				break;
 
--- a/editors/with-editor-devel/Makefile
+++ b/editors/with-editor-devel/Makefile
@ -1,8 +1,7 @@
 PORTNAME=	with-editor
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.2.0-40
-PORTREVISION=	2
-DISTVERSIONSUFFIX=	-g59867ae
+DISTVERSION=	3.2.0-41
+DISTVERSIONSUFFIX=	-gdf74385
 CATEGORIES=	editors elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}

@ -13,14 +12,14 @@ WWW=		https://github.com/magit/with-editor
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE

-BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=28.1.1.0:misc/compat.el@${EMACS_FLAVOR}
-RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=28.1.1.0:misc/compat.el@${EMACS_FLAVOR}
+BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.3.4:misc/compat.el@${EMACS_FLAVOR}
+RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.3.4:misc/compat.el@${EMACS_FLAVOR}

 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit

-MAKE_ENV+=	LOAD_PATH="-L ${WRKSRC}/lisp -L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat"
+MAKE_ENV+=	LOAD_PATH="-L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat"
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	lisp info

--- a/editors/with-editor-devel/distinfo
+++ b/editors/with-editor-devel/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1677634317
-SHA256 (magit-with-editor-v3.2.0-40-g59867ae_GH0.tar.gz) = 99274a49826d4b662026311e24aff7db6b90e0b42f5ce297d54ee7c5591ea09f
-SIZE (magit-with-editor-v3.2.0-40-g59867ae_GH0.tar.gz) = 33263
+TIMESTAMP = 1683780276
+SHA256 (magit-with-editor-v3.2.0-41-gdf74385_GH0.tar.gz) = 0314b55eb9be423da4b604d3ea78acf605845f1c4ada161faece75554e0f1e8a
+SIZE (magit-with-editor-v3.2.0-41-gdf74385_GH0.tar.gz) = 33294
--- a/emulators/mame/files/target.ini.in
+++ b/emulators/mame/files/target.ini.in
@ -1,4 +1,4 @@
-#
+#
 # CORE CONFIGURATION OPTIONS
 #
 readconfig                1
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@ -4,7 +4,7 @@ CATEGORIES=	emulators
 MASTER_SITES=	GNU

 MAINTAINER=	skreuzer@FreeBSD.org
-COMMENT=	Collection of tools for manipulating MS-DOS files
+COMMENT=	Tools for manipulating MS-DOS disks and images
 WWW=		https://www.gnu.org/software/mtools/intro.html

 LICENSE=	GPLv3
--- a/emulators/mtools/files/patch-Makefile.in
+++ b/emulators/mtools/files/patch-Makefile.in
@ -1,6 +1,12 @@
 --- Makefile.in.orig	2022-10-09 09:55:19 UTC
 +++ Makefile.in
-@@ -77,6 +77,9 @@ mcd.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 mdu.1 mformat.1
+@@ -72,11 +72,14 @@ INSTALL_INFO	= @INSTALL_INFO@
+ .SUFFIXES: .o .c
+ .SUFFIXES: .o .c
+ 
+-MAN1 = floppyd.1 floppyd_installtest.1 mattrib.1 mbadblocks.1 mcat.1	\
+MAN1 = mattrib.1 mbadblocks.1 mcat.1	\
+ mcd.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 mdu.1 mformat.1	\
 minfo.1 mkmanifest.1 mlabel.1 mmd.1 mmount.1 mmove.1 mpartition.1	\
 mrd.1 mren.1 mshortname.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1	\
 mzip.1
@ -19,7 +25,7 @@
 
 LINKS=mattrib mcat mcd mcopy mdel mdeltree mdir mdu	\
 mformat minfo mlabel mmd mmount mmove mpartition mrd mren mtype	\
-@@ -264,11 +267,11 @@ install-links: $(DESTDIR)$(bindir)/mtools
+@@ -264,11 +267,9 @@ install-links: $(DESTDIR)$(bindir)/mtools
 install-scripts: $(DESTDIR)$(bindir)/mtools
 	@$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
 	@for j in $(SCRIPTS) ; do \
@ -29,8 +35,6 @@
 	done
 -	rm -f $(DESTDIR)$(bindir)/lz
 -	cd $(DESTDIR)$(bindir) && $(LN_S) uz lz
-+	#rm -f $(DESTDIR)$(bindir)/lz
-+	#cd $(DESTDIR)$(bindir) && $(LN_S) uz lz
 
 install-man:
 	@$(top_srcdir)/mkinstalldirs $(MAN1DIR)
--- a/emulators/mtools/pkg-descr
+++ b/emulators/mtools/pkg-descr
@ -1,3 +1,4 @@
-Mtools is a collection of utilities for accessing MS-DOS disks from Unix without
-mounting them. It supports Win95 style long file names, OS/2 Xdf disks, ZIP/JAZ
-disks, and 2m disks (store up to 1992k on a high density 3 1/2" disk).
+Mtools is a collection of utilities for accessing MS-DOS disks and file
+system images from Unix without mounting them.  It supports Win95-style
+long file names, OS/2 XDF-formatted disks, ZIP/JAZ disks, and 2MB disks
+(store up to 1992kB on a high-density 3.5" diskette).
--- a/emulators/pcemu/files/README.FreeBSD
+++ b/emulators/pcemu/files/README.FreeBSD
@ -1,7 +1,3 @@
-This is an excerpt of what you can see with the standalone "system".
- -- Jörg
-
-
 1. This looks like PC, but where is DOS? How to get pcemu really running

 Pcemu is an emulator that emulates an 8086 CPU as well as a bunch of
@ -102,7 +98,7 @@ need them.  It's not wise to make the whole BSD hierarchy available
 since DOS does not provide multiuser protection.

 Should you wish to override some of the emulator defaults like
-size and location of the bootfile, you can do this by settig up a
+size and location of the bootfile, you can do this by setting up a
 $HOME/.pcemurc file.  Refer to sections 2. and 3. below.


@ -110,14 +106,14 @@ $HOME/.pcemurc file.  Refer to sections 2. and 3. below.
 2. Information about this FreeBSD port


-This `port' of pcemu to FreeBSD has been prepared by Jörg Wunsch.  It
+This `port' of pcemu to FreeBSD has been prepared by Jörg Wunsch.  It
 is a modified version of David's code, a few problems have been fixed
 for the BSD compilation environment, the location of the default boot
 file has been moved in order to get you started with just what you are
 reading now.  Unfortunately David is no longer developing pcemu, so
 during the past years, a number of improvements have been added to the
 FreeBSD port.  Thanks to Arne Henrik Juul <arnej@math.ntnu.no> who
-submitted a large patchset, among them fixes to make harddisk access
+submitted a large patchset, among them fixes to make hard disk access
 work.

 The PostScript document David is mentioning under 3. below has
@ -128,20 +124,20 @@ been compressed and stored under
 It is huge however, so if you don't care much for it you might wish
 to remove it later.

-Since i'm living in Germany with a German keyboard, i found the
+Since I'm living in Germany with a German keyboard, I found the
 original X11 KeySym to PC scancode translation unacceptable.  Several
-scancodes have been unreachable for me.  Hence i decided to add another
+scancodes have been unreachable for me.  Hence I decided to add another
 section to the .pcemurc file allowing to instruct pcemu of specific
 keyboard layout semantics.  They consist of the keyword keymap,
 followed by the desired PC scancode, an equal sign, and the character
 that is generated for this key under X11 without any shift keys.  (Note
 that no space is allowed on either side of the equal sign.)  This way
-i won't get a German key mapping under DOS, but at least a valid keyboard
+I won't get a German key mapping under DOS, but at least a valid keyboard
 layout where all the scan codes can actually be generated at all.

 The appropriate section of my .pcemurc file looks like:

-keymap 12=ß
+keymap 12=ß
 keymap 13='
 keymap 21=z
 keymap 26=]
@ -155,7 +151,7 @@ keymap 53=-
 keymap 86=<

 Another recent addition to the .pcemurc file was the option to add
-floppy and hard disk defintions dynamically.  (Previously, everything
+floppy and hard disk definitions dynamically.  (Previously, everything
 needed to be compiled into the emulator.)  The syntax of those entries
 is:

@ -174,7 +170,3 @@ letting DOS tools access your hard disks...

 Should you wish to contact me regarding this FreeBSD port, you can
 reach me as joerg_wunsch@uriah.heep.sax.de.
-
-
-
-
--- a/emulators/pcemu/scripts/configure
+++ b/emulators/pcemu/scripts/configure
@ -1,6 +1,6 @@
 #!/bin/sh

-# Author:		Jörg Wunsch <joerg@FreeBSD.org>
+# Author:		Jörg Wunsch <joerg@FreeBSD.org>
 # Date of creation:	Mar 27, 1995
 #

--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.27-14980 # git rev-list --count HEAD
-DISTVERSIONSUFFIX=	-g195de818b6
+DISTVERSION=	0.0.27-14986 # git rev-list --count HEAD
+DISTVERSIONSUFFIX=	-gdb7f84f9f8
 CATEGORIES=	emulators wayland

 MAINTAINER=	jbeich@FreeBSD.org
@ -51,7 +51,7 @@ ELF_FEATURES=	+noaslr,wxneeded:bin/${PORTNAME}

 .if ${FLAVOR:U} == qt6 || make(makesum) || make(fetch)
 PATCH_SITES+=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/:qt6
-PATCHFILES+=	9e0b4ac56138.patch:-p1:qt6 # https://github.com/RPCS3/rpcs3/pull/12471
+PATCHFILES+=	1ca0470f02b2.patch:-p1:qt6 # https://github.com/RPCS3/rpcs3/pull/12471
 PKGNAMESUFFIX=	-${FLAVOR}
 USES:=		${USES:S/qt:5/qt:6/}
 USE_QT=		base multimedia svg
--- a/emulators/rpcs3/distinfo
+++ b/emulators/rpcs3/distinfo
@ -1,6 +1,6 @@
-TIMESTAMP = 1683395320
-SHA256 (RPCS3-rpcs3-v0.0.27-14980-g195de818b6_GH0.tar.gz) = 6a7789c7c33cc44318822093cc7c8b5a0283a35afce77efd1987995105b141fc
-SIZE (RPCS3-rpcs3-v0.0.27-14980-g195de818b6_GH0.tar.gz) = 8809993
+TIMESTAMP = 1683712854
+SHA256 (RPCS3-rpcs3-v0.0.27-14986-gdb7f84f9f8_GH0.tar.gz) = f82ff51be93d1f1c787bf270a2c23e79c751bd6f8bf2793857a503839d8a2f9c
+SIZE (RPCS3-rpcs3-v0.0.27-14986-gdb7f84f9f8_GH0.tar.gz) = 8811599
 SHA256 (RPCS3-hidapi-hidapi-0.13.1-2-gecf1b62_GH0.tar.gz) = a45fdf93aeb913407f0e707769b3ee7ac58bef6d44e299065ea1df038261ac1c
 SIZE (RPCS3-hidapi-hidapi-0.13.1-2-gecf1b62_GH0.tar.gz) = 245283
 SHA256 (RPCS3-soundtouch-2.3.1-16-g83cfba6_GH0.tar.gz) = 56863dbed27510742ed4ced54e9a5fba8658bcbfbb1cc5cdb978d7d537a3a874
@ -21,5 +21,5 @@ SHA256 (miniupnp-miniupnp-miniupnpd_2_3_3_GH0.tar.gz) = 166277d9c1b8d8241cc6bfaa
 SIZE (miniupnp-miniupnp-miniupnpd_2_3_3_GH0.tar.gz) = 454853
 SHA256 (wolfSSL-wolfssl-v5.6.0-stable_GH0.tar.gz) = c1e689e21a17aa9b838e67a37c3eadfa578c8e260f8c77fb028c0316309f0636
 SIZE (wolfSSL-wolfssl-v5.6.0-stable_GH0.tar.gz) = 21998970
-SHA256 (9e0b4ac56138.patch) = d3784457298181373f52fd762f863539f2fdd8c569e6eaa4cc6aec6e886004a8
-SIZE (9e0b4ac56138.patch) = 111593
+SHA256 (1ca0470f02b2.patch) = 20bddafca8afd62acfd68ee0869cc54a3ee77488bd745aa2c1ca05a4b050168b
+SIZE (1ca0470f02b2.patch) = 110744
--- a/emulators/yuzu/Makefile
+++ b/emulators/yuzu/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	yuzu
-PORTVERSION=	s20230507
+PORTVERSION=	s20230510
 CATEGORIES=	emulators wayland
 .if make(makesum)
 MASTER_SITES=	https://api.yuzu-emu.org/gamedb/?dummy=/:gamedb
@ -46,7 +46,7 @@ qt6_OPTIONS_EXCLUDE=	QT5

 USE_GITHUB=	yes
 GH_ACCOUNT=	yuzu-emu
-GH_TAGNAME=	a4362765a
+GH_TAGNAME=	b7f60e912
 GH_TUPLE=	yuzu-emu:mbedtls:v2.16.9-115-g8c88150ca:mbedtls/externals/mbedtls \
 		yuzu-emu:sirit:ab75463:sirit/externals/sirit \
 		KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-201-gc214f6f:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \
--- a/emulators/yuzu/distinfo
+++ b/emulators/yuzu/distinfo
@ -1,8 +1,8 @@
-TIMESTAMP = 1683506732
-SHA256 (yuzu-s20230507/compatibility_list.json) = 382db629d6b060af722a27dfa9cd6bb60ac16a7544c58322f63aa1be4c0c0fac
-SIZE (yuzu-s20230507/compatibility_list.json) = 1801327
-SHA256 (yuzu-emu-yuzu-s20230507-a4362765a_GH0.tar.gz) = 8ef6f295719bb270d119e424903e24b52dd288fe126818a59a20a0e4d1f3a468
-SIZE (yuzu-emu-yuzu-s20230507-a4362765a_GH0.tar.gz) = 5632055
+TIMESTAMP = 1683728748
+SHA256 (yuzu-s20230510/compatibility_list.json) = 382db629d6b060af722a27dfa9cd6bb60ac16a7544c58322f63aa1be4c0c0fac
+SIZE (yuzu-s20230510/compatibility_list.json) = 1801327
+SHA256 (yuzu-emu-yuzu-s20230510-b7f60e912_GH0.tar.gz) = d3184d97282254834321cf176d599bc0abe8c4129af38eca91b9a2041e5a94ee
+SIZE (yuzu-emu-yuzu-s20230510-b7f60e912_GH0.tar.gz) = 5633042
 SHA256 (yuzu-emu-mbedtls-v2.16.9-115-g8c88150ca_GH0.tar.gz) = 8cd6d075b4da0ad5fb995eb37390e2e6088be8d41ab1cdfc7e7e4256bd991450
 SIZE (yuzu-emu-mbedtls-v2.16.9-115-g8c88150ca_GH0.tar.gz) = 2679189
 SHA256 (yuzu-emu-sirit-ab75463_GH0.tar.gz) = 6b61e265be182b7a78075fc1b98ccf80fd33008343205dd0e22a10a439c45319
--- a/games/openbor/pkg-descr
+++ b/games/openbor/pkg-descr
@ -1,7 +1,7 @@
 OpenBOR is a royalty free sprite-based side scrolling gaming
 engine. From humble beginnings in 2004, it has since grown into the
 most versatile, easy to use, and powerful engine of its type you will
-find anywhere. OpenBOR is optimized for side-scrolling "beat 'em up"
+find anywhere. OpenBOR is optimized for side-scrolling beat 'em up
 style games (Double Dragon, Streets of Rage, Final Fight), but easily
 accommodates any sort of gameplay style and feature set you can
 imagine.
--- a/games/openrct2/Makefile
+++ b/games/openrct2/Makefile
@ -1,12 +1,11 @@
 PORTNAME=	openrct2
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.4.4
-PORTREVISION=	1
+DISTVERSION=	0.4.5
 CATEGORIES=	games
 MASTER_SITES=	https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.0/:sequence \
-		https://github.com/OpenRCT2/objects/releases/download/v1.3.8/:object \
-		https://github.com/OpenRCT2/OpenMusic/releases/download/v1.1.0/:openmsx \
-		https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v1.0.2/:opensfx
+		https://github.com/OpenRCT2/objects/releases/download/v1.3.11/:object \
+		https://github.com/OpenRCT2/OpenMusic/releases/download/v1.3.0/:openmsx \
+		https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v1.0.3/:opensfx
 DISTFILES=	title-sequences.zip:sequence \
 		objects.zip:object\
 		openmusic.zip:openmsx \
--- a/games/openrct2/distinfo
+++ b/games/openrct2/distinfo
@ -1,11 +1,11 @@
-TIMESTAMP = 1680053917
+TIMESTAMP = 1683665256
 SHA256 (title-sequences.zip) = 6e7c7b554717072bfc7acb96fd0101dc8e7f0ea0ea316367a05c2e92950c9029
 SIZE (title-sequences.zip) = 7945853
-SHA256 (objects.zip) = 84a95590d13a753b1d239f7f06c8d121e36fd28694b21f33646518e2012904ae
-SIZE (objects.zip) = 4583315
+SHA256 (objects.zip) = bf85d88e4fb11ca2e5915567390898747dc2459b3c7a057bdc32b829c91780b4
+SIZE (objects.zip) = 4705861
 SHA256 (openmusic.zip) = e53e1b6c25deb81a2e1c19130d2935daa7a6741a45b46dbb58fd713135a98728
 SIZE (openmusic.zip) = 9020863
-SHA256 (opensound.zip) = ab93e7d88190eec40b66cff84cacdb9fadc6b993fa769d4fd22ce9de98d5d22c
-SIZE (opensound.zip) = 3739001
-SHA256 (OpenRCT2-OpenRCT2-v0.4.4_GH0.tar.gz) = 18970bfffe49c77fa81ea6c295119b173a613c7310d7762963458e3e77c24913
-SIZE (OpenRCT2-OpenRCT2-v0.4.4_GH0.tar.gz) = 16554655
+SHA256 (opensound.zip) = 70be1b6ff8cc24ad8031a2e0cdd445b5dd3c52c886a8e5f70401f75152e4ae6c
+SIZE (opensound.zip) = 3820122
+SHA256 (OpenRCT2-OpenRCT2-v0.4.5_GH0.tar.gz) = eb9e20dc0dcbf10b02b5f334a029983a0a2b43d931f95a2088a64e8b2657bab1
+SIZE (OpenRCT2-OpenRCT2-v0.4.5_GH0.tar.gz) = 16809101
--- a/games/pysolfc/pkg-message
+++ b/games/pysolfc/pkg-message
@ -34,7 +34,7 @@ currently selected options for existing users.  If you want to use the new
 settings, you can delete or rename your options.cfg file.

 Also note that because of these changes, upgrading your version of PySolFC
-Cardsets is required even if you’re using the minimal package.  If you are
+Cardsets is required even if you're using the minimal package.  If you are
 installing from pkg/ports, this will be handled automatically.

 If you're using the larger collection of cardsets, please use the following
--- a/games/qudos/files/patch-srcclientsnd_dma.c
+++ b/games/qudos/files/patch-srcclientsnd_dma.c
@ -1,51 +1,16 @@
 --- src/client/snd_dma.c.orig	Fri Jun  9 16:42:59 2006
 +++ src/client/snd_dma.c	Thu Sep 13 20:17:11 2007
-@@ -1,27 +1,23 @@
- /*
- * Copyright (C) 1997-2001 Id Software, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- */
-/* snd_dma.c -- main control for any streaming sound output device */
-+Copyright (C) 1997-2001 Id Software, Inc.
+@@ -19,10 +19,6 @@
+  */
+ /* snd_dma.c -- main control for any streaming sound output device */
 
 -#include "client.h"
 -#include "snd_loc.h"
 -#include "snd_ogg.h"
-+This program is free software; you can redistribute it and/or
-+modify it under the terms of the GNU General Public License
-+as published by the Free Software Foundation; either version 2
-+of the License, or (at your option) any later version.
-+
-+This program is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-+
-+See the GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with this program; if not, write to the Free Software
-+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+
-+*/
-+// snd_dma.c -- main control for any streaming sound output device
- 
+-
 #if defined (__unix__)
 #include <sys/types.h>
+ #include <sys/stat.h>
@@ -31,26 +27,30 @@
 #include <dlfcn.h>
 #endif
--- a/games/qudos/files/patch-srcunixsnd_sdl.c
+++ b/games/qudos/files/patch-srcunixsnd_sdl.c
@ -1,59 +1,6 @@
 --- src/unix/snd_sdl.c.orig	Thu Sep 13 20:13:49 2007
 +++ src/unix/snd_sdl.c	Thu Sep 13 20:17:03 2007
-@@ -1,47 +1,47 @@
- /*
- * snd_sdl.c
- *
- * Sound code taken from SDLQuake and modified to work with Quake2 Robert Bäuml
- * 2001-12-25
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to:
- *
- * Free Software Foundation, Inc. 59 Temple Place - Suite 330 Boston, MA
- * 02111-1307, USA
- *
- * $Id: snd_sdl.c,v 1.2 2002/02/09 20:29:38 relnev Exp $
- */
-+	snd_sdl.c
-+
-+	Sound code taken from SDLQuake and modified to work with Quake2
-+	Robert Bï¿½ml 2001-12-25
-+
-+	This program is free software; you can redistribute it and/or
-+	modify it under the terms of the GNU General Public License
-+	as published by the Free Software Foundation; either version 2
-+	of the License, or (at your option) any later version.
-+
-+	This program is distributed in the hope that it will be useful,
-+	but WITHOUT ANY WARRANTY; without even the implied warranty of
-+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+
-+	See the GNU General Public License for more details.
-+
-+	You should have received a copy of the GNU General Public License
-+	along with this program; if not, write to:
-+
-+		Free Software Foundation, Inc.
-+		59 Temple Place - Suite 330
-+		Boston, MA  02111-1307, USA
-+
-+	$Id: snd_sdl.c,v 1.2 2002/02/09 20:29:38 relnev Exp $
-+*/
- 
- #include "SDL.h"
- 
+@@ -29,19 +29,18 @@
 #include "../client/client.h"
 #include "../client/snd_loc.h"
 
--- a/games/sgt-puzzles/Makefile
+++ b/games/sgt-puzzles/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	puzzles
-PORTVERSION=	20230504
+PORTVERSION=	20230508
 CATEGORIES=	games
 # upstream does not preserve older versions, mirroring is mandatory
 MASTER_SITES=	https://www.chiark.greenend.org.uk/~sgtatham/puzzles/ \
@ -20,7 +20,7 @@ USES=		cmake gnome magick:build perl5 pkgconfig
 USE_PERL5=	build
 CMAKE_ARGS=	-DNAME_PREFIX:STRING=sgt-

-COMMITHASH=	63346a8
+COMMITHASH=	8237b02

 DATADIR=	${PREFIX}/share/sgt-puzzles
 PORTDATA=	*
--- a/games/sgt-puzzles/distinfo
+++ b/games/sgt-puzzles/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1683314874
-SHA256 (puzzles-20230504.63346a8.tar.gz) = dcb11b3366e909235fecc5309ab254a968188b30790f0be76d41a5f911a0745b
-SIZE (puzzles-20230504.63346a8.tar.gz) = 2080111
+TIMESTAMP = 1683744271
+SHA256 (puzzles-20230508.8237b02.tar.gz) = 5ca75ff1fda1e428a9f5b85d9147d32c5ff61bb9443d647131b11f0c96d750cd
+SIZE (puzzles-20230508.8237b02.tar.gz) = 2080218
--- a/games/tome4/Makefile
+++ b/games/tome4/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	tome4
 DISTVERSION?=	1.7.5
+PORTREVISION?=	0
 CATEGORIES=	games
 MASTER_SITES=	https://te4.org/dl/t-engine/ \
 		SF/lifanov-ports-distfiles/${PORTNAME}/:icons
--- a/games/veloren-weekly/Makefile
+++ b/games/veloren-weekly/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	veloren
-PORTVERSION=	s20230506
+PORTVERSION=	s20230510
 CATEGORIES=	games wayland
 PKGNAMESUFFIX=	-weekly

@ -24,7 +24,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-pl
 USES=		cargo xorg
 USE_XORG=	xcb
 USE_GITLAB=	yes
-GL_COMMIT=	95a38ff8f60d8895461971eb1266a5530cca8cce
+GL_COMMIT=	db860de51760d94e1f501390c5e1f472d89a8db7
 CARGO_ENV=	VELOREN_USERDATA_STRATEGY=system SHADERC_LIB_DIR="${LOCALBASE}/lib"
 PLIST_FILES=	bin/${PORTNAME}-server-cli \
 		bin/${PORTNAME}-voxygen \
@ -60,6 +60,13 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/share,${DATADIR:H},' \
 		${WRKSRC}/common/assets/src/lib.rs

+do-install:
+# XXX [workspace.dependencies] breaks rebuild in subdirs
+.for f in ${CARGO_INSTALL_PATH}
+	${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/*/*/${PORTNAME}-$f \
+		${STAGEDIR}${PREFIX}/bin
+.endfor
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} assets ${STAGEDIR}${DATADIR})
--- a/games/veloren-weekly/Makefile.crates
+++ b/games/veloren-weekly/Makefile.crates
@ -188,7 +188,6 @@ CARGO_CRATES=	ab_glyph-0.2.21 \
 		enumset_derive-0.7.0 \
 		epaint-0.12.0 \
 		epi-0.12.0 \
-		errno-0.2.8 \
 		errno-0.3.1 \
 		errno-dragonfly-0.1.2 \
 		error-code-2.3.1 \
@ -199,7 +198,7 @@ CARGO_CRATES=	ab_glyph-0.2.21 \
 		fallible-iterator-0.2.0 \
 		fallible-streaming-iterator-0.1.9 \
 		fastrand-1.9.0 \
-		fd-lock-3.0.4 \
+		fd-lock-3.0.12 \
 		fdeflate-0.3.0 \
 		fehler-1.0.0 \
 		fehler-macros-1.0.0 \
@ -283,7 +282,6 @@ CARGO_CRATES=	ab_glyph-0.2.21 \
 		instant-0.1.12 \
 		intl_pluralrules-7.0.2 \
 		io-kit-sys-0.3.0 \
-		io-lifetimes-0.5.3 \
 		io-lifetimes-1.0.10 \
 		is-terminal-0.4.7 \
 		itertools-0.10.5 \
@ -317,7 +315,6 @@ CARGO_CRATES=	ab_glyph-0.2.21 \
 		libudev-sys-0.1.4 \
 		link-cplusplus-1.0.8 \
 		linked-hash-map-0.5.6 \
-		linux-raw-sys-0.0.42 \
 		linux-raw-sys-0.3.7 \
 		lock_api-0.3.4 \
 		lock_api-0.4.9 \
@ -344,7 +341,7 @@ CARGO_CRATES=	ab_glyph-0.2.21 \
 		miniz_oxide-0.6.2 \
 		miniz_oxide-0.7.1 \
 		mio-0.7.14 \
-		mio-0.8.2 \
+		mio-0.8.6 \
 		mio-misc-1.2.2 \
 		miow-0.3.7 \
 		mopa-0.2.2 \
@ -372,7 +369,6 @@ CARGO_CRATES=	ab_glyph-0.2.21 \
 		noise-0.7.0 \
 		nom-7.1.3 \
 		notify-5.1.0 \
-		ntapi-0.3.7 \
 		nu-ansi-term-0.46.0 \
 		num-0.2.1 \
 		num-0.4.0 \
@ -412,10 +408,10 @@ CARGO_CRATES=	ab_glyph-0.2.21 \
 		packed_simd_2-0.3.8 \
 		parking_lot-0.10.2 \
 		parking_lot-0.11.2 \
-		parking_lot-0.12.0 \
+		parking_lot-0.12.1 \
 		parking_lot_core-0.7.3 \
 		parking_lot_core-0.8.6 \
-		parking_lot_core-0.9.2 \
+		parking_lot_core-0.9.7 \
 		parse-zoneinfo-0.3.0 \
 		paste-1.0.12 \
 		peeking_take_while-0.1.2 \
@ -499,7 +495,6 @@ CARGO_CRATES=	ab_glyph-0.2.21 \
 		rmp-serde-1.1.1 \
 		rodio-0.15.0 \
 		ron-0.6.6 \
-		ron-0.7.1 \
 		ron-0.8.0 \
 		roots-0.0.6 \
 		rose_tree-0.2.0 \
@ -511,7 +506,6 @@ CARGO_CRATES=	ab_glyph-0.2.21 \
 		rustc-hash-1.1.0 \
 		rustc_version-0.2.3 \
 		rustc_version-0.4.0 \
-		rustix-0.33.7 \
 		rustix-0.37.19 \
 		rustls-0.19.1 \
 		rustls-0.20.8 \
@ -527,6 +521,7 @@ CARGO_CRATES=	ab_glyph-0.2.21 \
 		ryu-1.0.13 \
 		same-file-1.0.6 \
 		schannel-0.1.19 \
+		schnellru-0.2.1 \
 		scoped-tls-1.0.1 \
 		scopeguard-1.1.0 \
 		scratch-1.0.5 \
@ -621,8 +616,8 @@ CARGO_CRATES=	ab_glyph-0.2.21 \
 		tinytemplate-1.2.1 \
 		tinyvec-1.6.0 \
 		tinyvec_macros-0.1.1 \
-		tokio-1.20.0 \
-		tokio-macros-1.8.2 \
+		tokio-1.28.0 \
+		tokio-macros-2.1.0 \
 		tokio-rustls-0.22.0 \
 		tokio-stream-0.1.14 \
 		tokio-util-0.7.1 \
@ -723,9 +718,7 @@ CARGO_CRATES=	ab_glyph-0.2.21 \
 		window_clipboard-0.2.4 \
 		windows-0.37.0 \
 		windows-0.48.0 \
-		windows-sys-0.30.0 \
 		windows-sys-0.33.0 \
-		windows-sys-0.34.0 \
 		windows-sys-0.42.0 \
 		windows-sys-0.45.0 \
 		windows-sys-0.48.0 \
@ -733,35 +726,25 @@ CARGO_CRATES=	ab_glyph-0.2.21 \
 		windows-targets-0.48.0 \
 		windows_aarch64_gnullvm-0.42.2 \
 		windows_aarch64_gnullvm-0.48.0 \
-		windows_aarch64_msvc-0.30.0 \
 		windows_aarch64_msvc-0.33.0 \
-		windows_aarch64_msvc-0.34.0 \
 		windows_aarch64_msvc-0.37.0 \
 		windows_aarch64_msvc-0.42.2 \
 		windows_aarch64_msvc-0.48.0 \
-		windows_i686_gnu-0.30.0 \
 		windows_i686_gnu-0.33.0 \
-		windows_i686_gnu-0.34.0 \
 		windows_i686_gnu-0.37.0 \
 		windows_i686_gnu-0.42.2 \
 		windows_i686_gnu-0.48.0 \
-		windows_i686_msvc-0.30.0 \
 		windows_i686_msvc-0.33.0 \
-		windows_i686_msvc-0.34.0 \
 		windows_i686_msvc-0.37.0 \
 		windows_i686_msvc-0.42.2 \
 		windows_i686_msvc-0.48.0 \
-		windows_x86_64_gnu-0.30.0 \
 		windows_x86_64_gnu-0.33.0 \
-		windows_x86_64_gnu-0.34.0 \
 		windows_x86_64_gnu-0.37.0 \
 		windows_x86_64_gnu-0.42.2 \
 		windows_x86_64_gnu-0.48.0 \
 		windows_x86_64_gnullvm-0.42.2 \
 		windows_x86_64_gnullvm-0.48.0 \
-		windows_x86_64_msvc-0.30.0 \
 		windows_x86_64_msvc-0.33.0 \
-		windows_x86_64_msvc-0.34.0 \
 		windows_x86_64_msvc-0.37.0 \
 		windows_x86_64_msvc-0.42.2 \
 		windows_x86_64_msvc-0.48.0 \
@ -787,6 +770,7 @@ CARGO_CRATES=	ab_glyph-0.2.21 \
 		yasna-0.5.2 \
 		wgpu-profiler@git+https://github.com/Imberflur/wgpu-profiler?tag=wgpu-0.8\#b156eb145bc223386ef344860d9b33b3c181650c \
 		tui@git+https://github.com/fdehau/tui-rs.git?branch=paragraph-scroll\#54b841fab6cfdb38e8dc1382176e965787964b4c \
+		ntapi@git+https://github.com/MSxDOS/ntapi.git?rev=9f56b149c9e25796739157c0fce3e0007a7de6eb\#9f56b149c9e25796739157c0fce3e0007a7de6eb \
 		fluent,fluent-bundle,fluent-syntax,intl-memoizer@git+https://github.com/juliancoffee/fluent-rs.git?branch=patched\#929cf9512de121cce9b4cbf1cb860cd3294a1cd9 \
 		auth-common,authc@git+https://gitlab.com/veloren/auth.git?rev=fb3dcbc4962b367253f8f2f92760ef44d2679c9a\#fb3dcbc4962b367253f8f2f92760ef44d2679c9a \
 		iced_core,iced_futures,iced_graphics,iced_native,iced_style,iced_winit@git+https://github.com/Imberflur/iced?tag=winit-0.25\#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb \
--- a/games/veloren-weekly/distinfo
+++ b/games/veloren-weekly/distinfo
@ -1,4 +1,4 @@
-TIMESTAMP = 1683349940
+TIMESTAMP = 1683755570
 SHA256 (rust/crates/ab_glyph-0.2.21.crate) = 5110f1c78cf582855d895ecd0746b653db010cec6d9f5575293f27934d980a39
 SIZE (rust/crates/ab_glyph-0.2.21.crate) = 17764
 SHA256 (rust/crates/ab_glyph_rasterizer-0.1.8.crate) = c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046
@ -379,8 +379,6 @@ SHA256 (rust/crates/epaint-0.12.0.crate) = 80e2db640801230bdda80629bc3a063927a46
 SIZE (rust/crates/epaint-0.12.0.crate) = 672262
 SHA256 (rust/crates/epi-0.12.0.crate) = 59c4f6cbede1fc8f836384f85295a59199a4825940abcc3a8a29cfe2e3c37583
 SIZE (rust/crates/epi-0.12.0.crate) = 6678
-SHA256 (rust/crates/errno-0.2.8.crate) = f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1
-SIZE (rust/crates/errno-0.2.8.crate) = 9276
 SHA256 (rust/crates/errno-0.3.1.crate) = 4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a
 SIZE (rust/crates/errno-0.3.1.crate) = 10348
 SHA256 (rust/crates/errno-dragonfly-0.1.2.crate) = aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf
@ -401,8 +399,8 @@ SHA256 (rust/crates/fallible-streaming-iterator-0.1.9.crate) = 7360491ce676a36bf
 SIZE (rust/crates/fallible-streaming-iterator-0.1.9.crate) = 9249
 SHA256 (rust/crates/fastrand-1.9.0.crate) = e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be
 SIZE (rust/crates/fastrand-1.9.0.crate) = 11910
-SHA256 (rust/crates/fd-lock-3.0.4.crate) = 02ecad9808e0596f8956d14f7fa868f996290bd01c8d7329d6e5bc2bb76adf8f
-SIZE (rust/crates/fd-lock-3.0.4.crate) = 13381
+SHA256 (rust/crates/fd-lock-3.0.12.crate) = 39ae6b3d9530211fb3b12a95374b8b0823be812f53d09e18c5675c0146b09642
+SIZE (rust/crates/fd-lock-3.0.12.crate) = 13692
 SHA256 (rust/crates/fdeflate-0.3.0.crate) = d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10
 SIZE (rust/crates/fdeflate-0.3.0.crate) = 21790
 SHA256 (rust/crates/fehler-1.0.0.crate) = d5729fe49ba028cd550747b6e62cd3d841beccab5390aa398538c31a2d983635
@ -569,8 +567,6 @@ SHA256 (rust/crates/intl_pluralrules-7.0.2.crate) = 078ea7b7c29a2b4df841a7f6ac87
 SIZE (rust/crates/intl_pluralrules-7.0.2.crate) = 9201
 SHA256 (rust/crates/io-kit-sys-0.3.0.crate) = 9b2d4429acc1deff0fbdece0325b4997bdb02b2c245ab7023fd5deca0f6348de
 SIZE (rust/crates/io-kit-sys-0.3.0.crate) = 38799
-SHA256 (rust/crates/io-lifetimes-0.5.3.crate) = ec58677acfea8a15352d42fc87d11d63596ade9239e0a7c9352914417515dbe6
-SIZE (rust/crates/io-lifetimes-0.5.3.crate) = 37540
 SHA256 (rust/crates/io-lifetimes-1.0.10.crate) = 9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220
 SIZE (rust/crates/io-lifetimes-1.0.10.crate) = 37294
 SHA256 (rust/crates/is-terminal-0.4.7.crate) = adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f
@ -637,8 +633,6 @@ SHA256 (rust/crates/link-cplusplus-1.0.8.crate) = ecd207c9c713c34f95a097a5b029ac
 SIZE (rust/crates/link-cplusplus-1.0.8.crate) = 7674
 SHA256 (rust/crates/linked-hash-map-0.5.6.crate) = 0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f
 SIZE (rust/crates/linked-hash-map-0.5.6.crate) = 15049
-SHA256 (rust/crates/linux-raw-sys-0.0.42.crate) = 5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7
-SIZE (rust/crates/linux-raw-sys-0.0.42.crate) = 756837
 SHA256 (rust/crates/linux-raw-sys-0.3.7.crate) = ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f
 SIZE (rust/crates/linux-raw-sys-0.3.7.crate) = 1013423
 SHA256 (rust/crates/lock_api-0.3.4.crate) = c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75
@ -691,8 +685,8 @@ SHA256 (rust/crates/miniz_oxide-0.7.1.crate) = e7810e0be55b428ada41041c41f32c9f1
 SIZE (rust/crates/miniz_oxide-0.7.1.crate) = 55194
 SHA256 (rust/crates/mio-0.7.14.crate) = 8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc
 SIZE (rust/crates/mio-0.7.14.crate) = 87429
-SHA256 (rust/crates/mio-0.8.2.crate) = 52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9
-SIZE (rust/crates/mio-0.8.2.crate) = 88272
+SHA256 (rust/crates/mio-0.8.6.crate) = 5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9
+SIZE (rust/crates/mio-0.8.6.crate) = 93658
 SHA256 (rust/crates/mio-misc-1.2.2.crate) = b47412f3a52115b936ff2a229b803498c7b4d332adeb87c2f1498c9da54c398c
 SIZE (rust/crates/mio-misc-1.2.2.crate) = 11898
 SHA256 (rust/crates/miow-0.3.7.crate) = b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21
@ -747,8 +741,6 @@ SHA256 (rust/crates/nom-7.1.3.crate) = d273983c5a657a70a3e8f2a01329822f3b8c8172b
 SIZE (rust/crates/nom-7.1.3.crate) = 117570
 SHA256 (rust/crates/notify-5.1.0.crate) = 58ea850aa68a06e48fdb069c0ec44d0d64c8dbffa49bf3b6f7f0a901fdea1ba9
 SIZE (rust/crates/notify-5.1.0.crate) = 37269
-SHA256 (rust/crates/ntapi-0.3.7.crate) = c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f
-SIZE (rust/crates/ntapi-0.3.7.crate) = 126994
 SHA256 (rust/crates/nu-ansi-term-0.46.0.crate) = 77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84
 SIZE (rust/crates/nu-ansi-term-0.46.0.crate) = 24311
 SHA256 (rust/crates/num-0.2.1.crate) = b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36
@ -827,14 +819,14 @@ SHA256 (rust/crates/parking_lot-0.10.2.crate) = d3a704eb390aafdc107b0e392f56a82b
 SIZE (rust/crates/parking_lot-0.10.2.crate) = 39536
 SHA256 (rust/crates/parking_lot-0.11.2.crate) = 7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99
 SIZE (rust/crates/parking_lot-0.11.2.crate) = 39869
-SHA256 (rust/crates/parking_lot-0.12.0.crate) = 87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58
-SIZE (rust/crates/parking_lot-0.12.0.crate) = 39761
+SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f
+SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967
 SHA256 (rust/crates/parking_lot_core-0.7.3.crate) = b93f386bb233083c799e6e642a9d73db98c24a5deeb95ffc85bf281255dffc98
 SIZE (rust/crates/parking_lot_core-0.7.3.crate) = 33855
 SHA256 (rust/crates/parking_lot_core-0.8.6.crate) = 60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc
 SIZE (rust/crates/parking_lot_core-0.8.6.crate) = 32567
-SHA256 (rust/crates/parking_lot_core-0.9.2.crate) = 995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37
-SIZE (rust/crates/parking_lot_core-0.9.2.crate) = 32254
+SHA256 (rust/crates/parking_lot_core-0.9.7.crate) = 9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521
+SIZE (rust/crates/parking_lot_core-0.9.7.crate) = 32412
 SHA256 (rust/crates/parse-zoneinfo-0.3.0.crate) = c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41
 SIZE (rust/crates/parse-zoneinfo-0.3.0.crate) = 76590
 SHA256 (rust/crates/paste-1.0.12.crate) = 9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79
@ -1001,8 +993,6 @@ SHA256 (rust/crates/rodio-0.15.0.crate) = ec0939e9f626e6c6f1989adb6226a039c855ca
 SIZE (rust/crates/rodio-0.15.0.crate) = 7414161
 SHA256 (rust/crates/ron-0.6.6.crate) = 86018df177b1beef6c7c8ef949969c4f7cb9a9344181b92486b23c79995bdaa4
 SIZE (rust/crates/ron-0.6.6.crate) = 45107
-SHA256 (rust/crates/ron-0.7.1.crate) = 88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a
-SIZE (rust/crates/ron-0.7.1.crate) = 53572
 SHA256 (rust/crates/ron-0.8.0.crate) = 300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff
 SIZE (rust/crates/ron-0.8.0.crate) = 57013
 SHA256 (rust/crates/roots-0.0.6.crate) = 84348444bd7ad45729d0c49a4240d7cdc11c9d512c06c5ad1835c1ad4acda6db
@ -1025,8 +1015,6 @@ SHA256 (rust/crates/rustc_version-0.2.3.crate) = 138e3e0acb6c9fb258b19b67cb8abd6
 SIZE (rust/crates/rustc_version-0.2.3.crate) = 10210
 SHA256 (rust/crates/rustc_version-0.4.0.crate) = bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366
 SIZE (rust/crates/rustc_version-0.4.0.crate) = 12175
-SHA256 (rust/crates/rustix-0.33.7.crate) = 938a344304321a9da4973b9ff4f9f8db9caf4597dfd9dda6a60b523340a0fff0
-SIZE (rust/crates/rustix-0.33.7.crate) = 268622
 SHA256 (rust/crates/rustix-0.37.19.crate) = acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d
 SIZE (rust/crates/rustix-0.37.19.crate) = 323809
 SHA256 (rust/crates/rustls-0.19.1.crate) = 35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7
@ -1057,6 +1045,8 @@ SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e
 SIZE (rust/crates/same-file-1.0.6.crate) = 10183
 SHA256 (rust/crates/schannel-0.1.19.crate) = 8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75
 SIZE (rust/crates/schannel-0.1.19.crate) = 42755
+SHA256 (rust/crates/schnellru-0.2.1.crate) = 772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d
+SIZE (rust/crates/schnellru-0.2.1.crate) = 22458
 SHA256 (rust/crates/scoped-tls-1.0.1.crate) = e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294
 SIZE (rust/crates/scoped-tls-1.0.1.crate) = 8202
 SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd
@ -1245,10 +1235,10 @@ SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a465126
 SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991
 SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20
 SIZE (rust/crates/tinyvec_macros-0.1.1.crate) = 5865
-SHA256 (rust/crates/tokio-1.20.0.crate) = 57aec3cfa4c296db7255446efb4928a6be304b431a806216105542a67b6ca82e
-SIZE (rust/crates/tokio-1.20.0.crate) = 589938
-SHA256 (rust/crates/tokio-macros-1.8.2.crate) = d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8
-SIZE (rust/crates/tokio-macros-1.8.2.crate) = 10071
+SHA256 (rust/crates/tokio-1.28.0.crate) = c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f
+SIZE (rust/crates/tokio-1.28.0.crate) = 660469
+SHA256 (rust/crates/tokio-macros-2.1.0.crate) = 630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e
+SIZE (rust/crates/tokio-macros-2.1.0.crate) = 11472
 SHA256 (rust/crates/tokio-rustls-0.22.0.crate) = bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6
 SIZE (rust/crates/tokio-rustls-0.22.0.crate) = 22706
 SHA256 (rust/crates/tokio-stream-0.1.14.crate) = 397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842
@ -1449,12 +1439,8 @@ SHA256 (rust/crates/windows-0.37.0.crate) = 57b543186b344cc61c85b5aab0d2e3adf4e0
 SIZE (rust/crates/windows-0.37.0.crate) = 14060820
 SHA256 (rust/crates/windows-0.48.0.crate) = e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f
 SIZE (rust/crates/windows-0.48.0.crate) = 11864177
-SHA256 (rust/crates/windows-sys-0.30.0.crate) = 030b7ff91626e57a05ca64a07c481973cbb2db774e4852c9c7ca342408c6a99a
-SIZE (rust/crates/windows-sys-0.30.0.crate) = 3256610
 SHA256 (rust/crates/windows-sys-0.33.0.crate) = 43dbb096663629518eb1dfa72d80243ca5a6aca764cae62a2df70af760a9be75
 SIZE (rust/crates/windows-sys-0.33.0.crate) = 3355291
-SHA256 (rust/crates/windows-sys-0.34.0.crate) = 5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825
-SIZE (rust/crates/windows-sys-0.34.0.crate) = 3369228
 SHA256 (rust/crates/windows-sys-0.42.0.crate) = 5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7
 SIZE (rust/crates/windows-sys-0.42.0.crate) = 3006791
 SHA256 (rust/crates/windows-sys-0.45.0.crate) = 75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0
@ -1469,48 +1455,32 @@ SHA256 (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 597a5118570b68bc08d8
 SIZE (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 364071
 SHA256 (rust/crates/windows_aarch64_gnullvm-0.48.0.crate) = 91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc
 SIZE (rust/crates/windows_aarch64_gnullvm-0.48.0.crate) = 366543
-SHA256 (rust/crates/windows_aarch64_msvc-0.30.0.crate) = 29277a4435d642f775f63c7d1faeb927adba532886ce0287bd985bffb16b6bca
-SIZE (rust/crates/windows_aarch64_msvc-0.30.0.crate) = 669666
 SHA256 (rust/crates/windows_aarch64_msvc-0.33.0.crate) = cd761fd3eb9ab8cc1ed81e56e567f02dd82c4c837e48ac3b2181b9ffc5060807
 SIZE (rust/crates/windows_aarch64_msvc-0.33.0.crate) = 674447
-SHA256 (rust/crates/windows_aarch64_msvc-0.34.0.crate) = 17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d
-SIZE (rust/crates/windows_aarch64_msvc-0.34.0.crate) = 674445
 SHA256 (rust/crates/windows_aarch64_msvc-0.37.0.crate) = 2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a
 SIZE (rust/crates/windows_aarch64_msvc-0.37.0.crate) = 661960
 SHA256 (rust/crates/windows_aarch64_msvc-0.42.2.crate) = e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43
 SIZE (rust/crates/windows_aarch64_msvc-0.42.2.crate) = 666981
 SHA256 (rust/crates/windows_aarch64_msvc-0.48.0.crate) = b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3
 SIZE (rust/crates/windows_aarch64_msvc-0.48.0.crate) = 671479
-SHA256 (rust/crates/windows_i686_gnu-0.30.0.crate) = 1145e1989da93956c68d1864f32fb97c8f561a8f89a5125f6a2b7ea75524e4b8
-SIZE (rust/crates/windows_i686_gnu-0.30.0.crate) = 774464
 SHA256 (rust/crates/windows_i686_gnu-0.33.0.crate) = cab0cf703a96bab2dc0c02c0fa748491294bf9b7feb27e1f4f96340f208ada0e
 SIZE (rust/crates/windows_i686_gnu-0.33.0.crate) = 772346
-SHA256 (rust/crates/windows_i686_gnu-0.34.0.crate) = 2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed
-SIZE (rust/crates/windows_i686_gnu-0.34.0.crate) = 772343
 SHA256 (rust/crates/windows_i686_gnu-0.37.0.crate) = d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1
 SIZE (rust/crates/windows_i686_gnu-0.37.0.crate) = 818111
 SHA256 (rust/crates/windows_i686_gnu-0.42.2.crate) = c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f
 SIZE (rust/crates/windows_i686_gnu-0.42.2.crate) = 736236
 SHA256 (rust/crates/windows_i686_gnu-0.48.0.crate) = 622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241
 SIZE (rust/crates/windows_i686_gnu-0.48.0.crate) = 741490
-SHA256 (rust/crates/windows_i686_msvc-0.30.0.crate) = d4a09e3a0d4753b73019db171c1339cd4362c8c44baf1bcea336235e955954a6
-SIZE (rust/crates/windows_i686_msvc-0.30.0.crate) = 732295
 SHA256 (rust/crates/windows_i686_msvc-0.33.0.crate) = 8cfdbe89cc9ad7ce618ba34abc34bbb6c36d99e96cae2245b7943cd75ee773d0
 SIZE (rust/crates/windows_i686_msvc-0.33.0.crate) = 733499
-SHA256 (rust/crates/windows_i686_msvc-0.34.0.crate) = 9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956
-SIZE (rust/crates/windows_i686_msvc-0.34.0.crate) = 733497
 SHA256 (rust/crates/windows_i686_msvc-0.37.0.crate) = ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c
 SIZE (rust/crates/windows_i686_msvc-0.37.0.crate) = 724577
 SHA256 (rust/crates/windows_i686_msvc-0.42.2.crate) = 44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060
 SIZE (rust/crates/windows_i686_msvc-0.42.2.crate) = 724951
 SHA256 (rust/crates/windows_i686_msvc-0.48.0.crate) = 4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00
 SIZE (rust/crates/windows_i686_msvc-0.48.0.crate) = 730056
-SHA256 (rust/crates/windows_x86_64_gnu-0.30.0.crate) = 8ca64fcb0220d58db4c119e050e7af03c69e6f4f415ef69ec1773d9aab422d5a
-SIZE (rust/crates/windows_x86_64_gnu-0.30.0.crate) = 743236
 SHA256 (rust/crates/windows_x86_64_gnu-0.33.0.crate) = b4dd9b0c0e9ece7bb22e84d70d01b71c6d6248b81a3c60d11869451b4cb24784
 SIZE (rust/crates/windows_x86_64_gnu-0.33.0.crate) = 744302
-SHA256 (rust/crates/windows_x86_64_gnu-0.34.0.crate) = cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4
-SIZE (rust/crates/windows_x86_64_gnu-0.34.0.crate) = 744301
 SHA256 (rust/crates/windows_x86_64_gnu-0.37.0.crate) = 2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d
 SIZE (rust/crates/windows_x86_64_gnu-0.37.0.crate) = 790933
 SHA256 (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36
@ -1521,12 +1491,8 @@ SHA256 (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 26d41b46a36d453748aed
 SIZE (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 364068
 SHA256 (rust/crates/windows_x86_64_gnullvm-0.48.0.crate) = 7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953
 SIZE (rust/crates/windows_x86_64_gnullvm-0.48.0.crate) = 366536
-SHA256 (rust/crates/windows_x86_64_msvc-0.30.0.crate) = 08cabc9f0066848fef4bc6a1c1668e6efce38b661d2aeec75d18d8617eebb5f1
-SIZE (rust/crates/windows_x86_64_msvc-0.30.0.crate) = 668972
 SHA256 (rust/crates/windows_x86_64_msvc-0.33.0.crate) = ff1e4aa646495048ec7f3ffddc411e1d829c026a2ec62b39da15c1055e406eaa
 SIZE (rust/crates/windows_x86_64_msvc-0.33.0.crate) = 669901
-SHA256 (rust/crates/windows_x86_64_msvc-0.34.0.crate) = d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9
-SIZE (rust/crates/windows_x86_64_msvc-0.34.0.crate) = 669900
 SHA256 (rust/crates/windows_x86_64_msvc-0.37.0.crate) = f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d
 SIZE (rust/crates/windows_x86_64_msvc-0.37.0.crate) = 661993
 SHA256 (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0
@ -1577,6 +1543,8 @@ SHA256 (Imberflur-wgpu-profiler-wgpu-0.8_GH0.tar.gz) = e30fa6d177db9c77c8f938a0b
 SIZE (Imberflur-wgpu-profiler-wgpu-0.8_GH0.tar.gz) = 14759
 SHA256 (fdehau-tui-rs-54b841fab6cfdb38e8dc1382176e965787964b4c_GH0.tar.gz) = 920e26b3816975b77f9111206aec5859560141e222bef2d539c05894798ac4ba
 SIZE (fdehau-tui-rs-54b841fab6cfdb38e8dc1382176e965787964b4c_GH0.tar.gz) = 1531288
+SHA256 (MSxDOS-ntapi-9f56b149c9e25796739157c0fce3e0007a7de6eb_GH0.tar.gz) = 8fb5cffa8c7196189f5cf4483275c803598620cc6e03fdc875102f7fa3986767
+SIZE (MSxDOS-ntapi-9f56b149c9e25796739157c0fce3e0007a7de6eb_GH0.tar.gz) = 186924
 SHA256 (juliancoffee-fluent-rs-929cf9512de121cce9b4cbf1cb860cd3294a1cd9_GH0.tar.gz) = b1666caeb396b844788a732346e8ab6e555190978efe7a6386469040959acebf
 SIZE (juliancoffee-fluent-rs-929cf9512de121cce9b4cbf1cb860cd3294a1cd9_GH0.tar.gz) = 351345
 SHA256 (veloren-auth-fb3dcbc4962b367253f8f2f92760ef44d2679c9a_GL0.tar.gz) = b2d4945ddb39ad719985b189fb720350ab86df94332f362a0e4477d7a2a774a3
@ -1597,5 +1565,5 @@ SHA256 (hasenbanck-egui_wgpu_backend-63a002c6a9b6c016e45806dd065864431caab621_GH
 SIZE (hasenbanck-egui_wgpu_backend-63a002c6a9b6c016e45806dd065864431caab621_GH0.tar.gz) = 11500
 SHA256 (yoanlcq-vek-84d5cb65841d46599a986c5477341bea4456be26_GH0.tar.gz) = f6fc0b8e9b1290729ea94865be84a8c47846e49e3c193dab700940e1452d2fed
 SIZE (yoanlcq-vek-84d5cb65841d46599a986c5477341bea4456be26_GH0.tar.gz) = 90485
-SHA256 (veloren-veloren-95a38ff8f60d8895461971eb1266a5530cca8cce_GL0.tar.gz) = 37a2cd42a300c8c0f3fe4a794cb18d2c3c86114c53d0f3a0c50ae038092c59ba
-SIZE (veloren-veloren-95a38ff8f60d8895461971eb1266a5530cca8cce_GL0.tar.gz) = 263353066
+SHA256 (veloren-veloren-db860de51760d94e1f501390c5e1f472d89a8db7_GL0.tar.gz) = f26615339514f26bdd85d643266a3f4eb5f627d1c15931f70fe3f4d053a86b6f
+SIZE (veloren-veloren-db860de51760d94e1f501390c5e1f472d89a8db7_GL0.tar.gz) = 263372562
--- a/games/veloren-weekly/files/patch-rust-1.69
+++ b/games/veloren-weekly/files/patch-rust-1.69
@ -0,0 +1,475 @@
+Revert https://gitlab.com/veloren/veloren/-/commit/95bca5418af7
+until lang/rust >= 1.70 update e.g.,
+
+https://github.com/rust-lang/rust/commit/8a7ca936e61d
+
+error[E0658]: use of unstable library feature 'once_cell'
+   --> voxygen/src/scene/terrain.rs:620:20
+    |
+620 |         let init = core::cell::OnceCell::new();
+    |                    ^^^^^^^^^^^^^^^^^^^^
+    |
+    = note: see issue #74465 <https://github.com/rust-lang/rust/issues/74465> for more information
+    = help: add `#![feature(once_cell)]` to the crate attributes to enable
+
+error[E0658]: use of unstable library feature 'once_cell'
+   --> voxygen/src/scene/terrain.rs:620:20
+    |
+620 |         let init = core::cell::OnceCell::new();
+    |                    ^^^^^^^^^^^^^^^^^^^^^^^^^
+    |
+    = note: see issue #74465 <https://github.com/rust-lang/rust/issues/74465> for more information
+    = help: add `#![feature(once_cell)]` to the crate attributes to enable
+
+error[E0658]: use of unstable library feature 'once_cell'
+   --> voxygen/src/scene/terrain.rs:656:39
+    |
+656 |         Box::new(move |renderer| init.get_or_init(|| closure(renderer)).clone())
+    |                                       ^^^^^^^^^^^
+    |
+    = note: see issue #74465 <https://github.com/rust-lang/rust/issues/74465> for more information
+    = help: add `#![feature(once_cell)]` to the crate attributes to enable
+
+diff --git client/src/bin/bot/main.rs client/src/bin/bot/main.rs
+index ca7298d81b7e..f1c31e449b71 100644
+--- client/src/bin/bot/main.rs
+++ client/src/bin/bot/main.rs
+@@ -117,6 +117,7 @@ impl BotClient {
+     pub fn handle_register(&mut self, prefix: &str, password: &str, count: Option<usize>) {
+         let usernames = match count {
+             Some(n) => (0..n)
+                .into_iter()
+                 .map(|i| format!("{}{:03}", prefix, i))
+                 .collect::<Vec<String>>(),
+             None => vec![prefix.to_string()],
+diff --git common/src/comp/agent.rs common/src/comp/agent.rs
+index 6fd73d380dae..39f9d232052e 100644
+--- common/src/comp/agent.rs
+++ common/src/comp/agent.rs
+@@ -503,7 +503,7 @@ impl Timer {
+     /// Reset the timer for the given action, returning true if the timer was
+     /// not already reset.
+     pub fn reset(&mut self, action: TimerAction) -> bool {
+-        self.action_starts[Self::idx_for(action)].take().is_some()
+        std::mem::replace(&mut self.action_starts[Self::idx_for(action)], None).is_some()
+     }
+ 
+     /// Start the timer for the given action, even if it was already started.
+diff --git common/src/comp/inventory/item/mod.rs common/src/comp/inventory/item/mod.rs
+index 2716aac923e3..06c9a49a21bf 100644
+--- common/src/comp/inventory/item/mod.rs
+++ common/src/comp/inventory/item/mod.rs
+@@ -330,7 +330,7 @@ impl ItemKind {
+     // Used for inventory sorting, what comes before the first colon (:) is used as
+     // a broader category
+     pub fn get_itemkind_string(&self) -> String {
+-        match self {
+        let result = match self {
+             // Using tool and toolkind to sort tools by kind
+             ItemKind::Tool(tool) => format!("Tool: {:?}", tool.kind),
+             ItemKind::ModularComponent(modular_component) => {
+@@ -346,7 +346,8 @@ impl ItemKind {
+             ItemKind::Utility { kind } => format!("Utility: {:?}", kind),
+             ItemKind::Ingredient { descriptor } => format!("Ingredient: {}", descriptor),
+             ItemKind::TagExamples { item_ids } => format!("TagExamples: {:?}", item_ids),
+-        }
+        };
+        result
+     }
+ 
+     pub fn has_durability(&self) -> bool {
+diff --git common/src/comp/skillset/mod.rs common/src/comp/skillset/mod.rs
+index 6b14321b5e65..21bb5ebda3fd 100644
+--- common/src/comp/skillset/mod.rs
+++ common/src/comp/skillset/mod.rs
+@@ -81,6 +81,7 @@ lazy_static! {
+                     .map(|skill| {
+                         let max_level = skill.max_level();
+                         (1..=max_level)
+                            .into_iter()
+                             .map(|level| skill.skill_cost(level))
+                             .sum::<u16>()
+                     })
+diff --git common/src/skillset_builder.rs common/src/skillset_builder.rs
+index d330f2c834b7..f3df4511f1aa 100644
+--- common/src/skillset_builder.rs
+++ common/src/skillset_builder.rs
+@@ -112,7 +112,8 @@ impl SkillSetBuilder {
+     pub fn with_skill(mut self, skill: Skill, level: u16) -> Self {
+         let Some(group) = skill.skill_group_kind() else {
+             let err = format!(
+-                "Tried to add skill: {skill:?} which does not have an associated skill group."
+                "Tried to add skill: {:?} which does not have an associated skill group.",
+                skill
+             );
+             common_base::dev_panic!(err, or return self);
+         };
+@@ -120,7 +121,8 @@ impl SkillSetBuilder {
+         let SkillSetBuilder(ref mut skill_set) = self;
+         if skill_is_applied(skill_set, skill, level) {
+             let err = format!(
+-                "Tried to add skill: {skill:?} with level {level:?} which is already applied"
+                "Tried to add skill: {:?} with level {:?} which is already applied",
+                skill, level,
+             );
+             common_base::dev_panic!(err, or return self);
+         }
+@@ -133,8 +135,9 @@ impl SkillSetBuilder {
+         }
+         if !skill_is_applied(skill_set, skill, level) {
+             let err = format!(
+-                "Failed to add skill: {skill:?}. Verify that it has the appropriate skill group \
+-                 available and meets all prerequisite skills."
+                "Failed to add skill: {:?}. Verify that it has the appropriate skill group \
+                 available and meets all prerequisite skills.",
+                skill
+             );
+             common_base::dev_panic!(err);
+         }
+diff --git common/src/terrain/biome.rs common/src/terrain/biome.rs
+index c40956863fb0..8b6c83c8b4b3 100644
+--- common/src/terrain/biome.rs
+++ common/src/terrain/biome.rs
+@@ -1,9 +1,8 @@
+ use serde::{Deserialize, Serialize};
+ use strum::EnumIter;
+ 
+-#[derive(Default, Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq, Hash, EnumIter)]
+#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq, Hash, EnumIter)]
+ pub enum BiomeKind {
+-    #[default]
+     Void,
+     Lake,
+     Grassland,
+@@ -17,3 +16,7 @@ pub enum BiomeKind {
+     Savannah,
+     Taiga,
+ }
+
+impl Default for BiomeKind {
+    fn default() -> BiomeKind { BiomeKind::Void }
+}
+diff --git common/src/terrain/site.rs common/src/terrain/site.rs
+index 8358daaf2d24..fdcee627fd8c 100644
+--- common/src/terrain/site.rs
+++ common/src/terrain/site.rs
+@@ -1,12 +1,11 @@
+ use serde::{Deserialize, Serialize};
+ 
+-#[derive(Default, Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq)]
+ pub enum SiteKindMeta {
+     Dungeon(DungeonKindMeta),
+     Cave,
+     Settlement(SettlementKindMeta),
+     Castle,
+-    #[default]
+     Void,
+ }
+ 
+@@ -23,3 +22,7 @@ pub enum SettlementKindMeta {
+     DesertCity,
+     SavannahPit,
+ }
+
+impl Default for SiteKindMeta {
+    fn default() -> SiteKindMeta { SiteKindMeta::Void }
+}
+diff --git common/src/typed.rs common/src/typed.rs
+index 752c8d908dcf..ea7d97f66a19 100644
+--- common/src/typed.rs
+++ common/src/typed.rs
+@@ -321,7 +321,7 @@ macro_rules! make_case_elim {
+                 elim.reduce(((self,), context))
+             }
+ 
+-            pub fn elim_case_pure<'a, Type>(&self, cases: &'a $mod::PureCases<Type>) -> &'a Type
+            pub fn elim_case_pure<'a, 'b, Type>(&'a self, cases: &'b $mod::PureCases<Type>) -> &'b Type
+             {
+                 let (expr, ()) = self.elim(cases, ());
+                 expr
+@@ -425,7 +425,7 @@ macro_rules! make_proj_elim {
+                 elim.reduce(((self,), context))
+             }
+ 
+-            pub fn elim_proj_pure<'a, Type>(&self, cases: &'a $mod::PureProj<Type>) -> &'a Type
+            pub fn elim_proj_pure<'a, 'b, Type>(&'a self, cases: &'b $mod::PureProj<Type>) -> &'b Type
+             {
+                 let (expr, ()) = self.elim(cases, ());
+                 expr
+diff --git rust-toolchain rust-toolchain
+index b27a258d1a80..c7c621708744 100644
+--- rust-toolchain
+++ rust-toolchain
+@@ -1 +1 @@
+-nightly-2023-04-20
+nightly-2022-11-28
+diff --git server/src/events/inventory_manip.rs server/src/events/inventory_manip.rs
+index f86f23d31fba..bb62a7ba0305 100644
+--- server/src/events/inventory_manip.rs
+++ server/src/events/inventory_manip.rs
+@@ -786,6 +786,7 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Inv
+                     })
+                     .and_then(|r| {
+                         let items = (0..amount)
+                            .into_iter()
+                             .filter_map(|_| {
+                                 r.craft_simple(
+                                     &mut inventory,
+diff --git server/src/sys/chunk_serialize.rs server/src/sys/chunk_serialize.rs
+index 4226ea0429f3..0810aa9951a9 100644
+--- server/src/sys/chunk_serialize.rs
+++ server/src/sys/chunk_serialize.rs
+@@ -110,6 +110,7 @@ impl<'a> System<'a> for Sys {
+                     .get_key_arc_real(chunk_key)
+                     .map(|chunk| (Arc::clone(chunk), chunk_key, meta))
+             })
+            .into_iter()
+             .peekable();
+ 
+         while chunks_iter.peek().is_some() {
+diff --git voxygen/src/lib.rs voxygen/src/lib.rs
+index bee0a875709e..ccb5eb34d3e5 100644
+--- voxygen/src/lib.rs
+++ voxygen/src/lib.rs
+@@ -6,6 +6,7 @@
+     array_methods,
+     array_zip,
+     drain_filter,
+    once_cell,
+     trait_alias,
+     option_get_or_insert_default,
+     map_try_insert,
+diff --git voxygen/src/render/mod.rs voxygen/src/render/mod.rs
+index 9764930c0cc2..d77cf8806a5b 100644
+--- voxygen/src/render/mod.rs
+++ voxygen/src/render/mod.rs
+@@ -70,13 +70,12 @@ pub trait Vertex: Clone + bytemuck::Pod {
+ 
+ use serde::{Deserialize, Serialize};
+ /// Anti-aliasing modes
+-#[derive(Default, PartialEq, Eq, Clone, Copy, Debug, Serialize, Deserialize)]
+#[derive(PartialEq, Eq, Clone, Copy, Debug, Serialize, Deserialize)]
+ pub enum AaMode {
+     /// Fast approximate antialiasing.
+     ///
+     /// This is a screen-space technique, and therefore works fine with greedy
+     /// meshing.
+-    #[default]
+     Fxaa,
+     /// Multisampling AA, up to 4 samples per pixel.
+     ///
+@@ -122,8 +121,12 @@ impl AaMode {
+     }
+ }
+ 
+impl Default for AaMode {
+    fn default() -> Self { AaMode::Fxaa }
+}
+
+ /// Cloud modes
+-#[derive(Default, PartialEq, Eq, Clone, Copy, Debug, Serialize, Deserialize)]
+#[derive(PartialEq, Eq, Clone, Copy, Debug, Serialize, Deserialize)]
+ pub enum CloudMode {
+     /// No clouds. As cheap as it gets.
+     None,
+@@ -141,7 +144,6 @@ pub enum CloudMode {
+     Ultra,
+     /// Lots of detail with good-but-costly derivation of parameters.
+     #[serde(other)]
+-    #[default]
+     High,
+ }
+ 
+@@ -149,8 +151,12 @@ impl CloudMode {
+     pub fn is_enabled(&self) -> bool { *self != CloudMode::None }
+ }
+ 
+impl Default for CloudMode {
+    fn default() -> Self { CloudMode::High }
+}
+
+ /// Fluid modes
+-#[derive(Default, PartialEq, Eq, Clone, Copy, Debug, Serialize, Deserialize)]
+#[derive(PartialEq, Eq, Clone, Copy, Debug, Serialize, Deserialize)]
+ pub enum FluidMode {
+     /// "Low" water.  This water implements no waves, no reflections, no
+     /// diffraction, and no light attenuation through water.  As a result,
+@@ -174,26 +180,32 @@ pub enum FluidMode {
+     /// which causes attenuation to be computed incorrectly; this can be
+     /// addressed by using shadow maps (at least for terrain).
+     #[serde(other)]
+-    #[default]
+     Medium,
+ }
+ 
+impl Default for FluidMode {
+    fn default() -> Self { FluidMode::Medium }
+}
+
+ /// Reflection modes
+-#[derive(Default, PartialEq, Eq, Clone, Copy, Debug, Serialize, Deserialize)]
+#[derive(PartialEq, Eq, Clone, Copy, Debug, Serialize, Deserialize)]
+ pub enum ReflectionMode {
+     /// No or minimal reflections.
+     Low,
+     /// High quality reflections with screen-space raycasting and
+     /// all the bells & whistles.
+-    #[default]
+     High,
+     // Medium quality screen-space reflections.
+     #[serde(other)]
+     Medium,
+ }
+ 
+impl Default for ReflectionMode {
+    fn default() -> Self { ReflectionMode::High }
+}
+
+ /// Lighting modes
+-#[derive(Default, PartialEq, Eq, Clone, Copy, Debug, Serialize, Deserialize)]
+#[derive(PartialEq, Eq, Clone, Copy, Debug, Serialize, Deserialize)]
+ pub enum LightingMode {
+     /// Ashikhmin-Shirley BRDF lighting model.  Attempts to generate a
+     /// physically plausible (to some extent) lighting distribution.
+@@ -210,10 +222,13 @@ pub enum LightingMode {
+     /// Standard Blinn-Phong shading, combing Lambertian diffuse reflections and
+     /// specular highlights.
+     #[serde(other)]
+-    #[default]
+     BlinnPhong,
+ }
+ 
+impl Default for LightingMode {
+    fn default() -> Self { LightingMode::BlinnPhong }
+}
+
+ /// Shadow map settings.
+ #[derive(PartialEq, Clone, Copy, Debug, Serialize, Deserialize)]
+ pub struct ShadowMapMode {
+@@ -299,7 +314,7 @@ impl From<PresentMode> for wgpu::PresentMode {
+ 
+ /// Bloom factor
+ /// Controls fraction of output image luminosity that is blurred bloom
+-#[derive(Default, PartialEq, Clone, Copy, Debug, Serialize, Deserialize)]
+#[derive(PartialEq, Clone, Copy, Debug, Serialize, Deserialize)]
+ pub enum BloomFactor {
+     Low,
+     High,
+@@ -307,10 +322,13 @@ pub enum BloomFactor {
+     Custom(f32),
+     // other variant has to be placed last
+     #[serde(other)]
+-    #[default]
+     Medium,
+ }
+ 
+impl Default for BloomFactor {
+    fn default() -> Self { Self::Medium }
+}
+
+ impl BloomFactor {
+     /// Fraction of output image luminosity that is blurred bloom
+     pub fn fraction(self) -> f32 {
+diff --git voxygen/src/window.rs voxygen/src/window.rs
+index 0713ad4a0eaf..fd1e62ae04fe 100644
+--- voxygen/src/window.rs
+++ voxygen/src/window.rs
+@@ -1359,14 +1359,16 @@ impl Window {
+     pub fn scale_factor(&self) -> f64 { self.scale_factor }
+ }
+ 
+-#[derive(Default, Copy, Clone, Hash, Eq, PartialEq, Debug, Serialize, Deserialize)]
+#[derive(Copy, Clone, Hash, Eq, PartialEq, Debug, Serialize, Deserialize)]
+ pub enum FullscreenMode {
+     Exclusive,
+     #[serde(other)]
+-    #[default]
+     Borderless,
+ }
+ 
+impl Default for FullscreenMode {
+    fn default() -> Self { FullscreenMode::Borderless }
+}
+ #[derive(PartialEq, Eq, Clone, Copy, Debug, Serialize, Deserialize)]
+ #[serde(default)]
+ pub struct FullScreenSettings {
+diff --git world/examples/chunk_compression_benchmarks.rs world/examples/chunk_compression_benchmarks.rs
+index 46727195b953..5cf915701c89 100644
+--- world/examples/chunk_compression_benchmarks.rs
+++ world/examples/chunk_compression_benchmarks.rs
+@@ -1190,7 +1190,10 @@ fn main() {
+                 if !SKIP_VOLGRID {
+                     let _ = volgrid.insert(spiralpos, Arc::new(chunk));
+ 
+-                    if (1usize..20).any(|i| (2 * i + 1) * (2 * i + 1) == count) {
+                    if (1usize..20)
+                        .into_iter()
+                        .any(|i| (2 * i + 1) * (2 * i + 1) == count)
+                    {
+                         use std::fs::File;
+                         let mut f = File::create(&format!("chonkjpegs/{}_{}.jpg", sitename, count))
+                             .unwrap();
+diff --git world/examples/world_block_statistics.rs world/examples/world_block_statistics.rs
+index a0bf81309fbe..bd478b75dd82 100644
+--- world/examples/world_block_statistics.rs
+++ world/examples/world_block_statistics.rs
+@@ -85,9 +85,12 @@ fn generate(db_path: &str, ymin: Option<i32>, ymax: Option<i32>) -> Result<(), B
+     let (tx, rx) = mpsc::channel();
+     rayon::spawn(move || {
+         let coords: Vec<_> = (ymin.unwrap_or(1)..ymax.unwrap_or(sz.y as i32))
+            .into_iter()
+             .flat_map(move |y| {
+                 let tx = tx.clone();
+-                (1..sz.x as i32).map(move |x| (tx.clone(), x, y))
+                (1..sz.x as i32)
+                    .into_iter()
+                    .map(move |x| (tx.clone(), x, y))
+             })
+             .collect();
+         coords.into_par_iter().for_each(|(tx, x, y)| {
+diff --git world/src/sim/util.rs world/src/sim/util.rs
+index f94d584b2f0c..bc7d49a4a684 100644
+--- world/src/sim/util.rs
+++ world/src/sim/util.rs
+@@ -218,6 +218,7 @@ pub fn local_cells(map_size_lg: MapSizeLg, posi: usize) -> impl Clone + Iterator
+     let grid_size = 3i32;
+     let grid_bounds = 2 * grid_size + 1;
+     (0..grid_bounds * grid_bounds)
+        .into_iter()
+         .map(move |index| {
+             Vec2::new(
+                 pos.x + (index % grid_bounds) - grid_size,
+diff --git world/src/site2/plot/dungeon.rs world/src/site2/plot/dungeon.rs
+index 1b092edcc926..b44b9df3f89f 100644
+--- world/src/site2/plot/dungeon.rs
+++ world/src/site2/plot/dungeon.rs
+@@ -948,7 +948,7 @@ pub fn inscribed_polystar(
+         use std::f32::consts::TAU;
+         let rpos: Vec2<f32> = pos.xy().as_() - origin.as_();
+         let is_border = rpos.magnitude_squared() > (radius - 2.0).powi(2);
+-        let is_line = (0..sides).any(|i| {
+        let is_line = (0..sides).into_iter().any(|i| {
+             let f = |j: f32| {
+                 let t = j * TAU / sides as f32;
+                 radius * Vec2::new(t.cos(), t.sin())
+diff --git world/src/site2/plot/gnarling.rs world/src/site2/plot/gnarling.rs
+index 837390d8c6d5..9606622410ab 100644
+--- world/src/site2/plot/gnarling.rs
+++ world/src/site2/plot/gnarling.rs
+@@ -112,6 +112,7 @@ impl GnarlingFortification {
+ 
+         let num_points = (wall_radius / 15).max(5);
+         let outer_wall_corners = (0..num_points)
+            .into_iter()
+             .map(|a| {
+                 let angle = a as f32 / num_points as f32 * core::f32::consts::TAU;
+                 Vec2::new(angle.cos(), angle.sin()).map(|a| (a * wall_radius as f32) as i32)
+@@ -447,6 +448,7 @@ impl Structure for GnarlingFortification {
+             const SECTIONS_PER_WALL_SEGMENT: usize = 8;
+ 
+             (0..(SECTIONS_PER_WALL_SEGMENT as i32))
+                .into_iter()
+                 .map(move |a| {
+                     let get_point =
+                         |a| point + (next_point - point) * a / (SECTIONS_PER_WALL_SEGMENT as i32);
--- a/graphics/R-cran-png/Makefile
+++ b/graphics/R-cran-png/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	png
-DISTVERSION=	0.1-7
-PORTREVISION=	9
+DISTVERSION=	0.1-8
 CATEGORIES=	graphics
 DISTNAME=	${PORTNAME}_${DISTVERSION}

@ -8,8 +7,7 @@ MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Read and write PNG images
 WWW=		https://www.rforge.net/png/

-LICENSE=	GPLv2 GPLv3
-LICENSE_COMB=	dual
+LICENSE=	GPLv2+

 LIB_DEPENDS=	libpng.so:graphics/png

--- a/graphics/R-cran-png/distinfo
+++ b/graphics/R-cran-png/distinfo
@ -1,2 +1,3 @@
-SHA256 (png_0.1-7.tar.gz) = e269ff968f04384fc9421d17cfc7c10cf7756b11c2d6d126e9776f5aca65553c
-SIZE (png_0.1-7.tar.gz) = 24990
+TIMESTAMP = 1682467999
+SHA256 (png_0.1-8.tar.gz) = 5a36fabb6d62ba2533d3fc4cececd07891942cfb76fe689ec0d550d08762f61c
+SIZE (png_0.1-8.tar.gz) = 24880
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	mesa
-DISTVERSION=	23.1-branchpoint-989
-DISTVERSIONSUFFIX=	-gcb4e4fc5de4
+DISTVERSION=	23.1-branchpoint-1212
+DISTVERSIONSUFFIX=	-ge169a402a8c
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	-devel

--- a/graphics/mesa-devel/distinfo
+++ b/graphics/mesa-devel/distinfo
@ -1,6 +1,6 @@
-TIMESTAMP = 1683305549
-SHA256 (mesa3d-mesa-23.1-branchpoint-989-gcb4e4fc5de4_GH0.tar.gz) = e5045bfebe72b07f49002e41ab9578d11ff619f904a86e93d7f8adb33e3768aa
-SIZE (mesa3d-mesa-23.1-branchpoint-989-gcb4e4fc5de4_GH0.tar.gz) = 29108616
+TIMESTAMP = 1683754954
+SHA256 (mesa3d-mesa-23.1-branchpoint-1212-ge169a402a8c_GH0.tar.gz) = 69b6603f24ab42753586415e6af83696a73e1f8c229c81c6611ed0394964ebff
+SIZE (mesa3d-mesa-23.1-branchpoint-1212-ge169a402a8c_GH0.tar.gz) = 29135406
 SHA256 (700efacda59c.patch) = 0d567fe737ad1404e1f12d7cd018826d9095c23835f1ed5aaa1c81cb58d3d008
 SIZE (700efacda59c.patch) = 983
 SHA256 (3043f16d66bf.patch) = 7afdba18fc3041dc6e30bdb1409f5214e451e7e5ceaa3b21991d6b2f793d9c85
--- a/graphics/py-pyglet/Makefile
+++ b/graphics/py-pyglet/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	pyglet
-PORTVERSION=	2.0.6
+PORTVERSION=	2.0.7
 CATEGORIES=	graphics multimedia x11-toolkits python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/graphics/py-pyglet/distinfo
+++ b/graphics/py-pyglet/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1683027650
-SHA256 (pyglet-2.0.6.zip) = 6f93f2bde6df818087e1b5d91033086cb2fb689c1220b632c46d1fc4a6685a00
-SIZE (pyglet-2.0.6.zip) = 6509004
+TIMESTAMP = 1683744199
+SHA256 (pyglet-2.0.7.zip) = 9282f9497c1c0cdcb2cc39d8c05090cf686dedb9ebbef4a8de49af22a0ae0e8f
+SIZE (pyglet-2.0.7.zip) = 6509176
--- a/lang/scratch/Makefile
+++ b/lang/scratch/Makefile
@ -12,12 +12,13 @@ LICENSE=	CC-BY-SA-3.0 GPLv2 MIT
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE

-BUILD_DEPENDS=	pkg-config:devel/pkgconf \
-		v4l_compat>=1.0.20100321:multimedia/v4l_compat
-LIB_DEPENDS=	libpango-1.0.so:x11-toolkits/pango \
-		libv4l2.so:multimedia/libv4l
+BUILD_DEPENDS=	v4l_compat>=1.0.20100321:multimedia/v4l_compat
+LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 RUN_DEPENDS=	squeak:lang/squeak

+USES=		gnome pkgconfig
+USE_GNOME=	pango
+
 DESKTOP_ENTRIES=	"Scratch" \
 			"${COMMENT}" \
 			"${DATADIR}/icons/128x128/scratch.png" \
--- a/Show More
+++ b/Show More