Import of pkgsrc-2016Q3

databases/rrdtool/Makefile

@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.119 2015/08/18 12:29:44 mef Exp $
+# $NetBSD: Makefile,v 1.124 2016/08/27 06:42:43 dholland Exp $
 #
 # Please, also update databases/ruby-rrdtool
 
-DISTNAME=	rrdtool-1.5.4
+DISTNAME=	rrdtool-1.6.0
+PKGREVISION=	2
 CATEGORIES=	databases graphics net
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
 
@@ -18,10 +19,7 @@ USE_TOOLS+=		gmake pkg-config perl msgfmt intltool groff nroff
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--with-perl-options=${MAKE_PARAMS:Q}
-CONFIGURE_ARGS+=	--disable-tcl
-CONFIGURE_ARGS+=	--disable-python
 CONFIGURE_ARGS+=	--disable-ruby
-CONFIGURE_ARGS+=	--disable-lua
 CONFIGURE_ARGS+=	--disable-libdbi
 
 PTHREAD_OPTS+=		require
@@ -38,8 +36,25 @@ 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'. 
+TEST_TARGET=		# *** No rule to make target 'test'.
+
+RCD_SCRIPTS=		rrdcached
+
+# rrd_config.h is needed for databases/ruby-rrdtool
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/src/rrd_config.h ${DESTDIR}${PREFIX}/include/
+
+.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
+
+RRDCACHED_USER?=	rrdcached
+RRDCACHED_GROUP?=	${RRDCACHED_USER}
+
+PKG_USERS_VARS=		RRDCACHED_USER
+PKG_GROUPS_VARS=	RRDCACHED_GROUP
+PKG_GROUPS=		${RRDCACHED_GROUP}
+PKG_USERS=		${RRDCACHED_USER}:${RRDCACHED_GROUP}
+PKG_GECOS.${RRDCACHED_USER}=	RRDCacheD daemon user
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -51,7 +66,6 @@ TEST_TARGET=		# *** No rule to make target 'test'.
 .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"

databases/rrdtool/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2015/08/18 12:29:44 mef Exp $
+@comment $NetBSD: PLIST,v 1.18 2016/08/27 06:42:43 dholland Exp $
 bin/rrdcached
 bin/rrdcgi
 bin/rrdcreate
@@ -7,10 +7,19 @@ bin/rrdtool
 bin/rrdupdate
 include/rrd.h
 include/rrd_client.h
+include/rrd_config.h
 include/rrd_format.h
 lib/librrd.la
-lib/librrd_th.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
 man/man1/bin_dec_hex.1
 man/man1/cdeftutorial.1
 man/man1/rpntutorial.1
@@ -31,6 +40,7 @@ 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/rrdresize.1
 man/man1/rrdrestore.1
 man/man1/rrdthreads.1
@@ -64,6 +74,7 @@ share/doc/rrdtool-${PKGVERSION}/html/rrdgraph_rpn.html
 share/doc/rrdtool-${PKGVERSION}/html/rrdinfo.html
 share/doc/rrdtool-${PKGVERSION}/html/rrdlast.html
 share/doc/rrdtool-${PKGVERSION}/html/rrdlastupdate.html
+${PLIST.lua}share/doc/rrdtool-${PKGVERSION}/html/rrdlua.html
 share/doc/rrdtool-${PKGVERSION}/html/rrdresize.html
 share/doc/rrdtool-${PKGVERSION}/html/rrdrestore.html
 share/doc/rrdtool-${PKGVERSION}/html/rrdthreads.html
@@ -113,6 +124,8 @@ share/doc/rrdtool-${PKGVERSION}/txt/rrdlast.pod
 share/doc/rrdtool-${PKGVERSION}/txt/rrdlast.txt
 share/doc/rrdtool-${PKGVERSION}/txt/rrdlastupdate.pod
 share/doc/rrdtool-${PKGVERSION}/txt/rrdlastupdate.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
 share/doc/rrdtool-${PKGVERSION}/txt/rrdresize.txt
 share/doc/rrdtool-${PKGVERSION}/txt/rrdrestore.pod

