29 files changed, 61 insertions, 59 deletions

diff --git a/devel/clanlib-devel/Makefile b/devel/clanlib-devel/Makefile
index 5023f04026ae..31bb60c3e6bf 100644
--- a/devel/clanlib-devel/Makefile
+++ b/devel/clanlib-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	clanlib
 PORTVERSION=	0.7.5.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://clanlib.org/~sphair/download/
 DISTNAME=	ClanLib-${PORTVERSION:R}-${PORTVERSION:E}
@@ -61,7 +62,7 @@ USE_MESA=	yes
 PLIST_SUB+=	OPENGL=""
 .endif
 
-.if defined(WITHOUT_LIBMIKMOD)
+.if defined(WITHOUT_MIKMOD)
 CONFIGURE_ARGS+=	--disable-clanMikMod
 PLIST_SUB+=	LIBMIKMOD="@comment "
 .else
@@ -69,11 +70,11 @@ LIB_DEPENDS+=	mikmod.2:${PORTSDIR}/audio/libmikmod
 PLIST_SUB+=	LIBMIKMOD=""
 .endif
 
-.if defined(WITHOUT_LIBVORBIS)
+.if defined(WITHOUT_VORBIS)
 CONFIGURE_ARGS+=	--disable-clanVorbis
 PLIST_SUB+=	LIBVORBIS="@comment "
 .else
-LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 PLIST_SUB+=	LIBVORBIS=""
 .endif
 
@@ -82,8 +83,8 @@ pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "	WITHOUT_SDL=yes		Turns off SDL support"
 	@${ECHO_MSG} "	WITHOUT_OPENGL=yes	Turns off OpenGL support"
-	@${ECHO_MSG} "	WITHOUT_LIBMIKMOD=yes	Turns off libmikmod support"
-	@${ECHO_MSG} "	WITHOUT_LIBVORBIS=yes	Turns off libvorbis support"
+	@${ECHO_MSG} "	WITHOUT_MIKMOD=yes	Turns off libmikmod support"
+	@${ECHO_MSG} "	WITHOUT_VORBIS=yes	Turns off libvorbis support"
 	@${ECHO_MSG} ""
 
 post-patch:
diff --git a/devel/clanlib/Makefile b/devel/clanlib/Makefile
index 5023f04026ae..31bb60c3e6bf 100644
--- a/devel/clanlib/Makefile
+++ b/devel/clanlib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	clanlib
 PORTVERSION=	0.7.5.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://clanlib.org/~sphair/download/
 DISTNAME=	ClanLib-${PORTVERSION:R}-${PORTVERSION:E}
@@ -61,7 +62,7 @@ USE_MESA=	yes
 PLIST_SUB+=	OPENGL=""
 .endif
 
-.if defined(WITHOUT_LIBMIKMOD)
+.if defined(WITHOUT_MIKMOD)
 CONFIGURE_ARGS+=	--disable-clanMikMod
 PLIST_SUB+=	LIBMIKMOD="@comment "
 .else
@@ -69,11 +70,11 @@ LIB_DEPENDS+=	mikmod.2:${PORTSDIR}/audio/libmikmod
 PLIST_SUB+=	LIBMIKMOD=""
 .endif
 
-.if defined(WITHOUT_LIBVORBIS)
+.if defined(WITHOUT_VORBIS)
 CONFIGURE_ARGS+=	--disable-clanVorbis
 PLIST_SUB+=	LIBVORBIS="@comment "
 .else
-LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 PLIST_SUB+=	LIBVORBIS=""
 .endif
 
@@ -82,8 +83,8 @@ pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "	WITHOUT_SDL=yes		Turns off SDL support"
 	@${ECHO_MSG} "	WITHOUT_OPENGL=yes	Turns off OpenGL support"
-	@${ECHO_MSG} "	WITHOUT_LIBMIKMOD=yes	Turns off libmikmod support"
-	@${ECHO_MSG} "	WITHOUT_LIBVORBIS=yes	Turns off libvorbis support"
+	@${ECHO_MSG} "	WITHOUT_MIKMOD=yes	Turns off libmikmod support"
+	@${ECHO_MSG} "	WITHOUT_VORBIS=yes	Turns off libvorbis support"
 	@${ECHO_MSG} ""
 
 post-patch:
