diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index e806592f9694..46297a28e4f7 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -1,83 +1,79 @@
 PORTNAME=	gkrellm
-PORTVERSION=	2.4.0
-PORTREVISION=	2
+PORTVERSION=	2.5.0
+PORTREVISION=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://gkrellm.srcbox.net/releases/ \
 		LOCAL/ume
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	GTK based system monitor
 WWW=		https://gkrellm.srcbox.net/
 
 LICENSE=	GPLv3
 
 USES=		cpe gmake gnome pkgconfig tar:bzip2
 USE_RC_SUBR=	gkrellmd
 
 OPTIONS_DEFINE=		DOCS CLIENT NLS NTLM OPENSSL
 OPTIONS_DEFAULT=	CLIENT NTLM OPENSSL
 OPTIONS_SUB=		yes
 
 CLIENT_DESC=		GKrellM Client
 CLIENT_CONFLICTS=	gkrellm-[^2].* gkrellm[^2]-[^2].*
 CLIENT_USES=		xorg
 CLIENT_USE=		GNOME=gtk20,gdkpixbufextra XORG=sm,x11
 CLIENT_USE_OFF=		GNOME=glib20
 CLIENT_VARS_OFF=	BUILD_WRKSRC=${WRKSRC}/server \
 			INSTALL_WRKSRC=${WRKSRC}/server
 NTLM_LIB_DEPENDS=	libntlm.so:security/libntlm
 NTLM_VARS_OFF=		MAKE_ENV+=without-ntlm=1
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLIENT}
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 .else
 MAKE_ENV+=	enable_nls=0
 .endif
 .if ${PORT_OPTIONS:MOPENSSL}
 USES+=		ssl
 MAKE_ENV+=	without-gnutls=1
 .else
 MAKE_ENV+=	without-gnutls=1 without-ssl=1
 .endif
 .endif
 
 PORTDOCS=	COPYRIGHT CREDITS README Themes.html
 
 ALL_TARGET=	freebsd
+INSTALL_TARGET=	install_freebsd
 
 MAKE_ENV+=	INSTALLROOT=${PREFIX} INSTALL_PREFIX=${STAGEDIR} \
-		PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
-		SINSTALLDIR=${PREFIX}/sbin \
-		MANDIR=${PREFIX}/share/man/man1 SMANDIR=${PREFIX}/share/man/man8 \
-		VERSION=${PORTVERSION}
+		PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig CFGDIR=${EXAMPLESDIR} \
+		SINSTALLDIR=${PREFIX}/sbin SMANSECTION=8 VERSION=${PORTVERSION}
 
 CFLAGS+=	-DSYSTEM_THEMES_DIR='\"${LOCALBASE}/share/gkrellm2/themes\"' \
 		-DSYSTEM_PLUGINS_DIR='\"${LOCALBASE}/libexec/gkrellm2/plugins\"' \
 		-DGKRELLMD_SYS_ETC='\"${PREFIX}/etc\"' \
 		-DGKRELLMD_SYSTEM_PLUGINS_DIR='\"${PREFIX}/libexec/gkrellm2/plugins-gkrellmd\"'
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/gthread-2.0/gmodule-2.0 gthread-2.0/g' \
 			  ${WRKSRC}/src/Makefile
 
 post-install-CLIENT-on:
 	@${MKDIR} ${STAGEDIR}${LOCALBASE}/libexec/gkrellm2/plugins
 	@${MKDIR} ${STAGEDIR}${LOCALBASE}/share/gkrellm2/themes
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins-gkrellmd
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/server/gkrellmd.conf \
-		${STAGEDIR}${EXAMPLESDIR}/gkrellmd.conf
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/sysutils/gkrellm2/distinfo b/sysutils/gkrellm2/distinfo
index bbbf3e251a72..d2f8f959d135 100644
--- a/sysutils/gkrellm2/distinfo
+++ b/sysutils/gkrellm2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1737978638
-SHA256 (gkrellm-2.4.0.tar.bz2) = 6f83665760b936ad4b55f9182b1ec7601faf38a0f25ea1e4bddc9965088f032d
-SIZE (gkrellm-2.4.0.tar.bz2) = 790070
+TIMESTAMP = 1765731793
+SHA256 (gkrellm-2.5.0.tar.bz2) = 68c75a03a06b935afa93d3331ca1c2d862c1d50c3e9df19d9a8d48970d766b55
+SIZE (gkrellm-2.5.0.tar.bz2) = 773211
diff --git a/sysutils/gkrellm2/files/patch-Makefile b/sysutils/gkrellm2/files/patch-Makefile
deleted file mode 100644
index 5042e398dbbf..000000000000
--- a/sysutils/gkrellm2/files/patch-Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
---- Makefile.orig	2025-01-19 16:02:37 UTC
-+++ Makefile
-@@ -3,7 +3,9 @@
- #	make
- # For FreeBSD 2.X:
- #	make freebsd2
--# For FreeBSD 3.X or later:
-+# For FreeBSD 3.X and 4.X:
-+#	make freebsd3
-+# For FreeBSD 5.X or later:
- #	make freebsd
- # For NetBSD 1.5 - 1.6.X
- #	make netbsd1
-@@ -117,7 +119,7 @@ export OS_RELEASE
- export MANDIR SMANDIR MANDIRMODE MANMODE
- export OS_RELEASE
- 
--enable_nls=1
-+enable_nls?=1
- debug=0
- export enable_nls
- export debug
-@@ -155,8 +157,8 @@ install_gkrellm.pc: gkrellm.pc
- 	$(RM) $(PKGCONFIGDIR)/gkrellm.pc
- 
- install_gkrellm.pc: gkrellm.pc
--	$(INSTALL) -d $(PKGCONFIGDIR)
--	$(INSTALL) -m $(INCLUDEMODE) -c gkrellm.pc $(PKGCONFIGDIR)
-+	$(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR)
-+	$(INSTALL) -m $(INCLUDEMODE) -c gkrellm.pc $(DESTDIR)$(PKGCONFIGDIR)
- 
- install_darwin install_darwin9 install_macosx: install_gkrellm.pc
- 	(cd po && ${MAKE} install)
diff --git a/sysutils/gkrellm2/files/patch-gkrellm.1 b/sysutils/gkrellm2/files/patch-docs__gkrellm.1
similarity index 75%
rename from sysutils/gkrellm2/files/patch-gkrellm.1
rename to sysutils/gkrellm2/files/patch-docs__gkrellm.1
index 84cb8404190e..78692237c936 100644
--- a/sysutils/gkrellm2/files/patch-gkrellm.1
+++ b/sysutils/gkrellm2/files/patch-docs__gkrellm.1
@@ -1,83 +1,82 @@
---- gkrellm.1.orig	2025-01-19 16:02:37 UTC
-+++ gkrellm.1
+--- docs/gkrellm.1.orig	2025-12-14 15:28:26 UTC
++++ docs/gkrellm.1
 @@ -1,4 +1,4 @@
 -.TH gkrellm 1 "Jan 07, 2025" "" "User's Manual"
