2 files changed, 26 insertions, 19 deletions

diff --git a/audio/esound/files/patch-ad b/audio/esound/files/patch-ad
index c2059f5d0703..68018a173ede 100644
--- a/audio/esound/files/patch-ad
+++ b/audio/esound/files/patch-ad
@@ -1,5 +1,5 @@
---- esdlib.c.orig	2008-07-30 17:08:59.000000000 -0400
-+++ esdlib.c	2008-09-07 22:19:48.000000000 -0400
+--- esdlib.c.orig	2008-11-18 15:35:19.000000000 -0500
++++ esdlib.c	2008-11-20 14:32:59.000000000 -0500
 @@ -21,6 +21,8 @@
  #include <errno.h>
  #include <sys/wait.h>
@@ -9,17 +9,16 @@
  
  #include <sys/un.h>
  
-@@ -895,8 +897,7 @@ int esd_open_sound( const char *host )
- 		setsid();
- 		cmd = malloc(strlen(SERVERDIR"/esd  -spawnfd 999999") + (esd_spawn_options?strlen(esd_spawn_options):0));
+@@ -928,7 +930,7 @@ int esd_open_sound( const char *rhost )
+ 		    putenv(preload2);
+ 		}
+ 	    cmd = malloc(strlen(SERVERDIR"/esd  -spawnfd 9999999999") + strlen(esd_spawn_options));
+-	    sprintf(cmd, "%s/esd %s -spawnfd %d", SERVERDIR, esd_spawn_options, esd_pipe[1]);
++	    sprintf(cmd, "exec esd %s -spawnfd %d", esd_spawn_options?esd_spawn_options:"", esd_pipe[1]);
  
--		sprintf(cmd, "%s/esd %s -spawnfd %d", SERVERDIR, esd_spawn_options?esd_spawn_options:"", esd_pipe[1]);
--
-+		sprintf(cmd, "exec esd %s -spawnfd %d", esd_spawn_options?esd_spawn_options:"", esd_pipe[1]);
- 		execl("/bin/sh", "/bin/sh", "-c", cmd, NULL);
- 		perror("execl");
- 		_exit(1);
-@@ -1709,3 +1710,34 @@ int esd_close( int esd )
+ 	    if(!fork()) {
+ 		/* child of child process.  Minimal so startup overhead is
+@@ -1747,3 +1749,34 @@ int esd_close( int esd )
      return close( esd );
  }
  
diff --git a/audio/esound/files/patch-esddsp.c b/audio/esound/files/patch-esddsp.c
index 3ea9a1c61369..3c24fc97e477 100644
--- a/audio/esound/files/patch-esddsp.c
+++ b/audio/esound/files/patch-esddsp.c
@@ -1,6 +1,14 @@
---- esddsp.c.orig	2008-07-15 11:47:20.000000000 -0400
-+++ esddsp.c	2008-07-17 13:58:09.000000000 -0400
-@@ -220,16 +220,19 @@ open_wrapper (int (*func) (const char *,
+--- esddsp.c.orig	2008-11-18 15:35:19.000000000 -0500
++++ esddsp.c	2008-11-20 14:35:02.000000000 -0500
+@@ -70,6 +70,7 @@
+ 
+ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__bsdi__)
+ typedef unsigned long request_t;
++typedef off_t off64_t;
+ #else
+ typedef int request_t;
+ #endif
+@@ -228,16 +229,19 @@ open_wrapper (int (*func) (const char *,
  	      const char *pathname, int flags, ...)
  {
    va_list args;
@@ -25,7 +33,7 @@
  
    if (!strcmp (pathname, "/dev/dsp"))
      {
-@@ -260,7 +263,7 @@ open (const char *pathname, int flags, .
+@@ -268,7 +272,7 @@ open (const char *pathname, int flags, .
  {
    static int (*func) (const char *, int, mode_t) = NULL;
    va_list args;
@@ -34,7 +42,7 @@
  
    DPRINTF ("open\n");
  
-@@ -275,9 +278,12 @@ open (const char *pathname, int flags, .
+@@ -283,9 +287,12 @@ open (const char *pathname, int flags, .
  	}
      }
  
@@ -50,7 +58,7 @@
  
    return open_wrapper(func, pathname, flags, mode);
  }
-@@ -287,7 +293,7 @@ open64 (const char *pathname, int flags,
+@@ -295,7 +302,7 @@ open64 (const char *pathname, int flags,
  {
    static int (*func) (const char *, int, mode_t) = NULL;
    va_list args;
@@ -59,7 +67,7 @@
  
    DPRINTF ("open64\n");
  
-@@ -302,9 +308,12 @@ open64 (const char *pathname, int flags,
+@@ -310,9 +317,12 @@ open64 (const char *pathname, int flags,
  	}
      }