Convert multimedia/xmms to USES=libtool. Bump PORTREVISION on all

dependent ports and convert them to USES=libtool too.

audio/scrobbler:
- USES=tar:bzip2.
- Don't link with libstdc++.

audio/xmms-bonk:
- Don't link with libstdc++.

audio/xmms-flac:
- Remove unneeded dependencies.
- Remove $FreeBSD$ from patches.

audio/xmms-scrobbler:
- Use OPTIONS_SLAVE.

audio/xmms-timidity:
- USES=tar:bzip2.
- Install the library instead of the source code file.

audio/xmms-volnorm:
- Remove do-install.

2 files changed, 6 insertions, 23 deletions

diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index 8008dabbdd8d..55859defc828 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xmms
 PORTVERSION=	1.2.11
-PORTREVISION=	23
+PORTREVISION=	24
 CATEGORIES=	multimedia audio ipv6
 MASTER_SITES=	http://www.xmms.org/files/1.2.x/ \
 		http://legacy.xmms2.org/ \
@@ -17,7 +17,7 @@ LICENSE=	GPLv2
 
 CONFLICTS?=	ru-xmms-[0-9]* zh-xmms-[0-9]*
 GNU_CONFIGURE=	yes
-USES=		desktop-file-utils pathfix gmake iconv tar:bzip2
+USES=		desktop-file-utils gmake iconv libtool pathfix tar:bzip2
 USE_GNOME=	gtk12
 USE_LDCONFIG=	yes
 USE_XORG=	sm x11 xxf86vm
@@ -80,8 +80,8 @@ LIB_DEPENDS+=	librcc.so:${PORTSDIR}/devel/librcc \
 		librcd.so:${PORTSDIR}/devel/librcd
 
 USE_AUTOTOOLS=	aclocal autoheader libtoolize autoconf automake
-LIBTOOLIZE_ARGS=--install --force
-AUTOMAKE_ARGS=	--add-missing --force-missing
+LIBTOOLIZE_ARGS=-i -c -f
+AUTOMAKE_ARGS=	-a -c -f
 USE_OPENSSL=	yes
 .endif
 
diff --git a/multimedia/xmms/pkg-plist b/multimedia/xmms/pkg-plist
index ed9613bbc488..8fcb3f4b7ef7 100644
--- a/multimedia/xmms/pkg-plist
+++ b/multimedia/xmms/pkg-plist
@@ -9,42 +9,25 @@ include/xmms/plugin.h
 include/xmms/titlestring.h
 include/xmms/util.h
 include/xmms/xmmsctrl.h
-lib/libxmms.la
 lib/libxmms.so
-lib/libxmms.so.4
-lib/xmms/Effect/libecho.la
+lib/libxmms.so.1
+lib/libxmms.so.1.3.1
 lib/xmms/Effect/libecho.so
-lib/xmms/Effect/libstereo.la
 lib/xmms/Effect/libstereo.so
-lib/xmms/Effect/libvoice.la
 lib/xmms/Effect/libvoice.so
 lib/xmms/General/libir.so
-lib/xmms/General/libir.la
-lib/xmms/General/libsong_change.la
 lib/xmms/General/libsong_change.so
-lib/xmms/Input/libcdaudio.la
 lib/xmms/Input/libcdaudio.so
-%%MIKMOD%%lib/xmms/Input/libmikmod.la
 %%MIKMOD%%lib/xmms/Input/libmikmod.so
-lib/xmms/Input/libmpg123.la
 lib/xmms/Input/libmpg123.so
-lib/xmms/Input/libtonegen.la
 lib/xmms/Input/libtonegen.so
-%%VORBIS%%lib/xmms/Input/libvorbis.la
 %%VORBIS%%lib/xmms/Input/libvorbis.so
-lib/xmms/Input/libwav.la
 lib/xmms/Input/libwav.so
-%%ESOUND%%lib/xmms/Output/libesdout.la
 %%ESOUND%%lib/xmms/Output/libesdout.so
-lib/xmms/Output/libOSS.la
 lib/xmms/Output/libOSS.so
-lib/xmms/Output/libdisk_writer.la
 lib/xmms/Output/libdisk_writer.so
-%%SPEC%%lib/xmms/Visualization/libogl_spectrum.la
 %%SPEC%%lib/xmms/Visualization/libogl_spectrum.so
-lib/xmms/Visualization/libbscope.la
 lib/xmms/Visualization/libbscope.so
-lib/xmms/Visualization/libsanalyzer.la
 lib/xmms/Visualization/libsanalyzer.so
 man/man1/wmxmms.1.gz
 man/man1/xmms.1.gz