From owner-freebsd-ports@FreeBSD.ORG Mon May 13 21:28:56 2013 Return-Path: Delivered-To: ports@FreeBSD.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 70E19121 for ; Mon, 13 May 2013 21:28:56 +0000 (UTC) (envelope-from bsam@passap.ru) Received: from forward2h.mail.yandex.net (forward2h.mail.yandex.net [IPv6:2a02:6b8:0:f05::2]) by mx1.freebsd.org (Postfix) with ESMTP id E2951B2E for ; Mon, 13 May 2013 21:28:55 +0000 (UTC) Received: from smtp3h.mail.yandex.net (smtp3h.mail.yandex.net [84.201.186.20]) by forward2h.mail.yandex.net (Yandex) with ESMTP id 1D5EB7007DE; Tue, 14 May 2013 01:28:43 +0400 (MSK) Received: from smtp3h.mail.yandex.net (localhost [127.0.0.1]) by smtp3h.mail.yandex.net (Yandex) with ESMTP id A2EC91B403B8; Tue, 14 May 2013 01:28:42 +0400 (MSK) Received: from 93.91.2.208.tel.ru (93.91.2.208.tel.ru [93.91.2.208]) by smtp3h.mail.yandex.net (nwsmtp/Yandex) with ESMTP id K4QRk7o3sq-SfrC7ufr; Tue, 14 May 2013 01:28:42 +0400 Message-ID: <51915B09.8090907@passap.ru> Date: Tue, 14 May 2013 01:28:41 +0400 From: Boris Samorodov Organization: =?UTF-8?B?0JfQkNCeICLQktCQ0KDQoiI=?= User-Agent: Mozilla/5.0 (X11; FreeBSD i386; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: Peter Mueller Subject: Re: FreeBSD Port: collectd-4.10.4_7 References: <8A5E7425-D383-4071-8D92-5444CE60BAB7@occsilva.de> In-Reply-To: <8A5E7425-D383-4071-8D92-5444CE60BAB7@occsilva.de> Content-Type: multipart/mixed; boundary="------------030105070000040701040803" Cc: "ports@FreeBSD.org" , "ports@bsdserwis.com" X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 May 2013 21:28:56 -0000 This is a multi-part message in MIME format. --------------030105070000040701040803 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 13.05.2013 20:20, Peter Mueller пишет: > > I like to use the modbus plugin. But it is not listed in the config options. How can I enable this plugin to compile it. I've just added comms/libmodbus upon your request. And here is attached (an untested) patch to net-mgmt/collectd. Test and feedback are welcome. Thanks! -- WBR, Boris Samorodov (bsam) FreeBSD Committer, http://www.FreeBSD.org The Power To Serve --------------030105070000040701040803 Content-Type: text/x-diff; name="collectd.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="collectd.diff" Index: Makefile =================================================================== --- Makefile (revision 317544) +++ Makefile (working copy) @@ -19,8 +19,9 @@ OPTIONS_GROUP= INPUT OUTPUT OPTIONS_GROUP_OUTPUT= RRDTOOL RRDCACHED WRITE_HTTP OPTIONS_GROUP_INPUT= APACHE APCUPS CURL CURL_JSON CURL_XML DBI DISK \ - NUTUPS INTERFACE MBMON MEMCACHED MYSQL NGINX OPENVPN \ - PDNS PGSQL PING PYTHON ROUTEROS SNMP TOKYOTYRANT XMMS + NUTUPS INTERFACE MBMON MEMCACHED MODBUS MYSQL NGINX \ + OPENVPN PDNS PGSQL PING PYTHON ROUTEROS SNMP \ + TOKYOTYRANT XMMS OPTIONS_DEFAULT= BIND INTERFACE PING SNMP RRDTOOL RRDCACHED CGI_DESC= Install collection.cgi (requires RRDTOOL) @@ -40,6 +41,7 @@ INTERFACE_DESC= Network interfaces (libstatgrab) MBMON_DESC= MBMon MEMCACHED_DESC= Memcached +MODBUS_DESC= modbus support via libmodbus MYSQL_DESC= MySQL NGINX_DESC= Nginx OPENVPN_DESC= OpenVPN statistics @@ -100,7 +102,6 @@ --disable-match_timediff \ --disable-match_value \ --disable-memcachec \ - --disable-modbus \ --disable-multimeter \ --disable-netapp \ --disable-netlink \ @@ -276,6 +277,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 @@ -362,7 +372,7 @@ CONFIGURE_ARGS+=--enable-rrdcached PLIST_SUB+= RRDCACHED="" .else -CONFIGURE_ARGS+=--disable--rrdcached +CONFIGURE_ARGS+=--disable-rrdcached PLIST_SUB+= RRDCACHED="@comment " .endif Index: pkg-plist =================================================================== --- pkg-plist (revision 317544) +++ pkg-plist (working copy) @@ -49,6 +49,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 --------------030105070000040701040803--