SF.net SVN: gar:[25357] csw/mgar/pkg/zabbix/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 25357
          http://sourceforge.net/p/gar/code/25357
Author:   dmichelsen
Date:     2015-11-03 10:50:59 +0000 (Tue, 03 Nov 2015)
Log Message:
-----------
zabbix/trunk: Make version with PostgreSQL support

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

Modified: csw/mgar/pkg/zabbix/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zabbix/trunk/Makefile	2015-11-02 16:09:27 UTC (rev 25356)
+++ csw/mgar/pkg/zabbix/trunk/Makefile	2015-11-03 10:50:59 UTC (rev 25357)
@@ -34,7 +34,8 @@
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibcurl4
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibssh2-1
-RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibmysqlclient18
+#RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibmysqlclient18
+RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibpq5
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibnetsnmp30
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibldap2-4-2
 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWliblber2-4-2
@@ -53,7 +54,8 @@
 PACKAGES += $(PACKAGES-$(GAROSREL))
 SPKG_DESC_CSWzabbix-server = Zabbix monitoring system server
 PKGFILES_CSWzabbix-server += $(call baseisadirs,$(sbindir),zabbix_server)
-RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibmysqlclient18
+#RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibmysqlclient18
+RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibpq5
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibcurl4
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWliblber2-4-2
@@ -61,10 +63,9 @@
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibssh2-1
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibldap2-4-2
 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiksemel3
-RUNTIME_DEP_PKGS_CSWzabbix-server_sparc += CSWlibintl8
 
 # Linker anomaly
-RUNTIME_DEP_PKGS_CSWzabbix-server += $(RUNTIME_DEP_PKGS_CSWzabbix-agent_$(GARCH))
+# RUNTIME_DEP_PKGS_CSWzabbix-server += $(RUNTIME_DEP_PKGS_CSWzabbix-agent_$(GARCH))
 
 # MySQL uses gcc, so we need to do also or the compiler flags bust
 # GARCOMPILER = GCC4
@@ -90,14 +91,18 @@
 
 # We need the latest Solaris 10 for the mysql bindings
 LINKER_MAP_RELEASE =
-CONFIGURE_ARGS += --with-mysql
 
+# CONFIGURE_ARGS += --with-mysql=$(bindir)/mysql_config
 # CONFIGURE_ARGS += --with-sqlite3
-# CONFIGURE_ARGS += --with-postgresql
-CONFIGURE_ARGS += --with-libcurl=$(prefix)/bin/curl-config
 
-CONFIGURE_ARGS += --with-net-snmp=$(prefix)/bin/net-snmp-config
+# PostgreSQL
+CONFIGURE_ARGS += --without-mysql
+CONFIGURE_ARGS += --with-postgresql=$(bindir)/pg_config
 
+CONFIGURE_ARGS += --with-libcurl=$(bindir)/curl-config
+
+CONFIGURE_ARGS += --with-net-snmp=$(bindir)/net-snmp-config
+
 CONFIGURE_ARGS += --with-jabber
 
 PRESERVECONF += $(sysconfdir)/zabbix_agent.conf

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