From dc3d0f564e8348ce96ac143ee50c01e2f0590ae2 Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme>
Date: Wed, 20 Feb 2008 10:15:30 +0000
Subject: Remove an obsolete CONFLICTS line.

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

diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index a82b64d3f8f..516b68929a3 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/02/20 10:12:04 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2008/02/20 10:15:30 xtraeme Exp $
 
 DISTNAME=	ffmpeg-${DISTVERSION}
 PKGNAME=	ffmpeg-devel-${DISTVERSION:S/-//g}
@@ -17,8 +17,6 @@ HAS_CONFIGURE=	YES
 USE_LIBTOOL=	YES
 USE_TOOLS+=	gmake texi2html pod2man
 
-CONFLICTS+=	ffmpeg-devel-[0-9]*
-
 REPLACE_PERL+=	doc/texi2pod.pl
 
 SUBST_CLASSES+=		conf
-- 
cgit v1.2.3