4 files changed, 52 insertions, 335 deletions

diff --git a/audio/dap/files/patch-aa b/audio/dap/files/patch-aa
index 6e3ce5a80e3e..bbe0748b9f76 100644
--- a/audio/dap/files/patch-aa
+++ b/audio/dap/files/patch-aa
@@ -1,6 +1,5 @@
---- Makefile.orig	Wed Sep 16 09:26:41 1998
-+++ Makefile	Wed Sep 16 09:26:41 1998
-@@ -0,0 +1,81 @@
+Index: Makefile
+@@ -0,0 +1,83 @@
 +BACKDIR = ./bak
 +HOMEDIR = $(HOME)
 +
@@ -8,8 +7,10 @@
 +
 +DAP: 
 +	(cd tooltips; make -f Makefile);
-+	(cd spkit/spkit; make -f Makefile.freebsd);
-+	(cd main; make -f Makefile.freebsd);
++	(cd libaudio; make -f Makefile.linux);
++	(cd libaudiofile; make -f Makefile.linux);
++	(cd spkit/spkit; make -f Makefile.linux);
++	(cd main; make -f Makefile.linux);
 +
 +release: DAP
 +	strip main/DAP
diff --git a/audio/dap/files/patch-ab b/audio/dap/files/patch-ab
index 7b5f277e175a..d5a746d0b6f5 100644
--- a/audio/dap/files/patch-ab
+++ b/audio/dap/files/patch-ab
@@ -1,104 +1,22 @@
---- main/Makefile.freebsd.orig	Wed Sep 16 09:26:42 1998
-+++ main/Makefile.freebsd	Wed Sep 16 18:34:39 1998
-@@ -0,0 +1,83 @@
-+CC      = gcc
-+CXX     = g++
-+FORMS   = /usr/X11R6/include
-+SOUND   = ../sound
-+SPKIT   = ../spkit
-+TOOLTIP = ../tooltips
-+BACKDIR = ../mainbak
-+HOMEDIR = $(HOME)
-+INCDIR  = -I. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I/usr/include
-+LIBDIR  = -L$(SPKIT)/spkit -L$(FORMS) -L$(TOOLTIP) -L/usr/lib -L/usr/X11R6/lib
-+CCFLAGS = $(CFLAGS) $(INCDIR) -DLINUX -DUSINGGCC
-+LDFLAGS = $(LIBDIR) -ldsp -ltooltips -lxforms -lXpm -lX11 -lm
-+
-+PROGS =	DAP
-+OBJS  = DPTich.o DPTich_cb.o DPTich_DSP.o DPTich_edit_cb.o DPTich_macros.o \
-+        DPTich_effect_cb.o DPTich_main.o DPSampleXforms.o DPTich_prefs.o \
-+        DPTich_linux_audio.o DPTich_linux_audiofile.o \
-+        DPTich_linux_macros.o DPTich_linux_ieee.o  \
-+        $(SOUND)/DPSample.o $(SOUND)/DPResample.o $(SOUND)/DPMixPlay.o \
-+        DPCrossButton.o
-+
-+.c.o:
-+	$(CC) $(CCFLAGS) -c $*.c -o $*.o
-+
-+.cc.o:
-+	$(CXX) $(CCFLAGS) -c $*.cc -o $*.o
-+
-+all: $(PROGS)
-+
-+DAP: $(OBJS)
-+	$(CXX) $(OBJS) -o DAP $(LDFLAGS) 
-+
-+clean:
-+	-rm -f $(OBJS) core
-+
-+empty:
-+	-rm -f $(OBJS) $(PROGS) core
-+
-+back:
-+	"cp" *.c $(BACKDIR)
-+	"cp" *.cc $(BACKDIR)
-+	"cp" *.h $(BACKDIR)
-+	"cp" *.fd $(BACKDIR)
-+	"cp" icons/*.gif $(BACKDIR)/icons
-+	"cp" icons/*.xpm $(BACKDIR)/icons
-+	"cp" Makefile.* $(BACKDIR)
-+	lha a $(HOMEDIR)/tich3.lzh *.c *.cc *.h *.fd icons/*.gif icons/*.xpm \
-+	Makefile.*
-+
-+restore:
-+	lha x $(HOMEDIR)/tich3.lzh
-+
-+print:
-+	a2ps \
-+	DPTich_main.h \
-+	DPTich_main.cc \
-+	DPTich_prefs.h \
-+	DPTich_prefs.cc \
-+	DPTich_macros.h \
-+	DPTich_macros.cc \
-+	DPTich_cb.h \
-+	DPTich_cb.cc \
-+	DPTich_edit_cb.cc \
-+	DPTich_effect_cb.cc \
-+	DPTich_effect.h \
-+	DPTich_DSP.h \
-+	DPTich_DSP.cc \
-+	DPTich_linux_macros.h \
-+	DPTich_linux_macros.c \
-+	DPTich_linux_audio.h \
-+	DPTich_linux_audio.c \
-+	DPTich_linux_audiofile.h \
-+	DPTich_linux_audiofile.c \
-+	DPTich_linux_ieee.h \
-+	DPTich_linux_ieee.c \
-+	DPSampleXforms.h \
-+	DPSampleXforms.cc \
-+	DPCrossButton.h \
-+	DPCrossButton.c \
-+	DPTich.h \
-+	DPTich.c \
-+	Makefile.* \
-+	>$(HOMEDIR)/tich3.ps
---- main/DPTich_linux_audio.h.orig	Wed Sep 16 18:40:00 1998
-+++ main/DPTich_linux_audio.h	Wed Sep 16 18:43:04 1998
-@@ -23,7 +23,11 @@
- #define _DPTich_linux_audio_h
+Index: libaudio/audio.h
+@@ -17,13 +17,15 @@
+ |
+ ****************************************************************************/
+ 
+-#ifdef LINUX
++#if defined(LINUX) || defined(__FreeBSD__)
+ 
+ #ifndef _audio_h
+ #define _audio_h
  
  #include <stdio.h>
