Mon Jul 28 19:48:03 2008 UTC ()
Imported the old rrdtool 1.2.x due to many private requests. This has
less dependencies...

Status:

Vendor Tag:	TNF
Release Tags:	pkgsrc-base


(martti)
diff -r0 -r1.1.1.1 pkgsrc/databases/rrdtool12/PLIST
diff -r0 -r1.1.1.1 pkgsrc/databases/rrdtool12/distinfo
diff -r0 -r1.1.1.1 pkgsrc/databases/rrdtool12/buildlink3.mk
diff -r0 -r1.1.1.1 pkgsrc/databases/rrdtool12/DESCR
diff -r0 -r1.1.1.1 pkgsrc/databases/rrdtool12/Makefile
diff -r0 -r1.1.1.1 pkgsrc/databases/rrdtool12/patches/patch-ay
diff -r0 -r1.1.1.1 pkgsrc/databases/rrdtool12/patches/patch-al
diff -r0 -r1.1.1.1 pkgsrc/databases/rrdtool12/patches/patch-as
diff -r0 -r1.1.1.1 pkgsrc/databases/rrdtool12/patches/patch-av
diff -r0 -r1.1.1.1 pkgsrc/databases/rrdtool12/patches/patch-aw

File Added: pkgsrc/databases/rrdtool12/PLIST
@comment $NetBSD: PLIST,v 1.1.1.1 2008/07/28 19:48:03 martti Exp $
bin/rrdcgi
bin/rrdtool
bin/rrdupdate
include/rrd.h
lib/librrd.la
lib/librrd_th.la
man/man1/bin_dec_hex.1
man/man1/cdeftutorial.1
man/man1/rpntutorial.1
man/man1/rrd-beginners.1
man/man1/rrdbuild.1
man/man1/rrdcgi.1
man/man1/rrdcreate.1
man/man1/rrddump.1
man/man1/rrdfetch.1
man/man1/rrdfirst.1
man/man1/rrdgraph.1
man/man1/rrdgraph_data.1
man/man1/rrdgraph_examples.1
man/man1/rrdgraph_graph.1
man/man1/rrdgraph_rpn.1
man/man1/rrdinfo.1
man/man1/rrdlast.1
man/man1/rrdlastupdate.1
man/man1/rrdresize.1
man/man1/rrdrestore.1
man/man1/rrdthreads.1
man/man1/rrdtool.1
man/man1/rrdtune.1
man/man1/rrdtutorial.1
man/man1/rrdupdate.1
man/man1/rrdxport.1
share/doc/rrdtool-${PKGVERSION}/html/RRDp.html
share/doc/rrdtool-${PKGVERSION}/html/RRDs.html
share/doc/rrdtool-${PKGVERSION}/html/bin_dec_hex.html
share/doc/rrdtool-${PKGVERSION}/html/cdeftutorial.html
share/doc/rrdtool-${PKGVERSION}/html/index.html
share/doc/rrdtool-${PKGVERSION}/html/rpntutorial.html
share/doc/rrdtool-${PKGVERSION}/html/rrd-beginners.html
share/doc/rrdtool-${PKGVERSION}/html/rrdbuild.html
share/doc/rrdtool-${PKGVERSION}/html/rrdcgi.html
share/doc/rrdtool-${PKGVERSION}/html/rrdcreate.html
share/doc/rrdtool-${PKGVERSION}/html/rrddump.html
share/doc/rrdtool-${PKGVERSION}/html/rrdfetch.html
share/doc/rrdtool-${PKGVERSION}/html/rrdfirst.html
share/doc/rrdtool-${PKGVERSION}/html/rrdgraph.html
share/doc/rrdtool-${PKGVERSION}/html/rrdgraph_data.html
share/doc/rrdtool-${PKGVERSION}/html/rrdgraph_examples.html
share/doc/rrdtool-${PKGVERSION}/html/rrdgraph_graph.html
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
share/doc/rrdtool-${PKGVERSION}/html/rrdresize.html
share/doc/rrdtool-${PKGVERSION}/html/rrdrestore.html
share/doc/rrdtool-${PKGVERSION}/html/rrdthreads.html
share/doc/rrdtool-${PKGVERSION}/html/rrdtool.html
share/doc/rrdtool-${PKGVERSION}/html/rrdtune.html
share/doc/rrdtool-${PKGVERSION}/html/rrdtutorial.html
share/doc/rrdtool-${PKGVERSION}/html/rrdupdate.html
share/doc/rrdtool-${PKGVERSION}/html/rrdxport.html
share/doc/rrdtool-${PKGVERSION}/txt/bin_dec_hex.pod
share/doc/rrdtool-${PKGVERSION}/txt/bin_dec_hex.txt
share/doc/rrdtool-${PKGVERSION}/txt/cdeftutorial.pod
share/doc/rrdtool-${PKGVERSION}/txt/cdeftutorial.txt
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/rrdbuild.pod
share/doc/rrdtool-${PKGVERSION}/txt/rrdbuild.txt
share/doc/rrdtool-${PKGVERSION}/txt/rrdcgi.pod
share/doc/rrdtool-${PKGVERSION}/txt/rrdcgi.txt
share/doc/rrdtool-${PKGVERSION}/txt/rrdcreate.pod
share/doc/rrdtool-${PKGVERSION}/txt/rrdcreate.txt
share/doc/rrdtool-${PKGVERSION}/txt/rrddump.pod
share/doc/rrdtool-${PKGVERSION}/txt/rrddump.txt
share/doc/rrdtool-${PKGVERSION}/txt/rrdfetch.pod
share/doc/rrdtool-${PKGVERSION}/txt/rrdfetch.txt
share/doc/rrdtool-${PKGVERSION}/txt/rrdfirst.pod
share/doc/rrdtool-${PKGVERSION}/txt/rrdfirst.txt
share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph.pod
share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph.txt
share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_data.pod
share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_data.txt
share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_examples.pod
share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_examples.txt
share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_graph.pod
share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_graph.txt
share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_rpn.pod
share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_rpn.txt
share/doc/rrdtool-${PKGVERSION}/txt/rrdinfo.pod
share/doc/rrdtool-${PKGVERSION}/txt/rrdinfo.txt
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
share/doc/rrdtool-${PKGVERSION}/txt/rrdresize.pod
share/doc/rrdtool-${PKGVERSION}/txt/rrdresize.txt
share/doc/rrdtool-${PKGVERSION}/txt/rrdrestore.pod
share/doc/rrdtool-${PKGVERSION}/txt/rrdrestore.txt
share/doc/rrdtool-${PKGVERSION}/txt/rrdthreads.pod
share/doc/rrdtool-${PKGVERSION}/txt/rrdthreads.txt
share/doc/rrdtool-${PKGVERSION}/txt/rrdtool.pod
share/doc/rrdtool-${PKGVERSION}/txt/rrdtool.txt
share/doc/rrdtool-${PKGVERSION}/txt/rrdtune.pod
share/doc/rrdtool-${PKGVERSION}/txt/rrdtune.txt
share/doc/rrdtool-${PKGVERSION}/txt/rrdtutorial.pod
share/doc/rrdtool-${PKGVERSION}/txt/rrdtutorial.txt
share/doc/rrdtool-${PKGVERSION}/txt/rrdupdate.pod
share/doc/rrdtool-${PKGVERSION}/txt/rrdupdate.txt
share/doc/rrdtool-${PKGVERSION}/txt/rrdxport.pod
share/doc/rrdtool-${PKGVERSION}/txt/rrdxport.txt
share/examples/rrdtool/4charts.pl
share/examples/rrdtool/bigtops.pl
share/examples/rrdtool/cgi-demo.cgi
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
share/rrdtool/fonts/DejaVuSansMono-Roman.ttf
@dirrm share/examples/rrdtool
@dirrm share/rrdtool/fonts
@dirrm share/rrdtool
@dirrm share/doc/rrdtool-${PKGVERSION}/html
@dirrm share/doc/rrdtool-${PKGVERSION}/txt
@dirrm share/doc/rrdtool-${PKGVERSION}

