From owner-freebsd-multimedia@FreeBSD.ORG  Thu Jan 30 16:29:57 2014
Return-Path: <owner-freebsd-multimedia@FreeBSD.ORG>
Delivered-To: multimedia@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0E1A252E;
 Thu, 30 Jan 2014 16:29:57 +0000 (UTC)
Received: from smtpout6.timeweb.ru (smtpout6.timeweb.ru [92.53.117.39])
 (using TLSv1 with cipher AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id BAE991D06;
 Thu, 30 Jan 2014 16:29:56 +0000 (UTC)
Received: from [213.148.20.85] (helo=hive.panopticon)
 by smtp.timeweb.ru with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
 (Exim 4.76) (envelope-from <amdmi3@amdmi3.ru>)
 id 1W8uUt-0001Mp-J5; Thu, 30 Jan 2014 20:29:47 +0400
Received: from hades.panopticon (hades.panopticon [192.168.0.32])
 by hive.panopticon (Postfix) with ESMTP id 3082164B;
 Thu, 30 Jan 2014 20:29:47 +0400 (MSK)
Received: by hades.panopticon (Postfix, from userid 1000)
 id 039792AEE4; Thu, 30 Jan 2014 20:29:46 +0400 (MSK)
To: FreeBSD-gnats-submit@freebsd.org
Subject: [PATCH] multimedia/avidemux2: fix QT4 option handling
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
X-send-pr-version: 3.113
X-GNATS-Notify: 
Message-Id: <20140130162947.039792AEE4@hades.panopticon>
Date: Thu, 30 Jan 2014 20:29:46 +0400 (MSK)
Cc: multimedia@FreeBSD.org
X-BeenThere: freebsd-multimedia@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: Multimedia discussions <freebsd-multimedia.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-multimedia>, 
 <mailto:freebsd-multimedia-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-multimedia/>
List-Post: <mailto:freebsd-multimedia@freebsd.org>
List-Help: <mailto:freebsd-multimedia-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-multimedia>, 
 <mailto:freebsd-multimedia-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Jan 2014 16:29:57 -0000


>Submitter-Id:	current-users
>Originator:	Dmitry Marakasov
>Organization:	
>Confidential:	no 
>Synopsis:	[PATCH] multimedia/avidemux2: fix QT4 option handling
>Severity:	non-critical
>Priority:	low
>Category:	ports 
>Class:		change-request
>Release:	FreeBSD 10.0-RELEASE amd64
>Environment:
System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK
>Description:
- Fix leftover from pre-OPTIONSng era; as a result, this fixes plist in case of both NLS and QT4 enabled

Port maintainer (multimedia@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- avidemux2-2.5.6_5.patch begins here ---
Index: Makefile.common
===================================================================
--- Makefile.common	(revision 341857)
+++ Makefile.common	(working copy)
@@ -46,10 +46,10 @@
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 PLIST_SUB+=	NLS=""
-. 	if !defined(WITH_QT4)
+. 	if ${PORT_OPTIONS:MQT4}
+PLIST_SUB+=	QT_NLS=""
+.	else
 PLIST_SUB+=	QT_NLS="@comment "
-.	else
-PLIST_SUB+=	QT_NLS=""
 .	endif
 .else
 CMAKE_ARGS+=	-DNO_NLS:BOOL=ON
--- avidemux2-2.5.6_5.patch ends here ---