diff --git a/security/gosec/Makefile b/security/gosec/Makefile
index 6907939f176..fa6728cc85d 100644
--- a/security/gosec/Makefile
+++ b/security/gosec/Makefile
@@ -1,6 +1,7 @@
 COMMENT =	security checker for Go projects
 
 MODGO_MODNAME =	github.com/securego/gosec/v2
+REVISION =	0
 MODGO_VERSION =	v2.9.6
 
 DISTNAME =	gosec-${MODGO_VERSION}
@@ -12,6 +13,8 @@ CATEGORIES =	security devel
 # Apache 2.0
 PERMIT_PACKAGE =	Yes
 
+WANTLIB += c pthread
+
 MODULES =		lang/go
 
 MODGO_LDFLAGS =		-X main.Version=${MODGO_VERSION}
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index e9d03c6cdad..4a975b158be 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -11,7 +11,7 @@ PKGNAME-libs=		heimdal-libs-${V}
 
 REVISION-main=		1
 REVISION-devel-docs=	0
-REVISION-libs=		1
+REVISION-libs=		2
 
 CATEGORIES=		security net
 
@@ -72,8 +72,7 @@ LIB_DEPENDS-main=	${BASE_PKGPATH},-libs=${V}
 PKG_ARCH-devel-docs=	*
 WANTLIB-devel-docs=	# empty
 
-WANTLIB-libs=		${WANTLIB} com_err
-WANTLIB-libs +=		com_err
+WANTLIB-libs=		${WANTLIB} com_err execinfo
 LIB_DEPENDS-libs=	sysutils/e2fsprogs
 
 MODGNU_CONFIG_GUESS_DIRS= \
diff --git a/sysutils/alertmanager/Makefile b/sysutils/alertmanager/Makefile
index 0a625e8880d..1734e763422 100644
--- a/sysutils/alertmanager/Makefile
+++ b/sysutils/alertmanager/Makefile
@@ -1,6 +1,7 @@
 COMMENT =	handles alerts sent by the Prometheus server
 
 MODGO_MODNAME =	github.com/prometheus/alertmanager
+REVISION =	0
 MODGO_VERSION =	v0.24.0
 
 MODGO_LDFLAGS += -X github.com/prometheus/common/version.Version=${MODGO_VERSION}
@@ -15,6 +16,8 @@ MAINTAINER =	Denis Fondras <denis@openbsd.org>
 # Apache 2.0
 PERMIT_PACKAGE =	Yes
 
+WANTLIB += c pthread
+
 MODULES =	lang/go
 
 do-install:
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 61705477404..5fc59db310f 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -7,7 +7,7 @@ PKGNAME-main =		${DISTNAME}
 PKGNAME-cgi =		${DISTNAME:S/-/-cgi-/}
 PKGNAME-x11 =		${DISTNAME:S/-/-x11-/}
 REVISION-main =		6
-REVISION-x11 =		3
+REVISION-x11 =		4
 REVISION-cgi =		3
 
 CATEGORIES =		sysutils
@@ -75,7 +75,7 @@ WANTLIB-x11 += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
 WANTLIB-x11 += Xrandr Xrender atk-1.0 cairo fontconfig freetype gconf-2
 WANTLIB-x11 += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
 WANTLIB-x11 += gthread-2.0 gtk-x11-2.0 intl pango-1.0 pangocairo-1.0
-WANTLIB-x11 += pangoft2-1.0 z
+WANTLIB-x11 += pangoft2-1.0 z harfbuzz
 .endif
 
 FAKE_FLAGS =		sysconfdir=${TRUEPREFIX}/share/examples/apcupsd/etc
diff --git a/sysutils/beats/Makefile.inc b/sysutils/beats/Makefile.inc
index 92a8d63517c..3ab58b1e9ab 100644
--- a/sysutils/beats/Makefile.inc
+++ b/sysutils/beats/Makefile.inc
@@ -15,7 +15,7 @@ MAINTAINER =		Pavel Korovin <pvk@openbsd.org>
 # Apachev2
 PERMIT_PACKAGE =	Yes
 
