i3status: Update wip/i3status to 2.10.

[Mateusz Poszwa <old4%o2.pl@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Fri Jan 22 01:46:38 2016 +0100
Changeset:	abfe73ffcb67e9cdadc689a3c1cdce9bcf19032d

Modified Files:
	i3status/Makefile
	i3status/TODO
	i3status/distinfo
	i3status/patches/patch-src_print__disk__info.c
Added Files:
	i3status/patches/patch-src_print__wireless__info.c

Log Message:
i3status: Update wip/i3status to 2.10.

Changes:
 * man: fix typo in battery example
 * Pass the "instance" JSON property key for tztime blocks
 * Fix build (and build warnings) on FreeBSD
 * Fix build on OpenBSD
 * path_exists, run_watch: add format_down
 * volume: add PulseAudio support. This significantly reduces battery
   consumption on systems that use PulseAudio, which is the default on any
   modern Linux desktop.
 * wireless/OpenBSD: use the maximum rssi, not the scaled percentage for the
   signal level.
 * make: Add support for differing PREFIX and MANPREFIX.
 * battery: make output HH:MM across all platforms.
 * battery: clamp the percentage at 100% when last_full_capacity is enabled.
 * Use format_not_mounted if the directory for a disk_info block does not
   exist.
 • disk_info/OS X: Fix build.
 * volume/OpenBSD: use SndIO.
 * eth, wireless: Use "color_degraded" when interface has no IP.
 * eth, wireless/FreeBSD: Fix for recent FreeBSD versions.
 * wireless/Linux: switch from libiw to libnl. This allows you to run i3status
   on kernels which don’t have the wext compatibility module enabled.
 * battery/FreeBSD: properly detect charging status
 * eth: first_eth_interface: ignore MAC addresses, look for IPv4/IPv6 addresses
 * Implement support for Pango markup.
 * format detection: recognise swaybar

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=abfe73ffcb67e9cdadc689a3c1cdce9bcf19032d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 i3status/Makefile                                  |  4 +-
 i3status/TODO                                      | 10 ++--
 i3status/distinfo                                  | 10 ++--
 i3status/patches/patch-src_print__disk__info.c     | 59 +++++++++++++++-------
 i3status/patches/patch-src_print__wireless__info.c | 19 +++++++
 5 files changed, 74 insertions(+), 28 deletions(-)

diffs:
diff --git a/i3status/Makefile b/i3status/Makefile
index c0e504e..8619e26 100644
--- a/i3status/Makefile
+++ b/i3status/Makefile
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.5 2015/04/08 14:33:19 nros Exp $
 #
 
-DISTNAME=	i3status-2.9
-PKGREVISION=	1
+DISTNAME=	i3status-2.10
 CATEGORIES=	sysutils wm
 MASTER_SITES=	http://i3wm.org/i3status/
 EXTRACT_SUFX=	.tar.bz2
@@ -28,4 +27,5 @@ do-install:
 
 .include "../../devel/confuse/buildlink3.mk"
 .include "../../devel/yajl/buildlink3.mk"
+.include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/i3status/TODO b/i3status/TODO
index a2be11e..ec73c44 100644
--- a/i3status/TODO
+++ b/i3status/TODO
@@ -1,13 +1,15 @@
 NetBSD :
 src/print_battery_info.c
-src/print_cpu_temperature.c
-src/print_cpu_usage.c
+src/print_cpu_temperature.c		There must be some requirements for it to work
+                           		TODO: Use _PATH_SYSMON instead of /dev/sysmon.
+src/print_cpu_usage.c			Looks fine
 src/print_ddate.c
-src/print_disk_info.c			OK
+src/print_disk_info.c			Not so OK. Sizes multiplied by 8 on NetBSD.
+                     			It may be filesystem dependent.
 src/print_eth_info.c
 src/print_ip_addr.c
 src/print_ipv6_addr.c
-src/print_load.c
+src/print_load.c			Looks fine
 src/print_run_watch.c
 src/print_time.c			OK
 src/print_volume.c
diff --git a/i3status/distinfo b/i3status/distinfo
index 4212fee..99f7a89 100644
--- a/i3status/distinfo
+++ b/i3status/distinfo
@@ -1,6 +1,8 @@
 $NetBSD: distinfo,v 1.5 2015/04/07 21:11:11 nros Exp $
 
-SHA1 (i3status-2.9.tar.bz2) = a7621b108208453a1cd974d52ebc2ba49917ee30
-RMD160 (i3status-2.9.tar.bz2) = 90fe09fbb66e253bbf8442bfafbc3288abe5d007
-Size (i3status-2.9.tar.bz2) = 46615 bytes
-SHA1 (patch-src_print__disk__info.c) = 71cd13ae19fccc9feb0ed69c9b04856d231f7598
+SHA1 (i3status-2.10.tar.bz2) = b0bfcac24c9e57958eefd9c3b00aed4b73b2c708
+RMD160 (i3status-2.10.tar.bz2) = 78a2d26aea8d59e8b8e9f7a302e28688bd9ae516
+SHA512 (i3status-2.10.tar.bz2) = a514331d83458de15b548686d423b38a7a9198a7a31ca3001f3f136e4b873617c397a0073bb10b44fa8613bc12ed4fa4e384d099d31122a8afbd0df5de2e9c85
+Size (i3status-2.10.tar.bz2) = 53684 bytes
+SHA1 (patch-src_print__disk__info.c) = e0662f65b21402e60a643374898707f5807077f2
+SHA1 (patch-src_print__wireless__info.c) = 4632c9eabd5b5d73bc67e541bf7dc93e883339d1
diff --git a/i3status/patches/patch-src_print__disk__info.c b/i3status/patches/patch-src_print__disk__info.c
index 2bf88df..1f2680c 100644
--- a/i3status/patches/patch-src_print__disk__info.c
+++ b/i3status/patches/patch-src_print__disk__info.c
@@ -1,30 +1,53 @@
 $NetBSD: patch-src_print__disk__info.c,v 1.1 2015/04/07 21:11:11 nros Exp $
+
 * mntent.h and setmntent stuff is linux only
---- src/print_disk_info.c.orig	2015-03-22 17:03:23.000000000 +0000
+* NetBSD has statvfs structure, not statfs
+
+--- src/print_disk_info.c.orig	2016-01-01 18:51:19.000000000 +0000
 +++ src/print_disk_info.c
-@@ -3,7 +3,9 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
-+#if defined(__linux__)
- #include <mntent.h>
-+#endif
- #include <stdint.h>
+@@ -7,11 +7,11 @@
  #include <sys/stat.h>
  #include <sys/statvfs.h>
-@@ -126,6 +128,7 @@ void print_disk_info(yajl_gen json_gen, 
-     if (statvfs(path, &buf) == -1)
-         return;
+ #include <sys/types.h>
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || (__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__)
++#if defined(__linux__)
++#include <mntent.h>
++#else
+ #include <sys/param.h>
+ #include <sys/mount.h>
+-#else
+-#include <mntent.h>
+ #endif
+ #include <yajl/yajl_gen.h>
+ #include <yajl/yajl_version.h>
+@@ -116,12 +116,7 @@ void print_disk_info(yajl_gen json_gen, 
  
+     INSTANCE(path);
+ 
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__)
+-    struct statfs buf;
+-
+-    if (statfs(path, &buf) == -1)
+-        return;
+-#else
 +#if defined(__linux__)
-     if (format_not_mounted != NULL) {
-         FILE *mntentfile = setmntent("/etc/mtab", "r");
-         struct mntent *m;
-@@ -144,6 +147,7 @@ void print_disk_info(yajl_gen json_gen, 
+     struct statvfs buf;
+ 
+     if (statvfs(path, &buf) == -1) {
+@@ -145,6 +140,16 @@ void print_disk_info(yajl_gen json_gen, 
+             format = format_not_mounted;
          }
      }
++#elif defined(__NetBSD__)
++    struct statvfs buf;
++
++    if (statvfs(path, &buf) == -1)
++        format = format_not_mounted;
++#else
++    struct statfs buf;
++
++    if (statfs(path, &buf) == -1)
++        return;
  #endif
-+#endif
  
      if (low_threshold > 0 && below_threshold(buf, prefix_type, threshold_type, low_threshold)) {
-         START_COLOR("color_bad");
diff --git a/i3status/patches/patch-src_print__wireless__info.c b/i3status/patches/patch-src_print__wireless__info.c
new file mode 100644
index 0000000..f67f4d6
--- /dev/null
+++ b/i3status/patches/patch-src_print__wireless__info.c
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Add support for NetBSD.
+
+--- src/print_wireless_info.c.orig	2016-01-01 18:51:19.000000000 +0000
++++ src/print_wireless_info.c
+@@ -52,6 +52,12 @@
+ #include <net80211/ieee80211_ioctl.h>
+ #endif
+ 
++#ifdef __NetBSD__
++#include <unistd.h>
++#include <net80211/ieee80211.h>
++#define IW_ESSID_MAX_SIZE IEEE80211_NWID_LEN
++#endif
++
+ #include "i3status.h"
+ 
+ #define WIRELESS_INFO_FLAG_HAS_ESSID (1 << 0)