-+.TH gkrellm 1 "June 7, 2003" "FreeBSD" "User's Manual"
++.TH gkrellm 1 "Jan 7, 2025" "FreeBSD" "User's Manual"
  
  .SH "NAME"
  gkrellm \- The GNU Krell Monitors
 @@ -429,7 +429,7 @@ lock file
  ppp is connecting, and the on state is the ppp link connected.
  The phone line lock is determined by the existence of the modem
  lock file
 -.IR /var/lock/LCK..modem,
 +.IR /var/spool/lock/LCK..modem,
  which assumes pppd is using
  .IR /dev/modem.
  However, if your pppd setup does not use
 @@ -438,11 +438,11 @@ then you can configure an alternative with:
  .PP
  .RS
  .nf
 -ln  \-s  /var/lock/LCK..ttySx   ~/.gkrellm2/LCK..modem
 +ln  \-s  /var/spool/lock/LCK..cuaaS   ~/.gkrellm2/LCK..modem
  .fi
  .RE
  .IP
 -where ttySx is the tty device your modem does use.  The ppp on
 +where cuaaS is the tty device your modem does use.  The ppp on
  state is detected by the existence of
  .IR /var/run/pppX.pid
  and the time stamp of this file is the base for the on line time.
-@@ -1138,7 +1138,7 @@ several locations:
+@@ -1138,7 +1138,6 @@ several locations:
  .nf
  ~/.gkrellm2/themes
  /usr/local/share/gkrellm2/themes
 -/usr/share/gkrellm2/themes
-+/usr/X11R6/share/gkrellm2/themes
  .fi
  .RE
  .PP
-@@ -1149,7 +1149,7 @@ theme may also be installed as:
+@@ -1149,7 +1148,7 @@ theme may also be installed as:
  .RS
  .nf
  ~/.themes/THEME_NAME/gkrellm2
 -/usr/share/themes/THEME_NAME/gkrellm2
-+/usr/X11R6/share/themes/THEME_NAME/gkrellm2
++/usr/local/share/themes/THEME_NAME/gkrellm2
  .fi
  .RE
  .PP
-@@ -1177,7 +1177,7 @@ and
+@@ -1177,7 +1176,7 @@ and
  The directories
  .IR /usr/local/lib/gkrellm2/plugins
  and
 -.IR /usr/lib/gkrellm2/plugins
