Update to 0.2.30:

* IPv6 support (Archana Shah)
* Cygwin support (Masahiro Sakai)
* MacOS X CoreAudio support (Masanori Sekino)
* Always read esd config file, not only when auto-spawning (James Strandboge)
* Prevents drop-outs for hardware allowing low period_size (ALSA) (Stanislav)
* Man pages fixes (Stanislav)
* Major code cleanup (Kjartan)
* Ensure esd_open_audio succeed if interrupted (Arvind)
* Allow 0 as auto-standby value (Mohammed Waleed Kadous)
* Allow simultaneous play and record on Solaris (Balamurali)
* Add support for session name to esdcat (j@thing.net)

4 files changed, 37 insertions, 22 deletions

diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index 01f568e5443..9e6bffd61cc 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2003/07/21 16:30:38 martti Exp $
+# $NetBSD: Makefile,v 1.43 2003/08/01 17:10:40 jmmv Exp $
 
-DISTNAME=		esound-0.2.29
-PKGREVISION=		1
+DISTNAME=		esound-0.2.30
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/esound/0.2/}
 
@@ -22,6 +21,14 @@ MAKE_ENV+=		AM_CPPFLAGS='-DDEV_DSP=\"${DEVOSSAUDIO}\"'
 EGDIR=			${PREFIX}/share/examples/esound
 CONF_FILES=		${EGDIR}/esd.conf ${PKG_SYSCONFDIR}/esd.conf
 
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+=	--enable-ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/esound
 	cd ${WRKSRC}/docs/html && \
diff --git a/audio/esound/PLIST b/audio/esound/PLIST
index 1ce4dba4429..94bea0e892f 100644
--- a/audio/esound/PLIST
+++ b/audio/esound/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2003/03/15 08:58:43 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.10 2003/08/01 17:10:40 jmmv Exp $
 bin/esd
 bin/esd-config
 bin/esdcat
@@ -14,7 +14,7 @@ lib/libesd.a
 lib/libesd.la
 lib/libesd.so
 lib/libesd.so.2
-lib/libesd.so.2.29
+lib/libesd.so.2.30
 lib/pkgconfig/esound.pc
 man/man1/esd-config.1
 man/man1/esd.1
diff --git a/audio/esound/distinfo b/audio/esound/distinfo
index bd72cace618..8beecaa904d 100644
--- a/audio/esound/distinfo
+++ b/audio/esound/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2002/10/30 03:09:25 rh Exp $
+$NetBSD: distinfo,v 1.13 2003/08/01 17:10:40 jmmv Exp $
 
-SHA1 (esound-0.2.29.tar.gz) = fea170b3453a14d5a4cdbf3ab9a578f0a423ebd9
-Size (esound-0.2.29.tar.gz) = 364819 bytes
+SHA1 (esound-0.2.30.tar.gz) = ac807c9fce4577aa788148725bcdd3b9365a995d
+Size (esound-0.2.30.tar.gz) = 413618 bytes
 SHA1 (patch-aa) = fe632a5514073f8d898fef5182a1047b9f2a44c9
 SHA1 (patch-ab) = 50d4c829fe5d53f28a4a38b1962097b8a47b97c7
 SHA1 (patch-ac) = 8c68050320c80363b831745eb17cc0703acbaf24
-SHA1 (patch-ae) = f0e06658e7cd1f19da089c20f0b89ff89ca5a10f
+SHA1 (patch-ae) = de4948795f3dc05ede7235269d85a08bac5266fc
diff --git a/audio/esound/patches/patch-ae b/audio/esound/patches/patch-ae
index 5a416faf3b5..de556be7c93 100644
--- a/audio/esound/patches/patch-ae
+++ b/audio/esound/patches/patch-ae
@@ -1,22 +1,30 @@
-$NetBSD: patch-ae,v 1.1 2002/10/03 12:21:29 jlam Exp $
+$NetBSD: patch-ae,v 1.2 2003/08/01 17:10:41 jmmv Exp $
 
---- configure.orig	Mon Aug 26 10:18:46 2002
+--- configure.orig	2003-08-01 16:51:15.000000000 +0200
 +++ configure
-@@ -7036,7 +7036,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
-   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -10989,13 +10989,13 @@ if test $ac_cv_func__oss_ioctl = yes; th
+   :
  else
-   ac_save_LIBS="$LIBS"
+ 
+-echo "$as_me:$LINENO: checking for _oss_ioctl in -lossaudio" >&5
+-echo $ECHO_N "checking for _oss_ioctl in -lossaudio... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for _oss_ioctl in ${LIBOSSAUDIO}" >&5
++echo $ECHO_N "checking for _oss_ioctl in ${LIBOSSAUDIO}... $ECHO_C" >&6
+ if test "${ac_cv_lib_ossaudio__oss_ioctl+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lossaudio  $LIBS"
 +LIBS="${LIBOSSAUDIO} $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 7042 "configure"
- #include "confdefs.h"
-@@ -7070,7 +7070,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
- #define $ac_tr_lib 1
- EOF
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -11048,7 +11048,7 @@ if test $ac_cv_lib_ossaudio__oss_ioctl =
+ #define HAVE_LIBOSSAUDIO 1
+ _ACEOF
  
 -  LIBS="-lossaudio $LIBS"
 +  LIBS="${LIBOSSAUDIO} $LIBS"
  
- else
-   echo "$ac_t""no" 1>&6
+ fi
+