From owner-svn-ports-head@FreeBSD.ORG  Mon Apr 20 19:05:52 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 141323E9;
 Mon, 20 Apr 2015 19:05:52 +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 025E116D;
 Mon, 20 Apr 2015 19:05:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3KJ5paJ051879;
 Mon, 20 Apr 2015 19:05:51 GMT (envelope-from pi@FreeBSD.org)
Received: (from pi@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3KJ5pMG051878;
 Mon, 20 Apr 2015 19:05:51 GMT (envelope-from pi@FreeBSD.org)
Message-Id: <201504201905.t3KJ5pMG051878@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pi set sender to pi@FreeBSD.org
 using -f
From: Kurt Jaeger <pi@FreeBSD.org>
Date: Mon, 20 Apr 2015 19:05:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r384379 - head/multimedia/handbrake
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: Mon, 20 Apr 2015 19:05:52 -0000

Author: pi
Date: Mon Apr 20 19:05:51 2015
New Revision: 384379
URL: https://svnweb.freebsd.org/changeset/ports/384379

Log:
  multimedia/handbrake: register CONFLICTS_BUILD with x265
  
  handbrake does not build if multimedia/x265 is installed
  
  PR:		199126
  Submitted by:	Walter Schwarzenfeld <w.schwarzenfeld@aon.at>

Modified:
  head/multimedia/handbrake/Makefile

Modified: head/multimedia/handbrake/Makefile
==============================================================================
--- head/multimedia/handbrake/Makefile	Mon Apr 20 18:38:19 2015	(r384378)
+++ head/multimedia/handbrake/Makefile	Mon Apr 20 19:05:51 2015	(r384379)
@@ -43,7 +43,7 @@ LIB_DEPENDS=	libfontconfig.so:${PORTSDIR
 		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
 		libx264.so:${PORTSDIR}/multimedia/libx264 \
 		libmp3lame.so:${PORTSDIR}/audio/lame
-
+CONFLICTS_BUILD=	x265
 
 .if !defined(PACKAGE_BUILDING)
 # DVDCSS version hardcoded in contrib/libdvdread/libdvdread/src/dvd_input.c (dlopen'ed)