- Update to 0.9.6.

- Remove LICENSE_FILE.
- Remove soversion number from LIB_DEPENDS.
- Add support for different FFmpeg versions (currently using ffmpeg1).

7 files changed, 79 insertions, 23 deletions

diff --git a/multimedia/kdenlive/Makefile b/multimedia/kdenlive/Makefile
index dd8b3c094ce9..5cc90e181b96 100644
--- a/multimedia/kdenlive/Makefile
+++ b/multimedia/kdenlive/Makefile
@@ -1,9 +1,7 @@
-# Created by: Alberto Villa <villa.alberto@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	kdenlive
-PORTVERSION=	0.9.2
-PORTREVISION=	1
+PORTVERSION=	0.9.6
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src/
@@ -12,28 +10,32 @@ MAINTAINER=	avilla@FreeBSD.org
 COMMENT=	KDE professional quality non-linear video editing suite
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	mlt.5:${PORTSDIR}/multimedia/mlt \
-		qjson.0:${PORTSDIR}/devel/qjson
-RUN_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS=	mlt:${PORTSDIR}/multimedia/mlt \
+		qjson:${PORTSDIR}/devel/qjson
+RUN_DEPENDS=	ffmpeg${FFMPEG_SUFX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFX}
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4 sharedmime
 USE_QT4=	dbus gui opengl script svg xml \
 		moc_build qmake_build rcc_build uic_build
 USE_XORG=	x11
-USE_BZIP2=	yes
 USES=		cmake
+USE_BZIP2=	yes
+CMAKE_ARGS=	-DFFMPEG_SUFFIX:STRING="${FFMPEG_SUFX}"
 MAKE_JOBS_SAFE=	yes
 
+# Keep in sync with multimedia/mlt, possibly.
+FFMPEG_SUFX=	1
+
 MAN1=		kdenlive.1 kdenlive_render.1
 
-OPTIONS_DEFINE=	DVDWIZARD FREI0R LADSPA SCREENREC XINE
-DVDWIZARD_DESC=	DVD authoring with DVDAuthor and cdrtools
-SCREENREC_DESC=	Screen recording with recordMyDesktop
-XINE_DESC=	DVD previewing with xine
+OPTIONS_DEFINE=	DVDWIZARD FREI0R LADSPA NLS SCREENCAST XINE
+OPTIONS_DEFAULT=DVDWIZARD FREI0R LADSPA SCREENCAST XINE
 
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+DVDWIZARD_DESC=	DVD authoring via DVDAuthor and cdrtools
+SCREENCAST_DESC=Screen capture support via recordMyDesktop
+#V4L_DESC=	Webcam support via Video 4 Linux
+XINE_DESC=	DVD preview support via xine
 
 .include <bsd.port.options.mk>
 
@@ -58,18 +60,25 @@ CMAKE_ARGS+=	-DBUILD_po:BOOL=FALSE
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MSCREENREC}
+.if ${PORT_OPTIONS:MSCREENCAST}
 RUN_DEPENDS+=	recordmydesktop:${PORTSDIR}/multimedia/recordmydesktop
 .endif
 
+#.if ${PORT_OPTIONS:MV4L}
+#LIB_DEPENDS+=	v4l2:${PORTSDIR}/multimedia/libv4l
+#BUILD_DEPENDS+=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
+#.else
+CMAKE_ARGS+=	-DWITH_V4L:BOOL=FALSE
+#.endif
+
 .if ${PORT_OPTIONS:MXINE}
 RUN_DEPENDS+=	xine:${PORTSDIR}/multimedia/xine
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -E -e '/${PORTNAME}.(menu|xpm)/ d' \
+	@${REINPLACE_CMD} -E -e '/${PORTNAME}.(menu|xpm)/ d' \
 		${PATCH_WRKSRC}/data/CMakeLists.txt
-	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d; /SharedMimeInfo/ d' \
+	@${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d; /SharedMimeInfo/ d' \
 		${PATCH_WRKSRC}/src/mimetypes/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/multimedia/kdenlive/distinfo b/multimedia/kdenlive/distinfo
