On 2013/06/13 23:26, Stuart Henderson wrote:
> Here's a long-overdue update to rrdtool (we needed perl linked with
> -lpthread before this was possible).
>
> Notable improvements include rrdcached, a persistent daemon which
> buffers updates to RRD files and writes them in batches, significantly
> cutting disk i/o in some cases.
>
> Note that rrdtool 1.4 uses pango/cairo/fontconfig to draw the graphs
> which makes use in a chroot jail somewhat nasty, which was another
> sticking point for the update - I've now included a readme and helper
> script (based on that from webacula) to copy minimal files into place.
>
> Perl bindings are rolled into the main package (there doesn't
> seem a lot of point in separating them, and it just makes updates
> harder as update-plist doesn't get on well with this). A few ports
> will need updating to cope with that change (mailgraph, bindgraph,
> mrtg, munin-server, nedi, nfsen, smokeping) - diffs not included,
> but are straightforward.
>
> Comments/tests welcome..
regenerated against -current, with a few changes:
- new rc.d/rrdcached (and associated @newuser/@newgroup lines)
- groff is not needed
- don't install html version of manpages
- split rrdupdate to a separate subpackage
- fix rrdupdate on LP64; missing header -> no prototype for
basename() -> pointer truncation
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/rrdtool/Makefile,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile
--- Makefile 4 Jun 2013 18:41:54 -0000 1.71
+++ Makefile 15 Jun 2013 09:15:18 -0000
@@ -1,74 +1,89 @@
-# $OpenBSD: Makefile,v 1.71 2013/06/04 18:41:54 naddy Exp $
+# $OpenBSD: Makefile,v 1.62 2011/06/08 18:00:50 jasper Exp $
SHARED_ONLY= Yes
COMMENT-main= system to store and display time-series data
-COMMENT-perl= perl interface to librrd
-COMMENT-python= python interface to librrd
+COMMENT-update= lightweight update-only tool for rrdtool
+COMMENT-python= python interface to librrd
COMMENT-ruby= ruby interface to librrd
-VERSION= 1.2.30
+MODPY_EGG_VERSION= 0.2.2
+VERSION= 1.4.8
DISTNAME= rrdtool-${VERSION}
-PKGNAME-main= rrdtool-${VERSION}
-PKGNAME-perl= p5-RRD-${VERSION}
+PKGNAME-main= ${DISTNAME}
+PKGNAME-update= rrdupdate-${VERSION}
PKGNAME-python= py-rrd-${VERSION}
PKGNAME-ruby= ruby-rrd-${VERSION}
-REVISION-main= 3
-REVISION-perl= 3
-REVISION-python=5
-REVISION-ruby= 10
-SHARED_LIBS+= rrd 3.0
-SHARED_LIBS+= rrd_th 3.0
+SHARED_LIBS += rrd 4.0 # 6.1
+SHARED_LIBS += rrd_th 4.0 # 6.1
CATEGORIES= net databases
MAINTAINER= Stuart Henderson <[email protected]>
-HOMEPAGE= http://oss.oetiker.ch/rrdtool/
-# GPLv2+
-PERMIT_PACKAGE_CDROM= Yes
+HOMEPAGE= http://oss.oetiker.ch/rrdtool/
+MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/
-MASTER_SITES= ${HOMEPAGE}pub/
+# GPLv2+, with exceptions for use of the library with certain
+# named open-source licenses; see COPYRIGHT
+PERMIT_PACKAGE_CDROM= Yes
USE_GMAKE= Yes
-USE_GROFF = Yes
-MULTI_PACKAGES= -main -perl -python -ruby
+MULTI_PACKAGES= -main -python -ruby -update
MODULES= lang/python lang/ruby
CONFIGURE_STYLE= gnu
+CPPFLAGS+= -I${X11BASE}/include/ \
+ -I${X11BASE}/include/freetype2
+LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib
+
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
+ --disable-libdbi \
+ --disable-lua \
+ --disable-tcl \
--enable-perl-site-install \
--enable-python \
- --enable-ruby-site-install \
- --disable-tcl
-CPPFLAGS+= -I${LOCALBASE}/include/libart-2.0 \
- -I${X11BASE}/include/ \
- -I${X11BASE}/include/freetype2
-LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib
+ --enable-ruby-site-install
+# needs checking before enabling mmap; is it safe without UBC?
+CONFIGURE_ARGS+= --disable-mmap
+
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="${LDFLAGS}" \
RUBY="${RUBY}"
-WANTLIB-main= c m z freetype png art_lgpl_2
-LIB_DEPENDS-main= graphics/png \
- graphics/libart
-RUN_DEPENDS-main=
+WANTLIB= pthread
+WANTLIB-update= ${WANTLIB} c m
+WANTLIB-python= ${WANTLIB} ${MODPY_WANTLIB} rrd
+WANTLIB-ruby= ${WANTLIB} ${MODRUBY_WANTLIB} c m rrd
+# depends on Perl ABI
+WANTLIB-main= ${WANTLIB} perl
+WANTLIB-main += X11 Xext Xrender c cairo expat ffi fontconfig freetype
+WANTLIB-main += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0
+WANTLIB-main += harfbuzz iconv intl m pango-1.0 pangocairo-1.0
+WANTLIB-main += pangoft2-1.0 pcre pixman-1 png pthread-stubs xcb
+WANTLIB-main += xcb-render xcb-shm xml2 z
-WANTLIB-perl= c m z rrd
-LIB_DEPENDS-perl= rrdtool-${VERSION}:net/rrdtool
-RUN_DEPENDS-perl=
+LIB_DEPENDS-main= graphics/png \
+ devel/pango \
+ textproc/libxml
+RUN_DEPENDS-main= rrdupdate-${VERSION}:net/rrdtool,-update
-WANTLIB-python = c pthread rrd ${MODPY_WANTLIB}
LIB_DEPENDS-python= rrdtool-${VERSION}:net/rrdtool
RUN_DEPENDS-python= ${MODPY_RUN_DEPENDS}
-MODPY_EGG_VERSION= 0.2.1
-MODRUBY_REV= 1.8
LIB_DEPENDS-ruby= rrdtool-${VERSION}:net/rrdtool \
${MODRUBY_LIB_DEPENDS}
-WANTLIB-ruby= c m rrd ${MODRUBY_WANTLIB}
+
+post-install:
+ cd ${WRKSRC}; ${INSTALL_DATA} CHANGES CONTRIBUTORS COPYRIGHT \
+ NEWS README ${PREFIX}/share/doc/rrdtool
+ rm -r ${PREFIX}/share/doc/rrdtool/txt
+ ${SUBST_CMD} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${FILESDIR}/rrdtool-chroot.sh \
+ ${PREFIX}/share/examples/rrdtool/rrdtool-chroot
+ rm -rf ${PREFIX}/share/doc/rrdtool/html
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/rrdtool/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo 26 Jan 2009 21:26:32 -0000 1.10
+++ distinfo 15 Jun 2013 09:15:18 -0000
@@ -1,5 +1,2 @@
-MD5 (rrdtool-1.2.30.tar.gz) = GbJPcYSo2/e0jBu7VlrZ+w==
-RMD160 (rrdtool-1.2.30.tar.gz) = 7k1JL+5OEJ2onKhb2d1WHLnd/Ow=
-SHA1 (rrdtool-1.2.30.tar.gz) = yFDcYAi9ZYDu+kJX4zn3i9P3j6M=
-SHA256 (rrdtool-1.2.30.tar.gz) = MZDv6kEKbdA1eZcXlIst8JkQ9gjXLSPuga2tTNAYSuk=
-SIZE (rrdtool-1.2.30.tar.gz) = 1092483
+SHA256 (rrdtool-1.4.8.tar.gz) = 3pW59apIiwaDYAqtWgfDFvjZjL6NAKoKHIfisu+J89Y=
+SIZE (rrdtool-1.4.8.tar.gz) = 1379482
Index: files/rrdtool-chroot.sh
===================================================================
RCS file: files/rrdtool-chroot.sh
diff -N files/rrdtool-chroot.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/rrdtool-chroot.sh 15 Jun 2013 09:15:18 -0000
@@ -0,0 +1,59 @@
+#!/bin/ksh
+#
+# make rrdtool(1) available in Apache chroot(8)
+
+# WARNING: /var/www/usr/libexec/ld.so and /var/www/lib/* may be shared
+# by other executables in the chroot(8)
+
+if [ "$(id -u)" -ne 0 ]; then
+ echo " *** Error: need root privileges to run this script"
+ exit 1
+fi
+
+do_enable() {
+ mkdir -p
/var/www{/etc/{pango,fonts/TTF},/usr/lib,/usr/libexec,${LOCALBASE}/bin,${X11BASE}/lib,/cache/fontconfig}
+ cp -p ${LOCALBASE}/bin/rrdtool /var/www${LOCALBASE}/bin
+ for i in $(ldd ${LOCALBASE}/bin/rrdtool | grep 'lib/' | awk '{ print $7
}') ; do \
+ cp -p $i /var/www/usr/lib/
+ done
+ cp -p ${LOCALBASE}/lib/pango/*/modules/pango-basic-fc.so
/var/www/usr/lib/
+ cp -p /usr/libexec/ld.so /var/www/usr/libexec/
+ cp -p /usr/X11R6/lib/X11/fonts/TTF/DejaVuSans.ttf /var/www/etc/fonts/TTF
+ cat << EOF > /var/www/etc/fonts/fonts.conf
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+ <dir>/etc/fonts/TTF</dir>
+ <cachedir>/cache/fontconfig</cachedir>
+</fontconfig>
+EOF
+ cat << EOF > /var/www/etc/pango/pango.modules
+/usr/lib/pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc
common:
+EOF
+}
+
+do_disable() {
+ rm -rf /var/www/usr/local/bin/rrdtool \
+ /var/www/usr/libexec/ld.so \
+ /var/www/etc/fonts \
+ /var/www/etc/pango \
+ /var/www/cache/fontconfig
+ for i in $(ldd ${LOCALBASE}/bin/rrdtool | grep 'lib/' | awk '{ print $7
}') ; do \
+ rm -f /var/www/usr/lib/$(basename $i | sed -e 's,\.so.*,,')*
+ done
+ rm -f /var/www/usr/lib/pango-basic-fc.so
+ rmdir
/var/www{/etc/fonts,${LOCALBASE}/bin,${LOCALBASE},/usr/lib,/usr/libexec,/usr}
2>/dev/null
+}
+
+case $1 in
+enable)
+ do_disable
+ do_enable
+ ;;
+disable)
+ do_disable
+ ;;
+*)
+ echo "usage: ${0##*/} {enable|disable}"
+ ;;
+esac
Index: patches/patch-bindings_Makefile_in
===================================================================
RCS file: patches/patch-bindings_Makefile_in
diff -N patches/patch-bindings_Makefile_in
--- patches/patch-bindings_Makefile_in 26 Jan 2009 21:26:32 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- bindings/Makefile.in.orig Wed Jul 23 14:56:19 2008
-+++ bindings/Makefile.in Thu Dec 11 11:22:50 2008
-@@ -560,7 +560,7 @@ ruby:
-
- # rules for buildung the pyton module
- python:
-- cd python && env BUILDLIBDIR=../../src/.libs $(PYTHON) setup.py
build_ext --rpath=$(libdir) && env LIBDIR=../../src/.libs $(PYTHON) setup.py
build
-+ cd python && env BUILDLIBDIR=../../src/.libs INCDIR=../../src $(PYTHON)
setup.py build_ext --rpath=$(libdir) && env LIBDIR=../../src/.libs $(PYTHON)
setup.py build
-
- # rules for building the perl module
- perl_piped: perl-piped/Makefile
Index: patches/patch-bindings_ruby_extconf_rb
===================================================================
RCS file: /cvs/ports/net/rrdtool/patches/patch-bindings_ruby_extconf_rb,v
retrieving revision 1.2
diff -u -p -r1.2 patch-bindings_ruby_extconf_rb
--- patches/patch-bindings_ruby_extconf_rb 3 Jul 2010 01:55:24 -0000
1.2
+++ patches/patch-bindings_ruby_extconf_rb 15 Jun 2013 09:15:18 -0000
@@ -1,7 +1,6 @@
-$OpenBSD: patch-bindings_ruby_extconf_rb,v 1.2 2010/07/03 01:55:24 espie Exp $
-doesnt find the lib it just created for whatever reason...
---- bindings/ruby/extconf.rb.orig Mon Jan 19 15:29:14 2009
-+++ bindings/ruby/extconf.rb Sat Jul 3 03:44:44 2010
+$OpenBSD$
+--- bindings/ruby/extconf.rb.orig Thu May 23 08:55:07 2013
++++ bindings/ruby/extconf.rb Thu May 23 20:20:56 2013
@@ -14,5 +14,5 @@ elsif /aix/ =~ RUBY_PLATFORM
end
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure 15 Jun 2013 09:15:18 -0000
@@ -0,0 +1,29 @@
+$OpenBSD$
+--- configure.orig Thu May 23 08:55:19 2013
++++ configure Thu Jun 13 21:41:18 2013
+@@ -17662,6 +17662,9 @@ case "${host_cpu}-${host_os}" in
+
+ acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags"
+ ;;
++ *openbsd*)
++ acx_pthread_flags="pthread $acx_pthread_flags"
++ ;;
+ esac
+
+ if test x"$acx_pthread_ok" = xno; then
+@@ -23863,6 +23866,7 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_u
+ fi
+
+
++if false; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking in" >&5
+ $as_echo_n "checking in... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: and out again" >&5
+@@ -23880,6 +23884,7 @@ echo $ECHO_N ".$ECHO_C" 1>&6
+ sleep 1
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: just kidding ;-)" >&5
+ $as_echo " just kidding ;-)" >&6; }
++fi
+ echo
+ echo "----------------------------------------------------------------"
+ echo "Config is DONE!"
Index: patches/patch-doc_Makefile_in
===================================================================
RCS file: /cvs/ports/net/rrdtool/patches/patch-doc_Makefile_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-doc_Makefile_in
--- patches/patch-doc_Makefile_in 26 Jan 2009 21:26:32 -0000 1.7
+++ patches/patch-doc_Makefile_in 15 Jun 2013 09:15:18 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.7 2009/01/26 21:26:32 sthen Exp $
---- doc/Makefile.in.orig Wed Jul 23 15:56:19 2008
-+++ doc/Makefile.in Sat Nov 22 14:09:31 2008
-@@ -150,7 +150,7 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
+$OpenBSD$
+--- doc/Makefile.in.orig Thu May 23 08:55:21 2013
++++ doc/Makefile.in Thu May 23 19:34:50 2013
+@@ -203,7 +203,7 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -9,4 +9,4 @@ $OpenBSD: patch-doc_Makefile_in,v 1.7 20
+RRDDOCDIR = $(datadir)/doc/rrdtool
RRDGRAPH_YLEGEND_ANGLE = @RRDGRAPH_YLEGEND_ANGLE@
RRD_DEFAULT_FONT = @RRD_DEFAULT_FONT@
- RUBY = @RUBY@
+ RRD_GETOPT_LONG = @RRD_GETOPT_LONG@
Index: patches/patch-examples_Makefile_in
===================================================================
RCS file: /cvs/ports/net/rrdtool/patches/patch-examples_Makefile_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-examples_Makefile_in
--- patches/patch-examples_Makefile_in 26 Jan 2009 21:26:32 -0000 1.7
+++ patches/patch-examples_Makefile_in 15 Jun 2013 09:15:18 -0000
@@ -1,9 +1,9 @@
-$OpenBSD: patch-examples_Makefile_in,v 1.7 2009/01/26 21:26:32 sthen Exp $
---- examples/Makefile.in.orig Wed Jul 23 15:56:19 2008
-+++ examples/Makefile.in Sat Nov 22 14:09:31 2008
-@@ -227,7 +227,7 @@ target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
+$OpenBSD$
+--- examples/Makefile.in.orig Thu May 23 08:55:21 2013
++++ examples/Makefile.in Thu May 23 19:34:50 2013
+@@ -339,7 +339,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = rrdcached
EXTRA_DIST = cgi-demo.cgi.in
-examplesdir = $(pkgdatadir)/examples
+examplesdir = $(datadir)/examples/rrdtool
Index: patches/patch-examples_rrdcached_Makefile_in
===================================================================
RCS file: patches/patch-examples_rrdcached_Makefile_in
diff -N patches/patch-examples_rrdcached_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-examples_rrdcached_Makefile_in 15 Jun 2013 09:15:18
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- examples/rrdcached/Makefile.in.orig Thu May 23 08:55:21 2013
++++ examples/rrdcached/Makefile.in Thu May 23 19:34:50 2013
+@@ -292,7 +292,7 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-examplesdir = $(pkgdatadir)/examples/rrdcached
++examplesdir = $(datadir)/examples/rrdtool/rrdcached
+ examples_SCRIPTS = RRDCached.pm rrdcached-size.pl
+ EXTRA_DIST = RRDCached.pm rrdcached-size.pl
+ all: all-am
Index: patches/patch-rrd_config_h_in
===================================================================
RCS file: patches/patch-rrd_config_h_in
diff -N patches/patch-rrd_config_h_in
--- patches/patch-rrd_config_h_in 26 Jan 2009 21:26:32 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-rrd_config_h_in,v 1.1 2009/01/26 21:26:32 sthen Exp $
---- rrd_config.h.in.orig Wed Jul 23 15:56:17 2008
-+++ rrd_config.h.in Sat Nov 22 14:09:31 2008
-@@ -283,12 +283,12 @@
- # include <errno.h>
- #endif
-
--#if defined(HAVE_SYS_MMAN_H)
--#include <sys/mman.h>
--#endif
--
- #ifdef HAVE_SYS_TYPES_H
- # include <sys/types.h>
-+#endif
-+
-+#if defined(HAVE_SYS_MMAN_H)
-+#include <sys/mman.h>
- #endif
-
- #ifdef HAVE_SYS_PARAM_H
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: patches/patch-src_Makefile_in
diff -N patches/patch-src_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Makefile_in 15 Jun 2013 09:15:18 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/Makefile.in.orig Thu Jun 13 21:49:12 2013
++++ src/Makefile.in Thu Jun 13 21:50:01 2013
+@@ -466,7 +466,7 @@ include_HEADERS = rrd.h rrd_format.h rrd_client.h
+ rrdcgi_SOURCES = rrd_cgi.c
+ rrdcgi_LDADD = librrd.la
+ rrdupdate_SOURCES = rrdupdate.c
+-rrdupdate_LDADD = librrdupd.la
++rrdupdate_LDADD = librrdupd.la -lpthread
+ rrdtool_SOURCES = rrd_tool.c
+ rrdtool_DEPENDENCIES = librrd.la
+ rrdtool_LDADD = librrd.la
Index: patches/patch-src_rrd_config_bottom_h
===================================================================
RCS file: patches/patch-src_rrd_config_bottom_h
diff -N patches/patch-src_rrd_config_bottom_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_rrd_config_bottom_h 15 Jun 2013 09:15:18 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+--- src/rrd_config_bottom.h.orig Thu May 23 08:55:07 2013
++++ src/rrd_config_bottom.h Thu May 23 19:34:50 2013
+@@ -15,12 +15,21 @@
+ #endif
+
+ /* FreeBSD 4.8 wants this included BEFORE sys/types.h */
++#ifdef FreeBSD
+ #ifdef HAVE_SYS_MMAN_H
+ # include <sys/mman.h>
+ #endif
++#endif
+
+ #ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
++#endif
++
++/* ... but OpenBSD must have it included AFTER sys/types.h */
++#ifndef FreeBSD
++#ifdef HAVE_SYS_MMAN_H
++# include <sys/mman.h>
++#endif
+ #endif
+
+ #ifdef HAVE_SYS_PARAM_H
Index: patches/patch-src_rrdupdate_c
===================================================================
RCS file: patches/patch-src_rrdupdate_c
diff -N patches/patch-src_rrdupdate_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_rrdupdate_c 15 Jun 2013 09:15:18 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+https://github.com/oetiker/rrdtool-1.x/pull/401
+
+--- src/rrdupdate.c.orig Sat Jun 15 10:07:57 2013
++++ src/rrdupdate.c Sat Jun 15 10:08:13 2013
+@@ -15,7 +15,12 @@
+ #endif
+
+ #include "rrd.h"
++/* for basename */
++#ifdef HAVE_LIBGEN_H
++# include <libgen.h>
++#else
+ #include "plbasename.h"
++#endif
+
+ int main(
+ int argc,
Index: pkg/DESCR-main
===================================================================
RCS file: /cvs/ports/net/rrdtool/pkg/DESCR-main,v
retrieving revision 1.1
diff -u -p -r1.1 DESCR-main
--- pkg/DESCR-main 12 Sep 2007 14:34:37 -0000 1.1
+++ pkg/DESCR-main 15 Jun 2013 09:15:18 -0000
@@ -1,11 +1,8 @@
-If you know MRTG, you can think of RRDtool as a reimplementation of
-MRTGs graphing and logging features. Magnitudes faster and more
-flexible than you ever thought possible
+RRDtool is a high performance data logging and graphing system for time
+series data (i.e. network bandwidth, machine-room temperature, server
+load average, etc). RRDtool can be easily integrated in shell scripts,
+perl, python, ruby, lua or tcl applications. It stores the data in a
+very compact way that will not expand over time, and it presents useful
+graphs by processing the data to enforce a certain data density.
-RRD is the Acronym for Round Robin Database. RRD is a system to store
-and display time-series data (i.e. network bandwidth, machine-room
-temperature, server load average). It stores the data in a very compact
-way that will not expand over time, and it presents useful graphs by
-processing the data to enforce a certain data density. It can be used
-either via simple wrapper scripts (from shell or Perl) or via frontends
-that poll network devices and put a friendly user interface on it
+This package includes the main software and perl bindings.
Index: pkg/DESCR-perl
===================================================================
RCS file: pkg/DESCR-perl
diff -N pkg/DESCR-perl
--- pkg/DESCR-perl 12 Sep 2007 14:34:37 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-perl bindings to librrd
Index: pkg/DESCR-update
===================================================================
RCS file: pkg/DESCR-update
diff -N pkg/DESCR-update
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-update 15 Jun 2013 09:15:18 -0000
@@ -0,0 +1,10 @@
+RRDtool is a high performance data logging and graphing system for time
+series data (i.e. network bandwidth, machine-room temperature, server
+load average, etc). RRDtool can be easily integrated in shell scripts,
+perl, python, ruby, lua or tcl applications. It stores the data in a
+very compact way that will not expand over time, and it presents useful
+graphs by processing the data to enforce a certain data density.
+
+This package includes the standalone rrdupdate/rrdinfo/rrdcreate tools,
+which are packaged separately for those only needing to update RRDs
+(but not draw graphs) without pulling in a big dependency chain.
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/rrdtool/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-main
--- pkg/PLIST-main 26 Jan 2009 21:26:32 -0000 1.2
+++ pkg/PLIST-main 15 Jun 2013 09:15:18 -0000
@@ -1,30 +1,45 @@
@comment $OpenBSD: PLIST-main,v 1.2 2009/01/26 21:26:32 sthen Exp $
+@newgroup _rrdcached:717
+@newuser _rrdcached:717:_rrdcached:daemon:rrdcached
user:/nonexistent:/sbin/nologin
+@conflict p5-RRD-*
+@extraunexec rm -f /var/db/rrd/*.rrd /var/db/rrd/journal/*
+@pkgpath net/rrdtool,-perl
+@bin bin/rrdcached
@bin bin/rrdcgi
@bin bin/rrdtool
-@bin bin/rrdupdate
include/rrd.h
+include/rrd_client.h
+include/rrd_format.h
lib/librrd.a
lib/librrd.la
@lib lib/librrd.so.${LIBrrd_VERSION}
lib/librrd_th.a
lib/librrd_th.la
@lib lib/librrd_th.so.${LIBrrd_th_VERSION}
+lib/pkgconfig/librrd.pc
+libdata/perl5/site_perl/RRDp.pm
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/RRDs.pm
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/RRDs/
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/RRDs/RRDs.bs
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/RRDs/RRDs.so
@man man/man1/bin_dec_hex.1
@man man/man1/cdeftutorial.1
@man man/man1/rpntutorial.1
@man man/man1/rrd-beginners.1
@man man/man1/rrdbuild.1
+@man man/man1/rrdcached.1
@man man/man1/rrdcgi.1
-@man man/man1/rrdcreate.1
@man man/man1/rrddump.1
@man man/man1/rrdfetch.1
@man man/man1/rrdfirst.1
+@man man/man1/rrdflushcached.1
@man man/man1/rrdgraph.1
@man man/man1/rrdgraph_data.1
@man man/man1/rrdgraph_examples.1
@man man/man1/rrdgraph_graph.1
@man man/man1/rrdgraph_rpn.1
-@man man/man1/rrdinfo.1
@man man/man1/rrdlast.1
@man man/man1/rrdlastupdate.1
@man man/man1/rrdresize.1
@@ -33,92 +48,34 @@ lib/librrd_th.la
@man man/man1/rrdtool.1
@man man/man1/rrdtune.1
@man man/man1/rrdtutorial.1
-@man man/man1/rrdupdate.1
@man man/man1/rrdxport.1
+@man man/man3/librrd.3
+@man man/man3p/RRDp.3p
+@man man/man3p/RRDs.3p
+share/doc/pkg-readmes/${FULLPKGNAME}
share/doc/rrdtool/
-share/doc/rrdtool/html/
-share/doc/rrdtool/html/bin_dec_hex.html
-share/doc/rrdtool/html/cdeftutorial.html
-share/doc/rrdtool/html/index.html
-share/doc/rrdtool/html/rpntutorial.html
-share/doc/rrdtool/html/rrd-beginners.html
-share/doc/rrdtool/html/rrdbuild.html
-share/doc/rrdtool/html/rrdcgi.html
-share/doc/rrdtool/html/rrdcreate.html
-share/doc/rrdtool/html/rrddump.html
-share/doc/rrdtool/html/rrdfetch.html
-share/doc/rrdtool/html/rrdfirst.html
-share/doc/rrdtool/html/rrdgraph.html
-share/doc/rrdtool/html/rrdgraph_data.html
-share/doc/rrdtool/html/rrdgraph_examples.html
-share/doc/rrdtool/html/rrdgraph_graph.html
-share/doc/rrdtool/html/rrdgraph_rpn.html
-share/doc/rrdtool/html/rrdinfo.html
-share/doc/rrdtool/html/rrdlast.html
-share/doc/rrdtool/html/rrdlastupdate.html
-share/doc/rrdtool/html/rrdresize.html
-share/doc/rrdtool/html/rrdrestore.html
-share/doc/rrdtool/html/rrdthreads.html
-share/doc/rrdtool/html/rrdtool.html
-share/doc/rrdtool/html/rrdtune.html
-share/doc/rrdtool/html/rrdtutorial.html
-share/doc/rrdtool/html/rrdupdate.html
-share/doc/rrdtool/html/rrdxport.html
-share/doc/rrdtool/txt/
-share/doc/rrdtool/txt/bin_dec_hex.pod
-share/doc/rrdtool/txt/bin_dec_hex.txt
-share/doc/rrdtool/txt/cdeftutorial.pod
-share/doc/rrdtool/txt/cdeftutorial.txt
-share/doc/rrdtool/txt/rpntutorial.pod
-share/doc/rrdtool/txt/rpntutorial.txt
-share/doc/rrdtool/txt/rrd-beginners.pod
-share/doc/rrdtool/txt/rrd-beginners.txt
-share/doc/rrdtool/txt/rrdbuild.pod
-share/doc/rrdtool/txt/rrdbuild.txt
-share/doc/rrdtool/txt/rrdcgi.pod
-share/doc/rrdtool/txt/rrdcgi.txt
-share/doc/rrdtool/txt/rrdcreate.pod
-share/doc/rrdtool/txt/rrdcreate.txt
-share/doc/rrdtool/txt/rrddump.pod
-share/doc/rrdtool/txt/rrddump.txt
-share/doc/rrdtool/txt/rrdfetch.pod
-share/doc/rrdtool/txt/rrdfetch.txt
-share/doc/rrdtool/txt/rrdfirst.pod
-share/doc/rrdtool/txt/rrdfirst.txt
-share/doc/rrdtool/txt/rrdgraph.pod
-share/doc/rrdtool/txt/rrdgraph.txt
-share/doc/rrdtool/txt/rrdgraph_data.pod
-share/doc/rrdtool/txt/rrdgraph_data.txt
-share/doc/rrdtool/txt/rrdgraph_examples.pod
-share/doc/rrdtool/txt/rrdgraph_examples.txt
-share/doc/rrdtool/txt/rrdgraph_graph.pod
-share/doc/rrdtool/txt/rrdgraph_graph.txt
-share/doc/rrdtool/txt/rrdgraph_rpn.pod
-share/doc/rrdtool/txt/rrdgraph_rpn.txt
-share/doc/rrdtool/txt/rrdinfo.pod
-share/doc/rrdtool/txt/rrdinfo.txt
-share/doc/rrdtool/txt/rrdlast.pod
-share/doc/rrdtool/txt/rrdlast.txt
-share/doc/rrdtool/txt/rrdlastupdate.pod
-share/doc/rrdtool/txt/rrdlastupdate.txt
-share/doc/rrdtool/txt/rrdresize.pod
-share/doc/rrdtool/txt/rrdresize.txt
-share/doc/rrdtool/txt/rrdrestore.pod
-share/doc/rrdtool/txt/rrdrestore.txt
-share/doc/rrdtool/txt/rrdthreads.pod
-share/doc/rrdtool/txt/rrdthreads.txt
-share/doc/rrdtool/txt/rrdtool.pod
-share/doc/rrdtool/txt/rrdtool.txt
-share/doc/rrdtool/txt/rrdtune.pod
-share/doc/rrdtool/txt/rrdtune.txt
-share/doc/rrdtool/txt/rrdtutorial.pod
-share/doc/rrdtool/txt/rrdtutorial.txt
-share/doc/rrdtool/txt/rrdupdate.pod
-share/doc/rrdtool/txt/rrdupdate.txt
-share/doc/rrdtool/txt/rrdxport.pod
-share/doc/rrdtool/txt/rrdxport.txt
+share/doc/rrdtool/CHANGES
+share/doc/rrdtool/CONTRIBUTORS
+share/doc/rrdtool/COPYRIGHT
+share/doc/rrdtool/NEWS
+share/doc/rrdtool/README
share/examples/rrdtool/
+share/examples/rrdtool/4charts.pl
+share/examples/rrdtool/bigtops.pl
share/examples/rrdtool/cgi-demo.cgi
-share/rrdtool/
-share/rrdtool/fonts/
-share/rrdtool/fonts/DejaVuSansMono-Roman.ttf
+share/examples/rrdtool/minmax.pl
+share/examples/rrdtool/perftest.pl
+share/examples/rrdtool/piped-demo.pl
+share/examples/rrdtool/rrdcached/
+share/examples/rrdtool/rrdcached/RRDCached.pm
+share/examples/rrdtool/rrdcached/rrdcached-size.pl
+share/examples/rrdtool/rrdtool-chroot
+share/examples/rrdtool/shared-demo.pl
+share/examples/rrdtool/stripes.pl
+@owner _rrdcached
+@mode 750
+@sample /var/db/rrd/
+@sample /var/db/rrd/journal/
+@mode
+@owner
+@rcscript ${RCDIR}/rrdcached
Index: pkg/PLIST-perl
===================================================================
RCS file: pkg/PLIST-perl
diff -N pkg/PLIST-perl
--- pkg/PLIST-perl 12 Sep 2007 14:34:37 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-@comment $OpenBSD: PLIST-perl,v 1.1 2007/09/12 14:34:37 msf Exp $
-libdata/perl5/site_perl/RRDp.pm
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/RRDs.pm
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/RRDs/
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/RRDs/RRDs.bs
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/RRDs/RRDs.so
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/ntmake.pl
-@man man/man3p/RRDp.3p
-@man man/man3p/RRDs.3p
-share/doc/rrdtool/html/RRDp.html
-share/doc/rrdtool/html/RRDs.html
-share/examples/rrdtool/4charts.pl
-share/examples/rrdtool/bigtops.pl
-share/examples/rrdtool/minmax.pl
-share/examples/rrdtool/perftest.pl
-share/examples/rrdtool/piped-demo.pl
-share/examples/rrdtool/shared-demo.pl
-share/examples/rrdtool/stripes.pl
Index: pkg/PLIST-ruby
===================================================================
RCS file: /cvs/ports/net/rrdtool/pkg/PLIST-ruby,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-ruby
--- pkg/PLIST-ruby 19 Jul 2011 18:00:16 -0000 1.4
+++ pkg/PLIST-ruby 15 Jun 2013 09:15:18 -0000
@@ -1,6 +1,2 @@
-@comment $OpenBSD: PLIST-ruby,v 1.4 2011/07/19 18:00:16 jeremy Exp $
-lib/ruby/
-lib/ruby/site_ruby/
-${MODRUBY_SITEDIR}/
-${MODRUBY_SITEARCHDIR}/
+@comment $OpenBSD: PLIST-ruby,v 1.3 2010/11/16 18:16:12 jeremy Exp $
${MODRUBY_SITEARCHDIR}/RRD.so
Index: pkg/PLIST-update
===================================================================
RCS file: pkg/PLIST-update
diff -N pkg/PLIST-update
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-update 15 Jun 2013 09:15:18 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-main,v 1.2 2009/01/26 21:26:32 sthen Exp $
+bin/rrdcreate
+bin/rrdinfo
+@bin bin/rrdupdate
+@man man/man1/rrdcreate.1
+@man man/man1/rrdinfo.1
+@man man/man1/rrdupdate.1
Index: pkg/README-main
===================================================================
RCS file: pkg/README-main
diff -N pkg/README-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/README-main 15 Jun 2013 09:15:18 -0000
@@ -0,0 +1,19 @@
+$OpenBSD: README.template,v 1.4 2011/06/02 13:44:40 ajacoutot Exp $
+
++-----------------------------------------------------------------------
+| Running ${FULLPKGNAME} on OpenBSD
++-----------------------------------------------------------------------
+
+Use within a chroot jail
+========================
+
+Under OpenBSD, the default Apache runs chrooted under /var/www.
+To use the rrdtool(1) binary from within this chroot (for example, as
+needed by some CGI/PHP scripts), we will need to copy it into the chroot
+along with the required libraries and configuration.
+To do so, run the following command:
+
+ # ${TRUEPREFIX}/share/examples/rrdtool/rrdtool-chroot
+
+Note that you will have to run this command again when the rrdtool
+package is updated.
Index: pkg/rrdcached.rc
===================================================================
RCS file: pkg/rrdcached.rc
diff -N pkg/rrdcached.rc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/rrdcached.rc 15 Jun 2013 09:15:18 -0000
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# $OpenBSD$
+
+daemon="${TRUEPREFIX}/bin/rrdcached"
+daemon_flags="-b /var/db/rrd -l unix:/var/run/rrd/rrdcached.sock -j
/var/db/rrd/journal -p /var/run/rrd/rrdcached.pid"
+daemon_user="_rrdcached"
+
+. /etc/rc.d/rc.subr
+
+rc_reload=NO
+
+rc_pre() {
+ install -d -o _rrdcached -g _rrdcached -m 750 /var/run/rrd
+}
+
+rc_cmd $1
