Update to 0.2.39:

===============
Version 0.2.39
===============
	* Fixed esd client-side code to not hang if esd crashes/hangs
          or otherwise becomes unreachable (Jeffrey Stedfast)
	* Suppress verbose error messages from ALSA (Stanislav Brabec)
	* Allow for multiple esd instances
	* Fix esound-config for multi-lib setups (Matthias Clasen)
	* Don't report errors about /dev/dsp not existing (Havoc Pennington)
	* Various other build fixes for AMD64 (Rémi Cardona)

4 files changed, 20 insertions, 29 deletions

diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index 5f9fb32d03a..173d9e7c3e6 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.68 2008/01/19 09:16:17 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2008/07/29 21:58:13 wiz Exp $
 
-DISTNAME=		esound-0.2.38
+DISTNAME=		esound-0.2.39
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/esound/0.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/audio/esound/distinfo b/audio/esound/distinfo
index 88ccf3b5022..4a225d7cc18 100644
--- a/audio/esound/distinfo
+++ b/audio/esound/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.24 2007/05/06 16:36:06 wiz Exp $
+$NetBSD: distinfo,v 1.25 2008/07/29 21:58:13 wiz Exp $
 
-SHA1 (esound-0.2.38.tar.bz2) = 29133b0acd17ddac10c3a6769afa40a7cb596c91
-RMD160 (esound-0.2.38.tar.bz2) = d12605bcd24b697a5525b0e266d2bbca43edea32
-Size (esound-0.2.38.tar.bz2) = 393758 bytes
+SHA1 (esound-0.2.39.tar.bz2) = 71dd61502224309784f1d9c274914731cde7c628
+RMD160 (esound-0.2.39.tar.bz2) = 1f719fdefe2bb9bc38d7dbf178d84e45451d8249
+Size (esound-0.2.39.tar.bz2) = 423581 bytes
 SHA1 (patch-aa) = d734a1004026287071e571ceb3fd346b809a6a30
-SHA1 (patch-ab) = 50d4c829fe5d53f28a4a38b1962097b8a47b97c7
-SHA1 (patch-ac) = 8ab2eebc32792102a6d74b57f75a4381a218186e
+SHA1 (patch-ab) = cb6d32ce121e46d53286c1d9bdb9b15c411d0c6c
diff --git a/audio/esound/patches/patch-ab b/audio/esound/patches/patch-ab
index fdba4b3b609..baa19a68635 100644
--- a/audio/esound/patches/patch-ab
+++ b/audio/esound/patches/patch-ab
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.5 2002/10/03 12:21:29 jlam Exp $
+$NetBSD: patch-ab,v 1.6 2008/07/29 21:58:13 wiz Exp $
 
---- audio_oss.c.orig	Tue Jul 18 18:33:41 2000
+--- audio_oss.c.orig	2008-07-15 16:00:03.000000000 +0000
 +++ audio_oss.c
-@@ -19,7 +19,7 @@
+@@ -1,5 +1,7 @@
+ #include "config.h"
+ 
++#include <errno.h>
++
+ #ifdef HAVE_MACHINE_SOUNDCARD_H
+ #  include <machine/soundcard.h>
+ #else
+@@ -19,7 +21,7 @@
  #define ARCH_esd_audio_devices
  const char *esd_audio_devices()
  {
@@ -11,7 +19,7 @@ $NetBSD: patch-ab,v 1.5 2002/10/03 12:21:29 jlam Exp $
  }
  
  
-@@ -38,7 +38,7 @@
+@@ -38,7 +40,7 @@ int esd_audio_open()
      mode |= O_NONBLOCK;
  
      /* open the sound device */
@@ -19,4 +27,4 @@ $NetBSD: patch-ab,v 1.5 2002/10/03 12:21:29 jlam Exp $
 +    device = esd_audio_device ? esd_audio_device : DEV_DSP;
      if ((afd = open(device, mode, 0)) == -1)
      {   /* Opening device failed */
-         perror(device);
+ 	if (errno != ENOENT)
diff --git a/audio/esound/patches/patch-ac b/audio/esound/patches/patch-ac
deleted file mode 100644
index a6970896817..00000000000
--- a/audio/esound/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2003/11/10 01:14:43 danw Exp $
-
---- esd-config.in.orig	Fri Feb  5 23:34:19 1999
-+++ esd-config.in
-@@ -54,9 +54,9 @@
-       ;;
-     --libs)
-       my_audiofile_libs=
--      libdirs=-L@libdir@
-+      libdirs="-L@libdir@ -Wl,-R@libdir@"
-       for i in $audiofile_libs ; do
--        if test $i != -L@libdir@ ; then
-+        if test $i != -L@libdir@ -a "$i" != "-Wl,-R@libdir@"; then
-           if test -z "$my_audiofile_libs" ; then
-             my_audiofile_libs="$i"
-           else