From 044dd83bcf3b8394b8ee587a2abba3d4f98c1da2 Mon Sep 17 00:00:00 2001 From: wulf Date: Tue, 5 Dec 2000 11:15:42 +0000 Subject: Update to rrdtool-1.0.28 that since has seen several bugfixes --- databases/rrdtool/files/md5 | 4 +- databases/rrdtool/files/patch-sum | 36 +++++++-------- databases/rrdtool/patches/patch-aa | 34 +++++++------- databases/rrdtool/patches/patch-ab | 8 ++-- databases/rrdtool/patches/patch-ac | 10 ++-- databases/rrdtool/patches/patch-ad | 8 ++-- databases/rrdtool/patches/patch-ae | 8 ++-- databases/rrdtool/patches/patch-af | 8 ++-- databases/rrdtool/patches/patch-ag | 8 ++-- databases/rrdtool/patches/patch-ah | 95 +++++++++++++++++++------------------- databases/rrdtool/patches/patch-ai | 14 +++--- databases/rrdtool/patches/patch-ak | 10 ++-- databases/rrdtool/patches/patch-ao | 8 ++-- databases/rrdtool/patches/patch-ap | 8 ++-- databases/rrdtool/patches/patch-aq | 13 +++--- databases/rrdtool/patches/patch-ar | 8 ++-- databases/rrdtool/patches/patch-as | 8 ++-- databases/rrdtool/patches/patch-at | 8 ++-- databases/rrdtool/patches/patch-au | 8 ++-- 19 files changed, 151 insertions(+), 153 deletions(-) (limited to 'databases/rrdtool') diff --git a/databases/rrdtool/files/md5 b/databases/rrdtool/files/md5 index 4b7d497e9ea..0c194c85b79 100644 --- a/databases/rrdtool/files/md5 +++ b/databases/rrdtool/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.2 2000/05/07 12:50:51 wulf Exp $ +$NetBSD: md5,v 1.3 2000/12/05 11:15:42 wulf Exp $ -MD5 (rrdtool-1.0.21.tar.gz) = 60dbff17e3fd1b070b8ed0833520e7d5 +MD5 (rrdtool-1.0.28.tar.gz) = 4db8949675ccb97cd289fae96fb3dbb0 diff --git a/databases/rrdtool/files/patch-sum b/databases/rrdtool/files/patch-sum index 65688568af9..0b49d71701a 100644 --- a/databases/rrdtool/files/patch-sum +++ b/databases/rrdtool/files/patch-sum @@ -1,23 +1,23 @@ -$NetBSD: patch-sum,v 1.5 2000/06/27 01:32:12 hubertf Exp $ +$NetBSD: patch-sum,v 1.6 2000/12/05 11:15:42 wulf Exp $ -MD5 (patch-aa) = b551857e3989780dca848a79e7729644 -MD5 (patch-ab) = 6ad36347d300005cc45690ce79bb2177 -MD5 (patch-ac) = f02ab818b5935f01dd8c815c17ca2af5 -MD5 (patch-ad) = e9dbcc6855e9c0e37d82ee98f8af947b -MD5 (patch-ae) = 8200f12c2a71ea81312735037b23dbf3 -MD5 (patch-af) = 76b6d549e9ab0bf4ac58ea9109abefb7 -MD5 (patch-ag) = 7c051367568fa9d09dbd5863acf69a43 -MD5 (patch-ah) = 8eec5a52b7329e1cd3e6715b27cde9d7 -MD5 (patch-ai) = f7a53b1c2b1008fc81e86405773384c6 +MD5 (patch-aa) = 9fe5f141433a98426086969dfe91374e +MD5 (patch-ab) = 6106d7ead53acd41d3dff2a4c2c56a7d +MD5 (patch-ac) = 6307f0c667de456544fc3d89ac6d7fc7 +MD5 (patch-ad) = e9f7b6ac959f62a1951f02b2da5924ae +MD5 (patch-ae) = 7e2530456dd89a6a1a8fcbdb12acdb22 +MD5 (patch-af) = 29dfae0d50c6d9317024cb6e83725ca1 +MD5 (patch-ag) = b3b538caca887b2c874cb372e5c62fcf +MD5 (patch-ah) = 5bf6f281a4c65705e68ea1884e2bd25e +MD5 (patch-ai) = 403a55b3fee32ea11a44edc62e1f413c MD5 (patch-aj) = 0e31ae086aa1a6e2276171b15458bb51 -MD5 (patch-ak) = 38728393cce8a0b36661ca8864d012d4 +MD5 (patch-ak) = f96e09b8a76412bfba29cb0303319a18 MD5 (patch-al) = 546d7f972159d17d523ac9584a4b35c1 MD5 (patch-am) = eb50fb55ed437ada4f543786f4a66cee MD5 (patch-an) = f5f2ef97bd1cc75759cdb578236389e8 -MD5 (patch-ao) = dd701ac3b43157f9e3b89fcc2a9ccaf0 -MD5 (patch-ap) = 60100a12dd5cb5be8992b0aadb57a754 -MD5 (patch-aq) = 14a14d053602d46d11b842e1f8bb87ef -MD5 (patch-ar) = 9428ec77d9166aff02ea370c81ff9365 -MD5 (patch-as) = 810acca601241f5beebdb7c31deac571 -MD5 (patch-at) = e1b4bc946f59db48b6317aca7b15a6c5 -MD5 (patch-au) = 299e143ef30832bfdda00d78d1da2802 +MD5 (patch-ao) = 947892535815c1073c3cf6e5239559ba +MD5 (patch-ap) = 6f3c4cba1f96d680d8700dfbc56c75db +MD5 (patch-aq) = 38fe2148964b712c59edfe6a601a9600 +MD5 (patch-ar) = cb2fb8ea42c8805558aec9c592f4a063 +MD5 (patch-as) = 2f0651b0a7689fd3248b664be28a4fe9 +MD5 (patch-at) = 83335b59d2e3be4d2a6ca94c2227a60f +MD5 (patch-au) = ff4b87406aaa853bf08c11e7a515876f diff --git a/databases/rrdtool/patches/patch-aa b/databases/rrdtool/patches/patch-aa index 841167afbeb..a3516505abf 100644 --- a/databases/rrdtool/patches/patch-aa +++ b/databases/rrdtool/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2000/05/07 12:50:51 wulf Exp $ +$NetBSD: patch-aa,v 1.3 2000/12/05 11:15:42 wulf Exp $ ---- Makefile.in.orig Wed May 3 20:38:20 2000 -+++ Makefile.in Wed May 3 20:40:13 2000 -@@ -84,7 +84,7 @@ +--- Makefile.in.orig Thu Sep 14 15:27:45 2000 ++++ Makefile.in Tue Dec 5 20:54:28 2000 +@@ -86,7 +86,7 @@ RSYNC = rsync --rsh=ssh # build the following subdirectories @@ -11,21 +11,21 @@ $NetBSD: patch-aa,v 1.2 2000/05/07 12:50:51 wulf Exp $ # the following files are not mentioned in any other Makefile -@@ -381,11 +381,12 @@ - +@@ -384,11 +384,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: -- $(INSTALL) -d -m 755 $(prefix)/lib/perl/auto/RRDs -- $(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_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_EXT@ $(prefix)/share/rrdtool/lib/perl/auto/RRDs -+ gmake site-perl-inst +- ./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 ++ $(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_EXT@ $(prefix)/share/rrdtool/lib/perl/auto/RRDs ++ gmake site-perl-inst # rules for building the perl module perl_piped: perl-piped/Makefile diff --git a/databases/rrdtool/patches/patch-ab b/databases/rrdtool/patches/patch-ab index ee4451a369e..0d0a88f03c2 100644 --- a/databases/rrdtool/patches/patch-ab +++ b/databases/rrdtool/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2000/05/07 12:50:52 wulf Exp $ +$NetBSD: patch-ab,v 1.3 2000/12/05 11:15:42 wulf Exp $ ---- 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 @@ +--- 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 @@ 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 17e0222ee51..33176ec2894 100644 --- a/databases/rrdtool/patches/patch-ac +++ b/databases/rrdtool/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.2 2000/05/07 12:50:52 wulf Exp $ +$NetBSD: patch-ac,v 1.3 2000/12/05 11:15:42 wulf Exp $ ---- 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 @@ +--- 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 @@ 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 + EXTRA_DIST = clickgraphs php3 php4 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs diff --git a/databases/rrdtool/patches/patch-ad b/databases/rrdtool/patches/patch-ad index 3cff75a08d6..d8105b95c70 100644 --- a/databases/rrdtool/patches/patch-ad +++ b/databases/rrdtool/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.2 2000/05/07 12:50:52 wulf Exp $ +$NetBSD: patch-ad,v 1.3 2000/12/05 11:15:42 wulf Exp $ ---- 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 @@ +--- 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 @@ VERSION = @VERSION@ ZLIB_LIB_DIR = @ZLIB_LIB_DIR@ diff --git a/databases/rrdtool/patches/patch-ae b/databases/rrdtool/patches/patch-ae index abde5d7380f..11750ee4850 100644 --- a/databases/rrdtool/patches/patch-ae +++ b/databases/rrdtool/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.2 2000/05/07 12:50:52 wulf Exp $ +$NetBSD: patch-ae,v 1.3 2000/12/05 11:15:42 wulf Exp $ ---- 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 @@ +--- 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 diff --git a/databases/rrdtool/patches/patch-af b/databases/rrdtool/patches/patch-af index 84d352d8cf5..628326c0300 100644 --- a/databases/rrdtool/patches/patch-af +++ b/databases/rrdtool/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.2 2000/05/07 12:50:52 wulf Exp $ +$NetBSD: patch-af,v 1.3 2000/12/05 11:15:42 wulf Exp $ ---- 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 @@ +--- 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 diff --git a/databases/rrdtool/patches/patch-ag b/databases/rrdtool/patches/patch-ag index 6ef39788519..91262a95db2 100644 --- a/databases/rrdtool/patches/patch-ag +++ b/databases/rrdtool/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.2 2000/05/07 12:50:52 wulf Exp $ +$NetBSD: patch-ag,v 1.3 2000/12/05 11:15:42 wulf Exp $ ---- 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 @@ +--- 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 @@ EXTRA_DIST = $(POD) $(HTML) $(TXT) # some install rules diff --git a/databases/rrdtool/patches/patch-ah b/databases/rrdtool/patches/patch-ah index 82d90ba750f..858876fa1df 100644 --- a/databases/rrdtool/patches/patch-ah +++ b/databases/rrdtool/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.4 2000/05/07 12:50:52 wulf Exp $ +$NetBSD: patch-ah,v 1.5 2000/12/05 11:15:42 wulf Exp $ ---- 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 @@ +--- 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@ VERSION = @VERSION@ @@ -16,7 +16,7 @@ $NetBSD: patch-ah,v 1.4 2000/05/07 12:50:52 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) -@@ -105,7 +100,7 @@ +@@ -107,7 +102,7 @@ # creates a ./.lib/*.al file that contains the PIC compiled object # files. @@ -25,7 +25,7 @@ $NetBSD: patch-ah,v 1.4 2000/05/07 12:50:52 wulf Exp $ lib_LTLIBRARIES = librrd.la -@@ -138,18 +133,12 @@ +@@ -142,18 +137,12 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../config CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ @@ -45,7 +45,7 @@ $NetBSD: patch-ah,v 1.4 2000/05/07 12:50:52 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 \ -@@ -266,8 +255,8 @@ +@@ -272,8 +261,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.4 2000/05/07 12:50:52 wulf Exp $ mostlyclean-binPROGRAMS: -@@ -294,7 +283,7 @@ +@@ -300,7 +289,7 @@ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done @@ -65,7 +65,7 @@ $NetBSD: patch-ah,v 1.4 2000/05/07 12:50:52 wulf Exp $ @rm -f rrdcgi $(LINK) $(rrdcgi_LDFLAGS) $(rrdcgi_OBJECTS) $(rrdcgi_LDADD) $(LIBS) -@@ -346,50 +335,50 @@ +@@ -367,49 +356,49 @@ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done @@ -77,65 +77,64 @@ $NetBSD: patch-ah,v 1.4 2000/05/07 12:50:52 wulf Exp $ 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 +- rrd.h getopt.h rrd_format.h ../gd1.3/gd.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.6/pngconf.h -+ parsetime.h getopt.h rrd_format.h ${PREFIX}/include/gd.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 parsetime.h getopt.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 \ -- parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h -+ parsetime.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 \ -- parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h -+ parsetime.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 \ -- parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h -+ parsetime.h getopt.h rrd_format.h ${PREFIX}/include/gd.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 \ +- 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 \ +- 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 \ -- parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h -+ parsetime.h getopt.h rrd_format.h ${PREFIX}/include/gd.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 \ -- parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h -+ parsetime.h getopt.h rrd_format.h ${PREFIX}/include/gd.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 \ -- parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h -+ parsetime.h getopt.h rrd_format.h ${PREFIX}/include/gd.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 \ -- parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h \ +- rrd.h getopt.h rrd_format.h ../gd1.3/gd.h \ - ../gd1.3/gdlucidan10.h ../gd1.3/gdlucidab12.h -+ parsetime.h getopt.h rrd_format.h ${PREFIX}/include/gd.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 \ -- 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 - rrd_open.lo rrd_open.o : rrd_open.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_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 \ +- 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 \ +- 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 \ -- parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h -+ parsetime.h getopt.h rrd_format.h ${PREFIX}/include/gd.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 \ - ../config/config.h parsetime.h getopt.h rrd_format.h \ -- ../gd1.3/gd.h -+ ${PREFIX}/include/gd.h - rrd_tool.o: rrd_tool.c rrd_tool.h ../config/config.h parsetime.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_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 \ - getopt.h rrd_format.h ../gd1.3/gd.h + getopt.h rrd_format.h ${PREFIX}/include/gd.h - rrd_tune.lo rrd_tune.o : rrd_tune.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_update.lo rrd_update.o : rrd_update.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.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 6946f62a3e3..e186cb7de77 100644 --- a/databases/rrdtool/patches/patch-ai +++ b/databases/rrdtool/patches/patch-ai @@ -1,7 +1,7 @@ -$NetBSD: patch-ai,v 1.2 2000/05/07 12:50:52 wulf Exp $ +$NetBSD: patch-ai,v 1.3 2000/12/05 11:15:42 wulf Exp $ ---- src/rrd_graph.c.orig Tue May 2 04:51:47 2000 -+++ src/rrd_graph.c Wed May 3 21:04:46 2000 +--- 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 @@ #include "rrd_tool.h" @@ -20,7 +20,7 @@ $NetBSD: patch-ai,v 1.2 2000/05/07 12:50:52 wulf Exp $ /* #define DEBUG */ @@ -38,7 +38,7 @@ - OP_MIN,OP_MAX,OP_LIMIT, + OP_MIN,OP_MAX,OP_LIMIT, OP_FLOOR, OP_CEIL, OP_UN,OP_END}; -enum if_en {IF_GIF=0,IF_PNG=1}; @@ -36,7 +36,7 @@ $NetBSD: patch-ai,v 1.2 2000/05/07 12:50:52 wulf Exp $ conv_if(PNG,IF_PNG) return (-1); -@@ -2291,9 +2290,6 @@ +@@ -2309,9 +2308,6 @@ if ((fd = fopen(im->graphfile,"rb")) == NULL) return 0; /* the file does not exist */ switch (im->imgformat) { @@ -46,7 +46,7 @@ $NetBSD: patch-ai,v 1.2 2000/05/07 12:50:52 wulf Exp $ case IF_PNG: size = PngSize(fd,&(im->xgif),&(im->ygif)); break; -@@ -2552,9 +2548,6 @@ +@@ -2570,9 +2566,6 @@ } } switch (im->imgformat) { @@ -56,7 +56,7 @@ $NetBSD: patch-ai,v 1.2 2000/05/07 12:50:52 wulf Exp $ case IF_PNG: gdImagePng(gif, fo); break; -@@ -2669,7 +2662,7 @@ +@@ -2687,7 +2680,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 d8229c04cb0..508d97fd438 100644 --- a/databases/rrdtool/patches/patch-ak +++ b/databases/rrdtool/patches/patch-ak @@ -1,10 +1,10 @@ -$NetBSD: patch-ak,v 1.2 2000/05/07 12:50:52 wulf Exp $ +$NetBSD: patch-ak,v 1.3 2000/12/05 11:15:42 wulf Exp $ ---- 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 @@ +--- perl-shared/Makefile.PL.orig Fri Jul 14 06:52:17 2000 ++++ perl-shared/Makefile.PL Tue Dec 5 20:57:43 2000 +@@ -10,10 +10,10 @@ + 'NAME' => 'RRDs', 'VERSION_FROM' => 'RRDs.pm', # finds $VERSION - 'OPTIMIZE' => '-g', 'DEFINE' => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}", - 'INC' => '-I../src -I../gd1.3', + 'INC' => '-I../src -I${PREFIX}/include', diff --git a/databases/rrdtool/patches/patch-ao b/databases/rrdtool/patches/patch-ao index e1368d349fe..ce567aaca41 100644 --- a/databases/rrdtool/patches/patch-ao +++ b/databases/rrdtool/patches/patch-ao @@ -1,8 +1,8 @@ -$NetBSD: patch-ao,v 1.1 2000/05/07 13:36:49 wulf Exp $ +$NetBSD: patch-ao,v 1.2 2000/12/05 11:15:42 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 @@ +--- 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 diff --git a/databases/rrdtool/patches/patch-ap b/databases/rrdtool/patches/patch-ap index 8c2cf880a78..97310c6a6d1 100644 --- a/databases/rrdtool/patches/patch-ap +++ b/databases/rrdtool/patches/patch-ap @@ -1,8 +1,8 @@ -$NetBSD: patch-ap,v 1.1 2000/05/07 13:36:49 wulf Exp $ +$NetBSD: patch-ap,v 1.2 2000/12/05 11:15:42 wulf Exp $ ---- configure.orig Tue May 2 19:39:15 2000 -+++ configure Sat May 6 00:53:18 2000 -@@ -1696,7 +1696,7 @@ +--- configure.orig Thu Sep 14 15:27:47 2000 ++++ configure Tue Dec 5 20:58:00 2000 +@@ -1708,7 +1708,7 @@ LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" # Always use our own libtool. diff --git a/databases/rrdtool/patches/patch-aq b/databases/rrdtool/patches/patch-aq index aa1c479921e..0feae5e72c9 100644 --- a/databases/rrdtool/patches/patch-aq +++ b/databases/rrdtool/patches/patch-aq @@ -1,7 +1,7 @@ -$NetBSD: patch-aq,v 1.2 2000/05/07 13:55:17 wulf Exp $ +$NetBSD: patch-aq,v 1.3 2000/12/05 11:15:42 wulf Exp $ ---- src/rrd_tool.h.orig Tue May 2 21:21:49 2000 -+++ src/rrd_tool.h Sun May 7 22:24:20 2000 +--- src/rrd_tool.h.orig Thu Sep 14 15:34:00 2000 ++++ src/rrd_tool.h Tue Dec 5 20:46:24 2000 @@ -14,6 +14,11 @@ #ifndef _RRD_TOOL_H #define _RRD_TOOL_H @@ -14,12 +14,11 @@ $NetBSD: patch-aq,v 1.2 2000/05/07 13:55:17 wulf Exp $ #ifdef WIN32 # include "ntconfig.h" #else -@@ -142,7 +147,7 @@ - int GifSize(FILE *, long *, long *); +@@ -125,7 +130,6 @@ int PngSize(FILE *, long *, long *); int PngSize(FILE *, long *, long *); + -#include -+ 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, diff --git a/databases/rrdtool/patches/patch-ar b/databases/rrdtool/patches/patch-ar index 2ce00437387..cba221c71cc 100644 --- a/databases/rrdtool/patches/patch-ar +++ b/databases/rrdtool/patches/patch-ar @@ -1,8 +1,8 @@ -$NetBSD: patch-ar,v 1.1 2000/06/27 01:32:13 hubertf Exp $ +$NetBSD: patch-ar,v 1.2 2000/12/05 11:15:42 wulf Exp $ ---- contrib/add_ds/Makefile.in.orig Tue Jun 27 01:52:30 2000 -+++ contrib/add_ds/Makefile.in Tue Jun 27 01:54:08 2000 -@@ -85,7 +85,7 @@ +--- 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 diff --git a/databases/rrdtool/patches/patch-as b/databases/rrdtool/patches/patch-as index af0a10ec616..218152ea4c5 100644 --- a/databases/rrdtool/patches/patch-as +++ b/databases/rrdtool/patches/patch-as @@ -1,8 +1,8 @@ -$NetBSD: patch-as,v 1.1 2000/06/27 01:32:13 hubertf Exp $ +$NetBSD: patch-as,v 1.2 2000/12/05 11:15:42 wulf Exp $ ---- contrib/killspike/Makefile.in.orig Tue Jun 27 01:55:42 2000 -+++ contrib/killspike/Makefile.in Tue Jun 27 01:56:05 2000 -@@ -85,7 +85,7 @@ +--- 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 diff --git a/databases/rrdtool/patches/patch-at b/databases/rrdtool/patches/patch-at index ab47e20563a..4b78d773f9a 100644 --- a/databases/rrdtool/patches/patch-at +++ b/databases/rrdtool/patches/patch-at @@ -1,8 +1,8 @@ -$NetBSD: patch-at,v 1.1 2000/06/27 01:32:13 hubertf Exp $ +$NetBSD: patch-at,v 1.2 2000/12/05 11:15:42 wulf Exp $ ---- contrib/rrdfetchnames/Makefile.in.orig Tue Jun 27 01:57:15 2000 -+++ contrib/rrdfetchnames/Makefile.in Tue Jun 27 01:57:24 2000 -@@ -85,7 +85,7 @@ +--- 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 diff --git a/databases/rrdtool/patches/patch-au b/databases/rrdtool/patches/patch-au index 7b1d01ea685..f68b96ea42a 100644 --- a/databases/rrdtool/patches/patch-au +++ b/databases/rrdtool/patches/patch-au @@ -1,8 +1,8 @@ -$NetBSD: patch-au,v 1.1 2000/06/27 01:32:14 hubertf Exp $ +$NetBSD: patch-au,v 1.2 2000/12/05 11:15:42 wulf Exp $ ---- contrib/rrdlastds/Makefile.in.orig Tue Jun 27 01:58:01 2000 -+++ contrib/rrdlastds/Makefile.in Tue Jun 27 01:58:08 2000 -@@ -85,7 +85,7 @@ +--- 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 -- cgit v1.2.3