aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/audacity-devel/Makefile3
-rw-r--r--audio/audacity/Makefile3
-rw-r--r--audio/darkice/Makefile4
-rw-r--r--audio/easytag-devel/Makefile3
-rw-r--r--audio/easytag/Makefile3
-rw-r--r--audio/flac/Makefile3
-rw-r--r--audio/freeamp/Makefile4
-rw-r--r--audio/kdemultimedia2/Makefile5
-rw-r--r--audio/mp3stat/Makefile3
-rw-r--r--audio/mq3/Makefile3
-rw-r--r--audio/muse/Makefile4
-rw-r--r--audio/sdl_mixer/Makefile3
-rw-r--r--audio/snack/Makefile3
-rw-r--r--audio/sox/Makefile3
-rw-r--r--audio/xmms/Makefile4
-rw-r--r--audio/zinf/Makefile4
-rw-r--r--games/tuxpuck/Makefile3
-rw-r--r--graphics/avifile/Makefile4
-rw-r--r--graphics/gstreamer-plugins/Makefile3
-rw-r--r--graphics/libquicktime/Makefile3
-rw-r--r--graphics/libxine/Makefile5
-rw-r--r--graphics/mplayer/Makefile3
-rw-r--r--multimedia/avifile/Makefile4
-rw-r--r--multimedia/gstreamer-plugins/Makefile3
-rw-r--r--multimedia/gstreamer-plugins80/Makefile3
-rw-r--r--multimedia/libquicktime/Makefile3
-rw-r--r--multimedia/libxine/Makefile5
-rw-r--r--multimedia/mplayer/Makefile3
-rw-r--r--multimedia/mplayerxp/Makefile3
-rw-r--r--multimedia/xmms/Makefile4
30 files changed, 62 insertions, 42 deletions
diff --git a/audio/audacity-devel/Makefile b/audio/audacity-devel/Makefile
index 7cabfaf41f18..5937bdef328a 100644
--- a/audio/audacity-devel/Makefile
+++ b/audio/audacity-devel/Makefile
@@ -6,6 +6,7 @@
PORTNAME= audacity
PORTVERSION= 0.98
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -34,7 +35,7 @@ CONFIGURE_ARGS+= --with-arts-soundserver=yes
.if !defined(WITHOUT_VORBIS)
CONFIGURE_ARGS+= --with-vorbis
-LIB_DEPENDS+= vorbis.1:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+= vorbis.2:${PORTSDIR}/audio/libvorbis
pre-everything:
@${ECHO_MSG} "You can disable support for vorbis by defining WITHOUT_VORBIS.MSG."
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 7cabfaf41f18..5937bdef328a 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -6,6 +6,7 @@
PORTNAME= audacity
PORTVERSION= 0.98
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -34,7 +35,7 @@ CONFIGURE_ARGS+= --with-arts-soundserver=yes
.if !defined(WITHOUT_VORBIS)
CONFIGURE_ARGS+= --with-vorbis
-LIB_DEPENDS+= vorbis.1:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+= vorbis.2:${PORTSDIR}/audio/libvorbis
pre-everything:
@${ECHO_MSG} "You can disable support for vorbis by defining WITHOUT_VORBIS.MSG."
diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
index 0db4af44c211..ce398e0b2407 100644
--- a/audio/darkice/Makefile
+++ b/audio/darkice/Makefile
@@ -8,6 +8,7 @@
PORTNAME= darkice
PORTVERSION= 0.8
+PORTREVISION= 1
CATEGORIES= audio net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,8 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= mp3lame:${PORTSDIR}/audio/lame-devel \
- ogg:${PORTSDIR}/audio/libogg \
- vorbis:${PORTSDIR}/audio/libvorbis
+ vorbis.2:${PORTSDIR}/audio/libvorbis
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-lame-prefix=${LOCALBASE} \
diff --git a/audio/easytag-devel/Makefile b/audio/easytag-devel/Makefile
index 9ba60f7ad03b..ea0d3072ed69 100644
--- a/audio/easytag-devel/Makefile
+++ b/audio/easytag-devel/Makefile
@@ -8,6 +8,7 @@
PORTNAME= easytag
PORTVERSION= 0.21
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= dominic_marks@btinternet.com
LIB_DEPENDS= id3-3.7.13:${PORTSDIR}/audio/id3lib \
- vorbis.1:${PORTSDIR}/audio/libvorbis
+ vorbis.2:${PORTSDIR}/audio/libvorbis
USE_GTK= yes
USE_LIBTOOL= yes
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 9ba60f7ad03b..ea0d3072ed69 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -8,6 +8,7 @@
PORTNAME= easytag
PORTVERSION= 0.21
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= dominic_marks@btinternet.com
LIB_DEPENDS= id3-3.7.13:${PORTSDIR}/audio/id3lib \
- vorbis.1:${PORTSDIR}/audio/libvorbis
+ vorbis.2:${PORTSDIR}/audio/libvorbis
USE_GTK= yes
USE_LIBTOOL= yes
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 9c71ba51a832..4d17c8d4c6a2 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -7,13 +7,14 @@
PORTNAME= flac
PORTVERSION= 1.0.3
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= naddy@FreeBSD.org
-LIB_DEPENDS= ogg.3:${PORTSDIR}/audio/libogg
+LIB_DEPENDS= ogg.4:${PORTSDIR}/audio/libogg
.if defined(WITH_XMMS)
BUILD_DEPENDS+= xmms-config:${PORTSDIR}/audio/xmms
diff --git a/audio/freeamp/Makefile b/audio/freeamp/Makefile
index bb277f8b34af..06640cd2589c 100644
--- a/audio/freeamp/Makefile
+++ b/audio/freeamp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= freeamp
PORTVERSION= 2.1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://www.freeamp.org/download/src/
@@ -53,7 +53,7 @@ PLIST_SUB+= LIBARTS="@comment "
.endif
.if !defined(WITHOUT_VORBIS) || defined(WITH_ALL_PLUGINS)
-LIB_DEPENDS+= vorbis.1:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+= vorbis.2:${PORTSDIR}/audio/libvorbis
PLIST_SUB+= VORBIS=""
.else
CONFIGURE_ARGS+= --disable-vorbis
diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile
index 990710f8a609..a4751fc89856 100644
--- a/audio/kdemultimedia2/Makefile
+++ b/audio/kdemultimedia2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdemultimedia
PORTVERSION= 2.2.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= Attic/${PORTVERSION}/src
@@ -17,8 +17,7 @@ MAINTAINER= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= ogg.3:${PORTSDIR}/audio/libogg \
- vorbis.1:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS= vorbis.2:${PORTSDIR}/audio/libvorbis
RUN_DEPENDS= xanim:${PORTSDIR}/graphics/xanim
USE_KDELIBS_VER=2
diff --git a/audio/mp3stat/Makefile b/audio/mp3stat/Makefile
index 18f42ad48d47..d8c2f78174df 100644
--- a/audio/mp3stat/Makefile
+++ b/audio/mp3stat/Makefile
@@ -8,6 +8,7 @@
PORTNAME= mp3stat
PORTVERSION= 2.5.6
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://safemode.homeip.net/
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -21,7 +22,7 @@ USE_GMAKE= yes
MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
.if defined(WITH_VORBIS)
-LIB_DEPENDS= vorbis.1:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS= vorbis.2:${PORTSDIR}/audio/libvorbis
MAKE_ENV+= WITH_VORBIS="${WITH_VORBIS}"
pre-everything::
diff --git a/audio/mq3/Makefile b/audio/mq3/Makefile
index 29d8fae52d5c..a48c77db4b37 100644
--- a/audio/mq3/Makefile
+++ b/audio/mq3/Makefile
@@ -7,13 +7,14 @@
PORTNAME= mq3
PORTVERSION= 8
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://www.mq3.org/source/
MAINTAINER= erich@tacni.net
LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw \
- vorbis.1:${PORTSDIR}/audio/libvorbis \
+ vorbis.2:${PORTSDIR}/audio/libvorbis \
qthreads.0:${PORTSDIR}/lang/guile
BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index e16ee6a1a00a..9c2b03ec880d 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -8,7 +8,7 @@
PORTNAME= muse
PORTVERSION= 0.7.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://freesoftware.fsf.org/download/muse/ \
http://muse.dyne.org/releases/
@@ -17,7 +17,7 @@ DISTNAME= MuSE-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \
- vorbis.1:${PORTSDIR}/audio/libvorbis \
+ vorbis.2:${PORTSDIR}/audio/libvorbis \
gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
USE_REINPLACE= yes
diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile
index 23fd9c9a17b6..5009b99e2095 100644
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sdl_mixer
PORTVERSION= 1.2.4
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://www.libsdl.org/projects/SDL_mixer/release/
DISTNAME= SDL_mixer-${PORTVERSION}
@@ -15,7 +16,7 @@ MAINTAINER= sobomax@FreeBSD.org
LIB_DEPENDS= SDL-1.1.4:${PORTSDIR}/devel/sdl12 \
smpeg.1:${PORTSDIR}/graphics/smpeg \
- vorbis.1:${PORTSDIR}/audio/libvorbis
+ vorbis.2:${PORTSDIR}/audio/libvorbis
SDL_CONFIG= ${LOCALBASE}/bin/sdl11-config
diff --git a/audio/snack/Makefile b/audio/snack/Makefile
index 4506a486ebba..ebad85621883 100644
--- a/audio/snack/Makefile
+++ b/audio/snack/Makefile
@@ -8,6 +8,7 @@
PORTNAME= snack
PORTVERSION= 2.1.6
+PORTREVISION= 1
CATEGORIES= audio tcl83 tk83
MASTER_SITES= http://www.speech.kth.se/~kare/
DISTNAME= ${PORTNAME}${PORTVERSION}
@@ -25,7 +26,7 @@ CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl8.3 \
PLIST_SUB= SNACK_VER=${PORTVERSION:R}
.if defined(WITH_VORBIS)
-LIB_DEPENDS+= vorbis.1:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+= vorbis.2:${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 07b58c428a1e..776faa645392 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sox
PORTVERSION= 12.17.3
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= sox
@@ -20,7 +21,7 @@ GNU_CONFIGURE= yes
.if defined(WITH_VORBIS)
CONFIGURE_ARGS+= --with-ogg-vorbisinc=${LOCALBASE}/include \
--with-ogg-vorbislib=${LOCALBASE}/lib
-LIB_DEPENDS+= vorbis.1:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+= vorbis.2:${PORTSDIR}/audio/libvorbis
.else
CONFIGURE_ARGS+= --with-ogg-vorbisinc=no
.endif
diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index 39d1f821fb3d..8be002ecad50 100644
--- a/audio/xmms/Makefile
+++ b/audio/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
diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile
index bb277f8b34af..06640cd2589c 100644
--- a/audio/zinf/Makefile
+++ b/audio/zinf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= freeamp
PORTVERSION= 2.1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://www.freeamp.org/download/src/
@@ -53,7 +53,7 @@ PLIST_SUB+= LIBARTS="@comment "
.endif
.if !defined(WITHOUT_VORBIS) || defined(WITH_ALL_PLUGINS)
-LIB_DEPENDS+= vorbis.1:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+= vorbis.2:${PORTSDIR}/audio/libvorbis
PLIST_SUB+= VORBIS=""
.else
CONFIGURE_ARGS+= --disable-vorbis
diff --git a/games/tuxpuck/Makefile b/games/tuxpuck/Makefile
index 20041894a77a..eeae8ec6a27d 100644
--- a/games/tuxpuck/Makefile
+++ b/games/tuxpuck/Makefile
@@ -8,6 +8,7 @@
PORTNAME= tuxpuck
PORTVERSION= 0.7.116
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://www.efd.lth.se/~d00jkr/tuxpuck/
@@ -15,7 +16,7 @@ MAINTAINER= Jan.Stocker@t-online.de
LIB_DEPENDS= SDL-1.1.4:${PORTSDIR}/devel/sdl12 \
png.5:${PORTSDIR}/graphics/png \
- vorbis.1:${PORTSDIR}/audio/libvorbis
+ vorbis.2:${PORTSDIR}/audio/libvorbis
SDL_CONFIG= ${LOCALBASE}/bin/sdl11-config
USE_GMAKE= yes
diff --git a/graphics/avifile/Makefile b/graphics/avifile/Makefile
index 4d949f9a9dbe..c252e6bc439d 100644
--- a/graphics/avifile/Makefile
+++ b/graphics/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/graphics/gstreamer-plugins/Makefile b/graphics/gstreamer-plugins/Makefile
index fe69adfda48d..2e0b1d950ef9 100644
--- a/graphics/gstreamer-plugins/Makefile
+++ b/graphics/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/graphics/libquicktime/Makefile b/graphics/libquicktime/Makefile
index 85f158a60a05..face8fcabab9 100644
--- a/graphics/libquicktime/Makefile
+++ b/graphics/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/graphics/libxine/Makefile b/graphics/libxine/Makefile
index 2981c98a3d77..6b877a80520a 100644
--- a/graphics/libxine/Makefile
+++ b/graphics/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/graphics/mplayer/Makefile b/graphics/mplayer/Makefile
index c3de6f8f2b40..8093f2cbecb2 100644
--- a/graphics/mplayer/Makefile
+++ b/graphics/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/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