Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 980417A110 for ; Tue, 14 Jun 2016 06:39:39 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 46F5285EF3; Tue, 14 Jun 2016 06:39:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CC1B385E3C for ; Tue, 14 Jun 2016 06:39:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id Is3bHRvIyk39 for ; Tue, 14 Jun 2016 06:39:38 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 1600884CFB for ; Tue, 14 Jun 2016 06:39:38 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1062BFBB5; Tue, 14 Jun 2016 06:39:38 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_146588637890850" MIME-Version: 1.0 Date: Tue, 14 Jun 2016 06:39:38 +0000 From: "Kamil Rytarowski" Subject: CVS commit: pkgsrc/sysutils/i3status To: pkgsrc-changes@NetBSD.org Reply-To: kamil@netbsd.org X-Mailer: log_accum Message-Id: <20160614063938.1062BFBB5@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_146588637890850 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: kamil Date: Tue Jun 14 06:39:37 UTC 2016 Added Files: pkgsrc/sysutils/i3status: DESCR Makefile PLIST distinfo pkgsrc/sysutils/i3status/patches: patch-Makefile patch-src_print__disk__info.c patch-src_print__wireless__info.c Log Message: Import i3status-2.10 as sysutils/i3status i3status is a small program (about 3000 SLOC) for generating a status bar for dzen2, xmobar or similar programs. It is designed to be very efficient by issuing a very small number of system calls, as one generally wants to update such a status line every second. This ensures that even under high load, your status bar is updated correctly. Also, it saves a bit of energy by not hogging your CPU as much as spawning the corresponding amount of shell commands would. Originally packaged in pkgsrc-wip by: - Pierre Allegraud, - Vitaly Shevtsov, - Niclas Rosenvik, - Mateusz Poszwa, - myself, with maintanance commits by: - Aleksej Saushev. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/i3status/DESCR \ pkgsrc/sysutils/i3status/Makefile pkgsrc/sysutils/i3status/PLIST \ pkgsrc/sysutils/i3status/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/i3status/patches/patch-Makefile \ pkgsrc/sysutils/i3status/patches/patch-src_print__disk__info.c \ pkgsrc/sysutils/i3status/patches/patch-src_print__wireless__info.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_146588637890850 Content-Disposition: inline Content-Length: 7194 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Added files: Index: pkgsrc/sysutils/i3status/DESCR diff -u /dev/null pkgsrc/sysutils/i3status/DESCR:1.1 --- /dev/null Tue Jun 14 06:39:37 2016 +++ pkgsrc/sysutils/i3status/DESCR Tue Jun 14 06:39:37 2016 @@ -0,0 +1,7 @@ +i3status is a small program (about 3000 SLOC) for generating a status bar +for dzen2, xmobar or similar programs. It is designed to be very efficient +by issuing a very small number of system calls, as one generally wants +to update such a status line every second. +This ensures that even under high load, your status bar is updated correctly. +Also, it saves a bit of energy by not hogging your CPU as much as spawning +the corresponding amount of shell commands would. Index: pkgsrc/sysutils/i3status/Makefile diff -u /dev/null pkgsrc/sysutils/i3status/Makefile:1.1 --- /dev/null Tue Jun 14 06:39:37 2016 +++ pkgsrc/sysutils/i3status/Makefile Tue Jun 14 06:39:37 2016 @@ -0,0 +1,25 @@ +# $NetBSD: Makefile,v 1.1 2016/06/14 06:39:37 kamil Exp $ +# + +DISTNAME= i3status-2.10 +CATEGORIES= sysutils +MASTER_SITES= http://i3wm.org/i3status/ +EXTRACT_SUFX= .tar.bz2 + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://i3wm.org/i3status/ +COMMENT= Small program for generating a status bar +LICENSE= modified-bsd + +USE_TOOLS+= gmake + +CONF_FILES= ${PREFIX}/share/examples/${PKGBASE}/i3status.conf ${PKG_SYSCONFDIR}/i3status.conf + +MAKE_ENV+= MANDIR=${PKGMANDIR} +MAKE_ENV+= SYSCONFDIR=${PKG_SYSCONFDIR} +MAKE_ENV+= DEBUG=0 + +.include "../../devel/confuse/buildlink3.mk" +.include "../../devel/yajl/buildlink3.mk" +.include "../../audio/pulseaudio/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" Index: pkgsrc/sysutils/i3status/PLIST diff -u /dev/null pkgsrc/sysutils/i3status/PLIST:1.1 --- /dev/null Tue Jun 14 06:39:37 2016 +++ pkgsrc/sysutils/i3status/PLIST Tue Jun 14 06:39:37 2016 @@ -0,0 +1,5 @@ +@comment $NetBSD: PLIST,v 1.1 2016/06/14 06:39:37 kamil Exp $ +bin/i3status +man/man1/i3status.1 +share/doc/i3status/LICENSE +share/examples/i3status/i3status.conf Index: pkgsrc/sysutils/i3status/distinfo diff -u /dev/null pkgsrc/sysutils/i3status/distinfo:1.1 --- /dev/null Tue Jun 14 06:39:37 2016 +++ pkgsrc/sysutils/i3status/distinfo Tue Jun 14 06:39:37 2016 @@ -0,0 +1,9 @@ +$NetBSD: distinfo,v 1.1 2016/06/14 06:39:37 kamil 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 Index: pkgsrc/sysutils/i3status/patches/patch-Makefile diff -u /dev/null pkgsrc/sysutils/i3status/patches/patch-Makefile:1.1 --- /dev/null Tue Jun 14 06:39:38 2016 +++ pkgsrc/sysutils/i3status/patches/patch-Makefile Tue Jun 14 06:39:37 2016 @@ -0,0 +1,36 @@ +$NetBSD: patch-Makefile,v 1.1 2016/06/14 06:39:37 kamil Exp $ + +Adjust paths and install LICENSE. + +--- Makefile.orig 2016-01-01 18:51:19.000000000 +0000 ++++ Makefile +@@ -11,6 +11,9 @@ ifndef SYSCONFDIR + SYSCONFDIR=$(PREFIX)/etc + endif + endif ++ifndef MANDIR ++ MANDIR=$(MANDIR) ++endif + + CFLAGS+=-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare + CFLAGS+=-g +@@ -100,13 +103,15 @@ manpage: + + install: + install -m 755 -d $(DESTDIR)$(PREFIX)/bin +- install -m 755 -d $(DESTDIR)$(SYSCONFDIR) +- install -m 755 -d $(DESTDIR)$(MANPREFIX)/share/man/man1 ++ install -m 755 -d $(DESTDIR)$(PREFIX)/share/examples/i3status ++ install -m 755 -d $(DESTDIR)$(PREFIX)/share/doc/i3status ++ install -m 755 -d $(DESTDIR)$(MANPREFIX)/$(MANDIR)/man1 + install -m 755 i3status $(DESTDIR)$(PREFIX)/bin/i3status + # Allow network configuration for getting the link speed + (which setcap && setcap cap_net_admin=ep $(DESTDIR)$(PREFIX)/bin/i3status) || true +- install -m 644 i3status.conf $(DESTDIR)$(SYSCONFDIR)/i3status.conf +- install -m 644 man/i3status.1 $(DESTDIR)$(MANPREFIX)/share/man/man1 ++ install -m 644 i3status.conf $(DESTDIR)$(PREFIX)/share/examples/i3status/i3status.conf ++ install -m 644 LICENSE $(DESTDIR)$(PREFIX)/share/doc/i3status ++ install -m 644 man/i3status.1 $(DESTDIR)$(MANPREFIX)/$(MANDIR)/man1 + + release: + [ -f i3status-${VERSION} ] || rm -rf i3status-${VERSION} Index: pkgsrc/sysutils/i3status/patches/patch-src_print__disk__info.c diff -u /dev/null pkgsrc/sysutils/i3status/patches/patch-src_print__disk__info.c:1.1 --- /dev/null Tue Jun 14 06:39:38 2016 +++ pkgsrc/sysutils/i3status/patches/patch-src_print__disk__info.c Tue Jun 14 06:39:37 2016 @@ -0,0 +1,53 @@ +$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 + #include + #include +-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || (__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) ++#if defined(__linux__) ++#include ++#else + #include + #include +-#else +-#include + #endif + #include + #include +@@ -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)) { Index: pkgsrc/sysutils/i3status/patches/patch-src_print__wireless__info.c diff -u /dev/null pkgsrc/sysutils/i3status/patches/patch-src_print__wireless__info.c:1.1 --- /dev/null Tue Jun 14 06:39:38 2016 +++ pkgsrc/sysutils/i3status/patches/patch-src_print__wireless__info.c Tue Jun 14 06:39:37 2016 @@ -0,0 +1,19 @@ +$NetBSD: patch-src_print__wireless__info.c,v 1.1 2016/06/14 06:39:37 kamil Exp $ + +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 + #endif + ++#ifdef __NetBSD__ ++#include ++#include ++#define IW_ESSID_MAX_SIZE IEEE80211_NWID_LEN ++#endif ++ + #include "i3status.h" + + #define WIRELESS_INFO_FLAG_HAS_ESSID (1 << 0) --_----------=_146588637890850--