Bump due to ffmpeg update to 0.7.1

82 files changed, 160 insertions, 62 deletions

diff --git a/audio/akode-plugins-ffmpeg/Makefile b/audio/akode-plugins-ffmpeg/Makefile
index b20bebff0a8d..2b27230801bb 100644
--- a/audio/akode-plugins-ffmpeg/Makefile
+++ b/audio/akode-plugins-ffmpeg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	akode
 PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_GENTOO}
diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile
index 4939dadb42ee..773667bf1ff5 100644
--- a/audio/alsa-plugins/Makefile
+++ b/audio/alsa-plugins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	alsa-plugins
 PORTVERSION=	1.0.23
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.silug.org/pub/alsa/plugins/ \
 		ftp://gd.tuwien.ac.at/opsys/linux/alsa/plugins/ \
diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index 88279ec82a37..4cc41616ae97 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	amarok
 PORTVERSION=	2.4.1
+PORTREVISION=	1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile
index c429f80d12d3..7a09f1024fb3 100644
--- a/audio/aqualung/Makefile
+++ b/audio/aqualung/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aqualung
 DISTVERSION=	0.9beta11
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} \
  		http://wickedmachine.net/mirror/
diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index 30fdd1310ff8..192b44f37694 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cmus
 PORTVERSION=	2.4.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/cuberok/Makefile b/audio/cuberok/Makefile
index c5dedcdc7dfb..8f04a7bea1e2 100644
--- a/audio/cuberok/Makefile
+++ b/audio/cuberok/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cuberok
 PORTVERSION=	0.0.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	GOOGLE_CODE
 
diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile
index 1d07b9ff74e7..203664b54884 100644
--- a/audio/deadbeef/Makefile
+++ b/audio/deadbeef/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	deadbeef
 PORTVERSION=	0.4.4
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/
 
diff --git a/audio/moc/Makefile b/audio/moc/Makefile
index 5be2e50032e2..103862735ca7 100644
--- a/audio/moc/Makefile
+++ b/audio/moc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	moc
 PORTVERSION=	2.4.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.daper.net/pub/soft/moc/stable/
 
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 19b488052cf5..a5f4f05716ca 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	musicpd
 PORTVERSION=	0.16.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio ipv6
 MASTER_SITES=	SF/${PORTNAME}/mpd/${PORTVERSION}
 DISTNAME=	mpd-${PORTVERSION}
diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index 6e267df81552..f97e74896768 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	picard
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	http://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
 		ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
diff --git a/audio/soundkonverter/Makefile b/audio/soundkonverter/Makefile
index b761b06343c3..bd3a15b7cca0 100644
--- a/audio/soundkonverter/Makefile
+++ b/audio/soundkonverter/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	soundkonverter
 DISTVERSION=	0.9.94rc2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio kde
 MASTER_SITES=	https://api.opensuse.org/public/source/home:HessiJames/soundkonverter/
 
diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index 95c7465620b2..7229e4ddd5c0 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sox
 PORTVERSION=	14.3.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
diff --git a/audio/spek/Makefile b/audio/spek/Makefile
index c0bf3b551ce4..72b5999949b1 100644
--- a/audio/spek/Makefile
+++ b/audio/spek/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	spek
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
index 38396129d3b6..5b4ecabe6322 100644
--- a/audio/xmms2/Makefile
+++ b/audio/xmms2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	xmms2
 PORTVERSION=	0.7
-PORTREVISION?=	1
+PORTREVISION?=	2
 DISTVERSIONSUFFIX=DrNo
 CATEGORIES?=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}
diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile
index a3f8b5e9b75d..ffbcffb1421c 100644
--- a/cad/netgen/Makefile
+++ b/cad/netgen/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	netgen
 PORTVERSION=	4.9.13
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	cad
 MASTER_SITES=	SF/netgen-mesher/netgen-mesher/${PORTVERSION}/
 
