From fb406132ea3e792279435d801dc4da23dc8294ee Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 7 Jan 2020 02:40:53 +0000
Subject: user/*: Modernise / fix syntax / deps

Also, take APR
---
 user/apr-util/APKBUILD | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'user/apr-util')

diff --git a/user/apr-util/APKBUILD b/user/apr-util/APKBUILD
index 36a8f4a59..6dd56ef3e 100644
--- a/user/apr-util/APKBUILD
+++ b/user/apr-util/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: 
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=apr-util
 pkgver=1.6.1
 pkgrel=0
@@ -6,16 +6,15 @@ pkgdesc="The Apache Portable Runtime Utility Library"
 url="http://apr.apache.org/"
 arch="all"
 license="Apache-2.0"
-depends=
-subpackages="$pkgname-dev $pkgname-dbm_db $pkgname-dbd_pgsql
-	$pkgname-dbd_sqlite3 $pkgname-ldap"
+depends=""
 depends_dev="db-dev expat-dev openldap-dev openssl-dev postgresql-dev
 	sqlite-dev"
 makedepends="$depends_dev apr-dev bash chrpath openssl"
+subpackages="$pkgname-dev $pkgname-dbm_db $pkgname-dbd_pgsql
+	$pkgname-dbd_sqlite3 $pkgname-ldap"
 source="http://www.apache.org/dist/apr/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -33,13 +32,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	# testxlate fails because UTF-7 is unsupported
 	make check || return 0
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	rm "$pkgdir"/usr/lib/*.exp
 	chrpath -d "$pkgdir"/usr/lib/*.so.*
@@ -48,7 +45,7 @@ package() {
 _mv_mod() {
 	pkgdesc="The Apache Portable Runtime Utility Library - $2 driver"
 	depends=
-	local _moddir="usr/lib/apr-util-1"
+	_moddir="usr/lib/apr-util-1"
 	mkdir -p "$subpkgdir"/$_moddir
 	mv "$pkgdir"/$_moddir/apr_$1*.so "$subpkgdir"/$_moddir/
 }
-- 
cgit v1.2.3-70-g09d2