8 files changed, 134 insertions, 9 deletions

diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile
index f3d2678959c7..e327123bb9ee 100644
--- a/audio/spiralsynth/Makefile
+++ b/audio/spiralsynth/Makefile
@@ -26,15 +26,18 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 
 DOC_FILES=	CHANGES COPYING README
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 500112
-BROKEN=         "errors in linking"
-USE_GCC=	2.95
-.endif
-
 post-patch:
-.for ii in Makefile.in PluginLink.sh SpiralSound/Output.h
+.for ii in \
+        Makefile.in \
+        PluginLink.sh \
+        SpiralInfo.C \
+        SpiralSound/Midi.h \
+        SpiralSound/Output.h \
+        SpiralSound/SpiralInfo.h \
+        SpiralSound/Synth.C \
+        SpiralSound/Synth.h \
+        SpiralSound/_SynthInfo.C \
+        Synth.h
 	${MV} ${WRKSRC}/${ii} ${WRKSRC}/${ii}.orig
 	${SED} -e 's|-O3|${PTHREAD_CFLAGS}|g ; \
 			s|CC	=|CC?	=|g ; \
@@ -44,6 +47,8 @@ post-patch:
 			s|LINK	=	g++|LINK	=	${CXX}|g ; \
 			s|-lm|${PTHREAD_LIBS} -lm|g ; \
 			s|/usr/X11R6|${X11BASE}|g ; \
+			s|iostream.h|iostream|g ;\
+			s|<strstream>|<sstream>|g ;\
 			s|machine/soundcard|sys/soundcard|g' \
 			< ${WRKSRC}/${ii}.orig \
 			> ${WRKSRC}/${ii}