-+#ifdef	__FreeBSD__
-+#include <stdio.h>
-+#else
++#ifndef	__FreeBSD__
  #include <malloc.h>
 +#endif
  #include <unistd.h>
  #include <fcntl.h>
  #include <limits.h>
-@@ -31,7 +35,11 @@
+@@ -31,7 +33,11 @@
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/ioctl.h>
diff --git a/audio/dap/files/patch-ac b/audio/dap/files/patch-ac
index 6ae37ad01206..874ccbaf3f70 100644
--- a/audio/dap/files/patch-ac
+++ b/audio/dap/files/patch-ac
@@ -1,239 +1,28 @@
---- spkit/spkit/Makefile.freebsd.orig	Wed Sep 16 09:26:42 1998
-+++ spkit/spkit/Makefile.freebsd	Wed Sep 16 18:34:14 1998
-@@ -0,0 +1,164 @@
-+CC      = gcc
-+CXX     = g++
-+FORMS   = /usr/X11R6/include
-+SOUND   = ../../sound
-+TOOLTIP = ../../tooltips
-+BACKDIR = ../spkitbak
-+MAINDIR = ../../main
-+HOMEDIR = $(HOME)
-+INCDIR  = -I. -I.. -I$(SOUND) -I$(FORMS) -I$(MAINDIR) -I$(TOOLTIP)
-+CCFLAGS = $(CFLAGS) $(INCDIR) -DLINUX -DUSINGGCC
-+
-+.c.o:
-+	$(CC) $(CCFLAGS) -c $*.c -o $*.o
-+
-+.cc.o:
-+	$(CXX) $(CCFLAGS) -c $*.cc -o $*.o
-+
-+LIBNAME = libdsp.a
-+
-+OBJS = \
-+	allpassi.o \
-+	allpassn.o \
-+	amp.o \
-+	butterwo.o \
-+	bwbandpa.o \
-+	bwbandre.o \
-+	bwhighpa.o \
-+	bwlowpas.o \
-+	comb.o \
-+	combint.o \
-+	comblowp.o \
-+	complim.o \
-+	compress.o \
-+	delay.o \
-+	delayint.o \
-+	dist.o \
-+	dpreader.o \
-+	dpwriter.o \
-+	dynamics.o \
-+	fbdelay.o \
-+	feedback.o \
-+	gate.o \
-+	inverter.o \
-+	jamrever.o \
-+	lfo.o \
-+	limiter.o \
-+	mult.o \
-+	mux.o \
-+	pan.o \
-+	processo.o \
-+	rectifie.o \
-+	resonato.o \
-+	schroede.o \
-+	stdrever.o \
-+	sum.o \
-+	sumavg.o \
-+	waveshap.o \
-+	z1lpf.o
-+
-+all: libdsp.a
-+
-+libdsp.a: $(OBJS)
-+	rm -f $(LIBNAME)
-+	ar -ruv $(LIBNAME) $(OBJS)
+Index: libaudio/Makefile.linux
+@@ -21,6 +21,7 @@
+ libaudio.a: $(OBJS)
+ 	rm -f $(LIBNAME)
+ 	ar ruv $(LIBNAME) $(OBJS)
 +	ranlib $(LIBNAME)
