kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed build problem and updated rrdtool to version 1.0.21

Browse source
This commit is contained in:
wulf 2000-05-07 12:50:51 +00:00
parent 846588c0e3
commit 56bb68adc5
19 changed files with 203 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
databases/rrdtool/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.2 1999/11/18 15:57:23 wennmach Exp $
# $NetBSD: Makefile,v 1.3 2000/05/07 12:50:51 wulf Exp $
#
DISTNAME= rrdtool-1.0.7
DISTNAME= rrdtool-1.0.21
CATEGORIES= databases graphics net
MASTER_SITES= http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/pub/
@ -9,11 +9,13 @@ MAINTAINER= wulf@ping.net.au
HOMEPAGE= http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool
DEPENDS+= cgilib-0.5:../../www/cgilib
DEPENDS+= gd-1.7.3:../../graphics/gd
DEPENDS+= gd>=1.7.3:../../graphics/gd
DEPENDS+= jpeg-6*:../../graphics/jpeg
USE_PERL5= yes
USE_LIBTOOL= yes
USE_GMAKE= yes
USE_X11= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
@ -22,4 +24,18 @@ LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ARGS= --enable-shared
# tcl build not enabled at this time. If this is turned on, the
# following files & directory would have to be added to PLIST:
#
# lib/tclrrd1.0.21.so
# lib/tclrrd1.0.21/
# lib/tclrrd1.0.21/pkgIndex.tcl
#
#DEPENDS+= tcl-8.0.5:../../x11/tk
#
#CFLAGS+= -I${LOCALBASE}/include/tcl8.0
#CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
#CONFIGURE_ARGS+= --with-tcllib=${LOCALBASE}/lib/tcl8.0
#INSTALL_TARGET= install site-tcl-install
.include "../../mk/bsd.pkg.mk"

4
databases/rrdtool/files/md5
View file

@ -1,3 +1,3 @@
$NetBSD: md5,v 1.1.1.1 1999/11/17 17:34:38 wennmach Exp $
$NetBSD: md5,v 1.2 2000/05/07 12:50:51 wulf Exp $
MD5 (rrdtool-1.0.7.tar.gz) = 4f1735aca4df8701101fe59024e6d08f
MD5 (rrdtool-1.0.21.tar.gz) = 60dbff17e3fd1b070b8ed0833520e7d5

29
databases/rrdtool/files/patch-sum
View file

@ -1,16 +1,19 @@
$NetBSD: patch-sum,v 1.2 2000/02/25 22:13:00 dmcmahill Exp $
$NetBSD: patch-sum,v 1.3 2000/05/07 12:50:51 wulf Exp $
MD5 (patch-aa) = d1005d5f9d9db58207a4e7716757cbba
MD5 (patch-ab) = 0a2f438a9ca534ce8f98135a1732db23
MD5 (patch-ac) = 2b56cf0f406173211aa64120dc1208e2
MD5 (patch-ad) = c322d812c9924e49fc2c3a779fa2fe12
MD5 (patch-ae) = b74b78a1d5904770c05710265151ae0a
MD5 (patch-af) = 7f4586bca3b6b53a76cabfc4190dab81
MD5 (patch-ag) = 2d2c34e5cd2603581e8e62065b68e859
MD5 (patch-ah) = 1e91272387db5004b28deb9db41c2572
MD5 (patch-ai) = de52dbb3dad3aa32c62a78e5db8a28d6
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-aj) = 0e31ae086aa1a6e2276171b15458bb51
MD5 (patch-ak) = 45403767288b570525028a2fcf4960ba
MD5 (patch-al) = b08f6ca5a759b71131c1be647fdf63f3
MD5 (patch-ak) = 38728393cce8a0b36661ca8864d012d4
MD5 (patch-al) = 546d7f972159d17d523ac9584a4b35c1
MD5 (patch-am) = eb50fb55ed437ada4f543786f4a66cee
MD5 (patch-an) = 29ce9924b25ddd418413685db458b7be
MD5 (patch-an) = f5f2ef97bd1cc75759cdb578236389e8
MD5 (patch-ao) = dd701ac3b43157f9e3b89fcc2a9ccaf0
MD5 (patch-ap) = 60100a12dd5cb5be8992b0aadb57a754
MD5 (patch-aq) = 50a435bc08cd749566280f2f87c684de