@@ -85,4 +90,4 @@ do-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/spiralsynth/files/patch-GUI_MixerGUI.C b/audio/spiralsynth/files/patch-GUI_MixerGUI.C
new file mode 100644
index 000000000000..67e81cc7200d
--- /dev/null
+++ b/audio/spiralsynth/files/patch-GUI_MixerGUI.C
@@ -0,0 +1,16 @@
+$FreeBSD$
+
+--- GUI/MixerGUI.C.orig	Sun Nov 26 15:52:40 2000
++++ GUI/MixerGUI.C	Mon Feb  9 12:08:25 2004
+@@ -24,8 +24,10 @@ MixerGUI::MixerGUI(Mixer *o)
+ 	if (!m_mix) cerr<<"WARNING: Mixer not correctly set up"<<endl;
+ }
+ 		
+-void MixerGUI::CreateGUI(int xoff=0, int yoff=0, char *name)
++void MixerGUI::CreateGUI(int xoff, int yoff, char *name)
+ {
++	 xoff=0;
++	 yoff=0;
+ 	 Fl_Group* o = GUIMixGroup = new Fl_Group(xoff, yoff, 100, 110, name);
+       o->type(1);
+ 	  o->box(FL_UP_BOX);
diff --git a/audio/spiralsynth/files/patch-GUI_OutputGUI.C b/audio/spiralsynth/files/patch-GUI_OutputGUI.C
new file mode 100644
index 000000000000..18a74a00b1fe
--- /dev/null
+++ b/audio/spiralsynth/files/patch-GUI_OutputGUI.C
@@ -0,0 +1,16 @@
+$FreeBSD$
+
+--- GUI/OutputGUI.C.orig	Sun Nov 26 15:52:39 2000
++++ GUI/OutputGUI.C	Mon Feb  9 12:10:10 2004
+@@ -26,8 +26,10 @@ OutputGUI::OutputGUI(Output *o)
+ 	if (!m_out) cerr<<"WARNING: Output not correctly set up"<<endl;
+ }
+ 		
+-void OutputGUI::CreateGUI(int xoff=0, int yoff=0, char *name)
++void OutputGUI::CreateGUI(int xoff, int yoff, char *name)
+ {
++	 xoff=0;
++	 yoff=0;
+ 	 Fl_Group* o = GUIMixGroup = new Fl_Group(xoff, yoff, 85, 110, name);
+       o->type(1);
+ 	  o->box(FL_UP_BOX);
diff --git a/audio/spiralsynth/files/patch-GUI_ScopeGUI.C b/audio/spiralsynth/files/patch-GUI_ScopeGUI.C
new file mode 100644
index 000000000000..0b9104acbc5b
--- /dev/null
+++ b/audio/spiralsynth/files/patch-GUI_ScopeGUI.C
@@ -0,0 +1,27 @@
+$FreeBSD$
+
+--- GUI/ScopeGUI.C.orig	Sun Nov 26 15:52:39 2000
++++ GUI/ScopeGUI.C	Mon Feb  9 12:14:00 2004
+@@ -22,8 +22,8 @@
+ 
+ #include <FL/fl_draw.H>
+ 
+-ScopeWidget::ScopeWidget(int x,int y,int w,int h,const char *l=0) :
+-Fl_Widget(x,y,w,h,l)
++ScopeWidget::ScopeWidget(int x,int y,int w,int h,const char *l) :
++Fl_Widget(x,y,w,h,0)
+ {
+ }
+ 
+@@ -53,8 +53,10 @@ void ScopeGUI::Display(short *data)
+ 	if (!m_Bypass) m_Scope->redraw();
+ }
+ 		
+-void ScopeGUI::CreateGUI(int xoff=0, int yoff=0, char *name)
++void ScopeGUI::CreateGUI(int xoff, int yoff, char *name)
+ {
++	 xoff=0;
++	 yoff=0;
+ 	 Fl_Group* o = GUIScopeGroup = new Fl_Group(xoff, yoff, 225, 110, name);
+       o->type(1);
+ 	  o->box(FL_UP_BOX);
diff --git a/audio/spiralsynth/files/patch-GUI_Widgets_Fl_Knob.cxx b/audio/spiralsynth/files/patch-GUI_Widgets_Fl_Knob.cxx
new file mode 100644
index 000000000000..4bced8cb4684
--- /dev/null
+++ b/audio/spiralsynth/files/patch-GUI_Widgets_Fl_Knob.cxx
@@ -0,0 +1,23 @@
+$FreeBSD$
+
+--- GUI/Widgets/Fl_Knob.cxx.orig	Mon Sep 11 19:52:03 2000
++++ GUI/Widgets/Fl_Knob.cxx	Mon Feb  9 13:22:13 2004
+@@ -4,7 +4,7 @@
+ #include <FL/fl_draw.H>
+ #include <math.h>
+ 
+-Fl_Knob::Fl_Knob(int xx,int yy,int ww,int hh,const char *l=0): Fl_Valuator(xx,yy,ww,hh,l) {
++Fl_Knob::Fl_Knob(int xx,int yy,int ww,int hh,const char *l): Fl_Valuator(xx,yy,ww,hh,0) {
+   a1 = 35;
+ 	a2 = 325;
+ 	_type = DOTLIN;
+@@ -40,7 +40,8 @@ unsigned char rr,gg,bb;
+ 	int dam = damage();
+ 	if (dam & FL_DAMAGE_ALL)
+ 	{
+-		int col = parent()->color();
++//		int col = parent()->color();
++		int col = FL_BLACK;
+ 		fl_color(col);
+ 		fl_rectf(ox,oy,side,side);
+ 		Fl::get_color((Fl_Color)col,rr,gg,bb);
diff --git a/audio/spiralsynth/files/patch-SpiralInfo.C b/audio/spiralsynth/files/patch-SpiralInfo.C
new file mode 100644
index 000000000000..f91a73c279f3
--- /dev/null
+++ b/audio/spiralsynth/files/patch-SpiralInfo.C
@@ -0,0 +1,14 @@
+--- SpiralInfo.C.orig	Mon Feb  9 13:26:01 2004
++++ SpiralInfo.C	Mon Feb  9 13:26:59 2004
+@@ -22,8 +22,10 @@
+ 
+ #include "SpiralSound/SpiralInfo.h"
+ 
+-float RandFloat(float s=0.0f, float e=1.0f)
++float RandFloat(float s, float e)
+ {
++	s=0.0f;
++	e=1.0f;
+ 	return s+((rand()%10000/10000.0)*(e-s));
+ }
+ 
diff --git a/audio/spiralsynth/files/patch-SpiralSound_RiffWav.h b/audio/spiralsynth/files/patch-SpiralSound_RiffWav.h
new file mode 100644
index 000000000000..ee6c8486fdaf
--- /dev/null
+++ b/audio/spiralsynth/files/patch-SpiralSound_RiffWav.h
@@ -0,0 +1,12 @@
+$FreeBSD$
+
+--- SpiralSound/RiffWav.h.orig	Sun Nov 26 15:52:45 2000
++++ SpiralSound/RiffWav.h	Mon Feb  9 12:05:58 2004
+@@ -17,6 +17,7 @@
+ */ 
+ 
+ #include <string>
++using namespace std;
+ 
+ #ifndef WAVFILE
+ #define WAVFILE
diff --git a/audio/spiralsynth/files/patch-SpiralSound_SpiralInfo.h b/audio/spiralsynth/files/patch-SpiralSound_SpiralInfo.h
new file mode 100644
index 000000000000..1e603c2e1ddc
--- /dev/null
+++ b/audio/spiralsynth/files/patch-SpiralSound_SpiralInfo.h
@@ -0,0 +1,12 @@
+$FreeBSD$
+
+--- SpiralSound/SpiralInfo.h.orig	Sun Nov 26 15:52:46 2000
++++ SpiralSound/SpiralInfo.h	Mon Feb  9 13:31:38 2004
+@@ -19,6 +19,7 @@
+ #include <iostream.h>
+ #include <string>
+ #include <stdlib.h>
++using namespace std;
+ 
+ #ifndef SpiralINFO
+ #define SpiralINFO