summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorxtraeme <xtraeme>2008-02-20 10:15:30 +0000
committerxtraeme <xtraeme>2008-02-20 10:15:30 +0000
commitdc3d0f564e8348ce96ac143ee50c01e2f0590ae2 (patch)
tree797ef3c5919ce30f1763b455da85da30499fb3a0 /multimedia
parentff213e676b02742315f0b9ffe415401a3aa8fd50 (diff)
downloadpkgsrc-dc3d0f564e8348ce96ac143ee50c01e2f0590ae2.tar.gz
Remove an obsolete CONFLICTS line.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/ffmpeg-devel/Makefile4
1 files changed, 1 insertions, 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