- update to gkrellm-2.3.2

This commit is contained in:
ajacoutot 2008-11-09 13:38:29 +00:00
parent f2bea3b294
commit c72b360d72
12 changed files with 112 additions and 107 deletions

View File

@ -1,21 +1,21 @@
# $OpenBSD: Makefile,v 1.41 2008/09/02 11:28:05 landry Exp $
# $OpenBSD: Makefile,v 1.42 2008/11/09 13:38:29 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT-main= single process stack of system monitors for GTK+2 (server)
COMMENT-client= single process stack of system monitors for GTK+2
V= 2.3.1
V= 2.3.2
DISTNAME= gkrellm-${V}
PKGNAME-main= gkrellm-server-${V}p3
PKGNAME-client= gkrellm-${V}p4
PKGNAME-main= gkrellm-server-${V}
PKGNAME-client= gkrellm-${V}
CATEGORIES= sysutils sysutils/gkrellm
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
HOMEPAGE= http://www.gkrellm.net/
# GPLv3
# GPLv3 with OpenSSL license exception
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes

View File

@ -1,5 +1,5 @@
MD5 (gkrellm-2.3.1.tar.bz2) = AJ2N3dPOXMg6S7TVWe6SLQ==
RMD160 (gkrellm-2.3.1.tar.bz2) = QPSqU0m+QtAaH4/3tPLoOYa+DmI=
SHA1 (gkrellm-2.3.1.tar.bz2) = 9eggau7pP1s6av/5zFXFjp1RH1Y=
SHA256 (gkrellm-2.3.1.tar.bz2) = Gip+PunR8tcwXaDTPZvnH/5dGQPtapxpz3f/4Q/JW00=
SIZE (gkrellm-2.3.1.tar.bz2) = 744132
MD5 (gkrellm-2.3.2.tar.bz2) = 1VQ6Q57neVAoLQawAASL5w==
RMD160 (gkrellm-2.3.2.tar.bz2) = CqzA0Hg8/1uy/YxnNlU6POiHStk=
SHA1 (gkrellm-2.3.2.tar.bz2) = /pSZbE/ghMKL96f7w/jU/WRySsA=
SHA256 (gkrellm-2.3.2.tar.bz2) = oQLmgcvMRfjLIlygoyG2J3IQbW8Ls3LqoCa1otqECHM=
SIZE (gkrellm-2.3.2.tar.bz2) = 747697

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Makefile,v 1.8 2007/10/26 22:56:57 ajacoutot Exp $
--- Makefile.orig Thu Jul 19 23:21:50 2007
+++ Makefile Fri Oct 26 15:38:58 2007
$OpenBSD: patch-Makefile,v 1.9 2008/11/09 13:38:29 ajacoutot Exp $
--- Makefile.orig Fri Oct 3 23:52:48 2008
+++ Makefile Sun Nov 9 13:26:44 2008
@@ -89,16 +89,12 @@ BINMODE = 755
VERSION = 2.3.0
VERSION = 2.3.2
-INSTALLROOT ?= $(DESTDIR)$(PREFIX)
+INSTALLROOT ?= ${PREFIX}

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gkrellm_1,v 1.1 2008/08/21 07:23:44 ajacoutot Exp $
--- gkrellm.1.orig Tue Jul 29 10:10:38 2008
+++ gkrellm.1 Tue Jul 29 10:12:27 2008
@@ -758,7 +758,7 @@ any correction factors and offsets for each of the sen
$OpenBSD: patch-gkrellm_1,v 1.2 2008/11/09 13:38:29 ajacoutot Exp $
--- gkrellm.1.orig Sat Oct 4 03:48:08 2008
+++ gkrellm.1 Sun Nov 9 13:26:44 2008
@@ -767,7 +767,7 @@ any correction factors and offsets for each of the sen
(see below and lm_sensor documentation). For Linux, default values are
automatically provided for many sensor chips.
.PP
@ -10,7 +10,7 @@ $OpenBSD: patch-gkrellm_1,v 1.1 2008/08/21 07:23:44 ajacoutot Exp $
offsets on the Sensors config page because libsensors configuration is
done in the /etc/sensors.conf file. To get sensor debug output and to find
out the sensor data source, run:
@@ -1088,8 +1088,7 @@ several locations:
@@ -1097,8 +1097,7 @@ several locations:
.RS
.nf
~/.gkrellm2/themes
@ -20,7 +20,7 @@ $OpenBSD: patch-gkrellm_1,v 1.1 2008/08/21 07:23:44 ajacoutot Exp $
.fi
.RE
.PP
@@ -1100,7 +1099,7 @@ theme may also be installed as:
@@ -1109,7 +1108,7 @@ theme may also be installed as:
.RS
.nf
~/.themes/THEME_NAME/gkrellm2
@ -29,7 +29,7 @@ $OpenBSD: patch-gkrellm_1,v 1.1 2008/08/21 07:23:44 ajacoutot Exp $
.fi
.RE
.PP
@@ -1125,11 +1124,9 @@ and there you will find a Theme making reference.
@@ -1134,11 +1133,9 @@ and there you will find a Theme making reference.
tries to load all plugins (shared object files ending in .so)
it finds in your plugin directory
.IR ~/.gkrellm2/plugins.
@ -44,7 +44,7 @@ $OpenBSD: patch-gkrellm_1,v 1.1 2008/08/21 07:23:44 ajacoutot Exp $
.PP
Some plugins may be available only as source files and they will
have to be compiled before installation. There should be instructions
@@ -1164,25 +1161,19 @@ and user's themes.
@@ -1173,25 +1170,19 @@ and user's themes.
.I ~/.gkrellm2/plugins
User plugin directory.
.TP

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gkrellmd_1,v 1.1 2008/08/21 07:23:44 ajacoutot Exp $
--- gkrellmd.1.orig Tue Jul 29 10:12:40 2008
+++ gkrellmd.1 Tue Jul 29 10:13:51 2008
@@ -362,7 +362,7 @@ to see a log of the plugin install process.
$OpenBSD: patch-gkrellmd_1,v 1.2 2008/11/09 13:38:29 ajacoutot Exp $
--- gkrellmd.1.orig Sat Oct 4 03:52:26 2008
+++ gkrellmd.1 Sun Nov 9 13:26:45 2008
@@ -375,7 +375,7 @@ to see a log of the plugin install process.
.SH "FILES"
.TP
@ -10,7 +10,7 @@ $OpenBSD: patch-gkrellmd_1,v 1.1 2008/08/21 07:23:44 ajacoutot Exp $
System server config which is read first.
The config file may contain lines similar to the command line args.
For example:
@@ -401,20 +401,14 @@ command line args will override options in gkrellmd.co
@@ -414,20 +414,14 @@ command line args will override options in gkrellmd.co
.RE
.TP

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-server_Makefile,v 1.8 2007/10/26 22:56:57 ajacoutot Exp $
--- server/Makefile.orig Fri Oct 26 15:06:21 2007
+++ server/Makefile Fri Oct 26 15:07:54 2007
@@ -2,12 +2,9 @@ PACKAGE_D ?= gkrellmd
PKG_CONFIG ?= pkg-config
$OpenBSD: patch-server_Makefile,v 1.9 2008/11/09 13:38:29 ajacoutot Exp $
--- server/Makefile.orig Sun Nov 9 13:21:40 2008
+++ server/Makefile Sun Nov 9 13:24:01 2008
@@ -3,10 +3,7 @@ PKG_CONFIG ?= pkg-config
BINMODE ?= 755
BINEXT ?=
-INSTALLROOT ?= $(DESTDIR)$(PREFIX)
-ifeq ($(INSTALLROOT),)
@ -11,14 +11,11 @@ $OpenBSD: patch-server_Makefile,v 1.8 2007/10/26 22:56:57 ajacoutot Exp $
-endif
+INSTALLROOT ?= $(PREFIX)
-SINSTALLDIR ?= $(INSTALLROOT)/bin
+SINSTALLDIR ?= $(INSTALLROOT)/sbin
SINSTALLDIR ?= $(INSTALLROOT)/bin
INSTALLDIRMODE ?= 755
INCLUDEDIR ?= $(INSTALLROOT)/include
@@ -17,11 +14,11 @@ INCLUDEDIRMODE ?= 755
LIBDIR ?= $(INSTALLROOT)/lib
LIBDIRMODE ?= 755
@@ -22,11 +19,11 @@ CFGDIR ?= $(INSTALLROOT)/etc
CFGDIRMODE ?= 755
CFGMODE ?= 644
-SMANDIR ?= $(INSTALLROOT)/share/man/man1
+SMANDIR ?= $(INSTALLROOT)/man/man1
@ -29,41 +26,28 @@ $OpenBSD: patch-server_Makefile,v 1.8 2007/10/26 22:56:57 ajacoutot Exp $
+LINK_FLAGS ?= -Wl
EXTRAOBJS =
@@ -51,23 +48,23 @@ PKG_LIB = `$(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 g
SHARED_PATH = ../shared
@@ -59,13 +56,13 @@ PKG_LIB = `$(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 g
GLIB12_INCLUDE = `glib-config --cflags`
GLIB12_LIB = `glib-config --libs glib gmodule`
-FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
+FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
ifeq ($(glib12),1)
-FLAGS = -O2 -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
+FLAGS = -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
endif
ifeq ($(glib12),yes)
-FLAGS = -O2 -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
+FLAGS = -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
endif
FLAGS+= $(PTHREAD_INC)
-LIBS = $(PKG_LIB) $(GTOP_LIBS_D) $(SYS_LIBS) $(SENSORS_LIBS)
+LIBS += $(PKG_LIB) $(GTOP_LIBS_D) $(SYS_LIBS) $(SENSORS_LIBS)
-FLAGS = -O2 $(PKG_INCLUDE)
+FLAGS = $(PKG_INCLUDE)
ifeq ($(glib12),1)
-LIBS = $(GLIB12_LIB) $(GTOP_LIBS_D) $(SYS_LIBS) $(SENSORS_LIBS)
+LIBS += $(GLIB12_LIB) $(GTOP_LIBS_D) $(SYS_LIBS) $(SENSORS_LIBS)
- FLAGS = -O2 $(GLIB12_INCLUDE)
+ FLAGS = $(GLIB12_INCLUDE)
endif
ifeq ($(glib12),yes)
-LIBS = $(GLIB12_LIB) $(GTOP_LIBS_D) $(SYS_LIBS) $(SENSORS_LIBS)
+LIBS += $(GLIB12_LIB) $(GTOP_LIBS_D) $(SYS_LIBS) $(SENSORS_LIBS)
- FLAGS = -O2 $(GLIB12_INCLUDE)
+ FLAGS = $(GLIB12_INCLUDE)
endif
FLAGS += $(GTOP_INCLUDE) $(PTHREAD_INC) -I.. -I$(SHARED_PATH) -DGKRELLM_SERVER
ifeq ($(debug),1)
@@ -100,7 +97,7 @@ ifeq ($(HAVE_GETADDRINFO),1)
@@ -107,7 +104,7 @@ ifeq ($(HAVE_GETADDRINFO),1)
FLAGS += -DHAVE_GETADDRINFO
endif
-override CC += -Wall $(FLAGS)
+CFLAGS += $(FLAGS)

View File

@ -1,20 +1,21 @@
$OpenBSD: patch-server_gkrellmd_conf,v 1.1 2008/08/21 07:23:44 ajacoutot Exp $
--- server/gkrellmd.conf.orig Tue Jul 29 10:02:02 2008
+++ server/gkrellmd.conf Tue Jul 29 10:05:18 2008
@@ -29,14 +29,14 @@ port 19150
$OpenBSD: patch-server_gkrellmd_conf,v 1.2 2008/11/09 13:38:29 ajacoutot Exp $
--- server/gkrellmd.conf.orig Sun Nov 9 13:24:08 2008
+++ server/gkrellmd.conf Sun Nov 9 13:24:57 2008
@@ -30,7 +30,7 @@ port 19150
# Drop privileges after startup (you must start gkrellmd as root to do it).
# NOTE: Option ignored on Windows
#
-#user nobody
+user _gkrellmd
#group proc
# Create a PID file for the running gkrellmd. Default is no PID file.
#pidfile /var/run/gkrellmd.pid
@@ -41,7 +41,7 @@ port 19150
# Run in background and detach from the controlling terminal
# NOTE: Option ignored on Windows
#
-#detach
+detach
# Time interval between checks for various monitors. If nfs-interval
# is <= 0 then gkrellmd will not read data for nfs file system types.
# Enable writing logging message to the system syslog file
#syslog

View File

@ -1,22 +1,20 @@
$OpenBSD: patch-server_gkrellmd_h,v 1.6 2008/08/21 07:23:44 ajacoutot Exp $
--- server/gkrellmd.h.orig Tue Jul 29 09:59:22 2008
+++ server/gkrellmd.h Tue Jul 29 10:00:52 2008
@@ -104,14 +104,14 @@ GKRELLMD_VERSION_REV >= (rev)))
#define GKRELLMD_CONFIG "gkrellmd.conf"
$OpenBSD: patch-server_gkrellmd_h,v 1.7 2008/11/09 13:38:29 ajacoutot Exp $
--- server/gkrellmd.h.orig Sun Nov 9 13:25:01 2008
+++ server/gkrellmd.h Sun Nov 9 13:25:43 2008
@@ -114,12 +114,12 @@ GKRELLMD_VERSION_REV >= (rev)))
#define GKRELLMD_PLUGINS_DIR ".gkrellm2/plugins-gkrellmd"
-#define GKRELLMD_LOCAL_PLUGINS_DIR "/usr/local/lib/gkrellm2/plugins-gkrellmd"
+#define GKRELLMD_LOCAL_PLUGINS_DIR "${PREFIX}/lib/gkrellm2/plugins-gkrellmd"
#if !defined(GKRELLMD_SYSTEM_PLUGINS_DIR)
-#define GKRELLMD_SYSTEM_PLUGINS_DIR "/usr/lib/gkrellm2/plugins-gkrellmd"
+#define GKRELLMD_SYSTEM_PLUGINS_DIR "${PREFIX}/lib/gkrellm2/plugins-gkrellmd"
#endif
#if !defined(WIN32)
-#define GKRELLMD_SYS_ETC "/etc"
-#define GKRELLMD_LOCAL_ETC "/usr/local/etc"
+#define GKRELLMD_SYS_ETC "${SYSCONFDIR}"
+#define GKRELLMD_LOCAL_ETC "${SYSCONFDIR}"
#endif
- #define GKRELLMD_LOCAL_PLUGINS_DIR "/usr/local/lib/gkrellm2/plugins-gkrellmd"
+ #define GKRELLMD_LOCAL_PLUGINS_DIR "${PREFIX}/lib/gkrellm2/plugins-gkrellmd"
#if !defined(GKRELLMD_SYSTEM_PLUGINS_DIR)
- #define GKRELLMD_SYSTEM_PLUGINS_DIR "/usr/lib/gkrellm2/plugins-gkrellmd"
+ #define GKRELLMD_SYSTEM_PLUGINS_DIR "${PREFIX}/lib/gkrellm2/plugins-gkrellmd"
#endif
- #define GKRELLMD_SYS_ETC "/etc"
- #define GKRELLMD_LOCAL_ETC "/usr/local/etc"
+ #define GKRELLMD_SYS_ETC "${SYSCONFDIR}"
+ #define GKRELLMD_LOCAL_ETC "${SYSCONFDIR}"
#endif // !defined(WIN32)

