Changes 1.4.4:

Bugfixes:
* compile: multiple fixes isnan and isinf defines to make rrdtool compile
  with gcc on solaris (with --disable-nls)
* handle gettext/libintl like any other feature, do not try to supply
  our own ... rrdtool can work fine without it
* rrd_client: fix potential segfaults
* rrd_client: resolve synmlinks properly
* compile: fix libtool and libtoolize names for OSX compiles
* compile: fix for HAVE_BROKEN_MS_ASYNC (old linux kernels)
* rrd_xport: fix --daemon handling
* rrd_client: explicitly close connection on error
* rrd_update: fix memory leak for COMPUTE datasources
* rrd_daemon: fix segfault when specifying a relative path (-j option)
* compile: make rrdtool compile with gcc 4.5
* portability: use %lld (long long int) for time_t *printf
* compile: link pangocairo and not pango since we do use pangocairo actually
* compile: re-integrate intl into compile dependency so that hosts with
  old (or no) gettext can get access to the included copy.
* rrd_cached: exit with status !=0 on invalid cli

Enhancements:
* updated build files and instructions for win32 port by Chris Larsen
* legal: Relicense the RRDCacheD client interface under the MIT license
* legal: Updted FLOSS Exception for latest PHP license
* rrd_cached: better help output

6 files changed, 60 insertions, 46 deletions

diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index fa431cb9b78..ee84b09e20d 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.82 2010/06/13 22:44:01 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2010/07/06 07:31:20 adam Exp $
 
-DISTNAME=	rrdtool-1.3.9
-PKGREVISION=	2
+DISTNAME=	rrdtool-1.4.4
 
 CATEGORIES=	databases graphics net
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
@@ -37,13 +36,13 @@ SUBST_FILES.prefix=	examples/cgi-demo.cgi
 SUBST_SED.prefix=	-e '1s,^\#! \$${prefix},\#! ${PREFIX},'
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/databases/rrdtool/PLIST b/databases/rrdtool/PLIST
index c43b62af7e3..0238199ec4c 100644
--- a/databases/rrdtool/PLIST
+++ b/databases/rrdtool/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.12 2009/06/14 17:43:23 joerg Exp $
+@comment $NetBSD: PLIST,v 1.13 2010/07/06 07:31:20 adam Exp $
+bin/rrdcached
 bin/rrdcgi
 bin/rrdtool
 bin/rrdupdate
 include/rrd.h
+include/rrd_client.h
 include/rrd_format.h
 lib/librrd.la
 lib/librrd_th.la
@@ -12,11 +14,13 @@ man/man1/cdeftutorial.1
 man/man1/rpntutorial.1
 man/man1/rrd-beginners.1
 man/man1/rrdbuild.1
+man/man1/rrdcached.1
 man/man1/rrdcgi.1
 man/man1/rrdcreate.1
 man/man1/rrddump.1
 man/man1/rrdfetch.1
 man/man1/rrdfirst.1
+man/man1/rrdflushcached.1
 man/man1/rrdgraph.1
 man/man1/rrdgraph_data.1
 man/man1/rrdgraph_examples.1
@@ -33,19 +37,23 @@ man/man1/rrdtune.1
 man/man1/rrdtutorial.1
 man/man1/rrdupdate.1
 man/man1/rrdxport.1
+man/man3/librrd.3
 share/doc/rrdtool-${PKGVERSION}/html/RRDp.html
 share/doc/rrdtool-${PKGVERSION}/html/RRDs.html
 share/doc/rrdtool-${PKGVERSION}/html/bin_dec_hex.html
 share/doc/rrdtool-${PKGVERSION}/html/cdeftutorial.html
 share/doc/rrdtool-${PKGVERSION}/html/index.html
+share/doc/rrdtool-${PKGVERSION}/html/librrd.html
 share/doc/rrdtool-${PKGVERSION}/html/rpntutorial.html
 share/doc/rrdtool-${PKGVERSION}/html/rrd-beginners.html
 share/doc/rrdtool-${PKGVERSION}/html/rrdbuild.html
+share/doc/rrdtool-${PKGVERSION}/html/rrdcached.html
 share/doc/rrdtool-${PKGVERSION}/html/rrdcgi.html
 share/doc/rrdtool-${PKGVERSION}/html/rrdcreate.html
 share/doc/rrdtool-${PKGVERSION}/html/rrddump.html
 share/doc/rrdtool-${PKGVERSION}/html/rrdfetch.html
 share/doc/rrdtool-${PKGVERSION}/html/rrdfirst.html
