Fixed build problem and updated rrdtool to version 1.0.21

15 files changed, 151 insertions, 93 deletions

diff --git a/databases/rrdtool/patches/patch-aa b/databases/rrdtool/patches/patch-aa
index b8c68385d18..841167afbeb 100644
--- a/databases/rrdtool/patches/patch-aa
+++ b/databases/rrdtool/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $
+$NetBSD: patch-aa,v 1.2 2000/05/07 12:50:51 wulf Exp $
 
---- Makefile.in.orig	Sat Aug 28 04:50:18 1999
-+++ Makefile.in	Thu Nov  4 08:05:41 1999
-@@ -75,7 +75,7 @@
- RANLIB = @RANLIB@
- ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
+--- Makefile.in.orig	Wed May  3 20:38:20 2000
++++ Makefile.in	Wed May  3 20:40:13 2000
+@@ -84,7 +84,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 = config src doc examples contrib tcl
  
--SUBDIRS = cgilib-0.4 config gd1.3 zlib-1.1.3 libpng-1.0.3 src doc examples contrib
-+SUBDIRS = config src doc examples contrib
  
  # the following files are not mentioned in any other Makefile
- EXTRA_DIST = COPYRIGHT CHANGES NT-BUILD-TIPS.txt TODO CONTRIBUTORS   perl-piped/MANIFEST perl-piped/README perl-piped/rrdpl.ds?  perl-piped/RRDp.pm perl-piped/Makefile.PL  perl-piped/t/base.t  perl-shared/MANIFEST perl-shared/README perl-shared/RRDs.xs  perl-shared/ntmake.pl perl-shared/Makefile.PL perl-shared/t/base.t  perl-shared/rrdpl.ds? perl-shared/RRDs.pm
-@@ -374,11 +374,12 @@
+@@ -381,11 +381,12 @@
  
  # lets schedule the perl stuff for installation
  install-data-local:
