From 768ba9d9fc4e4634ec561d37e1a39baf269f83ee Mon Sep 17 00:00:00 2001
From: ckuethe <ckuethe@openbsd.org>
Date: Mon, 9 Jun 2008 14:29:17 +0000
Subject: [PATCH] update to darkstat 3.0.708, mostly concerned with decreased
 memory usage. all local patches merged upstream.

---
 net/darkstat/Makefile                 |  5 ++---
 net/darkstat/distinfo                 | 10 +++++-----
 net/darkstat/patches/patch-graph_db_c | 27 ---------------------------
 net/darkstat/patches/patch-hosts_db_c | 23 -----------------------
 4 files changed, 7 insertions(+), 58 deletions(-)
 delete mode 100644 net/darkstat/patches/patch-graph_db_c
 delete mode 100644 net/darkstat/patches/patch-hosts_db_c

diff --git a/net/darkstat/Makefile b/net/darkstat/Makefile
index 5f0e40079d3..4c4849bea50 100644
--- a/net/darkstat/Makefile
+++ b/net/darkstat/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.9 2008/05/17 22:33:31 ckuethe Exp $
+# $OpenBSD: Makefile,v 1.10 2008/06/09 14:29:17 ckuethe Exp $
 
 COMMENT=		network statistics gatherer with graphs
 
-DISTNAME=		darkstat-3.0.707
-PKGNAME=		${DISTNAME}p0
+DISTNAME=		darkstat-3.0.708
 CATEGORIES=		net www
 
 HOMEPAGE=		http://dmr.ath.cx/net/darkstat/
diff --git a/net/darkstat/distinfo b/net/darkstat/distinfo
index 791d0292c8f..8a693479c04 100644
--- a/net/darkstat/distinfo
+++ b/net/darkstat/distinfo
@@ -1,5 +1,5 @@
-MD5 (darkstat-3.0.707.tar.bz2) = kccPlkmN1nmyEzAhQ2Hk3A==
-RMD160 (darkstat-3.0.707.tar.bz2) = kaGe+Delj2tGTMJMTcNLy47xWlk=
-SHA1 (darkstat-3.0.707.tar.bz2) = pd9SH/vYAbMstSqqhG/qNEj1dQ8=
-SHA256 (darkstat-3.0.707.tar.bz2) = JDvXf5Osu2gy9e8cxLA6voIwBsEp+I/lckaX4cCFdkQ=
-SIZE (darkstat-3.0.707.tar.bz2) = 90459
+MD5 (darkstat-3.0.708.tar.bz2) = If4jH27IS+CC6dQXR90PyQ==
+RMD160 (darkstat-3.0.708.tar.bz2) = wwYZl6cHDG2pyZvexnyQZDZylSs=
+SHA1 (darkstat-3.0.708.tar.bz2) = PmGFpaRz/dXVChXvcX88RPYuzjM=
+SHA256 (darkstat-3.0.708.tar.bz2) = y6L5AshpS8DPbImtAO0XyCJdYKjxTWgbeHmCO97Y+JA=
+SIZE (darkstat-3.0.708.tar.bz2) = 91765
diff --git a/net/darkstat/patches/patch-graph_db_c b/net/darkstat/patches/patch-graph_db_c
deleted file mode 100644
index af85b1f78f5..00000000000
--- a/net/darkstat/patches/patch-graph_db_c
+++ /dev/null
@@ -1,27 +0,0 @@
-$OpenBSD: patch-graph_db_c,v 1.1 2008/05/17 22:33:31 ckuethe Exp $
---- graph_db.c.orig	Fri May 16 13:23:14 2008
-+++ graph_db.c	Fri May 16 13:41:43 2008
-@@ -27,6 +27,8 @@
- #define GRAPH_WIDTH "320"
- #define GRAPH_HEIGHT "200"
- 
-+extern const char *interface;
-+
- struct graph {
-    uint64_t *in, *out;
-    unsigned int offset; /* i.e. seconds start at 0, days start at 1 */
-@@ -348,11 +350,12 @@ html_front_page(void)
- 
-    buf = str_make();
-    str_append(buf, html_header_1);
--   str_append(buf, "<title>" PACKAGE_STRING " : graphs</title>\n");
-+   str_appendf(buf, "<title>" PACKAGE_STRING " : graphs (%s)</title>\n",
-+               interface);
-    str_append(buf, "<script src=\"graph.js\" type=\"text/javascript\">"
-                    "</script>\n");
-    str_append(buf, html_header_2);
--   str_append(buf, "<h2 class=\"pageheader\">Graphs</h2>\n");
-+   str_appendf(buf, "<h2 class=\"pageheader\">Graphs (%s)</h2>\n", interface);
- 
-    str_append(buf, "<p>\n");
- 
diff --git a/net/darkstat/patches/patch-hosts_db_c b/net/darkstat/patches/patch-hosts_db_c
deleted file mode 100644
index e1bc53a3330..00000000000
--- a/net/darkstat/patches/patch-hosts_db_c
+++ /dev/null
@@ -1,23 +0,0 @@
-$OpenBSD: patch-hosts_db_c,v 1.1 2008/05/17 22:33:31 ckuethe Exp $
---- hosts_db.c.orig	Fri May 16 13:23:50 2008
-+++ hosts_db.c	Fri May 16 13:36:21 2008
-@@ -26,6 +26,7 @@
- #include <unistd.h>
- 
- int show_mac_addrs = 0;
-+extern const char *interface;
- 
- /* FIXME: specify somewhere more sane/tunable */
- #define MAX_ENTRIES 30 /* in an HTML table rendered from a hashtable */
-@@ -887,9 +888,9 @@ html_hosts_main(const char *qs)
- #define FULL "full table"
- 
-    str_append(buf, html_header_1);
--   str_append(buf, "<title>darkstat3: Hosts</title>\n");
-+   str_appendf(buf, "<title>darkstat3: Hosts (%s)</title>\n", interface);
-    str_append(buf, html_header_2);
--   str_append(buf, "<h2 class=\"pageheader\">Hosts</h2>\n");
-+   str_appendf(buf, "<h2 class=\"pageheader\">Hosts (%s)</h2>\n", interface);
-    format_table(buf, hosts_db, start, sort, full);
- 
-    /* <prev | full | stats | next> */