main/bind: cleanup and fix named.initd stop

7 files changed, 20 insertions, 19 deletions

diff --git a/main/bind/bind.127.zone b/main/bind/127.zone
index 2ad28de52c..2ad28de52c 100644
--- a/main/bind/bind.127.zone
+++ b/main/bind/127.zone
diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD
index c2c81775fd..7cd545fff4 100644
--- a/main/bind/APKBUILD
+++ b/main/bind/APKBUILD
@@ -5,7 +5,7 @@ pkgver=9.9.0
 _ver=${pkgver%_p*}
 _p=${pkgver#*_p}
 [ "$_p" != "$pkgver" ] && _ver="${_ver}-P$_p"
-pkgrel=0
+pkgrel=1
 pkgdesc="BIND - Berkeley Internet Name Domain - Name Server and tools"
 url="http://www.isc.org"
 arch="all"
@@ -18,12 +18,12 @@ install="$pkgname.pre-install"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-tools"
 source="http://ftp.isc.org/isc/bind9/${_ver}/bind-${_ver}.tar.gz
 	bind.so_bsdcompat.patch
-	$pkgname.initd
-	$pkgname.confd
-	$pkgname.conf
-	$pkgname.127.zone
-	$pkgname.localhost.zone
-	$pkgname.named.ca
+	named.initd
+	named.confd
+	named.conf
+	127.zone
+	localhost.zone
+	named.ca
 	"
 
 _builddir="$srcdir/bind-${_ver}"
@@ -81,17 +81,17 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la || return 1
 	
-	install -Dm755 "$srcdir"/$pkgname.initd \
+	install -Dm755 "$srcdir"/named.initd \
 		"$pkgdir"/etc/init.d/named || return 1
-	install -Dm644 "$srcdir"/$pkgname.confd \
+	install -Dm644 "$srcdir"/named.confd \
 		"$pkgdir"/etc/conf.d/named || return 1
-	install -Dm644 "$srcdir"/$pkgname.conf \
+	install -Dm644 "$srcdir"/named.conf \
 		"$pkgdir"/etc/bind/named.conf || return 1
-	install -Dm644 "$srcdir"/$pkgname.named.ca \
+	install -Dm644 "$srcdir"/named.ca \
 		"$pkgdir"/var/bind/named.ca || return 1
-	install -Dm644 "$srcdir"/$pkgname.127.zone \
+	install -Dm644 "$srcdir"/127.zone \
 		"$pkgdir"/var/bind/pri/127.zone || return 1
-	install -Dm644 "$srcdir"/$pkgname.localhost.zone \
+	install -Dm644 "$srcdir"/localhost.zone \
 		"$pkgdir"/var/bind/pri/localhost.zone || return 1
 	cd "$pkgdir"/var/bind
 	ln -s named.ca root.cache || return 1
@@ -114,9 +114,9 @@ tools() {
 
 md5sums="9281d0b04f711d28153ba1ab04a54026  bind-9.9.0.tar.gz
 f270a5b0a28ab6e818840c5c368ddbcc  bind.so_bsdcompat.patch
-da52267d5d56317d08c0fb170fc14da8  bind.initd
-418a367cecfdf8760c92235d3967867e  bind.confd
-be5fd752bdbd59385f2a559d603098d5  bind.conf
-a7455b009b7fccd74ac6f6eaa6902a00  bind.127.zone
-c3220168fabfb31a25e8c3a545545e34  bind.localhost.zone
-a94e29ac677846f3d4d618c50b7d34f1  bind.named.ca"
+1e77ad70d15546ae5e2527892b867580  named.initd
+418a367cecfdf8760c92235d3967867e  named.confd
+be5fd752bdbd59385f2a559d603098d5  named.conf
+a7455b009b7fccd74ac6f6eaa6902a00  127.zone
+c3220168fabfb31a25e8c3a545545e34  localhost.zone
+a94e29ac677846f3d4d618c50b7d34f1  named.ca"
diff --git a/main/bind/bind.localhost.zone b/main/bind/localhost.zone
index 338d7050ca..338d7050ca 100644
--- a/main/bind/bind.localhost.zone
+++ b/main/bind/localhost.zone
diff --git a/main/bind/bind.named.ca b/main/bind/named.ca
index 902a7047f9..902a7047f9 100644
--- a/main/bind/bind.named.ca
+++ b/main/bind/named.ca
diff --git a/main/bind/bind.conf b/main/bind/named.conf
index d58c61bde0..d58c61bde0 100644
--- a/main/bind/bind.conf
+++ b/main/bind/named.conf
diff --git a/main/bind/bind.confd b/main/bind/named.confd
index a9af5676f7..a9af5676f7 100644
--- a/main/bind/bind.confd
+++ b/main/bind/named.confd
diff --git a/main/bind/bind.initd b/main/bind/named.initd
index fa9ffb3434..c03f35d3a4 100644
--- a/main/bind/bind.initd
+++ b/main/bind/named.initd
@@ -84,6 +84,7 @@ start() {
 
 stop() {
 	ebegin "Stopping named"
+	_get_pidfile
 	start-stop-daemon --stop --quiet --pidfile $PIDFILE
 	eend $?
 }