From c605cd03a9027772cff9605ad9d4ba8e2442d614 Mon Sep 17 00:00:00 2001 From: he Date: Mon, 14 Apr 2008 16:05:35 +0000 Subject: Update rrdtool to version 1.2.27. Changes: * doc/rrdcreate.pod, doc/rrdgraph.pod, doc/rrdgraph_graph.pod, doc/rrdgraph_rpn.pod, doc/rrdtutorial.pod: fixes for better web rendering * COPYRIGHT: added ZPL 2.1 to floss exception * src/rrd_graph.c, trunk/program/src/rrd_graph.c: fixed parsing of fontnames with embeded spaces * bindings/tcl/tclrrd.c, configure.ac, src/rrd_cgi.c: * fix fadvice and madvice inclusion ... again * fix rrdcgi warning * fix warnings in tcl bindings -- Peter Breitenlohner peb mppmu.mpg.de * src/rrd_graph.c: weekday and time are too tight * configure.ac: fixing the solaris build * netware/Makefile, src/rrd_update.c, win32/Makefile: updates for netware and mingw32 ... allows for crosscompilation * src/rrd_update.c: make update compile for mingw32 3.4.5 * bindings/perl-shared/Makefile.PL, configure.ac, src/rrd_tool.h, src/rrd_update.c: * improve portability of compile environment to netbsd and solaris --- databases/rrdtool/Makefile | 4 ++-- databases/rrdtool/distinfo | 11 ++++------- databases/rrdtool/patches/patch-aa | 19 ------------------- databases/rrdtool/patches/patch-ab | 38 -------------------------------------- databases/rrdtool/patches/patch-ap | 16 ---------------- 5 files changed, 6 insertions(+), 82 deletions(-) delete mode 100644 databases/rrdtool/patches/patch-aa delete mode 100644 databases/rrdtool/patches/patch-ab delete mode 100644 databases/rrdtool/patches/patch-ap (limited to 'databases/rrdtool') diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile index c8a069d2dcb..c876fe4daf5 100644 --- a/databases/rrdtool/Makefile +++ b/databases/rrdtool/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.62 2007/11/20 11:57:59 martti Exp $ +# $NetBSD: Makefile,v 1.63 2008/04/14 16:05:35 he Exp $ -DISTNAME= rrdtool-1.2.26 +DISTNAME= rrdtool-1.2.27 #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 3f2f0f9ef9b..9516207d91e 100644 --- a/databases/rrdtool/distinfo +++ b/databases/rrdtool/distinfo @@ -1,12 +1,9 @@ -$NetBSD: distinfo,v 1.24 2007/11/21 07:50:14 martti Exp $ +$NetBSD: distinfo,v 1.25 2008/04/14 16:05:35 he Exp $ -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) = 95149f9f2a4e016fe79cb2845b7d796d6917f749 -SHA1 (patch-ab) = 696b67b38c9da903606ad77dd8dd5e7ff9eb3b5b +SHA1 (rrdtool-1.2.27.tar.gz) = 15028b65be68da83602f7479405dffb1eef819ec +RMD160 (rrdtool-1.2.27.tar.gz) = ee01b9cd52a9dbf42c6ac8d9259bdcfcd036b112 +Size (rrdtool-1.2.27.tar.gz) = 1081450 bytes SHA1 (patch-al) = f4e8687e8d92347373646c0db344911420203f84 -SHA1 (patch-ap) = bfeb02ca36eae3858bbca31c2c369eb35bae7ef6 SHA1 (patch-as) = aa48dbc38ae23493b8ff700fabf90d6e0f3f1d5a SHA1 (patch-av) = 2e2a626c8bbc78671ff7e834cb229f4a1b0c35c3 SHA1 (patch-aw) = 69b95e3d92ac58f53ca06784dec5d76f6f632fff diff --git a/databases/rrdtool/patches/patch-aa b/databases/rrdtool/patches/patch-aa deleted file mode 100644 index 0aa0d38c07e..00000000000 --- a/databases/rrdtool/patches/patch-aa +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-aa,v 1.9 2007/11/21 07:50:14 martti Exp $ - -Index: src/rrd_update.c -=================================================================== ---- src/rrd_update.c (revision 1235) -+++ src/rrd_update.c (working copy) -@@ -427,10 +427,10 @@ - fclose(rrd_file); - return(-1); - } --#ifdef HAVE_MADVISE -+#ifdef USE_MADVISE - /* when we use mmaping we tell the kernel the mmap equivalent - of POSIX_FADV_RANDOM */ -- madvise(rrd_mmaped_file,rrd_filesize,POSIX_MADV_RANDOM); -+ madvise(rrd_mmaped_file,rrd_filesize,MADV_RANDOM); - #endif - #endif - /* loop through the arguments. */ diff --git a/databases/rrdtool/patches/patch-ab b/databases/rrdtool/patches/patch-ab deleted file mode 100644 index 5dd69e098b5..00000000000 --- a/databases/rrdtool/patches/patch-ab +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-ab,v 1.7 2007/11/21 07:50:14 martti Exp $ - ---- configure.ac (revision 1235) -+++ configure.ac (working copy) -@@ -49,6 +49,13 @@ - /* realloc does not support NULL as argument */ - #undef NO_NULL_REALLOC - -+/* lets enable madvise defines in netbsd */ -+#if defined(__NetBSD__) -+# if !defined(_NETBSD_SOURCE) -+# define _NETBSD_SOURCE -+# endif -+#endif -+ - ]) - - AH_BOTTOM([ -@@ -58,6 +65,19 @@ - #include - #endif - -+#if !defined HAVE_MADVISE && defined HAVE_POSIX_MADVISE -+/* use posix_madvise family */ -+# define madvise posix_madvise -+# define MADV_NORMAL POSIX_MADV_NORMAL -+# define MADV_RANDOM POSIX_MADV_RANDOM -+# define MADV_SEQUENTIAL POSIX_MADV_SEQUENTIAL -+# define MADV_WILLNEED POSIX_MADV_WILLNEED -+# define MADV_DONTNEED POSIX_MADV_DONTNEED -+#endif -+#if defined HAVE_MADVISE || defined HAVE_POSIX_MADVISE -+# define USE_MADVISE 1 -+#endif -+ - /* define strrchr, strchr and memcpy, memmove in terms of bsd funcs - make sure you are NOT using bcopy, index or rindex in the code */ - diff --git a/databases/rrdtool/patches/patch-ap b/databases/rrdtool/patches/patch-ap deleted file mode 100644 index 43a9c01dd1a..00000000000 --- a/databases/rrdtool/patches/patch-ap +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ap,v 1.10 2007/11/13 01:58:43 cube Exp $ - ---- bindings/perl-shared/Makefile.PL.orig 2006-07-14 14:11:26.000000000 +0200 -+++ bindings/perl-shared/Makefile.PL -@@ -30,8 +30,10 @@ WriteMakefile( - 'VERSION_FROM' => 'RRDs.pm', # finds $VERSION - 'DEFINE' => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}", - 'INC' => '-I../../src', -+ 'LIBS' => "-lm -lpng -lz -lfreetype", - # Perl will figure out which one is valid -- 'dynamic_lib' => {'OTHERLDFLAGS' => "$librrd -lm"}, -+ 'depend' => {'RRDs.c' => "../../src/librrd.la"}, -+ 'LDFROM' => "\$(OBJECT) $librrd", - 'realclean' => {FILES => 't/demo?.rrd t/demo?.png' } - ); - -- cgit v1.2.3