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

[dmichelsen at users.sourceforge.net]

Revision: 18532
          http://gar.svn.sourceforge.net/gar/?rev=18532&view=rev
Author:   dmichelsen
Date:     2012-06-26 07:47:48 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
zabbix/trunk: Update to 2.0.0

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	2012-06-26 07:45:51 UTC (rev 18531)
+++ csw/mgar/pkg/zabbix/trunk/Makefile	2012-06-26 07:47:48 UTC (rev 18532)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = zabbix
-VERSION = 1.8.10
+VERSION = 2.0.0
 GARTYPE = v2
 CATEGORIES = server
 
@@ -13,7 +13,7 @@
 MASTER_SITES = $(SF_MIRROR)
 DISTFILES  = $(DISTNAME).tar.gz
 
-PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386
+# PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
 
 # This is just for the server which is in 64 bit only on Solars 10
@@ -26,20 +26,30 @@
 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
 
+# These are just examples
+CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/zabbix_agentd.8
+CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/zabbix_sender.1
+CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/etc/opt/csw/zabbix_agentd.conf.CSW
+CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/etc/opt/csw/zabbix_agent.conf.CSW
+
 PACKAGES-5.10 += CSWzabbix-server
 PACKAGES += $(PACKAGES-$(GAROSREL))
 SPKG_DESC_CSWzabbix-server = Zabbix monitoring system server
 PKGFILES_CSWzabbix-server += $(call baseisadirs,$(sbindir),zabbix_server)
-RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibmysqlclient15
+RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibmysqlclient18
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibz1
-RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibssl0-9-8
+RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibcurl4
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibidn11
 
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --with-mysql
+CONFIGURE_ARGS += --with-mysql=$(bindir)/mysql_config
 CONFIGURE_ARGS += --with-libcurl
 CONFIGURE_ARGS += --enable-agent
 CONFIGURE_ARGS += --enable-ipv6
@@ -50,5 +60,8 @@
 CONFIGURE_ARGS-5.10-64 += --enable-server
 CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)-$(MEMORYMODEL))
 
+PRESERVECONF += $(sysconfdir)/zabbix_agent.conf
+PRESERVECONF += $(sysconfdir)/zabbix_agentd.conf
+
 include gar/category.mk
 

Modified: csw/mgar/pkg/zabbix/trunk/checksums
===================================================================
--- csw/mgar/pkg/zabbix/trunk/checksums	2012-06-26 07:45:51 UTC (rev 18531)
+++ csw/mgar/pkg/zabbix/trunk/checksums	2012-06-26 07:47:48 UTC (rev 18532)
@@ -1 +1 @@
-7e89f80c1822787c0831f7c0dbefcd7b  zabbix-1.8.10.tar.gz
+d34d398beddee0eaa999789100cf74e3  zabbix-2.0.0.tar.gz

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