Tue Jul 6 07:31:20 2010 UTC ()
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


(adam)
diff -r1.82 -r1.83 pkgsrc/databases/rrdtool/Makefile
diff -r1.12 -r1.13 pkgsrc/databases/rrdtool/PLIST
diff -r1.40 -r1.41 pkgsrc/databases/rrdtool/distinfo
diff -r1.16 -r1.17 pkgsrc/databases/rrdtool/patches/patch-al
diff -r1.1 -r1.2 pkgsrc/databases/rrdtool/patches/patch-az

cvs diff -r1.82 -r1.83 pkgsrc/databases/rrdtool/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/rrdtool/Makefile 2010/06/13 22:44:01 1.82
+++ pkgsrc/databases/rrdtool/Makefile 2010/07/06 07:31:20 1.83
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.82 2010/06/13 22:44:01 wiz Exp $ 1# $NetBSD: Makefile,v 1.83 2010/07/06 07:31:20 adam Exp $
2 2
3DISTNAME= rrdtool-1.3.9 3DISTNAME= rrdtool-1.4.4
4PKGREVISION= 2 
5 4
6CATEGORIES= databases graphics net 5CATEGORIES= databases graphics net
7MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/ 6MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://oss.oetiker.ch/rrdtool/ 9HOMEPAGE= http://oss.oetiker.ch/rrdtool/
11COMMENT= Data analysis tool generating graphical representations 10COMMENT= Data analysis tool generating graphical representations
12LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
13 12
14PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
15 14
16USE_LIBTOOL= yes 15USE_LIBTOOL= yes
17USE_TOOLS+= gmake pkg-config perl msgfmt intltool 16USE_TOOLS+= gmake pkg-config perl msgfmt intltool
@@ -27,24 +26,24 @@ PERL5_CONFIGURE= no @@ -27,24 +26,24 @@ PERL5_CONFIGURE= no
27PERL5_PACKLIST+= auto/RRDp/.packlist 26PERL5_PACKLIST+= auto/RRDp/.packlist
28PERL5_PACKLIST+= auto/RRDs/.packlist 27PERL5_PACKLIST+= auto/RRDs/.packlist
29 28
30# rrdtool explicitly forbids any use of -ffast-math 29# rrdtool explicitly forbids any use of -ffast-math
31BUILDLINK_TRANSFORM+= rm:-ffast-math 30BUILDLINK_TRANSFORM+= rm:-ffast-math
32 31
33SUBST_CLASSES+= prefix 32SUBST_CLASSES+= prefix
34SUBST_STAGE.prefix= post-build 33SUBST_STAGE.prefix= post-build
35SUBST_MESSAGE.prefix= Fixing $${prefix} in scripts. 34SUBST_MESSAGE.prefix= Fixing $${prefix} in scripts.
36SUBST_FILES.prefix= examples/cgi-demo.cgi 35SUBST_FILES.prefix= examples/cgi-demo.cgi
37SUBST_SED.prefix= -e '1s,^\#! \$${prefix},\#! ${PREFIX},' 36SUBST_SED.prefix= -e '1s,^\#! \$${prefix},\#! ${PREFIX},'
38 37
39.include "../../devel/gettext-lib/buildlink3.mk" 38.include "../../devel/gettext-lib/buildlink3.mk"
40.include "../../graphics/freetype2/buildlink3.mk" 39.include "../../devel/glib2/buildlink3.mk"
41.include "../../fonts/fontconfig/buildlink3.mk" 
42.include "../../devel/pango/buildlink3.mk" 40.include "../../devel/pango/buildlink3.mk"
 41.include "../../fonts/fontconfig/buildlink3.mk"
43.include "../../graphics/cairo/buildlink3.mk" 42.include "../../graphics/cairo/buildlink3.mk"
 43.include "../../graphics/freetype2/buildlink3.mk"
44.include "../../graphics/png/buildlink3.mk" 44.include "../../graphics/png/buildlink3.mk"
45.include "../../textproc/libxml2/buildlink3.mk" 45.include "../../textproc/libxml2/buildlink3.mk"
46.include "../../devel/glib2/buildlink3.mk" 
47.include "../../x11/pixman/buildlink3.mk" 46.include "../../x11/pixman/buildlink3.mk"
48.include "../../lang/perl5/module.mk" 47.include "../../lang/perl5/module.mk"
49.include "../../mk/pthread.buildlink3.mk" 48.include "../../mk/pthread.buildlink3.mk"
50.include "../../mk/bsd.pkg.mk" 49.include "../../mk/bsd.pkg.mk"