-WANTLIB =		c pthread
+WANTLIB +=		c pthread
 
 MODULES =		lang/go
 
diff --git a/sysutils/beats/packetbeat/Makefile b/sysutils/beats/packetbeat/Makefile
index a9b6dad8848..72f6367fc55 100644
--- a/sysutils/beats/packetbeat/Makefile
+++ b/sysutils/beats/packetbeat/Makefile
@@ -1,5 +1,5 @@
 COMMENT =	lightweight shipper for real-time network analytics
-REVISION =	0
+REVISION =	1
 
 BEAT =		packetbeat
 
diff --git a/sysutils/blackbox_exporter/Makefile b/sysutils/blackbox_exporter/Makefile
index 065d12fd237..d7df5a8c29b 100644
--- a/sysutils/blackbox_exporter/Makefile
+++ b/sysutils/blackbox_exporter/Makefile
@@ -2,6 +2,8 @@ COMMENT=	Prometheus exporter to test HTTP/DNS/TCP/ICMP endpoints
 
 MODGO_MODNAME=	github.com/prometheus/blackbox_exporter
 MODGO_VERSION=	v0.19.0
+REVISION=	0
+
 DISTNAME=	blackbox_exporter-${MODGO_VERSION}
 
 CATEGORIES=	sysutils
@@ -11,6 +13,8 @@ MAINTAINER=	Stuart Henderson <stu.ports@spacehopper.org>
 # Apache 2.0
 PERMIT_PACKAGE=Yes
 
+WANTLIB += c pthread
+
 USE_GMAKE=	Yes
 
 MODULES=	lang/go
diff --git a/sysutils/collectd/Makefile b/sysutils/collectd/Makefile
index b3865f5e478..badc2687694 100644
--- a/sysutils/collectd/Makefile
+++ b/sysutils/collectd/Makefile
@@ -31,16 +31,16 @@ PKGNAME-prometheus =	collectd-prometheus-$V
 PKGNAME-ping =		collectd-ping-$V
 CATEGORIES =		sysutils
 REVISION-main =		0
-REVISION-memcachec =	0
+REVISION-memcachec =	1
 REVISION-mqtt =		0
 REVISION-mysql =	1
 REVISION-nut =		1
 REVISION-pgsql =	0
 REVISION-ping =		0
-REVISION-prometheus =	2
+REVISION-prometheus =	3
 REVISION-python =	1
 REVISION-redis =	0
-REVISION-riemann =	2
+REVISION-riemann =	3
 REVISION-rrdtool =	2
 REVISION-snmp =		0
 REVISION-virt =		3
@@ -58,7 +58,8 @@ MODULES =		lang/python
 MODPY_VERSION =	${MODPY_DEFAULT_VERSION_2}
 MODPY_RUNDEP =		No
 
-MULTI_PACKAGES =	-main -mysql -pgsql -rrdtool -snmp -virt -python -memcachec -mqtt -nut -riemann -redis -prometheus -ping
+MULTI_PACKAGES =	-main -mysql -pgsql -rrdtool -snmp -virt -python \
+			-memcachec -mqtt -nut -riemann -redis -prometheus -ping
 
 WANTLIB-mysql =		mariadb pthread
 LIB_DEPENDS-mysql =	databases/mariadb
@@ -91,7 +92,7 @@ RUN_DEPENDS-python =	collectd-$V:${BASE_PKGPATH},-main \
 			${MODPY_RUN_DEPENDS}
 
 LIB_DEPENDS-memcachec =	devel/libmemcached
-WANTLIB-memcachec =	m memcached sasl2 pthread
+WANTLIB-memcachec =	crypto m memcached sasl2 pthread
 RUN_DEPENDS-memcachec =	collectd-$V:${BASE_PKGPATH},-main
 
 LIB_DEPENDS-nut =	nut->=2.7.3p0:sysutils/nut
