- Unbreak

PR:		ports/105744
Submitted by:	trasz

13 files changed, 153 insertions, 9 deletions

diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile
index f1252765d3d5..81be4de479b2 100644
--- a/audio/spiralloops/Makefile
+++ b/audio/spiralloops/Makefile
@@ -27,10 +27,6 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500113
-BROKEN=		Does not compile (bad C++ code)
-.endif
-
 post-patch:
 	${MV} ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in.orig
 	${SED} -E "s:-ldl::g; \
diff --git a/audio/spiralloops/files/patch-Fl_LED_Button.cxx b/audio/spiralloops/files/patch-Fl_LED_Button.cxx
index c240d99767c1..391c9751939a 100644
--- a/audio/spiralloops/files/patch-Fl_LED_Button.cxx
+++ b/audio/spiralloops/files/patch-Fl_LED_Button.cxx
@@ -1,8 +1,15 @@
-patch by Stephen Paskaluk to enable compilation with fltk 1.1.2
-
---- GUI/Widgets/Fl_LED_Button.cxx.orig	Thu Apr 19 16:48:11 2001
-+++ GUI/Widgets/Fl_LED_Button.cxx	Sat Mar  1 12:38:27 2003
-@@ -15,7 +15,7 @@ Fl_LED_Button::~Fl_LED_Button() {
+--- GUI/Widgets/Fl_LED_Button.cxx.orig	Thu Apr 19 22:48:11 2001
++++ GUI/Widgets/Fl_LED_Button.cxx	Wed Nov 22 13:16:40 2006
+@@ -3,7 +3,7 @@
+ #include "Fl_LED_Button.H"
+ #include <FL/fl_draw.H>
+ 
+-Fl_LED_Button::Fl_LED_Button(int x, int y, int w, int h, const char* l=0):Fl_Light_Button(x,y,w,h,l) {
++Fl_LED_Button::Fl_LED_Button(int x, int y, int w, int h, const char* l):Fl_Light_Button(x,y,w,h,l) {
+   box(FL_NO_BOX);
+ 	down_box(FL_ROUND_DOWN_BOX);
+ 	selection_color(FL_RED);
+@@ -15,7 +15,7 @@
  void Fl_LED_Button::draw() {
    uchar r,g,b;
  
diff --git a/audio/spiralloops/files/patch-GUI-OutputGUI.C b/audio/spiralloops/files/patch-GUI-OutputGUI.C
new file mode 100644
index 000000000000..de4b17a4dc4f
--- /dev/null
+++ b/audio/spiralloops/files/patch-GUI-OutputGUI.C
@@ -0,0 +1,11 @@
+--- GUI/OutputGUI.C.orig	Wed Nov 22 13:13:17 2006
++++ GUI/OutputGUI.C	Wed Nov 22 13:13:32 2006
+@@ -26,7 +26,7 @@
+ 	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)
+ {
+ 	 Fl_Group* o = GUIMixGroup = new Fl_Group(xoff, yoff, 85, 110, name);
+       o->type(1);
diff --git a/audio/spiralloops/files/patch-GUI-ScopeGUI.C b/audio/spiralloops/files/patch-GUI-ScopeGUI.C
new file mode 100644
index 000000000000..3dbf6a2e47f0
--- /dev/null
+++ b/audio/spiralloops/files/patch-GUI-ScopeGUI.C
@@ -0,0 +1,20 @@
+--- GUI/ScopeGUI.C.orig	Wed Nov 22 13:08:41 2006
++++ GUI/ScopeGUI.C	Wed Nov 22 13:10:26 2006
+@@ -23,7 +23,7 @@
+ 
+ #include <FL/fl_draw.H>
+ 
+-ScopeWidget::ScopeWidget(int x,int y,int w,int h,const char *l=0) :
++ScopeWidget::ScopeWidget(int x,int y,int w,int h,const char *l) :
+ Fl_Widget(x,y,w,h,l),
+ m_Channels(1)
+ {
+@@ -69,7 +69,7 @@
+ 	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)
+ {
+ 	 Fl_Group* o = GUIScopeGroup = new Fl_Group(xoff, yoff, 225, 110, name);
+       o->type(1);
diff --git a/audio/spiralloops/files/patch-GUI-Widgets-Fl_Knob.cxx b/audio/spiralloops/files/patch-GUI-Widgets-Fl_Knob.cxx
new file mode 100644
index 000000000000..ff53ece651b1
--- /dev/null
+++ b/audio/spiralloops/files/patch-GUI-Widgets-Fl_Knob.cxx
@@ -0,0 +1,11 @@
+--- GUI/Widgets/Fl_Knob.cxx.orig	Wed Nov 22 13:14:11 2006
++++ GUI/Widgets/Fl_Knob.cxx	Wed Nov 22 13:14:20 2006
+@@ -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,l) {
+   a1 = 35;
+ 	a2 = 325;
+ 	_type = DOTLIN;
diff --git a/audio/spiralloops/files/patch-GUI-Widgets-Fl_Loop.C b/audio/spiralloops/files/patch-GUI-Widgets-Fl_Loop.C
new file mode 100644
index 000000000000..e76be23ef25d
--- /dev/null
+++ b/audio/spiralloops/files/patch-GUI-Widgets-Fl_Loop.C
@@ -0,0 +1,11 @@
+--- GUI/Widgets/Fl_Loop.C.orig	Wed Nov 22 13:15:09 2006
++++ GUI/Widgets/Fl_Loop.C	Wed Nov 22 13:15:18 2006
+@@ -30,7 +30,7 @@
+ static const int   INDW = 3; // indicator width
+ static const int   UPDATECYCLES = 4;
+ 
+-Fl_Loop::Fl_Loop(int x, int y, int w, int h, const char* label=0) : 
++Fl_Loop::Fl_Loop(int x, int y, int w, int h, const char* label) : 
+ Fl_Double_Window(x,y,w,h,label), 
+ m_data(NULL),
+ m_MainWin(NULL),
diff --git a/audio/spiralloops/files/patch-GUI-Widgets-Fl_Loop.h b/audio/spiralloops/files/patch-GUI-Widgets-Fl_Loop.h
new file mode 100644
index 000000000000..b2409524ab5c
--- /dev/null
+++ b/audio/spiralloops/files/patch-GUI-Widgets-Fl_Loop.h
@@ -0,0 +1,11 @@
+--- GUI/Widgets/Fl_Loop.h.orig	Wed Nov 22 13:00:49 2006
++++ GUI/Widgets/Fl_Loop.h	Wed Nov 22 13:01:09 2006
+@@ -18,7 +18,7 @@
+ 
+ #include <FL/Fl.H>
+ #include <FL/Fl_Double_Window.H>
+-#include <iostream.h>
++#include <iostream>
+ 
+ #ifndef LOOPWIDGET
+ #define LOOPWIDGET
diff --git a/audio/spiralloops/files/patch-GUI-Widgets-Fl_Trigger.C b/audio/spiralloops/files/patch-GUI-Widgets-Fl_Trigger.C
new file mode 100644
index 000000000000..962301336075
--- /dev/null
+++ b/audio/spiralloops/files/patch-GUI-Widgets-Fl_Trigger.C
@@ -0,0 +1,11 @@
+--- GUI/Widgets/Fl_Trigger.C.orig	Wed Nov 22 13:17:29 2006
++++ GUI/Widgets/Fl_Trigger.C	Wed Nov 22 13:17:36 2006
+@@ -27,7 +27,7 @@
+ 
+ static const float RADCONV = 0.017453292;
+ 
+-Fl_Trigger::Fl_Trigger(int x, int y, int w, int h, const char* label=0) : 
++Fl_Trigger::Fl_Trigger(int x, int y, int w, int h, const char* label) : 
+ Fl_Widget(x,y,w,h,label),
+ m_CentreX(0),
+ m_CentreY(0),
diff --git a/audio/spiralloops/files/patch-SpiralSound-Output.C b/audio/spiralloops/files/patch-SpiralSound-Output.C
new file mode 100644
index 000000000000..ad16b8079a05
--- /dev/null
+++ b/audio/spiralloops/files/patch-SpiralSound-Output.C
@@ -0,0 +1,11 @@
+--- SpiralSound/Output.C.orig	Wed Nov 22 13:07:18 2006
++++ SpiralSound/Output.C	Wed Nov 22 13:07:30 2006
+@@ -29,7 +29,7 @@
+ 	m_Buffer.Zero();
+ }
+ 
+-void Output::Send(Sample &data, float LeftVolume=1, float RightVolume=1) 
++void Output::Send(Sample &data, float LeftVolume, float RightVolume) 
+ {
+ 	long temp;
+ 	int on=0;
diff --git a/audio/spiralloops/files/patch-SpiralSound-RiffWav.C b/audio/spiralloops/files/patch-SpiralSound-RiffWav.C
new file mode 100644
index 000000000000..c7d8675edd95
--- /dev/null
+++ b/audio/spiralloops/files/patch-SpiralSound-RiffWav.C
@@ -0,0 +1,11 @@
+--- SpiralSound/RiffWav.C.orig	Wed Nov 22 13:07:57 2006
++++ SpiralSound/RiffWav.C	Wed Nov 22 13:08:07 2006
+@@ -55,7 +55,7 @@
+ #endif
+ }
+ 
+-int WavFile::Open(string FileName, Mode mode, Channels channels=MONO)
++int WavFile::Open(string FileName, Mode mode, Channels channels)
+ {
+ 	if (m_Stream!=NULL) 
+ 	{
diff --git a/audio/spiralloops/files/patch-SpiralSound-Sample.C b/audio/spiralloops/files/patch-SpiralSound-Sample.C
new file mode 100644
index 000000000000..442bb7fccaf7
--- /dev/null
+++ b/audio/spiralloops/files/patch-SpiralSound-Sample.C
@@ -0,0 +1,14 @@
+--- SpiralSound/Sample.C.orig	Wed Nov 22 13:02:12 2006
++++ SpiralSound/Sample.C	Wed Nov 22 13:03:58 2006
+@@ -18,9 +18,9 @@
+ 
+ #include <string.h>
+ #include "Sample.h"
+-#include "iostream.h"
++#include "iostream"
+ 
+-Sample::Sample(int Len=0) :
++Sample::Sample(int Len) :
+ m_Data(NULL),
+ m_Length(0)
+ {
diff --git a/audio/spiralloops/files/patch-SpiralSound-SpiralInfo.C b/audio/spiralloops/files/patch-SpiralSound-SpiralInfo.C
new file mode 100644
index 000000000000..cc924cd5ba15
--- /dev/null
+++ b/audio/spiralloops/files/patch-SpiralSound-SpiralInfo.C
@@ -0,0 +1,11 @@
+--- SpiralSound/SpiralInfo.C.orig	Wed Nov 22 13:05:47 2006
++++ SpiralSound/SpiralInfo.C	Wed Nov 22 13:06:04 2006
+@@ -22,7 +22,7 @@
+ 
+ #include "SpiralInfo.h"
+ 
+-float RandFloat(float s=0.0f, float e=1.0f)
++float RandFloat(float s, float e)
+ {
+ 	return s+((rand()%10000/10000.0)*(e-s));
+ }
diff --git a/audio/spiralloops/files/patch-SpiralSound-SpiralInfo.h b/audio/spiralloops/files/patch-SpiralSound-SpiralInfo.h
new file mode 100644
index 000000000000..64ea41d0aa6d
--- /dev/null
+++ b/audio/spiralloops/files/patch-SpiralSound-SpiralInfo.h
@@ -0,0 +1,19 @@
+--- SpiralSound/SpiralInfo.h.orig	Wed Nov 22 12:59:01 2006
++++ SpiralSound/SpiralInfo.h	Wed Nov 22 13:00:04 2006
+@@ -16,13 +16,15 @@
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+ 
+-#include <iostream.h>
++#include <iostream>
+ #include <string>
+ #include <stdlib.h>
+ #include "Sample.h"
+ 
+ #ifndef SpiralINFO
+ #define SpiralINFO
++
++using namespace std;
+ 
+ // todo: better place for these util funcs
+ float RandFloat(float s=0.0f, float e=1.0f);