community/zabbix: fix style issues

1 files changed, 23 insertions, 25 deletions

diff --git a/community/zabbix/APKBUILD b/community/zabbix/APKBUILD
index 262f1eabd9..af5f5ef159 100644
--- a/community/zabbix/APKBUILD
+++ b/community/zabbix/APKBUILD
@@ -11,9 +11,9 @@ arch="all"
 license="GPL-2.0-or-later"
 depends="fping"
 _php=php7
-_php_depends="$_php ${_php}-gd ${_php}-curl ${_php}-bcmath ${_php}-sockets
-	${_php}-iconv ${_php}-xmlreader ${_php}-xmlwriter ${_php}-ctype
-	${_php}-gettext ${_php}-session ${_php}-simplexml ${_php}-json"
+_php_depends="$_php $_php-gd $_php-curl $_php-bcmath $_php-sockets
+ $_php-iconv $_php-xmlreader $_php-xmlwriter $_php-ctype
+	$_php-gettext $_php-session $_php-simplexml $_php-json"
 makedepends="postgresql-dev curl-dev net-snmp-dev libevent-dev pcre-dev
 	sqlite-dev mariadb-connector-c-dev curl-dev openipmi-dev unixodbc-dev
 	libxml2-dev autoconf automake libssh2-dev gnutls-dev
@@ -25,7 +25,7 @@ options="!check" # no tests available
 subpackages="$pkgname-doc $pkgname-agent $pkgname-pgsql $pkgname-mysql $pkgname-sqlite
 	$pkgname-webif::noarch $pkgname-utils $pkgname-setup::noarch
 	$pkgname-openrc $pkgname-agent-openrc:agent_openrc"
-source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+source="https://downloads.sourceforge.net/zabbix/$pkgname-$pkgver.tar.gz
 	zabbix-server.initd
 	zabbix-server.confd
 	zabbix-agentd.initd
@@ -40,8 +40,6 @@ source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	zabbix_agent2-uname-linux.patch
 	"
 
-builddir="$srcdir"/$pkgname-$pkgver
-
 # Agent2 does not build on x86 atm
 case $CARCH in
 x86)
@@ -62,7 +60,7 @@ prepare() {
 
 	# Fix config file locations
 	for file in server agentd proxy; do
-		sed -i "$builddir"/conf/zabbix_${file}.conf \
+		sed -i "$builddir"/conf/zabbix_$file.conf \
 			-e 's|SNMPTrapperFile=/tmp|SNMPTrapperFile=/var/log/zabbix|' \
 			-e 's|PidFile=/tmp|PidFile=/var/run/zabbix|' \
 			-e 's|LogFile=/tmp|LogFile=/var/log/zabbix|'
@@ -101,11 +99,11 @@ build() {
 		cd "$srcdir"
 		msg "Building for $db"
 		cp -r "$pkgname-$pkgver" "$pkgname-$pkgver-$db"
-		cd "$builddir-$db"
+	cd "$builddir-$db"
 		case $db in
 			sqlite3)
 				./configure \
-					--build=$CBUILD \
+					--build=$CBUILD	\
 					--host=$CHOST \
 					--with-$db \
 					$_configure
@@ -124,7 +122,7 @@ build() {
 }
 
 package() {
-        # doing manual install
+	# doing manual install
 	components="agentd proxy server";
 	if $_build_agent2; then
 		msg2 "Packaging agen2"
@@ -140,13 +138,13 @@ package() {
 			"$pkgdir"/usr/share/man/man1/zabbix_$i.1
 	done
 	install -d -m0750 -o zabbix -g zabbix \
-                "$pkgdir"/var/run/zabbix "$pkgdir"/var/log/zabbix
-        install -D -m0644 "$builddir"/conf/zabbix_server.conf \
+		"$pkgdir"/var/run/zabbix "$pkgdir"/var/log/zabbix
+	install -D -m0644 "$builddir"/conf/zabbix_server.conf \
 		"$pkgdir"/etc/zabbix/zabbix_server.conf
-        for i in server proxy; do
-                install -D -m0755 "$srcdir"/zabbix-$i.initd \
-                        "$pkgdir"/etc/init.d/zabbix-$i
-        done
+	for i in server proxy; do
+		install -D -m0755 "$srcdir"/zabbix-$i.initd \
+			"$pkgdir"/etc/init.d/zabbix-$i
+	done
 	install -D -m0644 "$srcdir"/zabbix-server.confd \
 		"$pkgdir"/etc/conf.d/zabbix-server
 }
@@ -159,17 +157,17 @@ setup() {
 }
 
 _do_db() {
-        pkgdesc="Zabbix server with $1 database support"
-        depends="$pkgname $2"
+	pkgdesc="Zabbix server with $1 database support"
+	depends="$pkgname $2"
 	local i=
 	mkdir -p "$subpkgdir"/usr/sbin
 	if [ "$1" != "sqlite3" ]; then
 		cp "$builddir-$1"/src/zabbix_server/zabbix_server \
 			"$subpkgdir"/usr/sbin
 	fi
-	cp "$builddir-$1"/src/zabbix_proxy/zabbix_proxy \
+	cp "$builddir-$1"/src/zabbix_proxy/zabbix_proxy	\
 		"$subpkgdir"/usr/sbin
-        install -D -m0644 "$builddir"/conf/zabbix_proxy.conf \
+	install	-D -m0644 "$builddir"/conf/zabbix_proxy.conf \
 		"$pkgdir"/etc/zabbix/zabbix_proxy.conf
 	cd "$builddir"
 	for i in upgrades/dbpatches/*/$1; do
@@ -177,11 +175,11 @@ _do_db() {
 		mkdir -p "$subpkgdir"/usr/share/zabbix/${i%/*}
 		cp "$i" "$subpkgdir"/usr/share/zabbix/$i
 	done
-        return 0
+	return 0
 }
 
-pgsql()	{ _do_db postgresql "!$pkgname-mysql !$pkgname-sqlite";}
-mysql()	{ _do_db mysql "!$pkgname-pgsql !$pkgname-sqlite";}
+pgsql() { _do_db postgresql "!$pkgname-mysql !$pkgname-sqlite";}
+mysql() { _do_db mysql "!$pkgname-pgsql !$pkgname-sqlite";}
 sqlite(){ _do_db sqlite3 "!$pkgname-pgsql !$pkgname-mysql";}
 
 utils() {
@@ -190,8 +188,8 @@ utils() {
 	mkdir -p "$subpkgdir"/usr/bin
 	cp "$builddir-postgresql"/src/zabbix_get/zabbix_get \
 		"$subpkgdir"/usr/bin
-        cp "$builddir-postgresql"/src/zabbix_sender/zabbix_sender \
-	                "$subpkgdir"/usr/bin
+	cp "$builddir-postgresql"/src/zabbix_sender/zabbix_sender \
+			"$subpkgdir"/usr/bin
 }
 
 webif() {