diff --git a/devel/libdlna/Makefile b/devel/libdlna/Makefile
index 789dbe9c57f9..110f97de87dd 100644
--- a/devel/libdlna/Makefile
+++ b/devel/libdlna/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libdlna
 PORTVERSION=	0.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://libdlna.geexbox.org/releases/ \
 		http://critical.ch/distfiles/ \
diff --git a/devel/synfig/Makefile b/devel/synfig/Makefile
index 0a171b7dca6a..a739e2af3360 100644
--- a/devel/synfig/Makefile
+++ b/devel/synfig/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	synfig
 DISTVERSION=	0.62.02
+PORTREVISION=	1
 CATEGORIES=	devel graphics multimedia
 MASTER_SITES=	SF
 
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 1c53aa55ac74..3f3ef65819ad 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	vice
 PORTVERSION=	2.3
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.viceteam.org/online/ \
 		http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ \
diff --git a/graphics/amide/Makefile b/graphics/amide/Makefile
index badec29a6582..6b48ee287ba4 100644
--- a/graphics/amide/Makefile
+++ b/graphics/amide/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	amide
 PORTVERSION=	0.9.3
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index d53698ba4bb3..8467c8eafb95 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	blender
 PORTVERSION=	2.57b
+PORTREVISION=	1
 CATEGORIES=	graphics games
 MASTER_SITES=	http://download.blender.org/source/ \
 		http://mirror.cs.umn.edu/blender.org/source/ \
diff --git a/graphics/blender/files/patch-source-blender-blenkernel-intern-writeffmpeg.c b/graphics/blender/files/patch-source-blender-blenkernel-intern-writeffmpeg.c
new file mode 100644
index 000000000000..1641a19763da
--- /dev/null
+++ b/graphics/blender/files/patch-source-blender-blenkernel-intern-writeffmpeg.c
@@ -0,0 +1,17 @@
+--- source/blender/blenkernel/intern/writeffmpeg.c.orig	2011-06-24 09:07:48.320613989 +0200
++++ source/blender/blenkernel/intern/writeffmpeg.c	2011-06-24 09:08:17.697825516 +0200
+@@ -1101,12 +1101,12 @@
+ 	switch (o->type) {
+ 	case FF_OPT_TYPE_INT:
+ 	case FF_OPT_TYPE_INT64:
+-		val.i = o->default_val;
++		val.i = o->default_val.i64;
+ 		idp_type = IDP_INT;
+ 		break;
+ 	case FF_OPT_TYPE_DOUBLE:
+ 	case FF_OPT_TYPE_FLOAT:
+-		val.f = o->default_val;
++		val.f = o->default_val.dbl;
+ 		idp_type = IDP_FLOAT;
+ 		break;
+ 	case FF_OPT_TYPE_STRING:
diff --git a/graphics/bugle/Makefile b/graphics/bugle/Makefile
index 5f43bb698ac1..ede06f4f9597 100644
--- a/graphics/bugle/Makefile
+++ b/graphics/bugle/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bugle
 PORTVERSION=	0.0.20091026
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index 2dc2ebd73e1b..2c84c50d87a3 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cimg
 PORTVERSION=	1.4.8
-PORTEPOCH=	2
+PORTEPOCH=	3
 CATEGORIES=	graphics devel
 MASTER_SITES=	SF/${PORTNAME}		\
 		SF/${PORTNAME}/old
diff --git a/graphics/enfle/Makefile b/graphics/enfle/Makefile
index 99d6ffd4f6e8..f563f4043e8b 100644
--- a/graphics/enfle/Makefile
+++ b/graphics/enfle/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	enfle
 PORTVERSION=	20101006
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://enfle.fennel.org/files/stable/
 
diff --git a/graphics/gimp-gap/Makefile b/graphics/gimp-gap/Makefile
index 4ef6c1154f8a..17b0a65e956f 100644
--- a/graphics/gimp-gap/Makefile
+++ b/graphics/gimp-gap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gimp-gap
 PORTVERSION=	2.4.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		http://gimp.mirrors.hoobly.com/%SUBDIR%/ \
diff --git a/graphics/gimp-gmic-plugin/Makefile b/graphics/gimp-gmic-plugin/Makefile
index 1a0d037e8760..9137bf95ae5d 100644
--- a/graphics/gimp-gmic-plugin/Makefile
+++ b/graphics/gimp-gmic-plugin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gmic
 PORTVERSION=	1.4.9.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME} \
 		SF/${PORTNAME}/old
