main/mariadb: modernise

1 files changed, 14 insertions, 27 deletions

diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD
index 55fd8015cd..43768f57bd 100644
--- a/main/mariadb/APKBUILD
+++ b/main/mariadb/APKBUILD
@@ -48,15 +48,6 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-common
 
 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
-}
-
 build() {
 	cd "$builddir"
 	cmake . -DBUILD_CONFIG=mysql_release \
@@ -91,21 +82,20 @@ build() {
 		-DPLUGIN_TOKUDB=NO \
 		-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
 		-DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
-		-DWITHOUT_PBXT_STORAGE_ENGINE=1 \
-		|| return 1
-	make || return 1
+		-DWITHOUT_PBXT_STORAGE_ENGINE=1
+	make
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir/" install || return 1
+	make DESTDIR="$pkgdir/" install
 
 	install -Dm 755 "$startdir"/$pkgname.initd \
-		"$pkgdir"/etc/init.d/$pkgname || return 1
+		"$pkgdir"/etc/init.d/$pkgname
 
 	# use small example config as default, which has tcp disabled
 	install -Dm 640 -o mysql  "$pkgdir"/usr/share/mysql/my-medium.cnf \
-		"$pkgdir"/etc/mysql/my.cnf || return 1
+		"$pkgdir"/etc/mysql/my.cnf
 
 	# libmysqlclient_r is no more.  Upstream tries to replace it with
 	# symlinks but that really doesn't work (wrong soname in particular).
@@ -136,11 +126,9 @@ _client_libs() {
 	replaces="mariadb libmysqlclient"
 	depends="mariadb-common"
 	mkdir -p "$subpkgdir"/usr/lib \
-		"$subpkgdir"/usr/share/mysql \
-		|| return 1
+		"$subpkgdir"/usr/share/mysql
 	mv "$pkgdir"/usr/lib/libmysqlclient.so* \
-		"$subpkgdir"/usr/lib/ \
-		|| return 1
+		"$subpkgdir"/usr/lib/
 }
 
 common() {
@@ -150,28 +138,27 @@ common() {
 	mkdir -p "$subpkgdir"/usr/share/mysql \
 		"$subpkgdir"/etc \
 		"$subpkgdir"/usr/lib/mysql/plugin
-	mv "$pkgdir"/etc/mysql "$subpkgdir"/etc/ || return 1
+	mv "$pkgdir"/etc/mysql "$subpkgdir"/etc/
 	mv "$pkgdir"/usr/lib/mysql/plugin/dialog.so \
 		"$pkgdir"/usr/lib/mysql/plugin/mysql_clear_password.so \
-		"$subpkgdir"/usr/lib/mysql/plugin/ || return 1
+		"$subpkgdir"/usr/lib/mysql/plugin/
 	local lang="charsets danish english french greek italian korean norwegian-ny
 		portuguese russian slovak swedish czech dutch estonian german
 		hungarian japanese norwegian polish romanian serbian spanish
 		ukrainian"
 	for l in $lang; do
 		mv "$pkgdir"/usr/share/mysql/$l \
-			"$subpkgdir"/usr/share/mysql/ || return 1
+			"$subpkgdir"/usr/share/mysql/
 	done
 }
 
 mytest() {
 	pkgdesc="The test suite distributed with MariaDB"
-	mkdir -p "$subpkgdir"/usr/bin || return 1
+	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/mysql_client_test \
 		"$pkgdir"/usr/mysql-test \
 		"$pkgdir"/usr/bin/my_safe_process \
-		"$subpkgdir"/usr/bin/ \
-		|| return 1
+		"$subpkgdir"/usr/bin/
 }
 
 client() {
@@ -181,9 +168,9 @@ client() {
 	local bins="myisam_ftdump mysql mysqlaccess mysqladmin mysqlbug
 		mysqlcheck mysqldump mysqldumpslow mysql_find_rows
 		mysql_fix_extensions mysqlimport mysqlshow mysql_waitpid"
-	mkdir -p "$subpkgdir"/usr/bin/ || return 1
+	mkdir -p "$subpkgdir"/usr/bin/
 	for i in $bins; do
-		mv "$pkgdir"/usr/bin/${i} "$subpkgdir"/usr/bin/ || return 1
+		mv "$pkgdir"/usr/bin/${i} "$subpkgdir"/usr/bin/
 	done
 }