Update to 1.0.24

PR:		19250
Submitted by:	maintainer

7 files changed, 39 insertions, 33 deletions

diff --git a/net/rrdtool/Makefile b/net/rrdtool/Makefile
index 09808fdfea86..cb3ff0932fee 100644
--- a/net/rrdtool/Makefile
+++ b/net/rrdtool/Makefile
@@ -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 @@ MAINTAINER=	dima@Chg.RU
 USE_PERL5=	yes
 MAKE_ENV+=	PERL=${PERL}
 
+USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared=yes
@@ -23,7 +24,7 @@ CONFIGURE_ENV=	PERL=${PERL}
 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 --git a/net/rrdtool/distinfo b/net/rrdtool/distinfo
index 8262aec2a102..b6ae0ecc5b01 100644
--- a/net/rrdtool/distinfo
+++ b/net/rrdtool/distinfo
@@ -1 +1 @@
-MD5 (rrdtool-1.0.13.tar.gz) = 51311e66400ad776cf04a8fcf6594115
+MD5 (rrdtool-1.0.24.tar.gz) = 251b2ea132245d02039fe67eae6047da
diff --git a/net/rrdtool/files/patch-aa b/net/rrdtool/files/patch-aa
index 5e948c99bca4..ebf17ddaf33b 100644
--- a/net/rrdtool/files/patch-aa
+++ b/net/rrdtool/files/patch-aa
@@ -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 --git a/net/rrdtool/files/patch-ab b/net/rrdtool/files/patch-ab
index c23c3688906d..2513bfe423fb 100644
--- a/net/rrdtool/files/patch-ab
+++ b/net/rrdtool/files/patch-ab
@@ -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 --git a/net/rrdtool/files/patch-ac b/net/rrdtool/files/patch-ac
index 685e54f8fc67..f1318a481dcb 100644
--- a/net/rrdtool/files/patch-ac
+++ b/net/rrdtool/files/patch-ac
@@ -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 --git a/net/rrdtool/files/patch-ag b/net/rrdtool/files/patch-ag
index 00a71b9b165d..1463213ac6f3 100644
--- a/net/rrdtool/files/patch-ag
+++ b/net/rrdtool/files/patch-ag
@@ -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 --git a/net/rrdtool/pkg-plist b/net/rrdtool/pkg-plist
index a5160007dbdc..186251ae32bc 100644
--- a/net/rrdtool/pkg-plist
+++ b/net/rrdtool/pkg-plist
@@ -1,8 +1,10 @@
 bin/rrdtool
 bin/rrdcgi
+bin/trytime
 lib/librrd.a
 lib/librrd.so.0
 lib/librrd.so
+include/rrd.h
 share/examples/rrdtool/cgi-demo.cgi
 share/examples/rrdtool/piped-demo.pl
 share/examples/rrdtool/shared-demo.pl
@@ -28,6 +30,7 @@ share/examples/rrdtool/rrdfetchnames/rrdfetchnames.pl
 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
@@ -43,6 +46,7 @@ share/doc/rrdtool/rrdresize.pod
 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
@@ -60,6 +64,7 @@ share/doc/rrdtool/rrdtutorial.txt
 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