From dcb34d2aced20c188f97e607063aa39cffe54413 Mon Sep 17 00:00:00 2001 From: adrianp Date: Fri, 19 May 2006 12:21:52 +0000 Subject: faad2 and mpeg4ip conflict on lib/libmp4v2.la so add the appropriate CONFLICTS statement. --- multimedia/mpeg4ip/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'multimedia') diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile index 1dc8bfe35ce..0a58fcd62d4 100644 --- a/multimedia/mpeg4ip/Makefile +++ b/multimedia/mpeg4ip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2006/05/09 02:38:44 hira Exp $ +# $NetBSD: Makefile,v 1.4 2006/05/19 12:21:52 adrianp Exp $ # DISTNAME= mpeg4ip-1.4.1 @@ -9,6 +9,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://mpeg4ip.sourceforge.net/ COMMENT= Tools for streaming video and audio +CONFLICTS+ faad2-[0-9]* + USE_LANGUAGES= c c++ USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -- cgit v1.2.3