Revision: 25812
http://sourceforge.net/p/gar/code/25812
Author: dmichelsen
Date: 2016-07-08 12:53:43 +0000 (Fri, 08 Jul 2016)
Log Message:
-----------
collectd/trunk: Make the plugins depend on collectd
Modified Paths:
--------------
csw/mgar/pkg/collectd/trunk/Makefile
Modified: csw/mgar/pkg/collectd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/collectd/trunk/Makefile 2016-07-08 09:50:48 UTC (rev
25811)
+++ csw/mgar/pkg/collectd/trunk/Makefile 2016-07-08 12:53:43 UTC (rev
25812)
@@ -122,12 +122,16 @@
SPKG_DESC_CSWcollectd-plugin-dbi = CollectD Plugin for DBI
PKGFILES_CSWcollectd-plugin-dbi += $(call pkgfiles_lib,collectd/dbi.so)
RUNTIME_DEP_PKGS_CSWcollectd-plugin-dbi += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWcollectd-plugin-dbi += CSWcollectd
+CHECKPKG_OVERRIDES_CSWcollectd-plugin-dbi += surplus-dependency|CSWcollectd
RUNTIME_DEP_PKGS_CSWcollectd-plugin-dbi += CSWlibdbi1
PACKAGES += CSWcollectd-plugin-gmond
SPKG_DESC_CSWcollectd-plugin-gmond = CollectD Plugin for Ganglia gmond
PKGFILES_CSWcollectd-plugin-gmond += $(call pkgfiles_lib,collectd/gmond.so)
RUNTIME_DEP_PKGS_CSWcollectd-plugin-gmond += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWcollectd-plugin-gmond += CSWcollectd
+CHECKPKG_OVERRIDES_CSWcollectd-plugin-gmond += surplus-dependency|CSWcollectd
RUNTIME_DEP_PKGS_CSWcollectd-plugin-gmond += CSWlibganglia0
# No 64 bit ganglia yet
CHECKPKG_OVERRIDES_CSWcollectd-plugin-gmond += 64-bit-binaries-missing
@@ -137,6 +141,8 @@
PKGFILES_CSWcollectd-plugin-java += $(call pkgfiles_lib,collectd/java.so)
PKGFILES_CSWcollectd-plugin-java += $(sharedstatedir)/java/.*
RUNTIME_DEP_PKGS_CSWcollectd-plugin-java += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWcollectd-plugin-java += CSWcollectd
+CHECKPKG_OVERRIDES_CSWcollectd-plugin-java += surplus-dependency|CSWcollectd
RUNTIME_DEP_PKGS_CSWcollectd-plugin-java += CSWjre7
# There are some symlinks that confuse checkpkg
CHECKPKG_OVERRIDES_CSWcollectd-plugin-java +=
soname-not-found|libjvm.so|is|needed|by|opt/csw/lib/sparcv9/collectd/java.so
@@ -148,6 +154,8 @@
SPKG_DESC_CSWcollectd-plugin-mysql = CollectD Plugin for MySQL
PKGFILES_CSWcollectd-plugin-mysql += $(call pkgfiles_lib,collectd/mysql.so)
RUNTIME_DEP_PKGS_CSWcollectd-plugin-mysql += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWcollectd-plugin-mysql += CSWcollectd
+CHECKPKG_OVERRIDES_CSWcollectd-plugin-mysql += surplus-dependency|CSWcollectd
RUNTIME_DEP_PKGS_CSWcollectd-plugin-mysql += CSWlibmysqlclient18
PACKAGES += CSWcollectd-plugin-postgresql
@@ -155,6 +163,8 @@
PKGFILES_CSWcollectd-plugin-postgresql += $(call
pkgfiles_lib,collectd/postgresql.so)
PKGFILES_CSWcollectd-plugin-postgresql +=
$(sharedstatedir)/collectd/postgresql_default.conf
RUNTIME_DEP_PKGS_CSWcollectd-plugin-postgresql += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWcollectd-plugin-postgresql += CSWcollectd
+CHECKPKG_OVERRIDES_CSWcollectd-plugin-postgresql +=
surplus-dependency|CSWcollectd
RUNTIME_DEP_PKGS_CSWcollectd-plugin-postgresql += CSWlibpq5
PACKAGES += CSWcollectd-plugin-python
@@ -162,6 +172,8 @@
PKGFILES_CSWcollectd-plugin-python += $(call pkgfiles_lib,collectd/python.so)
PKGFILES_CSWcollectd-plugin-python += $(mandir)/man5/collectd-python.5
RUNTIME_DEP_PKGS_CSWcollectd-plugin-python += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWcollectd-plugin-python += CSWcollectd
+CHECKPKG_OVERRIDES_CSWcollectd-plugin-python += surplus-dependency|CSWcollectd
RUNTIME_DEP_PKGS_CSWcollectd-plugin-python += CSWlibpython2-7-1-0
# No 64 bit Python yet
CHECKPKG_OVERRIDES_CSWcollectd-plugin-python += 64-bit-binaries-missing
@@ -171,6 +183,8 @@
PKGFILES_CSWcollectd-plugin-rrdtool += $(call pkgfiles_lib,collectd/rrdtool.so)
PKGFILES_CSWcollectd-plugin-rrdtool += $(call
pkgfiles_lib,collectd/rrdcached.so)
RUNTIME_DEP_PKGS_CSWcollectd-plugin-rrdtool += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWcollectd-plugin-rrdtool += CSWcollectd
+CHECKPKG_OVERRIDES_CSWcollectd-plugin-rrdtool += surplus-dependency|CSWcollectd
RUNTIME_DEP_PKGS_CSWcollectd-plugin-rrdtool += CSWlibrrd-th4
PACKAGES += CSWcollectd-plugin-snmp
@@ -178,12 +192,16 @@
PKGFILES_CSWcollectd-plugin-snmp += $(call pkgfiles_lib,collectd/snmp.so)
PKGFILES_CSWcollectd-plugin-snmp += $(mandir)/man5/collectd-snmp.5
RUNTIME_DEP_PKGS_CSWcollectd-plugin-snmp += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWcollectd-plugin-snmp += CSWcollectd
+CHECKPKG_OVERRIDES_CSWcollectd-plugin-snmp += surplus-dependency|CSWcollectd
RUNTIME_DEP_PKGS_CSWcollectd-plugin-snmp += CSWlibnetsnmp30
PACKAGES += CSWcollectd-plugin-xmms
SPKG_DESC_CSWcollectd-plugin-xmms = CollectD Plugin for XMMS
PKGFILES_CSWcollectd-plugin-xmms += $(call pkgfiles_lib,collectd/xmms.so)
RUNTIME_DEP_PKGS_CSWcollectd-plugin-xmms += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWcollectd-plugin-xmms += CSWcollectd
+CHECKPKG_OVERRIDES_CSWcollectd-plugin-xmms += surplus-dependency|CSWcollectd
RUNTIME_DEP_PKGS_CSWcollectd-plugin-xmms += CSWlibxmms1
# This is due to a linker anomaly, these are pulled in also from libxmms.so.1
RUNTIME_DEP_PKGS_CSWcollectd-plugin-xmms-sparc += CSWlibgdk1-2-0
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
