From owner-svn-ports-head@FreeBSD.ORG  Tue Jul  2 17:32:22 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])
 by hub.freebsd.org (Postfix) with ESMTP id E9FBC64B;
 Tue,  2 Jul 2013 17:32:22 +0000 (UTC)
 (envelope-from rakuco@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DC8481C2F;
 Tue,  2 Jul 2013 17:32:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r62HWMrr020055;
 Tue, 2 Jul 2013 17:32:22 GMT (envelope-from rakuco@svn.freebsd.org)
Received: (from rakuco@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r62HWMSn020054;
 Tue, 2 Jul 2013 17:32:22 GMT (envelope-from rakuco@svn.freebsd.org)
Message-Id: <201307021732.r62HWMSn020054@svn.freebsd.org>
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Tue, 2 Jul 2013 17:32:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322187 - head/multimedia/phonon
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: Tue, 02 Jul 2013 17:32:23 -0000

Author: rakuco
Date: Tue Jul  2 17:32:22 2013
New Revision: 322187
URL: http://svnweb.freebsd.org/changeset/ports/322187

Log:
  Remove WITH_QT_PHONON check, qt4-phonon was removed in r313054.

Modified:
  head/multimedia/phonon/Makefile

Modified: head/multimedia/phonon/Makefile
==============================================================================
--- head/multimedia/phonon/Makefile	Tue Jul  2 17:14:19 2013	(r322186)
+++ head/multimedia/phonon/Makefile	Tue Jul  2 17:32:22 2013	(r322187)
@@ -43,10 +43,6 @@ CMAKE_ARGS+=	-DWITH_PulseAudio:BOOL=OFF
 
 PLIST_SUB+=	QT_PREFIX=${QT_PREFIX}
 
-.ifdef(WITH_QT_PHONON)
-IGNORE=		conflicts with Qt 4 phonon. Please, deinstall qt4-phonon and unset WITH_QT_PHONON to continue
-.endif
-
 pre-configure:
 	${REINPLACE_CMD} -e '/phonon.pc/s|pkgconfig|../libdata/pkgconfig|' \
 		-e 's|{QT_INCLUDES}|{QT_INCLUDES} ${LOCALBASE}/include|'\