Upgrade esound to 0.2.33.

Changes:

        * use new ALSA PCM API if available (Lukasz Mach and Eddy Mylyono)
        * fix build on AIX and OSF (Albert Chin-A-Young)
        * don't try to close audio device if not opened (Debian)
        * fix build with latest automake (Stanislav Bradec)
        * no longer required automake 1.4 (Thomas Cataldo)
        * Fix Darwin build (Jerry Talkington)
        * fix typo in manpage (Kjartan Maraas)

While here use subst.mk instead of patching configure script.

4 files changed, 14 insertions, 38 deletions

diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index 41d1071f514..68ae82a8596 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.48 2004/02/14 18:26:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.49 2004/03/02 05:03:47 xtraeme Exp $
 
-DISTNAME=		esound-0.2.32
+DISTNAME=		esound-0.2.33
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/esound/0.2/}
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.tux.org/~ricdude/EsounD.html
@@ -30,6 +31,12 @@ CONFIGURE_ARGS+=	--enable-ipv6
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
+SUBST_CLASSES=		oss
+SUBST_STAGE.oss=	post-patch
+SUBST_FILES.oss=	configure
+SUBST_SED.oss=		-e 's,-lossaudio,${LIBOSSAUDIO},g'
+SUBST_MESSAGE.oss=	"Fixing oss."
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/esound
 	cd ${WRKSRC}/docs/html && \
diff --git a/audio/esound/PLIST.common b/audio/esound/PLIST.common
index 4a8307a9bb4..a470d1793f0 100644
--- a/audio/esound/PLIST.common
+++ b/audio/esound/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1 2003/09/25 04:39:11 grant Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2004/03/02 05:03:47 xtraeme 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.32
+lib/libesd.so.2.33
 lib/pkgconfig/esound.pc
 man/man1/esd-config.1
 man/man1/esd.1
diff --git a/audio/esound/distinfo b/audio/esound/distinfo
index 5c3f7a75bda..cbe3e87b630 100644
--- a/audio/esound/distinfo
+++ b/audio/esound/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.17 2003/11/10 01:14:43 danw Exp $
+$NetBSD: distinfo,v 1.18 2004/03/02 05:03:47 xtraeme Exp $
 
-SHA1 (esound-0.2.32.tar.gz) = ad353802accf3ce6254592a76bde9cb9bba4e7d9
-Size (esound-0.2.32.tar.gz) = 423553 bytes
+SHA1 (esound-0.2.33.tar.bz2) = 9935202e79e5e8729e0d967285d5c0d2c979b0c2
+Size (esound-0.2.33.tar.bz2) = 347932 bytes
 SHA1 (patch-aa) = bf90e118cb5106b6328fa455bc9403fce11cb2ed
 SHA1 (patch-ab) = 50d4c829fe5d53f28a4a38b1962097b8a47b97c7
 SHA1 (patch-ac) = 8ab2eebc32792102a6d74b57f75a4381a218186e
-SHA1 (patch-ae) = 0c841359ec01e0f2c9fe421189e42c63c9ce436b
diff --git a/audio/esound/patches/patch-ae b/audio/esound/patches/patch-ae
deleted file mode 100644
index c2c7d551d67..00000000000
--- a/audio/esound/patches/patch-ae
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2003/09/07 10:46:09 wiz Exp $
-
---- configure.orig	Wed Sep  3 18:25:37 2003
-+++ configure
-@@ -11130,13 +11130,13 @@ if test $ac_cv_func__oss_ioctl = yes; th
-   :
- else
- 
--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 <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -11189,7 +11189,7 @@ if test $ac_cv_lib_ossaudio__oss_ioctl =
- #define HAVE_LIBOSSAUDIO 1
- _ACEOF
- 
--  LIBS="-lossaudio $LIBS"
-+  LIBS="${LIBOSSAUDIO} $LIBS"
- 
- fi
-