7 files changed, 66 insertions, 33 deletions

diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index 8f6da5e44224..1f8acc589eea 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	esound
-PORTVERSION=	0.2.38
+PORTVERSION=	0.2.39
 PORTREVISION=	0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/audio/esound/distinfo b/audio/esound/distinfo
index 5862cf7ba53e..72f71054c418 100644
--- a/audio/esound/distinfo
+++ b/audio/esound/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome/esound-0.2.38.tar.bz2) = 1c48c100b450d617b58dacb59837d34f
-SHA256 (gnome/esound-0.2.38.tar.bz2) = 08ea208cb3948650250bb068de5c75b877e78902d679e8af5d0a14062c939b37
-SIZE (gnome/esound-0.2.38.tar.bz2) = 393758
+MD5 (gnome/esound-0.2.39.tar.bz2) = d950b9cd0d7b5406cc4bb16bcdcea8f4
+SHA256 (gnome/esound-0.2.39.tar.bz2) = 41ce2f8c84f7703d0b62ed1f49d0885ac006563d86f8cacaa0c770180b81c289
+SIZE (gnome/esound-0.2.39.tar.bz2) = 423581
diff --git a/audio/esound/files/patch-aa b/audio/esound/files/patch-aa
index 099765584c1f..a323a88f60ee 100644
--- a/audio/esound/files/patch-aa
+++ b/audio/esound/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Mon May 28 15:23:55 2007
-+++ Makefile.in	Mon May 28 15:24:56 2007
-@@ -341,7 +341,7 @@ bin_SCRIPTS = \
+--- Makefile.in.orig	2008-07-17 13:45:22.000000000 -0400
++++ Makefile.in	2008-07-17 13:45:46.000000000 -0400
+@@ -342,7 +342,7 @@ bin_SCRIPTS = \
  
  lib_LTLIBRARIES = libesd.la $(libesddsp_la)
  libesd_la_CFLAGS = $(AM_CFLAGS)
@@ -9,12 +9,12 @@
  libesd_la_LIBADD = $(AUDIOFILE_LIBS) $(SOUND_LIBS)
  libesd_la_SOURCES = \
  	esdlib.c	\
-@@ -372,7 +372,7 @@ AUDIO_BACKENDS = \
+@@ -373,7 +373,7 @@ AUDIO_BACKENDS = \
  	audio_solaris.c		\
  	audio_win32.c
  
 -libesddsp_la_LDFLAGS = -version-info $(ESD_VERSION_INFO)
 +libesddsp_la_LDFLAGS = -version-info 2:0:0
- libesddsp_la_LIBADD = $(DL_LIB) -lm libesd.la
+ libesddsp_la_LIBADD = libesd.la $(DL_LIB) -lm
  libesddsp_la_SOURCES = \
  	esddsp.c
diff --git a/audio/esound/files/patch-ad b/audio/esound/files/patch-ad
index 570d73c91cc9..3632b7f873e0 100644
--- a/audio/esound/files/patch-ad
+++ b/audio/esound/files/patch-ad
@@ -1,15 +1,15 @@
---- esdlib.c.orig	Mon Jul 15 05:28:26 2002
-+++ esdlib.c	Tue Aug 27 13:06:16 2002
-@@ -20,6 +20,8 @@
- #include <arpa/inet.h>
+--- esdlib.c.orig	2008-07-15 11:35:15.000000000 -0400
++++ esdlib.c	2008-07-17 13:46:44.000000000 -0400
+@@ -21,6 +21,8 @@
  #include <errno.h>
  #include <sys/wait.h>
+ #include <poll.h>
 +#include <pwd.h>
 +#include <limits.h>
  
  #include <sys/un.h>
  
-@@ -660,8 +662,7 @@
+@@ -889,8 +891,7 @@ int esd_open_sound( const char *host )
  		setsid();
  		cmd = malloc(strlen(SERVERDIR"/esd  -spawnfd 999999") + (esd_spawn_options?strlen(esd_spawn_options):0));
  
@@ -19,11 +19,10 @@
  		execl("/bin/sh", "/bin/sh", "-c", cmd, NULL);
  		perror("execl");
  		_exit(1);
-@@ -1421,3 +1422,34 @@
- 
+@@ -1703,3 +1704,34 @@ int esd_close( int esd )
      return close( esd );
  }
-+
+ 
 +char *
 +esd_unix_socket_dir(void) {
 +       static char *sockdir = NULL, sockdirbuf[PATH_MAX];
@@ -54,3 +53,4 @@
 +       return (sockname);
 + }
 +
