head 1.9; access; symbols pkgsrc-2015Q1:1.8.0.42 pkgsrc-2015Q1-base:1.8 pkgsrc-2014Q4:1.8.0.40 pkgsrc-2014Q4-base:1.8 pkgsrc-2014Q3:1.8.0.38 pkgsrc-2014Q3-base:1.8 pkgsrc-2014Q2:1.8.0.36 pkgsrc-2014Q2-base:1.8 pkgsrc-2014Q1:1.8.0.34 pkgsrc-2014Q1-base:1.8 pkgsrc-2013Q4:1.8.0.32 pkgsrc-2013Q4-base:1.8 pkgsrc-2013Q3:1.8.0.30 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.28 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.26 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.24 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.22 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.20 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.8.0.18 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.16 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.14 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.12 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.8.0.10 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.8.0.8 pkgsrc-2010Q4-base:1.8 pkgsrc-2010Q3:1.8.0.6 pkgsrc-2010Q3-base:1.8 pkgsrc-2010Q2:1.8.0.4 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.8.0.2 pkgsrc-2010Q1-base:1.8 pkgsrc-2009Q4:1.7.0.10 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.8 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.7.0.6 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.7.0.4 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.7.0.2 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.6.0.10 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.8 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.6 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.4 pkgsrc-2008Q1:1.6.0.2 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.4.0.6 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.4 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.2 pkgsrc-2007Q2-base:1.4 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.9 date 2015.04.21.08.56.40; author jperkin; state dead; branches; next 1.8; commitid 7bC9eaQQq3KiZqiy; 1.8 date 2010.03.22.15.46.03; author joerg; state Exp; branches; next 1.7; 1.7 date 2008.12.17.12.57.27; author hira; state Exp; branches; next 1.6; 1.6 date 2008.01.05.05.42.02; author hira; state Exp; branches; next 1.5; 1.5 date 2008.01.05.05.35.20; author hira; state Exp; branches; next 1.4; 1.4 date 2007.06.30.17.40.50; author joerg; state Exp; branches; next 1.3; 1.3 date 2007.05.04.10.13.12; author hira; state Exp; branches; next 1.2; 1.2 date 2007.05.01.17.42.00; author martti; state Exp; branches; next 1.1; 1.1 date 2007.04.27.10.48.06; author martti; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2007.04.27.10.48.06; author martti; state Exp; branches; next ; desc @@ 1.9 log @Update Xfce to 4.12.0. This is a very large change, and incorporates the 4.8, 4.10, and 4.12 major Xfce releases since 4.6.2, our previous pkgsrc release. For more information about the thousands of changes in each major release since then, please see: Xfce 4.12 announcement: http://www.xfce.org/about/news Xfce 4.12 tour: http://www.xfce.org/about/tour Xfce 4.10 announcement: http://www.xfce.org/about/news/?post=1335571200 Xfce 4.10 tour: http://www.xfce.org/about/tour410 Xfce 4.8 announcement: http://www.xfce.org/about/news/?post=1295136000 Xfce 4.8 tour: http://www.xfce.org/about/tour48 The pkgsrc changes since then are: New packages: archivers/xfce4-thunar-archive graphics/elementary-xfce-icon-theme mail/xfce4-mailwatch-plugin misc/xfce4-time-out-plugin multimedia/xfce4-thunar-media-tags sysutils/xfce4-mount-plugin sysutils/xfce4-taskmanager sysutils/xfce4-thunar-vcs sysutils/xfce4-verve-plugin x11/xfce4-garcon x11/xfce4-notifyd x11/xfce4-tumbler x11/xfce4-whiskermenu-plugin Renamed packages: devel/xfconf to devel/xfce4-conf x11/libxfce4menu to x11/libxfce4ui x11/xfce4-screenshooter-plugin to x11/xfce4-screenshooter Updated packages: audio/xfce4-mixer audio/xfce4-xmms-plugin devel/xfce4-dev-tools editors/xfce4-mousepad graphics/ristretto meta-pkgs/xfce4-extras meta-pkgs/xfce4 misc/xfce4-weather-plugin multimedia/xfce4-mpc-plugin net/xfce4-wavelan-plugin sysutils/xfce4-appfinder sysutils/xfce4-battery-plugin sysutils/xfce4-cpugraph-plugin sysutils/xfce4-diskperf-plugin sysutils/xfce4-fsguard-plugin sysutils/xfce4-genmon-plugin sysutils/xfce4-netload-plugin sysutils/xfce4-quicklauncher-plugin sysutils/xfce4-systemload-plugin sysutils/xfce4-thunar sysutils/xfce4-xarchiver sysutils/xfce4-xkb-plugin textproc/xfce4-dict-plugin time/xfce4-datetime-plugin time/xfce4-orage time/xfce4-timer-plugin wm/xfce4-wm-themes wm/xfce4-wm x11/libxfce4gui x11/libxfce4util x11/xfce4-clipman-plugin x11/xfce4-desktop x11/xfce4-exo x11/xfce4-eyes-plugin x11/xfce4-gtk2-engine x11/xfce4-notes-plugin x11/xfce4-panel x11/xfce4-places-plugin x11/xfce4-session x11/xfce4-settings x11/xfce4-terminal Removed packages: sysutils/xfce4-volman x11/xfce4-utils This is based on a huge amount of work by the NetBSDfr team and Youri Mouton, who takes over as MAINTAINER, and has been tested by Youri on a large number of platforms prior to commit. A massive thanks to them. Any issues with the import are mine alone as the committer-by-proxy. @ text @$NetBSD: patch-aa,v 1.8 2010/03/22 15:46:03 joerg Exp $ --- 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 #endif -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #include #elif __OpenBSD__ #include @@@@ -33,8 +33,18 @@@@ #elif __NetBSD__ #include #include +#if defined(__sparc64__) +/* On NetBSD/sparc64, apmvar.h is not exist in /usr/include/machine. */ +/* Reported in PR port-sparc64/36735. */ +#include +#elif defined(__x86_64__) +#include +#include +#else #include +#endif #define APMDEVICE "/dev/apm" +#define _ACPI_APM_BATT_UNKNOWN 0xffff /* from sys/dev/acpi/acpi_apm.c */ #elif __linux__ #include #endif @@@@ -155,7 +165,7 @@@@ gboolean detect_battery_info(t_battmon *battmon) { -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__DragonFly__) /* This is how I read the information from the APM subsystem under FreeBSD. Each time this functions is called (once every second) the APM device is opened, read from and then closed. @@@@ -209,7 +217,7 @@@@ battmon->method = BM_BROKEN; fd = open(APMDEVICE, O_RDONLY); if (fd == -1) return FALSE; - + if (ioctl(fd, APM_IOC_GETPOWER, &apm) == -1) { + if (ioctl(fd, APM_IOC_GETPOWER, &apm) == -1) { close(fd); return FALSE; } @@@@ -302,13 +312,16 @@@@ battmon->method = BM_BROKEN; fd = open(APMDEVICE, O_RDONLY); if (fd == -1) return TRUE; - if (ioctl(fd, APM_IOC_GETPOWER, &apminfo) == -1) + if (ioctl(fd, APM_IOC_GETPOWER, &apm) == -1) return TRUE; close(fd); charge = apm.battery_life; time_remaining = apm.minutes_left; acline = apm.ac_state ? TRUE : FALSE; + if(battmon->timeoutid != 0) g_source_remove(battmon->timeoutid); + battmon->timeoutid = g_timeout_add(2 * 1024, + (GSourceFunc) update_apm_status, battmon); #else struct apm_info apm; DBG ("Updating battery status..."); @@@@ -404,7 +417,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) @@@@ -464,6 +475,11 @@@@ 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.battery_state == APM_BATT_ABSENT) + g_snprintf(buffer, sizeof(buffer),"--%% "); + else +#endif g_snprintf(buffer, sizeof(buffer),"%d%% ", charge); gtk_label_set_text(battmon->charge,buffer); } else { @@@@ -481,6 +501,11 @@@@ } gtk_widget_show((GtkWidget *)active_label); +#if defined(__NetBSD__) + if (acline || time_remaining == _ACPI_APM_BATT_UNKNOWN) + g_snprintf(buffer, sizeof(buffer), "--:--"); + else +#endif g_snprintf(buffer, sizeof(buffer),"%02d:%02d ",time_remaining/60,time_remaining%60); gtk_label_set_text(active_label,buffer); @ 1.8 log @Use /usr/include/dev/apm/* on AMD64. Add explicit failure message for systems that have neither those nor /usr/include/machine/apmvar.h. Mark as DESTDIR ready. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.7 2008/12/17 12:57:27 hira Exp $ @ 1.7 log @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). @ text @d1 1 a1 1 $NetBSD$ d14 1 a14 1 @@@@ -33,8 +33,15 @@@@ d22 3 d33 1 a33 1 @@@@ -155,7 +162,7 @@@@ d42 1 a42 1 @@@@ -209,7 +216,7 @@@@ d51 1 a51 1 @@@@ -302,13 +309,16 @@@@ d69 1 a69 1 @@@@ -404,7 +414,7 @@@@ d78 1 a78 1 @@@@ -464,6 +474,11 @@@@ d90 1 a90 1 @@@@ -481,6 +496,11 @@@@ @ 1.6 log @Correct category of PR 36735 in comment (pkg -> port-sparc64). @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2008/01/05 05:35:20 hira Exp $ d3 2 a4 2 --- 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 d9 2 a10 2 -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__DragonFly__) d66 1 a66 1 @@@@ -400,7 +410,7 @@@@ d68 1 a68 1 d75 1 a75 1 @@@@ -460,6 +470,11 @@@@ d87 1 a87 1 @@@@ -477,6 +492,11 @@@@ @ 1.5 log @On NetBSD/sparc64, use /usr/include/sparc/apmvar.h instead of /usr/include/machine/apmvar.h until PR pkg/36735 is fixed. Pointed out by obache@@. OK'd by maintainer. @ text @d1 1 a1 1 $NetBSD$ d20 1 a20 1 +/* Reported in PR pkg/36735. */ @ 1.4 log @Add untested DragonFly support. @ text @d3 2 a4 2 --- panel-plugin/battery.c.orig 2007-01-17 17:56:51.000000000 +0000 +++ panel-plugin/battery.c d14 3 a16 1 @@@@ -35,6 +35,7 @@@@ d18 5 d24 1 d30 1 a30 1 @@@@ -155,7 +156,7 @@@@ init_options(t_battmon_options *options) d39 1 a39 1 @@@@ -209,7 +210,7 @@@@ detect_battery_info(t_battmon *battmon) d48 1 a48 1 @@@@ -302,13 +303,16 @@@@ update_apm_status(t_battmon *battmon) d66 1 a66 1 @@@@ -400,7 +404,7 @@@@ update_apm_status(t_battmon *battmon) d75 1 a75 1 @@@@ -460,6 +464,11 @@@@ battmon.c:241: for each function it appe d87 1 a87 1 @@@@ -477,6 +486,11 @@@@ battmon.c:241: for each function it appe @ 1.3 log @Fix previous with apm(4). Check battery_state instead of nbattery. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2007/05/01 17:42:00 martti Exp $ d3 11 a13 2 --- 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 d22 10 a31 1 @@@@ -209,7 +210,7 @@@@ d40 1 a40 1 @@@@ -302,13 +303,16 @@@@ d58 10 a67 1 @@@@ -460,6 +464,11 @@@@ d79 1 a79 1 @@@@ -477,6 +486,11 @@@@ @ 1.2 log @Updated sysutils/xfce4-battery-plugin to 0.5.0nb1 - Don't change behavior of remaining time on Linux and FreeBSD. - Don't print remaining percentage as `100%' if there are no batteries. @ text @d1 1 a1 1 $NetBSD$ d45 1 a45 1 + if (apm.nbattery == 0) @ 1.1 log @Initial revision @ text @d4 1 a4 1 +++ panel-plugin/battery.c 2007-04-25 02:57:46.000000000 +0900 d9 1 a9 1 +#define _APM_BATT_UNKNOWN 0xffff /* from sys/dev/acpi/acpi_apm.c */ d40 13 a52 1 @@@@ -477,7 +481,15 @@@@ d56 4 a59 4 - g_snprintf(buffer, sizeof(buffer),"%02d:%02d ",time_remaining/60,time_remaining%60); + if (acline +#ifdef __NetBSD__ + || time_remaining == _APM_BATT_UNKNOWN d61 1 a61 5 + ) + g_snprintf(buffer, sizeof(buffer), "--:--"); + else + g_snprintf(buffer, sizeof(buffer),"%02d:%02d ", + time_remaining/60,time_remaining%60); a63 1 } else { @ 1.1.1.1 log @Added some Xfce plugins. @ text @@