Updated rrdtool to 1.0.33

Several bugfixes since 1.0.28
Fixed libgd interdependency problems that caused execution of perl scripts
to fail.

19 files changed, 107 insertions, 235 deletions

diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index c0d251131a2..e4e58173a93 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2001/06/11 06:34:24 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/09/24 13:12:18 wulf Exp $
 #
 
-DISTNAME=	rrdtool-1.0.28
+DISTNAME=	rrdtool-1.0.33
 CATEGORIES=	databases graphics net
 MASTER_SITES=	http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/pub/
 
diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
index 211e6046195..e206663f858 100644
--- a/databases/rrdtool/distinfo
+++ b/databases/rrdtool/distinfo
@@ -1,25 +1,18 @@
-$NetBSD: distinfo,v 1.3 2001/05/06 01:09:34 fredb Exp $
+$NetBSD: distinfo,v 1.4 2001/09/24 13:13:13 wulf Exp $
 
-SHA1 (rrdtool-1.0.28.tar.gz) = f43bd1abbc6895754de3891885cdd26dc15e7495
-Size (rrdtool-1.0.28.tar.gz) = 1005682 bytes
-SHA1 (patch-aa) = 1f75b2af0fc8296422ea8de98e205bab47b77524
-SHA1 (patch-ab) = c25a89a0b5c05ff78ef963ac021ca137317af5a8
-SHA1 (patch-ac) = 56ee1e5ce31b658875614870384da367fc509b06
-SHA1 (patch-ad) = 464e2a68a4bcc89750b302d34f97f03f81559737
-SHA1 (patch-ae) = 8a502ffd1c0b076d76efb512d1422e03501d2fd8
-SHA1 (patch-af) = b8ce05ccdd09a3331d987076bb1bf9ed12e85000
-SHA1 (patch-ag) = a234239914f6b6accdca2609657f0f95593130bd
-SHA1 (patch-ah) = 807ea1577dcadbef3c3c8c1ab221ed893824e91a
-SHA1 (patch-ai) = dbf48f7cdd1e6f5d257c239b54567527fe66a818
-SHA1 (patch-aj) = e89ef2af0c357e92523d8476d97cf68463de5427
-SHA1 (patch-ak) = a89cad65549f108a70402cecffa7e849607150ac
+SHA1 (rrdtool-1.0.33.tar.gz) = d0394368ef30dcd390d466843ef4d052365f2470
+Size (rrdtool-1.0.33.tar.gz) = 1118040 bytes
+SHA1 (patch-aa) = 0875a1a71f6577fefaf1bfd7aaf7058f6dd8ae5d
+SHA1 (patch-ab) = 978c96792b14e21302c5f97da8cf9c47701413ac
+SHA1 (patch-ac) = b57fc4a10ef8df50983a0ee5f1059c8b079c4d0f
+SHA1 (patch-ad) = c96aa5f833e5637fb6090fb3043a54111c0d99d8
+SHA1 (patch-ag) = 4949384f3431cd716c37bcf22e3c4b96f4c900fc
+SHA1 (patch-ah) = 2e8350196ab6eabf55a29c4bac65c0d72fa40836
+SHA1 (patch-ai) = 90766fd4083f6697ca7406449628b26f7d051726
+SHA1 (patch-aj) = 35ed816678d0b6cf0aedfff0d09b9726db22d68f
+SHA1 (patch-ak) = e21471035065195f312e14a1fb2da42efbe30ca0
 SHA1 (patch-al) = 7ac3e507d3d8950ed431c7a9cc3afd23d4462c07
 SHA1 (patch-am) = 048de065a9d3bdb7625df69c4c6807ea58522ba4
 SHA1 (patch-an) = 4dc1cf17f7d143a347de2bc141607e404064a03d
-SHA1 (patch-ao) = 7e9573a99f70d8ba79f2fe4570869ad94d3fc78e
 SHA1 (patch-ap) = c313f11dfd4a7666702bfb943d5b699def360660
 SHA1 (patch-aq) = 28f845f4384fd04558e627d9f33eaf5529f5a780
-SHA1 (patch-ar) = 6aadb5af2abd18ec391cd3f3c26e1b476d955443
-SHA1 (patch-as) = de3c6633e410d5008a1dfbff0fb0ee5da7012816
-SHA1 (patch-at) = c275634d7e18b7c286adaf3ceefaa0a3b1139ff8
-SHA1 (patch-au) = 94aba2cdecfb14c1b4071fd84079621a3946ae65
diff --git a/databases/rrdtool/patches/patch-aa b/databases/rrdtool/patches/patch-aa
index 6b7d784116f..aa59492bec2 100644
--- a/databases/rrdtool/patches/patch-aa
+++ b/databases/rrdtool/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.4 2000/12/15 19:20:18 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2001/09/24 13:10:48 wulf Exp $
 