-+
-+clean:
-+	rm -f $(OBJS)
-+
-+empty:
-+	rm -f $(OBJS) $(LIBNAME)
-+
-+back:
-+	"cp" *.cc $(BACKDIR)
-+	"cp" *.h $(BACKDIR)
-+	"cp" Makefile.* $(BACKDIR)
-+	lha a $(HOMEDIR)/tich1.lzh *.cc *.h Makefile.*
-+
-+restore:
-+	lha x $(HOMEDIR)/tich1.lzh
-+
-+print:
-+	a2ps \
-+	allpassi.h \
-+	allpassi.cc \
-+	allpassn.h \
-+	allpassn.cc \
-+	amp.h \
-+	amp.cc \
-+	butterwo.h \
-+	butterwo.cc \
-+	bwbandpa.h \
-+	bwbandpa.cc \
-+	bwbandre.h \
-+	bwbandre.cc \
-+	bwhighpa.h \
-+	bwhighpa.cc \
-+	bwlowpas.h \
-+	bwlowpas.cc \
-+	comb.h \
-+	comb.cc \
-+	combint.h \
-+	combint.cc \
-+	comblowp.h \
-+	comblowp.cc \
-+	complim.h \
-+	complim.cc \
-+	compress.h \
-+	compress.cc \
-+	delay.h \
-+	delay.cc \
-+	delayint.h \
-+	delayint.cc \
-+	dist.h \
-+	dist.cc \
-+	dpreader.h \
-+	dpreader.cc \
-+	dpwriter.h \
-+	dpwriter.cc \
-+	dynamics.h \
-+	dynamics.cc \
-+	fbdelay.h \
-+	fbdelay.cc \
-+	feedback.h \
-+	feedback.cc \
-+	gate.h \
-+	gate.cc \
-+	inverter.h \
-+	inverter.cc \
-+	jamrever.h \
-+	jamrever.cc \
-+	lfo.h \
-+	lfo.cc \
-+	limiter.h \
-+	limiter.cc \
-+	mult.h \
-+	mult.cc \
-+	mux.h \
-+	mux.cc \
-+	pan.h \
-+	pan.cc \
-+	processo.h \
-+	processo.cc \
-+	rectifie.h \
-+	rectifie.cc \
-+	resonato.h \
-+	resonato.cc \
-+	schroede.h \
-+	schroede.cc \
-+	spkit.h \
-+	stdrever.h \
-+	stdrever.cc \
-+	sum.h \
-+	sum.cc \
-+	sumavg.h \
-+	sumavg.cc \
-+	tube.h \
-+	valve.h \
-+	waveshap.h \
-+	waveshap.cc \
-+	z1lpf.h \
-+	z1lpf.cc \
-+	Makefile.* \
-+	>$(HOMEDIR)/tich1.ps
---- sound/Makefile.freebsd.orig	Wed Sep 16 18:45:52 1998
-+++ sound/Makefile.freebsd	Wed Sep 16 18:46:18 1998
-@@ -0,0 +1,53 @@
-+CC      = gcc
-+CXX     = g++
-+FORMS   = /usr/X11R6/include
-+SPKIT   = ../spkit
-+TOOLTIP = ../tooltips
-+BACKDIR = ../soundbak
-+MAINDIR = ../main
-+HOMEDIR = $(HOME)
-+INCDIR  = -I. -I$(SPKIT) -I$(FORMS) -I$(MAINDIR) -I$(TOOLTIP) -I/usr/include -I/usr/local/include
-+LIBDIR  = -L$(SPKIT)/spkit -L$(FORMS) -L/usr/lib -L/usr/X11R6/lib
-+CCFLAGS = $(CFLAGS) -DNOFORMS -DLINUX -DUSINGGCC
-+LDFLAGS = $(LIBDIR) -ldsp -lforms -lXpm -lX11 -lm
-+
-+PROGS =	SampleTest
-+OBJS  = DPSample.o DPResample.o DPMixPlay.o SampleTest.o
-+LINUX = $(MAINDIR)/DPTich_linux_audio.o \
-+        $(MAINDIR)/DPTich_linux_audiofile.o \
-+        $(MAINDIR)/DPTich_linux_macros.o \
-+        $(MAINDIR)/DPTich_linux_ieee.o
-+
-+.c.o:
-+	$(CC) $(CCFLAGS) $(INCDIR) -c $*.c -o $*.o
-+
-+.cc.o:
-+	$(CXX) $(CCFLAGS) $(INCDIR) -c $*.cc -o $*.o
-+
-+normal: DPSample.o DPResample.o DPMixPlay.o
-+
-+all: $(PROGS)
-+
-+SampleTest: $(OBJS)
-+	$(CXX) $(CCFLAGS) $(OBJS) $(LINUX) -o SampleTest $(LDFLAGS)
-+
-+clean:
-+	-rm -f $(OBJS) core
-+
-+empty:
-+	-rm -f $(OBJS) $(PROGS) core
-+
-+back:
-+	"cp" *.h $(BACKDIR)
-+	"cp" *.cc $(BACKDIR)
-+	"cp" *.inl $(BACKDIR)
-+	"cp" Makefile.* $(BACKDIR)
-+	lha a $(HOMEDIR)/tich2.lzh *.h *.cc *.inl Makefile.*
-+
-+restore:
-+	lha x $(HOMEDIR)/tich2.lzh
-+
-+print:
-+	a2ps DPDefs.h DPSample.h DPSample.inl DPSample.cc DPResample.h \
-+	DPResample.cc DPMixPlay.h DPMixPlay.cc Makefile.* \
-+	>$(HOMEDIR)/tich2.ps
---- tooltips/Makefile.orig	Wed Sep 16 18:45:00 1998
-+++ tooltips/Makefile	Wed Sep 16 18:45:19 1998
-@@ -36,11 +36,11 @@
  
