10 files changed, 19 insertions, 12 deletions

diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index 0dd6a5cc22b0..d2a0cb1ccdc3 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	avidemux
 PORTVERSION=	0.9.0.110
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://fixounet.free.fr/avidemux/
 DISTNAME=	avidemux-0.9
@@ -16,7 +17,7 @@ MAINTAINER=	amistry@am-productions.biz
 COMMENT=	Simple GUI-based video editor
 
 LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
-		mad.1:${PORTSDIR}/audio/mad \
+		mad.2:${PORTSDIR}/audio/mad \
 		freetype.9:${PORTSDIR}/print/freetype2
 BUILD_DEPENDS=	\
 	${X11BASE}/include/X11/extensions/Xvlib.h:${PORTSDIR}/graphics/xv
diff --git a/multimedia/avidemux2/Makefile b/multimedia/avidemux2/Makefile
index 6bb3bfc5f652..e8ebd159a0df 100644
--- a/multimedia/avidemux2/Makefile
+++ b/multimedia/avidemux2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	avidemux2
 PORTVERSION=	2.0.18
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://fixounet.free.fr/avidemux/
 DISTNAME=	avidemux-2.0.18
@@ -15,7 +16,7 @@ MAINTAINER=	amistry@am-productions.biz
 COMMENT=	Simple GUI based video editor
 
 LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
-		mad.1:${PORTSDIR}/audio/mad
+		mad.2:${PORTSDIR}/audio/mad
 BUILD_DEPENDS=	\
 	${X11BASE}/include/X11/extensions/Xvlib.h:${PORTSDIR}/graphics/xv
 
diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index 5710a65a1e7a..700f74260efc 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -108,7 +108,7 @@ PLIST_SUB+=	A52="@comment "
 
 # libmad
 .if !defined(WITHOUT_MAD)
-LIB_DEPENDS+=	mad.1:${PORTSDIR}/audio/mad
+LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/mad
 
 CONFIGURE_ARGS+=	--enable-mad \
 			--enable-libmad
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index e485eee7a09d..7f9075ba2454 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -541,7 +541,8 @@ PLIST_SUB+=	LIBSIDPLAY=""
 CONFIGURE_ARGS+=	--disable-mad
 PLIST_SUB+=	LIBMAD="@comment "
 .else
-LIB_DEPENDS+=	mad.1:${PORTSDIR}/audio/mad
+LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad \
+		id3tag.2:${PORTSDIR}/audio/libid3tag
 
 PLIST_SUB+=	LIBMAD=""
 .endif
diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile
index e485eee7a09d..7f9075ba2454 100644
--- a/multimedia/gstreamer-plugins80/Makefile
+++ b/multimedia/gstreamer-plugins80/Makefile
@@ -541,7 +541,8 @@ PLIST_SUB+=	LIBSIDPLAY=""
 CONFIGURE_ARGS+=	--disable-mad
 PLIST_SUB+=	LIBMAD="@comment "
 .else
-LIB_DEPENDS+=	mad.1:${PORTSDIR}/audio/mad
+LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad \
+		id3tag.2:${PORTSDIR}/audio/libid3tag
 
 PLIST_SUB+=	LIBMAD=""
 .endif
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index f3f677b44deb..0b1e2bfbe480 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.0.r2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,7 +22,7 @@ LIB_DEPENDS=	FLAC.5:${PORTSDIR}/audio/flac \
 		a52.0:${PORTSDIR}/audio/liba52 \
 		ogg.4:${PORTSDIR}/audio/libogg \
 		vorbis.2:${PORTSDIR}/audio/libvorbis \
-		mad.1:${PORTSDIR}/audio/mad \
+		mad.2:${PORTSDIR}/audio/mad \
 		speex.2:${PORTSDIR}/audio/speex \
 		iconv.3:${PORTSDIR}/converters/libiconv \
 		intl.5:${PORTSDIR}/devel/gettext \
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 011b0c53b3b9..2b316fe3c64c 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -257,7 +257,7 @@ WITH_LIBDVDNAV=	yes
 WITH_LIBUNGIF=	yes
 .endif
 
-.if exists(${LOCALBASE}/lib/libmad.so.1)
+.if exists(${LOCALBASE}/lib/libmad.so.2)
 WITH_MAD=	yes
 .endif
 
@@ -399,7 +399,7 @@ CONFIGURE_ARGS+=	--disable-libdv
 .endif
 
 .if defined(WITH_MAD)
-LIB_DEPENDS+=	mad.1:${PORTSDIR}/audio/mad
+LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/mad
 
 CONFIGURE_ARGS+=	--enable-mad \
 			--with-madlibdir=${LOCALBASE}/lib
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index e5fd26842805..f9c77b6eeb2f 100644
--- a/multimedia/ogle/Makefile
+++ b/multimedia/ogle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ogle
 PORTVERSION=	0.9.2
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
@@ -16,7 +17,7 @@ COMMENT=	Open DVD player that supports DVD menus
 LIB_DEPENDS=	a52.0:${PORTSDIR}/audio/liba52 \
 		dvdread.3:${PORTSDIR}/multimedia/libdvdread \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		mad.1:${PORTSDIR}/audio/mad \
+		mad.2:${PORTSDIR}/audio/mad \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
 USE_REINPLACE=	yes
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index 09e07278171c..83f417727631 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vlc
 PORTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.videolan.org/pub/videolan/vlc/${PORTVERSION}/
 
@@ -15,7 +16,7 @@ COMMENT=	An X11 video streaming client/server solution
 
 LIB_DEPENDS=	dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
 		dvdread.3:${PORTSDIR}/multimedia/libdvdread \
-		mad.1:${PORTSDIR}/audio/mad \
+		mad.2:${PORTSDIR}/audio/mad \
 		avcodec.0:${PORTSDIR}/multimedia/ffmpeg \
 		a52.0:${PORTSDIR}/audio/liba52 \
 		intl.5:${PORTSDIR}/devel/gettext \
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 09e07278171c..83f417727631 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vlc
 PORTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.videolan.org/pub/videolan/vlc/${PORTVERSION}/
 
@@ -15,7 +16,7 @@ COMMENT=	An X11 video streaming client/server solution
 
 LIB_DEPENDS=	dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
 		dvdread.3:${PORTSDIR}/multimedia/libdvdread \
-		mad.1:${PORTSDIR}/audio/mad \
+		mad.2:${PORTSDIR}/audio/mad \
 		avcodec.0:${PORTSDIR}/multimedia/ffmpeg \
 		a52.0:${PORTSDIR}/audio/liba52 \
 		intl.5:${PORTSDIR}/devel/gettext \