4 files changed, 60 insertions, 12 deletions

diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
index eb619257a8e8..4f7ae85bd264 100644
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	mlt
-PORTVERSION=	0.8.8
-PORTREVISION?=	1
+PORTVERSION=	0.9.0
+PORTREVISION?=	0
 CATEGORIES?=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
@@ -19,9 +19,9 @@ SLAVE_PORT?=	no
 # They both install bin/melt.
 CONFLICTS_INSTALL=	freeze-[0-9]*
 
-USES=		pkgconfig
-USE_GNOME=	gnomehack libxml2
+USE_GNOME=	libxml2
 USE_SDL=	image
+USES=		pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-gpl --enable-gpl3
 USE_GMAKE=	yes
@@ -41,14 +41,15 @@ PORTEXAMPLES=	demo
 
 MAN1=		melt.1
 
-OPTIONS_DEFINE=	DV FFMPEG FREI0R GTK2 JACK QT4 QUICKTIME \
+OPTIONS_DEFINE=	DOCS DV EXAMPLES FFMPEG FREI0R GTK2 JACK KDE4 QT4 QUICKTIME \
 		SAMPLERATE SOX SWFDEC VDPAU VORBIS
 OPTIONS_DEFAULT=DV FFMPEG FREI0R GTK2 QT4 \
 		SAMPLERATE SOX SWFDEC VORBIS
 
-GTK2_DESC=	Images, text rendering, etc. via GTK+ 2
-QT4_DESC=	Kdenlive titles, images, etc. via QImage
-SOX_DESC=	SoX audio effects
+GTK2_DESC=	Images and text rendering via GTK+ 2
+KDE4_DESC=	QImage extra formats support
+QT4_DESC=	Kdenlive titles and images support via QImage
+SOX_DESC=	SoX audio effects support
 
 .include <bsd.port.options.mk>
 
@@ -107,11 +108,17 @@ PLIST_SUB+=	JACK="@comment "
 
 .if ${PORT_OPTIONS:MQT4}
 LIB_DEPENDS+=	exif:${PORTSDIR}/graphics/libexif
-USE_QT4+=	gui svg xml
+USE_QT4+=	corelib gui opengl svg xml
 CONFIGURE_ARGS+=--enable-qimage \
 		--qimage-includedir="${QT_INCDIR}" \
 		--qimage-libdir="${QT_LIBDIR}"
 PLIST_SUB+=	QT4=""
+. if ${PORT_OPTIONS:MKDE4}
+USE_KDE4+=	kdelibs
+CONFIGURE_ENV+=	PATH="${KDE4_PREFIX}/bin:$$PATH"
+. else
+CONFIGURE_ARGS+=--without-kde
+. endif
 .else
 CONFIGURE_ARGS+=--disable-qimage
 PLIST_SUB+=	QT4="@comment "
diff --git a/multimedia/mlt/distinfo b/multimedia/mlt/distinfo
index e796752b5076..8785a150d2f5 100644
--- a/multimedia/mlt/distinfo
+++ b/multimedia/mlt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mlt-0.8.8.tar.gz) = cc0e1cdb97a1cd59811a74553b5d3fbff590eb859c475253e188de1069ff9654
-SIZE (mlt-0.8.8.tar.gz) = 1108652
+SHA256 (mlt-0.9.0.tar.gz) = f20c6a9c9acaed3da84c601bf9293b2d148168386e5be2bc55651a75f95c1cc9
+SIZE (mlt-0.9.0.tar.gz) = 1167943
diff --git a/multimedia/mlt/files/patch-configure b/multimedia/mlt/files/patch-configure
new file mode 100644
index 000000000000..ca040c141914
--- /dev/null
+++ b/multimedia/mlt/files/patch-configure
@@ -0,0 +1,29 @@
+--- ./configure.orig	2013-06-03 05:34:35.000000000 +0200
++++ ./configure	2013-06-06 18:15:11.804543548 +0200
+@@ -301,7 +301,7 @@
+ 		grep mmx /proc/cpuinfo > /dev/null 2>&1 || mmx=false
+ 		;;
+ 		FreeBSD)
+-		[ "$(make -V MACHINE_CPU:Mmmx)" ] || mmx=false
++		[ "$(make -V MACHINE_CPU:Mmmx -f /dev/null)" ] || mmx=false
+ 		;;
+ 		*)
+ 		grep mmx /proc/cpuinfo > /dev/null 2>&1 || mmx=false
+@@ -320,7 +320,7 @@
+ 		grep sse /proc/cpuinfo > /dev/null 2>&1 || sse=false
+ 		;;
+ 		FreeBSD)
+-		[ "$(make -V MACHINE_CPU:Msse)" ] || sse=false
++		[ "$(make -V MACHINE_CPU:Msse -f /dev/null)" ] || sse=false
+ 		;;
+ 		*)
+ 		grep sse /proc/cpuinfo > /dev/null 2>&1 || sse=false
+@@ -339,7 +339,7 @@
+ 		grep sse2 /proc/cpuinfo > /dev/null 2>&1 || sse2=false
+ 		;;
+ 		FreeBSD)
+-		[ "$(make -V MACHINE_CPU:Msse2)" ] || sse2=false
++		[ "$(make -V MACHINE_CPU:Msse2 -f /dev/null)" ] || sse2=false
+ 		;;
+ 		*)
+ 		grep sse2 /proc/cpuinfo > /dev/null 2>&1 || sse2=false
diff --git a/multimedia/mlt/pkg-plist b/multimedia/mlt/pkg-plist
index c13b07e6216b..5c8ba3f3dcbf 100644
--- a/multimedia/mlt/pkg-plist
+++ b/multimedia/mlt/pkg-plist
@@ -24,6 +24,7 @@ include/mlt++/MltTractor.h
 include/mlt++/MltTransition.h
 include/mlt++/config.h
 include/mlt/framework/mlt.h
