From 50c1e85babf752ebba714573fc92f237a97dc92e Mon Sep 17 00:00:00 2001
From: hira <hira>
Date: Wed, 17 Dec 2008 12:57:27 +0000
Subject: Update to 0.5.1.   * Apply patch to fix compilation with kfreebsd
 (Bug #3040).   * Apply patch to make the plugin work with newer kernels (Bug
 #3190).

---
 sysutils/xfce4-battery-plugin/Makefile         |  5 ++---
 sysutils/xfce4-battery-plugin/distinfo         | 10 +++++-----
 sysutils/xfce4-battery-plugin/patches/patch-aa | 18 +++++++++---------
 3 files changed, 16 insertions(+), 17 deletions(-)

(limited to 'sysutils')

diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index f755e1c52ea..0d0eca0486a 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2008/01/05 05:42:02 hira Exp $
+# $NetBSD: Makefile,v 1.7 2008/12/17 12:57:27 hira Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION=	0.5.0
+XFCE4_VERSION=	0.5.1
 
 DISTNAME=	xfce4-battery-plugin-${XFCE4_VERSION}
-PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-battery-plugin/
 COMMENT=	Xfce battey monitor plugin
diff --git a/sysutils/xfce4-battery-plugin/distinfo b/sysutils/xfce4-battery-plugin/distinfo
index d8876f2dcf8..4b9464ae7ca 100644
--- a/sysutils/xfce4-battery-plugin/distinfo
+++ b/sysutils/xfce4-battery-plugin/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2008/01/05 05:42:02 hira Exp $
+$NetBSD: distinfo,v 1.7 2008/12/17 12:57:27 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) = 350959404b2c1d9f5cfa8c360cfd9d9eec6ce5e0
+SHA1 (xfce4-battery-plugin-0.5.1.tar.bz2) = f97c1b6445c8da07c17353ae385b5fadb2fd5f1a
+RMD160 (xfce4-battery-plugin-0.5.1.tar.bz2) = ee770f06226cf8dfed95892c152ae3a2a446079a
+Size (xfce4-battery-plugin-0.5.1.tar.bz2) = 227940 bytes
+SHA1 (patch-aa) = 2293c172ad3f8414168e012d6a982d1ff017c5e3
diff --git a/sysutils/xfce4-battery-plugin/patches/patch-aa b/sysutils/xfce4-battery-plugin/patches/patch-aa
index e28aa0d367a..f1fe0cb7f74 100644
--- a/sysutils/xfce4-battery-plugin/patches/patch-aa
+++ b/sysutils/xfce4-battery-plugin/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.6 2008/01/05 05:42:02 hira Exp $
+$NetBSD: patch-aa,v 1.7 2008/12/17 12:57:27 hira Exp $
 
---- panel-plugin/battery.c.orig	2007-01-18 02:56:51.000000000 +0900
-+++ panel-plugin/battery.c	2008-01-03 21:30:22.000000000 +0900
+--- panel-plugin/battery.c.orig	2008-09-05 05:53:40.000000000 +0900
++++ panel-plugin/battery.c	2008-11-27 22:16:05.000000000 +0900
 @@ -25,7 +25,7 @@
  #include <config.h>
  #endif
  
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
  #include <machine/apm_bios.h>
  #elif __OpenBSD__
  #include <sys/param.h>
@@ -63,16 +63,16 @@ $NetBSD: patch-aa,v 1.6 2008/01/05 05:42:02 hira Exp $
  #else
      struct apm_info apm;
      DBG ("Updating battery status...");
-@@ -400,7 +410,7 @@
+@@ -404,7 +414,7 @@
          acline = apm.ac_line_status ? TRUE : FALSE;
-         
+ 
      }
 -#elif __FreeBSD__
 +#elif defined(__FreeBSD__) || defined(__DragonFly__)
      else {
   /* This is how I read the information from the APM subsystem under
       FreeBSD.  Each time this functions is called (once every second)
-@@ -460,6 +470,11 @@
+@@ -464,6 +474,11 @@
  
      if(battmon->options.display_percentage && !(battmon->options.hide_when_full && acline && charge >= 99)){
          gtk_widget_show((GtkWidget *)battmon->charge);
@@ -84,7 +84,7 @@ $NetBSD: patch-aa,v 1.6 2008/01/05 05:42:02 hira Exp $
          g_snprintf(buffer, sizeof(buffer),"%d%% ", charge);
          gtk_label_set_text(battmon->charge,buffer);
      } else {
-@@ -477,6 +492,11 @@
+@@ -481,6 +496,11 @@
          }
  
          gtk_widget_show((GtkWidget *)active_label);
-- 
cgit v1.2.3