audio/spiralsynth: Fix iostream / Fix DragonFly / amd64

Replace <iostream.h> and <fstream.h> with their c++ counterparts.
Addition of <string.h> was originally under a DragonFly macro, but
this was removed when it was shown NetBSD 5.99 needed it too.
Allow package to build on all x86_64 architectures.

5 files changed, 39 insertions, 23 deletions

diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile
index b7cf4471098..720a5d57411 100644
--- a/audio/spiralsynth/Makefile
+++ b/audio/spiralsynth/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2011/01/13 13:37:08 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2011/11/23 08:32:10 marino Exp $
 #
 
 DISTNAME=		SpiralSynth-2.0.0
 PKGNAME=		spiralsynth-2.0.0
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		audio
 MASTER_SITES=		http://www.pawfal.org/Software/SpiralSynth/dload/
 
@@ -14,7 +14,7 @@ COMMENT=		Polyphonic analogue softsynth
 # only runs correctly on little-endian machines
 ONLY_FOR_PLATFORM=	*-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \
 			*-*-hpcmips *-*-hpcsh *-*-i386 *-*-pc532 *-*-pmax \
-			*-*-vax
+			*-*-vax *-*-x86_64
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/audio/spiralsynth/distinfo b/audio/spiralsynth/distinfo
index 3079a208556..b5fe5907001 100644
--- a/audio/spiralsynth/distinfo
+++ b/audio/spiralsynth/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.12 2007/09/29 11:40:46 rillig Exp $
+$NetBSD: distinfo,v 1.13 2011/11/23 08:32:10 marino Exp $
 
 SHA1 (SpiralSynth-2.0.0.tar.gz) = ea42c5b7710237139f5281cf0c4ca155c184c4cd
 RMD160 (SpiralSynth-2.0.0.tar.gz) = c05f38a9ae8b8b87f520c11854631e6dfa00c034
 Size (SpiralSynth-2.0.0.tar.gz) = 66263 bytes
 SHA1 (patch-aa) = 01e4f4348761ca5c3e7e7c9dce0e13fa0b2b986f
-SHA1 (patch-ab) = 49ea69a000b68c3c6ec07fefa9f1e2a415abb0f0
+SHA1 (patch-ab) = 1be8a26fbfcdcde6d775c55586fbff24f55b212f
 SHA1 (patch-ad) = 235afa6618c5ec5aef2ca3448388f11757918832
-SHA1 (patch-ae) = b0c36c839504ecef6c781609ebd9fef266249645
+SHA1 (patch-ae) = decad0d1a4b2894a4dd9b9bc6bac9e4984b63357
 SHA1 (patch-af) = 88d1a457ad82184a1d5f34e3f56de2d8fb7daf89
 SHA1 (patch-ag) = fab78772ee8b451f60b69597c9844e7c6aae465c
 SHA1 (patch-ah) = d2ff3c4ddd4da9c96a74c3f898aa3429dcc51bb9
@@ -17,4 +17,4 @@ SHA1 (patch-al) = 7436bce933cbddcd4f869ab2cbbe27762d4273e5
 SHA1 (patch-am) = 4899c78015028a6e8047e5527362646e40a10708
 SHA1 (patch-an) = 2bafb1a9a959816af43a858fdb4a9df5586a91e9
 SHA1 (patch-ao) = 138f58bd7fae0226690747efcb8daf472e3a5337
-SHA1 (patch-ar) = 65ca1e3f86bbd76821ff0faecb9320bb356b0ec4
+SHA1 (patch-ar) = 44ab335b5a7831080d58a952f3cc13e5795a3f0e
diff --git a/audio/spiralsynth/patches/patch-ab b/audio/spiralsynth/patches/patch-ab
index 2a1faa5055e..dbea40fe281 100644
--- a/audio/spiralsynth/patches/patch-ab
+++ b/audio/spiralsynth/patches/patch-ab
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.4 2004/11/25 17:24:27 ben Exp $
+$NetBSD: patch-ab,v 1.5 2011/11/23 08:32:10 marino Exp $
 
