summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authoradrianp <adrianp@pkgsrc.org>2006-05-19 12:21:52 +0000
committeradrianp <adrianp@pkgsrc.org>2006-05-19 12:21:52 +0000
commitdcb34d2aced20c188f97e607063aa39cffe54413 (patch)
treeab6442f521469e77d7127892ba752cb417f46442 /audio
parent55caebbe7672768ef20066eab3a1e4f7319ff6da (diff)
downloadpkgsrc-dcb34d2aced20c188f97e607063aa39cffe54413.tar.gz
faad2 and mpeg4ip conflict on lib/libmp4v2.la so add the appropriate
CONFLICTS statement.
Diffstat (limited to 'audio')
-rw-r--r--audio/faad2/Makefile4
1 files changed, 3 insertions, 1 deletions
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}