Attachment #120654 for bug #163473

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





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


		NUTUPS		"Input: NUT UPS daemon" 			Off \
		INTERFACE 	"Input: Network interfaces (libstatgrab)" 	On  \
		MBMON		"Input: MBMon" 					Off \
		MEMCACHED	"Input: Memcahed"				Off \
		MYSQL		"Input: MySQL" 					Off \
		NGINX		"Input: Nginx" 					Off \
		OPENVPN		"Input: OpenVPN statistics"			Off \
		PDNS		"Input: PowerDNS" 				Off \
		PGSQL		"Input: PostgreSQL" 				Off \
		PING		"Input: Network latency (liboping)" 		On  \
		PYTHON		"Input: Python plugin"				Off  \
		SNMP		"Input: SNMP" 					On  \
		TOKYOTYRANT	"Input: Tokyotyrant database"			Off \
		XMMS		"Input: XMMS" 					Off \
		RRDTOOL		"Output: RRDTool"				On \
		RRDCACHED	"Output: RRDTool Cached (require RRDTOOL)"	On

		--disable-ipvs \
		--disable-irq \
		--disable-java \
		--without-java \
		--disable-libvirt \
		--disable-madwifi \
		--disable-match_empty_counter \

		--disable-match_value \
		--disable-memcachec \
		--disable-modbus \
		--without-libmodbus \
		--disable-multimeter \
		--disable-netapp \
		--without-libnetapp \
		--disable-netlink \
		--disable-nfs \
		--disable-notify_desktop \

		--disable-oracle \
		--disable-perl \
		--disable-pinba \
		--disable-python \
		--disable-protocols \
		--disable-routeros \
		--without-librouteros \
		--disable-sensors \
		--disable-serial \
		--disable-table \

		--disable-teamspeak2 \
		--disable-ted \
		--disable-thermal \
		--disable-tokyotyrant \
		--disable-users \
		--disable-vmem \
		--disable-vserver \

		--disable-write_http \
		--disable-zfs_arc \
		--without-perl-bindings \
		--without-librabbitmq \
		--disable-varnish \
		--without-libvarnish \
		--without-libcredis \
		--without-libganglia \
		--without-libupsclient \
		--without-libesmtp \
		--disable-static

.if defined(WITH_DEBUG)

		${SITE_PERL}/${PERL_ARCH}/Data/Dumper.pm:${PORTSDIR}/devel/p5-Data-Dumper \
		${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser
PLIST_SUB+=	CGI=""
WITH_RRDTOOL=	YES
.else
PLIST_SUB+=	CGI="@comment "
.endif

LIB_DEPENDS+=	yajl:${PORTSDIR}/devel/yajl
PLIST_SUB+=	CURL_JSON=""
.else
CONFIGURE_ARGS+=--disable-curl_json --without-libyajl
PLIST_SUB+=	CURL_JSON="@comment "
.endif


LIB_DEPENDS+=	dbi.1:${PORTSDIR}/databases/libdbi
PLIST_SUB+=	DBI=""
.else
CONFIGURE_ARGS+=--disable-dbi --without-libdbi
PLIST_SUB+=	DBI="@comment "
.endif


PLIST_SUB+=	MBMON="@comment "
.endif

.if defined(WITH_MEMCACHED)
LIB_DEPENDS+=	memcached.8:${PORTSDIR}/databases/libmemcached
CONFIGURE_ARGS+=--enable-memcached
CONFIGURE_ARGS+=--with-libmemcahed=${LOCALBASE}
PLIST_SUB+=	MEMCACHED=""
.else
CONFIGURE_ARGS+=--disable-memcached --without-libmemcahed
PLIST_SUB+=	MEMCACHED="@comment "
.endif

.if defined(WITH_MYSQL)
USE_MYSQL=	yes
CONFIGURE_ARGS+=--enable-mysql

PLIST_SUB+=	PING="@comment "
.endif

.if defined(WITH_PYTHON)
USE_PYTHON=		yes
.include "${PORTSDIR}/Mk/bsd.python.mk"
CONFIGURE_ARGS+=--enable-python
PLIST_SUB+=	PYTHON=""
.else
CONFIGURE_ARGS+=--disable-python
PLIST_SUB+=	PYTHON="@comment "
.endif

.if defined(WITH_RRDTOOL)
LIB_DEPENDS+=	rrd:${PORTSDIR}/databases/rrdtool
CONFIGURE_ARGS+=--enable-rrdtool

PLIST_SUB+=	SNMP="@comment "
.endif

.if defined(WITH_TOKYOTYRANT)
LIB_DEPENDS+=	tokyotyrant.3:${PORTSDIR}/databases/tokyotyrant
CONFIGURE_ARGS+=--enable-tokyotyrant
CONFIGURE_ARGS+=--with-libtokyotyrant=${LOCALBASE}
PLIST_SUB+=	TOKYOTYRANT=""
.else
CONFIGURE_ARGS+=--disable-tokyotyrant --without-libtokyotyrant
PLIST_SUB+=	TOKYOTYRANT="@comment "
.endif

.if defined(WITH_XMMS)
LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
CONFIGURE_ARGS+=--enable-xmms




--- configure.orig	2011-10-14 22:54:07.000000000 +0200
+++ configure	2011-12-19 23:25:58.000000000 +0100
@@ -21745,7 +21745,7 @@
 then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python LIBS" >&5
 $as_echo_n "checking for Python LIBS... " >&6; }
