From owner-svn-ports-all@FreeBSD.ORG  Wed Jul 18 12:50:14 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 0491F1065674;
	Wed, 18 Jul 2012 12:50:14 +0000 (UTC)
	(envelope-from avilla@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E377B8FC18;
	Wed, 18 Jul 2012 12:50:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6ICoDcR072441;
	Wed, 18 Jul 2012 12:50:13 GMT (envelope-from avilla@svn.freebsd.org)
Received: (from avilla@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6ICoDI9072439;
	Wed, 18 Jul 2012 12:50:13 GMT (envelope-from avilla@svn.freebsd.org)
Message-Id: <201207181250.q6ICoDI9072439@svn.freebsd.org>
From: Alberto Villa <avilla@FreeBSD.org>
Date: Wed, 18 Jul 2012 12:50:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r301094 - head/multimedia/kdenlive
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Jul 2012 12:50:14 -0000

Author: avilla
Date: Wed Jul 18 12:50:13 2012
New Revision: 301094
URL: http://svn.freebsd.org/changeset/ports/301094

Log:
  - Force dependency on multimedia/ffmpeg.
  - OPTIONSngify, part 2/2.

Modified:
  head/multimedia/kdenlive/Makefile   (contents, props changed)

Modified: head/multimedia/kdenlive/Makefile
==============================================================================
--- head/multimedia/kdenlive/Makefile	Wed Jul 18 12:48:22 2012	(r301093)
+++ head/multimedia/kdenlive/Makefile	Wed Jul 18 12:50:13 2012	(r301094)
@@ -19,6 +19,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	mlt.5:${PORTSDIR}/multimedia/mlt \
 		qjson.0:${PORTSDIR}/devel/qjson
+RUN_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4 sharedmime
 USE_QT4=	dbus gui opengl script svg xml \
@@ -30,15 +31,16 @@ MAKE_JOBS_SAFE=	yes
 
 MAN1=		kdenlive.1 kdenlive_render.1
 
-OPTIONS=	DVD	"DVD creation with cdrtools and dvdauthor" on \
-		FREI0R	"frei0r video plugins" on \
-		LADSPA	"LADSPA audio plugins" on \
-		SCREENGRAB	"Screen capture with recordMyDesktop" on \
-		XINE	"DVD preview with xine" on
+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_DEFAULT=	${OPTIONS_DEFINE}
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDVD}
+.if ${PORT_OPTIONS:MDVDWIZARD}
 RUN_DEPENDS+=	dvdauthor:${PORTSDIR}/multimedia/dvdauthor
 USE_CDRTOOLS=	yes
 .endif
@@ -59,7 +61,7 @@ CMAKE_ARGS+=	-DBUILD_po:BOOL=FALSE
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MSCREENGRAB}
+.if ${PORT_OPTIONS:MSCREENREC}
 RUN_DEPENDS+=	recordmydesktop:${PORTSDIR}/multimedia/recordmydesktop
 .endif