<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[128824] users/raimue/ports/sysutils/collectd</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/128824">128824</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2014-11-27 14:26:43 -0800 (Thu, 27 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>sysutils/collectd:
Update to version 5.4.1
Add patch from upstream to fix check for htonll() on Yosemite</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersraimueportssysutilscollectdPortfile">users/raimue/ports/sysutils/collectd/Portfile</a></li>
<li><a href="#usersraimueportssysutilscollectdfilesdepgensh">users/raimue/ports/sysutils/collectd/files/dep-gen.sh</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#usersraimueportssysutilscollectdfilespatchconfigurehtonlldiff">users/raimue/ports/sysutils/collectd/files/patch-configure-htonll.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersraimueportssysutilscollectdPortfile"></a>
<div class="modfile"><h4>Modified: users/raimue/ports/sysutils/collectd/Portfile (128823 => 128824)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name collectd
</span><del>-version 5.2.1
</del><ins>+version 5.4.1
</ins><span class="cx"> categories sysutils net
</span><span class="cx"> platforms darwin
</span><span class="cx"> license GPL-2
</span><span class="lines">@@ -19,8 +19,8 @@
</span><span class="cx"> master_sites http://collectd.org/files/
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-checksums sha1 593b6ab96200b4b5f357280d93025a3287163f6d \
- sha256 d82a5c302d2cfa0c3f7a3c7b7e37fb3faf42b17d2addae036cb819b6b25b9d98
</del><ins>+checksums sha1 cea47e3936ed081bd71efacf7ba825fc837dc347 \
+ sha256 75452129f271cb0aad28e57f12a49070618bbb7b6a9d64cf869e8766fa2f66e0
</ins><span class="cx">
</span><span class="cx"> # collectd uses -Werror in their CFLAGS, which turns warnings into errors.
</span><span class="cx"> # Some of these are not fixable and thus need to be suppressed when clang
</span><span class="lines">@@ -36,6 +36,11 @@
</span><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.regex ${name}-(\\d+(\\.\\d+)+)\\.tar
</span><span class="cx">
</span><ins>+patchfiles patch-configure-htonll.diff
+patch.pre_args -p1
+
+use_autoreconf yes
+
</ins><span class="cx"> #######################################################
</span><span class="cx"> # WARNING: This list is generated by files/dep-gen.sh #
</span><span class="cx"> # Take care when editing manually! #
</span><span class="lines">@@ -71,6 +76,7 @@
</span><span class="cx"> --disable-redis \
</span><span class="cx"> --disable-irq \
</span><span class="cx"> --disable-df \
</span><ins>+ --disable-tail_csv \
</ins><span class="cx"> --disable-perl \
</span><span class="cx"> --disable-ethstat \
</span><span class="cx"> --disable-write_graphite \
</span><span class="lines">@@ -109,6 +115,7 @@
</span><span class="cx"> --disable-java \
</span><span class="cx"> --disable-uuid \
</span><span class="cx"> --disable-threshold \
</span><ins>+ --disable-stats \
</ins><span class="cx"> --disable-amqp \
</span><span class="cx"> --disable-olsrd \
</span><span class="cx"> --disable-network \
</span><span class="lines">@@ -223,14 +230,19 @@
</span><span class="cx"> configure.args-append --enable-df
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+variant tail_csv description {Parsing of CSV files} {
+ configure.args-delete --disable-tail_csv
+ configure.args-append --enable-tail_csv
+}
+
</ins><span class="cx"> variant perl description {Embed a Perl interpreter} {
</span><span class="cx"> configure.args-delete --disable-perl
</span><span class="cx"> configure.args-append --enable-perl
</span><span class="cx">
</span><del>- configure.args-append --with-perl=${prefix}/bin/perl5.16
</del><ins>+ configure.args-append --with-perl=${prefix}/bin/perl5.18
</ins><span class="cx">
</span><del>- depends_lib-delete port:perl5.16
- depends_lib-append port:perl5.16
</del><ins>+ depends_lib-delete port:perl5.18
+ depends_lib-append port:perl5.18
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant ethstat description {Stats from NIC driver} {
</span><span class="lines">@@ -343,11 +355,6 @@
</span><span class="cx"> depends_lib-append port:curl port:libxml2
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant write_mongodb description {MongoDB output plugin} {
- configure.args-delete --disable-write_mongodb
- configure.args-append --enable-write_mongodb
-}
-
</del><span class="cx"> variant ted description {Read The Energy Detective values} {
</span><span class="cx"> configure.args-delete --disable-ted
</span><span class="cx"> configure.args-append --enable-ted
</span><span class="lines">@@ -385,6 +392,19 @@
</span><span class="cx"> configure.args-append --enable-threshold
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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
+}
+
</ins><span class="cx"> variant olsrd description {olsrd statistics} {
</span><span class="cx"> configure.args-delete --disable-olsrd
</span><span class="cx"> configure.args-append --enable-olsrd
</span><span class="lines">@@ -539,6 +559,14 @@
</span><span class="cx"> depends_lib-append port:rrdtool
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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
+}
+
</ins><span class="cx"> variant pf description {BSD packet filter (PF) statistics} {
</span><span class="cx"> configure.args-delete --disable-pf
</span><span class="cx"> configure.args-append --enable-pf
</span><span class="lines">@@ -602,6 +630,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default_variants \
</span><ins>+ +aggregation \
</ins><span class="cx"> +apache \
</span><span class="cx"> +apcups \
</span><span class="cx"> +apple_sensors \
</span><span class="lines">@@ -630,10 +659,12 @@
</span><span class="cx"> +openvpn \
</span><span class="cx"> +rrdcached \
</span><span class="cx"> +rrdtool \
</span><ins>+ +statsd \
</ins><span class="cx"> +swap \
</span><span class="cx"> +syslog \
</span><span class="cx"> +table \
</span><span class="cx"> +tail \
</span><ins>+ +tail_csv \
</ins><span class="cx"> +tcpconns \
</span><span class="cx"> +teamspeak2 \
</span><span class="cx"> +ted \
</span><span class="lines">@@ -642,5 +673,6 @@
</span><span class="cx"> +uptime \
</span><span class="cx"> +users \
</span><span class="cx"> +uuid \
</span><ins>+ +write_graphite \
</ins><span class="cx"> +write_http \
</span><span class="cx">
</span></span></pre></div>
<a id="usersraimueportssysutilscollectdfilesdepgensh"></a>
<div class="modfile"><h4>Modified: users/raimue/ports/sysutils/collectd/files/dep-gen.sh (128823 => 128824)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -97,10 +97,12 @@
</span><span class="cx"> [sensors]="lm_sensors statistics"
</span><span class="cx"> [serial]="serial port traffic"
</span><span class="cx"> [snmp]="SNMP querying plugin"
</span><ins>+ [stats]="StatsD plugin"
</ins><span class="cx"> [swap]="Swap usage statistics"
</span><span class="cx"> [syslog]="Syslog logging plugin"
</span><span class="cx"> [table]="Parsing of tabular data"
</span><span class="cx"> [tail]="Parsing of logfiles"
</span><ins>+ [tail_csv]="Parsing of CSV files"
</ins><span class="cx"> [tape]="Tape drive statistics"
</span><span class="cx"> [tcpconns]="TCP connection statistics"
</span><span class="cx"> [teamspeak2]="TeamSpeak2 server statistics"
</span><span class="lines">@@ -127,7 +129,7 @@
</span><span class="cx"> # list of required dependencies by plugin
</span><span class="cx"> declare -A PLUGIN_DEPS
</span><span class="cx"> PLUGIN_DEPS=(
</span><del>- [amqp]="port:librabbitmq"
</del><ins>+ [amqp]="port:rabbitmq-c"
</ins><span class="cx"> [apache]="port:curl"
</span><span class="cx"> [ascent]="port:curl port:libxml2"
</span><span class="cx"> [bind]="port:curl port:libxml2"
</span><span class="lines">@@ -137,42 +139,35 @@
</span><span class="cx"> [dbi]="port:libdbi"
</span><span class="cx"> [dns]="port:libpcap"
</span><span class="cx"> [gmond]="port:ganglia"
</span><del>- [ipmi]="port:openipmithread"
</del><span class="cx"> [libvirt]="port:libvirt port:libxml2"
</span><span class="cx"> [memcachec]="port:libmemcached"
</span><span class="cx"> [memcached]="port:libmemcached"
</span><del>- [modbus]="port:libmodbus"
</del><span class="cx"> [mysql]="path:lib/mysql5/mysql/libmysqlclient.dylib:mysql5"
</span><del>- [netapp]="port:libnetapp"
- [netlink]="port:libnetlink"
</del><span class="cx"> [network]="port:libgcrypt"
</span><span class="cx"> [nginx]="port:curl"
</span><span class="cx"> [notify_desktop]="port:libnotify"
</span><span class="cx"> [notify_email]="port:libesmtp"
</span><span class="cx"> [nut]="port:nut"
</span><del>- [onewire]="port:libowcapi"
- [perl]="port:perl5.16"
- [pinba]="port:protobuf-c port:protoc-c"
- [ping]="port:liboping"
</del><ins>+ [perl]="port:perl5.18"
+ [pinba]="port:protobuf-c"
</ins><span class="cx"> [postgresql]="port:postgresql91"
</span><span class="cx"> [python]="port:python27"
</span><span class="cx"> [redis]="port:libcredis"
</span><del>- [routeros]="port:librouteros"
</del><span class="cx"> [rrdcached]="port:rrdtool"
</span><span class="cx"> [rrdtool]="port:rrdtool"
</span><del>- [sensors]="port:libsensors"
</del><span class="cx"> [snmp]="port:net-snmp"
</span><span class="cx"> [tokyotyrant]="port:tokyotyrant"
</span><span class="cx"> [varnish]="port:varnish"
</span><span class="cx"> [write_http]="port:curl"
</span><del>- [write_redis]="port:libcredis"
</del><ins>+ [write_riemann]="port:protobuf-c"
</ins><span class="cx"> [xmms]="port:xmms"
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # list of useless modules on OS X
</span><span class="cx"> declare -A OSX_BLACKLIST
</span><span class="cx"> OSX_BLACKLIST=(
</span><del>- [amqp]=1 # requires librabbitmq, which is not available
</del><ins>+ [aquaero]=1 # requires libaquaero5, which is not available
+ [cgroups]=1 # Linux only
</ins><span class="cx"> [conntrack]=1 # Linux only
</span><span class="cx"> [cpufreq]=1 # Linux only
</span><span class="cx"> [entropy]=1 # Linux only
</span><span class="lines">@@ -181,16 +176,17 @@
</span><span class="cx"> [iptables]=1 # Linux only
</span><span class="cx"> [ipvs]=1 # Linux only
</span><span class="cx"> [irq]=1 # Linux only
</span><ins>+ [lvm]=1 # Linux only
</ins><span class="cx"> [madwifi]=1 # Linux only
</span><span class="cx"> [md]=1 # Linux only
</span><ins>+ [mic]=1 # Intel Many Integrated Core (Xeon Phi) only
</ins><span class="cx"> [modbus]=1 # requires libmodbus, which is not available
</span><span class="cx"> [netapp]=1 # requires libnetapp, which is not available
</span><del>- [netlink]=1 # requires libnetlink, which is not available
</del><ins>+ [netlink]=1 # requires libmnl, which is not available
</ins><span class="cx"> [nfs]=1 # Linux only
</span><span class="cx"> [onewire]=1 # requires libowcapu, which is not available
</span><span class="cx"> [oracle]=1 # requires libclntsh, which is not available
</span><span class="cx"> [perfstat]=1 # AIX only
</span><del>- [pinba]=1 # requires protoc-c, which is not available
</del><span class="cx"> [ping]=1 # requires liboping, which is not available
</span><span class="cx"> [processes]=1 # No OS X support
</span><span class="cx"> [protocols]=1 # Linux only
</span><span class="lines">@@ -198,18 +194,21 @@
</span><span class="cx"> [routeros]=1 # requires librouteros, which is not available
</span><span class="cx"> [sensors]=1 # requires libsensors, which is not available
</span><span class="cx"> [serial]=1 # Linux only
</span><ins>+ [sigrok]=1 # requires libsigrok, which is not available
</ins><span class="cx"> [tape]=1 # Solaris only
</span><span class="cx"> [thermal]=1 # Linux only
</span><span class="cx"> [vmem]=1 # Linux only
</span><span class="cx"> [vserver]=1 # Linux only
</span><span class="cx"> [wireless]=1 # Linux only
</span><del>- [write_redis]=1 # requires libcredis, which is not available
</del><ins>+ [write_mongodb]=1 # requires libmongoc, which is not available
+ [write_redis]=1 # requires libcredis, which is not available
</ins><span class="cx"> [zfs_arc]=1 # Solaris only
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # list of standard modules on OS X
</span><span class="cx"> declare -a OSX_STANDARD
</span><span class="cx"> OSX_STANDARD=(
</span><ins>+ aggregation
</ins><span class="cx"> apache
</span><span class="cx"> apcups
</span><span class="cx"> apple_sensors
</span><span class="lines">@@ -238,10 +237,12 @@
</span><span class="cx"> openvpn
</span><span class="cx"> rrdcached
</span><span class="cx"> rrdtool
</span><ins>+ statsd
</ins><span class="cx"> swap
</span><span class="cx"> syslog
</span><span class="cx"> table
</span><span class="cx"> tail
</span><ins>+ tail_csv
</ins><span class="cx"> tcpconns
</span><span class="cx"> teamspeak2
</span><span class="cx"> ted
</span><span class="lines">@@ -250,12 +251,13 @@
</span><span class="cx"> uptime
</span><span class="cx"> users
</span><span class="cx"> uuid
</span><ins>+ write_graphite
</ins><span class="cx"> write_http
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> declare -A EXTRA_CODE
</span><span class="cx"> read -r -d '' PERL_EXTRA <<'EOF'
</span><del>- configure.args-append --with-perl=${prefix}/bin/perl5.16
</del><ins>+ configure.args-append --with-perl=${prefix}/bin/perl5.18
</ins><span class="cx"> EOF
</span><span class="cx"> read -r -d '' PYTHON_EXTRA <<'EOF'
</span><span class="cx"> configure.args-append --with-python=${prefix}/bin/python2.7
</span></span></pre></div>
<a id="usersraimueportssysutilscollectdfilespatchconfigurehtonlldiff"></a>
<div class="addfile"><h4>Added: users/raimue/ports/sysutils/collectd/files/patch-configure-htonll.diff (0 => 128824)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+From 1a822486f40287f552890a553181fd620c662ada Mon Sep 17 00:00:00 2001
+From: Manuel Luis Sanmartin Rozada <manuel.luis@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
+
</ins></span></pre>
</div>
</div>
</body>
</html>