40 files changed, 80 insertions, 67 deletions

diff --git a/audio/alsaplayer/Makefile b/audio/alsaplayer/Makefile
index cc352ff2417a..dcd9b26dd43b 100644
--- a/audio/alsaplayer/Makefile
+++ b/audio/alsaplayer/Makefile
@@ -137,7 +137,7 @@ PLIST_SUB+=		VORBIS="@comment "
 CONFIGURE_ARGS+=	--enable-oggvorbis \
 			--with-vorbis-prefix=${LOCALBASE} \
 			--with-ogg-prefix=${LOCALBASE}
-LIB_DEPENDS+=		vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=		vorbis.3:${PORTSDIR}/audio/libvorbis
 PLIST_SUB+=		VORBIS=""
 .endif
 
diff --git a/audio/audacity-devel/Makefile b/audio/audacity-devel/Makefile
index 60b8d1ccc996..215223f075fd 100644
--- a/audio/audacity-devel/Makefile
+++ b/audio/audacity-devel/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	audacity
 PORTVERSION=	1.2.0.p3
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -45,7 +46,7 @@ CONFIGURE_ARGS+=	--without-libmad
 
 .if !defined(WITHOUT_VORBIS)
 CONFIGURE_ARGS+=	--with-vorbis=system
-LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 .else
 CONFIGURE_ARGS+=	--without-vorbis
 .endif
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 281b0f1af052..6ab8d3295526 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	audacity
 PORTVERSION=	1.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -42,7 +42,7 @@ CONFIGURE_ARGS+=	--with-arts-soundserver=yes
 
 .if !defined(WITHOUT_VORBIS)
 CONFIGURE_ARGS+=	--with-vorbis
-LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 .endif
 
 pre-everything::
diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
index f85dca632dfe..cc6afad153c8 100644
--- a/audio/darkice/Makefile
+++ b/audio/darkice/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	darkice
 PORTVERSION=	0.13.1
+PORTREVISION=	1
 CATEGORIES=	audio net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An IceCast, IceCast2 and ShoutCast live audio streamer
 
 LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
-		vorbis.2:${PORTSDIR}/audio/libvorbis
+		vorbis.3:${PORTSDIR}/audio/libvorbis
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
diff --git a/audio/easytag-devel/Makefile b/audio/easytag-devel/Makefile
index ace3152acfe1..b14ecfffd59b 100644
--- a/audio/easytag-devel/Makefile
+++ b/audio/easytag-devel/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	easytag
 PORTVERSION=	0.30
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tag editor for MP3 and OGG files
 
 LIB_DEPENDS=	id3-3.8.2:${PORTSDIR}/audio/id3lib \
-		vorbis.2:${PORTSDIR}/audio/libvorbis \
+		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		FLAC.5:${PORTSDIR}/audio/flac
 
 MAN1=		easytag.1
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index ace3152acfe1..b14ecfffd59b 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	easytag
 PORTVERSION=	0.30
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tag editor for MP3 and OGG files
 
 LIB_DEPENDS=	id3-3.8.2:${PORTSDIR}/audio/id3lib \
-		vorbis.2:${PORTSDIR}/audio/libvorbis \
+		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		FLAC.5:${PORTSDIR}/audio/flac
 
 MAN1=		easytag.1
diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index 8cea6df461e5..fff0690a55da 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glame
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A powerful, fast, stable, and easily extensible sound editor for GNOME
 
 BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=	vorbis.2:${PORTSDIR}/audio/libvorbis \
+LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
 		ltdl.4:${PORTSDIR}/devel/libltdl
 
 USE_REINPLACE=	yes
diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile
index 8f9a81bb8f80..449a13757877 100644
--- a/audio/icecast2/Makefile
+++ b/audio/icecast2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	icecast2
 PORTVERSION=	2.0.b.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	audio net ipv6
 MASTER_SITES=	http://www.icecast.org/files/
@@ -16,9 +17,8 @@ MAINTAINER=	lofi@freebsd.org
 COMMENT=	A streaming mp3/ogg-vorbis audio server
 
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
-		ogg.4:${PORTSDIR}/audio/libogg \
 		shout.3:${PORTSDIR}/audio/libshout2 \