---- Makefile.in.orig	Thu Sep 14 15:27:45 2000
-+++ Makefile.in	Tue Dec  5 20:54:28 2000
-@@ -86,7 +86,7 @@
+--- Makefile.in.orig	Thu Feb 22 12:02:14 2001
++++ Makefile.in
+@@ -87,7 +87,7 @@
  RSYNC = rsync --rsh=ssh
  
  # build the following subdirectories
--SUBDIRS = cgilib-0.4 config gd1.3 zlib-1.1.3 libpng-1.0.6           src doc examples contrib tcl
+-SUBDIRS = cgilib-0.4 config gd1.3 zlib-1.1.3 libpng-1.0.9           src doc examples contrib tcl
 +SUBDIRS = config src doc examples contrib tcl
  
  
  # the following files are not mentioned in any other Makefile
-@@ -384,11 +384,12 @@
+@@ -385,11 +385,12 @@
  # lets schedule the perl stuff for installation
  # the special call to install-sh is because the -d switch is not portable
  install-data-local:
diff --git a/databases/rrdtool/patches/patch-ab b/databases/rrdtool/patches/patch-ab
index 0d0a88f03c2..a87f790caa8 100644
--- a/databases/rrdtool/patches/patch-ab
+++ b/databases/rrdtool/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2000/12/05 11:15:42 wulf Exp $
+$NetBSD: patch-ab,v 1.4 2001/09/24 13:10:48 wulf Exp $
 
---- examples/Makefile.in.orig	Thu Sep 14 15:34:30 2000
-+++ examples/Makefile.in	Tue Dec  5 20:57:15 2000
-@@ -91,7 +91,7 @@
+--- examples/Makefile.in.orig	Thu Feb 22 12:07:37 2001
++++ examples/Makefile.in
+@@ -92,7 +92,7 @@
  
  EXTRA_DIST = cgi-demo.cgi.in    piped-demo.pl.in   shared-demo.pl.in stripes.pl.in bigtops.pl.in minmax.pl.in
  
diff --git a/databases/rrdtool/patches/patch-ac b/databases/rrdtool/patches/patch-ac
index 33176ec2894..23821f5670f 100644
--- a/databases/rrdtool/patches/patch-ac
+++ b/databases/rrdtool/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2000/12/05 11:15:42 wulf Exp $
+$NetBSD: patch-ac,v 1.4 2001/09/24 13:10:48 wulf Exp $
 
---- contrib/Makefile.in.orig	Thu Sep 14 15:34:30 2000
-+++ contrib/Makefile.in	Tue Dec  5 20:57:18 2000
-@@ -86,7 +86,7 @@
+--- contrib/Makefile.in.orig	Thu Feb 22 12:07:39 2001
++++ contrib/Makefile.in
+@@ -87,7 +87,7 @@
  ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
  
- SUBDIRS = log2rrd rrd-file-icon trytime rrdproc rrdlastds add_ds killspike rrdfetchnames
+ SUBDIRS = trytime
 -contribdir = $(prefix)/contrib
 +contribdir = $(prefix)/share/rrdtool/contrib
  contrib_DATA = README
- EXTRA_DIST = clickgraphs php3 php4
+ EXTRA_DIST = rrdview log2rrd rrd-file-icon rrdproc rrdlastds add_ds killspike rrdfetchnames snmpstats rrdexplorer php3 php4
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/databases/rrdtool/patches/patch-ad b/databases/rrdtool/patches/patch-ad
index d8105b95c70..9400fec4e22 100644
--- a/databases/rrdtool/patches/patch-ad
+++ b/databases/rrdtool/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2000/12/05 11:15:42 wulf Exp $
+$NetBSD: patch-ad,v 1.4 2001/09/24 13:10:48 wulf Exp $
 
---- contrib/trytime/Makefile.in.orig	Thu Sep 14 15:34:34 2000
-+++ contrib/trytime/Makefile.in	Tue Dec  5 20:57:22 2000
-@@ -85,9 +85,9 @@
+--- contrib/trytime/Makefile.in.orig	Thu Feb 22 12:07:45 2001
++++ contrib/trytime/Makefile.in
+@@ -86,9 +86,9 @@
  VERSION = @VERSION@
  ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
  
