From a13911c98734198dd07ed40d752968e5e4d9779c Mon Sep 17 00:00:00 2001
From: adrianp <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.

---
 audio/faad2/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'audio/faad2')

diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile
index edb716118e7..0205155ea04 100644
--- a/audio/faad2/Makefile
+++ b/audio/faad2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/03/04 21:28:54 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2006/05/19 12:21:52 adrianp Exp $
 #
 
 DISTNAME=	faad2-2.0
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.audiocoding.com/
 COMMENT=	AAC decoding library
 
+CONFLICTS=	mpeg4ip-[0-9]*
+
 RESTRICTED=	Dolby doesn't allow binary distributions
 NO_BIN_ON_FTP=	${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
-- 
cgit v1.2.3