<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[139307] trunk/dports/net/zabbix2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/139307">139307</a></dd>
<dt>Author</dt> <dd>eborisch@macports.org</dd>
<dt>Date</dt> <dd>2015-08-11 17:01:13 -0700 (Tue, 11 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>zabbix2: Update to 2.4.6; Update startup scripts for mysql flavors when +full_server.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetzabbix2Portfile">trunk/dports/net/zabbix2/Portfile</a></li>
<li><a href="#trunkdportsnetzabbix2fileszabbix_serverinitmysql">trunk/dports/net/zabbix2/files/zabbix_server.init.mysql</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetzabbix2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/zabbix2/Portfile (139306 => 139307)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name zabbix2
</span><del>-version 2.4.5
</del><ins>+version 2.4.6
</ins><span class="cx"> revision 0
</span><span class="cx"> categories net
</span><span class="cx"> maintainers eborisch openmaintainer
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx"> dist_subdir zabbix2
</span><span class="cx">
</span><span class="cx"> checksums \
</span><del>- rmd160 7d771e8fe84e276f2c1ce4378391be9316163f06 \
- sha256 4e2cf1e4893a45d83379a05e2debabddf16beab324c93e84adc0bb57716fb957
</del><ins>+ rmd160 4e58ad3ae67c6d16f473151545cc3567f5762742 \
+ sha256 0ebc6a3326e506cee18826baf2940e39fca3667650f7187e4aa103bf6f7f613c
</ins><span class="cx">
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span><span class="lines">@@ -243,6 +243,10 @@
</span><span class="cx"> ${destroot}${prefix}/share/zabbix/zabbix_server.init
</span><span class="cx"> reinplace "s|__VER__|${ZDB}|g" \
</span><span class="cx"> ${destroot}${prefix}/share/zabbix/zabbix_server.init
</span><ins>+ if {[variant_isset full_server]} {
+ reinplace "s/^#%#//" \
+ ${destroot}${prefix}/share/zabbix/zabbix_server.init
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> xinstall -m 755 ${portpath}/${filesdir}/zabbix_server.init \
</span><span class="cx"> ${destroot}${prefix}/share/zabbix
</span></span></pre></div>
<a id="trunkdportsnetzabbix2fileszabbix_serverinitmysql"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/zabbix2/files/zabbix_server.init.mysql (139306 => 139307)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2,18 +2,19 @@
</span><span class="cx">
</span><span class="cx"> case "$1" in
</span><span class="cx"> start)
</span><del>- 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."
</del><ins>+#%# #### 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."
</ins><span class="cx"> sudo -u zabbix __PREFIX__/sbin/zabbix/zabbix_server \
</span><span class="cx"> -c __PREFIX__/etc/zabbix/zabbix_server.conf
</span><span class="cx"> ;;
</span></span></pre>
</div>
</div>
</body>
</html>