12 files changed, 42 insertions, 48 deletions
diff --git a/sysutils/rubygem-smart_proxy_salt/Makefile b/sysutils/rubygem-smart_proxy_salt/Makefile
index 805ef804472a..d40c7bad87c9 100644
--- a/sysutils/rubygem-smart_proxy_salt/Makefile
+++ b/sysutils/rubygem-smart_proxy_salt/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	smart_proxy_salt
-PORTVERSION=	5.1.0
-PORTREVISION=	1
+PORTVERSION=	6.0.0
 CATEGORIES=	sysutils ruby
 MASTER_SITES=	RG
 
diff --git a/sysutils/rubygem-smart_proxy_salt/distinfo b/sysutils/rubygem-smart_proxy_salt/distinfo
index c618d0019ec9..708082c02974 100644
--- a/sysutils/rubygem-smart_proxy_salt/distinfo
+++ b/sysutils/rubygem-smart_proxy_salt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1713528680
-SHA256 (rubygem/smart_proxy_salt-5.1.0.gem) = 27808b770676394f3bd07e58d4a6527c24c90b55b34f32d7dd3e26163b31701b
-SIZE (rubygem/smart_proxy_salt-5.1.0.gem) = 28672
+TIMESTAMP = 1747547558
+SHA256 (rubygem/smart_proxy_salt-6.0.0.gem) = 08fffd7bf6fb5dfb9f169eeeb5e9a3d0310a0f597e46178523b2735a233f9bf2
+SIZE (rubygem/smart_proxy_salt-6.0.0.gem) = 28672
diff --git a/sysutils/screen49/Makefile b/sysutils/screen49/Makefile
index 580f13c0a7c1..53845b416c98 100644
--- a/sysutils/screen49/Makefile
+++ b/sysutils/screen49/Makefile
@@ -21,6 +21,9 @@ WWW=		https://www.gnu.org/software/screen/
 
 CONFLICTS+=	screen-devel*
 
+DEPRECATED=	Multiple CVEs
+EXPIRATION_DATE=2025-05-31
+
 LICENSE=	GPLv3
 
 OPTIONS_DEFINE=		INFO NETHACK XTERM_256 SYSTEM_SCREENRC MULTIUSER \
diff --git a/sysutils/screen50/Makefile b/sysutils/screen50/Makefile
index 221f4fd63eb0..50da30c85c00 100644
--- a/sysutils/screen50/Makefile
+++ b/sysutils/screen50/Makefile
@@ -89,7 +89,7 @@ CONFIGURE_ARGS+=	--disable-socket-dir
 .endif
 
 .if defined(SCREEN_SOCKET_DIR)
-CONFIGURE_ARGS+=	--with-socket-dir=${SCREEN_SOCKET_DIR}
+CONFIGURE_ARGS+=	--enable-socket-dir=${SCREEN_SOCKET_DIR}
 .endif
 
 do-fetch:
diff --git a/sysutils/sysinfo/Makefile b/sysutils/sysinfo/Makefile
index d156a808fcd6..09e297a84a87 100644
--- a/sysutils/sysinfo/Makefile
+++ b/sysutils/sysinfo/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	sysinfo
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://codeberg.org/BSDforge/${PORTNAME}/archive/${DISTVERSION}${EXTRACT_SUFX}?dummy=/
 
diff --git a/sysutils/sysinfo/pkg-plist b/sysutils/sysinfo/pkg-plist
index 1529371c5fc0..366eb2d24880 100644
--- a/sysutils/sysinfo/pkg-plist
+++ b/sysutils/sysinfo/pkg-plist
@@ -1,4 +1,4 @@
-%%ETCDIR%%.conf.sample
+@sample %%ETCDIR%%.conf.sample
 sbin/sysinfo
 share/man/man5/sysinfo.conf.5.gz
 share/man/man8/sysinfo.8.gz
diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index ae3977149806..d83e7d9c7978 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	xfce4-battery-plugin
-PORTVERSION=	1.1.6
+PORTVERSION=	1.2.0
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
@@ -12,22 +12,19 @@ LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	amd64 i386
 
-LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
-
-USES=		alias gettext-tools gmake gnome libtool pkgconfig tar:bzip2 \
-		xfce
-USE_GNOME=	cairo gdkpixbuf glib20 gtk30
+USES=		alias gettext-tools gnome meson pkgconfig tar:xz xfce
+USE_GNOME=	glib20 gtk30
 USE_LDCONFIG=	yes
 USE_XFCE=	libmenu panel
 
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
 SSP_UNSAFE=	yes
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
-NLS_USES=		gettext-runtime
-NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=	gettext-runtime
+
+post-patch-NLS-off:
+	@${REINPLACE_CMD} -e "/^subdir('po')/d" ${WRKSRC}/meson.build
 
 .include <bsd.port.mk>
