From f9e2cf9d81248458cae10dd6777a9fd9e9c05ba9 Mon Sep 17 00:00:00 2001
From: abs <abs@pkgsrc.org>
Date: Mon, 19 May 2008 11:47:44 +0000
Subject: add a CONFLICTS line for ffmpeg-[0-9]*

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

(limited to 'multimedia')

diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index dae98f55218..39cc5e1e1c4 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -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_FILES.pc=		*.pc
 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 \
-- 
cgit v1.2.3