From owner-cvs-ports@FreeBSD.ORG  Sat Oct 16 22:36:04 2010
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
Delivered-To: cvs-ports@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F2D81106566B;
	Sat, 16 Oct 2010 22:36:03 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C8DB48FC18;
	Sat, 16 Oct 2010 22:36:03 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o9GMa3fh048315;
	Sat, 16 Oct 2010 22:36:03 GMT (envelope-from mm@repoman.freebsd.org)
Received: (from mm@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o9GMa3eI048314;
	Sat, 16 Oct 2010 22:36:03 GMT (envelope-from mm)
Message-Id: <201010162236.o9GMa3eI048314@repoman.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Sat, 16 Oct 2010 22:36:03 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/multimedia/ffmpeg Makefile
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.5
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, 16 Oct 2010 22:36:04 -0000

mm          2010-10-16 22:36:03 UTC

  FreeBSD ports repository

  Modified files:
    multimedia/ffmpeg    Makefile 
  Log:
  - fix conflicts with ffmpeg-devel [1]
  - properly handle alsa-lib as a possible dependency [2]
  
  PR:             ports/150634 [1], ports/151508 [2]
  Submitted by:   avilla@FreeBSD.org [1], makc@FreeBSD.org [2]
  
  Revision  Changes    Path
  1.116     +12 -3     ports/multimedia/ffmpeg/Makefile