diff options
| author | mva <mva@FreeBSD.org> | 2014-04-12 14:36:59 +0800 |
|---|---|---|
| committer | mva <mva@FreeBSD.org> | 2014-04-12 14:36:59 +0800 |
| commit | 01e27c34e3324a404d970d94b88c3744bfbd386e (patch) | |
| tree | 3f01597f18d6283202ca76c010a3496a505e070e | |
| parent | c474aced62123b7764a171bb519bff60ee1950b4 (diff) | |
| download | freebsd-ports-gnome-01e27c34e3324a404d970d94b88c3744bfbd386e.tar.gz freebsd-ports-gnome-01e27c34e3324a404d970d94b88c3744bfbd386e.tar.zst freebsd-ports-gnome-01e27c34e3324a404d970d94b88c3744bfbd386e.zip | |
- Remove CONFLICTS with multimedia/libav, which was forgotten on its update
| -rw-r--r-- | multimedia/ffmpeg0/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/multimedia/ffmpeg0/Makefile b/multimedia/ffmpeg0/Makefile index 113e1b338c6d..14866d5edc84 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 |