diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile index 46297a28e4f7..b9c7d4a6b093 100644 --- a/sysutils/gkrellm2/Makefile +++ b/sysutils/gkrellm2/Makefile @@ -1,79 +1,79 @@ PORTNAME= gkrellm -PORTVERSION= 2.5.0 +PORTVERSION= 2.5.1 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 .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 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 post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .include diff --git a/sysutils/gkrellm2/distinfo b/sysutils/gkrellm2/distinfo index d2f8f959d135..4a5cad0b6ae8 100644 --- a/sysutils/gkrellm2/distinfo +++ b/sysutils/gkrellm2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1765731793 -SHA256 (gkrellm-2.5.0.tar.bz2) = 68c75a03a06b935afa93d3331ca1c2d862c1d50c3e9df19d9a8d48970d766b55 -SIZE (gkrellm-2.5.0.tar.bz2) = 773211 +TIMESTAMP = 1771763247 +SHA256 (gkrellm-2.5.1.tar.bz2) = 089e3c1ed398482e682c9900b504ea166a6144a6c9fa041e70c5bbca6b177e63 +SIZE (gkrellm-2.5.1.tar.bz2) = 767988 diff --git a/sysutils/gkrellm2/files/patch-server__Makefile b/sysutils/gkrellm2/files/patch-server__Makefile deleted file mode 100644 index fd9473d17460..000000000000 --- a/sysutils/gkrellm2/files/patch-server__Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- server/Makefile.orig 2025-12-14 15:28:26 UTC -+++ server/Makefile -@@ -164,8 +164,8 @@ install_freebsd: - - 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) - - install_netbsd: - $(MAKE) SMANDIR="$(PREFIX)/man/man1" install_unix diff --git a/sysutils/gkrellm2/files/patch-server__gkrellmd.h b/sysutils/gkrellm2/files/patch-server__gkrellmd.h deleted file mode 100644 index a1b18d308191..000000000000 --- a/sysutils/gkrellm2/files/patch-server__gkrellmd.h +++ /dev/null @@ -1,15 +0,0 @@ ---- server/gkrellmd.h.orig 2010-09-14 16:34:34 UTC -+++ server/gkrellmd.h -@@ -131,8 +131,12 @@ - #if !defined(GKRELLMD_SYSTEM_PLUGINS_DIR) - #define GKRELLMD_SYSTEM_PLUGINS_DIR "/usr/lib/gkrellm2/plugins-gkrellmd" - #endif -+ #if !defined(GKRELLMD_SYS_ETC) - #define GKRELLMD_SYS_ETC "/etc" -+ #endif -+ #if 0 - #define GKRELLMD_LOCAL_ETC "/usr/local/etc" -+ #endif - #endif // !defined(WIN32) - - diff --git a/sysutils/gkrellm2/files/patch-src__Makefile b/sysutils/gkrellm2/files/patch-src__Makefile index 15709c5a752e..667ff122d806 100644 --- a/sysutils/gkrellm2/files/patch-src__Makefile +++ b/sysutils/gkrellm2/files/patch-src__Makefile @@ -1,23 +1,12 @@ ---- src/Makefile.orig 2025-12-14 15:28:26 UTC +--- src/Makefile.orig 2026-02-22 11:12:05 UTC +++ src/Makefile @@ -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 -@@ -197,8 +198,8 @@ install_freebsd: - - 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