CVS commit: pkgsrc/databases

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/databases
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Thu, 27 Jul 2017 18:31:20 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Jul 27 18:31:20 UTC 2017

Modified Files:
        pkgsrc/databases: Makefile
        pkgsrc/databases/rrdtool: Makefile PLIST distinfo options.mk
        pkgsrc/databases/rrdtool/patches:
            patch-bindings_perl-shared_Makefile.PL patch-src_rrd__cgi.c
            patch-src_rrd__graph.c patch-src_rrd__restore.c
            patch-src_rrd__strtod.c patch-src_rrd__utils.c
            patch-src_rrd__xport.c
        pkgsrc/databases/ruby-rrdtool: Makefile distinfo
Added Files:
        pkgsrc/databases/py-rrdtool: DESCR Makefile PLIST distinfo
        pkgsrc/databases/rrdtool/patches: patch-examples_Makefile.in
            patch-examples_rrdcached_Makefile.in patch-src_rrd__lastupdate.c
            patch-src_rrd__tool.c
Removed Files:
        pkgsrc/databases/rrdtool/patches: patch-aa patch-ab patch-al patch-am
            patch-src_rrd__dump.c

Log Message:
RRDtool 1.7.0

Bugfixes
--------
* made rrd_fetch_cb_wrapper in RRDs more careful with its arguments
* many bugfixes to resolve issues identified Coverty scan
* fix build issues with libdbl
* take the ds step into account while caching data in rrd graph DEF statements
* never 'exit' from librrd (even when DEBUG is on)

Features
--------
* new command rrd list to show rrd files in a directory
* configurable log-level for rrdcached
* hungarian translation (hu.po)

API
---
* New Exported funtions: rrd_lcd, rrd_reduce_data, rrd_cf_conf and rrd_list
* rrd_list support for perl and python binding
* all new and much more complete python bindings working on both python 2.6+ and 3.3+
* extended documentation in rrdlib.pod


To generate a diff of this commit:
cvs rdiff -u -r1.531 -r1.532 pkgsrc/databases/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/py-rrdtool/DESCR \
    pkgsrc/databases/py-rrdtool/Makefile pkgsrc/databases/py-rrdtool/PLIST \
    pkgsrc/databases/py-rrdtool/distinfo
cvs rdiff -u -r1.127 -r1.128 pkgsrc/databases/rrdtool/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/databases/rrdtool/PLIST
cvs rdiff -u -r1.53 -r1.54 pkgsrc/databases/rrdtool/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/rrdtool/options.mk
cvs rdiff -u -r1.15 -r0 pkgsrc/databases/rrdtool/patches/patch-aa
cvs rdiff -u -r1.11 -r0 pkgsrc/databases/rrdtool/patches/patch-ab
cvs rdiff -u -r1.18 -r0 pkgsrc/databases/rrdtool/patches/patch-al
cvs rdiff -u -r1.9 -r0 pkgsrc/databases/rrdtool/patches/patch-am
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/databases/rrdtool/patches/patch-bindings_perl-shared_Makefile.PL
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/rrdtool/patches/patch-examples_Makefile.in \
    pkgsrc/databases/rrdtool/patches/patch-examples_rrdcached_Makefile.in \
    pkgsrc/databases/rrdtool/patches/patch-src_rrd__lastupdate.c \
    pkgsrc/databases/rrdtool/patches/patch-src_rrd__tool.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/rrdtool/patches/patch-src_rrd__cgi.c \
    pkgsrc/databases/rrdtool/patches/patch-src_rrd__graph.c \
    pkgsrc/databases/rrdtool/patches/patch-src_rrd__restore.c \
    pkgsrc/databases/rrdtool/patches/patch-src_rrd__strtod.c \
    pkgsrc/databases/rrdtool/patches/patch-src_rrd__utils.c \
    pkgsrc/databases/rrdtool/patches/patch-src_rrd__xport.c
cvs rdiff -u -r1.1 -r0 pkgsrc/databases/rrdtool/patches/patch-src_rrd__dump.c
cvs rdiff -u -r1.22 -r1.23 pkgsrc/databases/ruby-rrdtool/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/ruby-rrdtool/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/Makefile
diff -u pkgsrc/databases/Makefile:1.531 pkgsrc/databases/Makefile:1.532
--- pkgsrc/databases/Makefile:1.531     Thu Jul 20 04:11:58 2017
+++ pkgsrc/databases/Makefile   Thu Jul 27 18:31:20 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.531 2017/07/20 04:11:58 jnemeth Exp $
+# $NetBSD: Makefile,v 1.532 2017/07/27 18:31:20 adam Exp $
 
 COMMENT=       Databases
 
@@ -358,6 +358,7 @@ SUBDIR+=    py-pymysql
 SUBDIR+=       py-python-rrdtool
 SUBDIR+=       py-python-sql
 SUBDIR+=       py-redis
