pullup ticket #2636 - requested by rafal
rrdtool: fix LP64BE problem
revisions pulled up:
pkgsrc/databases/rrdtool/Makefile 1.75
pkgsrc/databases/rrdtool/distinfo 1.35
pkgsrc/databases/rrdtool/patches/patch-aa 1.13
Module Name: pkgsrc
Committed By: rafal
Date: Fri Jan 16 02:23:03 UTC 2009
Modified Files:
pkgsrc/databases/rrdtool: Makefile distinfo
Added Files:
pkgsrc/databases/rrdtool/patches: patch-aa
Log Message:
Fix a LP64BE problem with 'rrdtool graph' where it claimed all graphs
+generated
were always of size 0x0. Patch already applied upstream.
(rtr)
diff -r1.74 -r1.74.2.1 pkgsrc/databases/rrdtool/Makefile| @@ -1,16 +1,18 @@ | @@ -1,16 +1,18 @@ | |||
| 1 | # $NetBSD: Makefile,v 1.74 2009/01/02 20:07:07 martti Exp $ | 1 | # $NetBSD: Makefile,v 1.74.2.1 2009/01/18 10:30:48 rtr Exp $ | |
| 2 | 2 | |||
| 3 | DISTNAME= rrdtool-1.3.5 | 3 | DISTNAME= rrdtool-1.3.5 | |
| 4 | PKGREVISION= 1 | |||
| 5 | ||||
| 4 | CATEGORIES= databases graphics net | 6 | CATEGORIES= databases graphics net | |
| 5 | MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/ | 7 | MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/ | |
| 6 | 8 | |||
| 7 | MAINTAINER= martti@NetBSD.org | 9 | MAINTAINER= martti@NetBSD.org | |
| 8 | HOMEPAGE= http://oss.oetiker.ch/rrdtool/ | 10 | HOMEPAGE= http://oss.oetiker.ch/rrdtool/ | |
| 9 | COMMENT= Data analysis tool generating graphical representations | 11 | COMMENT= Data analysis tool generating graphical representations | |
| 10 | #LICENSE= gnu-gpl-v2 | 12 | #LICENSE= gnu-gpl-v2 | |
| 11 | 13 | |||
| 12 | PKG_DESTDIR_SUPPORT= user-destdir | 14 | PKG_DESTDIR_SUPPORT= user-destdir | |
| 13 | 15 | |||
| 14 | USE_LIBTOOL= yes | 16 | USE_LIBTOOL= yes | |
| 15 | USE_TOOLS+= gmake pkg-config perl msgfmt intltool | 17 | USE_TOOLS+= gmake pkg-config perl msgfmt intltool | |
| 16 | GNU_CONFIGURE= yes | 18 | GNU_CONFIGURE= yes |
| @@ -1,6 +1,7 @@ | @@ -1,6 +1,7 @@ | |||
| 1 | $NetBSD: distinfo,v 1.34 2009/01/02 20:07:07 martti Exp $ | 1 | $NetBSD: distinfo,v 1.34.2.1 2009/01/18 10:30:48 rtr Exp $ | |
| 2 | 2 | |||
| 3 | SHA1 (rrdtool-1.3.5.tar.gz) = 0d123c054bdf30bfe5fa28c028ff3e8437f3777b | 3 | SHA1 (rrdtool-1.3.5.tar.gz) = 0d123c054bdf30bfe5fa28c028ff3e8437f3777b | |
| 4 | RMD160 (rrdtool-1.3.5.tar.gz) = fec1df84b7cb970bd35bb4fe8a8d9a2dd46c8cf5 | 4 | RMD160 (rrdtool-1.3.5.tar.gz) = fec1df84b7cb970bd35bb4fe8a8d9a2dd46c8cf5 | |
| 5 | Size (rrdtool-1.3.5.tar.gz) = 1075738 bytes | 5 | Size (rrdtool-1.3.5.tar.gz) = 1075738 bytes | |
| 6 | SHA1 (patch-aa) = fd24a682eb16b50c516d57787ef9d9981d74e7ad | |||
| 6 | SHA1 (patch-al) = 6c01b709fd8ca1b2f7968e721a8684864ae1db42 | 7 | SHA1 (patch-al) = 6c01b709fd8ca1b2f7968e721a8684864ae1db42 |
$NetBSD: patch-aa,v 1.12.8.1 2009/01/18 10:30:48 rtr Exp $
Fix image sizes on LP64BE
--- src/rrd_graph.c.orig 2008-10-04 12:04:04.000000000 -0400
+++ src/rrd_graph.c
@@ -3551,9 +3551,9 @@ int rrd_graph(
*ymax = 0;
while (walker) {
if (strcmp(walker->key, "image_width") == 0) {
- *xsize = walker->value.u_int;
+ *xsize = walker->value.u_cnt;
} else if (strcmp(walker->key, "image_height") == 0) {
- *ysize = walker->value.u_int;
+ *ysize = walker->value.u_cnt;
} else if (strcmp(walker->key, "value_min") == 0) {
*ymin = walker->value.u_val;
} else if (strcmp(walker->key, "value_max") == 0) {