diff options
| author | mva <mva@FreeBSD.org> | 2013-09-15 16:16:58 +0800 |
|---|---|---|
| committer | mva <mva@FreeBSD.org> | 2013-09-15 16:16:58 +0800 |
| commit | e639c2cb74dbe68cb2f9f9b32507e1fb38fbed3c (patch) | |
| tree | 6e2ad07494faa7deccec2b5098d60b2306cf2d34 /multimedia | |
| parent | 915e56e41a799015c287662c239cad917be2d623 (diff) | |
| download | freebsd-ports-gnome-e639c2cb74dbe68cb2f9f9b32507e1fb38fbed3c.tar.gz freebsd-ports-gnome-e639c2cb74dbe68cb2f9f9b32507e1fb38fbed3c.tar.zst freebsd-ports-gnome-e639c2cb74dbe68cb2f9f9b32507e1fb38fbed3c.zip | |
- set CONFLICTS for libav and ffmpeg, since they both install files in
the same location
- bump PORTREVISION, so users can solve the conflict on existing
installations
Reported by: kwm@
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/libav/Makefile | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 71679842fc4b..ed56e10bd4f8 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -4,12 +4,15 @@ PORTNAME= ffmpeg PORTVERSION= 0.7.15 PORTEPOCH= 1 +PORTREVISION= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ MAINTAINER= mm@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server +CONFLICTS= libav-[0-9]* + LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING.GPLv2 diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile index 69250396eaa3..fc3e771d6114 100644 --- a/multimedia/libav/Makefile +++ b/multimedia/libav/Makefile @@ -2,12 +2,15 @@ PORTNAME= libav PORTVERSION= 9.9 +PORTREVISION= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://libav.org/releases/ MAINTAINER= mva@FreeBSD.org COMMENT= Realtime audio/video conversion library +CONFLICTS= ffmpeg-[0-9]* + BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ texi2html:${PORTSDIR}/textproc/texi2html |