community/minetest: upgrade to 5.2.0

1 files changed, 17 insertions, 21 deletions

diff --git a/community/minetest/APKBUILD b/community/minetest/APKBUILD
index dcefb71afb..fca4d8ba97 100644
--- a/community/minetest/APKBUILD
+++ b/community/minetest/APKBUILD
@@ -1,10 +1,10 @@
 # Contributor: <xmingske@gmail.com>
 # Maintainer: Sascha Paunovic <azarus@posteo.net>
 pkgname=minetest
-pkgver=5.1.1
+pkgver=5.2.0
 pkgrel=0
 pkgdesc="An infinite-world block sandbox game and a game engine"
-url="http://www.minetest.net/"
+url="https://www.minetest.net/"
 arch="all"
 license="LGPL-2.1-or-later AND CC-BY-SA-3.0"
 pkgusers="minetest"
@@ -23,9 +23,8 @@ source="minetest-$pkgver.tar.gz::https://codeload.github.com/minetest/minetest/t
         "
 
 build() {
-        mkdir "$builddir"/.build_client
-        cd "$builddir"/.build_client
-        cmake -DCUSTOM_BINDIR=/usr/bin \
+        cmake -B .build_client \
+                -DCUSTOM_BINDIR=/usr/bin \
                 -DCMAKE_INSTALL_PREFIX=/usr \
                 -DCUSTOM_DOCDIR="/usr/share/doc/$pkgname" \
                 -DCUSTOM_SHAREDIR="/usr/share/$pkgname" \
@@ -33,13 +32,11 @@ build() {
                 -DBUILD_SERVER=0 \
                 -DENABLE_REDIS=0 \
                 -DENABLE_CURL=1 \
-                -DRUN_IN_PLACE=0 \
-                ..
-        make
+                -DRUN_IN_PLACE=0
+        make -C .build_client
 
-        mkdir "$builddir"/.build_server
-        cd "$builddir"/.build_server
-        cmake -DCUSTOM_BINDIR=/usr/bin \
+        cmake -B .build_server\
+                -DCUSTOM_BINDIR=/usr/bin \
                 -DCMAKE_INSTALL_PREFIX=/usr \
                 -DCUSTOM_DOCDIR="/usr/share/doc/minetest" \
                 -DCUSTOM_SHAREDIR="/usr/share/minetest" \
@@ -47,13 +44,17 @@ build() {
                 -DBUILD_SERVER=1 \
                 -DENABLE_REDIS=1 \
                 -DENABLE_CURL=1 \
-                -DRUN_IN_PLACE=0 \
-                ..
-        make
+                -DRUN_IN_PLACE=0
+        make -C .build_server
+}
+
+package() {
+        make -C .build_client DESTDIR="$pkgdir" install
 }
 
 common() {
-        depends=
+        pkgdesc="Minetest files used by both client & server"
+        depends=""
         install -o minetest -g minetest -d "$subpkgdir"/var/lib/minetest
         mkdir -p "$subpkgdir/usr/share/minetest"
         mv "$pkgdir/usr/share/minetest/builtin" \
@@ -62,11 +63,6 @@ common() {
                 "$subpkgdir/usr/share/minetest"
 }
 
-package() {
-        cd "$builddir"/.build_client
-        make DESTDIR="$pkgdir" install
-}
-
 server() {
         pkgdesc="Minetest server"
         depends="$pkgname-common"
@@ -86,7 +82,7 @@ openrc() {
                 "$subpkgdir"/etc/conf.d/minetest-server
 }
 
-sha512sums="4a36a86a3e5f8f5246ff3410e9ab182631f38292bea077e7dbc25fdc1520e5a479ffbd5ec447000fb4999ab252a59bf976299e6fecda1f8cd47f40549885766b  minetest-5.1.1.tar.gz
+sha512sums="47e3cdf488d50ea61659ac3b72960c9971270d1a793e0d79dcb649c89f7a6e65a16c21e1b903d08c916a2ebcbd3fd2164ec67173a3d4f2a2e9bb3a6351b48851  minetest-5.2.0.tar.gz
 7bca17dc0bd59db9c07c160677498aa09297026104e922bf93b7629c274d0aebd226af60c5e82f49ffe3cc5c1e4448e3798b6c2a44144fc6eca4d3aaed3384bb  minetest-server.confd
 c27aea87468538b48b5e0a66fa5cdde4fc67f3c00a0e57f359a2f044a31c5617d1b5f3dec72e015537ee3bf126bd1073878c0f4447de67db9be2c4cf21416dd7  minetest-server.initd
 6e35a39f079f0c1b280dbc3deb46eb789a7620d64b226b5f867c5d954ae8881659b6f15e3e2204a24ccd4ed7b9de50f2fbacc4c80534290fc4c049df24ddc5ff  0001-CMake-link-with-Intl-when-necessary.patch"