cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- unbreak following sensor changes

Browse Source 
- skip over ifm->ifm_version != RTM_VERSION messages
- sync WANTLIBs, bump everything
- drop ajacoutot@ as maintainer per his request
This commit is contained in:
sthen 2010-04-27 21:53:56 +00:00
parent fd73932cba
commit a878f31c5c
20 changed files with 66 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sysutils/gkrellm/gkrellm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.49 2010/01/18 14:27:16 sthen Exp $
# $OpenBSD: Makefile,v 1.50 2010/04/27 21:53:56 sthen Exp $
SHARED_ONLY= Yes
@ -7,12 +7,10 @@ COMMENT-client= single process stack of system monitors for GTK+2
V= 2.3.4
DISTNAME= gkrellm-${V}
PKGNAME-main= gkrellm-server-${V}p0
PKGNAME-client= gkrellm-${V}p0
PKGNAME-main= gkrellm-server-${V}p1
PKGNAME-client= gkrellm-${V}p1
CATEGORIES= sysutils sysutils/gkrellm
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
HOMEPAGE= http://www.gkrellm.net/
# GPLv3 with OpenSSL license exception

16
sysutils/gkrellm/gkrellm/patches/patch-src_sysdeps_bsd-common_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_sysdeps_bsd-common_c,v 1.3 2010/04/27 21:53:56 sthen Exp $
--- src/sysdeps/bsd-common.c.orig Thu Jun 25 17:29:06 2009
+++ src/sysdeps/bsd-common.c Thu Jun 25 17:34:51 2009
@@ -115,9 +115,11 @@ gkrellm_sys_net_read_data(void)
while (next < lim)
{
ifm = (struct if_msghdr *)next;
+ next += ifm->ifm_msglen;
+ if (ifm->ifm_version != RTM_VERSION)
+ continue;
if (ifm->ifm_type != RTM_IFINFO)
return;
- next += ifm->ifm_msglen;
while (next < lim)
{

23
sysutils/gkrellm/gkrellm/patches/patch-src_sysdeps_openbsd_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_sysdeps_openbsd_c,v 1.15 2010/01/18 14:27:16 sthen Exp $
--- src/sysdeps/openbsd.c.orig Sat Oct 4 00:46:45 2008
+++ src/sysdeps/openbsd.c Mon Jan 18 08:58:33 2010
$OpenBSD: patch-src_sysdeps_openbsd_c,v 1.16 2010/04/27 21:53:56 sthen Exp $
--- src/sysdeps/openbsd.c.orig Sat Oct 4 01:46:45 2008
+++ src/sysdeps/openbsd.c Tue Apr 27 22:20:22 2010
@@ -62,85 +62,96 @@ gkrellm_sys_main_cleanup(void)
/* ===================================================================== */
/* CPU monitor interface */
@ -205,7 +205,7 @@ $OpenBSD: patch-src_sysdeps_openbsd_c,v 1.15 2010/01/18 14:27:16 sthen Exp $
/* For page in/out operations, uvmexp struct doesn't seem to be reliable */
@@ -271,41 +271,122 @@ gkrellm_sys_mem_init(void)
@@ -271,41 +271,125 @@ gkrellm_sys_mem_init(void)
/* ===================================================================== */
@ -316,12 +316,15 @@ $OpenBSD: patch-src_sysdeps_openbsd_c,v 1.15 2010/01/18 14:27:16 sthen Exp $
+ int dev;
+ gboolean found = FALSE;
+
+ for (dev = 0; MAXSENSORDEVICES > dev; dev++) {
+#define GKRELLM_MAXSENSORDEVICES 1024
+ for (dev = 0; GKRELLM_MAXSENSORDEVICES > dev; dev++) {
+ mib[2] = dev;
+ if (sysctl(mib, 3, &sensdev, &len, NULL, 0) == -1) {
+ if (ENOENT != errno)
+ return FALSE;
+ continue;
+ if (errno == ENXIO)
+ continue;
+ if (errno == ENOENT)
+ break;
+ return FALSE;
+ }
+ if (add_sensdev(dev, &sensdev))
+ found = TRUE;
@ -340,7 +343,7 @@ $OpenBSD: patch-src_sysdeps_openbsd_c,v 1.15 2010/01/18 14:27:16 sthen Exp $
#include <machine/apmvar.h>
#define APMDEV "/dev/apm"
@@ -357,24 +438,10 @@ gkrellm_sys_battery_init()
@@ -357,24 +441,10 @@ gkrellm_sys_battery_init()
/* ===================================================================== */
/* Disk monitor interface */
@ -367,7 +370,7 @@ $OpenBSD: patch-src_sysdeps_openbsd_c,v 1.15 2010/01/18 14:27:16 sthen Exp $
gchar *
gkrellm_sys_disk_name_from_device(gint device_number, gint unit_number,
gint *order)
@@ -389,68 +456,50 @@ gkrellm_sys_disk_order_from_name(gchar *name)
@@ -389,68 +459,50 @@ gkrellm_sys_disk_order_from_name(gchar *name)
}

6
sysutils/gkrellm/plugins/Makefile.inc
View File

@ -1,9 +1,7 @@
# $OpenBSD: Makefile.inc,v 1.22 2009/08/10 06:34:29 kili Exp $
# $OpenBSD: Makefile.inc,v 1.23 2010/04/27 21:53:56 sthen Exp $
SHARED_ONLY= Yes
MAINTAINER?= Antoine Jacoutot <ajacoutot@openbsd.org>
CATEGORIES+= sysutils/gkrellm
# GPLv2+
@ -17,7 +15,7 @@ WANTLIB?= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 \
glitz gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 \
iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
pixman-1 png pthread-stubs xcb z
pixman-1 png pthread-stubs xcb xcb-render xcb-render-util z
.if defined(EXTRA_WANTLIB)
WANTLIB+= ${EXTRA_WANTLIB}

4
sysutils/gkrellm/plugins/aclock/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.17 2010/01/05 18:41:33 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.18 2010/04/27 21:53:56 sthen Exp $
COMMENT= analog clock for GkrellM2
V= 0.3.3
DISTNAME= gkrellaclock-${V}
PKGNAME= ${DISTNAME}p11
PKGNAME= ${DISTNAME}p12
CATEGORIES= misc
HOMEPAGE= http://www.geocities.com/m_muthukumar/gkrellaclock.html

4
sysutils/gkrellm/plugins/bgchg/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.21 2010/01/05 18:41:33 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.22 2010/04/27 21:53:56 sthen Exp $
COMMENT= change background image with GkrellM2
DISTNAME= gkrellmbgchg2-0.1.3
PKGNAME= ${DISTNAME}p12
PKGNAME= ${DISTNAME}p13
CATEGORIES= x11
HOMEPAGE= http://www.bender-suhl.de/stefan/english/comp/gkrellmbgchg.html

4
sysutils/gkrellm/plugins/flynn/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.10 2008/06/06 10:27:55 sthen Exp $
# $OpenBSD: Makefile,v 1.11 2010/04/27 21:53:56 sthen Exp $
COMMENT= GkrellM2 load meter with a familiar face
DISTNAME= gkrellflynn-0.8
PKGNAME= ${DISTNAME}p5
PKGNAME= ${DISTNAME}p6
CATEGORIES= x11
ALL_TARGET= gkrellm2

4
sysutils/gkrellm/plugins/itime/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.15 2009/08/10 06:34:29 kili Exp $
# $OpenBSD: Makefile,v 1.16 2010/04/27 21:53:56 sthen Exp $
COMMENT= GkrellM2 plugin that shows Internet time
V= 1.0.1
DISTNAME= gkrellmitime-${V}
PKGNAME= ${DISTNAME}p11
PKGNAME= ${DISTNAME}p12
CATEGORIES= net
ALL_TARGET= gkrellm_itime.so

4
sysutils/gkrellm/plugins/kam/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.11 2010/01/05 18:41:33 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.12 2010/04/27 21:53:56 sthen Exp $
COMMENT= webcam plugin for GkrellM2
V= 2.0.0
DISTNAME= gkrellkam-${V}
PKGNAME= ${DISTNAME}p7
PKGNAME= ${DISTNAME}p8
CATEGORIES= graphics
HOMEPAGE= http://gkrellkam.sourceforge.net

4
sysutils/gkrellm/plugins/launch/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.14 2009/08/10 06:34:29 kili Exp $
# $OpenBSD: Makefile,v 1.15 2010/04/27 21:53:56 sthen Exp $
COMMENT= launch commonly used apps from GkrellM2
DISTNAME= gkrellmlaunch-0.5
PKGNAME= ${DISTNAME}p11
PKGNAME= ${DISTNAME}p12
CATEGORIES= x11
HOMEPAGE= http://gkrellmlaunch.sourceforge.net/

4
sysutils/gkrellm/plugins/mailwatch/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.17 2010/01/05 18:41:33 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.18 2010/04/27 21:53:56 sthen Exp $
COMMENT= GkrellM2 plugin to monitor multiple mailboxes
V= 2.4.3
DISTNAME= gkrellm-mailwatch-${V}
PKGNAME= gkrellmmailwatch-${V}p3
PKGNAME= gkrellmmailwatch-${V}p4
CATEGORIES= mail
HOMEPAGE= http://gkrellm.luon.net/mailwatch.phtml

4
sysutils/gkrellm/plugins/mms/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.20 2010/01/05 18:41:33 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.21 2010/04/27 21:53:56 sthen Exp $
COMMENT= XMMS plugin for Gkrellm2
DISTNAME= gkrellmms-2.1.21
PKGNAME= ${DISTNAME}p11
PKGNAME= ${DISTNAME}p12
CATEGORIES= audio
HOMEPAGE= http://gkrellm.luon.net/gkrellmms.phtml

4
sysutils/gkrellm/plugins/moon/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.15 2010/01/05 18:41:33 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.16 2010/04/27 21:53:56 sthen Exp $
COMMENT= phase of the Moon for GkrellM2
DISTNAME= gkrellmoon-0.6
PKGNAME= ${DISTNAME}p12
PKGNAME= ${DISTNAME}p13
CATEGORIES= astro
HOMEPAGE= http://gkrellmoon.sourceforge.net/

4
sysutils/gkrellm/plugins/mss/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.21 2009/08/10 06:34:30 kili Exp $
# $OpenBSD: Makefile,v 1.22 2010/04/27 21:53:56 sthen Exp $
COMMENT= soundscope for GkrellM2 using ESD
DISTNAME= gkrellmss-2.6
PKGNAME= ${DISTNAME}p11
PKGNAME= ${DISTNAME}p12
CATEGORIES= audio
HOMEPAGE=http://members.dslextreme.com/users/billw/gkrellmss/gkrellmss.html

4
sysutils/gkrellm/plugins/reminder/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.16 2010/01/05 18:41:33 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.17 2010/04/27 21:53:56 sthen Exp $
COMMENT= GKrellM2 will remind you to do important events
V= 2.0.0
DISTNAME= gkrellm-reminder-${V}
PKGNAME= gkrellmreminder-${V}p3
PKGNAME= gkrellmreminder-${V}p4
CATEGORIES= misc
HOMEPAGE= http://members.dslextreme.com/users/billw/gkrellm/Plugins.html\#REMINDER

4
sysutils/gkrellm/plugins/shoot/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.14 2009/08/10 06:34:30 kili Exp $
# $OpenBSD: Makefile,v 1.15 2010/04/27 21:53:56 sthen Exp $
COMMENT= snapshot and background plugin for Gkrellm2
V= 0.4.3
DISTNAME= gkrellshoot-${V}
PKGNAME= ${DISTNAME}p12
PKGNAME= ${DISTNAME}p15
CATEGORIES= x11
HOMEPAGE= http://gkrellshoot.sourceforge.net

4
sysutils/gkrellm/plugins/stock/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.14 2009/08/10 06:34:30 kili Exp $
# $OpenBSD: Makefile,v 1.15 2010/04/27 21:53:56 sthen Exp $
COMMENT= stock ticker for GkrellM2
V= 0.5.1
DISTNAME= gkrellstock-${V}
PKGNAME= ${DISTNAME}p11
PKGNAME= ${DISTNAME}p12
CATEGORIES= misc
HOMEPAGE= http://gkrellstock.sourceforge.net/

4
sysutils/gkrellm/plugins/sun/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.17 2010/01/05 18:41:33 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.18 2010/04/27 21:53:56 sthen Exp $
COMMENT= GkrellM2 plugin to display sun rise/set times
DISTNAME= gkrellsun-0.12.1
PKGNAME= ${DISTNAME}p12
PKGNAME= ${DISTNAME}p13
CATEGORIES= astro
HOMEPAGE= http://gkrellsun.sourceforge.net/

4
sysutils/gkrellm/plugins/volume/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.17 2010/01/05 18:41:33 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.18 2010/04/27 21:53:56 sthen Exp $
COMMENT= Volume dial for Gkrellm2
V= 2.1.13
DISTNAME= gkrellm-volume-${V}
PKGNAME= gkrellmvolume-${V}p4
PKGNAME= gkrellmvolume-${V}p5
CATEGORIES= audio
HOMEPAGE= http://gkrellm.luon.net/volume.phtml

4
sysutils/gkrellm/plugins/wireless/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.16 2010/01/05 18:37:35 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.17 2010/04/27 21:53:56 sthen Exp $
COMMENT= GkrellM2 plugin to monitor wi(4) signal strength
DISTNAME= gkrellmwireless-2.0.3
PKGNAME= ${DISTNAME}p3
PKGNAME= ${DISTNAME}p4
CATEGORIES= net
HOMEPAGE= http://gkrellm.luon.net/gkrellmwireless.php