update to 1.4.7

changes:
-minor feature additions
-bugfixes

4 files changed, 48 insertions, 7 deletions

diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 055f7def334..e4f0f188639 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.92 2011/11/01 06:00:52 sbd Exp $
+# $NetBSD: Makefile,v 1.93 2012/02/03 15:43:44 drochner Exp $
 
-DISTNAME=	rrdtool-1.4.5
-PKGREVISION=	5
+DISTNAME=	rrdtool-1.4.7
 CATEGORIES=	databases graphics net
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
 
diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
index 0854a0bc4c3..6444ff7bfc4 100644
--- a/databases/rrdtool/distinfo
+++ b/databases/rrdtool/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.42 2011/01/05 18:12:39 kefren Exp $
+$NetBSD: distinfo,v 1.43 2012/02/03 15:43:44 drochner Exp $
 
-SHA1 (rrdtool-1.4.5.tar.gz) = 56638e8aedd5d5522152e86746e382b75dc48c35
-RMD160 (rrdtool-1.4.5.tar.gz) = 9c45c3be7bcb8e17260055a33e936f307884914f
-Size (rrdtool-1.4.5.tar.gz) = 1348713 bytes
+SHA1 (rrdtool-1.4.7.tar.gz) = faab7df7696b69f85d6f89dd9708d7cf0c9a273b
+RMD160 (rrdtool-1.4.7.tar.gz) = 3a8c1c0f3fe0d76fb7da8b712cdd19d59d5171ba
+Size (rrdtool-1.4.7.tar.gz) = 1349040 bytes
+SHA1 (patch-aa) = 317fc6e46e15333574d0e977d8ab34e916920f4a
+SHA1 (patch-ab) = 81131a74c8e9b81edfaa4b6746d4ab8508e82ac2
 SHA1 (patch-al) = abc25497a10d59b1ad2e3a263f818eef89985538
 SHA1 (patch-am) = 6c0a0890b1e8e2c1a186e2015c0cf5acd719b686
 SHA1 (patch-az) = 41e7f6aad5a54a0fa27744709af404b887b88602
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");