diff --git a/games/adonthell/Makefile b/games/adonthell/Makefile
index 205b4a6e0dd0..6d04668a826b 100644
--- a/games/adonthell/Makefile
+++ b/games/adonthell/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	adonthell
 PORTVERSION=	0.3.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}/src
@@ -19,7 +20,7 @@ COMMENT=	A free role playing game
 BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
 		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
-		vorbis.2:${PORTSDIR}/audio/libvorbis
+		vorbis.3:${PORTSDIR}/audio/libvorbis
 
 USE_PYTHON=	yes
 USE_GMAKE=	yes
diff --git a/games/chromium-bsu/Makefile b/games/chromium-bsu/Makefile
index abc15d90d13c..88eabd2e93e0 100644
--- a/games/chromium-bsu/Makefile
+++ b/games/chromium-bsu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	chromium
 PORTVERSION=	0.9.12
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.reptilelabour.com/software/files/chromium/
 DISTFILES=	${PORTNAME}-src-${PORTVERSION}.tar.gz \
@@ -15,7 +16,7 @@ DISTFILES=	${PORTNAME}-src-${PORTVERSION}.tar.gz \
 MAINTAINER=	anholt@FreeBSD.org
 COMMENT=	An arcade-style, top-scrolling space shooter
 
-LIB_DEPENDS=	ogg.4:${PORTSDIR}/audio/libogg \
+LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
 		smpeg.1:${PORTSDIR}/multimedia/smpeg \
 		openal.0:${PORTSDIR}/audio/openal
 
diff --git a/games/chromium/Makefile b/games/chromium/Makefile
index abc15d90d13c..88eabd2e93e0 100644
--- a/games/chromium/Makefile
+++ b/games/chromium/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	chromium
 PORTVERSION=	0.9.12
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.reptilelabour.com/software/files/chromium/
 DISTFILES=	${PORTNAME}-src-${PORTVERSION}.tar.gz \
@@ -15,7 +16,7 @@ DISTFILES=	${PORTNAME}-src-${PORTVERSION}.tar.gz \
 MAINTAINER=	anholt@FreeBSD.org
 COMMENT=	An arcade-style, top-scrolling space shooter
 
-LIB_DEPENDS=	ogg.4:${PORTSDIR}/audio/libogg \
+LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
 		smpeg.1:${PORTSDIR}/multimedia/smpeg \
 		openal.0:${PORTSDIR}/audio/openal
 
diff --git a/games/freedroid/Makefile b/games/freedroid/Makefile
index 26a3ae7b98f8..dd4a23fccf4d 100644
--- a/games/freedroid/Makefile
+++ b/games/freedroid/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	freedroid
 PORTVERSION=	1.0.2
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	freedroid
@@ -20,7 +20,7 @@ LIB_DEPENDS=	SDL-1.1:${PORTSDIR}/devel/sdl12 \
 		png:${PORTSDIR}/graphics/png \
 		SDL_image:${PORTSDIR}/graphics/sdl_image \
 		SDL_mixer:${PORTSDIR}/audio/sdl_mixer \
-		vorbis:${PORTSDIR}/audio/libvorbis
+		vorbis.3:${PORTSDIR}/audio/libvorbis
 
 USE_XLIB=	yes
 USE_SDL=	yes
diff --git a/games/gcompris2/Makefile b/games/gcompris2/Makefile
index 4ec85dcaec5b..9709d65cd811 100644
--- a/games/gcompris2/Makefile
+++ b/games/gcompris2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcompris2
 PORTVERSION=	2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gcompris
@@ -16,7 +16,7 @@ DISTNAME=	gcompris-${PORTVERSION}
 MAINTAINER=	gnome@freebsd.org
 COMMENT=	A simple Gnome2-based education game for children starting at 3
 
-LIB_DEPENDS=	vorbis.2:${PORTSDIR}/audio/libvorbis \
+LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
 		ao.3:${PORTSDIR}/audio/libao
 
 USE_X_PREFIX=	yes
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index d8db2bfd1eae..790f972bd878 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -107,7 +107,7 @@ PLIST_SUB+=	SVGA:="@comment "
 .endif
 
 .if !defined(WITHOUT_VORBIS) && defined(WITH_VORBIS)
-LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 CONFIGURE_ARGS+=--with-ogg=${LOCALBASE} --with-vorbis=${LOCALBASE}
 PLIST_SUB+=	VORBIS:=""
 .else
diff --git a/games/tuxpuck/Makefile b/games/tuxpuck/Makefile
index fba7dbbe8e07..fc6c4fa5c368 100644
--- a/games/tuxpuck/Makefile
+++ b/games/tuxpuck/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	tuxpuck
 PORTVERSION=	0.8.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.efd.lth.se/~d00jkr/tuxpuck/
 
@@ -17,7 +18,7 @@ COMMENT=	Shufflepuck Cafe Clone
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
-		vorbis.2:${PORTSDIR}/audio/libvorbis
+		vorbis.3:${PORTSDIR}/audio/libvorbis
 
 SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
 USE_GMAKE=	yes
diff --git a/games/uqm/Makefile b/games/uqm/Makefile
index b79d0cc16320..9b8a763193e5 100644
--- a/games/uqm/Makefile
+++ b/games/uqm/Makefile
@@ -14,7 +14,7 @@
 
 PORTNAME=	uqm
 PORTVERSION=	0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sc2
@@ -27,8 +27,7 @@ COMMENT=	A port of the original Star Control 2 for 3DO consoles
 ONLY_FOR_ARCHS=	i386
 
 LIB_DEPENDS=	SDL_image:${PORTSDIR}/graphics/sdl_image \
-		vorbis:${PORTSDIR}/audio/libvorbis \
-		ogg:${PORTSDIR}/audio/libogg
+		vorbis.3:${PORTSDIR}/audio/libvorbis
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
diff --git a/graphics/qtutils/Makefile b/graphics/qtutils/Makefile
index e7983755ad13..eef70c202112 100644
--- a/graphics/qtutils/Makefile
+++ b/graphics/qtutils/Makefile
@@ -8,13 +8,14 @@
 
 PORTNAME=	qtutils
 PORTVERSION=	0.0.6
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.flyn.org/projects/qtutils/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	QuickTime Utilities
 
-LIB_DEPENDS=	vorbis.2:${PORTSDIR}/audio/libvorbis \
+LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
 		quicktime.0:${PORTSDIR}/multimedia/libquicktime
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index 700f74260efc..8a6d91c4717b 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	avifile
 PORTVERSION=	0.7.38
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -139,7 +140,7 @@ PLIST_SUB+=	VIDIX="@comment "
 
 # libvorbis; thus, libogg
 .if !defined(WITHOUT_VORBIS)
-LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 
 CONFIGURE_ARGS+=	--with-vorbis-prefix=${LOCALBASE} \
 			--with-ogg-prefix=${LOCALBASE}
diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile
index f58ad3c761e9..b6f3e92b2097 100644
--- a/multimedia/beep-media-player/Makefile
+++ b/multimedia/beep-media-player/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	beep-media-player
 PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://linux-media.net/beep/downloads/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-pre5
@@ -52,7 +52,7 @@ PLIST_SUB+=	MIKMODPLUGIN:="@comment "
 #.endif
 
 .if !defined(WITHOUT_VORBIS)
-LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 INPUT_PLUGINS+=	vorbis
 PLIST_SUB+=	VORBISPLUGIN:=""
 .else
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 23e277b44eab..ec0c648d5586 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -606,7 +606,7 @@ CONFIGURE_ARGS+=	--disable-vorbis \
 			--disable-vorbistest
 PLIST_SUB+=	VORBIS="@comment "
 .else
-LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 
 CONFIGURE_ARGS+=	--with-vorbis=${LOCALBASE} \
 			--with-vorbis-libraries=${LOCALBASE}/lib \
diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile
index 23e277b44eab..ec0c648d5586 100644
--- a/multimedia/gstreamer-plugins80/Makefile
+++ b/multimedia/gstreamer-plugins80/Makefile
@@ -606,7 +606,7 @@ CONFIGURE_ARGS+=	--disable-vorbis \
 			--disable-vorbistest
 PLIST_SUB+=	VORBIS="@comment "
 .else
-LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 
 CONFIGURE_ARGS+=	--with-vorbis=${LOCALBASE} \
 			--with-vorbis-libraries=${LOCALBASE}/lib \
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 97817ec3a5c3..2459cc727a50 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -21,8 +21,7 @@ RUN_DEPENDS+=	xanim:${PORTSDIR}/multimedia/xanim
 LIB_DEPENDS+=	audiofile:${PORTSDIR}/audio/libaudiofile \
 		cdda_paranoia:${PORTSDIR}/audio/cdparanoia \
 		mp3lame:${PORTSDIR}/audio/lame \
-		ogg.4:${PORTSDIR}/audio/libogg \
-		vorbis.2:${PORTSDIR}/audio/libvorbis
+		vorbis.3:${PORTSDIR}/audio/libvorbis
 
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 97817ec3a5c3..2459cc727a50 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -21,8 +21,7 @@ RUN_DEPENDS+=	xanim:${PORTSDIR}/multimedia/xanim
 LIB_DEPENDS+=	audiofile:${PORTSDIR}/audio/libaudiofile \
 		cdda_paranoia:${PORTSDIR}/audio/cdparanoia \
 		mp3lame:${PORTSDIR}/audio/lame \
-		ogg.4:${PORTSDIR}/audio/libogg \
-		vorbis.2:${PORTSDIR}/audio/libvorbis
+		vorbis.3:${PORTSDIR}/audio/libvorbis
 
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index 36776349852d..c5573e906fbc 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libquicktime
 PORTVERSION=	0.9.2
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +16,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library for reading and writing quicktime files
 
