From owner-freebsd-ports-bugs@FreeBSD.ORG Thu May 17 20:40:03 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0EB76106567C for ; Thu, 17 May 2012 20:40:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 3D9EB8FC21 for ; Thu, 17 May 2012 20:40:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q4HKe2Y8046107 for ; Thu, 17 May 2012 20:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q4HKe2JL046106; Thu, 17 May 2012 20:40:02 GMT (envelope-from gnats) Resent-Date: Thu, 17 May 2012 20:40:02 GMT Resent-Message-Id: <201205172040.q4HKe2JL046106@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Olivier Duchateau Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7ECCA1065674 for ; Thu, 17 May 2012 20:30:38 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 685CC8FC17 for ; Thu, 17 May 2012 20:30:38 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q4HKUcuK026811 for ; Thu, 17 May 2012 20:30:38 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q4HKUcQf026805; Thu, 17 May 2012 20:30:38 GMT (envelope-from nobody) Message-Id: <201205172030.q4HKUcQf026805@red.freebsd.org> Date: Thu, 17 May 2012 20:30:38 GMT From: Olivier Duchateau To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/168071: [UPDATE] sysutils/xfce4-battery-plugin to 1.0.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2012 20:40:03 -0000 >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@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 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 - #include - -+#ifdef __FreeBSD__ -+#include -+#include -+#include -+#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 -@dirrmtry share/xfce4/panel-plugins +share/xfce4/panel/plugins/battery.desktop +@dirrmtry share/xfce4/panel/plugins +@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 -@dirrmtry libexec/xfce4/panel-plugins -@dirrmtry libexec/xfce4 +@dirrmtry lib/xfce4/panel/plugins +@dirrmtry lib/xfce4/panel +@dirrmtry lib/xfce4 >Release-Note: >Audit-Trail: >Unformatted: