25 files changed, 33 insertions, 29 deletions

diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile
index c332b10b23f9..efb7a224054a 100644
--- a/audio/aqualung/Makefile
+++ b/audio/aqualung/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	aqualung
 DISTVERSION=	0.9beta11
-PORTREVISION=	20
+PORTREVISION=	21
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} \
  		http://wickedmachine.net/mirror/
diff --git a/audio/clementine-player/Makefile b/audio/clementine-player/Makefile
index 08d2708f8898..2252d390c828 100644
--- a/audio/clementine-player/Makefile
+++ b/audio/clementine-player/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	clementine
 PORTVERSION=	1.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-player
 
diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index 24c4a821efb6..24797a1231b4 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cmus
 PORTVERSION=	2.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 MAINTAINER=	h.skuhra@gmail.com
@@ -154,7 +154,7 @@ PLIST_SUB+=	CDDB="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCDIO}
-LIB_DEPENDS+=	libcdio.so:${PORTSDIR}/sysutils/libcdio
+LIB_DEPENDS+=	libcdio_cdda.so:${PORTSDIR}/sysutils/libcdio-paranoia
 CONFIGURE_ARGS+=CONFIG_CDIO=y
 PLIST_SUB+=	CDIO=""
 .else
diff --git a/audio/cripple/Makefile b/audio/cripple/Makefile
index c89a16e84954..aa13fa12c9b2 100644
--- a/audio/cripple/Makefile
+++ b/audio/cripple/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cripple
 PORTVERSION=	0.06b
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	http://www.vortex.prodigynet.co.uk/${PORTNAME}/
 
diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile
index 512cc43c4162..6fa5cf61554e 100644
--- a/audio/deadbeef/Makefile
+++ b/audio/deadbeef/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	deadbeef
 PORTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/
 
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index a29167515975..ae3c6763abda 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	musicpd
 PORTVERSION=	0.18.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio ipv6
 MASTER_SITES=	http://www.musicpd.org/download/mpd/${PORTVERSION:R}/
 DISTNAME=	mpd-${PORTVERSION}
@@ -150,7 +150,7 @@ CONFIGURE_ARGS+=--enable-bzip2 \
 		--enable-zzip \
 		--enable-iso9660
 LIB_DEPENDS+=	libzzip.so:${PORTSDIR}/devel/zziplib \
-		libiso9660.so:${PORTSDIR}/sysutils/libcdio
+		libcdio-paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
 .else
 CONFIGURE_ARGS+=--disable-bzip2 \
 		--disable-zzip \
diff --git a/audio/mythplugin-mythmusic/Makefile b/audio/mythplugin-mythmusic/Makefile
index 373e8a25adf1..8b91fbf35ecd 100644
--- a/audio/mythplugin-mythmusic/Makefile
+++ b/audio/mythplugin-mythmusic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mythmusic
 PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	audio
 PKGNAMEPREFIX=	mythplugin-
 DISTNAME=	mythtv-${PORTVERSION}
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 8d81c541e62b..b13787983d57 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	sound-juicer
 PORTVERSION=	2.32.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
index b202d470f134..77009fc24a19 100644
--- a/audio/xmms2/Makefile
+++ b/audio/xmms2/Makefile
@@ -4,7 +4,7 @@
 PORTNAME?=	xmms2
 PORTVERSION=	0.8
 DISTVERSIONSUFFIX=DrO_o
-PORTREVISION?=	9
+PORTREVISION?=	10
 CATEGORIES?=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}
 
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index 04d862d95bdd..b67d319d6346 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gvfs
 PORTVERSION=	1.12.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -58,7 +58,7 @@ PLIST_SUB+=	SMB="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCDDA}
-LIB_DEPENDS+=	libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio
+LIB_DEPENDS+=	libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
 PLIST_SUB+=	CDDA=""
 .else
 CONFIGURE_ARGS+=	--disable-cdda
diff --git a/emulators/mednafen/Makefile b/emulators/mednafen/Makefile
index 667e55260a9e..e1ebaea885dd 100644
--- a/emulators/mednafen/Makefile
+++ b/emulators/mednafen/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mednafen
 PORTVERSION=	0.9.33.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	emulators games
 MASTER_SITES=	SF/${PORTNAME}/Mednafen/${PORTVERSION}
diff --git a/emulators/pcsxr/Makefile b/emulators/pcsxr/Makefile
index 2ccecc7a3eb1..e0cb99b333a8 100644
--- a/emulators/pcsxr/Makefile
+++ b/emulators/pcsxr/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pcsxr
 PORTVERSION=	1.9.94.r87113
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
 		LOCAL/martymac
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/
 
diff --git a/print/kover/Makefile b/print/kover/Makefile
index 62cb1646fa2c..a1f02cc52b7c 100644
--- a/print/kover/Makefile
+++ b/print/kover/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kover
 PORTVERSION=	6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print kde
 MASTER_SITES=	http://lisas.de/kover/
 
diff --git a/sysutils/unieject/Makefile b/sysutils/unieject/Makefile
index 9bc79c928219..59a1ad2b56e7 100644
--- a/sysutils/unieject/Makefile
+++ b/sysutils/unieject/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	unieject
 PORTVERSION=	6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	SF