diff --git a/graphics/gnash-devel/Makefile b/graphics/gnash-devel/Makefile
index 8506b5e4a710..8b58fba3096f 100644
--- a/graphics/gnash-devel/Makefile
+++ b/graphics/gnash-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnash
 PORTVERSION=	20100218
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/
 PKGNAMESUFFIX=	-devel
diff --git a/graphics/gnash-devel/files/patch-macros-ffmpeg.m4 b/graphics/gnash-devel/files/patch-macros-ffmpeg.m4
new file mode 100644
index 000000000000..6e7a266fcf89
--- /dev/null
+++ b/graphics/gnash-devel/files/patch-macros-ffmpeg.m4
@@ -0,0 +1,15 @@
+--- macros/ffmpeg.m4.orig	2011-06-24 09:51:50.606673957 +0200
++++ macros/ffmpeg.m4	2011-06-24 09:52:10.371550401 +0200
+@@ -184,9 +184,9 @@
+ 
+     AC_MSG_CHECKING([ffmpeg version])
+ 
+-    ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
+-    ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
+-    ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
++    ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${ffmpeg_top_incl}/libavcodec/version.h | sed -e "s%[[^0-9]]%%g"`
++    ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${ffmpeg_top_incl}/libavcodec/version.h | sed -e "s%[[^0-9]]%%g"`
++    ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${ffmpeg_top_incl}/libavcodec/version.h | sed -e "s%[[^0-9]]%%g"`
+ 
+     if test x"${ffmpeg_major_version}" != x ; then
+ 
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 41ff75c1070c..7c4bf1f7ec19 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnash
 PORTVERSION=	0.8.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	GNU/${PORTNAME}/${PORTVERSION}/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/graphics/gnash/files/patch-configure b/graphics/gnash/files/patch-configure
new file mode 100644
index 000000000000..6c829e306f84
--- /dev/null
+++ b/graphics/gnash/files/patch-configure
@@ -0,0 +1,15 @@
+--- configure.orig	2011-06-24 09:37:48.372797223 +0200
++++ configure	2011-06-24 09:49:48.244082692 +0200
+@@ -20791,9 +20791,9 @@
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking ffmpeg version" >&5
+ $as_echo_n "checking ffmpeg version... " >&6; }
+ 
+-    ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${avcodec_h} | sed -e "s%[^0-9]%%g"`
+-    ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${avcodec_h} | sed -e "s%[^0-9]%%g"`
+-    ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${avcodec_h} | sed -e "s%[^0-9]%%g"`
++    ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${ffmpeg_top_incl}/libavcodec/version.h | sed -e "s%[^0-9]%%g"`
++    ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${ffmpeg_top_incl}/libavcodec/version.h | sed -e "s%[^0-9]%%g"`
++    ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${ffmpeg_top_incl}/libavcodec/version.h | sed -e "s%[^0-9]%%g"`
+ 
+     if test x"${ffmpeg_major_version}" != x ; then
+ 
diff --git a/graphics/gnash/files/patch-macros-ffmpeg.m4 b/graphics/gnash/files/patch-macros-ffmpeg.m4
new file mode 100644
index 000000000000..6e7a266fcf89
--- /dev/null
+++ b/graphics/gnash/files/patch-macros-ffmpeg.m4
@@ -0,0 +1,15 @@
+--- macros/ffmpeg.m4.orig	2011-06-24 09:51:50.606673957 +0200
++++ macros/ffmpeg.m4	2011-06-24 09:52:10.371550401 +0200
+@@ -184,9 +184,9 @@
+ 
+     AC_MSG_CHECKING([ffmpeg version])
+ 
+-    ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
+-    ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
+-    ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
++    ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${ffmpeg_top_incl}/libavcodec/version.h | sed -e "s%[[^0-9]]%%g"`
++    ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${ffmpeg_top_incl}/libavcodec/version.h | sed -e "s%[[^0-9]]%%g"`
++    ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${ffmpeg_top_incl}/libavcodec/version.h | sed -e "s%[[^0-9]]%%g"`
+ 
+     if test x"${ffmpeg_major_version}" != x ; then
+ 
diff --git a/graphics/iulib/Makefile b/graphics/iulib/Makefile
index 12cd9be9625d..5cd835425c96 100644
--- a/graphics/iulib/Makefile
+++ b/graphics/iulib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	iulib
 PORTVERSION=	0.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics
 MASTER_SITES=	GOOGLE_CODE
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/lightspark-devel/Makefile b/graphics/lightspark-devel/Makefile
index 7a23559eb741..656add0dd7f5 100644
--- a/graphics/lightspark-devel/Makefile
+++ b/graphics/lightspark-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lightspark
 DISTVERSION=	r20110309
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/
 PKGNAMESUFFIX=	-devel
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index a1cb04df17f1..c5c0d05efcaa 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	opencv
 PORTVERSION=	2.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}library/${PORTNAME}-unix/${PORTVERSION:R}
 DISTNAME=	OpenCV-${PORTVERSION}
diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile
index 3eef31503de9..f8c4a9ed9b1c 100644
--- a/graphics/osg-devel/Makefile
+++ b/graphics/osg-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	osg
 PORTVERSION=	2.9.11
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.openscenegraph.org/downloads/developer_releases/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/graphics/php5-ffmpeg/Makefile b/graphics/php5-ffmpeg/Makefile
index 769dce44fbee..dc5fcbbb277c 100644
--- a/graphics/php5-ffmpeg/Makefile
+++ b/graphics/php5-ffmpeg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	0.6.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}-php/${PORTNAME}-php/${PORTVERSION}
 PKGNAMEPREFIX=	php5-
diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile
index b8ce6ba9f4a0..c24563f0f524 100644
--- a/graphics/wxsvg/Makefile
+++ b/graphics/wxsvg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wxsvg
 DISTVERSION=	1.0.8
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1
diff --git a/lang/pike76/Makefile b/lang/pike76/Makefile
index c32d7d52b200..d4026f1dd4ac 100644
--- a/lang/pike76/Makefile
+++ b/lang/pike76/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pike76
 PORTVERSION=	7.6.112
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	lang
 MASTER_SITES=	ftp://pike.ida.liu.se/pub/pike/beta/${PORTVERSION}/ \
 		http://pike.ida.liu.se/pub/pike/beta/${PORTVERSION}/ \
diff --git a/math/octave-forge-video/Makefile b/math/octave-forge-video/Makefile
index ac05a9b0644f..849e04a67eaa 100644
--- a/math/octave-forge-video/Makefile
+++ b/math/octave-forge-video/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	octave-forge-video
 PORTVERSION=	1.0.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile
index bb116e727a73..751c7c24884e 100644
--- a/multimedia/aegisub/Makefile
+++ b/multimedia/aegisub/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	aegisub
 PORTVERSION=	2.1.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://ftp.aegisub.org/pub/releases/ \
 		http://ftp2.aegisub.org/pub/releases/ \
@@ -31,7 +31,7 @@ OPTIONS=	DEBUG 		"Enable debug" Off \
 		PORTAUDIO	"Enable PortAudio2 audio provider (only one)" Off \
 		PULSE		"Enable PulseAudio audio provider (only one)" On \
 		OSS		"Enable OSS audio player (require portaudio)" Off \
-		FFMPEG		"Enable FFMPEG video provider" On \
+		FFMPEG		"Enable FFMPEG video provider" Off \
 		HUNSPELL	"Hungarian Spell" On \
 		LUA		"LUA Scripting" On \
 		PERL		"Perl Scripting" On
@@ -92,7 +92,8 @@ CONFIGURE_ARGS+=	--with-player-audio=pulseaudio
 CONFIGURE_ARGS+=	--with-player-audio=portaudio
 .endif
 .endif
