zabbix 2.4.4

Closes #38799.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>

1 files changed, 13 insertions, 12 deletions

diff --git a/Library/Formula/zabbix.rb b/Library/Formula/zabbix.rb
index a1cc55709..d4b216233 100644
--- a/Library/Formula/zabbix.rb
+++ b/Library/Formula/zabbix.rb
@@ -1,7 +1,7 @@
 class Zabbix < Formula
   homepage "http://www.zabbix.com/"
-  url "https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/2.4.3/zabbix-2.4.3.tar.gz"
-  sha1 "2173ef62bd0cd499677eae235d803956f4f72d0c"
+  url "https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/2.4.4/zabbix-2.4.4.tar.gz"
+  sha256 "e9f31b96104681b050fd27b4a669736dea9c5d4efc8444effb2bff1eab6cc34c"
 
   bottle do
     sha1 "09ef6fd26dcbe5e0224d30316739a223c136376a" => :yosemite
@@ -10,9 +10,10 @@ class Zabbix < Formula
   end
 
   option "with-mysql", "Use Zabbix Server with MySQL library instead PostgreSQL."
-  option "agent-only", "Install only the Zabbix Agent without Server and Proxy."
+  option "without-server-proxy", "Install only the Zabbix Agent without Server and Proxy."
+  deprecated_option "agent-only" => "without-server-proxy"
 
-  unless build.include? "agent-only"
+  if build.with? "server-proxy"
     depends_on :mysql => :optional
     depends_on :postgresql if build.without? "mysql"
     depends_on "fping"
@@ -25,33 +26,33 @@ class Zabbix < Formula
   end
 
   def install
-    args = %W{
+    args = %W[
       --disable-dependency-tracking
       --prefix=#{prefix}
       --enable-agent
       --with-iconv=#{MacOS.sdk_path}/usr
-    }
+    ]
 
     unless build.include? "agent-only"
-      args += %W{
+      args += %W[
         --enable-server
         --enable-proxy
         --enable-ipv6
         --with-net-snmp
         --with-libcurl
         --with-ssh2
-      }
+      ]
       if build.with? "mysql"
-        args << "--with-mysql=#{brewed_or_shipped('mysql_config')}"
+        args << "--with-mysql=#{brewed_or_shipped("mysql_config")}"
       else
-        args << "--with-postgresql=#{brewed_or_shipped('pg_config')}"
+        args << "--with-postgresql=#{brewed_or_shipped("pg_config")}"
       end
     end
 
     system "./configure", *args
-    system "make install"
+    system "make", "install"
 
-    unless build.include? "agent-only"
+    if build.with? "server-proxy"
       db = build.with?("mysql") ? "mysql" : "postgresql"
       (share/"zabbix").install "frontends/php", "database/#{db}"
     end