audio/sidplay: Fix DragonFly / use iostream and friends

Replace <iostream.h> includes and similar with c++ headers, and use
the standard namespace to fix breakage on DragonFly and NetBSD 5.99.

5 files changed, 78 insertions, 3 deletions

diff --git a/audio/sidplay/Makefile b/audio/sidplay/Makefile
index 1edbad863f8..4955667cf1b 100644
--- a/audio/sidplay/Makefile
+++ b/audio/sidplay/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2009/03/22 10:33:42 pooka Exp $
+# $NetBSD: Makefile,v 1.21 2011/11/23 19:17:07 marino Exp $
 #
 
 DISTNAME=	sidplay-base-1.0.9
 PKGNAME=	sidplay-1.0.9
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
 EXTRACT_SUFX=	.tgz
diff --git a/audio/sidplay/distinfo b/audio/sidplay/distinfo
index 1a1767333e0..0595f697a00 100644
--- a/audio/sidplay/distinfo
+++ b/audio/sidplay/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.7 2005/12/11 21:00:57 joerg Exp $
+$NetBSD: distinfo,v 1.8 2011/11/23 19:17:07 marino Exp $
 
 SHA1 (sidplay-base-1.0.9.tgz) = 0a159a9710fd82c942fe011a0d2ac70fb01be29c
 RMD160 (sidplay-base-1.0.9.tgz) = 4a96d5ebc5510d2b348bc837c184912c7f16789a
 Size (sidplay-base-1.0.9.tgz) = 71969 bytes
 SHA1 (patch-aa) = 19152c74918debf52578407b3b08331f969ad8d8
+SHA1 (patch-ab) = cd683bc6a822b10a9c54db3b70390b7dc00fd404
+SHA1 (patch-ac) = c48b67b9f07e237d010ba1de48d6ecc275261744
+SHA1 (patch-ad) = 5baac8b814adb7f86cf49147df5ab0a3f914db45
diff --git a/audio/sidplay/patches/patch-ab b/audio/sidplay/patches/patch-ab
new file mode 100644
index 00000000000..452fb7c8f2e
--- /dev/null
+++ b/audio/sidplay/patches/patch-ab
@@ -0,0 +1,26 @@
+$NetBSD: patch-ab,v 1.7 2011/11/23 19:17:07 marino Exp $
+
+--- sid2wav.cpp.orig	2002-03-11 10:42:10.000000000 +0000
++++ sid2wav.cpp
+@@ -18,9 +18,9 @@
+ //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ //
+ 
+-#include <iostream.h>
+-#include <iomanip.h>
+-#include <fstream.h>
++#include <iostream>
++#include <iomanip>
++#include <fstream>
+ #include <string.h>
+ 
+ #include <stdlib.h>
+@@ -39,6 +39,8 @@
+ #include <sidplay/fformat.h>
+ #include <sidplay/myendian.h>
+ 
++using namespace std;
++
+ const char s2w_version[] = "1.8";
+ 
+ struct wav_hdr                  // little endian
diff --git a/audio/sidplay/patches/patch-ac b/audio/sidplay/patches/patch-ac
new file mode 100644
index 00000000000..e9a2a810c88
--- /dev/null
+++ b/audio/sidplay/patches/patch-ac
@@ -0,0 +1,25 @@
+$NetBSD: patch-ac,v 1.8 2011/11/23 19:17:07 marino Exp $
+
+--- sidplay.cpp.orig	2002-09-28 18:44:02.000000000 +0000
++++ sidplay.cpp
+@@ -18,8 +18,9 @@
+ //
+ 
+ #include <ctype.h>
+-#include <iomanip.h>
+-#include <fstream.h>
++#include <iostream>
++#include <iomanip>
++#include <fstream>
+ #include <signal.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -41,6 +42,8 @@
+ #define DISALLOW_STEREO_SOUND
+ #endif
+ 
++using namespace std;
++
+ // Error and status message numbers.
+ enum
+ {
diff --git a/audio/sidplay/patches/patch-ad b/audio/sidplay/patches/patch-ad
new file mode 100644
index 00000000000..f363108e935
--- /dev/null
+++ b/audio/sidplay/patches/patch-ad
@@ -0,0 +1,21 @@
+$NetBSD: patch-ad,v 1.5 2011/11/23 19:17:07 marino Exp $
+
+--- sidcon.cpp.orig	2002-02-19 19:48:37.000000000 +0000
++++ sidcon.cpp
+@@ -25,12 +25,14 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <iostream.h>
+-#include <iomanip.h>
++#include <iostream>
++#include <iomanip>
+ 
+ #include <sidplay/sidtune.h>
+ #include <sidplay/fformat.h>
+ 
++using namespace std;
++
+ static bool toPSID = true,
+     toSIDPLAY = false,
+     checkOnly = false,