Use ossaudio.buildlink2.mk and modify to allow this to work with audio/oss.

4 files changed, 31 insertions, 6 deletions

diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index bda130b2b1c..134d12cd5bf 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2002/09/24 13:01:15 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2002/10/03 12:21:29 jlam Exp $
 
 DISTNAME=		esound-0.2.29
 CATEGORIES=		audio
@@ -14,11 +14,13 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+MAKE_ENV+=		AM_CPPFLAGS='-DDEV_DSP=\"${DEVOSSAUDIO}\"'
 
 EGDIR=			${PREFIX}/share/examples/esound
 CONF_FILES=		${EGDIR}/esd.conf ${PKG_SYSCONFDIR}/esd.conf
 
 .include "../../audio/libaudiofile/buildlink2.mk"
+.include "../../mk/ossaudio.buildlink2.mk"
 
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/esound/distinfo b/audio/esound/distinfo
index 6d3c8686e29..905a651ddda 100644
--- a/audio/esound/distinfo
+++ b/audio/esound/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.10 2002/09/23 15:02:27 wiz Exp $
+$NetBSD: distinfo,v 1.11 2002/10/03 12:21:29 jlam Exp $
 
 SHA1 (esound-0.2.29.tar.gz) = fea170b3453a14d5a4cdbf3ab9a578f0a423ebd9
 Size (esound-0.2.29.tar.gz) = 364819 bytes
 SHA1 (patch-aa) = fe632a5514073f8d898fef5182a1047b9f2a44c9
-SHA1 (patch-ab) = af59f6f254812c082566a1c483aec511deed0819
+SHA1 (patch-ab) = 50d4c829fe5d53f28a4a38b1962097b8a47b97c7
 SHA1 (patch-ac) = 8c68050320c80363b831745eb17cc0703acbaf24
 SHA1 (patch-ad) = 288711212e603d9e93415c95797a8698eec19e86
+SHA1 (patch-ae) = f0e06658e7cd1f19da089c20f0b89ff89ca5a10f
diff --git a/audio/esound/patches/patch-ab b/audio/esound/patches/patch-ab
index f24c340977c..fdba4b3b609 100644
--- a/audio/esound/patches/patch-ab
+++ b/audio/esound/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2002/04/29 08:40:28 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2002/10/03 12:21:29 jlam Exp $
 
 --- audio_oss.c.orig	Tue Jul 18 18:33:41 2000
 +++ audio_oss.c
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.4 2002/04/29 08:40:28 wiz Exp $
  const char *esd_audio_devices()
  {
 -    return "/dev/dsp, /dev/dsp2, etc.";
-+    return "/dev/audio, /dev/audio2, etc.";
++    return "/dev/audio, /dev/audio2, etc. or /dev/dsp, /dev/dsp2, etc.";
  }
  
  
@@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.4 2002/04/29 08:40:28 wiz Exp $
  
      /* open the sound device */
 -    device = esd_audio_device ? esd_audio_device : "/dev/dsp";
-+    device = esd_audio_device ? esd_audio_device : "/dev/audio";
++    device = esd_audio_device ? esd_audio_device : DEV_DSP;
      if ((afd = open(device, mode, 0)) == -1)
      {   /* Opening device failed */
          perror(device);
diff --git a/audio/esound/patches/patch-ae b/audio/esound/patches/patch-ae
new file mode 100644
index 00000000000..5a416faf3b5
--- /dev/null
+++ b/audio/esound/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 2002/10/03 12:21:29 jlam Exp $
+
+--- configure.orig	Mon Aug 26 10:18:46 2002
++++ configure
+@@ -7036,7 +7036,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_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
+ 
+-  LIBS="-lossaudio $LIBS"
++  LIBS="${LIBOSSAUDIO} $LIBS"
+ 
+ else
+   echo "$ac_t""no" 1>&6