From 226952994356bc3c0b7029db7a446120f3e1ab2a Mon Sep 17 00:00:00 2001 From: naddy Date: Mon, 29 Oct 2001 18:09:47 +0000 Subject: [PATCH] Update to bubblemon 1.0.9. Changes of interest from the Changelog: * Added support for building on OpenBSD. * Reworked the GOAD workaround (again) as the new version didn't seem to work too well. * Added missing build dependency. Submitted by maintainer Nils Nordman . --- sysutils/bubblemon/Makefile | 6 +-- sysutils/bubblemon/files/md5 | 6 +-- .../bubblemon/patches/patch-src-bubblemon.c | 42 ------------------- 3 files changed, 6 insertions(+), 48 deletions(-) delete mode 100644 sysutils/bubblemon/patches/patch-src-bubblemon.c diff --git a/sysutils/bubblemon/Makefile b/sysutils/bubblemon/Makefile index 4f54bdd5e98..1269ffa101a 100644 --- a/sysutils/bubblemon/Makefile +++ b/sysutils/bubblemon/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.7 2001/10/24 12:36:02 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2001/10/29 18:09:47 naddy Exp $ COMMENT= "GNOME panel applet that displays the CPU + memory load" -V= 1.0.5 +V= 1.0.9 DISTNAME= bubblemon-${V} CATEGORIES= sysutils x11/gnome NEED_VERSION= 1.474 @@ -27,6 +27,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ post-install: @${INSTALL_DATA_DIR} -d ${PREFIX}/share/examples/bubblemon; \ - cp -rp ${WRKINST}/${SYSCONFDIR}/* ${PREFIX}/share/examples/bubblemon/ + cp -Rp ${WRKINST}/${SYSCONFDIR}/* ${PREFIX}/share/examples/bubblemon/ .include diff --git a/sysutils/bubblemon/files/md5 b/sysutils/bubblemon/files/md5 index 897811e2a4c..670e855936e 100644 --- a/sysutils/bubblemon/files/md5 +++ b/sysutils/bubblemon/files/md5 @@ -1,3 +1,3 @@ -MD5 (bubblemon-1.0.5.tar.gz) = b04378ed3966f3053814a07145d21a9b -RMD160 (bubblemon-1.0.5.tar.gz) = 4e12f4b2bb49713a1bb8a7bd9d54d2892c7250e6 -SHA1 (bubblemon-1.0.5.tar.gz) = d50bf58c4386e8ee70e300d630faee89b2a67465 +MD5 (bubblemon-1.0.9.tar.gz) = 24287a144c3889594cb5d4e3a01ce430 +RMD160 (bubblemon-1.0.9.tar.gz) = 667c367bce95beb67fa042b78b018c6c6e377537 +SHA1 (bubblemon-1.0.9.tar.gz) = 98a63122a2e6dbdf463ba174ffd6cc99dce21eed diff --git a/sysutils/bubblemon/patches/patch-src-bubblemon.c b/sysutils/bubblemon/patches/patch-src-bubblemon.c deleted file mode 100644 index d1bfe15ef0d..00000000000 --- a/sysutils/bubblemon/patches/patch-src-bubblemon.c +++ /dev/null @@ -1,42 +0,0 @@ ---- src/bubblemon.c.orig Sun Apr 22 21:21:38 2001 -+++ src/bubblemon.c Sun Jun 17 17:37:13 2001 -@@ -27,7 +27,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -239,16 +238,16 @@ - - if (divisor_char) - { -- sprintf(string, "%Ld/%Ld%cb", -- used >> shiftme, -- max >> shiftme, -+ sprintf(string, "%lu/%lu%cb", -+ (unsigned long) used >> shiftme, -+ (unsigned long) max >> shiftme, - divisor_char); - } - else - { -- sprintf(string, "%Ld/%Ld bytes", -- used >> shiftme, -- max >> shiftme); -+ sprintf(string, "%lu/%lu bytes", -+ (unsigned long) used >> shiftme, -+ (unsigned long) max >> shiftme); - } - } - -@@ -1106,7 +1105,7 @@ - bm); - - /* Determine number of CPUs we will monitor */ -- bm->number_of_cpus = glibtop_get_sysinfo()->ncpu; -+ bm->number_of_cpus = 1; - g_assert(bm->number_of_cpus != 0); - - /* Initialize the CPU load metering... */