diff --git a/databases/rrdtool/patches/patch-ae b/databases/rrdtool/patches/patch-ae
deleted file mode 100644
index 11750ee4850..00000000000
--- a/databases/rrdtool/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2000/12/05 11:15:42 wulf Exp $ 
-
---- contrib/rrd-file-icon/Makefile.in.orig	Thu Sep 14 15:34:33 2000
-+++ contrib/rrd-file-icon/Makefile.in	Tue Dec  5 20:57:24 2000
-@@ -86,7 +86,7 @@
- ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
- 
- EXTRA_DIST = rrd.png
--contribdir = $(prefix)/contrib/rrd-file-icon
-+contribdir = $(prefix)/share/rrdtool/contrib/rrd-file-icon
- contrib_DATA = README       rrd.png
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = ../../config/config.h
diff --git a/databases/rrdtool/patches/patch-af b/databases/rrdtool/patches/patch-af
deleted file mode 100644
index 628326c0300..00000000000
--- a/databases/rrdtool/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.3 2000/12/05 11:15:42 wulf Exp $
-
---- contrib/log2rrd/Makefile.in.orig	Thu Sep 14 15:34:32 2000
-+++ contrib/log2rrd/Makefile.in	Tue Dec  5 20:57:27 2000
-@@ -87,7 +87,7 @@
- 
- EXTRA_DIST = log2rrd.pl.in
- 
--contribdir = $(prefix)/contrib/log2rrd
-+contribdir = $(prefix)/share/rrdtool/contrib/log2rrd
- contrib_DATA = README
- contrib_SCRIPTS = log2rrd.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/databases/rrdtool/patches/patch-ag b/databases/rrdtool/patches/patch-ag
index 91262a95db2..206c048548e 100644
--- a/databases/rrdtool/patches/patch-ag
+++ b/databases/rrdtool/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.3 2000/12/05 11:15:42 wulf Exp $
+$NetBSD: patch-ag,v 1.4 2001/09/24 13:10:48 wulf Exp $
 
---- doc/Makefile.in.orig	Thu Sep 14 15:34:28 2000
-+++ doc/Makefile.in	Tue Dec  5 20:57:29 2000
-@@ -106,9 +106,9 @@
+--- doc/Makefile.in.orig	Thu Feb 22 12:07:35 2001
++++ doc/Makefile.in
+@@ -108,9 +108,9 @@
  EXTRA_DIST = $(POD) $(HTML) $(TXT)
  
  # some install rules
diff --git a/databases/rrdtool/patches/patch-ah b/databases/rrdtool/patches/patch-ah
index 858876fa1df..19a42412010 100644
--- a/databases/rrdtool/patches/patch-ah
+++ b/databases/rrdtool/patches/patch-ah
@@ -1,9 +1,9 @@
-$NetBSD: patch-ah,v 1.5 2000/12/05 11:15:42 wulf Exp $
+$NetBSD: patch-ah,v 1.6 2001/09/24 13:10:48 wulf Exp $
 
---- src/Makefile.in.orig	Thu Sep 14 15:34:27 2000
-+++ src/Makefile.in	Tue Dec  5 20:42:01 2000
-@@ -86,12 +86,7 @@
- TCL_SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@
+--- src/Makefile.in.orig	Thu Feb 22 12:07:34 2001
++++ src/Makefile.in
+@@ -87,12 +87,7 @@
+ TROFF = @TROFF@
  VERSION = @VERSION@
  
 -CGI_LIB_DIR = $(top_srcdir)/@CGI_LIB_DIR@
@@ -16,7 +16,7 @@ $NetBSD: patch-ah,v 1.5 2000/12/05 11:15:42 wulf Exp $
  
  #COMPILE   = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA)
  #LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA)
-@@ -107,7 +102,7 @@
+@@ -108,7 +103,7 @@
  # creates a ./.lib/*.al file that contains the PIC compiled object
  # files.
  
@@ -25,7 +25,7 @@ $NetBSD: patch-ah,v 1.5 2000/12/05 11:15:42 wulf Exp $
  
  
  lib_LTLIBRARIES = librrd.la
-@@ -142,18 +137,12 @@
+@@ -146,18 +141,12 @@
  DEFS = @DEFS@ -I. -I$(srcdir) -I../config
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
@@ -45,7 +45,7 @@ $NetBSD: patch-ah,v 1.5 2000/12/05 11:15:42 wulf Exp $
  librrd_private_la_OBJECTS =  gdpng.lo getopt.lo getopt1.lo gifsize.lo \
  parsetime.lo pngsize.lo rrd_create.lo rrd_diff.lo rrd_dump.lo \
  rrd_info.lo rrd_error.lo rrd_fetch.lo rrd_format.lo rrd_graph.lo \
-@@ -272,8 +261,8 @@
+@@ -279,8 +268,8 @@
  librrd.la: $(librrd_la_OBJECTS) $(librrd_la_DEPENDENCIES)
  	$(LINK) -rpath $(libdir) $(librrd_la_LDFLAGS) $(librrd_la_OBJECTS) $(librrd_la_LIBADD) $(LIBS)
  