cvs diff -r1.12 -r1.13 pkgsrc/databases/rrdtool/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/rrdtool/PLIST 2009/06/14 17:43:23 1.12
+++ pkgsrc/databases/rrdtool/PLIST 2010/07/06 07:31:20 1.13
@@ -1,97 +1,110 @@ @@ -1,97 +1,110 @@
1@comment $NetBSD: PLIST,v 1.12 2009/06/14 17:43:23 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.13 2010/07/06 07:31:20 adam Exp $
 2bin/rrdcached
2bin/rrdcgi 3bin/rrdcgi
3bin/rrdtool 4bin/rrdtool
4bin/rrdupdate 5bin/rrdupdate
5include/rrd.h 6include/rrd.h
 7include/rrd_client.h
6include/rrd_format.h 8include/rrd_format.h
7lib/librrd.la 9lib/librrd.la
8lib/librrd_th.la 10lib/librrd_th.la
9lib/pkgconfig/librrd.pc 11lib/pkgconfig/librrd.pc
10man/man1/bin_dec_hex.1 12man/man1/bin_dec_hex.1
11man/man1/cdeftutorial.1 13man/man1/cdeftutorial.1
12man/man1/rpntutorial.1 14man/man1/rpntutorial.1
13man/man1/rrd-beginners.1 15man/man1/rrd-beginners.1
14man/man1/rrdbuild.1 16man/man1/rrdbuild.1
 17man/man1/rrdcached.1
15man/man1/rrdcgi.1 18man/man1/rrdcgi.1
16man/man1/rrdcreate.1 19man/man1/rrdcreate.1
17man/man1/rrddump.1 20man/man1/rrddump.1
18man/man1/rrdfetch.1 21man/man1/rrdfetch.1
19man/man1/rrdfirst.1 22man/man1/rrdfirst.1
 23man/man1/rrdflushcached.1
20man/man1/rrdgraph.1 24man/man1/rrdgraph.1
21man/man1/rrdgraph_data.1 25man/man1/rrdgraph_data.1
22man/man1/rrdgraph_examples.1 26man/man1/rrdgraph_examples.1
23man/man1/rrdgraph_graph.1 27man/man1/rrdgraph_graph.1
24man/man1/rrdgraph_rpn.1 28man/man1/rrdgraph_rpn.1
25man/man1/rrdinfo.1 29man/man1/rrdinfo.1
26man/man1/rrdlast.1 30man/man1/rrdlast.1
27man/man1/rrdlastupdate.1 31man/man1/rrdlastupdate.1
28man/man1/rrdresize.1 32man/man1/rrdresize.1
29man/man1/rrdrestore.1 33man/man1/rrdrestore.1
30man/man1/rrdthreads.1 34man/man1/rrdthreads.1
31man/man1/rrdtool.1 35man/man1/rrdtool.1
32man/man1/rrdtune.1 36man/man1/rrdtune.1
33man/man1/rrdtutorial.1 37man/man1/rrdtutorial.1
34man/man1/rrdupdate.1 38man/man1/rrdupdate.1
35man/man1/rrdxport.1 39man/man1/rrdxport.1
 40man/man3/librrd.3
36share/doc/rrdtool-${PKGVERSION}/html/RRDp.html 41share/doc/rrdtool-${PKGVERSION}/html/RRDp.html
37share/doc/rrdtool-${PKGVERSION}/html/RRDs.html 42share/doc/rrdtool-${PKGVERSION}/html/RRDs.html
38share/doc/rrdtool-${PKGVERSION}/html/bin_dec_hex.html 43share/doc/rrdtool-${PKGVERSION}/html/bin_dec_hex.html
39share/doc/rrdtool-${PKGVERSION}/html/cdeftutorial.html 44share/doc/rrdtool-${PKGVERSION}/html/cdeftutorial.html
40share/doc/rrdtool-${PKGVERSION}/html/index.html 45share/doc/rrdtool-${PKGVERSION}/html/index.html
 46share/doc/rrdtool-${PKGVERSION}/html/librrd.html
41share/doc/rrdtool-${PKGVERSION}/html/rpntutorial.html 47share/doc/rrdtool-${PKGVERSION}/html/rpntutorial.html
42share/doc/rrdtool-${PKGVERSION}/html/rrd-beginners.html 48share/doc/rrdtool-${PKGVERSION}/html/rrd-beginners.html
43share/doc/rrdtool-${PKGVERSION}/html/rrdbuild.html 49share/doc/rrdtool-${PKGVERSION}/html/rrdbuild.html
 50share/doc/rrdtool-${PKGVERSION}/html/rrdcached.html
