From owner-svn-ports-head@freebsd.org  Sat Apr 23 11:38:22 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 52926B1AFE6;
 Sat, 23 Apr 2016 11:38:22 +0000 (UTC)
 (envelope-from riggs@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 20112113A;
 Sat, 23 Apr 2016 11:38:22 +0000 (UTC)
 (envelope-from riggs@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3NBcLGK044317;
 Sat, 23 Apr 2016 11:38:21 GMT (envelope-from riggs@FreeBSD.org)
Received: (from riggs@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3NBcLxD044316;
 Sat, 23 Apr 2016 11:38:21 GMT (envelope-from riggs@FreeBSD.org)
Message-Id: <201604231138.u3NBcLxD044316@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: riggs set sender to
 riggs@FreeBSD.org using -f
From: Thomas Zander <riggs@FreeBSD.org>
Date: Sat, 23 Apr 2016 11:38:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r413862 - head/multimedia/ffmpeg
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Apr 2016 11:38:22 -0000

Author: riggs
Date: Sat Apr 23 11:38:21 2016
New Revision: 413862
URL: https://svnweb.freebsd.org/changeset/ports/413862

Log:
  Restore option to disable SSL support completely
  
  PR:		208878
  Submitted by:	jbeich

Modified:
  head/multimedia/ffmpeg/Makefile

Modified: head/multimedia/ffmpeg/Makefile
==============================================================================
--- head/multimedia/ffmpeg/Makefile	Sat Apr 23 10:25:14 2016	(r413861)
+++ head/multimedia/ffmpeg/Makefile	Sat Apr 23 11:38:21 2016	(r413862)
@@ -39,8 +39,8 @@ OPTIONS_DEFAULT=	FFSERVER FONTCONFIG FRE
 			OPENCV RTCPU SCHROEDINGER THEORA V4L VORBIS VPX \
 			X264 XVID
 
-OPTIONS_SINGLE=	SSL
-OPTIONS_SINGLE_SSL=	GNUTLS OPENSSL
+OPTIONS_RADIO=	SSL
+OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
 OPTIONS_GROUP=	LICENSE
 OPTIONS_GROUP_LICENSE=	GPL3 NONFREE