8 files changed, 70 insertions, 86 deletions

diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index 597321d5322b..3f356292bb0f 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libao
-PORTVERSION=	0.8.5
-PORTREVISION=	5
+PORTVERSION=	0.8.8
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/ao/
 
@@ -18,6 +17,7 @@ USE_AUTOTOOLS=	libtool:15
 WANT_GNOME=	yes
 USE_GNOME=	gnomehack pkgconfig
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--mandir="${PREFIX}/man"
 INSTALLS_SHLIB=	yes
 
 .if defined(NOPORTDOCS)
@@ -28,37 +28,45 @@ MAKE_ENV=	DOC=doc
 
 MAN5=		libao.conf.5
 
+OPTIONS=	ARTS "Enable the aRts module" off \
+		ESOUND "Enable the EsounD module" off \
+		NAS "Enable the Network Audio System module" off \
+		PULSEAUDIO "Enable the PulseAudio module" off
+
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_ARTS)
 LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
-PLIST_SUB+=	ARTS=""
 .else
-CONFIGURE_ARGS+=	--disable-arts
-PLIST_SUB+=	ARTS="@comment "
-pre-everything::
-	@${ECHO_MSG} "Define WITH_ARTS to enable the aRts module."
+CONFIGURE_ARGS+=--disable-arts
+.endif
+
+.if defined(WITH_ESOUND)
+USE_GNOME+=	esound
+.else
+CONFIGURE_ARGS+=--disable-esd
 .endif
 
 .if defined(WITH_NAS)
 LIB_DEPENDS+=	audio.2:${PORTSDIR}/audio/nas
-PLIST_SUB+=	NAS=""
 .else
-CONFIGURE_ARGS+=	--disable-nas
-PLIST_SUB+=	NAS="@comment "
-pre-everything::
-	@${ECHO_MSG} "Define WITH_NAS to enable the NAS module."
+CONFIGURE_ARGS+=--disable-nas
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${HAVE_GNOME:Mesound}
-USE_GNOME+=	esound
-PLIST_SUB+=	ESOUND=""
-PKGNAMESUFFIX=	-esound
+.if defined(WITH_PULSEAUDIO)
+LIB_DEPENDS+=	pulse-simple.0:${PORTSDIR}/audio/pulseaudio
 .else
-CONFIGURE_ARGS+=	--disable-esd
-PLIST_SUB+=	ESOUND="@comment "
+CONFIGURE_ARGS+=--disable-pulse
 .endif
 
+.for m in ARTS ESOUND NAS PULSEAUDIO
+.   if defined(WITH_$m)
+PLIST_SUB+=	$m=""
+.   else
+PLIST_SUB+=	$m="@comment "
+.   endif
+.endfor
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/libao.conf|${PREFIX}&|' \
 		${WRKSRC}/libao.conf.5 ${WRKSRC}/src/ao_private.h \
diff --git a/audio/libao/distinfo b/audio/libao/distinfo
index b1f727a66d28..568dae53f82b 100644
--- a/audio/libao/distinfo
+++ b/audio/libao/distinfo
@@ -1,3 +1,3 @@
-MD5 (libao-0.8.5.tar.gz) = dd72b66f5f29361411bda465470b65e2
-SHA256 (libao-0.8.5.tar.gz) = fd9d8447f81a86d3d991dc137609b087560e0affea94e7430a59bc0ca62e0d82
-SIZE (libao-0.8.5.tar.gz) = 267283
+MD5 (libao-0.8.8.tar.gz) = b92cba3cbcf1ee9bc221118a85d23dcd
+SHA256 (libao-0.8.8.tar.gz) = e52e05af6b10f42d2ee9845df1a581bf2b352060eabf7946aee0a600c3878954
+SIZE (libao-0.8.8.tar.gz) = 405619
diff --git a/audio/libao/files/patch-Makefile.in b/audio/libao/files/patch-Makefile.in
index 791159ce6a72..909311d9f1ea 100644
--- a/audio/libao/files/patch-Makefile.in
+++ b/audio/libao/files/patch-Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- 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
- 
--SUBDIRS = src include doc debian
-+SUBDIRS = src include $(DOC) debian
- 
- m4datadir = $(datadir)/aclocal
+--- Makefile.in.orig
++++ Makefile.in
+@@ -225,7 +225,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign 1.6 dist-zip
+-SUBDIRS = src include doc
++SUBDIRS = src include $(DOC)
+ m4datadir = $(prefix)/share/aclocal
  m4data_DATA = ao.m4
