8 files changed, 65 insertions, 173 deletions

diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
index 56669fdd927c..7f5dbe77227d 100644
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -1,16 +1,20 @@
 # $FreeBSD$
 
 PORTNAME=	mlt
-PORTVERSION=	0.8.2
-PORTREVISION=	1
-CATEGORIES=	multimedia
+PORTVERSION=	0.8.6
+PORTREVISION?=	0
+CATEGORIES?=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
-MAINTAINER=	avilla@FreeBSD.org
-COMMENT=	Multimedia framework for TV broadcasting
+MAINTAINER?=	avilla@FreeBSD.org
+COMMENT?=	Multimedia framework for TV broadcasting
 
-LICENSE=	GPLv2 GPLv3 LGPL21
-LICENSE_COMB=	multi
+LICENSE?=	GPLv2 GPLv3 LGPL21
+LICENSE_COMB?=	multi
+
+SLAVE_PORT?=	no
+
+.if ${SLAVE_PORT} == "no"
 
 # They both install bin/melt.
 CONFLICTS_INSTALL=	freeze-[0-9]*
@@ -25,9 +29,9 @@ MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 
 .ifndef(WITH_DEBUG)
-CONFIGURE_ARGS+=	--disable-debug
+CONFIGURE_ARGS+=--disable-debug
 .else
-CONFIGURE_ARGS+=	--enable-debug
+CONFIGURE_ARGS+=--enable-debug
 .endif
 
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
@@ -53,137 +57,137 @@ BROKEN=		does not compile on sparc64 (invokes i386 asm)
 .endif
 
 .if ${PORT_OPTIONS:MDV}
-LIB_DEPENDS+=	dv.4:${PORTSDIR}/multimedia/libdv
-CONFIGURE_ARGS+=	--enable-dv
+LIB_DEPENDS+=	dv:${PORTSDIR}/multimedia/libdv
+CONFIGURE_ARGS+=--enable-dv
 PLIST_SUB+=	DV=""
 .else
-CONFIGURE_ARGS+=	--disable-dv
+CONFIGURE_ARGS+=--disable-dv
 PLIST_SUB+=	DV="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG} || ${PORT_OPTIONS:MVDPAU}
-FFMPEG_SUFFIX=	-011
-LIB_DEPENDS+=	avformat${FFMPEG_SUFFIX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX}
-CONFIGURE_ARGS+=	--enable-avformat --avformat-swscale \
-			--avformat-suffix="${FFMPEG_SUFFIX}"
+FFMPEG_SUFX=	1
+LIB_DEPENDS+=	avformat${FFMPEG_SUFX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFX}
+CONFIGURE_ARGS+=--enable-avformat --avformat-swscale \
+		--avformat-suffix="${FFMPEG_SUFX}"
 PLIST_SUB+=	FFMPEG=""
 .else
-CONFIGURE_ARGS+=	--disable-avformat
+CONFIGURE_ARGS+=--disable-avformat
 PLIST_SUB+=	FFMPEG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFREI0R}
 BUILD_DEPENDS+=	${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
-CONFIGURE_ARGS+=	--enable-frei0r
+CONFIGURE_ARGS+=--enable-frei0r
 PLIST_SUB+=	FREI0R=""
 .else
-CONFIGURE_ARGS+=	--disable-frei0r
+CONFIGURE_ARGS+=--disable-frei0r
 PLIST_SUB+=	FREI0R="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGTK2}
-LIB_DEPENDS+=	exif.12:${PORTSDIR}/graphics/libexif
+LIB_DEPENDS+=	exif:${PORTSDIR}/graphics/libexif
 USE_GNOME+=	gdkpixbuf2 gtk20 pango
-CONFIGURE_ARGS+=	--enable-gtk2
+CONFIGURE_ARGS+=--enable-gtk2
 PLIST_SUB+=	GTK2=""
 .else
-CONFIGURE_ARGS+=	--disable-gtk2
+CONFIGURE_ARGS+=--disable-gtk2
 PLIST_SUB+=	GTK2="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
 BUILD_DEPENDS+=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-CONFIGURE_ARGS+=	--enable-jackrack
+CONFIGURE_ARGS+=--enable-jackrack
 PLIST_SUB+=	JACK=""
 .else
-CONFIGURE_ARGS+=	--disable-jackrack
+CONFIGURE_ARGS+=--disable-jackrack
 PLIST_SUB+=	JACK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MQT4}
