Date: Sat, 28 Mar 2015 20:26:12 +0000 (UTC) From: Dmitry Sivachenko <demon@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382551 - head/net-mgmt/collectd5 Message-ID: <201503282026.t2SKQCwN040048@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: demon Date: Sat Mar 28 20:26:11 2015 New Revision: 382551 URL: https://svnweb.freebsd.org/changeset/ports/382551 QAT: https://qat.redports.org/buildarchive/r382551/ Log: Add new OPTION for Varnish plugin support; Fix plist entries for several plugins; PR: 198659 Submitted by: maintainer Modified: head/net-mgmt/collectd5/Makefile head/net-mgmt/collectd5/pkg-plist Modified: head/net-mgmt/collectd5/Makefile ============================================================================== --- head/net-mgmt/collectd5/Makefile Sat Mar 28 20:00:55 2015 (r382550) +++ head/net-mgmt/collectd5/Makefile Sat Mar 28 20:26:11 2015 (r382551) @@ -3,6 +3,7 @@ PORTNAME= collectd PORTVERSION= 5.4.2 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= http://collectd.org/files/ PKGNAMESUFFIX= 5 @@ -25,7 +26,8 @@ OPTIONS_GROUP= INPUT OUTPUT OPTIONS_GROUP_OUTPUT= RRDTOOL NOTIFYEMAIL NOTIFYDESKTOP RIEMANN OPTIONS_GROUP_INPUT= CURL DBI JSON MEMCACHEC MODBUS MONGODB MYSQL \ NUTUPS PERL PGSQL PING PYTHON RABBITMQ REDIS \ - ROUTEROS SIGROK SNMP STATGRAB TOKYOTYRANT XML XMMS + ROUTEROS SIGROK SNMP STATGRAB TOKYOTYRANT VARNISH \ + XML XMMS CGI_DESC= Install collection.cgi (requires rrdtool) CURL_DESC= Enable curl-based plugins (apache, nginx, etc) @@ -53,6 +55,7 @@ SIGROK_DESC= Enable sigrok plugin SNMP_DESC= Enable SNMP plugin STATGRAB_DESC= Enable statgrab-based plugins (disk, interface, etc) TOKYOTYRANT_DESC= Enable tokyotyrant plugin +VARNISH_DESC= Enable varnish 3.x cache statistics VIRT_DESC= Enable libvirt plugin (requires XML) XML_DESC= Enable XML plugins XMMS_DESC= Enable xmms plugin @@ -86,7 +89,6 @@ CONFIGURE_ARGS= --localstatedir=/var \ --without-libowcapi \ --without-libperfstat \ --without-libsensors \ - --without-libvarnish \ --without-lvm \ --without-mic \ --without-oracle @@ -430,6 +432,15 @@ CONFIGURE_ARGS+=--without-libtokyotyrant PLIST_SUB+= TOKYOTYRANT="@comment " .endif +.if ${PORT_OPTIONS:MVARNISH} +LIB_DEPENDS+= libvarnishapi.so:${PORTSDIR}/www/varnish +CONFIGURE_ARGS+=--with-libvarnish=${LOCALBASE} --enable-varnish +PLIST_SUB+= VARNISH="" +.else +CONFIGURE_ARGS+=--without-libvarnish +PLIST_SUB+= VARNISH="@comment " +.endif + .if ${PORT_OPTIONS:MVIRT} .if empty(PORT_OPTIONS:MXML) IGNORE= VIRT requires XML. Either select XML or deselect VIRT. Modified: head/net-mgmt/collectd5/pkg-plist ============================================================================== --- head/net-mgmt/collectd5/pkg-plist Sat Mar 28 20:00:55 2015 (r382550) +++ head/net-mgmt/collectd5/pkg-plist Sat Mar 28 20:26:11 2015 (r382551) @@ -43,6 +43,8 @@ lib/collectd/memory.so %%MYSQL%%lib/collectd/mysql.so lib/collectd/network.so %%CURL%%lib/collectd/nginx.so +%%NOTIFYEMAIL%%lib/collectd/notify_email.so +%%NOTIFYDESKTOP%%lib/collectd/notify_desktop.so lib/collectd/ntpd.so %%NUTUPS%%lib/collectd/nut.so lib/collectd/openvpn.so @@ -80,6 +82,7 @@ lib/collectd/unixsock.so lib/collectd/uptime.so %%USERS%%lib/collectd/users.so lib/collectd/uuid.so +%%VARNISH%%lib/collectd/varnish.so %%VIRT%%lib/collectd/libvirt.so lib/collectd/write_graphite.so %%CURL%%lib/collectd/write_http.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503282026.t2SKQCwN040048>