From d4bec5f03cb00fca1d92bf56f81658957b206cce Mon Sep 17 00:00:00 2001
From: martti <martti>
Date: Fri, 2 Jan 2009 20:07:10 +0000
Subject: Updated databases/rrdtool12 to 1.2.29

Features:

- a second axis can now be displayed in rrd_graph. look for
  documentation on second-axis. feature was sponsored by VoltWerk.

Bugfixes:

- rrd_fetch: is more careful when seeking. it should not try to seek
  outside the file anymore.

- rrd_graph: CDEF:x= raises an error now and does not segfault

- rrd_graph: --font TITLE:12: problem fixed (affecting cacti)

- rrd_graph: make VDEF work with SHIFT (bug #177)

- rrd_xport: make it work when exporting datasources without
             uniform step size.

- rrd_tool:  rely on function return values and not on errno.  (bug #176)
---
 databases/rrdtool12/Makefile         |  6 ++----
 databases/rrdtool12/buildlink3.mk    |  4 ++--
 databases/rrdtool12/distinfo         | 10 +++++-----
 databases/rrdtool12/patches/patch-aw | 10 +++++-----
 4 files changed, 14 insertions(+), 16 deletions(-)

(limited to 'databases/rrdtool12')

diff --git a/databases/rrdtool12/Makefile b/databases/rrdtool12/Makefile
index 4382b8308d2..757461a3ee8 100644
--- a/databases/rrdtool12/Makefile
+++ b/databases/rrdtool12/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2008/10/19 19:17:46 he Exp $
+# $NetBSD: Makefile,v 1.3 2009/01/02 20:07:10 martti Exp $
 
-DISTNAME=	rrdtool-1.2.28
-#PKGREVISION=	1
-PKGREVISION=	1
+DISTNAME=	rrdtool-1.2.29
 CATEGORIES=	databases graphics net
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
 
diff --git a/databases/rrdtool12/buildlink3.mk b/databases/rrdtool12/buildlink3.mk
index 1290757638c..d0a97fb9670 100644
--- a/databases/rrdtool12/buildlink3.mk
+++ b/databases/rrdtool12/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/07/28 19:48:03 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/01/02 20:07:10 martti Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RRDTOOL_BUILDLINK3_MK:=	${RRDTOOL_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	rrdtool
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rrdtool
 
 .if ${RRDTOOL_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.rrdtool+=	rrdtool>=1.2.26
+BUILDLINK_API_DEPENDS.rrdtool+=	rrdtool>=1.2.29
 BUILDLINK_PKGSRCDIR.rrdtool?=	../../databases/rrdtool
 .endif	# RRDTOOL_BUILDLINK3_MK
 
diff --git a/databases/rrdtool12/distinfo b/databases/rrdtool12/distinfo
index abc0f9a5973..1b85ad16c52 100644
--- a/databases/rrdtool12/distinfo
+++ b/databases/rrdtool12/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/07/28 19:48:03 martti Exp $
+$NetBSD: distinfo,v 1.2 2009/01/02 20:07:10 martti Exp $
 
-SHA1 (rrdtool-1.2.28.tar.gz) = a8ca75fcf7b32ca94b057fa663e5f989522e2df9
-RMD160 (rrdtool-1.2.28.tar.gz) = 11a4c6414037b3ce0e49d49b458f9fc13f3ef7ba
-Size (rrdtool-1.2.28.tar.gz) = 1089006 bytes
+SHA1 (rrdtool-1.2.29.tar.gz) = bd6c201eb12ff9007081fda81aa6bd1410a30bf2
+RMD160 (rrdtool-1.2.29.tar.gz) = a54f80cf3eec6d1484e062311a96e5691656288e
+Size (rrdtool-1.2.29.tar.gz) = 1092333 bytes
 SHA1 (patch-al) = d60ff005ac635f0fcbc5222be419a9f08c326817
 SHA1 (patch-as) = f29600b678eec1d612f7bf59a4fbf4e9a91cf5a0
 SHA1 (patch-av) = 2499cb7f42dd1438d4126135a8305409a5dff744
-SHA1 (patch-aw) = 48698606d9e0685a2284ea2d02723a946fd22f95
+SHA1 (patch-aw) = 71b7ea0da101dc0867aa3e58334de0ef43eea33f
 SHA1 (patch-ay) = a9b9e9be3364f9b0ea5c407f841aced60b9ac3f0
diff --git a/databases/rrdtool12/patches/patch-aw b/databases/rrdtool12/patches/patch-aw
index 86d7dc95789..09737491d5a 100644
--- a/databases/rrdtool12/patches/patch-aw
+++ b/databases/rrdtool12/patches/patch-aw
@@ -1,10 +1,10 @@
-$NetBSD: patch-aw,v 1.1.1.1 2008/07/28 19:48:03 martti Exp $
+$NetBSD: patch-aw,v 1.2 2009/01/02 20:07:10 martti Exp $
 
 Adjust for pkgsrc.
 
---- src/rrd_tool.c.orig	2007-11-20 02:15:10.000000000 +0200
-+++ src/rrd_tool.c	2007-11-20 12:58:12.000000000 +0200
-@@ -699,9 +699,9 @@
+--- src/rrd_tool.c.orig	2008-12-16 00:05:13.000000000 +0200
++++ src/rrd_tool.c	2009-01-02 21:37:38.000000000 +0200
+@@ -697,9 +697,9 @@
  	  printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n\n", XML_ENCODING);
  	  printf("<%s>\n", ROOT_TAG);
  	  printf("  <%s>\n", META_TAG);
@@ -16,7 +16,7 @@ Adjust for pkgsrc.
  	  printf("    <%s>%lu</%s>\n", META_ROWS_TAG, row_cnt, META_ROWS_TAG);
  	  printf("    <%s>%lu</%s>\n", META_COLS_TAG, col_cnt, META_COLS_TAG);
  	  printf("    <%s>\n", LEGEND_TAG);
-@@ -717,7 +717,7 @@
+@@ -715,7 +715,7 @@
  	  printf("  <%s>\n", DATA_TAG);
  	  for (ti = start+step; ti <= end; ti += step) {
  	    printf ("    <%s>", DATA_ROW_TAG);
-- 
cgit v1.2.3