Attachment 120394 Details for Bug 163191 – collectd.patch

[patch] collectd.patch

collectd.patch (text/plain), 4.83 KB, created by Krzysztof on 2011-12-11 22:00:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof

Created: 2011-12-11 22:00:03 UTC

Size: 4.83 KB

patch

obsolete

>diff -ruN collectd.orig/Makefile collectd/Makefile
>--- collectd.orig/Makefile	2011-09-25 05:20:37.000000000 +0200
>+++ collectd/Makefile	2011-12-11 22:29:56.000000000 +0100
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	collectd
>-PORTVERSION=	4.10.3
>-PORTREVISION=	4
>+PORTVERSION=	4.10.4
> CATEGORIES=	net-mgmt
> MASTER_SITES=	http://collectd.org/files/
> 
>@@ -41,7 +40,8 @@
> 		PING		"Input: Network latency (liboping)" 		On  \
> 		SNMP		"Input: SNMP" 					On  \
> 		XMMS		"Input: XMMS" 					Off \
>-		RRDTOOL		"Output: RRDTool" 				On
>+		RRDTOOL		"Output: RRDTool"				On \
>+		RRDCACHED	"Output: RRDTool Cached (require RRDTOOL)"	On
> 
> MAN1=		collectd.1 collectd-nagios.1 collectdmon.1
> MAN5=		collectd.conf.5 collectd-email.5 collectd-exec.5 \
>@@ -111,7 +111,6 @@
> 		--disable-python \
> 		--disable-protocols \
> 		--disable-routeros \
>-		--disable-rrdcached \
> 		--disable-sensors \
> 		--disable-serial \
> 		--disable-table \
>@@ -130,7 +129,8 @@
> 		--disable-wireless \
> 		--disable-write_http \
> 		--disable-zfs_arc \
>-		--without-perl-bindings
>+		--without-perl-bindings \
>+		--disable-static
> 
> .if defined(WITH_DEBUG)
> CONFIGURE_ARGS+=--enable-debug
>@@ -322,6 +322,14 @@
> PLIST_SUB+=	RRD="@comment "
> .endif
> 
>+.if defined(WITH_RRDCACHED) && defined(WITH_RRDTOOL)
>+CONFIGURE_ARGS+=--enable-rrdcached
>+PLIST_SUB+=	RRDCACHED=""
>+.else
>+CONFIGURE_ARGS+=--disable--rrdcached
>+PLIST_SUB+=	RRDCACHED="@comment "
>+.endif
>+
> .if defined(WITH_SNMP)
> LIB_DEPENDS+=	netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
> CONFIGURE_ARGS+=--enable-snmp
>diff -ruN collectd.orig/distinfo collectd/distinfo
>--- collectd.orig/distinfo	2011-05-18 05:25:01.000000000 +0200
>+++ collectd/distinfo	2011-12-11 22:29:56.000000000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (collectd-4.10.3.tar.gz) = 69797d19f1782b243d8737072171611ebb16f972dc0021402df66905b8746033
>-SIZE (collectd-4.10.3.tar.gz) = 1743443
>+SHA256 (collectd-4.10.4.tar.gz) = ee63dfbd519dd4cae3b682e7379c5e01ac3a615d48ec5871b6ab4921ec0a9b12
>+SIZE (collectd-4.10.4.tar.gz) = 1632601
>diff -ruN collectd.orig/files/patch-src__meta_data.c collectd/files/patch-src__meta_data.c
>--- collectd.orig/files/patch-src__meta_data.c	2011-05-30 22:18:19.000000000 +0200
>+++ collectd/files/patch-src__meta_data.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,10 +0,0 @@
>---- ./src/meta_data.c.orig	2011-05-30 06:58:07.055492500 -0400
>-+++ ./src/meta_data.c	2011-05-30 06:59:10.383490225 -0400
>-@@ -215,6 +215,7 @@
>-     return;
>- 
>-   md_entry_free (md->head);
>-+  pthread_mutex_destroy(&md->lock);
>-   free (md);
>- } /* }}} void meta_data_destroy */
>- 
>diff -ruN collectd.orig/patch.txt collectd/patch.txt
>--- collectd.orig/patch.txt	2011-01-03 08:50:04.000000000 +0100
>+++ collectd/patch.txt	1970-01-01 01:00:00.000000000 +0100
>@@ -1,59 +0,0 @@
>-
>-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
>-
>-
>diff -ruN collectd.orig/pkg-plist collectd/pkg-plist
>--- collectd.orig/pkg-plist	2011-05-18 05:25:01.000000000 +0200
>+++ collectd/pkg-plist	2011-12-11 22:29:56.000000000 +0100
>@@ -77,6 +77,8 @@
> lib/collectd/processes.la
> %%RRD%%lib/collectd/rrdtool.la
> %%RRD%%lib/collectd/rrdtool.so
>+%%RRDCACHED%%lib/collectd/rrdcached.la
>+%%RRDCACHED%%lib/collectd/rrdcached.so
> %%SNMP%%lib/collectd/snmp.la
> %%SNMP%%lib/collectd/snmp.so
> lib/collectd/swap.la

Actions: View | Diff

Attachments on bug 163191: 120394