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

- update to bubblemon-2.0.12

Browse Source 
- change HOMEPAGE, tweak COMMENT and reorder Makefile

I doubt this works since our libgtop2 is next to unusable but at least
it gives a better base to work on.
This commit is contained in:
ajacoutot 2009-04-05 10:15:33 +00:00
parent 1662925683
commit 3866b5b834
10 changed files with 53 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sysutils/bubblemon/Makefile
View File

@ -1,18 +1,14 @@
# $OpenBSD: Makefile,v 1.31 2009/03/28 18:38:11 naddy Exp $ # $OpenBSD: Makefile,v 1.32 2009/04/05 10:15:33 ajacoutot Exp $
COMMENT= GNOME panel applet that displays the CPU + memory load COMMENT= GNOME panel applet that displays CPU and memory load
DISTNAME= bubblemon-2.0.1 DISTNAME= bubblemon-2.0.12
PKGNAME= ${DISTNAME}p8
CATEGORIES= sysutils x11/gnome CATEGORIES= sysutils x11/gnome
HOMEPAGE= http://www.d.kth.se/~d92-jwa/code/ HOMEPAGE= http://www.nongnu.org/bubblemon/
MASTER_SITES= ${MASTER_SITE_SAVANNAH:=bubblemon/} MASTER_SITES= ${MASTER_SITE_SAVANNAH:=bubblemon/}
LIB_DEPENDS= panel-applet-2::x11/gnome/panel \
gtop-2.0.>=3.0::devel/libgtop2
# GPLv2 # GPLv2
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_FTP= Yes
@ -33,12 +29,16 @@ WANTLIB= ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage \
MODULES= devel/gettext \ MODULES= devel/gettext \
textproc/intltool textproc/intltool
LIB_DEPENDS= panel-applet-2::x11/gnome/panel \
gtop-2.0.>=3.0::devel/libgtop2
USE_X11= Yes USE_X11= Yes
USE_GMAKE= Yes USE_GMAKE= Yes
CONFIGURE_STYLE= gnu CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" LDFLAGS="-L${LOCALBASE}/lib"
FAKE_FLAGS= itlocaledir=${PREFIX}/share/locale
.include <bsd.port.mk> .include <bsd.port.mk>

10
sysutils/bubblemon/distinfo
View File

@ -1,5 +1,5 @@
MD5 (bubblemon-2.0.1.tar.gz) = gVOmglUfzHM0RCDEhX6hmA== MD5 (bubblemon-2.0.12.tar.gz) = i2QlOmPuzLgKX0yu9JETPQ==
RMD160 (bubblemon-2.0.1.tar.gz) = FIvTA0Yap+2IyPE7zLt1EwnLDCo= RMD160 (bubblemon-2.0.12.tar.gz) = 4yJidZBwPkK8/oCndLlMIRVLQFI=
SHA1 (bubblemon-2.0.1.tar.gz) = mqSG3lUrK5V5qk7ExTszeiOBb6E= SHA1 (bubblemon-2.0.12.tar.gz) = AeyHFl5pK1WhM4CbyqNxlK9NyMs=
SHA256 (bubblemon-2.0.1.tar.gz) = bueaD+qqcwN7MR6RQSmIispcQfQnHqWwogM7rh6hLr0= SHA256 (bubblemon-2.0.12.tar.gz) = QYU34WfEfORJTwICTdUUkA86pSq1I/nV8TyDt3GZXN4=
SIZE (bubblemon-2.0.1.tar.gz) = 112655 SIZE (bubblemon-2.0.12.tar.gz) = 228879

20
sysutils/bubblemon/patches/patch-configure Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-configure,v 1.1 2009/04/05 10:15:33 ajacoutot Exp $
--- configure.orig Sun Apr 5 11:55:04 2009
+++ configure Sun Apr 5 11:55:41 2009
@@ -5001,16 +5001,6 @@ else
fi
-if test "x$GCC" = "xyes"; then
- # -Wno-missing-field-initializers is because of
- # http://bugs.debian.org/509663
- #
- # -Wno-unused-parameter is because in gnome2-ui.c our function
- # prototypes are decided by the GNOME API, and we have to accept
- # some parameters we never use.
- CFLAGS="-g -O2 -Wall -Werror -Wextra -Wno-unused-parameter -Wno-missing-field-initializers"
-
-fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

