From 6dffd98982df63a60bb820d80bd04574e1df4fec Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Sat, 26 Nov 2016 00:27:59 +0100
Subject: community/wine: clean up and fix abuild

---
 community/wine/APKBUILD | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/community/wine/APKBUILD b/community/wine/APKBUILD
index e4ad76e3ef..9c5d4deafd 100644
--- a/community/wine/APKBUILD
+++ b/community/wine/APKBUILD
@@ -21,23 +21,20 @@ makedepends="fontconfig-dev openldap-dev libxslt-dev libxxf86dga-dev
 source="http://downloads.sourceforge.net/project/wine/Source/wine-$_pkgver.tar.bz2
 	musl-fix.patch
 	nopie.patch"
+builddir="$srcdir/$pkgname-$_pkgver"
 
-_builddir="$srcdir"/$pkgname-$_pkgver
 prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	default_prepare || return 1
+
+	cd "$builddir"
 	aclocal && autoheader && autoreconf || return 1
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 
 	case "$CARCH" in
-	x86_64) _win64=--enable-win64;;
+		x86_64) _win64=--enable-win64;;
 	esac
 	./configure \
 		--build=$CBUILD \
@@ -54,12 +51,12 @@ build() {
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install || return 1
 
 	case "$CARCH" in
-	x86_64) _wine="wine64";;
-	*) _wine="wine";;
+		x86_64) _wine="wine64";;
+		*) _wine="wine";;
 	esac
 
 	paxmark -psmre "$pkgdir"/usr/bin/$_wine-preloader \
@@ -67,25 +64,31 @@ package() {
 }
 
 dev() {
-	default_dev
+	local file
+	default_dev || return 1
+
 	install -d "$subpkgdir"/usr/bin
-	for file in widl wmc wrc winebuild winedump function_grep.pl winedbg winemaker winegcc winecpp wineg++; do
+	for file in widl wmc wrc winebuild winedump function_grep.pl winedbg \
+			winemaker winegcc winecpp wineg++; do
 		mv "$pkgdir"/usr/bin/$file "$subpkgdir"/usr/bin/
 	done
+
 	install -d "$subpkgdir"/usr/lib/wine
 	mv "$pkgdir"/usr/lib/wine/*.def "$subpkgdir"/usr/lib/wine/
 }
 
 doc() {
-	default_doc
+	default_doc || return 1
 	rm -fr "$subpkgdir"/usr/share/man/*.UTF-8
 }
 
 libs() {
-	default_libs
+	local ext file
+	default_libs || return 1
+
 	install -d "$subpkgdir"/usr/lib/wine/fakedlls
 	for ext in dll16 drv16 exe16 acm dll drv ds ocx sys tlb vxd; do
-		for file in `find "$pkgdir"/usr/lib/wine/fakedlls -name *.$ext -exec basename {} \;`; do
+		for file in $(find "$pkgdir"/usr/lib/wine/fakedlls -name *.$ext -exec basename {} \;); do
 			mv "$pkgdir"/usr/lib/wine/fakedlls/$file \
 				"$subpkgdir"/usr/lib/wine/fakedlls/
 			mv "$pkgdir"/usr/lib/wine/${file}.so \
-- 
cgit v1.2.3