- Update to 0.6.0.

Feature safe:	yes

3 files changed, 21 insertions, 19 deletions

diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
index 9be622f5599b..1f7beba61b1a 100644
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	mlt
-PORTVERSION=	0.5.10
+PORTVERSION=	0.6.0
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
@@ -25,7 +25,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-debug \
 		--enable-gpl
 USE_GMAKE=	yes
-MAKE_ENV=	LDFLAGS="-lc" # Required by FreeBSD 6.X.
 CFLAGS+=	-I${LOCALBASE}/include
 USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/mlt
 
@@ -46,6 +45,7 @@ OPTIONS=	AVFORMAT	"Avformat module" on \
 		SOX	"Sound eXchange module" on \
 		SSE	"SSE support (requires MMX)" off \
 		SSE2	"SSE2 support (requires SSE)" off \
+		SWFDEC	"Swfdec module" on \
 		VORBIS	"Vorbis module" on
 
 .include <bsd.port.options.mk>
@@ -156,6 +156,15 @@ CONFIGURE_ARGS+=	--enable-sse2
 CONFIGURE_ARGS+=	--disable-sse2
 .endif
 
+.ifndef(WITHOUT_SWFDEC)
+LIB_DEPENDS+=	swfdec-0.8.0:${PORTSDIR}/graphics/swfdec
+CONFIGURE_ARGS+=	--enable-swfdec
+PLIST_SUB+=	SWFDEC=""
+.else
+CONFIGURE_ARGS+=	--disable-swfdec
+PLIST_SUB+=	SWFDEC="@comment "
+.endif
+
 .ifndef(WITHOUT_VORBIS)
 LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
 CONFIGURE_ARGS+=	--enable-vorbis
@@ -165,17 +174,7 @@ CONFIGURE_ARGS+=	--disable-vorbis
 PLIST_SUB+=	VORBIS="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-
 pre-configure:
-.if ${OSVERSION} < 700041
-	${REINPLACE_CMD} -E -e 's|^(LDFLAGS.*)|\1 -lthr|' \
-		${WRKSRC}/src/framework/Makefile \
-		${WRKSRC}/src/modules/avformat/Makefile \
-		${WRKSRC}/src/modules/core/Makefile \
-		${WRKSRC}/src/modules/dv/Makefile \
-		${WRKSRC}/src/modules/sdl/Makefile
-.endif
 	${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/configure \
 		${WRKSRC}/src/swig/*/build
@@ -193,4 +192,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/mlt/distinfo b/multimedia/mlt/distinfo
index 0b8d792987fa..287f58fa3a3b 100644
--- a/multimedia/mlt/distinfo
+++ b/multimedia/mlt/distinfo
@@ -1,3 +1,2 @@
-MD5 (mlt-0.5.10.tar.gz) = 6869ed138193cc0e3113e4e7ac341e14
-SHA256 (mlt-0.5.10.tar.gz) = 106636540cdf44f670937b8df549ea2c988a27d05e14d4a8670f9b6af5a0d19e
-SIZE (mlt-0.5.10.tar.gz) = 819471
+SHA256 (mlt-0.6.0.tar.gz) = 91a0d916a39f03b437192a6e0c34354996458a8892ce0c91740c9881ea14746e
+SIZE (mlt-0.6.0.tar.gz) = 860173
diff --git a/multimedia/mlt/pkg-plist b/multimedia/mlt/pkg-plist
index e3c8048d7c88..2ae5356aebeb 100644
--- a/multimedia/mlt/pkg-plist
+++ b/multimedia/mlt/pkg-plist
@@ -48,14 +48,16 @@ include/mlt/framework/mlt_tokeniser.h
 include/mlt/framework/mlt_tractor.h
 include/mlt/framework/mlt_transition.h
 include/mlt/framework/mlt_types.h
+include/mlt/framework/mlt_version.h
 lib/libmlt++.so
-lib/libmlt++.so.0.5.10
+lib/libmlt++.so.0.6.0
 lib/libmlt++.so.3
 lib/libmlt.so
-lib/libmlt.so.0.5.10
-lib/libmlt.so.2
+lib/libmlt.so.0.6.0
+lib/libmlt.so.3
 %%AVFORMAT%%lib/mlt/libmltavformat.so
 lib/mlt/libmltcore.so
+lib/mlt/libmltdecklink.so
 lib/mlt/libmltdgraft.so
 %%DV%%lib/mlt/libmltdv.so
 lib/mlt/libmlteffectv.so
@@ -73,6 +75,7 @@ lib/mlt/libmltplus.so
 %%RESAMPLE%%lib/mlt/libmltresample.so
 lib/mlt/libmltsdl.so
 %%SOX%%lib/mlt/libmltsox.so
+%%SWFDEC%%lib/mlt/libmltswfdec.so
 lib/mlt/libmltvmfx.so
 %%VORBIS%%lib/mlt/libmltvorbis.so
 lib/mlt/libmltxine.so
@@ -84,6 +87,7 @@ libdata/pkgconfig/mlt-framework.pc
 %%DATADIR%%/core/loader.dict
 %%DATADIR%%/core/loader.ini
 %%DATADIR%%/feeds/NTSC/data_fx.properties
+%%DATADIR%%/feeds/NTSC/etv.properties
 %%DATADIR%%/feeds/NTSC/obscure.properties
 %%DATADIR%%/feeds/PAL/border.properties
 %%DATADIR%%/feeds/PAL/data_fx.properties