Attachment 127368 Details for Bug 171204 – file.diff

[patch] file.diff

file.diff (text/plain), 2.39 KB, created by Krzysztof on 2012-08-31 14:30:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof

Created: 2012-08-31 14:30:13 UTC

Size: 2.39 KB

patch

obsolete

>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

Actions: View | Diff

Attachments on bug 171204: 127368 | 127369