4 files changed, 11 insertions, 63 deletions
diff --git a/audio/gnomemedia2/files/patch-ad b/audio/gnomemedia2/files/patch-ad
deleted file mode 100644
index f49a888a5a99..000000000000
--- a/audio/gnomemedia2/files/patch-ad
+++ /dev/null
@@ -1,31 +0,0 @@
---- gmix/gmix.c.orig	Tue Oct  8 19:40:43 2002
-+++ gmix/gmix.c	Fri Oct 11 09:20:13 2002
-@@ -60,7 +60,7 @@
- #ifdef HAVE_LINUX_SOUNDCARD_H 
- #include <linux/soundcard.h>
- #else 
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #endif
- #endif
- 
-@@ -722,6 +722,7 @@
- 	
- 	cnt = 0;
- 	devices = NULL;
-+	num_mixers = 0;
- 	device_by_name = g_hash_table_new (g_str_hash, g_str_equal);
- 		
- 	do {
-@@ -730,9 +731,8 @@
- 			devices = g_list_append (devices, new_device);
- 			g_hash_table_insert (device_by_name, new_device->info.name, new_device);
- 		}
--	} while (new_device);
--	
--	num_mixers = cnt - 1;
-+    	} while ((errno == EACCES) || (errno == EINVAL) || (errno == ENXIO) \
-+		|| new_device);
- }
- 
- device_info *
diff --git a/audio/gnomemedia2/files/patch-configure b/audio/gnomemedia2/files/patch-configure
index d5e0e924c1a7..2c6ea537ce3a 100644
--- a/audio/gnomemedia2/files/patch-configure
+++ b/audio/gnomemedia2/files/patch-configure
@@ -1,10 +1,11 @@
---- configure.orig	Thu Jan 23 17:55:03 2003
-+++ configure	Tue Feb  4 20:31:01 2003
-@@ -8336,6 +8336,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+--- configure.orig	Wed Dec 31 00:49:17 2003
++++ configure	Wed Dec 31 00:49:57 2003
+@@ -23190,7 +23190,7 @@
+ *FreeBSD*)
+ 	CDROM_HOST=freebsd
+ 	CDROM_HOST_FREEBSD=true
+-	default_cd_device="/dev/acd0c"
++	default_cd_device="/dev/%%CDROM%%"
+ 	;;
+ *Linux*)
+ 	CDROM_HOST=linux
diff --git a/audio/gnomemedia2/files/patch-gmix::prefs.c b/audio/gnomemedia2/files/patch-gmix::prefs.c
deleted file mode 100644
index b25b42b9748e..000000000000
--- a/audio/gnomemedia2/files/patch-gmix::prefs.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gmix/prefs.c.orig	Tue May  7 00:52:42 2002
-+++ gmix/prefs.c	Tue May  7 00:52:54 2002
-@@ -38,7 +38,7 @@
- #ifdef HAVE_LINUX_SOUNDCARD_H 
- #include <linux/soundcard.h>
- #else 
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #endif
- #endif
- 
diff --git a/audio/gnomemedia2/files/patch-gmix_gmix.h b/audio/gnomemedia2/files/patch-gmix_gmix.h
deleted file mode 100644
index 600110df6a9f..000000000000
--- a/audio/gnomemedia2/files/patch-gmix_gmix.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- gmix/gmix.h.orig	Sat Aug 16 15:13:57 2003
-+++ gmix/gmix.h	Sat Aug 16 15:14:47 2003
-@@ -25,7 +25,7 @@
-  */
- #define GMIX_VERSION 0x030000
- 
--#if defined(ALSA) || defined(__FreeBSD__)
-+#if defined(ALSA) || (defined(__FreeBSD__) && !defined(SOUND_MIXER_INFO))
- /* stolen from OSS's soundcard.h */
- typedef struct mixer_info
- {