Attachment #130928 for bug #174953

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





OPTIONS_DEFINE=		CGI BIND DEBUG GCRYPT VIRT
OPTIONS_MULTI=		INPUT OUTPUT
OPTIONS_MULTI_OUTPUT=	RRDTOOL RRDCACHED WRITE_GRAPHITE WRITE_HTTP NOTIFYEMAIL
OPTIONS_MULTI_INPUT=	APACHE APCUPS CURL CURL_JSON CURL_XML DBI DISK \
			GCRYPT NUTUPS INTERFACE IPMI MBMON MEMCACHED MYSQL NGINX \
			OPENVPN PDNS PGSQL PING PYTHON ROUTEROS SNMP \
			TABLE TOKYOTYRANT VARNISH XMMS
OPTIONS_DEFAULT=	BIND INTERFACE PING SNMP RRDTOOL RRDCACHED

CGI_DESC=		Install collection.cgi (requires RRDTOOL)

MBMON_DESC=		MBMon 
MEMCACHED_DESC=		Memcached
MYSQL_DESC=		MySQL
NOTIFYEMAIL_DESC=	Email notifications (libesmtp)
NGINX_DESC=		Nginx
OPENVPN_DESC=		OpenVPN statistics
PDNS_DESC=		PowerDNS

PYTHON_DESC=		Python plugin
ROUTEROS_DESC=		RouterOS plugin
SNMP_DESC=		SNMP
TABLE_DESC=		Table plugin
TOKYOTYRANT_DESC=	Tokyotyrant database
VARNISH_DESC=		Varnish plugin
XMMS_DESC=		XMMS
# OUTPUT
RRDTOOL_DESC=		RRDTool

.endif

.if ${PORT_OPTIONS:MIPMI}
USE_PKGCONFIG=  yes
CONFIGURE_ARGS+=--enable-ipmi
LIB_DEPENDS+=	OpenIPMI:${PORTSDIR}/sysutils/openipmi
PLIST_SUB+=	IPMI=""
.else
CONFIGURE_ARGS+=--disable-ipmi

PLIST_SUB+=	MYSQL="@comment "
.endif

.if ${PORT_OPTIONS:MNOTIFYEMAIL}
LIB_DEPENDS+=	esmtp:${PORTSDIR}/mail/libesmtp
CONFIGURE_ARGS+=--enable-notify_email
CONFIGURE_ARGS+=--with-libesmtp=${PREFIX}
PLIST_SUB+=	NOTIFYEMAIL=""
.else
CONFIGURE_ARGS+=--disable-notify_email
PLIST_SUB+=	NOTIFYEMAIL="@comment "
.endif

.if ${PORT_OPTIONS:MNGINX}
RUN_DEPENDS+=	nginx:${PORTSDIR}/www/nginx
LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl

PLIST_SUB+=	SNMP="@comment "
.endif

.if ${PORT_OPTIONS:MTABLE}
CONFIGURE_ARGS+=--enable-table
PLIST_SUB+=	TABLE=""
.else
CONFIGURE_ARGS+=--disable-table
PLIST_SUB+=	TABLE="@comment "
.endif

.if ${PORT_OPTIONS:MTOKYOTYRANT}
LIB_DEPENDS+=	tokyotyrant:${PORTSDIR}/databases/tokyotyrant
CONFIGURE_ARGS+=--enable-tokyotyrant

PLIST_SUB+=	TOKYOTYRANT="@comment "
.endif

.if ${PORT_OPTIONS:MVARNISH}
LIB_DEPENDS+=	varnishapi:${PORTSDIR}/www/varnish
CONFIGURE_ARGS+=--enable-varnish
CONFIGURE_ARGS+=--with-libvarnish=${PREFIX}
PLIST_SUB+=	VARNISH=""
.else
CONFIGURE_ARGS+=--disable-varnish
PLIST_SUB+=	VARNISH="@comment "
.endif

.if ${PORT_OPTIONS:MVIRT}
CONFIGURE_ARGS+=--enable-libvirt
LIB_DEPENDS+=	virt.1000:${PORTSDIR}/devel/libvirt




 
 	AC_CHECK_FUNC(PyObject_CallFunction,
 		      [with_python="yes"],
--- configure.in.orig	2013-01-03 17:07:22.000000000 +0000
+++ configure.in	2013-01-03 17:07:58.000000000 +0000
@@ -4057,7 +4057,7 @@
 	then
 		AC_MSG_NOTICE([Not checking for libvarnish: Manually configured])
 		with_libvarnish_cflags="-I$withval/include"
-		with_libvarnish_libs="-L$withval/lib -lvarnish -lvarnishcompat -lvarnishapi"
+		with_libvarnish_libs="-L$withval/lib/varnish -lvarnish -lvarnishcompat -lvarnishapi"
 		with_libvarnish="yes"
 	fi; fi; fi
 ],