@@ -101,7 +102,7 @@ WANTLIB-nut =		crypto pthread ssl upsclient
 LIB_DEPENDS-riemann =	sysutils/riemann-c-client
 WANTLIB-riemann =	gmp gnutls hogweed intl iconv idn2 nettle \
 			protobuf-c p11-kit pthread riemann-client tasn1 \
-			unistring
+			unistring brotlidec brotlienc z zstd
 RUN_DEPENDS-riemann =	collectd-$V:${BASE_PKGPATH},-main
 
 LIB_DEPENDS-mqtt =	net/mosquitto
@@ -112,7 +113,8 @@ LIB_DEPENDS-prometheus =	www/libmicrohttpd \
 				devel/protobuf-c
 RUN_DEPENDS-prometheus =	collectd-$V:${BASE_PKGPATH},-main
 WANTLIB-prometheus =	gmp gnutls hogweed iconv idn2 intl microhttpd \
-			nettle p11-kit protobuf-c pthread tasn1 unistring
+			nettle p11-kit protobuf-c pthread tasn1 unistring \
+			brotlidec brotlienc z zstd
 
 LIB_DEPENDS-redis =	databases/libhiredis
 RUN_DEPENDS-redis =	collectd-$V:${BASE_PKGPATH},-main
diff --git a/sysutils/gource/Makefile b/sysutils/gource/Makefile
index 9549bf972df..ba9d41969e5 100644
--- a/sysutils/gource/Makefile
+++ b/sysutils/gource/Makefile
@@ -1,6 +1,7 @@
 COMMENT =	software version control visualization tool
 
 DISTNAME =	gource-0.51
+REVISION =	0
 CATEGORIES =	sysutils graphics
 HOMEPAGE =	https://gource.io/
 
@@ -17,6 +18,7 @@ COMPILER =		base-clang ports-gcc
 
 WANTLIB += GL GLEW GLU SDL2 SDL2_image boost_filesystem boost_system
 WANTLIB += c freetype m pcre png pthread z ${COMPILER_LIBCXX}
+WANTLIB += X11 Xext Xi Xmu
 
 BUILD_DEPENDS =		graphics/glm
 LIB_DEPENDS =           devel/boost \
diff --git a/sysutils/gsmartcontrol/Makefile b/sysutils/gsmartcontrol/Makefile
index 1d28847b15a..c2445d49e25 100644
--- a/sysutils/gsmartcontrol/Makefile
+++ b/sysutils/gsmartcontrol/Makefile
@@ -2,7 +2,7 @@ COMMENT=		graphical hard drive inspection tool (smartctl front-end)
 
 DISTNAME=		gsmartcontrol-1.1.3
 EXTRACT_SUFX=		.tar.bz2
-REVISION=		2
+REVISION=		3
 
 CATEGORIES=		sysutils x11
 
@@ -15,7 +15,7 @@ WANTLIB += atk-1.0 atkmm-1.6 c cairo cairo-gobject cairomm-1.0
 WANTLIB += gdk-3 gdk_pixbuf-2.0 gdkmm-3.0 gio-2.0 giomm-2.4 glib-2.0
 WANTLIB += glibmm-2.4 gobject-2.0 gtk-3 gtkmm-3.0 intl m pango-1.0
 WANTLIB += pangocairo-1.0 pangomm-1.4 pcre pcrecpp pthread sigc-2.0
-WANTLIB += util ${COMPILER_LIBCXX}
+WANTLIB += util harfbuzz ${COMPILER_LIBCXX}
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gsmartcontrol/}
 
diff --git a/sysutils/krename/Makefile b/sysutils/krename/Makefile
index 02c565d27e3..49f50212010 100644
--- a/sysutils/krename/Makefile
+++ b/sysutils/krename/Makefile
@@ -2,7 +2,7 @@ COMMENT =	powerful batch file renamer
 
 VERSION =	5.0.1
 DISTNAME =	krename-${VERSION}
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	sysutils x11
 