-.if defined(WITH_FFMPEG)
+.if !defined(WITHOUT_FFMPEG)
+BROKEN=	ffmpeg support is broken
 BUILD_DEPENDS+=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
 CONFIGURE_ARGS+=	--with-provider-video=ffmpegsource --with-provider-audio=ffmpegsource
 .endif
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index ac720e8282e7..a1dd6296e633 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	audacious-plugins
 PORTVERSION=	2.5.1
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.atheme.org/
 EXTRACT_SUFX=	.tgz
diff --git a/multimedia/avbin/Makefile b/multimedia/avbin/Makefile
index 4973807ec169..1fcf89971b5f 100644
--- a/multimedia/avbin/Makefile
+++ b/multimedia/avbin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	avbin
 PORTVERSION=	7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/multimedia/bombono/Makefile b/multimedia/bombono/Makefile
index 94252323e3a5..325b7871501c 100644
--- a/multimedia/bombono/Makefile
+++ b/multimedia/bombono/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bombono
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/bombono/bombono-dvd/1.0
 DISTNAME=	bombono-dvd-${PORTVERSION}
diff --git a/multimedia/dvbcut/Makefile b/multimedia/dvbcut/Makefile
index 721c9a9bc326..d81a3ea86480 100644
--- a/multimedia/dvbcut/Makefile
+++ b/multimedia/dvbcut/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dvbcut
 PORTVERSION=	0.6.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.mr511.de/dvbcut/
 
diff --git a/multimedia/etoile-mediakit/Makefile b/multimedia/etoile-mediakit/Makefile
index d6034fa40aa0..2234586a1871 100644
--- a/multimedia/etoile-mediakit/Makefile
+++ b/multimedia/etoile-mediakit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mediakit
 PORTVERSION=	0.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia gnustep
 MASTER_SITES=	http://download.gna.org/etoile/
 PKGNAMEPREFIX=	etoile-
diff --git a/multimedia/ffmpeg2theora/Makefile b/multimedia/ffmpeg2theora/Makefile
index 9473c8c0a3f8..85f865cc96ba 100644
--- a/multimedia/ffmpeg2theora/Makefile
+++ b/multimedia/ffmpeg2theora/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	ffmpeg2theora
 PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://v2v.cc/~j/ffmpeg2theora/downloads/
 
diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile
index fc708eea9948..af15c521919d 100644
--- a/multimedia/ffmpegthumbnailer/Makefile
+++ b/multimedia/ffmpegthumbnailer/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	ffmpegthumbnailer
 PORTVERSION=	2.0.4
+PORTREVISION=	1
 CATEGORIES=	multimedia graphics
 MASTER_SITES=	GOOGLE_CODE
 
diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile
index 6fe83a657547..9c54daf184d3 100644
--- a/multimedia/gmerlin-avdecoder/Makefile
+++ b/multimedia/gmerlin-avdecoder/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmerlin-avdecoder
 PORTVERSION=	1.0.1
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/gmerlin/${PORTNAME}/${PORTVERSION}
 
diff --git a/multimedia/k9copy-kde4/Makefile b/multimedia/k9copy-kde4/Makefile
index d73b870c6241..9b2ec4900845 100644
--- a/multimedia/k9copy-kde4/Makefile
+++ b/multimedia/k9copy-kde4/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	k9copy
 PORTVERSION=	2.3.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia kde
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-kde4/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-Source
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 3c1631d26e37..e34cff7be004 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile
index 47c7ab6a94a1..e94beae2b6f6 100644
--- a/multimedia/kino/Makefile
+++ b/multimedia/kino/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kino
 PORTVERSION=	1.3.4
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index bb3c39033d1a..922c92acc426 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libquicktime
 PORTVERSION=	1.2.2
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 30f9235ce462..c192ad194d50 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.1.19
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
 PKGNAMEPREFIX=	lib
