Update to 1.0.0. Improvements in this release:

* Added surround channel mapping API and capability
* New config file options
* Driver options may be specified in config file
* Workaround for ESD non-4096 byte write bug
* Workaround aRts server crash bug
* Numerous patches from multiple downstreams

6 files changed, 32 insertions, 32 deletions

diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index e90efdfe570..7300c58533b 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libao
-PORTVERSION=	0.8.8
-PORTREVISION=	1
+PORTVERSION=	1.0.0
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/ao/
 
@@ -70,7 +69,7 @@ PLIST_SUB+=	$m="@comment "
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/libao.conf|${PREFIX}&|' \
-		${WRKSRC}/libao.conf.5 ${WRKSRC}/src/ao_private.h \
+		${WRKSRC}/libao.conf.5 ${WRKSRC}/include/ao/ao_private.h \
 		${WRKSRC}/doc/config.html
 
 .include <bsd.port.post.mk>
diff --git a/audio/libao/distinfo b/audio/libao/distinfo
index 568dae53f82..b3079d08be7 100644
--- a/audio/libao/distinfo
+++ b/audio/libao/distinfo
@@ -1,3 +1,3 @@
-MD5 (libao-0.8.8.tar.gz) = b92cba3cbcf1ee9bc221118a85d23dcd
-SHA256 (libao-0.8.8.tar.gz) = e52e05af6b10f42d2ee9845df1a581bf2b352060eabf7946aee0a600c3878954
-SIZE (libao-0.8.8.tar.gz) = 405619
+MD5 (libao-1.0.0.tar.gz) = 08283fbe1f587619053a156254afecec
+SHA256 (libao-1.0.0.tar.gz) = d0fe2c7e4afb8e45e8a3693fe9fde5402dbc2faecfb68a25e9c0cd711817b82a
+SIZE (libao-1.0.0.tar.gz) = 394204
diff --git a/audio/libao/files/patch-configure b/audio/libao/files/patch-configure
index c591036f1fa..e61eab48400 100644
--- a/audio/libao/files/patch-configure
+++ b/audio/libao/files/patch-configure
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig
-+++ configure
-@@ -20076,7 +20076,7 @@
+--- configure.orig	2010-06-05 15:58:21.000000000 +0200
++++ configure	2010-06-05 16:00:29.000000000 +0200
+@@ -11593,7 +11593,7 @@ if test -z "$GCC"; then
          *)
                  PLUGIN_LDFLAGS="-export-dynamic -avoid-version"
                  DEBUG="-g"
@@ -12,9 +12,9 @@ $FreeBSD$
                  PROFILE="-g -p" ;;
          esac
  else
-@@ -20099,9 +20099,9 @@
-                 PROFILE="-g -pg -D__NO_MATH_INLINES -fsigned-char -Ddlsym=dlsym_auto_underscore" ;;
-         *)
+@@ -11616,9 +11616,9 @@ else
+                 PROFILE="-g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
+      	*)
                  PLUGIN_LDFLAGS="-export-dynamic -avoid-version"
 -                DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
 -                CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
@@ -24,8 +24,8 @@ $FreeBSD$
 +                PROFILE="-g -pg -fsigned-char" ;;
          esac
  fi
- CFLAGS="$CFLAGS $cflags_save"
-@@ -24840,7 +24840,7 @@
+ CFLAGS="$CFLAGS $cflags_save -DAO_BUILDING_LIBAO"
+@@ -16563,7 +16563,7 @@ if test "${ac_cv_lib_audio_AuOpenServer+
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -34,7 +34,7 @@ $FreeBSD$
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -25055,7 +25055,7 @@
+@@ -16780,7 +16780,7 @@ fi
  
  if test "x$have_nas" = xyes; then
  	NAS_CFLAGS="$X_CFLAGS"
diff --git a/audio/libao/files/patch-src_Makefile.in b/audio/libao/files/patch-src_plugins_Makefile.in
index 3601b7937f8..c61a61fb9a2 100644
--- a/audio/libao/files/patch-src_Makefile.in
+++ b/audio/libao/files/patch-src_plugins_Makefile.in
@@ -1,9 +1,7 @@
-
 $FreeBSD$
-
---- src/Makefile.in.orig
-+++ src/Makefile.in
-@@ -364,7 +364,7 @@
+--- src/plugins/Makefile.in.orig	2010-06-05 15:49:54.000000000 +0200
++++ src/plugins/Makefile.in	2010-06-05 15:50:28.000000000 +0200
+@@ -295,7 +295,7 @@ $(RECURSIVE_TARGETS):
  	  else \
  	    local_target="$$target"; \
  	  fi; \
diff --git a/audio/libao/pkg-descr b/audio/libao/pkg-descr
index adf540f11c8..24468732d9d 100644
--- a/audio/libao/pkg-descr
+++ b/audio/libao/pkg-descr
@@ -6,7 +6,10 @@ On FreeBSD, it currently supports:
    * AU files
    * WAV files
    * OSS (Open Sound System)
+And optionally:
    * ESD (ESounD or Enlightened Sound Daemon)
    * aRts (KDE sound server)
+   * NAS (Network Audio System)
+   * PulseAudio
 
 WWW: http://www.xiph.org/ao/
diff --git a/audio/libao/pkg-plist b/audio/libao/pkg-plist
index c7ceb4a55f4..d83a00bf5b2 100644
--- a/audio/libao/pkg-plist
+++ b/audio/libao/pkg-plist
@@ -5,17 +5,17 @@ include/ao/plugin.h
 lib/libao.a
 lib/libao.la
 lib/libao.so
-lib/libao.so.3
-%%ARTS%%lib/ao/plugins-2/libarts.la
-%%ARTS%%lib/ao/plugins-2/libarts.so
-lib/ao/plugins-2/liboss.la
-lib/ao/plugins-2/liboss.so
-%%ESOUND%%lib/ao/plugins-2/libesd.la
-%%ESOUND%%lib/ao/plugins-2/libesd.so
-%%NAS%%lib/ao/plugins-2/libnas.la
-%%NAS%%lib/ao/plugins-2/libnas.so
-%%PULSEAUDIO%%lib/ao/plugins-2/libpulse.la
-%%PULSEAUDIO%%lib/ao/plugins-2/libpulse.so
+lib/libao.so.4
+%%ARTS%%lib/ao/plugins-4/libarts.la
+%%ARTS%%lib/ao/plugins-4/libarts.so
+lib/ao/plugins-4/liboss.la
+lib/ao/plugins-4/liboss.so
+%%ESOUND%%lib/ao/plugins-4/libesd.la
+%%ESOUND%%lib/ao/plugins-4/libesd.so
+%%NAS%%lib/ao/plugins-4/libnas.la
+%%NAS%%lib/ao/plugins-4/libnas.so
+%%PULSEAUDIO%%lib/ao/plugins-4/libpulse.la
+%%PULSEAUDIO%%lib/ao/plugins-4/libpulse.so
 libdata/pkgconfig/ao.pc
 share/aclocal/ao.m4
 %%PORTDOCS%%%%DOCSDIR%%/ao_append_option.html
@@ -55,6 +55,6 @@ share/aclocal/ao.m4
 %%PORTDOCS%%%%DOCSDIR%%/plugin-overview.html
 %%PORTDOCS%%%%DOCSDIR%%/style.css
 @dirrm include/ao
-@dirrm lib/ao/plugins-2
+@dirrm lib/ao/plugins-4
 @dirrm lib/ao
 %%PORTDOCS%%@dirrm %%DOCSDIR%%