+SUBDIR+=       py-rrdtool
 SUBDIR+=       py-sqlalchemy
 SUBDIR+=       py-sqlalchemy-i18n
 SUBDIR+=       py-sqlalchemy-migrate

Index: pkgsrc/databases/rrdtool/Makefile
diff -u pkgsrc/databases/rrdtool/Makefile:1.127 pkgsrc/databases/rrdtool/Makefile:1.128
--- pkgsrc/databases/rrdtool/Makefile:1.127     Sun Feb 12 06:24:37 2017
+++ pkgsrc/databases/rrdtool/Makefile   Thu Jul 27 18:31:20 2017
@@ -1,26 +1,17 @@
-# $NetBSD: Makefile,v 1.127 2017/02/12 06:24:37 ryoon Exp $
-#
-# Please, also update databases/ruby-rrdtool
-
-DISTNAME=      rrdtool-1.6.0
-PKGREVISION=   5
-CATEGORIES=    databases graphics net
-MASTER_SITES=  http://oss.oetiker.ch/rrdtool/pub/
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://oss.oetiker.ch/rrdtool/
-COMMENT=       Data analysis tool generating graphical representations
-LICENSE=       gnu-gpl-v2
+# $NetBSD: Makefile,v 1.128 2017/07/27 18:31:20 adam Exp $
+
+.include "Makefile.common"
 
 DEPENDS+=              dejavu-ttf>=2.26:../../fonts/dejavu-ttf
 
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake pkg-config perl msgfmt intltool groff nroff
 GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --disable-libdbi
+CONFIGURE_ARGS+=       --disable-python
+CONFIGURE_ARGS+=       --disable-ruby
 CONFIGURE_ARGS+=       --enable-shared
 CONFIGURE_ARGS+=       --with-perl-options=${MAKE_PARAMS:Q}
-CONFIGURE_ARGS+=       --disable-ruby
-CONFIGURE_ARGS+=       --disable-libdbi
 
 PTHREAD_OPTS+=         require
 PERL5_CONFIGURE=       no
@@ -36,7 +27,7 @@ SUBST_MESSAGE.prefix= Fixing $${prefix} 
 SUBST_FILES.prefix=    examples/cgi-demo.cgi
 SUBST_SED.prefix=      -e '1s,^\#! \$${prefix},\#! ${PREFIX},'
 
-TEST_TARGET=           # *** No rule to make target 'test'.
+TEST_TARGET=           check
 
 RCD_SCRIPTS=           rrdcached
 
@@ -56,6 +47,11 @@ PKG_GROUPS=          ${RRDCACHED_GROUP}
 PKG_USERS=             ${RRDCACHED_USER}:${RRDCACHED_GROUP}
 PKG_GECOS.${RRDCACHED_USER}=   RRDCacheD daemon user
 
+OPSYSVARS+=            SOEXT
+SOEXT.Darwin=          dylib
+SOEXT.*=               so
+PLIST_SUBST+=          SOEXT=${SOEXT}
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
@@ -63,9 +59,8 @@ PKG_GECOS.${RRDCACHED_USER}=  RRDCacheD d
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
-.include "../../lang/perl5/module.mk"
-
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/rrdtool/PLIST
diff -u pkgsrc/databases/rrdtool/PLIST:1.18 pkgsrc/databases/rrdtool/PLIST:1.19
--- pkgsrc/databases/rrdtool/PLIST:1.18 Sat Aug 27 06:42:43 2016
+++ pkgsrc/databases/rrdtool/PLIST      Thu Jul 27 18:31:20 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2016/08/27 06:42:43 dholland Exp $
+@comment $NetBSD: PLIST,v 1.19 2017/07/27 18:31:20 adam Exp $
 bin/rrdcached
 bin/rrdcgi
 bin/rrdcreate
@@ -11,15 +11,10 @@ include/rrd_config.h
 include/rrd_format.h
 lib/librrd.la
 ${PLIST.lua}${LUA_CDIR}/rrd.la
-${PLIST.python}${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PLIST.python}${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PLIST.python}${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PLIST.python}${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PLIST.python}${PYSITELIB}/rrdtool.so
 lib/pkgconfig/librrd.pc
 ${PLIST.tcl}lib/rrdtool/ifOctets.tcl
 ${PLIST.tcl}lib/rrdtool/pkgIndex.tcl
-${PLIST.tcl}lib/tclrrd1.6.0.so
+${PLIST.tcl}lib/tclrrd${PKGVERSION}.${SOEXT}
 man/man1/bin_dec_hex.1
 man/man1/cdeftutorial.1
 man/man1/rpntutorial.1
@@ -41,6 +36,7 @@ man/man1/rrdinfo.1
 man/man1/rrdlast.1
 man/man1/rrdlastupdate.1
 ${PLIST.lua}man/man1/rrdlua.1
+man/man1/rrdlist.1
 man/man1/rrdresize.1
 man/man1/rrdrestore.1
 man/man1/rrdthreads.1