+include/mlt/framework/mlt_animation.h
 include/mlt/framework/mlt_cache.h
 include/mlt/framework/mlt_consumer.h
 include/mlt/framework/mlt_deque.h
@@ -54,8 +55,9 @@ lib/libmlt++.so.%%PORTVERSION%%
 lib/libmlt++.so.3
 lib/libmlt.so
 lib/libmlt.so.%%PORTVERSION%%
-lib/libmlt.so.5
+lib/libmlt.so.6
 %%FFMPEG%%lib/mlt/libmltavformat.so
+lib/mlt/libmltavsync.so
 lib/mlt/libmltcore.so
 lib/mlt/libmltdecklink.so
 lib/mlt/libmltdgraft.so
@@ -86,6 +88,8 @@ libdata/pkgconfig/mlt++.pc
 libdata/pkgconfig/mlt-framework.pc
 %%FFMPEG%%%%DATADIR%%/avformat/consumer_avformat.yml
 %%FFMPEG%%%%DATADIR%%/avformat/producer_avformat.yml
+%%DATADIR%%/avsync/consumer_blipflash.yml
+%%DATADIR%%/avsync/producer_blipflash.yml
 %%DATADIR%%/core/consumer_multi.yml
 %%DATADIR%%/core/data_fx.properties
 %%DATADIR%%/core/filter_audiowave.yml
@@ -133,15 +137,18 @@ libdata/pkgconfig/mlt-framework.pc
 %%DATADIR%%/feeds/PAL/obscure.properties
 %%FREI0R%%%%DATADIR%%/frei0r/blacklist.txt
 %%FREI0R%%%%DATADIR%%/frei0r/not_thread_safe.txt
+%%FREI0R%%%%DATADIR%%/frei0r/param_name_map.yaml
 %%GTK2%%%%DATADIR%%/gtk2/consumer_gtk2_preview.yml
 %%GTK2%%%%DATADIR%%/gtk2/filter_dynamictext.yml
 %%GTK2%%%%DATADIR%%/gtk2/filter_rescale.yml
+%%GTK2%%%%DATADIR%%/gtk2/producer_count.yml
 %%GTK2%%%%DATADIR%%/gtk2/producer_pango.yml
 %%GTK2%%%%DATADIR%%/gtk2/producer_pixbuf.yml
 %%JACK%%%%DATADIR%%/jackrack/blacklist.txt
 %%JACK%%%%DATADIR%%/jackrack/consumer_jack.yml
 %%JACK%%%%DATADIR%%/jackrack/filter_jackrack.yml
 %%JACK%%%%DATADIR%%/jackrack/filter_ladspa.yml
+%%JACK%%%%DATADIR%%/jackrack/producer_ladspa.yml
 %%DATADIR%%/kdenlive/filter_boxblur.yml
 %%DATADIR%%/kdenlive/filter_freeze.yml
 %%DATADIR%%/kdenlive/filter_wave.yml
@@ -290,6 +297,9 @@ libdata/pkgconfig/mlt-framework.pc
 %%DATADIR%%/presets/consumer/avformat/x264-medium-pass1
 %%DATADIR%%/presets/filter/brightness/from_black
 %%DATADIR%%/presets/filter/brightness/to_black
+%%DATADIR%%/presets/filter/movit.blur/blur_in
+%%DATADIR%%/presets/filter/movit.blur/blur_in_out
+%%DATADIR%%/presets/filter/movit.blur/blur_out
 %%DATADIR%%/presets/filter/volume/fade_in
 %%DATADIR%%/presets/filter/volume/fade_out
 %%DATADIR%%/profiles/atsc_1080i_50
@@ -385,6 +395,7 @@ libdata/pkgconfig/mlt-framework.pc
 %%QT4%%@dirrm %%DATADIR%%/qimage
 @dirrm %%DATADIR%%/profiles
 @dirrm %%DATADIR%%/presets/filter/volume
+@dirrm %%DATADIR%%/presets/filter/movit.blur
 @dirrm %%DATADIR%%/presets/filter/brightness
 @dirrm %%DATADIR%%/presets/filter
 @dirrm %%DATADIR%%/presets/consumer/avformat/stills
@@ -437,6 +448,7 @@ libdata/pkgconfig/mlt-framework.pc
 %%DV%%@dirrm %%DATADIR%%/dv
 @dirrm %%DATADIR%%/decklink
 @dirrm %%DATADIR%%/core
+@dirrm %%DATADIR%%/avsync
 %%FFMPEG%%@dirrm %%DATADIR%%/avformat
 @dirrm %%DATADIR%%
 @dirrm lib/mlt