Update libao to 0.8.0, which breaks mpg321. Update libogg, libvorbis,

vorbis-tools and the vorbis meta-port to 1.0rc2.  This version
supports "channel coupling" for more efficient compression of stereo
material.

Submitted by:   Christian Weisgerber (maintainer)

4 files changed, 17 insertions, 37 deletions

diff --git a/audio/libao/files/patch-Makefile.in b/audio/libao/files/patch-Makefile.in
index 6346c48cb12d..791159ce6a72 100644
--- a/audio/libao/files/patch-Makefile.in
+++ b/audio/libao/files/patch-Makefile.in
@@ -1,7 +1,9 @@
+
 $FreeBSD$
---- Makefile.in.orig	Tue Jul 17 02:31:20 2001
-+++ Makefile.in	Tue Jul 17 02:31:31 2001
-@@ -87,7 +87,7 @@ plugindir = @plugindir@
+
+--- Makefile.in.orig	Mon Aug 13 13:39:22 2001
++++ Makefile.in	Tue Aug 14 17:39:55 2001
+@@ -87,7 +87,7 @@
  
  AUTOMAKE_OPTIONS = foreign dist-zip
  
diff --git a/audio/libao/files/patch-configure b/audio/libao/files/patch-configure
index 782e7d6eaeea..1fbaa4386df7 100644
--- a/audio/libao/files/patch-configure
+++ b/audio/libao/files/patch-configure
@@ -1,7 +1,9 @@
+
 $FreeBSD$
---- configure.orig	Mon Jun 18 18:05:25 2001
-+++ configure	Tue Jul 17 12:38:04 2001
-@@ -1510,7 +1510,7 @@ if test -z "$GCC"; then
+
+--- configure.orig	Mon Aug 13 13:39:05 2001
++++ configure	Tue Aug 14 17:40:12 2001
+@@ -1510,7 +1510,7 @@
                  PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
          *)
                  DEBUG="-g"
@@ -10,7 +12,7 @@ $FreeBSD$
                  PROFILE="-g -p" ;;
          esac
  else
-@@ -1525,9 +1525,9 @@ else
+@@ -1525,9 +1525,9 @@
                  CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
                  PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
          *)
diff --git a/audio/libao/files/patch-doc_Makefile.in b/audio/libao/files/patch-doc_Makefile.in
index b0ba162f53f6..2803148d2a81 100644
--- a/audio/libao/files/patch-doc_Makefile.in
+++ b/audio/libao/files/patch-doc_Makefile.in
@@ -1,12 +1,14 @@
+
 $FreeBSD$
---- doc/Makefile.in.orig	Wed Mar 21 16:29:06 2001
-+++ doc/Makefile.in	Wed Mar 21 16:29:15 2001
-@@ -87,7 +87,7 @@ plugindir = @plugindir@
+
+--- doc/Makefile.in.orig	Mon Aug 13 13:39:39 2001
++++ doc/Makefile.in	Tue Aug 14 17:39:32 2001
+@@ -88,7 +88,7 @@
  
  AUTOMAKE_OPTIONS = foreign
  
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 +docdir = $(datadir)/doc/$(PACKAGE)
  
- doc_DATA = API USAGE DRIVERS WANTED
+ doc_DATA = *.html ao_example.c style.css
  
diff --git a/audio/libao/files/patch-src_plugins_arts_Makefile.in b/audio/libao/files/patch-src_plugins_arts_Makefile.in
deleted file mode 100644
index 496b49a06519..000000000000
--- a/audio/libao/files/patch-src_plugins_arts_Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
-$FreeBSD$
---- src/plugins/arts/Makefile.in.orig	Tue Jul 17 02:29:03 2001
-+++ src/plugins/arts/Makefile.in	Tue Jul 17 02:29:34 2001
-@@ -93,13 +93,12 @@ AUTOMAKE_OPTIONS = foreign
- @HAVE_ARTS_TRUE@artssources = ao_arts.c
- @HAVE_ARTS_FALSE@artssources = 
- 
--INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include
-+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include @ARTS_CFLAGS@
- 
- libdir = $(plugindir)
- lib_LTLIBRARIES = $(artsltlibs)
- 
- libarts_la_LDFLAGS = $(artsldflags)
--CFLAGS = @ARTS_CFLAGS@
- libarts_la_LIBADD = @ARTS_LIBS@
- libarts_la_SOURCES = $(artssources)
- 
-@@ -116,6 +115,7 @@ LIBS = @LIBS@
- libarts_la_DEPENDENCIES = 
- @HAVE_ARTS_FALSE@libarts_la_OBJECTS = 
- @HAVE_ARTS_TRUE@libarts_la_OBJECTS =  ao_arts.lo
-+CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)