-	python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2>&1`
+	python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0)+\"/\"+distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2>&1`
 	python_config_status=$?
 
 	if test "$python_config_status" -ne 0 || test "x$python_library_flags" = "x"
@@ -21762,7 +21762,7 @@
 if test "x$with_python" = "xyes"
 then
 	LDFLAGS="-L$python_library_path $LDFLAGS"
-	LIBS="$python_library_flags $LIBS"
+	LIBS="$python_library_flags $LIBS -lm -lpthread -lutil"
 
 	ac_fn_c_check_func "$LINENO" "PyObject_CallFunction" "ac_cv_func_PyObject_CallFunction"
 if test "x$ac_cv_func_PyObject_CallFunction" = x""yes; then :




--- configure.in.orig	2011-10-14 22:49:49.000000000 +0200
+++ configure.in	2011-12-19 23:07:31.000000000 +0100
@@ -3165,7 +3165,7 @@
 if test "x$with_python" = "xyes"
 then
 	AC_MSG_CHECKING([for Python LIBS])
-	python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2>&1`
+	python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0)+\"/\"+distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2>&1`
 	python_config_status=$?
 
 	if test "$python_config_status" -ne 0 || test "x$python_library_flags" = "x"
@@ -3180,7 +3180,7 @@
 if test "x$with_python" = "xyes"
 then
 	LDFLAGS="-L$python_library_path $LDFLAGS"
