network/zabbix_proxy: Updated for version 1.8.6.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

1 files changed, 27 insertions, 18 deletions

diff --git a/network/zabbix_proxy/zabbix_proxy.SlackBuild b/network/zabbix_proxy/zabbix_proxy.SlackBuild
index f8852d2abe..c3320744e0 100644
--- a/network/zabbix_proxy/zabbix_proxy.SlackBuild
+++ b/network/zabbix_proxy/zabbix_proxy.SlackBuild
@@ -1,12 +1,32 @@
 #!/bin/sh
 
 # Slackware build script for zabbix_proxy
-# (with help from Michal Bialozor)
-# maintained by Niels Horn <niels.horn@gmail.com>
-# revision date 2011/02/13
+
+# Copyright 2010-2011 Niels Horn, Rio de Janeiro, RJ, Brazil
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Thanks to Michal Bialozor for the initial idea.
+# revision date 2011/08/06
 
 PRGNAM=zabbix_proxy
-VERSION=${VERSION:-1.8.4}
+VERSION=${VERSION:-1.8.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -35,12 +55,9 @@ set -e
 # Bail out if user or group isn't valid on your system
 # For slackbuilds.org, assigned zabbix uid/gid are 228/228
 # See http://slackbuilds.org/uid_gid.txt
-if ! grep ^$ZABBIXGROUP: /etc/group 2>&1 > /dev/null; then
-    echo "  You must have a \"$ZABBIXGROUP\" group to run this script."
+if [ "$(grep ^$ZABBIXUSER: /etc/passwd)" = "" -o "$(grep ^$ZABBIXGROUP: /etc/group)" = "" ] ; then
+    echo "  You must have a \"$ZABBIXGROUP\" group and user to run this script."
     echo "    # groupadd -g $ZABBIXGID $ZABBIXGROUP"
-    exit 1
-elif ! grep ^$ZABBIXUSER: /etc/passwd 2>&1 > /dev/null; then
-    echo "  You must have a \"$ZABBIXUSER\" user to run this script."
     echo "    # useradd -u $ZABBIXUID -g $ZABBIXGROUP -d /dev/null -s /bin/false $ZABBIXUSER"
     exit 1
 fi
@@ -48,23 +65,15 @@ fi
 if [ "$ARCH" = "i486" ]; then
     SLKCFLAGS="-O2 -march=i486 -mtune=i686"
     LIBDIRSUFFIX=""
-    ARCHQUADLET=""
 elif [ "$ARCH" = "i686" ]; then
     SLKCFLAGS="-O2 -march=i686 -mtune=i686"
     LIBDIRSUFFIX=""
-    ARCHQUADLET=""
 elif [ "$ARCH" = "x86_64" ]; then
     SLKCFLAGS="-O2 -fPIC"
     LIBDIRSUFFIX="64"
-    ARCHQUADLET=""
-elif [ "$ARCH" = "arm" ]; then
-    SLKCFLAGS="-O2 -march=armv4t"
-    LIBDIRSUFFIX=""
-    ARCHQUADLET="-gnueabi"
 else
     SLKCFLAGS="-O2"
     LIBDIRSUFFIX=""
-    ARCHQUADLET=""
 fi
 
 rm -rf $PKG
@@ -94,7 +103,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-mysql \
   --with-net-snmp \
   --with-libcurl \
-  --build=$ARCH-slackware-linux$ARCHQUADLET
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG