Attachment #120393 for bug #163190

View | Details | Raw Unified | Return to bug 163190
Collapse All | Expand All




#

PORTNAME=	collectd
PORTVERSION=	5.0.1
CATEGORIES=	net-mgmt
MASTER_SITES=	http://collectd.org/files/


		PING		"Input: Network latency (liboping)" 		On  \
		SNMP		"Input: SNMP" 					On  \
		XMMS		"Input: XMMS" 					Off \
		RRDTOOL		"Output: RRDTool"				On \
		RRDCACHED	"Output: RRDTool Cached (require RRDTOOL)"	On

MAN1=		collectd.1 collectd-nagios.1 collectdmon.1 collectdctl.1
MAN5=		collectd.conf.5 collectd-email.5 collectd-exec.5 \

		--disable-python \
		--disable-protocols \
		--disable-routeros \
		--disable-rrdcached \
		--disable-sensors \
		--disable-serial \
		--disable-table \

		--disable-wireless \
		--disable-write_http \
		--disable-zfs_arc \
		--without-perl-bindings \
		--disable-static

.if defined(WITH_DEBUG)
CONFIGURE_ARGS+=--enable-debug

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

Lines 1-2 Link Here

(-)collectd5/distinfo (-2 / +2 lines)
1	SHA256 (collectd-5.0.0.tar.gz) = d2106b2c85d16292b6b8bb9693c99f5659eced35b406da3c67e852100fdee2db	1	SHA256 (collectd-5.0.1.tar.gz) = 380f98a50eba9453eb84fbb8b847df8ee6eff69bf05a4d61c996cf8256712c42
2	SIZE (collectd-5.0.0.tar.gz) = 1784800	2	SIZE (collectd-5.0.1.tar.gz) = 1680960

Lines 1-10 Link Here

(-)collectd5/files/patch-src__meta_data.c (-10 lines)
1	--- ./src/meta_data.c.orig 2011-05-30 06:58:07.055492500 -0400
2	+++ ./src/meta_data.c 2011-05-30 06:59:10.383490225 -0400
3	@@ -215,6 +215,7 @@
4	return;
5
6	md_entry_free (md->head);
7	+ pthread_mutex_destroy(&md->lock);
8	free (md);
9	} /* }}} void meta_data_destroy */
10

Lines 13-24 Link Here

(-)collectd5/pkg-plist (-8 / +42 lines)
13	bin/collectdctl	13	bin/collectdctl
14	include/collectd/client.h	14	include/collectd/client.h
15	include/collectd/lcc_features.h	15	include/collectd/lcc_features.h
16	lib/collectd/bind.la	16	%%APACHE%%lib/collectd/apache.la
17	lib/collectd/bind.so	17	%%APACHE%%lib/collectd/apache.so
		18	%%APCUPS%%lib/collectd/apcups.la
		19	%%APCUPS%%lib/collectd/apcups.so
		20	%%BIND%%lib/collectd/bind.la
		21	%%BIND%%lib/collectd/bind.so
18	lib/collectd/cpu.la	22	lib/collectd/cpu.la
19	lib/collectd/cpu.so	23	lib/collectd/cpu.so
20	lib/collectd/csv.la	24	lib/collectd/csv.la
21	lib/collectd/csv.so	25	lib/collectd/csv.so
		26	%%CURL%%lib/collectd/curl.la
		27	%%CURL%%lib/collectd/curl.so
		28	%%CURL_JSON%%lib/collectd/curl_json.la
		29	%%CURL_JSON%%lib/collectd/curl_json.so
		30	%%CURL_XML%%lib/collectd/curl_xml.la
		31	%%CURL_XML%%lib/collectd/curl_xml.so
		32	%%DBI%%lib/collectd/dbi.la
		33	%%DBI%%lib/collectd/dbi.so
		34	%%DISK%%lib/collectd/disk.la
		35	%%DISK%%lib/collectd/disk.so
22	lib/collectd/df.la	36	lib/collectd/df.la
23	lib/collectd/df.so	37	lib/collectd/df.so
24	lib/collectd/dns.la	38	lib/collectd/dns.la
Lines 29-56 Link Here
29	lib/collectd/exec.so	43	lib/collectd/exec.so
30	lib/collectd/filecount.la	44	lib/collectd/filecount.la
31	lib/collectd/filecount.so	45	lib/collectd/filecount.so
32	lib/collectd/interface.la	46	%%INTERFACE%%lib/collectd/interface.la
33	lib/collectd/interface.so	47	%%INTERFACE%%lib/collectd/interface.so
34	lib/collectd/load.la	48	lib/collectd/load.la
35	lib/collectd/load.so	49	lib/collectd/load.so
36	lib/collectd/logfile.la	50	lib/collectd/logfile.la
37	lib/collectd/logfile.so	51	lib/collectd/logfile.so
		52	%%MBMON%%lib/collectd/mbmon.la
		53	%%MBMON%%lib/collectd/mbmon.so
38	lib/collectd/memcached.la	54	lib/collectd/memcached.la
39	lib/collectd/memcached.so	55	lib/collectd/memcached.so
40	lib/collectd/memory.la	56	lib/collectd/memory.la
41	lib/collectd/memory.so	57	lib/collectd/memory.so
		58	%%MYSQL%%lib/collectd/mysql.la
		59	%%MYSQL%%lib/collectd/mysql.so
		60	%%NGINX%%lib/collectd/nginx.la
		61	%%NGINX%%lib/collectd/nginx.so
42	lib/collectd/network.la	62	lib/collectd/network.la
43	lib/collectd/network.so	63	lib/collectd/network.so
		64	%%NUTUPS%%lib/collectd/nut.la
		65	%%NUTUPS%%lib/collectd/nut.so
