Remove dependency on deprecated audio/libmpcdec

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

4 files changed, 5 insertions, 17 deletions

diff --git a/audio/cynthiune/Makefile b/audio/cynthiune/Makefile
index f0a8b5a3bc08..d8c6770b1082 100644
--- a/audio/cynthiune/Makefile
+++ b/audio/cynthiune/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cynthiune
 PORTVERSION=	0.9.5
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	audio gnustep
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/c/cynthiune.app
@@ -18,7 +18,6 @@ COMMENT=	Romantic music player for GNUstep
 
 LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
 LIB_DEPENDS+=	tag.1:${PORTSDIR}/audio/taglib
-LIB_DEPENDS+=	mpcdec.5:${PORTSDIR}/audio/libmpcdec
 LIB_DEPENDS+=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
 LIB_DEPENDS+=	modplug.1:${PORTSDIR}/audio/libmodplug
 LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
@@ -37,6 +36,6 @@ WRKSRC=		${WRKDIR}/cynthiune.app-${PORTVERSION}
 ADDITIONAL_INCLUDE_DIRS+=	-I${LOCALBASE}/include/libmodplug
 ADDITIONAL_LIB_DIRS+=	-L${WRKSRC}/Frameworks/Cynthiune/Cynthiune.framework/Versions/Current
 MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
-MAKE_FLAGS=	disable-windowsmedia=yes debug=no
+MAKE_FLAGS=	disable-windowsmedia=yes disable-musepack=yes debug=no
 
 .include <bsd.port.mk>
diff --git a/audio/cynthiune/pkg-plist b/audio/cynthiune/pkg-plist
index cd8ab61a1c85..9ce2a79b42bc 100644
--- a/audio/cynthiune/pkg-plist
+++ b/audio/cynthiune/pkg-plist
@@ -99,9 +99,6 @@ GNUstep/Local/Library/Cynthiune/MP3.format/stamp.make
 GNUstep/Local/Library/Cynthiune/Mod.format/Mod
 GNUstep/Local/Library/Cynthiune/Mod.format/Resources/Info-gnustep.plist
 GNUstep/Local/Library/Cynthiune/Mod.format/stamp.make
-GNUstep/Local/Library/Cynthiune/Musepack.format/Musepack
-GNUstep/Local/Library/Cynthiune/Musepack.format/Resources/Info-gnustep.plist
-GNUstep/Local/Library/Cynthiune/Musepack.format/stamp.make
 GNUstep/Local/Library/Cynthiune/OSS.output/OSS
 GNUstep/Local/Library/Cynthiune/OSS.output/Resources/English.lproj/Localizable.strings
 GNUstep/Local/Library/Cynthiune/OSS.output/Resources/French.lproj/Localizable.strings
@@ -173,8 +170,6 @@ GNUstep/Local/Tools/Cynthiune
 @dirrm GNUstep/Local/Library/Cynthiune/OSS.output/Resources/English.lproj
 @dirrm GNUstep/Local/Library/Cynthiune/OSS.output/Resources
 @dirrm GNUstep/Local/Library/Cynthiune/OSS.output
-@dirrm GNUstep/Local/Library/Cynthiune/Musepack.format/Resources
-@dirrm GNUstep/Local/Library/Cynthiune/Musepack.format
 @dirrm GNUstep/Local/Library/Cynthiune/Mod.format/Resources
 @dirrm GNUstep/Local/Library/Cynthiune/Mod.format
 @dirrm GNUstep/Local/Library/Cynthiune/MP3.format/Resources
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 96bf4f94a9fc..0d2e6a19e457 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 COMMENT=	High performance media player supporting many formats
 
 .include "${.CURDIR}/Makefile.shared"
@@ -43,7 +43,6 @@ OPTIONS+=	SVGALIB "Enable svgalib support" off
 OPTIONS+=	LIBDV "Enable libdv support" off
 OPTIONS+=	MAD "Enable mad MPEG audio engine support" off
 OPTIONS+=	AMR "Enable opencore AMR audio codec support" off
-OPTIONS+=	LIBMPCDEC "Enable libmpcdec support" off
 OPTIONS+=	LADSPA "Enable LADSPA plugin support" off
 OPTIONS+=	SPEEX "Enable speex audio codec support" on
 OPTIONS+=	THEORA "Enable ogg theora video support" off
@@ -84,7 +83,8 @@ CONFIGURE_ARGS+=	--disable-ssse3 \
 			--disable-x264 \
 			--disable-xvid \
 			--disable-libdirac-lavc \
-			--disable-mencoder
+			--disable-mencoder \
+			--disable-musepack
 
 .include "${.CURDIR}/Makefile.options"
 
diff --git a/multimedia/mplayer/Makefile.options b/multimedia/mplayer/Makefile.options
index c47aa0aacb16..3fe720a92765 100644
--- a/multimedia/mplayer/Makefile.options
+++ b/multimedia/mplayer/Makefile.options
@@ -96,12 +96,6 @@ LIB_DEPENDS+=		schroedinger-1.0.3:${PORTSDIR}/multimedia/schroedinger
 CONFIGURE_ARGS+=	--disable-libschroedinger-lavc
 .endif
 
-.if defined(WITH_LIBMPCDEC)
-LIB_DEPENDS+=	mpcdec.5:${PORTSDIR}/audio/libmpcdec
-.else
-CONFIGURE_ARGS+=	--disable-musepack
-.endif
-
 .if !defined(WITHOUT_SPEEX)
 LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
 .else