From owner-svn-ports-head@FreeBSD.ORG  Sun Sep 15 08:16:59 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 48635980;
 Sun, 15 Sep 2013 08:16:59 +0000 (UTC) (envelope-from mva@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 35BDB2510;
 Sun, 15 Sep 2013 08:16:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8F8GxbY036174;
 Sun, 15 Sep 2013 08:16:59 GMT (envelope-from mva@svn.freebsd.org)
Received: (from mva@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8F8Gw3Q036172;
 Sun, 15 Sep 2013 08:16:58 GMT (envelope-from mva@svn.freebsd.org)
Message-Id: <201309150816.r8F8Gw3Q036172@svn.freebsd.org>
From: Marcus von Appen <mva@FreeBSD.org>
Date: Sun, 15 Sep 2013 08:16:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r327335 - in head/multimedia: ffmpeg libav
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Sep 2013 08:16:59 -0000

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@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@FreeBSD.org
 COMMENT=	Realtime audio/video conversion library
 
+CONFLICTS=	ffmpeg-[0-9]*
+
 BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 		texi2html:${PORTSDIR}/textproc/texi2html