Conversion to a single libtool environment.

Approved by:	portmgr (kris)

2 files changed, 23 insertions, 5 deletions

diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 82fdc81af8f9..286c051637dd 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	audacious
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://audacious-media-player.org/release/
 DISTNAME=	audacious-${PORTVERSION}
@@ -21,8 +22,7 @@ USE_GNOME=	gtk20 libglade2
 WANT_GNOME=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:15
-LIBTOOLFILES=	configure
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist
index f5e0c4f4f22c..ef0cf2f711d1 100644
--- a/multimedia/audacious-plugins/pkg-plist
+++ b/multimedia/audacious-plugins/pkg-plist
@@ -12,29 +12,46 @@ 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/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
 %%VORBISPLUGIN%%lib/audacious/Input/libvorbis.so
+%%FLACPLUGIN%%lib/audacious/Input/libflac.la
 %%FLACPLUGIN%%lib/audacious/Input/libflac.so
+%%MODPLUG%%lib/audacious/Input/libmodplug.la
 %%MODPLUG%%lib/audacious/Input/libmodplug.so
+%%MPCPLUGIN%%lib/audacious/Input/libmpc.la
 %%MPCPLUGIN%%lib/audacious/Input/libmpc.so
-%%MPCPLUGIN%%lib/audacious/Input/libmpc.a
+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.a
+lib/audacious/Output/libcrossfade.la
 lib/audacious/Output/libcrossfade.so
 lib/audacious/Output/libcrossfade.so.0
+lib/audacious/Output/libdisk_writer.la
 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.a
+lib/libaudacious.la
 lib/libaudacious.so
 lib/libaudacious.so.2
 libdata/pkgconfig/audacious.pc
@@ -90,6 +107,7 @@ 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