From owner-cvs-ports@FreeBSD.ORG  Sat May  7 01:02:23 2005
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
Delivered-To: cvs-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id C24F616A4D4; Sat,  7 May 2005 01:02:23 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 9000A43DA7; Sat,  7 May 2005 01:02:23 +0000 (GMT)
	(envelope-from lioux@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4712NRX015404;
	Sat, 7 May 2005 01:02:23 GMT
	(envelope-from lioux@repoman.freebsd.org)
Received: (from lioux@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4712NTC015403;
	Sat, 7 May 2005 01:02:23 GMT
	(envelope-from lioux)
Message-Id: <200505070102.j4712NTC015403@repoman.freebsd.org>
From: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
Date: Sat, 7 May 2005 01:02:23 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/multimedia/ffmpeg Makefile
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 May 2005 01:02:23 -0000

lioux       2005-05-07 01:02:23 UTC

  FreeBSD ports repository

  Modified files:
    multimedia/ffmpeg    Makefile 
  Log:
  Add CONFLICTS due to upcoming ffmpeg-devel port
  
  Revision  Changes    Path
  1.49      +1 -0      ports/multimedia/ffmpeg/Makefile