5 files changed, 23 insertions, 19 deletions

diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 5c8112e051b9..68551c517c70 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	rrdtool
-PORTVERSION=	1.2.15
+PORTVERSION=	1.2.18
 CATEGORIES=	net
-MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/
+MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Round Robin Database Tools
@@ -34,7 +34,7 @@ MAN1=		bin_dec_hex.1 cdeftutorial.1 rpntutorial.1 rrd-beginners.1 \
 		rrdgraph.1 rrdgraph_data.1 rrdgraph_examples.1 rrdgraph_graph.1 \
 		rrdgraph_rpn.1 rrdinfo.1 rrdlast.1 rrdresize.1 rrdrestore.1 \
 		rrdthreads.1 rrdtool.1 rrdtune.1 rrdtutorial.1 rrdupdate.1 \
-		rrdxport.1
+		rrdxport.1 rrdlastupdate.1
 MAN3=		RRDp.3 RRDs.3
 MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
 
diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
index 68fcf53878b1..7ad197a285c8 100644
--- a/databases/rrdtool/distinfo
+++ b/databases/rrdtool/distinfo
@@ -1,3 +1,3 @@
-MD5 (rrdtool-1.2.15.tar.gz) = bde8b12c202bc4e27fb9a9588a0aaddf
-SHA256 (rrdtool-1.2.15.tar.gz) = b33d68da8a39bb0fc745c0202f3a58e73bfc6a9fd35d71fbd8979d40a5ef7397
-SIZE (rrdtool-1.2.15.tar.gz) = 1043064
+MD5 (rrdtool-1.2.18.tar.gz) = 0c116d031275b7e0da1f8326d52d097d
+SHA256 (rrdtool-1.2.18.tar.gz) = 85e6baa0911e51e0703adb774d6904d0d77cab05180d2875188b35ae7c9b2ebd
+SIZE (rrdtool-1.2.18.tar.gz) = 1060451
diff --git a/databases/rrdtool/files/patch-bindings-Makefile.in b/databases/rrdtool/files/patch-bindings-Makefile.in
index 29eb27835f0f..3ba7e8e555fc 100644
--- a/databases/rrdtool/files/patch-bindings-Makefile.in
+++ b/databases/rrdtool/files/patch-bindings-Makefile.in
@@ -1,13 +1,13 @@
---- bindings/Makefile.in.orig	Fri Jun 17 13:07:13 2005
-+++ bindings/Makefile.in	Fri Jun 17 15:44:27 2005
-@@ -525,8 +525,8 @@
- all-local:  @COMP_PERL@
+--- bindings/Makefile.in.orig	Wed Jan 31 17:01:34 2007
++++ bindings/Makefile.in	Wed Jan 31 17:01:52 2007
+@@ -539,8 +539,8 @@
+ all-local:  @COMP_PERL@ @COMP_RUBY@
  
  install-data-local:
 -	test -f perl-piped/Makefile && cd perl-piped && $(MAKE) install || true
 -	test -f perl-shared/Makefile && cd perl-shared && $(MAKE) install || true
 +	test -f perl-piped/Makefile && cd perl-piped && $(MAKE) pure_install || true
 +	test -f perl-shared/Makefile && cd perl-shared && $(MAKE) pure_install || true
+ 	test -f ruby/Makefile && cd ruby && $(MAKE) EPREFIX=$(exec_prefix) $(RUBY_MAKE_OPTIONS) install || true
  
- # rules for building the perl module
- perl_piped: perl-piped/Makefile
+ # rules for buildung the ruby module
diff --git a/databases/rrdtool/files/patch-examples-Makefile.in b/databases/rrdtool/files/patch-examples-Makefile.in
index 60e62aa64792..c8bef96e6fad 100644
--- a/databases/rrdtool/files/patch-examples-Makefile.in
+++ b/databases/rrdtool/files/patch-examples-Makefile.in
@@ -1,11 +1,11 @@
---- examples/Makefile.in.orig	Mon Jul 25 18:14:50 2005
-+++ examples/Makefile.in	Wed Jul 27 13:13:02 2005
-@@ -217,7 +217,7 @@
- EXTRA_DIST = cgi-demo.cgi.in piped-demo.pl.in shared-demo.pl.in \
- 	stripes.pl.in bigtops.pl.in minmax.pl.in 4charts.pl.in
- 
+--- examples/Makefile.in.orig	Wed Jan 31 17:03:21 2007
++++ examples/Makefile.in	Wed Jan 31 17:03:08 2007
+@@ -220,7 +220,7 @@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ EXTRA_DIST = cgi-demo.cgi.in
 -examplesdir = $(pkgdatadir)/examples
 +examplesdir = $(datadir)/examples/rrdtool
  examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl \
- 	stripes.pl bigtops.pl minmax.pl 4charts.pl
+ 	stripes.pl bigtops.pl minmax.pl 4charts.pl perftest.pl
  
diff --git a/databases/rrdtool/pkg-plist b/databases/rrdtool/pkg-plist
index 1b3396f599cf..94c4fb2cc032 100644
--- a/databases/rrdtool/pkg-plist
+++ b/databases/rrdtool/pkg-plist
@@ -15,6 +15,7 @@ include/rrd.h
 %%EXAMPLESDIR%%/cgi-demo.cgi
 %%EXAMPLESDIR%%/minmax.pl
 %%EXAMPLESDIR%%/piped-demo.pl
+%%EXAMPLESDIR%%/perftest.pl
 %%EXAMPLESDIR%%/shared-demo.pl
 %%EXAMPLESDIR%%/stripes.pl
 %%PORTDOCS%%%%DOCSDIR%%/html/RRDp.html
@@ -37,6 +38,7 @@ include/rrd.h
 %%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_rpn.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rrdinfo.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rrdlast.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdlastupdate.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rrdresize.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rrdrestore.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rrdthreads.html
@@ -79,6 +81,8 @@ include/rrd.h
 %%PORTDOCS%%%%DOCSDIR%%/txt/rrdinfo.txt
 %%PORTDOCS%%%%DOCSDIR%%/txt/rrdlast.pod
 %%PORTDOCS%%%%DOCSDIR%%/txt/rrdlast.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlastupdate.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlastupdate.txt
 %%PORTDOCS%%%%DOCSDIR%%/txt/rrdresize.pod
 %%PORTDOCS%%%%DOCSDIR%%/txt/rrdresize.txt
 %%PORTDOCS%%%%DOCSDIR%%/txt/rrdrestore.pod