44share/doc/rrdtool-${PKGVERSION}/html/rrdcgi.html 51share/doc/rrdtool-${PKGVERSION}/html/rrdcgi.html
45share/doc/rrdtool-${PKGVERSION}/html/rrdcreate.html 52share/doc/rrdtool-${PKGVERSION}/html/rrdcreate.html
46share/doc/rrdtool-${PKGVERSION}/html/rrddump.html 53share/doc/rrdtool-${PKGVERSION}/html/rrddump.html
47share/doc/rrdtool-${PKGVERSION}/html/rrdfetch.html 54share/doc/rrdtool-${PKGVERSION}/html/rrdfetch.html
48share/doc/rrdtool-${PKGVERSION}/html/rrdfirst.html 55share/doc/rrdtool-${PKGVERSION}/html/rrdfirst.html
 56share/doc/rrdtool-${PKGVERSION}/html/rrdflushcached.html
49share/doc/rrdtool-${PKGVERSION}/html/rrdgraph.html 57share/doc/rrdtool-${PKGVERSION}/html/rrdgraph.html
50share/doc/rrdtool-${PKGVERSION}/html/rrdgraph_data.html 58share/doc/rrdtool-${PKGVERSION}/html/rrdgraph_data.html
51share/doc/rrdtool-${PKGVERSION}/html/rrdgraph_examples.html 59share/doc/rrdtool-${PKGVERSION}/html/rrdgraph_examples.html
52share/doc/rrdtool-${PKGVERSION}/html/rrdgraph_graph.html 60share/doc/rrdtool-${PKGVERSION}/html/rrdgraph_graph.html
53share/doc/rrdtool-${PKGVERSION}/html/rrdgraph_rpn.html 61share/doc/rrdtool-${PKGVERSION}/html/rrdgraph_rpn.html
54share/doc/rrdtool-${PKGVERSION}/html/rrdinfo.html 62share/doc/rrdtool-${PKGVERSION}/html/rrdinfo.html
55share/doc/rrdtool-${PKGVERSION}/html/rrdlast.html 63share/doc/rrdtool-${PKGVERSION}/html/rrdlast.html
56share/doc/rrdtool-${PKGVERSION}/html/rrdlastupdate.html 64share/doc/rrdtool-${PKGVERSION}/html/rrdlastupdate.html
57share/doc/rrdtool-${PKGVERSION}/html/rrdresize.html 65share/doc/rrdtool-${PKGVERSION}/html/rrdresize.html
58share/doc/rrdtool-${PKGVERSION}/html/rrdrestore.html 66share/doc/rrdtool-${PKGVERSION}/html/rrdrestore.html
59share/doc/rrdtool-${PKGVERSION}/html/rrdthreads.html 67share/doc/rrdtool-${PKGVERSION}/html/rrdthreads.html
60share/doc/rrdtool-${PKGVERSION}/html/rrdtool.html 68share/doc/rrdtool-${PKGVERSION}/html/rrdtool.html
61share/doc/rrdtool-${PKGVERSION}/html/rrdtune.html 69share/doc/rrdtool-${PKGVERSION}/html/rrdtune.html
62share/doc/rrdtool-${PKGVERSION}/html/rrdtutorial.html 70share/doc/rrdtool-${PKGVERSION}/html/rrdtutorial.html
63share/doc/rrdtool-${PKGVERSION}/html/rrdupdate.html 71share/doc/rrdtool-${PKGVERSION}/html/rrdupdate.html
64share/doc/rrdtool-${PKGVERSION}/html/rrdxport.html 72share/doc/rrdtool-${PKGVERSION}/html/rrdxport.html
65share/doc/rrdtool-${PKGVERSION}/txt/bin_dec_hex.pod 73share/doc/rrdtool-${PKGVERSION}/txt/bin_dec_hex.pod
66share/doc/rrdtool-${PKGVERSION}/txt/bin_dec_hex.txt 74share/doc/rrdtool-${PKGVERSION}/txt/bin_dec_hex.txt
67share/doc/rrdtool-${PKGVERSION}/txt/cdeftutorial.pod 75share/doc/rrdtool-${PKGVERSION}/txt/cdeftutorial.pod
68share/doc/rrdtool-${PKGVERSION}/txt/cdeftutorial.txt 76share/doc/rrdtool-${PKGVERSION}/txt/cdeftutorial.txt
 77share/doc/rrdtool-${PKGVERSION}/txt/librrd.txt
