16 files changed, 74 insertions, 116 deletions

diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index c1f5d395df9c..f47fe6da9798 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/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/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
index e9a59659e10b..da1030ebe725 100644
--- a/databases/rrdtool/distinfo
+++ b/databases/rrdtool/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/databases/rrdtool/files/patch-aa b/databases/rrdtool/files/patch-aa
index 2b96f3c7dcf4..a6bd67160b15 100644
--- a/databases/rrdtool/files/patch-aa
+++ b/databases/rrdtool/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/databases/rrdtool/files/patch-ab b/databases/rrdtool/files/patch-ab
index 705d98777aeb..5a2116ef58fb 100644
--- a/databases/rrdtool/files/patch-ab
+++ b/databases/rrdtool/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; i<ds_cnt;i++)
--	        printf("%14s",ds_namv[i]);
-+	        printf("%14s ",ds_namv[i]);
+-	        printf(" %20s",ds_namv[i]);
++	        printf(" %20s ",ds_namv[i]);
  	    printf ("\n\n");
  	    for (i = start; i <= end; i += step){
 -	        printf("%10lu:", i);
diff --git a/databases/rrdtool/files/patch-ac b/databases/rrdtool/files/patch-ac
index 2e8a0ecb18dc..52f476f929b8 100644
--- a/databases/rrdtool/files/patch-ac
+++ b/databases/rrdtool/files/patch-ac
@@ -1,23 +1,17 @@
---- Makefile.in.orig	Mon Oct 20 22:43:34 2003
-+++ Makefile.in	Mon Oct 20 22:43:25 2003
-@@ -393,13 +393,13 @@
+--- Makefile.in.orig	Mon Apr  5 02:03:53 2004
++++ Makefile.in	Tue Apr  6 10:53:31 2004
+@@ -633,13 +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 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
--	test -f perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@  && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
--	test -f perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
+-	$(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
 +install-data-local: site-perl-inst
-+#	$(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
-+#	test -f perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@  && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
-+#	test -f perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
  
- perl_piped:: $(top_builddir)/perl-piped
- 	test -d perl-piped \
+ # rules for building the perl module
+ 
diff --git a/databases/rrdtool/files/patch-ak b/databases/rrdtool/files/patch-ak
index c96efc161d92..982c95f4fd38 100644
--- a/databases/rrdtool/files/patch-ak
+++ b/databases/rrdtool/files/patch-ak
@@ -1,8 +1,8 @@
---- 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
+--- contrib/trytime/Makefile.in.orig	Mon Apr  5 02:03:53 2004
++++ contrib/trytime/Makefile.in	Tue Apr  6 11:17:12 2004
+@@ -162,7 +162,7 @@
+ target_vendor = @target_vendor@
+ AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/gd1.3
  EXTRA_DIST = trytime.c
 -contribdir = $(prefix)/contrib/trytime
 +contribdir = $(prefix)/share/examples/rrdtool/trytime
diff --git a/databases/rrdtool/files/patch-al b/databases/rrdtool/files/patch-al
deleted file mode 100644
index 9c459e8988bc..000000000000
--- a/databases/rrdtool/files/patch-al
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/parsetime.c.orig	Fri Oct 11 14:39:46 2002
-+++ src/parsetime.c	Mon Feb 10 20:47:18 2003
-@@ -660,6 +660,7 @@
- {
-     long mday=0, wday, mon, year = ptv->tm.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/databases/rrdtool/pkg-plist b/databases/rrdtool/pkg-plist
index 39244904f30e..6235d8efb1b3 100644
--- a/databases/rrdtool/pkg-plist
+++ b/databases/rrdtool/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
diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile
index c1f5d395df9c..f47fe6da9798 100644
--- a/databases/rrdtool10/Makefile
+++ b/databases/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/databases/rrdtool10/distinfo b/databases/rrdtool10/distinfo
index e9a59659e10b..da1030ebe725 100644
--- a/databases/rrdtool10/distinfo
+++ b/databases/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/databases/rrdtool10/files/patch-aa b/databases/rrdtool10/files/patch-aa
index 2b96f3c7dcf4..a6bd67160b15 100644
--- a/databases/rrdtool10/files/patch-aa
+++ b/databases/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/databases/rrdtool10/files/patch-ab b/databases/rrdtool10/files/patch-ab
index 705d98777aeb..5a2116ef58fb 100644
--- a/databases/rrdtool10/files/patch-ab
+++ b/databases/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; i<ds_cnt;i++)
--	        printf("%14s",ds_namv[i]);
-+	        printf("%14s ",ds_namv[i]);
+-	        printf(" %20s",ds_namv[i]);
++	        printf(" %20s ",ds_namv[i]);
  	    printf ("\n\n");
  	    for (i = start; i <= end; i += step){
 -	        printf("%10lu:", i);
diff --git a/databases/rrdtool10/files/patch-ac b/databases/rrdtool10/files/patch-ac
index 2e8a0ecb18dc..52f476f929b8 100644
--- a/databases/rrdtool10/files/patch-ac
+++ b/databases/rrdtool10/files/patch-ac
@@ -1,23 +1,17 @@
---- Makefile.in.orig	Mon Oct 20 22:43:34 2003
-+++ Makefile.in	Mon Oct 20 22:43:25 2003
-@@ -393,13 +393,13 @@
+--- Makefile.in.orig	Mon Apr  5 02:03:53 2004
++++ Makefile.in	Tue Apr  6 10:53:31 2004
+@@ -633,13 +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 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
--	test -f perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@  && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
--	test -f perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
+-	$(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
 +install-data-local: site-perl-inst
-+#	$(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
-+#	test -f perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@  && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
-+#	test -f perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
  
- perl_piped:: $(top_builddir)/perl-piped
- 	test -d perl-piped \
+ # rules for building the perl module
+ 
diff --git a/databases/rrdtool10/files/patch-ak b/databases/rrdtool10/files/patch-ak
index c96efc161d92..982c95f4fd38 100644
--- a/databases/rrdtool10/files/patch-ak
+++ b/databases/rrdtool10/files/patch-ak
@@ -1,8 +1,8 @@
---- 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
+--- contrib/trytime/Makefile.in.orig	Mon Apr  5 02:03:53 2004
++++ contrib/trytime/Makefile.in	Tue Apr  6 11:17:12 2004
+@@ -162,7 +162,7 @@
+ target_vendor = @target_vendor@
+ AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/gd1.3
  EXTRA_DIST = trytime.c
 -contribdir = $(prefix)/contrib/trytime
 +contribdir = $(prefix)/share/examples/rrdtool/trytime
diff --git a/databases/rrdtool10/files/patch-al b/databases/rrdtool10/files/patch-al
deleted file mode 100644
index 9c459e8988bc..000000000000
--- a/databases/rrdtool10/files/patch-al
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/parsetime.c.orig	Fri Oct 11 14:39:46 2002
-+++ src/parsetime.c	Mon Feb 10 20:47:18 2003
-@@ -660,6 +660,7 @@
- {
-     long mday=0, wday, mon, year = ptv->tm.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/databases/rrdtool10/pkg-plist b/databases/rrdtool10/pkg-plist
index 39244904f30e..6235d8efb1b3 100644
--- a/databases/rrdtool10/pkg-plist
+++ b/databases/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