Fix build with gcc4.3

9 files changed, 109 insertions, 2 deletions

diff --git a/audio/libofa/distinfo b/audio/libofa/distinfo
index 7ffcb3c1b87..1297f7b7f26 100644
--- a/audio/libofa/distinfo
+++ b/audio/libofa/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2006/07/18 19:11:15 joerg Exp $
+$NetBSD: distinfo,v 1.3 2011/01/29 21:09:09 markd Exp $
 
 SHA1 (libofa-0.9.3.tar.gz) = 3dec8e1dcea937f74b4165e9ffd4d4f355e4594a
 RMD160 (libofa-0.9.3.tar.gz) = 77f393570bb5356026c4b9c7195236bd96cb9143
@@ -6,3 +6,6 @@ Size (libofa-0.9.3.tar.gz) = 384043 bytes
 SHA1 (patch-aa) = 5873559f25c2dd3ca7cd3beac089167faa1ce49f
 SHA1 (patch-ab) = ee3aa29a18926a1d9b9a29e3a7719b67501462bc
 SHA1 (patch-ac) = 9a40d7472c405b9bdc4b9c008f5a28c3a91fc5c9
+SHA1 (patch-ad) = 9713150fb45a69da7d521494f42b7aa16f16104d
+SHA1 (patch-ae) = a581e60b45582713ad1b1ffa32d9d3ddf222118b
+SHA1 (patch-af) = f2483f7c948a3c5f1d30fcf66ea077c40cd7e057
diff --git a/audio/libofa/patches/patch-ad b/audio/libofa/patches/patch-ad
new file mode 100644
index 00000000000..198d2feefa0
--- /dev/null
+++ b/audio/libofa/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2011/01/29 21:09:09 markd Exp $
+
+build with gcc4.3
+
+--- lib/signal_op.cpp.orig	2006-05-10 18:01:12.000000000 +0000
++++ lib/signal_op.cpp
+@@ -12,6 +12,7 @@
+ // DATE CREATED: 1/12/06
+ 
+ 
++#include <cstdlib>
+ #include <math.h>
+ #include "signal_op.h"
+ #include "AFLIB/aflibConverter.h"
diff --git a/audio/libofa/patches/patch-ae b/audio/libofa/patches/patch-ae
new file mode 100644
index 00000000000..68ccfe8411d
--- /dev/null
+++ b/audio/libofa/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2011/01/29 21:09:09 markd Exp $
+
+build with gcc4.3
+
+--- examples/example.cpp.orig	2006-05-10 18:05:37.000000000 +0000
++++ examples/example.cpp
+@@ -9,6 +9,9 @@
+ 
+ #include "protocol.h"
+ 
++#include <cstring>
++#include <cstdio>
++
+ AudioData* loadWaveFile(char *file);
+ AudioData* loadDataUsingLAME(char *file);
+ 
diff --git a/audio/libofa/patches/patch-af b/audio/libofa/patches/patch-af
new file mode 100644
index 00000000000..fd3def08faf
--- /dev/null
+++ b/audio/libofa/patches/patch-af
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.1 2011/01/29 21:09:09 markd Exp $
+
+build with gcc4.3
+
+--- examples/protocol.cpp.orig	2006-05-10 18:05:42.000000000 +0000
++++ examples/protocol.cpp
+@@ -9,6 +9,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string>
++#include <cstring>
+ #include <map>
+ #include <expat.h>
+ #include <curl/curl.h>
diff --git a/audio/musicbrainz/distinfo b/audio/musicbrainz/distinfo
index 2bbb87d3855..c57c992829b 100644
--- a/audio/musicbrainz/distinfo
+++ b/audio/musicbrainz/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2009/01/20 20:23:36 sketch Exp $
+$NetBSD: distinfo,v 1.16 2011/01/29 21:04:59 markd Exp $
 
 SHA1 (libmusicbrainz-2.1.5.tar.gz) = 99e85701541e41bb367e37e3a6ac47415fe8748f
 RMD160 (libmusicbrainz-2.1.5.tar.gz) = 6b5da46c8d5e7c6359f847241705d8552665027b
