5 files changed, 45 insertions, 28 deletions
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.