svn commit: r351068 - head/multimedia/ffmpeg0

[Marcus von Appen]

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