File Added: pkgsrc/databases/rrdtool12/distinfo
$NetBSD: distinfo,v 1.1.1.1 2008/07/28 19:48:03 martti Exp $

SHA1 (rrdtool-1.2.28.tar.gz) = a8ca75fcf7b32ca94b057fa663e5f989522e2df9
RMD160 (rrdtool-1.2.28.tar.gz) = 11a4c6414037b3ce0e49d49b458f9fc13f3ef7ba
Size (rrdtool-1.2.28.tar.gz) = 1089006 bytes
SHA1 (patch-al) = d60ff005ac635f0fcbc5222be419a9f08c326817
SHA1 (patch-as) = f29600b678eec1d612f7bf59a4fbf4e9a91cf5a0
SHA1 (patch-av) = 2499cb7f42dd1438d4126135a8305409a5dff744
SHA1 (patch-aw) = 48698606d9e0685a2284ea2d02723a946fd22f95
SHA1 (patch-ay) = a9b9e9be3364f9b0ea5c407f841aced60b9ac3f0

File Added: pkgsrc/databases/rrdtool12/buildlink3.mk
# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/07/28 19:48:03 martti Exp $

BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
RRDTOOL_BUILDLINK3_MK:=	${RRDTOOL_BUILDLINK3_MK}+

.if ${BUILDLINK_DEPTH} == "+"
BUILDLINK_DEPENDS+=	rrdtool
.endif

BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrrdtool}
BUILDLINK_PACKAGES+=	rrdtool
BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rrdtool

.if ${RRDTOOL_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.rrdtool+=	rrdtool>=1.2.26
BUILDLINK_PKGSRCDIR.rrdtool?=	../../databases/rrdtool
.endif	# RRDTOOL_BUILDLINK3_MK

.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/libart/buildlink3.mk"

BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}

File Added: pkgsrc/databases/rrdtool12/DESCR
Round Robin Database Tools
==========================

It is pretty easy to gather status information from all sorts of things,
ranging from the temperature in your office to the number of octets which
have passed through the FDDI interface of your router. But it is not so
trivial to store this data in a efficient and systematic manner. This is
where RRDtool kicks in. It lets you log and analyze the data you gather from
all kinds of data-sources (DS). The data analysis part of RRDtool is based
on the ability to quickly generate graphical representations of the data
values collected over a definable time period.

File Added: pkgsrc/databases/rrdtool12/Makefile
# $NetBSD: Makefile,v 1.1.1.1 2008/07/28 19:48:03 martti Exp $

DISTNAME=	rrdtool-1.2.28
#PKGREVISION=	1
CATEGORIES=	databases graphics net
MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/

MAINTAINER=	martti@NetBSD.org
HOMEPAGE=	http://oss.oetiker.ch/rrdtool/
COMMENT=	Data analysis tool generating graphical representations
#LICENSE=	gnu-gpl-v2

PKG_DESTDIR_SUPPORT=	user-destdir

USE_LIBTOOL=		yes
USE_TOOLS+=		gmake pkg-config perl
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

PTHREAD_OPTS+=		require
PERL5_CONFIGURE=	no
PERL5_PACKLIST+=	auto/RRDp/.packlist
PERL5_PACKLIST+=	auto/RRDs/.packlist

# rrdtool explicitly forbids any use of -ffast-math
BUILDLINK_TRANSFORM+=	rm:-ffast-math

SUBST_CLASSES+=		prefix
SUBST_STAGE.prefix=	post-build
SUBST_MESSAGE.prefix=	Fixing $${prefix} in scripts.
SUBST_FILES.prefix=	examples/cgi-demo.cgi
SUBST_SED.prefix=	-e '1s,^\#! \$${prefix},\#! ${PREFIX},'

.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/libart/buildlink3.mk"
.include "../../lang/perl5/module.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

File Added: pkgsrc/databases/rrdtool12/patches/patch-ay
$NetBSD: patch-ay,v 1.1.1.1 2008/07/28 19:48:03 martti Exp $

Adjust for pkgsrc.

