svn commit: r384379 - head/multimedia/handbrake

[Kurt Jaeger]

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 at 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)