Update to 0.8.4:

* Incorporated OS X patches from the Fink team.
* AIX output plugin by Stefan Tibus.
* Improvements in plugin detection code by David Walser, especially
  when ESD or aRts are present.
* NAS plugin from Antoine Mathys.
* Portability fixes for various platforms (including dlopen() bugs)
  including HP-UX and *BSD.
* Memory/resource leak fixes
* Significant fixes to ALSA 0.9.x plugin by Kevin Cody, Jr. This
  should fix stuttering audio for mpg321 users. The --enable-alsa09-mmap
  option to ./configure turns on memory-mapped I/O. Note this is
  an experimental feature and causes some problems with some sound
  card drivers and also users of the dmix software mixer.

10 files changed, 68 insertions, 44 deletions

diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index b5b78c2a120..20e1fa8ebae 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2003/07/17 21:22:35 grant Exp $
+# $NetBSD: Makefile,v 1.20 2003/12/08 14:33:47 wiz Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=	1
-
 MAINTAINER=	lukem@NetBSD.org
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libao/Makefile.common b/audio/libao/Makefile.common
index 5d0906809c4..33eb40a71da 100644
--- a/audio/libao/Makefile.common
+++ b/audio/libao/Makefile.common
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile.common,v 1.2 2003/10/03 18:31:18 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.3 2003/12/08 14:33:47 wiz Exp $
 
-DISTNAME=	libao-0.8.3
+DISTNAME=	libao-0.8.4
 CATEGORIES=	audio devel
-MASTER_SITES=	http://www.vorbis.com/files/1.0/unix/
+MASTER_SITES=	http://www.xiph.org/ao/src/
 
+HOMEPAGE=	http://www.xiph.org/ao/
 COMMENT=	cross-platform audio library
 
 DISTINFO_FILE=	${.CURDIR}/../../audio/libao/distinfo
@@ -14,6 +15,8 @@ USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
 
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/ao.pc.in
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "FreeBSD"
@@ -29,4 +32,5 @@ CONFIGURE_ARGS+=	--disable-alsa09
 CONFIGURE_ARGS+=	--disable-arts
 CONFIGURE_ARGS+=	--disable-esd
 
+.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../mk/ossaudio.buildlink2.mk"
diff --git a/audio/libao/PLIST b/audio/libao/PLIST
index 42fa14c6147..a5f3f59303b 100644
--- a/audio/libao/PLIST
+++ b/audio/libao/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/10/03 18:31:18 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/12/08 14:33:47 wiz Exp $
 include/ao/ao.h
 include/ao/os_types.h
 include/ao/plugin.h
@@ -12,7 +12,8 @@ lib/libao.a
 lib/libao.la
 lib/libao.so
 lib/libao.so.3
-lib/libao.so.3.1
+lib/libao.so.3.2
+lib/pkgconfig/ao.pc
 man/man5/libao.conf.5
 share/aclocal/ao.m4
 share/doc/${PKGNAME}/ao_append_option.html
diff --git a/audio/libao/buildlink2.mk b/audio/libao/buildlink2.mk
index 3de907e7a76..6446e9aa198 100644
--- a/audio/libao/buildlink2.mk
+++ b/audio/libao/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:10 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/12/08 14:33:47 wiz Exp $
 
 .if !defined(LIBAO_BUILDLINK2_MK)
 LIBAO_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libao
