From owner-svn-ports-all@freebsd.org  Sun Feb 28 22:00:54 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DE5C1AB66E8;
 Sun, 28 Feb 2016 22:00:54 +0000 (UTC)
 (envelope-from rakuco@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AD34210E7;
 Sun, 28 Feb 2016 22:00:54 +0000 (UTC)
 (envelope-from rakuco@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1SM0r6p082495;
 Sun, 28 Feb 2016 22:00:53 GMT (envelope-from rakuco@FreeBSD.org)
Received: (from rakuco@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1SM0rUY082494;
 Sun, 28 Feb 2016 22:00:53 GMT (envelope-from rakuco@FreeBSD.org)
Message-Id: <201602282200.u1SM0rUY082494@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rakuco set sender to
 rakuco@FreeBSD.org using -f
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Sun, 28 Feb 2016 22:00:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r409770 - head/multimedia/kaffeine
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Feb 2016 22:00:55 -0000

Author: rakuco
Date: Sun Feb 28 22:00:53 2016
New Revision: 409770
URL: https://svnweb.freebsd.org/changeset/ports/409770

Log:
  Depend on multimedia/vlc-qt4 instead of multimedia/vlc.
  
  multimedia/vlc conflicts with multimedia/vlc-qt4, and the latter is needed by
  multimedia/phonon-qt4 and consequently by x11/kde4-workspace and other KDE4
  ports.
  
  Since Kaffeine depends on parts of KDE4 such as x11/kdelibs4, it makes more
  sense to depend on vlc-qt4 instead.
  
  PR:		204690
  MFH:		2016Q1

Modified:
  head/multimedia/kaffeine/Makefile

Modified: head/multimedia/kaffeine/Makefile
==============================================================================
--- head/multimedia/kaffeine/Makefile	Sun Feb 28 21:47:47 2016	(r409769)
+++ head/multimedia/kaffeine/Makefile	Sun Feb 28 22:00:53 2016	(r409770)
@@ -3,6 +3,7 @@
 
 PORTNAME=	kaffeine
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	SF/kaffeine/current
 
@@ -13,7 +14,7 @@ LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS=	libvlc.so:${PORTSDIR}/multimedia/vlc
+LIB_DEPENDS=	libvlc.so:${PORTSDIR}/multimedia/vlc-qt4
 
 USES=		cmake cpe gettext pkgconfig
 USE_KDE4=	automoc4 kdelibs kdeprefix