Date: Thu, 3 Oct 2013 23:37:48 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329249 - head/net-mgmt/collectd5 Message-ID: <201310032337.r93Nbmi6006401@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Thu Oct 3 23:37:48 2013 New Revision: 329249 URL: http://svnweb.freebsd.org/changeset/ports/329249 Log: net-mgmt/collectd5: add statsd support - Add statsd support [1] - Use PKGNAMESUFFIX to do not conflict with net-mgmt/collectd - Allow staging PR: ports/182064 [1] Submitted by: Kimo <kimor79 yahoo.com> [1] Approved by: maintainer [1] Modified: head/net-mgmt/collectd5/Makefile head/net-mgmt/collectd5/pkg-plist Modified: head/net-mgmt/collectd5/Makefile ============================================================================== --- head/net-mgmt/collectd5/Makefile Thu Oct 3 23:24:14 2013 (r329248) +++ head/net-mgmt/collectd5/Makefile Thu Oct 3 23:37:48 2013 (r329249) @@ -3,6 +3,8 @@ PORTNAME= collectd PORTVERSION= 5.4.0 +PORTREVISION= 1 +PKGNAMESUFFIX= 5 CATEGORIES= net-mgmt MASTER_SITES= http://collectd.org/files/ @@ -15,8 +17,6 @@ GNU_CONFIGURE= yes USE_AUTOTOOLS= aclocal autoconf autoheader automake libltdl libtool USE_GNOME= glib20 -LATEST_LINK= collectd5 - OPTIONS_DEFINE= CGI DEBUG GCRYPT VIRT OPTIONS_GROUP= INPUT OUTPUT OPTIONS_GROUP_OUTPUT= RRDTOOL NOTIFYEMAIL NOTIFYDESKTOP @@ -50,10 +50,6 @@ VIRT_DESC= Enable libvirt plugin (requi XML_DESC= Enable XML plugins XMMS_DESC= Enable xmms plugin -MAN1= collectd.1 collectd-nagios.1 collectd-tg.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 @@ -63,7 +59,6 @@ CONFLICTS= collectd-4.[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes .include <bsd.port.options.mk> # NOTE: Plugins without dependencies are defined further down. @@ -117,6 +112,7 @@ CONFIGURE_ARGS+= \ --enable-powerdns \ --enable-pf \ --enable-processes \ + --enable-statsd \ --enable-swap \ --enable-syslog \ --enable-table \ @@ -438,20 +434,12 @@ post-patch: ${WRKSRC}/configure.in 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 + @${MKDIR} ${STAGEDIR}/var/db/collectd .if ${PORT_OPTIONS:MCGI} - ${MKDIR} ${WWWDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/contrib/collection.cgi ${WWWDIR}/ + @${MKDIR} ${STAGEDIR}${WWWDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/contrib/collection.cgi ${STAGEDIR}${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 + ${STAGEDIR}${WWWDIR}/collection.conf.sample .endif .include <bsd.port.mk> Modified: head/net-mgmt/collectd5/pkg-plist ============================================================================== --- head/net-mgmt/collectd5/pkg-plist Thu Oct 3 23:24:14 2013 (r329248) +++ head/net-mgmt/collectd5/pkg-plist Thu Oct 3 23:37:48 2013 (r329249) @@ -154,6 +154,9 @@ lib/collectd/processes.la %%SNMP%%lib/collectd/snmp.a %%SNMP%%lib/collectd/snmp.so %%SNMP%%lib/collectd/snmp.la +lib/collectd/statsd.a +lib/collectd/statsd.so +lib/collectd/statsd.la lib/collectd/swap.a lib/collectd/swap.so lib/collectd/swap.la @@ -233,6 +236,21 @@ lib/libcollectdclient.so.1 libdata/pkgconfig/libcollectdclient.pc %%DATADIR%%/postgresql_default.conf %%DATADIR%%/types.db +man/man1/collectd-nagios.1.gz +man/man1/collectd-tg.1.gz +man/man1/collectd.1.gz +man/man1/collectdctl.1.gz +man/man1/collectdmon.1.gz +man/man5/collectd-email.5.gz +man/man5/collectd-exec.5.gz +man/man5/collectd-java.5.gz +man/man5/collectd-perl.5.gz +man/man5/collectd-python.5.gz +man/man5/collectd-snmp.5.gz +man/man5/collectd-threshold.5.gz +man/man5/collectd-unixsock.5.gz +man/man5/collectd.conf.5.gz +man/man5/types.db.5.gz @dirrm lib/collectd @dirrm include/collectd @dirrm %%DATADIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310032337.r93Nbmi6006401>