-BUILDLINK_DEPENDS.libao?=	libao>=0.8.3
+BUILDLINK_DEPENDS.libao?=	libao>=0.8.4
 BUILDLINK_PKGSRCDIR.libao?=	../../audio/libao
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.libao=libao
@@ -14,6 +14,8 @@ BUILDLINK_FILES.libao+=	include/ao/os_types.h
 BUILDLINK_FILES.libao+=	lib/libao.*
 BUILDLINK_FILES.libao+=	lib/ao/*
 
+.include "../../devel/pkgconfig/buildlink2.mk"
+
 BUILDLINK_TARGETS+=	libao-buildlink
 
 libao-buildlink: _BUILDLINK_USE
diff --git a/audio/libao/distinfo b/audio/libao/distinfo
index 8889660ff63..2eeac60ed87 100644
--- a/audio/libao/distinfo
+++ b/audio/libao/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.11 2002/10/04 08:12:46 jlam Exp $
+$NetBSD: distinfo,v 1.12 2003/12/08 14:33:47 wiz Exp $
 
-SHA1 (libao-0.8.3.tar.gz) = bf918997df2d99e60927cb5bc43b5d1e547811c0
-Size (libao-0.8.3.tar.gz) = 210690 bytes
-SHA1 (patch-aa) = e1c539373dc4f4db942ee21fa1d86100d67d38f9
-SHA1 (patch-ab) = a2faed5b409e5810cefa62d67e9a4ad22d5f5062
-SHA1 (patch-ac) = 11c6ebce842d29866903fd05e8f20fedc0515261
+SHA1 (libao-0.8.4.tar.gz) = c29e71b5cec430cd29f0af7ee111e314deb22ea5
+Size (libao-0.8.4.tar.gz) = 272670 bytes
+SHA1 (patch-aa) = 09434b7552954e4dcef0a7d544f7576de6189785
+SHA1 (patch-ab) = 9c7d8764c4e4515d577091b1b29a72266e6af5f7
+SHA1 (patch-ac) = b857f4cc3aa195230ce32f6b466d461016400f65
+SHA1 (patch-ad) = 2b32fec734ed315bc607747f7c7d4db4688f02f8
+SHA1 (patch-ae) = 60f1f96e3d0d6aedf0cbbd8daae55ad2edb9d856
diff --git a/audio/libao/patches/patch-aa b/audio/libao/patches/patch-aa
index 1034a15d3dc..8f2107fc342 100644
--- a/audio/libao/patches/patch-aa
+++ b/audio/libao/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2002/10/04 08:12:47 jlam Exp $
+$NetBSD: patch-aa,v 1.8 2003/12/08 14:33:47 wiz Exp $
 
---- src/plugins/oss/ao_oss.c.orig	Wed Apr 10 14:53:56 2002
+--- src/plugins/oss/ao_oss.c.orig	Sat Oct  4 17:16:05 2003
 +++ src/plugins/oss/ao_oss.c
-@@ -80,22 +80,22 @@ int _open_default_oss_device (char **dev
+@@ -81,22 +81,22 @@ int _open_default_oss_device (char **dev
  	char *err = NULL;
  	char *dev = NULL;
  
diff --git a/audio/libao/patches/patch-ab b/audio/libao/patches/patch-ab
index 95ca2f2afc1..438396f2579 100644
--- a/audio/libao/patches/patch-ab
+++ b/audio/libao/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.4 2001/08/23 16:42:31 jlam Exp $
+$NetBSD: patch-ab,v 1.5 2003/12/08 14:33:47 wiz Exp $
 
---- src/plugins/oss/Makefile.in.orig	Mon Aug 13 07:39:27 2001
+--- src/plugins/oss/Makefile.in.orig	Sun Oct  5 03:32:51 2003
 +++ src/plugins/oss/Makefile.in
-@@ -112,7 +112,7 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--liboss_la_LIBADD = 
+@@ -184,7 +184,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ 
+-liboss_la_LIBADD =
 +liboss_la_LIBADD = ${LIBOSSAUDIO}
- @HAVE_OSS_FALSE@liboss_la_OBJECTS = 
- @HAVE_OSS_TRUE@liboss_la_OBJECTS =  ao_oss.lo
- CFLAGS = @CFLAGS@
+ am__liboss_la_SOURCES_DIST = ao_oss.c
+ @HAVE_OSS_TRUE@am__objects_1 = ao_oss.lo
+ @HAVE_OSS_FALSE@am__objects_1 =
diff --git a/audio/libao/patches/patch-ac b/audio/libao/patches/patch-ac
index 7cec0fa9fc8..551f6353478 100644
--- a/audio/libao/patches/patch-ac
+++ b/audio/libao/patches/patch-ac
@@ -1,23 +1,11 @@
-$NetBSD: patch-ac,v 1.4 2002/08/25 18:38:11 jlam Exp $
+$NetBSD: patch-ac,v 1.5 2003/12/08 14:33:47 wiz 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.orig	Wed Jan  8 04:48:54 2003
 +++ 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_SOURCES = audio_out.c config.c ao_null.c ao_wav.c ao_au.c ao_raw.c ao_aixs.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@
  
diff --git a/audio/libao/patches/patch-ad b/audio/libao/patches/patch-ad
new file mode 100644
index 00000000000..ac5397650c8
--- /dev/null
+++ b/audio/libao/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.4 2003/12/08 14:33:47 wiz Exp $
+
+--- src/Makefile.in.orig	Sun Oct  5 03:32:49 2003
++++ src/Makefile.in
+@@ -171,7 +171,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_aixs.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@
+ subdir = src
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES =
diff --git a/audio/libao/patches/patch-ae b/audio/libao/patches/patch-ae
new file mode 100644
index 00000000000..743904a4b7b
--- /dev/null
+++ b/audio/libao/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.3 2003/12/08 14:33:47 wiz Exp $
+
+--- configure.orig	Sun Oct  5 03:32:52 2003
++++ configure
+@@ -9074,6 +9074,11 @@ else
+    BUILD_ESD="yes"
+ fi;
+ 
++if test "$BUILD_ESD" = "no"; then
++  HAVE_ESD_TRUE='#'
++  HAVE_ESD_FALSE=
++fi;
++
+ if test "$BUILD_ESD" = "yes"; then
+ 
+ # Check whether --with-esd-prefix or --without-esd-prefix was given.