[pkgsrc/trunk]: pkgsrc/databases/rrdtool Fix pkg/38555. Patches provided by N...

[martti <martti%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4a423a0e99be
branches:  trunk
changeset: 542143:4a423a0e99be
user:      martti <martti%pkgsrc.org@localhost>
date:      Mon May 05 05:25:20 2008 +0000

description:
Fix pkg/38555. Patches provided by NAKAJI Hiroyuki and reviewed by the rrdtool
author Tobias Oetiker.

diffstat:

 databases/rrdtool/distinfo         |   4 +++-
 databases/rrdtool/patches/patch-aa |  26 ++++++++++++++++++++++++++
 databases/rrdtool/patches/patch-ab |  30 ++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 1 deletions(-)

diffs (79 lines):

diff -r 27c8ee000227 -r 4a423a0e99be databases/rrdtool/distinfo
--- a/databases/rrdtool/distinfo        Mon May 05 05:25:08 2008 +0000
+++ b/databases/rrdtool/distinfo        Mon May 05 05:25:20 2008 +0000
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.25 2008/04/14 16:05:35 he Exp $
+$NetBSD: distinfo,v 1.26 2008/05/05 05:25:20 martti Exp $
 
 SHA1 (rrdtool-1.2.27.tar.gz) = 15028b65be68da83602f7479405dffb1eef819ec
 RMD160 (rrdtool-1.2.27.tar.gz) = ee01b9cd52a9dbf42c6ac8d9259bdcfcd036b112
 Size (rrdtool-1.2.27.tar.gz) = 1081450 bytes
+SHA1 (patch-aa) = cb7129fcb30ca961c824204975fc9481ab7bb1e9
+SHA1 (patch-ab) = 01cb2f7f19925b7ac8693239d03df78fe604e381
 SHA1 (patch-al) = f4e8687e8d92347373646c0db344911420203f84
 SHA1 (patch-as) = aa48dbc38ae23493b8ff700fabf90d6e0f3f1d5a
 SHA1 (patch-av) = 2e2a626c8bbc78671ff7e834cb229f4a1b0c35c3
diff -r 27c8ee000227 -r 4a423a0e99be databases/rrdtool/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/rrdtool/patches/patch-aa        Mon May 05 05:25:20 2008 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-aa,v 1.11 2008/05/05 05:25:20 martti Exp $
+
+--- src/rrd_getopt.c.orig      2008-02-17 12:26:32.000000000 +0200
++++ src/rrd_getopt.c   2008-05-05 08:18:08.000000000 +0300
+@@ -30,10 +30,6 @@
+ #define _NO_PROTO
+ #endif
+ 
+-#ifdef HAVE_CONFIG_H
+-#include "../rrd_config.h"
+-#endif
+-
+ #if !defined (__STDC__) || !__STDC__
+ /* This is a separate conditional since some stdc systems
+    reject `defined (const)'.  */
+@@ -42,6 +38,10 @@
+ #endif
+ #endif
+ 
++#ifdef HAVE_CONFIG_H
++#include "../rrd_config.h"
++#endif
++
+ #include <stdio.h>
+ 
+ /* Comment out all this code if we are using the GNU C Library, and are not
diff -r 27c8ee000227 -r 4a423a0e99be databases/rrdtool/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/rrdtool/patches/patch-ab        Mon May 05 05:25:20 2008 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.9 2008/05/05 05:25:20 martti Exp $
+
+--- src/rrd_getopt1.c.orig     2008-02-17 12:26:32.000000000 +0200
++++ src/rrd_getopt1.c  2008-05-05 08:18:29.000000000 +0300
+@@ -19,12 +19,6 @@
+    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+    Boston, MA 02111-1307, USA.  */
+ 
+-#ifdef HAVE_CONFIG_H
+-#include "../rrd_config.h"
+-#endif
+-
+-#include "rrd_getopt.h"
+-
+ #if !defined (__STDC__) || !__STDC__
+ /* This is a separate conditional since some stdc systems
+    reject `defined (const)'.  */
+@@ -33,6 +27,12 @@
+ #endif
+ #endif
+ 
++#ifdef HAVE_CONFIG_H
++#include "../rrd_config.h"
++#endif
++
++#include "rrd_getopt.h"
++
+ #include <stdio.h>
+ 
+ /* Comment out all this code if we are using the GNU C Library, and are not