index 539ec2a1d203..6b532eb4f10d 100644
--- a/multimedia/kdenlive/distinfo
+++ b/multimedia/kdenlive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kdenlive-0.9.2.tar.bz2) = 410e4261d2300a306be05484559490a7533c4655dfe5caf7d3e883c0800644c0
-SIZE (kdenlive-0.9.2.tar.bz2) = 5341243
+SHA256 (kdenlive-0.9.6.tar.bz2) = fdc447135428864a283c48122f8bffc236fa2e5cdffbbc65e44bd5e2ff6282e7
+SIZE (kdenlive-0.9.6.tar.bz2) = 5355764
diff --git a/multimedia/kdenlive/files/patch-src__CMakeLists.txt b/multimedia/kdenlive/files/patch-src__CMakeLists.txt
new file mode 100644
index 000000000000..5ed9d6dc5a61
--- /dev/null
+++ b/multimedia/kdenlive/files/patch-src__CMakeLists.txt
@@ -0,0 +1,11 @@
+--- ./src/CMakeLists.txt.orig	2013-04-06 21:25:09.000000000 +0200
++++ ./src/CMakeLists.txt	2013-06-05 15:33:12.402759625 +0200
+@@ -14,6 +14,8 @@
+ option(WITH_V4L "Build capture support with Video4Linux" ON)
+ option(WITH_JogShuttle "Build Jog/Shuttle support" ON)
+ 
++set(FFMPEG_SUFFIX "" CACHE STRING "FFmpeg custom suffix")
++add_definitions(-DFFMPEG_SUFFIX=\\\"\"${FFMPEG_SUFFIX}\"\\\")
+ 
+ 
+ if(WITH_V4L)
diff --git a/multimedia/kdenlive/files/patch-src__recmonitor.cpp b/multimedia/kdenlive/files/patch-src__recmonitor.cpp
new file mode 100644
index 000000000000..c3cc0771ab46
--- /dev/null
+++ b/multimedia/kdenlive/files/patch-src__recmonitor.cpp
@@ -0,0 +1,11 @@
+--- ./src/recmonitor.cpp.orig	2013-04-06 21:25:09.000000000 +0200
++++ ./src/recmonitor.cpp	2013-06-05 15:37:14.742805014 +0200
+@@ -269,7 +269,7 @@
+         m_stopAction->setEnabled(false);
+         m_playAction->setEnabled(false);
+ 	if (KdenliveSettings::ffmpegpath().isEmpty()) {
+-	    QString exepath = KStandardDirs::findExe("ffmpeg");
++	    QString exepath = KStandardDirs::findExe(QString("ffmpeg%1").arg(FFMPEG_SUFFIX));
+ 	    if (exepath.isEmpty()) {
+ 		// Check for libav version
+ 		exepath = KStandardDirs::findExe("avconv");
diff --git a/multimedia/kdenlive/files/patch-src__wizard.cpp b/multimedia/kdenlive/files/patch-src__wizard.cpp
new file mode 100644
index 000000000000..c6de970a5bbd
--- /dev/null
+++ b/multimedia/kdenlive/files/patch-src__wizard.cpp
@@ -0,0 +1,13 @@
+--- ./src/wizard.cpp.orig	2013-04-06 21:25:09.000000000 +0200
++++ ./src/wizard.cpp	2013-06-07 14:37:07.694597426 +0200
+@@ -499,8 +499,8 @@
+     QTreeWidgetItem *item = new QTreeWidgetItem(m_check.programList, QStringList() << QString() << i18n("FFmpeg & ffplay"));
+     item->setData(1, Qt::UserRole, i18n("Required for proxy clips, transcoding and screen capture"));
+     item->setSizeHint(0, itemSize);
+-    QString exepath = KStandardDirs::findExe("ffmpeg");
+-    QString playpath = KStandardDirs::findExe("ffplay");
++    QString exepath = KStandardDirs::findExe(QString("ffmpeg%1").arg(FFMPEG_SUFFIX));
++    QString playpath = KStandardDirs::findExe(QString("ffplay%1").arg(FFMPEG_SUFFIX));
+     item->setIcon(0, m_okIcon);
+     if (exepath.isEmpty()) {
+ 	// Check for libav version
diff --git a/multimedia/kdenlive/pkg-descr b/multimedia/kdenlive/pkg-descr
index 37e010bcc34d..97802f1859ad 100644
--- a/multimedia/kdenlive/pkg-descr
+++ b/multimedia/kdenlive/pkg-descr
@@ -1,7 +1,7 @@
-Kdenlive is a non-linear video editor for GNU/Linux, Mac OS X and
-FreeBSD, which supports DV, AVCHD (experimental support) and HDV
-editing. Kdenlive relies on several other open source projects, such
-as FFmpeg and the MLT video framework. It was designed to answer all
-needs, from basic video editing to semi-professional work.
+Kdenlive is a non-linear video editor for GNU/Linux, OS X and FreeBSD,
+which supports DV, AVCHD and HDV editing. Kdenlive relies on several
+other open source projects, such as FFmpeg, the MLT video framework
+and Frei0r effects. It was designed to answer all needs, from basic
+video editing to semi-professional work.
 
 WWW: http://www.kdenlive.org
diff --git a/multimedia/kdenlive/pkg-plist b/multimedia/kdenlive/pkg-plist
index c2d564e888b6..c71932f96088 100644
--- a/multimedia/kdenlive/pkg-plist
+++ b/multimedia/kdenlive/pkg-plist
@@ -34,8 +34,10 @@ share/apps/kdenlive/effects/frei0r_brightness.xml
 share/apps/kdenlive/effects/frei0r_c0rners.xml
 share/apps/kdenlive/effects/frei0r_cartoon.xml
 share/apps/kdenlive/effects/frei0r_cluster.xml
+share/apps/kdenlive/effects/frei0r_colgate.xml
 share/apps/kdenlive/effects/frei0r_coloradj_rgb.xml
 share/apps/kdenlive/effects/frei0r_colordistance.xml
+share/apps/kdenlive/effects/frei0r_colortap.xml
 share/apps/kdenlive/effects/frei0r_contrast0r.xml
 share/apps/kdenlive/effects/frei0r_curves.xml
 share/apps/kdenlive/effects/frei0r_d90stairsteppingfix.xml
@@ -52,12 +54,14 @@ share/apps/kdenlive/effects/frei0r_glow.xml
 share/apps/kdenlive/effects/frei0r_hqdn3d.xml
 share/apps/kdenlive/effects/frei0r_hueshift0r.xml
 share/apps/kdenlive/effects/frei0r_iirblur.xml
+share/apps/kdenlive/effects/frei0r_keyspillm0pup.xml
 share/apps/kdenlive/effects/frei0r_lenscorrection.xml
 share/apps/kdenlive/effects/frei0r_letterb0xed.xml
 share/apps/kdenlive/effects/frei0r_levels.xml
 share/apps/kdenlive/effects/frei0r_lightgraffiti.xml
 share/apps/kdenlive/effects/frei0r_luminance.xml
 share/apps/kdenlive/effects/frei0r_mask0mate.xml
+share/apps/kdenlive/effects/frei0r_medians.xml
 share/apps/kdenlive/effects/frei0r_nervous.xml
 share/apps/kdenlive/effects/frei0r_nosync0r.xml
 share/apps/kdenlive/effects/frei0r_pixeliz0r.xml
@@ -77,6 +81,7 @@ share/apps/kdenlive/effects/frei0r_tehroxx0r.xml
 share/apps/kdenlive/effects/frei0r_three_point_balance.xml
 share/apps/kdenlive/effects/frei0r_threelay0r.xml
 share/apps/kdenlive/effects/frei0r_threshold0r.xml
+share/apps/kdenlive/effects/frei0r_timeout.xml
 share/apps/kdenlive/effects/frei0r_tint0r.xml
 share/apps/kdenlive/effects/frei0r_twolay0r.xml
 share/apps/kdenlive/effects/frei0r_vectorscope.xml
@@ -143,6 +148,9 @@ share/apps/kdenlive/lumas/square.pgm
 share/apps/kdenlive/lumas/square2-bars.pgm
 share/apps/kdenlive/lumas/square2.pgm
 share/apps/kdenlive/lumas/symmetric_clock.pgm
+share/apps/kdenlive/meta_ffmpeg.png
+share/apps/kdenlive/meta_libav.png
+share/apps/kdenlive/meta_magiclantern.png
 share/apps/kdenlive/metadata.properties
 share/apps/kdenlive/pics/novisible.png
 share/apps/kdenlive/pics/visible.png
@@ -384,7 +392,9 @@ share/icons/oxygen/scalable/actions/kdenlive-zone-end.svgz
 share/icons/oxygen/scalable/actions/kdenlive-zone-start.svgz
 share/icons/oxygen/scalable/mimetypes/application-x-kdenlivetitle.svgz
 share/kde4/services/westleypreview.desktop
+%%NLS%%share/locale/bs/LC_MESSAGES/kdenlive.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/kdenlive.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdenlive.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/kdenlive.mo
 %%NLS%%share/locale/da/LC_MESSAGES/kdenlive.mo
 %%NLS%%share/locale/de/LC_MESSAGES/kdenlive.mo
@@ -401,12 +411,14 @@ share/kde4/services/westleypreview.desktop
 %%NLS%%share/locale/it/LC_MESSAGES/kdenlive.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/kdenlive.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/kdenlive.mo
+%%NLS%%share/locale/mr/LC_MESSAGES/kdenlive.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/kdenlive.mo
 %%NLS%%share/locale/nds/LC_MESSAGES/kdenlive.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/kdenlive.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/kdenlive.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/kdenlive.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdenlive.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/kdenlive.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/kdenlive.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/kdenlive.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/kdenlive.mo