---- SpiralInfo.C.orig	Sun Jun  2 08:44:31 2002
+--- SpiralInfo.C.orig	2002-06-02 15:44:31.000000000 +0000
 +++ SpiralInfo.C
-@@ -22,7 +22,7 @@
+@@ -16,13 +16,13 @@
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+ 
+-#include <iostream.h>
+-#include <fstream.h>
++#include <iostream>
++#include <fstream>
+ #include <stdlib.h>
  
  #include "SpiralSound/SpiralInfo.h"
  
diff --git a/audio/spiralsynth/patches/patch-ae b/audio/spiralsynth/patches/patch-ae
index 9fb8a323f8d..0d78644a46c 100644
--- a/audio/spiralsynth/patches/patch-ae
+++ b/audio/spiralsynth/patches/patch-ae
@@ -1,13 +1,15 @@
-$NetBSD: patch-ae,v 1.1 2003/12/19 16:48:06 ben Exp $
+$NetBSD: patch-ae,v 1.2 2011/11/23 08:32:10 marino Exp $
 
---- SpiralSound/SpiralInfo.h.orig	2000-11-26 07:52:46.000000000 -0800
+--- SpiralSound/SpiralInfo.h.orig	2002-06-02 15:44:45.000000000 +0000
 +++ SpiralSound/SpiralInfo.h
-@@ -16,6 +16,8 @@
+@@ -16,7 +16,9 @@
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
  
+-#include <iostream.h>
 +using namespace std;
 +
- #include <iostream.h>
++#include <iostream>
  #include <string>
  #include <stdlib.h>
+ 
diff --git a/audio/spiralsynth/patches/patch-ar b/audio/spiralsynth/patches/patch-ar
index a19d3d52861..3e7457ec5c3 100644
--- a/audio/spiralsynth/patches/patch-ar
+++ b/audio/spiralsynth/patches/patch-ar
@@ -1,10 +1,16 @@
-$NetBSD: patch-ar,v 1.1 2007/09/29 11:40:46 rillig Exp $
+$NetBSD: patch-ar,v 1.2 2011/11/23 08:32:10 marino Exp $
 
-g++ 4 enforces cleaner code.
-
---- SpiralSound/Sample.h.orig	2002-06-02 12:28:26.000000000 +0200
-+++ SpiralSound/Sample.h	2007-09-29 13:39:21.000000000 +0200
-@@ -66,7 +66,7 @@ public:
+--- SpiralSound/Sample.h.orig	2002-06-02 10:28:26.000000000 +0000
++++ SpiralSound/Sample.h
+@@ -22,6 +22,7 @@
+ #include <assert.h>
+ #include <limits.h>
+ #include <iostream>
++#include <string.h>
+ #include "SpiralInfo.h"
+ 
+ //#define DEBUG
+@@ -66,7 +67,7 @@ public:
  	void CropTo(int NewLength);
  	bool IsEmpty() const { return m_IsEmpty; }
  
@@ -13,7 +19,7 @@ g++ 4 enforces cleaner code.
  	{		
  		#ifdef DEBUG
  			assert(i>=0 && i<m_Length);
-@@ -75,7 +75,7 @@ public:
+@@ -75,7 +76,7 @@ public:
  	}
  
  	// Linear interpolated
@@ -22,7 +28,7 @@ g++ 4 enforces cleaner code.
  	{		
  		int ii=(int)i;
  		
-@@ -89,7 +89,7 @@ public:
+@@ -89,7 +90,7 @@ public:
  	}
  
  
@@ -31,7 +37,7 @@ g++ 4 enforces cleaner code.
  	{	
  		m_IsEmpty=false;
  		#ifdef DEBUG
-@@ -98,7 +98,7 @@ public:
+@@ -98,7 +99,7 @@ public:
  		m_Data[i]=v;
  	}