From owner-svn-ports-head@FreeBSD.ORG  Fri May  1 07:24:21 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
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 515888B7;
 Fri,  1 May 2015 07:24:21 +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 3B63E137A;
 Fri,  1 May 2015 07:24:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t417OLDB066804;
 Fri, 1 May 2015 07:24:21 GMT (envelope-from riggs@FreeBSD.org)
Received: (from riggs@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t417OLZN066803;
 Fri, 1 May 2015 07:24:21 GMT (envelope-from riggs@FreeBSD.org)
Message-Id: <201505010724.t417OLZN066803@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: riggs set sender to
 riggs@FreeBSD.org using -f
From: Thomas Zander <riggs@FreeBSD.org>
Date: Fri, 1 May 2015 07:24:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r385087 - head/multimedia/ffmpeg26
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.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 May 2015 07:24:21 -0000

Author: riggs
Date: Fri May  1 07:24:20 2015
New Revision: 385087
URL: https://svnweb.freebsd.org/changeset/ports/385087

Log:
  Merge BUILD_DEPENDS change (texi2html) from r385084 into ffmpeg26

Modified:
  head/multimedia/ffmpeg26/Makefile   (contents, props changed)

Modified: head/multimedia/ffmpeg26/Makefile
==============================================================================
--- head/multimedia/ffmpeg26/Makefile	Fri May  1 07:17:02 2015	(r385086)
+++ head/multimedia/ffmpeg26/Makefile	Fri May  1 07:24:20 2015	(r385087)
@@ -15,8 +15,7 @@ LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
-		${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils \
-		texi2html:${PORTSDIR}/textproc/texi2html
+		${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
 
 UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
@@ -281,9 +280,14 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \
 DOC_FILES=	Changelog CREDITS INSTALL.md LICENSE.md MAINTAINERS \
 		README.md RELEASE_NOTES
 # under doc subdirectory
-DOC_DOCFILES=	APIchanges *.txt *.html
+DOC_DOCFILES=	APIchanges *.txt
 PORTDOCS=	*
 
+.if ${PORT_OPTIONS:MDOCS}
+DOC_DOCFILES+=	*.html
+BUILD_DEPENDS+=	texi2html:${PORTSDIR}/textproc/texi2html
+.endif
+
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--disable-stripping
 .else