@@ -4580,6 +4583,12 @@
 	plugin_zfs_arc="yes"
 fi

Lines 45-50 Link Here

(-)collectd5/files/patch-src__Makefile.am (+9 lines)
45	endif	45	endif
46	if BUILD_WITH_LIBDEVINFO	46	if BUILD_WITH_LIBDEVINFO
47	memory_la_LIBADD += -ldevinfo	47	memory_la_LIBADD += -ldevinfo
		48	@@ -763,7 +763,7 @@
		49	pkglib_LTLIBRARIES += notify_email.la
		50	notify_email_la_SOURCES = notify_email.c
		51	notify_email_la_LDFLAGS = -module -avoid-version
		52	-notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread -ldl
		53	+notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread
		54	collectd_LDADD += "-dlopen" notify_email.la
		55	collectd_DEPENDENCIES += notify_email.la
		56	endif
48	@@ -1021,7 +1021,7 @@	57	@@ -1021,7 +1021,7 @@
49	collectd_LDADD += "-dlopen" swap.la	58	collectd_LDADD += "-dlopen" swap.la
50	collectd_DEPENDENCIES += swap.la	59	collectd_DEPENDENCIES += swap.la

Lines 45-50 Link Here

(-)collectd5/pkg-plist (+8 lines)
45	lib/collectd/filecount.so	45	lib/collectd/filecount.so
46	%%INTERFACE%%lib/collectd/interface.la	46	%%INTERFACE%%lib/collectd/interface.la
47	%%INTERFACE%%lib/collectd/interface.so	47	%%INTERFACE%%lib/collectd/interface.so
		48	%%IPMI%%lib/collectd/ipmi.la
		49	%%IPMI%%lib/collectd/ipmi.so
48	lib/collectd/load.la	50	lib/collectd/load.la
49	lib/collectd/load.so	51	lib/collectd/load.so
50	lib/collectd/logfile.la	52	lib/collectd/logfile.la
Lines 57-62 Link Here
57	lib/collectd/memory.so	59	lib/collectd/memory.so
58	%%MYSQL%%lib/collectd/mysql.la	60	%%MYSQL%%lib/collectd/mysql.la
59	%%MYSQL%%lib/collectd/mysql.so	61	%%MYSQL%%lib/collectd/mysql.so
		62	%%NOTIFYEMAIL%%lib/collectd/notify_email.la
		63	%%NOTIFYEMAIL%%lib/collectd/notify_email.so
60	%%NGINX%%lib/collectd/nginx.la	64	%%NGINX%%lib/collectd/nginx.la
61	%%NGINX%%lib/collectd/nginx.so	65	%%NGINX%%lib/collectd/nginx.so
62	lib/collectd/network.la	66	lib/collectd/network.la
Lines 97-102 Link Here
97	lib/collectd/tcpconns.so	101	lib/collectd/tcpconns.so
98	lib/collectd/threshold.la	102	lib/collectd/threshold.la
99	lib/collectd/threshold.so	103	lib/collectd/threshold.so
		104	%%TABLE%%lib/collectd/table.la
		105	%%TABLE%%lib/collectd/table.so
100	%%TOKYOTYRANT%%lib/collectd/tokyotyrant.la	106	%%TOKYOTYRANT%%lib/collectd/tokyotyrant.la
101	%%TOKYOTYRANT%%lib/collectd/tokyotyrant.so	107	%%TOKYOTYRANT%%lib/collectd/tokyotyrant.so
102	lib/collectd/unixsock.la	108	lib/collectd/unixsock.la
Lines 107-112 Link Here
107	lib/collectd/users.so	113	lib/collectd/users.so
108	lib/collectd/uuid.la	114	lib/collectd/uuid.la
109	lib/collectd/uuid.so	115	lib/collectd/uuid.so
		116	%%VARNISH%%lib/collectd/varnish.la
		117	%%VARNISH%%lib/collectd/varnish.so
110	%%VIRT%%lib/collectd/libvirt.la	118	%%VIRT%%lib/collectd/libvirt.la
111	%%VIRT%%lib/collectd/libvirt.so	119	%%VIRT%%lib/collectd/libvirt.so
112	%%WRITE_GRAPHITE%%lib/collectd/write_graphite.so	120	%%WRITE_GRAPHITE%%lib/collectd/write_graphite.so

Return to bug 174953

Lines 18-27 Link Here

(-)collectd5/Makefile (-4 / +37 lines)
18		18
19	OPTIONS_DEFINE= CGI BIND DEBUG GCRYPT VIRT	19	OPTIONS_DEFINE= CGI BIND DEBUG GCRYPT VIRT
20	OPTIONS_MULTI= INPUT OUTPUT	20	OPTIONS_MULTI= INPUT OUTPUT
21	OPTIONS_MULTI_OUTPUT= RRDTOOL RRDCACHED WRITE_GRAPHITE WRITE_HTTP	21	OPTIONS_MULTI_OUTPUT= RRDTOOL RRDCACHED WRITE_GRAPHITE WRITE_HTTP NOTIFYEMAIL
22	OPTIONS_MULTI_INPUT= APACHE APCUPS CURL CURL_JSON CURL_XML DBI DISK \	22	OPTIONS_MULTI_INPUT= APACHE APCUPS CURL CURL_JSON CURL_XML DBI DISK \
23	GCRYPT NUTUPS INTERFACE IPMI MBMON MEMCACHED MYSQL NGINX OPENVPN \	23	GCRYPT NUTUPS INTERFACE IPMI MBMON MEMCACHED MYSQL NGINX \
24	PDNS PGSQL PING PYTHON ROUTEROS SNMP TOKYOTYRANT XMMS	24	OPENVPN PDNS PGSQL PING PYTHON ROUTEROS SNMP \
		25	TABLE TOKYOTYRANT VARNISH XMMS
25	OPTIONS_DEFAULT= BIND INTERFACE PING SNMP RRDTOOL RRDCACHED	26	OPTIONS_DEFAULT= BIND INTERFACE PING SNMP RRDTOOL RRDCACHED
26		27
27	CGI_DESC= Install collection.cgi (requires RRDTOOL)	28	CGI_DESC= Install collection.cgi (requires RRDTOOL)
Lines 43-48 Link Here
43	MBMON_DESC= MBMon	44	MBMON_DESC= MBMon
44	MEMCACHED_DESC= Memcached	45	MEMCACHED_DESC= Memcached
45	MYSQL_DESC= MySQL	46	MYSQL_DESC= MySQL
		47	NOTIFYEMAIL_DESC= Email notifications (libesmtp)
46	NGINX_DESC= Nginx	48	NGINX_DESC= Nginx
47	OPENVPN_DESC= OpenVPN statistics	49	OPENVPN_DESC= OpenVPN statistics
48	PDNS_DESC= PowerDNS	50	PDNS_DESC= PowerDNS
Lines 51-57 Link Here
51	PYTHON_DESC= Python plugin	53	PYTHON_DESC= Python plugin
52	ROUTEROS_DESC= RouterOS plugin	54	ROUTEROS_DESC= RouterOS plugin
53	SNMP_DESC= SNMP	55	SNMP_DESC= SNMP
		56	TABLE_DESC= Table plugin
54	TOKYOTYRANT_DESC= Tokyotyrant database	57	TOKYOTYRANT_DESC= Tokyotyrant database
		58	VARNISH_DESC= Varnish plugin
55	XMMS_DESC= XMMS	59	XMMS_DESC= XMMS
56	# OUTPUT	60	# OUTPUT
57	RRDTOOL_DESC= RRDTool	61	RRDTOOL_DESC= RRDTool
Lines 264-271 Link Here
264	.endif	268	.endif
265		269
266	.if ${PORT_OPTIONS:MIPMI}	270	.if ${PORT_OPTIONS:MIPMI}
		271	USE_PKGCONFIG= yes