++
diff --git a/audio/esound/files/patch-audio_oss.c b/audio/esound/files/patch-audio_oss.c
index 9d540c88e219..a5d30b0dddb2 100644
--- a/audio/esound/files/patch-audio_oss.c
+++ b/audio/esound/files/patch-audio_oss.c
@@ -1,6 +1,12 @@
---- audio_oss.c.orig	Tue Jun  4 08:55:37 2002
-+++ audio_oss.c	Sun Jun  9 01:55:21 2002
-@@ -10,9 +10,14 @@
+--- audio_oss.c.orig	2008-07-15 12:00:03.000000000 -0400
++++ audio_oss.c	2008-07-17 13:56:25.000000000 -0400
+@@ -1,4 +1,5 @@
+ #include "config.h"
++#include <errno.h>
+ 
+ #ifdef HAVE_MACHINE_SOUNDCARD_H
+ #  include <machine/soundcard.h>
+@@ -10,9 +11,14 @@
  #  endif
  #endif
  
diff --git a/audio/esound/files/patch-esddsp.c b/audio/esound/files/patch-esddsp.c
index 6751ca4abbb9..3ea9a1c61369 100644
--- a/audio/esound/files/patch-esddsp.c
+++ b/audio/esound/files/patch-esddsp.c
@@ -1,22 +1,40 @@
---- esddsp.c.orig	Mon Jan  1 18:56:06 2007
-+++ esddsp.c	Thu Mar 22 19:49:15 2007
-@@ -224,9 +224,12 @@ open_wrapper (int (*func) (const char *,
+--- 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 *,
+ 	      const char *pathname, int flags, ...)
+ {
+   va_list args;
+-  mode_t mode;
++  mode_t mode = 0;
  
    dsp_init ();
  
 -  va_start (args, flags);
--  mode = va_arg (args, mode_t);
--  va_end (args);
+-  if (sizeof (mode_t) < sizeof (int))
 +  if ((flags & O_CREAT) != 0)
 +    {
 +      va_start (args, flags);
-+      mode = va_arg (args, int);
++      if (sizeof (mode_t) < sizeof (int))
+ 	  mode = va_arg (args, int);
+-  else
++      else
+ 	  mode = va_arg (args, mode_t);
+-  va_end (args);
 +      va_end (args);
 +    }
  
    if (!strcmp (pathname, "/dev/dsp"))
      {
-@@ -272,9 +275,12 @@ open (const char *pathname, int flags, .
+@@ -260,7 +263,7 @@ open (const char *pathname, int flags, .
+ {
+   static int (*func) (const char *, int, mode_t) = NULL;
+   va_list args;
+-  mode_t mode;
++  mode_t mode = 0;
+ 
+   DPRINTF ("open\n");
+ 
+@@ -275,9 +278,12 @@ open (const char *pathname, int flags, .
  	}
      }
  
@@ -32,7 +50,16 @@
  
    return open_wrapper(func, pathname, flags, mode);
  }
-@@ -299,9 +305,12 @@ open64 (const char *pathname, int flags,
+@@ -287,7 +293,7 @@ open64 (const char *pathname, int flags,
+ {
+   static int (*func) (const char *, int, mode_t) = NULL;
+   va_list args;
+-  mode_t mode;
++  mode_t mode = 0;
+ 
+   DPRINTF ("open64\n");
+ 
+@@ -302,9 +308,12 @@ open64 (const char *pathname, int flags,
  	}
      }
  
diff --git a/audio/esound/files/patch-esddsp.in b/audio/esound/files/patch-esddsp.in
index da937fd6d71f..e7b1085621b5 100644
--- a/audio/esound/files/patch-esddsp.in
+++ b/audio/esound/files/patch-esddsp.in
@@ -1,11 +1,11 @@
---- esddsp.in.orig	Sun Oct  5 15:31:52 2003
-+++ esddsp.in	Sun Oct  5 15:32:08 2003
-@@ -97,7 +97,7 @@
+--- esddsp.in.orig	2008-07-15 12:05:18.000000000 -0400
++++ esddsp.in	2008-07-17 13:54:49.000000000 -0400
+@@ -106,7 +106,7 @@ fi
  prefix=@prefix@
  exec_prefix=@exec_prefix@
  
--LD_PRELOAD="@libdir@/libesddsp.so.@ESD_MAJOR_VERSION@ @libdir@/libesd.so.@ESD_MAJOR_VERSION@ $LD_PRELOAD"
-+LD_PRELOAD="@libdir@/libesddsp.so @libdir@/libesd.so $LD_PRELOAD"
+-LD_PRELOAD="libesddsp.so.@ESD_MAJOR_VERSION@ libesd.so.@ESD_MAJOR_VERSION@ $LD_PRELOAD"
++LD_PRELOAD="libesddsp.so libesd.so $LD_PRELOAD"
  export LD_PRELOAD
  
  # invoke the program with the args given