Changes 1.2.13:

Restoring from 1.0.x format XML dumps was enabled.
The stability of rrdtool fetch results was fixed.
A new rrdtool graph and rrdcgi functions were added.
The pipe mode interface was improved. Many bugfixes were made.

8 files changed, 37 insertions, 39 deletions

diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index a13619e621f..cba362ae647 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2006/05/02 09:08:32 joerg Exp $
+# $NetBSD: Makefile,v 1.49 2006/05/05 17:42:06 adam Exp $
 
-DISTNAME=	rrdtool-1.2.12
-PKGREVISION=	3
+DISTNAME=	rrdtool-1.2.13
 CATEGORIES=	databases graphics net
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/
 
@@ -30,8 +29,6 @@ PERL5_PACKLIST+=	auto/RRDs/.packlist
 # rrdtool explicitly forbids any use of -ffast-math
 BUILDLINK_TRANSFORM+=	rm:-ffast-math
 
-RRDDOCDIR=		${PREFIX}/share/doc/rrdtool
-
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	post-build
 SUBST_MESSAGE.prefix=	Fixing $${prefix} in scripts.
diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
index 996e9019998..ad12d1718d3 100644
--- a/databases/rrdtool/distinfo
+++ b/databases/rrdtool/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.15 2006/01/24 22:22:16 adam Exp $
+$NetBSD: distinfo,v 1.16 2006/05/05 17:42:06 adam Exp $
 
-SHA1 (rrdtool-1.2.12.tar.gz) = bb7ea99635c34465829a74a09572bed6fee2b2f2
-RMD160 (rrdtool-1.2.12.tar.gz) = 253e0baff589f5fc7986e99e69dfc540713510e2
-Size (rrdtool-1.2.12.tar.gz) = 1022309 bytes
-SHA1 (patch-aj) = bcbf425ead5d65e309076a1169ec1281c3595050
-SHA1 (patch-al) = 655f6a504c1b593130ff79af4a3245aa3c18481b
-SHA1 (patch-ap) = 8960b74dbaafdd9f37a5bbffc97f04fbe2ad9eca
-SHA1 (patch-as) = 61f0cae2944301e112c8d8f956559e80c57dfbb2
+SHA1 (rrdtool-1.2.13.tar.gz) = 5e097253d0792a2c95cc0aba0ac22855719796fa
+RMD160 (rrdtool-1.2.13.tar.gz) = 111b9cccea5e5a54ce1a206828f100bfb2cb3470
+Size (rrdtool-1.2.13.tar.gz) = 1034025 bytes
+SHA1 (patch-aj) = 07d315efb5f2c48ee9f2a6dbf27f4d0f14e909ef
+SHA1 (patch-al) = 45b4912db3ef2e8fa9a49a832250da011d1130ed
+SHA1 (patch-ap) = 801fd43083118e4fbbcce8d6448cc3b2f1f19734
+SHA1 (patch-as) = aa48dbc38ae23493b8ff700fabf90d6e0f3f1d5a
 SHA1 (patch-av) = 2e2a626c8bbc78671ff7e834cb229f4a1b0c35c3
-SHA1 (patch-aw) = ac47919940bc0ed46cdcb92c1f5cae0270610180
-SHA1 (patch-ay) = 6826d5e89af4f7b1c8b820d3e35a84aae36f2cac
+SHA1 (patch-aw) = 0b5367e13f36cc4289ee0cc6a3cb4efd37f93f5c
+SHA1 (patch-ay) = d441bf4bc05b0ef7fcc7f15768cb2a0dd82a3142
diff --git a/databases/rrdtool/patches/patch-aj b/databases/rrdtool/patches/patch-aj
index 98937fc4618..e2365e44938 100644
--- a/databases/rrdtool/patches/patch-aj
+++ b/databases/rrdtool/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.7 2006/01/24 22:22:16 adam Exp $
+$NetBSD: patch-aj,v 1.8 2006/05/05 17:42:07 adam Exp $
 
---- doc/Makefile.in.orig	2005-12-18 21:32:11.000000000 +0100
+--- doc/Makefile.in.orig	2006-05-04 15:27:59.000000000 +0200
 +++ doc/Makefile.in
-@@ -252,9 +252,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefi
+@@ -254,9 +254,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefi
  	      exit 1;; \
  	  esac; \
  	done; \
diff --git a/databases/rrdtool/patches/patch-al b/databases/rrdtool/patches/patch-al
index 4e8dcc92ac7..707cf2a3519 100644
--- a/databases/rrdtool/patches/patch-al
+++ b/databases/rrdtool/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.7 2006/01/24 22:22:16 adam Exp $
+$NetBSD: patch-al,v 1.8 2006/05/05 17:42:07 adam Exp $
 
---- examples/Makefile.in.orig	2005-12-18 21:32:12.000000000 +0100
+--- examples/Makefile.in.orig	2006-05-04 15:28:00.000000000 +0200
 +++ examples/Makefile.in
-@@ -215,7 +215,7 @@ target_vendor = @target_vendor@
+@@ -217,7 +217,7 @@ target_vendor = @target_vendor@
  EXTRA_DIST = cgi-demo.cgi.in piped-demo.pl.in shared-demo.pl.in \
  	stripes.pl.in bigtops.pl.in minmax.pl.in 4charts.pl.in
  
diff --git a/databases/rrdtool/patches/patch-ap b/databases/rrdtool/patches/patch-ap
index fe5ae496cad..f2738ed783b 100644
--- a/databases/rrdtool/patches/patch-ap
+++ b/databases/rrdtool/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.6 2005/07/03 15:23:34 wulf Exp $
+$NetBSD: patch-ap,v 1.7 2006/05/05 17:42:07 adam Exp $
 
