Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/musicpd/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- Makefile	9 Jan 2007 23:19:26 -0000	1.27
+++ Makefile	19 Apr 2007 18:15:54 -0000
@@ -38,7 +38,6 @@
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/mpd.conf ${EGDIR}

 
-.include "../../audio/libao/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"

 
 .include "../../mk/oss.buildlink3.mk"
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/musicpd/options.mk,v
retrieving revision 1.7
diff -u -r1.7 options.mk
--- options.mk	1 Feb 2007 14:52:43 -0000	1.7
+++ options.mk	19 Apr 2007 18:15:54 -0000
@@ -1,8 +1,8 @@
 # $NetBSD: options.mk,v 1.7 2007/02/01 14:52:43 cbiere Exp $

 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.musicpd
-PKG_SUPPORTED_OPTIONS=	aac audiofile flac iconv id3 libmikmod musepack ogg
-PKG_SUGGESTED_OPTIONS=	aac audiofile flac iconv id3 libmikmod musepack ogg
+PKG_SUPPORTED_OPTIONS=	aac audiofile flac iconv id3 libmikmod musepack ogg libao
+PKG_SUGGESTED_OPTIONS=	aac audiofile flac iconv id3 libmikmod musepack ogg libao

 
 .include "../../mk/bsd.options.mk"

 
@@ -64,6 +64,13 @@
 CONFIGURE_ARGS+=	--disable-ogg
 .endif

 
+.if !empty(PKG_OPTIONS:Mlibao)
+.include "../../audio/libao/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-ao
+.else
+CONFIGURE_ARGS+=	--disable-ao
+.endif
+
 # when IPv6 support is enabled, mpd doesn't listen on an IPv4 address.
 #.if !empty(PKG_OPTIONS:Minet6)
 #CONFIGURE_ARGS+=	--enable-ipv6