[Orca-checkins] r381 - in trunk/orca: . packages/rrdtool-1.0.46 packages/rrdtool-1.0.49 packages/rrdtool-1.0.49/cgilib-0.4 packages/rrdtool-1.0.49/config packages/rrdtool-1.0.49/contrib packages/rrdtool-1.0.49/contrib/add_ds packages/rrdtool-1.0.49/contrib/php3 packages/rrdtool-1.0.49/contrib/php3/CVS packages/rrdtool-1.0.49/contrib/php4 packages/rrdtool-1.0.49/contrib/rrdexplorer packages/rrdtool-1.0.49/contrib/rrdfetchnames packages/rrdtool-1.0.49/contrib/rrdlastds packages/rrdtool-1.0.49/doc packages/rrdtool-1.0.49/examples packages/rrdtool-1.0.49/gd1.3 packages/rrdtool-1.0.49/libpng-1.0.9 packages/rrdtool-1.0.49/perl-piped packages/rrdtool-1.0.49/perl-shared packages/rrdtool-1.0.49/src packages/rrdtool-1.0.49/tcl packages/rrdtool-1.0.49/zlib-1.1.4

Blair Zajac blair at orcaware.com
Sat Aug 21 12:05:15 PDT 2004


Author: blair
Date: Sat Aug 21 11:59:00 2004
New Revision: 381

Added:
   trunk/orca/packages/rrdtool-1.0.49/
      - copied from r379, trunk/orca/packages/rrdtool-1.0.46/
   trunk/orca/packages/rrdtool-1.0.49/CHANGES
      - copied, changed from r380, trunk/orca/packages/rrdtool-1.0.46/CHANGES
   trunk/orca/packages/rrdtool-1.0.49/CONTRIBUTORS
      - copied, changed from r380, trunk/orca/packages/rrdtool-1.0.46/CONTRIBUTORS
   trunk/orca/packages/rrdtool-1.0.49/COPYING
      - copied unchanged from r380, trunk/orca/packages/rrdtool-1.0.46/COPYING
   trunk/orca/packages/rrdtool-1.0.49/COPYRIGHT
      - copied unchanged from r380, trunk/orca/packages/rrdtool-1.0.46/COPYRIGHT
   trunk/orca/packages/rrdtool-1.0.49/Makefile.am
      - copied, changed from r380, trunk/orca/packages/rrdtool-1.0.46/Makefile.am
   trunk/orca/packages/rrdtool-1.0.49/Makefile.in
      - copied, changed from r380, trunk/orca/packages/rrdtool-1.0.46/Makefile.in
   trunk/orca/packages/rrdtool-1.0.49/NT-BUILD-TIPS.txt
      - copied unchanged from r380, trunk/orca/packages/rrdtool-1.0.46/NT-BUILD-TIPS.txt
   trunk/orca/packages/rrdtool-1.0.49/README
      - copied unchanged from r380, trunk/orca/packages/rrdtool-1.0.46/README
   trunk/orca/packages/rrdtool-1.0.49/TODO
      - copied unchanged from r380, trunk/orca/packages/rrdtool-1.0.46/TODO
   trunk/orca/packages/rrdtool-1.0.49/aclocal.m4
      - copied unchanged from r380, trunk/orca/packages/rrdtool-1.0.46/aclocal.m4
   trunk/orca/packages/rrdtool-1.0.49/cgilib-0.4/
      - copied from r380, trunk/orca/packages/rrdtool-1.0.46/cgilib-0.4/
   trunk/orca/packages/rrdtool-1.0.49/config/
      - copied from r380, trunk/orca/packages/rrdtool-1.0.46/config/
   trunk/orca/packages/rrdtool-1.0.49/config.h.in
      - copied unchanged from r380, trunk/orca/packages/rrdtool-1.0.46/config.h.in
   trunk/orca/packages/rrdtool-1.0.49/configure
      - copied, changed from r380, trunk/orca/packages/rrdtool-1.0.46/configure
   trunk/orca/packages/rrdtool-1.0.49/configure.ac
      - copied, changed from r380, trunk/orca/packages/rrdtool-1.0.46/configure.ac
   trunk/orca/packages/rrdtool-1.0.49/contrib/
      - copied from r380, trunk/orca/packages/rrdtool-1.0.46/contrib/
   trunk/orca/packages/rrdtool-1.0.49/contrib/php3/Makefile
   trunk/orca/packages/rrdtool-1.0.49/contrib/php4/Makefile.in
   trunk/orca/packages/rrdtool-1.0.49/doc/
      - copied from r380, trunk/orca/packages/rrdtool-1.0.46/doc/
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdtool-dump.dtd
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdtool-xport.dtd
   trunk/orca/packages/rrdtool-1.0.49/examples/
      - copied from r380, trunk/orca/packages/rrdtool-1.0.46/examples/
   trunk/orca/packages/rrdtool-1.0.49/gd1.3/
      - copied from r380, trunk/orca/packages/rrdtool-1.0.46/gd1.3/
   trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/
      - copied from r380, trunk/orca/packages/rrdtool-1.0.46/libpng-1.0.9/
   trunk/orca/packages/rrdtool-1.0.49/perl-piped/
      - copied from r380, trunk/orca/packages/rrdtool-1.0.46/perl-piped/
   trunk/orca/packages/rrdtool-1.0.49/perl-shared/
      - copied from r380, trunk/orca/packages/rrdtool-1.0.46/perl-shared/
   trunk/orca/packages/rrdtool-1.0.49/rrdtool.spec
      - copied, changed from r380, trunk/orca/packages/rrdtool-1.0.46/rrdtool.spec
   trunk/orca/packages/rrdtool-1.0.49/src/
      - copied from r380, trunk/orca/packages/rrdtool-1.0.46/src/
   trunk/orca/packages/rrdtool-1.0.49/tcl/
      - copied from r380, trunk/orca/packages/rrdtool-1.0.46/tcl/
   trunk/orca/packages/rrdtool-1.0.49/zlib-1.1.4/
      - copied from r380, trunk/orca/packages/rrdtool-1.0.46/zlib-1.1.4/
Removed:
   trunk/orca/packages/rrdtool-1.0.46/
Modified:
   trunk/orca/INSTALL
   trunk/orca/configure.in
   trunk/orca/packages/rrdtool-1.0.49/contrib/add_ds/batch.pl
   trunk/orca/packages/rrdtool-1.0.49/contrib/php3/CVS/Entries
   trunk/orca/packages/rrdtool-1.0.49/contrib/rrdexplorer/png.cgi
   trunk/orca/packages/rrdtool-1.0.49/contrib/rrdfetchnames/rrdfetchnames.pl
   trunk/orca/packages/rrdtool-1.0.49/contrib/rrdlastds/rrdlastds.pl
   trunk/orca/packages/rrdtool-1.0.49/doc/Makefile.am
   trunk/orca/packages/rrdtool-1.0.49/doc/Makefile.in
   trunk/orca/packages/rrdtool-1.0.49/doc/RRDp.html
   trunk/orca/packages/rrdtool-1.0.49/doc/RRDp.txt
   trunk/orca/packages/rrdtool-1.0.49/doc/RRDs.html
   trunk/orca/packages/rrdtool-1.0.49/doc/RRDs.txt
   trunk/orca/packages/rrdtool-1.0.49/doc/bin_dec_hex.txt
   trunk/orca/packages/rrdtool-1.0.49/doc/cdeftutorial.html
   trunk/orca/packages/rrdtool-1.0.49/doc/cdeftutorial.pod
   trunk/orca/packages/rrdtool-1.0.49/doc/cdeftutorial.txt
   trunk/orca/packages/rrdtool-1.0.49/doc/rpntutorial.txt
   trunk/orca/packages/rrdtool-1.0.49/doc/rrd-beginners.html
   trunk/orca/packages/rrdtool-1.0.49/doc/rrd-beginners.txt
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdcgi.html
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdcgi.txt
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdcreate.html
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdcreate.pod
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdcreate.txt
   trunk/orca/packages/rrdtool-1.0.49/doc/rrddump.html
   trunk/orca/packages/rrdtool-1.0.49/doc/rrddump.pod
   trunk/orca/packages/rrdtool-1.0.49/doc/rrddump.txt
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdfetch.html
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdfetch.pod
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdfetch.txt
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdgraph.html
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdgraph.pod
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdgraph.txt
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdinfo.html
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdinfo.pod
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdinfo.txt
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdlast.html
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdlast.pod
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdlast.txt
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdresize.html
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdresize.pod
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdresize.txt
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdrestore.html
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdrestore.pod
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdrestore.txt
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdtool.txt
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdtune.html
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdtune.pod
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdtune.txt
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdtutorial.es.html
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdtutorial.es.txt
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdtutorial.html
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdtutorial.pod
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdtutorial.txt
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdupdate.html
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdupdate.pod
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdupdate.txt
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdxport.html
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdxport.pod
   trunk/orca/packages/rrdtool-1.0.49/doc/rrdxport.txt
   trunk/orca/packages/rrdtool-1.0.49/gd1.3/gdlucidab12l2.c
   trunk/orca/packages/rrdtool-1.0.49/gd1.3/gdlucidab12l2.h
   trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/png.h
   trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngconf.h
   trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngerror.c
   trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngpread.c
   trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngread.c
   trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngrtran.c
   trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngrutil.c
   trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngset.c
   trunk/orca/packages/rrdtool-1.0.49/perl-piped/RRDp.pm
   trunk/orca/packages/rrdtool-1.0.49/perl-shared/Makefile.PL.in
   trunk/orca/packages/rrdtool-1.0.49/perl-shared/RRDs.pm
   trunk/orca/packages/rrdtool-1.0.49/perl-shared/RRDs.xs
   trunk/orca/packages/rrdtool-1.0.49/src/Makefile.am
   trunk/orca/packages/rrdtool-1.0.49/src/Makefile.in
   trunk/orca/packages/rrdtool-1.0.49/src/gdpng.c
   trunk/orca/packages/rrdtool-1.0.49/src/gifsize.c
   trunk/orca/packages/rrdtool-1.0.49/src/parsetime.c
   trunk/orca/packages/rrdtool-1.0.49/src/pngsize.c
   trunk/orca/packages/rrdtool-1.0.49/src/rrd.h
   trunk/orca/packages/rrdtool-1.0.49/src/rrd_cgi.c
   trunk/orca/packages/rrdtool-1.0.49/src/rrd_create.c
   trunk/orca/packages/rrdtool-1.0.49/src/rrd_diff.c
   trunk/orca/packages/rrdtool-1.0.49/src/rrd_dump.c
   trunk/orca/packages/rrdtool-1.0.49/src/rrd_error.c
   trunk/orca/packages/rrdtool-1.0.49/src/rrd_fetch.c
   trunk/orca/packages/rrdtool-1.0.49/src/rrd_format.c
   trunk/orca/packages/rrdtool-1.0.49/src/rrd_format.h
   trunk/orca/packages/rrdtool-1.0.49/src/rrd_graph.c
   trunk/orca/packages/rrdtool-1.0.49/src/rrd_graph.h
   trunk/orca/packages/rrdtool-1.0.49/src/rrd_info.c
   trunk/orca/packages/rrdtool-1.0.49/src/rrd_last.c
   trunk/orca/packages/rrdtool-1.0.49/src/rrd_open.c
   trunk/orca/packages/rrdtool-1.0.49/src/rrd_resize.c
   trunk/orca/packages/rrdtool-1.0.49/src/rrd_restore.c
   trunk/orca/packages/rrdtool-1.0.49/src/rrd_tool.c
   trunk/orca/packages/rrdtool-1.0.49/src/rrd_tool.h
   trunk/orca/packages/rrdtool-1.0.49/src/rrd_tune.c
   trunk/orca/packages/rrdtool-1.0.49/src/rrd_update.c
   trunk/orca/packages/rrdtool-1.0.49/src/rrd_xport.c
   trunk/orca/packages/rrdtool-1.0.49/src/rrd_xport.h
   trunk/orca/packages/rrdtool-1.0.49/tcl/Makefile.am
   trunk/orca/packages/rrdtool-1.0.49/tcl/Makefile.in
Log:
Update rrdtool from 1.0.46 to 1.0.49.

* configure.in:
  Bump the required RRDs Perl VERSION number from 1.000461 to 1.000491
  and update the directory to find rrdtool in from rrdtool-1.0.46 to
  rrdtool-1.0.49.

* INSTALL (Determine which Perl modules need compiling and installing):
  Bump the required RRDs Perl VERSION number from 1.000461 to 1.000491
  and update the RRDs package version from 1.0.46 to 1.0.49.

* packages/rrdtool-1.0.49:
  Renamed from packages/rrdtool-1.0.46.  Directory contents updated
  from rrdtool-1.0.49.tar.gz.


Modified: trunk/orca/INSTALL
==============================================================================
--- trunk/orca/INSTALL	(original)
+++ trunk/orca/INSTALL	Sat Aug 21 11:59:00 2004
@@ -175,7 +175,7 @@
     Devel::DProf            Not required by Orca        19990108
     Digest::MD5             >= 2.33        >= 2.33      2.33
     Math::IntervalSearch    >= 1.05        >= 1.05      1.05
