12 files changed, 21 insertions, 108 deletions

diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 6fba633c54ed..65bcb9f1fb3f 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rrdtool
-PORTVERSION=	1.0.28
+PORTVERSION=	1.0.32
 CATEGORIES=	net
 MASTER_SITES=	http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/pub/
 
@@ -23,8 +23,8 @@ 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 rrdinfo.1
+		rrdtool.1 rrdtune.1 rrdtutorial.1 rrdtutorial.es.1 rrdupdate.1 \
+		cdeftutorial.1 rpntutorial.1 rrdinfo.1
 MAN3=		RRDp.3 RRDs.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
index ac18d439c7b8..270faede2d7c 100644
--- a/databases/rrdtool/distinfo
+++ b/databases/rrdtool/distinfo
@@ -1 +1 @@
-MD5 (rrdtool-1.0.28.tar.gz) = 4db8949675ccb97cd289fae96fb3dbb0
+MD5 (rrdtool-1.0.32.tar.gz) = 0ab3abd657984076f8cec4debef56c02
diff --git a/databases/rrdtool/files/patch-ag b/databases/rrdtool/files/patch-ag
index 1463213ac6f3..fde216a89988 100644
--- a/databases/rrdtool/files/patch-ag
+++ b/databases/rrdtool/files/patch-ag
@@ -1,11 +1,11 @@
---- 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 @@
+--- 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 @@
  ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
  
- SUBDIRS = log2rrd rrd-file-icon trytime rrdproc rrdlastds add_ds killspike rrdfetchnames
+ SUBDIRS = trytime
 -contribdir = $(prefix)/contrib
 +contribdir = $(prefix)/share/examples/rrdtool
  contrib_DATA = README
- EXTRA_DIST = clickgraphs php3
+ EXTRA_DIST = rrdview log2rrd rrd-file-icon rrdproc rrdlastds add_ds killspike rrdfetchnames snmpstats rrdexplorer php3 php4
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/databases/rrdtool/files/patch-ah b/databases/rrdtool/files/patch-ah
deleted file mode 100644
index ba81028f2075..000000000000
--- a/databases/rrdtool/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/log2rrd/Makefile.in.orig	Fri Jan  7 21:07:22 2000
-+++ contrib/log2rrd/Makefile.in	Fri Jan  7 21:07:45 2000
-@@ -77,7 +77,7 @@
- 
- EXTRA_DIST = log2rrd.pl.in
- 
--contribdir = $(prefix)/contrib/log2rrd
-+contribdir = $(prefix)/share/examples/rrdtool/log2rrd
- contrib_DATA = README
- contrib_SCRIPTS = log2rrd.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/databases/rrdtool/files/patch-ai b/databases/rrdtool/files/patch-ai
deleted file mode 100644
index 005a791e0dc8..000000000000
--- a/databases/rrdtool/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/rrd-file-icon/Makefile.in.orig	Fri Jan  7 21:08:22 2000
-+++ contrib/rrd-file-icon/Makefile.in	Fri Jan  7 21:08:46 2000
-@@ -76,7 +76,7 @@
- ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
- 
- EXTRA_DIST = rrd.png
--contribdir = $(prefix)/contrib/rrd-file-icon
-+contribdir = $(prefix)/share/examples/rrdtool/rrd-file-icon
- contrib_DATA = README       rrd.png
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = ../../config/config.h
diff --git a/databases/rrdtool/files/patch-aj b/databases/rrdtool/files/patch-aj
deleted file mode 100644
index 6af2fc2b9ba2..000000000000
--- a/databases/rrdtool/files/patch-aj
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/rrdproc/Makefile.in.orig	Fri Jan  7 21:09:17 2000
-+++ contrib/rrdproc/Makefile.in	Fri Jan  7 21:09:36 2000
-@@ -76,7 +76,7 @@
- ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
- 
- EXTRA_DIST = rrdproc.c
--contribdir = $(prefix)/contrib/rrdproc
-+contribdir = $(prefix)/share/examples/rrdtool/rrdproc
- contrib_DATA = README rrdproc.c
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = ../../config/config.h
diff --git a/databases/rrdtool/files/patch-al b/databases/rrdtool/files/patch-al
deleted file mode 100644
index c74995d8f0cb..000000000000
--- a/databases/rrdtool/files/patch-al
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/rrdlastds/Makefile.in.orig Sat Feb 12 18:22:45 2000
-+++ contrib/rrdlastds/Makefile.in      Sat Feb 12 18:23:30 2000
-@@ -77,7 +77,7 @@
-
- EXTRA_DIST = rrdlastds.pl.in
-
--contribdir = $(prefix)/contrib/rrdlastds
-+contribdir = $(prefix)/share/examples/rrdtool/rrdlastds
- contrib_DATA = README
- contrib_SCRIPTS = rrdlastds.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/databases/rrdtool/files/patch-am b/databases/rrdtool/files/patch-am
deleted file mode 100644
index c6cae0440881..000000000000
--- a/databases/rrdtool/files/patch-am
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/add_ds/Makefile.in.orig    Sat Feb 12 18:26:00 2000
-+++ contrib/add_ds/Makefile.in Sat Feb 12 18:26:17 2000
-@@ -77,7 +77,7 @@
-
- EXTRA_DIST = add_ds.pl.in batch.pl.in
-
--contribdir = $(prefix)/contrib/add_ds
-+contribdir = $(prefix)/share/examples/rrdtool/add_ds
- contrib_DATA = README
- contrib_SCRIPTS = add_ds.pl  batch.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/databases/rrdtool/files/patch-an b/databases/rrdtool/files/patch-an
deleted file mode 100644
index 6d4b4a9cd45d..000000000000
--- a/databases/rrdtool/files/patch-an
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/killspike/Makefile.in.orig Sat Feb 12 18:27:04 2000
-+++ contrib/killspike/Makefile.in      Sat Feb 12 18:27:19 2000
-@@ -77,7 +77,7 @@
-
- EXTRA_DIST = killspike.pl.in
-
--contribdir = $(prefix)/contrib/killspike
-+contribdir = $(prefix)/share/examples/rrdtool/killspike
- contrib_DATA = README
- contrib_SCRIPTS = killspike.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/databases/rrdtool/files/patch-ao b/databases/rrdtool/files/patch-ao
deleted file mode 100644
index 3dc1cc622454..000000000000
--- a/databases/rrdtool/files/patch-ao
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/rrdfetchnames/Makefile.in.orig	Mon Feb 14 23:27:59 2000
-+++ contrib/rrdfetchnames/Makefile.in	Mon Feb 14 23:28:17 2000
-@@ -77,7 +77,7 @@
- 
- EXTRA_DIST = rrdfetchnames.pl.in
- 
--contribdir = $(prefix)/contrib/rrdfetchnames
-+contribdir = $(prefix)/share/examples/rrdtool/rrdfetchnames
- contrib_DATA = README
- contrib_SCRIPTS = rrdfetchnames.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/databases/rrdtool/files/patch-ap b/databases/rrdtool/files/patch-ap
new file mode 100644
index 000000000000..bf9f94af8627
--- /dev/null
+++ b/databases/rrdtool/files/patch-ap
@@ -0,0 +1,8 @@
+--- doc/rrdtutorial.pod.orig	Thu Feb 22 13:16:30 2001
++++ doc/rrdtutorial.pod	Thu Feb 22 13:16:40 2001
+@@ -1,5 +1,3 @@
+-=for html <div align="right">Go <a href="rrdtutorial.es.html">Spanish</a></div> 
+-
+ =head1 NAME
+ 
+ rrdtutorial - Alex van den Bogaerdt's RRDtool tutorial
diff --git a/databases/rrdtool/pkg-plist b/databases/rrdtool/pkg-plist
index 186251ae32bc..3afc8fccadcc 100644
--- a/databases/rrdtool/pkg-plist
+++ b/databases/rrdtool/pkg-plist
@@ -1,6 +1,7 @@
 bin/rrdtool
 bin/rrdcgi
 bin/trytime
