svn commit: r327335 - in head/multimedia: ffmpeg libav

[Marcus von Appen]

Author: mva
Date: Sun Sep 15 08:16:58 2013
New Revision: 327335
URL: http://svnweb.freebsd.org/changeset/ports/327335

Log:
  - 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@

Modified:
  head/multimedia/ffmpeg/Makefile
  head/multimedia/libav/Makefile

Modified: head/multimedia/ffmpeg/Makefile
==============================================================================
--- head/multimedia/ffmpeg/Makefile	Sun Sep 15 08:15:41 2013	(r327334)
+++ head/multimedia/ffmpeg/Makefile	Sun Sep 15 08:16:58 2013	(r327335)
@@ -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 at 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

Modified: head/multimedia/libav/Makefile
==============================================================================
--- head/multimedia/libav/Makefile	Sun Sep 15 08:15:41 2013	(r327334)
+++ head/multimedia/libav/Makefile	Sun Sep 15 08:16:58 2013	(r327335)
@@ -2,12 +2,15 @@
 
 PORTNAME=	libav
 PORTVERSION=	9.9
+PORTREVISION=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://libav.org/releases/
 
 MAINTAINER=	mva at FreeBSD.org
 COMMENT=	Realtime audio/video conversion library
 
+CONFLICTS=	ffmpeg-[0-9]*
+
 BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 		texi2html:${PORTSDIR}/textproc/texi2html