aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia/ffmpeg0
diff options
context:
space:
mode:
authormva <mva@FreeBSD.org>2014-04-12 14:36:59 +0800
committermva <mva@FreeBSD.org>2014-04-12 14:36:59 +0800
commit01e27c34e3324a404d970d94b88c3744bfbd386e (patch)
tree3f01597f18d6283202ca76c010a3496a505e070e /multimedia/ffmpeg0
parentc474aced62123b7764a171bb519bff60ee1950b4 (diff)
downloadfreebsd-ports-graphics-01e27c34e3324a404d970d94b88c3744bfbd386e.tar.gz
freebsd-ports-graphics-01e27c34e3324a404d970d94b88c3744bfbd386e.tar.zst
freebsd-ports-graphics-01e27c34e3324a404d970d94b88c3744bfbd386e.zip
- Remove CONFLICTS with multimedia/libav, which was forgotten on its update
Diffstat (limited to 'multimedia/ffmpeg0')
-rw-r--r--multimedia/ffmpeg0/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/multimedia/ffmpeg0/Makefile b/multimedia/ffmpeg0/Makefile
index 113e1b338c6..14866d5edc8 100644
--- a/multimedia/ffmpeg0/Makefile
+++ b/multimedia/ffmpeg0/Makefile
@@ -21,7 +21,6 @@ BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \
${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils \
${LOCALBASE}/bin/texi2html:${PORTSDIR}/textproc/texi2html
-CONFLICTS= libav-[0-9]*
PORTSCOUT= limit:^0\.7.*
HAS_CONFIGURE= yes