diff --git a/sysutils/xfce4-battery-plugin/distinfo b/sysutils/xfce4-battery-plugin/distinfo
index d379d4d0e7a9..22fe0eec62a3 100644
--- a/sysutils/xfce4-battery-plugin/distinfo
+++ b/sysutils/xfce4-battery-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1735047695
-SHA256 (xfce4/xfce4-battery-plugin-1.1.6.tar.bz2) = 327d7304dded8411cd1a48da4f46bac248b44d8b27ffbc2036e0268cb37c3676
-SIZE (xfce4/xfce4-battery-plugin-1.1.6.tar.bz2) = 569701
+TIMESTAMP = 1747672610
+SHA256 (xfce4/xfce4-battery-plugin-1.2.0.tar.xz) = 1dba8f470d2b12517e7b86d83cd2ebf13eb57ff1a01a4f2d2d156cf5194d97b6
+SIZE (xfce4/xfce4-battery-plugin-1.2.0.tar.xz) = 111360
diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index 3c377c7ad296..61c0ee7d8198 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	xfce4-cpugraph-plugin
-PORTVERSION=	1.2.11
+PORTVERSION=	1.3.0
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
@@ -10,21 +10,18 @@ WWW=		https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin/start
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
-
-USES=		compiler:c++17-lang gettext-tools gmake gnome libtool pkgconfig \
-		tar:bzip2 xfce
+USES=		compiler:c++17-lang gettext-tools gnome meson pkgconfig tar:xz \
+		xfce
 USE_CXXSTD=	c++17
-USE_GNOME=	cairo gdkpixbuf gtk30
+USE_GNOME=	gtk30
 USE_XFCE=	libmenu panel xfconf
 
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
-
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
-NLS_USES=		gettext-runtime
-NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=	gettext-runtime
+
+post-patch-NLS-off:
+	@${REINPLACE_CMD} -e "/^subdir('po')/d" ${WRKSRC}/meson.build
 
 .include <bsd.port.mk>
diff --git a/sysutils/xfce4-cpugraph-plugin/distinfo b/sysutils/xfce4-cpugraph-plugin/distinfo
index d26b524cec82..3a7a615a32d2 100644
--- a/sysutils/xfce4-cpugraph-plugin/distinfo
+++ b/sysutils/xfce4-cpugraph-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1735164388
-SHA256 (xfce4/xfce4-cpugraph-plugin-1.2.11.tar.bz2) = 58aa31df1934afc2a352744754a730a3d796b1246e12c7a5e86f7b6a403ca20d
-SIZE (xfce4/xfce4-cpugraph-plugin-1.2.11.tar.bz2) = 569026
+TIMESTAMP = 1747673776
+SHA256 (xfce4/xfce4-cpugraph-plugin-1.3.0.tar.xz) = c3305edea13ae785ea8b7ce8efbb40b5d5cac69a6f8bf790e4f2efaa780ca097
+SIZE (xfce4/xfce4-cpugraph-plugin-1.3.0.tar.xz) = 94824
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index cf391607e146..1f4f41d95e7b 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	xfce4-fsguard-plugin
-PORTVERSION=	1.1.4
+PORTVERSION=	1.2.0
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
@@ -11,21 +11,18 @@ WWW=		https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin/start
 # COPYING file is wrong compared to license header
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
-
-USES=		compiler:c11 gettext-tools gmake gnome libtool pkgconfig \
-		tar:bzip2 xfce xorg
-USE_GNOME=	cairo gdkpixbuf gtk30
+USES=		compiler:c11 gettext-tools gnome meson pkgconfig tar:xz xfce \
+		xorg
+USE_GNOME=	gdkpixbuf gtk30
 USE_XFCE=	libmenu panel
 USE_XORG=	x11
 
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
-
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
-NLS_USES=		gettext-runtime
-NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=	gettext-runtime
+
+post-patch-NLS-off:
+	@${REINPLACE_CMD} -e "/^subdir('po')/d" ${WRKSRC}/meson.build
 
 .include <bsd.port.mk>
diff --git a/sysutils/xfce4-fsguard-plugin/distinfo b/sysutils/xfce4-fsguard-plugin/distinfo
index a4a7f2e25da8..551b71263d1d 100644
--- a/sysutils/xfce4-fsguard-plugin/distinfo
+++ b/sysutils/xfce4-fsguard-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1735162861
-SHA256 (xfce4/xfce4-fsguard-plugin-1.1.4.tar.bz2) = 24b3789be6de92678e7036678530c4da4b3838aa3cda428439aa8d140704a4a6
-SIZE (xfce4/xfce4-fsguard-plugin-1.1.4.tar.bz2) = 468762
+TIMESTAMP = 1747675372
+SHA256 (xfce4/xfce4-fsguard-plugin-1.2.0.tar.xz) = 9e40cf3ce7b34e1c27d6b442f3a067886c35154b5d0c4d644a239038611da64f
+SIZE (xfce4/xfce4-fsguard-plugin-1.2.0.tar.xz) = 64096