69share/doc/rrdtool-${PKGVERSION}/txt/rpntutorial.pod 78share/doc/rrdtool-${PKGVERSION}/txt/rpntutorial.pod
70share/doc/rrdtool-${PKGVERSION}/txt/rpntutorial.txt 79share/doc/rrdtool-${PKGVERSION}/txt/rpntutorial.txt
71share/doc/rrdtool-${PKGVERSION}/txt/rrd-beginners.pod 80share/doc/rrdtool-${PKGVERSION}/txt/rrd-beginners.pod
72share/doc/rrdtool-${PKGVERSION}/txt/rrd-beginners.txt 81share/doc/rrdtool-${PKGVERSION}/txt/rrd-beginners.txt
73share/doc/rrdtool-${PKGVERSION}/txt/rrdbuild.pod 82share/doc/rrdtool-${PKGVERSION}/txt/rrdbuild.pod
74share/doc/rrdtool-${PKGVERSION}/txt/rrdbuild.txt 83share/doc/rrdtool-${PKGVERSION}/txt/rrdbuild.txt
 84share/doc/rrdtool-${PKGVERSION}/txt/rrdcached.pod
 85share/doc/rrdtool-${PKGVERSION}/txt/rrdcached.txt
75share/doc/rrdtool-${PKGVERSION}/txt/rrdcgi.pod 86share/doc/rrdtool-${PKGVERSION}/txt/rrdcgi.pod
76share/doc/rrdtool-${PKGVERSION}/txt/rrdcgi.txt 87share/doc/rrdtool-${PKGVERSION}/txt/rrdcgi.txt
77share/doc/rrdtool-${PKGVERSION}/txt/rrdcreate.pod 88share/doc/rrdtool-${PKGVERSION}/txt/rrdcreate.pod
78share/doc/rrdtool-${PKGVERSION}/txt/rrdcreate.txt 89share/doc/rrdtool-${PKGVERSION}/txt/rrdcreate.txt
79share/doc/rrdtool-${PKGVERSION}/txt/rrddump.pod 90share/doc/rrdtool-${PKGVERSION}/txt/rrddump.pod
80share/doc/rrdtool-${PKGVERSION}/txt/rrddump.txt 91share/doc/rrdtool-${PKGVERSION}/txt/rrddump.txt
81share/doc/rrdtool-${PKGVERSION}/txt/rrdfetch.pod 92share/doc/rrdtool-${PKGVERSION}/txt/rrdfetch.pod
82share/doc/rrdtool-${PKGVERSION}/txt/rrdfetch.txt 93share/doc/rrdtool-${PKGVERSION}/txt/rrdfetch.txt
83share/doc/rrdtool-${PKGVERSION}/txt/rrdfirst.pod 94share/doc/rrdtool-${PKGVERSION}/txt/rrdfirst.pod
84share/doc/rrdtool-${PKGVERSION}/txt/rrdfirst.txt 95share/doc/rrdtool-${PKGVERSION}/txt/rrdfirst.txt
 96share/doc/rrdtool-${PKGVERSION}/txt/rrdflushcached.pod
 97share/doc/rrdtool-${PKGVERSION}/txt/rrdflushcached.txt
