(pkgsrc)

 - Fix PR pkg/49557 (by updating 1.4.9 to 1.5.4)
 - Add including lang/python/application.mk (for REPLACE_PYTHON)
 - Assign empty value to TEST_TARGET, to avoid
   *** No rule to make target 'test' (when PKGSRC_RUN_TEST=yes is set)
(upstream)
 - Update 1.4.9 to 1.5.4
-------------------------
RRDtool 1.5.4 - 2015-08-09
==========================
Bug Fixes
---------
* parse floating point numbers according to C locale in rrdtool create
  arguments, regardless of the systems locale setting.
* include missing rrd_rados.h into distribution archive
* make rrdtool work on ARM again
* make rrdtool test suit pass on 32bit OSs
* fix --grid-dash option regression in graph
* fix systemd support
* fix link dependency for libpng since we are using functions directly
* fix python module name
* fix rrdtool tune to accept U in minimum and maximum options
* fi
* rrd_parsetime now uses a mutex lock to become thread safe
* rrd_xport is now thread safe
* stop using MAX_PATH and make everything dynamic and make rrdtool work on
  Gnu HURD ... thanks nirgal!

Features
--------
* new RPN operators: STEPWIDTH, NEWDAY, NEWWEEK, NEWMONTH and NEWWEEK
  together they allow to draw graphs where a rate is converted back to
  absolute numbers and accumulated over a period..


RRDtool 1.5.3 - 2015-04-30
==========================
Bug Fixes
---------
* Brought commmand-line options and documentation back into sync.
* Make LINE dashes option work again

RRDtool 1.5.2 - 2015-04-23
==========================
Bug Fixes
---------
* paramters in VDEF are vnames and not data source names, hence
  they can be 255 chars long and not only 20

RRDtool 1.5.1 - 2015-04-22
==========================
Bug Fixes
---------
* parse numbers up to 40 characters long ..
* fix install rules for Python and Lua
* include missing VERSION and LICENSE file
* unlink before rename in rrd_create when running on WIN32

RRDtool 1.5.0 - 2015-04-16
==========================

New Features
------------
* automatic x-axis labels that work from 1s to 30y on a single chart
* librados integration
* new datasource types: DCOUNTER and DDERIVE (they work the same as the
  original DS, except that they can deal with floatingpoint numbers).
* compile without graphics libraries: ./configure --disable-rrd_graph
* updated windows port (see WIN32-BUILD-TIPS.txt)
* single step RRAs for MIN,MAX,LAST are generated virtually from
  an AVERAGE RRA
* ignore updates in the past with rrdtool update --skip-past-updates
* ignore a LINE when scaling a chart using the skipscale option
* detect 32bit timeoverflows
* massive performance boost for charts with more than 100 DEF line by
  switching form a linear search to a HASH when searching for data
* improved cross compilation support
* .Net bindings
* allow rrdtool graph to silently skip non-existing source files using the
  --use-nan-for-all-missing-data option
* restore from a pipe (rrdtool restore - y.rrd)
* in rrdtool create, row count and step can be defined in absolute time
* all new "create on steroids" can pull both data and configuration from
  existing rrd files
* use rrdtool graph to chart arbitrary data via a callback function for data fetching
  support is integrated in the perl bindings.
* re-written parser for rrdtool graph commands. It now follows a simple key
  value pattern, compatible with the previous syntax.
* MEDIAN op for CDEF expressions
* DEPTH,INDEX,COPY,ROL ops for CDEF (as seen in PostScript)
* gradient AREA backgrounds
* no more locale magic while reading numeric data.

Bugfixes
--------
all the bugs fixed in 1.4.x during 1.5 development

5 files changed, 30 insertions, 24 deletions

diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 8f2b28bf21e..dd67fe775ee 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.118 2015/06/12 10:48:46 wiz Exp $
+# $NetBSD: Makefile,v 1.119 2015/08/18 12:29:44 mef Exp $
 #
 # Please, also update databases/ruby-rrdtool
 
-DISTNAME=	rrdtool-1.4.9
-PKGREVISION=	2
+DISTNAME=	rrdtool-1.5.4
 CATEGORIES=	databases graphics net
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
 
@@ -39,6 +38,9 @@ SUBST_MESSAGE.prefix=	Fixing $${prefix} in scripts.
 SUBST_FILES.prefix=	examples/cgi-demo.cgi
 SUBST_SED.prefix=	-e '1s,^\#! \$${prefix},\#! ${PREFIX},'
 
+REPLACE_PYTHON=		examples/stripes.py
+TEST_TARGET=		# *** No rule to make target 'test'. 
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
@@ -49,5 +51,7 @@ SUBST_SED.prefix=	-e '1s,^\#! \$${prefix},\#! ${PREFIX},'
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
+.include "../../lang/python/application.mk"
+
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/rrdtool/PLIST b/databases/rrdtool/PLIST
index aa7e27d69bc..0e1f1064cfd 100644
--- a/databases/rrdtool/PLIST
+++ b/databases/rrdtool/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2014/08/24 07:06:02 adam Exp $
+@comment $NetBSD: PLIST,v 1.15 2015/08/18 12:29:44 mef Exp $
 bin/rrdcached
 bin/rrdcgi
 bin/rrdcreate
@@ -139,3 +139,4 @@ share/examples/rrdtool/perftest.pl
 share/examples/rrdtool/piped-demo.pl
 share/examples/rrdtool/shared-demo.pl
 share/examples/rrdtool/stripes.pl
