diff options
| author | martti <martti@pkgsrc.org> | 2008-05-05 05:25:20 +0000 |
|---|---|---|
| committer | martti <martti@pkgsrc.org> | 2008-05-05 05:25:20 +0000 |
| commit | a8ef60fba5c188fb6e73d541d12fa154fb41967f (patch) | |
| tree | ba9fd689bc7be2a8a715844dd4702376b97c872d /databases/rrdtool/patches | |
| parent | b3e95c16ba4aeb93a063ca2a139582a1f6bff7a4 (diff) | |
| download | pkgsrc-a8ef60fba5c188fb6e73d541d12fa154fb41967f.tar.gz | |
Fix pkg/38555. Patches provided by NAKAJI Hiroyuki and reviewed by the rrdtool
author Tobias Oetiker.
Diffstat (limited to 'databases/rrdtool/patches')
| -rw-r--r-- | databases/rrdtool/patches/patch-aa | 26 | ||||
| -rw-r--r-- | databases/rrdtool/patches/patch-ab | 30 |
2 files changed, 56 insertions, 0 deletions
diff --git a/databases/rrdtool/patches/patch-aa b/databases/rrdtool/patches/patch-aa new file mode 100644 index 00000000000..e2257353b17 --- /dev/null +++ b/databases/rrdtool/patches/patch-aa @@ -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 --git a/databases/rrdtool/patches/patch-ab b/databases/rrdtool/patches/patch-ab new file mode 100644 index 00000000000..31bbf5024e4 --- /dev/null +++ b/databases/rrdtool/patches/patch-ab @@ -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 |