8 files changed, 17 insertions, 11 deletions

diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index 4d949f9a9dbe..c252e6bc439d 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	avifile
 PORTVERSION=	0.7.11.20020711
-PORTEPOCH=	1
+PORTEPOCH=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://avifile.sourceforge.net/
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/.(.{8})$/-\1/}
@@ -114,7 +114,7 @@ CONFIGURE_ARGS+=	--without-sdl
 
 # libvorbis; thus, libogg
 .if !defined(WITHOUT_VORBIS)
-LIB_DEPENDS+=	vorbis.1:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
 
 CONFIGURE_ARGS+=	--with-vorbis-prefix=${LOCALBASE} \
 			--with-ogg-prefix=${LOCALBASE}
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index fe69adfda48d..2e0b1d950ef9 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -446,7 +447,7 @@ CONFIGURE_ARGS+=	--disable-vorbis \
 			--disable-vorbistest
 PLIST_SUB+=	VORBIS="@comment "
 .else
-LIB_DEPENDS+=	vorbis.1:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
 
 PLIST_SUB+=	VORBIS=""
 .endif
diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile
index fe69adfda48d..2e0b1d950ef9 100644
--- a/multimedia/gstreamer-plugins80/Makefile
+++ b/multimedia/gstreamer-plugins80/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -446,7 +447,7 @@ CONFIGURE_ARGS+=	--disable-vorbis \
 			--disable-vorbistest
 PLIST_SUB+=	VORBIS="@comment "
 .else
-LIB_DEPENDS+=	vorbis.1:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
 
 PLIST_SUB+=	VORBIS=""
 .endif
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index 85f158a60a05..face8fcabab9 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -8,13 +8,14 @@
 
 PORTNAME=	libquicktime
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	vorbis:${PORTSDIR}/audio/libvorbis \
+LIB_DEPENDS=	vorbis.2:${PORTSDIR}/audio/libvorbis \
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		png:${PORTSDIR}/graphics/png \
 		dv:${PORTSDIR}/graphics/libdv
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 2981c98a3d77..6b877a80520a 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	0.9.12
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://xine.sourceforge.net/files/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -72,7 +73,7 @@ PLIST_SUB+=	HAVE_ARTS="@comment "
 .endif
 
 .if exists(${LOCALBASE}/include/vorbis/codec.h)
-LIB_DEPENDS+=	vorbis.1:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
 
 PLIST_SUB+=	HAVE_VORBIS=""
 .else
@@ -80,7 +81,7 @@ PLIST_SUB+=	HAVE_VORBIS="@comment "
 .endif
 
 .if exists(${LOCALBASE}/include/ogg/ogg.h)
-LIB_DEPENDS+=	ogg.3:${PORTSDIR}/audio/libogg
+LIB_DEPENDS+=	ogg.4:${PORTSDIR}/audio/libogg
 
 PLIST_SUB+=	HAVE_OGG=""
 .else
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index c3de6f8f2b40..8093f2cbecb2 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	0.90.0.5
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://ftp.mplayerhq.hu/MPlayer/releases/ \
 		http://www.mplayerhq.hu/MPlayer/releases/ \
@@ -98,7 +99,7 @@ LIB_DEPENDS+=	SDL-1.1.4:${PORTSDIR}/devel/sdl12
 .endif
 
 .if defined(WITH_VORBIS)
-LIB_DEPENDS+=	vorbis.1:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
 .endif
 
 .if defined(WITH_XANIM)
diff --git a/multimedia/mplayerxp/Makefile b/multimedia/mplayerxp/Makefile
index c3de6f8f2b40..8093f2cbecb2 100644
--- a/multimedia/mplayerxp/Makefile
+++ b/multimedia/mplayerxp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	0.90.0.5
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://ftp.mplayerhq.hu/MPlayer/releases/ \
 		http://www.mplayerhq.hu/MPlayer/releases/ \
@@ -98,7 +99,7 @@ LIB_DEPENDS+=	SDL-1.1.4:${PORTSDIR}/devel/sdl12
 .endif
 
 .if defined(WITH_VORBIS)
-LIB_DEPENDS+=	vorbis.1:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
 .endif
 
 .if defined(WITH_XANIM)
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index 39d1f821fb3d..8be002ecad50 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms
 PORTVERSION=	1.2.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	audio
 MASTER_SITES=	ftp://ftp.xmms.org/xmms/1.2.x/ \
 		http://www.xmms.org/files/1.2.x/ \
@@ -47,7 +47,7 @@ PLIST_SUB+=	MIKMODPLUGIN:="@comment "
 .endif
 
 .if !defined(WITHOUT_VORBIS)
-LIB_DEPENDS+=	vorbis.1:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
 INPUT_PLUGINS+=	vorbis
 PLIST_SUB+=	VORBISPLUGIN:=""
 .else