267	CONFIGURE_ARGS+=--enable-ipmi	272	CONFIGURE_ARGS+=--enable-ipmi
268	LIB_DEPENDS+= openipmi:${PORTSDIR}/sysutils/openipmi	273	LIB_DEPENDS+= OpenIPMI:${PORTSDIR}/sysutils/openipmi
269	PLIST_SUB+= IPMI=""	274	PLIST_SUB+= IPMI=""
270	.else	275	.else
271	CONFIGURE_ARGS+=--disable-ipmi	276	CONFIGURE_ARGS+=--disable-ipmi
Lines 300-305 Link Here
300	PLIST_SUB+= MYSQL="@comment "	305	PLIST_SUB+= MYSQL="@comment "
301	.endif	306	.endif
302		307
		308	.if ${PORT_OPTIONS:MNOTIFYEMAIL}
		309	LIB_DEPENDS+= esmtp:${PORTSDIR}/mail/libesmtp
		310	CONFIGURE_ARGS+=--enable-notify_email
		311	CONFIGURE_ARGS+=--with-libesmtp=${PREFIX}
		312	PLIST_SUB+= NOTIFYEMAIL=""
		313	.else
		314	CONFIGURE_ARGS+=--disable-notify_email
		315	PLIST_SUB+= NOTIFYEMAIL="@comment "
		316	.endif
		317
303	.if ${PORT_OPTIONS:MNGINX}	318	.if ${PORT_OPTIONS:MNGINX}
304	RUN_DEPENDS+= nginx:${PORTSDIR}/www/nginx	319	RUN_DEPENDS+= nginx:${PORTSDIR}/www/nginx
305	LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl	320	LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
Lines 390-395 Link Here
390	PLIST_SUB+= SNMP="@comment "	405	PLIST_SUB+= SNMP="@comment "
391	.endif	406	.endif
392		407
		408	.if ${PORT_OPTIONS:MTABLE}
		409	CONFIGURE_ARGS+=--enable-table
		410	PLIST_SUB+= TABLE=""
		411	.else
		412	CONFIGURE_ARGS+=--disable-table
		413	PLIST_SUB+= TABLE="@comment "
		414	.endif
		415
393	.if ${PORT_OPTIONS:MTOKYOTYRANT}	416	.if ${PORT_OPTIONS:MTOKYOTYRANT}
394	LIB_DEPENDS+= tokyotyrant:${PORTSDIR}/databases/tokyotyrant	417	LIB_DEPENDS+= tokyotyrant:${PORTSDIR}/databases/tokyotyrant
395	CONFIGURE_ARGS+=--enable-tokyotyrant	418	CONFIGURE_ARGS+=--enable-tokyotyrant
Lines 400-405 Link Here
400	PLIST_SUB+= TOKYOTYRANT="@comment "	423	PLIST_SUB+= TOKYOTYRANT="@comment "
401	.endif	424	.endif
402		425
		426	.if ${PORT_OPTIONS:MVARNISH}
		427	LIB_DEPENDS+= varnishapi:${PORTSDIR}/www/varnish
		428	CONFIGURE_ARGS+=--enable-varnish
		429	CONFIGURE_ARGS+=--with-libvarnish=${PREFIX}
		430	PLIST_SUB+= VARNISH=""
		431	.else
		432	CONFIGURE_ARGS+=--disable-varnish
		433	PLIST_SUB+= VARNISH="@comment "
		434	.endif
		435
403	.if ${PORT_OPTIONS:MVIRT}	436	.if ${PORT_OPTIONS:MVIRT}
404	CONFIGURE_ARGS+=--enable-libvirt	437	CONFIGURE_ARGS+=--enable-libvirt
405	LIB_DEPENDS+= virt.1000:${PORTSDIR}/devel/libvirt	438	LIB_DEPENDS+= virt.1000:${PORTSDIR}/devel/libvirt

Lines 64-69 Link Here

(-)collectd5/files/patch-configure.in (+11 lines)
64		64
65	AC_CHECK_FUNC(PyObject_CallFunction,	65	AC_CHECK_FUNC(PyObject_CallFunction,
66	[with_python="yes"],	66	[with_python="yes"],
		67	--- configure.in.orig 2013-01-03 17:07:22.000000000 +0000
		68	+++ configure.in 2013-01-03 17:07:58.000000000 +0000
		69	@@ -4057,7 +4057,7 @@
		70	then
		71	AC_MSG_NOTICE([Not checking for libvarnish: Manually configured])
		72	with_libvarnish_cflags="-I$withval/include"
		73	- with_libvarnish_libs="-L$withval/lib -lvarnish -lvarnishcompat -lvarnishapi"
		74	+ with_libvarnish_libs="-L$withval/lib/varnish -lvarnish -lvarnishcompat -lvarnishapi"
		75	with_libvarnish="yes"
		76	fi; fi; fi
		77	],
67	@@ -4580,6 +4583,12 @@	78	@@ -4580,6 +4583,12 @@
68	plugin_zfs_arc="yes"	79	plugin_zfs_arc="yes"
69	fi	80	fi