<pre style='margin:0'>
Kurt Hindenburg (kurthindenburg) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1a615a034fc687b80cf90f59ac8c6899f9dcd8d5">https://github.com/macports/macports-ports/commit/1a615a034fc687b80cf90f59ac8c6899f9dcd8d5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 1a615a0 darkstat: update to 3.0.719; add license
</span>1a615a0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1a615a034fc687b80cf90f59ac8c6899f9dcd8d5
</span>Author: Kurt Hindenburg <khindenburg@macports.org>
AuthorDate: Mon Aug 7 10:35:42 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> darkstat: update to 3.0.719; add license
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add dependents; add patch for clock_gettime in 10.12+;
</span><span style='display:block; white-space:pre;color:#404040;'> add modeline
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> closes https://trac.macports.org/ticket/54002
</span>---
net/darkstat/Portfile | 18 ++++++++++++---
net/darkstat/files/patch-now.c.diff | 46 +++++++++++++++++++++++++++++++++++++
2 files changed, 61 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/darkstat/Portfile b/net/darkstat/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cd5c598..c798624 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/darkstat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/darkstat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem 1.0
name darkstat
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.0.707
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.0.719
</span> categories net
platforms darwin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2
</span> maintainers nomaintainer
description network traffic analyzer
long_description \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +18,16 @@ homepage http://dmr.ath.cx/net/darkstat/
</span> master_sites ${homepage}
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 91c70f96498dd679b21330214361e4dc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 a5df521ffbd801b32cb52aaa846fea3448f5750f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 900afe5a8db6e55a3640ffe33e76bad76a22a05a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 aeaf909585f7f43dc032a75328fdb62114e58405b06a92a13c0d3653236dedd7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:libpcap \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 10.12 has clock_gettime with clockid_t as an enum
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# error: typedef redefinition with different types ('int' vs 'enum clockid_ t')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} >= 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-now.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
configure.cflags-append -include stdint.h
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/darkstat/files/patch-now.c.diff b/net/darkstat/files/patch-now.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..54b2556
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/darkstat/files/patch-now.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,46 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- now.c 2015-05-24 03:40:25.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ now.c 2017-08-07 09:58:32.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,43 +23,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__MACH__) && !defined(__gnu_hurd__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* Fake up clock_gettime() on OS X. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <sys/time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <inttypes.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <mach/mach.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <mach/mach_time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- typedef int clockid_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define CLOCK_REALTIME 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define CLOCK_MONOTONIC 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static uint64_t mono_first = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int clock_gettime(clockid_t clk_id, struct timespec *tp) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (clk_id == CLOCK_REALTIME) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct timeval tv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gettimeofday(&tv, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tp->tv_sec = tv.tv_sec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tp->tv_nsec = tv.tv_usec * 1000;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (clk_id == CLOCK_MONOTONIC) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint64_t t = mach_absolute_time();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mach_timebase_info_data_t timebase;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mach_timebase_info(&timebase);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!mono_first) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mono_first = t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint64_t tdiff = (t - mono_first) * timebase.numer / timebase.denom;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tp->tv_sec = tdiff / 1000000000;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tp->tv_nsec = tdiff % 1000000000;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* __MACH__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static struct timespec clock_real, clock_mono;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int now_initialized = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>