@@ -20,7 +20,7 @@ WANTLIB += KF5ItemViews KF5JSApi KF5JobWidgets KF5KIOCore KF5KIOFileWidgets
 WANTLIB += KF5KIOGui KF5KIOWidgets KF5Service KF5Solid KF5WidgetsAddons
 WANTLIB += KF5WindowSystem KF5XmlGui Qt5Concurrent Qt5Core Qt5DBus
 WANTLIB += Qt5Gui Qt5Network Qt5Widgets Qt5Xml c exiv2 freetype
-WANTLIB += m podofo tag
+WANTLIB += m podofo tag z X11
 
 MASTER_SITES =	${MASTER_SITE_KDE:=stable/krename/${VERSION}/src/}
 
diff --git a/sysutils/libfwsi/Makefile b/sysutils/libfwsi/Makefile
index 0aec79a47db..45c9c1c8ac0 100644
--- a/sysutils/libfwsi/Makefile
+++ b/sysutils/libfwsi/Makefile
@@ -1,9 +1,9 @@
 COMMENT =	library to access the Windows Shell Item format
 
-VERSION = 	20191221
+VERSION =	20191221
 DISTNAME =	libfwsi-experimental-${VERSION}
 PKGNAME =	${DISTNAME:S/-experimental//}
-REVISION =	1
+REVISION =	2
 
 SHARED_LIBS +=  fwsi                       0.0 # 1.0
 
@@ -18,7 +18,7 @@ MAINTAINER =	Remi Pointel <rpointel@openbsd.org>
 # LGPLv3+
 PERMIT_PACKAGE =	Yes
 
-WANTLIB += m pthread util ${MODPY_WANTLIB}
+WANTLIB += iconv intl m pthread util ${MODPY_WANTLIB}
 
 CONFIGURE_STYLE =	gnu
 CONFIGURE_ARGS +=	--enable-python3
diff --git a/sysutils/librelp/Makefile b/sysutils/librelp/Makefile
index d38d03c8217..dfe667e4f94 100644
--- a/sysutils/librelp/Makefile
+++ b/sysutils/librelp/Makefile
@@ -1,7 +1,7 @@
 COMMENT =	reliable event logging protocol library
 
 DISTNAME =	librelp-1.9.0
-REVISION =	0
+REVISION =	1
 
 SHARED_LIBS +=  relp                      5.0 # 5.0
 
@@ -15,7 +15,7 @@ MAINTAINER =	Remi Locherer <remi@openbsd.org>
 PERMIT_PACKAGE =	Yes
 
 WANTLIB =  gmp gnutls hogweed iconv idn2 intl nettle p11-kit pthread
-WANTLIB += tasn1 unistring crypto ssl
+WANTLIB += tasn1 unistring crypto ssl brotlidec brotlienc z zstd
 
 MASTER_SITES =		http://download.rsyslog.com/librelp/
 
diff --git a/sysutils/modlogan/Makefile b/sysutils/modlogan/Makefile
index 32b82e13f16..cc25bba36b6 100644
--- a/sysutils/modlogan/Makefile
+++ b/sysutils/modlogan/Makefile
@@ -1,7 +1,7 @@
 COMMENT=	modular log analyzer
 
 DISTNAME=	modlogan-0.8.13
-REVISION=	11
+REVISION=	12
 CATEGORIES=	sysutils www
 
 HOMEPAGE=	http://jan.kneschke.de/projects/modlogan/
@@ -11,8 +11,8 @@ MASTER_SITES=	${HOMEPAGE}/download/
 # GPLv2+
 PERMIT_PACKAGE=	Yes
 
-WANTLIB =  adns bz2 c expat fontconfig freetype gd iconv intl jpeg m
-WANTLIB += pcre png pthread tiff webp z
+WANTLIB =  ${COMPILER_LIBCXX} adns bz2 c expat fontconfig freetype gd
+WANTLIB += iconv intl jpeg lzma m pcre png pthread tiff webp z zstd
 
 
 LIB_DEPENDS=	archivers/bzip2 \
diff --git a/sysutils/ntfs-3g/Makefile b/sysutils/ntfs-3g/Makefile
index bab02eec42c..a9b8c940443 100644
--- a/sysutils/ntfs-3g/Makefile
+++ b/sysutils/ntfs-3g/Makefile
@@ -5,7 +5,7 @@ DISTNAME =	ntfs-3g_ntfsprogs-${V}
 PKGNAME =	ntfs_3g-${V}
 SHARED_LIBS +=	ntfs-3g		0.2	# .88
 CATEGORIES =	sysutils
-REVISION =	2
+REVISION =	3
 
 HOMEPAGE =	https://www.tuxera.com/community/open-source-ntfs-3g/
 
@@ -14,7 +14,7 @@ MAINTAINER =	Paul Irofti <paul@irofti.net>
 # GPLv2
 PERMIT_PACKAGE =	Yes
 
-WANTLIB += c uuid fuse
+WANTLIB += c execinfo uuid fuse pthread
 
 MASTER_SITES =	https://tuxera.com/opensource/
 EXTRACT_SUFX =	.tgz
diff --git a/sysutils/promscale/Makefile b/sysutils/promscale/Makefile
index 81354224e84..4221ca0060b 100644
--- a/sysutils/promscale/Makefile
+++ b/sysutils/promscale/Makefile
@@ -1,6 +1,7 @@
 COMMENT =	observability backend for metrics and traces powered by SQL
 
 V =		0.7.1
+REVISION =	0
 CDATE =		2021-12-03T15-45-58Z
 CID =		493efa289605a1bf6c1c586595251bd4e0fdc162
 SHORTCID =	${CID:C/(............).*/\1/}
@@ -20,6 +21,8 @@ MAINTAINER =	Denis Fondras <denis@openbsd.org>
 # Apache 2.0
 PERMIT_PACKAGE = Yes
 
+WANTLIB += c pthread
+
 MODULES=	lang/go
 
 .include "modules.inc"
diff --git a/sysutils/restic-rest-server/Makefile b/sysutils/restic-rest-server/Makefile
index 84b85db4732..ae49ca8e52a 100644
--- a/sysutils/restic-rest-server/Makefile
+++ b/sysutils/restic-rest-server/Makefile
@@ -2,6 +2,7 @@ COMMENT =	REST backend for the restic backup tool
 
 MODGO_MODNAME =	github.com/restic/rest-server
 MODGO_VERSION =	v0.11.0
+REVISION =	0
 
 DISTNAME =	rest-server-${MODGO_VERSION}
 PKGNAME =	restic-${DISTNAME:S/-v/-/}
@@ -9,9 +10,12 @@ PKGNAME =	restic-${DISTNAME:S/-v/-/}
 CATEGORIES =	sysutils
 
 MAINTAINER =	Aaron Bieber <abieber@openbsd.org>
+
 # BSD
 PERMIT_PACKAGE =	Yes
 
+WANTLIB += c pthread
+
 SUBST_VARS +=		VARBASE
 
 MODULES =		lang/go
diff --git a/sysutils/rsyslog/Makefile b/sysutils/rsyslog/Makefile
index ad3532a9074..d9bba08f8ad 100644
--- a/sysutils/rsyslog/Makefile
+++ b/sysutils/rsyslog/Makefile
@@ -15,6 +15,8 @@ PKGNAME-pgsql =		rsyslog-pgsql-$V
 PKGNAME-elasticsearch =	rsyslog-elasticsearch-$V
 CATEGORIES =		sysutils
 
+REVISION-main =		0
+
 HOMEPAGE =		https://www.rsyslog.com/
 
 MAINTAINER =		Remi Locherer <remi@openbsd.org>
@@ -24,9 +26,11 @@ PERMIT_PACKAGE =	Yes
 
 COMPILER =		base-clang ports-gcc base-gcc
 
-WANTLIB-main += 	c crypto curl estr fastjson gcrypt gmp gnutls
+WANTLIB-main +=		c crypto curl estr fastjson gcrypt gmp gnutls
 WANTLIB-main +=		gpg-error hogweed iconv idn2 intl nettle nghttp2
 WANTLIB-main +=		p11-kit pthread relp ssl tasn1 unistring uuid z
+WANTLIB-main +=		brotlidec brotlienc execinfo zstd
+
 
 WANTLIB-mysql +=	crypto m mariadb pthread ssl z
 
@@ -55,7 +59,7 @@ RUN_DEPENDS-elasticsearch =	${PKGNAME-main}:${PKGPATH},-main
 MASTER_SITES =		https://www.rsyslog.com/files/download/rsyslog/
 
 CONFIGURE_STYLE =	gnu
-LIBTOOL_FLAGS = 	--tag=disable-static
+LIBTOOL_FLAGS =		--tag=disable-static
 CONFIGURE_ARGS +=	--enable-pgsql \
 			--enable-mysql \
 			--enable-mail \
diff --git a/sysutils/tray-app/Makefile b/sysutils/tray-app/Makefile
index a94a14537d7..87e928abc37 100644
--- a/sysutils/tray-app/Makefile
+++ b/sysutils/tray-app/Makefile
@@ -3,7 +3,7 @@ ONLY_FOR_ARCHS=	${APM_ARCHS}
 COMMENT=	small utilities for X11 system tray: eject, battery, mixer
 
 DISTNAME=	tray-app-0.3.1
-REVISION=	1
+REVISION=	2
 
 CATEGORIES=	sysutils x11
 
@@ -16,6 +16,7 @@ WANTLIB =  X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr
 WANTLIB += Xrender atk-1.0 c cairo fontconfig freetype gdk-x11-2.0
 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 iconv
 WANTLIB += intl m notify pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread z
+WANTLIB += harfbuzz sndio
 
 MASTER_SITES=	http://www.bsdua.org/files/
 
diff --git a/sysutils/xps/Makefile b/sysutils/xps/Makefile
index fce114d6aaa..a80f65c3819 100644
--- a/sysutils/xps/Makefile
+++ b/sysutils/xps/Makefile
@@ -1,11 +1,12 @@
 DISTNAME=       xps-4.2
-REVISION=	9
+REVISION=	10
 CATEGORIES=     sysutils x11
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=motif-pstree/}
 
 PERMIT_PACKAGE=	Yes
