community/rspamd: improve abuild

makedepends and subpackages are just reformatted and sorted

community/rspamd/APKBUILD

@@ -10,15 +10,33 @@ url="https://rspamd.com"
 arch="x86_64 x86 armhf ppc64le"
 license="Apache-2.0"
 options="!check"
-pkgusers=$pkgname
-pkggroups=$pkgname
-makedepends="cmake ragel perl luajit-dev glib-dev pcre-dev icu-dev
-	libevent-dev sqlite-dev libressl-dev file-dev curl-dev
-	gd-dev fann-dev"
+pkgusers="rspamd"
+pkggroups="rspamd"
+makedepends="
+	cmake
+	curl-dev
+	fann-dev
+	file-dev
+	gd-dev
+	glib-dev
+	icu-dev
+	libevent-dev
+	libressl-dev
+	luajit-dev
+	pcre-dev
+	perl
+	ragel
+	sqlite-dev
+	"
 install="$pkgname.pre-install"
-subpackages="$pkgname-doc $pkgname-client $pkgname-utils::noarch
-	$pkgname-controller::noarch $pkgname-fuzzy::noarch
-	$pkgname-proxy::noarch $pkgname-openrc
+subpackages="
+	$pkgname-doc
+	$pkgname-client
+	$pkgname-utils::noarch
+	$pkgname-controller::noarch
+	$pkgname-fuzzy::noarch
+	$pkgname-proxy::noarch
+	$pkgname-openrc
 	"
 source="$pkgname-$pkgver.tar.gz::https://github.com/vstakhov/$pkgname/archive/$pkgver.tar.gz
 	$pkgname.logrotated
