[127133] trunk/dports/net/zabbix2

[eborisch at macports.org]

Revision: 127133
          https://trac.macports.org/changeset/127133
Author:   eborisch at macports.org
Date:     2014-10-21 14:02:05 -0700 (Tue, 21 Oct 2014)
Log Message:
-----------
zabbix2: Update to 2.4.1

Modified Paths:
--------------
    trunk/dports/net/zabbix2/Portfile
    trunk/dports/net/zabbix2/files/zabbix_server.init.mysql

Modified: trunk/dports/net/zabbix2/Portfile
===================================================================
--- trunk/dports/net/zabbix2/Portfile	2014-10-21 20:27:34 UTC (rev 127132)
+++ trunk/dports/net/zabbix2/Portfile	2014-10-21 21:02:05 UTC (rev 127133)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                zabbix2
-version             2.2.5
+version             2.4.1
 revision            0
 categories          net
 maintainers         eborisch openmaintainer
@@ -30,8 +30,8 @@
 dist_subdir         zabbix2
 
 checksums \
-    rmd160  118474370cc1683205f2fb8f882a8a5e997b9656 \
-    sha256  1e33f54d4accc5b6a0dccf4a308d27dc82de245567dffef823f9add9fa7d81b5
+    rmd160  29a8c317abd05a3b1bcc1f6392a604ce4e142e7b \
+    sha256  e47b328c2babcc7c37b27c96732b5f6ac28a935901acf8a3d340887ba64bece4
 
 universal_variant   no
 
@@ -65,11 +65,12 @@
                             port:libssh2 \
                             port:net-snmp \
                             port:OpenIPMI \
-                            port:php5 \
-                            port:php5-gd \
-                            port:php5-gettext \
-                            port:php5-mbstring \
-                            port:php5-sockets
+                            port:php53 \
+                            port:php53-apache2handler \
+                            port:php53-gd \
+                            port:php53-gettext \
+                            port:php53-mbstring \
+                            port:php53-sockets
 
     configure.args-append   --enable-server \
                             --with-libcurl=${prefix}/bin/curl-config \
@@ -85,7 +86,7 @@
         Adds dependencies a complete server are installed.
     } {
     }
-    
+
     # Items are "display name" "port name" "config arg" "php interface"
     array set DBLIST {
         mysql5  {"MySQL 5.x"            mysql5 \
@@ -132,7 +133,7 @@
             depends_lib-append      port:[lindex ${prms} 1]
             configure.args-append   --with-[lindex ${prms} 2]
             depends_run-append \
-                port:php5-[lindex ${prms} 3]
+                port:php53-[lindex ${prms} 3]
 
             if {[string compare ${dbitem} sqlite3] && \
                  [variant_isset full_server]} {
@@ -154,7 +155,7 @@
         ![variant_isset pgsql83] &&
         ![variant_isset pgsql84] &&
         ![variant_isset sqlite3]} {
-        default_variants +mysql5
+        default_variants            +mysql5
     }
 
 # Notify anyone with +agent_only installed of new zabbix2-agent port
@@ -301,7 +302,7 @@
 2) Setup the ZABBIX MySQL database
 
  For other databases, follow documentation from 
- https://www.zabbix.com/documentation/2.0/manual/appendix/install/db_scripts
+ https://www.zabbix.com/documentation/2.4/manual/appendix/install/db_scripts
 
 -Create the ZABBIX database
     mysql5 -u root -p (enter password at prompt)

Modified: trunk/dports/net/zabbix2/files/zabbix_server.init.mysql
===================================================================
--- trunk/dports/net/zabbix2/files/zabbix_server.init.mysql	2014-10-21 20:27:34 UTC (rev 127132)
+++ trunk/dports/net/zabbix2/files/zabbix_server.init.mysql	2014-10-21 21:02:05 UTC (rev 127133)
@@ -2,12 +2,12 @@
 
 case "$1" in
     start)
+        echo "Zabbix_server init - will wait ${MAX_WAIT}s for __VER__ to start."
         MAX_WAIT=120
-        echo "Zabbix_server init - will wait ${MAX_WAIT}s for __VER__ to start."
         while [ ! -e __PREFIX__/var/run/__VER__/mysqld.sock ]; do
             if [ ${MAX_WAIT} -le 0 ]; then
-              echo "Tired of waiting. Try again after starting __VER__."
-              exit 1
+                echo "Tired of waiting. Try again after starting __VER__."
+                exit 1
             fi
             sleep 5
             let MAX_WAIT=MAX_WAIT-5
@@ -20,8 +20,18 @@
 
     stop)
         echo "Shutting down zabbix_server"
-        pid=`ps axc|awk "{if (\\$5==\"zabbix_server\") print \\$1}"`
-        /bin/kill $pid
+        pid=`ps -U zabbix | grep 'zabbix_server[^:]' | awk '{print $1}'`
+        bin/kill $pid
+        MAX_WAIT=10
+        while [ `netstat -an | grep -q '\.10051. *LISTEN' && echo 1 || echo 0` \
+                == "1" ]; do
+            if [ ${MAX_WAIT} -le 0 ]; then
+                echo "Warning: a process is still using port 10051??"
+                exit 1
+            fi
+            sleep 5
+            let MAX_WAIT=MAX_WAIT-5
+        done
         rm /tmp/zabbix_server.pid
         ;;
     restart)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141021/6d799848/attachment-0001.html>