i3status: update to 2.12.

2018-05-11 i3status 2.12

 • fix NULL value on OpenBSD when there is no acpitz0
 • show IP address when address has a label
 • man: explicitly use format_up/format_down in ethernet, wireless conf
 • man: remove SLOC comment
 • treat zero battery capacity as "not available"
 • add IPv6 address when IPv4 isn't available
 • call tzset at each time print to pick up time zone changes
 • doc: fixed minor typos
 • be more cautious about handling invalid battery measurements.
 • Makefile: make PKG_CONFIG overridable
 • fix CPU unit tests
 • use local timezone for battery %emptytime
 • fix memory leak/use BEGINS_WITH macro
 • _first_: add check for virtual ethernet devices
 • add battery capacity parsing
 • multiple CPU support for cpu_usage
 • remove useless checks (we use char, not unsigned char) to fix compilation warnings
 • disk: sanitize trailing slashes
 • plug an fd leak in the OpenBSD-specific code for
 • suppress printing :00 seconds of remaining battery lifetime, as apm(4)'s
   estimate only has a granularity of minutes.
 • fix the deciKelvin to Celsius conversion on FreeBSD
 • make first_eth_interface() work on OpenBSD
 • include sys/select.h on OpenBSD

2017-01-21 i3status 2.11

 • re-add forgotten wakeup call from SIGUSR1 handler
 • disk_info: bugfix: check format_not_mounted is not NULL before using it
 • revert back to using nanosleep
 • man: give more descriptive symbols to battery format
 • battery: removes the 'remaining' time when the battery is full
 • add separator and separator_block_width as universal module options
 • man: fix link to contrib
 • cpu_temperature: add glob check
 • battery: add status_unk
 • reconnect to PluseAudio when connection is lost
 • wireless: add ifdef to compile on macOS
 • order default configuration paths the same as in i3
 • add version files for release tarball
 • man: make tztime example config match the context
 • cpu_usage: add color thresholds
 • battery: support multiple batteries
 • disk: use empty string for not mounted disks
 • default config: remove DHCP, VPN
 • wireless: fix FTBFS on hurd and kFreeBSD
 • parse uevent file to detect network device type
 • allow pulse device to be specified by name
 • battery: find batteries using glob
 • tztime: support locales
 • wireless: use blank padding for quality
 • add unit tests
 • fix compilation with -fno-common

5 files changed, 25 insertions, 80 deletions

diff --git a/sysutils/i3status/Makefile b/sysutils/i3status/Makefile
index 92c03d8b4a1..e6c25814ac7 100644
--- a/sysutils/i3status/Makefile
+++ b/sysutils/i3status/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2018/07/06 15:06:50 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.9 2019/03/14 11:55:29 wiz Exp $
 
-DISTNAME=	i3status-2.10
-PKGREVISION=	5
+DISTNAME=	i3status-2.12
 CATEGORIES=	sysutils
 MASTER_SITES=	https://i3wm.org/i3status/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/i3status/distinfo b/sysutils/i3status/distinfo
index 69484f286e0..2f6f9721f5d 100644
--- a/sysutils/i3status/distinfo
+++ b/sysutils/i3status/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.1 2016/06/14 06:39:37 kamil Exp $
+$NetBSD: distinfo,v 1.2 2019/03/14 11:55:29 wiz Exp $
 
