From 32485aad2d5eb0ad3a62382e3c8f3e4db5d3de8c Mon Sep 17 00:00:00 2001
From: Dmitry Sivachenko <demon@FreeBSD.org>
Date: Sun, 8 Aug 2004 14:25:31 +0000
Subject: Update to version 1.0.49

---
 databases/rrdtool/Makefile                  |  2 +-
 databases/rrdtool/distinfo                  |  4 ++--
 databases/rrdtool/files/patch-aa            |  6 +++---
 databases/rrdtool/files/patch-ab            | 18 ------------------
 databases/rrdtool/files/patch-ac            | 26 +++++++++++++++++---------
 databases/rrdtool/files/patch-rrd_graph.c   |  8 ++++----
 databases/rrdtool10/Makefile                |  2 +-
 databases/rrdtool10/distinfo                |  4 ++--
 databases/rrdtool10/files/patch-aa          |  6 +++---
 databases/rrdtool10/files/patch-ab          | 18 ------------------
 databases/rrdtool10/files/patch-ac          | 26 +++++++++++++++++---------
 databases/rrdtool10/files/patch-rrd_graph.c |  8 ++++----
 12 files changed, 54 insertions(+), 74 deletions(-)
 delete mode 100644 databases/rrdtool/files/patch-ab
 delete mode 100644 databases/rrdtool10/files/patch-ab

(limited to 'databases')

diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index cc807df2daeb..e0211277aa4e 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rrdtool
-PORTVERSION=	1.0.48
+PORTVERSION=	1.0.49
 CATEGORIES=	net
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/
 
diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
index a351f333f291..5f69d61f8f67 100644
--- a/databases/rrdtool/distinfo
+++ b/databases/rrdtool/distinfo
@@ -1,2 +1,2 @@
-MD5 (rrdtool-1.0.48.tar.gz) = b38a3b04d2540f2f2bf4ca072b8eb229
-SIZE (rrdtool-1.0.48.tar.gz) = 1462609
+MD5 (rrdtool-1.0.49.tar.gz) = fbe492dbf3d68abb1d86c2322e7ed44a
+SIZE (rrdtool-1.0.49.tar.gz) = 1466897
diff --git a/databases/rrdtool/files/patch-aa b/databases/rrdtool/files/patch-aa
index a6bd67160b15..8436cf0346fb 100644
--- a/databases/rrdtool/files/patch-aa
+++ b/databases/rrdtool/files/patch-aa
@@ -1,11 +1,11 @@
---- 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
+--- perl-shared/Makefile.PL.in.orig	Thu Apr  8 01:04:53 2004
++++ perl-shared/Makefile.PL.in	Sun Aug  8 18:11:16 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@ -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',
+     'CCFLAGS'      => "$Config{ccflags} -DHAVE_CONFIG_H",
      # where to look for the necessary libraries 
      # Perl will figure out which one is valid
diff --git a/databases/rrdtool/files/patch-ab b/databases/rrdtool/files/patch-ab
deleted file mode 100644
index 5a2116ef58fb..000000000000
--- a/databases/rrdtool/files/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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("          ");
- 	    for (i = 0; i<ds_cnt;i++)
--	        printf(" %20s",ds_namv[i]);
-+	        printf(" %20s ",ds_namv[i]);
- 	    printf ("\n\n");
- 	    for (i = start; i <= end; i += step){
--	        printf("%10lu:", i);
-+	        printf("%10lu: ", i);
- 	        for (ii = 0; ii < ds_cnt; ii++)
--		    printf(" %0.10e", *(datai++));
-+		    printf(" %0.10e ", *(datai++));
- 	        printf("\n");
- 	    }
- 	    for (i=0;i<ds_cnt;i++)
diff --git a/databases/rrdtool/files/patch-ac b/databases/rrdtool/files/patch-ac
index 52f476f929b8..a43ad994692b 100644
--- a/databases/rrdtool/files/patch-ac
+++ b/databases/rrdtool/files/patch-ac
@@ -1,16 +1,24 @@
---- Makefile.in.orig	Mon Apr  5 02:03:53 2004
-+++ Makefile.in	Tue Apr  6 10:53:31 2004
-@@ -633,13 +633,7 @@
+--- Makefile.in.orig	Sun Aug  8 14:40:15 2004
++++ Makefile.in	Sun Aug  8 18:16:44 2004
+@@ -633,21 +633,7 @@
  # lets schedule the perl stuff for installation
  # the special call to install-sh is because the -d switch is not portable
  # mac os X has its perl module in bundles so it seems
 -install-data-local:
