Updated databases/rrdtool to 1.2.26

* Bug fixes

5 files changed, 41 insertions, 19 deletions

diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 790688eeb4e..c8a069d2dcb 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2007/11/13 01:58:42 cube Exp $
+# $NetBSD: Makefile,v 1.62 2007/11/20 11:57:59 martti Exp $
 
-DISTNAME=	rrdtool-1.2.23
-PKGREVISION=	2
+DISTNAME=	rrdtool-1.2.26
+#PKGREVISION=	1
 CATEGORIES=	databases graphics net
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
 
@@ -11,7 +11,7 @@ COMMENT=	Data analysis tool generating graphical representations
 #LICENSE=	gnu-gpl-v2
 
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake pkg-config perl
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--with-perl-options=${MAKE_PARAMS:Q}
diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
index b4b495cae4c..49bbcd0ba83 100644
--- a/databases/rrdtool/distinfo
+++ b/databases/rrdtool/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.22 2007/11/13 01:58:42 cube Exp $
+$NetBSD: distinfo,v 1.23 2007/11/20 11:57:59 martti Exp $
 
-SHA1 (rrdtool-1.2.23.tar.gz) = 5da610e1c8bc01b80abc21ab9e98e004363b429c
-RMD160 (rrdtool-1.2.23.tar.gz) = 0c1147242adf476f5e93f4d59b553ee3ea378b23
-Size (rrdtool-1.2.23.tar.gz) = 1061530 bytes
-SHA1 (patch-al) = ee357df87b25fd5286da173b245c03c9a02ab5b4
+SHA1 (rrdtool-1.2.26.tar.gz) = 1896f8060b6ff15d16c3ca4a6d21ea59b202d999
+RMD160 (rrdtool-1.2.26.tar.gz) = bd54677c70ec64cbdb2865109f4338243c160f82
+Size (rrdtool-1.2.26.tar.gz) = 1080151 bytes
+SHA1 (patch-aa) = 63638c3f204b216503eaa9832e38eb2873a5714c
+SHA1 (patch-al) = f4e8687e8d92347373646c0db344911420203f84
 SHA1 (patch-ap) = bfeb02ca36eae3858bbca31c2c369eb35bae7ef6
 SHA1 (patch-as) = aa48dbc38ae23493b8ff700fabf90d6e0f3f1d5a
 SHA1 (patch-av) = 2e2a626c8bbc78671ff7e834cb229f4a1b0c35c3
-SHA1 (patch-aw) = aeab03498d876b7b021ddd47714c27d9ded3060d
+SHA1 (patch-aw) = 69b95e3d92ac58f53ca06784dec5d76f6f632fff
 SHA1 (patch-ay) = 02d147bdbde1fee9b3de0badf7d9430d5be6029e
diff --git a/databases/rrdtool/patches/patch-aa b/databases/rrdtool/patches/patch-aa
new file mode 100644
index 00000000000..4f9765cf545
--- /dev/null
+++ b/databases/rrdtool/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.8 2007/11/20 11:58:00 martti Exp $
+
+--- src/rrd_tool.h.orig	2007-11-20 02:15:10.000000000 +0200
++++ src/rrd_tool.h	2007-11-20 13:47:45.000000000 +0200
+@@ -202,6 +202,16 @@
+ 
+ #endif
+ 
++#if defined(__NetBSD__)
++# if !defined(_NETBSD_SOURCE)
++#  define _NETBSD_SOURCE
++# endif
++
++# if !defined(POSIX_MADV_RANDOM)
++#  define POSIX_MADV_RANDOM MADV_RANDOM
++# endif
++#endif
++
+ #ifdef  __cplusplus
+ }
+ #endif
diff --git a/databases/rrdtool/patches/patch-al b/databases/rrdtool/patches/patch-al
index 813a68bf9df..21bfe386b30 100644
--- a/databases/rrdtool/patches/patch-al
+++ b/databases/rrdtool/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.10 2007/05/16 09:01:11 martti Exp $
+$NetBSD: patch-al,v 1.11 2007/11/20 11:58:00 martti Exp $
 
---- examples/Makefile.in.orig	2007-05-02 21:07:00.000000000 +0300
-+++ examples/Makefile.in	2007-05-16 08:41:47.000000000 +0300
-@@ -219,7 +219,7 @@
+--- 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 @@
  target_os = @target_os@
  target_vendor = @target_vendor@
  EXTRA_DIST = cgi-demo.cgi.in
diff --git a/databases/rrdtool/patches/patch-aw b/databases/rrdtool/patches/patch-aw
index 8697928949d..cfb6f28304e 100644
--- a/databases/rrdtool/patches/patch-aw
+++ b/databases/rrdtool/patches/patch-aw
@@ -1,8 +1,8 @@
-$NetBSD: patch-aw,v 1.7 2007/01/30 13:26:55 adam Exp $
+$NetBSD: patch-aw,v 1.8 2007/11/20 11:58:00 martti Exp $
 
---- src/rrd_tool.c.orig	2007-01-23 21:54:49.000000000 +0100
-+++ src/rrd_tool.c
-@@ -702,9 +702,9 @@ int HandleInputLine(int argc, char **arg
+--- 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 @@
  	  printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n\n", XML_ENCODING);
  	  printf("<%s>\n", ROOT_TAG);
  	  printf("  <%s>\n", META_TAG);
@@ -14,7 +14,7 @@ $NetBSD: patch-aw,v 1.7 2007/01/30 13:26:55 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);
-@@ -720,7 +720,7 @@ int HandleInputLine(int argc, char **arg
+@@ -717,7 +717,7 @@
  	  printf("  <%s>\n", DATA_TAG);
  	  for (ti = start+step; ti <= end; ti += step) {
  	    printf ("    <%s>", DATA_ROW_TAG);