Enable speex, mod, cdda, and cddb support, now that all related

libraries have been imported.  These all appear to work correctly,
except that CD audio playback has some occassional gaps, but
jakemsr@ reports that other libcdio users have similar issues.

OK jakemsr@

audio/aqualung/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.21 2010/10/24 21:00:29 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.22 2010/11/07 00:50:22 jeremy Exp $
 
 COMMENT=	advanced music player
 
 DISTNAME=	aqualung-0.9beta11
-REVISION=	2
+REVISION=	3
 CATEGORIES=	audio
 
 HOMEPAGE=	http://aqualung.factorial.hu/
@@ -25,7 +25,8 @@ WANTLIB=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
 		vorbisenc vorbisfile xcb xcb-render xcb-shm z \
 		gtk-x11-2.0 gdk-x11-2.0 gdk_pixbuf-2.0 xml2 lua mac mad \
 		mpcdec FLAC avcodec avformat avutil jack wavpack \
-		lrdf GL Xxf86vm drm
+		lrdf GL Xxf86vm drm oggz speex cddb cdio cdio_cdda \
+		cdio_paranoia modplug
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aqualung/}
 
@@ -33,15 +34,20 @@ MODULES=	devel/gettext
 
 LIB_DEPENDS=	::audio/flac \
 		::audio/jack \
+		::audio/libcdio \
+		::audio/libcddb \
 		::audio/libmad \
+		::audio/libmodplug \
 		::audio/libmpcdec \
 		::audio/mac \
+		::audio/speex \
 		::audio/wavpack \
 		::graphics/ffmpeg \
 		::lang/lua \
+		::multimedia/oggz \
+		::textproc/liblrdf \
 		::textproc/libxml \
-		::x11/gtk+2 \
-		::textproc/liblrdf
+		::x11/gtk+2
 
 RUN_DEPENDS=	::devel/desktop-file-utils
 		
@@ -52,11 +58,10 @@ CONFIGURE_ENV=	LDFLAGS="-pthread -L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		-DPTHREAD_MIN_PRIORITY=0 -DPTHREAD_MAX_PRIORITY=31  \
 		-I${LOCALBASE}/include"
 
-# cddb, ifp (requires lib*) - no package
-# cdda (requires libcdio) - no package
-# mod (requires libmodplug) - no package
-# speex (requires liboggz) - no package
-CONFIGURE_ARGS=	--with-flac \
+# ifp (requires libifp) - no package
+CONFIGURE_ARGS=	--with-cdda \
+		--with-cddb \
+		--with-flac \
 		--with-jack \
 		--with-ladspa \
 		--with-lame \
@@ -64,23 +69,22 @@ CONFIGURE_ARGS=	--with-flac \
 		--with-loop \
 		--with-lua \
 		--with-mac \
+		--with-mod \
 		--with-mpc \
 		--with-mpeg \
 		--with-ogg \
 		--with-podcast \
 		--with-sndfile \
 		--with-sndio \
+		--with-speex \
 		--with-src \
 		--with-systray \
 		--with-vorbisenc \
 		--with-wavpack \
 		--without-alsa \
-		--without-cdda \
-		--without-cddb \
 		--without-ifp \
-		--without-mod \
 		--without-oss \
-		--without-speex
+		--without-pulse
 
 post-install:
 	mv ${PREFIX}/share/aqualung/doc ${PREFIX}/share/doc/aqualung