Upgrade to 1.0.37

Submitted by:	Mark Rowlands <mark.rowlands@minmail.net> (partially).

18 files changed, 86 insertions, 76 deletions

diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index d0007efddc2b..b0e8889a6e67 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rrdtool
-PORTVERSION=	1.0.33
+PORTVERSION=	1.0.37
 CATEGORIES=	net
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/
 
diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
index aedd58977a94..a8a96fba3fc3 100644
--- a/databases/rrdtool/distinfo
+++ b/databases/rrdtool/distinfo
@@ -1 +1 @@
-MD5 (rrdtool-1.0.33.tar.gz) = 54bb6daf131cdc4bbe2bcf005bf583a5
+MD5 (rrdtool-1.0.37.tar.gz) = 9a610d901933ad18f30162fde5d7c100
diff --git a/databases/rrdtool/files/patch-aa b/databases/rrdtool/files/patch-aa
index ebf17ddaf33b..2b96f3c7dcf4 100644
--- a/databases/rrdtool/files/patch-aa
+++ b/databases/rrdtool/files/patch-aa
@@ -1,12 +1,12 @@
---- perl-shared/Makefile.PL.orig	Tue Jun 13 20:51:17 2000
-+++ perl-shared/Makefile.PL	Tue Jun 13 20:51:19 2000
+--- 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 @@
      'NAME'         => 'RRDs',
-     'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
+     'VERSION_FROM' => '@top_srcdir@/perl-shared/RRDs.pm', # finds $VERSION
      'DEFINE'	   => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
--    'INC'          => '-I../src -I../gd1.3',
-+    'CCFLAGS'	   => "-DHAVE_CONFIG_H",
-+    'INC'          => '-I../config -I../src -I../gd1.3',
+-    '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',
      # 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/databases/rrdtool/files/patch-ab b/databases/rrdtool/files/patch-ab
index 2513bfe423fb..705d98777aeb 100644
--- a/databases/rrdtool/files/patch-ab
+++ b/databases/rrdtool/files/patch-ab
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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 @@
  	    datai=data;
  	    printf("           ");
  	    for (i = 0; i<ds_cnt;i++)
diff --git a/databases/rrdtool/files/patch-ac b/databases/rrdtool/files/patch-ac
index 26d5410e4faf..d786d539f5b2 100644
--- a/databases/rrdtool/files/patch-ac
+++ b/databases/rrdtool/files/patch-ac
@@ -1,21 +1,26 @@
---- Makefile.in.orig	Wed Oct  4 13:09:37 2000
-+++ Makefile.in	Wed Oct  4 13:10:39 2000
-@@ -383,12 +383,12 @@
+--- Makefile.in.orig	Sun Apr 14 11:47:46 2002
++++ Makefile.in	Wed May  1 16:04:06 2002
+@@ -392,12 +392,17 @@
  
  # 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