24
databases/rrdtool/patches/patch-aa
View file

@ -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

8
databases/rrdtool/patches/patch-ab
View file

@ -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

14
databases/rrdtool/patches/patch-ac
View file

@ -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

15
databases/rrdtool/patches/patch-ad
View file

@ -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

8
databases/rrdtool/patches/patch-ae
View file

@ -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

8
databases/rrdtool/patches/patch-af
View file

@ -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

8
databases/rrdtool/patches/patch-ag
View file

@ -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

51
databases/rrdtool/patches/patch-ah
View file

@ -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

22
databases/rrdtool/patches/patch-ai
View file

@ -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;

14
databases/rrdtool/patches/patch-ak
View file

@ -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' }
);

8
databases/rrdtool/patches/patch-al
View file

@ -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>

14
databases/rrdtool/patches/patch-an
View file

@ -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'";

13
databases/rrdtool/patches/patch-ao Normal file
View file

@ -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

13
databases/rrdtool/patches/patch-ap Normal file
View file

@ -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.

24
databases/rrdtool/patches/patch-aq Normal file
View file

@ -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,

17
databases/rrdtool/pkg/PLIST
View file

@ -1,8 +1,7 @@
@comment $NetBSD: PLIST,v 1.3 2000/04/05 16:27:16 wulf Exp $
@comment $NetBSD: PLIST,v 1.4 2000/05/07 12:50:52 wulf Exp $
bin/rrdcgi
bin/rrdtool
lib/librrd.a
lib/librrd.la
lib/librrd.so.0.0
man/man1/rrdtool.1
man/man1/rrdlast.1
@ -19,6 +18,8 @@ man/man1/rrdcgi.1
man/man1/rrdtutorial.1
man/man1/RRDs.1
man/man1/RRDp.1
man/man1/cdeftutorial.1
man/man1/rpntutorial.1
share/rrdtool/contrib/README
share/rrdtool/contrib/log2rrd/README
share/rrdtool/contrib/log2rrd/log2rrd.pl
@ -26,12 +27,17 @@ share/rrdtool/contrib/rrd-file-icon/README
share/rrdtool/contrib/rrd-file-icon/rrd.png
share/rrdtool/contrib/trytime/README
share/rrdtool/contrib/trytime/trytime.c
share/rrdtool/contrib/rrdproc/README
share/rrdtool/contrib/rrdproc/rrdproc.c
share/examples/rrdtool/cgi-demo.cgi
share/examples/rrdtool/piped-demo.pl
share/examples/rrdtool/shared-demo.pl
share/examples/rrdtool/stripes.pl
share/examples/rrdtool/bigtops.pl
share/examples/rrdtool/minmax.pl
share/doc/rrdtool/rrdinfo.html
share/doc/rrdtool/rrdinfo.pod
share/doc/rrdtool/rrdinfo.txt
share/doc/rrdtool/rrdtool.html
share/doc/rrdtool/rrdlast.html
share/doc/rrdtool/rrdcreate.html
@ -75,6 +81,12 @@ share/doc/rrdtool/rrdcgi.txt
share/doc/rrdtool/rrdtutorial.txt
share/doc/rrdtool/RRDs.txt
share/doc/rrdtool/RRDp.txt
share/doc/rrdtool/cdeftutorial.pod
share/doc/rrdtool/cdeftutorial.txt
share/doc/rrdtool/cdeftutorial.html
share/doc/rrdtool/rpntutorial.pod
share/doc/rrdtool/rpntutorial.txt
share/doc/rrdtool/rpntutorial.html
share/rrdtool/lib/perl/RRDp.pm
share/rrdtool/lib/perl/RRDs.pm
share/rrdtool/lib/perl/auto/RRDs/RRDs.bs
@ -90,6 +102,7 @@ lib/perl5/man/man3/RRDp.3
lib/perl5/man/man3/RRDs.3
@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/RRDp
@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/RRDs
@dirrm share/rrdtool/contrib/rrdproc
@dirrm share/rrdtool/contrib/rrd-file-icon
@dirrm share/rrdtool/contrib/trytime
@dirrm share/rrdtool/contrib/log2rrd