From owner-svn-ports-head@FreeBSD.ORG Thu Nov 20 19:34:20 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 61DFC253; Thu, 20 Nov 2014 19:34:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 34F59BE; Thu, 20 Nov 2014 19:34:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAKJYKHC010884; Thu, 20 Nov 2014 19:34:20 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAKJYJKd010876; Thu, 20 Nov 2014 19:34:19 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201411201934.sAKJYJKd010876@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Thu, 20 Nov 2014 19:34:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372953 - in head/multimedia: ffmpeg ffmpeg24 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.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Nov 2014 19:34:20 -0000 Author: riggs Date: Thu Nov 20 19:34:19 2014 New Revision: 372953 URL: https://svnweb.freebsd.org/changeset/ports/372953 QAT: https://qat.redports.org/buildarchive/r372953/ Log: Un-break non-default OPTION OPENSSL PR: 195202 Submitted by: jbeich@vfemail.net Modified: head/multimedia/ffmpeg/Makefile head/multimedia/ffmpeg24/Makefile Modified: head/multimedia/ffmpeg/Makefile ============================================================================== --- head/multimedia/ffmpeg/Makefile Thu Nov 20 18:35:57 2014 (r372952) +++ head/multimedia/ffmpeg/Makefile Thu Nov 20 19:34:19 2014 (r372953) @@ -143,6 +143,10 @@ OPENCV_CONFIGURE_ENABLE= libopencv OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 OPENJPEG_CONFIGURE_ENABLE= libopenjpeg +# openssl +OPENSSL_USE= OPENSSL=yes +OPENSSL_CONFIGURE_ENABLE= openssl + # opus OPUS_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus OPUS_CONFIGURE_ENABLE= libopus @@ -214,7 +218,6 @@ DATADIR= ${PREFIX}/share/${PORTNAME}${PK # ssl .if ${PORT_OPTIONS:MOPENSSL} && empty(PORT_OPTIONS:MGNUTLS) -USE_OPENSSL= yes FFMPEG_NONFREE= yes .endif Modified: head/multimedia/ffmpeg24/Makefile ============================================================================== --- head/multimedia/ffmpeg24/Makefile Thu Nov 20 18:35:57 2014 (r372952) +++ head/multimedia/ffmpeg24/Makefile Thu Nov 20 19:34:19 2014 (r372953) @@ -150,6 +150,10 @@ OPENCV_CONFIGURE_ENABLE= libopencv OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 OPENJPEG_CONFIGURE_ENABLE= libopenjpeg +# openssl +OPENSSL_USE= OPENSSL=yes +OPENSSL_CONFIGURE_ENABLE= openssl + # opus OPUS_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus OPUS_CONFIGURE_ENABLE= libopus @@ -221,7 +225,6 @@ DATADIR= ${PREFIX}/share/${PORTNAME}${PK # ssl .if ${PORT_OPTIONS:MOPENSSL} && empty(PORT_OPTIONS:MGNUTLS) -USE_OPENSSL= yes FFMPEG_NONFREE= yes .endif