+-	$(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-data-local: site-perl-inst
-+#	./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
++#      ./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
++
++
++
  
- # rules for building the perl module
- perl_piped: perl-piped/Makefile
+ perl_piped:: $(top_builddir)/perl-piped
+ 	test -d perl-piped \
diff --git a/databases/rrdtool/files/patch-ae b/databases/rrdtool/files/patch-ae
index 98feb795d0ff..b1465ab16354 100644
--- a/databases/rrdtool/files/patch-ae
+++ b/databases/rrdtool/files/patch-ae
@@ -1,11 +1,11 @@
---- doc/Makefile.in.orig	Fri Jan  7 20:56:21 2000
-+++ doc/Makefile.in	Fri Jan  7 20:57:05 2000
-@@ -96,9 +96,9 @@
+--- doc/Makefile.in.orig	Sun Apr 14 11:51:02 2002
++++ doc/Makefile.in	Wed May  1 16:05:42 2002
+@@ -110,9 +110,9 @@
  EXTRA_DIST = $(POD) $(HTML) $(TXT)
  
  # some install rules
 -idocdir = $(prefix)/doc
-+idocdir = $(prefix)/share/doc/rrdtool
++idocdir = $(prefix)/share/doc/rrdtool/
  idoc_DATA = $(POD) $(TXT)
 -ihtmldir = $(prefix)/html
 +ihtmldir = $(prefix)/share/doc/rrdtool/html
diff --git a/databases/rrdtool/files/patch-af b/databases/rrdtool/files/patch-af
index a109c319e248..ab74382bf032 100644
--- a/databases/rrdtool/files/patch-af
+++ b/databases/rrdtool/files/patch-af
@@ -1,6 +1,6 @@
---- examples/Makefile.in.orig	Fri Jan  7 20:58:16 2000
-+++ examples/Makefile.in	Fri Jan  7 20:59:13 2000
-@@ -81,7 +81,7 @@
+--- examples/Makefile.in.orig	Sun Apr 14 11:51:04 2002
++++ examples/Makefile.in	Wed May  1 16:07:13 2002
+@@ -93,7 +93,7 @@
  
  EXTRA_DIST = cgi-demo.cgi.in    piped-demo.pl.in   shared-demo.pl.in stripes.pl.in bigtops.pl.in minmax.pl.in
  
diff --git a/databases/rrdtool/files/patch-ag b/databases/rrdtool/files/patch-ag
index fde216a89988..205d5ac7228c 100644
--- a/databases/rrdtool/files/patch-ag
+++ b/databases/rrdtool/files/patch-ag
@@ -1,6 +1,6 @@
---- contrib/Makefile.in.orig	Thu Feb 22 12:56:40 2001
-+++ contrib/Makefile.in	Thu Feb 22 12:56:57 2001
-@@ -87,7 +87,7 @@
+--- contrib/Makefile.in.orig Sun Apr 14 11:51:05 2002
++++ contrib/Makefile.in	Wed May  1 16:08:10 2002
+@@ -88,7 +88,7 @@
  ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
  
  SUBDIRS = trytime
diff --git a/databases/rrdtool/files/patch-ak b/databases/rrdtool/files/patch-ak
index f998e6995400..c96efc161d92 100644
--- a/databases/rrdtool/files/patch-ak
+++ b/databases/rrdtool/files/patch-ak
@@ -1,11 +1,11 @@
---- contrib/trytime/Makefile.in.orig	Fri Jan  7 21:11:21 2000
-+++ contrib/trytime/Makefile.in	Fri Jan  7 21:11:41 2000
-@@ -76,7 +76,7 @@
- ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
+--- contrib/trytime/Makefile.in.orig	Sun Apr 14 11:51:10 2002
++++ contrib/trytime/Makefile.in	Wed May  1 16:09:23 2002
+@@ -89,7 +89,7 @@
  
+ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/gd1.3
  EXTRA_DIST = trytime.c
 -contribdir = $(prefix)/contrib/trytime
 +contribdir = $(prefix)/share/examples/rrdtool/trytime
  contrib_DATA = README trytime.c
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = ../../config/config.h
+ bin_PROGRAMS = trytime
+ trytime_SOURCES = trytime.c
diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile
index d0007efddc2b..b0e8889a6e67 100644
--- a/databases/rrdtool10/Makefile
+++ b/databases/rrdtool10/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rrdtool
-PORTVERSION=	1.0.33
+PORTVERSION=	1.0.37
 CATEGORIES=	net
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/
 
diff --git a/databases/rrdtool10/distinfo b/databases/rrdtool10/distinfo
index aedd58977a94..a8a96fba3fc3 100644
--- a/databases/rrdtool10/distinfo
+++ b/databases/rrdtool10/distinfo
@@ -1 +1 @@
-MD5 (rrdtool-1.0.33.tar.gz) = 54bb6daf131cdc4bbe2bcf005bf583a5
+MD5 (rrdtool-1.0.37.tar.gz) = 9a610d901933ad18f30162fde5d7c100
diff --git a/databases/rrdtool10/files/patch-aa b/databases/rrdtool10/files/patch-aa
index ebf17ddaf33b..2b96f3c7dcf4 100644
--- a/databases/rrdtool10/files/patch-aa
+++ b/databases/rrdtool10/files/patch-aa
@@ -1,12 +1,12 @@
---- perl-shared/Makefile.PL.orig	Tue Jun 13 20:51:17 2000
-+++ perl-shared/Makefile.PL	Tue Jun 13 20:51:19 2000
+--- 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 @@
      'NAME'         => 'RRDs',
-     'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
+     'VERSION_FROM' => '@top_srcdir@/perl-shared/RRDs.pm', # finds $VERSION
      'DEFINE'	   => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
--    'INC'          => '-I../src -I../gd1.3',
-+    'CCFLAGS'	   => "-DHAVE_CONFIG_H",
-+    'INC'          => '-I../config -I../src -I../gd1.3',
+-    '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',
      # 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/databases/rrdtool10/files/patch-ab b/databases/rrdtool10/files/patch-ab
index 2513bfe423fb..705d98777aeb 100644
--- a/databases/rrdtool10/files/patch-ab
+++ b/databases/rrdtool10/files/patch-ab
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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 @@
  	    datai=data;
  	    printf("           ");
  	    for (i = 0; i<ds_cnt;i++)
diff --git a/databases/rrdtool10/files/patch-ac b/databases/rrdtool10/files/patch-ac
index 26d5410e4faf..d786d539f5b2 100644
--- a/databases/rrdtool10/files/patch-ac
+++ b/databases/rrdtool10/files/patch-ac
@@ -1,21 +1,26 @@
---- Makefile.in.orig	Wed Oct  4 13:09:37 2000
-+++ Makefile.in	Wed Oct  4 13:10:39 2000
-@@ -383,12 +383,12 @@
+--- Makefile.in.orig	Sun Apr 14 11:47:46 2002
++++ Makefile.in	Wed May  1 16:04:06 2002
+@@ -392,12 +392,17 @@
  
  # 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
+-	$(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-data-local: site-perl-inst
-+#	./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
++#      ./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
++
++
++
  
- # rules for building the perl module
- perl_piped: perl-piped/Makefile
+ perl_piped:: $(top_builddir)/perl-piped
+ 	test -d perl-piped \
diff --git a/databases/rrdtool10/files/patch-ae b/databases/rrdtool10/files/patch-ae
index 98feb795d0ff..b1465ab16354 100644
--- a/databases/rrdtool10/files/patch-ae
+++ b/databases/rrdtool10/files/patch-ae
@@ -1,11 +1,11 @@
---- doc/Makefile.in.orig	Fri Jan  7 20:56:21 2000
-+++ doc/Makefile.in	Fri Jan  7 20:57:05 2000
-@@ -96,9 +96,9 @@
+--- doc/Makefile.in.orig	Sun Apr 14 11:51:02 2002
++++ doc/Makefile.in	Wed May  1 16:05:42 2002
+@@ -110,9 +110,9 @@
  EXTRA_DIST = $(POD) $(HTML) $(TXT)
  
  # some install rules
 -idocdir = $(prefix)/doc
-+idocdir = $(prefix)/share/doc/rrdtool
++idocdir = $(prefix)/share/doc/rrdtool/
  idoc_DATA = $(POD) $(TXT)
 -ihtmldir = $(prefix)/html
 +ihtmldir = $(prefix)/share/doc/rrdtool/html
diff --git a/databases/rrdtool10/files/patch-af b/databases/rrdtool10/files/patch-af
index a109c319e248..ab74382bf032 100644
--- a/databases/rrdtool10/files/patch-af
+++ b/databases/rrdtool10/files/patch-af
@@ -1,6 +1,6 @@
---- examples/Makefile.in.orig	Fri Jan  7 20:58:16 2000
-+++ examples/Makefile.in	Fri Jan  7 20:59:13 2000
-@@ -81,7 +81,7 @@
+--- examples/Makefile.in.orig	Sun Apr 14 11:51:04 2002
++++ examples/Makefile.in	Wed May  1 16:07:13 2002
+@@ -93,7 +93,7 @@
  
  EXTRA_DIST = cgi-demo.cgi.in    piped-demo.pl.in   shared-demo.pl.in stripes.pl.in bigtops.pl.in minmax.pl.in
  
diff --git a/databases/rrdtool10/files/patch-ag b/databases/rrdtool10/files/patch-ag
index fde216a89988..205d5ac7228c 100644
--- a/databases/rrdtool10/files/patch-ag
+++ b/databases/rrdtool10/files/patch-ag
@@ -1,6 +1,6 @@
---- contrib/Makefile.in.orig	Thu Feb 22 12:56:40 2001
-+++ contrib/Makefile.in	Thu Feb 22 12:56:57 2001
-@@ -87,7 +87,7 @@
+--- contrib/Makefile.in.orig Sun Apr 14 11:51:05 2002
++++ contrib/Makefile.in	Wed May  1 16:08:10 2002
+@@ -88,7 +88,7 @@
  ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
  
  SUBDIRS = trytime
diff --git a/databases/rrdtool10/files/patch-ak b/databases/rrdtool10/files/patch-ak
index f998e6995400..c96efc161d92 100644
--- a/databases/rrdtool10/files/patch-ak
+++ b/databases/rrdtool10/files/patch-ak
@@ -1,11 +1,11 @@
---- contrib/trytime/Makefile.in.orig	Fri Jan  7 21:11:21 2000
-+++ contrib/trytime/Makefile.in	Fri Jan  7 21:11:41 2000
-@@ -76,7 +76,7 @@
- ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
+--- contrib/trytime/Makefile.in.orig	Sun Apr 14 11:51:10 2002
++++ contrib/trytime/Makefile.in	Wed May  1 16:09:23 2002
+@@ -89,7 +89,7 @@
  
+ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/gd1.3
  EXTRA_DIST = trytime.c
 -contribdir = $(prefix)/contrib/trytime
 +contribdir = $(prefix)/share/examples/rrdtool/trytime
  contrib_DATA = README trytime.c
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = ../../config/config.h
+ bin_PROGRAMS = trytime
+ trytime_SOURCES = trytime.c