[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg-devel add a CONFLICTS line for ffmpe...

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c4a7aeef1007
branches:  trunk
changeset: 542481:c4a7aeef1007
user:      abs <abs%pkgsrc.org@localhost>
date:      Mon May 19 11:47:44 2008 +0000

description:
add a CONFLICTS line for ffmpeg-[0-9]*

diffstat:

 multimedia/ffmpeg-devel/Makefile |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (18 lines):

diff -r c6e1b4f1162a -r c4a7aeef1007 multimedia/ffmpeg-devel/Makefile
--- a/multimedia/ffmpeg-devel/Makefile  Mon May 19 10:43:02 2008 +0000
+++ b/multimedia/ffmpeg-devel/Makefile  Mon May 19 11:47:44 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/04/20 20:38:53 heinz Exp $
+# $NetBSD: Makefile,v 1.8 2008/05/19 11:47:44 abs Exp $
 
 DISTNAME=      ffmpeg-${DISTVERSION}
 PKGNAME=       ffmpeg-devel-${DISTVERSION:S/-//g}
@@ -29,6 +29,8 @@
 SUBST_SED.pc=          -e 's|-lx264||g'
 SUBST_MESSAGE.pc=      Fixing hardcoded libs.
 
+CONFLICTS+=    ffmpeg-[0-9]*
+
 PLIST_SRC+=    ${PKGDIR}/PLIST
 
 CONF_FILES+=   ${PREFIX}/share/examples/ffmpeg/ffserver.conf \