--	$(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
--	$(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
--	$(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
--	$(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
--	test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
--	test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
+-	@if test "x$(PERL)" != "xno"; then \
+-	  echo "$(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \
+-	  $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \
+-	  echo "$(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl"; \
+-	  $(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl; \
+-	  echo "$(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl"; \
+-	  $(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl; \
+-	  echo "$(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \
+-	  $(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \
+-	  echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true"; \
+-	  test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true; \
+-	  echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true"; \
+-	  test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true; \
+-	fi
 +install-data-local: site-perl-inst
  
  # rules for building the perl module
diff --git a/databases/rrdtool/files/patch-rrd_graph.c b/databases/rrdtool/files/patch-rrd_graph.c
index 2ba5c0859e60..b8fcdefb8c77 100644
--- a/databases/rrdtool/files/patch-rrd_graph.c
+++ b/databases/rrdtool/files/patch-rrd_graph.c
@@ -1,11 +1,11 @@
---- src/rrd_graph.c.orig	Fri May  7 15:10:16 2004
-+++ src/rrd_graph.c	Fri May  7 15:10:34 2004
+--- src/rrd_graph.c.orig	Sun Aug  8 14:58:13 2004
++++ src/rrd_graph.c	Sun Aug  8 18:19:06 2004
 @@ -2966,7 +2966,7 @@
  
  	
  	opt = getopt_long(argc, argv, 
--			  "s:e:x:y:v:w:h:iu:l:rb:oc:t:f:a:zgjFYAMXL:S:RB:O:U:",
-+			  "s:e:x:y:v:w:h:iu:l:rb:oc:t:f:a:zgjFYNAMX:L:S:RB:O:U:",
+-			  "s:e:x:y:v:w:h:iu:l:rb:oc:t:f:a:zgjFYAMX:L:S:RB:O:U:",
++			  "s:e:x:y:v:w:h:iu:l:rb:oc:t:f:a:zgjFYAMNX:L:S:RB:O:U:",
  			  long_options, &option_index);
  
  	if (opt == EOF)
diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile
index cc807df2daeb..e0211277aa4e 100644
--- a/databases/rrdtool10/Makefile
+++ b/databases/rrdtool10/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rrdtool
-PORTVERSION=	1.0.48
+PORTVERSION=	1.0.49
 CATEGORIES=	net
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/
 
diff --git a/databases/rrdtool10/distinfo b/databases/rrdtool10/distinfo
index a351f333f291..5f69d61f8f67 100644
--- a/databases/rrdtool10/distinfo
+++ b/databases/rrdtool10/distinfo
@@ -1,2 +1,2 @@
-MD5 (rrdtool-1.0.48.tar.gz) = b38a3b04d2540f2f2bf4ca072b8eb229
-SIZE (rrdtool-1.0.48.tar.gz) = 1462609
+MD5 (rrdtool-1.0.49.tar.gz) = fbe492dbf3d68abb1d86c2322e7ed44a
+SIZE (rrdtool-1.0.49.tar.gz) = 1466897
diff --git a/databases/rrdtool10/files/patch-aa b/databases/rrdtool10/files/patch-aa
index a6bd67160b15..8436cf0346fb 100644
--- a/databases/rrdtool10/files/patch-aa
+++ b/databases/rrdtool10/files/patch-aa
@@ -1,11 +1,11 @@
---- 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
+--- perl-shared/Makefile.PL.in.orig	Thu Apr  8 01:04:53 2004
++++ perl-shared/Makefile.PL.in	Sun Aug  8 18:11:16 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@ -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',
+     'CCFLAGS'      => "$Config{ccflags} -DHAVE_CONFIG_H",
      # where to look for the necessary libraries 
      # Perl will figure out which one is valid
diff --git a/databases/rrdtool10/files/patch-ab b/databases/rrdtool10/files/patch-ab
deleted file mode 100644
index 5a2116ef58fb..000000000000
--- a/databases/rrdtool10/files/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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("          ");
- 	    for (i = 0; i<ds_cnt;i++)
--	        printf(" %20s",ds_namv[i]);
-+	        printf(" %20s ",ds_namv[i]);
- 	    printf ("\n\n");
- 	    for (i = start; i <= end; i += step){
--	        printf("%10lu:", i);
-+	        printf("%10lu: ", i);
- 	        for (ii = 0; ii < ds_cnt; ii++)
--		    printf(" %0.10e", *(datai++));
-+		    printf(" %0.10e ", *(datai++));
- 	        printf("\n");
- 	    }
- 	    for (i=0;i<ds_cnt;i++)
diff --git a/databases/rrdtool10/files/patch-ac b/databases/rrdtool10/files/patch-ac
index 52f476f929b8..a43ad994692b 100644
--- a/databases/rrdtool10/files/patch-ac
+++ b/databases/rrdtool10/files/patch-ac
@@ -1,16 +1,24 @@
---- Makefile.in.orig	Mon Apr  5 02:03:53 2004
-+++ Makefile.in	Tue Apr  6 10:53:31 2004
-@@ -633,13 +633,7 @@
+--- Makefile.in.orig	Sun Aug  8 14:40:15 2004
++++ Makefile.in	Sun Aug  8 18:16:44 2004
+@@ -633,21 +633,7 @@
  # lets schedule the perl stuff for installation
  # the special call to install-sh is because the -d switch is not portable
  # mac os X has its perl module in bundles so it seems
 -install-data-local:
--	$(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
--	$(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
--	$(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
--	$(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
--	test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
--	test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
+-	@if test "x$(PERL)" != "xno"; then \
+-	  echo "$(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \
+-	  $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \
+-	  echo "$(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl"; \
+-	  $(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl; \
+-	  echo "$(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl"; \
+-	  $(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl; \
+-	  echo "$(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \
+-	  $(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \
+-	  echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true"; \
+-	  test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true; \
+-	  echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true"; \
+-	  test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true; \
+-	fi
 +install-data-local: site-perl-inst
  
  # rules for building the perl module
diff --git a/databases/rrdtool10/files/patch-rrd_graph.c b/databases/rrdtool10/files/patch-rrd_graph.c
index 2ba5c0859e60..b8fcdefb8c77 100644
--- a/databases/rrdtool10/files/patch-rrd_graph.c
+++ b/databases/rrdtool10/files/patch-rrd_graph.c
@@ -1,11 +1,11 @@
---- src/rrd_graph.c.orig	Fri May  7 15:10:16 2004
-+++ src/rrd_graph.c	Fri May  7 15:10:34 2004
+--- src/rrd_graph.c.orig	Sun Aug  8 14:58:13 2004
++++ src/rrd_graph.c	Sun Aug  8 18:19:06 2004
 @@ -2966,7 +2966,7 @@
  
  	
  	opt = getopt_long(argc, argv, 
--			  "s:e:x:y:v:w:h:iu:l:rb:oc:t:f:a:zgjFYAMXL:S:RB:O:U:",
-+			  "s:e:x:y:v:w:h:iu:l:rb:oc:t:f:a:zgjFYNAMX:L:S:RB:O:U:",
+-			  "s:e:x:y:v:w:h:iu:l:rb:oc:t:f:a:zgjFYAMX:L:S:RB:O:U:",
++			  "s:e:x:y:v:w:h:iu:l:rb:oc:t:f:a:zgjFYAMNX:L:S:RB:O:U:",
  			  long_options, &option_index);
  
  	if (opt == EOF)
-- 
cgit v1.2.3