From 2f491df432b567d9446705c604ec4e1e4ad84d2d Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Mon, 30 Dec 2019 22:51:30 +0000
Subject: user/*: Modernise / fix syntax

---
 user/libcanberra/APKBUILD             | 5 +----
 user/lynx/APKBUILD                    | 3 ---
 user/sound-theme-freedesktop/APKBUILD | 3 ---
 user/xf86-input-evdev/APKBUILD        | 3 ---
 user/xf86-input-synaptics/APKBUILD    | 3 ---
 5 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/user/libcanberra/APKBUILD b/user/libcanberra/APKBUILD
index 756f8e3f7..43480cb26 100644
--- a/user/libcanberra/APKBUILD
+++ b/user/libcanberra/APKBUILD
@@ -16,13 +16,11 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-gtk2 $pkgname-gtk3
 source="http://0pointer.de/lennart/projects/$pkgname/$pkgname-$pkgver.tar.xz"
 
 prepare() {
-	cd "$builddir"
-	update_config_sub
 	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -35,7 +33,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 }
 
diff --git a/user/lynx/APKBUILD b/user/lynx/APKBUILD
index 24af506f4..70fb32c0c 100644
--- a/user/lynx/APKBUILD
+++ b/user/lynx/APKBUILD
@@ -16,7 +16,6 @@ source="https://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_relver}
 builddir="$srcdir/${pkgname}${_relver}"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -33,12 +32,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	./lynx -version
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install install-help install-doc \
 		helpdir=/usr/share/doc/lynx/help \
 		docdir=/usr/share/doc/lynx
diff --git a/user/sound-theme-freedesktop/APKBUILD b/user/sound-theme-freedesktop/APKBUILD
index ad1f9c0e4..eaf320db8 100644
--- a/user/sound-theme-freedesktop/APKBUILD
+++ b/user/sound-theme-freedesktop/APKBUILD
@@ -13,7 +13,6 @@ subpackages=""
 source="https://people.freedesktop.org/~mccann/dist/sound-theme-freedesktop-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xf86-input-evdev/APKBUILD b/user/xf86-input-evdev/APKBUILD
index 3339d8caf..caa0ae96f 100644
--- a/user/xf86-input-evdev/APKBUILD
+++ b/user/xf86-input-evdev/APKBUILD
@@ -13,7 +13,6 @@ makedepends="libxkbfile-dev xorg-server-dev libxi-dev libxrandr-dev
 source="https://www.X.Org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
@@ -26,12 +25,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
diff --git a/user/xf86-input-synaptics/APKBUILD b/user/xf86-input-synaptics/APKBUILD
index 5d45c4602..c2e8adcb8 100644
--- a/user/xf86-input-synaptics/APKBUILD
+++ b/user/xf86-input-synaptics/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc $pkgname-dev"
 source="https://www.X.Org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
@@ -26,12 +25,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-- 
cgit v1.2.3-70-g09d2