From owner-svn-ports-all@FreeBSD.ORG  Tue Oct 15 17:56:09 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 282D3E1;
 Tue, 15 Oct 2013 17:56:09 +0000 (UTC)
 (envelope-from rakuco@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 EFCA52B33;
 Tue, 15 Oct 2013 17:56:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9FHu8Mf092859;
 Tue, 15 Oct 2013 17:56:08 GMT (envelope-from rakuco@svn.freebsd.org)
Received: (from rakuco@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9FHu82T092858;
 Tue, 15 Oct 2013 17:56:08 GMT (envelope-from rakuco@svn.freebsd.org)
Message-Id: <201310151756.r9FHu82T092858@svn.freebsd.org>
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Tue, 15 Oct 2013 17:56:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r330416 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Oct 2013 17:56:09 -0000

Author: rakuco
Date: Tue Oct 15 17:56:08 2013
New Revision: 330416
URL: http://svnweb.freebsd.org/changeset/ports/330416

Log:
  - Explicitly depend on qt4-corelib, which was otherwise pulled indirectly by
    the other Qt dependencies.
  - Support staging.
  
  Commits by makc@ and Schaich Alonso <alonsoschaich@fastmail.fm>, pulled from
  our area51 repository.

Modified:
  head/multimedia/phonon/Makefile

Modified: head/multimedia/phonon/Makefile
==============================================================================
--- head/multimedia/phonon/Makefile	Tue Oct 15 17:36:34 2013	(r330415)
+++ head/multimedia/phonon/Makefile	Tue Oct 15 17:56:08 2013	(r330416)
@@ -19,7 +19,7 @@ CONFLICTS=	qt4-phonon-4*
 PHONON_BRANCH=	stable
 
 USE_KDE4=	kdehier kdeprefix automoc4
-USE_QT4=	dbus gui \
+USE_QT4=	corelib dbus gui \
 		qmake_build moc_build rcc_build uic_build
 USE_XZ=		yes
 USES=		cmake
@@ -30,7 +30,6 @@ USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	PULSEAUDIO
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
@@ -49,13 +48,14 @@ pre-configure:
 		${PATCH_WRKSRC}/CMakeLists.txt
 
 post-install:
-	${LN} -sf ${PREFIX}/include/phonon ${QT_INCDIR}/phonon
-	${LN} -sf ${PREFIX}/include/phonon ${QT_INCDIR}/Phonon
-	${LN} -sf ${PREFIX}/include/KDE/Phonon ${PREFIX}/include/phonon/Phonon
+	${MKDIR} ${STAGEDIR}${QT_INCDIR}
+	${MKDIR} ${STAGEDIR}${QT_LIBDIR}
+	${LN} -sf ${PREFIX}/include/phonon ${STAGEDIR}${QT_INCDIR}/phonon
+	${LN} -sf ${PREFIX}/include/phonon ${STAGEDIR}${QT_INCDIR}/Phonon
+	${LN} -sf ${PREFIX}/include/KDE/Phonon ${STAGEDIR}${PREFIX}/include/phonon/Phonon
 .for lib in phonon phononexperimental
-	${LN} -sf ${PREFIX}/lib/lib${lib}.so.${PORTVERSION} ${QT_LIBDIR}/lib${lib}.so
-	${LN} -sf ${PREFIX}/lib/lib${lib}.so.${PORTVERSION} ${QT_LIBDIR}/lib${lib}.so.4
+	${LN} -sf ${PREFIX}/lib/lib${lib}.so.${PORTVERSION} ${STAGEDIR}${QT_LIBDIR}/lib${lib}.so
+	${LN} -sf ${PREFIX}/lib/lib${lib}.so.${PORTVERSION} ${STAGEDIR}${QT_LIBDIR}/lib${lib}.so.4
 .endfor
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>