[128824] users/raimue/ports/sysutils/collectd
raimue at macports.org
raimue at macports.org
Thu Nov 27 14:26:43 PST 2014
Revision: 128824
https://trac.macports.org/changeset/128824
Author: raimue at macports.org
Date: 2014-11-27 14:26:43 -0800 (Thu, 27 Nov 2014)
Log Message:
-----------
sysutils/collectd:
Update to version 5.4.1
Add patch from upstream to fix check for htonll() on Yosemite
Modified Paths:
--------------
users/raimue/ports/sysutils/collectd/Portfile
users/raimue/ports/sysutils/collectd/files/dep-gen.sh
Added Paths:
-----------
users/raimue/ports/sysutils/collectd/files/patch-configure-htonll.diff
Modified: users/raimue/ports/sysutils/collectd/Portfile
===================================================================
--- users/raimue/ports/sysutils/collectd/Portfile 2014-11-27 22:25:02 UTC (rev 128823)
+++ users/raimue/ports/sysutils/collectd/Portfile 2014-11-27 22:26:43 UTC (rev 128824)
@@ -4,7 +4,7 @@
PortSystem 1.0
name collectd
-version 5.2.1
+version 5.4.1
categories sysutils net
platforms darwin
license GPL-2
@@ -19,8 +19,8 @@
master_sites http://collectd.org/files/
use_bzip2 yes
-checksums sha1 593b6ab96200b4b5f357280d93025a3287163f6d \
- sha256 d82a5c302d2cfa0c3f7a3c7b7e37fb3faf42b17d2addae036cb819b6b25b9d98
+checksums sha1 cea47e3936ed081bd71efacf7ba825fc837dc347 \
+ sha256 75452129f271cb0aad28e57f12a49070618bbb7b6a9d64cf869e8766fa2f66e0
# collectd uses -Werror in their CFLAGS, which turns warnings into errors.
# Some of these are not fixable and thus need to be suppressed when clang
@@ -36,6 +36,11 @@
livecheck.type regex
livecheck.regex ${name}-(\\d+(\\.\\d+)+)\\.tar
+patchfiles patch-configure-htonll.diff
+patch.pre_args -p1
+
+use_autoreconf yes
+
#######################################################
# WARNING: This list is generated by files/dep-gen.sh #
# Take care when editing manually! #
@@ -71,6 +76,7 @@
--disable-redis \
--disable-irq \
--disable-df \
+ --disable-tail_csv \
--disable-perl \
--disable-ethstat \
--disable-write_graphite \
@@ -109,6 +115,7 @@
--disable-java \
--disable-uuid \
--disable-threshold \
+ --disable-stats \
--disable-amqp \
--disable-olsrd \
--disable-network \
@@ -223,14 +230,19 @@
configure.args-append --enable-df
}
+variant tail_csv description {Parsing of CSV files} {
+ configure.args-delete --disable-tail_csv
+ configure.args-append --enable-tail_csv
+}
+
variant perl description {Embed a Perl interpreter} {
configure.args-delete --disable-perl
configure.args-append --enable-perl
- configure.args-append --with-perl=${prefix}/bin/perl5.16
+ configure.args-append --with-perl=${prefix}/bin/perl5.18
- depends_lib-delete port:perl5.16
- depends_lib-append port:perl5.16
+ depends_lib-delete port:perl5.18
+ depends_lib-append port:perl5.18
}
variant ethstat description {Stats from NIC driver} {
@@ -343,11 +355,6 @@
depends_lib-append port:curl port:libxml2
}
-variant write_mongodb description {MongoDB output plugin} {
- configure.args-delete --disable-write_mongodb
- configure.args-append --enable-write_mongodb
-}
-
variant ted description {Read The Energy Detective values} {
configure.args-delete --disable-ted
configure.args-append --enable-ted
@@ -385,6 +392,19 @@
configure.args-append --enable-threshold
}
+variant stats description {StatsD plugin} {
+ configure.args-delete --disable-stats
+ configure.args-append --enable-stats
+}
+
+variant amqp description {AMQP output plugin} {
+ configure.args-delete --disable-amqp
+ configure.args-append --enable-amqp
+
+ depends_lib-delete port:rabbitmq-c
+ depends_lib-append port:rabbitmq-c
+}
+
variant olsrd description {olsrd statistics} {
configure.args-delete --disable-olsrd
configure.args-append --enable-olsrd
@@ -539,6 +559,14 @@
depends_lib-append port:rrdtool
}
+variant pinba description {Pinba statistics} {
+ configure.args-delete --disable-pinba
+ configure.args-append --enable-pinba
+
+ depends_lib-delete port:protobuf-c
+ depends_lib-append port:protobuf-c
+}
+
variant pf description {BSD packet filter (PF) statistics} {
configure.args-delete --disable-pf
configure.args-append --enable-pf
@@ -602,6 +630,7 @@
}
default_variants \
+ +aggregation \
+apache \
+apcups \
+apple_sensors \
@@ -630,10 +659,12 @@
+openvpn \
+rrdcached \
+rrdtool \
+ +statsd \
+swap \
+syslog \
+table \
+tail \
+ +tail_csv \
+tcpconns \
+teamspeak2 \
+ted \
@@ -642,5 +673,6 @@
+uptime \
+users \
+uuid \
+ +write_graphite \
+write_http \
Modified: users/raimue/ports/sysutils/collectd/files/dep-gen.sh
===================================================================
--- users/raimue/ports/sysutils/collectd/files/dep-gen.sh 2014-11-27 22:25:02 UTC (rev 128823)
+++ users/raimue/ports/sysutils/collectd/files/dep-gen.sh 2014-11-27 22:26:43 UTC (rev 128824)
@@ -97,10 +97,12 @@
[sensors]="lm_sensors statistics"
[serial]="serial port traffic"
[snmp]="SNMP querying plugin"
+ [stats]="StatsD plugin"
[swap]="Swap usage statistics"
[syslog]="Syslog logging plugin"
[table]="Parsing of tabular data"
[tail]="Parsing of logfiles"
+ [tail_csv]="Parsing of CSV files"
[tape]="Tape drive statistics"
[tcpconns]="TCP connection statistics"
[teamspeak2]="TeamSpeak2 server statistics"
@@ -127,7 +129,7 @@
# list of required dependencies by plugin
declare -A PLUGIN_DEPS
PLUGIN_DEPS=(
- [amqp]="port:librabbitmq"
+ [amqp]="port:rabbitmq-c"
[apache]="port:curl"
[ascent]="port:curl port:libxml2"
[bind]="port:curl port:libxml2"
@@ -137,42 +139,35 @@
[dbi]="port:libdbi"
[dns]="port:libpcap"
[gmond]="port:ganglia"
- [ipmi]="port:openipmithread"
[libvirt]="port:libvirt port:libxml2"
[memcachec]="port:libmemcached"
[memcached]="port:libmemcached"
- [modbus]="port:libmodbus"
[mysql]="path:lib/mysql5/mysql/libmysqlclient.dylib:mysql5"
- [netapp]="port:libnetapp"
- [netlink]="port:libnetlink"
[network]="port:libgcrypt"
[nginx]="port:curl"
[notify_desktop]="port:libnotify"
[notify_email]="port:libesmtp"
[nut]="port:nut"
- [onewire]="port:libowcapi"
- [perl]="port:perl5.16"
- [pinba]="port:protobuf-c port:protoc-c"
- [ping]="port:liboping"
+ [perl]="port:perl5.18"
+ [pinba]="port:protobuf-c"
[postgresql]="port:postgresql91"
[python]="port:python27"
[redis]="port:libcredis"
- [routeros]="port:librouteros"
[rrdcached]="port:rrdtool"
[rrdtool]="port:rrdtool"
- [sensors]="port:libsensors"
[snmp]="port:net-snmp"
[tokyotyrant]="port:tokyotyrant"
[varnish]="port:varnish"
[write_http]="port:curl"
- [write_redis]="port:libcredis"
+ [write_riemann]="port:protobuf-c"
[xmms]="port:xmms"
)
# list of useless modules on OS X
declare -A OSX_BLACKLIST
OSX_BLACKLIST=(
- [amqp]=1 # requires librabbitmq, which is not available
+ [aquaero]=1 # requires libaquaero5, which is not available
+ [cgroups]=1 # Linux only
[conntrack]=1 # Linux only
[cpufreq]=1 # Linux only
[entropy]=1 # Linux only
@@ -181,16 +176,17 @@
[iptables]=1 # Linux only
[ipvs]=1 # Linux only
[irq]=1 # Linux only
+ [lvm]=1 # Linux only
[madwifi]=1 # Linux only
[md]=1 # Linux only
+ [mic]=1 # Intel Many Integrated Core (Xeon Phi) only
[modbus]=1 # requires libmodbus, which is not available
[netapp]=1 # requires libnetapp, which is not available
- [netlink]=1 # requires libnetlink, which is not available
+ [netlink]=1 # requires libmnl, which is not available
[nfs]=1 # Linux only
[onewire]=1 # requires libowcapu, which is not available
[oracle]=1 # requires libclntsh, which is not available
[perfstat]=1 # AIX only
- [pinba]=1 # requires protoc-c, which is not available
[ping]=1 # requires liboping, which is not available
[processes]=1 # No OS X support
[protocols]=1 # Linux only
@@ -198,18 +194,21 @@
[routeros]=1 # requires librouteros, which is not available
[sensors]=1 # requires libsensors, which is not available
[serial]=1 # Linux only
+ [sigrok]=1 # requires libsigrok, which is not available
[tape]=1 # Solaris only
[thermal]=1 # Linux only
[vmem]=1 # Linux only
[vserver]=1 # Linux only
[wireless]=1 # Linux only
- [write_redis]=1 # requires libcredis, which is not available
+ [write_mongodb]=1 # requires libmongoc, which is not available
+ [write_redis]=1 # requires libcredis, which is not available
[zfs_arc]=1 # Solaris only
)
# list of standard modules on OS X
declare -a OSX_STANDARD
OSX_STANDARD=(
+ aggregation
apache
apcups
apple_sensors
@@ -238,10 +237,12 @@
openvpn
rrdcached
rrdtool
+ statsd
swap
syslog
table
tail
+ tail_csv
tcpconns
teamspeak2
ted
@@ -250,12 +251,13 @@
uptime
users
uuid
+ write_graphite
write_http
)
declare -A EXTRA_CODE
read -r -d '' PERL_EXTRA <<'EOF'
- configure.args-append --with-perl=${prefix}/bin/perl5.16
+ configure.args-append --with-perl=${prefix}/bin/perl5.18
EOF
read -r -d '' PYTHON_EXTRA <<'EOF'
configure.args-append --with-python=${prefix}/bin/python2.7
Added: users/raimue/ports/sysutils/collectd/files/patch-configure-htonll.diff
===================================================================
--- users/raimue/ports/sysutils/collectd/files/patch-configure-htonll.diff (rev 0)
+++ users/raimue/ports/sysutils/collectd/files/patch-configure-htonll.diff 2014-11-27 22:26:43 UTC (rev 128824)
@@ -0,0 +1,51 @@
+From 1a822486f40287f552890a553181fd620c662ada Mon Sep 17 00:00:00 2001
+From: Manuel Luis Sanmartin Rozada <manuel.luis at gmail.com>
+Date: Mon, 31 Mar 2014 21:08:05 +0200
+Subject: [PATCH] Fix check for htonll in configure.ac
+
+---
+ configure.ac | 21 +++++++++++----------
+ 1 file changed, 11 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7029e1e..1399e79 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1207,10 +1207,9 @@ if test "x$have_getmntent" = "xgen"; then
+ fi
+
+ # Check for htonll
+-AC_MSG_CHECKING([if have htonll defined])
+-
+- have_htonll="no"
+- AC_LINK_IFELSE([AC_LANG_PROGRAM(
++AC_CACHE_CHECK([if have htonll defined],
++ [c_cv_have_htonll],
++ AC_LINK_IFELSE([AC_LANG_PROGRAM(
+ [[[
+ #include <sys/types.h>
+ #include <netinet/in.h>
+@@ -1222,12 +1221,14 @@ AC_MSG_CHECKING([if have htonll defined])
+ return htonll(0);
+ ]]]
+ )],
+- [
+- have_htonll="yes"
+- AC_DEFINE(HAVE_HTONLL, 1, [Define if the function htonll exists.])
+- ])
+-
+-AC_MSG_RESULT([$have_htonll])
++ [c_cv_have_htonll="yes"],
++ [c_cv_have_htonll="no"]
++ )
++)
++if test "x$c_cv_have_htonll" = "xyes"
++then
++ AC_DEFINE(HAVE_HTONLL, 1, [Define if the function htonll exists.])
++fi
+
+ # Check for structures
+ AC_CHECK_MEMBERS([struct if_data.ifi_ibytes, struct if_data.ifi_opackets, struct if_data.ifi_ierrors],
+--
+2.1.3
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141127/14863ff6/attachment.html>
More information about the macports-changes
mailing list