Use the patches for 2.0.0, not those for 0.1.7 (logged by bento).

4 files changed, 13 insertions, 44 deletions

diff --git a/audio/spiralloops/files/patch-Makefile.in b/audio/spiralloops/files/patch-Makefile.in
deleted file mode 100644
index 0de88286621a..000000000000
--- a/audio/spiralloops/files/patch-Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.in.orig	Mon Apr 30 03:30:32 2001
-+++ Makefile.in	Mon Apr 30 03:30:56 2001
-@@ -7,12 +7,10 @@
- 
- ####### Compiler, tools and options
- 
--CC	=	gcc
--CXX	=	g++
--CFLAGS	=	-pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused -g
--CXXFLAGS=	-pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused -g
-+CFLAGS	+=	-Wall -DNO_DEBUG -Wno-unused -g
-+CXXFLAGS+=	-Wall -DNO_DEBUG -Wno-unused -g
- INCPATH	=	-I/usr/X11R6/include
--LINK	=	g++
-+LINK	=	${CXX}
- LFLAGS	=	
- LIBS	=   -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm 
- MOC	=	moc
diff --git a/audio/spiralloops/files/patch-SpiralLoops.C b/audio/spiralloops/files/patch-SpiralLoops.C
new file mode 100644
index 000000000000..26de3b970d4d
--- /dev/null
+++ b/audio/spiralloops/files/patch-SpiralLoops.C
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- SpiralLoops.C.orig	Thu Apr 19 13:48:11 2001
++++ SpiralLoops.C	Thu May 23 02:16:36 2002
+@@ -308,7 +308,7 @@
+         Run     = (Sample *(*)()) dlsym(handle, "Run__Fv");
+         
+                 
+-        if ((error = dlerror()) != NULL)
++        if ((error = (char *)dlerror()) != NULL)
+         {
+         	cerr<<"Error linking to plugin:"<<endl;
+ 		    fputs(error, stderr);
diff --git a/audio/spiralloops/files/patch-SpiralLoops.h b/audio/spiralloops/files/patch-SpiralLoops.h
deleted file mode 100644
index 2b6d78209849..000000000000
--- a/audio/spiralloops/files/patch-SpiralLoops.h
+++ /dev/null
@@ -1,13 +0,0 @@
-SpiralLoops.C:196: assignment to `char *' from `const char *' discards qualifiers
-
---- SpiralLoops.h.orig	Sun Nov 26 07:53:44 2000
-+++ SpiralLoops.h	Wed Dec  6 21:55:54 2000
-@@ -85,7 +85,7 @@
-     short *(*Run)(void);
-     void   (*Destroy)(void);
-     void    *handle;
--    char    *error;
-+    const char  *error;
- 	short   *m_PluginBuffer;
- 	bool	 m_PluginOpen;
- 	bool	 m_PluginLinked;
diff --git a/audio/spiralloops/files/patch-SpiralSoundMidi_C b/audio/spiralloops/files/patch-SpiralSoundMidi_C
deleted file mode 100644
index 4c29f82a0c23..000000000000
--- a/audio/spiralloops/files/patch-SpiralSoundMidi_C
+++ /dev/null
@@ -1,13 +0,0 @@
-SpiralSound/Midi.C:54: `O_SYNC' undeclared (first use this function)
-
---- SpiralSound/Midi.C.orig	Sun Nov 26 07:52:41 2000
-+++ SpiralSound/Midi.C	Wed Dec  6 14:22:58 2000
-@@ -51,7 +51,7 @@
- {
- 	if (!SpiralInfo::WANTMIDI) return;
- 	
--	m_MidiFd = open(SpiralInfo::MIDIFILE.c_str(),O_RDONLY|O_SYNC);  
-+	m_MidiFd = open(SpiralInfo::MIDIFILE.c_str(),O_RDONLY);  
- 
- 	pipe(m_Pipefd);
- 	fcntl(m_Pipefd[0],F_SETFL,O_NONBLOCK);