[Midnightbsd-cvs] mports [15660] U trunk/databases/rrdtool: rrdtool 1.4.8
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Dec 7 16:24:01 EST 2013
Revision: 15660
http://svnweb.midnightbsd.org/mports/?rev=15660
Author: laffer1
Date: 2013-12-07 16:24:01 -0500 (Sat, 07 Dec 2013)
Log Message:
-----------
rrdtool 1.4.8
Modified Paths:
--------------
trunk/databases/rrdtool/Makefile
trunk/databases/rrdtool/distinfo
trunk/databases/rrdtool/pkg-plist
Added Paths:
-----------
trunk/databases/rrdtool/files/thirdparty-json.diff
Property Changed:
----------------
trunk/databases/rrdtool/distinfo
trunk/databases/rrdtool/files/patch-bindings-Makefile.in
trunk/databases/rrdtool/files/patch-doc-Makefile.in
trunk/databases/rrdtool/files/patch-examples-Makefile.in
trunk/databases/rrdtool/files/patch-src-rrd_open.c
trunk/databases/rrdtool/files/rrdcached.in
trunk/databases/rrdtool/pkg-descr
trunk/databases/rrdtool/pkg-plist
Modified: trunk/databases/rrdtool/Makefile
===================================================================
--- trunk/databases/rrdtool/Makefile 2013-12-07 21:17:15 UTC (rev 15659)
+++ trunk/databases/rrdtool/Makefile 2013-12-07 21:24:01 UTC (rev 15660)
@@ -1,13 +1,13 @@
# $MidnightBSD$
PORTNAME= rrdtool
-PORTVERSION= 1.4.7
-PORTREVISION= 1
+PORTVERSION= 1.4.8
CATEGORIES= databases graphics
MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/
MAINTAINER= ports at MidnightBSD.org
COMMENT= Round Robin Database Tools
+
LICENSE= gpl2
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
@@ -18,33 +18,34 @@
CONFLICTS= rrdtool-1.0*
+USE_RC_SUBR= rrdcached
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-USE_GMAKE= yes
-WANT_PERL= yes
+USES= gmake pkgconfig
USE_GNOME= gnomehack intltool
CONFIGURE_ARGS= --disable-tcl --program-prefix=""
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd6.1 \
- --host=${ARCH}-portbld-freebsd6.1 \
- --target=${ARCH}-portbld-freebsd6.1
+
PORTDOCS= *
-PORTEXAMPLES= 4charts.pl bigtops.pl cgi-demo.cgi minmax.pl piped-demo.pl \
- perftest.pl shared-demo.pl stripes.pl
+PORTEXAMPLES= 4charts.pl bigtops.pl cgi-demo.cgi minmax.pl perftest.pl \
+ piped-demo.pl shared-demo.pl stripes.pl
-OPTIONS= PYTHON_MODULE "Build PYTHON bindings" off \
- RUBY_MODULE "Build RUBY bindings" off \
- PERL_MODULE "Build PERL module" on \
- DEJAVU "Use DejaVu fonts (requires X11)" off \
- MMAP "Use mmap in rrd_update" on
+OPTIONS_DEFINE= DEJAVU JSON MMAP PERL_MODULE PYTHON_MODULE RUBY_MODULE EXAMPLES DOCS
+OPTIONS_DEFAULT= MMAP PERL_MODULE
+DEJAVU_DESC= Use DejaVu fonts (requires X11)
+JSON_DESC= Support of json export
+MMAP_DESC= Use mmap in rrd_update
+PERL_MODULE_DESC= Build PERL module
+PYTHON_MODULE_DESC= Build PYTHON bindings
+RUBY_MODULE_DESC= Build RUBY bindings
.include <bsd.mport.options.mk>
-.if defined(WITH_PYTHON_MODULE)
+.if ${PORT_OPTIONS:MPYTHON_MODULE}
USE_PYTHON= yes
INSTALLS_EGGINFO=yes
-PYDISTUTILS_EGGINFO=py_rrdtool-0.2.1-${PYTHON_VERSION:S/thon//}.egg-info
+PYDISTUTILS_EGGINFO=py_rrdtool-0.2.2-${PYTHON_VERSION:S/thon//}.egg-info
EXTENSIONS+= python
PLIST_SUB+= WITH_PYTHON=""
CONFIGURE_ARGS+= --enable-python
@@ -53,19 +54,18 @@
PLIST_SUB+= WITH_PYTHON="@comment "
.endif
-.if defined(WITH_RUBY_MODULE)
+.if ${PORT_OPTIONS:MRUBY_MODULE}
USE_RUBY= yes
EXTENSIONS+= ruby
PLIST_SUB+= WITH_RUBY=""
CONFIGURE_ARGS+= --enable-ruby
-CFLAGS+= -L/usr/local/lib
.else
CONFIGURE_ARGS+= --disable-ruby
PLIST_SUB+= WITH_RUBY="@comment "
.endif
-.if !defined(WITHOUT_PERL_MODULE)
-USE_PERL5= yes
+.if ${PORT_OPTIONS:MPERL_MODULE}
+USES+= perl5
CONFIGURE_ARGS+= --enable-perl --enable-perl-site-install
PLIST_SUB+= WITH_PERL=""
.else
@@ -73,36 +73,41 @@
PLIST_SUB+= WITH_PERL="@comment "
.endif
-.if defined(WITHOUT_MMAP)
+.if ! ${PORT_OPTIONS:MMMAP}
CONFIGURE_ARGS+= --disable-mmap
.endif
-.if exists(${LOCALBASE}/lib/X11/fonts/dejavu) || defined(WITH_DEJAVU)
-RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
+.if ${PORT_OPTIONS:MJSON}
+EXTRA_PATCHES+= ${FILESDIR}/thirdparty-json.diff
.endif
+.if exists(${LOCALBASE}/lib/X11/fonts/dejavu) || ${PORT_OPTIONS:MDEJAVU}
+RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
+.endif
+
CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
-LDFLAGS+= -L${LOCALBASE}/lib
+##LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS:= ${CFLAGS:N-ffast-math}
-MAN1= bin_dec_hex.1 cdeftutorial.1 rpntutorial.1 rrd-beginners.1 \
- rrdbuild.1 rrdcgi.1 rrdcreate.1 rrddump.1 rrdfetch.1 rrdfirst.1 \
- rrdgraph.1 rrdgraph_data.1 rrdgraph_examples.1 rrdgraph_graph.1 \
- rrdgraph_rpn.1 rrdinfo.1 rrdlast.1 rrdresize.1 rrdrestore.1 \
- rrdthreads.1 rrdtool.1 rrdtune.1 rrdtutorial.1 rrdupdate.1 \
- rrdxport.1 rrdlastupdate.1
-
-.include <bsd.port.pre.mk>
-
post-extract:
-.if defined(NOPORTDOCS)
- @${REINPLACE_CMD} -e 's/install-idocDATA install-ihtmlDATA//g' \
- -e 's/^ cd .* rrdtool.html index.html/ #/' \
+ @${REINPLACE_CMD} -e 's/^POD3/#POD3/' ${WRKSRC}/doc/Makefile.in
+.if ! ${PORT_OPTIONS:MDOCS}
+ @${REINPLACE_CMD} -e 's/[[:space:]]install-idocDATA//g' \
+ -e 's/[[:space:]]install-ihtmlDATA//g' \
+ -e 's/^[[:space:]].*cd .* rrdtool.html index.html/ #/' \
${WRKSRC}/doc/Makefile.in
.endif
-.if defined(NOPORTEXAMPLES)
- @${REINPLACE_CMD} -e 's|SUBDIRS = $$(PO) src examples doc bindings|SUBDIRS = $$(PO) src doc bindings|' \
+.if ! ${PORT_OPTIONS:MEXAMPLES}
+ ${REINPLACE_CMD} -e '/^SUBDIRS = /s| examples | |' \
${WRKSRC}/Makefile.in
.endif
-.include <bsd.port.post.mk>
+post-install:
+.if !defined(BATCH) && ${PORT_OPTIONS:MEXAMPLES}
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "############################################################################"
+ @${ECHO_MSG} "# See ${EXAMPLESDIR} for some demonstration code #"
+ @${ECHO_MSG} "############################################################################"
+.endif
+
+.include <bsd.port.mk>
Modified: trunk/databases/rrdtool/distinfo
===================================================================
--- trunk/databases/rrdtool/distinfo 2013-12-07 21:17:15 UTC (rev 15659)
+++ trunk/databases/rrdtool/distinfo 2013-12-07 21:24:01 UTC (rev 15660)
@@ -1,2 +1,2 @@
-SHA256 (rrdtool-1.4.7.tar.gz) = 956aaf431c955ba88dd7d98920ade3a8c4bad04adb1f9431377950a813a7af11
-SIZE (rrdtool-1.4.7.tar.gz) = 1349040
+SHA256 (rrdtool-1.4.8.tar.gz) = de95b9f5aa488b0683600aad5a07c316f8d98cbe8d00aa0a1c87e2b2ef89f3d6
+SIZE (rrdtool-1.4.8.tar.gz) = 1379482
Property changes on: trunk/databases/rrdtool/distinfo
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.7
\ No newline at end of property
Index: trunk/databases/rrdtool/files/patch-bindings-Makefile.in
===================================================================
--- trunk/databases/rrdtool/files/patch-bindings-Makefile.in 2013-12-07 21:17:15 UTC (rev 15659)
+++ trunk/databases/rrdtool/files/patch-bindings-Makefile.in 2013-12-07 21:24:01 UTC (rev 15660)
Property changes on: trunk/databases/rrdtool/files/patch-bindings-Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/databases/rrdtool/files/patch-doc-Makefile.in
===================================================================
--- trunk/databases/rrdtool/files/patch-doc-Makefile.in 2013-12-07 21:17:15 UTC (rev 15659)
+++ trunk/databases/rrdtool/files/patch-doc-Makefile.in 2013-12-07 21:24:01 UTC (rev 15660)
Property changes on: trunk/databases/rrdtool/files/patch-doc-Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/databases/rrdtool/files/patch-examples-Makefile.in
===================================================================
--- trunk/databases/rrdtool/files/patch-examples-Makefile.in 2013-12-07 21:17:15 UTC (rev 15659)
+++ trunk/databases/rrdtool/files/patch-examples-Makefile.in 2013-12-07 21:24:01 UTC (rev 15660)
Property changes on: trunk/databases/rrdtool/files/patch-examples-Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/databases/rrdtool/files/patch-src-rrd_open.c
===================================================================
--- trunk/databases/rrdtool/files/patch-src-rrd_open.c 2013-12-07 21:17:15 UTC (rev 15659)
+++ trunk/databases/rrdtool/files/patch-src-rrd_open.c 2013-12-07 21:24:01 UTC (rev 15660)
Property changes on: trunk/databases/rrdtool/files/patch-src-rrd_open.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/databases/rrdtool/files/rrdcached.in
===================================================================
--- trunk/databases/rrdtool/files/rrdcached.in 2013-12-07 21:17:15 UTC (rev 15659)
+++ trunk/databases/rrdtool/files/rrdcached.in 2013-12-07 21:24:01 UTC (rev 15660)
Property changes on: trunk/databases/rrdtool/files/rrdcached.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/databases/rrdtool/files/thirdparty-json.diff
===================================================================
--- trunk/databases/rrdtool/files/thirdparty-json.diff (rev 0)
+++ trunk/databases/rrdtool/files/thirdparty-json.diff 2013-12-07 21:24:01 UTC (rev 15660)
@@ -0,0 +1,112 @@
+--- src/rrd_tool.c.orig 2012-01-24 08:08:48.000000000 -0200
++++ src/rrd_tool.c 2012-05-11 15:57:51.000000000 -0300
+@@ -57,7 +57,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");
+@@ -210,6 +210,13 @@
+ "\t\t[--enumds] [--json]\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");
+@@ -232,7 +239,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;
+@@ -270,6 +277,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"))
+@@ -345,6 +354,9 @@
+ case C_XPORT:
+ puts(_(help_xport));
+ break;
++ case C_JSON:
++ puts(_(help_json));
++ break;
+ case C_QUIT:
+ puts(_(help_quit));
+ break;
+@@ -844,6 +856,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
+ rrd_set_error("the instance of rrdtool has been compiled without graphics");
+ #endif
Index: trunk/databases/rrdtool/pkg-descr
===================================================================
--- trunk/databases/rrdtool/pkg-descr 2013-12-07 21:17:15 UTC (rev 15659)
+++ trunk/databases/rrdtool/pkg-descr 2013-12-07 21:24:01 UTC (rev 15660)
Property changes on: trunk/databases/rrdtool/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/databases/rrdtool/pkg-plist
===================================================================
--- trunk/databases/rrdtool/pkg-plist 2013-12-07 21:17:15 UTC (rev 15659)
+++ trunk/databases/rrdtool/pkg-plist 2013-12-07 21:24:01 UTC (rev 15660)
@@ -1,5 +1,7 @@
bin/rrdcached
bin/rrdcgi
+bin/rrdcreate
+bin/rrdinfo
bin/rrdtool
bin/rrdupdate
include/rrd.h
Property changes on: trunk/databases/rrdtool/pkg-plist
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list