Updated hot-babe to 0.2.2.

Changes since 0.1.2:
- Switched to gtk2

5 files changed, 95 insertions, 46 deletions

diff --git a/x11/hot-babe/Makefile b/x11/hot-babe/Makefile
index 82a6b4c2df0..e523b375732 100644
--- a/x11/hot-babe/Makefile
+++ b/x11/hot-babe/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2006/04/17 13:46:54 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2006/05/31 11:42:45 rillig Exp $
 
-DISTNAME=	hot-babe-0.1.2
-PKGREVISION=	9
+DISTNAME=	hot-babe-0.2.2
 CATEGORIES=	x11
 MASTER_SITES=	http://dindinx.net/hotbabe/downloads/
 
@@ -9,8 +8,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://dindinx.net/hotbabe/
 COMMENT=	System load monitor
 
-
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/hot-babe/PLIST b/x11/hot-babe/PLIST
index e098bacb275..60db8c80bf1 100644
--- a/x11/hot-babe/PLIST
+++ b/x11/hot-babe/PLIST
@@ -1,3 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/10/24 18:57:05 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/05/31 11:42:45 rillig Exp $
 bin/hot-babe
 man/man1/hot-babe.1
+share/hot-babe/hb01/descr
+share/hot-babe/hb01/hb01_0.png
+share/hot-babe/hb01/hb01_1.png
+share/hot-babe/hb01/hb01_2.png
+share/hot-babe/hb01/hb01_3.png
+share/hot-babe/hb01/hb01_4.png
diff --git a/x11/hot-babe/distinfo b/x11/hot-babe/distinfo
index 0fce002384d..58d2aac97fe 100644
--- a/x11/hot-babe/distinfo
+++ b/x11/hot-babe/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 17:36:12 wiz Exp $
+$NetBSD: distinfo,v 1.5 2006/05/31 11:42:45 rillig Exp $
 
-SHA1 (hot-babe-0.1.2.tar.gz) = 53410a9f5590250ba862ee220ac9140014c39114
-RMD160 (hot-babe-0.1.2.tar.gz) = 6f5e1a3c9a84bd71e4d8a5c15667d0beeb1f14c0
-Size (hot-babe-0.1.2.tar.gz) = 708450 bytes
-SHA1 (patch-aa) = fdee9709d63b28d888abfa59ffe087d6917e5717
-SHA1 (patch-ab) = ebb9a0fae24c0ad6719fe99b34c77e49f91e02bc
+SHA1 (hot-babe-0.2.2.tar.gz) = 403a8f14322c5ca5187daed5050392468c114ec5
+RMD160 (hot-babe-0.2.2.tar.gz) = 4981fdf346937d0a89f249dd967f7e33a32e05e0
+Size (hot-babe-0.2.2.tar.gz) = 408991 bytes
+SHA1 (patch-aa) = ecb2b043d7eb78ee532005d57010a1d372a62378
+SHA1 (patch-ab) = fc67f595280a8fdeb302ed91829c8973459cb6ad
diff --git a/x11/hot-babe/patches/patch-aa b/x11/hot-babe/patches/patch-aa
index 821f37549cc..bd2f8701890 100644
--- a/x11/hot-babe/patches/patch-aa
+++ b/x11/hot-babe/patches/patch-aa
@@ -1,31 +1,37 @@
-$NetBSD: patch-aa,v 1.3 2004/03/29 22:44:29 snj Exp $
+$NetBSD: patch-aa,v 1.4 2006/05/31 11:42:45 rillig Exp $
 
---- hot-babe.c.orig	Sat Sep 21 16:53:24 2002
-+++ hot-babe.c
-@@ -74,6 +74,18 @@
- /* returns current CPU load in percent, 0 to 256 */
+--- hot-babe.c.orig	2004-12-05 23:59:38.000000000 +0100
++++ hot-babe.c	2006-05-31 13:36:52.000000000 +0200
+@@ -68,20 +68,15 @@ typedef struct
+ 
+ HotBabeData bm;
+ 
+-#if 0
++#if defined(__NetBSD__)
+ /* FIXME New BSD and Solaris code.. to check.
+  * doesn't work with Linux (getloadavg return 1.000) */
  static int system_cpu(void)
  {
-+#ifdef __NetBSD__
-+	double l;
-+	int i;
-+	if (getloadavg(&l, 1) < 0)
-+		return 0;
-+	i = (l - 0.5) * (256/4);
-+	if (i < 0)
-+	    i = 0;
-+	if (i > 256)
-+	    i = 256;
-+	return i;
+-  int rc;
+-  double loadavg[15];
+-  rc=getloadavg(loadavg, 1); 
+-  while( rc-- )
+-    printf( "load = %f\n", loadavg[rc] );
+-  rc=100*loadavg[0];
+-  return rc;
++  double loadavg;
++  return ((getloadavg(&loadavg, 1) == -1) ? 0 : (100 * loadavg));
+ }
+-#endif
 +#else