-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-Makefile) = 2ca0cf79670e189a7e70e14247b1cd4aafb81ffd
-SHA1 (patch-src_print__disk__info.c) = e0662f65b21402e60a643374898707f5807077f2
-SHA1 (patch-src_print__wireless__info.c) = 4632c9eabd5b5d73bc67e541bf7dc93e883339d1
+SHA1 (i3status-2.12.tar.bz2) = cb397987a1d931b600731e5ad033fe2f371d02b1
+RMD160 (i3status-2.12.tar.bz2) = d0cfd5dd51b0460c4052c81923b2ca4394ed8840
+SHA512 (i3status-2.12.tar.bz2) = 687a880a65cb8df46f5e9d2256b59724ba3424c502e9a0fb3ca71b070875df5f4008ee501c554bc716f2d728a5cf813a36d22d7377d42c3c46b14381d385bab3
+Size (i3status-2.12.tar.bz2) = 57162 bytes
+SHA1 (patch-Makefile) = 3e6358c173b74f24d82995a0019f36854237e135
+SHA1 (patch-src_print__wireless__info.c) = 0b51f34f95cb3731c2df033df503b0e58e91ad2a
diff --git a/sysutils/i3status/patches/patch-Makefile b/sysutils/i3status/patches/patch-Makefile
index 6662a3809bf..3295ea160f0 100644
--- a/sysutils/i3status/patches/patch-Makefile
+++ b/sysutils/i3status/patches/patch-Makefile
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile,v 1.1 2016/06/14 06:39:37 kamil Exp $
+$NetBSD: patch-Makefile,v 1.2 2019/03/14 11:55:29 wiz Exp $
 
 Adjust paths and install LICENSE.
 
---- Makefile.orig	2016-01-01 18:51:19.000000000 +0000
+--- Makefile.orig	2018-05-11 09:10:46.000000000 +0000
 +++ Makefile
-@@ -11,6 +11,9 @@ ifndef SYSCONFDIR
+@@ -13,6 +13,9 @@ ifndef SYSCONFDIR
      SYSCONFDIR=$(PREFIX)/etc
    endif
  endif
@@ -12,9 +12,9 @@ Adjust paths and install LICENSE.
 +  MANDIR=$(MANDIR)
 +endif
  
+ PKG_CONFIG ?= pkg-config
  CFLAGS+=-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare
- CFLAGS+=-g
-@@ -100,13 +103,15 @@ manpage:
+@@ -110,13 +113,15 @@ manpage:
  
  install:
  	install -m 755 -d $(DESTDIR)$(PREFIX)/bin
diff --git a/sysutils/i3status/patches/patch-src_print__disk__info.c b/sysutils/i3status/patches/patch-src_print__disk__info.c
deleted file mode 100644
index f57bbd513c2..00000000000
--- a/sysutils/i3status/patches/patch-src_print__disk__info.c
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-src_print__disk__info.c,v 1.1 2016/06/14 06:39:37 kamil Exp $
-
-* mntent.h and setmntent stuff is linux only
-* 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
-@@ -7,11 +7,11 @@
- #include <sys/stat.h>
- #include <sys/statvfs.h>
- #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__)
-     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
- 
-     if (low_threshold > 0 && below_threshold(buf, prefix_type, threshold_type, low_threshold)) {
diff --git a/sysutils/i3status/patches/patch-src_print__wireless__info.c b/sysutils/i3status/patches/patch-src_print__wireless__info.c
index c48ef125d85..5560ac5488f 100644
--- a/sysutils/i3status/patches/patch-src_print__wireless__info.c
+++ b/sysutils/i3status/patches/patch-src_print__wireless__info.c
@@ -1,18 +1,19 @@
-$NetBSD: patch-src_print__wireless__info.c,v 1.1 2016/06/14 06:39:37 kamil Exp $
+$NetBSD: patch-src_print__wireless__info.c,v 1.2 2019/03/14 11:55:29 wiz Exp $
 
-Add support for NetBSD.
+Add includes for AF_INET & AF_INET6, and for free().
 
---- src/print_wireless_info.c.orig	2016-01-01 18:51:19.000000000 +0000
+--- src/print_wireless_info.c.orig	2018-05-11 09:10:46.000000000 +0000
 +++ src/print_wireless_info.c
-@@ -52,6 +52,12 @@
- #include <net80211/ieee80211_ioctl.h>
+@@ -60,10 +60,13 @@
+ 
+ #ifdef __NetBSD__
+ #include <sys/types.h>
++#include <sys/socket.h>
+ #include <net80211/ieee80211.h>
+ #define IW_ESSID_MAX_SIZE IEEE80211_NWID_LEN
  #endif
  
-+#ifdef __NetBSD__
-+#include <unistd.h>
-+#include <net80211/ieee80211.h>
-+#define IW_ESSID_MAX_SIZE IEEE80211_NWID_LEN
-+#endif
++#include <stdlib.h>
 +
  #include "i3status.h"