diff options
author | adam <adam@pkgsrc.org> | 2019-02-11 08:22:44 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2019-02-11 08:22:44 +0000 |
commit | 25038f5551a13bc8d513de2577ab7bf145ff77a9 (patch) | |
tree | cc561a87e69bb7ddb16ee438463c10c2d5a71b5f | |
parent | 37170317f7ffa505808965caa2edc82b677dc629 (diff) | |
download | pkgsrc-25038f5551a13bc8d513de2577ab7bf145ff77a9.tar.gz |
rrdtool: updated to 1.7.1
RRDtool 1.7.1:
Bugfixes
* about 38949 assorted fixes for the windows build of rrdtool
* fix many compile time warnings
* Re-enable 0-width lines
* Include rrd_pdpcalc.pod in Makefile.am also
* Lots of spelling fixes for rrdtool source and documentation
* fix off by one issue in rrdtool xport output
* fix lua extension build
* fix python bindings
* fix multiple static variable issues in conflict with MT
* make translations actually work
* Fixed configure --enable / --disable options
* rrd_daemon stability fixes
* fix tcl bindings
* do not call umask ever (not MT safe)
Features
* Multiline Titles
* French translation
* Added support for --allow-shrink with --rigid flag
* Added SUSPEND/RESUME/SUSPENDALL/RESUMEALL commands for rrd_cached
* include the daemon name in the error messag
-rw-r--r-- | databases/py-rrdtool/Makefile | 7 | ||||
-rw-r--r-- | databases/py-rrdtool/distinfo | 10 | ||||
-rw-r--r-- | databases/rrdtool/Makefile | 3 | ||||
-rw-r--r-- | databases/rrdtool/Makefile.common | 7 | ||||
-rw-r--r-- | databases/rrdtool/PLIST | 9 | ||||
-rw-r--r-- | databases/rrdtool/distinfo | 15 | ||||
-rw-r--r-- | databases/rrdtool/options.mk | 6 | ||||
-rw-r--r-- | databases/rrdtool/patches/patch-doc_Makefile.in | 15 | ||||
-rw-r--r-- | databases/rrdtool/patches/patch-src_rrd__lastupdate.c | 13 | ||||
-rw-r--r-- | databases/rrdtool/patches/patch-src_rrd__list.c | 10 | ||||
-rw-r--r-- | databases/rrdtool/patches/patch-src_rrd__tool.c | 27 | ||||
-rw-r--r-- | databases/ruby-rrdtool/Makefile | 5 | ||||
-rw-r--r-- | databases/ruby-rrdtool/distinfo | 10 |
13 files changed, 54 insertions, 83 deletions
diff --git a/databases/py-rrdtool/Makefile b/databases/py-rrdtool/Makefile index a0ba729148b..9150c876044 100644 --- a/databases/py-rrdtool/Makefile +++ b/databases/py-rrdtool/Makefile @@ -1,12 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2018/11/14 22:21:12 kleink Exp $ +# $NetBSD: Makefile,v 1.6 2019/02/11 08:22:45 adam Exp $ -PKGREVISION= 4 .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 @@ -14,7 +11,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/bindings/python MAKE_ENV+= ABS_TOP_BUILDDIR=${WRKDIR}/${DISTNAME} pre-configure: - rm ${WRKDIR}/${DISTNAME}/src/rrd_config.h + ${RM} ${WRKDIR}/${DISTNAME}/src/rrd_config.h .include "../../databases/rrdtool/buildlink3.mk" .include "../../lang/python/egg.mk" diff --git a/databases/py-rrdtool/distinfo b/databases/py-rrdtool/distinfo index a43dc8f8bae..54dbfe0a310 100644 --- a/databases/py-rrdtool/distinfo +++ b/databases/py-rrdtool/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1 2017/07/27 18:31:20 adam Exp $ +$NetBSD: distinfo,v 1.2 2019/02/11 08:22:45 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 +SHA1 (rrdtool-1.7.1.tar.gz) = e70e1241bd5ee286a5903e0714f2afb4070d1c2d +RMD160 (rrdtool-1.7.1.tar.gz) = 5f304435be4e0391eab2de41a1c33bf86c64e0a6 +SHA512 (rrdtool-1.7.1.tar.gz) = ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14 +Size (rrdtool-1.7.1.tar.gz) = 2881346 bytes diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile index d84b345ef37..a779f076207 100644 --- a/databases/rrdtool/Makefile +++ b/databases/rrdtool/Makefile @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.133 2018/11/14 22:21:12 kleink Exp $ +# $NetBSD: Makefile,v 1.134 2019/02/11 08:22:44 adam Exp $ -PKGREVISION= 5 .include "Makefile.common" DEPENDS+= dejavu-ttf>=2.26:../../fonts/dejavu-ttf diff --git a/databases/rrdtool/Makefile.common b/databases/rrdtool/Makefile.common index 00283208185..688ecb68620 100644 --- a/databases/rrdtool/Makefile.common +++ b/databases/rrdtool/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.2 2017/09/04 18:08:19 wiz Exp $ +# $NetBSD: Makefile.common,v 1.3 2019/02/11 08:22:44 adam Exp $ # used by databases/rrdtool/Makefile # used by databases/py-rrdtool/Makefile # used by databases/ruby-rrdtool/Makefile -DISTNAME= rrdtool-1.7.0 +DISTNAME= rrdtool-1.7.1 CATEGORIES= databases graphics net MASTER_SITES= https://oss.oetiker.ch/rrdtool/pub/ @@ -11,6 +11,3 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://oss.oetiker.ch/rrdtool/ COMMENT= Data analysis tool generating graphical representations LICENSE= gnu-gpl-v2 - -#DISTINFO_FILE= ${.CURDIR}/../../databases/rrdtool/distinfo -#PATCHDIR= ${.CURDIR}/../../databases/rrdtool/patches diff --git a/databases/rrdtool/PLIST b/databases/rrdtool/PLIST index d66c3820159..12b234eb962 100644 --- a/databases/rrdtool/PLIST +++ b/databases/rrdtool/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2017/07/27 18:31:20 adam Exp $ +@comment $NetBSD: PLIST,v 1.20 2019/02/11 08:22:44 adam Exp $ bin/rrdcached bin/rrdcgi bin/rrdcreate @@ -19,6 +19,7 @@ man/man1/bin_dec_hex.1 man/man1/cdeftutorial.1 man/man1/rpntutorial.1 man/man1/rrd-beginners.1 +man/man1/rrd_pdpcalc.1 man/man1/rrdbuild.1 man/man1/rrdcached.1 man/man1/rrdcgi.1 @@ -35,8 +36,8 @@ man/man1/rrdgraph_rpn.1 man/man1/rrdinfo.1 man/man1/rrdlast.1 man/man1/rrdlastupdate.1 -${PLIST.lua}man/man1/rrdlua.1 man/man1/rrdlist.1 +${PLIST.lua}man/man1/rrdlua.1 man/man1/rrdresize.1 man/man1/rrdrestore.1 man/man1/rrdthreads.1 @@ -54,6 +55,7 @@ share/doc/rrdtool-${PKGVERSION}/html/index.html share/doc/rrdtool-${PKGVERSION}/html/librrd.html share/doc/rrdtool-${PKGVERSION}/html/rpntutorial.html share/doc/rrdtool-${PKGVERSION}/html/rrd-beginners.html +share/doc/rrdtool-${PKGVERSION}/html/rrd_pdpcalc.html share/doc/rrdtool-${PKGVERSION}/html/rrdbuild.html share/doc/rrdtool-${PKGVERSION}/html/rrdcached.html share/doc/rrdtool-${PKGVERSION}/html/rrdcgi.html @@ -89,6 +91,8 @@ share/doc/rrdtool-${PKGVERSION}/txt/rpntutorial.pod share/doc/rrdtool-${PKGVERSION}/txt/rpntutorial.txt share/doc/rrdtool-${PKGVERSION}/txt/rrd-beginners.pod share/doc/rrdtool-${PKGVERSION}/txt/rrd-beginners.txt +share/doc/rrdtool-${PKGVERSION}/txt/rrd_pdpcalc.pod +share/doc/rrdtool-${PKGVERSION}/txt/rrd_pdpcalc.txt share/doc/rrdtool-${PKGVERSION}/txt/rrdbuild.pod share/doc/rrdtool-${PKGVERSION}/txt/rrdbuild.txt share/doc/rrdtool-${PKGVERSION}/txt/rrdcached.pod @@ -152,4 +156,5 @@ share/examples/rrdtool/piped-demo.pl share/examples/rrdtool/shared-demo.pl share/examples/rrdtool/stripes.pl share/examples/rrdtool/stripes.py +share/locale/fr/LC_MESSAGES/rrdtool.mo share/locale/hu/LC_MESSAGES/rrdtool.mo diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo index be7977f4ed4..5fe9e1e6a58 100644 --- a/databases/rrdtool/distinfo +++ b/databases/rrdtool/distinfo @@ -1,19 +1,18 @@ -$NetBSD: distinfo,v 1.55 2017/08/02 03:13:54 maya Exp $ +$NetBSD: distinfo,v 1.56 2019/02/11 08:22:44 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 +SHA1 (rrdtool-1.7.1.tar.gz) = e70e1241bd5ee286a5903e0714f2afb4070d1c2d +RMD160 (rrdtool-1.7.1.tar.gz) = 5f304435be4e0391eab2de41a1c33bf86c64e0a6 +SHA512 (rrdtool-1.7.1.tar.gz) = ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14 +Size (rrdtool-1.7.1.tar.gz) = 2881346 bytes SHA1 (patch-bindings_perl-shared_Makefile.PL) = 839b4474e89b59002d1629425c5839e4df3b8f5c +SHA1 (patch-doc_Makefile.in) = 749309b6532fff991a89c317a57e24f91a2804d1 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) = f2004681d9d430b6d347627e029ce3c7a717bcd6 SHA1 (patch-src_rrd__graph.c) = e53a925c329e477b198cdeaf6b50891187ee17c5 -SHA1 (patch-src_rrd__lastupdate.c) = 317fc6e46e15333574d0e977d8ab34e916920f4a -SHA1 (patch-src_rrd__list.c) = 9a5e623e20aa2be4ad22f5358897a8a9ad418b38 +SHA1 (patch-src_rrd__list.c) = 5d548b4196d7242565e23d6d74af1fc2d8be1ba0 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 diff --git a/databases/rrdtool/options.mk b/databases/rrdtool/options.mk index a662cce5f38..d5c7d9e8a55 100644 --- a/databases/rrdtool/options.mk +++ b/databases/rrdtool/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2018/07/07 04:45:10 minskim Exp $ +# $NetBSD: options.mk,v 1.7 2019/02/11 08:22:44 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.rrdtool PKG_SUPPORTED_OPTIONS= lua tcl @@ -20,13 +20,13 @@ REPLACE_FILES.tclsh= bindings/tcl/ifOctets.tcl.in PLIST.tcl= yes -.if ${OPSYS} == "Darwin" +. if ${OPSYS} == "Darwin" .PHONY: fix-darwin-install-name post-install: fix-darwin-install-name fix-darwin-install-name: install_name_tool -id ${PREFIX}/lib/tclrrd${PKGVERSION_NOREV}.dylib \ ${DESTDIR}${PREFIX}/lib/tclrrd${PKGVERSION_NOREV}.dylib -.endif +. endif .include "../../lang/tcl/buildlink3.mk" diff --git a/databases/rrdtool/patches/patch-doc_Makefile.in b/databases/rrdtool/patches/patch-doc_Makefile.in new file mode 100644 index 00000000000..a45bb4f70da --- /dev/null +++ b/databases/rrdtool/patches/patch-doc_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-doc_Makefile.in,v 1.1 2019/02/11 08:22:45 adam Exp $ + +Remove non-portable -Wbreak option. + +--- doc/Makefile.in.orig 2019-02-09 18:02:06.000000000 +0000 ++++ doc/Makefile.in +@@ -698,7 +698,7 @@ all-local: link man txt html-local + $(AM_V_GEN)@POD2MAN@ --release=$(VERSION) --center=rrdtool --section=3 $< > $@ + + .1.txt .3.txt: +- $(AM_V_GEN)GROFF_NO_SGR=1 @NROFF@ -man -Tlp -Wbreak $< > $@ ++ $(AM_V_GEN)GROFF_NO_SGR=1 @NROFF@ -man -Tlp $< > $@ + + .1.pdf .3.pdf: + $(AM_V_GEN)@TROFF@ -man $< | ps2pdf - $@ diff --git a/databases/rrdtool/patches/patch-src_rrd__lastupdate.c b/databases/rrdtool/patches/patch-src_rrd__lastupdate.c deleted file mode 100644 index 3e65fd0ff3b..00000000000 --- a/databases/rrdtool/patches/patch-src_rrd__lastupdate.c +++ /dev/null @@ -1,13 +0,0 @@ -$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]); diff --git a/databases/rrdtool/patches/patch-src_rrd__list.c b/databases/rrdtool/patches/patch-src_rrd__list.c index fcdc400c7aa..db2050d3201 100644 --- a/databases/rrdtool/patches/patch-src_rrd__list.c +++ b/databases/rrdtool/patches/patch-src_rrd__list.c @@ -1,13 +1,13 @@ -$NetBSD: patch-src_rrd__list.c,v 1.1 2017/08/02 03:13:54 maya Exp $ +$NetBSD: patch-src_rrd__list.c,v 1.2 2019/02/11 08:22:45 adam Exp $ Need limits.h for PATH_MAX ---- src/rrd_list.c.orig 2017-05-16 12:26:46.000000000 +0000 +--- src/rrd_list.c.orig 2019-02-04 17:42:30.000000000 +0000 +++ src/rrd_list.c -@@ -3,6 +3,7 @@ - #include <string.h> - #include <glob.h> +@@ -14,6 +14,7 @@ + #endif #include <dirent.h> + #endif +#include <limits.h> #include <sys/types.h> diff --git a/databases/rrdtool/patches/patch-src_rrd__tool.c b/databases/rrdtool/patches/patch-src_rrd__tool.c deleted file mode 100644 index 1e07c9a5977..00000000000 --- a/databases/rrdtool/patches/patch-src_rrd__tool.c +++ /dev/null @@ -1,27 +0,0 @@ -$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"); diff --git a/databases/ruby-rrdtool/Makefile b/databases/ruby-rrdtool/Makefile index ac45908e105..41e0d034a92 100644 --- a/databases/ruby-rrdtool/Makefile +++ b/databases/ruby-rrdtool/Makefile @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.27 2018/11/14 22:21:12 kleink Exp $ +# $NetBSD: Makefile,v 1.28 2019/02/11 08:22:45 adam Exp $ -PKGREVISION= 4 .include "../../databases/rrdtool/Makefile.common" PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} @@ -11,7 +10,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/bindings/ruby MAKE_ENV+= ABS_TOP_BUILDDIR=${WRKDIR}/${DISTNAME} pre-configure: - rm ${WRKDIR}/${DISTNAME}/src/rrd_config.h + ${RM} ${WRKDIR}/${DISTNAME}/src/rrd_config.h .include "../../databases/rrdtool/buildlink3.mk" .include "../../lang/ruby/modules.mk" diff --git a/databases/ruby-rrdtool/distinfo b/databases/ruby-rrdtool/distinfo index 59b42f8d992..b2f7783bf4d 100644 --- a/databases/ruby-rrdtool/distinfo +++ b/databases/ruby-rrdtool/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.7 2017/07/27 18:31:20 adam Exp $ +$NetBSD: distinfo,v 1.8 2019/02/11 08:22:45 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 +SHA1 (rrdtool-1.7.1.tar.gz) = e70e1241bd5ee286a5903e0714f2afb4070d1c2d +RMD160 (rrdtool-1.7.1.tar.gz) = 5f304435be4e0391eab2de41a1c33bf86c64e0a6 +SHA512 (rrdtool-1.7.1.tar.gz) = ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14 +Size (rrdtool-1.7.1.tar.gz) = 2881346 bytes SHA1 (patch-extconf.rb) = 18cce3cb95afd81ea30c03bad4e2a1717c7ab982 |