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-commondiff -r1.8 -r1.9 pkgsrc/sysutils/i3status/Makefile
(wiz)
@@ -1,18 +1,16 @@ | @@ -1,18 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.8 2018/07/06 15:06:50 ryoon Exp $ | 1 | # $NetBSD: Makefile,v 1.9 2019/03/14 11:55:29 wiz Exp $ | |
2 | # | |||
3 | 2 | |||
4 | DISTNAME= i3status-2.10 | 3 | DISTNAME= i3status-2.12 | |
5 | PKGREVISION= 5 | |||
6 | CATEGORIES= sysutils | 4 | CATEGORIES= sysutils | |
7 | MASTER_SITES= https://i3wm.org/i3status/ | 5 | MASTER_SITES= https://i3wm.org/i3status/ | |
8 | EXTRACT_SUFX= .tar.bz2 | 6 | EXTRACT_SUFX= .tar.bz2 | |
9 | 7 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= https://i3wm.org/i3status/ | 9 | HOMEPAGE= https://i3wm.org/i3status/ | |
12 | COMMENT= Small program for generating a status bar | 10 | COMMENT= Small program for generating a status bar | |
13 | LICENSE= modified-bsd | 11 | LICENSE= modified-bsd | |
14 | 12 | |||
15 | USE_TOOLS+= gmake | 13 | USE_TOOLS+= gmake | |
16 | 14 | |||
17 | CONF_FILES= ${PREFIX}/share/examples/${PKGBASE}/i3status.conf ${PKG_SYSCONFDIR}/i3status.conf | 15 | CONF_FILES= ${PREFIX}/share/examples/${PKGBASE}/i3status.conf ${PKG_SYSCONFDIR}/i3status.conf | |
18 | 16 |
@@ -1,9 +1,8 @@ | @@ -1,9 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.1 2016/06/14 06:39:37 kamil Exp $ | 1 | $NetBSD: distinfo,v 1.2 2019/03/14 11:55:29 wiz Exp $ | |
2 | 2 | |||
3 | SHA1 (i3status-2.10.tar.bz2) = b0bfcac24c9e57958eefd9c3b00aed4b73b2c708 | 3 | SHA1 (i3status-2.12.tar.bz2) = cb397987a1d931b600731e5ad033fe2f371d02b1 | |
4 | RMD160 (i3status-2.10.tar.bz2) = 78a2d26aea8d59e8b8e9f7a302e28688bd9ae516 | 4 | RMD160 (i3status-2.12.tar.bz2) = d0cfd5dd51b0460c4052c81923b2ca4394ed8840 | |
5 | SHA512 (i3status-2.10.tar.bz2) = a514331d83458de15b548686d423b38a7a9198a7a31ca3001f3f136e4b873617c397a0073bb10b44fa8613bc12ed4fa4e384d099d31122a8afbd0df5de2e9c85 | 5 | SHA512 (i3status-2.12.tar.bz2) = 687a880a65cb8df46f5e9d2256b59724ba3424c502e9a0fb3ca71b070875df5f4008ee501c554bc716f2d728a5cf813a36d22d7377d42c3c46b14381d385bab3 | |
6 | Size (i3status-2.10.tar.bz2) = 53684 bytes | 6 | Size (i3status-2.12.tar.bz2) = 57162 bytes | |
7 | SHA1 (patch-Makefile) = 2ca0cf79670e189a7e70e14247b1cd4aafb81ffd | 7 | SHA1 (patch-Makefile) = 3e6358c173b74f24d82995a0019f36854237e135 | |
8 | SHA1 (patch-src_print__disk__info.c) = e0662f65b21402e60a643374898707f5807077f2 | 8 | SHA1 (patch-src_print__wireless__info.c) = 0b51f34f95cb3731c2df033df503b0e58e91ad2a | |
9 | SHA1 (patch-src_print__wireless__info.c) = 4632c9eabd5b5d73bc67e541bf7dc93e883339d1 |
@@ -1,30 +1,30 @@ | @@ -1,30 +1,30 @@ | |||
1 | $NetBSD: patch-Makefile,v 1.1 2016/06/14 06:39:37 kamil Exp $ | 1 | $NetBSD: patch-Makefile,v 1.2 2019/03/14 11:55:29 wiz Exp $ | |
2 | 2 | |||
3 | Adjust paths and install LICENSE. | 3 | Adjust paths and install LICENSE. | |
4 | 4 | |||
5 | --- Makefile.orig 2016-01-01 18:51:19.000000000 +0000 | 5 | --- Makefile.orig 2018-05-11 09:10:46.000000000 +0000 | |
6 | +++ Makefile | 6 | +++ Makefile | |
7 | @@ -11,6 +11,9 @@ ifndef SYSCONFDIR | 7 | @@ -13,6 +13,9 @@ ifndef SYSCONFDIR | |
8 | SYSCONFDIR=$(PREFIX)/etc | 8 | SYSCONFDIR=$(PREFIX)/etc | |
9 | endif | 9 | endif | |
10 | endif | 10 | endif | |
11 | +ifndef MANDIR | 11 | +ifndef MANDIR | |
12 | + MANDIR=$(MANDIR) | 12 | + MANDIR=$(MANDIR) | |
13 | +endif | 13 | +endif | |
14 | 14 | |||
15 | PKG_CONFIG ?= pkg-config | |||
15 | CFLAGS+=-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare | 16 | CFLAGS+=-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare | |
16 | CFLAGS+=-g | 17 | @@ -110,13 +113,15 @@ manpage: | |
17 | @@ -100,13 +103,15 @@ manpage: | |||
18 | 18 | |||
19 | install: | 19 | install: | |
20 | install -m 755 -d $(DESTDIR)$(PREFIX)/bin | 20 | install -m 755 -d $(DESTDIR)$(PREFIX)/bin | |
21 | - install -m 755 -d $(DESTDIR)$(SYSCONFDIR) | 21 | - install -m 755 -d $(DESTDIR)$(SYSCONFDIR) | |
22 | - install -m 755 -d $(DESTDIR)$(MANPREFIX)/share/man/man1 | 22 | - install -m 755 -d $(DESTDIR)$(MANPREFIX)/share/man/man1 | |
23 | + install -m 755 -d $(DESTDIR)$(PREFIX)/share/examples/i3status | 23 | + install -m 755 -d $(DESTDIR)$(PREFIX)/share/examples/i3status | |
24 | + install -m 755 -d $(DESTDIR)$(PREFIX)/share/doc/i3status | 24 | + install -m 755 -d $(DESTDIR)$(PREFIX)/share/doc/i3status | |
25 | + install -m 755 -d $(DESTDIR)$(MANPREFIX)/$(MANDIR)/man1 | 25 | + install -m 755 -d $(DESTDIR)$(MANPREFIX)/$(MANDIR)/man1 | |
26 | install -m 755 i3status $(DESTDIR)$(PREFIX)/bin/i3status | 26 | install -m 755 i3status $(DESTDIR)$(PREFIX)/bin/i3status | |
27 | # Allow network configuration for getting the link speed | 27 | # Allow network configuration for getting the link speed | |
28 | (which setcap && setcap cap_net_admin=ep $(DESTDIR)$(PREFIX)/bin/i3status) || true | 28 | (which setcap && setcap cap_net_admin=ep $(DESTDIR)$(PREFIX)/bin/i3status) || true | |
29 | - install -m 644 i3status.conf $(DESTDIR)$(SYSCONFDIR)/i3status.conf | 29 | - install -m 644 i3status.conf $(DESTDIR)$(SYSCONFDIR)/i3status.conf | |
30 | - install -m 644 man/i3status.1 $(DESTDIR)$(MANPREFIX)/share/man/man1 | 30 | - install -m 644 man/i3status.1 $(DESTDIR)$(MANPREFIX)/share/man/man1 |
@@ -1,19 +1,20 @@ | @@ -1,19 +1,20 @@ | |||
1 | $NetBSD: patch-src_print__wireless__info.c,v 1.1 2016/06/14 06:39:37 kamil Exp $ | 1 | $NetBSD: patch-src_print__wireless__info.c,v 1.2 2019/03/14 11:55:29 wiz Exp $ | |
2 | 2 | |||
3 | Add support for NetBSD. | 3 | Add includes for AF_INET & AF_INET6, and for free(). | |
4 | 4 | |||
5 | --- src/print_wireless_info.c.orig 2016-01-01 18:51:19.000000000 +0000 | 5 | --- src/print_wireless_info.c.orig 2018-05-11 09:10:46.000000000 +0000 | |
6 | +++ src/print_wireless_info.c | 6 | +++ src/print_wireless_info.c | |
7 | @@ -52,6 +52,12 @@ | 7 | @@ -60,10 +60,13 @@ | |
8 | #include <net80211/ieee80211_ioctl.h> | 8 | ||
9 | #ifdef __NetBSD__ | |||
10 | #include <sys/types.h> | |||
11 | +#include <sys/socket.h> | |||
12 | #include <net80211/ieee80211.h> | |||
13 | #define IW_ESSID_MAX_SIZE IEEE80211_NWID_LEN | |||
9 | #endif | 14 | #endif | |
10 | 15 | |||
11 | +#ifdef __NetBSD__ | 16 | +#include <stdlib.h> | |
12 | +#include <unistd.h> | |||
13 | +#include <net80211/ieee80211.h> | |||
14 | +#define IW_ESSID_MAX_SIZE IEEE80211_NWID_LEN | |||
15 | +#endif | |||
16 | + | 17 | + | |
17 | #include "i3status.h" | 18 | #include "i3status.h" | |
18 | 19 | |||
19 | #define WIRELESS_INFO_FLAG_HAS_ESSID (1 << 0) | 20 | #define WIRELESS_INFO_FLAG_HAS_ESSID (1 << 0) |