system/man-db: bump to 2.8.5, modernise

2 files changed, 24 insertions, 26 deletions

diff --git a/system/man-db/APKBUILD b/system/man-db/APKBUILD
index 341e124e1..fd89714e7 100644
--- a/system/man-db/APKBUILD
+++ b/system/man-db/APKBUILD
@@ -1,22 +1,22 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=man-db
-pkgver=2.8.4
-pkgrel=1
+pkgver=2.8.5
+pkgrel=0
 pkgdesc="The man command and related utilities for examining on-line help files"
 url="https://www.nongnu.org/man-db/"
 arch="all"
+options="!check"  # requires //IGNORE in iconv
 license="GPL-2.0+"
 depends="groff gzip less"
 makedepends_host="db-dev libpipeline-dev zlib-dev"
 subpackages="$pkgname-doc $pkgname-lang"
-options="!check"  # requires //IGNORE in iconv
-source="https://download.savannah.nongnu.org/releases/man-db/man-db-$pkgver.tar.xz
-	man-db-2.8.3-iconv.patch"
 triggers="man-db.trigger=/usr/share/man"
+source="https://download.savannah.nongnu.org/releases/man-db/man-db-$pkgver.tar.xz
+	man-db-2.8.5-iconv.patch
+	"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,15 +32,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	rm -r "${pkgdir}"/usr/lib/tmpfiles.d  # systemd
 }
 
-sha512sums="3cc160a5a8a0a4e918f6f6546582d1e5fe9851a13c5bd8dc94e3fcbf4ec28cb3cd1524b1ae30722931c84981fa8ca9ac64c9c4d9544c2d0bea80ac9f39cb5e66  man-db-2.8.4.tar.xz
-4bc9efaafa30dedb6da9d2a62436cf570bef5603b98494ca3c565c3e338b57a481ed40af2312a20cd9f64f965fc0c45607403d829339700c57f9dc0022d7c6ed  man-db-2.8.3-iconv.patch"
+sha512sums="8d1524c3b6459c9ac02d969149c18c198cb171bcd6acc493e863a466c01309958ee9f5ac52df4d7d27da29d35cb7c64132732f5b969181ab336500df2e6dad69  man-db-2.8.5.tar.xz
+76a5b13d3018627cbc5a72cb51da3c78022245ad574c742699e7c4ab152ec2222ce7f34af5594de74b436dd23008af6c43739ee66973e049b07d82882e4965c6  man-db-2.8.5-iconv.patch"
diff --git a/system/man-db/man-db-2.8.3-iconv.patch b/system/man-db/man-db-2.8.5-iconv.patch
index 98f10cb2a..8c006fd9c 100644
--- a/system/man-db/man-db-2.8.3-iconv.patch
+++ b/system/man-db/man-db-2.8.5-iconv.patch
@@ -1,5 +1,5 @@
---- man-db-2.8.3/src/man.c	2018-06-18 22:44:35.672743065 -0500
-+++ man-db-2.8.3/src/man.c	2018-06-18 22:46:35.032624890 -0500
+--- man-db-2.8.5/src/man.c	2018-06-18 22:44:35.672743065 -0500
++++ man-db-2.8.5/src/man.c	2018-06-18 22:46:35.032624890 -0500
 @@ -1569,15 +1569,13 @@
  {
  	debug ("add_output_iconv: source %s, target %s\n", source, target);
@@ -9,7 +9,7 @@
  		iconv_cmd = pipecmd_new_args
 -			("iconv", "-c", "-f", source, "-t", target_translit,
 +			("iconv", "-c", "-f", source, "-t", target,
- 			 NULL);
+ 			 (void *) 0);
  		pipecmd_pre_exec (iconv_cmd, sandbox_load, sandbox_free,
  				  sandbox);
  		pipeline_command (p, iconv_cmd);
@@ -17,8 +17,8 @@
  	}
  }
  
---- man-db-2.8.3/src/manconv.c
-+++ man-db-2.8.3/src/manconv.c
+--- man-db-2.8.5/src/manconv.c
++++ man-db-2.8.5/src/manconv.c
 @@ -106,10 +106,9 @@ static int try_iconv (pipeline *p, const char *try_from_code, const char *to,
  	static char *utf8 = NULL, *output = NULL;
  	size_t utf8left = 0;
@@ -33,32 +33,32 @@
  	int ret = 0;
  
  	debug ("trying encoding %s -> %s\n", try_from_code, try_to_code);
---- man-db-2.8.3/src/manconv_client.c
-+++ man-db-2.8.3/src/manconv_client.c
+--- man-db-2.8.5/src/manconv_client.c
++++ man-db-2.8.5/src/manconv_client.c
 @@ -105,7 +105,7 @@ void add_manconv (pipeline *p, const char *source, const char *target)
  		codes->from[2] = NULL;
- 		name = appendstr (name, "UTF-8:", source, NULL);
+ 		name = appendstr (name, "UTF-8:", source, (void *) 0);
  	}
 -	codes->to = xasprintf ("%s//IGNORE", target);
 +	codes->to = xstrdup (target);
  	/* informational only; no shell quoting concerns */
- 	name = appendstr (name, " -t ", codes->to, NULL);
+ 	name = appendstr (name, " -t ", codes->to, (void *) 0);
  	if (quiet >= 2)
---- man-db-2.8.3/src/manconv_main.c
-+++ man-db-2.8.3/src/manconv_main.c
-@@ -107,9 +107,6 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state)
+--- man-db-2.8.5/src/manconv_main.c
++++ man-db-2.8.5/src/manconv_main.c
+@@ -106,9 +106,6 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state)
  			return 0;
  		case 't':
  			to_code = xstrdup (arg);
 -			if (!strstr (to_code, "//"))
 -				to_code = appendstr (to_code, "//TRANSLIT",
--						     NULL);
+-						     (void *) 0);
  			return 0;
  		case 'd':
  			debug_level = 1;
---- man-db-2.8.3/src/whatis.c
-+++ man-db-2.8.3/src/whatis.c
-@@ -968,7 +968,7 @@ int main (int argc, char *argv[])
+--- man-db-2.8.5/src/whatis.c
++++ man-db-2.8.5/src/whatis.c
+@@ -974,7 +974,7 @@ int main (int argc, char *argv[])
  	display_seen = hashtable_create (&null_hashtable_free);
  
  #ifdef HAVE_ICONV