@@ -56,7 +56,7 @@ $NetBSD: patch-ah,v 1.5 2000/12/05 11:15:42 wulf Exp $
  
  mostlyclean-binPROGRAMS:
  
-@@ -300,7 +289,7 @@
+@@ -307,7 +296,7 @@
  	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
  	done
  
@@ -65,76 +65,53 @@ $NetBSD: patch-ah,v 1.5 2000/12/05 11:15:42 wulf Exp $
  	@rm -f rrdcgi
  	$(LINK) $(rrdcgi_LDFLAGS) $(rrdcgi_OBJECTS) $(rrdcgi_LDADD) $(LIBS)
  
-@@ -367,49 +356,49 @@
+@@ -378,49 +367,6 @@
  	    || cp -p $$d/$$file $(distdir)/$$file || :; \
  	  fi; \
  	done
--gdpng.lo gdpng.o : gdpng.c ../libpng-1.0.6/png.h ../zlib-1.1.3/zlib.h \
--	../zlib-1.1.3/zconf.h ../libpng-1.0.6/pngconf.h ../gd1.3/gd.h
-+gdpng.lo gdpng.o : gdpng.c ${PREFIX}/include/png.h /usr/include/zlib.h \
-+	/usr/include/zconf.h ${PREFIX}/include/pngconf.h ${PREFIX}/include/gd.h
- getopt.lo getopt.o : getopt.c ../config/config.h getopt.h
- getopt1.lo getopt1.o : getopt1.c ../config/config.h getopt.h
- gifsize.lo gifsize.o : gifsize.c
- parsetime.lo parsetime.o : parsetime.c rrd_tool.h ../config/config.h \
+-gdpng.lo gdpng.o : gdpng.c ../libpng-1.0.9/png.h ../zlib-1.1.3/zlib.h \
+-	../zlib-1.1.3/zconf.h ../libpng-1.0.9/pngconf.h ../gd1.3/gd.h
+-getopt.lo getopt.o : getopt.c ../config/config.h getopt.h
+-getopt1.lo getopt1.o : getopt1.c ../config/config.h getopt.h
+-gifsize.lo gifsize.o : gifsize.c
+-parsetime.lo parsetime.o : parsetime.c rrd_tool.h ../config/config.h \
 -	rrd.h getopt.h rrd_format.h ../gd1.3/gd.h
--pngsize.lo pngsize.o : pngsize.c ../libpng-1.0.6/png.h \
+-pngsize.lo pngsize.o : pngsize.c ../libpng-1.0.9/png.h \
 -	../zlib-1.1.3/zlib.h ../zlib-1.1.3/zconf.h \
--	../libpng-1.0.6/pngconf.h
-+	rrd.h getopt.h rrd_format.h ${PREFIX}/include/gd.h
-+pngsize.lo pngsize.o : pngsize.c ${PREFIX}/include/png.h \
-+	/usr/include/zlib.h /usr/include/zconf.h \
-+	${PREFIX}/include/pngconf.h
- rrd_cgi.o: rrd_cgi.c rrd_tool.h ../config/config.h rrd.h getopt.h \
+-	../libpng-1.0.9/pngconf.h
+-rrd_cgi.o: rrd_cgi.c rrd_tool.h ../config/config.h rrd.h getopt.h \
 -	rrd_format.h ../gd1.3/gd.h ../cgilib-0.4/cgi.h
-+	rrd_format.h ${PREFIX}/include/gd.h ${PREFIX}/include/cgi.h
- rrd_create.lo rrd_create.o : rrd_create.c rrd_tool.h ../config/config.h \
+-rrd_create.lo rrd_create.o : rrd_create.c rrd_tool.h ../config/config.h \
 -	rrd.h getopt.h rrd_format.h ../gd1.3/gd.h
-+	rrd.h getopt.h rrd_format.h ${PREFIX}/include/gd.h
- rrd_diff.lo rrd_diff.o : rrd_diff.c rrd_tool.h ../config/config.h rrd.h \
+-rrd_diff.lo rrd_diff.o : rrd_diff.c rrd_tool.h ../config/config.h rrd.h \
 -	getopt.h rrd_format.h ../gd1.3/gd.h
-+	getopt.h rrd_format.h ${PREFIX}/include/gd.h
- rrd_dump.lo rrd_dump.o : rrd_dump.c rrd_tool.h ../config/config.h rrd.h \
+-rrd_dump.lo rrd_dump.o : rrd_dump.c rrd_tool.h ../config/config.h rrd.h \
 -	getopt.h rrd_format.h ../gd1.3/gd.h
