Attachment #134055 for bug #178637

View | Details | Raw Unified | Return to bug 178637
Collapse All | Expand All




OPTIONS_GROUP=		INPUT OUTPUT
OPTIONS_GROUP_OUTPUT=	RRDTOOL RRDCACHED WRITE_GRAPHITE WRITE_HTTP NOTIFYEMAIL
OPTIONS_GROUP_INPUT=	APACHE APCUPS CURL CURL_JSON CURL_XML DBI DISK GCRYPT \
			NUTUPS INTERFACE IPMI MBMON MEMCACHED MODBUS MYSQL NGINX \
			OPENVPN PDNS PGSQL PING PYTHON ROUTEROS SNMP TABLE \
			TOKYOTYRANT VARNISH XMMS


IPMI_DESC=		IPMI plugin (openipmi)
MBMON_DESC=		MBMon 
MEMCACHED_DESC=		Memcached
MODBUS_DESC=		modbus support via libmodbus
MYSQL_DESC=		MySQL
NOTIFYEMAIL_DESC=	Email notifications (libesmtp)
NGINX_DESC=		Nginx

		--disable-match_timediff \
		--disable-match_value \
		--disable-memcachec \
		--disable-modbus \
		--without-libmodbus \
		--disable-multimeter \
		--disable-netapp \
		--without-libnetapp \

PLIST_SUB+=	MEMCACHED="@comment "
.endif

.if ${PORT_OPTIONS:MMODBUS}
CONFIGURE_ARGS+=--enable-modbus
LIB_DEPENDS+=	modbus:${PORTSDIR}/comms/libmodbus
PLIST_SUB+=	MODBUS=""
.else
CONFIGURE_ARGS+=--disable-modbus
PLIST_SUB+=	MODBUS="@comment "
.endif

.if ${PORT_OPTIONS:MMYSQL}
USE_MYSQL=	yes
CONFIGURE_ARGS+=--enable-mysql

Line 0 Link Here

(-)files/patch-src_modbus.c (+12 lines)
	1	--- src/modbus.c.orig 2013-01-27 17:47:18.246255000 +0400
	2	+++ src/modbus.c 2013-05-14 18:40:05.000000000 +0400
	3	@@ -25,6 +25,9 @@
	4	#include "plugin.h"
	5	#include "configfile.h"
	6
	7	+/* FreeBSD needs this */
	8	+#include <sys/socket.h>
	9	+
	10	#include <netdb.h>
	11
	12	#include <modbus/modbus.h>

Lines 56-61 Link Here

(-)pkg-plist (+2 lines)
56	lib/collectd/load.so	56	lib/collectd/load.so
57	lib/collectd/logfile.la	57	lib/collectd/logfile.la
58	lib/collectd/logfile.so	58	lib/collectd/logfile.so
		59	%%MODBUS%%lib/collectd/modbus.la
		60	%%MODBUS%%lib/collectd/modbus.so
59	%%MBMON%%lib/collectd/mbmon.la	61	%%MBMON%%lib/collectd/mbmon.la
60	%%MBMON%%lib/collectd/mbmon.so	62	%%MBMON%%lib/collectd/mbmon.so
61	%%MEMCACHED%%lib/collectd/memcached.la	63	%%MEMCACHED%%lib/collectd/memcached.la

Return to bug 178637

Lines 21-27 Link Here

(-)Makefile (-3 / +11 lines)
21	OPTIONS_GROUP= INPUT OUTPUT	21	OPTIONS_GROUP= INPUT OUTPUT
22	OPTIONS_GROUP_OUTPUT= RRDTOOL RRDCACHED WRITE_GRAPHITE WRITE_HTTP NOTIFYEMAIL	22	OPTIONS_GROUP_OUTPUT= RRDTOOL RRDCACHED WRITE_GRAPHITE WRITE_HTTP NOTIFYEMAIL
23	OPTIONS_GROUP_INPUT= APACHE APCUPS CURL CURL_JSON CURL_XML DBI DISK GCRYPT \	23	OPTIONS_GROUP_INPUT= APACHE APCUPS CURL CURL_JSON CURL_XML DBI DISK GCRYPT \
24	NUTUPS INTERFACE IPMI MBMON MEMCACHED MYSQL NGINX \	24	NUTUPS INTERFACE IPMI MBMON MEMCACHED MODBUS MYSQL NGINX \
25	OPENVPN PDNS PGSQL PING PYTHON ROUTEROS SNMP TABLE \	25	OPENVPN PDNS PGSQL PING PYTHON ROUTEROS SNMP TABLE \
26	TOKYOTYRANT VARNISH XMMS	26	TOKYOTYRANT VARNISH XMMS
27		27
Lines 45-50 Link Here
45	IPMI_DESC= IPMI plugin (openipmi)	45	IPMI_DESC= IPMI plugin (openipmi)
46	MBMON_DESC= MBMon	46	MBMON_DESC= MBMon
47	MEMCACHED_DESC= Memcached	47	MEMCACHED_DESC= Memcached
		48	MODBUS_DESC= modbus support via libmodbus
48	MYSQL_DESC= MySQL	49	MYSQL_DESC= MySQL
49	NOTIFYEMAIL_DESC= Email notifications (libesmtp)	50	NOTIFYEMAIL_DESC= Email notifications (libesmtp)
50	NGINX_DESC= Nginx	51	NGINX_DESC= Nginx
Lines 110-117 Link Here
110	--disable-match_timediff \	111	--disable-match_timediff \
111	--disable-match_value \	112	--disable-match_value \
112	--disable-memcachec \	113	--disable-memcachec \
113	--disable-modbus \
114	--without-libmodbus \
115	--disable-multimeter \	114	--disable-multimeter \
116	--disable-netapp \	115	--disable-netapp \
117	--without-libnetapp \	116	--without-libnetapp \
Lines 288-293 Link Here
288	PLIST_SUB+= MEMCACHED="@comment "	287	PLIST_SUB+= MEMCACHED="@comment "
289	.endif	288	.endif
290		289
		290	.if ${PORT_OPTIONS:MMODBUS}
		291	CONFIGURE_ARGS+=--enable-modbus
		292	LIB_DEPENDS+= modbus:${PORTSDIR}/comms/libmodbus
		293	PLIST_SUB+= MODBUS=""
		294	.else
		295	CONFIGURE_ARGS+=--disable-modbus
		296	PLIST_SUB+= MODBUS="@comment "
		297	.endif
		298
291	.if ${PORT_OPTIONS:MMYSQL}	299	.if ${PORT_OPTIONS:MMYSQL}
292	USE_MYSQL= yes	300	USE_MYSQL= yes
293	CONFIGURE_ARGS+=--enable-mysql	301	CONFIGURE_ARGS+=--enable-mysql