From owner-svn-ports-head@FreeBSD.ORG  Sat Apr 12 06:37:00 2014
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 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8F646E84;
 Sat, 12 Apr 2014 06:37:00 +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 7C2DA10C1;
 Sat, 12 Apr 2014 06:37:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3C6b0FR083030;
 Sat, 12 Apr 2014 06:37:00 GMT (envelope-from mva@svn.freebsd.org)
Received: (from mva@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3C6b0QO083029;
 Sat, 12 Apr 2014 06:37:00 GMT (envelope-from mva@svn.freebsd.org)
Message-Id: <201404120637.s3C6b0QO083029@svn.freebsd.org>
From: Marcus von Appen <mva@FreeBSD.org>
Date: Sat, 12 Apr 2014 06:37:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r351068 - head/multimedia/ffmpeg0
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.17
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: Sat, 12 Apr 2014 06:37:00 -0000

Author: mva
Date: Sat Apr 12 06:36:59 2014
New Revision: 351068
URL: http://svnweb.freebsd.org/changeset/ports/351068
QAT: https://qat.redports.org/buildarchive/r351068/

Log:
  - Remove CONFLICTS with multimedia/libav, which was forgotten on its update

Modified:
  head/multimedia/ffmpeg0/Makefile

Modified: head/multimedia/ffmpeg0/Makefile
==============================================================================
--- head/multimedia/ffmpeg0/Makefile	Sat Apr 12 03:52:58 2014	(r351067)
+++ head/multimedia/ffmpeg0/Makefile	Sat Apr 12 06:36:59 2014	(r351068)
@@ -21,7 +21,6 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/ya
 		${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils \
 		${LOCALBASE}/bin/texi2html:${PORTSDIR}/textproc/texi2html
 
-CONFLICTS=	libav-[0-9]*
 PORTSCOUT=	limit:^0\.7.*
 
 HAS_CONFIGURE=	yes