@@ -74,6 +70,7 @@ share/doc/rrdtool-${PKGVERSION}/html/rrd
 share/doc/rrdtool-${PKGVERSION}/html/rrdinfo.html
 share/doc/rrdtool-${PKGVERSION}/html/rrdlast.html
 share/doc/rrdtool-${PKGVERSION}/html/rrdlastupdate.html
+share/doc/rrdtool-${PKGVERSION}/html/rrdlist.html
 ${PLIST.lua}share/doc/rrdtool-${PKGVERSION}/html/rrdlua.html
 share/doc/rrdtool-${PKGVERSION}/html/rrdresize.html
 share/doc/rrdtool-${PKGVERSION}/html/rrdrestore.html
@@ -124,6 +121,8 @@ share/doc/rrdtool-${PKGVERSION}/txt/rrdl
 share/doc/rrdtool-${PKGVERSION}/txt/rrdlast.txt
 share/doc/rrdtool-${PKGVERSION}/txt/rrdlastupdate.pod
 share/doc/rrdtool-${PKGVERSION}/txt/rrdlastupdate.txt
+share/doc/rrdtool-${PKGVERSION}/txt/rrdlist.pod
+share/doc/rrdtool-${PKGVERSION}/txt/rrdlist.txt
 ${PLIST.lua}share/doc/rrdtool-${PKGVERSION}/txt/rrdlua.pod
 ${PLIST.lua}share/doc/rrdtool-${PKGVERSION}/txt/rrdlua.txt
 share/doc/rrdtool-${PKGVERSION}/txt/rrdresize.pod
@@ -153,3 +152,4 @@ share/examples/rrdtool/piped-demo.pl
 share/examples/rrdtool/shared-demo.pl
 share/examples/rrdtool/stripes.pl
 share/examples/rrdtool/stripes.py
+share/locale/hu/LC_MESSAGES/rrdtool.mo

Index: pkgsrc/databases/rrdtool/distinfo
diff -u pkgsrc/databases/rrdtool/distinfo:1.53 pkgsrc/databases/rrdtool/distinfo:1.54
--- pkgsrc/databases/rrdtool/distinfo:1.53      Tue Oct 18 21:22:12 2016
+++ pkgsrc/databases/rrdtool/distinfo   Thu Jul 27 18:31:20 2017
@@ -1,19 +1,18 @@
-$NetBSD: distinfo,v 1.53 2016/10/18 21:22:12 he Exp $
+$NetBSD: distinfo,v 1.54 2017/07/27 18:31:20 adam Exp $
 
-SHA1 (rrdtool-1.6.0.tar.gz) = 9866b41bda9416188f236d61d24f185b173fd571
-RMD160 (rrdtool-1.6.0.tar.gz) = 90bb6dc4a19c296fb67bb83094f6308396e591c0
-SHA512 (rrdtool-1.6.0.tar.gz) = 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd
-Size (rrdtool-1.6.0.tar.gz) = 2186538 bytes
-SHA1 (patch-aa) = 317fc6e46e15333574d0e977d8ab34e916920f4a
-SHA1 (patch-ab) = 81131a74c8e9b81edfaa4b6746d4ab8508e82ac2
-SHA1 (patch-al) = 985e90539340c8bac9788e897c4b7b899fe9f6b1
-SHA1 (patch-am) = be06ac61b314e225d62f9f27da28c24fb6a1b84b
-SHA1 (patch-bindings_perl-shared_Makefile.PL) = f3b86e68a023ec9da5d600c8f803c93820195d53
+SHA1 (rrdtool-1.7.0.tar.gz) = 15a2009e2ee67eb41a2598d1a0f1f7cf1a651c78
+RMD160 (rrdtool-1.7.0.tar.gz) = 8816c971189a60e190d15a5b3827697c299ffce3
+SHA512 (rrdtool-1.7.0.tar.gz) = 36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f
+Size (rrdtool-1.7.0.tar.gz) = 2849994 bytes
+SHA1 (patch-bindings_perl-shared_Makefile.PL) = 839b4474e89b59002d1629425c5839e4df3b8f5c
+SHA1 (patch-examples_Makefile.in) = 985e90539340c8bac9788e897c4b7b899fe9f6b1
+SHA1 (patch-examples_rrdcached_Makefile.in) = be06ac61b314e225d62f9f27da28c24fb6a1b84b
 SHA1 (patch-src_gettext.h) = 1254beedc267d901e154ea98599bdfddbe49ddc0
