From bryan@shatow.net  Mon Jun  4 18:43:17 2012
Return-Path: <bryan@shatow.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 25AE31065670
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  4 Jun 2012 18:43:17 +0000 (UTC)
	(envelope-from bryan@shatow.net)
Received: from secure.xzibition.com (secure.xzibition.com [173.160.118.92])
	by mx1.freebsd.org (Postfix) with ESMTP id C71848FC0C
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  4 Jun 2012 18:43:16 +0000 (UTC)
Received: (qmail 11609 invoked from network); 4 Jun 2012 13:43:14 -0500
Received: from unknown (HELO test8.xzibition.com) (10.10.0.34)
  by sweb.xzibition.com with SMTP; 4 Jun 2012 13:43:14 -0500
Received: by test8.xzibition.com (sSMTP sendmail emulation); Mon, 04 Jun 2012 13:42:13 -0500
Message-Id: <20120604184317.25AE31065670@hub.freebsd.org>
Date: Mon, 04 Jun 2012 13:42:13 -0500
From: "Bryan Drewery" <bryan@shatow.net>
Reply-To: Bryan Drewery <bryan@shatow.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: bapt@freebsd.org, osa@freebsd.org
Subject: [PATCH] www/nginx: New options conversion is forcing video module
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         168677
>Category:       ports
>Synopsis:       [PATCH] www/nginx: New options conversion is forcing video module
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    osa
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 04 18:50:14 UTC 2012
>Closed-Date:    Tue Jun 05 02:45:28 UTC 2012
>Last-Modified:  Tue Jun 05 02:45:28 UTC 2012
>Originator:     Bryan Drewery
>Release:        FreeBSD 8.3-RELEASE i386
>Organization:
>Environment:


	
>Description:
	# make check-config
	====> You must select one and only one option from the VIDEO single

	The changes are forcing users to enable one of the VIDEO modules. I'm guessing the intention was for this group to be 0 or 1, not 1-and-only-1. To achieve this, the VIDEO option must be added as a separate OPTION. Thus allowing enabling/disabling the VIDEO support and giving 0 or 1.


	Reported By: sanjuro @ #FreeBSDHelp on EFNet

>How-To-Repeat:
	
>Fix:

	Patch add VIDEO to OPTIONS_DEFINE, which makes this into 0-or-1

--- patch-nginx-video.txt begins here ---
--- Makefile.orig	2012-06-04 13:37:18.307492180 -0500
+++ Makefile	2012-06-04 13:38:55.330491829 -0500
@@ -97,7 +97,8 @@
 	SUPERVISORD \
 	SYSLOG_SUPPORT \
 	UDPLOG \
-	XRID_HEADER
+	XRID_HEADER \
+	VIDEO
 
 OPTIONS_SINGLE=		VIDEO
 OPTIONS_SINGLE_VIDEO=	HTTP_MP4 HTTP_MP4_H264
@@ -180,6 +181,7 @@
 UDPLOG_DESC=			3rd party udplog (syslog) module
 XRID_HEADER_DESC=		3rd party x-rid header module
 XSS_DESC=			3rd party xss module
+VIDEO_DESC=			Enable VIDEO support
 
 WANT_GNOME=	yes
 MAKE_JOBS_SAFE=	yes
--- patch-nginx-video.txt ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->osa 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Jun 4 19:35:18 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168677 
State-Changed-From-To: open->closed 
State-Changed-By: osa 
State-Changed-When: Tue Jun 5 02:44:09 UTC 2012 
State-Changed-Why:  
I'll committed similar fix few hours ago. 
Thanks for report! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168677 
>Unformatted:
