25 files changed, 39 insertions, 33 deletions

diff --git a/audio/alsaplayer/Makefile b/audio/alsaplayer/Makefile
index d9a0c69f976c..ffbf2125c36e 100644
--- a/audio/alsaplayer/Makefile
+++ b/audio/alsaplayer/Makefile
@@ -95,7 +95,7 @@ PLIST_SUB+=		ESD=""
 CONFIGURE_ARGS+=	--disable-flac
 PLIST_SUB+=		FLAC="@comment "
 .else
-LIB_DEPENDS+=		FLAC.5:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=		FLAC.7:${PORTSDIR}/audio/flac
 CONFIGURE_ARGS+=	--enable-flac
 PLIST_SUB+=		FLAC=""
 .endif
diff --git a/audio/easytag-devel/Makefile b/audio/easytag-devel/Makefile
index 883f62261901..255c962297a6 100644
--- a/audio/easytag-devel/Makefile
+++ b/audio/easytag-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	easytag
 PORTVERSION=	1.99.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 329e22fd507a..fc451fc8a1fd 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	easytag
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +18,7 @@ COMMENT=	Tag editor for MP3 and OGG files
 
 LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
 		vorbis.3:${PORTSDIR}/audio/libvorbis \
-		FLAC.5:${PORTSDIR}/audio/flac
+		FLAC.7:${PORTSDIR}/audio/flac
 
 MAN1=		easytag.1
 CONFLICTS=	easytag-devel-[0-9]*
diff --git a/audio/flac123/Makefile b/audio/flac123/Makefile
index ddf9992744b8..7349aec2ddd2 100644
--- a/audio/flac123/Makefile
+++ b/audio/flac123/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	flac123
 PORTVERSION=	0.0.8
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	flac-tools
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR=	flac-tools
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command-line player for flac audio files
 
-LIB_DEPENDS=	FLAC.5:${PORTSDIR}/audio/flac \
+LIB_DEPENDS=	FLAC.7:${PORTSDIR}/audio/flac \
 		ao.3:${PORTSDIR}/audio/libao \
 		popt.0:${PORTSDIR}/devel/popt
 
diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index 0bfff34a1071..6b457aee861a 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		hydrogen
 PORTVERSION=		0.9.0.b1
+PORTREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/ices0/Makefile b/audio/ices0/Makefile
index a3a4ecca3ce1..2dca4a358414 100644
--- a/audio/ices0/Makefile
+++ b/audio/ices0/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	ices
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	audio net
 MASTER_SITES=	http://svn.xiph.org/releases/ices/
 
 MAINTAINER=	lofi@freebsd.org
 COMMENT=	A streaming source client for icecast 2
 
-LIB_DEPENDS=	FLAC:${PORTSDIR}/audio/flac \
+LIB_DEPENDS=	FLAC.7:${PORTSDIR}/audio/flac \
 		faad:${PORTSDIR}/audio/faad \
 		mp3lame:${PORTSDIR}/audio/lame \
 		shout.3:${PORTSDIR}/audio/libshout2 \
diff --git a/audio/libtunepimp-old/Makefile b/audio/libtunepimp-old/Makefile
index 5410d9c43e06..f46f92b62006 100644
--- a/audio/libtunepimp-old/Makefile
+++ b/audio/libtunepimp-old/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libtunepimp
 PORTVERSION=	0.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/
 
diff --git a/audio/libtunepimp/Makefile b/audio/libtunepimp/Makefile
index 5410d9c43e06..f46f92b62006 100644
--- a/audio/libtunepimp/Makefile
+++ b/audio/libtunepimp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libtunepimp
 PORTVERSION=	0.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/
 
diff --git a/audio/muine/Makefile b/audio/muine/Makefile
index 3ddd93ed42c5..f9e6651c8bc9 100644
--- a/audio/muine/Makefile
+++ b/audio/muine/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	muine
 PORTVERSION=	0.6.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://muine.gooeylinux.org/
 
 MAINTAINER=	tmclaugh@sdf.lonestar.org
 COMMENT=	Mono based Gnome audio player
 
-LIB_DEPENDS=	FLAC.5:${PORTSDIR}/audio/flac \
+LIB_DEPENDS=	FLAC.7:${PORTSDIR}/audio/flac \
 		id3tag.2:${PORTSDIR}/audio/libid3tag \
 		gdbm:${PORTSDIR}/databases/gdbm
 BUILD_DEPENDS=	gapi-fixup:${PORTSDIR}/x11-toolkits/gtk-sharp
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index afc905418098..6e56ad3fe140 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	musicpd
 PORTVERSION=	0.11.5