-+.IR /usr/X11R6/libexec/gkrellm2/plugins
++.IR /usr/local/libexec/gkrellm2/plugins
  are also searched for plugins to install.
  .PP
  Some plugins may be available only as source files and they will
-@@ -1213,7 +1213,7 @@ User plugin directory.
+@@ -1213,7 +1212,7 @@ User plugin directory.
  .I ~/.gkrellm2/plugins
  User plugin directory.
  .TP
 -.I /usr/lib/gkrellm2/plugins
-+.I /usr/X11R6/libexec/gkrellm2/plugins
++.I /usr/local/libexec/gkrellm2/plugins
  System wide plugin directory.
  .TP
  .I /usr/local/lib/gkrellm2/plugins
-@@ -1225,13 +1225,13 @@ User theme packaged as part of a user Gtk theme.
+@@ -1225,13 +1224,13 @@ User theme packaged as part of a user Gtk theme.
  .I ~/.themes/THEME_NAME/gkrellm2
  User theme packaged as part of a user Gtk theme.
  .TP
 -.I /usr/share/gkrellm2/themes
-+.I /usr/X11R6/share/gkrellm2/themes
++.I /usr/local/share/gkrellm2/themes
  System wide theme directory.
  .TP
  .I /usr/local/share/gkrellm2/themes
  Local theme directory.
  .TP
 -.I /usr/share/themes/THEME_NAME/gkrellm2
-+.I /usr/X11R6/share/themes/THEME_NAME/gkrellm2
++.I /usr/local/share/themes/THEME_NAME/gkrellm2
  System wide theme packaged as part of a system wide Gtk theme.
  
  .SH "AUTHORS"
diff --git a/sysutils/gkrellm2/files/patch-gkrellmd.1 b/sysutils/gkrellm2/files/patch-docs__gkrellmd.1
similarity index 86%
rename from sysutils/gkrellm2/files/patch-gkrellmd.1
rename to sysutils/gkrellm2/files/patch-docs__gkrellmd.1
index 4c0c69e0930f..047613a9be9c 100644
--- a/sysutils/gkrellm2/files/patch-gkrellmd.1
+++ b/sysutils/gkrellm2/files/patch-docs__gkrellmd.1
@@ -1,35 +1,35 @@
---- gkrellmd.1.orig	2010-09-14 16:55:49 UTC
-+++ gkrellmd.1
+--- docs/gkrellmd.1.orig	2010-09-14 16:55:49 UTC
++++ docs/gkrellmd.1
 @@ -1,4 +1,4 @@
 -.TH gkrellmd 1 "Sep 15, 2010" "GNU/Linux" "User's Manual"
-+.TH gkrellmd 8 "June 7, 2003" "FreeBSD" "User's Manual"
++.TH gkrellmd 8 "Sep 15, 2010" "FreeBSD" "User's Manual"
  
  .SH "NAME"
  gkrellmd \- The GNU Krell Monitors Server
 @@ -375,7 +375,7 @@
  
  .SH "FILES"
  .TP
 -.I /etc/gkrellmd.conf
 +.I /usr/local/etc/gkrellmd.conf
  System server config which is read first.
  The config file may contain lines similar to the command line args.
  For example:
 @@ -414,16 +414,13 @@
  
  .RE
  .TP
 -.I /usr/local/etc/gkrellmd.conf
 -Local server config file which is read second.
 -.TP
  .I ~/.gkrellmd.conf
  User server config file which is read last.
  .TP
  .I ~/.gkrellm2/plugins-gkrellmd
  User server plugin directory.
  .TP
 -.I /usr/lib/gkrellm2/plugins-gkrellmd
 +.I /usr/local/libexec/gkrellm2/plugins-gkrellmd
  System wide server plugin directory.
  .TP
  .I /usr/local/lib/gkrellm2/plugins-gkrellmd
diff --git a/sysutils/gkrellm2/files/patch-server__Makefile b/sysutils/gkrellm2/files/patch-server__Makefile
index c26b0f30603e..fd9473d17460 100644
--- a/sysutils/gkrellm2/files/patch-server__Makefile
+++ b/sysutils/gkrellm2/files/patch-server__Makefile
@@ -1,120 +1,13 @@
---- server/Makefile.orig	2025-01-19 16:02:37 UTC
+--- server/Makefile.orig	2025-12-14 15:28:26 UTC
 +++ server/Makefile
