From f9e6884719d434a762c185a992bae4d15cafb64d Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sat, 28 Dec 2019 04:16:28 -0600
Subject: user/[multimedia libs]: fix syntax and modernise

---
 user/exiv2/APKBUILD | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'user/exiv2/APKBUILD')

diff --git a/user/exiv2/APKBUILD b/user/exiv2/APKBUILD
index 82aa2a958..f1ca3f81f 100644
--- a/user/exiv2/APKBUILD
+++ b/user/exiv2/APKBUILD
@@ -8,8 +8,8 @@ arch="all"
 license="GPL-2.0+"
 depends=""
 depends_dev="expat-dev zlib-dev"
-makedepends="$depends_dev bash cmake"
 checkdepends="python3 libxml2 cmd:which"
+makedepends="$depends_dev bash cmake"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://www.exiv2.org/builds/exiv2-$pkgver-Source.tar.gz
 	https://dev.sick.bike/dist/exiv2-0.27.2-POC-file_issue_1019
@@ -89,7 +89,6 @@ builddir="$srcdir/$pkgname-$pkgver-Source"
 
 prepare() {
 	default_prepare
-	mkdir build
 
 	# Remove #1019 POC after >= 0.27.2
 	mv "$srcdir/$pkgname-$pkgver-POC-file_issue_1019" \
@@ -97,21 +96,18 @@ prepare() {
 }
 
 build() {
-	cd "$builddir/build"
 	cmake -DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
-		-DCMAKE_BUILD_TYPE=RelWithDebInfo ..
-	make
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo -Bbuild
+	make -C build
 }
 
 check() {
-	cd "$builddir/build"
-	make tests
+	make -C build tests
 }
 
 package() {
-	cd "$builddir/build"
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -C build install
 }
 
 sha512sums="39eb7d920dce18b275ac66f4766c7c73f7c72ee10e3e1e43d84c611b24f48ce20a70eac6d53948914e93242a25b8b52cc4bc760ee611ddcd77481306c1f9e721  exiv2-0.27.2-Source.tar.gz
-- 
cgit v1.2.3-70-g09d2