From 216dba9b3e9bf4362bf5ff07c6658e5afe08d9e4 Mon Sep 17 00:00:00 2001 From: Dmitry Sivachenko Date: Tue, 6 Apr 2004 07:30:51 +0000 Subject: Update to version 1.0.47. --- net/rrdtool10/Makefile | 9 +++++++-- net/rrdtool10/distinfo | 4 ++-- net/rrdtool10/files/patch-aa | 13 ++++++------- net/rrdtool10/files/patch-ab | 12 ++++++------ net/rrdtool10/files/patch-ac | 26 ++++++++++---------------- net/rrdtool10/files/patch-ak | 10 +++++----- net/rrdtool10/files/patch-al | 20 -------------------- net/rrdtool10/pkg-plist | 1 + 8 files changed, 37 insertions(+), 58 deletions(-) delete mode 100644 net/rrdtool10/files/patch-al (limited to 'net/rrdtool10') diff --git a/net/rrdtool10/Makefile b/net/rrdtool10/Makefile index c1f5d395df9c..f47fe6da9798 100644 --- a/net/rrdtool10/Makefile +++ b/net/rrdtool10/Makefile @@ -6,20 +6,25 @@ # PORTNAME= rrdtool -PORTVERSION= 1.0.45 +PORTVERSION= 1.0.47 CATEGORIES= net MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/ MAINTAINER= demon@FreeBSD.org COMMENT= Round Robin Database Tools +LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png + USE_PERL5= yes MAKE_ENV+= PERL=${PERL} USE_LIBTOOL_VER=13 INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --enable-shared=yes +CONFIGURE_ARGS= --enable-shared --enable-local-zlib --enable-local-libpng \ + --program-transform-name='' CONFIGURE_ENV= PERL=${PERL} +CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib CFLAGS:= ${CFLAGS:N-ffast-math} MAN1= RRDp.1 RRDs.1 bin_dec_hex.1 rrdcgi.1 rrdcreate.1 rrddump.1 \ diff --git a/net/rrdtool10/distinfo b/net/rrdtool10/distinfo index e9a59659e10b..da1030ebe725 100644 --- a/net/rrdtool10/distinfo +++ b/net/rrdtool10/distinfo @@ -1,2 +1,2 @@ -MD5 (rrdtool-1.0.45.tar.gz) = 64086fc7f1ca28c069ee5104f85d7a8c -SIZE (rrdtool-1.0.45.tar.gz) = 1176656 +MD5 (rrdtool-1.0.47.tar.gz) = 19fec533ad125b2538f5e27b3be6dfd6 +SIZE (rrdtool-1.0.47.tar.gz) = 1462489 diff --git a/net/rrdtool10/files/patch-aa b/net/rrdtool10/files/patch-aa index 2b96f3c7dcf4..a6bd67160b15 100644 --- a/net/rrdtool10/files/patch-aa +++ b/net/rrdtool10/files/patch-aa @@ -1,12 +1,11 @@ ---- perl-shared/Makefile.PL.in.orig Wed May 1 17:55:28 2002 -+++ perl-shared/Makefile.PL.in Wed May 1 18:00:05 2002 -@@ -10,7 +10,8 @@ +--- perl-shared/Makefile.PL.in.orig Sat Apr 3 18:33:13 2004 ++++ perl-shared/Makefile.PL.in Tue Apr 6 10:49:27 2004 +@@ -10,7 +10,7 @@ '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', -+ 'CCFLAGS' => '-DHAVE_CONFIG_H', -+ 'INC' => '-I../config -I@top_srcdir@/src -I@top_srcdir@/gd1.3', +- 'INC' => '-I@top_srcdir@ -I@top_srcdir@/src -I@top_srcdir@/gd1.3', ++ 'INC' => '-I../ -I@top_srcdir@ -I@top_srcdir@/src -I@top_srcdir@/gd1.3', + 'CCFLAGS' => '-DHAVE_CONFIG_H', # where to look for the necessary libraries # Perl will figure out which one is valid - 'depend' => {'RRDs.c' => "../src/.libs/librrd_private.a"}, diff --git a/net/rrdtool10/files/patch-ab b/net/rrdtool10/files/patch-ab index 705d98777aeb..5a2116ef58fb 100644 --- a/net/rrdtool10/files/patch-ab +++ b/net/rrdtool10/files/patch-ab @@ -1,11 +1,11 @@ ---- src/rrd_tool.c.orig Sun Apr 14 11:48:04 2002 -+++ src/rrd_tool.c Wed May 1 15:59:04 2002 -@@ -322,12 +322,12 @@ +--- src/rrd_tool.c.orig Mon Apr 5 02:13:52 2004 ++++ src/rrd_tool.c Tue Apr 6 10:51:41 2004 +@@ -340,12 +340,12 @@ datai=data; - printf(" "); + printf(" "); for (i = 0; itm.tm_year; - int tlen; -+ time_t montime; - - switch (sc_tokid) { - case YESTERDAY: -@@ -713,7 +714,8 @@ - tlen = strlen(sc_token); - mon = atol(sc_token); - if (mon > 10*356*24*60*60) { -- ptv->tm=*localtime(&mon); -+ montime = mon; -+ ptv->tm=*localtime(&montime); - token(); - break; - } diff --git a/net/rrdtool10/pkg-plist b/net/rrdtool10/pkg-plist index 39244904f30e..6235d8efb1b3 100644 --- a/net/rrdtool10/pkg-plist +++ b/net/rrdtool10/pkg-plist @@ -3,6 +3,7 @@ bin/rrdcgi bin/trytime bin/rrdupdate lib/librrd.a +lib/librrd.la lib/librrd.so.0 lib/librrd.so include/rrd.h -- cgit v1.2.3