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

(-)collectd5.new/Makefile (-2 / +13 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	collectd
4
PORTNAME=	collectd
5
PORTVERSION=	5.4.2
5
PORTVERSION=	5.4.2
6
PORTREVISION=	1
6
CATEGORIES=	net-mgmt
7
CATEGORIES=	net-mgmt
7
MASTER_SITES=	http://collectd.org/files/
8
MASTER_SITES=	http://collectd.org/files/
8
PKGNAMESUFFIX=	5
9
PKGNAMESUFFIX=	5
Lines 25-31 Link Here
25
OPTIONS_GROUP_OUTPUT=	RRDTOOL NOTIFYEMAIL NOTIFYDESKTOP RIEMANN
26
OPTIONS_GROUP_OUTPUT=	RRDTOOL NOTIFYEMAIL NOTIFYDESKTOP RIEMANN
26
OPTIONS_GROUP_INPUT=	CURL DBI JSON MEMCACHEC MODBUS MONGODB MYSQL \
27
OPTIONS_GROUP_INPUT=	CURL DBI JSON MEMCACHEC MODBUS MONGODB MYSQL \
27
			NUTUPS PERL PGSQL PING PYTHON RABBITMQ REDIS \
28
			NUTUPS PERL PGSQL PING PYTHON RABBITMQ REDIS \
28
			ROUTEROS SIGROK SNMP STATGRAB TOKYOTYRANT XML XMMS
29
			ROUTEROS SIGROK SNMP STATGRAB TOKYOTYRANT VARNISH \
30
			XML XMMS
29
31
30
CGI_DESC=		Install collection.cgi (requires rrdtool)
32
CGI_DESC=		Install collection.cgi (requires rrdtool)
31
CURL_DESC=		Enable curl-based plugins (apache, nginx, etc)
33
CURL_DESC=		Enable curl-based plugins (apache, nginx, etc)
Lines 53-58 Link Here
53
SNMP_DESC=		Enable SNMP plugin
55
SNMP_DESC=		Enable SNMP plugin
54
STATGRAB_DESC=		Enable statgrab-based plugins (disk, interface, etc)
56
STATGRAB_DESC=		Enable statgrab-based plugins (disk, interface, etc)
55
TOKYOTYRANT_DESC=	Enable tokyotyrant plugin
57
TOKYOTYRANT_DESC=	Enable tokyotyrant plugin
58
VARNISH_DESC=		Enable varnish 3.x cache statistics
56
VIRT_DESC=		Enable libvirt plugin (requires XML)
59
VIRT_DESC=		Enable libvirt plugin (requires XML)
57
XML_DESC=		Enable XML plugins
60
XML_DESC=		Enable XML plugins
58
XMMS_DESC=		Enable xmms plugin
61
XMMS_DESC=		Enable xmms plugin
Lines 86-92 Link Here
86
		--without-libowcapi \
89
		--without-libowcapi \
87
		--without-libperfstat \
90
		--without-libperfstat \
88
		--without-libsensors \
91
		--without-libsensors \
89
		--without-libvarnish \
90
		--without-lvm \
92
		--without-lvm \
91
		--without-mic \
93
		--without-mic \
92
		--without-oracle
94
		--without-oracle
Lines 430-435 Link Here
430
PLIST_SUB+=	TOKYOTYRANT="@comment "
432
PLIST_SUB+=	TOKYOTYRANT="@comment "
431
.endif
433
.endif
432
434
435
.if ${PORT_OPTIONS:MVARNISH}
436
LIB_DEPENDS+=	libvarnishapi.so:${PORTSDIR}/www/varnish
437
CONFIGURE_ARGS+=--with-libvarnish=${LOCALBASE} --enable-varnish
438
PLIST_SUB+=	VARNISH=""
439
.else
440
CONFIGURE_ARGS+=--without-libvarnish
441
PLIST_SUB+=	VARNISH="@comment "
442
.endif
443
433
.if ${PORT_OPTIONS:MVIRT}
444
.if ${PORT_OPTIONS:MVIRT}
434
.if empty(PORT_OPTIONS:MXML)
445
.if empty(PORT_OPTIONS:MXML)
435
IGNORE=		VIRT requires XML. Either select XML or deselect VIRT.
446
IGNORE=		VIRT requires XML. Either select XML or deselect VIRT.
(-)collectd5.new/pkg-plist (+3 lines)
Lines 43-48 Link Here
43
%%MYSQL%%lib/collectd/mysql.so
43
%%MYSQL%%lib/collectd/mysql.so
44
lib/collectd/network.so
44
lib/collectd/network.so
45
%%CURL%%lib/collectd/nginx.so
45
%%CURL%%lib/collectd/nginx.so
46
%%NOTIFYEMAIL%%lib/collectd/notify_email.so
47
%%NOTIFYDESKTOP%%lib/collectd/notify_desktop.so
46
lib/collectd/ntpd.so
48
lib/collectd/ntpd.so
47
%%NUTUPS%%lib/collectd/nut.so
49
%%NUTUPS%%lib/collectd/nut.so
48
lib/collectd/openvpn.so
50
lib/collectd/openvpn.so
Lines 80-85 Link Here
80
lib/collectd/uptime.so
82
lib/collectd/uptime.so
81
%%USERS%%lib/collectd/users.so
83
%%USERS%%lib/collectd/users.so
82
lib/collectd/uuid.so
84
lib/collectd/uuid.so
85
%%VARNISH%%lib/collectd/varnish.so
83
%%VIRT%%lib/collectd/libvirt.so
86
%%VIRT%%lib/collectd/libvirt.so
84
lib/collectd/write_graphite.so
87
lib/collectd/write_graphite.so
85
%%CURL%%lib/collectd/write_http.so
88
%%CURL%%lib/collectd/write_http.so

Return to bug 198659