<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"><br><div><div>On Jun 26, 2014, at 10:03 AM, <a href="mailto:eborisch@macports.org">eborisch@macports.org</a> wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div id="msg"><dl class="meta" style="font-family: verdana, arial, helvetica, sans-serif; font-size: 10pt; border: 1px solid rgb(0, 0, 102); background-color: rgb(51, 102, 153); padding: 6px; color: rgb(255, 255, 255); background-position: initial initial; background-repeat: initial initial;"><dt style="font-family: verdana, arial, helvetica, sans-serif; font-size: 10pt; float: left; width: 6em; font-weight: bold;">Revision</dt><dd><a href="https://trac.macports.org/changeset/121475" style="font-weight: bold; color: rgb(204, 204, 102);">121475</a></dd><dt style="font-family: verdana, arial, helvetica, sans-serif; font-size: 10pt; float: left; width: 6em; font-weight: bold;">Author</dt><dd><a href="mailto:eborisch@macports.org" style="font-weight: bold; color: rgb(204, 204, 102);">eborisch@macports.org</a></dd><dt style="font-family: verdana, arial, helvetica, sans-serif; font-size: 10pt; float: left; width: 6em; font-weight: bold;">Date</dt><dd>2014-06-26 09:03:36 -0700 (Thu, 26 Jun 2014)</dd></dl><h3 style="font-family: verdana, arial, helvetica, sans-serif; font-size: 10pt; font-weight: bold;">Log Message</h3><pre style="overflow: auto; background-color: rgb(255, 255, 204); border: 1px solid rgb(255, 170, 0); padding: 6px; background-position: initial initial; background-repeat: initial initial;">zabbix2[-agent]: Upgrade to 2.2.4</pre><h3 style="font-family: verdana, arial, helvetica, sans-serif; font-size: 10pt; font-weight: bold;">Modified Paths</h3><ul style="font-family: verdana, arial, helvetica, sans-serif; font-size: 10pt;"><li style="font-family: verdana, arial, helvetica, sans-serif; font-size: 10pt;"><a href="x-msg://10/#trunkdportsnetzabbix2Portfile">trunk/dports/net/zabbix2/Portfile</a></li><li style="font-family: verdana, arial, helvetica, sans-serif; font-size: 10pt;"><a href="x-msg://10/#trunkdportsnetzabbix2fileszabbix_serverinit">trunk/dports/net/zabbix2/files/zabbix_server.init</a></li><li style="font-family: verdana, arial, helvetica, sans-serif; font-size: 10pt;"><a href="x-msg://10/#trunkdportsnetzabbix2fileszabbix_serverinitmysql">trunk/dports/net/zabbix2/files/zabbix_server.init.mysql</a></li></ul></div><div id="patch" style="width: 1548px;"><h3 style="font-family: verdana, arial, helvetica, sans-serif; font-size: 10pt; font-weight: bold;">Diff</h3><a id="trunkdportsnetzabbix2Portfile"></a><div class="modfile" style="border: 1px solid rgb(204, 204, 204); margin: 10px 0px; position: static; z-index: auto;"><h4 style="font-family: verdana, arial, helvetica, sans-serif; font-size: 10pt; padding: 8px; background-color: rgb(51, 102, 153); color: rgb(255, 255, 255); margin: 0px; position: static; z-index: auto;">Modified: trunk/dports/net/zabbix2/Portfile (121474 => 121475)</h4><pre class="diff" style="padding: 0px 0px 10px; line-height: 1.2em; margin: 0px; width: 1546px; background-color: rgb(238, 238, 238); overflow: auto; background-position: initial initial; background-repeat: initial initial;"><span style="display: block; padding: 0px 10px;">
<span class="info" style="color: rgb(136, 136, 136); background-color: rgb(255, 255, 255); display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">--- trunk/dports/net/zabbix2/Portfile 2014-06-26 15:55:32 UTC (rev 121474)
+++ trunk/dports/net/zabbix2/Portfile 2014-06-26 16:03:36 UTC (rev 121475)
</span><span class="lines" style="display: block; padding: 0px 10px; color: rgb(136, 136, 136); background-color: rgb(255, 255, 255); background-position: initial initial; background-repeat: initial initial;">@@ -4,10 +4,10 @@
</span><span class="cx" style="display: block; padding: 0px 10px;"> PortSystem 1.0
</span><span class="cx" style="display: block; padding: 0px 10px;">
</span><span class="cx" style="display: block; padding: 0px 10px;"> name zabbix2
</span><del style="background-color: rgb(255, 221, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">-version 2.2.1
</del><ins style="background-color: rgb(221, 255, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">+version 2.2.4
</ins><span class="cx" style="display: block; padding: 0px 10px;"> revision 0
</span><span class="cx" style="display: block; padding: 0px 10px;"> categories net
</span><del style="background-color: rgb(255, 221, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">-maintainers nomaintainer
</del><ins style="background-color: rgb(221, 255, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">+maintainers eborisch, openmaintainer
</ins></span></pre></div></div></div></blockquote><div>It is not correct to use a comma here. </div><div><br></div><div><font face="Monaco">$ port info --maintainers zabbix2<br>maintainers: eborisch,@<a href="http://macports.org">macports.org</a>, <a href="mailto:openmaintainer@macports.org">openmaintainer@macports.org</a></font></div><div><br></div><br><blockquote type="cite"><div style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div id="patch" style="width: 1548px;"><div class="modfile" style="border: 1px solid rgb(204, 204, 204); margin: 10px 0px; position: static; z-index: auto;"><pre class="diff" style="padding: 0px 0px 10px; line-height: 1.2em; margin: 0px; width: 1546px; background-color: rgb(238, 238, 238); overflow: auto; background-position: initial initial; background-repeat: initial initial;"><span style="display: block; padding: 0px 10px;"><span class="cx" style="display: block; padding: 0px 10px;"> platforms darwin
</span><span class="cx" style="display: block; padding: 0px 10px;">
</span><span class="cx" style="display: block; padding: 0px 10px;"> license GPL-2
</span><span class="lines" style="display: block; padding: 0px 10px; color: rgb(136, 136, 136); background-color: rgb(255, 255, 255); background-position: initial initial; background-repeat: initial initial;">@@ -27,21 +27,18 @@
</span><span class="cx" style="display: block; padding: 0px 10px;"> master_sites \
</span><span class="cx" style="display: block; padding: 0px 10px;"> sourceforge:project/zabbix/ZABBIX%20Latest%20Stable/${version} \
</span><span class="cx" style="display: block; padding: 0px 10px;"> sourceforge:project/zabbix/ZABBIX%20Release%20Candidates/${version}
</span><ins style="background-color: rgb(221, 255, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">+dist_subdir zabbix2
</ins><span class="cx" style="display: block; padding: 0px 10px;">
</span><span class="cx" style="display: block; padding: 0px 10px;"> checksums \
</span><del style="background-color: rgb(255, 221, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">- rmd160 24cfecc6825245b8a3ae15c23ffe38236cd37cd4 \
- sha256 29c9e4cefb527bf929797b26a5a1d8a07c55675bfe6a86ff9ef8e46bd792c7fb
</del><ins style="background-color: rgb(221, 255, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">+ rmd160 fc6043a63975ecb3ba7757e3de52ba82f1978e3a \
+ sha256 33654ed8a74280a38ff89b9deba400e1305086bdf75815f8b76dd6129a9ec781
</ins><span class="cx" style="display: block; padding: 0px 10px;">
</span><span class="cx" style="display: block; padding: 0px 10px;"> universal_variant no
</span><span class="cx" style="display: block; padding: 0px 10px;">
</span><del style="background-color: rgb(255, 221, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">-depends_lib port:OpenIPMI
-
</del><span class="cx" style="display: block; padding: 0px 10px;"> conflicts zabbix
</span><span class="cx" style="display: block; padding: 0px 10px;">
</span><del style="background-color: rgb(255, 221, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">-dist_subdir zabbix2
</del><ins style="background-color: rgb(221, 255, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">+subport zabbix2-agent {}
</ins><span class="cx" style="display: block; padding: 0px 10px;">
</span><del style="background-color: rgb(255, 221, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">-subport zabbix2-agent {}
-
</del><span class="cx" style="display: block; padding: 0px 10px;"> configure.args --bindir=${prefix}/bin/zabbix \
</span><span class="cx" style="display: block; padding: 0px 10px;"> --sbindir=${prefix}/sbin/zabbix \
</span><span class="cx" style="display: block; padding: 0px 10px;"> --libexecdir=${prefix}/libexec/zabbix \
</span><span class="lines" style="display: block; padding: 0px 10px; color: rgb(136, 136, 136); background-color: rgb(255, 255, 255); background-position: initial initial; background-repeat: initial initial;">@@ -49,8 +46,6 @@
</span><span class="cx" style="display: block; padding: 0px 10px;"> --sysconfdir=${prefix}/etc/zabbix \
</span><span class="cx" style="display: block; padding: 0px 10px;"> --localstatedir=${prefix}/var/zabbix
</span><span class="cx" style="display: block; padding: 0px 10px;">
</span><del style="background-color: rgb(255, 221, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">-configure.args-append --with-openipmi=${prefix}
-
</del><span class="cx" style="display: block; padding: 0px 10px;"> configure.ldflags-append -lresolv
</span><span class="cx" style="display: block; padding: 0px 10px;">
</span><span class="cx" style="display: block; padding: 0px 10px;"> startupitem.create yes
</span><span class="lines" style="display: block; padding: 0px 10px; color: rgb(136, 136, 136); background-color: rgb(255, 255, 255); background-position: initial initial; background-repeat: initial initial;">@@ -64,9 +59,12 @@
</span><span class="cx" style="display: block; padding: 0px 10px;">
</span><span class="cx" style="display: block; padding: 0px 10px;"> configure.args-append --enable-agent
</span><span class="cx" style="display: block; padding: 0px 10px;"> } else {
</span><del style="background-color: rgb(255, 221, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">- depends_lib-append port:fping \
</del><ins style="background-color: rgb(221, 255, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">+ depends_lib-append port:apache2 \
</ins><span class="cx" style="display: block; padding: 0px 10px;"> port:curl \
</span><del style="background-color: rgb(255, 221, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">- port:apache2 \
</del><ins style="background-color: rgb(221, 255, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">+ port:fping \
+ port:libssh2 \
+ port:net-snmp \
+ port:OpenIPMI \
</ins><span class="cx" style="display: block; padding: 0px 10px;"> port:php5 \
</span><span class="cx" style="display: block; padding: 0px 10px;"> port:php5-gd \
</span><span class="cx" style="display: block; padding: 0px 10px;"> port:php5-gettext \
</span><span class="lines" style="display: block; padding: 0px 10px; color: rgb(136, 136, 136); background-color: rgb(255, 255, 255); background-position: initial initial; background-repeat: initial initial;">@@ -75,7 +73,9 @@
</span><span class="cx" style="display: block; padding: 0px 10px;">
</span><span class="cx" style="display: block; padding: 0px 10px;"> configure.args-append --enable-server \
</span><span class="cx" style="display: block; padding: 0px 10px;"> --with-libcurl=${prefix}/bin/curl-config \
</span><del style="background-color: rgb(255, 221, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">- --with-net-snmp
</del><ins style="background-color: rgb(221, 255, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">+ --with-net-snmp \
+ --with-openipmi=${prefix} \
+ --with-ssh2=${prefix}
</ins><span class="cx" style="display: block; padding: 0px 10px;">
</span><span class="cx" style="display: block; padding: 0px 10px;"> startupitem.name zabbix2-server
</span><span class="cx" style="display: block; padding: 0px 10px;"> startupitem.start "${prefix}/share/zabbix/zabbix_server.init start"
</span><span class="lines" style="display: block; padding: 0px 10px; color: rgb(136, 136, 136); background-color: rgb(255, 255, 255); background-position: initial initial; background-repeat: initial initial;">@@ -111,7 +111,9 @@
</span><span class="cx" style="display: block; padding: 0px 10px;"> sqlite3 {"SQLite 3.x" sqlite3 \
</span><span class="cx" style="display: block; padding: 0px 10px;"> sqlite3=${prefix} sqlite}
</span><span class="cx" style="display: block; padding: 0px 10px;"> }
</span><ins style="background-color: rgb(221, 255, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">+
</ins><span class="cx" style="display: block; padding: 0px 10px;"> set DBLIST_KEYS [lsort [array names DBLIST]]
</span><ins style="background-color: rgb(221, 255, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">+
</ins><span class="cx" style="display: block; padding: 0px 10px;"> foreach dbitem $DBLIST_KEYS {
</span><span class="cx" style="display: block; padding: 0px 10px;"> set this_key [lsearch -exact $DBLIST_KEYS $dbitem]
</span><span class="cx" style="display: block; padding: 0px 10px;"> set conf_list [lreplace $DBLIST_KEYS $this_key $this_key]
</span><span class="lines" style="display: block; padding: 0px 10px; color: rgb(136, 136, 136); background-color: rgb(255, 255, 255); background-position: initial initial; background-repeat: initial initial;">@@ -165,7 +167,7 @@
</span><span class="cx" style="display: block; padding: 0px 10px;"> }
</span><span class="cx" style="display: block; padding: 0px 10px;">
</span><span class="cx" style="display: block; padding: 0px 10px;"> variant date_slash description {
</span><del style="background-color: rgb(255, 221, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">- Draw date/month rather than date.month on line graphs.
</del><ins style="background-color: rgb(221, 255, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">+ Draw month/day rather than day.month on line graphs.
</ins><span class="cx" style="display: block; padding: 0px 10px;"> } {}
</span><span class="cx" style="display: block; padding: 0px 10px;"> }
</span><span class="cx" style="display: block; padding: 0px 10px;">
</span><span class="lines" style="display: block; padding: 0px 10px; color: rgb(136, 136, 136); background-color: rgb(255, 255, 255); background-position: initial initial; background-repeat: initial initial;">@@ -179,7 +181,7 @@
</span><span class="cx" style="display: block; padding: 0px 10px;"> }
</span><span class="cx" style="display: block; padding: 0px 10px;">
</span><span class="cx" style="display: block; padding: 0px 10px;"> if {[variant_isset date_slash]} {
</span><del style="background-color: rgb(255, 221, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">- reinplace -E {s|[[:<:]]d\.m[[:>:]]|d/m|g} \
</del><ins style="background-color: rgb(221, 255, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">+ reinplace -E {s|[[:<:]]d\.m[[:>:]]|m/d|g} \
</ins><span class="cx" style="display: block; padding: 0px 10px;"> frontends/php/include/classes/graphdraw/CLineGraphDraw.php
</span><span class="cx" style="display: block; padding: 0px 10px;"> }
</span><span class="cx" style="display: block; padding: 0px 10px;"> }
</span><span class="lines" style="display: block; padding: 0px 10px; color: rgb(136, 136, 136); background-color: rgb(255, 255, 255); background-position: initial initial; background-repeat: initial initial;">@@ -365,22 +367,22 @@
</span><span class="cx" style="display: block; padding: 0px 10px;"> #### ####
</span><span class="cx" style="display: block; padding: 0px 10px;">
</span><span class="cx" style="display: block; padding: 0px 10px;">
</span><del style="background-color: rgb(255, 221, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! ZABBIX -> ZABBIX2 Server Upgrade process !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! 0) BACK UP YOUR DATABASE !!
-!! !!
-!! 1) Be sure to use 'sudo port unload zabbix' to stop the background !!
-!! server before deactivating zabbix, and then use !!
-!! 'sudo port load zabbix2' **AFTER UPGRADING THE DATABASE** as !!
-!! described below. !!
-!! !!
-!! 2) For upgrading from 1.8 (zabbix -> zabbix2), upgrade scripts are !!
-!! located in ${prefix}/share/zabbix/upgrades !!
-!! !!
-!! For upgrade procedure, please see !!
-!! <a href="http://www.zabbix.com/documentation/2.0/manual/installation/upgrade">http://www.zabbix.com/documentation/2.0/manual/installation/upgrade</a> !!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
</del><ins style="background-color: rgb(221, 255, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! ZABBIX -> ZABBIX2 Server Upgrade process !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! 0) BACK UP YOUR DATABASE !!
+!! !!
+!! 1) Be sure to use 'sudo port unload zabbix' to stop the background !!
+!! server before deactivating zabbix, and then use !!
+!! 'sudo port load zabbix2' **AFTER UPGRADING THE DATABASE** as !!
+!! described below. !!
+!! !!
+!! 2) For upgrading from 1.8 (zabbix -> zabbix2), upgrade scripts are !!
+!! located in ${prefix}/share/zabbix/upgrades !!
+!! !!
+!! For upgrade procedure, please see !!
+!! <a href="http://www.zabbix.com/documentation/2.0/manual/installation/upgrade">http://www.zabbix.com/documentation/2.0/manual/installation/upgrade</a> !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
</ins><span class="cx" style="display: block; padding: 0px 10px;"> "
</span><span class="cx" style="display: block; padding: 0px 10px;"> }
</span></span></pre></div><a id="trunkdportsnetzabbix2fileszabbix_serverinit"></a><div class="modfile" style="border: 1px solid rgb(204, 204, 204); margin: 10px 0px;"><h4 style="font-family: verdana, arial, helvetica, sans-serif; font-size: 10pt; padding: 8px; background-color: rgb(51, 102, 153); color: rgb(255, 255, 255); margin: 0px; background-position: initial initial; background-repeat: initial initial;">Modified: trunk/dports/net/zabbix2/files/zabbix_server.init (121474 => 121475)</h4><pre class="diff" style="padding: 0px 0px 10px; line-height: 1.2em; margin: 0px; width: 1546px; background-color: rgb(238, 238, 238); overflow: auto; background-position: initial initial; background-repeat: initial initial;"><span style="display: block; padding: 0px 10px;">
<span class="info" style="color: rgb(136, 136, 136); background-color: rgb(255, 255, 255); display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">--- trunk/dports/net/zabbix2/files/zabbix_server.init 2014-06-26 15:55:32 UTC (rev 121474)
+++ trunk/dports/net/zabbix2/files/zabbix_server.init 2014-06-26 16:03:36 UTC (rev 121475)
</span><span class="lines" style="display: block; padding: 0px 10px; color: rgb(136, 136, 136); background-color: rgb(255, 255, 255); background-position: initial initial; background-repeat: initial initial;">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0px 10px;"> ;;
</span><span class="cx" style="display: block; padding: 0px 10px;">
</span><span class="cx" style="display: block; padding: 0px 10px;"> stop)
</span><del style="background-color: rgb(255, 221, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">- echo -n "Shutting down zabbix_server"
</del><ins style="background-color: rgb(221, 255, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">+ echo "Shutting down zabbix_server"
</ins><span class="cx" style="display: block; padding: 0px 10px;"> pid=`ps axc|awk "{if (\\$5==\"zabbix_server\") print \\$1}"`
</span><span class="cx" style="display: block; padding: 0px 10px;"> /bin/kill $pid
</span><span class="cx" style="display: block; padding: 0px 10px;"> rm /tmp/zabbix_server.pid
</span></span></pre></div><a id="trunkdportsnetzabbix2fileszabbix_serverinitmysql"></a><div class="modfile" style="border: 1px solid rgb(204, 204, 204); margin: 10px 0px;"><h4 style="font-family: verdana, arial, helvetica, sans-serif; font-size: 10pt; padding: 8px; background-color: rgb(51, 102, 153); color: rgb(255, 255, 255); margin: 0px; background-position: initial initial; background-repeat: initial initial;">Modified: trunk/dports/net/zabbix2/files/zabbix_server.init.mysql (121474 => 121475)</h4><pre class="diff" style="padding: 0px 0px 10px; line-height: 1.2em; margin: 0px; width: 1546px; background-color: rgb(238, 238, 238); overflow: auto; background-position: initial initial; background-repeat: initial initial;"><span style="display: block; padding: 0px 10px;">
<span class="info" style="color: rgb(136, 136, 136); background-color: rgb(255, 255, 255); display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">--- trunk/dports/net/zabbix2/files/zabbix_server.init.mysql 2014-06-26 15:55:32 UTC (rev 121474)
+++ trunk/dports/net/zabbix2/files/zabbix_server.init.mysql 2014-06-26 16:03:36 UTC (rev 121475)
</span><span class="lines" style="display: block; padding: 0px 10px; color: rgb(136, 136, 136); background-color: rgb(255, 255, 255); background-position: initial initial; background-repeat: initial initial;">@@ -2,14 +2,24 @@
</span><span class="cx" style="display: block; padding: 0px 10px;">
</span><span class="cx" style="display: block; padding: 0px 10px;"> case "$1" in
</span><span class="cx" style="display: block; padding: 0px 10px;"> start)
</span><del style="background-color: rgb(255, 221, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">- echo -n "Zabbix_server - waiting for SQL server to start."
- while [ ! -e __PREFIX__/var/run/__VER__/mysqld.sock ]; do sleep 5; echo -n .; done
- echo " SQL server online; starting zabbix_server."
- sudo -u zabbix __PREFIX__/sbin/zabbix/zabbix_server -c __PREFIX__/etc/zabbix/zabbix_server.conf
</del><ins style="background-color: rgb(221, 255, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">+ 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
</ins><span class="cx" style="display: block; padding: 0px 10px;"> ;;
</span><span class="cx" style="display: block; padding: 0px 10px;">
</span><span class="cx" style="display: block; padding: 0px 10px;"> stop)
</span><del style="background-color: rgb(255, 221, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">- echo -n "Shutting down zabbix_server"
</del><ins style="background-color: rgb(221, 255, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">+ echo "Shutting down zabbix_server"
</ins><span class="cx" style="display: block; padding: 0px 10px;"> pid=`ps axc|awk "{if (\\$5==\"zabbix_server\") print \\$1}"`
</span><span class="cx" style="display: block; padding: 0px 10px;"> /bin/kill $pid
</span><span class="cx" style="display: block; padding: 0px 10px;"> rm /tmp/zabbix_server.pid
</span></span></pre></div></div>_______________________________________________<br>macports-changes mailing list<br><a href="mailto:macports-changes@lists.macosforge.org">macports-changes@lists.macosforge.org</a><br><a href="https://lists.macosforge.org/mailman/listinfo/macports-changes">https://lists.macosforge.org/mailman/listinfo/macports-changes</a></div></blockquote></div><br></body></html>