From 52fe1196b4eb74d18bdb1de93351546aaae4cc37 Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 30 Jan 2007 13:26:55 +0000 Subject: Changes 1.2.18: * Bug fixes --- databases/rrdtool/Makefile | 11 +++++------ databases/rrdtool/PLIST | 7 ++++++- databases/rrdtool/distinfo | 13 ++++++------- databases/rrdtool/patches/patch-aj | 16 ---------------- databases/rrdtool/patches/patch-al | 14 +++++++------- databases/rrdtool/patches/patch-aw | 19 +++++-------------- 6 files changed, 29 insertions(+), 51 deletions(-) delete mode 100644 databases/rrdtool/patches/patch-aj (limited to 'databases/rrdtool') diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile index 714d1059587..c866262aff6 100644 --- a/databases/rrdtool/Makefile +++ b/databases/rrdtool/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.51 2006/10/04 20:53:46 wiz Exp $ +# $NetBSD: Makefile,v 1.52 2007/01/30 13:26:55 adam Exp $ -DISTNAME= rrdtool-1.2.15 +DISTNAME= rrdtool-1.2.18 CATEGORIES= databases graphics net MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/ @@ -8,20 +8,19 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://oss.oetiker.ch/rrdtool/ COMMENT= Data analysis tool generating graphical representations -#needs FPC code not found in older versions of NetBSD +# 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= yes USE_TOOLS+= gmake pkg-config GNU_CONFIGURE= yes -PTHREAD_OPTS+= require - CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --with-perl-options=${MAKE_PARAMS:Q} CONFIGURE_ARGS+= --disable-tcl CONFIGURE_ARGS+= --disable-python +PTHREAD_OPTS+= require PERL5_CONFIGURE= no PERL5_PACKLIST+= auto/RRDp/.packlist PERL5_PACKLIST+= auto/RRDs/.packlist @@ -38,7 +37,7 @@ SUBST_SED.prefix= -e '1s,^\#! \$${prefix},\#! ${PREFIX},' .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" -.include "../../www/cgilib/buildlink3.mk" .include "../../lang/perl5/module.mk" +.include "../../www/cgilib/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/rrdtool/PLIST b/databases/rrdtool/PLIST index feb3ce94e87..199866a74a0 100644 --- a/databases/rrdtool/PLIST +++ b/databases/rrdtool/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2006/07/22 07:37:07 adam Exp $ +@comment $NetBSD: PLIST,v 1.9 2007/01/30 13:26:55 adam Exp $ bin/rrdcgi bin/rrdtool bin/rrdupdate @@ -22,6 +22,7 @@ man/man1/rrdgraph_graph.1 man/man1/rrdgraph_rpn.1 man/man1/rrdinfo.1 man/man1/rrdlast.1 +man/man1/rrdlastupdate.1 man/man1/rrdresize.1 man/man1/rrdrestore.1 man/man1/rrdthreads.1 @@ -50,6 +51,7 @@ share/doc/rrdtool-${PKGVERSION}/html/rrdgraph_graph.html share/doc/rrdtool-${PKGVERSION}/html/rrdgraph_rpn.html share/doc/rrdtool-${PKGVERSION}/html/rrdinfo.html share/doc/rrdtool-${PKGVERSION}/html/rrdlast.html +share/doc/rrdtool-${PKGVERSION}/html/rrdlastupdate.html share/doc/rrdtool-${PKGVERSION}/html/rrdresize.html share/doc/rrdtool-${PKGVERSION}/html/rrdrestore.html share/doc/rrdtool-${PKGVERSION}/html/rrdthreads.html @@ -92,6 +94,8 @@ share/doc/rrdtool-${PKGVERSION}/txt/rrdinfo.pod share/doc/rrdtool-${PKGVERSION}/txt/rrdinfo.txt share/doc/rrdtool-${PKGVERSION}/txt/rrdlast.pod share/doc/rrdtool-${PKGVERSION}/txt/rrdlast.txt +share/doc/rrdtool-${PKGVERSION}/txt/rrdlastupdate.pod +share/doc/rrdtool-${PKGVERSION}/txt/rrdlastupdate.txt share/doc/rrdtool-${PKGVERSION}/txt/rrdresize.pod share/doc/rrdtool-${PKGVERSION}/txt/rrdresize.txt share/doc/rrdtool-${PKGVERSION}/txt/rrdrestore.pod @@ -112,6 +116,7 @@ share/examples/rrdtool/4charts.pl share/examples/rrdtool/bigtops.pl share/examples/rrdtool/cgi-demo.cgi share/examples/rrdtool/minmax.pl +share/examples/rrdtool/perftest.pl share/examples/rrdtool/piped-demo.pl share/examples/rrdtool/shared-demo.pl share/examples/rrdtool/stripes.pl diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo index d68fab9a270..aacc90c83d5 100644 --- a/databases/rrdtool/distinfo +++ b/databases/rrdtool/distinfo @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.17 2006/07/22 07:37:07 adam Exp $ +$NetBSD: distinfo,v 1.18 2007/01/30 13:26:55 adam Exp $ -SHA1 (rrdtool-1.2.15.tar.gz) = 4ac695aff26ab193a083c65513aad06ff36bad82 -RMD160 (rrdtool-1.2.15.tar.gz) = 493e5b108ac363484eb4015c0962945c5fb9fb9e -Size (rrdtool-1.2.15.tar.gz) = 1043064 bytes -SHA1 (patch-aj) = 07d315efb5f2c48ee9f2a6dbf27f4d0f14e909ef -SHA1 (patch-al) = 45b4912db3ef2e8fa9a49a832250da011d1130ed +SHA1 (rrdtool-1.2.18.tar.gz) = e65c246c3e4cffcf992d3d3e3a844bf5788a92ec +RMD160 (rrdtool-1.2.18.tar.gz) = 6287c61ffe6742ad16d93d3b4352a407713f0241 +Size (rrdtool-1.2.18.tar.gz) = 1060451 bytes +SHA1 (patch-al) = 3b46b3b829b6e83e821770c5d0bda53867096ee7 SHA1 (patch-ap) = 0ad63228c9257ad4de5ae6e8a40b5b2ccf348456 SHA1 (patch-as) = aa48dbc38ae23493b8ff700fabf90d6e0f3f1d5a SHA1 (patch-av) = 2e2a626c8bbc78671ff7e834cb229f4a1b0c35c3 -SHA1 (patch-aw) = 0e6a903dea8c7e142919ce930f13922b7f45e6e7 +SHA1 (patch-aw) = aeab03498d876b7b021ddd47714c27d9ded3060d SHA1 (patch-ay) = d441bf4bc05b0ef7fcc7f15768cb2a0dd82a3142 diff --git a/databases/rrdtool/patches/patch-aj b/databases/rrdtool/patches/patch-aj deleted file mode 100644 index e2365e44938..00000000000 --- a/databases/rrdtool/patches/patch-aj +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aj,v 1.8 2006/05/05 17:42:07 adam Exp $ - ---- doc/Makefile.in.orig 2006-05-04 15:27:59.000000000 +0200 -+++ doc/Makefile.in -@@ -254,9 +254,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu doc/Makefile -+ $(AUTOMAKE) --foreign doc/Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ diff --git a/databases/rrdtool/patches/patch-al b/databases/rrdtool/patches/patch-al index 707cf2a3519..6c8a8cadcaa 100644 --- a/databases/rrdtool/patches/patch-al +++ b/databases/rrdtool/patches/patch-al @@ -1,13 +1,13 @@ -$NetBSD: patch-al,v 1.8 2006/05/05 17:42:07 adam Exp $ +$NetBSD: patch-al,v 1.9 2007/01/30 13:26:55 adam Exp $ ---- examples/Makefile.in.orig 2006-05-04 15:28:00.000000000 +0200 +--- examples/Makefile.in.orig 2007-01-23 21:55:38.000000000 +0100 +++ examples/Makefile.in -@@ -217,7 +217,7 @@ target_vendor = @target_vendor@ - EXTRA_DIST = cgi-demo.cgi.in piped-demo.pl.in shared-demo.pl.in \ - stripes.pl.in bigtops.pl.in minmax.pl.in 4charts.pl.in - +@@ -220,7 +220,7 @@ target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ + EXTRA_DIST = cgi-demo.cgi.in -examplesdir = $(pkgdatadir)/examples +examplesdir = $(prefix)/share/examples/rrdtool examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl \ - stripes.pl bigtops.pl minmax.pl 4charts.pl + stripes.pl bigtops.pl minmax.pl 4charts.pl perftest.pl diff --git a/databases/rrdtool/patches/patch-aw b/databases/rrdtool/patches/patch-aw index 1eacac2669a..8697928949d 100644 --- a/databases/rrdtool/patches/patch-aw +++ b/databases/rrdtool/patches/patch-aw @@ -1,17 +1,8 @@ -$NetBSD: patch-aw,v 1.6 2006/07/22 07:37:07 adam Exp $ +$NetBSD: patch-aw,v 1.7 2007/01/30 13:26:55 adam Exp $ ---- src/rrd_tool.c.orig 2006-07-14 14:11:26.000000000 +0200 +--- src/rrd_tool.c.orig 2007-01-23 21:54:49.000000000 +0100 +++ src/rrd_tool.c -@@ -619,7 +619,7 @@ int HandleInputLine(int argc, char **arg - else if (strcmp("resize", argv[1]) == 0) - rrd_resize(argc-1, &argv[1]); - else if (strcmp("last", argv[1]) == 0) -- printf("%ld\n",rrd_last(argc-1, &argv[1])); -+ printf("%ld\n",(long) rrd_last(argc-1, &argv[1])); - else if (strcmp("first", argv[1]) == 0) - printf("%ld\n",rrd_first(argc-1, &argv[1])); - else if (strcmp("update", argv[1]) == 0) -@@ -659,9 +659,9 @@ int HandleInputLine(int argc, char **arg +@@ -702,9 +702,9 @@ int HandleInputLine(int argc, char **arg printf("\n\n", XML_ENCODING); printf("<%s>\n", ROOT_TAG); printf(" <%s>\n", META_TAG); @@ -23,7 +14,7 @@ $NetBSD: patch-aw,v 1.6 2006/07/22 07:37:07 adam Exp $ printf(" <%s>%lu\n", META_ROWS_TAG, row_cnt, META_ROWS_TAG); printf(" <%s>%lu\n", META_COLS_TAG, col_cnt, META_COLS_TAG); printf(" <%s>\n", LEGEND_TAG); -@@ -677,7 +677,7 @@ int HandleInputLine(int argc, char **arg +@@ -720,7 +720,7 @@ int HandleInputLine(int argc, char **arg printf(" <%s>\n", DATA_TAG); for (ti = start+step; ti <= end; ti += step) { printf (" <%s>", DATA_ROW_TAG); @@ -31,4 +22,4 @@ $NetBSD: patch-aw,v 1.6 2006/07/22 07:37:07 adam Exp $ + printf ("<%s>%lu", COL_TIME_TAG, (unsigned long) ti, COL_TIME_TAG); for (j = 0; j < col_cnt; j++) { rrd_value_t newval = DNAN; - newval = *ptr; + if (enumds == 1) -- cgit v1.2.3