testing/i3status: clarify license

improve abuild and sanitize patches

testing/i3status/APKBUILD

@@ -3,32 +3,27 @@
 pkgname=i3status
 pkgver=2.12
 pkgrel=0
-pkgdesc="Generates status bar to use with i3bar, dzen2 or xmobar"
-url="http://i3.zekjur.net/i3status/"
+pkgdesc="Generates status bar for dzen2, xmobar or similar"
+url="https://i3.zekjur.net/i3status"
 arch="all"
-license="BSD"
-depends=""
-depends_dev=""
-makedepends="libnl3-dev alsa-lib-dev confuse-dev yajl-dev
-	asciidoc linux-headers"
-install=""
+license="BSD-3-Clause"
+makedepends="alsa-lib-dev asciidoc confuse-dev libnl3-dev linux-headers yajl-dev"
 subpackages="$pkgname-doc"
-source="http://i3wm.org/i3status/${pkgname}-${pkgver}.tar.bz2
+source="https://i3wm.org/i3status/$pkgname-$pkgver.tar.bz2
 	musl-fix.patch
-	no-pulseaudio.patch
-	"
+	no-pulseaudio.patch"
+builddir="$srcdir/$pkgname-$pkgver"
 
-builddir="$srcdir"/${pkgname}-${pkgver}
 build() {
 	cd "$builddir"
-	make HAVE_PULSE=0 || return 1
+	make HAVE_PULSE=0
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir/" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
 sha512sums="687a880a65cb8df46f5e9d2256b59724ba3424c502e9a0fb3ca71b070875df5f4008ee501c554bc716f2d728a5cf813a36d22d7377d42c3c46b14381d385bab3  i3status-2.12.tar.bz2
-340c44f68b2f74c2f66314f515f6843a6ac609a4d203ceb152b662aa8822ed405ccbbe459ea2eb1b42891cea84e3b63d1ff3bfe478d7fa2fc6c8b51f39f12a00  musl-fix.patch
-6c18330d0ba3994b0a295948641de230e36430191dd5da6a1defeb83e46b0a90826ccc03dd175dce69f51239739cc76e414e2479e4602687025b30200e669a31  no-pulseaudio.patch"
+b9d853879885ac04284eb57198251d39bd00b9fae2a0bc8f5b7475a6787699f4f27e40985363efd5a52d4ceee21a4afb58c7b37778e8270b5aade7e0e13e217f  musl-fix.patch
+a681945ddde9a111d0034c68103d8966e10a9d9417ff6bd691d5c1e3d0be6b184195ded70cb5d41c0a9ab0acac2319fdbae5d7c5d87f5499f4d58606b59f54cf  no-pulseaudio.patch"

testing/i3status/musl-fix.patch

@@ -1,8 +1,8 @@
---- a/include/i3status.h.orig
+--- a/include/i3status.h
 +++ b/include/i3status.h
-@@ -11,6 +11,10 @@
- #include <unistd.h>
- #include <string.h>
+@@ -29,6 +29,10 @@
+ #include <pthread.h>
+ #include <stdint.h>
  
 +#ifndef GLOB_TILDE
 +#define GLOB_TILDE 0

testing/i3status/no-pulseaudio.patch

@@ -1,8 +1,6 @@
-diff --git a/Makefile b/Makefile
-index 3084ae7..fdf1030 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -23,7 +23,6 @@ CPPFLAGS+=-DVERSION=\"${I3STATUS_VERSION}\"
+@@ -24,7 +24,6 @@
  CFLAGS+=-Iinclude
  LIBS+=-lconfuse
  LIBS+=-lyajl
@@ -10,7 +8,7 @@ index 3084ae7..fdf1030 100644
  LIBS+=-lm
  LIBS+=-lpthread
  
-@@ -79,7 +78,14 @@ CFLAGS += -idirafter yajl-fallback
+@@ -80,7 +79,14 @@
  OBJS:=$(sort $(wildcard src/*.c *.c))
  OBJS:=$(OBJS:.c=.o)
  
@@ -26,11 +24,10 @@ index 3084ae7..fdf1030 100644
  OBJS:=$(filter-out src/pulse.o, $(OBJS))
  LIBS:=$(filter-out -lpulse, $(LIBS))
  endif
-diff --git a/src/print_volume.c b/src/print_volume.c
-index 51e84f3..95be558 100644
+Only in /tmp/i3status-2.12/: Makefile.orig
 --- a/src/print_volume.c
 +++ b/src/print_volume.c
-@@ -61,7 +61,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
+@@ -61,7 +61,7 @@
          free(instance);
      }