-LIB_DEPENDS=	vorbis.2:${PORTSDIR}/audio/libvorbis \
+LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		dv.3:${PORTSDIR}/multimedia/libdv
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 04845b5fdca1..ac826b8a285b 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.0.r2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,8 +20,7 @@ COMMENT=	Libraries for xine multimedia player
 BUILD_DEPENDS=	${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft
 LIB_DEPENDS=	FLAC.5:${PORTSDIR}/audio/flac \
 		a52.0:${PORTSDIR}/audio/liba52 \
-		ogg.4:${PORTSDIR}/audio/libogg \
-		vorbis.2:${PORTSDIR}/audio/libvorbis \
+		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		mad.2:${PORTSDIR}/audio/mad \
 		speex.2:${PORTSDIR}/audio/speex \
 		iconv.3:${PORTSDIR}/converters/libiconv \
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index b8ebafd29802..197ebb38c981 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -429,7 +429,7 @@ PKGNAMESUFFIX=	-esound
 .endif
 
 .if defined(WITH_VORBIS)
-LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 .endif
 
 .if defined(WITH_REALPLAYER)
diff --git a/multimedia/ogmtools/Makefile b/multimedia/ogmtools/Makefile
index e0944c90d7b1..d0213b3ef66f 100644
--- a/multimedia/ogmtools/Makefile
+++ b/multimedia/ogmtools/Makefile
@@ -7,15 +7,14 @@
 
 PORTNAME=	ogmtools
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/ogmtools/
 
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Tools to extract from/get info about/create OGG media streams
 
-LIB_DEPENDS=	ogg.4:${PORTSDIR}/audio/libogg \
-		vorbis.2:${PORTSDIR}/audio/libvorbis \
-		vorbisenc.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis
 
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index af9756ac692d..fb0686354ce6 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -203,7 +203,7 @@ PLIST_SUB+=	WITH_LAME="@comment "
 .endif
 
 .if defined(WITH_OGG)
-LIB_DEPENDS+=	ogg.4:${PORTSDIR}/audio/libogg
+LIB_DEPENDS+=	ogg.5:${PORTSDIR}/audio/libogg
 CONFIGURE_ARGS+=	--with-ogg=yes
 PLIST_SUB+=	WITH_OGG=""
 .else
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index 83f417727631..29bd5ef0f988 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vlc
 PORTVERSION=	0.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.videolan.org/pub/videolan/vlc/${PORTVERSION}/
 
@@ -21,8 +21,7 @@ LIB_DEPENDS=	dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
 		a52.0:${PORTSDIR}/audio/liba52 \
 		intl.5:${PORTSDIR}/devel/gettext \
 		iconv.3:${PORTSDIR}/converters/libiconv \
-		vorbis.2:${PORTSDIR}/audio/libvorbis \
-		ogg.4:${PORTSDIR}/audio/libogg \
+		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		FLAC.5:${PORTSDIR}/audio/flac \
 		faad.0:${PORTSDIR}/audio/faad \
 		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 83f417727631..29bd5ef0f988 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vlc
 PORTVERSION=	0.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.videolan.org/pub/videolan/vlc/${PORTVERSION}/
 
@@ -21,8 +21,7 @@ LIB_DEPENDS=	dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
 		a52.0:${PORTSDIR}/audio/liba52 \
 		intl.5:${PORTSDIR}/devel/gettext \
 		iconv.3:${PORTSDIR}/converters/libiconv \
-		vorbis.2:${PORTSDIR}/audio/libvorbis \
-		ogg.4:${PORTSDIR}/audio/libogg \
+		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		FLAC.5:${PORTSDIR}/audio/flac \
 		faad.0:${PORTSDIR}/audio/faad \
 		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index 740725c9675a..f206bf313b4e 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmms
 PORTVERSION=	1.2.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES+=	multimedia audio ipv6
 MASTER_SITES=	ftp://ftp.xmms.org/pub/xmms/1.2.x/ \
 		http://www.xmms.org/files/1.2.x/ \
@@ -64,7 +64,7 @@ PLIST_SUB+=	MIKMODPLUGIN:="@comment "
 .endif
 
 .if !defined(WITHOUT_VORBIS)
-LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 INPUT_PLUGINS+=	vorbis
 PLIST_SUB+=	VORBISPLUGIN:=""
 .else
diff --git a/net-p2p/gift/Makefile b/net-p2p/gift/Makefile
index ffb54fb7b1d9..e37efbcfa1ce 100644
--- a/net-p2p/gift/Makefile
+++ b/net-p2p/gift/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	giFT
 PORTVERSION=	0.11.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
@@ -17,7 +17,7 @@ MAINTAINER=	shoesoft@gmx.net
 COMMENT=	An OpenFT, Gnutella and FastTrack p2p network client
 
 LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl \
-		vorbis.2:${PORTSDIR}/audio/libvorbis \
+		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		Magick.6:${PORTSDIR}/graphics/ImageMagick
 .if defined(WITH_LIBMAGIC)
 LIB_DEPENDS+=	magic.1:${PORTSDIR}/sysutils/file
diff --git a/net/gift/Makefile b/net/gift/Makefile
index ffb54fb7b1d9..e37efbcfa1ce 100644
--- a/net/gift/Makefile
+++ b/net/gift/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	giFT
 PORTVERSION=	0.11.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
@@ -17,7 +17,7 @@ MAINTAINER=	shoesoft@gmx.net
 COMMENT=	An OpenFT, Gnutella and FastTrack p2p network client
 
 LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl \
-		vorbis.2:${PORTSDIR}/audio/libvorbis \
+		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		Magick.6:${PORTSDIR}/graphics/ImageMagick
 .if defined(WITH_LIBMAGIC)
 LIB_DEPENDS+=	magic.1:${PORTSDIR}/sysutils/file
diff --git a/net/gini/Makefile b/net/gini/Makefile
index 48cd92f9fe17..9b4a0449e988 100644
--- a/net/gini/Makefile
+++ b/net/gini/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gini
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	net multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A lightweight media streaming server
 
-LIB_DEPENDS=	vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis
 
 USE_BZIP2=	yes
 USE_GNOME=	glib12
diff --git a/www/mod_musicindex/Makefile b/www/mod_musicindex/Makefile
index ad7aaa0c066b..1278efd6b97a 100644
--- a/www/mod_musicindex/Makefile
+++ b/www/mod_musicindex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_musicindex
 PORTVERSION=	0.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www audio
 MASTER_SITES=	http://www.esiee.fr/~puffin/musicindex/
 DISTNAME=	libapache-mod-musicindex_${PORTVERSION}
@@ -17,8 +17,7 @@ COMMENT=	Apache module in C implements Perl module Apache::MP3
 
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
-LIB_DEPENDS=	ogg.4:${PORTSDIR}/audio/libogg \
-		vorbis.2:${PORTSDIR}/audio/libvorbis \
+LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
 		id3tag.2:${PORTSDIR}/audio/libid3tag \
 		mad.2:${PORTSDIR}/audio/libmad