+ pkgconfigdir = $(prefix)/libdata/pkgconfig
diff --git a/audio/libao/files/patch-configure b/audio/libao/files/patch-configure
index a2ec84e3ae9b..c591036f1fa8 100644
--- a/audio/libao/files/patch-configure
+++ b/audio/libao/files/patch-configure
@@ -1,17 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Sun Oct  5 03:32:52 2003
-+++ configure	Wed Oct  8 16:17:26 2003
-@@ -7787,6 +7787,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -7816,7 +7817,7 @@
+--- configure.orig
++++ configure
+@@ -20076,7 +20076,7 @@
          *)
                  PLUGIN_LDFLAGS="-export-dynamic -avoid-version"
                  DEBUG="-g"
@@ -20,7 +12,7 @@ $FreeBSD$
                  PROFILE="-g -p" ;;
          esac
  else
-@@ -7839,9 +7840,9 @@
+@@ -20099,9 +20099,9 @@
                  PROFILE="-g -pg -D__NO_MATH_INLINES -fsigned-char -Ddlsym=dlsym_auto_underscore" ;;
          *)
                  PLUGIN_LDFLAGS="-export-dynamic -avoid-version"
@@ -33,16 +25,16 @@ $FreeBSD$
          esac
  fi
  CFLAGS="$CFLAGS $cflags_save"
-@@ -12128,7 +12129,7 @@
+@@ -24840,7 +24840,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-laudio -lXau $X_LIBS $LIBS"
 +LIBS="-laudio -lXau -lXt -lm $X_LIBS $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -12337,7 +12338,7 @@
+ _ACEOF
+@@ -25055,7 +25055,7 @@
  
  if test "x$have_nas" = xyes; then
  	NAS_CFLAGS="$X_CFLAGS"
diff --git a/audio/libao/files/patch-doc_Makefile.in b/audio/libao/files/patch-doc_Makefile.in
index 2803148d2a81..7c34b06e0418 100644
--- a/audio/libao/files/patch-doc_Makefile.in
+++ b/audio/libao/files/patch-doc_Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- 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
- 
+--- doc/Makefile.in.orig
++++ doc/Makefile.in
+@@ -161,7 +161,7 @@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 +docdir = $(datadir)/doc/$(PACKAGE)
- 
- doc_DATA = *.html ao_example.c style.css
- 
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
diff --git a/audio/libao/files/patch-include_ao_ao.h b/audio/libao/files/patch-include_ao_ao.h
deleted file mode 100644
index 7295a654dea2..000000000000
--- a/audio/libao/files/patch-include_ao_ao.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- include/ao/ao.h.orig
-+++ include/ao/ao.h
-@@ -134,7 +134,7 @@
- 
- /* driver information */
- int ao_driver_id(const char *short_name);
--int ao_default_driver_id();
-+int ao_default_driver_id(void);
- ao_info *ao_driver_info(int driver_id);
- ao_info **ao_driver_info_list(int *driver_count);
- char *ao_file_extension(int driver_id);
diff --git a/audio/libao/files/patch-src_Makefile.in b/audio/libao/files/patch-src_Makefile.in
index 60aa858b71d0..3601b7937f82 100644
--- a/audio/libao/files/patch-src_Makefile.in
+++ b/audio/libao/files/patch-src_Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- src/Makefile.in.orig	Wed Oct  8 03:17:06 2003
-+++ src/Makefile.in	Wed Oct  8 03:17:23 2003
-@@ -171,7 +171,7 @@
- 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 =
+--- src/Makefile.in.orig
++++ src/Makefile.in
+@@ -364,7 +364,7 @@
+ 	  else \
+ 	    local_target="$$target"; \
+ 	  fi; \
+-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) LIBTOOL="$(LIBTOOL) --tag=disable-static" $$local_target) \
+ 	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
diff --git a/audio/libao/pkg-plist b/audio/libao/pkg-plist
index 482dd5fbc671..c7ceb4a55f45 100644
--- a/audio/libao/pkg-plist
+++ b/audio/libao/pkg-plist
@@ -6,18 +6,16 @@ lib/libao.a
 lib/libao.la
 lib/libao.so
 lib/libao.so.3
-%%ARTS%%lib/ao/plugins-2/libarts.a
 %%ARTS%%lib/ao/plugins-2/libarts.la
 %%ARTS%%lib/ao/plugins-2/libarts.so
-lib/ao/plugins-2/liboss.a
 lib/ao/plugins-2/liboss.la
 lib/ao/plugins-2/liboss.so
-%%ESOUND%%lib/ao/plugins-2/libesd.a
 %%ESOUND%%lib/ao/plugins-2/libesd.la
 %%ESOUND%%lib/ao/plugins-2/libesd.so
-%%NAS%%lib/ao/plugins-2/libnas.a
 %%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
 libdata/pkgconfig/ao.pc
 share/aclocal/ao.m4
 %%PORTDOCS%%%%DOCSDIR%%/ao_append_option.html