4 files changed, 88 insertions, 2 deletions

diff --git a/audio/rhythmbox/files/patch-configure b/audio/rhythmbox/files/patch-configure
new file mode 100644
index 000000000000..9c31cedaaf54
--- /dev/null
+++ b/audio/rhythmbox/files/patch-configure
@@ -0,0 +1,47 @@
+--- configure.orig	Mon Oct 17 10:21:14 2005
++++ configure	Mon Oct 17 10:22:47 2005
+@@ -21603,7 +21603,7 @@
+ 	enable_hal02=yes
+ fi
+ 	fi
+-	if test x$enable_hal05 == xyes || test x$enable_hal02 == xyes; then
++	if test x$enable_hal05 = xyes || test x$enable_hal02 = xyes; then
+   	  enable_hal=yes
+ 	else
+ 	  enable_hal=no
+@@ -21620,7 +21620,7 @@
+ _ACEOF
+ 
+ 	   enable_ipod=yes
+-	   if test x$enable_hal05 == xyes; then
++	   if test x$enable_hal05 = xyes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_HAL_0_5 1
+@@ -21887,7 +21887,7 @@
+ RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS $SOUNDSYSTEM_LIBS"
+ 
+ 
+-  if test "x$GST_INSPECT" == "x"; then
++  if test "x$GST_INSPECT" = "x"; then
+     # Extract the first word of "gst-inspect-0.8", so it can be a program name with args.
+ set dummy gst-inspect-0.8; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+@@ -22640,7 +22640,7 @@
+ 
+ 
+ if test x"$x_includes" != x"NONE" && test -n "$x_includes" ; then
+-	CFLAGS=$CFLAGS -I`echo $x_includes | sed -e "s/:/ -I/g"`
++	CFLAGS=$CFLAGS\ -I`echo $x_includes | sed -e "s/:/ -I/g"`
+ fi
+ if test x"$x_libraries" != x"NONE" && test -n "$x_libraries" ; then
+ 	LIBS=-L`echo $x_libraries | sed -e "s/:/ -L/g"`
+@@ -22977,7 +22977,7 @@
+ fi
+ if test "x$enable_audiocd" = "xyes"; then
+ 
+-  if test "x$GST_INSPECT" == "x"; then
++  if test "x$GST_INSPECT" = "x"; then
+     # Extract the first word of "gst-inspect-0.8", so it can be a program name with args.
+ set dummy gst-inspect-0.8; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
diff --git a/audio/rhythmbox/files/patch-daapsharing_rb-daap-src.c b/audio/rhythmbox/files/patch-daapsharing_rb-daap-src.c
new file mode 100644
index 000000000000..fdbf98e762a5
--- /dev/null
+++ b/audio/rhythmbox/files/patch-daapsharing_rb-daap-src.c
@@ -0,0 +1,27 @@
+--- daapsharing/rb-daap-src.c.orig	Sun Oct 16 05:50:21 2005
++++ daapsharing/rb-daap-src.c	Mon Oct 17 10:30:20 2005
+@@ -34,6 +34,7 @@
+ #include <sys/ioctl.h>
+ #include <netdb.h>
+ #include <unistd.h>
++#include <signal.h>
+ 
+ #include <libgnome/gnome-i18n.h>
+ #include <gst/gst.h>
+@@ -580,7 +581,15 @@ gst_tcp_socket_write (int socket, const 
+ 	size_t bytes_written = 0;
+ 
+ 	while (bytes_written < count) {
+-		ssize_t wrote = send (socket, buf + bytes_written, count - bytes_written, MSG_NOSIGNAL);
++		ssize_t wrote;
++#ifdef MSG_NOSIGNAL
++		wrote = send (socket, buf + bytes_written, count - bytes_written, MSG_NOSIGNAL);
++#else
++		signal (SIGPIPE, SIG_IGN);
++		wrote = send (socket, buf + bytes_written, count - bytes_written, 0);
++		signal (SIGPIPE, SIG_DFL);
++#endif
++
+ 
+ 		if (wrote <= 0) {
+ 			return bytes_written;
diff --git a/audio/rhythmbox/files/patch-player_rb-recorder-gst.c b/audio/rhythmbox/files/patch-player_rb-recorder-gst.c
new file mode 100644
index 000000000000..e8aae3495d17
--- /dev/null
+++ b/audio/rhythmbox/files/patch-player_rb-recorder-gst.c
@@ -0,0 +1,12 @@
+--- player/rb-recorder-gst.c.orig	Wed Aug 10 20:06:11 2005
++++ player/rb-recorder-gst.c	Wed Aug 10 20:06:31 2005
+@@ -25,7 +25,9 @@
+ #include <string.h>
+ #include <math.h>
+ #include <time.h>
++#ifndef __FreeBSD__
+ #include <sys/vfs.h>
++#endif
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
diff --git a/audio/rhythmbox/files/patch-corba_Makefile.in b/audio/rhythmbox/files/patch-remote_bonobo_Makefile.in
index 723285dfa01b..c19ec530ea0b 100644
--- a/audio/rhythmbox/files/patch-corba_Makefile.in
+++ b/audio/rhythmbox/files/patch-remote_bonobo_Makefile.in
@@ -1,5 +1,5 @@
---- corba/Makefile.in.orig	Wed Aug 27 04:19:40 2003
-+++ corba/Makefile.in	Wed Aug 27 04:19:56 2003
+--- remote/bonobo/Makefile.in.orig	Wed Aug 27 04:19:40 2003
++++ remote/bonobo/Makefile.in	Wed Aug 27 04:19:56 2003
 @@ -237,7 +237,7 @@
  
  noinst_HEADERS = Rhythmbox.h