main/abuild: modernize abuild

1 files changed, 12 insertions, 14 deletions

diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index 6ec4d9f749..da115180a8 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -17,7 +17,7 @@ makedepends_host="libressl-dev zlib-dev"
 makedepends="$makedepends_host $makedepends_build"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 subpackages="apkbuild-cpan:cpan:noarch apkbuild-gem-resolver:gems:noarch"
-options="suid"
+options="suid !check"
 pkggroups="abuild"
 source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz
 	0001-abuild-use-new-PKG_CONFIG_MAXIMUM_TRAVERSE_DEPTH-env.patch
@@ -26,36 +26,33 @@ source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz
 	0001-abuild-Add-support-for-lzip-source-packages.patch
 	0001-remove-explicit-return-1-from-all-sample-APKBUILDs.patch
 	"
-
 builddir="$srcdir/$pkgname-$_ver"
+
 prepare() {
+	default_prepare
+
 	cd "$builddir"
-	for i in $source; do
-		case $i in
-		*.patch)
-			msg "Applying $i"
-			patch -p1 -i "$srcdir"/$i || return 1
-			;;
-		esac
-	done
 	sed -i -e "/^CHOST=/s/=.*/=$CHOST/" abuild.conf
 }
 
 build() {
 	cd "$builddir"
-	make || return 1
+	make
 }
 
 package() {
 	cd "$builddir"
-	make install DESTDIR="$pkgdir" || return 1
-	install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf || return 1
-	install -d -m 775 -g abuild "$pkgdir"/var/cache/distfiles || return 1
+
+	make install DESTDIR="$pkgdir"
+
+	install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf
+	install -d -m 775 -g abuild "$pkgdir"/var/cache/distfiles
 }
 
 cpan() {
 	pkgdesc="Script to generate perl APKBUILD from CPAN"
 	depends="perl perl-libwww perl-json perl-module-build-tiny"
+
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/apkbuild-cpan "$subpkgdir"/usr/bin/
 }
@@ -63,6 +60,7 @@ cpan() {
 gems() {
 	pkgdesc="APKBUILD dependency resolver for RubyGems"
 	depends="ruby ruby-augeas"
+
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/apkbuild-gem-resolver "$subpkgdir"/usr/bin/
 }