diff options
author | Beech Rintoul <beech@FreeBSD.org> | 2008-09-23 00:10:24 +0000 |
---|---|---|
committer | Beech Rintoul <beech@FreeBSD.org> | 2008-09-23 00:10:24 +0000 |
commit | 49754c6d0654363e44159a19ddc243679f79d2c0 (patch) | |
tree | e11166e8bb3bfb84a49f4d1a59c69a8cede208d1 /databases/rrdtool | |
parent | - Update to 2.0.8 (diff) |
- Update to 1.3.3
- Fixes a major data corruption bug present in earlier 1.3.x versions
- Fix rrdcgi is generating invalid paths
PR: ports/127271 [1]
PR: ports/127477 [2]
Submitted by: kevin brintnall <kbrint@rufus.net> [1]
Submitted by: David Wolfskill <dwolf@juniper.net> [2]
Approved by: Razor <bg1tpt@gmail.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=220456
Diffstat (limited to 'databases/rrdtool')
-rw-r--r-- | databases/rrdtool/Makefile | 10 | ||||
-rw-r--r-- | databases/rrdtool/distinfo | 6 | ||||
-rw-r--r-- | databases/rrdtool/files/patch-bindings-perl-shared-Makefile.PL | 10 | ||||
-rw-r--r-- | databases/rrdtool/pkg-plist | 94 |
4 files changed, 22 insertions, 98 deletions
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile index e0a6dd55831c..7d2cb1bef0f3 100644 --- a/databases/rrdtool/Makefile +++ b/databases/rrdtool/Makefile @@ -6,7 +6,7 @@ # PORTNAME= rrdtool -PORTVERSION= 1.3.1 +PORTVERSION= 1.3.3 CATEGORIES= databases graphics MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/ @@ -29,6 +29,10 @@ WANT_PERL= yes CONFIGURE_ARGS= --disable-tcl +PORTDOCS= * +PORTEXAMPLES= 4charts.pl bigtops.pl cgi-demo.cgi minmax.pl piped-demo.pl \ + perftest.pl shared-demo.pl stripes.pl + OPTIONS= PYTHON_MODULE "Build PYTHON bindings" off \ RUBY_MODULE "Build RUBY bindings" off \ PERL_MODULE "Build PERL module" on @@ -86,6 +90,10 @@ post-extract: -e 's/^ cd .* rrdtool.html index.html/ #/' \ ${WRKSRC}/doc/Makefile.in .endif +.if defined(NOPORTEXAMPLES) + @${REINPLACE_CMD} -e 's|SUBDIRS = $$(PO) src examples doc bindings|SUBDIRS = $$(PO) src doc bindings|' \ + ${WRKSRC}/Makefile.in +.endif post-install: .if !defined(BATCH) diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo index 4aebb13e0468..f67773e0d28e 100644 --- a/databases/rrdtool/distinfo +++ b/databases/rrdtool/distinfo @@ -1,3 +1,3 @@ -MD5 (rrdtool-1.3.1.tar.gz) = ae0eb2465581574ed6355d378c96a17e -SHA256 (rrdtool-1.3.1.tar.gz) = bbec7d497d5b8d3a9db20e230f56f587db6553a58d55aaa42628d3a04b903894 -SIZE (rrdtool-1.3.1.tar.gz) = 1102997 +MD5 (rrdtool-1.3.3.tar.gz) = 42e7a5b7d5eeaa63959b75822f9f1e2c +SHA256 (rrdtool-1.3.3.tar.gz) = f21a5dc4db3d6884588d25d88a940a70991f9562ddaff8e117ab0c86ed038d2c +SIZE (rrdtool-1.3.3.tar.gz) = 1064805 diff --git a/databases/rrdtool/files/patch-bindings-perl-shared-Makefile.PL b/databases/rrdtool/files/patch-bindings-perl-shared-Makefile.PL new file mode 100644 index 000000000000..0688909360b8 --- /dev/null +++ b/databases/rrdtool/files/patch-bindings-perl-shared-Makefile.PL @@ -0,0 +1,10 @@ +--- ./bindings/perl-shared/Makefile.PL.orig 2008-09-22 09:26:55.000000000 +0800 ++++ ./bindings/perl-shared/Makefile.PL 2008-09-22 09:27:28.000000000 +0800 +@@ -14,6 +14,7 @@ + /linux/ && do{ $R = "-Wl,--rpath -Wl,$rp"}; + /hpux/ && do{ $R = "+b$rp"}; + /solaris/ && do{ $R = "-R$rp"}; ++ /bsd/ && do{ $R = "-R$rp"}; + /aix/ && do{ $R = "-Wl,-blibpath:$rp"}; + } + } diff --git a/databases/rrdtool/pkg-plist b/databases/rrdtool/pkg-plist index 3dfb25f88259..4485a92afa73 100644 --- a/databases/rrdtool/pkg-plist +++ b/databases/rrdtool/pkg-plist @@ -11,96 +11,6 @@ lib/librrd_th.so lib/librrd_th.so.4 include/rrd.h include/rrd_format.h -%%EXAMPLESDIR%%/4charts.pl -%%EXAMPLESDIR%%/bigtops.pl -%%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 -%%PORTDOCS%%%%DOCSDIR%%/html/RRDs.html -%%PORTDOCS%%%%DOCSDIR%%/html/bin_dec_hex.html -%%PORTDOCS%%%%DOCSDIR%%/html/cdeftutorial.html -%%PORTDOCS%%%%DOCSDIR%%/html/index.html -%%PORTDOCS%%%%DOCSDIR%%/html/rpntutorial.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrd-beginners.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdbuild.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdcgi.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdcreate.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrddump.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdfetch.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdfirst.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_data.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_examples.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_graph.html -%%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 -%%PORTDOCS%%%%DOCSDIR%%/html/rrdtool.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdtune.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdtutorial.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdupdate.html -%%PORTDOCS%%%%DOCSDIR%%/html/rrdxport.html -%%PORTDOCS%%%%DOCSDIR%%/txt/bin_dec_hex.pod -%%PORTDOCS%%%%DOCSDIR%%/txt/bin_dec_hex.txt -%%PORTDOCS%%%%DOCSDIR%%/txt/cdeftutorial.pod -%%PORTDOCS%%%%DOCSDIR%%/txt/cdeftutorial.txt -%%PORTDOCS%%%%DOCSDIR%%/txt/rpntutorial.pod -%%PORTDOCS%%%%DOCSDIR%%/txt/rpntutorial.txt -%%PORTDOCS%%%%DOCSDIR%%/txt/rrd-beginners.pod -%%PORTDOCS%%%%DOCSDIR%%/txt/rrd-beginners.txt -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdbuild.pod -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdbuild.txt -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcgi.pod -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcgi.txt -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcreate.pod -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcreate.txt -%%PORTDOCS%%%%DOCSDIR%%/txt/rrddump.pod -%%PORTDOCS%%%%DOCSDIR%%/txt/rrddump.txt -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfetch.pod -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfetch.txt -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfirst.pod -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfirst.txt -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph.pod -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph.txt -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_data.pod -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_data.txt -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_examples.pod -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_examples.txt -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_graph.pod -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_graph.txt -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_rpn.pod -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_rpn.txt -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdinfo.pod -%%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 -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdrestore.txt -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdthreads.pod -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdthreads.txt -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtool.pod -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtool.txt -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtune.pod -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtune.txt -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtutorial.pod -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtutorial.txt -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdupdate.pod -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdupdate.txt -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdxport.pod -%%PORTDOCS%%%%DOCSDIR%%/txt/rrdxport.txt -%%WITH_PERL%%%%SITE_PERL%%/RRDp.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp/.packlist %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RRDs.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/ntmake.pl @@ -109,9 +19,5 @@ include/rrd_format.h %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/.packlist %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtoolmodule.so %%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/RRD.so -@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%%/txt -%%PORTDOCS%%@dirrm %%DOCSDIR%%/html -%%PORTDOCS%%@dirrm %%DOCSDIR%% %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs |