pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/i3status i3status: update to 2.13.
details: https://anonhg.NetBSD.org/pkgsrc/rev/693d2dafb6f3
branches: trunk
changeset: 336767:693d2dafb6f3
user: wiz <wiz%pkgsrc.org@localhost>
date: Mon Jul 22 23:04:31 2019 +0000
description:
i3status: update to 2.13.
2019-06-30 i3status 2.13
? add memory module
? add read_file module
? drop CAP_NET_ADMIN (not needed on Linux ? 2.6.37)
? switch to autotools
? battery: hide seconds by default
? wireless: add format_quality
? doc: clarify min_width not being supported with dzen2/xmobar
? battery: read multiple batteries on DragonFlyBSD
? make: don?t use pulseaudio on DragonFlyBSD
? wireless: detect interface type on DragonFlyBSD
? cpu usage: fix: correctly print usage for cpu 10
? cpu usage: fix: correctly print for invalid %cpu placeholder
? cpu usage: support non-consecutive CPUs
? time: add only_when_tz_different option
? ethernet: add %interface
? ethernet: fix speed display for 100 Gbit/s cards
? battery: handle POWER_SUPPLY_STATUS=Not charging
? volume: provide more natural volume percentage with ALSA
? volume: fix ALSA capture device monitoring
? volume: implement %devicename for PulseAudio and ALSA
? config: re-arrange disk after network interfaces
? fix: include sys/socket.h on macOS
? fix: strip network interface labels
? fix glob(3) error handling
? various testsuite improvements
? switch to clang-format-3.8
diffstat:
sysutils/i3status/Makefile | 22 +-
sysutils/i3status/PLIST | 3 +-
sysutils/i3status/distinfo | 15 +-
sysutils/i3status/patches/patch-Makefile | 36 --
sysutils/i3status/patches/patch-Makefile.in | 15 +
sysutils/i3status/patches/patch-configure | 157 ++++++++++++
sysutils/i3status/patches/patch-src_print__wireless__info.c | 14 +-
7 files changed, 200 insertions(+), 62 deletions(-)
diffs (truncated from 327 to 300 lines):
diff -r 41a0dc8ec4b5 -r 693d2dafb6f3 sysutils/i3status/Makefile
--- a/sysutils/i3status/Makefile Mon Jul 22 22:48:47 2019 +0000
+++ b/sysutils/i3status/Makefile Mon Jul 22 23:04:31 2019 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2019/03/14 11:55:29 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2019/07/22 23:04:31 wiz Exp $
-DISTNAME= i3status-2.12
+DISTNAME= i3status-2.13
CATEGORIES= sysutils
MASTER_SITES= https://i3wm.org/i3status/
EXTRACT_SUFX= .tar.bz2
@@ -10,23 +10,31 @@
COMMENT= Small program for generating a status bar
LICENSE= modified-bsd
-USE_TOOLS+= gmake
+TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
+TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
+
+GNU_CONFIGURE= yes
+USE_TOOLS+= gmake pkg-config
+
+INSTALLATION_DIRS= share/examples/${PKGBASE}
CONF_FILES= ${PREFIX}/share/examples/${PKGBASE}/i3status.conf ${PKG_SYSCONFDIR}/i3status.conf
BUILD_DEFS+= VARBASE
-MAKE_ENV+= MANDIR=${PKGMANDIR}
-MAKE_ENV+= SYSCONFDIR=${PKG_SYSCONFDIR}
-MAKE_ENV+= DEBUG=0
-
SUBST_CLASSES+= fix-paths
SUBST_STAGE.fix-paths= pre-configure
SUBST_MESSAGE.fix-paths= Fixing absolute paths.
SUBST_FILES.fix-paths= i3status.conf
SUBST_SED.fix-paths+= -e 's,/var,${VARBASE},g'
+post-install:
+ ${MV} ${DESTDIR}${PREFIX}/etc/i3status.conf ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}
+
.include "../../devel/confuse/buildlink3.mk"
.include "../../devel/yajl/buildlink3.mk"
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} != "OpenBSD" && ${OPSYS} != "DragonFly"
.include "../../audio/pulseaudio/buildlink3.mk"
+.endif
.include "../../mk/bsd.pkg.mk"
diff -r 41a0dc8ec4b5 -r 693d2dafb6f3 sysutils/i3status/PLIST
--- a/sysutils/i3status/PLIST Mon Jul 22 22:48:47 2019 +0000
+++ b/sysutils/i3status/PLIST Mon Jul 22 23:04:31 2019 +0000
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2016/06/14 06:39:37 kamil Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/07/22 23:04:31 wiz Exp $
bin/i3status
man/man1/i3status.1
-share/doc/i3status/LICENSE
share/examples/i3status/i3status.conf
diff -r 41a0dc8ec4b5 -r 693d2dafb6f3 sysutils/i3status/distinfo
--- a/sysutils/i3status/distinfo Mon Jul 22 22:48:47 2019 +0000
+++ b/sysutils/i3status/distinfo Mon Jul 22 23:04:31 2019 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.2 2019/03/14 11:55:29 wiz Exp $
+$NetBSD: distinfo,v 1.3 2019/07/22 23:04:31 wiz Exp $
-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
+SHA1 (i3status-2.13.tar.bz2) = b09fd2f322046daaca22f60cf6bfc7dbebea1b11
+RMD160 (i3status-2.13.tar.bz2) = 8432809add78a0086ce8181160528f5e34b7c0d3
+SHA512 (i3status-2.13.tar.bz2) = 6dadff19e53499d169ba4f491e1f821014b4f92fc3c93d7947c85cbbbdeaba538d02bd8ab98fe266a8f80756a287fd5803ec77a8cd874d50082b5cad309875c2
+Size (i3status-2.13.tar.bz2) = 201409 bytes
+SHA1 (patch-Makefile.in) = e50ed614d41a1bcef33feb6414322affa5e20a92
+SHA1 (patch-configure) = e372bf638683a2b30a13f6fd5b58d0293e5bd767
+SHA1 (patch-src_print__wireless__info.c) = 7039b7fbd2f43b798763793cd4296035610eeee0
diff -r 41a0dc8ec4b5 -r 693d2dafb6f3 sysutils/i3status/patches/patch-Makefile
--- a/sysutils/i3status/patches/patch-Makefile Mon Jul 22 22:48:47 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-$NetBSD: patch-Makefile,v 1.2 2019/03/14 11:55:29 wiz Exp $
-
-Adjust paths and install LICENSE.
-
---- Makefile.orig 2018-05-11 09:10:46.000000000 +0000
-+++ Makefile
-@@ -13,6 +13,9 @@ ifndef SYSCONFDIR
- SYSCONFDIR=$(PREFIX)/etc
- endif
- endif
-+ifndef MANDIR
-+ MANDIR=$(MANDIR)
-+endif
-
- PKG_CONFIG ?= pkg-config
- CFLAGS+=-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare
-@@ -110,13 +113,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}
diff -r 41a0dc8ec4b5 -r 693d2dafb6f3 sysutils/i3status/patches/patch-Makefile.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/i3status/patches/patch-Makefile.in Mon Jul 22 23:04:31 2019 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2019/07/22 23:04:31 wiz Exp $
+
+This line gets expanded to
+am--fnord am--fnord-all $(TEST_LOGS) $(TEST_LOGS:
+
+--- Makefile.in.orig 2019-06-30 17:54:48.000000000 +0000
++++ Makefile.in
+@@ -1346,7 +1346,6 @@ distclean-tags:
+
+ # Leading 'am--fnord' is there to ensure the list of targets does not
+ # expand to empty, as could happen e.g. with make check TESTS=''.
+-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+ am--force-recheck:
+ @:
+
diff -r 41a0dc8ec4b5 -r 693d2dafb6f3 sysutils/i3status/patches/patch-configure
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/i3status/patches/patch-configure Mon Jul 22 23:04:31 2019 +0000
@@ -0,0 +1,157 @@
+$NetBSD: patch-configure,v 1.1 2019/07/22 23:04:31 wiz Exp $
+
+Based on https://github.com/i3/i3status/commit/54e798e3a6dcf5747c3e943b376ae441ee0534a4
+
+--- configure.orig 2019-06-30 17:54:48.000000000 +0000
++++ configure
+@@ -7178,6 +7166,7 @@ $as_echo "yes" >&6; }
+
+ fi
+
++pulse=true
+ case $host_os in
+ linux*)
+
+@@ -7362,6 +7351,74 @@ else
+ $as_echo "yes" >&6; }
+
+ fi
++ ;;
++ openbsd*)
++ pulse=false
++ ;;
++ dragonfly*)
++ pulse=false
++ ;;
++ netbsd*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing prop_string_create" >&5
++$as_echo_n "checking for library containing prop_string_create... " >&6; }
++if ${ac_cv_search_prop_string_create+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char prop_string_create ();
++int
++main ()
++{
++return prop_string_create ();
++ ;
++ return 0;
++}
++_ACEOF
++for ac_lib in '' prop; do
++ if test -z "$ac_lib"; then
++ ac_res="none required"
++ else
++ ac_res=-l$ac_lib
++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
++ fi
++ if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_search_prop_string_create=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext
++ if ${ac_cv_search_prop_string_create+:} false; then :
++ break
++fi
++done
++if ${ac_cv_search_prop_string_create+:} false; then :
++
++else
++ ac_cv_search_prop_string_create=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_prop_string_create" >&5
++$as_echo "$ac_cv_search_prop_string_create" >&6; }
++ac_res=$ac_cv_search_prop_string_create
++if test "$ac_res" != no; then :
++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++fi
++
++ ;;
++esac
++
++if test x"$pulse" = x"true"; then :
+
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PULSE" >&5
+@@ -7453,67 +7510,7 @@ else
+ $as_echo "yes" >&6; }
+
+ fi
+- ;;
+- netbsd*)
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing prop_string_create" >&5
+-$as_echo_n "checking for library containing prop_string_create... " >&6; }
+-if ${ac_cv_search_prop_string_create+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- ac_func_search_save_LIBS=$LIBS
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char prop_string_create ();
+-int
+-main ()
+-{
+-return prop_string_create ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-for ac_lib in '' prop; do
+- if test -z "$ac_lib"; then
+- ac_res="none required"
+- else
+- ac_res=-l$ac_lib
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- fi
+- if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_search_prop_string_create=$ac_res
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext
+- if ${ac_cv_search_prop_string_create+:} false; then :
+- break
+-fi
+-done
+-if ${ac_cv_search_prop_string_create+:} false; then :
+-
+-else
+- ac_cv_search_prop_string_create=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_prop_string_create" >&5
+-$as_echo "$ac_cv_search_prop_string_create" >&6; }
+-ac_res=$ac_cv_search_prop_string_create
+-if test "$ac_res" != no; then :
+- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+-
+-fi
+-
+- ;;
+-esac
+-
+
+ # Checks for programs.
+ for ac_prog in gawk mawk nawk awk
diff -r 41a0dc8ec4b5 -r 693d2dafb6f3 sysutils/i3status/patches/patch-src_print__wireless__info.c
Home |
Main Index |
Thread Index |
Old Index