>Number: 153643
>Category: ports
>Synopsis: Add disk plugin support to net-mgmt/collectd
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Jan 03 06:00:21 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Benjamin Lee
>Release: 8.1-RELEASE
>Organization:
>Environment:
FreeBSD eclipse.b1c1l1.com 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:55:53 UTC 2010 root at almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:
The attached patch adds support to the net-mgmt/collectd port for enabling the collectd disk plugin via OPTIONS.
>How-To-Repeat:
Install net-mgmt/collectd from ports.
>Fix:
Apply the attached patch.
Patch attached with submission follows:
diff -ruN /usr/ports/net-mgmt/collectd/Makefile collectd/Makefile
--- /usr/ports/net-mgmt/collectd/Makefile 2010-12-03 23:33:08.000000000 -0800
+++ collectd/Makefile 2011-01-02 21:41:49.679126870 -0800
@@ -7,7 +7,7 @@
PORTNAME= collectd
PORTVERSION= 4.9.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= http://collectd.org/files/
@@ -26,6 +26,7 @@
APCUPS "Input: APC UPS (apcupsd)" Off \
CURL "Input: CURL generic web statistics" Off \
DBI "Input: database abstraction library" Off \
+ DISK "Input: Disk performance statistics" Off \
NUTUPS "Input: NUT UPS daemon" Off \
INTERFACE "Input: Network interfaces (libstatgrab)" On \
MBMON "Input: MBMon" Off \
@@ -74,7 +75,6 @@
--disable-contextswitch \
--disable-cpufreq \
--disable-curl_json \
- --disable-disk \
--disable-entropy \
--disable-fscache \
--disable-gmond \
@@ -195,6 +195,14 @@
PLIST_SUB+= DBI="@comment "
.endif
+.if defined(WITH_DISK)
+CONFIGURE_ARGS+=--enable-disk
+PLIST_SUB+= DISK=""
+.else
+CONFIGURE_ARGS+=--disable-disk
+PLIST_SUB+= DISK="@comment "
+.endif
+
.if defined(WITH_NUTUPS)
CONFIGURE_ARGS+=--enable-nut
BUILD_DEPENDS+= ${LOCALBASE}/include/upsclient.h:${PORTSDIR}/sysutils/nut
diff -ruN /usr/ports/net-mgmt/collectd/pkg-plist collectd/pkg-plist
--- /usr/ports/net-mgmt/collectd/pkg-plist 2010-10-31 23:13:45.000000000 -0700
+++ collectd/pkg-plist 2011-01-02 21:43:39.890919853 -0800
@@ -35,6 +35,9 @@
%%DBI%%lib/collectd/dbi.a
%%DBI%%lib/collectd/dbi.la
%%DBI%%lib/collectd/dbi.so
+%%DISK%%lib/collectd/disk.a
+%%DISK%%lib/collectd/disk.la
+%%DISK%%lib/collectd/disk.so
lib/collectd/df.a
lib/collectd/df.la
lib/collectd/df.so
>Release-Note:
>Audit-Trail:
>Unformatted: