From 3a5eb59dc72572666a8d51a489cb396f23526541 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Mon, 13 Jan 2020 09:00:59 +0000
Subject: user/*: Modernise / fix syntax / deps / code

---
 user/wine/APKBUILD | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'user/wine')

diff --git a/user/wine/APKBUILD b/user/wine/APKBUILD
index ea9384603..ef31fa802 100644
--- a/user/wine/APKBUILD
+++ b/user/wine/APKBUILD
@@ -21,22 +21,18 @@ makedepends="fontconfig-dev openldap-dev libxslt-dev libxxf86dga-dev
 	cups-dev alsa-lib-dev libxml2-dev dbus-dev libxi-dev
 	gnutls-dev tiff-dev v4l-utils-dev udisks2-dev autoconf automake
 	openal-soft-dev pulseaudio-dev sane-dev eudev-dev mpg123-dev
-	"
+	autoconf automake libtool"
 source="http://dl.winehq.org/$pkgname/source/${pkgver%.[1-9]}/$pkgname-$pkgver.tar.xz
 	no-pie.patch
 	winhlp32-flex.patch
 	"
 
 prepare() {
-	cd "$builddir"
-
 	default_prepare
 	aclocal && autoheader && autoreconf
 }
 
 build() {
-	cd "$builddir"
-
 	case "$CARCH" in
 		x86_64) _win64=--enable-win64;;
 	esac
@@ -70,13 +66,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	local file
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 
 	case "$CARCH" in
@@ -88,21 +81,18 @@ package() {
 		"$pkgdir"/usr/bin/wineapploader
 
 	for file in msiexec notepad regedit regsvr32 wineboot \
-		winecfg wineconsole winefile winemine winepath
-	do
+		winecfg wineconsole winefile winemine winepath; do
 		rm "$pkgdir"/usr/bin/$file
 		ln -sf /usr/bin/wineapploader "$pkgdir"/usr/bin/$file
 	done
 }
 
 dev() {
-	local file
 	default_dev
 
 	install -d "$subpkgdir"/usr/bin
 	for file in widl wmc wrc winebuild winedump function_grep.pl \
-		 winedbg winemaker winegcc winecpp wineg++
-	do
+		 winedbg winemaker winegcc winecpp wineg++; do
 		mv "$pkgdir"/usr/bin/$file "$subpkgdir"/usr/bin/
 	done
 
@@ -116,7 +106,6 @@ doc() {
 }
 
 libs() {
-	local file ext
 	default_libs
 
 	install -d "$subpkgdir"/usr/lib/wine/fakedlls
-- 
cgit v1.2.3-70-g09d2