6 files changed, 39 insertions, 71 deletions
diff --git a/audio/liba52/patches/patch-aa b/audio/liba52/patches/patch-aa
index 10fa083c0a9..2fe00371457 100644
--- a/audio/liba52/patches/patch-aa
+++ b/audio/liba52/patches/patch-aa
@@ -1,16 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/12/10 19:49:46 veego Exp $
+$NetBSD: patch-aa,v 1.2 2002/06/16 18:08:05 wiz Exp $
 
---- configure-orig	Fri Aug 31 11:39:53 2001
-+++ configure	Wed Oct 10 21:18:49 2001
-@@ -2663,6 +2663,11 @@
- #define LIBAO_SOLARIS 
- EOF
- ;;
+--- libao/configure.incl.orig	Sun Feb 17 10:23:15 2002
++++ libao/configure.incl	Thu Jun 13 10:27:49 2002
+@@ -19,6 +19,8 @@
+     case "$host" in
+     *-sun-solaris*)
+ 	AC_DEFINE([LIBAO_SOLARIS],,[libao solaris support]);;
 +    *-netbsd*)
-+	cat >> confdefs.h <<\EOF
-+#define LIBAO_SOLARIS 
-+EOF
-+;;
++	AC_DEFINE([LIBAO_SOLARIS],,[libao solaris compat support]);;
      esac
  fi
  
diff --git a/audio/liba52/patches/patch-ab b/audio/liba52/patches/patch-ab
index 3acd3ba53aa..c99d442ddb5 100644
--- a/audio/liba52/patches/patch-ab
+++ b/audio/liba52/patches/patch-ab
@@ -1,10 +1,16 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/12/10 19:49:46 veego Exp $
+$NetBSD: patch-ab,v 1.2 2002/06/16 18:08:06 wiz Exp $
 
---- configure.in-orig	Fri Aug 31 11:36:47 2001
-+++ configure.in	Thu Oct 11 00:13:14 2001
-@@ -92,4 +92,4 @@
+--- configure.orig	Thu Feb 21 08:55:21 2002
++++ configure	Thu Jun 13 10:12:43 2002
+@@ -8802,6 +8802,11 @@
+ #define LIBAO_SOLARIS
+ EOF
+ ;;
++    *-netbsd*)
++cat >> confdefs.h <<\EOF
++#define LIBAO_SOLARIS 
++EOF
++;;
+     esac
+ fi
  
- AC_C_ATTRIBUTE_ALIGNED
- 
--AC_OUTPUT(Makefile autotools/Makefile include/Makefile test/Makefile doc/Makefile src/Makefile liba52/Makefile libao/Makefile)
-+AC_OUTPUT(Makefile autotools/Makefile include/Makefile liba52/Makefile)
diff --git a/audio/liba52/patches/patch-ac b/audio/liba52/patches/patch-ac
index 8fb0affda89..03c1ab52190 100644
--- a/audio/liba52/patches/patch-ac
+++ b/audio/liba52/patches/patch-ac
@@ -1,22 +1,9 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/12/10 19:49:46 veego Exp $
+$NetBSD: patch-ac,v 1.2 2002/06/16 18:08:06 wiz Exp $
 
---- configure-orig	Fri Aug 31 11:39:53 2001
-+++ configure	Thu Oct 11 00:13:56 2001
-@@ -2857,7 +2857,7 @@
- ac_given_srcdir=$srcdir
- ac_given_INSTALL="$INSTALL"
+--- Makefile.am.orig	Mon Dec 17 00:23:45 2001
++++ Makefile.am	Thu Jun 13 10:04:13 2002
+@@ -1,3 +1,3 @@
+-SUBDIRS = autotools include doc liba52 libao src vc++ test
++SUBDIRS = autotools include liba52
  
--trap 'rm -fr `echo "Makefile autotools/Makefile include/Makefile test/Makefile doc/Makefile src/Makefile liba52/Makefile libao/Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-+trap 'rm -fr `echo "Makefile autotools/Makefile include/Makefile liba52/Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
- EOF
- cat >> $CONFIG_STATUS <<EOF
- 
-@@ -2967,7 +2967,7 @@
- 
- cat >> $CONFIG_STATUS <<EOF
- 
--CONFIG_FILES=\${CONFIG_FILES-"Makefile autotools/Makefile include/Makefile test/Makefile doc/Makefile src/Makefile liba52/Makefile libao/Makefile"}
-+CONFIG_FILES=\${CONFIG_FILES-"Makefile autotools/Makefile include/Makefile liba52/Makefile"}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+ EXTRA_DIST = HISTORY bootstrap
diff --git a/audio/liba52/patches/patch-ad b/audio/liba52/patches/patch-ad
index 89a4c437aee..1a736f87683 100644
--- a/audio/liba52/patches/patch-ad
+++ b/audio/liba52/patches/patch-ad
@@ -1,9 +1,13 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/12/10 19:49:46 veego Exp $
+$NetBSD: patch-ad,v 1.2 2002/06/16 18:08:06 wiz Exp $
 
---- Makefile.am-orig	Wed Aug 15 20:36:52 2001
-+++ Makefile.am	Thu Oct 11 00:15:31 2001
-@@ -1,3 +1,3 @@
--SUBDIRS = autotools include doc liba52 libao src test
+--- Makefile.in.orig	Thu Feb 21 08:58:36 2002
++++ Makefile.in	Thu Jun 13 10:03:57 2002
+@@ -76,7 +76,7 @@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+ 
+-SUBDIRS = autotools include doc liba52 libao src vc++ test
 +SUBDIRS = autotools include liba52
  
- EXTRA_DIST = bootstrap
+ EXTRA_DIST = HISTORY bootstrap
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/audio/liba52/patches/patch-ae b/audio/liba52/patches/patch-ae
deleted file mode 100644
index aaba3f24550..00000000000
--- a/audio/liba52/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/12/10 19:49:46 veego Exp $
-
---- Makefile.in-orig	Fri Aug 31 11:40:06 2001
-+++ Makefile.in	Thu Oct 11 00:15:42 2001
-@@ -72,7 +72,7 @@
- RANLIB = @RANLIB@
- VERSION = @VERSION@
- 
--SUBDIRS = autotools include doc liba52 libao src test
-+SUBDIRS = autotools include liba52
- 
- EXTRA_DIST = bootstrap
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/audio/liba52/patches/patch-af b/audio/liba52/patches/patch-af
deleted file mode 100644
index 2091efe30bf..00000000000
--- a/audio/liba52/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2002/01/21 21:31:32 wiz Exp $
-
---- liba52/bitstream.c.orig	Wed Aug 15 14:36:53 2001
-+++ liba52/bitstream.c
-@@ -38,7 +38,7 @@
- {
-     int align;
- 
--    align = (int)buf & 3;
-+    align = (long)buf & 3;
-     buffer_start = (uint32_t *) (buf - align);
-     bits_left = 0;
-     bitstream_get (align * 8);