From 6159ef6b49d6e0432ea6ef3b4514ffdf44a93f14 Mon Sep 17 00:00:00 2001 From: cube Date: Wed, 25 Feb 2004 08:41:56 +0000 Subject: Update to 2.1.26. Pkgsrc change: o use subst.mk instead of hand-crafted sed which removes the need for patches. GKrellM changes: * Patches: o Frederick Bruckman detect multiple CPUs on NetBSD. * Bugfixes: o Andreas Liebe patch to solaris.c prevents running out of fds on some SPARC servers. o CPU and Net stats from 64 bit gkrellmd server overflowed on a 32 bit client. o Changed Linux sysfs sensor temperature factor from 100 to 1000. Those running Linux kernels >= 2.6.2 should now only need gkrellm config temperature factors of 1.0. But those still running kernels <= 2.6.1 may still need factor of 10 gkrellm config adjustments. o $d should be %d typo in cs.po --- sysutils/gkrellm-server/Makefile | 10 +++++----- sysutils/gkrellm/Makefile | 9 +++++---- sysutils/gkrellm/Makefile.common | 4 ++-- sysutils/gkrellm/distinfo | 8 +++----- sysutils/gkrellm/files/top.Makefile.inc | 7 ++++--- sysutils/gkrellm/patches/patch-ac | 18 ------------------ sysutils/gkrellm/patches/patch-af | 13 ------------- 7 files changed, 19 insertions(+), 50 deletions(-) delete mode 100644 sysutils/gkrellm/patches/patch-ac delete mode 100644 sysutils/gkrellm/patches/patch-af (limited to 'sysutils') diff --git a/sysutils/gkrellm-server/Makefile b/sysutils/gkrellm-server/Makefile index c81bb70ebde..13fce31da3b 100644 --- a/sysutils/gkrellm-server/Makefile +++ b/sysutils/gkrellm-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/02/24 22:30:25 cube Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/25 08:41:56 cube Exp $ .include "../../sysutils/gkrellm/Makefile.common" GKRELLM_PKGBASE= gkrellm-server @@ -24,10 +24,10 @@ MAKE_ENV+= MODULES=server # Define this to use glib-1.2 instead of glib-2 BUILD_DEFS+= GKRELLMSERVER_USE_GLIB12 -pre-build: - ${SED} -e s,@@PREFIX@@,${PREFIX}, \ - <${WRKSRC}/server/gkrellmd.h >${WRKSRC}/server/gkrellmd.h.sed - ${MV} ${WRKSRC}/server/gkrellmd.h.sed ${WRKSRC}/server/gkrellmd.h +SUBST_STAGE.gkprefix= post-patch +SUBST_FILES.gkprefix= ${WRKSRC}/server/gkrellmd.h +SUBST_SED.gkprefix= -e '/GKRELLMD_SYS_ETC/{s!/etc!${PREFIX}&!;}' +SUBST_CLASSES+= gkprefix post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gkrellm-server diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile index 60b8257c2bb..b6352ef9772 100644 --- a/sysutils/gkrellm/Makefile +++ b/sysutils/gkrellm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/02/25 00:36:11 cube Exp $ +# $NetBSD: Makefile,v 1.29 2004/02/25 08:41:56 cube Exp $ .include "Makefile.common" GKRELLM_PKGBASE= gkrellm @@ -22,9 +22,10 @@ NOT_FOR_PLATFORM= IRIX-* MAKE_ENV+= MODULES=src LINK_FLAGS=${EXPORT_SYMBOLS_LDFLAGS} -pre-build: - ${SED} -e s,@@PREFIX@@,${PREFIX}, <${WRKSRC}/src/gkrellm.h >${WRKSRC}/src/gkrellm.h.sed - ${MV} ${WRKSRC}/src/gkrellm.h.sed ${WRKSRC}/src/gkrellm.h +SUBST_STAGE.gkprefix= post-patch +SUBST_FILES.gkprefix= ${WRKSRC}/src/gkrellm.h +SUBST_SED.gkprefix= -e '/SYSTEM_/{s!/usr!${PREFIX}!;}' +SUBST_CLASSES+= gkprefix post-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm2 diff --git a/sysutils/gkrellm/Makefile.common b/sysutils/gkrellm/Makefile.common index 3cef23b4cd3..bcf3abe7f5e 100644 --- a/sysutils/gkrellm/Makefile.common +++ b/sysutils/gkrellm/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1.1.1 2004/02/24 22:11:28 cube Exp $ +# $NetBSD: Makefile.common,v 1.2 2004/02/25 08:41:56 cube Exp $ DISTNAME= ${GKRELLM_DISTBASE} PKGNAME= ${GKRELLM_PKGBASE}-${GKRELLM_VERSION} @@ -16,7 +16,7 @@ USE_PKGLOCALEDIR= YES MAKE_ENV+= LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale -GKRELLM_VERSION= 2.1.25 +GKRELLM_VERSION= 2.1.26 GKRELLM_DISTBASE= gkrellm-${GKRELLM_VERSION} GKRELLM_SRCDIR= ${WRKDIR}/${GKRELLM_DISTBASE} diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo index c0ddabadf06..1df35002186 100644 --- a/sysutils/gkrellm/distinfo +++ b/sysutils/gkrellm/distinfo @@ -1,6 +1,4 @@ -$NetBSD: distinfo,v 1.16 2004/02/24 22:21:15 cube Exp $ +$NetBSD: distinfo,v 1.17 2004/02/25 08:41:56 cube Exp $ -SHA1 (gkrellm-2.1.25.tar.bz2) = e45cf8192de7dcc393742d97f8b9a78950e4a5c4 -Size (gkrellm-2.1.25.tar.bz2) = 633685 bytes -SHA1 (patch-ac) = 577aecc480525f7ede6e8726308343c5ba90eca7 -SHA1 (patch-af) = c1879ccb5cb9adb1fe9822284fd7962c637daec7 +SHA1 (gkrellm-2.1.26.tar.bz2) = 3d40c19f0dfde3d05ee1d1ae0c8527c81861daab +Size (gkrellm-2.1.26.tar.bz2) = 633381 bytes diff --git a/sysutils/gkrellm/files/top.Makefile.inc b/sysutils/gkrellm/files/top.Makefile.inc index d8661b93ab8..bfa0d710623 100644 --- a/sysutils/gkrellm/files/top.Makefile.inc +++ b/sysutils/gkrellm/files/top.Makefile.inc @@ -1,4 +1,4 @@ -VERSION= 2.1.25 +VERSION= 2.1.26 # Path options PREFIX?= /usr/local @@ -115,10 +115,11 @@ SYS_LIBS+= -lnsl GKRELLM_CFLAGS= -DSOLARIS_8 endif else +SYS_LIBS+= -lsocket ifeq ($(MODULE),src) -SYS_LIBS+= -lresolv +SYS_LIBS+= -lresolv -lX11 else -SYS_LIBS+= -lsocket -lnsl +SYS_LIBS+= -lnsl endif endif endif diff --git a/sysutils/gkrellm/patches/patch-ac b/sysutils/gkrellm/patches/patch-ac deleted file mode 100644 index 2c59ca8a584..00000000000 --- a/sysutils/gkrellm/patches/patch-ac +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2004/02/24 22:21:15 cube Exp $ - ---- src/gkrellm.h.orig 2003-03-10 06:59:37.000000000 +0100 -+++ src/gkrellm.h -@@ -115,11 +115,11 @@ - - #define LOCAL_THEMES_DIR "/usr/local/share/gkrellm2/themes" - #if !defined(SYSTEM_THEMES_DIR) --#define SYSTEM_THEMES_DIR "/usr/share/gkrellm2/themes" -+#define SYSTEM_THEMES_DIR "@@PREFIX@@/share/gkrellm2/themes" - #endif - #define LOCAL_PLUGINS_DIR "/usr/local/lib/gkrellm2/plugins" - #if !defined(SYSTEM_PLUGINS_DIR) --#define SYSTEM_PLUGINS_DIR "/usr/lib/gkrellm2/plugins" -+#define SYSTEM_PLUGINS_DIR "@@PREFIX@@/lib/gkrellm2/plugins" - #endif - - #else diff --git a/sysutils/gkrellm/patches/patch-af b/sysutils/gkrellm/patches/patch-af deleted file mode 100644 index 0db2e3fb6a4..00000000000 --- a/sysutils/gkrellm/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2004/02/24 22:11:28 cube Exp $ - ---- server/gkrellmd.h.orig 2003-03-29 03:34:13.000000000 +0100 -+++ server/gkrellmd.h -@@ -143,7 +143,7 @@ extern int errno; - #define GKRELLMD_CONFIG "gkrellmd.conf" - - #if !defined(WIN32) --#define GKRELLMD_SYS_ETC "/etc" -+#define GKRELLMD_SYS_ETC "@@PREFIX@@/etc" - #define GKRELLMD_LOCAL_ETC "/usr/local/etc" - #endif - -- cgit v1.2.3