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)

8 files changed, 61 insertions, 46 deletions

diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index 84fa2ddc3008..b1c6f5ff3216 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	libao
-PORTVERSION=	0.7.0
+PORTVERSION=	0.8.0
 CATEGORIES=	audio
-MASTER_SITES=	http://www.vorbis.com/files/rc1/unix/
+MASTER_SITES=	http://www.vorbis.com/files/rc2/unix/
 
 MAINTAINER=	naddy@mips.inka.de
 
@@ -23,6 +23,8 @@ MAKE_ENV=	DOC=""
 MAKE_ENV=	DOC=doc
 .endif
 
+MAN5=		libao.conf.5
+
 .include <bsd.port.pre.mk>
 
 .if defined(HAVE_ESOUND)
diff --git a/audio/libao/distinfo b/audio/libao/distinfo
index 046c6eaf525c..6547e363a8fb 100644
--- a/audio/libao/distinfo
+++ b/audio/libao/distinfo
@@ -1 +1 @@
-MD5 (libao-0.7.0.tar.gz) = f4708f76c18cadc781ecbe0b9131d050
+MD5 (libao-0.8.0.tar.gz) = e387df473b23e3cd15d2d8fbb5b5d236
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)
diff --git a/audio/libao/pkg-descr b/audio/libao/pkg-descr
index e7fbd3d03a05..594ea5675814 100644
--- a/audio/libao/pkg-descr
+++ b/audio/libao/pkg-descr
@@ -1,9 +1,12 @@
 libao is a cross-platform audio library that allows programs to
 output audio using a simple API on a wide variety of platforms.
 On FreeBSD, it currently supports:
-   * Null output
+   * null output
+   * raw output
+   * AU files
    * WAV files
    * OSS (Open Sound System)
    * ESD (ESounD or Enlightened Sound Daemon)
+   * aRts (KDE sound server)
 
 WWW: http://www.vorbis.com/
diff --git a/audio/libao/pkg-plist b/audio/libao/pkg-plist
index 8723ddb49673..85c717e3d00a 100644
--- a/audio/libao/pkg-plist
+++ b/audio/libao/pkg-plist
@@ -1,16 +1,46 @@
 @comment $FreeBSD$
 include/ao/ao.h
 include/ao/os_types.h
+include/ao/plugin.h
 lib/libao.so
-lib/libao.so.1
+lib/libao.so.2
 %%ARTS%%lib/ao/libarts.so
 lib/ao/liboss.so
 %%ESOUND%%lib/ao/libesd.so
 share/aclocal/ao.m4
-%%PORTDOCS%%share/doc/libao/API
-%%PORTDOCS%%share/doc/libao/DRIVERS
-%%PORTDOCS%%share/doc/libao/USAGE
-%%PORTDOCS%%share/doc/libao/WANTED
+%%PORTDOCS%%share/doc/libao/ao_append_option.html
+%%PORTDOCS%%share/doc/libao/ao_close.html
+%%PORTDOCS%%share/doc/libao/ao_default_driver_id.html
+%%PORTDOCS%%share/doc/libao/ao_device.html
+%%PORTDOCS%%share/doc/libao/ao_driver_id.html
+%%PORTDOCS%%share/doc/libao/ao_driver_info.html
+%%PORTDOCS%%share/doc/libao/ao_driver_info_list.html
+%%PORTDOCS%%share/doc/libao/ao_example.c
+%%PORTDOCS%%share/doc/libao/ao_free_options.html
+%%PORTDOCS%%share/doc/libao/ao_info.html
+%%PORTDOCS%%share/doc/libao/ao_initialize.html
+%%PORTDOCS%%share/doc/libao/ao_open_file.html
+%%PORTDOCS%%share/doc/libao/ao_open_live.html
+%%PORTDOCS%%share/doc/libao/ao_option.html
+%%PORTDOCS%%share/doc/libao/ao_play.html
+%%PORTDOCS%%share/doc/libao/ao_plugin_close.html
+%%PORTDOCS%%share/doc/libao/ao_plugin_device_clear.html
+%%PORTDOCS%%share/doc/libao/ao_plugin_device_init.html
+%%PORTDOCS%%share/doc/libao/ao_plugin_driver_info.html
+%%PORTDOCS%%share/doc/libao/ao_plugin_open.html
+%%PORTDOCS%%share/doc/libao/ao_plugin_play.html
+%%PORTDOCS%%share/doc/libao/ao_plugin_set_option.html
+%%PORTDOCS%%share/doc/libao/ao_plugin_test.html
+%%PORTDOCS%%share/doc/libao/ao_sample_format.html
+%%PORTDOCS%%share/doc/libao/ao_shutdown.html
+%%PORTDOCS%%share/doc/libao/config.html
+%%PORTDOCS%%share/doc/libao/drivers.html
+%%PORTDOCS%%share/doc/libao/index.html
+%%PORTDOCS%%share/doc/libao/libao-api.html
+%%PORTDOCS%%share/doc/libao/overview.html
+%%PORTDOCS%%share/doc/libao/plugin-api.html
+%%PORTDOCS%%share/doc/libao/plugin-overview.html
+%%PORTDOCS%%share/doc/libao/style.css
 @dirrm include/ao
 @dirrm lib/ao
 %%PORTDOCS%%@dirrm share/doc/libao