85share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph.pod 98share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph.pod
86share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph.txt 99share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph.txt
87share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_data.pod 100share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_data.pod
88share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_data.txt 101share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_data.txt
89share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_examples.pod 102share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_examples.pod
90share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_examples.txt 103share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_examples.txt
91share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_graph.pod 104share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_graph.pod
92share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_graph.txt 105share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_graph.txt
93share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_rpn.pod 106share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_rpn.pod
94share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_rpn.txt 107share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_rpn.txt
95share/doc/rrdtool-${PKGVERSION}/txt/rrdinfo.pod 108share/doc/rrdtool-${PKGVERSION}/txt/rrdinfo.pod
96share/doc/rrdtool-${PKGVERSION}/txt/rrdinfo.txt 109share/doc/rrdtool-${PKGVERSION}/txt/rrdinfo.txt
97share/doc/rrdtool-${PKGVERSION}/txt/rrdlast.pod 110share/doc/rrdtool-${PKGVERSION}/txt/rrdlast.pod
@@ -104,21 +117,23 @@ share/doc/rrdtool-${PKGVERSION}/txt/rrdr @@ -104,21 +117,23 @@ share/doc/rrdtool-${PKGVERSION}/txt/rrdr
104share/doc/rrdtool-${PKGVERSION}/txt/rrdrestore.txt 117share/doc/rrdtool-${PKGVERSION}/txt/rrdrestore.txt
105share/doc/rrdtool-${PKGVERSION}/txt/rrdthreads.pod 118share/doc/rrdtool-${PKGVERSION}/txt/rrdthreads.pod
106share/doc/rrdtool-${PKGVERSION}/txt/rrdthreads.txt 119share/doc/rrdtool-${PKGVERSION}/txt/rrdthreads.txt
107share/doc/rrdtool-${PKGVERSION}/txt/rrdtool.pod 120share/doc/rrdtool-${PKGVERSION}/txt/rrdtool.pod
108share/doc/rrdtool-${PKGVERSION}/txt/rrdtool.txt 121share/doc/rrdtool-${PKGVERSION}/txt/rrdtool.txt
109share/doc/rrdtool-${PKGVERSION}/txt/rrdtune.pod 122share/doc/rrdtool-${PKGVERSION}/txt/rrdtune.pod
110share/doc/rrdtool-${PKGVERSION}/txt/rrdtune.txt 123share/doc/rrdtool-${PKGVERSION}/txt/rrdtune.txt
111share/doc/rrdtool-${PKGVERSION}/txt/rrdtutorial.pod 124share/doc/rrdtool-${PKGVERSION}/txt/rrdtutorial.pod
112share/doc/rrdtool-${PKGVERSION}/txt/rrdtutorial.txt 125share/doc/rrdtool-${PKGVERSION}/txt/rrdtutorial.txt
113share/doc/rrdtool-${PKGVERSION}/txt/rrdupdate.pod 126share/doc/rrdtool-${PKGVERSION}/txt/rrdupdate.pod
114share/doc/rrdtool-${PKGVERSION}/txt/rrdupdate.txt 127share/doc/rrdtool-${PKGVERSION}/txt/rrdupdate.txt
115share/doc/rrdtool-${PKGVERSION}/txt/rrdxport.pod 128share/doc/rrdtool-${PKGVERSION}/txt/rrdxport.pod
116share/doc/rrdtool-${PKGVERSION}/txt/rrdxport.txt 129share/doc/rrdtool-${PKGVERSION}/txt/rrdxport.txt
 130share/examples/rrdcached/RRDCached.pm
 131share/examples/rrdcached/rrdcached-size.pl
117share/examples/rrdtool/4charts.pl 132share/examples/rrdtool/4charts.pl
118share/examples/rrdtool/bigtops.pl 133share/examples/rrdtool/bigtops.pl
119share/examples/rrdtool/cgi-demo.cgi 134share/examples/rrdtool/cgi-demo.cgi
120share/examples/rrdtool/minmax.pl 135share/examples/rrdtool/minmax.pl
121share/examples/rrdtool/perftest.pl 136share/examples/rrdtool/perftest.pl
122share/examples/rrdtool/piped-demo.pl 137share/examples/rrdtool/piped-demo.pl
123share/examples/rrdtool/shared-demo.pl 138share/examples/rrdtool/shared-demo.pl
124share/examples/rrdtool/stripes.pl 139share/examples/rrdtool/stripes.pl

cvs diff -r1.40 -r1.41 pkgsrc/databases/rrdtool/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/rrdtool/distinfo 2010/03/13 16:41:21 1.40
+++ pkgsrc/databases/rrdtool/distinfo 2010/07/06 07:31:20 1.41
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.40 2010/03/13 16:41:21 spz Exp $ 1$NetBSD: distinfo,v 1.41 2010/07/06 07:31:20 adam Exp $
2 2
3SHA1 (rrdtool-1.3.9.tar.gz) = 5c202810bdf5e5dda3f06079c7739993622c7e86 3SHA1 (rrdtool-1.4.4.tar.gz) = e4715c13f2a6fd077c54911d396eb573788377b0
4RMD160 (rrdtool-1.3.9.tar.gz) = 2b05c37a713cca3d15d92d1d9c5292c3cc4e0781 4RMD160 (rrdtool-1.4.4.tar.gz) = 7636c67af3e3b9ce2361cc2c3cab5a90a662a29a
5Size (rrdtool-1.3.9.tar.gz) = 1189442 bytes 5Size (rrdtool-1.4.4.tar.gz) = 1345477 bytes
6SHA1 (patch-al) = 5ff520a236abe66ee7daf8ac56274da52dd42172 6SHA1 (patch-al) = abc25497a10d59b1ad2e3a263f818eef89985538
7SHA1 (patch-az) = e6d55613b6041546223e89763633e7fa81bc029f 7SHA1 (patch-am) = 6c0a0890b1e8e2c1a186e2015c0cf5acd719b686
 8SHA1 (patch-az) = 9db879e7e74e7953b15afc46504cf9a65b9eb342

