Updated databases/rrdtool to 1.3.1

* image size does get returned properly even with --lazy active
  this broke a number of frontends which should work now.
* fix rrd_restore to be able to read rrd 1.0.x generated dumps again.
* several documetation fixes
* make rrdtool.spec work without php
* complain when someone tries to create an rrd file with step size zero.
* added filename to illegal updated interval error message.
* fix number of rows returned by python modules fetch implementation.

4 files changed, 12 insertions, 35 deletions

diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 63d985cb404..180f44ac8d4 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2008/06/30 07:31:09 martti Exp $
+# $NetBSD: Makefile,v 1.68 2008/07/29 17:23:17 martti Exp $
 
-DISTNAME=	rrdtool-1.3.0
-PKGREVISION=	1
+DISTNAME=	rrdtool-1.3.1
+#PKGREVISION=	1
 CATEGORIES=	databases graphics net
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
 
diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
index 3fe201069ec..739c8918c9e 100644
--- a/databases/rrdtool/distinfo
+++ b/databases/rrdtool/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.29 2008/06/30 07:29:48 martti Exp $
+$NetBSD: distinfo,v 1.30 2008/07/29 17:23:17 martti Exp $
 
-SHA1 (rrdtool-1.3.0.tar.gz) = c80572b3b74a3a58b83d83edcbcaf295f9a37538
-RMD160 (rrdtool-1.3.0.tar.gz) = c5d6665f22155bb6801e83cf9ec931b776cfcc2b
-Size (rrdtool-1.3.0.tar.gz) = 1101980 bytes
-SHA1 (patch-al) = 5a3c397d8f5ed026972cbaadbe21f91f4e762a74
-SHA1 (patch-am) = 9797d7c33632376e75361963e8141a2ad30cfafe
+SHA1 (rrdtool-1.3.1.tar.gz) = 969cdce376e4cf00e1f7ecfb838d4049e299dd08
+RMD160 (rrdtool-1.3.1.tar.gz) = 0fcfbf9122e6c2dc00590a5aefa83fbe3e2d707f
+Size (rrdtool-1.3.1.tar.gz) = 1102997 bytes
+SHA1 (patch-al) = 3013e1df139fc8ecf89235a00d41c71bf1fdd8f1
diff --git a/databases/rrdtool/patches/patch-al b/databases/rrdtool/patches/patch-al
index e5d5e080987..81a9fc2e358 100644
--- a/databases/rrdtool/patches/patch-al
+++ b/databases/rrdtool/patches/patch-al
@@ -1,10 +1,10 @@
-$NetBSD: patch-al,v 1.12 2008/06/30 07:29:48 martti Exp $
+$NetBSD: patch-al,v 1.13 2008/07/29 17:23:17 martti Exp $
 
 Correct examples directory.
 
---- examples/Makefile.in.orig	2007-11-20 02:15:30.000000000 +0200
-+++ examples/Makefile.in	2007-11-20 12:57:37.000000000 +0200
-@@ -224,7 +224,7 @@
+--- examples/Makefile.in.orig	2008-07-23 16:02:43.000000000 +0300
++++ examples/Makefile.in	2008-07-29 20:17:30.000000000 +0300
+@@ -281,7 +281,7 @@
  target_os = @target_os@
  target_vendor = @target_vendor@
  EXTRA_DIST = cgi-demo.cgi.in
diff --git a/databases/rrdtool/patches/patch-am b/databases/rrdtool/patches/patch-am
deleted file mode 100644
index a75bb855518..00000000000
--- a/databases/rrdtool/patches/patch-am
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-am,v 1.6 2008/06/30 07:29:48 martti Exp $
-
-Prepend file name to error message.
-
---- src/rrd_update.c.orig	2008-06-11 01:12:55.000000000 +0200
-+++ src/rrd_update.c
-@@ -502,6 +502,15 @@ int _rrd_update(
-                         rra_step_cnt, updvals, tmpl_idx, tmpl_cnt,
-                         &pcdp_summary, version, skip_update,
-                         &schedule_smooth) == -1) {
-+	    if (rrd_test_error()) { /* Should have error string always here */
-+		char *save_error;
-+
-+		/* Prepend file name to error message */
-+		if ((save_error = strdup(rrd_get_error())) != NULL) {
-+		    rrd_set_error("%s: %s", filename, save_error);
-+		    free(save_error);
-+		}
-+	    }
-             free(arg_copy);
-             break;
-         }