diff options
| -rw-r--r-- | audio/faad2/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/mpeg4ip/Makefile | 4 |
2 files changed, 6 insertions, 2 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} 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 |