-WANTLIB=		ICE SM X11 Xext Xmu Xt c kvm m Xm
+
+WANTLIB=		ICE SM X11 Xext Xmu Xt c kvm m Xm elf
 
 COMMENT=	graphically display and dynamically update the process tree
 
diff --git a/sysutils/xstatbar/Makefile b/sysutils/xstatbar/Makefile
index 9a28b49fd42..1c7e9bc3c9a 100644
--- a/sysutils/xstatbar/Makefile
+++ b/sysutils/xstatbar/Makefile
@@ -3,7 +3,7 @@ ONLY_FOR_ARCHS=	${APM_ARCHS}
 COMMENT=	simple system monitor bar
 
 DISTNAME=	xstatbar-0.5
-REVISION=	13
+REVISION=	14
 FIX_EXTRACT_PERMISSIONS=Yes
 
 CATEGORIES=	sysutils x11
@@ -13,7 +13,7 @@ HOMEPAGE=	http://www.ryanflannery.net/hacking/xstatbar/
 # ISC
 PERMIT_PACKAGE=	Yes
 
-WANTLIB += X11 Xau Xdmcp Xext Xrender c m
+WANTLIB += X11 Xau Xdmcp Xext Xrender c m sndio
 
 # bad https redirect
 #MASTER_SITES=	http://www.ryanflannery.net/hacking/xstatbar/files/