[csw-devel] SF.net SVN: gar:[21746] csw/mgar/pkg/zabbix/trunk

[dmichelsen at users.sourceforge.net]

Revision: 21746
          http://gar.svn.sourceforge.net/gar/?rev=21746&view=rev
Author:   dmichelsen
Date:     2013-08-16 09:35:38 +0000 (Fri, 16 Aug 2013)
Log Message:
-----------
zabbix/trunk: Update to 2.0.7, update dependencies

Modified Paths:
--------------
    csw/mgar/pkg/zabbix/trunk/Makefile
    csw/mgar/pkg/zabbix/trunk/checksums

Modified: csw/mgar/pkg/zabbix/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zabbix/trunk/Makefile	2013-08-16 08:32:56 UTC (rev 21745)
+++ csw/mgar/pkg/zabbix/trunk/Makefile	2013-08-16 09:35:38 UTC (rev 21746)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = zabbix
-VERSION = 2.0.0
+VERSION = 2.0.7
 GARTYPE = v2
 
 DESCRIPTION = Zabbix monitoring system
@@ -15,6 +15,11 @@
 # PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
 
+REINPLACEMENTS += etc
+REINPLACE_MATCH_etc = /usr/local/etc
+REINPLACE_WITH_etc = $(sysconfdir)
+REINPLACE_FILES_etc += conf/zabbix_proxy.conf
+
 # This is just for the server which is in 64 bit only on Solars 10
 BUILD64-5.9 =
 BUILD64-5.10 = 1
@@ -25,10 +30,12 @@
 SPKG_DESC_CSWzabbix-agent = Zabbix monitoring system agent
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibidn11
-RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibz1
-RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibcurl4
+RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibssh2-1
+RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibmysqlclient18
+RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibnetsnmp25
+RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibldap2-4-2
+RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWliblber2-4-2
 
 # These are just examples
 CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/zabbix_agentd.8
@@ -42,10 +49,11 @@
 PKGFILES_CSWzabbix-server += $(call baseisadirs,$(sbindir),zabbix_server)
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibmysqlclient18
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibz1
-RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibcurl4
-RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibidn11
+RUNTIME_DEP_PKGS_CSWzabbix-server += CSWliblber2-4-2
+RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibnetsnmp25
+RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibssh2-1
+RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibldap2-4-2
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-mysql=$(bindir)/mysql_config
@@ -59,6 +67,13 @@
 CONFIGURE_ARGS-5.10-64 += --enable-server
 CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)-$(MEMORYMODEL))
 
+CONFIGURE_ARGS += --enable-proxy
+
+CONFIGURE_ARGS += --with-net-snmp
+# This searches libssh2 in $(prefix)/lib regardless if we are building 64 bit or not
+CONFIGURE_ARGS += --with-ssh2=$(prefix)
+CONFIGURE_ARGS += --with-ldap
+
 PRESERVECONF += $(sysconfdir)/zabbix_agent.conf
 PRESERVECONF += $(sysconfdir)/zabbix_agentd.conf
 

Modified: csw/mgar/pkg/zabbix/trunk/checksums
===================================================================
--- csw/mgar/pkg/zabbix/trunk/checksums	2013-08-16 08:32:56 UTC (rev 21745)
+++ csw/mgar/pkg/zabbix/trunk/checksums	2013-08-16 09:35:38 UTC (rev 21746)
@@ -1 +1 @@
-d34d398beddee0eaa999789100cf74e3  zabbix-2.0.0.tar.gz
+0e86f37e3acecc1e0b618af14edc5346  zabbix-2.0.7.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.