-LIB_DEPENDS+=	exif.12:${PORTSDIR}/graphics/libexif
+LIB_DEPENDS+=	exif:${PORTSDIR}/graphics/libexif
 USE_QT4+=	gui svg xml
-CONFIGURE_ARGS+=	--enable-qimage \
-			--qimage-includedir="${QT_INCDIR}" \
-			--qimage-libdir="${QT_LIBDIR}"
+CONFIGURE_ARGS+=--enable-qimage \
+		--qimage-includedir="${QT_INCDIR}" \
+		--qimage-libdir="${QT_LIBDIR}"
 PLIST_SUB+=	QT4=""
 .else
-CONFIGURE_ARGS+=	--disable-qimage
+CONFIGURE_ARGS+=--disable-qimage
 PLIST_SUB+=	QT4="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MQUICKTIME}
-LIB_DEPENDS+=	dv.4:${PORTSDIR}/multimedia/libdv \
-		quicktime.0:${PORTSDIR}/multimedia/libquicktime
-CONFIGURE_ARGS+=	--enable-kino
-PLIST_SUB+=	KINO=""
+LIB_DEPENDS+=	dv:${PORTSDIR}/multimedia/libdv \
+		quicktime:${PORTSDIR}/multimedia/libquicktime
+CONFIGURE_ARGS+=--enable-kino
+PLIST_SUB+=	QUICKTIME=""
 .else
-CONFIGURE_ARGS+=	--disable-kino
-PLIST_SUB+=	KINO="@comment "
+CONFIGURE_ARGS+=--disable-kino
+PLIST_SUB+=	QUICKTIME="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSAMPLERATE}
-LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
-CONFIGURE_ARGS+=	--enable-resample
+LIB_DEPENDS+=	samplerate:${PORTSDIR}/audio/libsamplerate
+CONFIGURE_ARGS+=--enable-resample
 PLIST_SUB+=	SAMPLERATE=""
 .else
-CONFIGURE_ARGS+=	--disable-resample
+CONFIGURE_ARGS+=--disable-resample
 PLIST_SUB+=	SAMPLERATE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSOX}
-LIB_DEPENDS+=	sox.1:${PORTSDIR}/audio/sox
-CONFIGURE_ARGS+=	--enable-sox
+LIB_DEPENDS+=	sox:${PORTSDIR}/audio/sox
+CONFIGURE_ARGS+=--enable-sox
 PLIST_SUB+=	SOX=""
 .else
-CONFIGURE_ARGS+=	--disable-sox
+CONFIGURE_ARGS+=--disable-sox
 PLIST_SUB+=	SOX="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSWFDEC}
-LIB_DEPENDS+=	swfdec-0.8.0:${PORTSDIR}/graphics/swfdec
-CONFIGURE_ARGS+=	--enable-swfdec
+LIB_DEPENDS+=	swfdec-0.8:${PORTSDIR}/graphics/swfdec
+CONFIGURE_ARGS+=--enable-swfdec
 PLIST_SUB+=	SWFDEC=""
 .else
-CONFIGURE_ARGS+=	--disable-swfdec
+CONFIGURE_ARGS+=--disable-swfdec
 PLIST_SUB+=	SWFDEC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MVDPAU}
 USE_XORG+=	x11
-CONFIGURE_ARGS+=	--avformat-vdpau
+CONFIGURE_ARGS+=--avformat-vdpau
 .else
-CONFIGURE_ARGS+=	--avformat--no-vdpau
+CONFIGURE_ARGS+=--avformat-no-vdpau
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
-CONFIGURE_ARGS+=	--enable-vorbis
+LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
+CONFIGURE_ARGS+=--enable-vorbis
 PLIST_SUB+=	VORBIS=""
 .else
-CONFIGURE_ARGS+=	--disable-vorbis
+CONFIGURE_ARGS+=--disable-vorbis
 PLIST_SUB+=	VORBIS="@comment "
 .endif
 
 pre-configure:
