update to 1.4.7

changes:
-minor feature additions
-bugfixes

2 files changed, 40 insertions, 0 deletions

diff --git a/databases/rrdtool/patches/patch-aa b/databases/rrdtool/patches/patch-aa
new file mode 100644
index 00000000000..cea1f56df2e
--- /dev/null
+++ b/databases/rrdtool/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.15 2012/02/03 15:43:44 drochner Exp $
+
+--- src/rrd_lastupdate.c.orig	2012-01-24 10:08:48.000000000 +0000
++++ src/rrd_lastupdate.c
+@@ -75,7 +75,7 @@ int rrd_lastupdate (int argc, char **arg
+         printf(" %s", ds_names[i]);
+     printf ("\n\n");
+ 
+-    printf ("%10lu:", last_update);
++    printf ("%10llu:", (unsigned long long)last_update);
+     for (i = 0; i < ds_count; i++) {
+         printf(" %s", last_ds[i]);
+         free(last_ds[i]);
diff --git a/databases/rrdtool/patches/patch-ab b/databases/rrdtool/patches/patch-ab
new file mode 100644
index 00000000000..f0b63dfedd0
--- /dev/null
+++ b/databases/rrdtool/patches/patch-ab
@@ -0,0 +1,27 @@
+$NetBSD: patch-ab,v 1.11 2012/02/03 15:43:44 drochner Exp $
+
+--- src/rrd_tool.c.orig	2012-01-24 10:08:48.000000000 +0000
++++ src/rrd_tool.c
+@@ -670,11 +670,11 @@ int HandleInputLine(
+     else if (strcmp("resize", argv[1]) == 0)
+         rrd_resize(argc - 1, &argv[1]);
+     else if (strcmp("last", argv[1]) == 0)
+-        printf("%ld\n", rrd_last(argc - 1, &argv[1]));
++	    printf("%lld\n", (long long)rrd_last(argc - 1, &argv[1]));
+     else if (strcmp("lastupdate", argv[1]) == 0) {
+         rrd_lastupdate(argc - 1, &argv[1]);
+     } else if (strcmp("first", argv[1]) == 0)
+-        printf("%ld\n", rrd_first(argc - 1, &argv[1]));
++	    printf("%lld\n", (long long)rrd_first(argc - 1, &argv[1]));
+     else if (strcmp("update", argv[1]) == 0)
+         rrd_update(argc - 1, &argv[1]);
+     else if (strcmp("fetch", argv[1]) == 0) {
+@@ -692,7 +692,7 @@ int HandleInputLine(
+                 printf("%20s", ds_namv[i]);
+             printf("\n\n");
+             for (ti = start + step; ti <= end; ti += step) {
+-                printf("%10lu:", ti);
++		    printf("%10llu:", (unsigned long long)ti);
+                 for (ii = 0; ii < ds_cnt; ii++)
+                     printf(" %0.10e", *(datai++));
+                 printf("\n");