[pkgsrc/trunk]: pkgsrc/databases/rrdtool Updated rrdtool to 1.2.11: Minor bug...

[wulf <wulf%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0b9117ce1453
branches:  trunk
changeset: 497528:0b9117ce1453
user:      wulf <wulf%pkgsrc.org@localhost>
date:      Sat Jul 30 06:53:15 2005 +0000

description:
Updated rrdtool to 1.2.11: Minor bug fix release

Added --enable-perl-site-install configuration argument relevant to PR30719

diffstat:

 databases/rrdtool/Makefile         |    8 +-
 databases/rrdtool/PLIST            |  161 ++++++++++++++++++------------------
 databases/rrdtool/distinfo         |   15 +-
 databases/rrdtool/patches/patch-aj |   20 +---
 databases/rrdtool/patches/patch-al |   24 +----
 databases/rrdtool/patches/patch-at |   13 --
 databases/rrdtool/patches/patch-aw |   12 +-
 7 files changed, 109 insertions(+), 144 deletions(-)

diffs (truncated from 346 to 300 lines):

diff -r 8c3c25e48b06 -r 0b9117ce1453 databases/rrdtool/Makefile
--- a/databases/rrdtool/Makefile        Sat Jul 30 00:38:56 2005 +0000
+++ b/databases/rrdtool/Makefile        Sat Jul 30 06:53:15 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2005/07/21 16:29:46 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2005/07/30 06:53:15 wulf Exp $
 #
 
-DISTNAME=      rrdtool-1.2.10
+DISTNAME=      rrdtool-1.2.11
 CATEGORIES=    databases graphics net
 MASTER_SITES=  http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/pub/
 
@@ -18,12 +18,14 @@
 GNU_CONFIGURE=         yes
 PTHREAD_OPTS+=         require
 
-CONFIGURE_ARGS= --enable-shared
+CONFIGURE_ARGS= --enable-shared --enable-perl-site-install
 
 PERL5_CONFIGURE=       NO
 PERL5_PACKLIST+=       auto/RRDp/.packlist
 PERL5_PACKLIST+=       auto/RRDs/.packlist
 
+RRDDOCDIR=             ${PREFIX}/share/doc/rrdtool
+
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
diff -r 8c3c25e48b06 -r 0b9117ce1453 databases/rrdtool/PLIST
--- a/databases/rrdtool/PLIST   Sat Jul 30 00:38:56 2005 +0000
+++ b/databases/rrdtool/PLIST   Sat Jul 30 06:53:15 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/07/04 22:53:39 wulf Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/07/30 06:53:15 wulf Exp $
 bin/rrdcgi
 bin/rrdtool
 bin/rrdupdate
@@ -30,83 +30,83 @@
 man/man1/rrdtutorial.1
 man/man1/rrdupdate.1
 man/man1/rrdxport.1
-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
-share/doc/rrdtool/html/cdeftutorial.html
-share/doc/rrdtool/html/rpntutorial.html
-share/doc/rrdtool/html/rrd-beginners.html
-share/doc/rrdtool/html/rrdbuild.html
-share/doc/rrdtool/html/rrdcgi.html
-share/doc/rrdtool/html/rrdcreate.html
-share/doc/rrdtool/html/rrddump.html
-share/doc/rrdtool/html/rrdfetch.html
-share/doc/rrdtool/html/rrdfirst.html
-share/doc/rrdtool/html/rrdgraph.html
-share/doc/rrdtool/html/rrdgraph_data.html
-share/doc/rrdtool/html/rrdgraph_examples.html
-share/doc/rrdtool/html/rrdgraph_graph.html
-share/doc/rrdtool/html/rrdgraph_rpn.html
-share/doc/rrdtool/html/rrdinfo.html
-share/doc/rrdtool/html/rrdlast.html
-share/doc/rrdtool/html/rrdresize.html
-share/doc/rrdtool/html/rrdrestore.html
-share/doc/rrdtool/html/rrdthreads.html
-share/doc/rrdtool/html/rrdtool.html
-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/rpntutorial.pod
-share/doc/rrdtool/rpntutorial.txt
-share/doc/rrdtool/rrd-beginners.pod
-share/doc/rrdtool/rrd-beginners.txt
-share/doc/rrdtool/rrdbuild.pod
-share/doc/rrdtool/rrdbuild.txt
-share/doc/rrdtool/rrdcgi.pod
-share/doc/rrdtool/rrdcgi.txt
-share/doc/rrdtool/rrdcreate.pod
-share/doc/rrdtool/rrdcreate.txt
-share/doc/rrdtool/rrddump.pod
-share/doc/rrdtool/rrddump.txt
-share/doc/rrdtool/rrdfetch.pod
-share/doc/rrdtool/rrdfetch.txt
-share/doc/rrdtool/rrdfirst.pod
-share/doc/rrdtool/rrdfirst.txt
-share/doc/rrdtool/rrdgraph.pod
-share/doc/rrdtool/rrdgraph.txt
-share/doc/rrdtool/rrdgraph_data.pod
-share/doc/rrdtool/rrdgraph_data.txt
-share/doc/rrdtool/rrdgraph_examples.pod
-share/doc/rrdtool/rrdgraph_examples.txt
-share/doc/rrdtool/rrdgraph_graph.pod
-share/doc/rrdtool/rrdgraph_graph.txt
-share/doc/rrdtool/rrdgraph_rpn.pod
-share/doc/rrdtool/rrdgraph_rpn.txt
-share/doc/rrdtool/rrdinfo.pod
-share/doc/rrdtool/rrdinfo.txt
-share/doc/rrdtool/rrdlast.pod
-share/doc/rrdtool/rrdlast.txt
-share/doc/rrdtool/rrdresize.pod
-share/doc/rrdtool/rrdresize.txt
-share/doc/rrdtool/rrdrestore.pod
-share/doc/rrdtool/rrdrestore.txt
-share/doc/rrdtool/rrdthreads.pod
-share/doc/rrdtool/rrdthreads.txt
-share/doc/rrdtool/rrdtool.pod
-share/doc/rrdtool/rrdtool.txt
-share/doc/rrdtool/rrdtune.pod
-share/doc/rrdtool/rrdtune.txt
-share/doc/rrdtool/rrdtutorial.pod
-share/doc/rrdtool/rrdtutorial.txt
-share/doc/rrdtool/rrdupdate.pod
-share/doc/rrdtool/rrdupdate.txt
-share/doc/rrdtool/rrdxport.pod
-share/doc/rrdtool/rrdxport.txt
+share/doc/rrdtool-1.2.11/html/RRDp.html
+share/doc/rrdtool-1.2.11/html/RRDs.html
+share/doc/rrdtool-1.2.11/html/bin_dec_hex.html
+share/doc/rrdtool-1.2.11/html/cdeftutorial.html
+share/doc/rrdtool-1.2.11/html/rpntutorial.html
+share/doc/rrdtool-1.2.11/html/rrd-beginners.html
+share/doc/rrdtool-1.2.11/html/rrdbuild.html
+share/doc/rrdtool-1.2.11/html/rrdcgi.html
+share/doc/rrdtool-1.2.11/html/rrdcreate.html
+share/doc/rrdtool-1.2.11/html/rrddump.html
+share/doc/rrdtool-1.2.11/html/rrdfetch.html
+share/doc/rrdtool-1.2.11/html/rrdfirst.html
+share/doc/rrdtool-1.2.11/html/rrdgraph.html
+share/doc/rrdtool-1.2.11/html/rrdgraph_data.html
+share/doc/rrdtool-1.2.11/html/rrdgraph_examples.html
+share/doc/rrdtool-1.2.11/html/rrdgraph_graph.html
+share/doc/rrdtool-1.2.11/html/rrdgraph_rpn.html
+share/doc/rrdtool-1.2.11/html/rrdinfo.html
+share/doc/rrdtool-1.2.11/html/rrdlast.html
+share/doc/rrdtool-1.2.11/html/rrdresize.html
+share/doc/rrdtool-1.2.11/html/rrdrestore.html
+share/doc/rrdtool-1.2.11/html/rrdthreads.html
+share/doc/rrdtool-1.2.11/html/rrdtool.html
+share/doc/rrdtool-1.2.11/html/rrdtune.html
+share/doc/rrdtool-1.2.11/html/rrdtutorial.html
+share/doc/rrdtool-1.2.11/html/rrdupdate.html
+share/doc/rrdtool-1.2.11/html/rrdxport.html
+share/doc/rrdtool-1.2.11/txt/bin_dec_hex.pod
+share/doc/rrdtool-1.2.11/txt/bin_dec_hex.txt
+share/doc/rrdtool-1.2.11/txt/cdeftutorial.pod
+share/doc/rrdtool-1.2.11/txt/cdeftutorial.txt
+share/doc/rrdtool-1.2.11/txt/rpntutorial.pod
+share/doc/rrdtool-1.2.11/txt/rpntutorial.txt
+share/doc/rrdtool-1.2.11/txt/rrd-beginners.pod
+share/doc/rrdtool-1.2.11/txt/rrd-beginners.txt
+share/doc/rrdtool-1.2.11/txt/rrdbuild.pod
+share/doc/rrdtool-1.2.11/txt/rrdbuild.txt
+share/doc/rrdtool-1.2.11/txt/rrdcgi.pod
+share/doc/rrdtool-1.2.11/txt/rrdcgi.txt
+share/doc/rrdtool-1.2.11/txt/rrdcreate.pod
+share/doc/rrdtool-1.2.11/txt/rrdcreate.txt
+share/doc/rrdtool-1.2.11/txt/rrddump.pod
+share/doc/rrdtool-1.2.11/txt/rrddump.txt
+share/doc/rrdtool-1.2.11/txt/rrdfetch.pod
+share/doc/rrdtool-1.2.11/txt/rrdfetch.txt
+share/doc/rrdtool-1.2.11/txt/rrdfirst.pod
+share/doc/rrdtool-1.2.11/txt/rrdfirst.txt
+share/doc/rrdtool-1.2.11/txt/rrdgraph.pod
+share/doc/rrdtool-1.2.11/txt/rrdgraph.txt
+share/doc/rrdtool-1.2.11/txt/rrdgraph_data.pod
+share/doc/rrdtool-1.2.11/txt/rrdgraph_data.txt
+share/doc/rrdtool-1.2.11/txt/rrdgraph_examples.pod
+share/doc/rrdtool-1.2.11/txt/rrdgraph_examples.txt
+share/doc/rrdtool-1.2.11/txt/rrdgraph_graph.pod
+share/doc/rrdtool-1.2.11/txt/rrdgraph_graph.txt
+share/doc/rrdtool-1.2.11/txt/rrdgraph_rpn.pod
+share/doc/rrdtool-1.2.11/txt/rrdgraph_rpn.txt
+share/doc/rrdtool-1.2.11/txt/rrdinfo.pod
+share/doc/rrdtool-1.2.11/txt/rrdinfo.txt
+share/doc/rrdtool-1.2.11/txt/rrdlast.pod
+share/doc/rrdtool-1.2.11/txt/rrdlast.txt
+share/doc/rrdtool-1.2.11/txt/rrdresize.pod
+share/doc/rrdtool-1.2.11/txt/rrdresize.txt
+share/doc/rrdtool-1.2.11/txt/rrdrestore.pod
+share/doc/rrdtool-1.2.11/txt/rrdrestore.txt
+share/doc/rrdtool-1.2.11/txt/rrdthreads.pod
+share/doc/rrdtool-1.2.11/txt/rrdthreads.txt
+share/doc/rrdtool-1.2.11/txt/rrdtool.pod
+share/doc/rrdtool-1.2.11/txt/rrdtool.txt
+share/doc/rrdtool-1.2.11/txt/rrdtune.pod
+share/doc/rrdtool-1.2.11/txt/rrdtune.txt
+share/doc/rrdtool-1.2.11/txt/rrdtutorial.pod
+share/doc/rrdtool-1.2.11/txt/rrdtutorial.txt
+share/doc/rrdtool-1.2.11/txt/rrdupdate.pod
+share/doc/rrdtool-1.2.11/txt/rrdupdate.txt
+share/doc/rrdtool-1.2.11/txt/rrdxport.pod
+share/doc/rrdtool-1.2.11/txt/rrdxport.txt
 share/examples/rrdtool/4charts.pl
 share/examples/rrdtool/bigtops.pl
 share/examples/rrdtool/cgi-demo.cgi
@@ -118,5 +118,6 @@
 @dirrm share/examples/rrdtool
 @dirrm share/rrdtool/fonts
 @dirrm share/rrdtool
-@dirrm share/doc/rrdtool/html
-@dirrm share/doc/rrdtool
+@dirrm share/doc/rrdtool-1.2.11/html
+@dirrm share/doc/rrdtool-1.2.11/txt
+@dirrm share/doc/rrdtool-1.2.11
diff -r 8c3c25e48b06 -r 0b9117ce1453 databases/rrdtool/distinfo
--- a/databases/rrdtool/distinfo        Sat Jul 30 00:38:56 2005 +0000
+++ b/databases/rrdtool/distinfo        Sat Jul 30 06:53:15 2005 +0000
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.13 2005/07/04 22:53:39 wulf Exp $
+$NetBSD: distinfo,v 1.14 2005/07/30 06:53:15 wulf Exp $
 
-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 (rrdtool-1.2.11.tar.gz) = 2aa33cbc857318679db03c0b8b42dc1ab18e4d4f
+RMD160 (rrdtool-1.2.11.tar.gz) = f294c3dd0e8597d0be23e2aa317774bd626695a6
+Size (rrdtool-1.2.11.tar.gz) = 1003339 bytes
+SHA1 (patch-aj) = d6f7ab6ac0e13ae3da0b04e1402f19b9d3b7c5e5
+SHA1 (patch-al) = b703252461e8ac8f4e7d422404fbd3c6f30c3032
 SHA1 (patch-ap) = 8960b74dbaafdd9f37a5bbffc97f04fbe2ad9eca
 SHA1 (patch-as) = a3320a652f09b6f818903fcec997d3d559d36fa0
-SHA1 (patch-at) = 56c3c6eec319be6ae1320aaefa78da6cc2fc73a2
 SHA1 (patch-av) = 2e2a626c8bbc78671ff7e834cb229f4a1b0c35c3
-SHA1 (patch-aw) = ff19b160da8170117cc9a3567709efcd80e6984e
+SHA1 (patch-aw) = 39e942734bc3ce56323f816996210513b08f325b
 SHA1 (patch-ay) = 30f2e1b3d7c720900da2168eb6874b1dcf6697f1
diff -r 8c3c25e48b06 -r 0b9117ce1453 databases/rrdtool/patches/patch-aj
--- a/databases/rrdtool/patches/patch-aj        Sat Jul 30 00:38:56 2005 +0000
+++ b/databases/rrdtool/patches/patch-aj        Sat Jul 30 06:53:15 2005 +0000
@@ -1,20 +1,8 @@
-$NetBSD: patch-aj,v 1.5 2005/07/04 22:53:39 wulf Exp $
+$NetBSD: patch-aj,v 1.6 2005/07/30 06:53:15 wulf Exp $
 
---- 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)/share/doc/$(DOCPREFIX)txt
-+idocdir = $(prefix)/share/doc/rrdtool
- idoc_DATA = $(POD) $(TXT)
--ihtmldir = $(prefix)/share/doc/$(DOCPREFIX)html
-+ihtmldir = $(prefix)/share/doc/rrdtool/html
- ihtml_DATA = $(HTML)
- imandir = $(mandir)/man1
- iman_DATA = $(MAN)
-@@ -252,9 +252,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefi
+--- doc/Makefile.in.orig       2005-07-25 23:44:49.000000000 +0930
++++ doc/Makefile.in    2005-07-29 14:29:16.000000000 +0930
+@@ -254,9 +254,9 @@
              exit 1;; \
          esac; \
        done; \
