- Add an optional patch (not enabled by default for now) to

   support 'json' command which in turn spits output in json
   format.

   PORTREVISION not bumped as the default build was not
   changed.

 - While I'm there remove MD5 checksum.

Approved by:	maintainer
Feature safe:	yes

3 files changed, 120 insertions, 1 deletions

diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index bd36ba88c47b..8c3576e954a6 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -35,6 +35,7 @@ PORTEXAMPLES=	4charts.pl bigtops.pl cgi-demo.cgi minmax.pl perftest.pl \
 		piped-demo.pl shared-demo.pl stripes.pl
 
 OPTIONS=	DEJAVU		"Use DejaVu fonts (requires X11)" off \
+		JSON		"Support of json export" off \
 		MMAP		"Use mmap in rrd_update" on \
 		PERL_MODULE	"Build PERL module" on \
 		PYTHON_MODULE	"Build PYTHON bindings" off \
@@ -81,6 +82,10 @@ PLIST_SUB+=	WITH_PERL="@comment "
 CONFIGURE_ARGS+=	--disable-mmap
 .endif
 
+.if defined(WITH_JSON)
+EXTRA_PATCHES+=		${FILESDIR}/thirdparty-json.diff
+.endif
+
 .if exists(${LOCALBASE}/lib/X11/fonts/dejavu) || defined(WITH_DEJAVU)
 RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
 .endif
diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
index e484ffc4568c..502c9ad80b17 100644
--- a/databases/rrdtool/distinfo
+++ b/databases/rrdtool/distinfo
@@ -1,3 +1,2 @@
-MD5 (rrdtool-1.4.4.tar.gz) = 93ad2fc2e9ddcd7d99c611fe30284a54
 SHA256 (rrdtool-1.4.4.tar.gz) = 0778d2f5cb0807b825b11a153eb0c365a847631dba69faca5c887f30797c6c33
 SIZE (rrdtool-1.4.4.tar.gz) = 1345477
diff --git a/databases/rrdtool/files/thirdparty-json.diff b/databases/rrdtool/files/thirdparty-json.diff
new file mode 100644
index 000000000000..e4605cf79699
--- /dev/null
+++ b/databases/rrdtool/files/thirdparty-json.diff
@@ -0,0 +1,115 @@
+#
+# From: https://gist.github.com/raw/614476/19f1b1bc9499bb9dd761e5e03eff225d2316707d/0001-work-in-progress.patch
+#
+--- src/rrd_tool.c.orig	2010-07-05 12:31:21.000000000 -0700
++++ src/rrd_tool.c	2011-01-06 15:17:04.453738239 -0800
+@@ -55,7 +55,7 @@
+         N_
+         ("Valid commands: create, update, updatev, graph, graphv,  dump, restore,\n"
+          "\t\tlast, lastupdate, first, info, fetch, tune,\n"
+-         "\t\tresize, xport, flushcached\n");
++         "\t\tresize, xport, json, flushcached\n");
+ 
+     const char *help_listremote =
+         N_("Valid remote commands: quit, ls, cd, mkdir, pwd\n");
+@@ -208,6 +208,13 @@
+            "\t\t[--enumds]\n" "\t\t[DEF:vname=rrd:ds-name:CF]\n"
+            "\t\t[CDEF:vname=rpn-expression]\n"
+            "\t\t[XPORT:vname:legend]\n");
++    const char *help_json =
++        N_("* json - generate JSON dump from one or several RRD\n\n"
++           "\trrdtool json [-s|--start seconds] [-e|--end seconds]\n"
++           "\t\t[-m|--maxrows rows]\n" "\t\t[--step seconds]\n"
++           "\t\t[DEF:vname=rrd:ds-name:CF]\n"
++           "\t\t[CDEF:vname=rpn-expression]\n"
++           "\t\t[XPORT:vname:legend]\n");
+     const char *help_quit =
+         N_(" * quit - closing a session in remote mode\n\n"
+            "\trrdtool quit\n");
+@@ -230,7 +237,7 @@
+     enum { C_NONE, C_CREATE, C_DUMP, C_INFO, C_RESTORE, C_LAST,
+         C_LASTUPDATE, C_FIRST, C_UPDATE, C_FETCH, C_GRAPH, C_GRAPHV,
+         C_TUNE,
+-        C_RESIZE, C_XPORT, C_QUIT, C_LS, C_CD, C_MKDIR, C_PWD,
++        C_RESIZE, C_XPORT, C_JSON, C_QUIT, C_LS, C_CD, C_MKDIR, C_PWD,
+         C_UPDATEV, C_FLUSHCACHED
+     };
+     int       help_cmd = C_NONE;
+@@ -268,6 +275,8 @@
+             help_cmd = C_RESIZE;
+         else if (!strcmp(cmd, "xport"))
+             help_cmd = C_XPORT;
++        else if (!strcmp(cmd, "json"))
++            help_cmd = C_JSON;
+         else if (!strcmp(cmd, "quit"))
+             help_cmd = C_QUIT;
+         else if (!strcmp(cmd, "ls"))
+@@ -343,6 +352,9 @@
+     case C_XPORT:
+         puts(_(help_xport));
+         break;
++    case C_JSON:
++        puts(_(help_json));
++        break;
+     case C_QUIT:
+         puts(_(help_quit));
+         break;
+@@ -770,6 +782,58 @@
+             setlocale(LC_NUMERIC, old_locale);
+         }
+         free(vtag);
++    } else if (strcmp("json", argv[1]) == 0) {
++        int       xxsize;
++        unsigned long int j = 0;
++        time_t    start, end, ti;
++        unsigned long step, col_cnt;
++        rrd_value_t *data, *ptr;
++        char    **legend_v;
++        int       i;
++
++        if (rrd_xport
++            (argc - 1, &argv[1], &xxsize, &start, &end, &step, &col_cnt,
++             &legend_v, &data) != -1) {
++            char *old_locale = setlocale(LC_NUMERIC, "C");
++            printf("[\n");
++            for (j = 0; j < col_cnt; j++) {
++                char     *entry = NULL;
++                ptr = j + data;
++                entry = legend_v[j];
++
++                printf("\t{\n\t\t\"%s\": {\n", entry);
++                free(entry);
++
++                printf("\t\t\t\"%s\": %lld,\n", META_START_TAG,
++                      (long long int) start + step);
++                printf("\t\t\t\"%s\": %lu,\n", META_STEP_TAG, step);
++                printf("\t\t\t\"%s\": %lld,\n", META_END_TAG, (long long int) end);
++                printf("\t\t\t\"data_points\": [\n");
++
++                for (ti = start + step; ti <= end; ti += step) {
++                  rrd_value_t newval = DNAN;
++                    newval = *ptr;
++                    if (isnan(newval)) {
++                        printf("null");
++                    } else {
++                        printf("%0.5f", newval);
++                    };
++                    if (ti < end) {
++                      printf(", ");
++                    }
++                    ptr+=col_cnt;
++                }
++
++                printf("\n\t\t\t]\n");
++                printf("\t\t}\n");
++                printf("\t}%s\n", (j<col_cnt-1) ? "," : "");
++            }
++            free(legend_v);
++
++            free(data);
++            printf("]\n");
++            setlocale(LC_NUMERIC, old_locale);
++        }
+     } else if (strcmp("graph", argv[1]) == 0) {
+         char    **calcpr;
+