-		vorbis.2:${PORTSDIR}/audio/libvorbis \
+		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		xslt.2:${PORTSDIR}/textproc/libxslt
 
 USE_GMAKE=	yes
diff --git a/audio/ices/Makefile b/audio/ices/Makefile
index 95f7492066e6..fc117caa5e75 100644
--- a/audio/ices/Makefile
+++ b/audio/ices/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ices
 PORTVERSION=	2.0.b.2.20030811
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	audio net
 MASTER_SITES=	http://tigress.com/lofi/ \
@@ -16,9 +17,8 @@ DISTNAME=	${PORTNAME}-2.0-Beta2-20030811
 MAINTAINER=	lofi@freebsd.org
 COMMENT=	A streaming source client for icecast 2
 
-LIB_DEPENDS=	ogg.4:${PORTSDIR}/audio/libogg \
-		shout.3:${PORTSDIR}/audio/libshout2 \
-		vorbis.2:${PORTSDIR}/audio/libvorbis \
+LIB_DEPENDS=	shout.3:${PORTSDIR}/audio/libshout2 \
+		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
 CONFIGURE_ENV=	CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
diff --git a/audio/jamboree/Makefile b/audio/jamboree/Makefile
index 9e09fb4167af..827564fe7a44 100644
--- a/audio/jamboree/Makefile
+++ b/audio/jamboree/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jamboree
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.3
@@ -15,8 +16,7 @@ MAINTAINER=	jylefort@brutele.be
 COMMENT=	A simple GNOME music player
 
 LIB_DEPENDS+=	id3tag:${PORTSDIR}/audio/mad \
-		ogg:${PORTSDIR}/audio/libogg \
-		vorbis:${PORTSDIR}/audio/libvorbis \
+		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		gstplay-0.6:${PORTSDIR}/multimedia/gstreamer-plugins \
 		gdbm.3:${PORTSDIR}/databases/gdbm
 
diff --git a/audio/libshout2/Makefile b/audio/libshout2/Makefile
index c7758725cc59..ac59f3286cc1 100644
--- a/audio/libshout2/Makefile
+++ b/audio/libshout2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libshout2
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	audio net
 MASTER_SITES=	http://www.icecast.org/files/libshout/
@@ -16,8 +16,7 @@ DISTNAME=	libshout-${PORTVERSION}
 MAINTAINER=	lofi@freebsd.org
 COMMENT=	Routines for connecting and transmitting data to the icecast server
 
-LIB_DEPENDS=	ogg.4:${PORTSDIR}/audio/libogg \
-		vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis
 
 CONFIGURE_ENV=	CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
index 0b48ed93bd5d..6c9c6c2f894b 100644
--- a/audio/liteamp/Makefile
+++ b/audio/liteamp/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	liteamp
 PORTVERSION=	0.2.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://download.kldp.net/liteamp/
 
@@ -15,8 +15,7 @@ COMMENT=	Light-weight Music Player for GNOME2
 
 LIB_DEPENDS=	ao.3:${PORTSDIR}/audio/libao \
 		mad.2:${PORTSDIR}/audio/mad \
-		ogg.4:${PORTSDIR}/audio/libogg \
-		vorbisfile.3:${PORTSDIR}/audio/libvorbis
+		vorbisfile.4:${PORTSDIR}/audio/libvorbis
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/audio/lopster/Makefile b/audio/lopster/Makefile
index fe624a0cadbe..2f64a3fc61ed 100644
--- a/audio/lopster/Makefile
+++ b/audio/lopster/Makefile
@@ -32,7 +32,7 @@ WITH_LIBOGG=	yes
 .endif
 
 .if defined(WITH_LIBOGG)
-LIB_DEPENDS+=	ogg.4:${PORTSDIR}/audio/libogg
+LIB_DEPENDS+=	ogg.5:${PORTSDIR}/audio/libogg
 .endif
 
 pre-everything::
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index 1859cac6a16b..959deac53a70 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mp3blaster
 PORTVERSION=	3.2.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.stack.nl/~brama/mp3blaster/src/
 
@@ -45,7 +46,7 @@ CONFIGURE_ARGS+=	--without-sidplay
 .if defined(WITHOUT_VORBIS)
 CONFIGURE_ARGS+=	--without-oggvorbis
 .else