- # Uncomment out this line if you do not want debug information included.
- # DEBUG = -g -Wall -ansi -pedantic
--DEBUG = 
-+#DEBUG = 
+ clean:
+ 	-rm -f $(OBJS) core
+Index: libaudiofile/Makefile.linux
+@@ -21,6 +21,7 @@
+ libaudiofile.a: $(OBJS)
+ 	rm -f $(LIBNAME)
+ 	ar ruv $(LIBNAME) $(OBJS)
++	ranlib $(LIBNAME)
+ 
+ clean:
+ 	-rm -f $(OBJS) core
+Index: main/Makefile.linux
+@@ -14,7 +14,7 @@
+ CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall
+ DEBUG   = -g3
+ OPTIM   = -O1
+-LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -lXpm -lX11 -lm
++LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lxforms -lXpm -lX11 -lm
  
- # Define the utilities to use for compilation.
- CC         = gcc
--CCOPTS     = $(DEBUG) -I$(XFORMS_INCLUDE_DIR) -I$(X11_INCLUDE_DIR) \
-+CCOPTS     = $(CFLAGS) -I$(XFORMS_INCLUDE_DIR) -I$(X11_INCLUDE_DIR) \
-              -I$(OTHER_INCLUDE_DIR)
- AR         = ar
- AROPTS     = rc
+ PROGS =	DAP
+ OBJS  = DPTich.o DPTich_cb.o DPTich_DSP.o DPTich_edit_cb.o DPTich_macros.o \
diff --git a/audio/dap/files/patch-ad b/audio/dap/files/patch-ad
new file mode 100644
index 000000000000..34efa2bbfcde
--- /dev/null
+++ b/audio/dap/files/patch-ad
@@ -0,0 +1,9 @@
+Index: spkit/spkit/Makefile.linux
+@@ -65,6 +65,7 @@
+ libdsp.a: $(OBJS)
+ 	rm -f $(LIBNAME)
+ 	ar ruv $(LIBNAME) $(OBJS)
++	ranlib $(LIBNAME)
+ 
+ clean:
+ 	rm -f $(OBJS)