Make hot-babe less sensitive so that her clothes stay on a bit longer. From

toddpw@ in PR pkg/24921.

While here, clean up the English in DESCR and use bl3.

4 files changed, 23 insertions, 18 deletions

diff --git a/x11/hot-babe/DESCR b/x11/hot-babe/DESCR
index bf21b505d67..d4ddb26ddb5 100644
--- a/x11/hot-babe/DESCR
+++ b/x11/hot-babe/DESCR
@@ -1,6 +1,6 @@
-Hot-babe is a small graphical utility which display the system
-activity in a very special way. When the CPU is idle, it displays
+Hot-babe is a small graphical utility which displays the system
+activity in a very special way.  When the CPU is idle, it displays
 a dressed girl, and when the activity goes up, as the temperature
 increases, the girl begins to undress, to finish totally naked when
-the system activity reaches 100%. Of course, if you can be shocked
+the system activity reaches 100%.  Of course, if you are shocked
 by nudity, don't use it!
diff --git a/x11/hot-babe/Makefile b/x11/hot-babe/Makefile
index 83b09a4b688..11e65384d80 100644
--- a/x11/hot-babe/Makefile
+++ b/x11/hot-babe/Makefile
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.7 2004/01/03 18:49:57 reed Exp $
-#
+# $NetBSD: Makefile,v 1.8 2004/03/29 22:44:29 snj Exp $
 
 DISTNAME=	hot-babe-0.1.2
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	http://dindinx.net/hotbabe/downloads/
 
 MAINTAINER=	hubertf@NetBSD.org
 HOMEPAGE=	http://dindinx.net/hotbabe/
-COMMENT=	System monitor
+COMMENT=	System load monitor
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 USE_X11=	yes
 
-.include "../../x11/gtk/buildlink2.mk"
-.include "../../graphics/gdk-pixbuf/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
+.include "../../x11/gtk/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/hot-babe/distinfo b/x11/hot-babe/distinfo
index 7020ae5959b..b668e2781f5 100644
--- a/x11/hot-babe/distinfo
+++ b/x11/hot-babe/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2002/10/24 19:04:23 hubertf Exp $
+$NetBSD: distinfo,v 1.3 2004/03/29 22:44:29 snj Exp $
 
 SHA1 (hot-babe-0.1.2.tar.gz) = 53410a9f5590250ba862ee220ac9140014c39114
 Size (hot-babe-0.1.2.tar.gz) = 708450 bytes
-SHA1 (patch-aa) = 4b8a239530edb4c144eacf61061bad030d7cb3d6
+SHA1 (patch-aa) = fdee9709d63b28d888abfa59ffe087d6917e5717
 SHA1 (patch-ab) = ebb9a0fae24c0ad6719fe99b34c77e49f91e02bc
diff --git a/x11/hot-babe/patches/patch-aa b/x11/hot-babe/patches/patch-aa
index 60d43a1bf39..821f37549cc 100644
--- a/x11/hot-babe/patches/patch-aa
+++ b/x11/hot-babe/patches/patch-aa
@@ -1,21 +1,27 @@
-$NetBSD: patch-aa,v 1.2 2002/10/24 19:04:23 hubertf Exp $
+$NetBSD: patch-aa,v 1.3 2004/03/29 22:44:29 snj Exp $
 
 --- hot-babe.c.orig	Sat Sep 21 16:53:24 2002
 +++ hot-babe.c
-@@ -74,6 +74,12 @@
+@@ -74,6 +74,18 @@
  /* returns current CPU load in percent, 0 to 256 */
  static int system_cpu(void)
  {
 +#ifdef __NetBSD__
 +	double l;
++	int i;
 +	if (getloadavg(&l, 1) < 0)
-+		return 256;
-+	return (int)(256 * (l>2.0? 2.0 : l) / 2.0);
++		return 0;
++	i = (l - 0.5) * (256/4);
++	if (i < 0)
++	    i = 0;
++	if (i > 256)
++	    i = 256;
++	return i;
 +#else
    unsigned int  cpuload;
    u_int64_t     load, total, oload, ototal;
    u_int64_t     ab, ac, ad, ae;
-@@ -111,6 +117,7 @@
+@@ -111,6 +123,7 @@
      cpuload = (256 * (load - oload)) / (total - ototal);
  
    return cpuload;