-LIB_DEPENDS+=	vorbisfile.3:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbisfile.4:${PORTSDIR}/audio/libvorbis
 .endif
 
 pre-everything::
diff --git a/audio/mp3splt/Makefile b/audio/mp3splt/Makefile
index ab5dacebb03b..14f412812bf6 100644
--- a/audio/mp3splt/Makefile
+++ b/audio/mp3splt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mp3splt
 PORTVERSION=	1.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,8 +17,7 @@ MAINTAINER=	q@uni.de
 COMMENT=	Utility to split mp3 and ogg files (via CUE sheets)
 
 LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/mad \
-		vorbis.2:${PORTSDIR}/audio/libvorbis \
-		ogg.4:${PORTSDIR}/audio/libogg
+		vorbis.3:${PORTSDIR}/audio/libvorbis
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
diff --git a/audio/mq3/Makefile b/audio/mq3/Makefile
index d19facc04901..6b731b526654 100644
--- a/audio/mq3/Makefile
+++ b/audio/mq3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mq3
 PORTVERSION=	8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mq3.org/source/
 
@@ -15,7 +15,7 @@ MAINTAINER=	erich@tacni.net
 COMMENT=	A minimal mp3/ogg player written in Qt
 
 LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw \
-		vorbis.2:${PORTSDIR}/audio/libvorbis \
+		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		qthreads.15:${PORTSDIR}/lang/guile
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index 0706c413826a..607f1ccf97f1 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	MuSE
 PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
 		http://muse.dyne.org/releases/
@@ -19,7 +19,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multiple Streaming Engine
 
 LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
-		vorbis.2:${PORTSDIR}/audio/libvorbis
+		vorbis.3:${PORTSDIR}/audio/libvorbis
 
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 1dbf988191d4..f2c831f76928 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	musicpd
 PORTVERSION=	0.9.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -38,10 +38,10 @@ CONFIGURE_ARGS+=--disable-flac
 LIB_DEPENDS+=	FLAC.5:${PORTSDIR}/audio/flac
 .endif
 
-.ifdef(WITHOUT_OGG)
+.ifdef(WITHOUT_VORBIS)
 CONFIGURE_ARGS+=--disable-ogg
 .else
-LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 .endif
 
 .ifdef(WITHOUT_WAV)
@@ -76,10 +76,10 @@ PLIST_SUB+=	RC_SUFX=${RC_SUFX}
 pre-everything::
 	@${ECHO_CMD} "You can build ${PKGNAME} with the following options:"
 	@${ECHO_CMD}
-	@${ECHO_CMD} "WITHOUT_OGG             Disable OGG-Vorbis-support"
-	@${ECHO_CMD} "WITHOUT_FLAC            Disable FLAC-support"
-	@${ECHO_CMD} "WITHOUT_WAV             Disable libao-support"
-	@${ECHO_CMD} "WITHOUT_ICONV           Disable international-chars-support"
+	@${ECHO_CMD} "WITHOUT_VORBIS          Disable Ogg Vorbis support"
+	@${ECHO_CMD} "WITHOUT_FLAC            Disable FLAC support"
+	@${ECHO_CMD} "WITHOUT_WAV             Disable libao support"
+	@${ECHO_CMD} "WITHOUT_ICONV           Disable international chars support"
 	@${ECHO_CMD}
 
 post-build:
diff --git a/audio/net-rhythmbox/Makefile b/audio/net-rhythmbox/Makefile
index 6958fc0de240..86dbcabc2a0e 100644
--- a/audio/net-rhythmbox/Makefile
+++ b/audio/net-rhythmbox/Makefile
@@ -43,7 +43,7 @@ LIB_DEPENDS+=		xosd.4:${PORTSDIR}/misc/xosd
 CONFIGURE_ARGS+=	--disable-xosd
 .endif
 .ifdef (WITH_VORBIS)
-LIB_DEPENDS+=		vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=		vorbis.3:${PORTSDIR}/audio/libvorbis
 .else
 CONFIGURE_ARGS+=	--disable-vorbistest
 .endif
