Chase library dependencies after libcdio <-> libcdio-paranoia split

PR:		192271

11 files changed, 16 insertions, 14 deletions

diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index f72d479ca157..02f3c418a575 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	audacious-plugins
 PORTVERSION=	3.5
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.audacious-media-player.org/
 
@@ -251,7 +252,7 @@ CONFIGURE_ARGS+=--disable-sid
 .endif
 
 .if ${PORT_OPTIONS:MCDAUDIO}
-LIB_DEPENDS+=	libcdio.so:${PORTSDIR}/sysutils/libcdio \
+LIB_DEPENDS+=	libcdio_cdda.so:${PORTSDIR}/sysutils/libcdio-paranoia \
 		libcddb.so:${PORTSDIR}/audio/libcddb
 CONFIGURE_ARGS+=--enable-cdaudio
 PLIST_SUB+=	CDAUDIOPLUGIN=""
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 5f54e3117566..ca6f86cd7d94 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	2.2.4
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
@@ -63,7 +63,7 @@ ASS_LIB_DEPENDS=	libass.so:${PORTSDIR}/multimedia/libass
 ASS_CONFIGURE_ENABLE=	libass
 
 # cdio
-CDIO_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio
+CDIO_LIB_DEPENDS=	libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
 CDIO_CONFIGURE_ENABLE=	libcdio
 
 # celt
diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile
index 261f4fb5520c..76677bfb4a39 100644
--- a/multimedia/gmerlin-avdecoder/Makefile
+++ b/multimedia/gmerlin-avdecoder/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmerlin-avdecoder
 PORTVERSION=	1.2.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/gmerlin/${PORTNAME}/${PORTVERSION}
 
diff --git a/multimedia/gmerlin/Makefile b/multimedia/gmerlin/Makefile
index 3ef4b1524177..e93d559d7972 100644
--- a/multimedia/gmerlin/Makefile
+++ b/multimedia/gmerlin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmerlin
 PORTVERSION=	1.2.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile
index 50615ae7dbad..2d3d2de7a09e 100644
--- a/multimedia/libav/Makefile
+++ b/multimedia/libav/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libav
 PORTVERSION=	10.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://libav.org/releases/
 
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index b3ee510e77b2..88304c0d1121 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.2.4
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	multimedia ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
 PKGNAMEPREFIX=	lib
@@ -22,7 +22,7 @@ LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
 		libdvdread.so:${PORTSDIR}/multimedia/libdvdread \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libfame.so:${PORTSDIR}/multimedia/libfame \
-		libcdio.so:${PORTSDIR}/sysutils/libcdio \
+		libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia \
 		libmodplug.so:${PORTSDIR}/audio/libmodplug \
 		libvcdinfo.so:${PORTSDIR}/multimedia/vcdimager \
 		libtheora.so:${PORTSDIR}/multimedia/libtheora \
diff --git a/multimedia/mplayer2/Makefile b/multimedia/mplayer2/Makefile
index 1f3e9674f4b4..8b6e8de23e38 100644
--- a/multimedia/mplayer2/Makefile
+++ b/multimedia/mplayer2/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mplayer2
 PORTVERSION=	${MPLAYER2_PORT_VERSION}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	multimedia audio
 MASTER_SITES=	LOCAL/gblach/
 
@@ -165,7 +165,7 @@ CONFIGURE_ARGS+=	--disable-smb
 .endif
 
 .if ${PORT_OPTIONS:MLIBCDIO}
-LIB_DEPENDS+=		libcdio.so:${PORTSDIR}/sysutils/libcdio
+LIB_DEPENDS+=		libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
 .else
 CONFIGURE_ARGS+=	--disable-libcdio
 .endif
diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index 7763c7d46f6b..99492c8ba9b7 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mpv
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	GH:0 GHC:0 http://ftp.waf.io/pub/release/:1 \
@@ -79,7 +80,7 @@ LIBGUESS_CONFIGURE_ENABLE=	libguess
 LIRC_LIB_DEPENDS=		liblirc_client.so:${PORTSDIR}/comms/lirc
 LIRC_CONFIGURE_ENABLE=		lirc
 
-CDIO_LIB_DEPENDS=		libcdio.so:${PORTSDIR}/sysutils/libcdio
+CDIO_LIB_DEPENDS=		libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
 CDIO_CONFIGURE_ENABLE=		cdda
 
 LIBBLURAY_LIB_DEPENDS=		libbluray.so:${PORTSDIR}/multimedia/libbluray
diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile
index 36846b48eef2..5895cba4170a 100644
--- a/multimedia/qmmp/Makefile
+++ b/multimedia/qmmp/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	qmmp
 PORTVERSION=	0.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/
 
diff --git a/multimedia/vcdimager/Makefile b/multimedia/vcdimager/Makefile
index b131a01cbab6..e16bfa645560 100644
--- a/multimedia/vcdimager/Makefile
+++ b/multimedia/vcdimager/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vcdimager
 PORTVERSION=	0.7.24
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	vcdimager
diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile
index 7002354b24bc..eb2c49c49041 100644
--- a/multimedia/xbmc/Makefile
+++ b/multimedia/xbmc/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xbmc
 DISTVERSION=	13.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://mirrors.xbmc.org/releases/source/