-SHA1 (patch-src_rrd__cgi.c) = 2ea93cf6cd084638e9ae720fcb9c503631d31413
-SHA1 (patch-src_rrd__dump.c) = b42add89a7c1e410c2a5ec8a714dba21a446d125
-SHA1 (patch-src_rrd__graph.c) = 799c5a666661054e4c32b8ed02cc09f2262dae03
-SHA1 (patch-src_rrd__restore.c) = e10312901fd6edfdcaf7cce932eb434cce8ef771
-SHA1 (patch-src_rrd__strtod.c) = 49ed57170777b8bcbd7c4e700c1f54d74e3a3a72
-SHA1 (patch-src_rrd__utils.c) = 58d10b1447c23268af119e525220a8d950a43dd4
-SHA1 (patch-src_rrd__xport.c) = 27671dc58affdcc0c8eab62b01f1edd65dc4a67f
+SHA1 (patch-src_rrd__cgi.c) = f2004681d9d430b6d347627e029ce3c7a717bcd6
+SHA1 (patch-src_rrd__graph.c) = e53a925c329e477b198cdeaf6b50891187ee17c5
+SHA1 (patch-src_rrd__lastupdate.c) = 317fc6e46e15333574d0e977d8ab34e916920f4a
+SHA1 (patch-src_rrd__restore.c) = 06cc3918fd685fc4dfbfdefcf39835a6b08f947c
+SHA1 (patch-src_rrd__strtod.c) = 6148276ba17eaaf1ef728db1d55bda18d67da83e
+SHA1 (patch-src_rrd__tool.c) = 81131a74c8e9b81edfaa4b6746d4ab8508e82ac2
+SHA1 (patch-src_rrd__utils.c) = c6eb0c0c1e4656984cbd72fa1d1952af776bad4c
+SHA1 (patch-src_rrd__xport.c) = d50bc5069ad672814f70fdb813cffa875f6514bf

