ports/168071: [UPDATE] sysutils/xfce4-battery-plugin to 1.0.4
Olivier Duchateau
duchateau.olivier at gmail.com
Thu May 17 20:40:03 UTC 2012
>Number: 168071
>Category: ports
>Synopsis: [UPDATE] sysutils/xfce4-battery-plugin to 1.0.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu May 17 20:40:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Olivier Duchateau
>Release: FreeBSD 8.2-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
Announce: http://mail.xfce.org/pipermail/xfce/2012-May/030606.html
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -urN /usr/ports/sysutils/xfce4-battery-plugin/Makefile xfce4-battery-plugin/Makefile
--- /usr/ports/sysutils/xfce4-battery-plugin/Makefile 2011-10-26 22:27:21.000000000 +0200
+++ xfce4-battery-plugin/Makefile 2012-05-15 22:05:50.000000000 +0200
@@ -6,11 +6,10 @@
#
PORTNAME= xfce4-battery-plugin
-PORTVERSION= 1.0.0
-PORTREVISION= 1
+PORTVERSION= 1.0.4
CATEGORIES= sysutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= xfce at FreeBSD.org
@@ -18,16 +17,13 @@
ONLY_FOR_ARCHS= i386 amd64
-USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gtk20 glib20 intltool intlhack pkgconfig
-USE_XFCE= configenv libgui libutil panel
+USE_XFCE= configenv libmenu libutil panel
INSTALLS_ICONS= yes
-CONFIGURE_ARGS= --disable-debug
-
OPTIONS= NLS "Enable Native Language Support" on
.include <bsd.port.pre.mk>
diff -urN /usr/ports/sysutils/xfce4-battery-plugin/distinfo xfce4-battery-plugin/distinfo
--- /usr/ports/sysutils/xfce4-battery-plugin/distinfo 2011-03-17 16:46:49.000000000 +0100
+++ xfce4-battery-plugin/distinfo 2012-05-15 22:05:50.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfce4-battery-plugin-1.0.0.tar.bz2) = c28bb580e6b932c017b5bc6b2e75de8c3557e08d9606c7a70134aa035f8a121f
-SIZE (xfce4/xfce4-battery-plugin-1.0.0.tar.bz2) = 358338
+SHA256 (xfce4/xfce4-battery-plugin-1.0.4.tar.bz2) = 2682d634f30511d09e65f70b3cb3bd7748cc684a745a252c47c4118b3adf6dd6
+SIZE (xfce4/xfce4-battery-plugin-1.0.4.tar.bz2) = 402261
diff -urN /usr/ports/sysutils/xfce4-battery-plugin/files/patch-panel-plugin_libacpi.c xfce4-battery-plugin/files/patch-panel-plugin_libacpi.c
--- /usr/ports/sysutils/xfce4-battery-plugin/files/patch-panel-plugin_libacpi.c 2011-03-27 12:36:11.000000000 +0200
+++ xfce4-battery-plugin/files/patch-panel-plugin_libacpi.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,82 +0,0 @@
---- panel-plugin/libacpi.c.orig 2011-01-03 23:38:40.000000000 +1100
-+++ panel-plugin/libacpi.c 2011-03-21 15:38:01.000000000 +1100
-@@ -30,6 +30,16 @@
- #include <dirent.h>
- #include <glob.h>
-
-+#ifdef __FreeBSD__
-+#include <fcntl.h>
-+#include <sys/ioctl.h>
-+#include <dev/acpica/acpiio.h>
-+#define ACPIDEV "/dev/acpi"
-+static int acpifd;
-+#define UNKNOWN_CAP 0xffffffff
-+#define UNKNOWN_VOLTAGE 0xffffffff
-+#endif
-+
- #if HAVE_SYSCTL
-
- #if defined(__NetBSD__) || defined (__OpenBSD__)
-@@ -484,6 +494,7 @@
- }
-
- return 1;
-+
- #else
- #ifdef HAVE_SYSCTL
- static char buf[BUFSIZ];
-@@ -730,6 +741,24 @@
- #endif
- }
- acpiinfo->present = retval;
-+
-+#ifdef __FreeBSD__
-+ union acpi_battery_ioctl_arg battio;
-+ acpifd = open(ACPIDEV, O_RDONLY);
-+
-+ battio.unit = battery;
-+ if (ioctl(acpifd, ACPIIO_BATT_GET_BIF, &battio) == -1) {
-+ return 0;
-+ }
-+ close(acpifd);
-+
-+ acpiinfo->design_capacity = battio.bif.dcap;
-+ acpiinfo->last_full_capacity = battio.bif.lfcap;
-+ acpiinfo->battery_technology = battio.bif.btech;
-+ acpiinfo->design_voltage = battio.bif.dvol;
-+ acpiinfo->design_capacity_warning = battio.bif.wcap;
-+ acpiinfo->design_capacity_low = battio.bif.lcap;
-+#endif
- return 1;
- #else
- return 0;
-@@ -966,6 +995,29 @@
- #endif
- }
- acpistate->percentage =retval;
-+
-+#ifdef __FreeBSD__
-+ union acpi_battery_ioctl_arg battio;
-+ acpifd = open(ACPIDEV, O_RDONLY);
-+
-+ battio.unit = battery;
-+ if (ioctl(acpifd, ACPIIO_BATT_GET_BATTINFO, &battio) == -1) {
-+ return 0;
-+ }
-+
-+ acpistate->state = battio.battinfo.state;
-+ acpistate->prate = battio.battinfo.rate;
-+ acpistate->rcapacity = acpiinfo->last_full_capacity * battio.battinfo.cap / 100;
-+ acpistate->rtime = battio.battinfo.min;
-+ acpistate->percentage = battio.battinfo.cap;
-+
-+ battio.unit = battery;
-+ if (ioctl(acpifd, ACPIIO_BATT_GET_BATTINFO, &battio) == -1) {
-+ return 0;
-+ }
-+ close(acpifd);
-+ acpistate->pvoltage = battio.bst.volt;
-+#endif
- return 1;
- #else
- return 0;
diff -urN /usr/ports/sysutils/xfce4-battery-plugin/pkg-plist xfce4-battery-plugin/pkg-plist
--- /usr/ports/sysutils/xfce4-battery-plugin/pkg-plist 2011-03-17 16:46:49.000000000 +0100
+++ xfce4-battery-plugin/pkg-plist 2012-05-15 22:05:50.000000000 +0200
@@ -1,11 +1,49 @@
-libexec/xfce4/panel-plugins/xfce4-battery-plugin
+lib/xfce4/panel/plugins/libbattery.la
+lib/xfce4/panel/plugins/libbattery.so
+share/icons/hicolor/16x16/apps/xfce4-battery-critical-charging.png
+share/icons/hicolor/16x16/apps/xfce4-battery-critical.png
+share/icons/hicolor/16x16/apps/xfce4-battery-full-charging.png
+share/icons/hicolor/16x16/apps/xfce4-battery-full.png
+share/icons/hicolor/16x16/apps/xfce4-battery-low-charging.png
+share/icons/hicolor/16x16/apps/xfce4-battery-low.png
+share/icons/hicolor/16x16/apps/xfce4-battery-missing.png
+share/icons/hicolor/16x16/apps/xfce4-battery-ok-charging.png
+share/icons/hicolor/16x16/apps/xfce4-battery-ok.png
share/icons/hicolor/16x16/apps/xfce4-battery-plugin.png
+share/icons/hicolor/22x22/apps/xfce4-battery-critical-charging.png
+share/icons/hicolor/22x22/apps/xfce4-battery-critical.png
+share/icons/hicolor/22x22/apps/xfce4-battery-full-charging.png
+share/icons/hicolor/22x22/apps/xfce4-battery-full.png
+share/icons/hicolor/22x22/apps/xfce4-battery-low-charging.png
+share/icons/hicolor/22x22/apps/xfce4-battery-low.png
+share/icons/hicolor/22x22/apps/xfce4-battery-missing.png
+share/icons/hicolor/22x22/apps/xfce4-battery-ok-charging.png
+share/icons/hicolor/22x22/apps/xfce4-battery-ok.png
share/icons/hicolor/22x22/apps/xfce4-battery-plugin.png
+share/icons/hicolor/24x24/apps/xfce4-battery-critical-charging.png
+share/icons/hicolor/24x24/apps/xfce4-battery-critical.png
+share/icons/hicolor/24x24/apps/xfce4-battery-full-charging.png
+share/icons/hicolor/24x24/apps/xfce4-battery-full.png
+share/icons/hicolor/24x24/apps/xfce4-battery-low-charging.png
+share/icons/hicolor/24x24/apps/xfce4-battery-low.png
+share/icons/hicolor/24x24/apps/xfce4-battery-missing.png
+share/icons/hicolor/24x24/apps/xfce4-battery-ok-charging.png
+share/icons/hicolor/24x24/apps/xfce4-battery-ok.png
share/icons/hicolor/24x24/apps/xfce4-battery-plugin.png
share/icons/hicolor/32x32/apps/xfce4-battery-plugin.png
+share/icons/hicolor/scalable/apps/xfce4-battery-critical-charging.svg
+share/icons/hicolor/scalable/apps/xfce4-battery-critical.svg
+share/icons/hicolor/scalable/apps/xfce4-battery-full-charging.svg
+share/icons/hicolor/scalable/apps/xfce4-battery-full.svg
+share/icons/hicolor/scalable/apps/xfce4-battery-low-charging.svg
+share/icons/hicolor/scalable/apps/xfce4-battery-low.svg
+share/icons/hicolor/scalable/apps/xfce4-battery-missing.svg
+share/icons/hicolor/scalable/apps/xfce4-battery-ok-charging.svg
+share/icons/hicolor/scalable/apps/xfce4-battery-ok.svg
share/icons/hicolor/scalable/apps/xfce4-battery-plugin.svg
%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-battery-plugin.mo
%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-battery-plugin.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-battery-plugin.mo
%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-battery-plugin.mo
%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-battery-plugin.mo
%%NLS%%share/locale/da/LC_MESSAGES/xfce4-battery-plugin.mo
@@ -20,12 +58,16 @@
%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-battery-plugin.mo
%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-battery-plugin.mo
%%NLS%%share/locale/id/LC_MESSAGES/xfce4-battery-plugin.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-battery-plugin.mo
%%NLS%%share/locale/it/LC_MESSAGES/xfce4-battery-plugin.mo
%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-battery-plugin.mo
%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-battery-plugin.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-battery-plugin.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-battery-plugin.mo
%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-battery-plugin.mo
%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-battery-plugin.mo
%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-battery-plugin.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/xfce4-battery-plugin.mo
%%NLS%%share/locale/pa/LC_MESSAGES/xfce4-battery-plugin.mo
%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-battery-plugin.mo
%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-battery-plugin.mo
@@ -42,8 +84,9 @@
%%NLS%%share/locale/vi/LC_MESSAGES/xfce4-battery-plugin.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-battery-plugin.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-battery-plugin.mo
-share/xfce4/panel-plugins/battmon.desktop
- at dirrmtry share/xfce4/panel-plugins
+share/xfce4/panel/plugins/battery.desktop
+ at dirrmtry share/xfce4/panel/plugins
+ at dirrmtry share/xfce4/panel
@dirrmtry share/xfce4
%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ur_PK
@@ -55,5 +98,6 @@
%%NLS%%@dirrmtry share/locale/kk
%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ast
- at dirrmtry libexec/xfce4/panel-plugins
- at dirrmtry libexec/xfce4
+ at dirrmtry lib/xfce4/panel/plugins
+ at dirrmtry lib/xfce4/panel
+ at dirrmtry lib/xfce4
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list