Update libao from 0.8.2 to 0.8.3 (for ogg vorbis 1.0 release).

Notable changes:
	- fix to ao.m4 macro
	- minor alsa09 plugin updates
	- fixes to irix plugin

Note: patch-ac added to remove unconditional use of -ldl in libao.la.

5 files changed, 38 insertions, 10 deletions

diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index b7447982eb0..73a5e4efe94 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2002/03/05 17:38:49 skrll Exp $
+# $NetBSD: Makefile,v 1.14 2002/08/05 13:08:38 lukem Exp $
 
-DISTNAME=	libao-0.8.2
+DISTNAME=	libao-0.8.3
 CATEGORIES=	devel
-MASTER_SITES=	http://www.vorbis.com/files/rc3/unix/
+MASTER_SITES=	http://www.vorbis.com/files/1.0/unix/
 
 MAINTAINER=	lukem@netbsd.org
 COMMENT=	cross-platform audio library
@@ -17,7 +17,7 @@ CONFIGURE_ARGS+=	--disable-esd
 
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 .include "../../mk/ossaudio.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libao/PLIST b/audio/libao/PLIST
index 71b3b36f423..b576ec42880 100644
--- a/audio/libao/PLIST
+++ b/audio/libao/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/02 12:23:48 lukem Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/05 13:08:39 lukem Exp $
 include/ao/ao.h
 include/ao/os_types.h
 include/ao/plugin.h
+lib/ao/plugins-2/liboss.a
 lib/ao/plugins-2/liboss.la
 lib/ao/plugins-2/liboss.so
+lib/ao/plugins-2/libsun.a
 lib/ao/plugins-2/libsun.la
 lib/ao/plugins-2/libsun.so
 lib/libao.la
diff --git a/audio/libao/buildlink.mk b/audio/libao/buildlink.mk
index ca83dd1ede4..6d3c276b805 100644
--- a/audio/libao/buildlink.mk
+++ b/audio/libao/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2002/06/06 14:51:48 kei Exp $
+# $NetBSD: buildlink.mk,v 1.5 2002/08/05 13:08:39 lukem Exp $
 #
 # This Makefile fragment is included by packages that use libao.
 #
@@ -17,7 +17,7 @@ LIBAO_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.libao?=	libao>=0.8.2
+BUILDLINK_DEPENDS.libao?=	libao>=0.8.3
 DEPENDS+=		${BUILDLINK_DEPENDS.libao}:../../audio/libao
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.libao=libao
diff --git a/audio/libao/distinfo b/audio/libao/distinfo
index 046ceaae8e2..649f01d4e26 100644
--- a/audio/libao/distinfo
+++ b/audio/libao/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2002/01/02 12:23:48 lukem Exp $
+$NetBSD: distinfo,v 1.9 2002/08/05 13:08:39 lukem Exp $
 
-SHA1 (libao-0.8.2.tar.gz) = 8fab336aa453557e59f383c8013d949b67a5fcea
-Size (libao-0.8.2.tar.gz) = 206622 bytes
+SHA1 (libao-0.8.3.tar.gz) = bf918997df2d99e60927cb5bc43b5d1e547811c0
+Size (libao-0.8.3.tar.gz) = 210690 bytes
 SHA1 (patch-aa) = 9cc59790050564de60d8ddc430bee946a12ee83d
 SHA1 (patch-ab) = a2faed5b409e5810cefa62d67e9a4ad22d5f5062
+SHA1 (patch-ac) = 11c6ebce842d29866903fd05e8f20fedc0515261
diff --git a/audio/libao/patches/patch-ac b/audio/libao/patches/patch-ac
new file mode 100644
index 00000000000..4b05bfe0118
--- /dev/null
+++ b/audio/libao/patches/patch-ac
@@ -0,0 +1,25 @@
+$NetBSD: patch-ac,v 1.3 2002/08/05 13:08:39 lukem Exp $
+
+--- src/Makefile.in.orig	Sat Jul 20 00:17:44 2002
++++ src/Makefile.in
+@@ -99,7 +99,7 @@ INCLUDES = -I$(top_builddir)/include/ao 
+ lib_LTLIBRARIES = libao.la
+ 
+ libao_la_SOURCES = audio_out.c config.c ao_null.c ao_wav.c ao_au.c ao_raw.c ao_private.h
+-libao_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -ldl
++libao_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES = 
+ LTLIBRARIES =  $(lib_LTLIBRARIES)
+
+--- src/Makefile.am.orig	Wed Jan  2 17:56:35 2002
++++ src/Makefile.am
+@@ -8,7 +8,7 @@ INCLUDES = -I$(top_builddir)/include/ao 
+ lib_LTLIBRARIES = libao.la
+ 
+ libao_la_SOURCES = audio_out.c config.c ao_null.c ao_wav.c ao_au.c ao_raw.c ao_private.h
+-libao_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -ldl
++libao_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
+ 
+ 
+ debug: