3 files changed, 18 insertions, 61 deletions

diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index a9f68f00eae2..50e90a5283ae 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	audacious
-PORTVERSION=	0.2
-PORTREVISION=	1
+PORTVERSION=	0.2.2
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://audacious-media-player.org/release/ \
 		${MASTER_SITE_LOCAL}
@@ -18,7 +17,10 @@ EXTRACT_SUFX=.tgz
 MAINTAINER=	redchrom@gmail.com
 COMMENT=	A media player based on BMP and XMMS
 
-LIB_DEPENDS=	sndfile:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	sndfile:${PORTSDIR}/audio/libsndfile \
+		musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
+		curl.3:${PORTSDIR}/ftp/curl \
+		FLAC:${PORTSDIR}/audio/flac
 
 USE_GNOME=	gtk20 libglade2
 WANT_GNOME=	yes
@@ -37,16 +39,15 @@ MAN1=		audacious.1
 
 PORTDOCS=	README AUTHORS ChangeLog NEWS
 
-INPUT_PLUGINS=	cdaudio,mpg123,wav,tonegen,wma,console,sexypsf
-OUTPUT_PLUGINS=	OSS,disk_writer,crossfade
+INPUT_PLUGINS=	cdaudio mpg123 wav tonegen wma console \
+		sexypsf aac timidity flac
+OUTPUT_PLUGINS=	OSS disk_writer
 VISUALIZATION_PLUGINS=	blur_scope
 
 OPTIONS=	VORBIS	"Enable Ogg Vorbis input" on \
-		FLAC	"Enable flac input" on \
 		MODPLUG	"Enable modplug input" off \
 		MPC	"Enable mpc input" off \
 		ESOUND	"Enable Esound output"  off \
-		VISUAL  "Enable libvisual plugin" off \
 		ID3V2	"Enable id3v2 editing" off \
 		SIMD	"Build with x86 SIMD(3DNow!/MMX) instructions support" on \
 		SDL	"Enable SDL support" off \
@@ -63,15 +64,6 @@ CONFIGURE_ARGS+=	--disable-vorbis
 PLIST_SUB+=	VORBISPLUGIN="@comment "
 .endif
 
-.if !defined(WITHOUT_FLAC)
-INPUT_PLUGINS+=	flac
-PLIST_SUB+=	FLACPLUGIN=""
-LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
-.else
-PLIST_SUB+=	FLACPLUGIN="@comment "
-CONFIGURE_ARGS+=	--disable-flac
-.endif
-
 .if !defined(WITHOUT_MODPLUG)
 INPUT_PLUGINS+=	modplug
 PLIST_SUB+=	MODPLUG=""
@@ -105,14 +97,6 @@ CONFIGURE_ARGS+=	--disable-esd
 PLIST_SUB+=	ESDPLUGIN="@comment "
 .endif
 
-.if defined(WITH_VISUAL)
-PLIST_SUB+=	LIBVISUAL=""
-VISUALIZATION_PLUGINS+=	libvisual-proxy
-LIB_DEPENDS+=	visual.0:${PORTSDIR}/graphics/libvisual
-.else
-PLIST_SUB+=	LIBVISUAL="@comment "
-.endif
-
 .if defined(WITH_ID3V2)
 LIB_DEPENDS+=	id3-3.8.3:${PORTSDIR}/audio/id3lib
 .endif
@@ -135,7 +119,7 @@ CONFIGURE_ARGS+=	--enable-gnome-vfs --enable-gconf
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
+	@${REINPLACE_CMD} -e 's|(LIBDIR)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's,-pthread,${PTHREAD_LIBS},g' \
 		${WRKSRC}/configure
@@ -148,13 +132,6 @@ post-install:
 	@${ECHO_MSG} "ALL PRESETS will be storing in the gconf database."
 	@${ECHO_MSG} ""
 .endif
-.if defined(WITH_VISUAL)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You have installed audacious with libvisual support."
-	@${ECHO_MSG} "If you want to be able to access any visualizations,"
-	@${ECHO_MSG} "you must install the graphics/libvisual-plugins port."
-	@${ECHO_MSG} ""
-.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for i in README AUTHORS ChangeLog NEWS
diff --git a/multimedia/audacious/distinfo b/multimedia/audacious/distinfo
index 801500dae195..32ae3c8b6daf 100644
--- a/multimedia/audacious/distinfo
+++ b/multimedia/audacious/distinfo
@@ -1,3 +1,3 @@
-MD5 (audacious-0.2.tgz) = 42ecd9753684929482e598a0a7170147
-SHA256 (audacious-0.2.tgz) = 5999c83d6afccff6d1cb1410fc8bea439c0a4337b4077470c6ac2a93cb1fd0a8
-SIZE (audacious-0.2.tgz) = 3834934
+MD5 (audacious-0.2.2.tgz) = c7552c96df2d3076a2a6fbcfa0980030
+SHA256 (audacious-0.2.2.tgz) = b47d82650538847ab732e5d0e1d4b1cf6e4e0a4f4cd1a5fbe4606a0251ab9a0c
+SIZE (audacious-0.2.2.tgz) = 3216937
diff --git a/multimedia/audacious/pkg-plist b/multimedia/audacious/pkg-plist
index ef0cf2f711d1..6cc7984f3318 100644
--- a/multimedia/audacious/pkg-plist
+++ b/multimedia/audacious/pkg-plist
@@ -12,48 +12,29 @@ include/audacious/vfs.h
 include/audacious/input.h
 include/audacious/output.h
 include/audacious/xml_document.h
-lib/audacious/Effect/libladspa.la
 lib/audacious/Effect/libladspa.so
-lib/audacious/General/libsong_change.la
 lib/audacious/General/libsong_change.so
-lib/audacious/Input/libcdaudio.la
+lib/audacious/General/libscrobbler.so
 lib/audacious/Input/libcdaudio.so
-lib/audacious/Input/libconsole.la
 lib/audacious/Input/libconsole.so
-lib/audacious/Input/libmpg123.la
 lib/audacious/Input/libmpg123.so
-lib/audacious/Input/libsexypsf.la
 lib/audacious/Input/libsexypsf.so
-lib/audacious/Input/libtonegen.la
 lib/audacious/Input/libtonegen.so
-%%VORBISPLUGIN%%lib/audacious/Input/libvorbis.la
+lib/audacious/Input/libaac.so
+lib/audacious/Input/libtimidity.so
 %%VORBISPLUGIN%%lib/audacious/Input/libvorbis.so
-%%FLACPLUGIN%%lib/audacious/Input/libflac.la
-%%FLACPLUGIN%%lib/audacious/Input/libflac.so
-%%MODPLUG%%lib/audacious/Input/libmodplug.la
+lib/audacious/Input/libflac.so
 %%MODPLUG%%lib/audacious/Input/libmodplug.so
-%%MPCPLUGIN%%lib/audacious/Input/libmpc.la
 %%MPCPLUGIN%%lib/audacious/Input/libmpc.so
-lib/audacious/Input/libwav.la
 lib/audacious/Input/libwav.so
-lib/audacious/Input/libwma.la
 lib/audacious/Input/libwma.so
-lib/audacious/Output/libOSS.la
 lib/audacious/Output/libOSS.so
-%%ESDPLUGIN%%lib/audacious/Output/libesdout.la
-%%ESDPLUGIN%%lib/audacious/Output/libesdout.so
-lib/audacious/Output/libcrossfade.la
-lib/audacious/Output/libcrossfade.so
-lib/audacious/Output/libcrossfade.so.0
-lib/audacious/Output/libdisk_writer.la
+%%ESDPLUGIN%%lib/audacious/Output/libESD.so
 lib/audacious/Output/libdisk_writer.so
-lib/audacious/Visualization/libbscope.la
 lib/audacious/Visualization/libbscope.so
-%%LIBVISUAL%%lib/audacious/Visualization/libvisual_proxy.la
-%%LIBVISUAL%%lib/audacious/Visualization/libvisual_proxy.so
-lib/libaudacious.la
 lib/libaudacious.so
 lib/libaudacious.so.2
+lib/libaudacious.so.2.0.0
 libdata/pkgconfig/audacious.pc
 share/applications/audacious.desktop
 share/pixmaps/audacious.png
@@ -107,7 +88,6 @@ share/locale/sv/LC_MESSAGES/audacious.mo
 share/locale/uk/LC_MESSAGES/audacious.mo
 share/locale/zh_CN/LC_MESSAGES/audacious.mo
 share/locale/zh_TW/LC_MESSAGES/audacious.mo
-share/pixmaps/audacious.png
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%/Skins/Default