-    RRDs                    >= 1.000461    >= 1.0.46    1.0.46
+    RRDs                    >= 1.000491    >= 1.0.49    1.0.49
     Storable                >= 2.13        >= 2.13      2.13
     Time::HiRes             Not required by Orca        1.59
     version                 >= 0.41        >= 0.41      0.41

Modified: trunk/orca/configure.in
==============================================================================
--- trunk/orca/configure.in	(original)
+++ trunk/orca/configure.in	Sat Aug 21 11:59:00 2004
@@ -37,8 +37,8 @@
 DIGEST_MD5_VER=2.33
 MATH_INTERVALSEARCH_DIR=Math-Interpolate-1.05
 MATH_INTERVALSEARCH_VER=1.05
-RRDTOOL_DIR=rrdtool-1.0.46
-RRDTOOL_VER=1.000461
+RRDTOOL_DIR=rrdtool-1.0.49
+RRDTOOL_VER=1.000491
 STORABLE_DIR=Storable-2.13
 STORABLE_VER=2.13
 TIME_HIRES_DIR=Time-HiRes-1.59

Copied: trunk/orca/packages/rrdtool-1.0.49/CHANGES (from r380, trunk/orca/packages/rrdtool-1.0.46/CHANGES)
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/CHANGES	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/CHANGES	Sat Aug 21 11:59:00 2004
@@ -2,6 +2,93 @@
 ---------------------------
 - bugfix, + enhancement, * contrib, = RELEASE
 ---------------------------------------------
+= 1.0.49 2004/08/08 -- Tobi
+
+- 2004/08/08 --  Tobi
+  * applied all outstanding patches to libpng 1.0.9
+
+- 2004/07/23 --  Blair Zajac <blair at orcaware.com>
+  * make it compile without perl
+
+- 2004/07/16 -- Krzysztof Kotlenga <pocek at polbrokers.dyndns.org>
+  * fix lucida compiled in font to be realy bold
+
+- 2004/07/14 -- Arend-Jan Wijtzes <ajwytzes at wise-guys.nl>
+  * fixed rrdcgi issues with evaluation tags inside arguments
+
++ 2004/05/25 -- Wolfgang Schrimm <wolfgang{dot}schrimm{at}urz{dot}uni-heidelberg{dot}de>
+  * dtd files for dump and xport xml files
+
++ 2004/05/25 -- Mike Schilli <b2b at perlmeister.com>
+  * added dump and restore support to persbindings
+
++ 2004/05/25 -- Tobi
+  * added example to rrdtool dump from debian patch ... 
+
+- 2004/05/09 -- Lars Thegler <lars at thegler.dk> (and Blair Zajac)
+  * make RRD.xs compile with old perls
+
+- 2004/05/08 -- Tobi
+  * missed : in getopt for -X causing segfault
+
+- 2004/04/24 -- Milan Obuch <milan.obuch at bluegrass.sk>
+  * better layout when printing data from rrdtool
+
+
+
+= 1.0.48 2004/04/06 -- Tobi
+
+- 2004/04/05 -- Thomas M. Payerle <payerle at benfranklin.physics.umd.edu>
+  * tcl makefile was broken again ... (tobi does not use tcl)
+
+- 2004/04/05 -- Tobi
+  * allow icon size up to 64pixels
+
+- 2004/04/05 -- Gustavo Badauy <gustavo.badauy at unear.net>
+  improve compilability on windows
+
+= 1.0.47 2004/04/04 -- Tobi
+
++ 2004/04/04 -- Gabor Gombas <gombasg at sztaki.hu>
+  added stdout flushing to rrdexplorer.cgi
+
++ 2004/04/04 -- Piotr Kodzis <Piotr.Kodzis at inteligo.pl>
+  --only-graph option for rrdtool graph
+
++ 2004/04/04 -- Antoine Delvaux <antoine(dot)delvaux(at)belnet(dot)be>
+  --force-rules-legend option to force drawing of [HV]RULE legends
+
+- 2004/03/23 -- "Girod, Laurent" <Laurent.Girod at pmintl.com>
+  open file in binary for writing in restore ... (unbreak things on windows)
+
+- 2004/03/11 -- Milan Obuch <milan.obuch at bluegrass.sk>
+  fixes to perl-shared to find config.h propperly  
+
+- 2004/03/09 -- Michael Boman <mboman at gentoo.org>
+  fixed tcl building even more
+
+- 2004/02/18 -- Dominik Loniewski <D.Loniewski at itl.waw.pl>
+  fixed tcl building some more
+
+- 2003/01/19 -- David L. Barker <dave at ncomtech.com>
+  Fixed xport crash when processing different size variable sets
+  Ensured that xport output variables are in the row with the correct timestamp
+  Removed unused allocated array srcptr_list[]
+
+- 2004/01/17 - Gerhard Strangar <g.s at arcor.de>
+  fixed pod files to allow indexing with solaris windexer
+
++ 2003/11/02 - Christophe Kalt <kalt at taranis.org>
+  addition of RRDs::times()
+
+- 2004/01/12 -- paul_murphy at non.agilent.com
+  fix for tcl makefile
+
+- 2004/01/11 -- Milan Obuch <milan.obuch at bluegrass.sk>
+  improved mrtg alt scale
+  improved ascii output spacing in rrdtool cli (port from FreeBSD)
+  fixed error in month parsing in parsetime (port from FreeBSD)
+
 = 1.0.46 2004/01/04 -- Tobi
 
 + 2004/01/01 -- Tobi
@@ -223,7 +310,7 @@
 - 2002/04/29 -- Alex
   * fix for PRINT template parser in rrd_graph ...
 
-- 2002/04/16 -- Milan Obuch <milan.obuch at in.nextra.sk>
+- 2002/04/16 -- Milan Obuch <milan.obuch at bluegrass.sk>
   * fix for --alt-mrtg
 
 + 2002/05/01 Wolfgang Schrimm <Wolfgang.Schrimm at urz.uni-heidelberg.de>
@@ -236,7 +323,7 @@
 
 = 1.0.36 2002/04/13 -- Tobi
 
-+ 2002/04/13 -- Milan Obuch <milan.obuch at in.nextra.sk>
++ 2002/04/13 -- Milan Obuch <milan.obuch at bluegrass.sk>
   * added new options to rrdgraph. Check the manpage for
     --overlay, --background, --unit, GD (graph output format)
 

Copied: trunk/orca/packages/rrdtool-1.0.49/CONTRIBUTORS (from r380, trunk/orca/packages/rrdtool-1.0.46/CONTRIBUTORS)
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/CONTRIBUTORS	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/CONTRIBUTORS	Sat Aug 21 11:59:00 2004
@@ -54,10 +54,11 @@
 	Bruce Campbell <bruce.campbell at apnic.net>
 	Sean Summers <sean at Fenstermaker.com> (RPM .spec)
 	Christophe Van Ginneken <Christophe.VanGinneken at ubizen.com> (--no-legend)
-        Milan Obuch <milan.obuch at in.nextra.sk> background unit GD overlay --y-alt-mrtg
+        Milan Obuch <milan.obuch at bluegrass.sk> background unit GD overlay --y-alt-mrtg
 	Wolfgang Schrimm <wschrimm at uni-hd.de> xport function
         Travis Brown <tebrown at csh.rit.edu>
         Lee Thompson <bm55b at yahoo.com> --enable-local-libpng, --enable-local-zlib
+        David L. Barker <dave at ncomtech.com> xport function bug fixes
 
 Documentation
 

Copied: trunk/orca/packages/rrdtool-1.0.49/Makefile.am (from r380, trunk/orca/packages/rrdtool-1.0.46/Makefile.am)
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/Makefile.am	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/Makefile.am	Sat Aug 21 11:59:00 2004
@@ -34,12 +34,20 @@
 # the special call to install-sh is because the -d switch is not portable
 # mac os X has its perl module in bundles so it seems
 install-data-local:
