[139307] trunk/dports/net/zabbix2

[eborisch at macports.org]

Revision: 139307
          https://trac.macports.org/changeset/139307
Author:   eborisch at macports.org
Date:     2015-08-11 17:01:13 -0700 (Tue, 11 Aug 2015)
Log Message:
-----------
zabbix2: Update to 2.4.6; Update startup scripts for mysql flavors when +full_server.

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	2015-08-11 21:08:26 UTC (rev 139306)
+++ trunk/dports/net/zabbix2/Portfile	2015-08-12 00:01:13 UTC (rev 139307)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                zabbix2
-version             2.4.5
+version             2.4.6
 revision            0
 categories          net
 maintainers         eborisch openmaintainer
@@ -30,8 +30,8 @@
 dist_subdir         zabbix2
 
 checksums \
-    rmd160  7d771e8fe84e276f2c1ce4378391be9316163f06 \
-    sha256  4e2cf1e4893a45d83379a05e2debabddf16beab324c93e84adc0bb57716fb957
+    rmd160  4e58ad3ae67c6d16f473151545cc3567f5762742 \
+    sha256  0ebc6a3326e506cee18826baf2940e39fca3667650f7187e4aa103bf6f7f613c
 
 universal_variant   no
 
@@ -243,6 +243,10 @@
                 ${destroot}${prefix}/share/zabbix/zabbix_server.init
             reinplace "s|__VER__|${ZDB}|g" \
                 ${destroot}${prefix}/share/zabbix/zabbix_server.init
+            if {[variant_isset full_server]} {
+                reinplace "s/^#%#//" \
+                    ${destroot}${prefix}/share/zabbix/zabbix_server.init
+            }
         } else {
             xinstall -m 755 ${portpath}/${filesdir}/zabbix_server.init \
                 ${destroot}${prefix}/share/zabbix

Modified: trunk/dports/net/zabbix2/files/zabbix_server.init.mysql
===================================================================
--- trunk/dports/net/zabbix2/files/zabbix_server.init.mysql	2015-08-11 21:08:26 UTC (rev 139306)
+++ trunk/dports/net/zabbix2/files/zabbix_server.init.mysql	2015-08-12 00:01:13 UTC (rev 139307)
@@ -2,18 +2,19 @@
 
 case "$1" in
     start)
-        echo "Zabbix_server init - will wait ${MAX_WAIT}s for __VER__ to start."
-        MAX_WAIT=120
-        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
-            fi
-            sleep 5
-            let MAX_WAIT=MAX_WAIT-5
-            echo .
-        done
-        echo "SQL server online; starting zabbix_server."
+#%#        #### Wait for mysql server 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
+#%#            fi
+#%#            sleep 5
+#%#            let MAX_WAIT=MAX_WAIT-5
+#%#            echo .
+#%#        done
+#%#        echo "SQL server online; starting zabbix_server."
         sudo -u zabbix __PREFIX__/sbin/zabbix/zabbix_server \
              -c __PREFIX__/etc/zabbix/zabbix_server.conf
         ;;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150811/2e5280d7/attachment.html>