From 8ec380b058bc73a57abb13eadf6ddde5fc19a1cd Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 10 Jan 2020 02:33:18 +0000
Subject: user/*: Modernise / fix syntax / metadata / deps

---
 user/libburn/APKBUILD        | 4 +---
 user/libisofs/APKBUILD       | 4 +---
 user/liborcus/APKBUILD       | 1 +
 user/lighttpd/APKBUILD       | 7 ++++---
 user/lksctp-tools/APKBUILD   | 2 +-
 user/lua-filesystem/APKBUILD | 5 +----
 6 files changed, 9 insertions(+), 14 deletions(-)

(limited to 'user')

diff --git a/user/libburn/APKBUILD b/user/libburn/APKBUILD
index 6a8bde34b..e6ff9bc25 100644
--- a/user/libburn/APKBUILD
+++ b/user/libburn/APKBUILD
@@ -7,12 +7,12 @@ pkgdesc="Library for CD/DVD burning"
 url="https://dev.lovelyhq.com/libburnia/web/wikis/home"
 arch="all"
 license="(GPL-2.0+ OR BSD-3-Clause) AND GPL-2.0+ AND BSD-3-Clause"
+depends=""
 makedepends=""
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://files.libburnia-project.org/releases/libburn-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libisofs/APKBUILD b/user/libisofs/APKBUILD
index 5020a072d..b870b3be7 100644
--- a/user/libisofs/APKBUILD
+++ b/user/libisofs/APKBUILD
@@ -7,12 +7,12 @@ pkgdesc="Library for creating and managing iso9660-based filesystems"
 url="https://dev.lovelyhq.com/libburnia/web/wikis/home"
 arch="all"
 license="GPL-2.0+ AND Unicode-TOU"
+depends=""
 makedepends="zlib-dev"
 subpackages="$pkgname-dev"
 source="http://files.libburnia-project.org/releases/libisofs-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/liborcus/APKBUILD b/user/liborcus/APKBUILD
index 3f0434eae..f64c0ec1f 100644
--- a/user/liborcus/APKBUILD
+++ b/user/liborcus/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Library for processing spreadsheet documents"
 url="https://gitlab.com/orcus/orcus"
 arch="all"
 license="MPL-2.0 AND MIT"
+depends=""
 depends_dev="boost-dev mdds~1.4 libixion-dev~0.14"
 makedepends="$depends_dev zlib-dev"
 subpackages="$pkgname-dev"
diff --git a/user/lighttpd/APKBUILD b/user/lighttpd/APKBUILD
index 5f768bbdd..30f8f9aef 100644
--- a/user/lighttpd/APKBUILD
+++ b/user/lighttpd/APKBUILD
@@ -5,15 +5,16 @@ pkgver=1.4.54
 pkgrel=2
 pkgdesc="A secure, fast, compliant and very flexible web-server"
 url="http://www.lighttpd.net/"
-arch="all"
-license="BSD-3-Clause"
-install="$pkgname.pre-install $pkgname.pre-upgrade"
 pkgusers="lighttpd"
 pkggroups="lighttpd"
+arch="all"
+license="BSD-3-Clause"
+depends=""
 makedepends="attr-dev bzip2-dev flex gamin-dev libev-dev libxml2-dev
 	openldap-dev openssl-dev pcre-dev sqlite-dev zlib-dev"
 subpackages="$pkgname-doc $pkgname-dbg $pkgname-mod_auth $pkgname-openrc
 	$pkgname-mod_webdav"
+install="$pkgname.pre-install $pkgname.pre-upgrade"
 source="http://download.lighttpd.net/lighttpd/releases-1.4.x/$pkgname-$pkgver.tar.xz
 	$pkgname.initd
 	$pkgname.confd
diff --git a/user/lksctp-tools/APKBUILD b/user/lksctp-tools/APKBUILD
index c625bb4d5..645230f32 100644
--- a/user/lksctp-tools/APKBUILD
+++ b/user/lksctp-tools/APKBUILD
@@ -8,7 +8,7 @@ url="http://lksctp.sourceforge.net/"
 arch="all"
 license="GPL-2.0-only AND LGPL-2.1-only"
 depends=""
-makedepends="autoconf automake"
+makedepends="autoconf automake libtool"
 subpackages="$pkgname-dev $pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/sctp/$pkgname/archive/v$pkgver.tar.gz
 	header-install.patch
diff --git a/user/lua-filesystem/APKBUILD b/user/lua-filesystem/APKBUILD
index f244b935d..11e166311 100644
--- a/user/lua-filesystem/APKBUILD
+++ b/user/lua-filesystem/APKBUILD
@@ -16,18 +16,15 @@ source="$_pkgname-$pkgver.tar.gz::https://github.com/keplerproject/$_pkgname/arc
 builddir="$srcdir/$_pkgname-$_pkgver"
 
 build() {
-	cd "$builddir"
 	make CFLAGS="$CFLAGS $(pkg-config lua --cflags) -fPIC"
 }
 
 check() {
-	cd "$builddir"
 	LUA_CPATH=./src/?.so lua tests/test.lua
 }
 
 package() {
-	local rockdir="$pkgdir/usr/lib/luarocks/rocks-5.3/$_pkgname/$_rockver"
-	cd "$builddir"
+	rockdir="$pkgdir/usr/lib/luarocks/rocks-5.3/$_pkgname/$_rockver"
 	make LUA_LIBDIR="$pkgdir/$(pkg-config --variable=INSTALL_CMOD lua)" install
 	mkdir -p "$rockdir"
 	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
-- 
cgit v1.2.3-70-g09d2