-+	getopt.h rrd_format.h ${PREFIX}/include/gd.h
- rrd_error.lo rrd_error.o : rrd_error.c rrd_tool.h ../config/config.h \
+-rrd_error.lo rrd_error.o : rrd_error.c rrd_tool.h ../config/config.h \
 -	rrd.h getopt.h rrd_format.h ../gd1.3/gd.h
-+	rrd.h getopt.h rrd_format.h ${PREFIX}/include/gd.h
- rrd_fetch.lo rrd_fetch.o : rrd_fetch.c rrd_tool.h ../config/config.h \
+-rrd_fetch.lo rrd_fetch.o : rrd_fetch.c rrd_tool.h ../config/config.h \
 -	rrd.h getopt.h rrd_format.h ../gd1.3/gd.h
-+	rrd.h getopt.h rrd_format.h ${PREFIX}/include/gd.h
- rrd_format.lo rrd_format.o : rrd_format.c rrd_tool.h ../config/config.h \
+-rrd_format.lo rrd_format.o : rrd_format.c rrd_tool.h ../config/config.h \
 -	rrd.h getopt.h rrd_format.h ../gd1.3/gd.h
-+	rrd.h getopt.h rrd_format.h ${PREFIX}/include/gd.h
- rrd_graph.lo rrd_graph.o : rrd_graph.c rrd_tool.h ../config/config.h \
+-rrd_graph.lo rrd_graph.o : rrd_graph.c rrd_tool.h ../config/config.h \
 -	rrd.h getopt.h rrd_format.h ../gd1.3/gd.h \
 -	../gd1.3/gdlucidan10.h ../gd1.3/gdlucidab12.h
-+	rrd.h getopt.h rrd_format.h ${PREFIX}/include/gd.h \
-+	${PREFIX}/include/gdfontt.h ${PREFIX}/include/gdfonts.h
- rrd_info.lo rrd_info.o : rrd_info.c rrd_tool.h ../config/config.h rrd.h \
+-rrd_info.lo rrd_info.o : rrd_info.c rrd_tool.h ../config/config.h rrd.h \
 -	getopt.h rrd_format.h ../gd1.3/gd.h
-+	getopt.h rrd_format.h ${PREFIX}/include/gd.h
- rrd_last.lo rrd_last.o : rrd_last.c rrd_tool.h ../config/config.h rrd.h \
+-rrd_last.lo rrd_last.o : rrd_last.c rrd_tool.h ../config/config.h rrd.h \
 -	getopt.h rrd_format.h ../gd1.3/gd.h
-+	getopt.h rrd_format.h ${PREFIX}/include/gd.h
- rrd_open.lo rrd_open.o : rrd_open.c rrd_tool.h ../config/config.h rrd.h \
+-rrd_open.lo rrd_open.o : rrd_open.c rrd_tool.h ../config/config.h rrd.h \
 -	getopt.h rrd_format.h ../gd1.3/gd.h
-+	getopt.h rrd_format.h ${PREFIX}/include/gd.h
- rrd_resize.lo rrd_resize.o : rrd_resize.c rrd_tool.h ../config/config.h \
+-rrd_resize.lo rrd_resize.o : rrd_resize.c rrd_tool.h ../config/config.h \
 -	rrd.h getopt.h rrd_format.h ../gd1.3/gd.h
-+	rrd.h getopt.h rrd_format.h ${PREFIX}/include/gd.h
- rrd_restore.lo rrd_restore.o : rrd_restore.c rrd_tool.h \
+-rrd_restore.lo rrd_restore.o : rrd_restore.c rrd_tool.h \
 -	../config/config.h rrd.h getopt.h rrd_format.h ../gd1.3/gd.h
-+	../config/config.h rrd.h getopt.h rrd_format.h ${PREFIX}/include/gd.h
- rrd_tool.o: rrd_tool.c rrd_tool.h ../config/config.h rrd.h getopt.h \
+-rrd_tool.o: rrd_tool.c rrd_tool.h ../config/config.h rrd.h getopt.h \
 -	rrd_format.h ../gd1.3/gd.h
-+	rrd_format.h ${PREFIX}/include/gd.h
- rrd_tune.lo rrd_tune.o : rrd_tune.c rrd_tool.h ../config/config.h rrd.h \
+-rrd_tune.lo rrd_tune.o : rrd_tune.c rrd_tool.h ../config/config.h rrd.h \
 -	getopt.h rrd_format.h ../gd1.3/gd.h
-+	getopt.h rrd_format.h ${PREFIX}/include/gd.h
- rrd_update.lo rrd_update.o : rrd_update.c rrd_tool.h ../config/config.h \
+-rrd_update.lo rrd_update.o : rrd_update.c rrd_tool.h ../config/config.h \
 -	rrd.h getopt.h rrd_format.h ../gd1.3/gd.h
-+	rrd.h getopt.h rrd_format.h ${PREFIX}/include/gd.h
  
  info-am:
  info: info-am
diff --git a/databases/rrdtool/patches/patch-ai b/databases/rrdtool/patches/patch-ai
index e186cb7de77..b581e9bb5e9 100644
--- a/databases/rrdtool/patches/patch-ai
+++ b/databases/rrdtool/patches/patch-ai
@@ -1,25 +1,35 @@
-$NetBSD: patch-ai,v 1.3 2000/12/05 11:15:42 wulf Exp $
+$NetBSD: patch-ai,v 1.4 2001/09/24 13:10:48 wulf Exp $
 
---- src/rrd_graph.c.orig	Thu Sep 14 15:34:00 2000
-+++ src/rrd_graph.c	Tue Dec  5 20:57:36 2000
-@@ -6,12 +6,12 @@
+--- src/rrd_graph.c.orig	Thu Feb 22 12:02:47 2001
++++ src/rrd_graph.c
+@@ -6,16 +6,26 @@
  
  #include "rrd_tool.h"
  #include <gd.h>
--#include <gdlucidan10.h>
--#include <gdlucidab12.h>
-+#include <gdfontt.h>
++#ifdef __NetBSD__
 +#include <gdfonts.h>
++#include <gdfontt.h>
++#else
+ #include <gdlucidan10.h>
+ #include <gdlucidab12.h>
++#endif
  #include <sys/stat.h>
+ #ifdef WIN32
+ #include <io.h>
+ #include <fcntl.h>
+ #endif
  
--#define SmallFont gdLucidaNormal10
--#define LargeFont gdLucidaBold12
++#ifdef __NetBSD__
 +#define SmallFont gdFontTiny
 +#define LargeFont gdFontSmall
++#else
+ #define SmallFont gdLucidaNormal10
+ #define LargeFont gdLucidaBold12
++#endif
  
  /* #define DEBUG */
  
-@@ -38,7 +38,7 @@
+@@ -45,7 +55,7 @@
  	    OP_MIN,OP_MAX,OP_LIMIT, OP_FLOOR, OP_CEIL,
  	    OP_UN,OP_END};
  
