Changeset View
Changeset View
Standalone View
Standalone View
head/net-mgmt/collectd5/files/patch-src__Makefile.am
--- src/Makefile.am.orig 2013-08-18 04:24:25.061973000 -0600 | --- src/Makefile.am.orig 2015-05-26 19:38:14 UTC | ||||
+++ src/Makefile.am 2013-08-20 21:34:14.000000000 -0600 | +++ src/Makefile.am | ||||
@@ -10,7 +10,7 @@ | @@ -14,7 +14,7 @@ AM_CPPFLAGS = -I$(srcdir)/daemon | ||||
AM_CPPFLAGS = -DPREFIX='"${prefix}"' | AM_CPPFLAGS += -DPREFIX='"${prefix}"' | ||||
AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' | AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' | ||||
AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"' | AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"' | ||||
-AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' | -AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' | ||||
+AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"' | +AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/db/${PACKAGE_NAME}"' | ||||
if BUILD_FEATURE_DAEMON | if BUILD_FEATURE_DAEMON | ||||
AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"' | AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"' | ||||
endif | endif | ||||
@@ -64,7 +64,7 @@ | @@ -218,7 +218,7 @@ cpu_la_CFLAGS = $(AM_CFLAGS) | ||||
collectd_LDADD += -lpthread | cpu_la_LDFLAGS = $(PLUGIN_LDFLAGS) | ||||
endif | |||||
if BUILD_WITH_LIBKSTAT | |||||
-collectd_LDADD += -lkstat | |||||
+collectd_LDADD += $(BUILD_WITH_LIBKSTAT_LIBS) | |||||
endif | |||||
if BUILD_WITH_LIBDEVINFO | |||||
collectd_LDADD += -ldevinfo | |||||
@@ -275,7 +275,7 @@ | |||||
cpu_la_LDFLAGS = -module -avoid-version | |||||
cpu_la_LIBADD = | cpu_la_LIBADD = | ||||
if BUILD_WITH_LIBKSTAT | if BUILD_WITH_LIBKSTAT | ||||
-cpu_la_LIBADD += -lkstat | -cpu_la_LIBADD += -lkstat | ||||
+cpu_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) | +cpu_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) | ||||
endif | endif | ||||
if BUILD_WITH_LIBDEVINFO | if BUILD_WITH_LIBDEVINFO | ||||
cpu_la_LIBADD += -ldevinfo | cpu_la_LIBADD += -ldevinfo | ||||
@@ -373,7 +373,7 @@ | @@ -303,7 +303,7 @@ disk_la_CFLAGS = $(AM_CFLAGS) | ||||
disk_la_LDFLAGS = -module -avoid-version | disk_la_LDFLAGS = $(PLUGIN_LDFLAGS) | ||||
disk_la_LIBADD = | disk_la_LIBADD = | ||||
if BUILD_WITH_LIBKSTAT | if BUILD_WITH_LIBKSTAT | ||||
-disk_la_LIBADD += -lkstat | -disk_la_LIBADD += -lkstat | ||||
+disk_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) | +disk_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) | ||||
endif | endif | ||||
if BUILD_WITH_LIBDEVINFO | if BUILD_WITH_LIBDEVINFO | ||||
disk_la_LIBADD += -ldevinfo | disk_la_LIBADD += -ldevinfo | ||||
@@ -480,7 +480,7 @@ | @@ -408,7 +408,7 @@ interface_la_CFLAGS += $(BUILD_WITH_LIBS | ||||
interface_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) | interface_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) | ||||
else | else | ||||
if BUILD_WITH_LIBKSTAT | if BUILD_WITH_LIBKSTAT | ||||
-interface_la_LIBADD += -lkstat | -interface_la_LIBADD += -lkstat | ||||
+interface_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) | +interface_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) | ||||
endif | endif | ||||
if BUILD_WITH_LIBDEVINFO | if BUILD_WITH_LIBDEVINFO | ||||
interface_la_LIBADD += -ldevinfo | interface_la_LIBADD += -ldevinfo | ||||
@@ -694,7 +694,7 @@ | @@ -591,7 +591,7 @@ memory_la_CFLAGS = $(AM_CFLAGS) | ||||
collectd_LDADD += "-dlopen" memory.la | memory_la_LDFLAGS = $(PLUGIN_LDFLAGS) | ||||
collectd_DEPENDENCIES += memory.la | memory_la_LIBADD = | ||||
if BUILD_WITH_LIBKSTAT | if BUILD_WITH_LIBKSTAT | ||||
-memory_la_LIBADD += -lkstat | -memory_la_LIBADD += -lkstat | ||||
+memory_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) | +memory_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) | ||||
endif | endif | ||||
if BUILD_WITH_LIBDEVINFO | if BUILD_WITH_LIBDEVINFO | ||||
memory_la_LIBADD += -ldevinfo | memory_la_LIBADD += -ldevinfo | ||||
@@ -823,7 +823,7 @@ | @@ -964,7 +964,7 @@ swap_la_CFLAGS = $(AM_CFLAGS) | ||||
pkglib_LTLIBRARIES += notify_email.la | swap_la_LDFLAGS = $(PLUGIN_LDFLAGS) | ||||
notify_email_la_SOURCES = notify_email.c | swap_la_LIBADD = | ||||
notify_email_la_LDFLAGS = -module -avoid-version | |||||
-notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread -ldl | |||||
+notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread | |||||
collectd_LDADD += "-dlopen" notify_email.la | |||||
collectd_DEPENDENCIES += notify_email.la | |||||
endif | |||||
@@ -1108,7 +1108,7 @@ | |||||
collectd_LDADD += "-dlopen" swap.la | |||||
collectd_DEPENDENCIES += swap.la | |||||
if BUILD_WITH_LIBKSTAT | if BUILD_WITH_LIBKSTAT | ||||
-swap_la_LIBADD += -lkstat | -swap_la_LIBADD += -lkstat | ||||
+swap_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) | +swap_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) | ||||
endif | endif | ||||
if BUILD_WITH_LIBDEVINFO | if BUILD_WITH_LIBDEVINFO | ||||
swap_la_LIBADD += -ldevinfo | swap_la_LIBADD += -ldevinfo | ||||
@@ -1162,7 +1162,7 @@ | @@ -1010,7 +1010,7 @@ if BUILD_PLUGIN_TAPE | ||||
pkglib_LTLIBRARIES += tape.la | pkglib_LTLIBRARIES += tape.la | ||||
tape_la_SOURCES = tape.c | tape_la_SOURCES = tape.c | ||||
tape_la_LDFLAGS = -module -avoid-version | tape_la_LDFLAGS = $(PLUGIN_LDFLAGS) | ||||
-tape_la_LIBADD = -lkstat -ldevinfo | -tape_la_LIBADD = -lkstat -ldevinfo | ||||
+tape_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS) -ldevinfo | +tape_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS) -ldevinfo | ||||
collectd_LDADD += "-dlopen" tape.la | |||||
collectd_DEPENDENCIES += tape.la | |||||
endif | endif | ||||
@@ -1285,7 +1285,7 @@ | |||||
uptime_la_LDFLAGS = -module -avoid-version | if BUILD_PLUGIN_TARGET_NOTIFICATION | ||||
@@ -1116,7 +1116,7 @@ uptime_la_CFLAGS = $(AM_CFLAGS) | |||||
uptime_la_LDFLAGS = $(PLUGIN_LDFLAGS) | |||||
uptime_la_LIBADD = | uptime_la_LIBADD = | ||||
if BUILD_WITH_LIBKSTAT | if BUILD_WITH_LIBKSTAT | ||||
-uptime_la_LIBADD += -lkstat | -uptime_la_LIBADD += -lkstat | ||||
+uptime_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) | +uptime_la_LIBADD += $(BUILD_WITH_LIBKSTAT_LIBS) | ||||
endif | endif | ||||
if BUILD_WITH_PERFSTAT | if BUILD_WITH_PERFSTAT | ||||
uptime_la_LIBADD += -lperfstat | uptime_la_LIBADD += -lperfstat | ||||
@@ -1519,12 +1519,7 @@ | @@ -1275,7 +1275,7 @@ if BUILD_LINUX | ||||
# zfs_arc requires no library on linux | |||||
else | |||||
# solaris | |||||
-zfs_arc_la_LIBADD = -lkstat | |||||
+zfs_arc_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS) | |||||
endif | |||||
endif | |||||
endif | |||||
@@ -1364,12 +1364,7 @@ endif | |||||
install-exec-hook: | install-exec-hook: | ||||
$(mkinstalldirs) $(DESTDIR)$(sysconfdir) | $(mkinstalldirs) $(DESTDIR)$(sysconfdir) | ||||
- if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \ | - if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \ | ||||
- then \ | - then \ | ||||
- $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \ | - $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \ | ||||
- else \ | - else \ | ||||
- $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \ | - $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \ | ||||
- fi; \ | - fi; \ | ||||
+ $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.sample | + $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.sample | ||||
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir) | $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) | ||||
$(INSTALL) -m 0644 $(srcdir)/types.db $(DESTDIR)$(pkgdatadir)/types.db; | $(INSTALL) -m 0644 $(srcdir)/types.db $(DESTDIR)$(pkgdatadir)/types.db; | ||||
$(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \ | $(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \ |