Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Oct 2013 17:56:08 +0000 (UTC)
From:      Raphael Kubo da Costa <rakuco@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r330416 - head/multimedia/phonon
Message-ID:  <201310151756.r9FHu82T092858@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310151756.r9FHu82T092858>