@@ -31,7 +49,8 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/vstakhov/$pkgname/archive/$p
 
 build() {
 	cd "$builddir"
-	cmake CMakeLists.txt \
+
+	cmake . \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCONFDIR=/etc/$pkgname \
 		-DRUNDIR=/run/$pkgname \
@@ -48,81 +67,83 @@ build() {
 
 package() {
 	cd "$builddir"
+
 	make DESTDIR="$pkgdir" install
 
-	mkdir -p "$pkgdir"/etc/$pkgname/local.d \
-		"$pkgdir"/etc/$pkgname/override.d
-
-	install -Dm644 "$srcdir"/$pkgname.logrotated \
-		"$pkgdir"/etc/logrotate.d/$pkgname
-	install -Dm755 "$srcdir"/$pkgname.initd \
-		"$pkgdir"/etc/init.d/$pkgname
-	install -Dm644 "$srcdir"/$pkgname.confd \
-		"$pkgdir"/etc/conf.d/$pkgname
-
-	install -dm750 -o $pkgname -g $pkgname \
-		"$pkgdir"/var/lib/$pkgname/dynamic
-	install -dm750 -g $pkgname \
-		"$pkgdir"/var/log/$pkgname
-	chown $pkgname:$pkgname "$pkgdir"/var/lib/$pkgname
-
-	mkdir "$pkgdir"/usr/sbin
-	find "$pkgdir"/usr/bin -type l -delete
-	mv "$pkgdir"/usr/bin/rspamd-$pkgver \
-		"$pkgdir"/usr/sbin/rspamd
-	mv "$pkgdir"/usr/bin/rspamadm-$pkgver \
-		"$pkgdir"/usr/bin/rspamadm
-
-	mkdir -p "$pkgdir"/usr/share/doc/$pkgname
-	mv "$pkgdir"/usr/share/$pkgname/www/README.md \
-		"$pkgdir"/usr/share/$pkgname/www/plugins.txt \
-		"$pkgdir"/usr/share/doc/$pkgname/
+	cd "$pkgdir"
+
+	find usr/bin -type l -delete
+	mkdir -p ./usr/sbin
+	mv ./usr/bin/rspamd-$pkgver ./usr/sbin/rspamd
+	mv ./usr/bin/rspamadm-$pkgver ./usr/bin/rspamadm
+
+	mkdir -p ./usr/share/doc/$pkgname
+	mv ./usr/share/$pkgname/www/README.md \
+		./usr/share/$pkgname/www/plugins.txt \
+		./usr/share/doc/$pkgname/
+
+	install -Dm 644 "$srcdir"/$pkgname.logrotated ./etc/logrotate.d/$pkgname
+	install -Dm 755 "$srcdir"/$pkgname.initd ./etc/init.d/$pkgname
+	install -Dm 644 "$srcdir"/$pkgname.confd ./etc/conf.d/$pkgname
+
+	mkdir -p ./etc/$pkgname/local.d \
+		./etc/$pkgname/override.d
+
+	install -dm 750 -o rspamd -g rspamd \
+		./var/lib/$pkgname \
+		./var/lib/$pkgname/dynamic
+	install -dm 750 -g rspamd ./var/log/$pkgname
 }
 
 client() {
 	pkgdesc="$pkgdesc (console client)"
+
+	cd "$pkgdir"
 	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/rspamc-$pkgver \
-		"$subpkgdir"/usr/bin/rspamc
+	mv ./usr/bin/rspamc-$pkgver "$subpkgdir"/usr/bin/rspamc
 }
 
 utils() {
-	depends="perl"
 	pkgdesc="$pkgdesc (utilities)"
+	depends="perl"
+
+	cd "$pkgdir"
 	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/${pkgname}_stats \
-		"$subpkgdir"/usr/bin/${pkgname}-stats
-	mv "$pkgdir"/usr/bin/${pkgname}-redirector "$subpkgdir"/usr/bin
+	mv ./usr/bin/${pkgname}_stats "$subpkgdir"/usr/bin/${pkgname}-stats
+	_mv ./usr/bin/${pkgname}-redirector "$subpkgdir"/usr/bin/
 }
 
 fuzzy() {
-	depends="$pkgname"
 	pkgdesc="$pkgdesc (local fuzzy storage)"
-	mkdir -p "$subpkgdir"/etc/$pkgname/modules.d
-	mv "$pkgdir"/etc/$pkgname/worker-fuzzy.* \
-		"$subpkgdir"/etc/$pkgname
-	mv "$pkgdir"/etc/$pkgname/modules.d/fuzzy_* \
-		"$subpkgdir"/etc/$pkgname/modules.d
+	depends="$pkgname"
+
+	cd "$pkgdir"
+	_mv ./etc/$pkgname/worker-fuzzy.* "$subpkgdir"/etc/$pkgname/
+	_mv ./etc/$pkgname/modules.d/fuzzy_* "$subpkgdir"/etc/$pkgname/modules.d/
 }
 
 controller() {
+	pkgdesc="$pkgdesc (controller web interface)"
 	license="MIT"
 	depends="$pkgname"
-	pkgdesc="$pkgdesc (controller web interface)"
-	mkdir -p "$subpkgdir"/usr/share/$pkgname \
-		"$subpkgdir"/etc/$pkgname
-	mv "$pkgdir"/usr/share/$pkgname/www \
-		"$subpkgdir"/usr/share/$pkgname
-	mv "$pkgdir"/etc/$pkgname/worker-controller.* \
-		"$subpkgdir"/etc/$pkgname
+
+	cd "$pkgdir"
+	_mv ./usr/share/$pkgname/www "$subpkgdir"/usr/share/$pkgname/
+	_mv ./etc/$pkgname/worker-controller.* "$subpkgdir"/etc/$pkgname/
 }
 
 proxy() {
-	depends="$pkgname"
 	pkgdesc="$pkgdesc (milter support)"
-	mkdir -p "$subpkgdir"/etc/$pkgname
-	mv "$pkgdir"/etc/$pkgname/worker-proxy.* \
-		"$subpkgdir"/etc/$pkgname
+	depends="$pkgname"
+
+	cd "$pkgdir"
+	_mv ./etc/$pkgname/worker-proxy.* "$subpkgdir"/etc/$pkgname/
+}
+
+_mv() {
+	local dest; for dest; do true; done  # get last argument
+	mkdir -p "$dest"
+	mv $@
 }
 
 sha512sums="43f2350dfa4e0369cd53480bd4c8d0aa3898d7c471540281e7460a264207032aea226c4fd519a26397b9e9e8c8de3951e5a9752e010eabf1b3733a0c3e3086c2  rspamd-1.7.8.tar.gz
@@ -130,4 +151,5 @@ sha512sums="43f2350dfa4e0369cd53480bd4c8d0aa3898d7c471540281e7460a264207032aea22
 df37726d03e676b16d707854d95bafc9162da65c27bb150edbfc0cb00f1842188a1f2a8f1b82be5ae2a253b4f4db4d93dfe804a89feb988b5af858eb3f3458be  rspamd.initd
 e417dd825d1b4d03d115db037b2fdf2f48a35420ee7a9010d97167b6c31e88d6c0a15dd33b21d7d76856db0fdc5097c922fcdf1d8164d1e92ae377f7c5303947  rspamd.confd
 fa0e14d507cd7421a20916506c03e6e6c95fb2f38736e69540ee3e066da883c2ee4cb779ee8787756e4a1831ff8f04150ce592d4d6df08d8a18d55f3c6de4646  cmakelists.patch
-a8aefee649bf6630339d1d3f2bb20c25ca70b21a8eaa92951e926d0fd4525f1d4ac4cc7ea66ac2b15323cf02c93c759ddf7181502f0d71b21384ced9d88c008e  conf-split-workers.patch"
+a8aefee649bf6630339d1d3f2bb20c25ca70b21a8eaa92951e926d0fd4525f1d4ac4cc7ea66ac2b15323cf02c93c759ddf7181502f0d71b21384ced9d88c008e  conf-split-workers.patch
+d3b466751392617dd8ffe63b63262c5bb2a066731057a5bf24a4990e5eaa22b1063017a0d186b758de87a2c57b57b762cc84858439aa6e7ded2b0b15dd4d4771  default-configs.patch"