+PORTREVISION=	1
 CATEGORIES=	audio ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -41,7 +42,7 @@ USE_RC_SUBR=	yes
 .ifdef(WITHOUT_FLAC)
 CONFIGURE_ARGS+=--disable-flac
 .else
-LIB_DEPENDS+=	FLAC.5:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	FLAC.7:${PORTSDIR}/audio/flac
 .endif
 
 .ifdef(WITHOUT_VORBIS)
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index e5962f7a8aa0..4f0b8cc92c00 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -40,7 +40,7 @@ OPTIONS=	XINE "Use xine backend instead of GStreamer" off \
 
 .ifdef (WITH_XINE)
 LIB_DEPENDS+=		xine.12:${PORTSDIR}/multimedia/libxine \
-			FLAC.5:${PORTSDIR}/audio/flac \
+			FLAC.7:${PORTSDIR}/audio/flac \
 			mad.2:${PORTSDIR}/audio/libmad
 CONFIGURE_ARGS+=	--with-player=xine
 WITH_MONKEYMEDIA=	yes
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index e5962f7a8aa0..4f0b8cc92c00 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -40,7 +40,7 @@ OPTIONS=	XINE "Use xine backend instead of GStreamer" off \
 
 .ifdef (WITH_XINE)
 LIB_DEPENDS+=		xine.12:${PORTSDIR}/multimedia/libxine \
-			FLAC.5:${PORTSDIR}/audio/flac \
+			FLAC.7:${PORTSDIR}/audio/flac \
 			mad.2:${PORTSDIR}/audio/libmad
 CONFIGURE_ARGS+=	--with-player=xine
 WITH_MONKEYMEDIA=	yes
diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile
index fdfa56154c66..96506d499e17 100644
--- a/audio/sdl_sound/Makefile
+++ b/audio/sdl_sound/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sdl_sound
 PORTVERSION=	1.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://www.icculus.org/SDL_sound/downloads/
 DISTNAME=	SDL_sound-${PORTVERSION}
@@ -26,7 +26,7 @@ INSTALLS_SHLIB=	yes
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_FLAC)
-LIB_DEPENDS+=	FLAC.5:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	FLAC.7:${PORTSDIR}/audio/flac
 .else
 CONFIGURE_ARGS+=	--disable-flac
 .endif
diff --git a/audio/squash/Makefile b/audio/squash/Makefile
index d7dffbf1db7e..9ce814385ea5 100644
--- a/audio/squash/Makefile
+++ b/audio/squash/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=		squash
 PORTVERSION=		1.0
+PORTREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -13,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	matthias.andree@gmx.de
 COMMENT=	Learning console-based MP3/OGG player
 
-LIB_DEPENDS+=	FLAC.5:${PORTSDIR}/audio/flac \
+LIB_DEPENDS+=	FLAC.7:${PORTSDIR}/audio/flac \
 		fftw.2:${PORTSDIR}/math/fftw \
 		id3-3.8.3:${PORTSDIR}/audio/id3lib \
 		mad.2:${PORTSDIR}/audio/mad \
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 4f108efbdbad..8b0fa9a4c65c 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vorbis-tools
 PORTVERSION=	1.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.vorbis.com/files/1.0.1/unix/
@@ -17,7 +17,7 @@ COMMENT=	Play, encode, and manage Ogg Vorbis files
 
 LIB_DEPENDS=	ao.3:${PORTSDIR}/audio/libao \
 		curl.3:${PORTSDIR}/ftp/curl \
-		FLAC.5:${PORTSDIR}/audio/flac \
+		FLAC.7:${PORTSDIR}/audio/flac \
 		speex.3:${PORTSDIR}/audio/speex \
 		vorbis.3:${PORTSDIR}/audio/libvorbis
 
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index bfeaae9fb581..fd965bf4aeb7 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmcd
 PORTVERSION=	3.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.ibiblio.org/tkan/download/xmcd/3.3.2/src/
 
@@ -15,7 +15,7 @@ MAINTAINER=	eischen@vigrid.com
 COMMENT=	Motif CD player
 
 LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis \
-		FLAC:${PORTSDIR}/audio/flac
+		FLAC.7:${PORTSDIR}/audio/flac
 RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
 
 USE_REINPLACE=	yes
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index d5ffb4f06463..36d8d5d15ce5 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -175,7 +175,7 @@ LIB_DEPENDS+=	faad.0:${PORTSDIR}/audio/faad
 
 # flac
 .if ${GST_PLUGIN}=="flac"