---- bindings/perl-shared/Makefile.PL.orig	2005-06-19 16:12:18.000000000 +0930
-+++ bindings/perl-shared/Makefile.PL	2005-06-19 16:16:56.000000000 +0930
-@@ -25,7 +25,9 @@
+--- bindings/perl-shared/Makefile.PL.orig	2006-05-04 15:26:28.000000000 +0200
++++ bindings/perl-shared/Makefile.PL
+@@ -29,8 +29,10 @@ WriteMakefile(
      'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
      'DEFINE'	   => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
      'INC'          => '-I../../src',
@@ -13,3 +13,4 @@ $NetBSD: patch-ap,v 1.6 2005/07/03 15:23:34 wulf Exp $
 +    'LDFROM'       => "\$(OBJECT) $librrd",
      'realclean'    => {FILES => 't/demo?.rrd t/demo?.png' }
  );
+ 
diff --git a/databases/rrdtool/patches/patch-as b/databases/rrdtool/patches/patch-as
index 91d2036464b..4f5f4a4330e 100644
--- a/databases/rrdtool/patches/patch-as
+++ b/databases/rrdtool/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.7 2006/01/24 22:22:16 adam Exp $
+$NetBSD: patch-as,v 1.8 2006/05/05 17:42:07 adam Exp $
 
---- src/rrd_cgi.c.orig	2005-12-18 21:30:45.000000000 +0100
+--- src/rrd_cgi.c.orig	2006-05-04 15:26:28.000000000 +0200
 +++ src/rrd_cgi.c
-@@ -413,7 +413,7 @@ int main(int argc, char *argv[]) {
+@@ -418,7 +418,7 @@ int main(int argc, char *argv[]) {
  
  	if (!filter) {
  		printf ("Content-Type: text/html\n" 
diff --git a/databases/rrdtool/patches/patch-aw b/databases/rrdtool/patches/patch-aw
index 387cf8d78d2..b208cfff644 100644
--- a/databases/rrdtool/patches/patch-aw
+++ b/databases/rrdtool/patches/patch-aw
@@ -1,8 +1,8 @@
-$NetBSD: patch-aw,v 1.4 2006/01/24 22:22:16 adam Exp $
+$NetBSD: patch-aw,v 1.5 2006/05/05 17:42:07 adam Exp $
 
---- src/rrd_tool.c.orig	2005-12-18 21:30:45.000000000 +0100
+--- src/rrd_tool.c.orig	2006-05-04 15:26:28.000000000 +0200
 +++ src/rrd_tool.c
-@@ -557,7 +557,7 @@ int HandleInputLine(int argc, char **arg
+@@ -590,7 +590,7 @@ int HandleInputLine(int argc, char **arg
      else if (strcmp("resize", argv[1]) == 0)
  	rrd_resize(argc-1, &argv[1]);
      else if (strcmp("last", argv[1]) == 0)
@@ -11,7 +11,7 @@ $NetBSD: patch-aw,v 1.4 2006/01/24 22:22:16 adam Exp $
      else if (strcmp("first", argv[1]) == 0)
          printf("%ld\n",rrd_first(argc-1, &argv[1]));
      else if (strcmp("update", argv[1]) == 0)
-@@ -597,9 +597,9 @@ int HandleInputLine(int argc, char **arg
+@@ -630,9 +630,9 @@ int HandleInputLine(int argc, char **arg
  	  printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n\n", XML_ENCODING);
  	  printf("<%s>\n", ROOT_TAG);
  	  printf("  <%s>\n", META_TAG);
@@ -23,7 +23,7 @@ $NetBSD: patch-aw,v 1.4 2006/01/24 22:22:16 adam Exp $
  	  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);
-@@ -615,7 +615,7 @@ int HandleInputLine(int argc, char **arg
+@@ -648,7 +648,7 @@ int HandleInputLine(int argc, char **arg
  	  printf("  <%s>\n", DATA_TAG);
  	  for (ti = start+step; ti <= end; ti += step) {
  	    printf ("    <%s>", DATA_ROW_TAG);
diff --git a/databases/rrdtool/patches/patch-ay b/databases/rrdtool/patches/patch-ay
index 1458ed937b6..6670015bd63 100644
--- a/databases/rrdtool/patches/patch-ay
+++ b/databases/rrdtool/patches/patch-ay
@@ -1,13 +1,13 @@
-$NetBSD: patch-ay,v 1.3 2006/01/24 22:22:16 adam Exp $
+$NetBSD: patch-ay,v 1.4 2006/05/05 17:42:07 adam Exp $
 
---- src/rrd_dump.c.orig	2005-12-18 21:30:45.000000000 +0100
+--- src/rrd_dump.c.orig	2006-05-04 15:26:28.000000000 +0200
 +++ src/rrd_dump.c
-@@ -93,7 +93,7 @@ rrd_dump_r(char *filename)    
+@@ -113,7 +113,7 @@ rrd_dump_r(char *filename, char *outname
  # error "Need strftime"
  #endif
-     printf("\t<lastupdate> %ld </lastupdate> <!-- %s -->\n\n",
+     fprintf(out_file, "\t<lastupdate> %ld </lastupdate> <!-- %s -->\n\n",
 -	   rrd.live_head->last_up,somestring);
 +	   (long) rrd.live_head->last_up,somestring);
      for(i=0;i<rrd.stat_head->ds_cnt;i++){
- 	printf("\t<ds>\n");
- 	printf("\t\t<name> %s </name>\n",rrd.ds_def[i].ds_nam);
+ 	fprintf(out_file, "\t<ds>\n");
+ 	fprintf(out_file, "\t\t<name> %s </name>\n",rrd.ds_def[i].ds_nam);