+share/examples/rrdtool/stripes.py
diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
index c030efaa923..10c4f04d887 100644
--- a/databases/rrdtool/distinfo
+++ b/databases/rrdtool/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.46 2014/10/07 10:23:41 adam Exp $
+$NetBSD: distinfo,v 1.47 2015/08/18 12:29:44 mef Exp $
 
-SHA1 (rrdtool-1.4.9.tar.gz) = c83b158b4aaadbf28b15823fa863db1672700d3b
-RMD160 (rrdtool-1.4.9.tar.gz) = 8c067f0207bdfeb067be3c9b31c8e35009485200
-Size (rrdtool-1.4.9.tar.gz) = 1385640 bytes
+SHA1 (rrdtool-1.5.4.tar.gz) = 5020ffb6c4d309207df946ab13fafff973465b2a
+RMD160 (rrdtool-1.5.4.tar.gz) = f336795c1ae26eb618793c9899fdf66984861d64
+Size (rrdtool-1.5.4.tar.gz) = 2181438 bytes
 SHA1 (patch-aa) = 317fc6e46e15333574d0e977d8ab34e916920f4a
 SHA1 (patch-ab) = 81131a74c8e9b81edfaa4b6746d4ab8508e82ac2
-SHA1 (patch-al) = abc25497a10d59b1ad2e3a263f818eef89985538
+SHA1 (patch-al) = 985e90539340c8bac9788e897c4b7b899fe9f6b1
 SHA1 (patch-am) = 6c0a0890b1e8e2c1a186e2015c0cf5acd719b686
-SHA1 (patch-bindings_perl-shared_Makefile.PL) = d767dca08217a909132646216679a5d1fad4b77c
+SHA1 (patch-bindings_perl-shared_Makefile.PL) = 1704531ecfcac0aeb0da03f350d9a657e3d8535d
diff --git a/databases/rrdtool/patches/patch-al b/databases/rrdtool/patches/patch-al
index 33af69bc1f1..7f6ff266f75 100644
--- a/databases/rrdtool/patches/patch-al
+++ b/databases/rrdtool/patches/patch-al
@@ -1,15 +1,15 @@
-$NetBSD: patch-al,v 1.17 2010/07/06 07:31:20 adam Exp $
+$NetBSD: patch-al,v 1.18 2015/08/18 12:29:44 mef Exp $
 
 Correct examples directory.
 
---- examples/Makefile.in.orig	2010-07-05 19:31:54.000000000 +0000
-+++ examples/Makefile.in
-@@ -330,7 +330,7 @@ top_builddir = @top_builddir@
+--- examples/Makefile.in.orig	2015-08-10 00:17:18.000000000 +0900
++++ examples/Makefile.in	2015-08-16 22:02:38.000000000 +0900
+@@ -420,7 +420,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  SUBDIRS = rrdcached
- EXTRA_DIST = cgi-demo.cgi.in
+ EXTRA_DIST = cgi-demo.cgi.in stripes.py
 -examplesdir = $(pkgdatadir)/examples
 +examplesdir = $(prefix)/share/examples/rrdtool
  examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl \
- 	stripes.pl bigtops.pl minmax.pl 4charts.pl perftest.pl
- 
+ 	stripes.pl bigtops.pl minmax.pl 4charts.pl perftest.pl \
+         stripes.py
diff --git a/databases/rrdtool/patches/patch-bindings_perl-shared_Makefile.PL b/databases/rrdtool/patches/patch-bindings_perl-shared_Makefile.PL
index feac653d693..18ab966b402 100644
--- a/databases/rrdtool/patches/patch-bindings_perl-shared_Makefile.PL
+++ b/databases/rrdtool/patches/patch-bindings_perl-shared_Makefile.PL
@@ -1,17 +1,18 @@
-$NetBSD: patch-bindings_perl-shared_Makefile.PL,v 1.1 2013/10/20 18:18:52 joerg Exp $
+$NetBSD: patch-bindings_perl-shared_Makefile.PL,v 1.2 2015/08/18 12:29:44 mef Exp $
 
---- bindings/perl-shared/Makefile.PL.orig	2013-10-16 20:05:57.000000000 +0000
-+++ bindings/perl-shared/Makefile.PL
-@@ -30,9 +30,9 @@ if (($Config{'osname'} eq 'MSWin32' && $
+ 
+--- bindings/perl-shared/Makefile.PL.orig	2015-04-20 23:12:18.000000000 +0900
++++ bindings/perl-shared/Makefile.PL	2015-08-16 22:00:55.000000000 +0900
+@@ -40,9 +40,9 @@ if (($Config{'osname'} eq 'MSWin32' && $
  		for ($^O){
  			/linux/   && do{ $R = "-Wl,--rpath -Wl,$rp"};
  			/hpux/    && do{ $R = "+b$rp"};
 -			/solaris/ && do{ $R = "-R$rp"};
--			/bsd/     && do{ $R = "-R$rp"};
+-			/bsd/     && do{ $R = "-Wl,--rpath -Wl,$rp"};
 -			/aix/     && do{ $R = "-blibpath:$rp"};
 +			/solaris/ && do{ $R = "-Wl,-R$rp"};
-+			/bsd/     && do{ $R = "-Wl,-R$rp"};
-+			/aix/     && do{ $R = "-Wl,-blibpath:$rp"};
++			/bsd/	  && do{ $R = "-Wl,-R$rp"};
++			/aix/	  && do{ $R = "-Wl,-blibpath:$rp"};
  		}
  	}