From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Aug 31 13:30:13 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B55E6106566B for ; Fri, 31 Aug 2012 13:30:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 893D08FC19 for ; Fri, 31 Aug 2012 13:30:13 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q7VDUDfK018707 for ; Fri, 31 Aug 2012 13:30:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q7VDUDLt018706; Fri, 31 Aug 2012 13:30:13 GMT (envelope-from gnats) Resent-Date: Fri, 31 Aug 2012 13:30:13 GMT Resent-Message-Id: <201208311330.q7VDUDLt018706@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Krzysztof Stryjek Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3BCBB106566B for ; Fri, 31 Aug 2012 13:23:40 +0000 (UTC) (envelope-from wtp@bsdserwis.com) Received: from mx1.bsdserwis.com (ns37332.ovh.net [91.121.4.86]) by mx1.freebsd.org (Postfix) with ESMTP id 07BA48FC14 for ; Fri, 31 Aug 2012 13:23:38 +0000 (UTC) Received: by mx1.bsdserwis.com (Postfix, from userid 1000) id 2ABDA2CA5CC0; Fri, 31 Aug 2012 15:23:32 +0200 (CEST) Message-Id: <20120831132332.2ABDA2CA5CC0@mx1.bsdserwis.com> Date: Fri, 31 Aug 2012 15:23:32 +0200 (CEST) From: Krzysztof Stryjek To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/171204: net-mgmt/collectd update - new options X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Krzysztof Stryjek List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Aug 2012 13:30:13 -0000 >Number: 171204 >Category: ports >Synopsis: net-mgmt/collectd update - new options >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Aug 31 13:30:13 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Krzysztof Stryjek >Release: FreeBSD 7.3-STABLE amd64 >Organization: private >Environment: System: FreeBSD dmc.bsdserwis.com 7.3-STABLE FreeBSD 7.3-STABLE #1: Fri May 7 15:18:19 CEST 2010 toor@dmc.bsdserwis.com:/home/usr/obj/home/usr/src/sys/IBM amd64 >Description: I've added more "plugins" do colletd port: http_write and libvirt >How-To-Repeat: Just install port :-) >Fix: Apply following patch: diff -ruN collectd/Makefile collectd.new/Makefile --- collectd/Makefile 2012-07-26 07:40:22.000000000 +0200 +++ collectd.new/Makefile 2012-08-31 15:17:42.000000000 +0200 @@ -7,7 +7,7 @@ PORTNAME= collectd PORTVERSION= 4.10.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MASTER_SITES= http://collectd.org/files/ @@ -46,7 +46,9 @@ TOKYOTYRANT "Input: Tokyotyrant database" Off \ XMMS "Input: XMMS" Off \ RRDTOOL "Output: RRDTool" On \ - RRDCACHED "Output: RRDTool Cached (require RRDTOOL)" On + RRDCACHED "Output: RRDTool Cached (require RRDTOOL)" On \ + VIRT "Build with libvirt" Off \ + WRITE_HTTP "Output: write_http" Off MAN1= collectd.1 collectd-nagios.1 collectdmon.1 MAN5= collectd.conf.5 collectd-email.5 collectd-exec.5 \ @@ -85,7 +87,6 @@ --disable-ipvs \ --disable-irq \ --disable-java \ - --disable-libvirt \ --disable-madwifi \ --disable-match_empty_counter \ --disable-match_hashed \ @@ -121,7 +122,6 @@ --disable-vmem \ --disable-vserver \ --disable-wireless \ - --disable-write_http \ --disable-zfs_arc \ --without-perl-bindings \ --without-librabbitmq \ @@ -378,6 +378,23 @@ PLIST_SUB+= TOKYOTYRANT="@comment " .endif +.if defined(WITH_VIRT) +CONFIGURE_ARGS+=--enable-libvirt +LIB_DEPENDS+= virt.9:${PORTSDIR}/devel/libvirt +PLIST_SUB+= VIRT="" +.else +CONFIGURE_ARGS+=--disable-libvirt +PLIST_SUB+= VIRT="@comment " +.endif + +.if defined(WITH_WRITE_HTTP) +CONFIGURE_ARGS+=--enable-write_http +PLIST_SUB+= WRITE_HTTP="" +.else +CONFIGURE_ARGS+=--disable-write_http +PLIST_SUB+= WRITE_HTTP="@comment " +.endif + .if defined(WITH_XMMS) LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms CONFIGURE_ARGS+=--enable-xmms diff -ruN collectd/pkg-plist collectd.new/pkg-plist --- collectd/pkg-plist 2012-04-12 07:44:15.000000000 +0200 +++ collectd.new/pkg-plist 2012-08-31 15:17:37.000000000 +0200 @@ -101,11 +101,15 @@ lib/collectd/uptime.la lib/collectd/uuid.so lib/collectd/uuid.la +%%VIRT%%lib/collectd/libvirt.la +%%VIRT%%lib/collectd/libvirt.so +%%WRITE_HTTP%%lib/collectd/write_http.la +%%WRITE_HTTP%%lib/collectd/write_http.so +%%XMMS%%lib/collectd/xmms.la +%%XMMS%%lib/collectd/xmms.so include/collectd/client.h include/collectd/lcc_features.h libdata/pkgconfig/libcollectdclient.pc -%%XMMS%%lib/collectd/xmms.la -%%XMMS%%lib/collectd/xmms.so %%DATADIR%%/postgresql_default.conf %%DATADIR%%/types.db @dirrm lib/collectd >Release-Note: >Audit-Trail: >Unformatted: