Update of rrdtool to 1.2.9:

Major Changes between 1.0.x and 1.2.x

Graphing
--------

* rewritten graphics generation based on libart.
  - anti-aliased output
  - alpha transparency support
  - truetype fonts

* additional graphics formats: EPS, PDF, SVG

* extended multi-part documentation

* VDEF support; define and use variables.  Find, and use, the
   maximum rate seen by rrdtool; compute and show the average

* Sliding window (trend) analysis
  Compute a smoother average, for instance over the last 6 CDPs

* percentile (95th or other)
  Remove peaks, 95 percent of all rates are at or below the returned value

Logging
-------
* a second logging interface: rrdtool updatev
  Verbose updating of the database; show CPDs being created

* Aberrant Behavior Detection with Holt-Winters Forecasting
  Compare current data with expected data, detect and log when
  the rates are outside expected levels

* COMPUTE data type for artificial data-sources calculating their
  input using RPN math and data from the other data-sources.

29 files changed, 174 insertions, 1032 deletions

diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 321c5230a4a..5eb2995744b 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2005/05/22 20:07:46 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2005/07/03 15:23:33 wulf Exp $
 #
 
-DISTNAME=	rrdtool-1.0.40
-PKGREVISION=	4
+DISTNAME=	rrdtool-1.2.9
 CATEGORIES=	databases graphics net
 MASTER_SITES=	http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/pub/
 
@@ -24,15 +23,17 @@ PERL5_CONFIGURE=	NO
 PERL5_PACKLIST+= 	${PERL5_SITEARCH}/auto/RRDp/.packlist
 PERL5_PACKLIST+=	${PERL5_SITEARCH}/auto/RRDs/.packlist
 
-INSTALL_DIRS=	${WRKSRC} ${WRKSRC}/perl-piped ${WRKSRC}/perl-shared
+#INSTALL_DIRS=		${WRKSRC} \
+#			${WRKSRC}/bindings/perl-piped \
+#			${WRKSRC}/bindings/perl-shared
 
-# remove this or else it is installed
-post-extract:
-	${RM} ${WRKSRC}/perl-shared/ntmake.pl
+#post-extract:
+#	${RM} ${WRKSRC}/bindings/perl-shared/ntmake.pl
 
-.include "../../graphics/freetype-lib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/gd/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/libart2/buildlink3.mk"
 .include "../../www/cgilib/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/rrdtool/PLIST b/databases/rrdtool/PLIST
index 627db85c81f..0cc9e9e8030 100644
--- a/databases/rrdtool/PLIST
+++ b/databases/rrdtool/PLIST
@@ -1,58 +1,73 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:23 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/07/03 15:23:33 wulf Exp $
 bin/rrdcgi
 bin/rrdtool
 bin/rrdupdate
-bin/trytime
 include/rrd.h
 lib/librrd.la
-man/man1/RRDp.1
-man/man1/RRDs.1
+lib/librrd_th.la
 man/man1/bin_dec_hex.1
 man/man1/cdeftutorial.1
 man/man1/rpntutorial.1
+man/man1/rrd-beginners.1
+man/man1/rrdbuild.1
 man/man1/rrdcgi.1
 man/man1/rrdcreate.1
 man/man1/rrddump.1
 man/man1/rrdfetch.1
+man/man1/rrdfirst.1
 man/man1/rrdgraph.1
+man/man1/rrdgraph_data.1
+man/man1/rrdgraph_examples.1
+man/man1/rrdgraph_graph.1
+man/man1/rrdgraph_rpn.1
 man/man1/rrdinfo.1
 man/man1/rrdlast.1
 man/man1/rrdresize.1
 man/man1/rrdrestore.1
+man/man1/rrdthreads.1
 man/man1/rrdtool.1
 man/man1/rrdtune.1
 man/man1/rrdtutorial.1
-man/man1/rrdtutorial.es.1
 man/man1/rrdupdate.1
 man/man1/rrdxport.1
-share/doc/html/rrdtool/RRDp.html
-share/doc/html/rrdtool/RRDs.html
-share/doc/html/rrdtool/bin_dec_hex.html
-share/doc/html/rrdtool/cdeftutorial.html
-share/doc/html/rrdtool/rpntutorial.html
-share/doc/html/rrdtool/rrdcgi.html
-share/doc/html/rrdtool/rrdcreate.html
-share/doc/html/rrdtool/rrddump.html
-share/doc/html/rrdtool/rrdfetch.html
-share/doc/html/rrdtool/rrdgraph.html
-share/doc/html/rrdtool/rrdinfo.html
-share/doc/html/rrdtool/rrdlast.html
-share/doc/html/rrdtool/rrdresize.html
-share/doc/html/rrdtool/rrdrestore.html
-share/doc/html/rrdtool/rrdtool.html
-share/doc/html/rrdtool/rrdtune.html
-share/doc/html/rrdtool/rrdtutorial.es.html
-share/doc/html/rrdtool/rrdtutorial.html
-share/doc/html/rrdtool/rrdupdate.html
-share/doc/html/rrdtool/rrdxport.html
-share/doc/rrdtool/RRDp.txt
-share/doc/rrdtool/RRDs.txt
+share/rrdtool/fonts/DejaVuSansMono-Roman.ttf
+share/doc/rrdtool/html/RRDp.html
+share/doc/rrdtool/html/RRDs.html
+share/doc/rrdtool/html/bin_dec_hex.html
+share/doc/rrdtool/html/cdeftutorial.html
+share/doc/rrdtool/html/rpntutorial.html
+share/doc/rrdtool/html/rrd-beginners.html
+share/doc/rrdtool/html/rrdbuild.html
+share/doc/rrdtool/html/rrdcgi.html
+share/doc/rrdtool/html/rrdcreate.html
+share/doc/rrdtool/html/rrddump.html
+share/doc/rrdtool/html/rrdfetch.html
+share/doc/rrdtool/html/rrdfirst.html
+share/doc/rrdtool/html/rrdgraph.html
+share/doc/rrdtool/html/rrdgraph_data.html
+share/doc/rrdtool/html/rrdgraph_examples.html
+share/doc/rrdtool/html/rrdgraph_graph.html
+share/doc/rrdtool/html/rrdgraph_rpn.html
+share/doc/rrdtool/html/rrdinfo.html
+share/doc/rrdtool/html/rrdlast.html
+share/doc/rrdtool/html/rrdresize.html
+share/doc/rrdtool/html/rrdrestore.html
+share/doc/rrdtool/html/rrdthreads.html
+share/doc/rrdtool/html/rrdtool.html
+share/doc/rrdtool/html/rrdtune.html
+share/doc/rrdtool/html/rrdtutorial.html
+share/doc/rrdtool/html/rrdupdate.html
+share/doc/rrdtool/html/rrdxport.html
 share/doc/rrdtool/bin_dec_hex.pod
 share/doc/rrdtool/bin_dec_hex.txt
 share/doc/rrdtool/cdeftutorial.pod
 share/doc/rrdtool/cdeftutorial.txt
 share/doc/rrdtool/rpntutorial.pod
 share/doc/rrdtool/rpntutorial.txt
+share/doc/rrdtool/rrd-beginners.pod
+share/doc/rrdtool/rrd-beginners.txt
+share/doc/rrdtool/rrdbuild.pod
+share/doc/rrdtool/rrdbuild.txt
 share/doc/rrdtool/rrdcgi.pod
 share/doc/rrdtool/rrdcgi.txt
 share/doc/rrdtool/rrdcreate.pod
@@ -61,8 +76,18 @@ share/doc/rrdtool/rrddump.pod
 share/doc/rrdtool/rrddump.txt
 share/doc/rrdtool/rrdfetch.pod
 share/doc/rrdtool/rrdfetch.txt
+share/doc/rrdtool/rrdfirst.pod
+share/doc/rrdtool/rrdfirst.txt
 share/doc/rrdtool/rrdgraph.pod
 share/doc/rrdtool/rrdgraph.txt
+share/doc/rrdtool/rrdgraph_data.pod
+share/doc/rrdtool/rrdgraph_data.txt
+share/doc/rrdtool/rrdgraph_examples.pod
+share/doc/rrdtool/rrdgraph_examples.txt
+share/doc/rrdtool/rrdgraph_graph.pod
+share/doc/rrdtool/rrdgraph_graph.txt
+share/doc/rrdtool/rrdgraph_rpn.pod
+share/doc/rrdtool/rrdgraph_rpn.txt
 share/doc/rrdtool/rrdinfo.pod
 share/doc/rrdtool/rrdinfo.txt
 share/doc/rrdtool/rrdlast.pod
@@ -71,30 +96,28 @@ share/doc/rrdtool/rrdresize.pod
 share/doc/rrdtool/rrdresize.txt
 share/doc/rrdtool/rrdrestore.pod
 share/doc/rrdtool/rrdrestore.txt
+share/doc/rrdtool/rrdthreads.pod
+share/doc/rrdtool/rrdthreads.txt
 share/doc/rrdtool/rrdtool.pod
 share/doc/rrdtool/rrdtool.txt
 share/doc/rrdtool/rrdtune.pod
 share/doc/rrdtool/rrdtune.txt
-share/doc/rrdtool/rrdtutorial.es.pod
-share/doc/rrdtool/rrdtutorial.es.txt
 share/doc/rrdtool/rrdtutorial.pod
 share/doc/rrdtool/rrdtutorial.txt
 share/doc/rrdtool/rrdupdate.pod
 share/doc/rrdtool/rrdupdate.txt
 share/doc/rrdtool/rrdxport.pod
 share/doc/rrdtool/rrdxport.txt
+share/examples/rrdtool/4charts.pl
 share/examples/rrdtool/bigtops.pl
 share/examples/rrdtool/cgi-demo.cgi
 share/examples/rrdtool/minmax.pl
 share/examples/rrdtool/piped-demo.pl
 share/examples/rrdtool/shared-demo.pl
 share/examples/rrdtool/stripes.pl
-share/rrdtool/contrib/README
-share/rrdtool/contrib/trytime/README
-share/rrdtool/contrib/trytime/trytime.c
-@dirrm share/rrdtool/contrib/trytime
-@dirrm share/rrdtool/contrib
-@dirrm share/rrdtool
 @dirrm share/examples/rrdtool
+@dirrm share/rrdtool/fonts
+@dirrm share/rrdtool
+@dirrm share/doc/rrdtool/html
 @dirrm share/doc/rrdtool