14
sysutils/bubblemon/patches/patch-po_ro_po
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-po_ro_po,v 1.1 2009/03/28 18:38:11 naddy Exp $
--- po/ro.po.orig Sat Mar 28 12:32:05 2009
+++ po/ro.po Sat Mar 28 12:32:36 2009
@@ -11,8 +11,8 @@ msgstr ""
"Last-Translator: Alex Badea <vampire@go.ro>\n"
"Language-Team: Romanian <ro@li.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
#: gnome/GNOME_BubblemonApplet.server.in.in.h:1
msgid "A CPU load meter monitor"

14
sysutils/bubblemon/patches/patch-po_sh_po
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-po_sh_po,v 1.1 2009/03/28 18:38:11 naddy Exp $
--- po/sh.po.orig Sat Mar 28 12:35:52 2009
+++ po/sh.po Sat Mar 28 12:36:21 2009
@@ -11,8 +11,8 @@ msgstr ""
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
#: gnome/GNOME_BubblemonApplet.server.in.in.h:1
msgid "A CPU load meter monitor"

12
sysutils/bubblemon/patches/patch-src_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.4 2004/08/10 20:00:40 sturm Exp $
--- src/Makefile.in.orig 2003-09-23 11:45:16.000000000 -0700
+++ src/Makefile.in 2003-09-23 11:45:52.000000000 -0700
@@ -67,7 +67,7 @@ GMSGFMT = @GMSGFMT@
GNOME_APPLETS_CFLAGS = @GNOME_APPLETS_CFLAGS@
GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@
GTOP_APPLETS_CFLAGS = @GTOP_APPLETS_CFLAGS@
-GTOP_APPLETS_LIBS = @GTOP_APPLETS_LIBS@
+GTOP_APPLETS_LIBS = @GTOP_APPLETS_LIBS@ -lXau
INSTOBJEXT = @INSTOBJEXT@
INTLDEPS = @INTLDEPS@
INTLLIBS = @INTLLIBS@

30
sysutils/bubblemon/patches/patch-src_bubblemon_c
View File

