From fb22089f7d9407c6e25941e97eca98b6d610735f Mon Sep 17 00:00:00 2001
From: tijl <tijl@FreeBSD.org>
Date: Sun, 4 May 2014 18:48:54 +0000
Subject: 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.
---
 audio/scrobbler/Makefile                | 9 +++------
 audio/scrobbler/files/patch-Makefile.in | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'audio/scrobbler')

diff --git a/audio/scrobbler/Makefile b/audio/scrobbler/Makefile
index 3df2cf21921f..744cf0c0b8dd 100644
--- a/audio/scrobbler/Makefile
+++ b/audio/scrobbler/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	scrobbler
 PORTVERSION=	0.3.8.1
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	audio
 MASTER_SITES=	http://static.audioscrobbler.com/plugins/ \
 		http://www.pipian.com/stuffforchat/
@@ -16,9 +16,8 @@ LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
 CONFLICTS=	xmms-scrobbler-[0-9]*
 
-USES=		gmake pkgconfig
+USES=		gmake libtool pkgconfig tar:bzip2
 USE_CSTD=	gnu89
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -31,8 +30,7 @@ XMMS_DESC=	Enable XMMS support
 ENCODINGS_PATCH_DESC=	Enable ID3 tags recoding support
 
 XMMS_LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
-XMMS_PLIST_FILES=	lib/xmms/General/libxmms_scrobbler.la \
-			lib/xmms/General/libxmms_scrobbler.so
+XMMS_PLIST_FILES=	lib/xmms/General/libxmms_scrobbler.so
 XMMS_PLIST_DIRS=	lib/xmms/General lib/xmms
 XMMS_CONFIGURE_ENABLE=	xmms-plugin
 
@@ -47,7 +45,6 @@ ENCODINGS_PATCH_USES=	iconv
 .include <bsd.port.options.mk>
 
 post-patch::
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
 .if ${PORT_OPTIONS:MENCODINGS_PATCH}
 	@${PATCH} ${PATCH_ARGS} -p1 < ${FILESDIR}/extra-encodings-patch
 .endif
diff --git a/audio/scrobbler/files/patch-Makefile.in b/audio/scrobbler/files/patch-Makefile.in
index 83d1ca4884df..139471d1fb5c 100644
--- a/audio/scrobbler/files/patch-Makefile.in
+++ b/audio/scrobbler/files/patch-Makefile.in
@@ -5,7 +5,7 @@
  LDFLAGS = @LDFLAGS@
  LIBOBJS = @LIBOBJS@
 -LIBS = `curl-config --libs` -lmusicbrainz -lm -lstdc++
-+LIBS = `curl-config --libs` -lm -lstdc++
++LIBS = `curl-config --libs` -lm
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
-- 
cgit