@@ -19,12 +19,12 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $
 -	$(INSTALL) -m 644 perl-piped/RRDp.pm $(prefix)/lib/perl
 -	$(INSTALL) -m 644 perl-shared/RRDs.pm $(prefix)/lib/perl
 -	$(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(prefix)/lib/perl/auto/RRDs
--	$(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.so $(prefix)/lib/perl/auto/RRDs
+-	$(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(prefix)/lib/perl/auto/RRDs
 +	$(INSTALL) -d -m 755 $(prefix)/share/rrdtool/lib/perl/auto/RRDs
 +	$(INSTALL) -m 644 perl-piped/RRDp.pm $(prefix)/share/rrdtool/lib/perl
 +	$(INSTALL) -m 644 perl-shared/RRDs.pm $(prefix)/share/rrdtool/lib/perl
 +	$(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(prefix)/share/rrdtool/lib/perl/auto/RRDs
-+	$(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.so $(prefix)/share/rrdtool/lib/perl/auto/RRDs
++	$(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(prefix)/share/rrdtool/lib/perl/auto/RRDs
 +	gmake site-perl-inst
  
  # rules for building the perl module
diff --git a/databases/rrdtool/patches/patch-ab b/databases/rrdtool/patches/patch-ab
index aa756e6b147..ee4451a369e 100644
--- a/databases/rrdtool/patches/patch-ab
+++ b/databases/rrdtool/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $
+$NetBSD: patch-ab,v 1.2 2000/05/07 12:50:52 wulf Exp $
 
---- examples/Makefile.in.orig	Sat Aug 28 04:50:27 1999
-+++ examples/Makefile.in	Sat Nov  6 00:58:52 1999
-@@ -81,7 +81,7 @@
+--- examples/Makefile.in.orig	Tue May  2 21:22:41 2000
++++ examples/Makefile.in	Sat May  6 01:02:16 2000
+@@ -89,7 +89,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 5b5d092a29d..17e0222ee51 100644
--- a/databases/rrdtool/patches/patch-ac
+++ b/databases/rrdtool/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $
+$NetBSD: patch-ac,v 1.2 2000/05/07 12:50:52 wulf Exp $
 
---- contrib/Makefile.in.ORIG	Sat Oct 30 20:33:27 1999
-+++ contrib/Makefile.in	Sat Oct 30 20:39:21 1999
-@@ -77,7 +77,7 @@
- 
- SUBDIRS = log2rrd rrd-file-icon trytime
+--- contrib/Makefile.in.orig	Tue May  2 21:22:42 2000
++++ contrib/Makefile.in	Sat May  6 01:02:52 2000
+@@ -84,7 +84,7 @@
+ ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
  
+ SUBDIRS = log2rrd rrd-file-icon trytime rrdproc rrdlastds add_ds killspike rrdfetchnames
 -contribdir = $(prefix)/contrib
 +contribdir = $(prefix)/share/rrdtool/contrib
  contrib_DATA = README
+ EXTRA_DIST = clickgraphs php3
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = ../config/config.h
diff --git a/databases/rrdtool/patches/patch-ad b/databases/rrdtool/patches/patch-ad
index 30093a8fa05..3cff75a08d6 100644
--- a/databases/rrdtool/patches/patch-ad
+++ b/databases/rrdtool/patches/patch-ad
@@ -1,13 +1,16 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $
+$NetBSD: patch-ad,v 1.2 2000/05/07 12:50:52 wulf Exp $
 
---- contrib/trytime/Makefile.in.ORIG	Sat Oct 30 20:34:18 1999
-+++ contrib/trytime/Makefile.in	Sat Oct 30 20:34:35 1999
-@@ -76,7 +76,7 @@
+--- contrib/trytime/Makefile.in.orig	Tue May  2 21:22:47 2000
++++ contrib/trytime/Makefile.in	Sat May  6 01:03:22 2000
+@@ -83,9 +83,9 @@
+ VERSION = @VERSION@
  ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
  
+-INCLUDES = -I../../src -I../../gd1.3
++INCLUDES = -I../../src
  EXTRA_DIST = trytime.c
 -contribdir = $(prefix)/contrib/trytime
 +contribdir = $(prefix)/share/rrdtool/contrib/trytime
  contrib_DATA = README trytime.c
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = ../../config/config.h
+ bin_PROGRAMS = trytime
+ trytime_SOURCES = trytime.c
diff --git a/databases/rrdtool/patches/patch-ae b/databases/rrdtool/patches/patch-ae
index cd1bb2d7d10..abde5d7380f 100644
--- a/databases/rrdtool/patches/patch-ae
+++ b/databases/rrdtool/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $
+$NetBSD: patch-ae,v 1.2 2000/05/07 12:50:52 wulf Exp $
 
---- contrib/rrd-file-icon/Makefile.in.ORIG	Sat Oct 30 20:34:47 1999
-+++ contrib/rrd-file-icon/Makefile.in	Sat Oct 30 20:35:14 1999
-@@ -76,7 +76,7 @@
+--- contrib/rrd-file-icon/Makefile.in.orig	Tue May  2 21:22:46 2000
++++ contrib/rrd-file-icon/Makefile.in	Sat May  6 01:04:55 2000
+@@ -84,7 +84,7 @@
  ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
  
  EXTRA_DIST = rrd.png
diff --git a/databases/rrdtool/patches/patch-af b/databases/rrdtool/patches/patch-af
index 2ffa10822e8..84d352d8cf5 100644
--- a/databases/rrdtool/patches/patch-af
+++ b/databases/rrdtool/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $
+$NetBSD: patch-af,v 1.2 2000/05/07 12:50:52 wulf Exp $
 
---- contrib/log2rrd/Makefile.in.ORIG	Sat Oct 30 20:35:34 1999
-+++ contrib/log2rrd/Makefile.in	Sat Oct 30 20:37:05 1999
-@@ -77,7 +77,7 @@
+--- contrib/log2rrd/Makefile.in.orig	Tue May  2 21:22:46 2000
++++ contrib/log2rrd/Makefile.in	Sat May  6 01:07:16 2000
+@@ -85,7 +85,7 @@
  
  EXTRA_DIST = log2rrd.pl.in
  
diff --git a/databases/rrdtool/patches/patch-ag b/databases/rrdtool/patches/patch-ag
index 3ccf18379ec..6ef39788519 100644
--- a/databases/rrdtool/patches/patch-ag
+++ b/databases/rrdtool/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $
+$NetBSD: patch-ag,v 1.2 2000/05/07 12:50:52 wulf Exp $
 
---- doc/Makefile.in.orig	Sat Nov  6 01:34:08 1999
-+++ doc/Makefile.in	Sat Nov  6 01:32:55 1999
-@@ -96,9 +96,9 @@
+--- doc/Makefile.in.orig	Tue May  2 21:22:36 2000
++++ doc/Makefile.in	Sat May  6 01:09:07 2000
+@@ -104,9 +104,9 @@
  EXTRA_DIST = $(POD) $(HTML) $(TXT)
  
  # some install rules
diff --git a/databases/rrdtool/patches/patch-ah b/databases/rrdtool/patches/patch-ah
index 82c396ec063..82d90ba750f 100644
--- a/databases/rrdtool/patches/patch-ah
+++ b/databases/rrdtool/patches/patch-ah
@@ -1,10 +1,10 @@
-$NetBSD: patch-ah,v 1.3 2000/02/25 22:12:59 dmcmahill Exp $
+$NetBSD: patch-ah,v 1.4 2000/05/07 12:50:52 wulf Exp $
 
---- src/Makefile.in.orig	Fri Aug 27 13:20:25 1999
-+++ src/Makefile.in	Fri Feb 18 14:21:20 2000
-@@ -76,12 +76,7 @@
- PERL = @PERL@
- RANLIB = @RANLIB@
+--- src/Makefile.in.orig	Tue May  2 04:52:33 2000
++++ src/Makefile.in	Wed May  3 21:04:46 2000
+@@ -84,12 +84,7 @@
+ TCL_SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@
+ VERSION = @VERSION@
  
 -CGI_LIB_DIR = $(top_srcdir)/@CGI_LIB_DIR@
 -GD_LIB_DIR = $(top_srcdir)/@GD_LIB_DIR@
@@ -16,16 +16,16 @@ $NetBSD: patch-ah,v 1.3 2000/02/25 22:12:59 dmcmahill 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)
-@@ -97,7 +92,7 @@
+@@ -105,7 +100,7 @@
  # 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 -lgd -lcgi -lpng
++RRD_LIBS = -lz -ljpeg -lgd -lcgi -lpng -lttf -lintl -lX11 -lXpm
  
  
  lib_LTLIBRARIES = librrd.la
-@@ -128,18 +123,12 @@
+@@ -138,18 +133,12 @@
  DEFS = @DEFS@ -I. -I$(srcdir) -I../config
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
@@ -33,28 +33,30 @@ $NetBSD: patch-ah,v 1.3 2000/02/25 22:12:59 dmcmahill Exp $
 -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
-+LIBS = @LIBS@ -lgd -lpng -lcgi -lz
++LIBS = @LIBS@ -ljpeg -lgd -lpng -lcgi -lz -lttf -lintl -lX11 -lXpm
  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_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
- librrd_private_la_LDFLAGS = 
+ 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
 -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_OBJECTS =  gdpng.lo getopt.lo getopt1.lo gifsize.lo \
  parsetime.lo pngsize.lo rrd_create.lo rrd_diff.lo rrd_dump.lo \
- rrd_error.lo rrd_fetch.lo rrd_format.lo rrd_graph.lo rrd_last.lo \
-@@ -255,7 +244,7 @@
+ rrd_info.lo rrd_error.lo rrd_fetch.lo rrd_format.lo rrd_graph.lo \
+@@ -266,8 +255,8 @@
  librrd.la: $(librrd_la_OBJECTS) $(librrd_la_DEPENDENCIES)
  	$(LINK) -rpath $(libdir) $(librrd_la_LDFLAGS) $(librrd_la_OBJECTS) $(librrd_la_LIBADD) $(LIBS)
  
 -librrd_private.la: $(librrd_private_la_OBJECTS) $(librrd_private_la_DEPENDENCIES)
+-	$(LINK)  $(librrd_private_la_LDFLAGS) $(librrd_private_la_OBJECTS) $(librrd_private_la_LIBADD) $(LIBS)
 +librrd_private.la: $(librrd_private_la_OBJECTS)
- 	$(LINK)  $(librrd_private_la_LDFLAGS) $(librrd_private_la_OBJECTS) $(librrd_private_la_LIBADD) $(LIBS)
++	$(LINK)  -rpath $(libdir) $(librrd_private_la_LDFLAGS) $(librrd_private_la_OBJECTS) $(librrd_private_la_LIBADD) $(LIBS)
  
  mostlyclean-binPROGRAMS:
-@@ -283,7 +272,7 @@
+ 
+@@ -294,7 +283,7 @@
  	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
  	done
  
@@ -63,22 +65,22 @@ $NetBSD: patch-ah,v 1.3 2000/02/25 22:12:59 dmcmahill Exp $
  	@rm -f rrdcgi
  	$(LINK) $(rrdcgi_LDFLAGS) $(rrdcgi_OBJECTS) $(rrdcgi_LDADD) $(LIBS)
  
-@@ -335,48 +324,48 @@
+@@ -346,50 +335,50 @@
  	    || cp -p $$d/$$file $(distdir)/$$file || :; \
  	  fi; \
  	done
--gdpng.lo gdpng.o : gdpng.c ../libpng-1.0.3/png.h ../zlib-1.1.3/zlib.h \
--	../zlib-1.1.3/zconf.h ../libpng-1.0.3/pngconf.h ../gd1.3/gd.h
+-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.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 \
 -	parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
--pngsize.lo pngsize.o : pngsize.c ../libpng-1.0.3/png.h \
+-pngsize.lo pngsize.o : pngsize.c ../libpng-1.0.6/png.h \
 -	../zlib-1.1.3/zlib.h ../zlib-1.1.3/zconf.h \
--	../libpng-1.0.3/pngconf.h
+-	../libpng-1.0.6/pngconf.h
 +	parsetime.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 \
@@ -109,6 +111,9 @@ $NetBSD: patch-ah,v 1.3 2000/02/25 22:12:59 dmcmahill Exp $
 -	../gd1.3/gdlucidan10.h ../gd1.3/gdlucidab12.h
 +	parsetime.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 \
+-	parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
++	parsetime.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 \
 -	parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
 +	parsetime.h getopt.h rrd_format.h ${PREFIX}/include/gd.h
diff --git a/databases/rrdtool/patches/patch-ai b/databases/rrdtool/patches/patch-ai
index 125484a30dc..6946f62a3e3 100644
--- a/databases/rrdtool/patches/patch-ai
+++ b/databases/rrdtool/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $
+$NetBSD: patch-ai,v 1.2 2000/05/07 12:50:52 wulf Exp $
 
---- src/rrd_graph.c.orig	Sun Nov  7 21:46:02 1999
-+++ src/rrd_graph.c	Sun Nov  7 21:47:13 1999
+--- src/rrd_graph.c.orig	Tue May  2 04:51:47 2000
++++ src/rrd_graph.c	Wed May  3 21:04:46 2000
 @@ -6,12 +6,12 @@
  
  #include "rrd_tool.h"
@@ -19,8 +19,8 @@ $NetBSD: patch-ai,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $
  
  /* #define DEBUG */
  
-@@ -37,7 +37,7 @@
- 	    OP_COS,OP_LOG,OP_EXP,OP_LT,OP_LE,OP_GT,OP_GE,OP_EQ,OP_IF,
+@@ -38,7 +38,7 @@
+ 	    OP_MIN,OP_MAX,OP_LIMIT,
  	    OP_UN,OP_END};
  
 -enum if_en {IF_GIF=0,IF_PNG=1};
@@ -28,7 +28,7 @@ $NetBSD: patch-ai,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $
  
  typedef struct rpnp_t {
      enum op_en   op;
-@@ -305,7 +305,6 @@
+@@ -340,7 +340,6 @@
  
  enum if_en if_conv(char *string){
      
@@ -36,17 +36,17 @@ $NetBSD: patch-ai,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $
      conv_if(PNG,IF_PNG)
  
      return (-1);
-@@ -2129,9 +2128,6 @@
+@@ -2291,9 +2290,6 @@
      if ((fd = fopen(im->graphfile,"rb")) == NULL) 
        return 0; /* the file does not exist */
      switch (im->imgformat) {
 -    case IF_GIF:
--	GifSize(fd,&(im->xgif),&(im->ygif));
+-	size = GifSize(fd,&(im->xgif),&(im->ygif));
 -	break;
      case IF_PNG:
- 	PngSize(fd,&(im->xgif),&(im->ygif));
+ 	size = PngSize(fd,&(im->xgif),&(im->ygif));
  	break;
-@@ -2389,9 +2385,6 @@
+@@ -2552,9 +2548,6 @@
  	}
      }
      switch (im->imgformat) {
@@ -56,7 +56,7 @@ $NetBSD: patch-ai,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $
      case IF_PNG:
  	gdImagePng(gif, fo);    
  	break;
-@@ -2506,7 +2499,7 @@
+@@ -2669,7 +2662,7 @@
      im.prt_c = 0;
      im.gdes_c = 0;
      im.gdes = NULL;
diff --git a/databases/rrdtool/patches/patch-ak b/databases/rrdtool/patches/patch-ak
index d0bfb31290a..d8229c04cb0 100644
--- a/databases/rrdtool/patches/patch-ak
+++ b/databases/rrdtool/patches/patch-ak
@@ -1,17 +1,17 @@
-$NetBSD: patch-ak,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $
+$NetBSD: patch-ak,v 1.2 2000/05/07 12:50:52 wulf Exp $
 
---- perl-shared/Makefile.PL.orig	Wed Aug 25 07:26:44 1999
-+++ perl-shared/Makefile.PL	Sat Nov  6 03:06:13 1999
-@@ -9,10 +9,10 @@
-     'NAME'         => 'RRDs',
+--- perl-shared/Makefile.PL.orig	Tue May  2 19:36:56 2000
++++ perl-shared/Makefile.PL	Sat May  6 00:50:18 2000
+@@ -11,10 +11,10 @@
      'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
      'OPTIMIZE'     => '-g',
+     'DEFINE'	   => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
 -    'INC'          => '-I../src -I../gd1.3',
 +    'INC'          => '-I../src -I${PREFIX}/include',
      # where to look for the necessary libraries 
      # Perl will figure out which one is valid
-     'depend'	   => {'RRDs.c' => $librrd},
+     'depend'	   => {'RRDs.c' => "../src/.libs/librrd_private.a"},
 -    'dynamic_lib'  => {'OTHERLDFLAGS' => "$librrd -lm"},
-+    'dynamic_lib'  => {'OTHERLDFLAGS' => "$librrd -lm -lgd -lpng -lcgi -lz"},
++    'dynamic_lib'  => {'OTHERLDFLAGS' => "$librrd -lm -lgd -lpng -ljpeg -lcgi -lz"},
      'realclean'    => {FILES => 't/demo?.rrd t/demo?.gif' }
  );
diff --git a/databases/rrdtool/patches/patch-al b/databases/rrdtool/patches/patch-al
index 6e0ad56aedc..63800ea98e9 100644
--- a/databases/rrdtool/patches/patch-al
+++ b/databases/rrdtool/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $
+$NetBSD: patch-al,v 1.2 2000/05/07 12:50:52 wulf Exp $ 
 
---- examples/cgi-demo.cgi.in.orig	Sun Nov 14 13:13:02 1999
-+++ examples/cgi-demo.cgi.in	Sun Nov 14 13:13:18 1999
+--- examples/cgi-demo.cgi.in.orig	Tue Jan  4 08:36:55 2000
++++ examples/cgi-demo.cgi.in	Sun Apr  2 09:55:18 2000
 @@ -11,7 +11,7 @@
  <H1>This is NOT traffic</H1>
  
@@ -10,7 +10,7 @@ $NetBSD: patch-al,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $
 +<P><RRD::GRAPH cgi-demo1.png 
  	    --lower-limit 0
  	    --start 'end-10h'
- 	    --title "Graph in Localtime"
+ 	    --title "Graph in Localtime <RRD::TIME::NOW %c>"
 @@ -22,7 +22,7 @@
  </P>
  
diff --git a/databases/rrdtool/patches/patch-an b/databases/rrdtool/patches/patch-an
index 383e719c351..fda4132f7cd 100644
--- a/databases/rrdtool/patches/patch-an
+++ b/databases/rrdtool/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $
+$NetBSD: patch-an,v 1.2 2000/05/07 12:50:52 wulf Exp $
 
 --- examples/piped-demo.pl.in.orig	Sun Nov 14 13:09:23 1999
 +++ examples/piped-demo.pl.in	Sun Nov 14 13:10:27 1999
@@ -28,12 +28,12 @@ $NetBSD: patch-an,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $
 -        "AREA:alpha#0022e9:Alpha",
 -        "STACK:beta#00b871:Beta",
 -        "STACK:calc#ff0091:Calc\\j",
--	"PRINT:alpha:AVERAGE:'Average Alpha\\: %1.2f %S'",
--	"PRINT:alpha:MIN:'Min Alpha\\: %1.2f %S'",
--	"PRINT:alpha:MAX:'Max Alpha\\: %1.2f %S'",
--	"GPRINT:calc:AVERAGE:'Average calc\\: %1.2f %S\\r'",
--	"GPRINT:calc:MIN:'Min calc\\: %1.2f %S'",
--	"GPRINT:calc:MAX:'Max calc\\: %1.2f %S'",
+-	"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'";
diff --git a/databases/rrdtool/patches/patch-ao b/databases/rrdtool/patches/patch-ao
new file mode 100644
index 00000000000..e1368d349fe
--- /dev/null
+++ b/databases/rrdtool/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2000/05/07 13:36:49 wulf Exp $
+
+--- contrib/rrdproc/Makefile.in.orig	Tue May  2 21:22:49 2000
++++ contrib/rrdproc/Makefile.in	Sat May  6 00:52:17 2000
+@@ -84,7 +84,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-ap b/databases/rrdtool/patches/patch-ap
new file mode 100644
index 00000000000..8c2cf880a78
--- /dev/null
+++ b/databases/rrdtool/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2000/05/07 13:36:49 wulf Exp $
+
+--- configure.orig	Tue May  2 19:39:15 2000
++++ configure	Sat May  6 00:53:18 2000
+@@ -1696,7 +1696,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++# LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
diff --git a/databases/rrdtool/patches/patch-aq b/databases/rrdtool/patches/patch-aq
new file mode 100644
index 00000000000..258ff20f2e4
--- /dev/null
+++ b/databases/rrdtool/patches/patch-aq
@@ -0,0 +1,24 @@
+$NetBSD: patch-aq,v 1.1 2000/05/07 13:36:49 wulf Exp $
+
+--- src/rrd_tool.h.orig	Sun May  7 09:44:02 2000
++++ src/rrd_tool.h	Sun May  7 09:48:27 2000
+@@ -10,6 +10,10 @@
+ extern "C" {
+ #endif
+ 
++/*
++ * gd.h needs to be called before math.h to avoid -Wshadow warnings
++ */
++#include <gd.h>
+ 
+ #ifndef _RRD_TOOL_H
+ #define _RRD_TOOL_H
+@@ -142,7 +146,7 @@
+ 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);
+ int rrd_fetch_fn(char *filename, enum cf_en cf_idx,