Attachment 134055 Details for Bug 178637 – file.diff

[patch] file.diff

file.diff (text/plain), 2.57 KB, created by Boris Samorodov on 2013-05-14 17:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Boris Samorodov

Created: 2013-05-14 17:50:00 UTC

Size: 2.57 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 317544)
>+++ Makefile	(working copy)
>@@ -21,7 +21,7 @@
> 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 MYSQL NGINX \
>+			NUTUPS INTERFACE IPMI MBMON MEMCACHED MODBUS MYSQL NGINX \
> 			OPENVPN PDNS PGSQL PING PYTHON ROUTEROS SNMP TABLE \
> 			TOKYOTYRANT VARNISH XMMS
> 
>@@ -45,6 +45,7 @@
> 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
>@@ -110,8 +111,6 @@
> 		--disable-match_timediff \
> 		--disable-match_value \
> 		--disable-memcachec \
>-		--disable-modbus \
>-		--without-libmodbus \
> 		--disable-multimeter \
> 		--disable-netapp \
> 		--without-libnetapp \
>@@ -288,6 +287,15 @@
> 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
>Index: files/patch-src_modbus.c
>===================================================================
>--- files/patch-src_modbus.c	(revision 0)
>+++ files/patch-src_modbus.c	(working copy)
>@@ -0,0 +1,12 @@
>+--- src/modbus.c.orig       2013-01-27 17:47:18.246255000 +0400
>++++ src/modbus.c    2013-05-14 18:40:05.000000000 +0400
>+@@ -25,6 +25,9 @@
>+ #include "plugin.h"
>+ #include "configfile.h"
>+ 
>++/* FreeBSD needs this */
>++#include <sys/socket.h> 
>++
>+ #include <netdb.h>
>+ 
>+ #include <modbus/modbus.h>
>
>Property changes on: files/patch-src_modbus.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 317544)
>+++ pkg-plist	(working copy)
>@@ -56,6 +56,8 @@
> lib/collectd/load.so
> lib/collectd/logfile.la
> lib/collectd/logfile.so
>+%%MODBUS%%lib/collectd/modbus.la
>+%%MODBUS%%lib/collectd/modbus.so
> %%MBMON%%lib/collectd/mbmon.la
> %%MBMON%%lib/collectd/mbmon.so
> %%MEMCACHED%%lib/collectd/memcached.la

Actions: View | Diff

Attachments on bug 178637: 134055