-LIB_DEPENDS+=	FLAC.5:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	FLAC.7:${PORTSDIR}/audio/flac
 .endif
 
 # gdkpixbuf
diff --git a/multimedia/gstreamer-plugins80/Makefile.common b/multimedia/gstreamer-plugins80/Makefile.common
index d5ffb4f06463..36d8d5d15ce5 100644
--- a/multimedia/gstreamer-plugins80/Makefile.common
+++ b/multimedia/gstreamer-plugins80/Makefile.common
@@ -175,7 +175,7 @@ LIB_DEPENDS+=	faad.0:${PORTSDIR}/audio/faad
 
 # flac
 .if ${GST_PLUGIN}=="flac"
-LIB_DEPENDS+=	FLAC.5:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	FLAC.7:${PORTSDIR}/audio/flac
 .endif
 
 # gdkpixbuf
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index baf001047406..9af7d48f2f09 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:S/.0//}/src
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index baf001047406..9af7d48f2f09 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:S/.0//}/src
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index d09332903017..d7a515e882d8 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +18,7 @@ MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Libraries for xine multimedia player
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft
-LIB_DEPENDS=	FLAC.5:${PORTSDIR}/audio/flac \
+LIB_DEPENDS=	FLAC.7:${PORTSDIR}/audio/flac \
 		a52.0:${PORTSDIR}/audio/liba52 \
 		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		mad.2:${PORTSDIR}/audio/libmad \
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 65b27afab637..74dbceed9bf4 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mkvtoolnix
 PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/ \
 		http://www.bunkus.org/videotools/mkvtoolnix/sources/old/
@@ -17,7 +17,7 @@ COMMENT=	Tools to extract from/get info about/create Matroska media streams
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmatroska.a:${PORTSDIR}/multimedia/libmatroska \
 		${LOCALBASE}/lib/libebml.a:${PORTSDIR}/textproc/libebml
-LIB_DEPENDS=	FLAC.5:${PORTSDIR}/audio/flac \
+LIB_DEPENDS=	FLAC.7:${PORTSDIR}/audio/flac \
 		expat.5:${PORTSDIR}/textproc/expat2 \
 		vorbis.3:${PORTSDIR}/audio/libvorbis
 
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index addd1e15d98c..7d2b20d03ef7 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -176,7 +176,7 @@
 
 PORTNAME=	vlc
 PORTVERSION=	0.8.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
 		http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${PORTVERSION}/ \
@@ -436,7 +436,7 @@ CONFIGURE_ARGS+=--disable-faad
 .endif
 
 .if !defined(WITHOUT_FLAC)
-LIB_DEPENDS+=	FLAC.5:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	FLAC.7:${PORTSDIR}/audio/flac
 CONFIGURE_ARGS+=--enable-flac
 .else
 CONFLGIRE_ARGS+=--disable-flac
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index addd1e15d98c..7d2b20d03ef7 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -176,7 +176,7 @@
 
 PORTNAME=	vlc
 PORTVERSION=	0.8.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
 		http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${PORTVERSION}/ \
@@ -436,7 +436,7 @@ CONFIGURE_ARGS+=--disable-faad
 .endif
 
 .if !defined(WITHOUT_FLAC)
-LIB_DEPENDS+=	FLAC.5:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	FLAC.7:${PORTSDIR}/audio/flac
 CONFIGURE_ARGS+=--enable-flac
 .else
 CONFLGIRE_ARGS+=--disable-flac
diff --git a/www/mod_musicindex/Makefile b/www/mod_musicindex/Makefile
index ccafc5a31db6..2386ce412fb6 100644
--- a/www/mod_musicindex/Makefile
+++ b/www/mod_musicindex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_musicindex
 PORTVERSION=	0.99.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www audio
 # Master site doesn't have a current version'd tarball...
 #MASTER_SITES=	http://www.parisc-linux.org/~varenet/musicindex/
@@ -20,7 +20,7 @@ COMMENT=	Apache module in C that implements the perl module Apache::MP3
 LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
 		id3tag.2:${PORTSDIR}/audio/libid3tag \
 		mad.2:${PORTSDIR}/audio/libmad \
-		FLAC.5:${PORTSDIR}/audio/flac
+		FLAC.7:${PORTSDIR}/audio/flac
 
 CPPFLAGS=	-DHAS_MP3 -DHAS_OGG -DHAS_FLAC
 CFLAGS+=	-I${LOCALBASE}/include