diff --git a/multimedia/miro/Makefile b/multimedia/miro/Makefile
index 1a1ac45568b6..aa488420685d 100644
--- a/multimedia/miro/Makefile
+++ b/multimedia/miro/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	miro
 PORTVERSION=	4.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.osuosl.org/pub/pculture.org/miro/src/ \
 		http://ftp.osuosl.org/pub/pculture.org/miro/src/
diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
index a853c7afad97..1e5e6881a0e4 100644
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	mlt
 PORTVERSION=	0.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
diff --git a/multimedia/moonlight/Makefile b/multimedia/moonlight/Makefile
index 8d202182aed8..b542f2dd3a63 100644
--- a/multimedia/moonlight/Makefile
+++ b/multimedia/moonlight/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	moonlight
 PORTVERSION=	2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia www
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/moon/${PORTVERSION}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile
index 286efb8d548e..fc3929ecfbe2 100644
--- a/multimedia/motion/Makefile
+++ b/multimedia/motion/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	motion
 PORTVERSION=	3.2.11.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20-%203.2/${PORTVERSION}
 
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 8310b6d2764c..e5d4865bd490 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mpeg4ip
 PORTVERSION=	1.6.1
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	LOCAL/ahze
 # http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136
@@ -144,7 +144,8 @@ PLIST_SUB+=	XVID="@comment "
 BROKEN=		Does not compile
 .endif
 
-post-patch:
+#post-patch:
+pre-configure:
 	@${TOUCH} -f ${WRKSRC}/bootstrapped
 # don't compile or use libmp4v2
 	@${REINPLACE_CMD} -e 's|mp4v2||' \
diff --git a/multimedia/mpeg4ip/files/patch-server_mp4live_video_ffmpeg.cpp b/multimedia/mpeg4ip/files/patch-server_mp4live_video_ffmpeg.cpp
index 2fd02ad2c05e..114e87f57d28 100644
--- a/multimedia/mpeg4ip/files/patch-server_mp4live_video_ffmpeg.cpp
+++ b/multimedia/mpeg4ip/files/patch-server_mp4live_video_ffmpeg.cpp
@@ -1,5 +1,5 @@
---- server/mp4live/video_ffmpeg.cpp.orig	2008-07-27 18:33:54.140404708 -0500
-+++ server/mp4live/video_ffmpeg.cpp	2008-07-27 18:34:54.699683611 -0500
+--- server/mp4live/video_ffmpeg.cpp.orig	2007-01-30 22:53:45.000000000 +0100
++++ server/mp4live/video_ffmpeg.cpp	2011-06-24 22:08:18.167374694 +0200
 @@ -121,9 +121,6 @@
    m_avctx->bit_rate = 
      Profile()->GetIntegerValue(CFG_VIDEO_BIT_RATE) * 1000;
@@ -23,3 +23,12 @@
  #else
      AVRational asp = 
        {Profile()->GetIntegerValue(CFG_VIDEO_MPEG4_PAR_WIDTH),
+@@ -225,7 +222,7 @@
+   }
+   if (wantKeyFrame) m_picture->pict_type = FF_I_TYPE; //m_picture->key_frame = 1;
+   else //m_picture->key_frame = 0;
+-    m_picture->pict_type = 0;
++    m_picture->pict_type = FF_P_TYPE;
+ 
+   m_picture->data[0] = (uint8_t *)pY;
+   m_picture->data[1] = (uint8_t *)pU;
diff --git a/multimedia/openmovieeditor/Makefile b/multimedia/openmovieeditor/Makefile
index 4e1b6032157a..c6045dcd39d6 100644
--- a/multimedia/openmovieeditor/Makefile
+++ b/multimedia/openmovieeditor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openmovieeditor
 PORTVERSION=	0.0.20090105
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile
index 3f55ea9c0fda..e4aeb6baf0e7 100644
--- a/multimedia/qmmp/Makefile
+++ b/multimedia/qmmp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qmmp
 PORTVERSION=	0.4.5
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
 	${MASTER_SITE_GOOGLE_CODE}