-	${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \
+	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \
 		${WRKSRC}/src/modules/avformat/vdpau.c \
 		${WRKSRC}/src/modules/frei0r/factory.c \
 		${WRKSRC}/src/modules/jackrack/plugin_mgr.c \
 		${WRKSRC}/src/modules/linsys/Makefile
-	${REINPLACE_CMD} -e 's,-pthread,${PTHREAD_LIBS},' \
+	@${REINPLACE_CMD} -e 's,-pthread,${PTHREAD_LIBS},' \
 		${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},' \
+	@${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},' \
 		${WRKSRC}/src/framework/Makefile \
 		${WRKSRC}/src/melt/Makefile \
 		${WRKSRC}/src/modules/*/Makefile
-	${REINPLACE_CMD} -e 's,$$(libdir)/pkgconfig,${PREFIX}/libdata/pkgconfig,' \
+	@${REINPLACE_CMD} -e 's,$$(libdir)/pkgconfig,${PREFIX}/libdata/pkgconfig,' \
 		${WRKSRC}/Makefile
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/melt.1 ${MANPREFIX}/man/man1/melt.1
-	${RM} -f ${WRKSRC}/docs/melt.1
+	@${RM} -f ${WRKSRC}/docs/melt.1
 .if ${PORT_OPTIONS:MDOCS}
 . for f in ${PORTDOCS}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} ${f} ${DOCSDIR}
@@ -195,4 +199,6 @@ post-install:
 . endfor
 .endif
 
+.endif # ${SLAVE_PORT} == "no"
+
 .include <bsd.port.mk>
diff --git a/multimedia/mlt/distinfo b/multimedia/mlt/distinfo
index 691b5b893f44..8ed90a1a24a6 100644
--- a/multimedia/mlt/distinfo
+++ b/multimedia/mlt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mlt-0.8.2.tar.gz) = 36c743d2abc68ce737ac526507fc2caf71b3d6a53a2bf31d22e8193a8b899577
-SIZE (mlt-0.8.2.tar.gz) = 1161293
+SHA256 (mlt-0.8.6.tar.gz) = 8323e546a661942c5bb880886a949e8243f9b53082cb3464a54009280c5bbb3f
+SIZE (mlt-0.8.6.tar.gz) = 1104163
diff --git a/multimedia/mlt/files/patch-src__framework__configure b/multimedia/mlt/files/patch-src__framework__configure
deleted file mode 100644
index 831fca751e5b..000000000000
--- a/multimedia/mlt/files/patch-src__framework__configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/framework/configure.orig	2012-09-04 00:19:55.916055280 +0200
-+++ ./src/framework/configure	2012-09-04 00:42:27.466054331 +0200
-@@ -4,7 +4,7 @@
- echo > config.mak
- if [ "$(uname -s)" = "FreeBSD" ]
- then
--	printf "#include <sys/param.h>\n int main(){ return 0;}" | gcc -c -x c - >/dev/null 2>&1
-+	printf "#include <sys/param.h>\n int main(){ return 0;}" | $CC -c -x c - >/dev/null 2>&1
- 	[ "$?" -eq 0 ] && echo "HAVE_SYS_PARAM_H=1" >> config.mak
- fi
- exit 0
diff --git a/multimedia/mlt/files/patch-src__framework__mlt_property.h b/multimedia/mlt/files/patch-src__framework__mlt_property.h
deleted file mode 100644
index 3b3635b4f9ce..000000000000
--- a/multimedia/mlt/files/patch-src__framework__mlt_property.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/framework/mlt_property.h.orig	2012-06-01 22:51:32.000000000 +0200
-+++ ./src/framework/mlt_property.h	2012-06-12 03:54:31.992557693 +0200
-@@ -30,7 +30,7 @@
- #include <sys/param.h>
- #endif
- 
--#if defined(__GLIBC__) || defined(__DARWIN__) || (__FreeBSD_version >= 1000002)
-+#if defined(__GLIBC__) || defined(__DARWIN__) || (__FreeBSD_version >= 900506)
- #include <xlocale.h>
- #else
- typedef void* locale_t;
diff --git a/multimedia/mlt/files/patch-src__modules__avformat__configure b/multimedia/mlt/files/patch-src__modules__avformat__configure
deleted file mode 100644
index 07457313d229..000000000000
--- a/multimedia/mlt/files/patch-src__modules__avformat__configure
+++ /dev/null
@@ -1,66 +0,0 @@
---- ./src/modules/avformat/configure.orig	2012-10-02 05:23:05.066523985 +0200
-+++ ./src/modules/avformat/configure	2012-10-02 05:27:15.848135787 +0200
-@@ -54,7 +54,7 @@
- 	echo > config.mak
- 
- 	export static_ffmpeg=
--	export shared_ffmpeg=$(pkg-config --variable=prefix libavformat)
-+	export shared_ffmpeg=
- 	export extra_libs=
- 	export avformat_suffix=
- 	export swscale=
-@@ -82,6 +82,8 @@
- 		esac
- 	done
- 
-+	: ${shared_ffmpeg:=$(pkg-config --variable=prefix libavformat${avformat_suffix})}
-+
- 	if [ "$static_ffmpeg" != "" ]
- 	then 
- 		if [ -d "$static_ffmpeg" ]
-@@ -105,7 +107,7 @@
- 			
- 			if [ "$vdpau" = "true" ]
- 			then
--				printf "#include <libavcodec/vdpau.h>\n int main(){ VdpBitstreamBuffer test; test.struct_version; return 0;}" | gcc -I"$static_ffmpeg" $CFLAGS -c -x c -  >/dev/null 2>&1
-+				printf "#include <libavcodec/vdpau.h>\n int main(){ VdpBitstreamBuffer test; test.struct_version; return 0;}" | $CC -I"$static_ffmpeg" $CFLAGS -c -x c -  >/dev/null 2>&1
- 				[ "$x11" = "0" -a "$?" = "0" ] && echo "VDPAU=1" >> config.mak
- 			fi
- 		else
-@@ -121,27 +123,27 @@
- 				echo "CFLAGS+=-DAVDATADIR=\\\"share/ffmpeg/\\\"" >> config.mak
- 			;;
- 			*)
--				echo "CFLAGS+=-DAVDATADIR=\\\"${shared_ffmpeg}/share/ffmpeg/\\\"" >> config.mak
-+				echo "CFLAGS+=-DAVDATADIR=\\\"${shared_ffmpeg}/share/ffmpeg${avformat_suffix}/\\\"" >> config.mak
- 			;;
- 		esac
--		echo "CFLAGS+=$(pkg-config --cflags libavformat)" >> config.mak
--		echo "LDFLAGS+=$(pkg-config --libs-only-L libavformat)" >> config.mak
-+		echo "CFLAGS+=$(pkg-config --cflags libavformat${avformat_suffix})" >> config.mak
-+		echo "LDFLAGS+=$(pkg-config --libs-only-L libavformat${avformat_suffix})" >> config.mak
- 		if [ "$devices" = "true" ]
- 		then
--			echo "CFLAGS+=$(pkg-config --cflags libavdevice)" >> config.mak
--			echo "LDFLAGS+=$(pkg-config --libs-only-L libavdevice)" >> config.mak
-+			echo "CFLAGS+=$(pkg-config --cflags libavdevice${avformat_suffix})" >> config.mak
-+			echo "LDFLAGS+=$(pkg-config --libs-only-L libavdevice${avformat_suffix})" >> config.mak
- 		fi
--		avcodec_version=$(pkg-config --modversion libavcodec)
-+		avcodec_version=$(pkg-config --modversion libavcodec${avformat_suffix})
- 		if [ "$swscale" != "" ] || [ $(echo $avcodec_version | cut -d. -f1) -gt 52 ] || ( [ $(echo $avcodec_version | cut -d. -f1) -ge 52 ] && [ $(echo $avcodec_version | cut -d. -f2) -ge 21 ] )
- 		then
--			echo "CFLAGS+=$(pkg-config --cflags libswscale)" >> config.mak
--			echo "LDFLAGS+=$(pkg-config --libs-only-L libswscale)" >> config.mak
-+			echo "CFLAGS+=$(pkg-config --cflags libswscale${avformat_suffix})" >> config.mak
-+			echo "LDFLAGS+=$(pkg-config --libs-only-L libswscale${avformat_suffix})" >> config.mak
- 			echo "SWSCALE=1" >> config.mak
- 		fi
- 		
- 		if [ "$vdpau" = "true" ]
- 		then
--			printf "#include <libavcodec/vdpau.h>\n int main(){ VdpBitstreamBuffer test; test.struct_version; return 0;}" | gcc -I"$(pkg-config --cflags libavformat)" -I"$shared_ffmpeg/include" $CFLAGS -c -x c -  >/dev/null 2>&1
-+			printf "#include <libavcodec/vdpau.h>\n int main(){ VdpBitstreamBuffer test; test.struct_version; return 0;}" | $CC $(pkg-config --cflags libavformat${avformat_suffix}) -I"$shared_ffmpeg/include" $CFLAGS -c -x c -  >/dev/null 2>&1
- 			[ "$x11" = "0" -a "$?" = "0" ] && echo "VDPAU=1" >> config.mak
- 		fi
- 	else
diff --git a/multimedia/mlt/files/patch-src__modules__frei0r__configure b/multimedia/mlt/files/patch-src__modules__frei0r__configure
deleted file mode 100644
index ccd5af457856..000000000000
--- a/multimedia/mlt/files/patch-src__modules__frei0r__configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/modules/frei0r/configure.orig	2012-10-02 05:23:05.066523985 +0200
-+++ ./src/modules/frei0r/configure	2012-10-02 05:25:52.436629939 +0200
-@@ -3,7 +3,7 @@
- if [ "$help" != "1" ]
- then
- 
--	echo "#include <frei0r.h> int main(){ f0r_plugin_info_t test; test.name;return 0;}"| gcc $CFLAGS -c -x c -  >/dev/null 2>&1
-+	echo "#include <frei0r.h> int main(){ f0r_plugin_info_t test; test.name;return 0;}"| $CC $(pkg-config --cflags frei0r) $CFLAGS -c -x c -  >/dev/null 2>&1
- 
- 	if [ "$?" = "1" ]
- 	then
diff --git a/multimedia/mlt/files/patch-src__modules__kdenlive__Makefile b/multimedia/mlt/files/patch-src__modules__kdenlive__Makefile
deleted file mode 100644
index ee8058e8832e..000000000000
--- a/multimedia/mlt/files/patch-src__modules__kdenlive__Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./src/modules/kdenlive/Makefile.orig	2012-05-15 08:54:26.554246237 +0200
-+++ ./src/modules/kdenlive/Makefile	2012-05-15 08:57:20.794280283 +0200
-@@ -3,6 +3,13 @@
- LDFLAGS += -L../../framework -lmlt
- 
- include ../../../config.mak
-+include ../../framework/config.mak
-+
-+ifeq ($(targetos), FreeBSD)
-+	ifdef HAVE_SYS_PARAM_H
-+		CFLAGS += -DHAVE_SYS_PARAM_H
-+	endif
-+endif
- 
- TARGET = ../libmltkdenlive$(LIBSUF)
- 
diff --git a/multimedia/mlt/pkg-plist b/multimedia/mlt/pkg-plist
index 1139775e1700..c13b07e6216b 100644
--- a/multimedia/mlt/pkg-plist
+++ b/multimedia/mlt/pkg-plist
@@ -65,7 +65,7 @@ lib/mlt/libmlteffectv.so
 %%GTK2%%lib/mlt/libmltgtk2.so
 %%JACK%%lib/mlt/libmltjackrack.so
 lib/mlt/libmltkdenlive.so
-%%KINO%%lib/mlt/libmltkino.so
+%%QUICKTIME%%lib/mlt/libmltkino.so
 lib/mlt/libmltlinsys.so
 lib/mlt/libmltmotion_est.so
 lib/mlt/libmltnormalize.so
@@ -196,6 +196,7 @@ libdata/pkgconfig/mlt-framework.pc
 %%DATADIR%%/motion_est/filter_motion_est.yml
 %%DATADIR%%/motion_est/filter_vismv.yml
 %%DATADIR%%/motion_est/producer_slowmotion.yml
+%%DATADIR%%/normalize/filter_audiolevel.yml
 %%DATADIR%%/normalize/filter_volume.yml
 %%DATADIR%%/oldfilm/dust1.svg
 %%DATADIR%%/oldfilm/dust2.svg