- Add missing patches

9 files changed, 135 insertions, 0 deletions

diff --git a/audio/audacity/files/patch-Makefile.in b/audio/audacity/files/patch-Makefile.in
new file mode 100644
index 0000000..c441c03
--- /dev/null
+++ b/audio/audacity/files/patch-Makefile.in
@@ -0,0 +1,17 @@
+--- Makefile.in.orig	Tue Dec  2 22:43:47 2003
++++ Makefile.in	Tue Dec  2 22:46:38 2003
+@@ -27,12 +27,14 @@
+ 	$(INSTALL) -d $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -m 755 audacity $(DESTDIR)$(BINDIR)/$(AUDACITY_NAME)
+ 
++ifeq ($(DOC),yes)
+ 	# install docs
+ 	$(INSTALL) -d $(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)
+ 	-test -f audacity-1.2-help.htb && $(INSTALL) -m 644 audacity-1.2-help.htb \
+ 		$(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)/audacity-1.2-help.htb
+ 	$(INSTALL) -m 644 README.txt $(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)/README.txt
+ 	$(INSTALL) -m 644 LICENSE.txt $(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)/LICENSE.txt
++endif
+ 
+ 	# install manpage
+ 	$(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
diff --git a/audio/audacity/files/patch-libnyquist-Makefile.in b/audio/audacity/files/patch-libnyquist-Makefile.in
new file mode 100644
index 0000000..2f57bba
--- /dev/null
+++ b/audio/audacity/files/patch-libnyquist-Makefile.in
@@ -0,0 +1,36 @@
+--- lib-src/libnyquist/Makefile.in.orig	Tue Dec  2 19:32:18 2003
++++ lib-src/libnyquist/Makefile.in	Tue Dec  2 19:32:42 2003
+@@ -465,13 +465,13 @@
+ 	cc -c cmt/userio.c -o cmt/userio.o $(CFLAGS)
+ 
+ misc/intgen: misc/intgen.c
+-	cd misc; make intgen
++	cd misc; $(MAKE) intgen
+ 
+ misc/unpacker: misc/unpacker.c misc/convert.c
+-	cd misc; make unpacker
++	cd misc; $(MAKE) unpacker
+ 
+ misc/packer: misc/packer.c misc/convert.c
+-	cd misc; make packer
++	cd misc; $(MAKE) packer
+ 
+ nyqsrc/sndfnintptrs.h: $(NYQHDRS) snd/snd.h misc/intgen
+ 	$(INTGEN) nyqsrc/sndfnint $(NYQHDRS)
+@@ -481,14 +481,14 @@
+ 
+ clean:
+ 	rm -f libnyquist.a
+-	cd misc; make clean
++	cd misc; $(MAKE) clean
+ 	rm -f $(OBJECTS)
+ # Note that these files are machine-generated:
+ 	rm -f nyqsrc/sndfnintptrs.h nyqsrc/sndfnint.c nyqsrc/sndfnintdefs.h
+ 	rm -f nyqsrc/seqfnintptrs.h nyqsrc/seqfnint.c nyqsrc/seqfnintdefs.h
+ 
+ cleaner: clean
+-	cd misc; make cleaner
++	cd misc; $(MAKE) cleaner
+ 	rm -f *.backup */*.backup
+ 	rm -f *~ */*.*~
+ 	rm -f *.save */*.save
diff --git a/audio/audacity/files/patch-libnyquist-switches.h b/audio/audacity/files/patch-libnyquist-switches.h
new file mode 100644
index 0000000..4cd74ad
--- /dev/null
+++ b/audio/audacity/files/patch-libnyquist-switches.h
@@ -0,0 +1,11 @@
+--- lib-src/libnyquist/sys/switches.h.orig	Tue Dec  2 19:14:40 2003
++++ lib-src/libnyquist/sys/switches.h	Tue Dec  2 19:16:20 2003
+@@ -39,7 +39,7 @@
+ */
+ #define nyquist_printf printf
+ 
+-#if __APPLE__ && __GNUC__ /* Mac OS X */
++#if (__FreeBSD__ || __APPLE__) && __GNUC__ /* Mac OS X */
+ #define NEED_ULONG 1
+ #else
+ #include <sys/types.h>
diff --git a/audio/audacity/files/patch-libnyquist-term.c b/audio/audacity/files/patch-libnyquist-term.c
new file mode 100644
index 0000000..5e33f81
--- /dev/null
+++ b/audio/audacity/files/patch-libnyquist-term.c
@@ -0,0 +1,11 @@
+--- lib-src/libnyquist/sys/term.c.orig	Tue Dec  2 19:17:30 2003
++++ lib-src/libnyquist/sys/term.c	Tue Dec  2 19:17:51 2003
+@@ -40,7 +40,7 @@
+ #else
+ 
+ #include <termios.h>
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
+ #include <asm/ioctls.h>
+ #endif
+ #include <signal.h>
diff --git a/audio/audacity/files/patch-libresample-Makefile.in b/audio/audacity/files/patch-libresample-Makefile.in
new file mode 100644
index 0000000..bcb4513
--- /dev/null
+++ b/audio/audacity/files/patch-libresample-Makefile.in
@@ -0,0 +1,11 @@
+--- lib-src/libresample/Makefile.in.orig	Tue Dec  2 19:46:02 2003
++++ lib-src/libresample/Makefile.in	Tue Dec  2 19:46:25 2003
+@@ -6,7 +6,7 @@
+ CC = @CC@
+ CFLAGS = @CFLAGS@ -Wall
+ 
+-LIBS = @LIBS@ -lm
++LIBS = @LDFLAGS@ @LIBS@ -lm
+ 
+ AR = @AR@
+ RANLIB = @RANLIB@
diff --git a/audio/audacity/files/patch-portaudio-pa_unix.h b/audio/audacity/files/patch-portaudio-pa_unix.h
new file mode 100644
index 0000000..e4a44ff
--- /dev/null
+++ b/audio/audacity/files/patch-portaudio-pa_unix.h
@@ -0,0 +1,11 @@
+--- lib-src/portaudio/pa_unix_oss/pa_unix.h.orig	Tue Dec  2 19:56:56 2003
++++ lib-src/portaudio/pa_unix_oss/pa_unix.h	Tue Dec  2 19:58:33 2003
+@@ -82,7 +82,7 @@
+ #define MAX_TIMEOUT_MSEC   (1000)
+ 
+ /************************************************* Definitions ********/
+-#ifdef __linux__
++#if defined(__linux__) || defined(__FreeBSD__)
+  #define DEVICE_NAME_BASE            "/dev/dsp"
+ #else
+  #define DEVICE_NAME_BASE            "/dev/audio"
diff --git a/audio/audacity/files/patch-portaudio-pa_unix_oss.c b/audio/audacity/files/patch-portaudio-pa_unix_oss.c
new file mode 100644
index 0000000..43b2d58
--- /dev/null
+++ b/audio/audacity/files/patch-portaudio-pa_unix_oss.c
@@ -0,0 +1,11 @@
+--- lib-src/portaudio/pa_unix_oss/pa_unix_oss.c.orig	Tue Dec  2 19:57:13 2003
++++ lib-src/portaudio/pa_unix_oss/pa_unix_oss.c	Tue Dec  2 19:57:47 2003
+@@ -42,6 +42,8 @@
+ 
+ #ifdef __linux__
+ #include <linux/soundcard.h>
++#elif defined(__FreeBSD__)
++#include <sys/soundcard.h>
+ #else
+ #include <machine/soundcard.h> /* JH20010905 */
+ #endif
diff --git a/audio/audacity/files/patch-portmixer-px_unix_oss.c b/audio/audacity/files/patch-portmixer-px_unix_oss.c
new file mode 100644
index 0000000..f55e651
--- /dev/null
+++ b/audio/audacity/files/patch-portmixer-px_unix_oss.c
@@ -0,0 +1,11 @@
+--- lib-src/portmixer/px_unix_oss/px_unix_oss.c.orig	Tue Dec  2 20:06:55 2003
++++ lib-src/portmixer/px_unix_oss/px_unix_oss.c	Tue Dec  2 20:07:09 2003
+@@ -37,6 +37,8 @@
+ 
+ #ifdef __linux__
+ #include <linux/soundcard.h>
++#elif defined(__FreeBSD__)
++#include <sys/soundcard.h>
+ #else
+ #include <machine/soundcard.h> /* JH20010905 */
+ #endif
diff --git a/audio/audacity/files/patch-soundtouch-Makefile.in b/audio/audacity/files/patch-soundtouch-Makefile.in
new file mode 100644
index 0000000..16b5d8b
--- /dev/null
+++ b/audio/audacity/files/patch-soundtouch-Makefile.in
@@ -0,0 +1,16 @@
+--- lib-src/soundtouch/Makefile.in.orig	Tue Dec  2 19:01:28 2003
++++ lib-src/soundtouch/Makefile.in	Tue Dec  2 19:03:17 2003
+@@ -1,10 +1,10 @@
+ all:
+-	cd src && make
++	cd src && $(MAKE)
+ 
+ clean:
+ 	rm -f *~ *.a config.cache config.log config.status core*
+-	cd src && make clean
++	cd src && $(MAKE) clean
+ 
+ distclean: clean
+ 	rm -f Makefile
+-	cd src && make dist
++	cd src && $(MAKE) dist