+share/doc/rrdtool-${PKGVERSION}/html/rrdflushcached.html
 share/doc/rrdtool-${PKGVERSION}/html/rrdgraph.html
 share/doc/rrdtool-${PKGVERSION}/html/rrdgraph_data.html
 share/doc/rrdtool-${PKGVERSION}/html/rrdgraph_examples.html
@@ -66,12 +74,15 @@ share/doc/rrdtool-${PKGVERSION}/txt/bin_dec_hex.pod
 share/doc/rrdtool-${PKGVERSION}/txt/bin_dec_hex.txt
 share/doc/rrdtool-${PKGVERSION}/txt/cdeftutorial.pod
 share/doc/rrdtool-${PKGVERSION}/txt/cdeftutorial.txt
+share/doc/rrdtool-${PKGVERSION}/txt/librrd.txt
 share/doc/rrdtool-${PKGVERSION}/txt/rpntutorial.pod
 share/doc/rrdtool-${PKGVERSION}/txt/rpntutorial.txt
 share/doc/rrdtool-${PKGVERSION}/txt/rrd-beginners.pod
 share/doc/rrdtool-${PKGVERSION}/txt/rrd-beginners.txt
 share/doc/rrdtool-${PKGVERSION}/txt/rrdbuild.pod
 share/doc/rrdtool-${PKGVERSION}/txt/rrdbuild.txt
+share/doc/rrdtool-${PKGVERSION}/txt/rrdcached.pod
+share/doc/rrdtool-${PKGVERSION}/txt/rrdcached.txt
 share/doc/rrdtool-${PKGVERSION}/txt/rrdcgi.pod
 share/doc/rrdtool-${PKGVERSION}/txt/rrdcgi.txt
 share/doc/rrdtool-${PKGVERSION}/txt/rrdcreate.pod
@@ -82,6 +93,8 @@ share/doc/rrdtool-${PKGVERSION}/txt/rrdfetch.pod
 share/doc/rrdtool-${PKGVERSION}/txt/rrdfetch.txt
 share/doc/rrdtool-${PKGVERSION}/txt/rrdfirst.pod
 share/doc/rrdtool-${PKGVERSION}/txt/rrdfirst.txt
+share/doc/rrdtool-${PKGVERSION}/txt/rrdflushcached.pod
+share/doc/rrdtool-${PKGVERSION}/txt/rrdflushcached.txt
 share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph.pod
 share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph.txt
 share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_data.pod
@@ -114,6 +127,8 @@ share/doc/rrdtool-${PKGVERSION}/txt/rrdupdate.pod
 share/doc/rrdtool-${PKGVERSION}/txt/rrdupdate.txt
 share/doc/rrdtool-${PKGVERSION}/txt/rrdxport.pod
 share/doc/rrdtool-${PKGVERSION}/txt/rrdxport.txt
+share/examples/rrdcached/RRDCached.pm
+share/examples/rrdcached/rrdcached-size.pl
 share/examples/rrdtool/4charts.pl
 share/examples/rrdtool/bigtops.pl
 share/examples/rrdtool/cgi-demo.cgi
diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
index 3f5f3247b75..0bf8ec0ac41 100644
--- a/databases/rrdtool/distinfo
+++ b/databases/rrdtool/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.40 2010/03/13 16:41:21 spz Exp $
+$NetBSD: distinfo,v 1.41 2010/07/06 07:31:20 adam Exp $
 
-SHA1 (rrdtool-1.3.9.tar.gz) = 5c202810bdf5e5dda3f06079c7739993622c7e86
-RMD160 (rrdtool-1.3.9.tar.gz) = 2b05c37a713cca3d15d92d1d9c5292c3cc4e0781
-Size (rrdtool-1.3.9.tar.gz) = 1189442 bytes
-SHA1 (patch-al) = 5ff520a236abe66ee7daf8ac56274da52dd42172
-SHA1 (patch-az) = e6d55613b6041546223e89763633e7fa81bc029f
+SHA1 (rrdtool-1.4.4.tar.gz) = e4715c13f2a6fd077c54911d396eb573788377b0
+RMD160 (rrdtool-1.4.4.tar.gz) = 7636c67af3e3b9ce2361cc2c3cab5a90a662a29a
+Size (rrdtool-1.4.4.tar.gz) = 1345477 bytes
+SHA1 (patch-al) = abc25497a10d59b1ad2e3a263f818eef89985538
+SHA1 (patch-am) = 6c0a0890b1e8e2c1a186e2015c0cf5acd719b686
+SHA1 (patch-az) = 9db879e7e74e7953b15afc46504cf9a65b9eb342
diff --git a/databases/rrdtool/patches/patch-al b/databases/rrdtool/patches/patch-al
index e03d5a99acd..33af69bc1f1 100644
--- a/databases/rrdtool/patches/patch-al
+++ b/databases/rrdtool/patches/patch-al
@@ -1,12 +1,12 @@
-$NetBSD: patch-al,v 1.16 2009/10/29 12:43:49 martti Exp $
+$NetBSD: patch-al,v 1.17 2010/07/06 07:31:20 adam Exp $
 
 Correct examples directory.
 