-@@ -42,7 +42,7 @@ PKG_LIB := $(shell $(PKG_CONFIG) --libs $(PKG_MODULES)
- endif
- PKG_LIB := $(shell $(PKG_CONFIG) --libs $(PKG_MODULES))
+@@ -164,8 +164,8 @@ install_freebsd:
  
--FLAGS = -O2 $(PKG_INCLUDE)
-+FLAGS = $(PKG_INCLUDE)
+ install_freebsd:
+ 	$(MAKE) install_unix
+-	chgrp kmem $(DESTDIR)$(SINSTALLDIR)/$(PACKAGE_D)
+-	chmod g+s $(DESTDIR)$(SINSTALLDIR)/$(PACKAGE_D)
++	# chgrp kmem $(DESTDIR)$(SINSTALLDIR)/$(PACKAGE_D)
++	# chmod g+s $(DESTDIR)$(SINSTALLDIR)/$(PACKAGE_D)
  
- FLAGS += $(GTOP_INCLUDE) $(PTHREAD_INC) -I.. -I$(SHARED_PATH) -DGSEAL_ENABLED -DGTK_DISABLE_DEPRECATED -DGKRELLM_SERVER
- 
-@@ -80,20 +80,31 @@ all:	gkrellmd$(BINEXT) $(SERVICE_FILE)
- 
- all:	gkrellmd$(BINEXT) $(SERVICE_FILE)
- 
--gkrellmd$(BINEXT): $(OBJS) $(EXTRAOBJS)
-+gkrellmd$(BINEXT): gkrellmd.pc $(OBJS) $(EXTRAOBJS)
- 	$(CC) $(OBJS) $(EXTRAOBJS) -o $@ \
- 		$(LDFLAGS) $(LIBS) $(LINK_FLAGS)
- 
--static: $(OBJS) $(EXTRAOBJS)
-+static: gkrellmd.pc $(OBJS) $(EXTRAOBJS)
- 	$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd.static -static \
- 		$(LDFLAGS) $(LIBS) $(LINK_FLAGS)
- 
-+gkrellmd.pc: Makefile
-+	echo "prefix=$(INSTALLROOT)" > gkrellmd.pc
-+	echo "Name: GKrellMd" >> gkrellmd.pc
-+	echo "Description: Extensible GLIB system monitoring application server" >> gkrellmd.pc
-+	echo "Version: $(VERSION)" >> gkrellmd.pc
-+	echo "Requires: glib-2.0" >> gkrellmd.pc
-+	echo "Cflags: -I$(INCLUDEDIR)" >> gkrellmd.pc
-+
- freebsd2:
- 	$(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -lmd" gkrellmd
- 
--freebsd3 freebsd:
-+freebsd3 freebsd4:
- 	$(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -ldevstat -lmd" gkrellmd
- 
-+freebsd5 freebsd6 freebsd7 freebsd8 freebsd:
-+	$(MAKE) EXTRAOBJS= SYS_LIBS="-ldevstat -lmd" gkrellmd
-+
- # Darwin target for systems that still have libkvm
- darwin: 
- 	$(MAKE) \
-@@ -152,42 +163,49 @@ uninstall-service:
- uninstall-service:
- 	$(RM) -f $(SERVICE_DIR)/$(SERVICE_FILE)
- 
--install: install_bin install_inc install_man install_cfg install-service
-+install: install_bin install_inc install_man install_cfg install_gkrellmd.pc
- 
- install-strip:
- 	$(MAKE) STRIP="-s" install
- 
- install_bin:
--	$(INSTALL) -d -m $(INSTALLDIRMODE) $(SINSTALLDIR)
--	$(INSTALL) -c $(STRIP) -m $(BINMODE) $(PACKAGE_D)$(BINEXT) $(SINSTALLDIR)/$(PACKAGE_D)$(BINEXT)
-+	$(INSTALL) -d -m $(INSTALLDIRMODE) $(DESTDIR)$(SINSTALLDIR)
-+	$(INSTALL) -c $(STRIP) -m $(BINMODE) $(PACKAGE_D)$(BINEXT) $(DESTDIR)$(SINSTALLDIR)/$(PACKAGE_D)$(BINEXT)
- 
- uninstall_bin:
--	$(RM) $(SINSTALLDIR)/$(PACKAGE_D)$(BINEXT)
-+	$(RM) $(DESTDIR)$(SINSTALLDIR)/$(PACKAGE_D)$(BINEXT)
- 
- install_inc:
--	$(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2
--	$(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(INCLUDEDIR)/gkrellm2
-+	$(INSTALL) -d -m $(INCLUDEDIRMODE) $(DESTDIR)$(INCLUDEDIR)/gkrellm2
-+	$(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(DESTDIR)$(INCLUDEDIR)/gkrellm2
- 
- # FIXME: may remove too many files, overlaps with uninstall_inc from client
- uninstall_inc:
--	$(RM) -r $(INCLUDEDIR)/gkrellm2
-+	$(RM) -r $(DESTDIR)$(INCLUDEDIR)/gkrellm2
- 
- install_man:
--	$(INSTALL) -d -m $(MANDIRMODE) $(SMANDIR)
--	$(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/$(PACKAGE_D).1
-+	$(INSTALL) -d -m $(MANDIRMODE) $(DESTDIR)$(SMANDIR)
-+	$(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(DESTDIR)$(SMANDIR)/$(PACKAGE_D).8
- 
- uninstall_man:
--	$(RM) $(SMANDIR)/$(PACKAGE_D).1
-+	$(RM) $(DESTDIR)$(SMANDIR)/$(PACKAGE_D).1
- 
- install_cfg:
--	$(INSTALL) -d -m $(CFGDIRMODE) $(CFGDIR)
--	$(INSTALL) -c -m $(CFGMODE) gkrellmd.conf $(CFGDIR)/gkrellmd.conf
-+	$(INSTALL) -d -m $(CFGDIRMODE) $(DESTDIR)$(CFGDIR)
-+	$(INSTALL) -c -m $(CFGMODE) gkrellmd.conf $(DESTDIR)$(CFGDIR)/gkrellmd.conf
- 
- uninstall_cfg:
--	$(RM) $(CFGDIR)/gkrellmd.conf
-+	$(RM) $(DESTDIR)$(CFGDIR)/gkrellmd.conf
- 
--uninstall: uninstall_bin uninstall_inc uninstall_man uninstall_cfg uninstall-service
-+install_gkrellmd.pc:
-+	$(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR)
-+	$(INSTALL) -c -m $(INCLUDEMODE) gkrellmd.pc $(DESTDIR)$(PKGCONFIGDIR)
- 
-+uninstall_gkrellmd.pc:
-+	$(RM) $(DESTDIR)$(PKGCONFIGDIR)/gkrellmd.pc
-+
-+uninstall: uninstall_bin uninstall_inc uninstall_man uninstall_cfg uninstall_gkrellmd.pc
-+
- install_darwin install_darwin9 install_macosx:
- 	$(MAKE) install
- 
-@@ -227,7 +245,8 @@ clean:
- 		gkrellmd-version.h \
- 		gkrellmd.exe \
- 		libgkrellmd.a \
--		win32-resource.rc
-+		win32-resource.rc \
-+		gkrellmd.pc
- 
- SYSDEPS = ../src/sysdeps/bsd-common.c ../src/sysdeps/bsd-net-open.c \
- 	../src/sysdeps/darwin.c \
+ install_netbsd:
+ 	$(MAKE) SMANDIR="$(PREFIX)/man/man1" install_unix
diff --git a/sysutils/gkrellm2/files/patch-src__Makefile b/sysutils/gkrellm2/files/patch-src__Makefile
index 6c8ae3beaa83..15709c5a752e 100644
--- a/sysutils/gkrellm2/files/patch-src__Makefile
+++ b/sysutils/gkrellm2/files/patch-src__Makefile
@@ -1,125 +1,23 @@
---- src/Makefile.orig	2025-01-19 16:02:37 UTC
+--- src/Makefile.orig	2025-12-14 15:28:26 UTC
 +++ src/Makefile
-@@ -38,7 +38,8 @@ endif
+@@ -36,7 +36,8 @@ endif
  	CONFIGURE_ARGS += --without-ntlm
  endif
  # run configure shell script
 -DUMMY_VAR := $(shell ./configure $(CONFIGURE_ARGS))
 +DUMMY_VAR := $(shell env OPENSSLINC=$(OPENSSLINC) OPENSSLLIB=$(OPENSSLLIB) \
 +		./configure $(CONFIGURE_ARGS))
  # pull in variables set by configure script
  include configure.mk
  
-@@ -51,7 +52,7 @@ PKG_LIB := $(shell $(PKG_CONFIG) --libs $(PKG_MODULES)
- endif
- PKG_LIB := $(shell $(PKG_CONFIG) --libs $(PKG_MODULES))
- 
--FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE) $(PTHREAD_INC)\
-+FLAGS = -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE) $(PTHREAD_INC)\
-  ${SSL_INCLUDE} ${NTLM_INCLUDE} -DGSEAL_ENABLED -DGTK_DISABLE_DEPRECATED -DGKRELLM_CLIENT
- 
- LIBS = $(PKG_LIB) $(GTOP_LIBS) $(X11_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(SENSORS_LIBS)\
-@@ -107,13 +108,20 @@ endif
- 	$(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -lmd" gkrellm
- endif
- 
--freebsd3 freebsd:
-+freebsd3 freebsd4:
- ifeq ($(HAVE_SSL),1)
- 	$(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -ldevstat" gkrellm
- else
- 	$(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -ldevstat -lmd" gkrellm
- endif
- 
-+freebsd5 freebsd6 freebsd7 freebsd8 freebsd9 freebsd:
-+ifeq ($(HAVE_SSL),1)
-+	$(MAKE) EXTRAOBJS= SYS_LIBS="-ldevstat" gkrellm
-+else
-+	$(MAKE) EXTRAOBJS= SYS_LIBS="-ldevstat -lmd" gkrellm
-+endif
-+
- # Darwin target for systems that still have libkvm
- darwin: 
- ifeq ($(HAVE_SSL),1)
-@@ -181,51 +189,51 @@ install_bin:
- 	$(MAKE) STRIP="-s" install
- 
- install_bin:
--	$(INSTALL) -d -m $(INSTALLDIRMODE) $(INSTALLDIR)
--	$(INSTALL) -c $(STRIP) -m $(BINMODE) $(PACKAGE)$(BINEXT) $(INSTALLDIR)/$(PACKAGE)$(BINEXT)
-+	$(INSTALL) -d -m $(INSTALLDIRMODE) $(DESTDIR)$(INSTALLDIR)
-+	$(INSTALL) -c $(STRIP) -m $(BINMODE) $(PACKAGE)$(BINEXT) $(DESTDIR)$(INSTALLDIR)/$(PACKAGE)$(BINEXT)
- 
- uninstall_bin:
--	$(RM) $(INSTALLDIR)/$(PACKAGE)$(BINEXT)
-+	$(RM) $(DESTDIR)$(INSTALLDIR)/$(PACKAGE)$(BINEXT)
- 
- install_inc:
--	$(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2
--	$(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLM_INCLUDES) $(INCLUDEDIR)/gkrellm2
-+	$(INSTALL) -d -m $(INCLUDEDIRMODE) $(DESTDIR)$(INCLUDEDIR)/gkrellm2
-+	$(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLM_INCLUDES) $(DESTDIR)$(INCLUDEDIR)/gkrellm2
- 
- # FIXME: may remove too many files, overlaps with uninstall_inc from server
- uninstall_inc:
--	$(RM) -r $(INCLUDEDIR)/gkrellm2
-+	$(RM) -r $(DESTDIR)$(INCLUDEDIR)/gkrellm2
- 
- install_man:
--	$(INSTALL) -d -m $(MANDIRMODE) $(MANDIR)
--	$(INSTALL) -c -m $(MANMODE) ../gkrellm.1 $(MANDIR)/$(PACKAGE).1
-+	$(INSTALL) -d -m $(MANDIRMODE) $(DESTDIR)$(MANDIR)
-+	$(INSTALL) -c -m $(MANMODE) ../gkrellm.1 $(DESTDIR)$(MANDIR)/$(PACKAGE).1
- 
- uninstall_man:
--	$(RM) $(MANDIR)/$(PACKAGE).1
-+	$(RM) $(DESTDIR)$(MANDIR)/$(PACKAGE).1
- 
- install-data:
--	$(INSTALL) -d -m 755 $(MENUDIR)
--	$(INSTALL) -c -m 644 ../data/gkrellm.desktop $(MENUDIR)/
--	$(INSTALL) -d -m 755 $(ICONDIR)/hicolor/16x16/apps
--	$(INSTALL) -c -m 644 ../data/icons/16/gkrellm.png $(ICONDIR)/hicolor/16x16/apps/
--	$(INSTALL) -d -m 755 $(ICONDIR)/hicolor/24x24/apps
--	$(INSTALL) -c -m 644 ../data/icons/24/gkrellm.png $(ICONDIR)/hicolor/24x24/apps/
--	$(INSTALL) -d -m 755 $(ICONDIR)/hicolor/32x32/apps
--	$(INSTALL) -c -m 644 ../data/icons/32/gkrellm.png $(ICONDIR)/hicolor/32x32/apps/
--	$(INSTALL) -d -m 755 $(ICONDIR)/hicolor/48x48/apps
--	$(INSTALL) -c -m 644 ../data/icons/48/gkrellm.png $(ICONDIR)/hicolor/48x48/apps/
--	$(INSTALL) -d -m 755 $(ICONDIR)/hicolor/64x64/apps
--	$(INSTALL) -c -m 644 ../data/icons/64/gkrellm.png $(ICONDIR)/hicolor/64x64/apps/
--	$(INSTALL) -d -m 755 $(METAINFODIR)
--	$(INSTALL) -c -m 644 ../data/net.srcbox.gkrellm.GKrellM.metainfo.xml $(METAINFODIR)/
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(MENUDIR)
-+	$(INSTALL) -c -m 644 ../data/gkrellm.desktop $(DESTDIR)$(MENUDIR)/
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(ICONDIR)/hicolor/16x16/apps
-+	$(INSTALL) -c -m 644 ../data/icons/16/gkrellm.png $(DESTDIR)$(ICONDIR)/hicolor/16x16/apps/
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(ICONDIR)/hicolor/24x24/apps
-+	$(INSTALL) -c -m 644 ../data/icons/24/gkrellm.png $(DESTDIR)$(ICONDIR)/hicolor/24x24/apps/
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(ICONDIR)/hicolor/32x32/apps
-+	$(INSTALL) -c -m 644 ../data/icons/32/gkrellm.png $(DESTDIR)$(ICONDIR)/hicolor/32x32/apps/
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(ICONDIR)/hicolor/48x48/apps
-+	$(INSTALL) -c -m 644 ../data/icons/48/gkrellm.png $(DESTDIR)$(ICONDIR)/hicolor/48x48/apps/
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(ICONDIR)/hicolor/64x64/apps
-+	$(INSTALL) -c -m 644 ../data/icons/64/gkrellm.png $(DESTDIR)$(ICONDIR)/hicolor/64x64/apps/
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(METAINFODIR)
-+	$(INSTALL) -c -m 644 ../data/net.srcbox.gkrellm.GKrellM.metainfo.xml $(DESTDIR)$(METAINFODIR)/
- 
- uninstall-data:
--	$(RM) $(MENUDIR)/gkrellm.desktop
--	$(RM) $(ICONDIR)/hicolor/16x16/apps/gkrellm.png
--	$(RM) $(ICONDIR)/hicolor/24x24/apps/gkrellm.png
--	$(RM) $(ICONDIR)/hicolor/32x32/apps/gkrellm.png
--	$(RM) $(ICONDIR)/hicolor/48x48/apps/gkrellm.png
--	$(RM) $(ICONDIR)/hicolor/64x64/apps/gkrellm.png
--	$(RM) $(METAINFODIR)/net.srcbox.gkrellm.GKrellM.metainfo.xml
-+	$(RM) $(DESTDIR)$(MENUDIR)/gkrellm.desktop
-+	$(RM) $(DESTDIR)$(ICONDIR)/hicolor/16x16/apps/gkrellm.png
-+	$(RM) $(DESTDIR)$(ICONDIR)/hicolor/24x24/apps/gkrellm.png
-+	$(RM) $(DESTDIR)$(ICONDIR)/hicolor/32x32/apps/gkrellm.png
-+	$(RM) $(DESTDIR)$(ICONDIR)/hicolor/48x48/apps/gkrellm.png
-+	$(RM) $(DESTDIR)$(ICONDIR)/hicolor/64x64/apps/gkrellm.png
-+	$(RM) $(DESTDIR)$(METAINFODIR)/net.srcbox.gkrellm.GKrellM.metainfo.xml
+@@ -197,8 +198,8 @@ install_freebsd:
  
- uninstall: uninstall_bin uninstall_inc uninstall_man uninstall-data
+ install_freebsd:
+ 	$(MAKE) install
+-	chgrp kmem $(DESTDIR)$(INSTALLDIR)/$(PACKAGE)
+-	chmod g+s $(DESTDIR)$(INSTALLDIR)/$(PACKAGE)
++	# chgrp kmem $(DESTDIR)$(INSTALLDIR)/$(PACKAGE)
++	# chmod g+s $(DESTDIR)$(INSTALLDIR)/$(PACKAGE)
  
+ install_netbsd:
+ 	$(MAKE) MANDIR="$(PREFIX)/man/man1" install
diff --git a/sysutils/gkrellm2/files/patch-src__sysdeps__bsd-common.c b/sysutils/gkrellm2/files/patch-src__sysdeps__bsd-common.c
deleted file mode 100644
index 4ee03712bdc0..000000000000
--- a/sysutils/gkrellm2/files/patch-src__sysdeps__bsd-common.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/sysdeps/bsd-common.c.orig	2010-09-14 16:27:35 UTC
-+++ src/sysdeps/bsd-common.c
-@@ -64,6 +64,10 @@ gkrellm_sys_net_read_data(void)
- 			{
- 			if (ifa->ifa_addr->sa_family != AF_LINK)
- 				continue;
-+#ifdef IFF_CANTCONFIG
-+			if ((ifa->ifa_flags & IFF_CANTCONFIG) != 0)
-+				continue;
-+#endif
- 			ifd = (struct if_data *)ifa->ifa_data;
- 			gkrellm_net_assign_data(ifa->ifa_name,
- 					ifd->ifi_ibytes, ifd->ifi_obytes);
diff --git a/sysutils/gkrellm2/files/patch-src__sysdeps__freebsd.c b/sysutils/gkrellm2/files/patch-src__sysdeps__freebsd.c
deleted file mode 100644
index b479fd4e0970..000000000000
--- a/sysutils/gkrellm2/files/patch-src__sysdeps__freebsd.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/sysdeps/freebsd.c.orig	2014-10-14 17:46:57.000000000 -0700
-+++ src/sysdeps/freebsd.c	2017-03-21 00:00:48.928710000 -0700
-@@ -701,9 +701,15 @@
- 		     xig->xig_len > sizeof(struct xinpgen);
- 		     xig = (struct xinpgen *)((char *)xig + xig->xig_len))
- 			{
-+#if __FreeBSD_version >= 1200026
-+			struct xtcpcb *tp = (struct xtcpcb *)xig;
-+			struct xinpcb *inp = &tp->xt_inp;
-+			struct xsocket *so = &inp->xi_socket;
-+#else
- 			struct tcpcb *tp = &((struct xtcpcb *)xig)->xt_tp;
- 			struct inpcb *inp = &((struct xtcpcb *)xig)->xt_inp;
- 			struct xsocket *so = &((struct xtcpcb *)xig)->xt_socket;
-+#endif
- 
- 			/* Ignore sockets for protocols other than tcp. */
- 			if (so->xso_protocol != IPPROTO_TCP)
-@@ -1441,7 +1447,9 @@
- 		struct smbcmd cmd;
- 
- 		bzero(&cmd, sizeof(cmd));
-+#if __FreeBSD_version < 1100070
- 		cmd.data.byte_ptr = (char *)&byte;
-+#endif
- 		cmd.slave         = 0x5a;
- 		cmd.cmd           = command;
- 		if (ioctl(iodev, SMB_READB, (caddr_t)&cmd) == -1)
-@@ -1449,6 +1457,9 @@
- 			close(iodev);
- 			return FALSE;
- 			}
-+#if __FreeBSD_version >= 1100070
-+		byte = (u_char)cmd.rdata.byte;
-+#endif
- 		}
- #endif
- 	else
diff --git a/sysutils/gkrellm2/pkg-plist b/sysutils/gkrellm2/pkg-plist
index 9a25de7060f9..982ab497080e 100644
--- a/sysutils/gkrellm2/pkg-plist
+++ b/sysutils/gkrellm2/pkg-plist
@@ -1,39 +1,40 @@
 %%CLIENT%%bin/gkrellm
 %%CLIENT%%include/gkrellm2/gkrellm-public-proto.h
 %%CLIENT%%include/gkrellm2/gkrellm-version.h
+include/gkrellm2/gkrellm-visibility.h
 %%CLIENT%%include/gkrellm2/gkrellm.h
 include/gkrellm2/gkrellmd-version.h
 include/gkrellm2/gkrellmd.h
 include/gkrellm2/log.h
 %%CLIENT%%libdata/pkgconfig/gkrellm.pc
 libdata/pkgconfig/gkrellmd.pc
 %%CLIENT%%share/man/man1/gkrellm.1.gz
 share/man/man8/gkrellmd.8.gz
 sbin/gkrellmd
 @sample %%EXAMPLESDIR%%/gkrellmd.conf etc/gkrellmd.conf
 %%CLIENT%%share/applications/gkrellm.desktop
 %%CLIENT%%share/icons/hicolor/16x16/apps/gkrellm.png
 %%CLIENT%%share/icons/hicolor/24x24/apps/gkrellm.png
 %%CLIENT%%share/icons/hicolor/32x32/apps/gkrellm.png
 %%CLIENT%%share/icons/hicolor/48x48/apps/gkrellm.png
 %%CLIENT%%share/icons/hicolor/64x64/apps/gkrellm.png
 %%CLIENT%%%%NLS%%share/locale/bg/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%%%NLS%%share/locale/cs/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%%%NLS%%share/locale/da/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%%%NLS%%share/locale/de/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%%%NLS%%share/locale/es/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%%%NLS%%share/locale/fr/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%%%NLS%%share/locale/it/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%%%NLS%%share/locale/ja/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%%%NLS%%share/locale/nl/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%%%NLS%%share/locale/pl/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%%%NLS%%share/locale/pt/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%%%NLS%%share/locale/pt_BR/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%%%NLS%%share/locale/ru/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%%%NLS%%share/locale/sl/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%%%NLS%%share/locale/sv/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%%%NLS%%share/locale/uk/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%share/metainfo/net.srcbox.gkrellm.GKrellM.metainfo.xml
 %%CLIENT%%@dir libexec/gkrellm2/plugins
 @dir libexec/gkrellm2/plugins-gkrellmd
 %%CLIENT%%@dir %%DATADIR%%2/themes