From 8126d917317ceaac75eb8c30a7f8dc33b7e1a3b4 Mon Sep 17 00:00:00 2001 From: wulf Date: Mon, 4 Jul 2005 22:53:39 +0000 Subject: Updated rrdtool to 1.2.10: Bug fix release --- databases/rrdtool/Makefile | 13 +++---------- databases/rrdtool/PLIST | 13 ++++++------- databases/rrdtool/distinfo | 13 +++++++------ databases/rrdtool/patches/patch-aj | 16 ++++++++-------- databases/rrdtool/patches/patch-al | 14 +++++++------- databases/rrdtool/patches/patch-at | 13 +++++++++++++ 6 files changed, 44 insertions(+), 38 deletions(-) create mode 100644 databases/rrdtool/patches/patch-at (limited to 'databases/rrdtool') diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile index 5eb2995744b..defbf1192e6 100644 --- a/databases/rrdtool/Makefile +++ b/databases/rrdtool/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.31 2005/07/03 15:23:33 wulf Exp $ +# $NetBSD: Makefile,v 1.32 2005/07/04 22:53:39 wulf Exp $ # -DISTNAME= rrdtool-1.2.9 +DISTNAME= rrdtool-1.2.10 CATEGORIES= databases graphics net MASTER_SITES= http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/pub/ -MAINTAINER= wulf@ping.net.au +MAINTAINER= wulf@NetBSD.org HOMEPAGE= http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/ COMMENT= Data analysis tool generating graphical representations @@ -23,13 +23,6 @@ PERL5_CONFIGURE= NO PERL5_PACKLIST+= ${PERL5_SITEARCH}/auto/RRDp/.packlist PERL5_PACKLIST+= ${PERL5_SITEARCH}/auto/RRDs/.packlist -#INSTALL_DIRS= ${WRKSRC} \ -# ${WRKSRC}/bindings/perl-piped \ -# ${WRKSRC}/bindings/perl-shared - -#post-extract: -# ${RM} ${WRKSRC}/bindings/perl-shared/ntmake.pl - .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" diff --git a/databases/rrdtool/PLIST b/databases/rrdtool/PLIST index 0cc9e9e8030..670bc8a0708 100644 --- a/databases/rrdtool/PLIST +++ b/databases/rrdtool/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2005/07/03 15:23:33 wulf Exp $ +@comment $NetBSD: PLIST,v 1.5 2005/07/04 22:53:39 wulf Exp $ bin/rrdcgi bin/rrdtool bin/rrdupdate @@ -30,7 +30,10 @@ man/man1/rrdtune.1 man/man1/rrdtutorial.1 man/man1/rrdupdate.1 man/man1/rrdxport.1 -share/rrdtool/fonts/DejaVuSansMono-Roman.ttf +share/doc/rrdtool/bin_dec_hex.pod +share/doc/rrdtool/bin_dec_hex.txt +share/doc/rrdtool/cdeftutorial.pod +share/doc/rrdtool/cdeftutorial.txt share/doc/rrdtool/html/RRDp.html share/doc/rrdtool/html/RRDs.html share/doc/rrdtool/html/bin_dec_hex.html @@ -58,10 +61,6 @@ share/doc/rrdtool/html/rrdtune.html share/doc/rrdtool/html/rrdtutorial.html share/doc/rrdtool/html/rrdupdate.html share/doc/rrdtool/html/rrdxport.html -share/doc/rrdtool/bin_dec_hex.pod -share/doc/rrdtool/bin_dec_hex.txt -share/doc/rrdtool/cdeftutorial.pod -share/doc/rrdtool/cdeftutorial.txt share/doc/rrdtool/rpntutorial.pod share/doc/rrdtool/rpntutorial.txt share/doc/rrdtool/rrd-beginners.pod @@ -115,9 +114,9 @@ share/examples/rrdtool/minmax.pl share/examples/rrdtool/piped-demo.pl share/examples/rrdtool/shared-demo.pl share/examples/rrdtool/stripes.pl +share/rrdtool/fonts/DejaVuSansMono-Roman.ttf @dirrm share/examples/rrdtool @dirrm share/rrdtool/fonts @dirrm share/rrdtool @dirrm share/doc/rrdtool/html @dirrm share/doc/rrdtool -@dirrm shared diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo index 9b10fbd6145..997b9850893 100644 --- a/databases/rrdtool/distinfo +++ b/databases/rrdtool/distinfo @@ -1,12 +1,13 @@ -$NetBSD: distinfo,v 1.12 2005/07/03 15:23:33 wulf Exp $ +$NetBSD: distinfo,v 1.13 2005/07/04 22:53:39 wulf Exp $ -SHA1 (rrdtool-1.2.9.tar.gz) = 281f4ce3adf322e8eee986ba201c3c2645877101 -RMD160 (rrdtool-1.2.9.tar.gz) = 048f21d30a0b78761da4bbca2a7305d8f8d0a35e -Size (rrdtool-1.2.9.tar.gz) = 901199 bytes -SHA1 (patch-aj) = 9390c7576c707779b3948150a587a0d3501959c5 -SHA1 (patch-al) = f3334c24eba97f3eacbbca51c56c5340f4e8b01a +SHA1 (rrdtool-1.2.10.tar.gz) = ebacf71a36e2d8d8fce4d95db6473e34e16b1fd0 +RMD160 (rrdtool-1.2.10.tar.gz) = dd938f78fa9f7385f5179a104dfc953936636dab +Size (rrdtool-1.2.10.tar.gz) = 1001508 bytes +SHA1 (patch-aj) = cdeea7176ddefb4c96c7fd115ee3972015ef4180 +SHA1 (patch-al) = e2d7c590b841e661e8306aa6156c6a067a654f29 SHA1 (patch-ap) = 8960b74dbaafdd9f37a5bbffc97f04fbe2ad9eca SHA1 (patch-as) = a3320a652f09b6f818903fcec997d3d559d36fa0 +SHA1 (patch-at) = 56c3c6eec319be6ae1320aaefa78da6cc2fc73a2 SHA1 (patch-av) = 2e2a626c8bbc78671ff7e834cb229f4a1b0c35c3 SHA1 (patch-aw) = ff19b160da8170117cc9a3567709efcd80e6984e SHA1 (patch-ay) = 30f2e1b3d7c720900da2168eb6874b1dcf6697f1 diff --git a/databases/rrdtool/patches/patch-aj b/databases/rrdtool/patches/patch-aj index bc5d6328294..d7308be329f 100644 --- a/databases/rrdtool/patches/patch-aj +++ b/databases/rrdtool/patches/patch-aj @@ -1,20 +1,20 @@ -$NetBSD: patch-aj,v 1.4 2005/07/03 15:23:34 wulf Exp $ +$NetBSD: patch-aj,v 1.5 2005/07/04 22:53:39 wulf Exp $ ---- doc/Makefile.in.orig 2005-05-28 22:33:22.000000000 +0930 -+++ doc/Makefile.in 2005-06-19 13:58:04.000000000 +0930 -@@ -228,9 +228,9 @@ +--- doc/Makefile.in.orig 2005-06-17 11:07:14.000000000 +0200 ++++ doc/Makefile.in +@@ -233,9 +233,9 @@ EXTRA_DIST = $(POD) $(HTML) $(MAN) $(TXT # some install rules if the install pat - DOCPREFIX := $(shell echo "@prefix@" | grep rrd >/dev/null && echo "rrdtool-@VERSION@/") --idocdir = $(prefix)/shared/doc/$(DOCPREFIX)txt + DOCPREFIX := $(shell echo "@prefix@" | grep rrd >/dev/null || echo "rrdtool-@VERSION@/") +-idocdir = $(prefix)/share/doc/$(DOCPREFIX)txt +idocdir = $(prefix)/share/doc/rrdtool idoc_DATA = $(POD) $(TXT) --ihtmldir = $(prefix)/shared/doc/$(DOCPREFIX)html +-ihtmldir = $(prefix)/share/doc/$(DOCPREFIX)html +ihtmldir = $(prefix)/share/doc/rrdtool/html ihtml_DATA = $(HTML) imandir = $(mandir)/man1 iman_DATA = $(MAN) -@@ -247,9 +247,9 @@ +@@ -252,9 +252,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 5fab8d90bad..5a85c3245cf 100644 --- a/databases/rrdtool/patches/patch-al +++ b/databases/rrdtool/patches/patch-al @@ -1,17 +1,17 @@ -$NetBSD: patch-al,v 1.4 2005/07/03 15:23:34 wulf Exp $ +$NetBSD: patch-al,v 1.5 2005/07/04 22:53:39 wulf Exp $ ---- examples/Makefile.in.orig 2005-05-28 22:33:22.000000000 +0930 -+++ examples/Makefile.in 2005-06-19 14:01:09.000000000 +0930 -@@ -207,7 +207,7 @@ - EXTRA_DIST = cgi-demo.cgi.in piped-demo.pl.in shared-demo.pl.in \ +--- examples/Makefile.in.orig 2005-06-17 11:07:15.000000000 +0200 ++++ examples/Makefile.in +@@ -213,7 +213,7 @@ EXTRA_DIST = cgi-demo.cgi.in piped-demo. stripes.pl.in bigtops.pl.in minmax.pl.in 4charts.pl.in --examplesdir = $(prefix)/examples + EXPREFIX := $(shell echo "@prefix@" | grep rrd >/dev/null || echo "rrdtool-@VERSION@/") +-examplesdir = $(prefix)/$(EXPREFIX)examples +examplesdir = $(prefix)/share/examples/rrdtool examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl \ stripes.pl bigtops.pl minmax.pl 4charts.pl -@@ -223,9 +223,9 @@ +@@ -229,9 +229,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi exit 1;; \ esac; \ done; \ diff --git a/databases/rrdtool/patches/patch-at b/databases/rrdtool/patches/patch-at new file mode 100644 index 00000000000..1b863692923 --- /dev/null +++ b/databases/rrdtool/patches/patch-at @@ -0,0 +1,13 @@ +$NetBSD: patch-at,v 1.6 2005/07/04 22:53:39 wulf Exp $ + +--- src/rrd_graph.c.orig 2005-07-05 09:33:44.000000000 +0930 ++++ src/rrd_graph.c 2005-07-05 09:54:16.000000000 +0930 +@@ -3150,7 +3150,7 @@ + + if(sscanf(optarg, + "%10[A-Z]:%lf:%1000s", +- prop,&size,font) == 3){ ++ prop,&size,font) >= 2){ + int sindex,propidx; + if((sindex=text_prop_conv(prop)) != -1){ + for (propidx=sindex;propidx