---- examples/Makefile.in.orig	2009-10-24 13:47:13.000000000 +0300
-+++ examples/Makefile.in	2009-10-29 14:35:23.000000000 +0200
-@@ -303,7 +303,7 @@
- top_builddir = @top_builddir@
+--- examples/Makefile.in.orig	2010-07-05 19:31:54.000000000 +0000
++++ examples/Makefile.in
+@@ -330,7 +330,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ SUBDIRS = rrdcached
  EXTRA_DIST = cgi-demo.cgi.in
 -examplesdir = $(pkgdatadir)/examples
 +examplesdir = $(prefix)/share/examples/rrdtool
diff --git a/databases/rrdtool/patches/patch-am b/databases/rrdtool/patches/patch-am
new file mode 100644
index 00000000000..625c0877eff
--- /dev/null
+++ b/databases/rrdtool/patches/patch-am
@@ -0,0 +1,15 @@
+$NetBSD: patch-am,v 1.8 2010/07/06 07:31:37 adam Exp $
+
+Correct examples directory.
+
+--- examples/rrdcached/Makefile.in.orig	2010-07-06 07:23:46.000000000 +0000
++++ examples/rrdcached/Makefile.in
+@@ -283,7 +283,7 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-examplesdir = $(pkgdatadir)/examples/rrdcached
++examplesdir = $(prefix)/share/examples/rrdcached
+ examples_SCRIPTS = RRDCached.pm rrdcached-size.pl
+ EXTRA_DIST = RRDCached.pm rrdcached-size.pl
+ all: all-am
diff --git a/databases/rrdtool/patches/patch-az b/databases/rrdtool/patches/patch-az
index 276f7268db0..aef989e9a6b 100644
--- a/databases/rrdtool/patches/patch-az
+++ b/databases/rrdtool/patches/patch-az
@@ -1,29 +1,13 @@
-$NetBSD: patch-az,v 1.1 2010/03/13 16:41:21 spz Exp $
+$NetBSD: patch-az,v 1.2 2010/07/06 07:31:20 adam Exp $
 
---- src/rrd_restore.c.orig	2009-10-24 10:46:42.000000000 +0000
-+++ src/rrd_restore.c
-@@ -966,10 +966,20 @@ static int parse_tag_rrd(
-             else { if (sizeof(time_t) == sizeof(long long)) {
-                        status = get_llong_from_node(doc, child, (long long *)&rrd->live_head->last_up);
-                     }
--                    else {
--                       rrd_set_error("can't convert to time_t ...", child->name);
--                       status = -1;    
--                    }
-+                    else if (sizeof(time_t) == sizeof(int)) {
-+				long temp_last_up;
-+				status = get_long_from_node(doc, child, &temp_last_up);
-+				if (temp_last_up < INT_MAX)
-+					rrd->live_head->last_up = temp_last_up;
-+				else {
-+					rrd_set_error("can't convert to time_t ...", child->name);
-+					status = -1;    
-+				}
-+			}
-+			else {
-+				rrd_set_error("can't convert to time_t ...", child->name);
-+				status = -1;    
-+			}
-             }
-         }
-         else if (xmlStrcmp(child->name, (const xmlChar *) "ds") == 0)
+--- src/rrd_daemon.c.orig	2010-07-06 07:12:11.000000000 +0000
++++ src/rrd_daemon.c
+@@ -109,7 +109,7 @@
+ #include <libgen.h>
+ #include <grp.h>
+ 
+-#include <glib-2.0/glib.h>
++#include <glib.h>
+ /* }}} */
+ 
+ #define RRDD_LOG(severity, ...) \