Index: pkgsrc/databases/rrdtool/options.mk
diff -u pkgsrc/databases/rrdtool/options.mk:1.3 pkgsrc/databases/rrdtool/options.mk:1.4
--- pkgsrc/databases/rrdtool/options.mk:1.3     Sun Sep  4 16:54:13 2016
+++ pkgsrc/databases/rrdtool/options.mk Thu Jul 27 18:31:20 2017
@@ -1,42 +1,15 @@
-# $NetBSD: options.mk,v 1.3 2016/09/04 16:54:13 dholland Exp $
+# $NetBSD: options.mk,v 1.4 2017/07/27 18:31:20 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.rrdtool
-PKG_SUPPORTED_OPTIONS= lua python tcl
-PKG_SUGGESTED_OPTIONS= lua python tcl
+PKG_SUPPORTED_OPTIONS= lua tcl
+PKG_SUGGESTED_OPTIONS= lua tcl
 
 # Note that there's another (apparently different) python library
 # in databases/py-python-rrdtool.
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           python tcl lua
-
-
-#
-# XXX: this should include egg.mk, but that doesn't work: it includes
-# extension.mk, which sets do-build and do-install rules, in such a
-# way that we can't override it. Instead we need to cutpaste the
-# definition of EGG_INFODIR and its plist bits. Sigh. Probably the
-# right thing to do is make this a separate package.
-#
-.if !empty(PKG_OPTIONS:Mpython)
-CONFIGURE_ARGS+=       --enable-python
-
-REPLACE_PYTHON=                examples/stripes.py
-.include "../../lang/python/application.mk"
-
-PLIST.python=          yes
-EGG_NAME=              py_rrdtool-0.2.2
-EGG_INFODIR?=          ${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
-PLIST_SUBST+=          PYSITELIB=${PYSITELIB}
-PLIST_SUBST+=          EGG_INFODIR=${EGG_INFODIR}
-DEPENDS+=       ${PYPKGPREFIX}-setuptools>=0.8:../../devel/py-setuptools
-#.include "../../lang/python/egg.mk"
-
-.else # python
-CONFIGURE_ARGS+=       --disable-python
-.endif
-
+PLIST_VARS+=           lua tcl
 
 .if !empty(PKG_OPTIONS:Mtcl)
 USE_TOOLS+=            tclsh:run

Index: pkgsrc/databases/rrdtool/patches/patch-bindings_perl-shared_Makefile.PL
diff -u pkgsrc/databases/rrdtool/patches/patch-bindings_perl-shared_Makefile.PL:1.3 pkgsrc/databases/rrdtool/patches/patch-bindings_perl-shared_Makefile.PL:1.4
--- pkgsrc/databases/rrdtool/patches/patch-bindings_perl-shared_Makefile.PL:1.3 Sat Aug 27 06:57:58 2016
+++ pkgsrc/databases/rrdtool/patches/patch-bindings_perl-shared_Makefile.PL     Thu Jul 27 18:31:20 2017
@@ -1,5 +1,6 @@
-$NetBSD: patch-bindings_perl-shared_Makefile.PL,v 1.3 2016/08/27 06:57:58 dholland Exp $
+$NetBSD: patch-bindings_perl-shared_Makefile.PL,v 1.4 2017/07/27 18:31:20 adam Exp $
 
+Fix Perl bindings.
 
 --- 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

Index: pkgsrc/databases/rrdtool/patches/patch-src_rrd__cgi.c
diff -u pkgsrc/databases/rrdtool/patches/patch-src_rrd__cgi.c:1.1 pkgsrc/databases/rrdtool/patches/patch-src_rrd__cgi.c:1.2
--- pkgsrc/databases/rrdtool/patches/patch-src_rrd__cgi.c:1.1   Sat Aug 27 07:40:23 2016
+++ pkgsrc/databases/rrdtool/patches/patch-src_rrd__cgi.c       Thu Jul 27 18:31:20 2017
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_rrd__cgi.c,v 1.1 2016/08/27 07:40:23 dholland Exp $
+$NetBSD: patch-src_rrd__cgi.c,v 1.2 2017/07/27 18:31:20 adam Exp $
 
 Use <ctype.h> correctly.
 
---- src/rrd_cgi.c~     2016-04-19 15:52:25.000000000 +0000
+--- src/rrd_cgi.c.orig 2017-05-16 12:26:46.000000000 +0000
 +++ src/rrd_cgi.c
-@@ -1223,7 +1223,7 @@ int parse(
+@@ -1209,7 +1209,7 @@ static int parse(
          return 0;
      }
      /* .. and match exactly (a whitespace following 'tag') */
@@ -13,7 +13,7 @@ Use <ctype.h> correctly.
          return 0;
      }
  #ifdef DEBUG_PARSER
-@@ -1334,10 +1334,10 @@ char     *rrdcgiDecodeString(
+@@ -1308,10 +1308,10 @@ static char *rrdcgiDecodeString(
          if (*cp == '%') {
              if (strchr("0123456789ABCDEFabcdef", *(cp + 1))
                  && strchr("0123456789ABCDEFabcdef", *(cp + 2))) {
Index: pkgsrc/databases/rrdtool/patches/patch-src_rrd__graph.c
diff -u pkgsrc/databases/rrdtool/patches/patch-src_rrd__graph.c:1.1 pkgsrc/databases/rrdtool/patches/patch-src_rrd__graph.c:1.2
--- pkgsrc/databases/rrdtool/patches/patch-src_rrd__graph.c:1.1 Sat Aug 27 07:40:23 2016
+++ pkgsrc/databases/rrdtool/patches/patch-src_rrd__graph.c     Thu Jul 27 18:31:20 2017
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_rrd__graph.c,v 1.1 2016/08/27 07:40:23 dholland Exp $
+$NetBSD: patch-src_rrd__graph.c,v 1.2 2017/07/27 18:31:20 adam Exp $
 
 Use <ctype.h> correctly.
 
---- src/rrd_graph.c~   2016-04-19 15:52:25.000000000 +0000
+--- src/rrd_graph.c.orig       2017-05-16 12:26:46.000000000 +0000
 +++ src/rrd_graph.c
 @@ -1704,7 +1704,7 @@ static int strfduration(char * const des
              if ((zpad = *f == '0'))
Index: pkgsrc/databases/rrdtool/patches/patch-src_rrd__restore.c
diff -u pkgsrc/databases/rrdtool/patches/patch-src_rrd__restore.c:1.1 pkgsrc/databases/rrdtool/patches/patch-src_rrd__restore.c:1.2
--- pkgsrc/databases/rrdtool/patches/patch-src_rrd__restore.c:1.1       Sat Aug 27 07:40:23 2016
+++ pkgsrc/databases/rrdtool/patches/patch-src_rrd__restore.c   Thu Jul 27 18:31:20 2017
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_rrd__restore.c,v 1.1 2016/08/27 07:40:23 dholland Exp $
+$NetBSD: patch-src_rrd__restore.c,v 1.2 2017/07/27 18:31:20 adam Exp $
 
 Use <ctype.h> correctly.
 
---- src/rrd_restore.c~ 2016-04-19 15:52:26.000000000 +0000
+--- src/rrd_restore.c.orig     2017-05-16 12:26:46.000000000 +0000
 +++ src/rrd_restore.c
 @@ -104,7 +104,7 @@ static xmlChar* get_xml_element (
                }
Index: pkgsrc/databases/rrdtool/patches/patch-src_rrd__strtod.c
diff -u pkgsrc/databases/rrdtool/patches/patch-src_rrd__strtod.c:1.1 pkgsrc/databases/rrdtool/patches/patch-src_rrd__strtod.c:1.2
--- pkgsrc/databases/rrdtool/patches/patch-src_rrd__strtod.c:1.1        Sat Aug 27 07:40:23 2016
+++ pkgsrc/databases/rrdtool/patches/patch-src_rrd__strtod.c    Thu Jul 27 18:31:20 2017
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_rrd__strtod.c,v 1.1 2016/08/27 07:40:23 dholland Exp $
+$NetBSD: patch-src_rrd__strtod.c,v 1.2 2017/07/27 18:31:20 adam Exp $
 
 Use <ctype.h> correctly.
 
---- src/rrd_strtod.c~  2016-04-19 15:52:26.000000000 +0000
+--- src/rrd_strtod.c.orig      2017-05-16 12:26:46.000000000 +0000
 +++ src/rrd_strtod.c
 @@ -117,7 +117,7 @@ double rrd_strtod(const char *str, char 
      num_decimals = 0;
Index: pkgsrc/databases/rrdtool/patches/patch-src_rrd__utils.c
diff -u pkgsrc/databases/rrdtool/patches/patch-src_rrd__utils.c:1.1 pkgsrc/databases/rrdtool/patches/patch-src_rrd__utils.c:1.2
--- pkgsrc/databases/rrdtool/patches/patch-src_rrd__utils.c:1.1 Sat Aug 27 07:40:23 2016
+++ pkgsrc/databases/rrdtool/patches/patch-src_rrd__utils.c     Thu Jul 27 18:31:20 2017
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_rrd__utils.c,v 1.1 2016/08/27 07:40:23 dholland Exp $
+$NetBSD: patch-src_rrd__utils.c,v 1.2 2017/07/27 18:31:20 adam Exp $
 
 Use <ctype.h> correctly.
 
---- src/rrd_utils.c~   2016-04-19 15:52:26.000000000 +0000
+--- src/rrd_utils.c.orig       2017-05-16 12:26:46.000000000 +0000
 +++ src/rrd_utils.c
 @@ -238,7 +238,7 @@ const char * rrd_scaled_duration (const 
      char * ep = NULL;
Index: pkgsrc/databases/rrdtool/patches/patch-src_rrd__xport.c
diff -u pkgsrc/databases/rrdtool/patches/patch-src_rrd__xport.c:1.1 pkgsrc/databases/rrdtool/patches/patch-src_rrd__xport.c:1.2
--- pkgsrc/databases/rrdtool/patches/patch-src_rrd__xport.c:1.1 Sat Aug 27 07:40:23 2016
+++ pkgsrc/databases/rrdtool/patches/patch-src_rrd__xport.c     Thu Jul 27 18:31:20 2017
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_rrd__xport.c,v 1.1 2016/08/27 07:40:23 dholland Exp $
+$NetBSD: patch-src_rrd__xport.c,v 1.2 2017/07/27 18:31:20 adam Exp $
 
 Use <ctype.h> correctly.
 
---- src/rrd_xport.c~   2016-04-19 15:52:26.000000000 +0000
+--- src/rrd_xport.c.orig       2017-05-16 12:26:46.000000000 +0000
 +++ src/rrd_xport.c
-@@ -547,7 +547,7 @@ int rrd_xport_format_sv(char sep, string
+@@ -537,7 +537,7 @@ static int rrd_xport_format_sv(char sep,
    if (addToBuffer(buffer,"\"time\"",6)) { return 1; }
    for(unsigned long i=0;i<col_cnt;i++) {
      /* strip leading spaces */
@@ -13,7 +13,7 @@ Use <ctype.h> correctly.
      /* and print it */
      snprintf(buf,255,"%c\"%s\"",sep,t);
      if (addToBuffer(buffer,buf,0)) { return 1;}
-@@ -690,7 +690,7 @@ int rrd_xport_format_xmljson(int flags,s
+@@ -680,7 +680,7 @@ static int rrd_xport_format_xmljson(int 
    for (unsigned long j = 0; j < col_cnt; j++) {
      char *entry = legend_v[j];
      /* I do not know why the legend is "spaced", but let us skip it */
@@ -22,7 +22,7 @@ Use <ctype.h> correctly.
      /* now output it */
      if (json){
        snprintf(buf,sizeof(buf),"      \"%s\"", entry);
-@@ -977,7 +977,7 @@ int rrd_xport_format_addprints(int flags
+@@ -970,7 +970,7 @@ static int rrd_xport_format_addprints(in
      case GF_LINE:
        entry = im->gdes[i].legend;
        /* I do not know why the legend is "spaced", but let us skip it */

Index: pkgsrc/databases/ruby-rrdtool/Makefile
diff -u pkgsrc/databases/ruby-rrdtool/Makefile:1.22 pkgsrc/databases/ruby-rrdtool/Makefile:1.23
--- pkgsrc/databases/ruby-rrdtool/Makefile:1.22 Sun Feb 12 06:25:10 2017
+++ pkgsrc/databases/ruby-rrdtool/Makefile      Thu Jul 27 18:31:20 2017
@@ -1,15 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2017/02/12 06:25:10 ryoon Exp $
+# $NetBSD: Makefile,v 1.23 2017/07/27 18:31:20 adam Exp $
 
-DISTNAME=      rrdtool-1.6.0
-PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION=   2
-CATEGORIES=    databases graphics net
-MASTER_SITES=  http://oss.oetiker.ch/rrdtool/pub/
+.include "../../databases/rrdtool/Makefile.common"
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://oss.oetiker.ch/rrdtool/
-COMMENT=       Ruby binding for rrdtool
-LICENSE=       gnu-gpl-v2
+PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME}
 
 USE_RUBY_EXTCONF=      yes
 EXTRACT_ELEMENTS=      ${DISTNAME}/bindings/ruby ${DISTNAME}/src

Index: pkgsrc/databases/ruby-rrdtool/distinfo
diff -u pkgsrc/databases/ruby-rrdtool/distinfo:1.6 pkgsrc/databases/ruby-rrdtool/distinfo:1.7
--- pkgsrc/databases/ruby-rrdtool/distinfo:1.6  Sat Apr 23 06:23:49 2016
+++ pkgsrc/databases/ruby-rrdtool/distinfo      Thu Jul 27 18:31:20 2017
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2016/04/23 06:23:49 adam Exp $
+$NetBSD: distinfo,v 1.7 2017/07/27 18:31:20 adam Exp $
 
-SHA1 (rrdtool-1.6.0.tar.gz) = 9866b41bda9416188f236d61d24f185b173fd571
-RMD160 (rrdtool-1.6.0.tar.gz) = 90bb6dc4a19c296fb67bb83094f6308396e591c0
-SHA512 (rrdtool-1.6.0.tar.gz) = 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd
-Size (rrdtool-1.6.0.tar.gz) = 2186538 bytes
+SHA1 (rrdtool-1.7.0.tar.gz) = 15a2009e2ee67eb41a2598d1a0f1f7cf1a651c78
+RMD160 (rrdtool-1.7.0.tar.gz) = 8816c971189a60e190d15a5b3827697c299ffce3
+SHA512 (rrdtool-1.7.0.tar.gz) = 36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f
+Size (rrdtool-1.7.0.tar.gz) = 2849994 bytes
 SHA1 (patch-extconf.rb) = 18cce3cb95afd81ea30c03bad4e2a1717c7ab982

Added files:

Index: pkgsrc/databases/py-rrdtool/DESCR
diff -u /dev/null pkgsrc/databases/py-rrdtool/DESCR:1.1
--- /dev/null   Thu Jul 27 18:31:20 2017
+++ pkgsrc/databases/py-rrdtool/DESCR   Thu Jul 27 18:31:20 2017
@@ -0,0 +1,2 @@
+This package contains Python extension module for rrdtool (Round Robin
+Database Tools).
Index: pkgsrc/databases/py-rrdtool/Makefile
diff -u /dev/null pkgsrc/databases/py-rrdtool/Makefile:1.1
--- /dev/null   Thu Jul 27 18:31:20 2017
+++ pkgsrc/databases/py-rrdtool/Makefile        Thu Jul 27 18:31:20 2017
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1 2017/07/27 18:31:20 adam Exp $
+
+.include "../../databases/rrdtool/Makefile.common"
+
+PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+
+DEPENDS+=      ${PYPKGPREFIX}-setuptools>=0.8:../../devel/py-setuptools
+
+EGG_NAME=      rrdtool-0.1.10
+
+EXTRACT_ELEMENTS=      ${DISTNAME}/bindings/python ${DISTNAME}/src
+WRKSRC=                        ${WRKDIR}/${DISTNAME}/bindings/python
+MAKE_ENV+=             ABS_TOP_BUILDDIR=${WRKDIR}/${DISTNAME}
+
+pre-configure:
+       rm ${WRKDIR}/${DISTNAME}/src/rrd_config.h
+
+.include "../../databases/rrdtool/buildlink3.mk"
+.include "../../lang/python/egg.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/databases/py-rrdtool/PLIST
diff -u /dev/null pkgsrc/databases/py-rrdtool/PLIST:1.1
--- /dev/null   Thu Jul 27 18:31:20 2017
+++ pkgsrc/databases/py-rrdtool/PLIST   Thu Jul 27 18:31:20 2017
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST,v 1.1 2017/07/27 18:31:20 adam Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/rrdtool.so
Index: pkgsrc/databases/py-rrdtool/distinfo
diff -u /dev/null pkgsrc/databases/py-rrdtool/distinfo:1.1
--- /dev/null   Thu Jul 27 18:31:20 2017
+++ pkgsrc/databases/py-rrdtool/distinfo        Thu Jul 27 18:31:20 2017
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2017/07/27 18:31:20 adam Exp $
+
+SHA1 (rrdtool-1.7.0.tar.gz) = 15a2009e2ee67eb41a2598d1a0f1f7cf1a651c78
+RMD160 (rrdtool-1.7.0.tar.gz) = 8816c971189a60e190d15a5b3827697c299ffce3
+SHA512 (rrdtool-1.7.0.tar.gz) = 36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f
+Size (rrdtool-1.7.0.tar.gz) = 2849994 bytes

Index: pkgsrc/databases/rrdtool/patches/patch-examples_Makefile.in
diff -u /dev/null pkgsrc/databases/rrdtool/patches/patch-examples_Makefile.in:1.1
--- /dev/null   Thu Jul 27 18:31:20 2017
+++ pkgsrc/databases/rrdtool/patches/patch-examples_Makefile.in Thu Jul 27 18:31:20 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-examples_Makefile.in,v 1.1 2017/07/27 18:31:20 adam Exp $
+
+Correct examples directory.
+
+--- 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 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.py
Index: pkgsrc/databases/rrdtool/patches/patch-examples_rrdcached_Makefile.in
diff -u /dev/null pkgsrc/databases/rrdtool/patches/patch-examples_rrdcached_Makefile.in:1.1
--- /dev/null   Thu Jul 27 18:31:20 2017
+++ pkgsrc/databases/rrdtool/patches/patch-examples_rrdcached_Makefile.in       Thu Jul 27 18:31:20 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-examples_rrdcached_Makefile.in,v 1.1 2017/07/27 18:31:20 adam Exp $
+
+Correct examples directory.
+
+--- examples/rrdcached/Makefile.in.orig        2015-11-10 16:59:27.000000000 +0000
++++ examples/rrdcached/Makefile.in
+@@ -356,7 +356,7 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-examplesdir = $(pkgdatadir)/examples/rrdcached
++examplesdir = $(prefix)/share/examples/rrdcached
+ examples_SCRIPTS = rrdcached-size.pl
+ examples_DATA = RRDCached.pm
+ EXTRA_DIST = $(examples_DATA) $(examples_SCRIPTS)
Index: pkgsrc/databases/rrdtool/patches/patch-src_rrd__lastupdate.c
diff -u /dev/null pkgsrc/databases/rrdtool/patches/patch-src_rrd__lastupdate.c:1.1
--- /dev/null   Thu Jul 27 18:31:20 2017
+++ pkgsrc/databases/rrdtool/patches/patch-src_rrd__lastupdate.c        Thu Jul 27 18:31:20 2017
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_rrd__lastupdate.c,v 1.1 2017/07/27 18:31:20 adam Exp $
+
+--- src/rrd_lastupdate.c.orig  2012-01-24 10:08:48.000000000 +0000
++++ src/rrd_lastupdate.c
+@@ -75,7 +75,7 @@ int rrd_lastupdate (int argc, char **arg
+         printf(" %s", ds_names[i]);
+     printf ("\n\n");
+ 
+-    printf ("%10lu:", last_update);
++    printf ("%10llu:", (unsigned long long)last_update);
+     for (i = 0; i < ds_count; i++) {
+         printf(" %s", last_ds[i]);
+         free(last_ds[i]);
Index: pkgsrc/databases/rrdtool/patches/patch-src_rrd__tool.c
diff -u /dev/null pkgsrc/databases/rrdtool/patches/patch-src_rrd__tool.c:1.1
--- /dev/null   Thu Jul 27 18:31:20 2017
+++ pkgsrc/databases/rrdtool/patches/patch-src_rrd__tool.c      Thu Jul 27 18:31:20 2017
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_rrd__tool.c,v 1.1 2017/07/27 18:31:20 adam Exp $
+
+--- src/rrd_tool.c.orig        2012-01-24 10:08:48.000000000 +0000
++++ src/rrd_tool.c
+@@ -670,11 +670,11 @@ int HandleInputLine(
+     else if (strcmp("resize", argv[1]) == 0)
+         rrd_resize(argc - 1, &argv[1]);
+     else if (strcmp("last", argv[1]) == 0)
+-        printf("%ld\n", rrd_last(argc - 1, &argv[1]));
++          printf("%lld\n", (long long)rrd_last(argc - 1, &argv[1]));
+     else if (strcmp("lastupdate", argv[1]) == 0) {
+         rrd_lastupdate(argc - 1, &argv[1]);
+     } else if (strcmp("first", argv[1]) == 0)
+-        printf("%ld\n", rrd_first(argc - 1, &argv[1]));
++          printf("%lld\n", (long long)rrd_first(argc - 1, &argv[1]));
+     else if (strcmp("update", argv[1]) == 0)
+         rrd_update(argc - 1, &argv[1]);
+     else if (strcmp("fetch", argv[1]) == 0) {
+@@ -692,7 +692,7 @@ int HandleInputLine(
+                 printf("%20s", ds_namv[i]);
+             printf("\n\n");
+             for (ti = start + step; ti <= end; ti += step) {
+-                printf("%10lu:", ti);
++                  printf("%10llu:", (unsigned long long)ti);
+                 for (ii = 0; ii < ds_cnt; ii++)
+                     printf(" %0.10e", *(datai++));
+                 printf("\n");

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/databases/rrdtool
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/databases/rrdtool
Indexes:

Home | Main Index | Thread Index | Old Index