From c6e36b36413380e646af20ff9fd404cfe94bce92 Mon Sep 17 00:00:00 2001 From: sturm Date: Sat, 16 Oct 2004 16:33:56 +0000 Subject: [PATCH] several updates from maintainer Peter Hessler --- sysutils/gkrellm/gkrellm/Makefile | 8 ++--- sysutils/gkrellm/gkrellm/distinfo | 6 ++-- .../gkrellm/gkrellm/patches/patch-Makefile | 14 ++++----- .../patches/patch-src_sysdeps_openbsd_c | 8 ++--- sysutils/gkrellm/gkrellm/pkg/PLIST-client | 3 +- sysutils/gkrellm/plugins/aclock/Makefile | 4 +-- sysutils/gkrellm/plugins/aclock/distinfo | 6 ++-- sysutils/gkrellm/plugins/flynn/Makefile | 4 +-- sysutils/gkrellm/plugins/flynn/distinfo | 6 ++-- sysutils/gkrellm/plugins/mailwatch/Makefile | 4 +-- sysutils/gkrellm/plugins/mailwatch/distinfo | 6 ++-- sysutils/gkrellm/plugins/mms/Makefile | 4 +-- sysutils/gkrellm/plugins/mms/distinfo | 6 ++-- sysutils/gkrellm/plugins/sun/Makefile | 4 +-- sysutils/gkrellm/plugins/sun/distinfo | 6 ++-- .../plugins/sun/patches/patch-Makefile | 13 ++++----- .../plugins/sun/patches/patch-gkrellsun_c | 29 ++++--------------- 17 files changed, 56 insertions(+), 75 deletions(-) diff --git a/sysutils/gkrellm/gkrellm/Makefile b/sysutils/gkrellm/gkrellm/Makefile index 155643c08df..fc654b8c9cd 100644 --- a/sysutils/gkrellm/gkrellm/Makefile +++ b/sysutils/gkrellm/gkrellm/Makefile @@ -1,14 +1,14 @@ -# $OpenBSD: Makefile,v 1.13 2004/06/25 18:54:50 marcm Exp $ +# $OpenBSD: Makefile,v 1.14 2004/10/16 16:33:56 sturm Exp $ NOT_FOR_ARCHS= ${NO_SHARED_ARCHS} COMMENT= "single process stack of system monitors for GTK+2 (server)" COMMENT-client= "single process stack of system monitors for GTK+2" -V= 2.2.1 +V= 2.2.4 DISTNAME= gkrellm-${V} -PKGNAME= gkrellm-server-${V}p0 -PKGNAME-client= gkrellm-${V}p0 +PKGNAME= gkrellm-server-${V} +PKGNAME-client= gkrellm-${V} CATEGORIES= sysutils sysutils/gkrellm HOMEPAGE= http://www.gkrellm.net/ diff --git a/sysutils/gkrellm/gkrellm/distinfo b/sysutils/gkrellm/gkrellm/distinfo index 400b9c07b1e..a6f121cda34 100644 --- a/sysutils/gkrellm/gkrellm/distinfo +++ b/sysutils/gkrellm/gkrellm/distinfo @@ -1,3 +1,3 @@ -MD5 (gkrellm-2.2.1.tar.bz2) = 56b96f14881c30753f3eb1251ef71068 -RMD160 (gkrellm-2.2.1.tar.bz2) = e25ac7f449bb07a0561a56d3ee3277b3426cfaa4 -SHA1 (gkrellm-2.2.1.tar.bz2) = 4a4d296a61307b3a0b93da035c07e301ed474dbc +MD5 (gkrellm-2.2.4.tar.bz2) = 7f8662d7f5b6e59f499799b6655c4267 +RMD160 (gkrellm-2.2.4.tar.bz2) = 06ba0d27a8ec1d8b0461fbe4297945f7c40121d2 +SHA1 (gkrellm-2.2.4.tar.bz2) = 20bf65e8b4d0026d5a727e6e5f6f4ded487bb935 diff --git a/sysutils/gkrellm/gkrellm/patches/patch-Makefile b/sysutils/gkrellm/gkrellm/patches/patch-Makefile index 29deefa80fe..5d1e97be194 100644 --- a/sysutils/gkrellm/gkrellm/patches/patch-Makefile +++ b/sysutils/gkrellm/gkrellm/patches/patch-Makefile @@ -1,17 +1,17 @@ -$OpenBSD: patch-Makefile,v 1.6 2004/06/18 08:48:35 robert Exp $ ---- Makefile.orig 2004-06-03 08:48:41.000000000 -0700 -+++ Makefile 2004-06-15 10:16:01.000000000 -0700 +$OpenBSD: patch-Makefile,v 1.7 2004/10/16 16:33:56 sturm Exp $ +--- Makefile.orig Mon Sep 6 15:32:40 2004 ++++ Makefile Mon Oct 11 00:11:29 2004 @@ -89,16 +89,12 @@ BINMODE = 755 - VERSION = 2.2.1 + VERSION = 2.2.4 -INSTALLROOT ?= $(DESTDIR)$(PREFIX) -- ++INSTALLROOT ?= ${PREFIX} + -ifeq ($(INSTALLROOT),) - INSTALLROOT = /usr/local -endif -+INSTALLROOT ?= ${PREFIX} - +- INSTALLDIR = $(INSTALLROOT)/bin -SINSTALLDIR ?= $(INSTALLDIR) -MANDIR ?= $(INSTALLROOT)/share/man/man1 diff --git a/sysutils/gkrellm/gkrellm/patches/patch-src_sysdeps_openbsd_c b/sysutils/gkrellm/gkrellm/patches/patch-src_sysdeps_openbsd_c index 2b6fd7812df..a34b4bb024c 100644 --- a/sysutils/gkrellm/gkrellm/patches/patch-src_sysdeps_openbsd_c +++ b/sysutils/gkrellm/gkrellm/patches/patch-src_sysdeps_openbsd_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_sysdeps_openbsd_c,v 1.4 2004/08/21 19:43:03 sturm Exp $ ---- src/sysdeps/openbsd.c.orig 2004-05-01 11:46:38.000000000 -0600 -+++ src/sysdeps/openbsd.c 2004-06-20 11:27:05.000000000 -0600 +$OpenBSD: patch-src_sysdeps_openbsd_c,v 1.5 2004/10/16 16:33:56 sturm Exp $ +--- src/sysdeps/openbsd.c.orig Sun Sep 5 12:57:34 2004 ++++ src/sysdeps/openbsd.c Mon Oct 11 00:11:29 2004 @@ -53,27 +53,21 @@ gkrellm_sys_main_cleanup(void) #include #include @@ -21,9 +21,9 @@ $OpenBSD: patch-src_sysdeps_openbsd_c,v 1.4 2004/08/21 19:43:03 sturm Exp $ - { "_cp_time" }, - { "" } - }; -- + size_t len; +- - if (kvmd == NULL) - return; - if (nl[0].n_type == 0) diff --git a/sysutils/gkrellm/gkrellm/pkg/PLIST-client b/sysutils/gkrellm/gkrellm/pkg/PLIST-client index 2820e143bc2..3a1f9f9e34e 100644 --- a/sysutils/gkrellm/gkrellm/pkg/PLIST-client +++ b/sysutils/gkrellm/gkrellm/pkg/PLIST-client @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-client,v 1.3 2004/09/15 18:39:32 espie Exp $ +@comment $OpenBSD: PLIST-client,v 1.4 2004/10/16 16:33:56 sturm Exp $ @mode 2755 @group kmem bin/gkrellm @@ -33,4 +33,3 @@ share/locale/sl/LC_MESSAGES/gkrellm.mo share/locale/sv/ share/locale/sv/LC_MESSAGES/ share/locale/sv/LC_MESSAGES/gkrellm.mo -@exec mkdir -p %D/lib/gkrellm2/plugins diff --git a/sysutils/gkrellm/plugins/aclock/Makefile b/sysutils/gkrellm/plugins/aclock/Makefile index ce1a0e79c76..b0606433209 100644 --- a/sysutils/gkrellm/plugins/aclock/Makefile +++ b/sysutils/gkrellm/plugins/aclock/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2003/11/03 20:34:16 sturm Exp $ +# $OpenBSD: Makefile,v 1.2 2004/10/16 16:33:56 sturm Exp $ COMMENT= "Analog clock for GkrellM2" -VERSION= 0.3.2 +VERSION= 0.3.2.1 DISTNAME= gkrellaclock-${VERSION} CATEGORIES= misc sysutils/gkrellm diff --git a/sysutils/gkrellm/plugins/aclock/distinfo b/sysutils/gkrellm/plugins/aclock/distinfo index 579bee88282..319bd131ec6 100644 --- a/sysutils/gkrellm/plugins/aclock/distinfo +++ b/sysutils/gkrellm/plugins/aclock/distinfo @@ -1,3 +1,3 @@ -MD5 (gkrellaclock-0.3.2.tar.gz) = 87aa90f8a2c26c50f619cf64985afb15 -RMD160 (gkrellaclock-0.3.2.tar.gz) = 3c05124a9c55ff9d448599d03e4efa85f3f3d7c4 -SHA1 (gkrellaclock-0.3.2.tar.gz) = 9c1d774aeedaa12bab20a68821216137c41e9c37 +MD5 (gkrellaclock-0.3.2.1.tar.gz) = f484886db0ab62b68302e7324a474b91 +RMD160 (gkrellaclock-0.3.2.1.tar.gz) = 09806a458eed4f8a33aa4f7688eb5cd797748546 +SHA1 (gkrellaclock-0.3.2.1.tar.gz) = 295cbae78466ccc19638bc381fdb26876ef91fd6 diff --git a/sysutils/gkrellm/plugins/flynn/Makefile b/sysutils/gkrellm/plugins/flynn/Makefile index 96ddfd4fe2b..b12718807d3 100644 --- a/sysutils/gkrellm/plugins/flynn/Makefile +++ b/sysutils/gkrellm/plugins/flynn/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2003/11/03 20:34:16 sturm Exp $ +# $OpenBSD: Makefile,v 1.2 2004/10/16 16:33:56 sturm Exp $ COMMENT= "GkrellM2 load meter with a familiar face" -DISTNAME= gkrellflynn-0.6 +DISTNAME= gkrellflynn-0.8 CATEGORIES= x11 sysutils/gkrellm HOMEPAGE= http://horus.comlab.uni-rostock.de/flynn/ diff --git a/sysutils/gkrellm/plugins/flynn/distinfo b/sysutils/gkrellm/plugins/flynn/distinfo index a050ad73065..07bd0e16a5a 100644 --- a/sysutils/gkrellm/plugins/flynn/distinfo +++ b/sysutils/gkrellm/plugins/flynn/distinfo @@ -1,3 +1,3 @@ -MD5 (gkrellflynn-0.6.tar.gz) = 6e5101d79861ca2831f7ee0a87dca2c9 -RMD160 (gkrellflynn-0.6.tar.gz) = 9aab766f25d4a62f8dbe6e2840388ded820e123f -SHA1 (gkrellflynn-0.6.tar.gz) = ba1d3b68553ee23d04b2d87a1a8388589ffb8d34 +MD5 (gkrellflynn-0.8.tar.gz) = 19eabecbe7f95e7246012a7be4dff60d +RMD160 (gkrellflynn-0.8.tar.gz) = f35eeacd8121bd52c53a5610199211f7c34c790c +SHA1 (gkrellflynn-0.8.tar.gz) = 8fc8ab477572ca8a858d19d5903f9a2b7c3b2d31 diff --git a/sysutils/gkrellm/plugins/mailwatch/Makefile b/sysutils/gkrellm/plugins/mailwatch/Makefile index 6c131ff0fb8..8701e42ec5f 100644 --- a/sysutils/gkrellm/plugins/mailwatch/Makefile +++ b/sysutils/gkrellm/plugins/mailwatch/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.2 2004/02/21 01:18:08 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.3 2004/10/16 16:33:56 sturm Exp $ COMMENT= "GkrellM2 plugin to monitor multiple mailboxes" -DISTNAME= gkrellm-mailwatch-2.4.2 +DISTNAME= gkrellm-mailwatch-2.4.3 CATEGORIES= mail sysutils/gkrellm HOMEPAGE= http://gkrellm.luon.net/mailwatch.phtml diff --git a/sysutils/gkrellm/plugins/mailwatch/distinfo b/sysutils/gkrellm/plugins/mailwatch/distinfo index 5d44d5809e9..d9bd449ede5 100644 --- a/sysutils/gkrellm/plugins/mailwatch/distinfo +++ b/sysutils/gkrellm/plugins/mailwatch/distinfo @@ -1,3 +1,3 @@ -MD5 (gkrellm-mailwatch-2.4.2.tar.gz) = 93ddba20cca1ed7c26ce8d23949ed880 -RMD160 (gkrellm-mailwatch-2.4.2.tar.gz) = c4b6f0908a0d184119f14255f58475e67d072147 -SHA1 (gkrellm-mailwatch-2.4.2.tar.gz) = a33a4b9745c4588720214e1cc01ee8c4c4667f93 +MD5 (gkrellm-mailwatch-2.4.3.tar.gz) = f3f5edbf7f573067d9ef0486965e2fa1 +RMD160 (gkrellm-mailwatch-2.4.3.tar.gz) = 38e6d9339735add13481994f180e3ccdf2d1560f +SHA1 (gkrellm-mailwatch-2.4.3.tar.gz) = 695c85342e96fa23c17d27f19510d2d633ccb27d diff --git a/sysutils/gkrellm/plugins/mms/Makefile b/sysutils/gkrellm/plugins/mms/Makefile index bd7e8da6e35..7d2be8363fa 100644 --- a/sysutils/gkrellm/plugins/mms/Makefile +++ b/sysutils/gkrellm/plugins/mms/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.3 2004/05/18 14:49:56 naddy Exp $ +# $OpenBSD: Makefile,v 1.4 2004/10/16 16:33:56 sturm Exp $ COMMENT= "XMMS plugin for Gkrellm2" -DISTNAME= gkrellmms-2.1.19 +DISTNAME= gkrellmms-2.1.20 CATEGORIES= audio sysutils/gkrellm HOMEPAGE= http://gkrellm.luon.net/gkrellmms.phtml diff --git a/sysutils/gkrellm/plugins/mms/distinfo b/sysutils/gkrellm/plugins/mms/distinfo index dde9ddff0d4..5670ee9d757 100644 --- a/sysutils/gkrellm/plugins/mms/distinfo +++ b/sysutils/gkrellm/plugins/mms/distinfo @@ -1,3 +1,3 @@ -MD5 (gkrellmms-2.1.19.tar.gz) = 192b5f39094b8bff9a7ccc72dda362b8 -RMD160 (gkrellmms-2.1.19.tar.gz) = fca1fdcadb65606b707c6c4b5280f634ade5e7ca -SHA1 (gkrellmms-2.1.19.tar.gz) = 2f274bc8896429b5654b7cb7d3ec9cb220854bde +MD5 (gkrellmms-2.1.20.tar.gz) = cf17ad00eccf068d3738c387899a93d3 +RMD160 (gkrellmms-2.1.20.tar.gz) = ac03b2be23f1eb6807621f9ca37e2cc460bed58b +SHA1 (gkrellmms-2.1.20.tar.gz) = 6aa0b3910fdfc9003305bc6735b44bd70e81be16 diff --git a/sysutils/gkrellm/plugins/sun/Makefile b/sysutils/gkrellm/plugins/sun/Makefile index 5cf71cc4ad1..dfd766075bd 100644 --- a/sysutils/gkrellm/plugins/sun/Makefile +++ b/sysutils/gkrellm/plugins/sun/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.2 2004/05/18 14:49:56 naddy Exp $ +# $OpenBSD: Makefile,v 1.3 2004/10/16 16:33:56 sturm Exp $ COMMENT= "GkrellM2 plugin to display sun rise/set times" -DISTNAME= gkrellsun-0.11.0 +DISTNAME= gkrellsun-0.12.1 CATEGORIES= astro sysutils/gkrellm HOMEPAGE= http://gkrellsun.sourceforge.net/ diff --git a/sysutils/gkrellm/plugins/sun/distinfo b/sysutils/gkrellm/plugins/sun/distinfo index 2dca4342c55..f3e4f71d5fd 100644 --- a/sysutils/gkrellm/plugins/sun/distinfo +++ b/sysutils/gkrellm/plugins/sun/distinfo @@ -1,3 +1,3 @@ -MD5 (gkrellsun-0.11.0.tar.gz) = f091de0acb59657fb562e5bbe8dcd5f7 -RMD160 (gkrellsun-0.11.0.tar.gz) = a880745037053b5e53d797035733746530c11744 -SHA1 (gkrellsun-0.11.0.tar.gz) = f6fe56b42d81ebacf03fffce4e0c775df834f0e7 +MD5 (gkrellsun-0.12.1.tar.gz) = d696f5a3d3e4669669246086af29f5d8 +RMD160 (gkrellsun-0.12.1.tar.gz) = 4c04750a25aa08cafff88eb8e3c410a0998d1d8e +SHA1 (gkrellsun-0.12.1.tar.gz) = cb562a21fef02564d925ca97abc56c9bbc2b8b0c diff --git a/sysutils/gkrellm/plugins/sun/patches/patch-Makefile b/sysutils/gkrellm/plugins/sun/patches/patch-Makefile index 3648b80629b..9a2c2deba8f 100644 --- a/sysutils/gkrellm/plugins/sun/patches/patch-Makefile +++ b/sysutils/gkrellm/plugins/sun/patches/patch-Makefile @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile,v 1.2 2004/05/18 14:49:56 naddy Exp $ ---- Makefile.orig 2004-03-03 14:01:14.000000000 -0600 -+++ Makefile 2004-05-15 17:25:31.000000000 -0500 +$OpenBSD: patch-Makefile,v 1.3 2004/10/16 16:33:56 sturm Exp $ +--- Makefile.orig Tue Jun 1 15:01:47 2004 ++++ Makefile Mon Oct 11 14:34:03 2004 @@ -1,8 +1,8 @@ PACKAGE ?= gkrellsun @@ -27,16 +27,15 @@ $OpenBSD: patch-Makefile,v 1.2 2004/05/18 14:49:56 naddy Exp $ ifeq ($(enable_nls),1) FLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\" -@@ -23,10 +23,10 @@ endif +@@ -23,9 +23,9 @@ endif FLAGS += -DPACKAGE="\"$(PACKAGE)\"" export PACKAGE LOCALEDIR -CC = gcc $(CFLAGS) $(FLAGS) - OBJS = gkrellsun.o CalcEphem.o Moon.o - -+CFLAGS += $(FLAGS) + ++CFLAGS += $(FLAGS) + #IMAGES = ../images/osun.xpm ../images/uvsun.xpm \ # ../images/star.xpm ../images/dot.xpm - diff --git a/sysutils/gkrellm/plugins/sun/patches/patch-gkrellsun_c b/sysutils/gkrellm/plugins/sun/patches/patch-gkrellsun_c index 9da989224a1..c551fcb130e 100644 --- a/sysutils/gkrellm/plugins/sun/patches/patch-gkrellsun_c +++ b/sysutils/gkrellm/plugins/sun/patches/patch-gkrellsun_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-gkrellsun_c,v 1.3 2004/06/04 01:45:58 naddy Exp $ ---- gkrellsun.c.orig 2004-05-07 00:16:38.000000000 -0600 -+++ gkrellsun.c 2004-06-03 19:44:08.000000000 -0600 -@@ -194,8 +194,8 @@ struct _Sun +$OpenBSD: patch-gkrellsun_c,v 1.4 2004/10/16 16:33:56 sturm Exp $ +--- gkrellsun.c.orig Sun Jun 6 06:34:21 2004 ++++ gkrellsun.c Mon Oct 11 14:34:03 2004 +@@ -214,8 +214,8 @@ struct _Sun SunData data; }; @@ -12,7 +12,7 @@ $OpenBSD: patch-gkrellsun_c,v 1.3 2004/06/04 01:45:58 naddy Exp $ static Sun sununit; static gchar *sun_data_dir; -@@ -211,9 +211,9 @@ static void update_sun_data(Sun * sun) +@@ -231,9 +231,9 @@ static void update_sun_data(Sun * sun) glong date; gint day_of_month, month, year; @@ -24,7 +24,7 @@ $OpenBSD: patch-gkrellsun_c,v 1.3 2004/06/04 01:45:58 naddy Exp $ /* It may return NULL when the year does not fit into an integer.*/ if (time_struc == NULL) { g_message("Error: gmtime returned NULL\n"); exit(EXIT_FAILURE); -@@ -238,7 +238,7 @@ static void update_sun_data(Sun * sun) +@@ -258,7 +258,7 @@ static void update_sun_data(Sun * sun) year, month, day_of_month, date); } @@ -33,20 +33,3 @@ $OpenBSD: patch-gkrellsun_c,v 1.3 2004/06/04 01:45:58 naddy Exp $ if (time_struc == NULL) { g_message("Error: localtime returned NULL\n"); exit(EXIT_FAILURE); } -@@ -839,6 +839,7 @@ update_tooltip(Sun *sun) - double val, altnoon; - int H,M; - int ampm_digit; -+ gint moonphase; - - if (tooltip == NULL) - return; -@@ -932,7 +933,7 @@ update_tooltip(Sun *sun) - (void)g_string_append_printf(mboxes, _("\nMoon Altitude: %4.1f"), sun->data.h_moon); - (void)g_string_append_printf(mboxes, _("\nMoon Phase: %4.1f\n"), sun->data.MoonPhase); - /* MoonPhase: 0 -> 1; there are 8 phase names */ -- gint moonphase = (gint) ((sun->data.MoonPhase * 8.0) + 0.4); -+ moonphase = (gint) ((sun->data.MoonPhase * 8.0) + 0.4); - (void)g_string_append_printf(mboxes, _("Moon Phase: %s"), moonPhases[moonphase]); - } -