diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile index 749a67e07353..5b728e3501cb 100644 --- a/net-mgmt/collectd5/Makefile +++ b/net-mgmt/collectd5/Makefile @@ -1,382 +1,391 @@ # New ports collection makefile for: collectd # Date created: Sat Sep 29 05:19:31 PDT 2007 # Whom: Matt Peterson # # $FreeBSD$ # PORTNAME= collectd -PORTVERSION= 5.0.0 +PORTVERSION= 5.0.1 CATEGORIES= net-mgmt MASTER_SITES= http://collectd.org/files/ MAINTAINER= ports@bsdserwis.com COMMENT= Systems & network statistics collection daemon USE_GMAKE= yes GNU_CONFIGURE= yes USE_AUTOTOOLS= libltdl WANT_GNOME= yes 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 \ 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 \ SNMP "Input: SNMP" On \ XMMS "Input: XMMS" Off \ - RRDTOOL "Output: RRDTool" On + 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 \ collectd-snmp.5 collectd-unixsock.5 collectd-perl.5 \ collectd-java.5 collectd-python.5 types.db.5 collectd-threshold.5 USE_RC_SUBR= collectd collectdmon USE_LDCONFIG= yes CONFLICTS= collectd-4.[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .include .if ( ${OSVERSION} < 601103 ) BROKEN= Need bind9 import post 6.1 .endif .if ${OSVERSION} < 700000 BROKEN= does not configure on 6.X .endif # NOTE: Feel free to submit patches adding support for any of these # disabled plugins. If a plugin requires external dependencies, # make it optional through OPTIONS defaulting to Off. Some of # these are Linux specific, but others will probably run on # FreeBSD as well, given a bit of careful attention. CONFIGURE_ARGS= --localstatedir=/var \ --disable-getifaddrs \ --disable-apple_sensors \ --disable-ascent \ --disable-battery \ --disable-conntrack \ --disable-contextswitch \ --disable-cpufreq \ --disable-entropy \ --disable-fscache \ --disable-gmond \ --disable-hddtemp \ --disable-ipmi \ --disable-iptables \ --disable-ipvs \ --disable-irq \ --disable-java \ --disable-libvirt \ --disable-madwifi \ --disable-match_empty_counter \ --disable-match_hashed \ --disable-match_regex \ --disable-match_timediff \ --disable-match_value \ --disable-memcachec \ --disable-modbus \ --disable-multimeter \ --disable-netapp \ --disable-netlink \ --disable-nfs \ --disable-notify_desktop \ --disable-notify_email \ --disable-olsrd \ --disable-onewire \ --disable-oracle \ --disable-perl \ --disable-pinba \ --disable-python \ --disable-protocols \ --disable-routeros \ - --disable-rrdcached \ --disable-sensors \ --disable-serial \ --disable-table \ --disable-tape \ --disable-target_notification \ --disable-target_replace \ --disable-target_scale \ --disable-target_set \ --disable-teamspeak2 \ --disable-ted \ --disable-thermal \ --disable-tokyotyrant \ --disable-users \ --disable-vmem \ --disable-vserver \ --disable-wireless \ --disable-write_http \ --disable-zfs_arc \ - --without-perl-bindings + --without-perl-bindings \ + --disable-static .if defined(WITH_DEBUG) CONFIGURE_ARGS+=--enable-debug .endif .if defined(WITH_CGI) RUN_DEPENDS+= ${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \ ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \ ${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="" .else PLIST_SUB+= CGI="@comment " .endif .if defined(WITH_BIND) CONFIGURE_ARGS+=--enable-bind LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl LIB_DEPENDS+= xml2:${PORTSDIR}/textproc/libxml2 PLIST_SUB+= BIND="" .else CONFIGURE_ARGS+=--disable-bind PLIST_SUB+= BIND="@comment " .endif .if defined(WITH_APACHE) CONFIGURE_ARGS+=--enable-apache LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl PLIST_SUB+= APACHE="" .else CONFIGURE_ARGS+=--disable-apache PLIST_SUB+= APACHE="@comment " .endif .if defined(WITH_APCUPS) CONFIGURE_ARGS+=--enable-apcups BUILD_DEPENDS+= ${LOCALBASE}/sbin/apcupsd:${PORTSDIR}/sysutils/apcupsd PLIST_SUB+= APCUPS="" .else CONFIGURE_ARGS+=--disable-apcups PLIST_SUB+= APCUPS="@comment " .endif .if defined(WITH_CURL) CONFIGURE_ARGS+=--enable-curl --with-libcurl=${LOCALBASE} LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl PLIST_SUB+= CURL="" .else CONFIGURE_ARGS+=--disable-curl PLIST_SUB+= CURL="@comment " .endif .if defined(WITH_CURL_JSON) .if !defined(WITH_CURL) IGNORE= using CURL_JSON requires CURL support .endif CONFIGURE_ARGS+=--enable-curl_json LIB_DEPENDS+= yajl:${PORTSDIR}/devel/yajl PLIST_SUB+= CURL_JSON="" .else CONFIGURE_ARGS+=--disable-curl_json PLIST_SUB+= CURL_JSON="@comment " .endif .if defined(WITH_CURL_XML) .if !defined(WITH_CURL) IGNORE= using CURL_XML requires CURL support .endif CONFIGURE_ARGS+=--enable-curl_xml LIB_DEPENDS+= xml2:${PORTSDIR}/textproc/libxml2 PLIST_SUB+= CURL_XML="" .else CONFIGURE_ARGS+=--disable-curl_xml PLIST_SUB+= CURL_XML="@comment " .endif .if defined(WITH_DBI) CONFIGURE_ARGS+=--enable-dbi --with-libdbi=${LOCALBASE} LIB_DEPENDS+= dbi.1:${PORTSDIR}/databases/libdbi PLIST_SUB+= DBI="" .else CONFIGURE_ARGS+=--disable-dbi PLIST_SUB+= DBI="@comment " .endif .if defined(WITH_DISK) CONFIGURE_ARGS+=--enable-disk PLIST_SUB+= DISK="" .else CONFIGURE_ARGS+=--disable-disk PLIST_SUB+= DISK="@comment " .endif .if defined(WITH_GCRYPT) CONFIGURE_ARGS+=--with-libgcrypt-prefix=${LOCALBASE} LIB_DEPENDS+= gcrypt.18:${PORTSDIR}/security/libgcrypt .endif .if defined(WITH_NUTUPS) CONFIGURE_ARGS+=--enable-nut BUILD_DEPENDS+= ${LOCALBASE}/include/upsclient.h:${PORTSDIR}/sysutils/nut PLIST_SUB+= NUTUPS="" .else CONFIGURE_ARGS+=--disable-nut PLIST_SUB+= NUTUPS="@comment " .endif .if defined(WITH_INTERFACE) BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config CONFIGURE_ARGS+=--enable-interface LIB_DEPENDS+= statgrab.8:${PORTSDIR}/devel/libstatgrab PLIST_SUB+= INTERFACE="" CONFIGURE_ENV+= LIBS="`pkg-config --libs libstatgrab`" .else CONFIGURE_ARGS+=--disable-interface PLIST_SUB+= INTERFACE="@comment " .endif .if defined(WITH_MBMON) CONFIGURE_ARGS+=--enable-mbmon RUN_DEPENDS+= ${LOCALBASE}/bin/mbmon:${PORTSDIR}/sysutils/mbmon PLIST_SUB+= MBMON="" .else CONFIGURE_ARGS+=--disable-mbmon PLIST_SUB+= MBMON="@comment " .endif .if defined(WITH_MYSQL) USE_MYSQL= yes CONFIGURE_ARGS+=--enable-mysql PLIST_SUB+= MYSQL="" .else CONFIGURE_ARGS+=--disable-mysql PLIST_SUB+= MYSQL="@comment " .endif .if defined(WITH_NGINX) USE_NGINX= yes LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+=--enable-nginx PLIST_SUB+= NGINX="" .else CONFIGURE_ARGS+=--disable-nginx PLIST_SUB+= NGINX="@comment " .endif .if defined(WITH_OPENVPN) CONFIGURE_ARGS+=--enable-openvpn RUN_DEPENDS+= ${LOCALBASE}/sbin/openvpn:${PORTSDIR}/security/openvpn PLIST_SUB+= OPENVPN="" .else CONFIGURE_ARGS+=--disable-openvpn PLIST_SUB+= OPENVPN="@comment " .endif .if defined(WITH_PDNS) USE_PDNS= yes CONFIGURE_ARGS+=--enable-powerdns PLIST_SUB+= PDNS="" .else CONFIGURE_ARGS+=--disable-powerdns PLIST_SUB+= PDNS="@comment " .endif .if defined(WITH_PGSQL) USE_PGSQL= yes CONFIGURE_ARGS+=--enable-postgresql PLIST_SUB+= PGSQL="" .else CONFIGURE_ARGS+=--disable-postgresql PLIST_SUB+= PGSQL="@comment " .endif .if defined(WITH_PING) LIB_DEPENDS+= oping:${PORTSDIR}/net/liboping CONFIGURE_ARGS+=--enable-ping PLIST_SUB+= PING="" .else CONFIGURE_ARGS+=--disable-ping PLIST_SUB+= PING="@comment " .endif .if defined(WITH_RRDTOOL) LIB_DEPENDS+= rrd:${PORTSDIR}/databases/rrdtool CONFIGURE_ARGS+=--enable-rrdtool PLIST_SUB+= RRD="" .else CONFIGURE_ARGS+=--disable-rrdtool 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 PLIST_SUB+= SNMP="" .else CONFIGURE_ARGS+=--disable-snmp PLIST_SUB+= SNMP="@comment " .endif .if defined(WITH_XMMS) LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms CONFIGURE_ARGS+=--enable-xmms CFLAGS+= `xmms-config --cflags` PLIST_SUB+= XMMS="" .else CONFIGURE_ARGS+=--disable-xmms PLIST_SUB+= XMMS="@comment " .endif post-patch: @${REINPLACE_CMD} \ -e 's;@prefix@/var/;/var/;' \ -e 's;/var/lib/;/var/db/;' \ ${WRKSRC}/src/collectd.conf.in @${REINPLACE_CMD} \ -e 's;$$[(]DESTDIR)$$[(]sysconfdir)/collectd\.conf;&.sample;' \ ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} -e '/$$[(]mkinstalldirs)/d' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} \ -e 's;/etc/collection\.conf;${WWWDIR}/collection.conf;' \ ${WRKSRC}/contrib/collection.cgi @${REINPLACE_CMD} \ -e 's;/opt/collectd/var/lib;/var/db;' \ -e 's;/opt/collectd/lib;${PREFIX}/lib;' \ ${WRKSRC}/contrib/collection.conf @${REINPLACE_CMD} \ -e 's;{libdir}/pkgconfig;{prefix}/libdata/pkgconfig;' \ ${WRKSRC}/configure post-install: ${MKDIR} /var/db/collectd if [ ! -f ${PREFIX}/etc/collectd.conf ]; then \ ${CP} -p ${PREFIX}/etc/collectd.conf.sample \ ${PREFIX}/etc/collectd.conf ; \ fi .if defined(WITH_CGI) ${MKDIR} ${WWWDIR} ${INSTALL_SCRIPT} ${WRKSRC}/contrib/collection.cgi ${WWWDIR}/ ${INSTALL_DATA} ${WRKSRC}/contrib/collection.conf \ ${WWWDIR}/collection.conf.sample if [ ! -f ${WWWDIR}/collection.conf ]; then \ ${CP} -p ${WWWDIR}/collection.conf.sample \ ${WWWDIR}/collection.conf ; \ fi .endif .include diff --git a/net-mgmt/collectd5/distinfo b/net-mgmt/collectd5/distinfo index ef6d9b81bcfb..481688996fa2 100644 --- a/net-mgmt/collectd5/distinfo +++ b/net-mgmt/collectd5/distinfo @@ -1,2 +1,2 @@ -SHA256 (collectd-5.0.0.tar.gz) = d2106b2c85d16292b6b8bb9693c99f5659eced35b406da3c67e852100fdee2db -SIZE (collectd-5.0.0.tar.gz) = 1784800 +SHA256 (collectd-5.0.1.tar.gz) = 380f98a50eba9453eb84fbb8b847df8ee6eff69bf05a4d61c996cf8256712c42 +SIZE (collectd-5.0.1.tar.gz) = 1680960 diff --git a/net-mgmt/collectd5/files/patch-src__meta_data.c b/net-mgmt/collectd5/files/patch-src__meta_data.c deleted file mode 100644 index c90d50e452aa..000000000000 --- a/net-mgmt/collectd5/files/patch-src__meta_data.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ./src/meta_data.c.orig 2011-05-30 06:58:07.055492500 -0400 -+++ ./src/meta_data.c 2011-05-30 06:59:10.383490225 -0400 -@@ -215,6 +215,7 @@ - return; - - md_entry_free (md->head); -+ pthread_mutex_destroy(&md->lock); - free (md); - } /* }}} void meta_data_destroy */ - diff --git a/net-mgmt/collectd5/pkg-plist b/net-mgmt/collectd5/pkg-plist index 3d11631b4ecc..54ae69950740 100644 --- a/net-mgmt/collectd5/pkg-plist +++ b/net-mgmt/collectd5/pkg-plist @@ -1,83 +1,117 @@ @stopdaemon collectd sbin/collectd sbin/collectdmon @unexec if cmp -s %D/etc/collectd.conf.sample %D/etc/collectd.conf; then rm -f %D/etc/collectd.conf; fi etc/collectd.conf.sample @exec if [ ! -f %B/collectd.conf ] ; then cp -p %B/%f %B/collectd.conf; fi %%CGI%%%%WWWDIR%%/collection.cgi %%CGI%%@unexec if cmp -s %B/collection.conf.sample %B/collection.conf; then rm -f %B/collection.conf; fi %%CGI%%%%WWWDIR%%/collection.conf.sample %%CGI%%@exec if [ ! -f %B/collection.conf ] ; then cp -p %B/%f %B/collection.conf; fi %%CGI%%@dirrmtry %%WWWDIR%% bin/collectd-nagios bin/collectdctl include/collectd/client.h include/collectd/lcc_features.h -lib/collectd/bind.la -lib/collectd/bind.so +%%APACHE%%lib/collectd/apache.la +%%APACHE%%lib/collectd/apache.so +%%APCUPS%%lib/collectd/apcups.la +%%APCUPS%%lib/collectd/apcups.so +%%BIND%%lib/collectd/bind.la +%%BIND%%lib/collectd/bind.so lib/collectd/cpu.la lib/collectd/cpu.so lib/collectd/csv.la lib/collectd/csv.so +%%CURL%%lib/collectd/curl.la +%%CURL%%lib/collectd/curl.so +%%CURL_JSON%%lib/collectd/curl_json.la +%%CURL_JSON%%lib/collectd/curl_json.so +%%CURL_XML%%lib/collectd/curl_xml.la +%%CURL_XML%%lib/collectd/curl_xml.so +%%DBI%%lib/collectd/dbi.la +%%DBI%%lib/collectd/dbi.so +%%DISK%%lib/collectd/disk.la +%%DISK%%lib/collectd/disk.so lib/collectd/df.la lib/collectd/df.so lib/collectd/dns.la lib/collectd/dns.so lib/collectd/email.la lib/collectd/email.so lib/collectd/exec.la lib/collectd/exec.so lib/collectd/filecount.la lib/collectd/filecount.so -lib/collectd/interface.la -lib/collectd/interface.so +%%INTERFACE%%lib/collectd/interface.la +%%INTERFACE%%lib/collectd/interface.so lib/collectd/load.la lib/collectd/load.so lib/collectd/logfile.la lib/collectd/logfile.so +%%MBMON%%lib/collectd/mbmon.la +%%MBMON%%lib/collectd/mbmon.so lib/collectd/memcached.la lib/collectd/memcached.so lib/collectd/memory.la lib/collectd/memory.so +%%MYSQL%%lib/collectd/mysql.la +%%MYSQL%%lib/collectd/mysql.so +%%NGINX%%lib/collectd/nginx.la +%%NGINX%%lib/collectd/nginx.so lib/collectd/network.la lib/collectd/network.so +%%NUTUPS%%lib/collectd/nut.la +%%NUTUPS%%lib/collectd/nut.so lib/collectd/ntpd.la lib/collectd/ntpd.so +%%OPENVPN%%lib/collectd/openvpn.la +%%OPENVPN%%lib/collectd/openvpn.so +%%PGSQL%%lib/collectd/postgresql.la +%%PGSQL%%lib/collectd/postgresql.so +%%PING%%lib/collectd/ping.la +%%PING%%lib/collectd/ping.so +%%PDNS%%lib/collectd/powerdns.so +%%PDNS%%lib/collectd/powerdns.la lib/collectd/ping.la lib/collectd/ping.so lib/collectd/processes.la lib/collectd/processes.so -lib/collectd/rrdtool.la -lib/collectd/rrdtool.so -lib/collectd/snmp.la -lib/collectd/snmp.so +%%RRD%%lib/collectd/rrdtool.la +%%RRD%%lib/collectd/rrdtool.so +%%RRDCACHED%%lib/collectd/rrdcached.la +%%RRDCACHED%%lib/collectd/rrdcached.so +%%SNMP%%lib/collectd/snmp.la +%%SNMP%%lib/collectd/snmp.so lib/collectd/swap.la lib/collectd/swap.so lib/collectd/syslog.la lib/collectd/syslog.so lib/collectd/tail.la lib/collectd/tail.so lib/collectd/target_v5upgrade.la lib/collectd/target_v5upgrade.so lib/collectd/tcpconns.la lib/collectd/tcpconns.so lib/collectd/threshold.la lib/collectd/threshold.so lib/collectd/unixsock.la lib/collectd/unixsock.so lib/collectd/uptime.la lib/collectd/uptime.so lib/collectd/uuid.la lib/collectd/uuid.so lib/libcollectdclient.la lib/libcollectdclient.so lib/libcollectdclient.so.0 libdata/pkgconfig/libcollectdclient.pc +%%XMMS%%lib/collectd/xmms.la +%%XMMS%%lib/collectd/xmms.so %%DATADIR%%/postgresql_default.conf %%DATADIR%%/types.db @dirrm lib/collectd @dirrm include/collectd @dirrm %%DATADIR%% @exec mkdir -p /var/db/collectd @cwd / @dirrmtry /var/db/collectd