From owner-svn-ports-all@FreeBSD.ORG  Sat Apr 12 22:10:14 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BA8832EC;
 Sat, 12 Apr 2014 22:10:14 +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 A7AAB14ED;
 Sat, 12 Apr 2014 22:10:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3CMAEqL069403;
 Sat, 12 Apr 2014 22:10:14 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3CMAEo7069402;
 Sat, 12 Apr 2014 22:10:14 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201404122210.s3CMAEo7069402@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sat, 12 Apr 2014 22:10:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r351150 - head/multimedia/y4mscaler
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Apr 2014 22:10:14 -0000

Author: antoine
Date: Sat Apr 12 22:10:14 2014
New Revision: 351150
URL: http://svnweb.freebsd.org/changeset/ports/351150
QAT: https://qat.redports.org/buildarchive/r351150/

Log:
  Mark broken: conflict with dependency mjpegtools
  
  Installing y4mscaler-9.0_8...pkg-static: y4mscaler-9.0_8 conflicts with mjpegtools-2.1.0 (installs files into the same place).  Problematic file: /usr/local/bin/y4mscaler
  *** Error code 70
  
  Reported by:	pkg-fallout

Modified:
  head/multimedia/y4mscaler/Makefile

Modified: head/multimedia/y4mscaler/Makefile
==============================================================================
--- head/multimedia/y4mscaler/Makefile	Sat Apr 12 22:06:34 2014	(r351149)
+++ head/multimedia/y4mscaler/Makefile	Sat Apr 12 22:10:14 2014	(r351150)
@@ -12,6 +12,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Y4mscaler scales, crops, and shifts Y'CbCr video
 
+BROKEN=		Conflicts with mjpegtools on /usr/local/bin/y4mscaler
+
 LIB_DEPENDS=	liblavjpeg-2.0.so:${PORTSDIR}/multimedia/mjpegtools
 
 USES=		gmake