-@dirrm share/doc/html/rrdtool
+@dirrm shared
diff --git a/databases/rrdtool/buildlink3.mk b/databases/rrdtool/buildlink3.mk
index 792e74a6cc2..66ebf41898f 100644
--- a/databases/rrdtool/buildlink3.mk
+++ b/databases/rrdtool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:13:23 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2005/07/03 15:23:33 wulf Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RRDTOOL_BUILDLINK3_MK:=	${RRDTOOL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrrdtool}
 BUILDLINK_PACKAGES+=	rrdtool
 
 .if !empty(RRDTOOL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.rrdtool+=	rrdtool>=1.0.40
-BUILDLINK_RECOMMENDED.rrdtool+=	rrdtool>=1.0.40nb4
+BUILDLINK_DEPENDS.rrdtool+=	rrdtool>=1.2.9
+BUILDLINK_RECOMMENDED.rrdtool+=	rrdtool>=1.2.9
 BUILDLINK_PKGSRCDIR.rrdtool?=	../../databases/rrdtool
 .endif	# RRDTOOL_BUILDLINK3_MK
 
diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
index f248a22c0c4..9b10fbd6145 100644
--- a/databases/rrdtool/distinfo
+++ b/databases/rrdtool/distinfo
@@ -1,30 +1,12 @@
-$NetBSD: distinfo,v 1.11 2005/02/23 16:33:09 agc Exp $
+$NetBSD: distinfo,v 1.12 2005/07/03 15:23:33 wulf Exp $
 
-SHA1 (rrdtool-1.0.40.tar.gz) = 6ad5265826049868663d0f3b4e2ef8f2f1aa06ed
-RMD160 (rrdtool-1.0.40.tar.gz) = 62db990c9e463d348d694d26f4cd001525d60d5b
-Size (rrdtool-1.0.40.tar.gz) = 1148458 bytes
-SHA1 (patch-aa) = 755863a0d29a0ffce6693bf945b460dba62e91c9
-SHA1 (patch-ab) = 1aa7fd5425772432ec2a561f5f871687a6ffe1b8
-SHA1 (patch-ac) = 2500bfecde03c61ae28ec9c5e17468309976b9f2
-SHA1 (patch-ad) = 2d2e870550847388c5269f4ef134a263e860231d
-SHA1 (patch-ae) = c601085922b63c033cf4ec8f50513fd3dc3368e0
-SHA1 (patch-af) = c961a8bad08a7ce2bd889b9b88290e61efaf0bef
-SHA1 (patch-ag) = 638781345cc4309b9754d1606c50c63e49564379
-SHA1 (patch-ah) = 8cf7f9e74f32c3c742c0b988da85f7acfdc6dc5a
-SHA1 (patch-ai) = f00a1114a048dcfa9f5ef5e31cfdf6e852c680fe
-SHA1 (patch-aj) = abbfacd273192dafec13f2f942eef26fd8d1f0a3
-SHA1 (patch-ak) = c26304c6aa926dbea7a2d26c38c6e76177d968a0
-SHA1 (patch-al) = 5293431b7966b25c48c624c6b7d0a4e86a5f70d2
-SHA1 (patch-am) = a48ad230b9a9a2d18dabd747e6759aa1e211831f
-SHA1 (patch-an) = 9b0e279929549d22187f1b24512e939b965f76c2
-SHA1 (patch-ao) = 88cd4b0b43782338145c1ee40bc1349a120a9676
-SHA1 (patch-ap) = 47e1b9619af73a73b3b141f5496fba1068b8eea9
-SHA1 (patch-aq) = 68aebe6c28a7bf4c93ff9196709a2b99c8b8a010
-SHA1 (patch-ar) = 18bd27b8d9bda4480d98be07a5c63c4f0667494f
-SHA1 (patch-as) = c81106bffd2be89d98a121b136516a2c5c5ce012
-SHA1 (patch-at) = 4a832681eb46c81ce957846368981e50a3b96769
-SHA1 (patch-au) = 7633d5a70004f10629b6076c5897dc9af0cec59e
-SHA1 (patch-av) = 00ab5347cf668347e3f816f21c0d9800a5726eb0
-SHA1 (patch-aw) = 19244da8f514245b171216babd5f1404f2e2ff43
-SHA1 (patch-ax) = 893f84787012fc2ef98a408f847d378c70b63967
-SHA1 (patch-ay) = fe21c6adab6591a4770b2875620712d6135a2dda
+SHA1 (rrdtool-1.2.9.tar.gz) = 281f4ce3adf322e8eee986ba201c3c2645877101
+RMD160 (rrdtool-1.2.9.tar.gz) = 048f21d30a0b78761da4bbca2a7305d8f8d0a35e
+Size (rrdtool-1.2.9.tar.gz) = 901199 bytes
+SHA1 (patch-aj) = 9390c7576c707779b3948150a587a0d3501959c5
+SHA1 (patch-al) = f3334c24eba97f3eacbbca51c56c5340f4e8b01a
+SHA1 (patch-ap) = 8960b74dbaafdd9f37a5bbffc97f04fbe2ad9eca
+SHA1 (patch-as) = a3320a652f09b6f818903fcec997d3d559d36fa0
+SHA1 (patch-av) = 2e2a626c8bbc78671ff7e834cb229f4a1b0c35c3
+SHA1 (patch-aw) = ff19b160da8170117cc9a3567709efcd80e6984e
+SHA1 (patch-ay) = 30f2e1b3d7c720900da2168eb6874b1dcf6697f1
diff --git a/databases/rrdtool/patches/patch-aa b/databases/rrdtool/patches/patch-aa
deleted file mode 100644
index 62a7538d6c2..00000000000
--- a/databases/rrdtool/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2003/02/16 23:08:56 seb Exp $
-
---- Makefile.am.orig	Thu Mar 21 21:55:56 2002
-+++ Makefile.am
-@@ -2,7 +2,7 @@
- RSYNC = rsync --rsh=ssh
- 
- # build the following subdirectories
--SUBDIRS = cgilib-0.4 config gd1.3 zlib-1.1.4 libpng-1.0.9 \
-+SUBDIRS = config \
-           src doc examples contrib tcl
- 
- # the following files are not mentioned in any other Makefile
-@@ -14,16 +14,6 @@ EXTRA_DIST = COPYRIGHT CHANGES NT-BUILD-
-  perl-shared/rrdpl.ds? perl-shared/RRDs.pm
- 
- CLEANFILES = config.cache
--
--# lets schedule the perl stuff for installation
--# the special call to install-sh is because the -d switch is not portable
--install-data-local:
--	$(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
--	$(INSTALL) -m 644 perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
--	$(INSTALL) -m 644 perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
--	$(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
--	$(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
--
- 
- # use relaxed rules when building dists
- AUTOMAKE_OPTIONS= foreign no-dependencies
diff --git a/databases/rrdtool/patches/patch-ab b/databases/rrdtool/patches/patch-ab
deleted file mode 100644
index 436236dd197..00000000000
--- a/databases/rrdtool/patches/patch-ab
+++ /dev/null
@@ -1,157 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2003/02/16 23:08:56 seb Exp $
-
---- Makefile.in.orig	Fri Oct 11 18:39:31 2002
-+++ Makefile.in
-@@ -88,7 +88,7 @@ ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
- RSYNC = rsync --rsh=ssh
- 
- # build the following subdirectories
--SUBDIRS = cgilib-0.4 config gd1.3 zlib-1.1.4 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
-@@ -114,20 +114,20 @@ PERL_CLONE = mkdir \$${P_DIR} 		&& cd \$
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = ./config/config.h
- CONFIG_CLEAN_FILES = 
--DIST_COMMON =  README COPYING Makefile.am Makefile.in TODO \
--config/config.h.in config/stamp-h.in configure configure.in
-+DIST_COMMON =  README COPYING Makefile.am Makefile.in TODO configure \
-+configure.in
- 
- 
- PACKAGE = @PACKAGE@
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- all: all-redirect
- .SUFFIXES:
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
-+	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
- 
- Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) \
-@@ -139,34 +139,6 @@ config.status: $(srcdir)/configure $(CON
- $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
- 	cd $(srcdir) && $(AUTOCONF)
- 
--config/config.h: config/stamp-h
--	@if test ! -f $@; then \
--		rm -f config/stamp-h; \
--		$(MAKE) config/stamp-h; \
--	else :; fi
--config/stamp-h: $(srcdir)/config/config.h.in $(top_builddir)/config.status
--	cd $(top_builddir) \
--	  && CONFIG_FILES= CONFIG_HEADERS=config/config.h \
--	     $(SHELL) ./config.status
--	@echo timestamp > config/stamp-h 2> /dev/null
--$(srcdir)/config/config.h.in: $(srcdir)/config/stamp-h.in
--	@if test ! -f $@; then \
--		rm -f $(srcdir)/config/stamp-h.in; \
--		$(MAKE) $(srcdir)/config/stamp-h.in; \
--	else :; fi
--$(srcdir)/config/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOHEADER)
--	@echo timestamp > $(srcdir)/config/stamp-h.in 2> /dev/null
--
--mostlyclean-hdr:
--
--clean-hdr:
--
--distclean-hdr:
--	-rm -f config/config.h
--
--maintainer-clean-hdr:
--
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
-@@ -299,7 +271,7 @@ distdir: $(DISTFILES)
- 	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    cp -pr $$/$$file $(distdir)/$$file; \
- 	  else \
- 	    test -f $(distdir)/$$file \
- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-@@ -327,7 +299,7 @@ installcheck: installcheck-recursive
- install-exec-am:
- install-exec: install-exec-recursive
- 
--install-data-am: install-data-local
-+install-data-am:
- install-data: install-data-recursive
- 
- install-am: all-am
-@@ -353,51 +325,41 @@ distclean-generic:
- 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
- 
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
-+mostlyclean-am:  mostlyclean-tags mostlyclean-generic
- 
- mostlyclean: mostlyclean-recursive
- 
--clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am clean-local
-+clean-am:  clean-tags clean-generic mostlyclean-am clean-local
- 
- clean: clean-recursive
- 
--distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
-+distclean-am:  distclean-tags distclean-generic clean-am
- 	-rm -f libtool
- 
- distclean: distclean-recursive
- 	-rm -f config.status
- 
--maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
--		maintainer-clean-generic distclean-am
-+maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-+		distclean-am
- 	@echo "This command is intended for maintainers to use;"
- 	@echo "it deletes files that may require special tools to rebuild."
- 
- maintainer-clean: maintainer-clean-recursive
- 	-rm -f config.status
- 
--.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
--install-data-recursive uninstall-data-recursive install-exec-recursive \
--uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
--all-recursive check-recursive installcheck-recursive info-recursive \
--dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-+.PHONY: install-data-recursive uninstall-data-recursive \
-+install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-+uninstalldirs-recursive all-recursive check-recursive \
-+installcheck-recursive info-recursive dvi-recursive \
-+mostlyclean-recursive distclean-recursive clean-recursive \
- maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
- distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
- dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
--install-exec install-data-local install-data-am install-data install-am \
--install uninstall-am uninstall all-local all-redirect all-am all \
--installdirs-am installdirs mostlyclean-generic distclean-generic \
--clean-generic maintainer-clean-generic clean mostlyclean distclean \
--maintainer-clean
--
-+install-exec install-data-am install-data install-am install \
-+uninstall-am uninstall all-local all-redirect all-am all installdirs-am \
-+installdirs mostlyclean-generic distclean-generic clean-generic \
-+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
- 
--# lets schedule the perl stuff for installation
--# the special call to install-sh is because the -d switch is not portable
--install-data-local:
--	$(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
--	$(INSTALL) -m 644 perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
--	$(INSTALL) -m 644 perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
--	$(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
--	$(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
- 
- perl_piped:: $(top_builddir)/perl-piped
- 	test -d perl-piped \
diff --git a/databases/rrdtool/patches/patch-ac b/databases/rrdtool/patches/patch-ac
deleted file mode 100644
index a272389c58c..00000000000
--- a/databases/rrdtool/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2003/02/16 23:08:57 seb Exp $
-
---- configure.in.orig	Fri Oct 11 18:39:19 2002
-+++ configure.in
-@@ -145,9 +145,6 @@ if test "x$GCC" = "xyes"; then
-   fi
- fi
- 
--dnl add pic flag in any case this makes sure all our code is relocatable
--CFLAGS="$CFLAGS "`grep pic_flag= libtool | sed -e 's/.*pic_flag=//' -e 's/"//g'`
--
- dnl it seems that hpux chockes on -fPIC for some reason
- ZLIB_CFLAGS=$CFLAGS
- case $target_os in
diff --git a/databases/rrdtool/patches/patch-ad b/databases/rrdtool/patches/patch-ad
deleted file mode 100644
index ebada2bd465..00000000000
--- a/databases/rrdtool/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2003/02/16 23:08:57 seb Exp $
-
---- configure.orig	Fri Oct 11 18:39:32 2002
-+++ configure
-@@ -2231,8 +2231,6 @@ echo "$ac_t""$rd_cv_gcc_opt" 1>&6
-   fi
- fi
- 
--CFLAGS="$CFLAGS "`grep pic_flag= libtool | sed -e 's/.*pic_flag=//' -e 's/"//g'`
--
- ZLIB_CFLAGS=$CFLAGS
- case $target_os in
- *hpux*)
diff --git a/databases/rrdtool/patches/patch-ae b/databases/rrdtool/patches/patch-ae
deleted file mode 100644
index 24e3a9b451d..00000000000
--- a/databases/rrdtool/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2003/02/16 23:08:57 seb Exp $
-
---- contrib/Makefile.am.orig	Tue Feb 26 10:21:19 2002
-+++ contrib/Makefile.am
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
- SUBDIRS = trytime
--contribdir = $(prefix)/contrib
-+contribdir = $(prefix)/share/rrdtool/contrib
- contrib_DATA = README
- EXTRA_DIST =  rrdview log2rrd rrd-file-icon rrdproc rrdlastds add_ds killspike rrdfetchnames snmpstats rrdexplorer php3 php4
diff --git a/databases/rrdtool/patches/patch-af b/databases/rrdtool/patches/patch-af
deleted file mode 100644
index a1020e55b2d..00000000000
--- a/databases/rrdtool/patches/patch-af
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-af,v 1.5 2003/02/16 23:08:57 seb Exp $
-
---- contrib/Makefile.in.orig	Fri Oct 11 18:42:55 2002
-+++ contrib/Makefile.in
-@@ -88,7 +88,7 @@ ZLIB_CFLAGS = @ZLIB_CFLAGS@
- ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
- 
- SUBDIRS = trytime
--contribdir = $(prefix)/contrib
-+contribdir = $(prefix)/share/rrdtool/contrib
- contrib_DATA = README
- EXTRA_DIST = rrdview log2rrd rrd-file-icon rrdproc rrdlastds add_ds killspike rrdfetchnames snmpstats rrdexplorer php3 php4
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-@@ -103,12 +103,12 @@ PACKAGE = @PACKAGE@
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- all: all-redirect
- .SUFFIXES:
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps contrib/Makefile
-+	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps contrib/Makefile
- 
- Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) \
-@@ -231,7 +231,7 @@ distdir: $(DISTFILES)
- 	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    cp -pr $$/$$file $(distdir)/$$file; \
- 	  else \
- 	    test -f $(distdir)/$$file \
- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
diff --git a/databases/rrdtool/patches/patch-ag b/databases/rrdtool/patches/patch-ag
deleted file mode 100644
index 32fbb8d48be..00000000000
--- a/databases/rrdtool/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.5 2003/02/16 23:08:58 seb Exp $
-
---- contrib/trytime/Makefile.am.orig	Thu Mar 21 21:51:29 2002
-+++ contrib/trytime/Makefile.am
-@@ -1,7 +1,7 @@
- ## Process this file with automake to produce Makefile.in
--INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/gd1.3
-+INCLUDES = -I$(top_srcdir)/src
- EXTRA_DIST = trytime.c
--contribdir = $(prefix)/contrib/trytime
-+contribdir = $(prefix)/share/rrdtool/contrib/trytime
- contrib_DATA = README trytime.c
- bin_PROGRAMS    = trytime
- trytime_SOURCES  = trytime.c
diff --git a/databases/rrdtool/patches/patch-ah b/databases/rrdtool/patches/patch-ah
deleted file mode 100644
index c769e4ede2f..00000000000
--- a/databases/rrdtool/patches/patch-ah
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-ah,v 1.8 2003/02/16 23:08:58 seb Exp $
-
---- contrib/trytime/Makefile.in.orig	Tue Feb  4 14:44:49 2003
-+++ contrib/trytime/Makefile.in
-@@ -87,9 +87,9 @@ VERSION = @VERSION@
- ZLIB_CFLAGS = @ZLIB_CFLAGS@
- ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
- 
--INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/gd1.3
-+INCLUDES = -I$(top_srcdir)/src
- EXTRA_DIST = trytime.c
--contribdir = $(prefix)/contrib/trytime
-+contribdir = $(prefix)/share/rrdtool/contrib/trytime
- contrib_DATA = README trytime.c
- bin_PROGRAMS = trytime
- trytime_SOURCES = trytime.c
-@@ -121,7 +121,7 @@ PACKAGE = @PACKAGE@
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- SOURCES = $(trytime_SOURCES)
- OBJECTS = $(trytime_OBJECTS)
-@@ -130,7 +130,7 @@ all: all-redirect
- .SUFFIXES:
- .SUFFIXES: .S .c .lo .o .s
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps contrib/trytime/Makefile
-+	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps contrib/trytime/Makefile
- 
- Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) \
-@@ -260,17 +260,13 @@ distdir: $(DISTFILES)
- 	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    cp -pr $$/$$file $(distdir)/$$file; \
- 	  else \
- 	    test -f $(distdir)/$$file \
- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
- 	  fi; \
- 	done
--trytime.o: trytime.c ../../src/getopt.h ../../src/rrd_tool.h \
--	../../config/config.h ../../src/rrd.h ../../src/rrd_format.h \
--	../../gd1.3/gd.h
--
- info-am:
- info: info-am
- dvi-am:
diff --git a/databases/rrdtool/patches/patch-ai b/databases/rrdtool/patches/patch-ai
deleted file mode 100644
index a40ce4a91da..00000000000
--- a/databases/rrdtool/patches/patch-ai
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ai,v 1.5 2003/02/16 23:08:58 seb Exp $
-
---- doc/Makefile.am.orig	Tue May  7 21:51:19 2002
-+++ doc/Makefile.am
-@@ -25,9 +25,9 @@ PDF = $(MAN:.1=.pdf)
- EXTRA_DIST= $(POD) $(HTML) $(TXT)
- 
- # some install rules
--idocdir = $(prefix)/doc
-+idocdir = $(prefix)/share/doc/rrdtool
- idoc_DATA = $(POD) $(TXT)
--ihtmldir = $(prefix)/html
-+ihtmldir = $(prefix)/share/doc/html/rrdtool
- ihtml_DATA = $(HTML)
- imandir = $(prefix)/man/man1
- iman_DATA = $(MAN)
diff --git a/databases/rrdtool/patches/patch-aj b/databases/rrdtool/patches/patch-aj
index 238bbf97aca..bc5d6328294 100644
--- a/databases/rrdtool/patches/patch-aj
+++ b/databases/rrdtool/patches/patch-aj
@@ -1,41 +1,28 @@
-$NetBSD: patch-aj,v 1.3 2003/02/16 23:08:58 seb Exp $
+$NetBSD: patch-aj,v 1.4 2005/07/03 15:23:34 wulf Exp $
 
---- doc/Makefile.in.orig	Fri Oct 11 18:42:53 2002
-+++ doc/Makefile.in
-@@ -110,9 +110,9 @@ PDF = $(MAN:.1=.pdf)
- EXTRA_DIST = $(POD) $(HTML) $(TXT)
+--- doc/Makefile.in.orig	2005-05-28 22:33:22.000000000 +0930
++++ doc/Makefile.in	2005-06-19 13:58:04.000000000 +0930
+@@ -228,9 +228,9 @@
  
- # some install rules
--idocdir = $(prefix)/doc
+ # some install rules if the install pat
+ DOCPREFIX := $(shell echo "@prefix@" | grep rrd >/dev/null && echo "rrdtool-@VERSION@/")
+-idocdir = $(prefix)/shared/doc/$(DOCPREFIX)txt
 +idocdir = $(prefix)/share/doc/rrdtool
  idoc_DATA = $(POD) $(TXT)
--ihtmldir = $(prefix)/html
-+ihtmldir = $(prefix)/share/doc/html/rrdtool
+-ihtmldir = $(prefix)/shared/doc/$(DOCPREFIX)html
++ihtmldir = $(prefix)/share/doc/rrdtool/html
  ihtml_DATA = $(HTML)
- imandir = $(prefix)/man/man1
+ imandir = $(mandir)/man1
  iman_DATA = $(MAN)
-@@ -133,13 +133,13 @@ PACKAGE = @PACKAGE@
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- all: all-redirect
- .SUFFIXES:
- .SUFFIXES: .1 .html .man .pdf .pm .pod .ps .txt
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile
-+	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps doc/Makefile
- 
- Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) \
-@@ -214,7 +214,7 @@ distdir: $(DISTFILES)
- 	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    cp -pr $$/$$file $(distdir)/$$file; \
- 	  else \
- 	    test -f $(distdir)/$$file \
- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+@@ -247,9 +247,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  doc/Makefile
++	  $(AUTOMAKE) --foreign  doc/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
diff --git a/databases/rrdtool/patches/patch-ak b/databases/rrdtool/patches/patch-ak
deleted file mode 100644
index 3f06bebe43b..00000000000
--- a/databases/rrdtool/patches/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ak,v 1.9 2003/02/16 23:08:58 seb Exp $
-
---- examples/Makefile.am.orig	Tue Feb 26 10:21:25 2002
-+++ examples/Makefile.am
-@@ -6,5 +6,5 @@
- 
- EXTRA_DIST =  cgi-demo.cgi.in    piped-demo.pl.in   shared-demo.pl.in stripes.pl.in bigtops.pl.in minmax.pl.in
- 
--examplesdir = $(prefix)/examples
-+examplesdir = $(prefix)/share/examples/rrdtool
- examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl stripes.pl bigtops.pl minmax.pl
diff --git a/databases/rrdtool/patches/patch-al b/databases/rrdtool/patches/patch-al
index 1302f30c218..5fab8d90bad 100644
--- a/databases/rrdtool/patches/patch-al
+++ b/databases/rrdtool/patches/patch-al
@@ -1,37 +1,25 @@
-$NetBSD: patch-al,v 1.3 2003/02/16 23:08:58 seb Exp $
+$NetBSD: patch-al,v 1.4 2005/07/03 15:23:34 wulf Exp $
 
---- examples/Makefile.in.orig	Fri Oct 11 18:42:55 2002
-+++ examples/Makefile.in
-@@ -93,7 +93,7 @@ ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
- 
- EXTRA_DIST = cgi-demo.cgi.in    piped-demo.pl.in   shared-demo.pl.in stripes.pl.in bigtops.pl.in minmax.pl.in
+--- examples/Makefile.in.orig	2005-05-28 22:33:22.000000000 +0930
++++ examples/Makefile.in	2005-06-19 14:01:09.000000000 +0930
+@@ -207,7 +207,7 @@
+ EXTRA_DIST = cgi-demo.cgi.in piped-demo.pl.in shared-demo.pl.in \
+ 	stripes.pl.in bigtops.pl.in minmax.pl.in 4charts.pl.in
  
 -examplesdir = $(prefix)/examples
 +examplesdir = $(prefix)/share/examples/rrdtool
- examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl stripes.pl bigtops.pl minmax.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = ../config/config.h
-@@ -109,12 +109,12 @@ PACKAGE = @PACKAGE@
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- all: all-redirect
- .SUFFIXES:
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps examples/Makefile
-+	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps examples/Makefile
+ examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl \
+ 	stripes.pl bigtops.pl minmax.pl 4charts.pl
  
- Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) \
-@@ -163,7 +163,7 @@ distdir: $(DISTFILES)
- 	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    cp -pr $$/$$file $(distdir)/$$file; \
- 	  else \
- 	    test -f $(distdir)/$$file \
- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+@@ -223,9 +223,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  examples/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  examples/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  examples/Makefile
++	  $(AUTOMAKE) --foreign  examples/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
diff --git a/databases/rrdtool/patches/patch-am b/databases/rrdtool/patches/patch-am
deleted file mode 100644
index dbc8905148d..00000000000
--- a/databases/rrdtool/patches/patch-am
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-am,v 1.2 2003/02/16 23:08:59 seb Exp $
-
---- examples/cgi-demo.cgi.in.orig	Tue Feb 26 10:21:25 2002
-+++ examples/cgi-demo.cgi.in
-@@ -11,7 +11,7 @@ the <TT>shared-demo.pl</TT>.
- <H1>This is NOT traffic</H1>
- 
- 
--<P><RRD::GRAPH cgi-demo1.gif 
-+<P><RRD::GRAPH cgi-demo1.png 
- 	    --lower-limit 0
- 	    --start 'end-10h'
- 	    --title "Graph in Localtime <RRD::TIME::NOW %c>"
-@@ -22,7 +22,7 @@ the <TT>shared-demo.pl</TT>.
- </P>
- 
- <P><RRD::SETENV TZ UTC>
--   <RRD::GRAPH cgi-demo2.gif 
-+   <RRD::GRAPH cgi-demo2.png
- 	    --lower-limit 0
- 	    --start 'end-10h'
- 	    --title "Graph in UTC"
diff --git a/databases/rrdtool/patches/patch-an b/databases/rrdtool/patches/patch-an
deleted file mode 100644
index bc098d38f3b..00000000000
--- a/databases/rrdtool/patches/patch-an
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-an,v 1.3 2003/02/16 23:08:59 seb Exp $
-
---- examples/piped-demo.pl.in.orig	Tue Feb 26 10:21:25 2002
-+++ examples/piped-demo.pl.in
-@@ -16,7 +16,6 @@ $STEP = 300;
- $RUNS = 12*24*30*6;
- $GRUNS = 20;
- $RRD = "piped-demo.rrd";
--$GIF = "piped-demo.gif";
- $PNG = "piped-demo.png";
- 
- # some magic to find the correct rrdtol executable
-@@ -66,42 +65,6 @@ printf "-- performance analysis Update t
-   ($real1-$real)/($RUNS), ($RUNS)/($real1-$real);
- print "\n";
- # creating some graphs
--
--print "* Creating $GRUNS GIF graphs: $GIF\n\n";
--$now = time;
--for ($i=0;$i<$GRUNS;$i++) {
--RRDp::cmd "graph $GIF ", "--title 'Test GRAPH' ",
--	"--height 150 --vertical-label 'Dummy Units' ".
--	"--start now".(-$RUNS*$STEP),
--	"--color ARROW#bfbfbf",
--        "DEF:alpha=$RRD:in:AVERAGE",
--        "DEF:beta=$RRD:out:AVERAGE",
--        "CDEF:calc=alpha,beta,+,1.5,/",
--        "AREA:alpha#0022e9:Alpha",
--        "STACK:beta#00b871:Beta",
--        "STACK:calc#ff0091:Calc\\j",
--	"PRINT:alpha:AVERAGE:'Average Alpha\\: %1.2lf %S'",
--	"PRINT:alpha:MIN:'Min Alpha\\: %1.2lf %S'",
--	"PRINT:alpha:MAX:'Max Alpha\\: %1.2lf %S'",
--	"GPRINT:calc:AVERAGE:'Average calc\\: %1.2lf %S\\r'",
--	"GPRINT:calc:MIN:'Min calc\\: %1.2lf %S'",
--	"GPRINT:calc:MAX:'Max calc\\: %1.2lf %S'",
--        "VRULE:".($now-3600)."#008877:'60 Minutes ago'",
--        "COMMENT:'\\s'",
--        "COMMENT:'Graph created on: ".localtime(time())."\\c'";
--
--$answer = RRDp::read;
--}
--($user2,$sys2,$real2) =  ($RRDp::user,$RRDp::sys,$RRDp::real);
--
--print "ANSWER:\n$$answer";
--
--printf "\n-- average Time for one Graph\n".
--       "   usr/grf: %1.5fs sys/grf: %1.5fs real/grf: %1.5fs   graphs/sec: %1.2f\n",
--  ($user2-$user1)/$GRUNS, 
--  ($sys2-$sys1)/$GRUNS, 
--  ($real2-$real1)/$GRUNS, 
--  $GRUNS/($real2-$real1);
- 
- print "\n\n* Creating $GRUNS PNG graphs: $PNG\n\n";
- 
diff --git a/databases/rrdtool/patches/patch-ao b/databases/rrdtool/patches/patch-ao
deleted file mode 100644
index 8be92df89ae..00000000000
--- a/databases/rrdtool/patches/patch-ao
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ao,v 1.4 2003/02/16 23:08:59 seb Exp $
-
---- examples/shared-demo.pl.in.orig	Tue May  7 21:51:19 2002
-+++ examples/shared-demo.pl.in
-@@ -36,8 +36,8 @@ my $RUNS  = 500;
- my $GRUNS = 4;
- my $RRD1  = "shared-demo.rrd";
- my $RRD2  = "shared-demob.rrd";
--my $GIF1  = "shared-demo1.gif";
--my $GIF2  = "shared-demo2.gif";
-+my $PNG1  = "shared-demo1.png";
-+my $PNG2  = "shared-demo2.png";
- my $time  = 30*int(time/30);
- my $START = $time-$RUNS*$STEP;
- 
-@@ -109,18 +109,18 @@ if ($ERROR = RRDs::error) {
-   die "$0: unable to update `$RRD2': $ERROR\n";
- }
- 
--print "* Creating $GRUNS graphs: $GIF1 & $GIF2\n\n";
-+print "* Creating $GRUNS graphs: $PNG1 & $PNG2\n\n";
- my $now = $time;
- for (my $i=0;$i<$GRUNS;$i++) {
--  my @rrd_gifs = ($RRD1, $GIF1, $RRD2, $GIF2);
--  while (@rrd_gifs) {
--    my $RRD = shift(@rrd_gifs);
--    my $GIF = shift(@rrd_gifs);
--    my ($graphret,$xs,$ys) = RRDs::graph $GIF, "--title", 'Test GRAPH', 
-+  my @rrd_pngs = ($RRD1, $PNG1, $RRD2, $PNG2);
-+  while (@rrd_pngs) {
-+    my $RRD = shift(@rrd_pngs);
-+    my $PNG = shift(@rrd_pngs);
-+    my ($graphret,$xs,$ys) = RRDs::graph $PNG, "--title", 'Test GRAPH', 
-     '--base', '1024',
-           "--vertical-label", 'Dummy Units', "--start", (-$RUNS*$STEP),
-           "--end", $time,
--	  "--interlace", "--imgformat","GIF",
-+	  "--interlace", "--imgformat","PNG",
-           "DEF:alpha=$RRD:a:AVERAGE",
-           "DEF:beta=$RRD:b:AVERAGE",
-           "DEF:gamma=$RRD:c:AVERAGE",
-@@ -147,7 +147,7 @@ for (my $i=0;$i<$GRUNS;$i++) {
-     if ($ERROR = RRDs::error) {
-       print "ERROR: $ERROR\n";
-     } else {
--      print "GIF Size: ${xs}x${ys}\n";
-+      print "PNG Size: ${xs}x${ys}\n";
-       print "Graph Return:\n",(join "\n", @$graphret),"\n\n";
-     }
-   }
diff --git a/databases/rrdtool/patches/patch-ap b/databases/rrdtool/patches/patch-ap
index 6c300f202f1..fe5ae496cad 100644
--- a/databases/rrdtool/patches/patch-ap
+++ b/databases/rrdtool/patches/patch-ap
@@ -1,19 +1,15 @@
-$NetBSD: patch-ap,v 1.5 2004/02/07 17:44:10 seb Exp $
+$NetBSD: patch-ap,v 1.6 2005/07/03 15:23:34 wulf Exp $
 
---- perl-shared/Makefile.PL.in.orig	2002-03-21 21:52:35.000000000 +0000
-+++ perl-shared/Makefile.PL.in
-@@ -10,10 +10,11 @@ WriteMakefile(
-     'NAME'         => 'RRDs',
-     'VERSION_FROM' => '@top_srcdir@/perl-shared/RRDs.pm', # finds $VERSION
+--- bindings/perl-shared/Makefile.PL.orig	2005-06-19 16:12:18.000000000 +0930
++++ bindings/perl-shared/Makefile.PL	2005-06-19 16:16:56.000000000 +0930
+@@ -25,7 +25,9 @@
+     'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
      'DEFINE'	   => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
--    'INC'          => '-I@top_srcdir@/src -I@top_srcdir@/gd1.3',
-+    'INC'          => "-I@top_srcdir@/src",
-+    'LIBS'         => "-lcgi -lm -lgd -lpng -lz -ljpeg -lttf",
-     # where to look for the necessary libraries 
+     'INC'          => '-I../../src',
++    'LIBS'         => "-lcgi -lm -lpng -lz -lfreetype",
      # Perl will figure out which one is valid
--    'depend'	   => {'RRDs.c' => "../src/.libs/librrd_private.a"},
 -    'dynamic_lib'  => {'OTHERLDFLAGS' => "$librrd -lm"},
-+    'depend'       => {'RRDs.c' => "../src/librrd_private.la"},
++    'depend'       => {'RRDs.c' => "../../src/librrd.la"},
 +    'LDFROM'       => "\$(OBJECT) $librrd",
-     'realclean'    => {FILES => 't/demo?.rrd t/demo?.gif' }
+     'realclean'    => {FILES => 't/demo?.rrd t/demo?.png' }
  );
diff --git a/databases/rrdtool/patches/patch-aq b/databases/rrdtool/patches/patch-aq
deleted file mode 100644
index 44401b29cd1..00000000000
--- a/databases/rrdtool/patches/patch-aq
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-aq,v 1.4 2003/02/16 23:08:59 seb Exp $
-
---- src/Makefile.am.orig	Tue May  7 21:51:19 2002
-+++ src/Makefile.am
-@@ -5,19 +5,6 @@
- #ACLOCAL_M4	   = $(top_srcdir)/config/aclocal.m4
- #AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
- 
--CGI_INC_DIR       = $(top_srcdir)/@CGI_LIB_DIR@
--GD_INC_DIR        = $(top_srcdir)/@GD_LIB_DIR@
--PNG_INC_DIR       = $(top_srcdir)/@PNG_LIB_DIR@
--ZLIB_INC_DIR      = $(top_srcdir)/@ZLIB_LIB_DIR@
--
--CGI_LIB_DIR       = $(top_builddir)/@CGI_LIB_DIR@
--GD_LIB_DIR        = $(top_builddir)/@GD_LIB_DIR@
--PNG_LIB_DIR       = $(top_builddir)/@PNG_LIB_DIR@
--ZLIB_LIB_DIR      = $(top_builddir)/@ZLIB_LIB_DIR@
--
--
--INCLUDES          = -I$(CGI_INC_DIR) -I$(GD_INC_DIR) -I$(PNG_INC_DIR) -I$(ZLIB_INC_DIR)
--
- #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)
- #LINK      = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA) $(LDFLAGS) -o $@
-@@ -54,11 +41,7 @@ RRD_C_FILES =		\
- # creates a ./.lib/*.al file that contains the PIC compiled object
- # files.
- 
--RRD_LIBS =				\
--	$(CGI_LIB_DIR)/librrd_cgi.la	\
--	$(GD_LIB_DIR)/librrd_gd.la	\
--	$(PNG_LIB_DIR)/librrd_png.la	\
--	$(ZLIB_LIB_DIR)/librrd_z.la
-+RRD_LIBS=	-lz -ljpeg -lgd -lcgi -lpng -lttf
- 
- lib_LTLIBRARIES           = librrd.la
- noinst_LTLIBRARIES        = librrd_private.la
-@@ -72,7 +55,7 @@ librrd_la_LDFLAGS         = -version-inf
- include_HEADERS	= rrd.h
- 
- librrd_private_la_LIBADD  = $(RRD_LIBS)
--librrd_private_la_LDFLAGS = -static
-+librrd_private_la_LDFLAGS = -prefer-pic
- 
- bin_PROGRAMS	= rrdcgi rrdtool rrdupdate
- 
diff --git a/databases/rrdtool/patches/patch-ar b/databases/rrdtool/patches/patch-ar
deleted file mode 100644
index d2882e9bc7b..00000000000
--- a/databases/rrdtool/patches/patch-ar
+++ /dev/null
@@ -1,175 +0,0 @@
-$NetBSD: patch-ar,v 1.4 2003/02/16 23:08:59 seb Exp $
-
---- src/Makefile.in.orig	Fri Oct 11 18:42:53 2002
-+++ src/Makefile.in
-@@ -15,6 +15,10 @@
- #ACLOCAL_M4	   = $(top_srcdir)/config/aclocal.m4
- #AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
- 
-+#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)
-+#LINK      = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA) $(LDFLAGS) -o $@
-+
- 
- SHELL = @SHELL@
- 
-@@ -69,13 +73,16 @@ host_triplet = @host@
- target_alias = @target_alias@
- target_triplet = @target@
- CC = @CC@
-+CGI_LIB_DIR = @CGI_LIB_DIR@
- COMP_PERL = @COMP_PERL@
- CPP = @CPP@
-+GD_LIB_DIR = @GD_LIB_DIR@
- LIBTOOL = @LIBTOOL@
- NROFF = @NROFF@
- PERL = @PERL@
- PERLFLAGS = @PERLFLAGS@
- PERL_MAKE_OPTIONS = @PERL_MAKE_OPTIONS@
-+PNG_LIB_DIR = @PNG_LIB_DIR@
- RANLIB = @RANLIB@
- SO_EXT = @SO_EXT@
- TCL_LD_SEARCH_FLAGS = @TCL_LD_SEARCH_FLAGS@
-@@ -87,22 +94,7 @@ TCL_SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@
- TROFF = @TROFF@
- VERSION = @VERSION@
- ZLIB_CFLAGS = @ZLIB_CFLAGS@
--
--CGI_INC_DIR = $(top_srcdir)/@CGI_LIB_DIR@
--GD_INC_DIR = $(top_srcdir)/@GD_LIB_DIR@
--PNG_INC_DIR = $(top_srcdir)/@PNG_LIB_DIR@
--ZLIB_INC_DIR = $(top_srcdir)/@ZLIB_LIB_DIR@
--
--CGI_LIB_DIR = $(top_builddir)/@CGI_LIB_DIR@
--GD_LIB_DIR = $(top_builddir)/@GD_LIB_DIR@
--PNG_LIB_DIR = $(top_builddir)/@PNG_LIB_DIR@
--ZLIB_LIB_DIR = $(top_builddir)/@ZLIB_LIB_DIR@
--
--INCLUDES = -I$(CGI_INC_DIR) -I$(GD_INC_DIR) -I$(PNG_INC_DIR) -I$(ZLIB_INC_DIR)
--
--#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)
--#LINK      = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA) $(LDFLAGS) -o $@
-+ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
- 
- RRD_C_FILES =  	gdpng.c			getopt.c		getopt1.c		gifsize.c		parsetime.c		pngsize.c		rrd_create.c		rrd_diff.c		rrd_dump.c		rrd_info.c		rrd_error.c		rrd_fetch.c		rrd_format.c		rrd_graph.c		rrd_last.c		rrd_open.c		rrd_resize.c		rrd_restore.c		rrd_tune.c		rrd_update.c		rrd_xport.c		rrd_graph.h rrd_xport.h getopt.h ntconfig.h 	parsetime.h rrd_format.h rrd_tool.h rrd.h
- 
-@@ -114,8 +106,7 @@ RRD_C_FILES =  	gdpng.c			getopt.c		geto
- # creates a ./.lib/*.al file that contains the PIC compiled object
- # files.
- 
--RRD_LIBS =  	$(CGI_LIB_DIR)/librrd_cgi.la		$(GD_LIB_DIR)/librrd_gd.la		$(PNG_LIB_DIR)/librrd_png.la		$(ZLIB_LIB_DIR)/librrd_z.la
--
-+RRD_LIBS = -lz -ljpeg -lgd -lcgi -lpng -lttf
- 
- lib_LTLIBRARIES = librrd.la
- noinst_LTLIBRARIES = librrd_private.la
-@@ -129,7 +120,7 @@ librrd_la_LDFLAGS = -version-info 0:0:0
- include_HEADERS = rrd.h
- 
- librrd_private_la_LIBADD = $(RRD_LIBS)
--librrd_private_la_LDFLAGS = -static
-+librrd_private_la_LDFLAGS = -prefer-pic
- 
- bin_PROGRAMS = rrdcgi rrdtool rrdupdate
- 
-@@ -153,17 +144,13 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../confi
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--librrd_la_DEPENDENCIES =  $(CGI_LIB_DIR)/librrd_cgi.la \
--$(GD_LIB_DIR)/librrd_gd.la $(PNG_LIB_DIR)/librrd_png.la \
--$(ZLIB_LIB_DIR)/librrd_z.la
-+librrd_la_DEPENDENCIES = 
- librrd_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 \
- rrd_last.lo rrd_open.lo rrd_resize.lo rrd_restore.lo rrd_tune.lo \
- rrd_update.lo rrd_xport.lo
--librrd_private_la_DEPENDENCIES =  $(CGI_LIB_DIR)/librrd_cgi.la \
--$(GD_LIB_DIR)/librrd_gd.la $(PNG_LIB_DIR)/librrd_png.la \
--$(ZLIB_LIB_DIR)/librrd_z.la
-+librrd_private_la_DEPENDENCIES = 
- 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 \
-@@ -194,7 +181,7 @@ PACKAGE = @PACKAGE@
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- SOURCES = $(librrd_la_SOURCES) $(librrd_private_la_SOURCES) $(rrdcgi_SOURCES) $(rrdtool_SOURCES) $(rrdupdate_SOURCES)
- OBJECTS = $(librrd_la_OBJECTS) $(librrd_private_la_OBJECTS) $(rrdcgi_OBJECTS) $(rrdtool_OBJECTS) $(rrdupdate_OBJECTS)
-@@ -203,7 +190,7 @@ all: all-redirect
- .SUFFIXES:
- .SUFFIXES: .S .c .lo .o .s
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
-+	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps src/Makefile
- 
- Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) \
-@@ -377,60 +364,13 @@ distdir: $(DISTFILES)
- 	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    cp -pr $$/$$file $(distdir)/$$file; \
- 	  else \
- 	    test -f $(distdir)/$$file \
- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
- 	  fi; \
- 	done
--gdpng.lo gdpng.o : gdpng.c ../libpng-1.0.9/png.h ../zlib-1.1.4/zlib.h \
--	../zlib-1.1.4/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.9/png.h \
--	../zlib-1.1.4/zlib.h ../zlib-1.1.4/zconf.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_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_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
--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
--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_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_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_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 rrd_graph.h \
--	../gd1.3/gdlucidan10.h ../gd1.3/gdlucidab12.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
--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
--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
--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_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
--rrd_tool.o: rrd_tool.c rrd_tool.h ../config/config.h rrd.h getopt.h \
--	rrd_format.h ../gd1.3/gd.h rrd_xport.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
--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_xport.lo rrd_xport.o : rrd_xport.c rrd_tool.h ../config/config.h \
--	rrd.h getopt.h rrd_format.h ../gd1.3/gd.h rrd_graph.h \
--	rrd_xport.h
--
- info-am:
- info: info-am
- dvi-am:
diff --git a/databases/rrdtool/patches/patch-as b/databases/rrdtool/patches/patch-as
index e63a2e2ca4b..64f56193f3f 100644
--- a/databases/rrdtool/patches/patch-as
+++ b/databases/rrdtool/patches/patch-as
@@ -1,22 +1,13 @@
-$NetBSD: patch-as,v 1.5 2004/02/07 17:44:10 seb Exp $
+$NetBSD: patch-as,v 1.6 2005/07/03 15:23:34 wulf Exp $
 
---- src/rrd_cgi.c.orig	Fri Oct 11 18:39:46 2002
-+++ src/rrd_cgi.c
-@@ -12,7 +12,7 @@
- #define MEMBLK 1024
+--- src/rrd_cgi.c.orig	2005-05-28 22:31:55.000000000 +0930
++++ src/rrd_cgi.c	2005-06-19 14:03:09.000000000 +0930
+@@ -352,7 +352,7 @@
  
- /* global variable for libcgi */
--s_cgi **cgiArg;
-+s_cgi *cgiArg;
+ 	if (!filter) {
+ 		printf ("Content-Type: text/html\n" 
+-				"Content-Length: %d\n", 
++				"Content-Length: %zd\n", 
+ 				strlen(buffer));
  
- /* in arg[0] find tags beginning with arg[1] call arg[2] on them
-    and replace by result of arg[2] call */
-@@ -168,7 +168,7 @@ int main(int argc, char *argv[]) {
- 
-   if (filter==0){
-       printf ("Content-Type: text/html\n"
--	      "Content-Length: %d\n", strlen(buffer));
-+	      "Content-Length: %zd\n", strlen(buffer));
-       if (labs(goodfor) > 0){
- 		  time_t now;
- 		  now = time(NULL);
+ 		if (labs(goodfor) > 0) {
diff --git a/databases/rrdtool/patches/patch-at b/databases/rrdtool/patches/patch-at
deleted file mode 100644
index 75ee2b54749..00000000000
--- a/databases/rrdtool/patches/patch-at
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-at,v 1.4 2003/02/16 23:09:00 seb Exp $
-
---- src/rrd_graph.c.orig	Fri Oct 11 18:39:47 2002
-+++ src/rrd_graph.c
-@@ -8,8 +8,10 @@
- #include "rrd_tool.h"
- #include "rrd_graph.h"
- #include <gd.h>
--#include <gdlucidan10.h>
--#include <gdlucidab12.h>
-+#include <gdfonts.h>
-+#include <gdfontt.h>
-+/* #include <gdlucidan10.h> */
-+/* #include <gdlucidab12.h> */
- #include <sys/stat.h>
- #ifdef WIN32
- #include <io.h>
-@@ -24,8 +26,10 @@
- #include <locale.h>
- #endif
-     
--#define SmallFont gdLucidaNormal10
--#define LargeFont gdLucidaBold12
-+/* #define SmallFont gdLucidaNormal10 */
-+/* #define LargeFont gdLucidaBold12 */
-+#define SmallFont gdFontTiny
-+#define LargeFont gdFontSmall
- 
- /* #define DEBUG */
- 
-@@ -194,7 +198,6 @@ enum gf_en gf_conv(char *string){
- 
- enum if_en if_conv(char *string){
-     
--    conv_if(GIF,IF_GIF)
-     conv_if(PNG,IF_PNG)
-     conv_if(GD,IF_GD)
- 
-@@ -2396,9 +2399,6 @@ int lazy_check(image_desc_t *im){
-     if ((fd = fopen(im->graphfile,"rb")) == NULL) 
-       return 0; /* the file does not exist */
-     switch (im->imgformat) {
--    case IF_GIF:
--	size = GifSize(fd,&(im->xgif),&(im->ygif));
--	break;
-     case IF_PNG:
- 	size = PngSize(fd,&(im->xgif),&(im->ygif));
- 	break;
-@@ -2673,9 +2673,6 @@ graph_paint(image_desc_t *im, char ***ca
- 	}
-     }
-     switch (im->imgformat) {
--    case IF_GIF:
--	gdImageGif(gif, fo);    
--	break;
-     case IF_PNG:
- 	gdImagePng(gif, fo);    
- 	break;
-@@ -2809,7 +2806,7 @@ rrd_graph(int argc, char **argv, char **
-     im.prt_c = 0;
-     im.gdes_c = 0;
-     im.gdes = NULL;
--    im.imgformat = IF_GIF; /* we default to GIF output */
-+    im.imgformat = IF_PNG; /* we default to PNG output */
- 
- im.bkg_image = NULL; /* do not put anything to background per default */
- im.ovl_image = NULL; /* do not use anything as overlay per default */
diff --git a/databases/rrdtool/patches/patch-au b/databases/rrdtool/patches/patch-au
deleted file mode 100644
index a36ee7844fd..00000000000
--- a/databases/rrdtool/patches/patch-au
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-au,v 1.4 2003/02/16 23:09:01 seb Exp $
-
---- src/rrd_tool.h.orig	Fri Oct 11 18:39:48 2002
-+++ src/rrd_tool.h
-@@ -17,6 +17,11 @@ extern "C" {
- #ifndef _RRD_TOOL_H
- #define _RRD_TOOL_H
- 
-+/*
-+ * gd.h needs to be called before math.h to avoid -Wshadow warnings
-+ */
-+#include <gd.h>
-+
- #ifdef WIN32
- # include "ntconfig.h"
- #else
-@@ -128,7 +133,6 @@ int GifSize(FILE *, long *, long *);
- int PngSize(FILE *, long *, long *);
- int PngSize(FILE *, long *, long *);
- 
--#include <gd.h>
- void gdImagePng(gdImagePtr im, FILE *out);
- 
- int rrd_create_fn(char *file_name, rrd_t *rrd);
diff --git a/databases/rrdtool/patches/patch-av b/databases/rrdtool/patches/patch-av
index 203a5700ecc..ced6b346451 100644
--- a/databases/rrdtool/patches/patch-av
+++ b/databases/rrdtool/patches/patch-av
@@ -1,19 +1,19 @@
-$NetBSD: patch-av,v 1.1 2004/02/07 17:44:10 seb Exp $
+$NetBSD: patch-av,v 1.2 2005/07/03 15:23:34 wulf Exp $
 
---- src/parsetime.c.orig	Fri Oct 11 18:39:46 2002
-+++ src/parsetime.c
-@@ -660,6 +660,7 @@ day(struct time_value *ptv)
- {
-     long mday=0, wday, mon, year = ptv->tm.tm_year;
+--- src/parsetime.c.orig	2005-05-28 22:31:55.000000000 +0930
++++ src/parsetime.c	2005-06-19 14:05:00.000000000 +0930
+@@ -662,6 +662,7 @@
+     /* using time_t seems to help portability with 64bit oses */    
+     time_t mday=0, wday, mon, year = ptv->tm.tm_year;
      int tlen;
 +    time_t montime;
  
      switch (sc_tokid) {
      case YESTERDAY:
-@@ -713,7 +714,8 @@ day(struct time_value *ptv)
+@@ -716,7 +717,8 @@
  	    tlen = strlen(sc_token);
  	    mon = atol(sc_token);
-             if (mon > 10*356*24*60*60) {
+             if (mon > 10*365*24*60*60) {
 -		ptv->tm=*localtime(&mon);
 +		montime = mon;
 +		ptv->tm=*localtime(&montime);
diff --git a/databases/rrdtool/patches/patch-aw b/databases/rrdtool/patches/patch-aw
index 9128e894acc..784fcdd8492 100644
--- a/databases/rrdtool/patches/patch-aw
+++ b/databases/rrdtool/patches/patch-aw
@@ -1,34 +1,34 @@
-$NetBSD: patch-aw,v 1.1 2004/02/07 17:44:10 seb Exp $
+$NetBSD: patch-aw,v 1.2 2005/07/03 15:23:34 wulf Exp $
 
---- src/rrd_tool.c.orig	Fri Oct 11 18:39:48 2002
-+++ src/rrd_tool.c
-@@ -325,7 +325,7 @@ int HandleInputLine(int argc, char **arg
+--- src/rrd_tool.c.orig	2005-05-28 22:31:55.000000000 +0930
++++ src/rrd_tool.c	2005-06-19 14:09:40.000000000 +0930
+@@ -559,7 +559,7 @@
      else if (strcmp("resize", argv[1]) == 0)
  	rrd_resize(argc-1, &argv[1]);
      else if (strcmp("last", argv[1]) == 0)
 -        printf("%ld\n",rrd_last(argc-1, &argv[1]));
-+        printf("%ld\n",(long)rrd_last(argc-1, &argv[1]));
++        printf("%ld\n",(long) rrd_last(argc-1, &argv[1]));
+     else if (strcmp("first", argv[1]) == 0)
+         printf("%ld\n",rrd_first(argc-1, &argv[1]));
      else if (strcmp("update", argv[1]) == 0)
- 	rrd_update(argc-1, &argv[1]);
-     else if (strcmp("fetch", argv[1]) == 0) {
-@@ -363,9 +363,9 @@ int HandleInputLine(int argc, char **arg
+@@ -599,9 +599,9 @@
  	  printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n\n", XML_ENCODING);
  	  printf("<%s>\n", ROOT_TAG);
  	  printf("  <%s>\n", META_TAG);
--	  printf("    <%s>%lu</%s>\n", META_START_TAG, start, META_START_TAG);
-+	  printf("    <%s>%lu</%s>\n", META_START_TAG, (unsigned long)start, META_START_TAG);
+-	  printf("    <%s>%lu</%s>\n", META_START_TAG, start+step, META_START_TAG);
++	  printf("    <%s>%lu</%s>\n", META_START_TAG, (unsigned long) start+step, META_START_TAG);
  	  printf("    <%s>%lu</%s>\n", META_STEP_TAG, step, META_STEP_TAG);
 -	  printf("    <%s>%lu</%s>\n", META_END_TAG, end, META_END_TAG);
-+	  printf("    <%s>%lu</%s>\n", META_END_TAG, (unsigned long)end, META_END_TAG);
++	  printf("    <%s>%lu</%s>\n", META_END_TAG, (unsigned long) end, META_END_TAG);
  	  printf("    <%s>%lu</%s>\n", META_ROWS_TAG, row_cnt, META_ROWS_TAG);
  	  printf("    <%s>%lu</%s>\n", META_COLS_TAG, col_cnt, META_COLS_TAG);
  	  printf("    <%s>\n", LEGEND_TAG);
-@@ -381,7 +381,7 @@ int HandleInputLine(int argc, char **arg
+@@ -617,7 +617,7 @@
  	  printf("  <%s>\n", DATA_TAG);
- 	  for (i = start; i <= end; i += step) {
+ 	  for (ti = start+step; ti <= end; ti += step) {
  	    printf ("    <%s>", DATA_ROW_TAG);
--	    printf ("<%s>%lu</%s>", COL_TIME_TAG, i, COL_TIME_TAG);
-+	    printf ("<%s>%lu</%s>", COL_TIME_TAG, (unsigned long)i, COL_TIME_TAG);
+-	    printf ("<%s>%lu</%s>", COL_TIME_TAG, ti, COL_TIME_TAG);
++	    printf ("<%s>%lu</%s>", COL_TIME_TAG, (unsigned long) ti, COL_TIME_TAG);
  	    for (j = 0; j < col_cnt; j++) {
  	      rrd_value_t newval = DNAN;
- 	      newval = *(ptr++);
+ 	      newval = *ptr;
diff --git a/databases/rrdtool/patches/patch-ax b/databases/rrdtool/patches/patch-ax
deleted file mode 100644
index 22bb2ca2811..00000000000
--- a/databases/rrdtool/patches/patch-ax
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ax,v 1.1 2004/02/07 17:44:10 seb Exp $
-
---- contrib/trytime/trytime.c.orig	Tue Feb 26 10:21:19 2002
-+++ contrib/trytime/trytime.c
-@@ -84,21 +84,21 @@ int main ( int ac, char **av )
-   if( *soption )
-       printf( "Start time was specified as: '%s',\n"
- 	      "for me this means: %s (or %ld sec since epoch)\n\n", 
--              soption, tim_b, start_tmp );
-+              soption, tim_b, (long) start_tmp );
-     else
-       printf( "Start time was not specified, default value will be used (end-24h)\n"
- 	      "for me this means: %s (or %ld sec since epoch)\n\n",
--	      tim_b, start_tmp );
-+	      tim_b, (long)start_tmp );
-     
-   strftime(tim_b,100,"%c %Z",localtime(&end_tmp));
-   if( *eoption )
-       printf( "End time was specified as: '%s',\n"
- 	      "for me this means: %s (or %ld sec since epoch)\n", 
--              eoption, tim_b, end_tmp );
-+              eoption, tim_b, (long)end_tmp );
-   else
-       printf( "End time was not specified, default value will be used (now)\n"
- 	      "for me this means: %s (or %ld sec since epoch)\n\n",
--	      tim_b, end_tmp );
-+	      tim_b, (long)end_tmp );
-   exit(0);
- }
- 
diff --git a/databases/rrdtool/patches/patch-ay b/databases/rrdtool/patches/patch-ay
index 7076acf4627..e6123334c9a 100644
--- a/databases/rrdtool/patches/patch-ay
+++ b/databases/rrdtool/patches/patch-ay
@@ -1,13 +1,13 @@
-$NetBSD: patch-ay,v 1.1 2004/02/07 17:44:10 seb Exp $
+$NetBSD: patch-ay,v 1.2 2005/07/03 15:23:34 wulf Exp $
 
---- src/rrd_dump.c.orig	Fri Oct 11 18:39:47 2002
-+++ src/rrd_dump.c
-@@ -40,7 +40,7 @@ rrd_dump(int argc, char **argv)    
+--- src/rrd_dump.c.orig	2005-05-28 22:31:55.000000000 +0930
++++ src/rrd_dump.c	2005-06-19 14:11:09.000000000 +0930
+@@ -91,7 +91,7 @@
  # error "Need strftime"
  #endif
      printf("\t<lastupdate> %ld </lastupdate> <!-- %s -->\n\n",
 -	   rrd.live_head->last_up,somestring);
-+	   (long)rrd.live_head->last_up,somestring);
++	   (long) rrd.live_head->last_up,somestring);
      for(i=0;i<rrd.stat_head->ds_cnt;i++){
  	printf("\t<ds>\n");
  	printf("\t\t<name> %s </name>\n",rrd.ds_def[i].ds_nam);