44	lib/collectd/ntpd.la	66	lib/collectd/ntpd.la
45	lib/collectd/ntpd.so	67	lib/collectd/ntpd.so
		68	%%OPENVPN%%lib/collectd/openvpn.la
		69	%%OPENVPN%%lib/collectd/openvpn.so
		70	%%PGSQL%%lib/collectd/postgresql.la
		71	%%PGSQL%%lib/collectd/postgresql.so
		72	%%PING%%lib/collectd/ping.la
		73	%%PING%%lib/collectd/ping.so
		74	%%PDNS%%lib/collectd/powerdns.so
		75	%%PDNS%%lib/collectd/powerdns.la
46	lib/collectd/ping.la	76	lib/collectd/ping.la
47	lib/collectd/ping.so	77	lib/collectd/ping.so
48	lib/collectd/processes.la	78	lib/collectd/processes.la
49	lib/collectd/processes.so	79	lib/collectd/processes.so
50	lib/collectd/rrdtool.la	80	%%RRD%%lib/collectd/rrdtool.la
51	lib/collectd/rrdtool.so	81	%%RRD%%lib/collectd/rrdtool.so
52	lib/collectd/snmp.la	82	%%RRDCACHED%%lib/collectd/rrdcached.la
53	lib/collectd/snmp.so	83	%%RRDCACHED%%lib/collectd/rrdcached.so
		84	%%SNMP%%lib/collectd/snmp.la
		85	%%SNMP%%lib/collectd/snmp.so
54	lib/collectd/swap.la	86	lib/collectd/swap.la
55	lib/collectd/swap.so	87	lib/collectd/swap.so
56	lib/collectd/syslog.la	88	lib/collectd/syslog.la
Lines 73-78 Link Here
73	lib/libcollectdclient.so	105	lib/libcollectdclient.so
74	lib/libcollectdclient.so.0	106	lib/libcollectdclient.so.0
75	libdata/pkgconfig/libcollectdclient.pc	107	libdata/pkgconfig/libcollectdclient.pc
		108	%%XMMS%%lib/collectd/xmms.la
		109	%%XMMS%%lib/collectd/xmms.so
76	%%DATADIR%%/postgresql_default.conf	110	%%DATADIR%%/postgresql_default.conf
77	%%DATADIR%%/types.db	111	%%DATADIR%%/types.db
78	@dirrm lib/collectd	112	@dirrm lib/collectd

Return to bug 163190

Lines 6-12 Link Here

(-)collectd5/Makefile (-4 / +13 lines)
6	#	6	#
7		7
8	PORTNAME= collectd	8	PORTNAME= collectd
9	PORTVERSION= 5.0.0	9	PORTVERSION= 5.0.1
10	CATEGORIES= net-mgmt	10	CATEGORIES= net-mgmt
11	MASTER_SITES= http://collectd.org/files/	11	MASTER_SITES= http://collectd.org/files/
12		12
Lines 42-48 Link Here
42	PING "Input: Network latency (liboping)" On \	42	PING "Input: Network latency (liboping)" On \
43	SNMP "Input: SNMP" On \	43	SNMP "Input: SNMP" On \
44	XMMS "Input: XMMS" Off \	44	XMMS "Input: XMMS" Off \
45	RRDTOOL "Output: RRDTool" On	45	RRDTOOL "Output: RRDTool" On \
		46	RRDCACHED "Output: RRDTool Cached (require RRDTOOL)" On
46		47
47	MAN1= collectd.1 collectd-nagios.1 collectdmon.1 collectdctl.1	48	MAN1= collectd.1 collectd-nagios.1 collectdmon.1 collectdctl.1
48	MAN5= collectd.conf.5 collectd-email.5 collectd-exec.5 \	49	MAN5= collectd.conf.5 collectd-email.5 collectd-exec.5 \
Lines 112-118 Link Here
112	--disable-python \	113	--disable-python \
113	--disable-protocols \	114	--disable-protocols \
114	--disable-routeros \	115	--disable-routeros \
115	--disable-rrdcached \
116	--disable-sensors \	116	--disable-sensors \
117	--disable-serial \	117	--disable-serial \
118	--disable-table \	118	--disable-table \
Lines 131-137 Link Here
131	--disable-wireless \	131	--disable-wireless \
132	--disable-write_http \	132	--disable-write_http \
133	--disable-zfs_arc \	133	--disable-zfs_arc \
134	--without-perl-bindings	134	--without-perl-bindings \
		135	--disable-static
135		136
136	.if defined(WITH_DEBUG)	137	.if defined(WITH_DEBUG)
137	CONFIGURE_ARGS+=--enable-debug	138	CONFIGURE_ARGS+=--enable-debug
Lines 323-328 Link Here
323	PLIST_SUB+= RRD="@comment "	324	PLIST_SUB+= RRD="@comment "
324	.endif	325	.endif
325		326
		327	.if defined(WITH_RRDCACHED) && defined(WITH_RRDTOOL)
		328	CONFIGURE_ARGS+=--enable-rrdcached
		329	PLIST_SUB+= RRDCACHED=""
		330	.else
		331	CONFIGURE_ARGS+=--disable--rrdcached
		332	PLIST_SUB+= RRDCACHED="@comment "
		333	.endif
		334
326	.if defined(WITH_SNMP)	335	.if defined(WITH_SNMP)
327	LIB_DEPENDS+= netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp	336	LIB_DEPENDS+= netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
328	CONFIGURE_ARGS+=--enable-snmp	337	CONFIGURE_ARGS+=--enable-snmp