Fix build with newer GCC

4 files changed, 40 insertions, 6 deletions

diff --git a/sysutils/lavaps/distinfo b/sysutils/lavaps/distinfo
index 50c4038c8b9..b2eb234f914 100644
--- a/sysutils/lavaps/distinfo
+++ b/sysutils/lavaps/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2008/07/27 16:47:46 dholland Exp $
+$NetBSD: distinfo,v 1.10 2011/11/25 22:18:54 joerg Exp $
 
 SHA1 (lavaps-2.7.tar.gz) = 5fb788359e22f80842423f211d42d8ebe2c58236
 RMD160 (lavaps-2.7.tar.gz) = 286530bca67f9d324c0edfc2def6d6b2a6f24255
@@ -9,5 +9,7 @@ SHA1 (patch-ac) = 8d6f43933eecc72cc75ffec1489cbf316a21c5fe
 SHA1 (patch-ad) = 520a4cc7bbafcca8cab50d0f92aed2a333e4da72
 SHA1 (patch-ae) = 82b0d0161eeef941f868b20282b9a7743be89461
 SHA1 (patch-af) = de66e431cdf61697d16df1f6e21d5f65390b845f
-SHA1 (patch-ag) = 59a691ec3ef98b2becae78f5ec05586ec400698e
+SHA1 (patch-ag) = dffad352c3812bd473ce37eed39413bbd77c3f8c
 SHA1 (patch-ah) = a2f8439e44674438cde037c41cbcc14897f42f86
+SHA1 (patch-src_const__str.hh) = 952fa949abbd5585a8511dc130a3a347f079df7b
+SHA1 (patch-src_lava__signal.cc) = cf4abf7f8fe1c72d255f4398d9e9ba55ecab6f24
diff --git a/sysutils/lavaps/patches/patch-ag b/sysutils/lavaps/patches/patch-ag
index 7402d016fea..1d9c93a25cf 100644
--- a/sysutils/lavaps/patches/patch-ag
+++ b/sysutils/lavaps/patches/patch-ag
@@ -1,8 +1,16 @@
-$NetBSD: patch-ag,v 1.1 2008/07/21 02:55:34 dholland Exp $
+$NetBSD: patch-ag,v 1.2 2011/11/25 22:18:54 joerg Exp $
 
---- src/blob.cc~	2008-07-20 22:00:41.000000000 -0400
-+++ src/blob.cc	2008-07-20 22:00:56.000000000 -0400
-@@ -503,7 +503,7 @@ void
+--- src/blob.cc.orig	2004-12-16 05:12:38.000000000 +0000
++++ src/blob.cc
+@@ -21,6 +21,7 @@
+ 
+ #include "config.h"
+ 
++#include <inttypes.h>
+ #include <stdlib.h>  // atoi
+ 
+ #include <iostream>
+@@ -503,7 +504,7 @@ void
  blob::print()
  {
  	ENTRY_TRACE(__FILE__,__LINE__);
diff --git a/sysutils/lavaps/patches/patch-src_const__str.hh b/sysutils/lavaps/patches/patch-src_const__str.hh
new file mode 100644
index 00000000000..e293a79ba07
--- /dev/null
+++ b/sysutils/lavaps/patches/patch-src_const__str.hh
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_const__str.hh,v 1.1 2011/11/25 22:18:54 joerg Exp $
+
+--- src/const_str.hh.orig	2011-11-25 19:27:49.000000000 +0000
++++ src/const_str.hh
+@@ -24,6 +24,7 @@
+ #ifndef lavaps_const_str_h
+ #define lavaps_const_str_h
+ 
++#include <stdlib.h>
+ #include <string.h>
+ 
+ class const_str {
diff --git a/sysutils/lavaps/patches/patch-src_lava__signal.cc b/sysutils/lavaps/patches/patch-src_lava__signal.cc
new file mode 100644
index 00000000000..32064b3005d
--- /dev/null
+++ b/sysutils/lavaps/patches/patch-src_lava__signal.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_lava__signal.cc,v 1.1 2011/11/25 22:18:54 joerg Exp $
+
+--- src/lava_signal.cc.orig	2011-11-25 19:29:00.000000000 +0000
++++ src/lava_signal.cc
+@@ -31,6 +31,7 @@
+ #include <sys/resource.h>
+ #include <sys/types.h>
+ #include <signal.h>
++#include <string.h>
+ 
+ int
+ lava_signal(int pid, int sig)