databases/rrdtool/distinfo

@@ -1,11 +1,18 @@
-$NetBSD: distinfo,v 1.48 2015/08/26 22:03:38 joerg Exp $
+$NetBSD: distinfo,v 1.52 2016/08/27 07:40:22 dholland Exp $
 
-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 (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) = 6c0a0890b1e8e2c1a186e2015c0cf5acd719b686
-SHA1 (patch-bindings_perl-shared_Makefile.PL) = 1704531ecfcac0aeb0da03f350d9a657e3d8535d
+SHA1 (patch-am) = be06ac61b314e225d62f9f27da28c24fb6a1b84b
+SHA1 (patch-bindings_perl-shared_Makefile.PL) = f3b86e68a023ec9da5d600c8f803c93820195d53
 SHA1 (patch-src_gettext.h) = 1254beedc267d901e154ea98599bdfddbe49ddc0
+SHA1 (patch-src_rrd__cgi.c) = 2ea93cf6cd084638e9ae720fcb9c503631d31413
+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

databases/rrdtool/files/rrdcached.sh

@@ -0,0 +1,27 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# PROVIDE: rrdcached
+# REQUIRE: DAEMON
+
+if [ -f /etc/rc.subr ]; then
+	. /etc/rc.subr
+fi
+
+name="rrdcached"
+rcvar=${name}
+command="@PREFIX@/bin/${name}"
+pidfile="@VARBASE@/run/${name}/${name}.pid"
+sockfile="/var/run/${name}/${name}.sock"
+start_precmd="rrdcached_precmd"
+
+rrdcached_precmd()
+{
+	rc_flags="-p ${pidfile} -l ${sockfile} -U rrdcached $rc_flags"
+
+	local piddir="$(dirname "${pidfile}")"
+	mkdir -p "${piddir}"
+	chown rrdcached:rrdcached "${piddir}"
+}
+
+load_rc_config $name
+run_rc_command "$1"

databases/rrdtool/options.mk

@@ -0,0 +1,65 @@
+# $NetBSD: options.mk,v 1.3 2016/09/04 16:54:13 dholland Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.rrdtool
+PKG_SUPPORTED_OPTIONS=	lua python tcl
+PKG_SUGGESTED_OPTIONS=	lua python 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
+
+
+.if !empty(PKG_OPTIONS:Mtcl)
+USE_TOOLS+=		tclsh:run
+CONFIGURE_ARGS+=	--enable-tcl
+CONFIGURE_ARGS+=	--with-tcllib=${BUILDLINK_PREFIX.tcl}/lib
+
+REPLACE_INTERPRETER+=	tclsh
+REPLACE.tclsh.old=	.*tclsh@TCL_VERSION@
+REPLACE.tclsh.new=	${BUILDLINK_PREFIX.tcl}/bin/tclsh
+REPLACE_FILES.tclsh=	bindings/tcl/ifOctets.tcl.in
+
+PLIST.tcl=		yes
+.include "../../lang/tcl/buildlink3.mk"
+
+.else # tcl
+CONFIGURE_ARGS+=	--disable-tcl
+.endif
+
+.if !empty(PKG_OPTIONS:Mlua)
+CONFIGURE_ARGS+=	--enable-lua
+CONFIGURE_ENV+=		ac_cv_path_LUA=${LUA_INTERPRETER}
+PLIST.lua=		yes
+.include "../../lang/lua/module.mk"
+.else
+CONFIGURE_ARGS+=	--disable-lua
+.endif

databases/rrdtool/patches/patch-am

@@ -1,15 +1,15 @@
-$NetBSD: patch-am,v 1.8 2010/07/06 07:31:37 adam Exp $
+$NetBSD: patch-am,v 1.9 2016/02/01 09:41:59 adam Exp $
 
 Correct examples directory.
 
---- examples/rrdcached/Makefile.in.orig	2010-07-06 07:23:46.000000000 +0000
+--- examples/rrdcached/Makefile.in.orig	2015-11-10 16:59:27.000000000 +0000
 +++ examples/rrdcached/Makefile.in