-   unsigned int  cpuload;
-   u_int64_t     load, total, oload, ototal;
-   u_int64_t     ab, ac, ad, ae;
-@@ -111,6 +123,7 @@
-     cpuload = (256 * (load - oload)) / (total - ototal);
+ 
+ /* returns current CPU load in percent, 0 to 256 */
+ static int system_cpu(void)
+@@ -144,6 +139,7 @@ static int system_cpu(void)
  
    return cpuload;
-+#endif 
  }
++#endif
  
- 
+ GdkPixmap     *pixmap;
+ GdkGC *gc;
diff --git a/x11/hot-babe/patches/patch-ab b/x11/hot-babe/patches/patch-ab
index 7117fd52806..7b7e0382133 100644
--- a/x11/hot-babe/patches/patch-ab
+++ b/x11/hot-babe/patches/patch-ab
@@ -1,15 +1,55 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/10/24 18:57:05 hubertf Exp $
+$NetBSD: patch-ab,v 1.2 2006/05/31 11:42:45 rillig Exp $
 
---- Makefile.orig	Sat Sep 21 17:28:43 2002
-+++ Makefile
-@@ -1,5 +1,4 @@
+--- Makefile.orig	2004-12-05 00:49:30.000000000 +0100
++++ Makefile	2006-05-31 12:49:08.000000000 +0200
+@@ -1,13 +1,16 @@
  # where to install this program
--PREFIX = /usr/local
- DESTDIR = ${PREFIX}
+-PREFIX := /usr/local
++mandir=		man
++sharedir=	share/hot-babe
++docdir=		share/doc/hot-babe
++pixmapdir=	share/pixmaps
++
+ VERSION := 0.2.2
  
  # optimization cflags
-@@ -21,3 +20,4 @@
+ CFLAGS += -O2 -Wall -g `pkg-config gdk-2.0 gdk-pixbuf-2.0  --cflags` -DPREFIX=\"$(PREFIX)\" -DVERSION=\"$(VERSION)\"
+ 
+ OBJS = hot-babe.o loader.o
+-CC = gcc
+-LIBS = `pkg-config gdk-2.0 gdk-pixbuf-2.0  --libs`
++LIBS += `pkg-config gdk-2.0 gdk-pixbuf-2.0  --libs`
+ 
+ DOC = ChangeLog NEWS TODO LICENSE CONTRIBUTORS copyright config.example
+ 
+@@ -22,18 +25,18 @@ clean:
  install:
- 	install -d $(DESTDIR)/bin
- 	install $(INSTALL) hot-babe $(DESTDIR)/bin
-+	install $(INSTALL) hot-babe.1 $(DESTDIR)/man/man1
+ 	install -d $(DESTDIR)$(PREFIX)/bin
+ 	install -m 0755 hot-babe $(DESTDIR)$(PREFIX)/bin
+-	install -d $(DESTDIR)$(PREFIX)/share/hot-babe/hb01
+-	install -m 0644 hb01/* $(DESTDIR)$(PREFIX)/share/hot-babe/hb01
+-	install -d $(DESTDIR)$(PREFIX)/share/doc/hot-babe
+-	install -m 0644 $(DOC) $(DESTDIR)$(PREFIX)/share/doc/hot-babe
+-	install -d $(DESTDIR)$(PREFIX)/share/man/man1
+-	install -m 0644 hot-babe.1 $(DESTDIR)$(PREFIX)/share/man/man1
+-	install -d $(DESTDIR)$(PREFIX)/share/pixmaps
+-	install -m 0644 hot-babe.xpm $(DESTDIR)$(PREFIX)/share/pixmaps
++	install -d $(DESTDIR)$(PREFIX)/${sharedir}/hb01
++	install -m 0644 hb01/* $(DESTDIR)$(PREFIX)/${sharedir}/hb01
++	install -d $(DESTDIR)$(PREFIX)/${docdir}
++	install -m 0644 $(DOC) $(DESTDIR)$(PREFIX)/${docdir}
++	install -d $(DESTDIR)$(PREFIX)/${mandir}/man1
++	install -m 0644 hot-babe.1 $(DESTDIR)$(PREFIX)/${mandir}/man1
++	install -d $(DESTDIR)$(PREFIX)/${pixmapdir}
++	install -m 0644 hot-babe.xpm $(DESTDIR)$(PREFIX)/${pixmapdir}
+ 
+ uninstall:
+ 	rm -f $(DESTDIR)$(PREFIX)/bin/hot-babe
+-	rm -rf $(DESTDIR)$(PREFIX)/share/hot-babe
+-	rm -rf $(DESTDIR)$(PREFIX)/share/doc/hot-babe
+-	rm -f $(DESTDIR)$(PREFIX)/share/man/man1/hot-babe.1
+-	rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/hot-babe.xpm
++	rm -rf $(DESTDIR)$(PREFIX)/${sharedir}
++	rm -rf $(DESTDIR)$(PREFIX)/${docdir}
++	rm -f $(DESTDIR)$(PREFIX)/${mandir}/man1/hot-babe.1
++	rm -f $(DESTDIR)$(PREFIX)/${pixmapdir}/hot-babe.xpm