diff --git a/multimedia/sabbu/Makefile b/multimedia/sabbu/Makefile
index 1a6dfa32a56d..8713693fc03e 100644
--- a/multimedia/sabbu/Makefile
+++ b/multimedia/sabbu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sabbu
 PORTVERSION=	0.3.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Sabbu%20${PORTVERSION}
 
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 5978a3787ebc..17b5a3ece2ba 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	transcode
 PORTVERSION=	1.1.5
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_BERLIOS} \
 		http://fromani.exit1.org/
diff --git a/multimedia/vdr-plugin-markad/Makefile b/multimedia/vdr-plugin-markad/Makefile
index 3d5386e1962e..633532911975 100644
--- a/multimedia/vdr-plugin-markad/Makefile
+++ b/multimedia/vdr-plugin-markad/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vdr-plugin-markad
 PORTVERSION=	0.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://projects.vdr-developer.org/attachments/download/578/
 DISTNAME=	${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
diff --git a/multimedia/vdr-plugin-osdpip/Makefile b/multimedia/vdr-plugin-osdpip/Makefile
index 5fdb637620c5..e3818d153eff 100644
--- a/multimedia/vdr-plugin-osdpip/Makefile
+++ b/multimedia/vdr-plugin-osdpip/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vdr-plugin-osdpip
 PORTVERSION=	0.1.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	multimedia
 MASTER_SITES=	http://projects.vdr-developer.org/attachments/download/267/
 DISTNAME=	${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
diff --git a/multimedia/vdr-plugin-softdevice/Makefile b/multimedia/vdr-plugin-softdevice/Makefile
index d3cb15dc4d51..1d523d5f8d47 100644
--- a/multimedia/vdr-plugin-softdevice/Makefile
+++ b/multimedia/vdr-plugin-softdevice/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vdr-plugin-softdevice
 PORTVERSION=	0.5.0p20100414
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	multimedia
 MASTER_SITES=	LOCAL
 MASTER_SITE_SUBDIR=	nox/
diff --git a/multimedia/vdr-plugin-upnp/Makefile b/multimedia/vdr-plugin-upnp/Makefile
index 1352c1e839c4..04ac0ba1ee7e 100644
--- a/multimedia/vdr-plugin-upnp/Makefile
+++ b/multimedia/vdr-plugin-upnp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vdr-plugin-upnp
 PORTVERSION=	0.0.2a2
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	multimedia
 MASTER_SITES=	http://projects.vdr-developer.org/attachments/download/177/
 DISTNAME=	${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION:S/a/-alpha/}${DISTVERSIONSUFFIX}
diff --git a/multimedia/vdr-plugin-xineliboutput/Makefile b/multimedia/vdr-plugin-xineliboutput/Makefile
index 6bc7a5252872..9ba011a27856 100644
--- a/multimedia/vdr-plugin-xineliboutput/Makefile
+++ b/multimedia/vdr-plugin-xineliboutput/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vdr-plugin-xineliboutput
 PORTVERSION=	1.0.90s20110308.2305
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	multimedia
 MASTER_SITES=	SF:release \
 		LOCAL:snapshot
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index a071b2ce4758..a488d4e6e751 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	1.1.10
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	3
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \
diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile
index 84bee262a817..b1c7e581a31c 100644
--- a/multimedia/xbmc/Makefile
+++ b/multimedia/xbmc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xbmc
 PORTVERSION=	10.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://mirrors.xbmc.org/releases/source/
 
diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile
index ac58b542486a..f4fab93053ae 100644
--- a/multimedia/zoneminder/Makefile
+++ b/multimedia/zoneminder/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	zoneminder
 PORTVERSION=	1.24.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www2.zoneminder.com/downloads/ \
 		http://www.zoneminder.com/downloads/
diff --git a/net/mediatomb/Makefile b/net/mediatomb/Makefile
index 8e18aa1db696..4393b3a2d229 100644
--- a/net/mediatomb/Makefile
+++ b/net/mediatomb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mediatomb
 PORTVERSION=	0.12.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net multimedia
 MASTER_SITES=	SF/${PORTNAME}/MediaTomb/${PORTVERSION}
 
diff --git a/net/minidlna/Makefile b/net/minidlna/Makefile
index 623bafa2ce37..53bea078ca63 100644
--- a/net/minidlna/Makefile
+++ b/net/minidlna/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	minidlna
 PORTVERSION=	2010.12.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net multimedia www
 MASTER_SITES=	http://aldan.algebra.com/~mi/
 
diff --git a/net/minidlna/files/BSDmakefile b/net/minidlna/files/BSDmakefile
index ab8a0128bc29..387110811263 100644
--- a/net/minidlna/files/BSDmakefile
+++ b/net/minidlna/files/BSDmakefile
@@ -7,7 +7,9 @@ VERS!=	uname -r
 CFLAGS+=-I${FILESDIR} -I${.CURDIR} -I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg
 CFLAGS+=-I${LOCALBASE}/include/libavutil
 CFLAGS+=-DPREFIX='"${PREFIX}"' -DOS='"${OS}"' -DOSVERSION='"${VERS}"'
-CFLAGS+=-Wformat -Werror
+CFLAGS+=-Wformat
+
+NO_WERROR=	true
 
 LDADD+=	-L${LOCALBASE}/lib
 LDADD+=	-lsqlite3 -ljpeg -lexif -lid3tag -logg -lvorbis -lFLAC -lavformat
diff --git a/net/opal/Makefile b/net/opal/Makefile
index a1dbf5469f3a..51dddfcaa8c8 100644
--- a/net/opal/Makefile
+++ b/net/opal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	opal
 PORTVERSION=	2.2.11
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	GNOME
 
diff --git a/net/opal3/Makefile b/net/opal3/Makefile
index 2372972e3020..3ec899cc98ef 100644
--- a/net/opal3/Makefile
+++ b/net/opal3/Makefile
@@ -124,7 +124,7 @@ PLIST_SUB+=	THEORA="@comment "
 .endif
 
 .if defined(WITH_X264)
-LIB_DEPENDS+=	x264.110:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.115:${PORTSDIR}/multimedia/x264
 CONFIGURE_ARGS+=	--enable-h264
 PLIST_SUB+=	X264=""
 WITH_VIDEO=	yes
@@ -136,6 +136,9 @@ PLIST_SUB+=	X264="@comment "
 .if defined(WITH_FFMPEG)
 LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
 CONFIGURE_ARGS+=	--enable-ffmpeg --enable-ffmpeg-h263
+CONFIGURE_ENV+=		ac_cv_lib_avcodec_h263p_encoder=yes \
+			ac_cv_lib_avcodec_h264_decoder=yes \
+			ac_cv_lib_avcodec_mpeg4_encoder=yes
 PLIST_SUB+=	FFMPEG=""
 WITH_VIDEO=	yes
 .else
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index dac3b54a0b4e..fa860d159c2e 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openh323
 PORTVERSION=	1.19.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-v${PORTVERSION:S/./_/g}-src
diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index e92b459f3b3d..75a2296a7aca 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	k3b
 PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index b9d9a2e9abdd..aaab8aa4976a 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	k3b
 PORTVERSION=	1.0.5
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	SF
 
diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile
index a694b34eb3e5..8ff57d0a2125 100644
--- a/textproc/libextractor/Makefile
+++ b/textproc/libextractor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libextractor
 PORTVERSION=	0.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index 0ff5da4f1f46..89137ee000ad 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cherokee
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.cherokee-project.com/download/1.2/${PORTVERSION}/ \
 		http://cherokee.osuosl.org/1.0/${PORTVERSION}/ \
diff --git a/x11-toolkits/nucleo/Makefile b/x11-toolkits/nucleo/Makefile
index 3b622899a0c0..9eb3cdee900d 100644
--- a/x11-toolkits/nucleo/Makefile
+++ b/x11-toolkits/nucleo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nucleo
 PORTVERSION=	0.7.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://insitu.lri.fr/metisse/download/nucleo/