@@ -6,3 +6,7 @@ Size (libmusicbrainz-2.1.5.tar.gz) = 524243 bytes
 SHA1 (patch-aa) = bd20589e9a5db516acf2e0caa712e44cdb527004
 SHA1 (patch-ab) = 6babceef5e3523bde2c33540aadc018e57eb8ebc
 SHA1 (patch-ac) = 8325cdf1097d9ef19e31f290112a0f12c8639296
+SHA1 (patch-ad) = 9c1ad2a308d63c6dd7a52a1234ee06359ac14d49
+SHA1 (patch-ae) = 66034d414ce372d6bf72c47101bbeec440bbc497
+SHA1 (patch-af) = c82c770947f1b14b3917d428117553bf4419173d
+SHA1 (patch-ag) = 3969a85dbaa173110b0bf323b48a39bf856f9813
diff --git a/audio/musicbrainz/patches/patch-ad b/audio/musicbrainz/patches/patch-ad
new file mode 100644
index 00000000000..b2de6b4ec15
--- /dev/null
+++ b/audio/musicbrainz/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2011/01/29 21:05:00 markd Exp $
+
+include <cstring> for strncpy(), memset() etc
+
+--- lib/c_wrapper.cpp.orig	2006-11-14 16:34:49.000000000 +0000
++++ lib/c_wrapper.cpp
+@@ -24,6 +24,7 @@
+ #include "musicbrainz.h"
+ #include "trm.h"
+ #include "mb_c.h"
++#include <cstring>
+ 
+ extern "C"
+ {
diff --git a/audio/musicbrainz/patches/patch-ae b/audio/musicbrainz/patches/patch-ae
new file mode 100644
index 00000000000..a1111a66690
--- /dev/null
+++ b/audio/musicbrainz/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 2011/01/29 21:05:00 markd Exp $
+
+include <cstring> for strncpy(), memset() etc
+
+--- lib/comsocket.h.orig	2006-11-14 16:34:49.000000000 +0000
++++ lib/comsocket.h
+@@ -34,6 +34,7 @@ ________________________________________
+ #define COMSOCKET_H
+ #include <stdio.h>
+ #include <string>
++#include <cstring>
+ 
+ #ifdef WIN32
+ #include <winsock.h>
diff --git a/audio/musicbrainz/patches/patch-af b/audio/musicbrainz/patches/patch-af
new file mode 100644
index 00000000000..62f2614e16f
--- /dev/null
+++ b/audio/musicbrainz/patches/patch-af
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.1 2011/01/29 21:05:00 markd Exp $
+
+include <cstring> for strncpy(), memset() etc
+
+--- lib/comhttpsocket.h.orig	2006-11-14 16:34:49.000000000 +0000
++++ lib/comhttpsocket.h
+@@ -11,6 +11,7 @@
+ #define MBCOMHTTPSocket_H
+ #include <stdio.h>
+ #include <string>
++#include <cstring>
+ 
+ using namespace std;
+ 
diff --git a/audio/musicbrainz/patches/patch-ag b/audio/musicbrainz/patches/patch-ag
new file mode 100644
index 00000000000..6c33633cd31
--- /dev/null
+++ b/audio/musicbrainz/patches/patch-ag
@@ -0,0 +1,14 @@
+$NetBSD: patch-ag,v 1.1 2011/01/29 21:05:00 markd Exp $
+
+include <cstring> for strncpy(), memset() etc
+
+--- lib/http.h.orig	2006-11-14 16:34:49.000000000 +0000
++++ lib/http.h
+@@ -27,6 +27,7 @@
+ #include "types.h"
+ #include "errors.h"
+ #include <string>
++#include <cstring>
+ 
+ using namespace std;
+