Date: Tue, 13 Jun 2000 21:43:34 +0400 (MSD) From: "Dmitry S. Sivachenko" <dima@Chg.RU> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/19250: Update port: net/rrdtool Message-ID: <200006131743.VAA42091@netserv1.chg.ru>
next in thread | raw e-mail | index | archive | help
>Number: 19250 >Category: ports >Synopsis: Update port: net/rrdtool >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Jun 13 10:50:00 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Dmitry S. Sivachenko >Release: FreeBSD 3.3-RELEASE i386 >Organization: >Environment: >Description: >How-To-Repeat: >Fix: diff -Nur rrdtool.old/Makefile rrdtool/Makefile --- rrdtool.old/Makefile Tue Jun 13 19:45:15 2000 +++ rrdtool/Makefile Tue Jun 13 21:18:50 2000 @@ -6,7 +6,7 @@ # PORTNAME= rrdtool -PORTVERSION= 1.0.13 +PORTVERSION= 1.0.24 CATEGORIES= net MASTER_SITES= http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/pub/ @@ -15,6 +15,7 @@ USE_PERL5= yes MAKE_ENV+= PERL=${PERL} +USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --enable-shared=yes CONFIGURE_ENV= PERL=${PERL} @@ -22,7 +23,7 @@ MAN1= RRDp.1 RRDs.1 bin_dec_hex.1 rrdcgi.1 rrdcreate.1 rrddump.1 \ rrdfetch.1 rrdgraph.1 rrdlast.1 rrdresize.1 rrdrestore.1 \ rrdtool.1 rrdtune.1 rrdtutorial.1 rrdupdate.1 cdeftutorial.1 \ - rpntutorial.1 + rpntutorial.1 rrdinfo.1 MAN3= RRDp.3 RRDs.3 MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} diff -Nur rrdtool.old/files/md5 rrdtool/files/md5 --- rrdtool.old/files/md5 Tue Feb 15 17:18:53 2000 +++ rrdtool/files/md5 Tue Jun 13 19:46:14 2000 @@ -1 +1 @@ -MD5 (rrdtool-1.0.13.tar.gz) = 51311e66400ad776cf04a8fcf6594115 +MD5 (rrdtool-1.0.24.tar.gz) = 251b2ea132245d02039fe67eae6047da diff -Nur rrdtool.old/patches/patch-aa rrdtool/patches/patch-aa --- rrdtool.old/patches/patch-aa Thu Sep 30 04:52:17 1999 +++ rrdtool/patches/patch-aa Tue Jun 13 20:59:23 2000 @@ -1,12 +1,12 @@ ---- perl-shared/Makefile.PL.orig Wed Sep 29 17:26:51 1999 -+++ perl-shared/Makefile.PL Wed Sep 29 17:42:36 1999 -@@ -9,7 +9,8 @@ +--- perl-shared/Makefile.PL.orig Tue Jun 13 20:51:17 2000 ++++ perl-shared/Makefile.PL Tue Jun 13 20:51:19 2000 +@@ -10,7 +10,8 @@ 'NAME' => 'RRDs', 'VERSION_FROM' => 'RRDs.pm', # finds $VERSION - 'OPTIMIZE' => '-g', + 'DEFINE' => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}", - 'INC' => '-I../src -I../gd1.3', -+ 'CCFLAGS' => '-DHAVE_CONFIG_H', ++ 'CCFLAGS' => "-DHAVE_CONFIG_H", + 'INC' => '-I../config -I../src -I../gd1.3', # 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"}, diff -Nur rrdtool.old/patches/patch-ab rrdtool/patches/patch-ab --- rrdtool.old/patches/patch-ab Thu Dec 23 20:08:27 1999 +++ rrdtool/patches/patch-ab Tue Jun 13 20:59:31 2000 @@ -1,6 +1,6 @@ ---- src/rrd_tool.c.orig Wed Nov 24 17:06:43 1999 -+++ src/rrd_tool.c Fri Nov 26 15:41:04 1999 -@@ -202,12 +202,12 @@ +--- src/rrd_tool.c.orig Tue Jun 13 20:56:08 2000 ++++ src/rrd_tool.c Tue Jun 13 20:56:10 2000 +@@ -317,12 +317,12 @@ datai=data; printf(" "); for (i = 0; i<ds_cnt;i++) @@ -11,8 +11,8 @@ - printf("%10lu:", i); + printf("%10lu: ", i); for (ii = 0; ii < ds_cnt; ii++) -- printf(" %13.2f", *(datai++)); -+ printf(" %14.2f ", *(datai++)); +- printf(" %0.10e", *(datai++)); ++ printf(" %0.10e ", *(datai++)); printf("\n"); } for (i=0;i<ds_cnt;i++) diff -Nur rrdtool.old/patches/patch-ac rrdtool/patches/patch-ac --- rrdtool.old/patches/patch-ac Tue Jan 11 03:59:37 2000 +++ rrdtool/patches/patch-ac Tue Jun 13 20:58:38 2000 @@ -1,21 +1,21 @@ ---- Makefile.in.orig Fri Jan 7 22:59:16 2000 -+++ Makefile.in Fri Jan 7 22:59:21 2000 -@@ -373,12 +373,12 @@ +--- Makefile.in.orig Tue Jun 13 20:58:24 2000 ++++ Makefile.in Tue Jun 13 20:58:25 2000 +@@ -382,12 +382,12 @@ # lets schedule the perl stuff for installation -install-data-local: -- $(INSTALL) -d -m 755 $(prefix)/lib/perl/auto/RRDs -- $(INSTALL) -m 644 perl-piped/RRDp.pm $(prefix)/lib/perl -- $(INSTALL) -m 644 perl-shared/RRDs.pm $(prefix)/lib/perl -- $(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(prefix)/lib/perl/auto/RRDs -- $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.so $(prefix)/lib/perl/auto/RRDs +- $(INSTALL) -d -m 755 $(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-data-local: site-perl-inst -+# $(INSTALL) -d -m 755 $(prefix)/lib/perl/auto/RRDs -+# $(INSTALL) -m 644 perl-piped/RRDp.pm $(prefix)/lib/perl -+# $(INSTALL) -m 644 perl-shared/RRDs.pm $(prefix)/lib/perl -+# $(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(prefix)/lib/perl/auto/RRDs -+# $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.so $(prefix)/lib/perl/auto/RRDs ++# $(INSTALL) -d -m 755 $(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 # rules for building the perl module perl_piped: perl-piped/Makefile diff -Nur rrdtool.old/patches/patch-ag rrdtool/patches/patch-ag --- rrdtool.old/patches/patch-ag Tue Jan 11 03:59:38 2000 +++ rrdtool/patches/patch-ag Tue Jun 13 21:03:30 2000 @@ -1,11 +1,11 @@ ---- contrib/Makefile.in.orig Fri Jan 7 21:04:47 2000 -+++ contrib/Makefile.in Fri Jan 7 21:04:24 2000 -@@ -77,7 +77,7 @@ - - SUBDIRS = log2rrd rrd-file-icon trytime rrdproc +--- contrib/Makefile.in.orig Tue Jun 13 21:00:28 2000 ++++ contrib/Makefile.in Tue Jun 13 21:01:04 2000 +@@ -86,7 +86,7 @@ + ZLIB_LIB_DIR = @ZLIB_LIB_DIR@ + SUBDIRS = log2rrd rrd-file-icon trytime rrdproc rrdlastds add_ds killspike rrdfetchnames -contribdir = $(prefix)/contrib +contribdir = $(prefix)/share/examples/rrdtool contrib_DATA = README + EXTRA_DIST = clickgraphs php3 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs - CONFIG_HEADER = ../config/config.h diff -Nur rrdtool.old/patches/patch-ap rrdtool/patches/patch-ap --- rrdtool.old/patches/patch-ap Sat Mar 11 16:53:07 2000 +++ rrdtool/patches/patch-ap Thu Jan 1 03:00:00 1970 @@ -1,143 +0,0 @@ ---- src/rrd_graph.c Sun Feb 6 23:19:21 2000 -+++ src/rrd_graph.c Mon Mar 6 17:13:16 2000 -@@ -35,6 +35,7 @@ - OP_SUB,OP_MUL, - OP_DIV,OP_SIN, OP_DUP, OP_EXC, OP_POP, - OP_COS,OP_LOG,OP_EXP,OP_LT,OP_LE,OP_GT,OP_GE,OP_EQ,OP_IF, -+ OP_MIN,OP_MAX,OP_LIMIT, - OP_UN,OP_END}; - - enum if_en {IF_GIF=0,IF_PNG=1}; -@@ -769,6 +770,9 @@ - match_op(OP_GE,GE) - match_op(OP_EQ,EQ) - match_op(OP_IF,IF) -+ match_op(OP_MIN,MIN) -+ match_op(OP_MAX,MAX) -+ match_op(OP_LIMIT,LIMIT) - /* order is important here ! .. match longest first */ - match_op(OP_UNKN,UNKN) - match_op(OP_UN,UN) -@@ -1057,7 +1061,12 @@ - free(stack); - return -1; - } -- stack[stptr-1] = stack[stptr-1] < stack[stptr] ? 1.0 : 0.0; -+ if (isnan(stack[stptr-1])) -+ ; -+ else if (isnan(stack[stptr])) -+ stack[stptr-1] = stack[stptr]; -+ else -+ stack[stptr-1] = stack[stptr-1] < stack[stptr] ? 1.0 : 0.0; - stptr--; - break; - case OP_LE: -@@ -1066,7 +1075,12 @@ - free(stack); - return -1; - } -- stack[stptr-1] = stack[stptr-1] <= stack[stptr] ? 1.0 : 0.0; -+ if (isnan(stack[stptr-1])) -+ ; -+ else if (isnan(stack[stptr])) -+ stack[stptr-1] = stack[stptr]; -+ else -+ stack[stptr-1] = stack[stptr-1] <= stack[stptr] ? 1.0 : 0.0; - stptr--; - break; - case OP_GT: -@@ -1075,7 +1089,12 @@ - free(stack); - return -1; - } -- stack[stptr-1] = stack[stptr-1] > stack[stptr] ? 1.0 : 0.0; -+ if (isnan(stack[stptr-1])) -+ ; -+ else if (isnan(stack[stptr])) -+ stack[stptr-1] = stack[stptr]; -+ else -+ stack[stptr-1] = stack[stptr-1] > stack[stptr] ? 1.0 : 0.0; - stptr--; - break; - case OP_GE: -@@ -1084,7 +1103,12 @@ - free(stack); - return -1; - } -- stack[stptr-1] = stack[stptr-1] >= stack[stptr] ? 1.0 : 0.0; -+ if (isnan(stack[stptr-1])) -+ ; -+ else if (isnan(stack[stptr])) -+ stack[stptr-1] = stack[stptr]; -+ else -+ stack[stptr-1] = stack[stptr-1] >= stack[stptr] ? 1.0 : 0.0; - stptr--; - break; - case OP_EQ: -@@ -1093,7 +1117,12 @@ - free(stack); - return -1; - } -- stack[stptr-1] = stack[stptr-1] == stack[stptr] ? 1.0 : 0.0; -+ if (isnan(stack[stptr-1])) -+ ; -+ else if (isnan(stack[stptr])) -+ stack[stptr-1] = stack[stptr]; -+ else -+ stack[stptr-1] = stack[stptr-1] == stack[stptr] ? 1.0 : 0.0; - stptr--; - break; - case OP_IF: -@@ -1105,6 +1134,52 @@ - stack[stptr-2] = stack[stptr-2] != 0.0 ? stack[stptr-1] : stack[stptr]; - stptr--; - stptr--; -+ break; -+ case OP_MIN: -+ if(stptr<1){ -+ rrd_set_error("RPN stack underflow"); -+ free(stack); -+ return -1; -+ } -+ if (isnan(stack[stptr-1])) -+ ; -+ else if (isnan(stack[stptr])) -+ stack[stptr-1] = stack[stptr]; -+ else if (stack[stptr-1] > stack[stptr]) -+ stack[stptr-1] = stack[stptr]; -+ stptr--; -+ break; -+ case OP_MAX: -+ if(stptr<1){ -+ rrd_set_error("RPN stack underflow"); -+ free(stack); -+ return -1; -+ } -+ if (isnan(stack[stptr-1])) -+ ; -+ else if (isnan(stack[stptr])) -+ stack[stptr-1] = stack[stptr]; -+ else if (stack[stptr-1] < stack[stptr]) -+ stack[stptr-1] = stack[stptr]; -+ stptr--; -+ break; -+ case OP_LIMIT: -+ if(stptr<2){ -+ rrd_set_error("RPN stack underflow"); -+ free(stack); -+ return -1; -+ } -+ if (isnan(stack[stptr-2])) -+ ; -+ else if (isnan(stack[stptr-1])) -+ stack[stptr-2] = stack[stptr-1]; -+ else if (isnan(stack[stptr])) -+ stack[stptr-2] = stack[stptr]; -+ else if (stack[stptr-2] < stack[stptr-1]) -+ stack[stptr-2] = DNAN; -+ else if (stack[stptr-2] > stack[stptr]) -+ stack[stptr-2] = DNAN; -+ stptr-=2; - break; - case OP_UN: - if(stptr<0){ diff -Nur rrdtool.old/pkg/PLIST rrdtool/pkg/PLIST --- rrdtool.old/pkg/PLIST Tue Feb 15 17:18:55 2000 +++ rrdtool/pkg/PLIST Tue Jun 13 21:20:25 2000 @@ -1,8 +1,10 @@ bin/rrdtool bin/rrdcgi +bin/trytime lib/librrd.a lib/librrd.so.0 lib/librrd.so +include/rrd.h @exec /sbin/ldconfig -m %D/lib @unexec /sbin/ldconfig -R share/examples/rrdtool/cgi-demo.cgi @@ -30,6 +32,7 @@ share/examples/rrdtool/rrdfetchnames/README share/examples/rrdtool/README share/doc/rrdtool/rrdtool.pod +share/doc/rrdtool/rrdinfo.pod share/doc/rrdtool/rrdlast.pod share/doc/rrdtool/rrdcreate.pod share/doc/rrdtool/rrdupdate.pod @@ -45,6 +48,7 @@ share/doc/rrdtool/rrdcgi.pod share/doc/rrdtool/rrdtutorial.pod share/doc/rrdtool/rrdtool.txt +share/doc/rrdtool/rrdinfo.txt share/doc/rrdtool/rrdlast.txt share/doc/rrdtool/rrdcreate.txt share/doc/rrdtool/rrdupdate.txt @@ -62,6 +66,7 @@ share/doc/rrdtool/RRDs.txt share/doc/rrdtool/RRDp.txt share/doc/rrdtool/html/rrdtool.html +share/doc/rrdtool/html/rrdinfo.html share/doc/rrdtool/html/rrdlast.html share/doc/rrdtool/html/rrdcreate.html share/doc/rrdtool/html/rrdupdate.html >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200006131743.VAA42091>