Index: deskutils/calibre/Makefile
===================================================================
--- deskutils/calibre/Makefile	(revision 338540)
+++ deskutils/calibre/Makefile	(working copy)
@@ -57,7 +57,7 @@
 		src/odf/*.py
 USE_XZ=		yes
 USE_PYTHON=	2.7
-USE_QT4=	qmake_build moc_build
+USE_QT4=	dbus qmake_build moc_build
 INSTALLS_ICONS=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-src
 CFLAGS+=	-I${LOCALBASE}/include
Index: devel/qross/Makefile
===================================================================
--- devel/qross/Makefile	(revision 338540)
+++ devel/qross/Makefile	(working copy)
@@ -14,7 +14,7 @@
 USES=		cmake
 USE_LDCONFIG=	yes
 USE_QT4=	designer gui network xml qmake_build uic_build moc_build \
-		rcc_build script
+		rcc_build script testlib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
Index: graphics/qgis/Makefile
===================================================================
--- graphics/qgis/Makefile	(revision 338541)
+++ graphics/qgis/Makefile	(working copy)
@@ -23,7 +23,7 @@
 USE_PYTHON=	yes
 USES=		bison cmake
 USE_SQLITE=	yes
-USE_QT4=	gui svg xml network sql designer linguist_build \
+USE_QT4=	gui svg xml network sql designer testlib linguist_build \
 		qmake_build moc_build rcc_build uic_build
 
 USE_LDCONFIG=	yes
Index: multimedia/smplayer/Makefile
===================================================================
--- multimedia/smplayer/Makefile	(revision 338541)
+++ multimedia/smplayer/Makefile	(working copy)
@@ -12,12 +12,14 @@
 RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer \
 		${LOCALBASE}/share/smplayer/themes:${PORTSDIR}/multimedia/smplayer-themes
 
-USE_QT4=	gui network script xml qmake_build moc_build rcc_build uic_build \
+USE_QT4=	gui network script xml moc_build rcc_build uic_build \
 		uic3_build porting_build linguist_build
 
 ALL_TARGET=	src/smplayer
+CONFIGURE_WRKSRC=	${WRKSRC}/src
+MAKE_ARGS+=	PREFIX=${PREFIX} DESTDIR=${STAGEDIR}
 
-USES=		gmake
+USES=		gmake qmake
 USE_BZIP2=	yes
 INSTALLS_ICONS=	yes
 
@@ -27,9 +29,8 @@
 .include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|qmake|${QMAKE} ${QMAKE_ARGS}|g' \
+	@${REINPLACE_CMD} -e 's|&& $$(QMAKE) $$(QMAKE_OPTS)||' \
 		-e 's|lrelease|${LRELEASE}|g' \
-		-e 's|PREFIX=/usr/local|PREFIX=${PREFIX}|g' \
 		-e 's,/share/man,/man,g' \
 		-e 's, make, ${MAKE_CMD},g' \
 		${WRKSRC}/Makefile
Index: multimedia/umplayer/Makefile
===================================================================
--- multimedia/umplayer/Makefile	(revision 338541)
+++ multimedia/umplayer/Makefile	(working copy)
@@ -12,14 +12,15 @@
 
 RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
 
-USES=		gmake
+USES=		gmake qmake
 USE_XZ=		yes
-USE_QT4=	gui network xml qmake_build moc_build rcc_build uic_build \
+USE_QT4=	gui network xml moc_build rcc_build uic_build \
 		linguist_build
 INSTALLS_ICONS=	yes
-MAKE_ARGS+=	${PREFIX}
+MAKE_ARGS+=	PREFIX=${PREFIX} DESTDIR=${STAGEDIR}
 QMAKE_ARGS+=	"DEFINES+=NO_DEBUG_ON_CONSOLE"
 ALL_TARGET=	src/umplayer
+CONFIGURE_WRKSRC=	${WRKSRC}/src
 
 OPTIONS_DEFINE=	DOCS
 
@@ -28,7 +29,7 @@
 post-patch:
 	@${REINPLACE_CMD} -e 's| make| $$(MAKE)|' \
 		-e 's|cd src|(&| ; /cd src/s|$$|)|' \
-		-e 's|qmake|${QMAKE} ${QMAKE_ARGS}|' \
+		-e 's|&& $$(QMAKE) $$(QMAKE_OPTS)||' \
 		-e 's|lrelease|${LRELEASE}|' \
 		-e 's|/share/man|/man|' \
 		-e 's|/doc/packages|/doc|' \