From amdmi3@amdmi3.ru  Thu Jan 30 16:29:57 2014
Return-Path: <amdmi3@amdmi3.ru>
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)
Message-Id: <20140130162947.039792AEE4@hades.panopticon>
Date: Thu, 30 Jan 2014 20:29:46 +0400 (MSK)
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc: multimedia@FreeBSD.org
Subject: [PATCH] multimedia/avidemux2: fix QT4 option handling
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         186280
>Category:       ports
>Synopsis:       [PATCH] multimedia/avidemux2: fix QT4 option handling
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-multimedia
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 30 16:40:00 UTC 2014
>Closed-Date:    Thu Jan 30 20:59:06 UTC 2014
>Last-Modified:  Thu Jan 30 21:00:00 UTC 2014
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 10.0-RELEASE amd64
>Organization:
>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 ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-multimedia 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Jan 30 16:40:09 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186280 
State-Changed-From-To: open->closed 
State-Changed-By: nox 
State-Changed-When: Thu Jan 30 20:59:05 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186280 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/186280: commit references a PR
Date: Thu, 30 Jan 2014 20:58:50 +0000 (UTC)

 Author: nox
 Date: Thu Jan 30 20:58:42 2014
 New Revision: 341886
 URL: http://svnweb.freebsd.org/changeset/ports/341886
 QAT: https://qat.redports.org/buildarchive/r341886/
 
 Log:
   Fix QT4 option handling.
   
   PR:		ports/186280
   Submitted by:	amdmi3
 
 Modified:
   head/multimedia/avidemux2/Makefile.common
 
 Modified: head/multimedia/avidemux2/Makefile.common
 ==============================================================================
 --- head/multimedia/avidemux2/Makefile.common	Thu Jan 30 20:57:05 2014	(r341885)
 +++ head/multimedia/avidemux2/Makefile.common	Thu Jan 30 20:58:42 2014	(r341886)
 @@ -46,10 +46,10 @@ OPTIONS_DEFAULT+=	LAME FAAC AMR
  .if ${PORT_OPTIONS:MNLS}
  USES+=		gettext
  PLIST_SUB+=	NLS=""
 -. 	if !defined(WITH_QT4)
 -PLIST_SUB+=	QT_NLS="@comment "
 -.	else
 +. 	if ${PORT_OPTIONS:MQT4}
  PLIST_SUB+=	QT_NLS=""
 +.	else
 +PLIST_SUB+=	QT_NLS="@comment "
  .	endif
  .else
  CMAKE_ARGS+=	-DNO_NLS:BOOL=ON
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
