diff options
| author | seb <seb@pkgsrc.org> | 2003-02-16 23:08:55 +0000 |
|---|---|---|
| committer | seb <seb@pkgsrc.org> | 2003-02-16 23:08:55 +0000 |
| commit | 830708ba674a42d28c281d60644b8ffd7dbb4097 (patch) | |
| tree | c36879faeb0d7e6d4e3befe437b9b109fb23e25f /databases | |
| parent | 36c26909d786629a09af4f5e7346692ad220b670 (diff) | |
| download | pkgsrc-830708ba674a42d28c281d60644b8ffd7dbb4097.tar.gz | |
Update to version 1.0.40. See changes below.
Packages changes: use buildlink2 and perl5/module.mk, documentation
splitted in $PREFIX/share/doc/{rrdtool,html/rrdtool}/*.
Okay'ed by wulf@.
Changes since version 1.0.33:
- bugfix, + enhancement, * contrib, = RELEASE
---------------------------------------------
= 1.0.40 2002/10/11 -- Tobi
- 2002/10/11 Jeffrey Wheat <jeff@nt.cetlink.net>
updated php4 bindings to work with php 4.2.3
- 2002/10/07 Tomoyuki Murakami <tomoyuki@pobox.com>
-z does not take an option
- 2002/10/03 Gonzalo Augusto Arana Tagle <garana@uolsinectis.com.ar>
fix for PREV() operator
- 2002/08/01 Paul Clifford <paul.clifford@bbc.co.uk>
fix for segfault in print_calc function
+ 2002/07/31 "Nenad Antic (EAB)" <Nenad.Antic@era.ericsson.se>
rrdfetch manpage update
- 2002/07/12 Gonzalo Augusto Arana Tagle <garana@uolsinectis.com.ar>
PREV(xxx) match with DEF_NAM_FMT
- 2002/07/12 Joerg Mertin <mertinj@europe.psi.com>
fixed bindings for php4
- 2002/07/02 Philippe.Simonet@swisscom.com
fixed DINF for win32 compile
= 1.0.39 2002/06/20 -- Tobi
+ 2002/06/20 -- Gonzalo Augusto Arana Tagle <garana@uolsinectis.com.ar>
* new CDEF feature PREV(x) which allows for funky new filters
to be created easily
+ 2002/06/14 -- "Shipway, Steve" <steve.shipway@eds.com>
* Improved docs for rrd_resize
- Tobi
* increassed commandline buffer in rrd_tool.c to 100 kilo Byte
* in rrd_graph replace rint by ceil ...its more portable
* remove // comments and replace with /* .... */
* due to popular demand change strftime format to %V for weeks
+ 2002/05/24 -- Joe Griffin <joe.griffin@mscsoftware.com>
* config.guess and config.sub updates for IA64
= 1.0.38 2002/05/22 -- Tobi
- 2002/05/12 -- Tobi
* fix for crash in restore when used with existing file
- 2002/04/29 -- Alex
* fix for PRINT template parser in rrd_graph ...
- 2002/04/16 -- Milan Obuch <milan.obuch@in.nextra.sk>
* fix for --alt-mrtg
+ 2002/05/01 Wolfgang Schrimm <Wolfgang.Schrimm@urz.uni-heidelberg.de>
* new subcommand xport
= 1.0.37 2002/04/13 -- Tobi
- 2002/04/14 -- Thierry Nkaoua <tnka@linux-sottises.net>
* do not change LC_ALL but just LC_TIME ...
= 1.0.36 2002/04/13 -- Tobi
+ 2002/04/13 -- Milan Obuch <milan.obuch@in.nextra.sk>
* added new options to rrdgraph. Check the manpage for
--overlay, --background, --unit, GD (graph output format)
+ 2002/04/09 -- Tobi
* added setlocale and tzset calls to rrd_graph
- 2002/04/09 -- Tobi
* removed description of --goodfor and --refresh from rrdcgi
- 2002/04/02 -- Paul Vixie <paul@vix.com>
* rrd restore should not burn down existing files
- 2002/03/23 -- Oliver Cook <ollie@uk.clara.net>
* kill segfault in diff code for non digit input
- 2002/03/23 -- Ashok Mandala <chakri063@yahoo.com>
* make sure CDEFs work properly even when none of the contributing
data sources start at start of the cdef.
+ 2002/03/20 -- David Lee <t.d.lee@durham.ac.uk>
* Allow link builds through the ../configure syntax
= 1.0.35 2002/03/20 -- Tobi
- 2002/03/20 -- Tobi
* fixed longstanding off by 1 bug in CDEF for cases where RRDs with
different step sizes were mixed in one CDEF
- 2002/03/13 -- Tobi
* Deal with cases where Config{cc} contains an absolute path to perls
C compiler.
- 2002/03/14 -- Matt Galvin <mgalvin@dandd.com>
* new OS detector config files which can deal with macos X
= 1.0.34 2002/03/12 -- Tobi
- 2002/02/12 -- Tobi
* replaced zlib 1.1.3 with 1.1.4
- 2002/02/06 -- Alexander Schwartz <alexander.schwartz@gmx.net>
* allow rrdcgi to deal with umlauts
- 2001/12/27 -- Tom.Bertelson@gecapital.com
* fix overflow error in rrd_fetch
- 2001/11/28 -- Richard A. Steenbergen <ras@e-gerbil.net>
* allow + - and ' ' in printfsring
- 2001/03/31 -- Tobi
* added 'all' dependancy to site-perl-install rule as many seem to skip
this step when instaling cricket ... probably an incomplete cricket doku.
- 2001/03/02 -- Mike Franusich <mike@franusich.com>
* filedescriptor leak fixed in rrd_open for faild open attempts.
- 2001/03/01 -- Tobi
* test if compiler perl wants to use for building its modules is available on the system
* zlib wants to be linked with -fpic on HPUX or it breaks ...
Diffstat (limited to 'databases')
25 files changed, 937 insertions, 494 deletions
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile index 09bd120d51e..82c8fc2e5c0 100644 --- a/databases/rrdtool/Makefile +++ b/databases/rrdtool/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2002/12/08 23:23:42 cjep Exp $ +# $NetBSD: Makefile,v 1.18 2003/02/16 23:08:55 seb Exp $ # -DISTNAME= rrdtool-1.0.33 -PKGREVISION= 1 +DISTNAME= rrdtool-1.0.40 CATEGORIES= databases graphics net MASTER_SITES= http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/pub/ @@ -10,54 +9,46 @@ MAINTAINER= wulf@ping.net.au HOMEPAGE= http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool COMMENT= Data analysis tool generating graphical representations -DEPENDS+= cgilib>=0.5nb1:../../www/cgilib -DEPENDS+= gd>=1.8.4nb1:../../graphics/gd -DEPENDS+= jpeg-6*:../../graphics/jpeg - #needs FPC code not found in older versions of NetBSD NOT_FOR_PLATFORM= NetBSD-1.[0-4]*-alpha NetBSD-1.5-alpha \ NetBSD-1.5.*-alpha NetBSD-1.5[A-U]-alpha USE_LIBTOOL= # defined +USE_BUILDLINK2= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig LTCONFIG_OVERRIDE+= ${WRKSRC}/contrib/php4/ltconfig USE_GMAKE= # defined -USE_X11= # defined GNU_CONFIGURE= # defined -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - CONFIGURE_ARGS= --enable-shared -MAKE_ENV+= X11BASE=${X11BASE} X11PREFIX=${X11PREFIX} - -USE_PERL5= # defined +PERL5_CONFIGURE= NO PERL5_PACKLIST+= ${PERL5_SITEARCH}/auto/RRDp/.packlist PERL5_PACKLIST+= ${PERL5_SITEARCH}/auto/RRDs/.packlist -post-patch: - cd ${WRKSRC}; \ - files="perl-shared/Makefile.PL"; \ - for file in $${files}; do \ - ${SED} -e "s|@X11BASE@|${X11BASE}|" \ - -e "s|@LOCALBASE@|${LOCALBASE}|" \ - $${file} > $${file}.new; \ - ${MV} -f $${file}.new $${file}; \ - done - -# 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 - +INSTALL_DIRS= ${WRKSRC} ${WRKSRC}/perl-piped ${WRKSRC}/perl-shared + +MAKE_ENV+= CGILIB_INC=${BUILDLINK_PREFIX.cgilib}/include +MAKE_ENV+= CGILIB_LIB=${BUILDLINK_PREFIX.cgilib}/lib +MAKE_ENV+= GD_INC=${BUILDLINK_PREFIX.gd}/include +MAKE_ENV+= GD_LIB=${BUILDLINK_PREFIX.gd}/lib +MAKE_ENV+= JPEG_INC=${BUILDLINK_PREFIX.jpeg}/include +MAKE_ENV+= JPEG_LIB=${BUILDLINK_PREFIX.jpeg}/lib +MAKE_ENV+= ZLIB_INC=${BUILDLINK_PREFIX.zlib}/include +MAKE_ENV+= ZLIB_LIB=${BUILDLINK_PREFIX.zlib}/lib +MAKE_ENV+= PNG_INC=${BUILDLINK_PREFIX.png}/include +MAKE_ENV+= PNG_LIB=${BUILDLINK_PREFIX.png}/lib +MAKE_ENV+= TTF_INC=${BUILDLINK_PREFIX.freetype}/include +MAKE_ENV+= TTF_LIB=${BUILDLINK_PREFIX.freetype}/lib + +MAKE_ENV+= _RPATH=${_OPSYS_RPATH_NAME} + +# remove this or else it is installed +post-extract: + ${RM} ${WRKSRC}/perl-shared/ntmake.pl + +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/gd/buildlink2.mk" +.include "../../www/cgilib/buildlink2.mk" +.include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/rrdtool/PLIST b/databases/rrdtool/PLIST index 79f3d668324..4a5e2c52c93 100644 --- a/databases/rrdtool/PLIST +++ b/databases/rrdtool/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:12:47 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/02/16 23:08:55 seb Exp $ bin/rrdcgi bin/rrdtool bin/rrdupdate @@ -28,61 +28,65 @@ man/man1/rrdtune.1 man/man1/rrdtutorial.1 man/man1/rrdtutorial.es.1 man/man1/rrdupdate.1 -share/doc/rrdtool/RRDp.html +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.html share/doc/rrdtool/RRDs.txt -share/doc/rrdtool/bin_dec_hex.html share/doc/rrdtool/bin_dec_hex.pod share/doc/rrdtool/bin_dec_hex.txt -share/doc/rrdtool/cdeftutorial.html share/doc/rrdtool/cdeftutorial.pod share/doc/rrdtool/cdeftutorial.txt -share/doc/rrdtool/rpntutorial.html share/doc/rrdtool/rpntutorial.pod share/doc/rrdtool/rpntutorial.txt -share/doc/rrdtool/rrdcgi.html share/doc/rrdtool/rrdcgi.pod share/doc/rrdtool/rrdcgi.txt -share/doc/rrdtool/rrdcreate.html share/doc/rrdtool/rrdcreate.pod share/doc/rrdtool/rrdcreate.txt -share/doc/rrdtool/rrddump.html share/doc/rrdtool/rrddump.pod share/doc/rrdtool/rrddump.txt -share/doc/rrdtool/rrdfetch.html share/doc/rrdtool/rrdfetch.pod share/doc/rrdtool/rrdfetch.txt -share/doc/rrdtool/rrdgraph.html share/doc/rrdtool/rrdgraph.pod share/doc/rrdtool/rrdgraph.txt -share/doc/rrdtool/rrdinfo.html share/doc/rrdtool/rrdinfo.pod share/doc/rrdtool/rrdinfo.txt -share/doc/rrdtool/rrdlast.html share/doc/rrdtool/rrdlast.pod share/doc/rrdtool/rrdlast.txt -share/doc/rrdtool/rrdresize.html share/doc/rrdtool/rrdresize.pod share/doc/rrdtool/rrdresize.txt -share/doc/rrdtool/rrdrestore.html share/doc/rrdtool/rrdrestore.pod share/doc/rrdtool/rrdrestore.txt -share/doc/rrdtool/rrdtool.html share/doc/rrdtool/rrdtool.pod share/doc/rrdtool/rrdtool.txt -share/doc/rrdtool/rrdtune.html share/doc/rrdtool/rrdtune.pod share/doc/rrdtool/rrdtune.txt -share/doc/rrdtool/rrdtutorial.es.html share/doc/rrdtool/rrdtutorial.es.pod share/doc/rrdtool/rrdtutorial.es.txt -share/doc/rrdtool/rrdtutorial.html share/doc/rrdtool/rrdtutorial.pod share/doc/rrdtool/rrdtutorial.txt -share/doc/rrdtool/rrdupdate.html share/doc/rrdtool/rrdupdate.pod share/doc/rrdtool/rrdupdate.txt +share/doc/rrdtool/rrdxport.pod +share/doc/rrdtool/rrdxport.txt share/examples/rrdtool/bigtops.pl share/examples/rrdtool/cgi-demo.cgi share/examples/rrdtool/minmax.pl @@ -92,16 +96,9 @@ share/examples/rrdtool/stripes.pl share/rrdtool/contrib/README share/rrdtool/contrib/trytime/README share/rrdtool/contrib/trytime/trytime.c -share/rrdtool/lib/perl/RRDp.pm -share/rrdtool/lib/perl/RRDs.pm -share/rrdtool/lib/perl/auto/RRDs/RRDs.bs -share/rrdtool/lib/perl/auto/RRDs/RRDs.so -@dirrm share/rrdtool/lib/perl/auto/RRDs -@dirrm share/rrdtool/lib/perl/auto -@dirrm share/rrdtool/lib/perl -@dirrm share/rrdtool/lib @dirrm share/rrdtool/contrib/trytime @dirrm share/rrdtool/contrib @dirrm share/rrdtool @dirrm share/examples/rrdtool @dirrm share/doc/rrdtool +@dirrm share/doc/html/rrdtool diff --git a/databases/rrdtool/buildlink2.mk b/databases/rrdtool/buildlink2.mk new file mode 100644 index 00000000000..dd943d5d83e --- /dev/null +++ b/databases/rrdtool/buildlink2.mk @@ -0,0 +1,28 @@ +# $NetBSD: buildlink2.mk,v 1.1 2003/02/16 23:08:55 seb Exp $ +# +# This Makefile fragment is included by packages that use rrdtool. +# +# This file was created automatically using createbuildlink 2.4. +# + +.if !defined(RRDTOOL_BUILDLINK2_MK) +RRDTOOL_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= rrdtool +BUILDLINK_DEPENDS.rrdtool?= rrdtool>=1.0.40 +BUILDLINK_PKGSRCDIR.rrdtool?= ../../databases/rrdtool + +EVAL_PREFIX+= BUILDLINK_PREFIX.rrdtool=rrdtool +BUILDLINK_PREFIX.rrdtool_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.rrdtool+= include/rrd.h +BUILDLINK_FILES.rrdtool+= lib/librrd.* + +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/gd/buildlink2.mk" +.include "../../www/cgilib/buildlink2.mk" + +BUILDLINK_TARGETS+= rrdtool-buildlink + +rrdtool-buildlink: _BUILDLINK_USE + +.endif # RRDTOOL_BUILDLINK2_MK diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo index 45a21832ca4..a0983489b60 100644 --- a/databases/rrdtool/distinfo +++ b/databases/rrdtool/distinfo @@ -1,19 +1,25 @@ -$NetBSD: distinfo,v 1.8 2002/11/27 19:33:08 bouyer Exp $ +$NetBSD: distinfo,v 1.9 2003/02/16 23:08:56 seb Exp $ -SHA1 (rrdtool-1.0.33.tar.gz) = d0394368ef30dcd390d466843ef4d052365f2470 -Size (rrdtool-1.0.33.tar.gz) = 1118040 bytes -SHA1 (patch-aa) = 0875a1a71f6577fefaf1bfd7aaf7058f6dd8ae5d -SHA1 (patch-ab) = 978c96792b14e21302c5f97da8cf9c47701413ac -SHA1 (patch-ac) = b57fc4a10ef8df50983a0ee5f1059c8b079c4d0f -SHA1 (patch-ad) = c96aa5f833e5637fb6090fb3043a54111c0d99d8 -SHA1 (patch-ae) = 0b401636a76434431ee0a2e371be62021868aaed -SHA1 (patch-ag) = 4949384f3431cd716c37bcf22e3c4b96f4c900fc -SHA1 (patch-ah) = fca2282a0f0fe9171dc713c62c61369f487cd76b -SHA1 (patch-ai) = 90766fd4083f6697ca7406449628b26f7d051726 -SHA1 (patch-aj) = 35ed816678d0b6cf0aedfff0d09b9726db22d68f -SHA1 (patch-ak) = 2ba3c51f2e8bcfcb34c867a1edf9de0e7281a161 -SHA1 (patch-al) = 7ac3e507d3d8950ed431c7a9cc3afd23d4462c07 -SHA1 (patch-am) = 048de065a9d3bdb7625df69c4c6807ea58522ba4 -SHA1 (patch-an) = 4dc1cf17f7d143a347de2bc141607e404064a03d -SHA1 (patch-ap) = f9ffb2faac2f4c5a3fa63d830a6f3184f54c1a35 -SHA1 (patch-aq) = 28f845f4384fd04558e627d9f33eaf5529f5a780 +SHA1 (rrdtool-1.0.40.tar.gz) = 6ad5265826049868663d0f3b4e2ef8f2f1aa06ed +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) = 40af210cd71e7bfa4af6f134d768b4b9d5e8c424 +SHA1 (patch-aq) = 68aebe6c28a7bf4c93ff9196709a2b99c8b8a010 +SHA1 (patch-ar) = 18bd27b8d9bda4480d98be07a5c63c4f0667494f +SHA1 (patch-as) = 2a6462263704d8da114d3b801a76844d42da3ce8 +SHA1 (patch-at) = 4a832681eb46c81ce957846368981e50a3b96769 +SHA1 (patch-au) = 7633d5a70004f10629b6076c5897dc9af0cec59e diff --git a/databases/rrdtool/patches/patch-aa b/databases/rrdtool/patches/patch-aa index aa59492bec2..62a7538d6c2 100644 --- a/databases/rrdtool/patches/patch-aa +++ b/databases/rrdtool/patches/patch-aa @@ -1,31 +1,30 @@ -$NetBSD: patch-aa,v 1.5 2001/09/24 13:10:48 wulf Exp $ +$NetBSD: patch-aa,v 1.6 2003/02/16 23:08:56 seb Exp $ ---- Makefile.in.orig Thu Feb 22 12:02:14 2001 -+++ Makefile.in -@@ -87,7 +87,7 @@ +--- 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.3 libpng-1.0.9 src doc examples contrib tcl -+SUBDIRS = config src doc examples contrib tcl - +-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 -@@ -385,11 +385,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: -- ./config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs +@@ -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 -+ $(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 + # 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 index a87f790caa8..436236dd197 100644 --- a/databases/rrdtool/patches/patch-ab +++ b/databases/rrdtool/patches/patch-ab @@ -1,13 +1,157 @@ -$NetBSD: patch-ab,v 1.4 2001/09/24 13:10:48 wulf Exp $ +$NetBSD: patch-ab,v 1.5 2003/02/16 23:08:56 seb Exp $ ---- examples/Makefile.in.orig Thu Feb 22 12:07:37 2001 -+++ examples/Makefile.in -@@ -92,7 +92,7 @@ +--- 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 - EXTRA_DIST = cgi-demo.cgi.in piped-demo.pl.in shared-demo.pl.in stripes.pl.in bigtops.pl.in minmax.pl.in + # 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 --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 + + # 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_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 index 23821f5670f..a272389c58c 100644 --- a/databases/rrdtool/patches/patch-ac +++ b/databases/rrdtool/patches/patch-ac @@ -1,13 +1,14 @@ -$NetBSD: patch-ac,v 1.4 2001/09/24 13:10:48 wulf Exp $ +$NetBSD: patch-ac,v 1.5 2003/02/16 23:08:57 seb Exp $ ---- contrib/Makefile.in.orig Thu Feb 22 12:07:39 2001 -+++ contrib/Makefile.in -@@ -87,7 +87,7 @@ - ZLIB_LIB_DIR = @ZLIB_LIB_DIR@ +--- configure.in.orig Fri Oct 11 18:39:19 2002 ++++ configure.in +@@ -145,9 +145,6 @@ if test "x$GCC" = "xyes"; then + fi + fi - 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 +-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 index 9400fec4e22..ebada2bd465 100644 --- a/databases/rrdtool/patches/patch-ad +++ b/databases/rrdtool/patches/patch-ad @@ -1,16 +1,13 @@ -$NetBSD: patch-ad,v 1.4 2001/09/24 13:10:48 wulf Exp $ +$NetBSD: patch-ad,v 1.5 2003/02/16 23:08:57 seb Exp $ ---- contrib/trytime/Makefile.in.orig Thu Feb 22 12:07:45 2001 -+++ contrib/trytime/Makefile.in -@@ -86,9 +86,9 @@ - VERSION = @VERSION@ - ZLIB_LIB_DIR = @ZLIB_LIB_DIR@ +--- 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 --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 - bin_PROGRAMS = trytime - trytime_SOURCES = trytime.c +-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 index b97ffa056dd..24e3a9b451d 100644 --- a/databases/rrdtool/patches/patch-ae +++ b/databases/rrdtool/patches/patch-ae @@ -1,13 +1,12 @@ -$NetBSD: patch-ae,v 1.5 2002/08/10 13:59:34 skrll Exp $ +$NetBSD: patch-ae,v 1.6 2003/02/16 23:08:57 seb Exp $ ---- src/Makefile.am.orig Mon Feb 19 11:05:56 2001 -+++ src/Makefile.am -@@ -64,7 +64,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 +--- 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 new file mode 100644 index 00000000000..a1020e55b2d --- /dev/null +++ b/databases/rrdtool/patches/patch-af @@ -0,0 +1,37 @@ +$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 index 206c048548e..32fbb8d48be 100644 --- a/databases/rrdtool/patches/patch-ag +++ b/databases/rrdtool/patches/patch-ag @@ -1,16 +1,14 @@ -$NetBSD: patch-ag,v 1.4 2001/09/24 13:10:48 wulf Exp $ +$NetBSD: patch-ag,v 1.5 2003/02/16 23:08:58 seb Exp $ ---- doc/Makefile.in.orig Thu Feb 22 12:07:35 2001 -+++ doc/Makefile.in -@@ -108,9 +108,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) +--- 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 index 11d66384760..c769e4ede2f 100644 --- a/databases/rrdtool/patches/patch-ah +++ b/databases/rrdtool/patches/patch-ah @@ -1,126 +1,53 @@ -$NetBSD: patch-ah,v 1.7 2002/08/10 13:59:35 skrll Exp $ +$NetBSD: patch-ah,v 1.8 2003/02/16 23:08:58 seb Exp $ ---- src/Makefile.in.orig Thu Feb 22 03:07:34 2001 -+++ src/Makefile.in -@@ -87,12 +87,7 @@ TCL_SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@ - TROFF = @TROFF@ - VERSION = @VERSION@ - --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) -@@ -108,7 +103,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 -lintl -lX11 -lXpm - - - lib_LTLIBRARIES = librrd.la -@@ -123,7 +118,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 - -@@ -146,18 +141,12 @@ LTLIBRARIES = $(lib_LTLIBRARIES) $(noin - 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@ -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_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_info.lo rrd_error.lo rrd_fetch.lo rrd_format.lo rrd_graph.lo \ -@@ -279,8 +268,8 @@ maintainer-clean-libtool: - 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) - - mostlyclean-binPROGRAMS: - -@@ -307,7 +296,7 @@ uninstall-binPROGRAMS: - 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) - -@@ -378,49 +367,6 @@ distdir: $(DISTFILES) +--- 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 --gdpng.lo gdpng.o : gdpng.c ../libpng-1.0.9/png.h ../zlib-1.1.3/zlib.h \ -- ../zlib-1.1.3/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.3/zlib.h ../zlib-1.1.3/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 \ -- ../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_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 - +-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 index b581e9bb5e9..a40ce4a91da 100644 --- a/databases/rrdtool/patches/patch-ai +++ b/databases/rrdtool/patches/patch-ai @@ -1,77 +1,16 @@ -$NetBSD: patch-ai,v 1.4 2001/09/24 13:10:48 wulf Exp $ +$NetBSD: patch-ai,v 1.5 2003/02/16 23:08:58 seb Exp $ ---- src/rrd_graph.c.orig Thu Feb 22 12:02:47 2001 -+++ src/rrd_graph.c -@@ -6,16 +6,26 @@ - - #include "rrd_tool.h" - #include <gd.h> -+#ifdef __NetBSD__ -+#include <gdfonts.h> -+#include <gdfontt.h> -+#else - #include <gdlucidan10.h> - #include <gdlucidab12.h> -+#endif - #include <sys/stat.h> - #ifdef WIN32 - #include <io.h> - #include <fcntl.h> - #endif - -+#ifdef __NetBSD__ -+#define SmallFont gdFontTiny -+#define LargeFont gdFontSmall -+#else - #define SmallFont gdLucidaNormal10 - #define LargeFont gdLucidaBold12 -+#endif - - /* #define DEBUG */ - -@@ -45,7 +55,7 @@ - OP_MIN,OP_MAX,OP_LIMIT, OP_FLOOR, OP_CEIL, - 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; -@@ -354,7 +364,6 @@ - - enum if_en if_conv(char *string){ - -- conv_if(GIF,IF_GIF) - conv_if(PNG,IF_PNG) - - return (-1); -@@ -2437,9 +2446,6 @@ - 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; -@@ -2703,9 +2709,6 @@ - } - } - switch (im->imgformat) { -- case IF_GIF: -- gdImageGif(gif, fo); -- break; - case IF_PNG: - gdImagePng(gif, fo); - break; -@@ -2828,7 +2831,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; +--- 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 d9aa1e88883..238bbf97aca 100644 --- a/databases/rrdtool/patches/patch-aj +++ b/databases/rrdtool/patches/patch-aj @@ -1,13 +1,41 @@ -$NetBSD: patch-aj,v 1.2 2001/09/24 13:10:48 wulf Exp $ +$NetBSD: patch-aj,v 1.3 2003/02/16 23:08:58 seb Exp $ ---- src/rrd_cgi.c.orig Thu Feb 22 12:02:47 2001 -+++ src/rrd_cgi.c -@@ -12,7 +12,7 @@ - #define MEMBLK 1024 +--- 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) - /* global variable for libcgi */ --s_cgi **cgiArg; -+s_cgi *cgiArg; + # 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) +@@ -133,13 +133,13 @@ PACKAGE = @PACKAGE@ - /* in arg[0] find tags beginning with arg[1] call arg[2] on them - and replace by result of arg[2] call */ + 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 \ diff --git a/databases/rrdtool/patches/patch-ak b/databases/rrdtool/patches/patch-ak index 1bd72992cdd..3f06bebe43b 100644 --- a/databases/rrdtool/patches/patch-ak +++ b/databases/rrdtool/patches/patch-ak @@ -1,26 +1,11 @@ -$NetBSD: patch-ak,v 1.8 2002/11/27 19:33:09 bouyer Exp $ +$NetBSD: patch-ak,v 1.9 2003/02/16 23:08:58 seb Exp $ ---- perl-shared/Makefile.PL.orig Thu Jul 13 22:22:17 2000 -+++ perl-shared/Makefile.PL -@@ -4,16 +4,18 @@ use Config; - # the contents of the Makefile that is written. +--- examples/Makefile.am.orig Tue Feb 26 10:21:25 2002 ++++ examples/Makefile.am +@@ -6,5 +6,5 @@ - # Specify the location of the archive containing PIC compiled object files. -+# This is a cheat. - my $librrd = "-L../src/.libs/ -lrrd_private" ; + EXTRA_DIST = cgi-demo.cgi.in piped-demo.pl.in shared-demo.pl.in stripes.pl.in bigtops.pl.in minmax.pl.in - WriteMakefile( - 'NAME' => 'RRDs', - 'VERSION_FROM' => 'RRDs.pm', # finds $VERSION - 'DEFINE' => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}", -- 'INC' => '-I../src -I../gd1.3', -+ 'INC' => '-I../src -I${PREFIX}/include', -+ 'LIBS' => "-L@X11BASE@/lib -L@LOCALBASE@/lib -lcgi -lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 -lintl", - # where to look for the necessary libraries - # 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"}, -+ 'dynamic_lib' => {'OTHERLDFLAGS' => "$librrd -Wl,-R@X11BASE@/lib"}, - 'realclean' => {FILES => 't/demo?.rrd t/demo?.gif' } - ); +-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 63800ea98e9..1302f30c218 100644 --- a/databases/rrdtool/patches/patch-al +++ b/databases/rrdtool/patches/patch-al @@ -1,22 +1,37 @@ -$NetBSD: patch-al,v 1.2 2000/05/07 12:50:52 wulf Exp $ +$NetBSD: patch-al,v 1.3 2003/02/16 23:08:58 seb Exp $ ---- 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> +--- 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 --<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 @@ - </P> +-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@ - <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" + 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 + + 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 \ diff --git a/databases/rrdtool/patches/patch-am b/databases/rrdtool/patches/patch-am index 66c6d222559..dbc8905148d 100644 --- a/databases/rrdtool/patches/patch-am +++ b/databases/rrdtool/patches/patch-am @@ -1,50 +1,22 @@ -$NetBSD: patch-am,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $ +$NetBSD: patch-am,v 1.2 2003/02/16 23:08:59 seb 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; +--- 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> -@@ -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"; - } - } +-<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 index fda4132f7cd..bc098d38f3b 100644 --- a/databases/rrdtool/patches/patch-an +++ b/databases/rrdtool/patches/patch-an @@ -1,8 +1,8 @@ -$NetBSD: patch-an,v 1.2 2000/05/07 12:50:52 wulf Exp $ +$NetBSD: patch-an,v 1.3 2003/02/16 23:08:59 seb 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 @@ +--- 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"; @@ -10,7 +10,7 @@ $NetBSD: patch-an,v 1.2 2000/05/07 12:50:52 wulf Exp $ $PNG = "piped-demo.png"; # some magic to find the correct rrdtol executable -@@ -66,42 +65,6 @@ +@@ -66,42 +65,6 @@ printf "-- performance analysis Update t ($real1-$real)/($RUNS), ($RUNS)/($real1-$real); print "\n"; # creating some graphs diff --git a/databases/rrdtool/patches/patch-ao b/databases/rrdtool/patches/patch-ao new file mode 100644 index 00000000000..8be92df89ae --- /dev/null +++ b/databases/rrdtool/patches/patch-ao @@ -0,0 +1,50 @@ +$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 3a0f10af7a9..9fb95252c10 100644 --- a/databases/rrdtool/patches/patch-ap +++ b/databases/rrdtool/patches/patch-ap @@ -1,13 +1,42 @@ -$NetBSD: patch-ap,v 1.3 2002/07/31 17:04:08 wiz Exp $ +$NetBSD: patch-ap,v 1.4 2003/02/16 23:08:59 seb Exp $ ---- configure.orig Thu Feb 22 12:02:16 2001 -+++ configure -@@ -2217,8 +2217,6 @@ echo "$ac_t""$rd_cv_gcc_opt" 1>&6 - CFLAGS=$oCFLAGS - fi - fi -- --CFLAGS="$CFLAGS "`grep pic_flag= libtool | sed -e 's/.*pic_flag=//' -e 's/"//g'` +--- perl-shared/Makefile.PL.in.orig Thu Mar 21 21:52:35 2002 ++++ perl-shared/Makefile.PL.in +@@ -6,14 +6,34 @@ use Config; + # Specify the location of the archive containing PIC compiled object files. + my $librrd = "-L../src/.libs/ -lrrd_private" ; - case $target_os in - *hpux*) ++my $CGILIB_INC = $ENV{CGILIB_INC}; ++my $CGILIB_LIB = $ENV{CGILIB_LIB}; ++my $GD_INC = $ENV{GD_INC}; ++my $GD_LIB = $ENV{GD_LIB}; ++my $JPEG_INC = $ENV{JPEG_INC}; ++my $JPEG_LIB = $ENV{JPEG_LIB}; ++my $ZLIB_INC = $ENV{ZLIB_INC}; ++my $ZLIB_LIB = $ENV{ZLIB_LIB}; ++my $PNG_INC = $ENV{PNG_INC}; ++my $PNG_LIB = $ENV{PNG_LIB}; ++my $TTF_INC = $ENV{TTF_INC}; ++my $TTF_LIB = $ENV{TTF_LIB}; ++ ++my $_RPATH = $ENV{_RPATH}; ++ ++my $MY_INCS = "-I".join (" -I", ($CGILIB_INC, $GD_INC, $JPEG_INC, $ZLIB_INC, $PNG_INC, $TTF_INC)); ++my $MY_LIBS = join "-L".(" -L", ($CGILIB_LIB, $GD_LIB, $JPEG_LIB, $ZLIB_LIB, $PNG_LIB, $TTF_LIB)); ++my $MY_DLIBS = "-Wl,$_RPATH".join (" -Wl,$_RPATH", ($CGILIB_LIB, $GD_LIB, $JPEG_LIB, $ZLIB_LIB, $PNG_LIB, $TTF_LIB)); ++ + WriteMakefile( + 'NAME' => 'RRDs', + 'VERSION_FROM' => '@top_srcdir@/perl-shared/RRDs.pm', # finds $VERSION + 'DEFINE' => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}", +- 'INC' => '-I@top_srcdir@/src -I@top_srcdir@/gd1.3', ++ 'INC' => "-I@top_srcdir@/src $MY_INCS", ++ 'LIBS' => "$MY_LIBS -lcgi -lm -lgd -lpng -lz -ljpeg -lttf", + # where to look for the necessary libraries + # 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"}, ++ 'dynamic_lib' => {'OTHERLDFLAGS' => "$librrd $MY_DLIBS"}, + 'realclean' => {FILES => 't/demo?.rrd t/demo?.gif' } + ); diff --git a/databases/rrdtool/patches/patch-aq b/databases/rrdtool/patches/patch-aq index 0feae5e72c9..44401b29cd1 100644 --- a/databases/rrdtool/patches/patch-aq +++ b/databases/rrdtool/patches/patch-aq @@ -1,24 +1,46 @@ -$NetBSD: patch-aq,v 1.3 2000/12/05 11:15:42 wulf Exp $ +$NetBSD: patch-aq,v 1.4 2003/02/16 23:08:59 seb Exp $ ---- 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 +--- 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 -+/* -+ * gd.h needs to be called before math.h to avoid -Wshadow warnings -+ */ -+#include <gd.h> -+ - #ifdef WIN32 - # include "ntconfig.h" - #else -@@ -125,7 +130,6 @@ - int PngSize(FILE *, long *, long *); - int PngSize(FILE *, long *, long *); +-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. --#include <gd.h> - void gdImagePng(gdImagePtr im, FILE *out); +-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 - int rrd_create_fn(char *file_name, rrd_t *rrd); diff --git a/databases/rrdtool/patches/patch-ar b/databases/rrdtool/patches/patch-ar new file mode 100644 index 00000000000..d2882e9bc7b --- /dev/null +++ b/databases/rrdtool/patches/patch-ar @@ -0,0 +1,175 @@ +$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 new file mode 100644 index 00000000000..ed2c2b99a2a --- /dev/null +++ b/databases/rrdtool/patches/patch-as @@ -0,0 +1,13 @@ +$NetBSD: patch-as,v 1.4 2003/02/16 23:09:00 seb Exp $ + +--- src/rrd_cgi.c.orig Fri Oct 11 18:39:46 2002 ++++ src/rrd_cgi.c +@@ -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-at b/databases/rrdtool/patches/patch-at new file mode 100644 index 00000000000..75ee2b54749 --- /dev/null +++ b/databases/rrdtool/patches/patch-at @@ -0,0 +1,67 @@ +$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 new file mode 100644 index 00000000000..a36ee7844fd --- /dev/null +++ b/databases/rrdtool/patches/patch-au @@ -0,0 +1,24 @@ +$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); |