main/unbound: improve abuild

1 files changed, 29 insertions, 24 deletions

diff --git a/main/unbound/APKBUILD b/main/unbound/APKBUILD
index c38cbfb5ba..44d092246a 100644
--- a/main/unbound/APKBUILD
+++ b/main/unbound/APKBUILD
@@ -5,29 +5,31 @@ pkgname=unbound
 pkgver=1.6.7
 pkgrel=2
 pkgdesc="Unbound is a validating, recursive, and caching DNS resolver"
-pkgusers="unbound"
-pkggroups="unbound"
 url="http://unbound.net/"
 arch="all"
 license="BSD"
-options="!check"
 depends="dnssec-root"
 depends_dev="libressl-dev expat-dev ldns-dev libevent-dev"
 makedepends="$depends_dev python2-dev swig linux-headers"
 install="$pkgname.pre-install"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-dbg py-unbound:py $pkgname-migrate::noarch"
-source="http://unbound.net/downloads/unbound-$pkgver.tar.gz
+options="!check"
+pkgusers="unbound"
+pkggroups="unbound"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-dbg py-unbound:py
+	$pkgname-migrate::noarch"
+source="http://unbound.net/downloads/$pkgname-$pkgver.tar.gz
 	conf.patch
 	update-unbound-root-hints
 	migrate-dnscache-to-unbound
 	root.hints
-	unbound.initd
-	unbound.confd
+	$pkgname.initd
+	$pkgname.confd
 	"
-builddir="$srcdir"/$pkgname-$pkgver
+builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
 	cd "$builddir"
+
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -49,50 +51,53 @@ build() {
 		--with-pyunbound
 
 	# do not link to libpython
-	sed -e '/^LIBS=/s/-lpython.*[[:space:]]/ /' \
-		-i Makefile
+	sed -i '/^LIBS=/s/-lpython.*[[:space:]]/ /' Makefile
 
 	make
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -D contrib/update-anchor.sh \
-		"$pkgdir"/usr/share/$pkgname/update-anchor.sh
-	install -Dm755 "$srcdir"/update-unbound-root-hints \
-		"$pkgdir"/etc/periodic/monthly/update-unbound-root-hints
 
-	install -m755 -D "$srcdir"/unbound.initd \
-		"$pkgdir"/etc/init.d/unbound
-	install -m644 -D "$srcdir"/unbound.confd \
-		"$pkgdir"/etc/conf.d/unbound
+	make DESTDIR="$pkgdir" install
 
-	install -d -o unbound -g unbound "$pkgdir"/var/run/unbound
-	install -m644 "$srcdir"/root.hints "$pkgdir"/etc/unbound/
+	install -m755 -D contrib/update-anchor.sh \
+		"$pkgdir"/usr/share/$pkgname/update-anchor.sh
 
 	mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
 	install -m644 doc/CREDITS doc/Changelog doc/FEATURES \
 		doc/README doc/TODO "$pkgdir"/usr/share/doc/$pkgname/
+
+	cd "$pkgdir"
+
+	install -Dm755 "$srcdir"/update-unbound-root-hints \
+		./etc/periodic/monthly/update-unbound-root-hints
+
+	install -m644 -D "$srcdir"/root.hints ./etc/unbound/root.hints
+
+	install -m755 -D "$srcdir"/unbound.initd ./etc/init.d/unbound
+	install -m755 -D "$srcdir"/unbound.confd ./etc/conf.d/unbound
 }
 
 libs() {
 	pkgdesc="unbound shared libraries"
+
 	mkdir -p "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/
 }
 
 py() {
 	pkgdesc="Python bindings to libunbound"
+
 	mkdir -p "$subpkgdir"/usr/lib/
 	mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
 }
 
 migrate() {
 	pkgdesc="Simple tool to migrate from dnscache to unbound"
-	mkdir -p "$subpkgdir"/usr/bin/
-	install -m755 "$srcdir"/migrate-dnscache-to-unbound \
-		"$subpkgdir"/usr/bin/
+
+	install -m755 -D "$srcdir"/migrate-dnscache-to-unbound \
+		"$subpkgdir"/usr/bin/migrate-dnscache-to-unbound
 }
 
 sha512sums="6e3d1a057081252183343d0d1b8ace742ab15e8f5244e61287340f49289d7449bed93fbfdaa3194c0e99ca23948f4b33038f75af5c5b26c938004d06fc3031e0  unbound-1.6.7.tar.gz