--- src/rrd_dump.c.orig	2007-05-02 21:06:10.000000000 +0300
+++ src/rrd_dump.c	2007-05-16 08:44:23.000000000 +0300
@@ -113,7 +113,7 @@
 # error "Need strftime"
 #endif
     fprintf(out_file, "\t<lastupdate> %ld </lastupdate> <!-- %s -->\n\n",
-	   rrd.live_head->last_up,somestring);
+	   (long) rrd.live_head->last_up,somestring);
     for(i=0;i<rrd.stat_head->ds_cnt;i++){
 	   fprintf(out_file, "\t<ds>\n");
 	   fprintf(out_file, "\t\t<name> %s </name>\n",rrd.ds_def[i].ds_nam);

File Added: pkgsrc/databases/rrdtool12/patches/patch-al
$NetBSD: patch-al,v 1.1.1.1 2008/07/28 19:48:03 martti Exp $

Adjust for pkgsrc.

--- examples/Makefile.in.orig	2008-07-23 16:56:19.000000000 +0300
+++ examples/Makefile.in	2008-07-28 22:34:47.000000000 +0300
@@ -227,7 +227,7 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
 EXTRA_DIST = cgi-demo.cgi.in
-examplesdir = $(pkgdatadir)/examples
+examplesdir = $(prefix)/share/examples/rrdtool
 examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl \
 	stripes.pl bigtops.pl minmax.pl 4charts.pl perftest.pl
 

File Added: pkgsrc/databases/rrdtool12/patches/patch-as
$NetBSD: patch-as,v 1.1.1.1 2008/07/28 19:48:03 martti Exp $

Adjust for pkgsrc.

--- src/rrd_cgi.c.orig	2006-05-04 15:26:28.000000000 +0200
+++ src/rrd_cgi.c
@@ -418,7 +418,7 @@ int main(int argc, char *argv[]) {
 
 	if (!filter) {
 		printf ("Content-Type: text/html\n" 
-				"Content-Length: %d\n", 
+				"Content-Length: %zd\n", 
 				strlen(buffer));
 
 		if (labs(goodfor) > 0) {

File Added: pkgsrc/databases/rrdtool12/patches/patch-av
$NetBSD: patch-av,v 1.1.1.1 2008/07/28 19:48:03 martti Exp $

Adjust for pkgsrc.

--- src/parsetime.c.orig	2005-05-28 22:31:55.000000000 +0930
+++ src/parsetime.c	2005-06-19 14:05:00.000000000 +0930
@@ -662,6 +662,7 @@
     /* using time_t seems to help portability with 64bit oses */    
     time_t mday=0, wday, mon, year = ptv->tm.tm_year;
     int tlen;
+    time_t montime;
 
     switch (sc_tokid) {
     case YESTERDAY:
@@ -716,7 +717,8 @@
 	    tlen = strlen(sc_token);
 	    mon = atol(sc_token);
             if (mon > 10*365*24*60*60) {
-		ptv->tm=*localtime(&mon);
+		montime = mon;
+		ptv->tm=*localtime(&montime);
 		token();
 		break;
 	    }

File Added: pkgsrc/databases/rrdtool12/patches/patch-aw
$NetBSD: patch-aw,v 1.1.1.1 2008/07/28 19:48:03 martti Exp $

Adjust for pkgsrc.

--- src/rrd_tool.c.orig	2007-11-20 02:15:10.000000000 +0200
+++ src/rrd_tool.c	2007-11-20 12:58:12.000000000 +0200
@@ -699,9 +699,9 @@
 	  printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n\n", XML_ENCODING);
 	  printf("<%s>\n", ROOT_TAG);
 	  printf("  <%s>\n", META_TAG);
-	  printf("    <%s>%lu</%s>\n", META_START_TAG, start+step, META_START_TAG);
+	  printf("    <%s>%lu</%s>\n", META_START_TAG, (unsigned long) start+step, META_START_TAG);
 	  printf("    <%s>%lu</%s>\n", META_STEP_TAG, step, META_STEP_TAG);
-	  printf("    <%s>%lu</%s>\n", META_END_TAG, end, META_END_TAG);
+	  printf("    <%s>%lu</%s>\n", META_END_TAG, (unsigned long) end, META_END_TAG);
 	  printf("    <%s>%lu</%s>\n", META_ROWS_TAG, row_cnt, META_ROWS_TAG);
 	  printf("    <%s>%lu</%s>\n", META_COLS_TAG, col_cnt, META_COLS_TAG);
 	  printf("    <%s>\n", LEGEND_TAG);
@@ -717,7 +717,7 @@
 	  printf("  <%s>\n", DATA_TAG);
 	  for (ti = start+step; ti <= end; ti += step) {
 	    printf ("    <%s>", DATA_ROW_TAG);
-	    printf ("<%s>%lu</%s>", COL_TIME_TAG, ti, COL_TIME_TAG);
+	    printf ("<%s>%lu</%s>", COL_TIME_TAG, (unsigned long) ti, COL_TIME_TAG);
 	    for (j = 0; j < col_cnt; j++) {
 	      rrd_value_t newval = DNAN;
               if (enumds == 1)