@ -1,30 +1,30 @@
$OpenBSD: patch-src_bubblemon_c,v 1.4 2003/09/23 21:24:52 marcm Exp $ $OpenBSD: patch-src_bubblemon_c,v 1.5 2009/04/05 10:15:33 ajacoutot Exp $
--- src/bubblemon.c.orig 2002-11-21 23:13:45.000000000 -0800 --- src/bubblemon.c.orig Sun Apr 5 11:48:09 2009
+++ src/bubblemon.c 2003-09-23 11:36:29.000000000 -0700 +++ src/bubblemon.c Sun Apr 5 11:49:57 2009
@@ -154,7 +154,7 @@ const char *bubblemon_getTooltip(void) @@ -191,7 +191,7 @@ const char *bubblemon_getTooltip(bubblemon_t *bubblemo
if (sysload.swapSize > 0) usage2string(swapstring,
{ bubblemon->sysload.swapUsed,
usage2string(swapstring, sysload.swapUsed, sysload.swapSize); bubblemon->sysload.swapSize);
- snprintf(loadstring, 90, - snprintf(loadstring, 90,
+ snprintf(loadstring, sizeof loadstring, + snprintf(loadstring, sizeof loadstring,
_("\nSwap used: %s"), _("\nSwap used: %s"),
swapstring); swapstring);
strcat(tooltipstring, loadstring); strcat(bubblemon->tooltipstring, loadstring);
@@ -162,7 +162,7 @@ const char *bubblemon_getTooltip(void) @@ -204,7 +204,7 @@ const char *bubblemon_getTooltip(bubblemon_t *bubblemo
if (sysload.nCpus == 1) if (bubblemon->sysload.nCpus == 1)
{ {
- snprintf(loadstring, 45, - snprintf(loadstring, 45,
+ snprintf(loadstring, sizeof loadstring, + snprintf(loadstring, sizeof loadstring,
_("\nCPU load: %d%%"), _("\nCPU load: %d%%"),
bubblemon_getCpuLoadPercentage(0)); bubblemon_getCpuLoadPercentage(bubblemon, 0));
strcat(tooltipstring, loadstring); strcat(bubblemon->tooltipstring, loadstring);
@@ -173,7 +173,7 @@ const char *bubblemon_getTooltip(void) @@ -215,7 +215,7 @@ const char *bubblemon_getTooltip(bubblemon_t *bubblemo
cpu_number < sysload.nCpus; cpu_number < bubblemon->sysload.nCpus;
cpu_number++) cpu_number++)
{ {
- snprintf(loadstring, 45, - snprintf(loadstring, 45,
+ snprintf(loadstring, sizeof loadstring, + snprintf(loadstring, sizeof loadstring,
_("\nCPU #%d load: %d%%"), _("\nCPU #%d load: %d%%"),
cpu_number, cpu_number,
bubblemon_getCpuLoadPercentage(cpu_number)); bubblemon_getCpuLoadPercentage(bubblemon, cpu_number));

11
sysutils/bubblemon/patches/patch-src_gnome1-meter_c
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_gnome1-meter_c,v 1.1 2003/04/30 14:59:34 avsm Exp $
--- src/gnome1-meter.c.orig Wed Apr 30 21:21:16 2003
+++ src/gnome1-meter.c Wed Apr 30 21:21:28 2003
@@ -20,6 +20,7 @@
* Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
*/
+#include <sys/types.h>
#include <glibtop.h>
#include <glibtop/cpu.h>
#include <glibtop/mem.h>

11
sysutils/bubblemon/patches/patch-src_gnome1-netload_c
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_gnome1-netload_c,v 1.1 2003/04/30 14:59:34 avsm Exp $
--- src/gnome1-netload.c.orig Wed Apr 30 21:21:39 2003
+++ src/gnome1-netload.c Wed Apr 30 21:21:49 2003
@@ -22,6 +22,7 @@
* This is the Gnome 1 specific network load measuring stuff.
*/
+#include <sys/types.h>
#include <stdlib.h>
#include <stdio.h>
#include <glibtop/netload.h>

6
sysutils/bubblemon/pkg/PLIST
View File

@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST,v 1.9 2008/02/04 12:53:52 ajacoutot Exp $ @comment $OpenBSD: PLIST,v 1.10 2009/04/05 10:15:34 ajacoutot Exp $
lib/bonobo/ lib/bonobo/
lib/bonobo/servers/ lib/bonobo/servers/
lib/bonobo/servers/GNOME_BubblemonApplet.server lib/bonobo/servers/GNOME_BubblemonApplet.server
libexec/bubblemon-gnome2 @bin libexec/bubblemon-gnome2
@comment man/hu/ @comment man/hu/
@comment man/hu/man1/ @comment man/hu/man1/
@comment @man man/hu/man1/bubblemon-gnome2.1 @comment @man man/hu/man1/bubblemon-gnome2.1
@ -13,6 +13,7 @@ libexec/bubblemon-gnome2
share/gnome-2.0/ share/gnome-2.0/
share/gnome-2.0/ui/ share/gnome-2.0/ui/
share/gnome-2.0/ui/GNOME_BubblemonApplet.xml share/gnome-2.0/ui/GNOME_BubblemonApplet.xml
share/locale/ca/LC_MESSAGES/bubblemon.mo
share/locale/da/LC_MESSAGES/bubblemon.mo share/locale/da/LC_MESSAGES/bubblemon.mo
share/locale/de/LC_MESSAGES/bubblemon.mo share/locale/de/LC_MESSAGES/bubblemon.mo
share/locale/es/LC_MESSAGES/bubblemon.mo share/locale/es/LC_MESSAGES/bubblemon.mo
@ -27,6 +28,7 @@ share/locale/ko/LC_MESSAGES/bubblemon.mo
share/locale/no/LC_MESSAGES/bubblemon.mo share/locale/no/LC_MESSAGES/bubblemon.mo
share/locale/pl/LC_MESSAGES/bubblemon.mo share/locale/pl/LC_MESSAGES/bubblemon.mo
share/locale/pt/LC_MESSAGES/bubblemon.mo share/locale/pt/LC_MESSAGES/bubblemon.mo
share/locale/pt_BR/LC_MESSAGES/bubblemon.mo
share/locale/ro/LC_MESSAGES/bubblemon.mo share/locale/ro/LC_MESSAGES/bubblemon.mo
share/locale/ru/LC_MESSAGES/bubblemon.mo share/locale/ru/LC_MESSAGES/bubblemon.mo
share/locale/sh/ share/locale/sh/