-	$(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
-	$(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
-	$(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
-	$(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
-	test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
-	test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
+	@if test "x$(PERL)" != "xno"; then \
+	  echo "$(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \
+	  $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \
+	  echo "$(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl"; \
+	  $(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl; \
+	  echo "$(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl"; \
+	  $(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl; \
+	  echo "$(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \
+	  $(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \
+	  echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true"; \
+	  test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true; \
+	  echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true"; \
+	  test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true; \
+	fi
 
 
 # use relaxed rules when building dists
@@ -123,8 +131,7 @@
 	
 to-scp: to-dist
 	cp CHANGES  archive/$(PACKAGE)-$(VERSION).tar.gz /home/oetiker/public_html/webtools/rrdtool/pub/
-	(cd /home/oetiker/public_html/webtools/rrdtool/pub; rm $(PACKAGE).tar.gz; ln -s $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE).tar.gz;gmd5sum $(PACKAGE)-$(VERSION).tar.gz >$(PACKAGE)-$(VERSION).tar.gz.md5; pgps  $(PACKAGE)-$(VERSION).tar.gz.md5)
-
+	(cd /home/oetiker/public_html/webtools/rrdtool/pub; rm $(PACKAGE).tar.gz; ln -s $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE).tar.gz;gmd5sum $(PACKAGE)-$(VERSION).tar.gz >$(PACKAGE)-$(VERSION).tar.gz.md5; pgps  $(PACKAGE)-$(VERSION).tar.gz.md5; chmod 644 $(PACKAGE)-$(VERSION).tar.gz* )
 #	$(RSYNC) CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz tobi at ipn.caida.org:/ipn/web/Tools/RRDtool/pub/
 
 site-perl-inst: site-perl-install

Copied: trunk/orca/packages/rrdtool-1.0.49/Makefile.in (from r380, trunk/orca/packages/rrdtool-1.0.46/Makefile.in)
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/Makefile.in	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/Makefile.in	Sat Aug 21 11:59:00 2004
@@ -634,12 +634,20 @@
 # the special call to install-sh is because the -d switch is not portable
 # mac os X has its perl module in bundles so it seems
 install-data-local:
-	$(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
-	$(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
-	$(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
-	$(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
-	test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
-	test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
+	@if test "x$(PERL)" != "xno"; then \
+	  echo "$(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \
+	  $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \
+	  echo "$(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl"; \
+	  $(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl; \
+	  echo "$(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl"; \
+	  $(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl; \
+	  echo "$(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \
+	  $(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \
+	  echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true"; \
+	  test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true; \
+	  echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true"; \
+	  test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true; \
+	fi
 
 # rules for building the perl module
 
@@ -713,8 +721,7 @@
 
 to-scp: to-dist
 	cp CHANGES  archive/$(PACKAGE)-$(VERSION).tar.gz /home/oetiker/public_html/webtools/rrdtool/pub/
-	(cd /home/oetiker/public_html/webtools/rrdtool/pub; rm $(PACKAGE).tar.gz; ln -s $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE).tar.gz;gmd5sum $(PACKAGE)-$(VERSION).tar.gz >$(PACKAGE)-$(VERSION).tar.gz.md5; pgps  $(PACKAGE)-$(VERSION).tar.gz.md5)
-
+	(cd /home/oetiker/public_html/webtools/rrdtool/pub; rm $(PACKAGE).tar.gz; ln -s $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE).tar.gz;gmd5sum $(PACKAGE)-$(VERSION).tar.gz >$(PACKAGE)-$(VERSION).tar.gz.md5; pgps  $(PACKAGE)-$(VERSION).tar.gz.md5; chmod 644 $(PACKAGE)-$(VERSION).tar.gz* )
 #	$(RSYNC) CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz tobi at ipn.caida.org:/ipn/web/Tools/RRDtool/pub/
 
 site-perl-inst: site-perl-install

Copied: trunk/orca/packages/rrdtool-1.0.49/configure (from r380, trunk/orca/packages/rrdtool-1.0.46/configure)
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/configure	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/configure	Sat Aug 21 11:59:00 2004
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.58.
+# Generated by GNU Autoconf 2.58 for rrdtool 1.0.49.
 #
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
@@ -419,14 +419,14 @@
 : ${ac_max_here_lines=38}
 
 # Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
+PACKAGE_NAME='rrdtool'
+PACKAGE_TARNAME='rrdtool'
+PACKAGE_VERSION='1.0.49'
+PACKAGE_STRING='rrdtool 1.0.49'
+PACKAGE_BUGREPORT=''
 
 ac_unique_file="src/rrd_tool.c"
-ac_default_prefix=/usr/local/rrdtool-1.0.46
+ac_default_prefix=/usr/local/rrdtool-1.0.49
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -953,7 +953,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures rrdtool 1.0.49 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1019,7 +1019,9 @@
 fi
 
 if test -n "$ac_init_help"; then
-
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of rrdtool 1.0.49:";;
+   esac
   cat <<\_ACEOF
 
 Optional Features:
@@ -1159,6 +1161,8 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
+rrdtool configure 1.0.49
+generated by GNU Autoconf 2.58
 
 Copyright (C) 2003 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -1171,7 +1175,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by $as_me, which was
+It was created by rrdtool $as_me 1.0.49, which was
 generated by GNU Autoconf 2.58.  Invocation command line was
 
   $ $0 $@
@@ -1501,6 +1505,14 @@
 
 
 
+
+
+
+
+
+
+
+
 ac_aux_dir=
 for ac_dir in config $srcdir/config; do
   if test -f $ac_dir/install-sh; then
@@ -1859,8 +1871,8 @@
 
 
 # Define the identity of the package.
- PACKAGE=rrdtool
- VERSION=1.0.46
+ PACKAGE='rrdtool'
+ VERSION='1.0.49'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1989,7 +2001,6 @@
 
 
 
-
           ac_config_headers="$ac_config_headers config.h"
 
 
@@ -3665,7 +3676,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3668 "configure"' > conftest.$ac_ext
+  echo '#line 3679 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4422,9 +4433,9 @@
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     (
       cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
+## ---------------------------------- ##
+## Report this to the rrdtool lists.  ##
+## ---------------------------------- ##
 _ASBOX
     ) |
       sed "s/^/$as_me: WARNING:     /" >&2
@@ -5230,7 +5241,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:5233:" \
+echo "$as_me:5244:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6257,11 +6268,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6260: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6271: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6264: \$? = $ac_status" >&5
+   echo "$as_me:6275: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6489,11 +6500,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6492: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6503: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6496: \$? = $ac_status" >&5
+   echo "$as_me:6507: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6556,11 +6567,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6559: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6570: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6563: \$? = $ac_status" >&5
+   echo "$as_me:6574: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8674,7 +8685,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8677 "configure"
+#line 8688 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8772,7 +8783,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8775 "configure"
+#line 8786 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10924,11 +10935,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10927: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10938: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10931: \$? = $ac_status" >&5
+   echo "$as_me:10942: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -10991,11 +11002,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10994: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11005: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10998: \$? = $ac_status" >&5
+   echo "$as_me:11009: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12320,7 +12331,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12323 "configure"
+#line 12334 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12418,7 +12429,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12421 "configure"
+#line 12432 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13240,11 +13251,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13243: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13254: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13247: \$? = $ac_status" >&5
+   echo "$as_me:13258: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -13307,11 +13318,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13310: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13321: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13314: \$? = $ac_status" >&5
+   echo "$as_me:13325: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15269,11 +15280,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15272: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15283: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15276: \$? = $ac_status" >&5
+   echo "$as_me:15287: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15501,11 +15512,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15504: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15515: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15508: \$? = $ac_status" >&5
+   echo "$as_me:15519: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15568,11 +15579,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15571: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15582: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15575: \$? = $ac_status" >&5
+   echo "$as_me:15586: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17686,7 +17697,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17689 "configure"
+#line 17700 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17784,7 +17795,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17787 "configure"
+#line 17798 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -20371,9 +20382,9 @@
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     (
       cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
+## ---------------------------------- ##
+## Report this to the rrdtool lists.  ##
+## ---------------------------------- ##
 _ASBOX
     ) |
       sed "s/^/$as_me: WARNING:     /" >&2
@@ -23692,7 +23703,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by $as_me, which was
+This file was extended by rrdtool $as_me 1.0.49, which was
 generated by GNU Autoconf 2.58.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23755,7 +23766,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-config.status
+rrdtool config.status 1.0.49
 configured by $0, generated by GNU Autoconf 2.58,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

Copied: trunk/orca/packages/rrdtool-1.0.49/configure.ac (from r380, trunk/orca/packages/rrdtool-1.0.46/configure.ac)
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/configure.ac	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/configure.ac	Sat Aug 21 11:59:00 2004
@@ -13,7 +13,7 @@
 unset CDPATH
 
 dnl make sure we are being executed in the right place
-AC_INIT
+AC_INIT(rrdtool, 1.0.49)
 AC_CONFIG_SRCDIR([src/rrd_tool.c])
 
 dnl all our local stuff like install scripts and include files
@@ -24,11 +24,10 @@
 AC_CANONICAL_TARGET([])
 
 dnl tell automake the this script is for rrdtool
-AM_INIT_AUTOMAKE(rrdtool, 1.0.46)
-AC_SUBST(VERSION)
+AM_INIT_AUTOMAKE
 
 dnl where we install our stuff ...
-AC_PREFIX_DEFAULT( /usr/local/rrdtool-1.0.46 )
+AC_PREFIX_DEFAULT( /usr/local/rrdtool-1.0.49 )
 
 dnl tell automake which file to use as config header
 AC_CONFIG_HEADERS([config.h])

Modified: trunk/orca/packages/rrdtool-1.0.49/contrib/add_ds/batch.pl
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/contrib/add_ds/batch.pl	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/contrib/add_ds/batch.pl	Sat Aug 21 11:59:00 2004
@@ -43,7 +43,7 @@
 ########### USER CONFIGURABLE SECTION #######################
 
 my $newdir = "xml";
-my $rrdtool = "/usr/local/rrdtool-1.0.46/bin/rrdtool";
+my $rrdtool = "/scratch/oetiker/rrd/bin/rrdtool";
 my $add_ds = "./add_ds.pl";  # path to add_ds.pl script
 
 ########### END CONFIGURE SECTION ###########################

Modified: trunk/orca/packages/rrdtool-1.0.49/contrib/php3/CVS/Entries
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/contrib/php3/CVS/Entries	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/contrib/php3/CVS/Entries	Sat Aug 21 11:59:00 2004
@@ -1,8 +1,8 @@
 /INSTALL/1.1.1.1/Tue Feb 26 10:21:19 2002//
-/Makefile/1.1.1.1/Tue Feb 26 10:21:19 2002//
 /README/1.1.1.1/Tue Feb 26 10:21:19 2002//
 /USAGE/1.1.1.1/Tue Feb 26 10:21:19 2002//
 /VERSION/1.1.1.1/Tue Feb 26 10:21:19 2002//
 /php3_rrdtool.c/1.1.1.1/Tue Feb 26 10:21:19 2002//
 /php3_rrdtool.h/1.1.1.1/Tue Feb 26 10:21:19 2002//
 D/examples////
+/Makefile/1.1.1.1/Fri Jan 23 23:28:32 2004//

Added: trunk/orca/packages/rrdtool-1.0.49/contrib/php3/Makefile
==============================================================================
--- (empty file)
+++ trunk/orca/packages/rrdtool-1.0.49/contrib/php3/Makefile	Sat Aug 21 11:59:00 2004
@@ -0,0 +1,72 @@
+# code by Joey Miller <joeym at inficad.com>
+#
+#
+# BEFORE COMPILING YOU MUST SET THE VARIABLES BELOW
+# TO INDICATE THE CORRECT DIRECTORIES!!!!!!!!!!!!!!!!!!!!!
+#
+#
+# USE AT YOUR OWN RISK!
+#
+
+## begin configurable vars
+
+## PHPINCLUDE -- the directory where php is untarred
+##
+PHPINCLUDE =  -I/usr/home/joeym/apache_build/php-3.0.14
+
+## PHPLIBS -- the directory where you can find some of the PHP objects
+## and compiled libs (the directory where php is untarred, and
+## has already been compiled!
+##
+PHPLIBS    =  /usr/home/joeym/apache_build/php-3.0.14
+
+## RRDINCLUDE, GDINCLUDE -- where to find some of the header
+## files needed by rrdtool and it's libs
+##
+RRDINCLUDE =  -I/usr/home/joeym/newshit/rrdtool-1.0.10/src
+GDINCLUDE  =  -I/usr/home/joeym/newshit/rrdtool-1.0.10/gd1.3
+
+## RRDLIB -- where to find librrd.a (usually /usr/local/rrdtool-1.0.10/lib)
+RRDLIB	   =	/usr/local/rrdtool-1.0.10/lib
+
+#
+# if php is compiled as an apache module
+#
+APACHEINC = -I/var/www/include
+
+
+
+###### end primary config vars  .. change the vars below only
+###### if you need to
+######
+
+
+
+
+CFLAGS	= -O -fpic
+CC	= gcc
+
+CXX	= g++
+CXXFLAGS= $(CFLAGS)
+
+LD	= cc
+LDFLAGS	= -shared
+
+RM	= /bin/rm
+
+OBJS    =  php3_rrdtool.o
+CFLAGS	:= $(CFLAGS) -I../lib $(PHPINCLUDE) $(APACHEINC) $(RRDINCLUDE) $(GDINCLUDE)
+CXXFLAGS:= $(CXXFLAGS) -I../lib $(PHPINCLUDE) $(APACHEINC) $(RRDINCLUDE) $(GDINCLUDE)
+LIBS	:= -L$(RRDLIB) -L$(PHPLIBS) -lrrd 
+
+all: php3_rrdtool.so
+
+php3_rrdtool.so: $(OBJS)
+	$(LD) $(LDFLAGS) $(OBJS) -o $@ $(LIBS)
+
+clean:
+	$(RM) *.o
+	$(RM) *.so
+	
+veryclean: clean
+	$(RM) *~

Added: trunk/orca/packages/rrdtool-1.0.49/contrib/php4/Makefile.in
==============================================================================
--- (empty file)
+++ trunk/orca/packages/rrdtool-1.0.49/contrib/php4/Makefile.in	Sat Aug 21 11:59:00 2004
@@ -0,0 +1,6 @@
+LTLIBRARY_NAME    = librrdtool.la
+LTLIBRARY_SOURCES = rrdtool.c
+LTLIBRARY_SHARED_NAME = rrdtool.la
+LTLIBRARY_SHARED_LIBADD = $(RRDTOOL_SHARED_LIBADD)
+
+include $(top_srcdir)/build/dynlib.mk

Modified: trunk/orca/packages/rrdtool-1.0.49/contrib/rrdexplorer/png.cgi
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/contrib/rrdexplorer/png.cgi	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/contrib/rrdexplorer/png.cgi	Sat Aug 21 11:59:00 2004
@@ -30,6 +30,7 @@
 print "Content-type: image/png\n"; # Use html
 print "Cache-Control: no-cache\n"; # Ensure no cashing of page
 print "Expires: $expiredate\n\n"; # Expire now
+$| = 1;
 
 $root = $ENV{"DOCUMENT_ROOT"};
 # see rrdfetchnames

Modified: trunk/orca/packages/rrdtool-1.0.49/contrib/rrdfetchnames/rrdfetchnames.pl
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/contrib/rrdfetchnames/rrdfetchnames.pl	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/contrib/rrdfetchnames/rrdfetchnames.pl	Sat Aug 21 11:59:00 2004
@@ -6,7 +6,7 @@
 use lib qw( ../../perl-shared/blib/lib ../../perl-shared/blib/arch );
 
 #makes programm work AFTER install
-use lib qw( /usr/local/rrdtool-1.0.46/lib/perl ../lib/perl );
+use lib qw( /scratch/oetiker/rrd/lib/perl ../lib/perl );
 
 use vars qw(@ISA $loaded);
 

Modified: trunk/orca/packages/rrdtool-1.0.49/contrib/rrdlastds/rrdlastds.pl
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/contrib/rrdlastds/rrdlastds.pl	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/contrib/rrdlastds/rrdlastds.pl	Sat Aug 21 11:59:00 2004
@@ -13,7 +13,7 @@
 #makes things work when run without install
 use lib qw( ../../perl-shared/blib/lib ../../perl-shared/blib/arch );
 # this is for after install
-use lib qw( /usr/local/rrdtool-1.0.46/lib/perl ../lib/perl );
+use lib qw( /scratch/oetiker/rrd/lib/perl ../lib/perl );
 
 use RRDs;
 

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/Makefile.am
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/Makefile.am	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/Makefile.am	Sat Aug 21 11:59:00 2004
@@ -22,20 +22,20 @@
 PDF = $(MAN:.1=.pdf)
 
 # what should go into the distribution
-EXTRA_DIST= $(POD) $(HTML) $(TXT)
+EXTRA_DIST= $(POD) $(HTML) $(TXT) rrdtool-dump.dtd   rrdtool-xport.dtd  
 
 # some install rules
 idocdir = $(prefix)/doc
 idoc_DATA = $(POD) $(TXT)
 ihtmldir = $(prefix)/html
 ihtml_DATA = $(HTML)
-imandir = $(prefix)/man/man1
+imandir = $(mandir)/man1
 iman_DATA = $(MAN)
 
 all-local: link txt man html
 
 .pod.1 .pm.1 .pl.1:
-	pod2man --release=$(VERSION) --center=rrdtool $<  > $@
+	pod2man --release=$(VERSION) --center=RRDtool $<  > $@
 
 .1.txt:
 	@NROFF@ -man -Tlp $< > $@ || echo @NROFF@ failed > $@

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/Makefile.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/Makefile.in	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/Makefile.in	Sat Aug 21 11:59:00 2004
@@ -184,14 +184,14 @@
 PDF = $(MAN:.1=.pdf)
 
 # what should go into the distribution
-EXTRA_DIST = $(POD) $(HTML) $(TXT)
+EXTRA_DIST = $(POD) $(HTML) $(TXT) rrdtool-dump.dtd   rrdtool-xport.dtd  
 
 # some install rules
 idocdir = $(prefix)/doc
 idoc_DATA = $(POD) $(TXT)
 ihtmldir = $(prefix)/html
 ihtml_DATA = $(HTML)
-imandir = $(prefix)/man/man1
+imandir = $(mandir)/man1
 iman_DATA = $(MAN)
 subdir = doc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -404,7 +404,7 @@
 all-local: link txt man html
 
 .pod.1 .pm.1 .pl.1:
-	pod2man --release=$(VERSION) --center=rrdtool $<  > $@
+	pod2man --release=$(VERSION) --center=RRDtool $<  > $@
 
 .1.txt:
 	@NROFF@ -man -Tlp $< > $@ || echo @NROFF@ failed > $@

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/RRDp.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/RRDp.html	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/RRDp.html	Sat Aug 21 11:59:00 2004
@@ -55,20 +55,20 @@
 Load the RRDp::pipe module.
 </dd>
 <p></p>
-<dt><strong><a name="item_rrdp%3a%3astart_path_to_rrdtool_executable"><strong>RRDp::start</strong> <em>path to rrdtool executable</em></a></strong><br />
+<dt><strong><a name="item_rrdp_3a_3astart_path_to_rrdtool_executable"><strong>RRDp::start</strong> <em>path to rrdtool executable</em></a></strong><br />
 </dt>
 <dd>
 start rrdtool. The argument must be the path to the rrdtool executable
 </dd>
 <p></p>
-<dt><strong><a name="item_rrdp%3a%3acmd_rrdtool_commandline"><strong>RRDp::cmd</strong> <em>rrdtool commandline</em></a></strong><br />
+<dt><strong><a name="item_rrdp_3a_3acmd_rrdtool_commandline"><strong>RRDp::cmd</strong> <em>rrdtool commandline</em></a></strong><br />
 </dt>
 <dd>
 pass commands on to rrdtool. check the rrdtool documentation for
 more info on the rrdtool commands.
 </dd>
 <p></p>
-<dt><strong><a name="item_%24answer_%3d_rrdp%3a%3aread">$answer = <strong>RRDp::read</strong></a></strong><br />
+<dt><strong><a name="item__24answer__3d_rrdp_3a_3aread">$answer = <strong>RRDp::read</strong></a></strong><br />
 </dt>
 <dd>
 read rrdtools response to your command. Note that the $answer variable will
@@ -79,13 +79,13 @@
 the variable.
 </dd>
 <p></p>
-<dt><strong><a name="item_%24status_%3d_rrdp%3a%3aend">$status = <strong>RRDp::end</strong></a></strong><br />
+<dt><strong><a name="item__24status__3d_rrdp_3a_3aend">$status = <strong>RRDp::end</strong></a></strong><br />
 </dt>
 <dd>
 terminates rrdtool and returns rrdtools status ...
 </dd>
 <p></p>
-<dt><strong><a name="item_%24rrdp%3a%3auser%2c_%24rrdp%3a%3asys%2c_%24rrdp%3"><strong>$RRDp::user</strong>,  <strong>$RRDp::sys</strong>, <strong>$RRDp::real</strong></a></strong><br />
+<dt><strong><a name="item__24rrdp_3a_3auser_2c__24rrdp_3a_3asys_2c__24rrdp_3"><strong>$RRDp::user</strong>,  <strong>$RRDp::sys</strong>, <strong>$RRDp::real</strong></a></strong><br />
 </dt>
 <dd>
 these variables will contain totals of the user time, system time and

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/RRDp.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/RRDp.txt	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/RRDp.txt	Sat Aug 21 11:59:00 2004
@@ -1,4 +1,4 @@
-RRDp(3)                      rrdtool                      RRDp(3)
+RRDp(3)                      RRDtool                      RRDp(3)
 
 
 
@@ -89,4 +89,4 @@
 
 
 
-1.0.46                      2004-01-04                    RRDp(3)
+1.0.49                      2004-08-08                    RRDp(3)

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/RRDs.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/RRDs.html	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/RRDs.html	Sat Aug 21 11:59:00 2004
@@ -46,7 +46,8 @@
   RRDs::update ...
   RRDs::graph ...
   RRDs::fetch ...
-  RRDs::tune ...</pre>
+  RRDs::tune ...
+  RRDs::times(start, end)</pre>
 <p>
 </p>
 <hr />
@@ -66,6 +67,10 @@
 <pre>
  --template=in:out</pre>
 <p>is also valid.</p>
+<p>The RRDs::times function takes two parameters:  a ``start'' and ``end'' time.
+These should be specified in the <strong>AT-STYLE TIME SPECIFICATION</strong> format
+used by rrdtool.  See the <strong>rrdfetch</strong> documentation for a detailed
+explanation on how to specify time.</p>
 <p>
 </p>
 <h2><a name="error_handling">Error Handling</a></h2>
@@ -82,8 +87,8 @@
 <p>
 </p>
 <h2><a name="return_values">Return Values</a></h2>
-<p>The functions RRDs::last, RRDs::graph, RRDs::info and RRDs::fetch return their
-findings.</p>
+<p>The functions RRDs::last, RRDs::graph, RRDs::info, RRDs::fetch and RRDs::times
+return their findings.</p>
 <p><strong>RRDs::last</strong> returns a single INTEGER representing the last update time.</p>
 <pre>
  $lastupdate = RRDs::last ...</pre>
@@ -119,6 +124,8 @@
     }
     print &quot;\n&quot;;
   }</pre>
+<p><strong>RRDs::times</strong> returns two integers which are the number of seconds since
+epoch (1970-01-01) for the supplied ``start'' and ``end'' arguments, respectively.</p>
 <p>See the examples directory for more ways to use this extension.</p>
 <p>
 </p>

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/RRDs.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/RRDs.txt	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/RRDs.txt	Sat Aug 21 11:59:00 2004
@@ -1,4 +1,4 @@
-RRDs(3)                      rrdtool                      RRDs(3)
+RRDs(3)                      RRDtool                      RRDs(3)
 
 
 
@@ -15,6 +15,7 @@
          RRDs::graph ...
          RRDs::fetch ...
          RRDs::tune ...
+         RRDs::times(start, end)
 
 DDEESSCCRRIIPPTTIIOONN
        CCaalllliinngg SSeeqquueennccee
@@ -36,6 +37,12 @@
 
        is also valid.
 
+       The RRDs::times function takes two parameters:  a "start"
+       and "end" time.  These should be specified in the AATT--SSTTYYLLEE
+       TTIIMMEE SSPPEECCIIFFIICCAATTIIOONN format used by rrdtool.  See the rrrrdd--
+       ffeettcchh documentation for a detailed explanation on how to
+       specify time.
+
        EErrrroorr HHaannddlliinngg
 
        The RRD functions will not abort your program even when
@@ -53,8 +60,8 @@
 
        RReettuurrnn VVaalluueess
 
-       The functions RRDs::last, RRDs::graph, RRDs::info and
-       RRDs::fetch return their findings.
+       The functions RRDs::last, RRDs::graph, RRDs::info,
+       RRDs::fetch and RRDs::times return their findings.
 
        RRRRDDss::::llaasstt returns a single INTEGER representing the last
        update time.
@@ -97,6 +104,10 @@
            print "\n";
          }
 
+       RRRRDDss::::ttiimmeess returns two integers which are the number of
+       seconds since epoch (1970-01-01) for the supplied "start"
+       and "end" arguments, respectively.
+
        See the examples directory for more ways to use this
        extension.
 
@@ -115,4 +126,4 @@
 
 
 
-1.0.46                      2004-01-04                    RRDs(3)
+1.0.49                      2004-08-08                    RRDs(3)

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/bin_dec_hex.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/bin_dec_hex.txt	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/bin_dec_hex.txt	Sat Aug 21 11:59:00 2004
@@ -1,4 +1,4 @@
-BIN_DEC_HEX(1)               rrdtool               BIN_DEC_HEX(1)
+BIN_DEC_HEX(1)               RRDtool               BIN_DEC_HEX(1)
 
 
 
@@ -411,4 +411,4 @@
 
 
 
-1.0.46                      2002-02-26             BIN_DEC_HEX(1)
+1.0.49                      2004-01-17             BIN_DEC_HEX(1)

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/cdeftutorial.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/cdeftutorial.html	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/cdeftutorial.html	Sat Aug 21 11:59:00 2004
@@ -37,20 +37,21 @@
 	<li><a href="#some_examples">Some examples</a></li>
 	<ul>
 
-		<li><a href="#example:_using_a_recently_created_rrd">Example: using a recently created RRD</a></li>
-		<li><a href="#example:_better_handling_of_unknown_data,_by_using_time">Example: better handling of unknown data, by using time</a></li>
-		<li><a href="#example:_pretending_weird_data_isn't_there">Example: Pretending weird data isn't there</a></li>
-		<li><a href="#example:_working_on_a_certain_time_span">Example: working on a certain time span</a></li>
-		<li><a href="#example:_you_suspect_to_have_problems_and_want_to_see_unknown_data.">Example: You suspect to have problems and want to see unknown data.</a></li>
-		<li><a href="#same_example_useful_with_stacked_data:">Same example useful with STACKed data:</a></li>
+		<li><a href="#example__using_a_recently_created_rrd">Example: using a recently created RRD</a></li>
+		<li><a href="#example__better_handling_of_unknown_data__by_using_time">Example: better handling of unknown data, by using time</a></li>
+		<li><a href="#example__pretending_weird_data_isn_t_there">Example: Pretending weird data isn't there</a></li>
+		<li><a href="#example__working_on_a_certain_time_span">Example: working on a certain time span</a></li>
+		<li><a href="#example__you_suspect_to_have_problems_and_want_to_see_unknown_data_">Example: You suspect to have problems and want to see unknown data.</a></li>
+		<li><a href="#same_example_useful_with_stacked_data_">Same example useful with STACKed data:</a></li>
 	</ul>
 
 	<li><a href="#the_examples_from_the_rrd_graph_manual_page">The examples from the RRD graph manual page</a></li>
 	<ul>
 
-		<li><a href="#degrees_celsius_vs._degrees_fahrenheit">Degrees Celsius vs. Degrees Fahrenheit</a></li>
+		<li><a href="#degrees_celsius_vs__degrees_fahrenheit">Degrees Celsius vs. Degrees Fahrenheit</a></li>
 		<li><a href="#changing_unknown_into_zero">Changing unknown into zero</a></li>
 		<li><a href="#infinity_demo">Infinity demo</a></li>
+		<li><a href="#data_filtering_example">Data Filtering Example</a></li>
 	</ul>
 
 	<li><a href="#out_of_ideas_for_now">Out of ideas for now</a></li>
@@ -380,7 +381,7 @@
 <h1><a name="some_examples">Some examples</a></h1>
 <p>
 </p>
-<h2><a name="example:_using_a_recently_created_rrd">Example: using a recently created RRD</a></h2>
+<h2><a name="example__using_a_recently_created_rrd">Example: using a recently created RRD</a></h2>
 <p>You are keeping statistics on your router for over a year now. Recently
 you installed an extra router and you would like to show the combined
 throughput for these two devices.</p>
@@ -439,7 +440,7 @@
 to remove this rule so that unknown data is properly displayed.</p>
 <p>
 </p>
-<h2><a name="example:_better_handling_of_unknown_data,_by_using_time">Example: better handling of unknown data, by using time</a></h2>
+<h2><a name="example__better_handling_of_unknown_data__by_using_time">Example: better handling of unknown data, by using time</a></h2>
 <p>Above example has one drawback. If you do log unknown data in
 your database after installing your new equipment, it will also be
 translated into zero and therefore you won't see that there was a
@@ -514,7 +515,7 @@
 come up with.</p>
 <p>
 </p>
-<h2><a name="example:_pretending_weird_data_isn't_there">Example: Pretending weird data isn't there</a></h2>
+<h2><a name="example__pretending_weird_data_isn_t_there">Example: Pretending weird data isn't there</a></h2>
 <p>Suppose you have a problem that shows up as huge spikes in your graph.
 You know this happens and why so you decide to work around the problem.
 Perhaps you're using your network to do a backup at night and by doing
@@ -548,7 +549,7 @@
     CDEF:result=number,100000,GT,100000,number,IF</pre>
 <p>
 </p>
-<h2><a name="example:_working_on_a_certain_time_span">Example: working on a certain time span</a></h2>
+<h2><a name="example__working_on_a_certain_time_span">Example: working on a certain time span</a></h2>
 <p>If you want a graph that spans a few weeks, but would only want to
 see some routers data for one week, you need to ``hide'' the rest of
 the time frame. Don't ask me when this would be useful, it's just
@@ -571,17 +572,17 @@
 numbers (or zero) only.</p>
 <p>Let's compile the complete CDEF:</p>
 <pre>
-        DEF:ds0=router1.rrd:AVERAGE
-        CDEF:ds0modified=TIME,begintime,GE,TIME,endtime,LE,*,UNKN,ds0,IF</pre>
+ DEF:ds0=router1.rrd:AVERAGE
+ CDEF:ds0modified=TIME,begintime,GE,TIME,endtime,LE,*,ds0,UNKN,IF</pre>
 <p>This will return the value of ds0 if both comparisons return true. You
 could also do it the other way around:</p>
 <pre>
-        DEF:ds0=router1.rrd:AVERAGE
-        CDEF:ds0modified=TIME,begintime,LT,TIME,endtime,GT,+,UNKN,ds0,IF</pre>
+ DEF:ds0=router1.rrd:AVERAGE
+ CDEF:ds0modified=TIME,begintime,LT,TIME,endtime,GT,+,UNKN,ds0,IF</pre>
 <p>This will return an UNKNOWN if either comparison returns true.</p>
 <p>
 </p>
-<h2><a name="example:_you_suspect_to_have_problems_and_want_to_see_unknown_data.">Example: You suspect to have problems and want to see unknown data.</a></h2>
+<h2><a name="example__you_suspect_to_have_problems_and_want_to_see_unknown_data_">Example: You suspect to have problems and want to see unknown data.</a></h2>
 <p>Suppose you add up the number of active users on several terminal servers.
 If one of them doesn't give an answer (or an incorrect one) you get ``NaN''
 in the database (``Not a Number'') and NaN is evaluated as Unknown.</p>
@@ -615,7 +616,7 @@
    AREA:wrongdata#FF0000:unknown data</pre>
 <p>
 </p>
-<h2><a name="same_example_useful_with_stacked_data:">Same example useful with STACKed data:</a></h2>
+<h2><a name="same_example_useful_with_stacked_data_">Same example useful with STACKed data:</a></h2>
 <p>If you use stack in the previous example (as I would do) then you don't
 add up the values. Therefore, there is no relationship between the
 four values and you don't get a single value to test.
@@ -664,7 +665,7 @@
 <h1><a name="the_examples_from_the_rrd_graph_manual_page">The examples from the RRD graph manual page</a></h1>
 <p>
 </p>
-<h2><a name="degrees_celsius_vs._degrees_fahrenheit">Degrees Celsius vs. Degrees Fahrenheit</a></h2>
+<h2><a name="degrees_celsius_vs__degrees_fahrenheit">Degrees Celsius vs. Degrees Fahrenheit</a></h2>
 <pre>
    rrdtool graph demo.gif --title=&quot;Demo Graph&quot; \
       DEF:cel=demo.rrd:exhaust:AVERAGE \
@@ -767,14 +768,13 @@
 <p>If your data can also have negative values you also need to overwrite
 the other half of your graph. This can be done in a relatively simple
 way: what you need is the ``wipeout'' variable and place a negative
-sign before it:  ``CDEF:wipeout2=wipeout,-1,*''
+sign before it:  ``CDEF:wipeout2=wipeout,-1,*''</p>
+<p>
 </p>
-<pre>
-
-=head2 Filtering data</pre>
+<h2><a name="data_filtering_example">Data Filtering Example</a></h2>
+<p>by Gonzalo Augusto Arana Tagle &lt;<a href="mailto:garana at uolsinectis.com.ar">garana at uolsinectis.com.ar</a>&gt;</p>
 <p>You may do some complex data filtering:</p>
-<pre>
-  MEDIAN FILTER: filters shot noise</pre>
+<p>MEDIAN FILTER: filters shot noise</p>
 <pre>
     DEF:var=database.rrd:traffic:AVERAGE
     CDEF:prev1=PREV(var)
@@ -783,12 +783,11 @@
     CDEF:median=prev1,prev2,prev3,+,+,3,/
     LINE3:median#000077:filtered
     LINE1:prev2#007700:'raw data'</pre>
-<pre>
-  DERIVATE:</pre>
+<p>DERIVATE:</p>
 <pre>
     DEF:var=database.rrd:traffic:AVERAGE
     CDEF:prev1=PREV(var)
-    CDEF:time=TIME
+    CDEF:time=var,POP,TIME
     CDEF:prevtime=PREV(time)
     CDEF:derivate=var,prev1,-,time,prevtime,-,/
     LINE3:derivate#000077:derivate
@@ -811,9 +810,7 @@
 </p>
 <hr />
 <h1><a name="author">AUTHOR</a></h1>
-<p>Alex van den Bogaerdt
-&lt;<a href="mailto:alex at ergens.op.het.net">alex at ergens.op.het.net</a>&gt;
-</p>
+<p>Alex van den Bogaerdt &lt;<a href="mailto:alex at ergens.op.het.net">alex at ergens.op.het.net</a>&gt;</p>
 
 </body>
 

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/cdeftutorial.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/cdeftutorial.pod	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/cdeftutorial.pod	Sat Aug 21 11:59:00 2004
@@ -615,14 +615,14 @@
 
 Let's compile the complete CDEF:
 
-	DEF:ds0=router1.rrd:AVERAGE
-	CDEF:ds0modified=TIME,begintime,GE,TIME,endtime,LE,*,UNKN,ds0,IF
+ DEF:ds0=router1.rrd:AVERAGE
+ CDEF:ds0modified=TIME,begintime,GE,TIME,endtime,LE,*,ds0,UNKN,IF
 
 This will return the value of ds0 if both comparisons return true. You
 could also do it the other way around:
 
-	DEF:ds0=router1.rrd:AVERAGE
-	CDEF:ds0modified=TIME,begintime,LT,TIME,endtime,GT,+,UNKN,ds0,IF
+ DEF:ds0=router1.rrd:AVERAGE
+ CDEF:ds0modified=TIME,begintime,LT,TIME,endtime,GT,+,UNKN,ds0,IF
 
 This will return an UNKNOWN if either comparison returns true.
 
@@ -837,12 +837,14 @@
 the other half of your graph. This can be done in a relatively simple
 way: what you need is the "wipeout" variable and place a negative
 sign before it:  "CDEF:wipeout2=wipeout,-1,*"
-    
-=head2 Filtering data
+
+=head2 Data Filtering Example
+
+by Gonzalo Augusto Arana Tagle E<lt>garana at uolsinectis.com.arE<gt>
 
 You may do some complex data filtering:
 
-  MEDIAN FILTER: filters shot noise
+MEDIAN FILTER: filters shot noise
 
     DEF:var=database.rrd:traffic:AVERAGE
     CDEF:prev1=PREV(var)
@@ -853,11 +855,11 @@
     LINE1:prev2#007700:'raw data'
 
 
-  DERIVATE:
+DERIVATE:
 
     DEF:var=database.rrd:traffic:AVERAGE
     CDEF:prev1=PREV(var)
-    CDEF:time=TIME
+    CDEF:time=var,POP,TIME
     CDEF:prevtime=PREV(time)
     CDEF:derivate=var,prev1,-,time,prevtime,-,/
     LINE3:derivate#000077:derivate
@@ -879,5 +881,4 @@
 
 =head1 AUTHOR
 
-Alex van den Bogaerdt
-E<lt>alex at ergens.op.het.netE<gt>
+Alex van den Bogaerdt E<lt>alex at ergens.op.het.netE<gt>

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/cdeftutorial.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/cdeftutorial.txt	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/cdeftutorial.txt	Sat Aug 21 11:59:00 2004
@@ -1,4 +1,4 @@
-CDEFTUTORIAL(1)              rrdtool              CDEFTUTORIAL(1)
+CDEFTUTORIAL(1)              RRDtool              CDEFTUTORIAL(1)
 
 
 
@@ -595,14 +595,14 @@
 
        Let's compile the complete CDEF:
 
-               DEF:ds0=router1.rrd:AVERAGE
-               CDEF:ds0modified=TIME,begintime,GE,TIME,endtime,LE,*,UNKN,ds0,IF
+        DEF:ds0=router1.rrd:AVERAGE
+        CDEF:ds0modified=TIME,begintime,GE,TIME,endtime,LE,*,ds0,UNKN,IF
 
        This will return the value of ds0 if both comparisons
        return true. You could also do it the other way around:
 
-               DEF:ds0=router1.rrd:AVERAGE
-               CDEF:ds0modified=TIME,begintime,LT,TIME,endtime,GT,+,UNKN,ds0,IF
+        DEF:ds0=router1.rrd:AVERAGE
+        CDEF:ds0modified=TIME,begintime,LT,TIME,endtime,GT,+,UNKN,ds0,IF
 
        This will return an UNKNOWN if either comparison returns
        true.
@@ -836,11 +836,13 @@
        "wipeout" variable and place a negative sign before it:
        "CDEF:wipeout2=wipeout,-1,*"
 
-       FFiilltteerriinngg ddaattaa
+       DDaattaa FFiilltteerriinngg EExxaammppllee
+
+       by Gonzalo Augusto Arana Tagle <garana at uolsinectis.com.ar>
 
        You may do some complex data filtering:
 
-         MEDIAN FILTER: filters shot noise
+       MEDIAN FILTER: filters shot noise
 
            DEF:var=database.rrd:traffic:AVERAGE
            CDEF:prev1=PREV(var)
@@ -850,15 +852,13 @@
            LINE3:median#000077:filtered
            LINE1:prev2#007700:'raw data'
 
-         DERIVATE:
-
-
+       DERIVATE:
 
 
 
            DEF:var=database.rrd:traffic:AVERAGE
            CDEF:prev1=PREV(var)
-           CDEF:time=TIME
+           CDEF:time=var,POP,TIME
            CDEF:prevtime=PREV(time)
            CDEF:derivate=var,prev1,-,time,prevtime,-,/
            LINE3:derivate#000077:derivate
@@ -881,4 +881,4 @@
 
 
 
-1.0.46                      2003-09-14            CDEFTUTORIAL(1)
+1.0.49                      2004-07-14            CDEFTUTORIAL(1)

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rpntutorial.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rpntutorial.txt	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rpntutorial.txt	Sat Aug 21 11:59:00 2004
@@ -1,4 +1,4 @@
-RPNTUTORIAL(1)               rrdtool               RPNTUTORIAL(1)
+RPNTUTORIAL(1)               RRDtool               RPNTUTORIAL(1)
 
 
 
@@ -202,4 +202,4 @@
 
 
 
-1.0.46                      2003-09-14             RPNTUTORIAL(1)
+1.0.49                      2004-01-17             RPNTUTORIAL(1)

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrd-beginners.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrd-beginners.html	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrd-beginners.html	Sat Aug 21 11:59:00 2004
@@ -20,11 +20,11 @@
 
 		<li><a href="#what_makes_rrdtool_so_special">What makes RRDTool so special?</a></li>
 		<li><a href="#graphical_magic">Graphical Magic</a></li>
-		<li><a href="#wrapping_rrdtool_within_shell/perl_script">Wrapping RRDTool within Shell/Perl script</a></li>
+		<li><a href="#wrapping_rrdtool_within_shell_perl_script">Wrapping RRDTool within Shell/Perl script</a></li>
 		<ul>
 
-			<li><a href="#shell_script_(collects_data,_updates_database)">Shell script (collects data, updates database)</a></li>
-			<li><a href="#perl_script_(retrieves_data_from_database_and_generates_graphs_and_statistics)">Perl script (retrieves data from database and generates graphs and statistics)</a></li>
+			<li><a href="#shell_script__collects_data__updates_database_">Shell script (collects data, updates database)</a></li>
+			<li><a href="#perl_script__retrieves_data_from_database_and_generates_graphs_and_statistics_">Perl script (retrieves data from database and generates graphs and statistics)</a></li>
 		</ul>
 
 	</ul>
@@ -232,7 +232,7 @@
 Detailed instructions be found under graph manual.</p>
 <p>
 </p>
-<h2><a name="wrapping_rrdtool_within_shell/perl_script">Wrapping RRDTool within Shell/Perl script</a></h2>
+<h2><a name="wrapping_rrdtool_within_shell_perl_script">Wrapping RRDTool within Shell/Perl script</a></h2>
 <p>After understanding RRDTool, it is now a time to actually use RRDTool in
 scripts. Tasks involved in network management are data collection, data
 storage, and data retrieval. In the following example,
@@ -242,7 +242,7 @@
 scripts are as shown below:</p>
 <p>
 </p>
-<h3><a name="shell_script_(collects_data,_updates_database)">Shell script (collects data, updates database)</a></h3>
+<h3><a name="shell_script__collects_data__updates_database_">Shell script (collects data, updates database)</a></h3>
 <pre>
  #!/bin/sh
  a=0
@@ -260,7 +260,7 @@
  done # end of while loop</pre>
 <p>
 </p>
-<h3><a name="perl_script_(retrieves_data_from_database_and_generates_graphs_and_statistics)">Perl script (retrieves data from database and generates graphs and statistics)</a></h3>
+<h3><a name="perl_script__retrieves_data_from_database_and_generates_graphs_and_statistics_">Perl script (retrieves data from database and generates graphs and statistics)</a></h3>
 <pre>
  #!/usr/bin/perl -w
  #This script fetch data from target.rrd, creates graph of memory consumption

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrd-beginners.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrd-beginners.txt	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrd-beginners.txt	Sat Aug 21 11:59:00 2004
@@ -1,4 +1,4 @@
-RRD-BEGINNERS(1)             rrdtool             RRD-BEGINNERS(1)
+RRD-BEGINNERS(1)             RRDtool             RRD-BEGINNERS(1)
 
 
 
@@ -392,4 +392,4 @@
 
 
 
-1.0.46                      2003-09-14           RRD-BEGINNERS(1)
+1.0.49                      2004-01-17           RRD-BEGINNERS(1)

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdcgi.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdcgi.html	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdcgi.html	Sat Aug 21 11:59:00 2004
@@ -51,7 +51,7 @@
 only for a subset of tags. This allows to nest tags.</p>
 <p>The argument parser uses the same semantics as you are used from your c shell.</p>
 <dl>
-<dt><strong><a name="item_%2d%2dfilter"><strong>--filter</strong></a></strong><br />
+<dt><strong><a name="item__2d_2dfilter"><strong>--filter</strong></a></strong><br />
 </dt>
 <dd>
 Assume that rrdcgi is being run as a filter and not as a cgi.
@@ -61,13 +61,13 @@
 </p>
 <h2><a name="keywords">Keywords</a></h2>
 <dl>
-<dt><strong><a name="item_rrd%3a%3acv_name">RRD::CV <em>name</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3acv_name">RRD::CV <em>name</em></a></strong><br />
 </dt>
 <dd>
 Inserts the CGI variable of the given name.
 </dd>
 <p></p>
-<dt><strong><a name="item_rrd%3a%3acv%3a%3aquote_name">RRD::CV::QUOTE <em>name</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3acv_3a_3aquote_name">RRD::CV::QUOTE <em>name</em></a></strong><br />
 </dt>
 <dd>
 Inserts the CGI variable of the given name but quotes it, ready for
@@ -75,7 +75,7 @@
 value of the CGI variable it will still be considered as one argument.
 </dd>
 <p></p>
-<dt><strong><a name="item_rrd%3a%3acv%3a%3apath_name">RRD::CV::PATH <em>name</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3acv_3a_3apath_name">RRD::CV::PATH <em>name</em></a></strong><br />
 </dt>
 <dd>
 Inserts the CGI variable of the given name, quotes it and makes sure
@@ -84,7 +84,7 @@
 CGI interface.
 </dd>
 <p></p>
-<dt><strong><a name="item_rrd%3a%3agetenv_variable">RRD::GETENV <em>variable</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3agetenv_variable">RRD::GETENV <em>variable</em></a></strong><br />
 </dt>
 <dd>
 Get the value of an environment variable.
@@ -98,7 +98,7 @@
 some sort of access control on the directory</p>
 </dd>
 <p></p>
-<dt><strong><a name="item_rrd%3a%3agoodfor_seconds">RRD::GOODFOR <em>seconds</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3agoodfor_seconds">RRD::GOODFOR <em>seconds</em></a></strong><br />
 </dt>
 <dd>
 Specify the number of seconds this page should remain valid. This will prompt
@@ -106,13 +106,13 @@
 seconds is <em>negative</em> a Refresh headers.
 </dd>
 <p></p>
-<dt><strong><a name="item_rrd%3a%3ainclude_filename">RRD::INCLUDE <em>filename</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3ainclude_filename">RRD::INCLUDE <em>filename</em></a></strong><br />
 </dt>
 <dd>
 Include the contents of the given file into the page returned from the cgi
 </dd>
 <p></p>
-<dt><strong><a name="item_rrd%3a%3asetenv_variable_value">RRD::SETENV <em>variable</em> <em>value</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3asetenv_variable_value">RRD::SETENV <em>variable</em> <em>value</em></a></strong><br />
 </dt>
 <dd>
 If you want to present your graphs in another time zone than your own, you
@@ -127,33 +127,33 @@
 values permitted to TZ depend on your OS.</p>
 </dd>
 <p></p>
-<dt><strong><a name="item_rrd%3a%3asetvar_variable_value">RRD::SETVAR <em>variable</em> <em>value</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3asetvar_variable_value">RRD::SETVAR <em>variable</em> <em>value</em></a></strong><br />
 </dt>
 <dd>
 Analog to SETENV but for local variables
 </dd>
 <p></p>
-<dt><strong><a name="item_rrd%3a%3agetvar_variable">RRD::GETVAR <em>variable</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3agetvar_variable">RRD::GETVAR <em>variable</em></a></strong><br />
 </dt>
 <dd>
 Analog to GETENV but for local variables
 </dd>
 <p></p>
-<dt><strong><a name="item_rrd%3a%3atime%3a%3alast_rrd%2dfile_strftime%2dform">RRD::TIME::LAST <em>rrd-file</em> <em>strftime-format</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3atime_3a_3alast_rrd_2dfile_strftime_2dform">RRD::TIME::LAST <em>rrd-file</em> <em>strftime-format</em></a></strong><br />
 </dt>
 <dd>
 This gets replaced by the last modification time of the selected RRD. The
 time is <em>strftime</em>-formated with the string specified in the second argument.
 </dd>
 <p></p>
-<dt><strong><a name="item_rrd%3a%3atime%3a%3anow_strftime%2dformat">RRD::TIME::NOW <em>strftime-format</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3atime_3a_3anow_strftime_2dformat">RRD::TIME::NOW <em>strftime-format</em></a></strong><br />
 </dt>
 <dd>
 This gets replaced by the current time of day. The
 time is <em>strftime</em>-formated with the string specified in the argument.
 </dd>
 <p></p>
-<dt><strong><a name="item_rrd%3a%3atime%3a%3astrftime_start%7cend_start%2dsp">RRD::TIME::STRFTIME <em>START|END</em> <em>start-spec</em> <em>end-spec</em> <em>strftime-format</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3atime_3a_3astrftime_start_7cend_start_2dsp">RRD::TIME::STRFTIME <em>START|END</em> <em>start-spec</em> <em>end-spec</em> <em>strftime-format</em></a></strong><br />
 </dt>
 <dd>
 This gets replaced by a strftime-formatted time using the format
@@ -164,7 +164,7 @@
 folks to figure out than ``-2weeks''.
 </dd>
 <p></p>
-<dt><strong><a name="item_rrd%3a%3agraph_rrdgraph_arguments">RRD::GRAPH <em>rrdgraph arguments</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3agraph_rrdgraph_arguments">RRD::GRAPH <em>rrdgraph arguments</em></a></strong><br />
 </dt>
 <dd>
 This tag creates the RRD graph defined in its argument and then gets
@@ -191,7 +191,7 @@
 directories given in the PNG file argument will get dropped.</p>
 </dd>
 <p></p>
-<dt><strong><a name="item_rrd%3a%3aprint_number">RRD::PRINT <em>number</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3aprint_number">RRD::PRINT <em>number</em></a></strong><br />
 </dt>
 <dd>
 If the preceding  <strong>RRD::GRAPH</strong> tag contained and <strong>PRINT</strong> arguments,

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdcgi.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdcgi.txt	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdcgi.txt	Sat Aug 21 11:59:00 2004
@@ -1,4 +1,4 @@
-RRDCGI(1)                    rrdtool                    RRDCGI(1)
+RRDCGI(1)                    RRDtool                    RRDCGI(1)
 
 
 
@@ -207,4 +207,4 @@
 
 
 
-1.0.46                      2003-11-23                  RRDCGI(1)
+1.0.49                      2004-01-17                  RRDCGI(1)

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdcreate.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdcreate.html	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdcreate.html	Sat Aug 21 11:59:00 2004
@@ -27,7 +27,7 @@
 <p>
 </p>
 <h1><a name="name">NAME</a></h1>
-<p>rrdtool create - Set up a new Round Robin Database</p>
+<p>rrdcreate - Set up a new Round Robin Database</p>
 <div align="right"><a href="rrdcreate.pdf">PDF</a> version.</div><p>
 </p>
 <hr />
@@ -73,7 +73,7 @@
 into the <strong>RRD</strong>.
 </dd>
 <p></p>
-<dt><strong><a name="item_ds%3ads%2dname%3adst%3aheartbeat%3amin%3amax"><strong>DS:</strong><em>ds-name</em><strong>:</strong><em>DST</em><strong>:</strong><em>heartbeat</em><strong>:</strong><em>min</em><strong>:</strong><em>max</em></a></strong><br />
+<dt><strong><a name="item_ds_3ads_2dname_3adst_3aheartbeat_3amin_3amax"><strong>DS:</strong><em>ds-name</em><strong>:</strong><em>DST</em><strong>:</strong><em>heartbeat</em><strong>:</strong><em>min</em><strong>:</strong><em>max</em></a></strong><br />
 </dt>
 <dd>
 A single <strong>RRD</strong> can accept input from several data sources (<strong>DS</strong>).
@@ -143,7 +143,7 @@
 <p><em>If information on minimal/maximal expected values is available,
 always set the min and/or max properties. This will help RRDTool in
 doing a simple sanity check on the data supplied when running update.</em></p>
-<dt><strong><a name="item_rra%3acf%3axff%3asteps%3arows"><strong>RRA:</strong><em>CF</em><strong>:</strong><em>xff</em><strong>:</strong><em>steps</em><strong>:</strong><em>rows</em></a></strong><br />
+<dt><strong><a name="item_rra_3acf_3axff_3asteps_3arows"><strong>RRA:</strong><em>CF</em><strong>:</strong><em>xff</em><strong>:</strong><em>steps</em><strong>:</strong><em>rows</em></a></strong><br />
 </dt>
 <dd>
 The purpose of an <strong>RRD</strong> is to store data in the round robin archives
@@ -239,7 +239,7 @@
 precision should be acceptable.
 </dd>
 <p></p>
-<dt><strong><a name="item_it%27s_always_a_rate">It's always a Rate</a></strong><br />
+<dt><strong><a name="item_it_27s_always_a_rate">It's always a Rate</a></strong><br />
 </dt>
 <dd>
 RRDTool stores rates in amount/second for COUNTER, DERIVE and ABSOLUTE data.

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdcreate.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdcreate.pod	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdcreate.pod	Sat Aug 21 11:59:00 2004
@@ -1,6 +1,6 @@
 =head1 NAME
 
-rrdtool create - Set up a new Round Robin Database
+rrdcreate - Set up a new Round Robin Database
 
 =for html <div align="right"><a href="rrdcreate.pdf">PDF</a> version.</div>
 

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdcreate.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdcreate.txt	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdcreate.txt	Sat Aug 21 11:59:00 2004
@@ -1,9 +1,9 @@
-RRDCREATE(1)                 rrdtool                 RRDCREATE(1)
+RRDCREATE(1)                 RRDtool                 RRDCREATE(1)
 
 
 
 NNAAMMEE
-       rrdtool create - Set up a new Round Robin Database
+       rrdcreate - Set up a new Round Robin Database
 
 SSYYNNOOPPSSIISS
        rrrrddttooooll ccrreeaattee _f_i_l_e_n_a_m_e [----ssttaarrtt|--bb _s_t_a_r_t _t_i_m_e]
@@ -248,4 +248,4 @@
 
 
 
-1.0.46                      2003-09-14               RRDCREATE(1)
+1.0.49                      2004-01-17               RRDCREATE(1)

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrddump.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrddump.html	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrddump.html	Sat Aug 21 11:59:00 2004
@@ -16,6 +16,7 @@
 	<li><a href="#name">NAME</a></li>
 	<li><a href="#synopsis">SYNOPSIS</a></li>
 	<li><a href="#description">DESCRIPTION</a></li>
+	<li><a href="#examples">EXAMPLES</a></li>
 	<li><a href="#author">AUTHOR</a></li>
 </ul>
 -->
@@ -24,7 +25,7 @@
 <p>
 </p>
 <h1><a name="name">NAME</a></h1>
-<p>rrdtool dump - dump the contents of an <strong>RRD</strong> to XML format</p>
+<p>rrddump - dump the contents of an <strong>RRD</strong> to XML format</p>
 <div align="right"><a href="rrddump.pdf">PDF</a> version.</div><p>
 </p>
 <hr />
@@ -40,7 +41,7 @@
 to another as well as manipulating the contents of an <strong>RRD</strong> file in a
 somewhat more convenient manner.</p>
 <dl>
-<dt><strong><a name="item_filename%2errd"><em>filename.rrd</em></a></strong><br />
+<dt><strong><a name="item_filename_2errd"><em>filename.rrd</em></a></strong><br />
 </dt>
 <dd>
 The name of the <strong>RRD</strong> you want to dump.
@@ -49,8 +50,28 @@
 <p>
 </p>
 <hr />
+<h1><a name="examples">EXAMPLES</a></h1>
+<p>To transfer an RRD between architectures, follow these steps:</p>
+<pre>
+
+=item 1.</pre>
+<p>On the same system where the RRD was created, use <strong>rrdtool</strong> <strong>dump</strong>
+to export the data to XML format.</p>
+<ol>
+<li></li>
+Transfer the XML dump to the target system
+<p></p>
+<li></li>
+Run <strong>rrdtool</strong> <strong>restore</strong> to create a new RRD from the XML dump.  See
+<strong>rrdrestore</strong> for details.
+<p></p></ol>
+<p>
+</p>
+<hr />
 <h1><a name="author">AUTHOR</a></h1>
-<p>Tobias Oetiker &lt;<a href="mailto:oetiker at ee.ethz.ch">oetiker at ee.ethz.ch</a>&gt;</p>
+<p>Tobias Oetiker &lt;<a href="mailto:oetiker at ee.ethz.ch">oetiker at ee.ethz.ch</a>&gt;
+
+</p>
 
 </body>
 

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrddump.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrddump.pod	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrddump.pod	Sat Aug 21 11:59:00 2004
@@ -1,6 +1,6 @@
 =head1 NAME
 
-rrdtool dump - dump the contents of an B<RRD> to XML format
+rrddump - dump the contents of an B<RRD> to XML format
 
 =for html <div align="right"><a href="rrddump.pdf">PDF</a> version.</div>
 
@@ -16,9 +16,7 @@
 to another as well as manipulating the contents of an B<RRD> file in a
 somewhat more convenient manner.
 
-
-
-=over 8
+=over
 
 =item I<filename.rrd>
 
@@ -26,6 +24,28 @@
 
 =back
 
+=head1 EXAMPLES
+
+To transfer an RRD between architectures, follow these steps:
+
+=over 4
+ 
+=item 1.
+
+On the same system where the RRD was created, use B<rrdtool> B<dump>
+to export the data to XML format.
+
+=item 2. 
+
+Transfer the XML dump to the target system
+
+=item 3.
+
+Run B<rrdtool> B<restore> to create a new RRD from the XML dump.  See
+B<rrdrestore> for details.
+
+=back
+
 =head1 AUTHOR
 
 Tobias Oetiker E<lt>oetiker at ee.ethz.chE<gt>

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrddump.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrddump.txt	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrddump.txt	Sat Aug 21 11:59:00 2004
@@ -1,9 +1,9 @@
-RRDDUMP(1)                   rrdtool                   RRDDUMP(1)
+RRDDUMP(1)                   RRDtool                   RRDDUMP(1)
 
 
 
 NNAAMMEE
-       rrdtool dump - dump the contents of an RRRRDD to XML format
+       rrddump - dump the contents of an RRRRDD to XML format
 
 SSYYNNOOPPSSIISS
        rrrrddttooooll dduummpp _f_i_l_e_n_a_m_e_._r_r_d > _f_i_l_e_n_a_m_e_._x_m_l
@@ -17,11 +17,23 @@
        venient manner.
 
        _f_i_l_e_n_a_m_e_._r_r_d
-               The name of the RRRRDD you want to dump.
+           The name of the RRRRDD you want to dump.
+
+EEXXAAMMPPLLEESS
+       To transfer an RRD between architectures, follow these
+       steps:
+
+       1.  On the same system where the RRD was created, use rrrrdd--
+           ttooooll dduummpp to export the data to XML format.
+
+       2.  Transfer the XML dump to the target system
+
+       3.  Run rrrrddttooooll rreessttoorree to create a new RRD from the XML
+           dump.  See rrrrddrreessttoorree for details.
 
 AAUUTTHHOORR
        Tobias Oetiker <oetiker at ee.ethz.ch>
 
 
 
-1.0.46                      2002-02-26                 RRDDUMP(1)
+1.0.49                      2004-05-25                 RRDDUMP(1)

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdfetch.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdfetch.html	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdfetch.html	Sat Aug 21 11:59:00 2004
@@ -33,7 +33,7 @@
 <p>
 </p>
 <h1><a name="name">NAME</a></h1>
-<p>rrdtool fetch - fetch data from an RRD.</p>
+<p>rrdfetch - fetch data from an RRD.</p>
 <div align="right"><a href="rrdfetch.pdf">PDF</a> version.</div><p>
 </p>
 <hr />

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdfetch.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdfetch.pod	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdfetch.pod	Sat Aug 21 11:59:00 2004
@@ -1,6 +1,6 @@
 =head1 NAME
 
-rrdtool fetch - fetch data from an RRD.
+rrdfetch - fetch data from an RRD.
 
 =for html <div align="right"><a href="rrdfetch.pdf">PDF</a> version.</div>
 

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdfetch.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdfetch.txt	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdfetch.txt	Sat Aug 21 11:59:00 2004
@@ -1,9 +1,9 @@
-RRDFETCH(1)                  rrdtool                  RRDFETCH(1)
+RRDFETCH(1)                  RRDtool                  RRDFETCH(1)
 
 
 
 NNAAMMEE
-       rrdtool fetch - fetch data from an RRD.
+       rrdfetch - fetch data from an RRD.
 
 SSYYNNOOPPSSIISS
        rrrrddttooooll ffeettcchh _f_i_l_e_n_a_m_e _C_F [----rreessoolluuttiioonn|--rr _r_e_s_o_l_u_t_i_o_n]
@@ -249,4 +249,4 @@
 
 
 
-1.0.46                      2003-09-14                RRDFETCH(1)
+1.0.49                      2004-01-17                RRDFETCH(1)

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdgraph.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdgraph.html	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdgraph.html	Sat Aug 21 11:59:00 2004
@@ -36,7 +36,7 @@
 <p>
 </p>
 <h1><a name="name">NAME</a></h1>
-<p>rrdtool graph - Create a graph based on data from one or several RRD</p>
+<p>rrdgraph - Create a graph based on data from one or several RRD</p>
 <div align="right"><a href="rrdgraph.pdf">PDF</a> version.</div><p>
 </p>
 <hr />
@@ -67,6 +67,8 @@
 [<strong>-u</strong>|<strong>--upper-limit</strong>&nbsp;<em>value</em>] 
 [<strong>-l</strong>|<strong>--lower-limit</strong>&nbsp;<em>value</em>]
 [<strong>-g</strong>|<strong>--no-legend</strong>]
+[<strong>-j</strong>|<strong>--only-graph</strong>]
+[<strong>-F</strong>|<strong>--force-rules-legend</strong>]
 [<strong>-r</strong>|<strong>--rigid</strong>]
 [<strong>-S</strong>|<strong>--step</strong>&nbsp;<em>value</em>]
 [<strong>-b</strong>|<strong>--base</strong>&nbsp;<em>value</em>]
@@ -188,7 +190,7 @@
 <p>If you want no y-grid at all set specify the magic word <strong>none</strong>.</p>
 </dd>
 <p></p>
-<dt><strong><a name="item_%2dy%7c%2d%2dalt%2dy%2dgrid"><strong>-Y</strong>|<strong>--alt-y-grid</strong></a></strong><br />
+<dt><strong><a name="item__2dy_7c_2d_2dalt_2dy_2dgrid"><strong>-Y</strong>|<strong>--alt-y-grid</strong></a></strong><br />
 </dt>
 <dd>
 Place Y grid dynamically based on graph Y range. Algorithm ensures
@@ -197,7 +199,7 @@
 every 1, 2, 5 or 10 units.  (contributed by Sasha Mikheev)
 </dd>
 <p></p>
-<dt><strong><a name="item_%2d%2dno%2dminor"><strong>--no-minor</strong></a></strong><br />
+<dt><strong><a name="item__2d_2dno_2dminor"><strong>--no-minor</strong></a></strong><br />
 </dt>
 <dd>
 Turn off the minor grid lines.  This is particularly useful for small 
@@ -205,14 +207,14 @@
 by Travis Brown)
 </dd>
 <p></p>
-<dt><strong><a name="item_%2dr%7c%2d%2dalt%2dy%2dmrtg"><strong>-R</strong>|<strong>--alt-y-mrtg</strong></a></strong><br />
+<dt><strong><a name="item__2dr_7c_2d_2dalt_2dy_2dmrtg"><strong>-R</strong>|<strong>--alt-y-mrtg</strong></a></strong><br />
 </dt>
 <dd>
 Y grid placed on graph Y range mimics MRTG's (rateup-generated) graphs.
 Currently axis is split into 4 parts, just as rateup does.
 </dd>
 <p></p>
-<dt><strong><a name="item_%2da%7c%2d%2dalt%2dautoscale"><strong>-A</strong>|<strong>--alt-autoscale</strong></a></strong><br />
+<dt><strong><a name="item__2da_7c_2d_2dalt_2dautoscale"><strong>-A</strong>|<strong>--alt-autoscale</strong></a></strong><br />
 </dt>
 <dd>
 Compute Y range  based on function absolute minimum and 
@@ -225,7 +227,7 @@
 and periodic behavior will be seen.   (contributed by Sasha Mikheev)
 </dd>
 <p></p>
-<dt><strong><a name="item_%2dm%7c%2d%2dalt%2dautoscale%2dmax"><strong>-M</strong>|<strong>--alt-autoscale-max</strong></a></strong><br />
+<dt><strong><a name="item__2dm_7c_2d_2dalt_2dautoscale_2dmax"><strong>-M</strong>|<strong>--alt-autoscale-max</strong></a></strong><br />
 </dt>
 <dd>
 Where --alt-autoscale will modify both the absolute maximum AND minimum
@@ -256,7 +258,7 @@
 values.
 </dd>
 <p></p>
-<dt><strong><a name="item_%2dv%7c%2d%2dvertical%2dlabel_text"><strong>-v</strong>|<strong>--vertical-label</strong> <em>text</em></a></strong><br />
+<dt><strong><a name="item__2dv_7c_2d_2dvertical_2dlabel_text"><strong>-v</strong>|<strong>--vertical-label</strong> <em>text</em></a></strong><br />
 </dt>
 <dd>
 vertical label on the left side of the graph. This is normally used to
@@ -266,15 +268,13 @@
 <dt><strong><a name="item_pixels"><strong>-w</strong>|<strong>--width</strong> <em>pixels</em> (default 400 pixel)</a></strong><br />
 </dt>
 <dd>
-Width of the drawing area within the graph. This affects the size of the
-gif.
+Width of the drawing area within the graph. This affects the size of the gif.
 </dd>
 <p></p>
 <dt><strong><strong>-h</strong>|<strong>--height</strong> <em>pixels</em> (default 100 pixel)</strong><br />
 </dt>
 <dd>
-Width of the drawing area within the graph. This affects the size of the
-gif.
+Height of the drawing area within the graph. This affects the size of the gif.
 </dd>
 <p></p>
 <dt><strong><a name="item_interlaced"><strong>-i</strong>|<strong>--interlaced</strong> (default: false)</a></strong><br />
@@ -288,7 +288,7 @@
 of the graph.
 </dd>
 <p></p>
-<dt><strong><a name="item_%2df%7c%2d%2dimginfo_formatstring"><strong>-f</strong>|<strong>--imginfo</strong> <em>formatstring</em></a></strong><br />
+<dt><strong><a name="item__2df_7c_2d_2dimginfo_formatstring"><strong>-f</strong>|<strong>--imginfo</strong> <em>formatstring</em></a></strong><br />
 </dt>
 <dd>
 After the image has been created, the graph function uses printf
@@ -309,14 +309,14 @@
 Allows you to produce PNG or GD output from RRDTool.
 </dd>
 <p></p>
-<dt><strong><a name="item_%2db%7c%2d%2dbackground_value"><strong>-B</strong>|<strong>--background</strong> <em>value</em></a></strong><br />
+<dt><strong><a name="item__2db_7c_2d_2dbackground_value"><strong>-B</strong>|<strong>--background</strong> <em>value</em></a></strong><br />
 </dt>
 <dd>
 You could use image in (currently only) GD format for background. It is
 used as background at the very beginning of graph creation.
 </dd>
 <p></p>
-<dt><strong><a name="item_%2do%7c%2d%2doverlay_value"><strong>-O</strong>|<strong>--overlay</strong> <em>value</em></a></strong><br />
+<dt><strong><a name="item__2do_7c_2d_2doverlay_value"><strong>-O</strong>|<strong>--overlay</strong> <em>value</em></a></strong><br />
 </dt>
 <dd>
 You could use image in (currently only) GD format as overlay. It is
@@ -324,7 +324,7 @@
 considered transparent, all other is replacing corresponding pixel in created graph.
 </dd>
 <p></p>
-<dt><strong><a name="item_%2du%7c%2d%2dunit_value"><strong>-U</strong>|<strong>--unit</strong> <em>value</em></a></strong><br />
+<dt><strong><a name="item__2du_7c_2d_2dunit_value"><strong>-U</strong>|<strong>--unit</strong> <em>value</em></a></strong><br />
 </dt>
 <dd>
 You could use unit to be displayed on y axis. It is wise to use only short
@@ -359,7 +359,7 @@
 keyword to expand graphs down.
 </dd>
 <p></p>
-<dt><strong><a name="item_%2dr%7c%2d%2drigid"><strong>-r</strong>|<strong>--rigid</strong></a></strong><br />
+<dt><strong><a name="item__2dr_7c_2d_2drigid"><strong>-r</strong>|<strong>--rigid</strong></a></strong><br />
 </dt>
 <dd>
 rigid boundaries mode.  Normally <strong>rrdgraph</strong> will automatically expand the
@@ -367,7 +367,7 @@
 range. With the r option you can disable this behavior
 </dd>
 <p></p>
-<dt><strong><a name="item_%2db%7c%2d%2dbase_value"><strong>-b</strong>|<strong>--base</strong> <em>value</em></a></strong><br />
+<dt><strong><a name="item__2db_7c_2d_2dbase_value"><strong>-b</strong>|<strong>--base</strong> <em>value</em></a></strong><br />
 </dt>
 <dd>
 if you are graphing memory (and NOT network traffic) this switch
@@ -375,7 +375,7 @@
 measurement, 1 kb/s is 1000 b/s.
 </dd>
 <p></p>
-<dt><strong><a name="item_%2do%7c%2d%2dlogarithmic"><strong>-o</strong>|<strong>--logarithmic</strong></a></strong><br />
+<dt><strong><a name="item__2do_7c_2d_2dlogarithmic"><strong>-o</strong>|<strong>--logarithmic</strong></a></strong><br />
 </dt>
 <dd>
 logarithmic y-axis scaling
@@ -391,12 +391,24 @@
 can be called multiple times to set several colors.
 </dd>
 <p></p>
-<dt><strong><a name="item_%2dg%7c%2d%2dno%2dlegend"><strong>-g</strong>|<strong>--no-legend</strong></a></strong><br />
+<dt><strong><a name="item__2dg_7c_2d_2dno_2dlegend"><strong>-g</strong>|<strong>--no-legend</strong></a></strong><br />
 </dt>
 <dd>
 Suppress generation of legend; only render the graph.
 </dd>
 <p></p>
+<dt><strong><a name="item__2dj_7c_2d_2donly_2dgraph"><strong>-j</strong>|<strong>--only-graph</strong></a></strong><br />
+</dt>
+<dd>
+Suppress anything but the graph, works only for height &lt; 64.
+</dd>
+<p></p>
+<dt><strong><a name="item__2df_7c_2d_2dforce_2drules_2dlegend"><strong>-F</strong>|<strong>--force-rules-legend</strong></a></strong><br />
+</dt>
+<dd>
+Force the generation of HRULE and VRULE legend even if those HRULE or VRULE will not be drawn because out of graph boundaries (mimics behaviour of pre 1.0.42 versions).
+</dd>
+<p></p>
 <dt><strong><a name="item_text"><strong>-t</strong>|<strong>--title</strong> <em>text</em> (default no title)</a></strong><br />
 </dt>
 <dd>
@@ -413,7 +425,7 @@
 that a step smaller than 1 pixel will be silently ignored.
 </dd>
 <p></p>
-<dt><strong><a name="item_def%3avname%3drrd%3ads%2dname%3acf"><strong>DEF:</strong><em>vname</em><strong>=</strong><em>rrd</em><strong>:</strong><em>ds-name</em><strong>:</strong><em>CF</em></a></strong><br />
+<dt><strong><a name="item_def_3avname_3drrd_3ads_2dname_3acf"><strong>DEF:</strong><em>vname</em><strong>=</strong><em>rrd</em><strong>:</strong><em>ds-name</em><strong>:</strong><em>CF</em></a></strong><br />
 </dt>
 <dd>
 Define virtual name for a data source. This name can then be used
@@ -426,7 +438,7 @@
 consolidated according to the consolidation function (<em>CF</em>) chosen.
 </dd>
 <p></p>
-<dt><strong><a name="item_cdef%3avname%3drpn%2dexpression"><strong>CDEF:</strong><em>vname</em><strong>=</strong><em>rpn-expression</em></a></strong><br />
+<dt><strong><a name="item_cdef_3avname_3drpn_2dexpression"><strong>CDEF:</strong><em>vname</em><strong>=</strong><em>rpn-expression</em></a></strong><br />
 </dt>
 <dd>
 Create a new virtual data source by evaluating a mathematical expression,
@@ -456,7 +468,7 @@
 values:</p>
 </dd>
 <dl>
-<dt><strong><a name="item_%2b%2c_%2d%2c_%2a%2c_%2f%2c_%25">+, -, *, /, %</a></strong><br />
+<dt><strong><a name="item__2b_2c__2d_2c__2a_2c__2f_2c__25">+, -, *, /, %</a></strong><br />
 </dt>
 <dd>
 pops two values from the stack applies the selected operator and pushes 
@@ -464,14 +476,14 @@
 operation.
 </dd>
 <p></p>
-<dt><strong><a name="item_sin%2c_cos%2c_log%2c_exp%2c_floor%2c_ceil">SIN, COS, LOG, EXP, FLOOR, CEIL</a></strong><br />
+<dt><strong><a name="item_sin_2c_cos_2c_log_2c_exp_2c_floor_2c_ceil">SIN, COS, LOG, EXP, FLOOR, CEIL</a></strong><br />
 </dt>
 <dd>
 pops one value from the stack, applies the selected function and pushes
 the result back onto the stack.
 </dd>
 <p></p>
-<dt><strong><a name="item_lt%2c_le%2c_gt%2c_ge%2c_eq">LT, LE, GT, GE, EQ</a></strong><br />
+<dt><strong><a name="item_lt_2c_le_2c_gt_2c_ge_2c_eq">LT, LE, GT, GE, EQ</a></strong><br />
 </dt>
 <dd>
 pops two values from the stack, compares them according to the selected
@@ -493,7 +505,7 @@
 E will be sent back to the stack.</p>
 </dd>
 <p></p>
-<dt><strong><a name="item_min%2c_max">MIN, MAX</a></strong><br />
+<dt><strong><a name="item_min_2c_max">MIN, MAX</a></strong><br />
 </dt>
 <dd>
 selects the lesser or larger of the two top stack values respectively
@@ -510,7 +522,7 @@
  CDEF:a=alpha,0,100,LIMIT</pre>
 </dd>
 <p></p>
-<dt><strong><a name="item_dup%2c_exc%2c_pop">DUP, EXC, POP</a></strong><br />
+<dt><strong><a name="item_dup_2c_exc_2c_pop">DUP, EXC, POP</a></strong><br />
 </dt>
 <dd>
 These manipulate the stack directly.  DUP will duplicate the top of the
@@ -549,7 +561,7 @@
 This allows you to perform complex calculations across the data.
 </dd>
 <p></p>
-<dt><strong><a name="item_inf%2c_neginf">INF, NEGINF</a></strong><br />
+<dt><strong><a name="item_inf_2c_neginf">INF, NEGINF</a></strong><br />
 </dt>
 <dd>
 Push a positive or negative infinite (oo) value onto the stack. When
@@ -590,7 +602,7 @@
 this writing (version 0.99.25), you must use at least one <em>vname</em>
 per expression, that is ``CDEF:fourtytwo=2,40,+'' will yield an error
 message but not a <em>vname</em> fourtytwo that's always equal to 42.</p>
-<dt><strong><a name="item_print%3avname%3acf%3aformat"><strong>PRINT:</strong><em>vname</em><strong>:</strong><em>CF</em><strong>:</strong><em>format</em></a></strong><br />
+<dt><strong><a name="item_print_3avname_3acf_3aformat"><strong>PRINT:</strong><em>vname</em><strong>:</strong><em>CF</em><strong>:</strong><em>format</em></a></strong><br />
 </dt>
 <dd>
 Calculate the chosen consolidation function <em>CF</em> over the data-source
@@ -617,7 +629,7 @@
 <p>If you want to put a '%' into your PRINT string, use '%%' instead.</p>
 </dd>
 <p></p>
-<dt><strong><a name="item_gprint%3avname%3acf%3aformat"><strong>GPRINT:</strong><em>vname</em><strong>:</strong><em>CF</em><strong>:</strong><em>format</em></a></strong><br />
+<dt><strong><a name="item_gprint_3avname_3acf_3aformat"><strong>GPRINT:</strong><em>vname</em><strong>:</strong><em>CF</em><strong>:</strong><em>format</em></a></strong><br />
 </dt>
 <dd>
 Same as <strong>PRINT</strong> but the result is printed into the graph below the legend.
@@ -631,25 +643,25 @@
 function.  In order to avoid this, make sure that your end time is at
 least one heartbeat prior to the current time.</p>
 <dl>
-<dt><strong><a name="item_comment%3atext"><strong>COMMENT:</strong><em>text</em></a></strong><br />
+<dt><strong><a name="item_comment_3atext"><strong>COMMENT:</strong><em>text</em></a></strong><br />
 </dt>
 <dd>
 Like <strong>GPRINT</strong> but the <em>text</em> is simply printed into the graph.
 </dd>
 <p></p>
-<dt><strong><a name="item_hrule%3avalue%23rrggbb%5b%3alegend%5d"><strong>HRULE:</strong><em>value</em><strong>#</strong><em>rrggbb</em>[<strong>:</strong><em>legend</em>]</a></strong><br />
+<dt><strong><a name="item_hrule_3avalue_23rrggbb_5b_3alegend_5d"><strong>HRULE:</strong><em>value</em><strong>#</strong><em>rrggbb</em>[<strong>:</strong><em>legend</em>]</a></strong><br />
 </dt>
 <dd>
 Draw a horizontal rule into the graph and optionally add a legend
 </dd>
 <p></p>
-<dt><strong><a name="item_vrule%3atime%23rrggbb%5b%3alegend%5d"><strong>VRULE:</strong><em>time</em><strong>#</strong><em>rrggbb</em>[<strong>:</strong><em>legend</em>]</a></strong><br />
+<dt><strong><a name="item_vrule_3atime_23rrggbb_5b_3alegend_5d"><strong>VRULE:</strong><em>time</em><strong>#</strong><em>rrggbb</em>[<strong>:</strong><em>legend</em>]</a></strong><br />
 </dt>
 <dd>
 Draw a vertical rule into the graph and optionally add a legend
 </dd>
 <p></p>
-<dt><strong><a name="item_line%7b1%7c2%7c3%7d%3avname%5b%23rrggbb%5b%3alegen"><strong>LINE</strong>{<strong>1</strong>|<strong>2</strong>|<strong>3</strong>}<strong>:</strong><em>vname</em>[<strong>#</strong><em>rrggbb</em>[<strong>:</strong><em>legend</em>]]</a></strong><br />
+<dt><strong><a name="item_line_7b1_7c2_7c3_7d_3avname_5b_23rrggbb_5b_3alegen"><strong>LINE</strong>{<strong>1</strong>|<strong>2</strong>|<strong>3</strong>}<strong>:</strong><em>vname</em>[<strong>#</strong><em>rrggbb</em>[<strong>:</strong><em>legend</em>]]</a></strong><br />
 </dt>
 <dd>
 Plot for the requested data, using the color specified. Write a legend
@@ -660,14 +672,14 @@
 data-sources without showing it in the graph.
 </dd>
 <p></p>
-<dt><strong><a name="item_area%3avname%5b%23rrggbb%5b%3alegend%5d%5d"><strong>AREA</strong>:<em>vname</em>[<strong>#</strong><em>rrggbb</em>[<strong>:</strong><em>legend</em>]]</a></strong><br />
+<dt><strong><a name="item_area_3avname_5b_23rrggbb_5b_3alegend_5d_5d"><strong>AREA</strong>:<em>vname</em>[<strong>#</strong><em>rrggbb</em>[<strong>:</strong><em>legend</em>]]</a></strong><br />
 </dt>
 <dd>
 Does the same as <strong>LINE?</strong>, but the area between 0 and 
 the graph will be filled with the color specified.
 </dd>
 <p></p>
-<dt><strong><a name="item_stack%3avname%5b%23rrggbb%5b%3alegend%5d%5d"><strong>STACK</strong>:<em>vname</em>[<strong>#</strong><em>rrggbb</em>[<strong>:</strong><em>legend</em>]]</a></strong><br />
+<dt><strong><a name="item_stack_3avname_5b_23rrggbb_5b_3alegend_5d_5d"><strong>STACK</strong>:<em>vname</em>[<strong>#</strong><em>rrggbb</em>[<strong>:</strong><em>legend</em>]]</a></strong><br />
 </dt>
 <dd>
 Does the same as <strong>LINE?</strong>, but the graph gets stacked on top of the previous

Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdgraph.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdgraph.pod	(original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdgraph.pod	Sat Aug 21 11:59:00 2004
@@ -1,6 +1,6 @@
 =head1 NAME
 
-rrdtool graph - Create a graph based on data from one or several RRD
+rrdgraph - Create a graph based on data from one or several RRD
 
 =for html <div align="right"><a href="rrdgraph.pdf">PDF</a> version.</div> 
 
@@ -32,6 +32,8 @@
 S<[B<-u>|B<--upper-limit> I<value>]> 
 S<[B<-l>|B<--lower-limit> I<value>]>
 S<[B<-g>|B<--no-legend>]>
+S<[B<-j>|B<--only-graph>]>
+S<[B<-F>|B<--force-rules-legend>]>
 S<[B<-r>|B<--rigid>]>
 S<[B<-S>|B<--step> I<value>]>
 S<[B<-b>|B<--base> I<value>]>
@@ -194,13 +196,11 @@
 
 =item B<-w>|B<--width> I<pixels> (default 400 pixel)
 
-Width of the drawing area within the graph. This affects the size of the
-gif.
+Width of the drawing area within the graph. This affects the size of the gif.
 
 =item B<-h>|B<--height> I<pixels> (default 100 pixel)
 
-Width of the drawing area within the graph. This affects the size of the
-gif.
+Height of the drawing area within the graph. This affects the size of the gif.
 
 =item B<-i>|B<--interlaced> (default: false)
 
@@ -291,6 +291,14 @@
 
 Suppress generation of legend; only render the graph.
 
+=item B<-j>|B<--only-graph>
+
+