diff options
Diffstat (limited to 'databases/rrdtool/patches')
-rw-r--r-- | databases/rrdtool/patches/patch-aa | 31 | ||||
-rw-r--r-- | databases/rrdtool/patches/patch-ab | 13 | ||||
-rw-r--r-- | databases/rrdtool/patches/patch-ac | 13 | ||||
-rw-r--r-- | databases/rrdtool/patches/patch-ad | 13 | ||||
-rw-r--r-- | databases/rrdtool/patches/patch-ae | 13 | ||||
-rw-r--r-- | databases/rrdtool/patches/patch-af | 13 | ||||
-rw-r--r-- | databases/rrdtool/patches/patch-ag | 16 | ||||
-rw-r--r-- | databases/rrdtool/patches/patch-ah | 136 | ||||
-rw-r--r-- | databases/rrdtool/patches/patch-ai | 67 | ||||
-rw-r--r-- | databases/rrdtool/patches/patch-aj | 13 | ||||
-rw-r--r-- | databases/rrdtool/patches/patch-ak | 17 | ||||
-rw-r--r-- | databases/rrdtool/patches/patch-al | 22 | ||||
-rw-r--r-- | databases/rrdtool/patches/patch-am | 50 | ||||
-rw-r--r-- | databases/rrdtool/patches/patch-an | 55 |
14 files changed, 472 insertions, 0 deletions
diff --git a/databases/rrdtool/patches/patch-aa b/databases/rrdtool/patches/patch-aa new file mode 100644 index 00000000000..b8c68385d18 --- /dev/null +++ b/databases/rrdtool/patches/patch-aa @@ -0,0 +1,31 @@ +$NetBSD: patch-aa,v 1.1.1.1 1999/11/17 17:34:39 wennmach 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@ + +-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 @@ + + # lets schedule the perl stuff for installation + 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 $(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 ++ 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 new file mode 100644 index 00000000000..aa756e6b147 --- /dev/null +++ b/databases/rrdtool/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1.1.1 1999/11/17 17:34:39 wennmach 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 @@ + + 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 + mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs + CONFIG_HEADER = ../config/config.h diff --git a/databases/rrdtool/patches/patch-ac b/databases/rrdtool/patches/patch-ac new file mode 100644 index 00000000000..5b5d092a29d --- /dev/null +++ b/databases/rrdtool/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1.1.1 1999/11/17 17:34:39 wennmach 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 + +-contribdir = $(prefix)/contrib ++contribdir = $(prefix)/share/rrdtool/contrib + contrib_DATA = README + 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 new file mode 100644 index 00000000000..30093a8fa05 --- /dev/null +++ b/databases/rrdtool/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1.1.1 1999/11/17 17:34:39 wennmach 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 @@ + ZLIB_LIB_DIR = @ZLIB_LIB_DIR@ + + 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 diff --git a/databases/rrdtool/patches/patch-ae b/databases/rrdtool/patches/patch-ae new file mode 100644 index 00000000000..cd1bb2d7d10 --- /dev/null +++ b/databases/rrdtool/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1.1.1 1999/11/17 17:34:39 wennmach 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 @@ + ZLIB_LIB_DIR = @ZLIB_LIB_DIR@ + + EXTRA_DIST = rrd.png +-contribdir = $(prefix)/contrib/rrd-file-icon ++contribdir = $(prefix)/share/rrdtool/contrib/rrd-file-icon + contrib_DATA = README rrd.png + mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs + CONFIG_HEADER = ../../config/config.h diff --git a/databases/rrdtool/patches/patch-af b/databases/rrdtool/patches/patch-af new file mode 100644 index 00000000000..2ffa10822e8 --- /dev/null +++ b/databases/rrdtool/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1.1.1 1999/11/17 17:34:39 wennmach 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 @@ + + EXTRA_DIST = log2rrd.pl.in + +-contribdir = $(prefix)/contrib/log2rrd ++contribdir = $(prefix)/share/rrdtool/contrib/log2rrd + contrib_DATA = README + contrib_SCRIPTS = log2rrd.pl + mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs diff --git a/databases/rrdtool/patches/patch-ag b/databases/rrdtool/patches/patch-ag new file mode 100644 index 00000000000..3ccf18379ec --- /dev/null +++ b/databases/rrdtool/patches/patch-ag @@ -0,0 +1,16 @@ +$NetBSD: patch-ag,v 1.1.1.1 1999/11/17 17:34:39 wennmach 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 @@ + 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/rrdtool + ihtml_DATA = $(HTML) + imandir = $(prefix)/man/man1 + iman_DATA = $(MAN) diff --git a/databases/rrdtool/patches/patch-ah b/databases/rrdtool/patches/patch-ah new file mode 100644 index 00000000000..f4d72afc182 --- /dev/null +++ b/databases/rrdtool/patches/patch-ah @@ -0,0 +1,136 @@ +$NetBSD: patch-ah,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $ + +--- src/Makefile.in.orig Sat Aug 28 04:50:25 1999 ++++ src/Makefile.in Sun Nov 7 22:03:59 1999 +@@ -76,12 +76,7 @@ + PERL = @PERL@ + RANLIB = @RANLIB@ + +-CGI_LIB_DIR = $(top_srcdir)/@CGI_LIB_DIR@ +-GD_LIB_DIR = $(top_srcdir)/@GD_LIB_DIR@ +-PNG_LIB_DIR = $(top_srcdir)/@PNG_LIB_DIR@ +-ZLIB_LIB_DIR = $(top_srcdir)/@ZLIB_LIB_DIR@ +- +-INCLUDES = -I$(CGI_LIB_DIR) -I$(GD_LIB_DIR) -I$(PNG_LIB_DIR) -I$(ZLIB_LIB_DIR) ++INCLUDES = -I${PREFIX}/include + + #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 @@ + # 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 + + + lib_LTLIBRARIES = librrd.la +@@ -128,18 +123,12 @@ + DEFS = @DEFS@ -I. -I$(srcdir) -I../config + 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 ++LIBS = @LIBS@ -lgd -lpng -lcgi -lz + 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 = +-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 @@ + 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) ++librrd_private.la: $(librrd_private_la_OBJECTS) + $(LINK) $(librrd_private_la_LDFLAGS) $(librrd_private_la_OBJECTS) $(librrd_private_la_LIBADD) $(LIBS) + + mostlyclean-binPROGRAMS: +@@ -283,7 +272,7 @@ + rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + done + +-rrdcgi: $(rrdcgi_OBJECTS) $(rrdcgi_DEPENDENCIES) ++rrdcgi: $(rrdcgi_OBJECTS) + @rm -f rrdcgi + $(LINK) $(rrdcgi_LDFLAGS) $(rrdcgi_OBJECTS) $(rrdcgi_LDADD) $(LIBS) + +@@ -335,48 +324,48 @@ + || 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 /usr/pkg/include/png.h /usr/include/zlib.h \ ++ /usr/include/zconf.h /usr/pkg/include/pngconf.h /usr/pkg/include/gd.h + getopt.lo getopt.o : getopt.c ../config/config.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 \ +- ../zlib-1.1.3/zlib.h ../zlib-1.1.3/zconf.h \ +- ../libpng-1.0.3/pngconf.h ++ parsetime.h getopt.h rrd_format.h /usr/pkg/include/gd.h ++pngsize.lo pngsize.o : pngsize.c /usr/pkg/include/png.h \ ++ /usr/include/zlib.h /usr/include/zconf.h \ ++ /usr/pkg/include/pngconf.h + rrd_cgi.o: rrd_cgi.c rrd_tool.h ../config/config.h parsetime.h getopt.h \ +- rrd_format.h ../gd1.3/gd.h ../cgilib-0.4/cgi.h ++ rrd_format.h /usr/pkg/include/gd.h /usr/pkg/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 /usr/pkg/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 /usr/pkg/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 /usr/pkg/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 /usr/pkg/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 /usr/pkg/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 /usr/pkg/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 \ +- ../gd1.3/gdlucidan10.h ../gd1.3/gdlucidab12.h ++ parsetime.h getopt.h rrd_format.h /usr/pkg/include/gd.h \ ++ /usr/pkg/include/gdfontt.h /usr/pkg/include/gdfonts.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 /usr/pkg/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 /usr/pkg/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 /usr/pkg/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 ++ /usr/pkg/include/gd.h + rrd_tool.o: rrd_tool.c rrd_tool.h ../config/config.h parsetime.h \ +- getopt.h rrd_format.h ../gd1.3/gd.h ++ getopt.h rrd_format.h /usr/pkg/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 /usr/pkg/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 /usr/pkg/include/gd.h + + info-am: + info: info-am diff --git a/databases/rrdtool/patches/patch-ai b/databases/rrdtool/patches/patch-ai new file mode 100644 index 00000000000..125484a30dc --- /dev/null +++ b/databases/rrdtool/patches/patch-ai @@ -0,0 +1,67 @@ +$NetBSD: patch-ai,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $ + +--- src/rrd_graph.c.orig Sun Nov 7 21:46:02 1999 ++++ src/rrd_graph.c Sun Nov 7 21:47:13 1999 +@@ -6,12 +6,12 @@ + + #include "rrd_tool.h" + #include <gd.h> +-#include <gdlucidan10.h> +-#include <gdlucidab12.h> ++#include <gdfontt.h> ++#include <gdfonts.h> + #include <sys/stat.h> + +-#define SmallFont gdLucidaNormal10 +-#define LargeFont gdLucidaBold12 ++#define SmallFont gdFontTiny ++#define LargeFont gdFontSmall + + /* #define DEBUG */ + +@@ -37,7 +37,7 @@ + OP_COS,OP_LOG,OP_EXP,OP_LT,OP_LE,OP_GT,OP_GE,OP_EQ,OP_IF, + OP_UN,OP_END}; + +-enum if_en {IF_GIF=0,IF_PNG=1}; ++enum if_en {IF_PNG=0}; + + typedef struct rpnp_t { + enum op_en op; +@@ -305,7 +305,6 @@ + + enum if_en if_conv(char *string){ + +- conv_if(GIF,IF_GIF) + conv_if(PNG,IF_PNG) + + return (-1); +@@ -2129,9 +2128,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)); +- break; + case IF_PNG: + PngSize(fd,&(im->xgif),&(im->ygif)); + break; +@@ -2389,9 +2385,6 @@ + } + } + switch (im->imgformat) { +- case IF_GIF: +- gdImageGif(gif, fo); +- break; + case IF_PNG: + gdImagePng(gif, fo); + break; +@@ -2506,7 +2499,7 @@ + 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 */ + + for(i=0;i<DIM(graph_col);i++) + im.graph_col[i].red=-1; diff --git a/databases/rrdtool/patches/patch-aj b/databases/rrdtool/patches/patch-aj new file mode 100644 index 00000000000..3c9aab48083 --- /dev/null +++ b/databases/rrdtool/patches/patch-aj @@ -0,0 +1,13 @@ +$NetBSD: patch-aj,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $ + +--- src/rrd_cgi.c.ORIG Fri Nov 5 00:20:16 1999 ++++ src/rrd_cgi.c Fri Nov 5 00:21:26 1999 +@@ -12,7 +12,7 @@ + #define MEMBLK 1024 + + /* global variable for libcgi */ +-s_cgi **cgiArg; ++s_cgi *cgiArg; + + /* in arg[0] find tags beginning with arg[1] call arg[2] on them + and replace by result of arg[2] call */ diff --git a/databases/rrdtool/patches/patch-ak b/databases/rrdtool/patches/patch-ak new file mode 100644 index 00000000000..d0bfb31290a --- /dev/null +++ b/databases/rrdtool/patches/patch-ak @@ -0,0 +1,17 @@ +$NetBSD: patch-ak,v 1.1.1.1 1999/11/17 17:34:39 wennmach 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', + 'VERSION_FROM' => 'RRDs.pm', # finds $VERSION + 'OPTIMIZE' => '-g', +- '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}, +- 'dynamic_lib' => {'OTHERLDFLAGS' => "$librrd -lm"}, ++ 'dynamic_lib' => {'OTHERLDFLAGS' => "$librrd -lm -lgd -lpng -lcgi -lz"}, + 'realclean' => {FILES => 't/demo?.rrd t/demo?.gif' } + ); diff --git a/databases/rrdtool/patches/patch-al b/databases/rrdtool/patches/patch-al new file mode 100644 index 00000000000..6e0ad56aedc --- /dev/null +++ b/databases/rrdtool/patches/patch-al @@ -0,0 +1,22 @@ +$NetBSD: patch-al,v 1.1.1.1 1999/11/17 17:34:39 wennmach 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 +@@ -11,7 +11,7 @@ + <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" +@@ -22,7 +22,7 @@ + </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-am b/databases/rrdtool/patches/patch-am new file mode 100644 index 00000000000..66c6d222559 --- /dev/null +++ b/databases/rrdtool/patches/patch-am @@ -0,0 +1,50 @@ +$NetBSD: patch-am,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $ + +--- examples/shared-demo.pl.in.orig Sun Nov 14 13:07:33 1999 ++++ examples/shared-demo.pl.in Sun Nov 14 13:12:13 1999 +@@ -36,8 +36,8 @@ + 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 @@ + 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 @@ + 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-an b/databases/rrdtool/patches/patch-an new file mode 100644 index 00000000000..383e719c351 --- /dev/null +++ b/databases/rrdtool/patches/patch-an @@ -0,0 +1,55 @@ +$NetBSD: patch-an,v 1.1.1.1 1999/11/17 17:34:39 wennmach 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 +@@ -16,7 +16,6 @@ + $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 @@ + ($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.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'", +- "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"; + |