cvs diff -r1.16 -r1.17 pkgsrc/databases/rrdtool/patches/Attic/patch-al (expand / switch to unified diff)

--- pkgsrc/databases/rrdtool/patches/Attic/patch-al 2009/10/29 12:43:49 1.16
+++ pkgsrc/databases/rrdtool/patches/Attic/patch-al 2010/07/06 07:31:20 1.17
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-al,v 1.16 2009/10/29 12:43:49 martti Exp $ 1$NetBSD: patch-al,v 1.17 2010/07/06 07:31:20 adam Exp $
2 2
3Correct examples directory. 3Correct examples directory.
4 4
5--- examples/Makefile.in.orig 2009-10-24 13:47:13.000000000 +0300 5--- examples/Makefile.in.orig 2010-07-05 19:31:54.000000000 +0000
6+++ examples/Makefile.in 2009-10-29 14:35:23.000000000 +0200 6+++ examples/Makefile.in
7@@ -303,7 +303,7 @@ 7@@ -330,7 +330,7 @@ top_builddir = @top_builddir@
8 top_builddir = @top_builddir@ 
9 top_srcdir = @top_srcdir@ 8 top_srcdir = @top_srcdir@
 9 SUBDIRS = rrdcached
10 EXTRA_DIST = cgi-demo.cgi.in 10 EXTRA_DIST = cgi-demo.cgi.in
11-examplesdir = $(pkgdatadir)/examples 11-examplesdir = $(pkgdatadir)/examples
12+examplesdir = $(prefix)/share/examples/rrdtool 12+examplesdir = $(prefix)/share/examples/rrdtool
13 examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl \ 13 examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl \
14 stripes.pl bigtops.pl minmax.pl 4charts.pl perftest.pl 14 stripes.pl bigtops.pl minmax.pl 4charts.pl perftest.pl
15  15

cvs diff -r1.1 -r1.2 pkgsrc/databases/rrdtool/patches/Attic/patch-az (expand / switch to unified diff)

--- pkgsrc/databases/rrdtool/patches/Attic/patch-az 2010/03/13 16:41:21 1.1
+++ pkgsrc/databases/rrdtool/patches/Attic/patch-az 2010/07/06 07:31:20 1.2
@@ -1,29 +1,13 @@ @@ -1,29 +1,13 @@
1$NetBSD: patch-az,v 1.1 2010/03/13 16:41:21 spz Exp $ 1$NetBSD: patch-az,v 1.2 2010/07/06 07:31:20 adam Exp $
2 2
3--- src/rrd_restore.c.orig 2009-10-24 10:46:42.000000000 +0000 3--- src/rrd_daemon.c.orig 2010-07-06 07:12:11.000000000 +0000
4+++ src/rrd_restore.c 4+++ src/rrd_daemon.c
5@@ -966,10 +966,20 @@ static int parse_tag_rrd( 5@@ -109,7 +109,7 @@
6 else { if (sizeof(time_t) == sizeof(long long)) { 6 #include <libgen.h>
7 status = get_llong_from_node(doc, child, (long long *)&rrd->live_head->last_up); 7 #include <grp.h>
8 } 8
9- else { 9-#include <glib-2.0/glib.h>
10- rrd_set_error("can't convert to time_t ...", child->name); 10+#include <glib.h>
11- status = -1;  11 /* }}} */
12- } 12
13+ else if (sizeof(time_t) == sizeof(int)) { 13 #define RRDD_LOG(severity, ...) \
14+ long temp_last_up; 
15+ status = get_long_from_node(doc, child, &temp_last_up); 
16+ if (temp_last_up < INT_MAX) 
17+ rrd->live_head->last_up = temp_last_up; 
18+ else { 
19+ rrd_set_error("can't convert to time_t ...", child->name); 
20+ status = -1;  
21+ } 
22+ } 
23+ else { 
24+ rrd_set_error("can't convert to time_t ...", child->name); 
25+ status = -1;  
26+ } 
27 } 
28 } 
29 else if (xmlStrcmp(child->name, (const xmlChar *) "ds") == 0)