[pkgsrc/trunk]: pkgsrc/sysutils/xfce4-battery-plugin Fix previous with apm(4)...

[hira <hira%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/63b29461a51b
branches:  trunk
changeset: 528452:63b29461a51b
user:      hira <hira%pkgsrc.org@localhost>
date:      Fri May 04 10:13:12 2007 +0000

description:
Fix previous with apm(4).  Check battery_state instead of nbattery.
Bump PKGREVISION.

diffstat:

 sysutils/xfce4-battery-plugin/Makefile         |  4 ++--
 sysutils/xfce4-battery-plugin/distinfo         |  4 ++--
 sysutils/xfce4-battery-plugin/patches/patch-aa |  4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diffs (47 lines):

diff -r 6cbb38e7f8a1 -r 63b29461a51b sysutils/xfce4-battery-plugin/Makefile
--- a/sysutils/xfce4-battery-plugin/Makefile    Fri May 04 07:50:32 2007 +0000
+++ b/sysutils/xfce4-battery-plugin/Makefile    Fri May 04 10:13:12 2007 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2007/05/01 17:41:59 martti Exp $
+# $NetBSD: Makefile,v 1.3 2007/05/04 10:13:12 hira Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION= 0.5.0
 
 DISTNAME=      xfce4-battery-plugin-${XFCE4_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils
 MASTER_SITES=  http://goodies.xfce.org/releases/xfce4-battery-plugin/
 COMMENT=       Xfce battey monitor plugin
diff -r 6cbb38e7f8a1 -r 63b29461a51b sysutils/xfce4-battery-plugin/distinfo
--- a/sysutils/xfce4-battery-plugin/distinfo    Fri May 04 07:50:32 2007 +0000
+++ b/sysutils/xfce4-battery-plugin/distinfo    Fri May 04 10:13:12 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2007/05/01 17:42:00 martti Exp $
+$NetBSD: distinfo,v 1.3 2007/05/04 10:13:12 hira Exp $
 
 SHA1 (xfce4-battery-plugin-0.5.0.tar.bz2) = 63439d32bfe8411458d41c38824cb393bc31d6e0
 RMD160 (xfce4-battery-plugin-0.5.0.tar.bz2) = bbf64994c7686b11b6a51bd7728569cd2a5d9777
 Size (xfce4-battery-plugin-0.5.0.tar.bz2) = 222269 bytes
-SHA1 (patch-aa) = 59c9bda919abd16c25da75ea4d9946fd7bb18514
+SHA1 (patch-aa) = 0b65b74f40079416167b6d85abc76006f2f2eced
diff -r 6cbb38e7f8a1 -r 63b29461a51b sysutils/xfce4-battery-plugin/patches/patch-aa
--- a/sysutils/xfce4-battery-plugin/patches/patch-aa    Fri May 04 07:50:32 2007 +0000
+++ b/sysutils/xfce4-battery-plugin/patches/patch-aa    Fri May 04 10:13:12 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2007/05/01 17:42:00 martti Exp $
+$NetBSD: patch-aa,v 1.3 2007/05/04 10:13:12 hira Exp $
 
 --- panel-plugin/battery.c.orig        2007-01-18 02:56:51.000000000 +0900
 +++ panel-plugin/battery.c     2007-05-01 01:32:49.000000000 +0900
@@ -42,7 +42,7 @@
      if(battmon->options.display_percentage && !(battmon->options.hide_when_full && acline && charge >= 99)){
          gtk_widget_show((GtkWidget *)battmon->charge);
 +#if defined(__NetBSD__) || defined(__OpenBSD__)
-+       if (apm.nbattery == 0)
++       if (apm.battery_state == APM_BATT_ABSENT)
 +            g_snprintf(buffer, sizeof(buffer),"--%% ");
 +       else
 +#endif