4 files changed, 8 insertions, 60 deletions
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index 60790bce00a..8fdc4be5245 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.71 2008/07/31 14:03:16 drochner Exp $
+# $NetBSD: Makefile,v 1.72 2008/09/06 14:42:53 wiz Exp $
 
-DISTNAME=		esound-0.2.39
-PKGREVISION=	1
+DISTNAME=		esound-0.2.40
 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 71480db3535..bcfc1bd3c92 100644
--- a/audio/esound/distinfo
+++ b/audio/esound/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.26 2008/07/31 14:03:16 drochner Exp $
+$NetBSD: distinfo,v 1.27 2008/09/06 14:42:53 wiz Exp $
 
-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 (esound-0.2.40.tar.bz2) = 98cef3b8dbf8c4b664eca94d3c1b2f98736b0b88
+RMD160 (esound-0.2.40.tar.bz2) = 6b435a01bc8c5a22df31622c27f6a83be798aea2
+Size (esound-0.2.40.tar.bz2) = 423798 bytes
 SHA1 (patch-aa) = d734a1004026287071e571ceb3fd346b809a6a30
-SHA1 (patch-ab) = cb6d32ce121e46d53286c1d9bdb9b15c411d0c6c
-SHA1 (patch-ac) = e36246569d85f0baf957d2faa5f787a214054894
+SHA1 (patch-ab) = 05b3d084546394fc47cdd21f40ce81b9d0e8f671
diff --git a/audio/esound/patches/patch-ab b/audio/esound/patches/patch-ab
index baa19a68635..57667a9cdd8 100644
--- a/audio/esound/patches/patch-ab
+++ b/audio/esound/patches/patch-ab
@@ -1,15 +1,7 @@
-$NetBSD: patch-ab,v 1.6 2008/07/29 21:58:13 wiz Exp $
+$NetBSD: patch-ab,v 1.7 2008/09/06 14:42:53 wiz Exp $
 
 --- audio_oss.c.orig	2008-07-15 16:00:03.000000000 +0000
 +++ audio_oss.c
-@@ -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()
diff --git a/audio/esound/patches/patch-ac b/audio/esound/patches/patch-ac
deleted file mode 100644
index a297d9d0672..00000000000
--- a/audio/esound/patches/patch-ac
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2008/07/31 14:03:16 drochner Exp $
-
---- esdlib.c.orig	2008-07-15 17:35:15.000000000 +0200
-+++ esdlib.c
-@@ -90,7 +90,7 @@ read_timeout (int fd, char *buf, size_t 
- 	do {
- 		pfd[0].revents = 0;
- 		rv = poll (pfd, 1, 100);
--	} while (rv == -1 && errno == EINTR);
-+	} while (rv == -1 && (errno == EINTR || errno == EAGAIN));
- 	
- 	if (rv < 1 || !(pfd[0].revents & POLLIN)) {
- 		errno = ETIMEDOUT;
-@@ -138,9 +138,9 @@ write_timeout (int fd, const char *buf, 
- 		do {
- 			pfd[0].revents = 0;
- 			rv = poll (pfd, 1, 100);
--		} while (rv == -1 && errno == EINTR);
-+		} while (rv == -1 && (errno == EINTR || errno == EAGAIN));
- 		
--		if (rv < 1 || !(pfd[0].revents & POLLOUT)) {
-+		if (rv < 1 || (pfd[0].revents & (POLLERR | POLLHUP | POLLOUT)) != POLLOUT) {
- 			fcntl (fd, F_SETFL, flags);
- 			errno = ETIMEDOUT;
- 			return -1;
-@@ -150,8 +150,14 @@ write_timeout (int fd, const char *buf, 
- 			n = write (fd, buf + nwritten, buflen - nwritten);
- 		} while (n == -1 && errno == EINTR);
- 		
--		if (n > 0)
--			nwritten += n;
-+		if (n == -1) {
-+			rv = errno;
-+			fcntl (fd, F_SETFL, flags);
-+			errno = rv;
-+			return -1;
-+		}
-+		
-+		nwritten += n;
- 	} while (nwritten < buflen);
- 	
- 	fcntl (fd, F_SETFL, flags);