-	LIBS="$python_library_flags $LIBS"
+	LIBS="$python_library_flags $LIBS -lm -lpthread -lutil"
 
 	AC_CHECK_FUNC(PyObject_CallFunction,
 		      [with_python="yes"],

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 51-58 Link Here

(-)collectd5/pkg-plist (-5 / +6 lines)
51	lib/collectd/logfile.so	51	lib/collectd/logfile.so
52	%%MBMON%%lib/collectd/mbmon.la	52	%%MBMON%%lib/collectd/mbmon.la
53	%%MBMON%%lib/collectd/mbmon.so	53	%%MBMON%%lib/collectd/mbmon.so
54	lib/collectd/memcached.la	54	%%MEMCACHED%%lib/collectd/memcached.la
55	lib/collectd/memcached.so	55	%%MEMCACHED%%lib/collectd/memcached.so
56	lib/collectd/memory.la	56	lib/collectd/memory.la
57	lib/collectd/memory.so	57	lib/collectd/memory.so
58	%%MYSQL%%lib/collectd/mysql.la	58	%%MYSQL%%lib/collectd/mysql.la
Lines 73-80 Link Here
73	%%PING%%lib/collectd/ping.so	73	%%PING%%lib/collectd/ping.so
74	%%PDNS%%lib/collectd/powerdns.so	74	%%PDNS%%lib/collectd/powerdns.so
75	%%PDNS%%lib/collectd/powerdns.la	75	%%PDNS%%lib/collectd/powerdns.la
76	lib/collectd/ping.la	76	%%PYTHON%%lib/collectd/python.la
77	lib/collectd/ping.so	77	%%PYTHON%%lib/collectd/python.so
78	lib/collectd/processes.la	78	lib/collectd/processes.la
79	lib/collectd/processes.so	79	lib/collectd/processes.so
80	%%RRD%%lib/collectd/rrdtool.la	80	%%RRD%%lib/collectd/rrdtool.la
Lines 95-100 Link Here
95	lib/collectd/tcpconns.so	95	lib/collectd/tcpconns.so
96	lib/collectd/threshold.la	96	lib/collectd/threshold.la
97	lib/collectd/threshold.so	97	lib/collectd/threshold.so
		98	%%TOKYOTYRANT%%lib/collectd/tokyotyrant.la
		99	%%TOKYOTYRANT%%lib/collectd/tokyotyrant.so
98	lib/collectd/unixsock.la	100	lib/collectd/unixsock.la
99	lib/collectd/unixsock.so	101	lib/collectd/unixsock.so
100	lib/collectd/uptime.la	102	lib/collectd/uptime.la
101	------------- begin of patch --------------

Return to bug 163473

Lines 7-12 Link Here

(-)collectd5/Makefile (-4 / +48 lines)
7		7
8	PORTNAME= collectd	8	PORTNAME= collectd
9	PORTVERSION= 5.0.1	9	PORTVERSION= 5.0.1
		10	PORTREVISION= 1
10	CATEGORIES= net-mgmt	11	CATEGORIES= net-mgmt
11	MASTER_SITES= http://collectd.org/files/	12	MASTER_SITES= http://collectd.org/files/
12		13
Lines 34-46 Link Here
34	NUTUPS "Input: NUT UPS daemon" Off \	35	NUTUPS "Input: NUT UPS daemon" Off \
35	INTERFACE "Input: Network interfaces (libstatgrab)" On \	36	INTERFACE "Input: Network interfaces (libstatgrab)" On \
36	MBMON "Input: MBMon" Off \	37	MBMON "Input: MBMon" Off \
		38	MEMCACHED "Input: Memcahed" Off \
37	MYSQL "Input: MySQL" Off \	39	MYSQL "Input: MySQL" Off \
38	NGINX "Input: Nginx" Off \	40	NGINX "Input: Nginx" Off \
39	OPENVPN "Input: OpenVPN statistics" Off \	41	OPENVPN "Input: OpenVPN statistics" Off \
40	PDNS "Input: PowerDNS" Off \	42	PDNS "Input: PowerDNS" Off \
41	PGSQL "Input: PostgreSQL" Off \	43	PGSQL "Input: PostgreSQL" Off \
42	PING "Input: Network latency (liboping)" On \	44	PING "Input: Network latency (liboping)" On \
		45	PYTHON "Input: Python plugin" Off \
43	SNMP "Input: SNMP" On \	46	SNMP "Input: SNMP" On \
		47	TOKYOTYRANT "Input: Tokyotyrant database" Off \
44	XMMS "Input: XMMS" Off \	48	XMMS "Input: XMMS" Off \
45	RRDTOOL "Output: RRDTool" On \	49	RRDTOOL "Output: RRDTool" On \
46	RRDCACHED "Output: RRDTool Cached (require RRDTOOL)" On	50	RRDCACHED "Output: RRDTool Cached (require RRDTOOL)" On
Lines 90-95 Link Here
90	--disable-ipvs \	94	--disable-ipvs \
91	--disable-irq \	95	--disable-irq \
92	--disable-java \	96	--disable-java \
		97	--without-java \
93	--disable-libvirt \	98	--disable-libvirt \
94	--disable-madwifi \	99	--disable-madwifi \
95	--disable-match_empty_counter \	100	--disable-match_empty_counter \
Lines 99-106 Link Here
99	--disable-match_value \	104	--disable-match_value \
100	--disable-memcachec \	105	--disable-memcachec \
101	--disable-modbus \	106	--disable-modbus \
		107	--without-libmodbus \
102	--disable-multimeter \	108	--disable-multimeter \
103	--disable-netapp \	109	--disable-netapp \
		110	--without-libnetapp \
104	--disable-netlink \	111	--disable-netlink \
105	--disable-nfs \	112	--disable-nfs \
106	--disable-notify_desktop \	113	--disable-notify_desktop \
Lines 110-118 Link Here
110	--disable-oracle \	117	--disable-oracle \
111	--disable-perl \	118	--disable-perl \
112	--disable-pinba \	119	--disable-pinba \
113	--disable-python \
114	--disable-protocols \	120	--disable-protocols \
115	--disable-routeros \	121	--disable-routeros \
		122	--without-librouteros \
116	--disable-sensors \	123	--disable-sensors \
117	--disable-serial \	124	--disable-serial \
118	--disable-table \	125	--disable-table \
Lines 124-130 Link Here
124	--disable-teamspeak2 \	131	--disable-teamspeak2 \
125	--disable-ted \	132	--disable-ted \
126	--disable-thermal \	133	--disable-thermal \
127	--disable-tokyotyrant \
128	--disable-users \	134	--disable-users \
129	--disable-vmem \	135	--disable-vmem \
130	--disable-vserver \	136	--disable-vserver \
Lines 132-137 Link Here
132	--disable-write_http \	138	--disable-write_http \
133	--disable-zfs_arc \	139	--disable-zfs_arc \
134	--without-perl-bindings \	140	--without-perl-bindings \
		141	--without-librabbitmq \
		142	--disable-varnish \
		143	--without-libvarnish \
		144	--without-libcredis \
		145	--without-libganglia \
		146	--without-libupsclient \
		147	--without-libesmtp \
135	--disable-static	148	--disable-static
136		149
137	.if defined(WITH_DEBUG)	150	.if defined(WITH_DEBUG)
Lines 144-149 Link Here
144	${SITE_PERL}/${PERL_ARCH}/Data/Dumper.pm:${PORTSDIR}/devel/p5-Data-Dumper \	157	${SITE_PERL}/${PERL_ARCH}/Data/Dumper.pm:${PORTSDIR}/devel/p5-Data-Dumper \
145	${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser	158	${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser
146	PLIST_SUB+= CGI=""	159	PLIST_SUB+= CGI=""
		160	WITH_RRDTOOL= YES
147	.else	161	.else
148	PLIST_SUB+= CGI="@comment "	162	PLIST_SUB+= CGI="@comment "
149	.endif	163	.endif
Lines 193-199 Link Here
193	LIB_DEPENDS+= yajl:${PORTSDIR}/devel/yajl	207	LIB_DEPENDS+= yajl:${PORTSDIR}/devel/yajl
194	PLIST_SUB+= CURL_JSON=""	208	PLIST_SUB+= CURL_JSON=""
195	.else	209	.else
196	CONFIGURE_ARGS+=--disable-curl_json	210	CONFIGURE_ARGS+=--disable-curl_json --without-libyajl
197	PLIST_SUB+= CURL_JSON="@comment "	211	PLIST_SUB+= CURL_JSON="@comment "
198	.endif	212	.endif
199		213
Lines 214-220 Link Here
214	LIB_DEPENDS+= dbi.1:${PORTSDIR}/databases/libdbi	228	LIB_DEPENDS+= dbi.1:${PORTSDIR}/databases/libdbi
215	PLIST_SUB+= DBI=""	229	PLIST_SUB+= DBI=""
216	.else	230	.else
217	CONFIGURE_ARGS+=--disable-dbi	231	CONFIGURE_ARGS+=--disable-dbi --without-libdbi
218	PLIST_SUB+= DBI="@comment "	232	PLIST_SUB+= DBI="@comment "
219	.endif	233	.endif
220		234
Lines 260-265 Link Here
260	PLIST_SUB+= MBMON="@comment "	274	PLIST_SUB+= MBMON="@comment "
261	.endif	275	.endif
262		276
		277	.if defined(WITH_MEMCACHED)
		278	LIB_DEPENDS+= memcached.8:${PORTSDIR}/databases/libmemcached
		279	CONFIGURE_ARGS+=--enable-memcached
		280	CONFIGURE_ARGS+=--with-libmemcahed=${LOCALBASE}
		281	PLIST_SUB+= MEMCACHED=""
		282	.else
		283	CONFIGURE_ARGS+=--disable-memcached --without-libmemcahed
		284	PLIST_SUB+= MEMCACHED="@comment "
		285	.endif
		286
263	.if defined(WITH_MYSQL)	287	.if defined(WITH_MYSQL)
264	USE_MYSQL= yes	288	USE_MYSQL= yes
265	CONFIGURE_ARGS+=--enable-mysql	289	CONFIGURE_ARGS+=--enable-mysql
Lines 315-320 Link Here
315	PLIST_SUB+= PING="@comment "	339	PLIST_SUB+= PING="@comment "
316	.endif	340	.endif
317		341
		342	.if defined(WITH_PYTHON)
		343	USE_PYTHON= yes
		344	.include "${PORTSDIR}/Mk/bsd.python.mk"
		345	CONFIGURE_ARGS+=--enable-python
		346	PLIST_SUB+= PYTHON=""
		347	.else
		348	CONFIGURE_ARGS+=--disable-python
		349	PLIST_SUB+= PYTHON="@comment "
		350	.endif
		351
318	.if defined(WITH_RRDTOOL)	352	.if defined(WITH_RRDTOOL)
319	LIB_DEPENDS+= rrd:${PORTSDIR}/databases/rrdtool	353	LIB_DEPENDS+= rrd:${PORTSDIR}/databases/rrdtool
320	CONFIGURE_ARGS+=--enable-rrdtool	354	CONFIGURE_ARGS+=--enable-rrdtool
Lines 341-346 Link Here
341	PLIST_SUB+= SNMP="@comment "	375	PLIST_SUB+= SNMP="@comment "
342	.endif	376	.endif
343		377
		378	.if defined(WITH_TOKYOTYRANT)
		379	LIB_DEPENDS+= tokyotyrant.3:${PORTSDIR}/databases/tokyotyrant
		380	CONFIGURE_ARGS+=--enable-tokyotyrant
		381	CONFIGURE_ARGS+=--with-libtokyotyrant=${LOCALBASE}
		382	PLIST_SUB+= TOKYOTYRANT=""
		383	.else
		384	CONFIGURE_ARGS+=--disable-tokyotyrant --without-libtokyotyrant
		385	PLIST_SUB+= TOKYOTYRANT="@comment "
		386	.endif
		387
344	.if defined(WITH_XMMS)	388	.if defined(WITH_XMMS)
345	LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms	389	LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms
346	CONFIGURE_ARGS+=--enable-xmms	390	CONFIGURE_ARGS+=--enable-xmms

Line 0 Link Here

(-)collectd5/files/patch-configure (+20 lines)
	1	--- configure.orig 2011-10-14 22:54:07.000000000 +0200
	2	+++ configure 2011-12-19 23:25:58.000000000 +0100
	3	@@ -21745,7 +21745,7 @@
	4	then
	5	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python LIBS" >&5
	6	$as_echo_n "checking for Python LIBS... " >&6; }
	7	- python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" \| "$with_python_prog" 2>&1`
	8	+ python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0)+\"/\"+distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" \| "$with_python_prog" 2>&1`
	9	python_config_status=$?
	10
	11	if test "$python_config_status" -ne 0 \|\| test "x$python_library_flags" = "x"
	12	@@ -21762,7 +21762,7 @@
	13	if test "x$with_python" = "xyes"
	14	then
	15	LDFLAGS="-L$python_library_path $LDFLAGS"
	16	- LIBS="$python_library_flags $LIBS"
	17	+ LIBS="$python_library_flags $LIBS -lm -lpthread -lutil"
	18
	19	ac_fn_c_check_func "$LINENO" "PyObject_CallFunction" "ac_cv_func_PyObject_CallFunction"
	20	if test "x$ac_cv_func_PyObject_CallFunction" = x""yes; then :

Line 0 Link Here

(-)collectd5/files/patch-configure.in (+20 lines)
	1	--- configure.in.orig 2011-10-14 22:49:49.000000000 +0200
	2	+++ configure.in 2011-12-19 23:07:31.000000000 +0100
	3	@@ -3165,7 +3165,7 @@
	4	if test "x$with_python" = "xyes"
	5	then
	6	AC_MSG_CHECKING([for Python LIBS])
	7	- python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" \| "$with_python_prog" 2>&1`
	8	+ python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0)+\"/\"+distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" \| "$with_python_prog" 2>&1`
	9	python_config_status=$?
	10
	11	if test "$python_config_status" -ne 0 \|\| test "x$python_library_flags" = "x"
	12	@@ -3180,7 +3180,7 @@
	13	if test "x$with_python" = "xyes"
	14	then
	15	LDFLAGS="-L$python_library_path $LDFLAGS"
	16	- LIBS="$python_library_flags $LIBS"
	17	+ LIBS="$python_library_flags $LIBS -lm -lpthread -lutil"
	18
	19	AC_CHECK_FUNC(PyObject_CallFunction,
	20	[with_python="yes"],