diff -r 8c3c25e48b06 -r 0b9117ce1453 databases/rrdtool/patches/patch-al
--- a/databases/rrdtool/patches/patch-al        Sat Jul 30 00:38:56 2005 +0000
+++ b/databases/rrdtool/patches/patch-al        Sat Jul 30 06:53:15 2005 +0000
@@ -1,25 +1,13 @@
-$NetBSD: patch-al,v 1.5 2005/07/04 22:53:39 wulf Exp $
+$NetBSD: patch-al,v 1.6 2005/07/30 06:53:15 wulf Exp $
 
---- 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.
+--- examples/Makefile.in.orig  2005-07-25 23:44:50.000000000 +0930
++++ examples/Makefile.in       2005-07-31 01:05:26.000000000 +0930
+@@ -217,7 +217,7 @@
+ EXTRA_DIST = cgi-demo.cgi.in piped-demo.pl.in shared-demo.pl.in \
        stripes.pl.in bigtops.pl.in minmax.pl.in 4charts.pl.in
  
- EXPREFIX := $(shell echo "@prefix@" | grep rrd >/dev/null || echo "rrdtool-@VERSION@/")
--examplesdir = $(prefix)/$(EXPREFIX)examples
+-examplesdir = $(pkgdatadir)/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
  
-@@ -229,9 +229,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefi
-             exit 1;; \
-         esac; \
-       done; \
--      echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  examples/Makefile'; \
-+      echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  examples/Makefile'; \
-       cd $(top_srcdir) && \
--        $(AUTOMAKE) --gnu  examples/Makefile
-+        $(AUTOMAKE) --foreign  examples/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-       @case '$?' in \
diff -r 8c3c25e48b06 -r 0b9117ce1453 databases/rrdtool/patches/patch-at
--- a/databases/rrdtool/patches/patch-at        Sat Jul 30 00:38:56 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-at,v 1.6 2005/07/04 22:53:39 wulf Exp $