@@ -28,7 +38,7 @@ $NetBSD: patch-ai,v 1.3 2000/12/05 11:15:42 wulf Exp $
  
  typedef struct rpnp_t {
      enum op_en   op;
-@@ -340,7 +340,6 @@
+@@ -354,7 +364,6 @@
  
  enum if_en if_conv(char *string){
      
@@ -36,7 +46,7 @@ $NetBSD: patch-ai,v 1.3 2000/12/05 11:15:42 wulf Exp $
      conv_if(PNG,IF_PNG)
  
      return (-1);
-@@ -2309,9 +2308,6 @@
+@@ -2437,9 +2446,6 @@
      if ((fd = fopen(im->graphfile,"rb")) == NULL) 
        return 0; /* the file does not exist */
      switch (im->imgformat) {
@@ -46,7 +56,7 @@ $NetBSD: patch-ai,v 1.3 2000/12/05 11:15:42 wulf Exp $
      case IF_PNG:
  	size = PngSize(fd,&(im->xgif),&(im->ygif));
  	break;
-@@ -2570,9 +2566,6 @@
+@@ -2703,9 +2709,6 @@
  	}
      }
      switch (im->imgformat) {
@@ -56,7 +66,7 @@ $NetBSD: patch-ai,v 1.3 2000/12/05 11:15:42 wulf Exp $
      case IF_PNG:
  	gdImagePng(gif, fo);    
  	break;
-@@ -2687,7 +2680,7 @@
+@@ -2828,7 +2831,7 @@
      im.prt_c = 0;
      im.gdes_c = 0;
      im.gdes = NULL;
diff --git a/databases/rrdtool/patches/patch-aj b/databases/rrdtool/patches/patch-aj
index 3c9aab48083..d9aa1e88883 100644
--- a/databases/rrdtool/patches/patch-aj
+++ b/databases/rrdtool/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $
+$NetBSD: patch-aj,v 1.2 2001/09/24 13:10:48 wulf Exp $
 
---- src/rrd_cgi.c.ORIG	Fri Nov  5 00:20:16 1999
-+++ src/rrd_cgi.c	Fri Nov  5 00:21:26 1999
+--- src/rrd_cgi.c.orig	Thu Feb 22 12:02:47 2001
++++ src/rrd_cgi.c
 @@ -12,7 +12,7 @@
  #define MEMBLK 1024
  
diff --git a/databases/rrdtool/patches/patch-ak b/databases/rrdtool/patches/patch-ak
index f83ff81514e..f7e9ea25c75 100644
--- a/databases/rrdtool/patches/patch-ak
+++ b/databases/rrdtool/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.4 2001/05/06 01:09:34 fredb Exp $
+$NetBSD: patch-ak,v 1.5 2001/09/24 13:10:48 wulf Exp $
 
 --- perl-shared/Makefile.PL.orig	Thu Jul 13 16:22:17 2000
 +++ perl-shared/Makefile.PL
@@ -12,6 +12,6 @@ $NetBSD: patch-ak,v 1.4 2001/05/06 01:09:34 fredb Exp $
      # Perl will figure out which one is valid
      'depend'	   => {'RRDs.c' => "../src/.libs/librrd_private.a"},
 -    'dynamic_lib'  => {'OTHERLDFLAGS' => "$librrd -lm"},
-+    'dynamic_lib'  => {'OTHERLDFLAGS' => '-L${X11BASE}/lib -L${X11PREFIX}/lib '."$librrd -lcgi -lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 -lintl"},
++    'dynamic_lib'  => {'OTHERLDFLAGS' => '-Wl,-R/usr/pkg/lib -L${X11BASE}/lib -L${X11PREFIX}/lib '."$librrd -lcgi -lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 -lintl"},
      'realclean'    => {FILES => 't/demo?.rrd t/demo?.gif' }
  );
diff --git a/databases/rrdtool/patches/patch-ao b/databases/rrdtool/patches/patch-ao
deleted file mode 100644
index ce567aaca41..00000000000
--- a/databases/rrdtool/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2000/12/05 11:15:42 wulf Exp $
-
---- contrib/rrdproc/Makefile.in.orig	Thu Sep 14 15:34:35 2000
-+++ contrib/rrdproc/Makefile.in	Tue Dec  5 20:57:56 2000
-@@ -86,7 +86,7 @@
- ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
- 
- EXTRA_DIST = rrdproc.c
--contribdir = $(prefix)/contrib/rrdproc
-+contribdir = $(prefix)/share/rrdtool/contrib/rrdproc
- contrib_DATA = README rrdproc.c
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = ../../config/config.h
diff --git a/databases/rrdtool/patches/patch-ar b/databases/rrdtool/patches/patch-ar
deleted file mode 100644
index cba221c71cc..00000000000
--- a/databases/rrdtool/patches/patch-ar
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ar,v 1.2 2000/12/05 11:15:42 wulf Exp $
-
---- contrib/add_ds/Makefile.in.orig	Thu Sep 14 15:34:36 2000
-+++ contrib/add_ds/Makefile.in	Tue Dec  5 20:58:06 2000
-@@ -87,7 +87,7 @@
- 
- EXTRA_DIST = add_ds.pl.in batch.pl.in
- 
--contribdir = $(prefix)/contrib/add_ds
-+contribdir = $(prefix)/share/rrdtool/contrib/add_ds
- contrib_DATA = README
- contrib_SCRIPTS = add_ds.pl  batch.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/databases/rrdtool/patches/patch-as b/databases/rrdtool/patches/patch-as
deleted file mode 100644
index 218152ea4c5..00000000000
--- a/databases/rrdtool/patches/patch-as
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.2 2000/12/05 11:15:42 wulf Exp $
-
---- contrib/killspike/Makefile.in.orig	Thu Sep 14 15:34:36 2000
-+++ contrib/killspike/Makefile.in	Tue Dec  5 20:58:09 2000
-@@ -87,7 +87,7 @@
- 
- EXTRA_DIST = killspike.pl.in
- 
--contribdir = $(prefix)/contrib/killspike
-+contribdir = $(prefix)/share/rrdtool/contrib/killspike
- contrib_DATA = README
- contrib_SCRIPTS = killspike.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/databases/rrdtool/patches/patch-at b/databases/rrdtool/patches/patch-at
deleted file mode 100644
index 4b78d773f9a..00000000000
--- a/databases/rrdtool/patches/patch-at
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-at,v 1.2 2000/12/05 11:15:42 wulf Exp $
-
---- contrib/rrdfetchnames/Makefile.in.orig	Thu Sep 14 15:34:37 2000
-+++ contrib/rrdfetchnames/Makefile.in	Tue Dec  5 20:58:12 2000
-@@ -87,7 +87,7 @@
- 
- EXTRA_DIST = rrdfetchnames.pl.in
- 
--contribdir = $(prefix)/contrib/rrdfetchnames
-+contribdir = $(prefix)/share/rrdtool/contrib/rrdfetchnames
- contrib_DATA = README
- contrib_SCRIPTS = rrdfetchnames.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/databases/rrdtool/patches/patch-au b/databases/rrdtool/patches/patch-au
deleted file mode 100644
index f68b96ea42a..00000000000
--- a/databases/rrdtool/patches/patch-au
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-au,v 1.2 2000/12/05 11:15:42 wulf Exp $
-
---- contrib/rrdlastds/Makefile.in.orig	Thu Sep 14 15:34:35 2000
-+++ contrib/rrdlastds/Makefile.in	Tue Dec  5 20:58:16 2000
-@@ -87,7 +87,7 @@
- 
- EXTRA_DIST = rrdlastds.pl.in
- 
--contribdir = $(prefix)/contrib/rrdlastds
-+contribdir = $(prefix)/share/rrdtool/contrib/rrdlastds
- contrib_DATA = README
- contrib_SCRIPTS = rrdlastds.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/databases/rrdtool/pkg/PLIST b/databases/rrdtool/pkg/PLIST
index 61dcf706ca1..02546d2cf7c 100644
--- a/databases/rrdtool/pkg/PLIST
+++ b/databases/rrdtool/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.9 2001/01/04 15:10:25 agc Exp $
+@comment $NetBSD: PLIST,v 1.10 2001/09/24 13:10:49 wulf Exp $
 bin/rrdcgi
 bin/rrdtool
+bin/rrdupdate
 bin/trytime
 include/rrd.h
 lib/librrd.a
@@ -25,6 +26,7 @@ man/man1/rrdrestore.1
 man/man1/rrdtool.1
 man/man1/rrdtune.1
 man/man1/rrdtutorial.1
+man/man1/rrdtutorial.es.1
 man/man1/rrdupdate.1
 share/doc/rrdtool/RRDp.html
 share/doc/rrdtool/RRDp.txt
@@ -72,6 +74,9 @@ share/doc/rrdtool/rrdtool.txt
 share/doc/rrdtool/rrdtune.html
 share/doc/rrdtool/rrdtune.pod
 share/doc/rrdtool/rrdtune.txt
+share/doc/rrdtool/rrdtutorial.es.html
+share/doc/rrdtool/rrdtutorial.es.pod
+share/doc/rrdtool/rrdtutorial.es.txt
 share/doc/rrdtool/rrdtutorial.html
 share/doc/rrdtool/rrdtutorial.pod
 share/doc/rrdtool/rrdtutorial.txt
@@ -85,21 +90,6 @@ share/examples/rrdtool/piped-demo.pl
 share/examples/rrdtool/shared-demo.pl
 share/examples/rrdtool/stripes.pl
 share/rrdtool/contrib/README
-share/rrdtool/contrib/add_ds/README
-share/rrdtool/contrib/add_ds/add_ds.pl
-share/rrdtool/contrib/add_ds/batch.pl
-share/rrdtool/contrib/killspike/README
-share/rrdtool/contrib/killspike/killspike.pl
-share/rrdtool/contrib/log2rrd/README
-share/rrdtool/contrib/log2rrd/log2rrd.pl
-share/rrdtool/contrib/rrd-file-icon/README
-share/rrdtool/contrib/rrd-file-icon/rrd.png
-share/rrdtool/contrib/rrdfetchnames/README
-share/rrdtool/contrib/rrdfetchnames/rrdfetchnames.pl
-share/rrdtool/contrib/rrdlastds/README
-share/rrdtool/contrib/rrdlastds/rrdlastds.pl
-share/rrdtool/contrib/rrdproc/README
-share/rrdtool/contrib/rrdproc/rrdproc.c
 share/rrdtool/contrib/trytime/README
 share/rrdtool/contrib/trytime/trytime.c
 share/rrdtool/lib/perl/RRDp.pm
@@ -111,13 +101,6 @@ share/rrdtool/lib/perl/auto/RRDs/RRDs.so
 @dirrm share/rrdtool/lib/perl
 @dirrm share/rrdtool/lib
 @dirrm share/rrdtool/contrib/trytime
-@dirrm share/rrdtool/contrib/rrdproc
-@dirrm share/rrdtool/contrib/rrdlastds
-@dirrm share/rrdtool/contrib/rrdfetchnames
-@dirrm share/rrdtool/contrib/rrd-file-icon
-@dirrm share/rrdtool/contrib/log2rrd
-@dirrm share/rrdtool/contrib/killspike
-@dirrm share/rrdtool/contrib/add_ds
 @dirrm share/rrdtool/contrib
 @dirrm share/rrdtool
 @dirrm share/examples/rrdtool