Switch to audio/musepack from deprecated audio/libmpcdec

PR:		ports/150510
Submitted by:	Ganael Laplanche <ganael.laplanche at martymac.org>

4 files changed, 20 insertions, 9 deletions

diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
index 00167e2..fd26165 100644
--- a/audio/xmms2/Makefile
+++ b/audio/xmms2/Makefile
@@ -242,7 +242,7 @@ PLIST_SUB+=	MPG123="@comment "
 .endif
 
 .if !defined(WITHOUT_MUSEPACK)
-LIB_DEPENDS+=	mpcdec.5:${PORTSDIR}/audio/libmpcdec
+LIB_DEPENDS+=	mpcdec.7:${PORTSDIR}/audio/musepack
 PLIST_SUB+=	MUSEPACK=""
 .else
 EXCLUDE+=	--without-plugins="musepack"
diff --git a/audio/xmms2/files/patch-patch-src-plugins-musepack-wscript b/audio/xmms2/files/patch-patch-src-plugins-musepack-wscript
new file mode 100644
index 0000000..9a450a7
--- /dev/null
+++ b/audio/xmms2/files/patch-patch-src-plugins-musepack-wscript
@@ -0,0 +1,11 @@
+--- src/plugins/musepack/wscript.orig	2010-09-10 22:55:03.412930402 +0200
++++ src/plugins/musepack/wscript	2010-09-10 23:02:05.738208553 +0200
+@@ -5,7 +5,7 @@
+         if not conf.check_cc(header_name="mpcdec/mpcdec.h", defines="HAVE_MPCDEC_OLD", uselib_store="mpcdec"):
+             return False
+ 
+-    if not conf.check_cc(lib="mpcdec", uselib_store="mpcdec"):
++    if not conf.check_cc(lib="mpcdec", uselib="math", uselib_store="mpcdec"):
+         return False
+ 
+     return True
diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index 8b3929f..9f2d090 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	k3b
 PORTVERSION=	2.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 
@@ -38,7 +38,7 @@ OPTIONS=	CDRDAO "Burning: Use cdrdao" ON \
 		FFMPEG "Decoder: various (multimedia/ffmpeg)" OFF \
 		FLAC "Decoder: flac (audio/flac)" ON \
 		MAD "Decoder: mp3 (audio/libmad)" ON \
-		MPC "Decoder: musepack (audio/libmpcdec)" OFF \
+		MUSEPACK "Decoder: musepack (audio/musepack)" OFF \
 		SNDFILE "Decoder: various (audio/libsndfile)" ON \
 		VORBIS_DEC "Decoder: ogg/vorbis" ON \
 		LAME "Encoder: mp3 (audio/lame)" OFF \
@@ -92,13 +92,13 @@ CMAKE_ARGS+=	-DK3B_BUILD_MAD_DECODER_PLUGIN:BOOL=OFF
 PLIST_SUB+=	MAD="@comment "
 .endif
 
-.if defined(WITH_MPC)
+.if defined(WITH_MUSEPACK)
 CMAKE_ARGS+=	-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
-LIB_DEPENDS+=	mpcdec:${PORTSDIR}/audio/libmpcdec
-PLIST_SUB+=	MPC=""
+LIB_DEPENDS+=	mpcdec:${PORTSDIR}/audio/musepack
+PLIST_SUB+=	MUSEPACK=""
 .else
 CMAKE_ARGS+=	-DK3B_BUILD_MUSE_DECODER_PLUGIN:BOOL=OFF
-PLIST_SUB+=	MPC="@comment "
+PLIST_SUB+=	MUSEPACK="@comment "
 .endif
 
 .if defined(WITH_SNDFILE)
diff --git a/sysutils/k3b-kde4/pkg-plist b/sysutils/k3b-kde4/pkg-plist
index 5d985cd..736c206 100644
--- a/sysutils/k3b-kde4/pkg-plist
+++ b/sysutils/k3b-kde4/pkg-plist
@@ -124,7 +124,7 @@ lib/kde4/k3bexternalencoder.so
 %%LAME%%lib/kde4/k3blameencoder.so
 %%SNDFILE%%lib/kde4/k3blibsndfiledecoder.so
 %%MAD%%lib/kde4/k3bmaddecoder.so
-%%MPC%%lib/kde4/k3bmpcdecoder.so
+%%MUSEPACK%%lib/kde4/k3bmpcdecoder.so
 %%VORBIS_DEC%%lib/kde4/k3boggvorbisdecoder.so
 %%VORBIS_ENC%%lib/kde4/k3boggvorbisencoder.so
 %%SOX%%lib/kde4/k3bsoxencoder.so
@@ -319,7 +319,7 @@ share/kde4/services/k3bexternalencoder.desktop
 %%LAME%%share/kde4/services/k3blameencoder.desktop
 %%SNDFILE%%share/kde4/services/k3blibsndfiledecoder.desktop
 %%MAD%%share/kde4/services/k3bmaddecoder.desktop
-%%MPC%%share/kde4/services/k3bmpcdecoder.desktop
+%%MUSEPACK%%share/kde4/services/k3bmpcdecoder.desktop
 %%VORBIS_DEC%%share/kde4/services/k3boggvorbisdecoder.desktop
 %%VORBIS_ENC%%share/kde4/services/k3boggvorbisencoder.desktop
 %%SOX%%share/kde4/services/k3bsoxencoder.desktop