Attachment 127371 Details for Bug 171205 – collectd5.patch

[patch] collectd5.patch

collectd5.patch (text/x-diff; charset=iso-8859-2), 11.43 KB, created by Krzysztof on 2012-09-03 01:25:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof

Created: 2012-09-03 01:25:18 UTC

Size: 11.43 KB

patch

obsolete

>diff -ruN collectd5/Makefile collectd5.new/Makefile
>--- collectd5/Makefile	2012-07-27 05:20:16.000000000 +0200
>+++ collectd5.new/Makefile	2012-09-03 02:21:01.000000000 +0200
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	collectd
> PORTVERSION=	5.1.0
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	net-mgmt
> MASTER_SITES=	http://collectd.org/files/
> 
>@@ -21,34 +21,41 @@
> 
> LATEST_LINK=	collectd5
> 
>-OPTIONS=	CGI		"Install collection.cgi (requires RRDTOOL)" 	Off \
>-		BIND		"Enable BIND 9.5+ statistics"			On  \
>-		DEBUG		"Enable debugging" 				Off \
>-		APACHE		"Input: Apache mod_status (libcurl)" 		Off \
>-		APCUPS		"Input: APC UPS (apcupsd)" 			Off \
>-		CURL		"Input: CURL generic web statistics" 		Off \
>-		CURL_JSON	"Input: CURL JSON generic web statistics"	Off \
>-		CURL_XML	"Input: CURL XML generic web statistics"	Off \
>-		DBI		"Input: database abstraction library"		Off \
>-		DISK		"Input: Disk performance statistics"		Off \
>-		GCRYPT		"Build with libgcrypt"				Off \
>-		NUTUPS		"Input: NUT UPS daemon" 			Off \
>-		INTERFACE 	"Input: Network interfaces (libstatgrab)" 	On  \
>-		MBMON		"Input: MBMon" 					Off \
>-		MEMCACHED	"Input: Memcached"				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 \
>-		ROUTEROS	"Input: RouterOS 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
>+OPTIONS_DEFINE=	CGI BIND DEBUG APACHE APCUPS CURL CURL_JSON CURL_XML DBI DISK \
>+		GCRYPT NUTUPS INTERFACE MBMON MEMCACHED MYSQL NGINX OPENVPN \
>+		PDNS PGSQL PING PYTHON ROUTEROS SNMP TOKYOTYRANT XMMS RRDTOOL \
>+		RRDCACHED VIRT WRITE_HTTP
>+OPTIONS_DEFAULT=BIND INTERFACE PING SNMP RRDTOOL RRDCACHED
>+CGI_DESC=	"Install collection.cgi (requires RRDTOOL)"
>+BIND_DESC=	"Enable BIND 9.5+ statistics"
>+DEBUG_DESC=	"Enable debugging"
>+APACHE_DESC=	"Input: Apache mod_status (libcurl)"
>+APCUPS_DESC=	"Input: APC UPS (apcupsd)"
>+CURL_DESC=	"Input: CURL generic web statistics"
>+CURL_JSON_DESC=	"Input: CURL JSON generic web statistics"
>+CURL_XML_DESC=	"Input: CURL XML generic web statistics"
>+DBI_DESC=	"Input: database abstraction library"
>+DISK_DESC=	"Input: Disk performance statistics"
>+GCRYPT_DESC=	"Build with libgcrypt"
>+NUTUPS_DESC=	"Input: NUT UPS daemon"
>+INTERFACE_DESC=	"Input: Network interfaces (libstatgrab)"
>+MBMON_DESC=	"Input: MBMon" 
>+MEMCACHED_DESC=	"Input: Memcached"
>+MYSQL_DESC=	"Input: MySQL"
>+NGINX_DESC=	"Input: Nginx"
>+OPENVPN_DESC=	"Input: OpenVPN statistics"
>+PDNS_DESC=	"Input: PowerDNS"
>+PGSQL_DESC=	"Input: PostgreSQL"
>+PING_DESC=	"Input: Network latency (liboping)"
>+PYTHON_DESC=	"Input: Python plugin"
>+ROUTEROS_DESC=	"Input: RouterOS plugin"
>+SNMP_DESC=	"Input: SNMP"
>+TOKYOTYRANT_DESC="Input: Tokyotyrant database"
>+XMMS_DESC=	"Input: XMMS"
>+RRDTOOL_DESC=	"Output: RRDTool"
>+RRDCACHED_DESC=	"Output: RRDTool Cached (require RRDTOOL)"
>+VIRT_DESC=	"Build with libvirt"
>+WRITE_HTTP_DESC="Output: write_http"
> 
> MAN1=		collectd.1 collectd-nagios.1 collectdmon.1 collectdctl.1
> MAN5=		collectd.conf.5 collectd-email.5 collectd-exec.5 \
>@@ -88,7 +95,6 @@
> 		--disable-irq \
> 		--disable-java \
> 		--without-java \
>-		--disable-libvirt \
> 		--disable-madwifi \
> 		--disable-match_empty_counter \
> 		--disable-match_hashed \
>@@ -126,7 +132,6 @@
> 		--disable-vmem \
> 		--disable-vserver \
> 		--disable-wireless \
>-		--disable-write_http \
> 		--disable-zfs_arc \
> 		--without-perl-bindings \
> 		--without-librabbitmq \
>@@ -138,22 +143,22 @@
> 		--without-libesmtp \
> 		--disable-static
> 
>-.if defined(WITH_DEBUG)
>+.if defined(PORT_OPTIONS:DEBUG)
> CONFIGURE_ARGS+=--enable-debug
> .endif
> 
>-.if defined(WITH_CGI)
>+.if defined(PORT_OPTIONS:CGI)
> RUN_DEPENDS+=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
> 		p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm \
> 		p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper \
> 		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
> PLIST_SUB+=	CGI=""
>-WITH_RRDTOOL=	YES
>+PORT_OPTIONS:RRDTOOL=	YES
> .else
> PLIST_SUB+=	CGI="@comment "
> .endif
> 
>-.if defined(WITH_BIND)
>+.if defined(PORT_OPTIONS:BIND)
> CONFIGURE_ARGS+=--enable-bind
> LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
> LIB_DEPENDS+=	xml2:${PORTSDIR}/textproc/libxml2
>@@ -163,7 +168,7 @@
> PLIST_SUB+=	BIND="@comment "
> .endif
> 
>-.if defined(WITH_APACHE)
>+.if defined(PORT_OPTIONS:APACHE)
> CONFIGURE_ARGS+=--enable-apache
> LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
> PLIST_SUB+=	APACHE=""
>@@ -172,7 +177,7 @@
> PLIST_SUB+=	APACHE="@comment "
> .endif
> 
>-.if defined(WITH_APCUPS)
>+.if defined(PORT_OPTIONS:APCUPS)
> CONFIGURE_ARGS+=--enable-apcups
> BUILD_DEPENDS+=	${LOCALBASE}/sbin/apcupsd:${PORTSDIR}/sysutils/apcupsd
> PLIST_SUB+=	APCUPS=""
>@@ -181,7 +186,7 @@
> PLIST_SUB+=	APCUPS="@comment "
> .endif
> 
>-.if defined(WITH_CURL)
>+.if defined(PORT_OPTIONS:CURL)
> CONFIGURE_ARGS+=--enable-curl --with-libcurl=${LOCALBASE}
> LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
> PLIST_SUB+=	CURL=""
>@@ -190,8 +195,8 @@
> PLIST_SUB+=	CURL="@comment "
> .endif
> 
>-.if defined(WITH_CURL_JSON)
>-.if !defined(WITH_CURL)
>+.if defined(PORT_OPTIONS:CURL_JSON)
>+.if !defined(PORT_OPTIONS:CURL)
> IGNORE=	using CURL_JSON requires CURL support
> .endif
> CONFIGURE_ARGS+=--enable-curl_json
>@@ -202,8 +207,8 @@
> PLIST_SUB+=	CURL_JSON="@comment "
> .endif
> 
>-.if defined(WITH_CURL_XML)
>-.if !defined(WITH_CURL)
>+.if defined(PORT_OPTIONS:CURL_XML)
>+.if !defined(PORT_OPTIONS:CURL)
> IGNORE=	using CURL_XML requires CURL support
> .endif
> CONFIGURE_ARGS+=--enable-curl_xml
>@@ -214,7 +219,7 @@
> PLIST_SUB+=	CURL_XML="@comment "
> .endif
> 
>-.if defined(WITH_DBI)
>+.if defined(PORT_OPTIONS:DBI)
> CONFIGURE_ARGS+=--enable-dbi --with-libdbi=${LOCALBASE}
> LIB_DEPENDS+=	dbi.1:${PORTSDIR}/databases/libdbi
> PLIST_SUB+=	DBI=""
>@@ -223,7 +228,7 @@
> PLIST_SUB+=	DBI="@comment "
> .endif
> 
>-.if defined(WITH_DISK)
>+.if defined(PORT_OPTIONS:DISK)
> CONFIGURE_ARGS+=--enable-disk
> PLIST_SUB+=	DISK=""
> .else
>@@ -231,12 +236,12 @@
> PLIST_SUB+=	DISK="@comment "
> .endif
> 
>-.if defined(WITH_GCRYPT)
>+.if defined(PORT_OPTIONS:GCRYPT)
> CONFIGURE_ARGS+=--with-libgcrypt-prefix=${LOCALBASE}
> LIB_DEPENDS+=	gcrypt.18:${PORTSDIR}/security/libgcrypt
> .endif
> 
>-.if defined(WITH_NUTUPS)
>+.if defined(PORT_OPTIONS:NUTUPS)
> CONFIGURE_ARGS+=--enable-nut --with-libupsclient
> LIB_DEPENDS+=	upsclient.1:${PORTSDIR}/sysutils/nut
> PLIST_SUB+=	NUTUPS=""
>@@ -245,7 +250,7 @@
> PLIST_SUB+=	NUTUPS="@comment "
> .endif
> 
>-.if defined(WITH_INTERFACE)
>+.if defined(PORT_OPTIONS:INTERFACE)
> USE_PKGCONFIG=	yes
> CONFIGURE_ARGS+=--enable-interface
> LIB_DEPENDS+=	statgrab.8:${PORTSDIR}/devel/libstatgrab
>@@ -256,7 +261,7 @@
> PLIST_SUB+=	INTERFACE="@comment "
> .endif
> 
>-.if defined(WITH_MBMON)
>+.if defined(PORT_OPTIONS:MBMON)
> CONFIGURE_ARGS+=--enable-mbmon
> RUN_DEPENDS+=	${LOCALBASE}/bin/mbmon:${PORTSDIR}/sysutils/mbmon
> PLIST_SUB+=	MBMON=""
>@@ -265,7 +270,7 @@
> PLIST_SUB+=	MBMON="@comment "
> .endif
> 
>-.if defined(WITH_MEMCACHED)
>+.if defined(PORT_OPTIONS:MEMCACHED)
> LIB_DEPENDS+=	memcached:${PORTSDIR}/databases/libmemcached
> CONFIGURE_ARGS+=--enable-memcached
> CONFIGURE_ARGS+=--with-libmemcached=${LOCALBASE}
>@@ -275,7 +280,7 @@
> PLIST_SUB+=	MEMCACHED="@comment "
> .endif
> 
>-.if defined(WITH_MYSQL)
>+.if defined(PORT_OPTIONS:MYSQL)
> USE_MYSQL=	yes
> CONFIGURE_ARGS+=--enable-mysql
> PLIST_SUB+=	MYSQL=""
>@@ -284,7 +289,7 @@
> PLIST_SUB+=	MYSQL="@comment "
> .endif
> 
>-.if defined(WITH_NGINX)
>+.if defined(PORT_OPTIONS:NGINX)
> RUN_DEPENDS+=	nginx:${PORTSDIR}/www/nginx
> LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
> CONFIGURE_ARGS+=--enable-nginx
>@@ -294,7 +299,7 @@
> PLIST_SUB+=	NGINX="@comment "
> .endif
> 
>-.if defined(WITH_OPENVPN)
>+.if defined(PORT_OPTIONS:OPENVPN)
> CONFIGURE_ARGS+=--enable-openvpn
> RUN_DEPENDS+=	${LOCALBASE}/sbin/openvpn:${PORTSDIR}/security/openvpn
> PLIST_SUB+=	OPENVPN=""
>@@ -303,7 +308,7 @@
> PLIST_SUB+=	OPENVPN="@comment "
> .endif
> 
>-.if defined(WITH_PDNS)
>+.if defined(PORT_OPTIONS:PDNS)
> USE_PDNS=	yes
> CONFIGURE_ARGS+=--enable-powerdns
> PLIST_SUB+=	PDNS=""
>@@ -312,7 +317,7 @@
> PLIST_SUB+=	PDNS="@comment "
> .endif
> 
>-.if defined(WITH_PGSQL)
>+.if defined(PORT_OPTIONS:PGSQL)
> USE_PGSQL=	yes
> CONFIGURE_ARGS+=--enable-postgresql
> PLIST_SUB+=	PGSQL=""
>@@ -321,7 +326,7 @@
> PLIST_SUB+=	PGSQL="@comment "
> .endif
> 
>-.if defined(WITH_PING)
>+.if defined(PORT_OPTIONS:PING)
> LIB_DEPENDS+=	oping:${PORTSDIR}/net/liboping
> CONFIGURE_ARGS+=--enable-ping
> PLIST_SUB+=	PING=""
>@@ -330,7 +335,7 @@
> PLIST_SUB+=	PING="@comment "
> .endif
> 
>-.if defined(WITH_PYTHON)
>+.if defined(PORT_OPTIONS:PYTHON)
> USE_PYTHON=		yes
> CONFIGURE_ARGS+=--enable-python
> PLIST_SUB+=	PYTHON=""
>@@ -339,7 +344,7 @@
> PLIST_SUB+=	PYTHON="@comment "
> .endif
> 
>-.if defined(WITH_ROUTEROS)
>+.if defined(PORT_OPTIONS:ROUTEROS)
> LIB_DEPENDS+=	routeros:${PORTSDIR}/net/librouteros
> CONFIGURE_ARGS+=--enable-routeros --with-librouteros=${LOCALBASE}
> PLIST_SUB+=	ROUTEROS=""
>@@ -348,7 +353,7 @@
> PLIST_SUB+=	ROUTEROS="@comment "
> .endif
> 
>-.if defined(WITH_RRDTOOL)
>+.if defined(PORT_OPTIONS:RRDTOOL)
> LIB_DEPENDS+=	rrd:${PORTSDIR}/databases/rrdtool
> CONFIGURE_ARGS+=--enable-rrdtool
> PLIST_SUB+=	RRD=""
>@@ -357,7 +362,7 @@
> PLIST_SUB+=	RRD="@comment "
> .endif
> 
>-.if defined(WITH_RRDCACHED) && defined(WITH_RRDTOOL)
>+.if defined(PORT_OPTIONS:RRDCACHED) && defined(PORT_OPTIONS:RRDTOOL)
> CONFIGURE_ARGS+=--enable-rrdcached
> PLIST_SUB+=	RRDCACHED=""
> .else
>@@ -365,7 +370,7 @@
> PLIST_SUB+=	RRDCACHED="@comment "
> .endif
> 
>-.if defined(WITH_SNMP)
>+.if defined(PORT_OPTIONS:SNMP)
> LIB_DEPENDS+=	netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
> CONFIGURE_ARGS+=--enable-snmp
> PLIST_SUB+=	SNMP=""
>@@ -374,7 +379,7 @@
> PLIST_SUB+=	SNMP="@comment "
> .endif
> 
>-.if defined(WITH_TOKYOTYRANT)
>+.if defined(PORT_OPTIONS:TOKYOTYRANT)
> LIB_DEPENDS+=	tokyotyrant.3:${PORTSDIR}/databases/tokyotyrant
> CONFIGURE_ARGS+=--enable-tokyotyrant
> CONFIGURE_ARGS+=--with-libtokyotyrant=${LOCALBASE}
>@@ -384,7 +389,24 @@
> PLIST_SUB+=	TOKYOTYRANT="@comment "
> .endif
> 
>-.if defined(WITH_XMMS)
>+.if defined(PORT_OPTIONS: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(PORT_OPTIONS: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(PORT_OPTIONS:XMMS)
> LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
> CONFIGURE_ARGS+=--enable-xmms
> CFLAGS+=	`xmms-config --cflags`
>@@ -422,7 +444,7 @@
> 		${CP} -p ${PREFIX}/etc/collectd.conf.sample \
> 			${PREFIX}/etc/collectd.conf ; \
> 	fi
>-.if defined(WITH_CGI)
>+.if defined(PORT_OPTIONS:CGI)
> 	${MKDIR} ${WWWDIR}
> 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/collection.cgi ${WWWDIR}/
> 	${INSTALL_DATA} ${WRKSRC}/contrib/collection.conf \
>diff -ruN collectd5/pkg-plist collectd5.new/pkg-plist
>--- collectd5/pkg-plist	2012-04-13 05:20:13.000000000 +0200
>+++ collectd5.new/pkg-plist	2012-08-31 15:17:59.000000000 +0200
>@@ -105,12 +105,16 @@
> lib/collectd/uptime.so
> lib/collectd/uuid.la
> lib/collectd/uuid.so
>+%%VIRT%%lib/collectd/libvirt.la
>+%%VIRT%%lib/collectd/libvirt.so
> lib/collectd/write_graphite.so
> lib/collectd/write_graphite.la
> lib/libcollectdclient.la
> lib/libcollectdclient.so
> lib/libcollectdclient.so.0
> libdata/pkgconfig/libcollectdclient.pc
>+%%WRITE_HTTP%%lib/collectd/write_http.la
>+%%WRITE_HTTP%%lib/collectd/write_http.so
> %%XMMS%%lib/collectd/xmms.la
> %%XMMS%%lib/collectd/xmms.so
> %%DATADIR%%/postgresql_default.conf

Actions: View | Diff

Attachments on bug 171205: 127370 | 127371