diff --git a/audio/nogger/Makefile b/audio/nogger/Makefile
index 91afa0514acc..cd876c897991 100644
--- a/audio/nogger/Makefile
+++ b/audio/nogger/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nogger
 PORTVERSION=	0.8.6
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.efd.lth.se/~d00jkr/nogger/
 
@@ -14,7 +15,7 @@ MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	No-frills, GTK-based Ogg Vorbis player
 
 LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
-		vorbis.2:${PORTSDIR}/audio/libvorbis
+		vorbis.3:${PORTSDIR}/audio/libvorbis
 
 .include <bsd.port.pre.mk>
 
diff --git a/audio/osalp/Makefile b/audio/osalp/Makefile
index 029f4dcb16c6..221e959511f8 100644
--- a/audio/osalp/Makefile
+++ b/audio/osalp/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	osalp
 PORTVERSION=	0.7.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +18,7 @@ COMMENT=	Open Source Audio Library Project
 
 BUILD_DEPENDS=	lame:${PORTSDIR}/audio/lame \
 		mpg123:${PORTSDIR}/audio/mpg123
-LIB_DEPENDS=	vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_GETOPT_LONG=yes
diff --git a/audio/p5-libvorbis/Makefile b/audio/p5-libvorbis/Makefile
index 34f6450e33ba..474053a2631c 100644
--- a/audio/p5-libvorbis/Makefile
+++ b/audio/p5-libvorbis/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libvorbis
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=../by-authors/id/F/FO/FOOF
@@ -16,7 +17,7 @@ DISTNAME=	${PORTNAME}-perl-${PORTVERSION}
 MAINTAINER=	dom@happygiraffe.net
 COMMENT=	Perl extension for Ogg Vorbis streams
 
-LIB_DEPENDS=	vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis
 
 USE_REINPLACE=	yes
 