+bin/rrdupdate
 lib/librrd.a
 lib/librrd.so.0
 lib/librrd.so
@@ -11,23 +12,8 @@ share/examples/rrdtool/shared-demo.pl
 share/examples/rrdtool/stripes.pl
 share/examples/rrdtool/bigtops.pl
 share/examples/rrdtool/minmax.pl
-share/examples/rrdtool/log2rrd/log2rrd.pl
-share/examples/rrdtool/log2rrd/README
-share/examples/rrdtool/rrd-file-icon/rrd.png
-share/examples/rrdtool/rrd-file-icon/README
 share/examples/rrdtool/trytime/trytime.c
 share/examples/rrdtool/trytime/README
-share/examples/rrdtool/rrdproc/rrdproc.c
-share/examples/rrdtool/rrdproc/README
-share/examples/rrdtool/rrdlastds/README
-share/examples/rrdtool/rrdlastds/rrdlastds.pl
-share/examples/rrdtool/add_ds/add_ds.pl
-share/examples/rrdtool/add_ds/batch.pl
-share/examples/rrdtool/add_ds/README
-share/examples/rrdtool/killspike/killspike.pl
-share/examples/rrdtool/killspike/README
-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
@@ -45,6 +31,7 @@ share/doc/rrdtool/rrdtune.pod
 share/doc/rrdtool/rrdresize.pod
 share/doc/rrdtool/rrdcgi.pod
 share/doc/rrdtool/rrdtutorial.pod
+share/doc/rrdtool/rrdtutorial.es.pod
 share/doc/rrdtool/rrdtool.txt
 share/doc/rrdtool/rrdinfo.txt
 share/doc/rrdtool/rrdlast.txt
@@ -61,6 +48,7 @@ share/doc/rrdtool/rrdtune.txt
 share/doc/rrdtool/rrdresize.txt
 share/doc/rrdtool/rrdcgi.txt
 share/doc/rrdtool/rrdtutorial.txt
+share/doc/rrdtool/rrdtutorial.es.txt
 share/doc/rrdtool/RRDs.txt
 share/doc/rrdtool/RRDp.txt
 share/doc/rrdtool/html/rrdtool.html
@@ -79,6 +67,7 @@ share/doc/rrdtool/html/rrdtune.html
 share/doc/rrdtool/html/rrdresize.html
 share/doc/rrdtool/html/rrdcgi.html
 share/doc/rrdtool/html/rrdtutorial.html
+share/doc/rrdtool/html/rrdtutorial.es.html
 share/doc/rrdtool/html/RRDs.html
 share/doc/rrdtool/html/RRDp.html
 lib/perl5/site_perl/%%PERL_VER%%/RRDp.pm
@@ -88,14 +77,7 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/ntmake.pl
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/.packlist
-@dirrm share/examples/rrdtool/log2rrd
 @dirrm share/examples/rrdtool/trytime
-@dirrm share/examples/rrdtool/rrdproc
-@dirrm share/examples/rrdtool/rrd-file-icon
-@dirrm share/examples/rrdtool/add_ds
-@dirrm share/examples/rrdtool/killspike
-@dirrm share/examples/rrdtool/rrdfetchnames
-@dirrm share/examples/rrdtool/rrdlastds
 @dirrm share/examples/rrdtool
 @dirrm share/doc/rrdtool/html
 @dirrm share/doc/rrdtool