View File

@ -1,16 +1,16 @@
$OpenBSD: patch-src_Makefile,v 1.4 2007/10/26 22:56:57 ajacoutot Exp $
--- src/Makefile.orig Mon May 28 21:12:20 2007
+++ src/Makefile Fri Oct 26 15:52:38 2007
@@ -70,7 +70,7 @@ PKG_INCLUDE = `$(PKG_CONFIG) --cflags gtk+-2.0 gthread
$OpenBSD: patch-src_Makefile,v 1.5 2008/11/09 13:38:29 ajacoutot Exp $
--- src/Makefile.orig Sun Nov 9 13:25:51 2008
+++ src/Makefile Sun Nov 9 13:26:13 2008
@@ -78,7 +78,7 @@ GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h $(
PKG_INCLUDE = `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0`
PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0`
-FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
+FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
FLAGS+= $(PTHREAD_INC)
-FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE) $(PTHREAD_INC) \
+FLAGS = -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE) $(PTHREAD_INC) \
-DGKRELLM_CLIENT
LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(SENSORS_LIBS)
@@ -98,7 +98,7 @@ ifeq ($(HAVE_GETADDRINFO),1)
LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(NTLM_LIBS) $(SENSORS_LIBS)
@@ -113,7 +113,7 @@ ifeq ($(HAVE_GETADDRINFO),1)
endif

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_main_c,v 1.1 2008/11/09 13:38:29 ajacoutot Exp $
--- src/main.c.orig Sun Nov 9 14:31:11 2008
+++ src/main.c Sun Nov 9 14:32:04 2008
@@ -2050,6 +2050,8 @@ main(gint argc, gchar **argv)
gint i;
gchar *s;
+ gkrellm_sys_main_init();
+
#ifdef ENABLE_NLS
gtk_set_locale();
#endif
@@ -2188,8 +2190,6 @@ main(gint argc, gchar **argv)
if (_GK.debug_level > 0)
g_debug("--- GKrellM %d.%d.%d ---\n", GKRELLM_VERSION_MAJOR,
GKRELLM_VERSION_MINOR, GKRELLM_VERSION_REV);
-
- gkrellm_sys_main_init(); //FIXME: call this later or earlier?
_GK.w_display = gdk_screen_get_width(gdk_screen_get_default());
_GK.h_display = gdk_screen_get_height(gdk_screen_get_default());

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_sysdeps_openbsd_c,v 1.11 2008/09/02 11:28:05 landry Exp $
--- src/sysdeps/openbsd.c.orig Fri Jul 6 16:54:22 2007
+++ src/sysdeps/openbsd.c Sat Jul 12 09:14:03 2008
@@ -53,41 +53,71 @@ gkrellm_sys_main_cleanup(void)
$OpenBSD: patch-src_sysdeps_openbsd_c,v 1.12 2008/11/09 13:38:29 ajacoutot Exp $
--- src/sysdeps/openbsd.c.orig Sat Oct 4 02:46:45 2008
+++ src/sysdeps/openbsd.c Sun Nov 9 13:26:45 2008
@@ -65,41 +65,71 @@ gkrellm_sys_main_cleanup(void)
#include <sys/dkstat.h>
#include <kvm.h>
@ -93,7 +93,7 @@ $OpenBSD: patch-src_sysdeps_openbsd_c,v 1.11 2008/09/02 11:28:05 landry Exp $
/* ===================================================================== */
/* Proc monitor interface */
@@ -259,41 +289,122 @@ gkrellm_sys_mem_init(void)
@@ -271,41 +301,122 @@ gkrellm_sys_mem_init(void)
/* ===================================================================== */
@ -228,7 +228,7 @@ $OpenBSD: patch-src_sysdeps_openbsd_c,v 1.11 2008/09/02 11:28:05 landry Exp $
#include <machine/apmvar.h>
#define APMDEV "/dev/apm"
@@ -405,7 +516,7 @@ gkrellm_sys_disk_read_data(void)
@@ -417,7 +528,7 @@ gkrellm_sys_disk_read_data(void)
/* Separate read/write stats were implemented in NetBSD 1.6K.
*/
@ -237,7 +237,7 @@ $OpenBSD: patch-src_sysdeps_openbsd_c,v 1.11 2008/09/02 11:28:05 landry Exp $
rbytes = d.dk_rbytes;
wbytes = d.dk_wbytes;
#else
@@ -413,7 +524,7 @@ gkrellm_sys_disk_read_data(void)
@@ -425,7 +536,7 @@ gkrellm_sys_disk_read_data(void)
wbytes = 0;
#endif

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-client,v 1.6 2007/10/25 07:34:29 ajacoutot Exp $
@comment $OpenBSD: PLIST-client,v 1.7 2008/11/09 13:38:29 ajacoutot Exp $
@mode 2755
@group kmem
bin/gkrellm
@ -7,6 +7,7 @@ bin/gkrellm
include/gkrellm2/
include/gkrellm2/gkrellm-public-proto.h
include/gkrellm2/gkrellm.h
include/gkrellm2/log.h
lib/pkgconfig/gkrellm.pc
@man man/man1/gkrellm.1
share/locale/bg/LC_MESSAGES/gkrellm.mo