diff --git a/audio/prokyon3/Makefile b/audio/prokyon3/Makefile
index 888c7212a0a0..49d210af4703 100644
--- a/audio/prokyon3/Makefile
+++ b/audio/prokyon3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	prokyon3
 PORTVERSION=	0.9.1.r1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +18,7 @@ COMMENT=	Prokyon3 is a multithreaded MP3 manager and tag editor
 
 BUILD_DEPENDS=	${X11BASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin
 LIB_DEPENDS=	id3-3.8:${PORTSDIR}/audio/id3lib \
-		vorbis.2:${PORTSDIR}/audio/libvorbis
+		vorbis.3:${PORTSDIR}/audio/libvorbis
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/audio/py-ogg/Makefile b/audio/py-ogg/Makefile
index f9fbce7cddda..923c4ca8b0ea 100644
--- a/audio/py-ogg/Makefile
+++ b/audio/py-ogg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ogg
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.andrewchatham.com/pyogg/download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +16,7 @@ DISTNAME=	pyogg-${PORTVERSION}
 MAINTAINER=	nbm@FreeBSD.org
 COMMENT=	Object-oriented Python bindings for the ogg library
 
-LIB_DEPENDS=	ogg.4:${PORTSDIR}/audio/libogg
+LIB_DEPENDS=	ogg.5:${PORTSDIR}/audio/libogg
 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
diff --git a/audio/py-vorbis/Makefile b/audio/py-vorbis/Makefile
index 3bcbca635499..3fc4d555fbf0 100644
--- a/audio/py-vorbis/Makefile
+++ b/audio/py-vorbis/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vorbis
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.andrewchatham.com/pyogg/download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +18,7 @@ COMMENT=	Object-oriented Python bindings for the vorbis library
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/_ogg.so:${PORTSDIR}/audio/py-ogg
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/_ogg.so:${PORTSDIR}/audio/py-ogg
-LIB_DEPENDS=	vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis
 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index c6d19e1f32f7..3f05de739252 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -45,7 +45,7 @@ WITH_VORBIS=	yes
 .endif
 
 .ifdef (WITH_VORBIS)
-LIB_DEPENDS+=		vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=		vorbis.3:${PORTSDIR}/audio/libvorbis
 .else
 CONFIGURE_ARGS+=	--disable-vorbis --disable-vorbistest
 .endif
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index c6d19e1f32f7..3f05de739252 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -45,7 +45,7 @@ WITH_VORBIS=	yes
 .endif
 
 .ifdef (WITH_VORBIS)
-LIB_DEPENDS+=		vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=		vorbis.3:${PORTSDIR}/audio/libvorbis
 .else
 CONFIGURE_ARGS+=	--disable-vorbis --disable-vorbistest
 .endif
diff --git a/audio/ruby-vorbisfile/Makefile b/audio/ruby-vorbisfile/Makefile
index ac3d77095332..5b9a5b5e6c05 100644
--- a/audio/ruby-vorbisfile/Makefile
+++ b/audio/ruby-vorbisfile/Makefile
@@ -7,8 +7,9 @@
 
 PORTNAME=	vorbisfile
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	audio ruby
-MASTER_SITES=	 http://rikkus.info/arch/
+MASTER_SITES=	http://rikkus.info/arch/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
@@ -16,7 +17,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A Ruby extension wrapping libvorbisfile
 
-LIB_DEPENDS=	vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	vorbisfile.4:${PORTSDIR}/audio/libvorbis
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile
index e4a14a266a8a..aa5d2803886e 100644
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sdl_mixer
 PORTVERSION=	1.2.5
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/
 DISTNAME=	SDL_mixer-${PORTVERSION}
@@ -14,7 +15,7 @@ DISTNAME=	SDL_mixer-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A sample multi-channel audio mixer library
 
-LIB_DEPENDS=	vorbis.2:${PORTSDIR}/audio/libvorbis \
+LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
 		smpeg.1:${PORTSDIR}/multimedia/smpeg
 
 USE_SDL=	yes
diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile
index b4b116162bb0..2e2b849001df 100644
--- a/audio/sdl_sound/Makefile
+++ b/audio/sdl_sound/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sdl_sound
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.icculus.org/SDL_sound/downloads/
 DISTNAME=	SDL_sound-${PORTVERSION}
@@ -62,7 +63,7 @@ CONFIGURE_ARGS+=	--disable-midi
 .endif
 
 .if !defined(WITHOUT_VORBIS)
-LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 .else
 CONFIGURE_ARGS+=	--disable-ogg
 .endif
diff --git a/audio/snack/Makefile b/audio/snack/Makefile
index 00475d2ffb8f..aeebb1d3530e 100644
--- a/audio/snack/Makefile
+++ b/audio/snack/Makefile
@@ -28,7 +28,7 @@ CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl8.4 \
 PLIST_SUB=	SNACK_VER=2.2
 
 .if defined(WITH_VORBIS)
-LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 CONFIGURE_ARGS+=	--with-ogg-include=${LOCALBASE}/include \
 			--with-ogg-lib=${LOCALBASE}/lib
 ALL_TARGET=	all libsnackogg.so
diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index f3a1dead6da0..0936d55e2a59 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -40,7 +40,7 @@ CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 .if defined(WITH_VORBIS)
 CONFIGURE_ARGS+=	--enable-ogg-vorbis
-LIB_DEPENDS+=		vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=		vorbis.3:${PORTSDIR}/audio/libvorbis
 .else
 CONFIGURE_ARGS+=	--disable-ogg-vorbis
 .endif
diff --git a/audio/squash/Makefile b/audio/squash/Makefile
index 76b25b5539e7..8b54ae741373 100644
--- a/audio/squash/Makefile
+++ b/audio/squash/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		squash
 PORTVERSION=		1.0.p1
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	squash
@@ -19,7 +19,7 @@ LIB_DEPENDS+=	FLAC.5:${PORTSDIR}/audio/flac \
 		fftw.2:${PORTSDIR}/math/fftw \
 		id3-3.8.2:${PORTSDIR}/audio/id3lib \
 		mad.2:${PORTSDIR}/audio/mad \
-		vorbis.2:${PORTSDIR}/audio/libvorbis \
+		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		ao.3:${PORTSDIR}/audio/libao
 RUN_DEPENDS=	id3v2:${PORTSDIR}/audio/id3v2
 
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 0f14fb8d478e..8f4712300fee 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sweep
 PORTVERSION=	0.8.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +17,7 @@ COMMENT=	A sound editor for the GNOME/GTK 1.2 desktop
 
 LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile \
 		samplerate.0:${PORTSDIR}/audio/libsamplerate \
-		vorbis.2:${PORTSDIR}/audio/libvorbis \
+		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		speex.2:${PORTSDIR}/audio/speex \
 		mad.2:${PORTSDIR}/audio/mad \
 		tdb.1:${PORTSDIR}/databases/tdb
diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index 7cead3dc07d9..fce352fb1593 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	terminatorx
 PORTVERSION=	3.81
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.terminatorx.cx/dist/
 DISTNAME=	terminatorX-${PORTVERSION}
@@ -47,7 +48,7 @@ CONFIGURE_ARGS+=	--disable-sox
 
 .if !defined(WITHOUT_VORBIS)
 BUILD_DEPENDS+=	oggenc:${PORTSDIR}/audio/vorbis-tools
-LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 .else
 CONFIGURE_ARGS+=	--disable-vorbis
 .endif
diff --git a/audio/trm/Makefile b/audio/trm/Makefile
index 67f3a22944f9..62f5b1b51fee 100644
--- a/audio/trm/Makefile
+++ b/audio/trm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	trm
 PORTVERSION=	0.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/ \
 		ftp://ftp.nl.musicbrainz.org/ \
@@ -18,9 +18,7 @@ COMMENT=	TRM generator to generate acoustic fingerprints
 
 BUILD_DEPENDS=	madplay:${PORTSDIR}/audio/mad
 LIB_DEPENDS=	musicbrainz.3:${PORTSDIR}/audio/libmusicbrainz \
-		ogg:${PORTSDIR}/audio/libogg \
-		vorbis:${PORTSDIR}/audio/libvorbis \
-		vorbisfile:${PORTSDIR}/audio/libvorbis
+		vorbisfile.4:${PORTSDIR}/audio/libvorbis
 
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/audio/vorbisgain/Makefile b/audio/vorbisgain/Makefile
index 38359d7f9ce7..8ff77214075e 100644
--- a/audio/vorbisgain/Makefile
+++ b/audio/vorbisgain/Makefile
@@ -8,13 +8,14 @@
 
 PORTNAME=	vorbisgain
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://users.pandora.be/sjeng/ftp/vorbis/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Calculates the perceived sound level of an Ogg Vorbis file
 
-LIB_DEPENDS=	vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis
 
 USE_ZIP=	yes
 GNU_CONFIGURE=	yes
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 8f1ffad467bc..379f6fd783ce 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmcd
 PORTVERSION=	3.2.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.ibiblio.org/tkan/download/xmcd/3.2.1/src/
 DISTNAME=	xmcd-3.2.1
@@ -14,7 +15,7 @@ DISTNAME=	xmcd-3.2.1
 MAINTAINER=	eischen@vigrid.com
 COMMENT=	Motif CD player
 
-LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
 
 USE_MOTIF=	yes
diff --git a/audio/yammi/Makefile b/audio/yammi/Makefile
index bbd1d4dd7466..f7364186884a 100644
--- a/audio/yammi/Makefile
+++ b/audio/yammi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	yammi
 PORTVERSION=	1.0.r1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +16,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.0.r/.0-rc/}
 MAINTAINER=	avleeuwen@piwebs.com
 COMMENT=	A QT-based music manager with fuzzy search
 
-LIB_DEPENDS=	vorbis.2:${PORTSDIR}/audio/libvorbis \
+LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
 		id3-3.8.2:${PORTSDIR}/audio/id3lib \
 		xmms.4:${PORTSDIR}/multimedia/xmms
 
diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile
index 3672c5360f88..ea5ea73d885e 100644
--- a/audio/zinf/Makefile
+++ b/audio/zinf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zinf
 PORTVERSION=	2.2.4
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -73,7 +74,7 @@ PLIST_SUB+=	LIBARTS="@comment "
 .endif
 
 .if !defined(WITHOUT_VORBIS) || defined(WITH_ALL_PLUGINS)
-LIB_DEPENDS+=	vorbis.2:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 PLIST_SUB+=	VORBIS=""
 .else
 CONFIGURE_ARGS+=	--disable-vorbis