-@@ -283,7 +283,7 @@ target_vendor = @target_vendor@
+@@ -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.pm rrdcached-size.pl
- EXTRA_DIST = RRDCached.pm rrdcached-size.pl
- all: all-am
+ examples_SCRIPTS = rrdcached-size.pl
+ examples_DATA = RRDCached.pm
+ EXTRA_DIST = $(examples_DATA) $(examples_SCRIPTS)

databases/rrdtool/patches/patch-bindings_perl-shared_Makefile.PL

@@ -1,6 +1,6 @@
-$NetBSD: patch-bindings_perl-shared_Makefile.PL,v 1.2 2015/08/18 12:29:44 mef Exp $
+$NetBSD: patch-bindings_perl-shared_Makefile.PL,v 1.3 2016/08/27 06:57:58 dholland Exp $
+
 
- 
 --- 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' && $

databases/rrdtool/patches/patch-src_rrd__cgi.c

@@ -0,0 +1,30 @@
+$NetBSD: patch-src_rrd__cgi.c,v 1.1 2016/08/27 07:40:23 dholland Exp $
+
+Use <ctype.h> correctly.
+
+--- src/rrd_cgi.c~	2016-04-19 15:52:25.000000000 +0000
++++ src/rrd_cgi.c
+@@ -1223,7 +1223,7 @@ int parse(
+         return 0;
+     }
+     /* .. and match exactly (a whitespace following 'tag') */
+-    if (!isspace(*((*buf) + i + taglen))) {
++    if (!isspace((unsigned char) *((*buf) + i + taglen))) {
+         return 0;
+     }
+ #ifdef DEBUG_PARSER
+@@ -1334,10 +1334,10 @@ char     *rrdcgiDecodeString(
+         if (*cp == '%') {
+             if (strchr("0123456789ABCDEFabcdef", *(cp + 1))
+                 && strchr("0123456789ABCDEFabcdef", *(cp + 2))) {
+-                if (islower(*(cp + 1)))
+-                    *(cp + 1) = toupper(*(cp + 1));
+-                if (islower(*(cp + 2)))
+-                    *(cp + 2) = toupper(*(cp + 2));
++                if (islower((unsigned char) *(cp + 1)))
++                    *(cp + 1) = toupper((unsigned char) *(cp + 1));
++                if (islower((unsigned char) *(cp + 2)))
++                    *(cp + 2) = toupper((unsigned char) *(cp + 2));
+                 *(xp) =
+                     (*(cp + 1) >=
+                      'A' ? *(cp + 1) - 'A' + 10 : *(cp + 1) - '0') * 16 +

databases/rrdtool/patches/patch-src_rrd__graph.c

@@ -0,0 +1,15 @@
+$NetBSD: patch-src_rrd__graph.c,v 1.1 2016/08/27 07:40:23 dholland Exp $
+
+Use <ctype.h> correctly.
+
+--- src/rrd_graph.c~	2016-04-19 15:52:25.000000000 +0000
++++ src/rrd_graph.c
+@@ -1704,7 +1704,7 @@ static int strfduration(char * const des
+             if ((zpad = *f == '0'))
+                 f++;
+ 
+-            if (isdigit(*f)) {
++            if (isdigit((unsigned char)*f)) {
+                 int nread;
+                 sscanf(f, "%d%n", &width, &nread);
+                 f += nread;

databases/rrdtool/patches/patch-src_rrd__restore.c

@@ -0,0 +1,15 @@
+$NetBSD: patch-src_rrd__restore.c,v 1.1 2016/08/27 07:40:23 dholland Exp $
+
+Use <ctype.h> correctly.
+
+--- src/rrd_restore.c~	2016-04-19 15:52:26.000000000 +0000
++++ src/rrd_restore.c
+@@ -104,7 +104,7 @@ static xmlChar* get_xml_element (
+ 		}
+ 		/* strip whitespace from end of message */
+ 		for (c-- ; c != msgcpy ; c--) {
+-		    if (!isprint(*c)) {
++		    if (!isprint((unsigned char)*c)) {
+ 			*c = 0;
+ 		    }
+ 		}

databases/rrdtool/patches/patch-src_rrd__strtod.c

@@ -0,0 +1,33 @@
+$NetBSD: patch-src_rrd__strtod.c,v 1.1 2016/08/27 07:40:23 dholland Exp $
+
+Use <ctype.h> correctly.
+
+--- src/rrd_strtod.c~	2016-04-19 15:52:26.000000000 +0000
++++ src/rrd_strtod.c
+@@ -117,7 +117,7 @@ double rrd_strtod(const char *str, char 
+     num_decimals = 0;
+ 
+     // Process string of digits
+-    while (isdigit(*p)) {
++    while (isdigit((unsigned char)*p)) {
+         number = number * 10. + (*p - '0');
+         p++;
+         num_digits++;
+@@ -127,7 +127,7 @@ double rrd_strtod(const char *str, char 
+     if (*p == '.') {
+         p++;
+ 
+-        while (isdigit(*p)) {
++        while (isdigit((unsigned char)*p)) {
+             number = number * 10. + (*p - '0');
+             p++;
+             num_digits++;
+@@ -156,7 +156,7 @@ double rrd_strtod(const char *str, char 
+ 
+         // Process string of digits
+         n = 0;
+-        while (isdigit(*p)) {
++        while (isdigit((unsigned char)*p)) {
+             n = n * 10 + (*p - '0');
+             p++;
+         }

databases/rrdtool/patches/patch-src_rrd__utils.c

@@ -0,0 +1,15 @@
+$NetBSD: patch-src_rrd__utils.c,v 1.1 2016/08/27 07:40:23 dholland Exp $
+
+Use <ctype.h> correctly.
+
+--- src/rrd_utils.c~	2016-04-19 15:52:26.000000000 +0000
++++ src/rrd_utils.c
+@@ -238,7 +238,7 @@ const char * rrd_scaled_duration (const 
+     char * ep = NULL;
+     unsigned long int value = strtoul(token, &ep, 10);
+     /* account for -1 => UMAXLONG which is not what we want */
+-    if (! isdigit(token[0]))
++    if (! isdigit((unsigned char)token[0]))
+         return "value must be (suffixed) positive number";
+     /* Catch an internal error before we inhibit scaling */
+     if (0 == divisor)

databases/rrdtool/patches/patch-src_rrd__xport.c

@@ -0,0 +1,33 @@
+$NetBSD: patch-src_rrd__xport.c,v 1.1 2016/08/27 07:40:23 dholland Exp $
+
+Use <ctype.h> correctly.
+
+--- src/rrd_xport.c~	2016-04-19 15:52:26.000000000 +0000
++++ src/rrd_xport.c
+@@ -547,7 +547,7 @@ int rrd_xport_format_sv(char sep, string
+   if (addToBuffer(buffer,"\"time\"",6)) { return 1; }
+   for(unsigned long i=0;i<col_cnt;i++) {
+     /* strip leading spaces */
+-    char *t=legend_v[i]; while (isspace(*t)) { t++;}
++    char *t=legend_v[i]; while (isspace((unsigned char)*t)) { t++;}
+     /* 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
+   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 */
+-    while(isspace(*entry)){entry++;}
++    while(isspace((unsigned char)*entry)){entry++;}
+     /* now output it */
+     if (json){
+       snprintf(buf,sizeof(buf),"      \"%s\"", entry);
+@@ -977,7 +977,7 @@ int rrd_xport_format_addprints(int flags
+     case GF_LINE:
+       entry = im->gdes[i].legend;
+       /* I do not know why the legend is "spaced", but let us skip it */
+-      while(isspace(*entry)){entry++;}
++      while(isspace((unsigned char)*entry)){entry++;}
+       if (json) {
+         snprintf(buf,sizeof(buf),",\n        { \"line\": \"%s\" }",entry);
+       } else {