- Convert to USES=qmake (and other USES while I'm here)

- Add state support
- Convert LIB_DEPENDS to new style, adjust USE_QT4 components, etc.

Approved by:	portmgr (blanket approval)

42 files changed, 209 insertions, 421 deletions

diff --git a/archivers/quazip/Makefile b/archivers/quazip/Makefile
index b3c6db3e8863..0ac984cda8ca 100644
--- a/archivers/quazip/Makefile
+++ b/archivers/quazip/Makefile
@@ -12,14 +12,8 @@ COMMENT=	Qt/C++ wrapper for ZIP/UNZIP package
 
 LICENSE=	LGPL21
 
-NO_STAGE=	yes
-QMAKE_ARGS=	PREFIX=${PREFIX} ${QMAKE_PRO}
-QMAKE_PRO=	${WRKSRC}/${PORTNAME}.pro
-
+USES=		qmake
 USE_LDCONFIG=	yes
-USE_QT4=	corelib moc_build qtestlib qmake_build
-
-do-configure:
-	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}
+USE_QT4=	corelib moc_build qtestlib
 
 .include <bsd.port.mk>
diff --git a/audio/cuberok/Makefile b/audio/cuberok/Makefile
index fc6481f9559a..60c9c6b96c43 100644
--- a/audio/cuberok/Makefile
+++ b/audio/cuberok/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	audio
 MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	vg@FreeBSD.org
-COMMENT=	A music player and a collection manager based on Qt4
+COMMENT=	Music player and collection manager based on Qt4
 
 BUILD_DEPENDS=	audiere-config:${PORTSDIR}/audio/audiere \
 		${LOCALBASE}/lib/libdumb.a:${PORTSDIR}/audio/dumb
@@ -18,14 +18,15 @@ LIB_DEPENDS=	libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0 \
 		libtag.so:${PORTSDIR}/audio/taglib
 
 USE_LDCONFIG=	yes
-USE_QT4=	gui xml qmake_build uic_build moc_build rcc_build \
+USE_QT4=	gui xml uic_build moc_build rcc_build \
 		network phonon-gst sql
-USES=		gettext iconv pkgconfig
-NO_STAGE=	yes
+USES=		gettext iconv pkgconfig qmake
 USE_SDL=	sdl
-QMAKEFLAGS+=	"CONFIG+=player_phonon"
-MAKE_ENV+=	INSTALL_ROOT=${PREFIX}
-QMAKEPRO=	Cuberok.pro
+QMAKE_ARGS+=	"CONFIG+=player_phonon"
+
+BROKEN_ia64=	does not compile
+BROKEN_powerpc=	${BROKEN_ia64}
+BROKEN_sparc64=	${BROKEN_ia64}
 
 post-patch:
 	@${REINPLACE_CMD} \
@@ -34,18 +35,11 @@ post-patch:
 		-e 's,libavformat,libavformat0,g' \
 		${WRKSRC}/Cuberok.pro \
 		${WRKSRC}/plugins/player_ffmpeg/player_ffmpeg.pro
-
-do-configure:
-	cd ${WRKSRC} && ${REINPLACE_CMD} -e 's/lib64/lib/g' \
-		plugins/plugins_path-x86*
-
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile on ia64, powerpc, or sparc64
-.endif
-
-.include <bsd.port.post.mk>
+	${REINPLACE_CMD} -e 's/lib64/lib/g' \
+		${WRKSRC}/plugins/plugins_path-x86*
+# Fix installation paths
+	${REINPLACE_CMD} '/.path =/s,= \(.*\),= $$$$PREFIX/\1,' \
+			${WRKSRC}/plugins/*.pri \
+			${WRKSRC}/src/src.pro
+
+.include <bsd.port.mk>
diff --git a/audio/cueplayer/Makefile b/audio/cueplayer/Makefile
index d1f0ef5d7a6b..74d57f6140c4 100644
--- a/audio/cueplayer/Makefile
+++ b/audio/cueplayer/Makefile
@@ -10,18 +10,17 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	CUE player
 
-LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
 
-USES=		pkgconfig
-NO_STAGE=	yes
-USE_QT4=	gui xml qmake_build uic_build moc_build rcc_build network
+USES=		pkgconfig qmake
+USE_QT4=	gui xml uic_build moc_build rcc_build network
 USE_GSTREAMER=	flac good dvd lame ugly ffmpeg taglib ogg vorbis soup libmms wavpack
 
 LICENSE=	GPLv3
 
 DESKTOP_ENTRIES="Cueplayer" "Lightweight media player based on Qt and Gstreamer" \
 		"${DATADIR}/${PORTNAME}.png" "${PORTNAME}" \
-		"AudioVideo;Audio;Video;" ${FALSE}
+		"AudioVideo;Audio;Video;" true
 
 post-patch:
 	cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,/usr/share/cueplayer/,${DATADIR}/,g' \
@@ -29,10 +28,7 @@ post-patch:
 	${REINPLACE_CMD} -e 's,/usr/share,${PREFIX},g' \
 		${WRKSRC}/${PORTNAME}.pro
 
-do-configure:
-	cd ${WRKSRC} && ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
-
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/images/${PORTNAME}.png ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/images/${PORTNAME}.png ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/audio/lastfm-desktop/Makefile b/audio/lastfm-desktop/Makefile
index 29b5e3d278ba..29d7d1b9d7ce 100644
--- a/audio/lastfm-desktop/Makefile
+++ b/audio/lastfm-desktop/Makefile
@@ -18,26 +18,21 @@ LIB_DEPENDS=	liblastfm.so:${PORTSDIR}/audio/liblastfm \
 		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
 		libgpod.so:${PORTSDIR}/audio/libgpod
 
-USES=		pkgconfig
-NO_STAGE=	yes
+USES=		pkgconfig qmake
 USE_BZIP2=	yes
-USE_QT4=	gui linguist_build moc_build network phonon qmake_build \
+USE_QT4=	gui linguist_build moc_build network phonon \
 		rcc_build uic_build webkit xml
-USE_LDCONFIG=	yes
 LASTFM=		${PORTNAME}${PKGNAMESUFFIX}
 SUB_FILES=	${LASTFM}.sh
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
-do-configure:
-	cd ${WRKSRC} && ${QMAKE} ${QMAKEFLAGS}
-
 do-install:
-	${MKDIR} ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/${LASTFM}.sh ${PREFIX}/bin/${LASTFM}
-	${INSTALL_PROGRAM} ${WRKSRC}/_bin/Last.fm\ Scrobbler ${DATADIR}/
-	${INSTALL_LIB} ${WRKSRC}/_bin/lib*.so* ${DATADIR}/
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/${LASTFM}.sh ${STAGEDIR}${PREFIX}/bin/${LASTFM}
+	${INSTALL_PROGRAM} ${WRKSRC}/_bin/Last.fm\ Scrobbler ${STAGEDIR}${DATADIR}
+	${INSTALL_LIB} ${WRKSRC}/_bin/lib*.so* ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/app/client/Last.fm\ Scrobbler.css \
-		${DATADIR}/
+		${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/audio/mehdiaplayer/Makefile b/audio/mehdiaplayer/Makefile
index 132416ff8597..032f7bfbfb20 100644
--- a/audio/mehdiaplayer/Makefile
+++ b/audio/mehdiaplayer/Makefile
@@ -8,23 +8,18 @@ CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
 MAINTAINER=	vg@FreeBSD.org
-COMMENT=	A simple media player using Qt/Phonon
+COMMENT=	Simple media player using Qt/Phonon
 
+USES=		qmake
 USE_BZIP2=	yes
-NO_STAGE=	yes
-USE_QT4=	gui xml qmake_build uic_build moc_build \
+USE_QT4=	gui xml uic_build moc_build \
 		rcc_build phonon
 
-QMAKE_PRO=	${PORTNAME}.pro
-
 WRKSRC=		${WRKDIR}/dev
 
 PLIST_FILES=	bin/${PORTNAME}
 
-do-configure:
-	cd ${WRKSRC} && ${QMAKE}
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/audio/midipp/Makefile b/audio/midipp/Makefile
index 6d34abdf01ba..0ccfeb339942 100644
--- a/audio/midipp/Makefile
+++ b/audio/midipp/Makefile
@@ -15,15 +15,8 @@ LICENSE=	BSD
 BUILD_DEPENDS=	libumidi>=2.0.9:${PORTSDIR}/audio/libumidi
 LIB_DEPENDS=	libumidi20.so:${PORTSDIR}/audio/libumidi
 
+USES=		qmake
 USE_BZIP2=	yes
-NO_STAGE=	yes
-
-USE_QT4=	gui qmake_build moc_build rcc_build network
-
-QMAKE_MIDIPP=	${QMAKE} -unix PREFIX=${PREFIX} -o
-
-do-configure:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${QMAKE_MIDIPP} Makefile ${PORTNAME}.pro
+USE_QT4=	gui moc_build rcc_build network
 
 .include <bsd.port.mk>
diff --git a/audio/minitunes/Makefile b/audio/minitunes/Makefile
index e537e09dd3e3..373964e42eb2 100644
--- a/audio/minitunes/Makefile
+++ b/audio/minitunes/Makefile
@@ -8,24 +8,18 @@ CATEGORIES=	audio
 MASTER_SITES=	http://flavio.tordini.org/files/${PORTNAME}/
 
 MAINTAINER=	vg@FreeBSD.org
-COMMENT=	Minitunes is just another music player
+COMMENT=	Just another music player
 
-LIB_DEPENDS=	tag.1:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
 
-NO_STAGE=	yes
-USE_QT4=	dbus gui moc_build network phonon qmake_build rcc_build \
+USES=		qmake
+USE_QT4=	dbus gui moc_build network phonon rcc_build \
 		sql uic_build xml
 INSTALLS_ICONS=	yes
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-QMAKEFLAGS+=	PREFIX="${PREFIX}"
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} ${PORTNAME}.pro
-
 .include <bsd.port.mk>
diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile
index 23946c091b38..ecd02b0e59e2 100644
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/Mumble/${PORTVERSION}
 
 MAINTAINER=	feld@FreeBSD.org
-COMMENT=	A voice chat software primarily intended for use while gaming
+COMMENT=	Voice chat software primarily intended for use while gaming
 
 LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex \
 		libsndfile.so:${PORTSDIR}/audio/libsndfile \
@@ -17,18 +17,18 @@ LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex \
 		libprotoc.so:${PORTSDIR}/devel/protobuf \
 		libopus.so:${PORTSDIR}/audio/opus
 
-USES=		gmake pkgconfig
+USES=		gmake pkgconfig qmake
 USE_QT4=	gui svg iconengines_run xml sql network l10n \
-		linguist_build qmake_build moc_build rcc_build uic_build \
+		linguist_build moc_build rcc_build uic_build \
 		opengl sql-sqlite3_run
 
 USE_XORG=	ice
-HAS_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 MAKE_JOBS_UNSAFE=yes
 
 CONFIG=		no-server no-alsa no-speechd no-bundled-speex no-bundled-opus no-update \
 		bundled-celt no-g15 no-portaudio no-pulseaudio no-xevie no-embed-qt-translations
+QMAKE_ARGS=	"CONFIG+=${CONFIG}"
 
 OPTIONS_DEFINE=	DBUS BONJOUR
 OPTIONS_DEFAULT=	DBUS
@@ -51,9 +51,6 @@ LIB_DEPENDS+=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/overlay_gl/overlay_gl.pro
 
-do-configure:
-	cd ${WRKSRC} && ${SETENV} QMAKESPEC=${QMAKESPEC} ${QMAKE} PREFIX=${PREFIX} main.pro "CONFIG+=${CONFIG}"
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/release/mumble ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.11.0 ${STAGEDIR}${PREFIX}/lib/libcelt-mumble.so.0.11.0
diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile
index 4f96839c3b98..0161e02b0e98 100644
--- a/audio/murmur/Makefile
+++ b/audio/murmur/Makefile
@@ -15,9 +15,11 @@ LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf
 
 USERS=		murmur
 GROUPS=		murmur
-USE_QT4=	qmake_build moc_build corelib network xml sql sql-sqlite3_run
+USES=		qmake
+USE_QT4=	moc_build corelib network xml sql sql-sqlite3_run
 
 CONFIG=		no-client
+QMAKE_ARGS=	"CONFIG+=${CONFIG}"
 
 USE_RC_SUBR=	murmur
 SUB_LIST+=	USERS="${USERS}" GROUPS="${GROUPS}"
@@ -50,10 +52,6 @@ CONFIG+=	no-bonjour
 post-patch:
 	@${ECHO_CMD} 'QMAKE_LFLAGS += -fstack-protector' >> ${WRKSRC}/src/murmur/murmur.pro
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} QMAKESPEC=${QMAKESPEC} \
-		${QMAKE} -unix PREFIX=${PREFIX} ${QMAKEFLAGS} main.pro "CONFIG+=${CONFIG}"
-
 pre-install:
 	@${SED} -i '' -e 's|database=.*|database=/var/db/murmur/murmur.sqlite|' ${WRKSRC}/scripts/murmur.ini
 	@${SED} -i '' -e 's|#pidfile=.*|pidfile=/var/run/murmur/murmur.pid|' ${WRKSRC}/scripts/murmur.ini
diff --git a/audio/qmpdclient/Makefile b/audio/qmpdclient/Makefile
index 07072af6064a..842d809c73be 100644
--- a/audio/qmpdclient/Makefile
+++ b/audio/qmpdclient/Makefile
@@ -13,15 +13,11 @@ COMMENT=	Easy to use musicpd client written in Qt4
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
-
+USES=		qmake
 USE_BZIP2=	yes
-NO_STAGE=	yes
-USE_QT4=	qmake_build moc_build rcc_build uic_build \
+USE_QT4=	moc_build rcc_build uic_build \
 		corelib gui network xml xmlpatterns
 INSTALLS_ICONS=	yes
-QMAKE_ARGS=	${QMAKE_PRO}
-QMAKE_PRO=	${PORTNAME}.pro
 
 OPTIONS_DEFINE=	DBUS NLS DEBUG
 
@@ -39,27 +35,23 @@ PLIST_SUB+=	NLS=""
 
 .if ${PORT_OPTIONS:MDBUS}
 USE_QT4+=	dbus
-QMAKEFLAGS+=	"CONFIG+=qdbus"
+QMAKE_ARGS+=	"CONFIG+=qdbus"
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
-QMAKEFLAGS+=	"CONFIG+=debug"
+QMAKE_ARGS+=	"CONFIG+=debug"
 .endif
 
 post-patch:
 .if ! ${PORT_OPTIONS:MNLS}
 	@${REINPLACE_CMD} -e '/INSTALLS += translations/d' \
-		${WRKSRC}/${QMAKE_PRO}
+		${WRKSRC}/${PORTNAME}.pro
 .endif
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
 		-e 's|lupdate|lupdate-qt4|' \
 		-e 's|lrelease|lrelease-qt4|' \
-		${WRKSRC}/${QMAKE_PRO}
+		${WRKSRC}/${PORTNAME}.pro
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' \
 		${WRKSRC}/src/notifications_dbus.cpp
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} \
-		${QMAKEFLAGS} ${QMAKE_ARGS}
-
 .include <bsd.port.mk>
diff --git a/cad/layouteditor/Makefile b/cad/layouteditor/Makefile
index 24d0d589cb74..b0c147a8151e 100644
--- a/cad/layouteditor/Makefile
+++ b/cad/layouteditor/Makefile
@@ -12,19 +12,16 @@ DISTNAME=	LayoutEditor-${PORTVERSION:S,^0.0.,,}-gpl-src
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	IC/MEMS layout editor
 
-LIB_DEPENDS=	ttf:${PORTSDIR}/print/freetype
+LIB_DEPENDS=	libttf.so:${PORTSDIR}/print/freetype
 
+USES=		qmake
 USE_QT4=	corelib gui network moc_build sql uic_build \
-		rcc_build qmake qt3support xml
+		rcc_build qt3support xml
 USE_ZIP=	yes
 WRKSRC=		${WRKDIR}/layout
 PLIST_FILES=	bin/layout
 
-NO_STAGE=	yes
-do-configure:
-	cd ${WRKSRC} && ${QMAKE} -makefile -spec ${QMAKESPEC}
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/layout ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/layout ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff --git a/cad/leocad/Makefile b/cad/leocad/Makefile
index 70986a0febed..35463ae5a10d 100644
--- a/cad/leocad/Makefile
+++ b/cad/leocad/Makefile
@@ -23,8 +23,8 @@ RUN_DEPENDS=	${LOCALBASE}/share/ldraw/models/car.dat:${PORTSDIR}/cad/ldraw
 WRKSRC=		${WRKDIR}/${PORTNAME}
 LEOCAD_PIECES=	pieces-7439.zip
 
-USES=		desktop-file-utils gmake pkgconfig shared-mime-info
-USE_QT4=	moc_build qmake_build rcc_build uic_build iconengines imageformats \
+USES=		desktop-file-utils gmake pkgconfig qmake shared-mime-info
+USE_QT4=	moc_build rcc_build uic_build iconengines_run imageformats_run \
 		corelib gui network opengl
 
 USE_GL=		glut
@@ -39,7 +39,6 @@ ICON_SIZES=	16x16 24x24 32x32 48x48 128x128 256x256
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-extract:
@@ -59,28 +58,24 @@ post-patch:
 	@cd ${WRKSRC}/tools/icon && ${CP} -a ${PORTNAME}_128x128.png icon128.png
 	@cd ${WRKSRC}/tools/icon && ${MV} icon.svg ${PORTNAME}.svg
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
-
 post-install:
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKDIR}/pieces/* ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKDIR}/pieces/* ${STAGEDIR}${DATADIR}
 
 .for s in ${ICON_SIZES}
 	@${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps
 	${INSTALL_DATA} ${WRKSRC}/tools/icon/${PORTNAME}_${s}.png \
-		${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
 .endfor
-	@${MKDIR} ${PREFIX}/share/icons/hicolor/scalable/apps
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	${INSTALL_DATA} ${WRKSRC}/tools/icon/${PORTNAME}.svg  \
-		${PREFIX}/share/icons/hicolor/scalable/apps/
-	@${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/
-	${INSTALL_MAN} ${WRKSRC}/docs/${MAN1} ${MAN1PREFIX}/man/man1/
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/
+	@${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/
+	${INSTALL_MAN} ${WRKSRC}/docs/${MAN1} ${STAGEDIR}${MAN1PREFIX}/man/man1/
 
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/cad/meshlab/Makefile b/cad/meshlab/Makefile
index 04028994caa1..87b3d05d97d8 100644
--- a/cad/meshlab/Makefile
+++ b/cad/meshlab/Makefile
@@ -14,10 +14,11 @@ COMMENT=	3D triangular meshes processing and editing tool
 EXTRACT_DEPENDS=7z:${PORTSDIR}/archivers/p7zip
 LIB_DEPENDS=	libQtSolutions_SOAP-head.so:${PORTSDIR}/devel/qt4-qtsolutions-soap
 
+USES=		dos2unix qmake
 USE_GL=		glew glu
-USE_QT4=	qmake_build moc_build rcc_build uic_build corelib gui xml \
+USE_QT4=	moc_build rcc_build uic_build corelib gui xml \
 		xmlpatterns opengl network script
-USE_DOS2UNIX=	external/structuresynth/ssynth/SyntopiaCore/GLEngine/Object3D.h \
+DOS2UNIX_FILES=	external/structuresynth/ssynth/SyntopiaCore/GLEngine/Object3D.h \
 		meshlabplugins/edit_arc3D/fillImage.cpp
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}/src
@@ -35,13 +36,11 @@ post-patch:
 	    ${REINPLACE_CMD} -e '/^CONFIG +=/s|$$| debug|'
 .endif
 
-do-configure:
-	cd ${WRKSRC}/external && ${QMAKE} -spec ${QMAKESPEC} -recursive external.pro
-	cd ${WRKSRC} && ${QMAKE} -spec ${QMAKESPEC} -recursive meshlab_full.pro
+pre-configure:
+	cd ${WRKSRC}/external && ${QMAKE} ${QMAKE_ARGS} -recursive external.pro
 
-do-build:
+pre-build:
 	cd ${WRKSRC}/external && ${MAKE}
-	cd ${WRKSRC} && ${MAKE}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/meshlab/plugins
diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
index 57a8460c78b9..3ae00826f82d 100644
--- a/cad/openscad/Makefile
+++ b/cad/openscad/Makefile
@@ -12,26 +12,22 @@ COMMENT=	The programmer's solid 3D CAD modeller
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison \
-		${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
 		${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2 \
 		${LOCALBASE}/include/boost/tuple/tuple.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	GLU:${PORTSDIR}/graphics/libGLU \
-		gmp:${PORTSDIR}/math/gmp \
-		mpfr:${PORTSDIR}/math/mpfr \
-		CGAL:${PORTSDIR}/math/cgal \
-		opencsg:${PORTSDIR}/graphics/opencsg
-
-USE_GL=		glew
-USE_QT4=  qmake corelib gui opengl moc uic rcc
-PLIST_SUB=      PORTVERSION=${PORTVERSION}
-#MAKE_JOBS_UNSAFE=yes
-QMAKE_ENV =		EIGEN2DIR=${LOCALBASE}/include/eigen2
-QMAKE_FLAGS =		VERSION=${PORTVERSION}
-MAKE_ENV =		INSTALL_ROOT=${DESTDIR}
+LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
+		libmpfr.so:${PORTSDIR}/math/mpfr \
+		libCGAL.so:${PORTSDIR}/math/cgal \
+		libopencsg.so:${PORTSDIR}/graphics/opencsg
+
+USES=		bison qmake
+USE_GL=		glu glew
+USE_QT4=	corelib gui opengl moc_build uic_build rcc_build
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+QMAKE_ENV=	EIGEN2DIR=${LOCALBASE}/include/eigen2
+QMAKE_ARGS+=	VERSION=${PORTVERSION}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e 's,XXXFLEXXX,"${LOCALBASE}/bin/flex",' \
 		${WRKSRC}/openscad.pro
@@ -42,8 +38,4 @@ post-patch:
 	${REINPLACE_CMD} -e 's#/usr/local/bin/flex#${LOCALBASE}/bin/flex#g' \
 		${WRKSRC}/flex.pri
 
-do-configure:
-	cd ${WRKSRC} && \
-	${SETENV} ${QMAKE_ENV} ${QMAKE} ${QMAKE_FLAGS} openscad.pro
-
 .include <bsd.port.mk>
diff --git a/cad/qelectrotech/Makefile b/cad/qelectrotech/Makefile
index ccc527f73d6b..643dba82932d 100644
--- a/cad/qelectrotech/Makefile
+++ b/cad/qelectrotech/Makefile
@@ -14,26 +14,26 @@ COMMENT=	QElectroTech is application to design electric diagrams
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USE_QT4=	gui moc_build network qmake_build rcc_build \
-		sql-sqlite3 svg uic_build xml designer
+USES=		qmake
+USE_QT4=	gui moc_build network rcc_build \
+		sql-sqlite3_run svg uic_build xml designer
 USE_GCC=	4.7+
 INSTALLS_ICONS=	yes
 
 CXXFLAGS+=	"-fno-ipa-sra"
-QMAKEFLAGS+=	QMAKE_RPATHDIR="${_GCC_RUNTIME}"
+QMAKE_ARGS+=	QMAKE_RPATHDIR="${_GCC_RUNTIME}"
 
 MAN1=		qelectrotech.1
 MANLANG=	"" cs el es fr.ISO8859-1 fr.UTF-8 fr it pl pt_PT
 MANCOMPRESSED=	yes
 
-do-configure:
+pre-configure:
 	${MV} ${WRKSRC}/man/files/pt ${WRKSRC}/man/files/pt_PT
-	${REINPLACE_CMD} -e 's,/usr/local/,${STAGEDIR}${PREFIX}/,g' \
+	${REINPLACE_CMD} -e 's,/usr/local/,${PREFIX}/,g' \
 		${WRKSRC}/${PORTNAME}.pro
 	${REINPLACE_CMD} -e 's,doc/,share/doc/,g' \
 		${WRKSRC}/${PORTNAME}.pro
 	${REINPLACE_CMD} -e 's,../share,share,g' \
 		${WRKSRC}/${PORTNAME}.pro
-	cd ${WRKSRC} && ${QMAKE} ${QMAKEFLAGS} ${PORTNAME}.pro
 
 .include <bsd.port.mk>
diff --git a/comms/gqrx/Makefile b/comms/gqrx/Makefile
index 51574f008009..13f1ac1f4662 100644
--- a/comms/gqrx/Makefile
+++ b/comms/gqrx/Makefile
@@ -14,25 +14,20 @@ COMMENT=	Qt-based software defined radio receiver
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	gnuradio-core:${PORTSDIR}/comms/gnuradio \
-		gnuradio-audio:${PORTSDIR}/comms/gnuradio \
-		gnuradio-osmosdr:${PORTSDIR}/comms/gr-osmosdr \
-		pulse:${PORTSDIR}/audio/pulseaudio \
-		pulse-simple:${PORTSDIR}/audio/pulseaudio \
-		boost_system:${PORTSDIR}/devel/boost-libs \
-		boost_program_options:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libgnuradio-core.so:${PORTSDIR}/comms/gnuradio \
+		libgnuradio-audio.so:${PORTSDIR}/comms/gnuradio \
+		libgnuradio-osmosdr.so:${PORTSDIR}/comms/gr-osmosdr \
+		libpulse.so:${PORTSDIR}/audio/pulseaudio \
+		libpulse-simple.so:${PORTSDIR}/audio/pulseaudio \
+		libboost_system.so:${PORTSDIR}/devel/boost-libs \
+		libboost_program_options.so:${PORTSDIR}/devel/boost-libs
 
-USES=	pkgconfig
-USE_QT4=	qmake_build moc_build rcc_build uic_build corelib gui svg
+USES=		pkgconfig qmake
+USE_QT4=	moc_build rcc_build uic_build corelib gui svg
 
 PLIST_FILES=	bin/gqrx
 
-NO_STAGE=	yes
-do-configure:
-	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gqrx ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/gqrx ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/comms/qsstv/Makefile b/comms/qsstv/Makefile
index c37da2cd0bb4..e7e71154106c 100644
--- a/comms/qsstv/Makefile
+++ b/comms/qsstv/Makefile
@@ -12,16 +12,16 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	shurd@sasktel.net
 COMMENT=	Amateur Radio SSTV/FAX reception program for unix
 
-LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3 \
-		hamlib:${PORTSDIR}/comms/hamlib \
-		asound:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
+		libhamlib.so:${PORTSDIR}/comms/hamlib \
+		libasound.so:${PORTSDIR}/audio/alsa-lib
 BUILD_DEPENDS=	v4l_compat>=0:${PORTSDIR}/multimedia/v4l_compat
 
-USE_QT4=	gui network moc_build qmake_build rcc_build uic_build
+USES=		qmake
+USE_QT4=	gui network moc_build rcc_build uic_build
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MDOCS}
@@ -36,8 +36,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 	    ${WRKSRC}/src/src.pro
 
-do-configure:
-	@cd ${WRKSRC}; \
-	    ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${DISTNAME}.pro
-
 .include <bsd.port.mk>
diff --git a/ftp/scythia/Makefile b/ftp/scythia/Makefile
index 16c2da295911..b0d3242a6829 100644
--- a/ftp/scythia/Makefile
+++ b/ftp/scythia/Makefile
@@ -12,7 +12,8 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}-2-src
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	Small ftp client unpretentious based on Qt4
 
-USE_QT4=	gui network corelib qmake_build uic_build moc_build rcc_build
+USES=		qmake
+USE_QT4=	gui network corelib uic_build moc_build rcc_build
 INSTALLS_ICONS=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -25,9 +26,8 @@ DESKTOP_ENTRIES=	"Scythia" \
 			"scythia" \
 			"scythia" \
 			"Network;FileTransfer;Qt;" \
-			"false"
+			"true"
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \
 		-e '/unix:desktop/d' \
@@ -35,8 +35,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \
 		${WRKSRC}/src/main.cpp
 
-pre-build:
-	@cd ${BUILD_WRKSRC} && \
-	       ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} scythia.pro
-
 .include <bsd.port.mk>
diff --git a/graphics/autoq3d/Makefile b/graphics/autoq3d/Makefile
index ae69e15328dd..1c5a332280ec 100644
--- a/graphics/autoq3d/Makefile
+++ b/graphics/autoq3d/Makefile
@@ -9,16 +9,15 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/AutoQ3D%20${PORTVERSION}
 DISTNAME=	AutoQ3DCommunity${PORTVERSION:C/\./-/}qt4source
 
 MAINTAINER=	nemysis@gmx.ch
-COMMENT=	Qt4 quick 3D model editor
+COMMENT=	Qt 4 quick 3D model editor
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-USE_DOS2UNIX=	yes
+USES=		dos2unix qmake
 USE_GL=		glu
 USE_ZIP=	yes
-USE_QT4=	corelib gui opengl \
-		moc_build qmake_build
+USE_QT4=	corelib gui opengl moc_build
 
 PORTDOCS=	3DQformat.txt ChangeLog.txt
 
@@ -27,9 +26,8 @@ DESKTOP_ENTRIES="AutoQ3D" \
 		"AutoQ3D" \
 		"AutoQ3D" \
 		"Graphics;3DGraphics;Qt;" \
-		false
+		true
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 post-patch:
 .for file in src/main.cpp src/fgui/cadform.cpp src/dialogs/prgsettings.cpp
@@ -37,16 +35,13 @@ post-patch:
 		's|/usr/share/AutoQ3D-Community|${DATADIR}|g' ${WRKSRC}/${file}
 .endfor
 
-do-configure:
-	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS})
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/AutoQ3D ${PREFIX}/bin
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "images *.htm *.qm" ${DATADIR})
-	${INSTALL_DATA} ${WRKSRC}/AutoQ3D.png ${PREFIX}/share/pixmaps
+	${INSTALL_PROGRAM} ${WRKSRC}/AutoQ3D ${STAGEDIR}${PREFIX}/bin
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "images *.htm *.qm" ${STAGEDIR}${DATADIR})
+	${INSTALL_DATA} ${WRKSRC}/AutoQ3D.png ${STAGEDIR}${PREFIX}/share/pixmaps
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/burplex/Makefile b/graphics/burplex/Makefile
index 744fc1fdf914..eee51f4882de 100644
--- a/graphics/burplex/Makefile
+++ b/graphics/burplex/Makefile
@@ -14,31 +14,23 @@ LICENSE=	BSD
 
 RUN_DEPENDS=	${LOCALBASE}/bin/dcraw:${PORTSDIR}/graphics/dcraw
 
-USE_QT4=	gui qmake_build uic_build moc_build rcc_build \
+USES=		qmake
+USE_QT4=	gui uic_build moc_build rcc_build \
 		imageformats_run
-HAS_CONFIGURE=	yes
-QMAKE_ARGS=	-recursive PREFIX=${PREFIX}
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-MAN7=		burplex.7
-PLIST_FILES=	bin/${PORTNAME}
+PLIST_FILES=	bin/${PORTNAME} \
+		man/man7/burplex.7.gz
 
 DESKTOP_ENTRIES=	"burplex" "${COMMENT}" ""  \
-			"burplex" "" "false"
+			"burplex" "" "true"
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \
 		${WRKSRC}/mainwindow.cpp
 
-do-configure:
-	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKE_ARGS} ${QMAKEFLAGS}
-
 do-install:
-	${MKDIR} ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${MKDIR} ${MANPREFIX}/man/man7
-	${INSTALL_MAN} ${WRKSRC}/burplex.7 ${MANPREFIX}/man/man7
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/burplex.7 ${STAGEDIR}${MANPREFIX}/man/man7
 
 .include <bsd.port.mk>
diff --git a/graphics/easypaint/Makefile b/graphics/easypaint/Makefile
index a25dadbfd2b8..e9114ffaf190 100644
--- a/graphics/easypaint/Makefile
+++ b/graphics/easypaint/Makefile
@@ -13,7 +13,8 @@ COMMENT=	Easy graphic editing program
 
 LICENSE=	GPLv3
 
-USE_QT4=	gui xml qmake_build uic_build moc_build rcc_build
+USES=		qmake
+USE_QT4=	gui xml uic_build moc_build rcc_build
 QPROFILE=	easyPaint
 WRKSRC=		${WRKDIR}/${QPROFILE}
 
@@ -22,11 +23,7 @@ DESKTOP_ENTRIES="easyPaint" "${COMMENT}" "" "easypaint" \
 
 PLIST_FILES=	bin/${PORTNAME}
 
-NO_STAGE=	yes
-do-configure:
-	cd ${WRKSRC} && ${QMAKE}
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${QPROFILE} ${PREFIX}/bin/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/${QPROFILE} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/graphics/evolvotron/Makefile b/graphics/evolvotron/Makefile
index ff43d416c189..ca0107b2f8ba 100644
--- a/graphics/evolvotron/Makefile
+++ b/graphics/evolvotron/Makefile
@@ -19,10 +19,11 @@ LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_QT4=	corelib gui xml moc_build qmake_build
+USES=		qmake
+USE_QT4=	corelib gui xml moc_build
 USE_PYTHON=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_ENV=	QTDIR="${QT_PREFIX}"
+QMAKE_ARGS+=	VERSION_NUMBER="${PORTVERSION}"
+QMAKE_SOURCE_PATH=	${WRKSRC}/main.pro
 MAKE_JOBS_UNSAFE=	yes
 
 PORTDOCS=	NEWS README TODO USAGE evolvotron.html
@@ -44,21 +45,14 @@ CXXFLAGS+=	-include ${WRKSRC}/${i}/${i}_precompiled.h \
 		-I${WRKSRC}/${i}
 .endfor
 .else
-QMAKEFLAGS+=	CONFIG+=precompile_header
+QMAKE_ARGS+=	CONFIG+=precompile_header
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' \
-		${WRKSRC}/configure ${WRKSRC}/VERSION
 	@${REINPLACE_CMD} -e \
 		'/^CONFIG/s|precompile_header|| ; \
 		 /DEFINES/s|_LINUX|_BSD|' ${WRKSRC}/common.pro
 
-post-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} \
-		VERSION_NUMBER="${PORTVERSION}" main.pro
-
 do-install:
 .for i in evolvotron evolvotron_mutate evolvotron_render
 	${INSTALL_PROGRAM} ${WRKSRC}/${i}/${i} ${STAGEDIR}${PREFIX}/bin/
diff --git a/graphics/opencsg/Makefile b/graphics/opencsg/Makefile
index 1ad85f12b051..b817c3097059 100644
--- a/graphics/opencsg/Makefile
+++ b/graphics/opencsg/Makefile
@@ -11,22 +11,17 @@ DISTNAME=	OpenCSG-${PORTVERSION}
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Constructive Solid Geometry rendering library
 
+USES=		qmake
 USE_GL=		glew
+USE_QT4=  	corelib gui
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
-
-USE_QT4=  qmake_build corelib gui
 PLIST_SUB=      PORTVERSION=${PORTVERSION}
-#MAKE_JOBS_UNSAFE=yes
-
-NO_STAGE=	yes
-do-configure:
-	cd ${WRKSRC} && ${QMAKE} src.pro
 
 do-install:
 	${INSTALL_LIB} ${WRKDIR}/${DISTNAME}/lib/libopencsg.so.${PORTVERSION} \
-		${PREFIX}/lib
-	${LN} -sf libopencsg.so.${PORTVERSION} ${PREFIX}/lib/libopencsg.so.1
-	${LN} -sf libopencsg.so.${PORTVERSION} ${PREFIX}/lib/libopencsg.so
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/include/opencsg.h ${PREFIX}/include
+		${STAGEDIR}${PREFIX}/lib
+	${LN} -sf libopencsg.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libopencsg.so.1
+	${LN} -sf libopencsg.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libopencsg.so
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/include/opencsg.h ${STAGEDIR}${PREFIX}/include
 
 .include <bsd.port.mk>
diff --git a/graphics/pencil/Makefile b/graphics/pencil/Makefile
index aaa9b491dc5f..addab1b99c28 100644
--- a/graphics/pencil/Makefile
+++ b/graphics/pencil/Makefile
@@ -22,38 +22,26 @@ LIB_DEPENDS+=	ming:${PORTSDIR}/graphics/ming \
 		drm:${PORTSDIR}/graphics/libdrm
 
 USE_ZIP=	yes
-USES=		gettext iconv
+USES=		gettext iconv qmake
 USE_GNOME=	glib20
-USE_QT4=	gui moc_build qmake_build rcc_build xml_build opengl_build
+USE_QT4=	gui moc_build rcc_build xml_build opengl_build
 USE_XORG=	xi xrender xrandr xfixes xcursor xinerama xext x11 xau xdmcp \
 		xxf86vm xdamage
 USE_GL=		gl glu
+QMAKE_ARGS+=	INCLUDEPATH+=${LOCALBASE}/include/ming
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-source
 
 PLIST_FILES=	bin/pencil
 PORTDOCS=	README TODO
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} -unix PREFIX=${PREFIX} \
-		INCLUDEPATH+=${LOCALBASE}/include/ming \
-		${PORTNAME}.pro
-
 post-patch:
 	@${MKDIR} ${WRKSRC}/src/external/freebsd
 	@${CP} ${FILESDIR}/src-external-freebsd-freebsd.cpp \
 		${WRKSRC}/src/external/freebsd/freebsd.cpp
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/Pencil ${PREFIX}/bin/pencil
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-.for doc in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
-.endfor
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/Pencil ${STAGEDIR}${PREFIX}/bin/pencil
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/qiviewer/Makefile b/graphics/qiviewer/Makefile
index 3f85ee1ad670..03f90752e338 100644
--- a/graphics/qiviewer/Makefile
+++ b/graphics/qiviewer/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Fast and lightweight image viewer
 
 LICENSE=	GPLv2
 
+USES=		qmake
 USE_BZIP2=	yes
-USE_QT4=	gui xml dbus imageformats linguist_build qmake_build \
+USE_QT4=	gui xml dbus imageformats_run linguist_build \
 		moc_build rcc_build uic_build
-QMAKEFLAGS+=	PREFIX="${PREFIX}"
 
 PLIST_FILES=	bin/qiviewer \
 		share/applications/qiviewer.desktop \
@@ -29,19 +29,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}/src
 
 OPTIONS_DEFINE=	WEBP
 WEBP_DESC=	Support for WebP image format (experimental)
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MWEBP}
-QMAKEFLAGS+=	CONFIG+=enable-webp
-PLIST_SUB+=	WEBP=""
-.else
-PLIST_SUB+=	WEBP="@comment "
-.endif
-
-do-configure:
-	@cd ${WRKSRC} && ${QMAKE} ${QMAKEFLAGS}
+WEBP_QMAKE_ON=	CONFIG+=enable-webp
 
 post-configure:
 	${REINPLACE_CMD} -e 's|lrelease|lrelease-qt4|g' \
diff --git a/graphics/qxv/Makefile b/graphics/qxv/Makefile
index 8f0b805ba46c..d843379b18eb 100644
--- a/graphics/qxv/Makefile
+++ b/graphics/qxv/Makefile
@@ -8,7 +8,7 @@ CATEGORIES+=	graphics
 MASTER_SITES=	http://labs.freehackers.org/attachments/download/422/
 
 MAINTAINER=	cy@FreeBSD.org
-COMMENT=	A QT4 program that displays images of various formats
+COMMENT=	Qt 4 program that displays images of various formats
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -24,22 +24,15 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		expat.6:${PORTSDIR}/textproc/expat2 \
 		xcb.2:${PORTSDIR}/x11/xcb
 
-USES=		iconv
+USES=		iconv qmake
 USE_BZIP2=	yes
 USE_XORG=	sm xrender xext x11 xau xdmcp ice
-USE_QT4=	corelib gui qmake_build moc_build uic_build rcc_build
+USE_QT4=	corelib gui moc_build uic_build rcc_build
 MAKE_JOBS_UNSAFE=	yes
-HAS_CONFIGURE=	yes
 
 PLIST_FILES=	bin/${PORTNAME}
 
-NO_STAGE=	yes
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-	${QMAKE} PREFIX=${PREFIX} ${PORTNAME}.pro
-
 do-install:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-	${INSTALL_PROGRAM} ${PORTNAME} ${LOCALBASE}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff --git a/graphics/seam-carving-gui/Makefile b/graphics/seam-carving-gui/Makefile
index 1fbd95c03f27..e55096b62c92 100644
--- a/graphics/seam-carving-gui/Makefile
+++ b/graphics/seam-carving-gui/Makefile
@@ -11,21 +11,14 @@ DISTNAME=	SeamCarvingGui-Src-${PORTVERSION}
 MAINTAINER=	buganini@gmail.com
 COMMENT=	The Seam Carving GUI is a GUI front end to CAIR
 
-HAS_CONFIGURE=	yes
-
-USE_GMAKE=	yes
-USE_QT4=	gui imageformats_run moc_build qmake_build uic_build
+USES=		gmake qmake
+USE_QT4=	gui imageformats_run moc_build uic_build
 
 WRKSRC=		${WRKDIR}/Src\ Seam\ Carving\ GUI\ ${PORTVERSION}
 
 PLIST_FILES=	bin/SeamCarvingGui
 
-NO_STAGE=	yes
-do-configure:
-	cd ${WRKSRC} && 	\
-	${SETENV} QMAKESPEC="${QMAKESPEC}" ${QMAKE} seam-carving-gui.pro
-
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/SeamCarvingGui ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/SeamCarvingGui ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/misc/qbrew/Makefile b/misc/qbrew/Makefile
index d9ebce684240..4da6b2faf152 100644
--- a/misc/qbrew/Makefile
+++ b/misc/qbrew/Makefile
@@ -8,27 +8,17 @@ CATEGORIES=	misc
 MASTER_SITES=	http://www.usermode.org/code/
 
 MAINTAINER=	david@usermode.org
-COMMENT=	A homebrewer's recipe calculator
+COMMENT=	Homebrewer's recipe calculator
 
-USE_QT4=	qmake_build moc_build uic_build rcc_build xml gui
+USES=		qmake
+USE_QT4=	moc_build uic_build rcc_build xml gui
 PORTDOCS=	*
-HAS_CONFIGURE=	yes
 
-CONFIGURE_ENV+=	BINDIR="${PREFIX}/bin" \
+QMAKE_ARGS=	CONFIG+="configure"
+QMAKE_ENV+=	BINDIR="${PREFIX}/bin" \
 		DATADIR="${DATADIR}" \
 		DOCDIR="${DOCSDIR}"
 
-NO_STAGE=	yes
-pre-configure:
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e '/INSTALLS/s|doc||' \
-		${WRKSRC}/qbrew.pro
-.endif
-
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} -unix CONFIG+="configure" qbrew.pro
-
 post-install:
 	${STRIP_CMD} ${PREFIX}/bin/qbrew
 
diff --git a/misc/qmetro/Makefile b/misc/qmetro/Makefile
index a4b249c28514..3d81ef176b55 100644
--- a/misc/qmetro/Makefile
+++ b/misc/qmetro/Makefile
@@ -11,15 +11,12 @@ COMMENT=	Map of the transport system for many city subways
 
 LICENSE=	GPLv2
 
+USES=		dos2unix qmake
 USE_ZIP=	yes
 INSTALLS_ICONS=	yes
-USE_QT4=	gui xml qmake_build uic_build moc_build multimedia \
+USE_QT4=	gui xml uic_build moc_build multimedia \
 		rcc_build
-QMAKEFLAGS=	QMAKE_LFLAGS="-lz"
-USE_DOS2UNIX=	rc/alarm.pri
-
-NO_STAGE=	yes
-do-configure:
-	cd ${WRKSRC} && ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
+LDFLAGS=	-lz
+DOS2UNIX_FILES=	rc/alarm.pri
 
 .include <bsd.port.mk>
diff --git a/misc/saaghar/Makefile b/misc/saaghar/Makefile
index b2672960e4ce..84c3ee0fa9b7 100644
--- a/misc/saaghar/Makefile
+++ b/misc/saaghar/Makefile
@@ -17,17 +17,15 @@ LICENSE=	GPLv3
 
 EXTRACT_DEPENDS=	${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
 
+USES=		qmake
 USE_QT4=	gui network sql xml sql-sqlite3_run \
-		moc_build qmake_build rcc_build uic_build
-HAS_CONFIGURE=	yes
-QMAKEFLAGS+=	PREFIX=${PREFIX}
+		moc_build rcc_build uic_build
 WRKSRC=		${WRKDIR}/Saaghar
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MDEBUG}
-QMAKEFLAGS+=	-config release
+QMAKE_ARGS+=	-config release
 .endif
 
 post-extract:
@@ -43,11 +41,7 @@ post-patch:
 		${WRKSRC}/QGanjoorDbStuff.h \
 		${WRKSRC}/mainwindow.cpp
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-	${QMAKE} ${QMAKEFLAGS} saaghar.pro
-
 post-install:
-	cd ${WRKDIR}/ganjoor && ${COPYTREE_SHARE} .  ${DATADIR}
+	cd ${WRKDIR}/ganjoor && ${COPYTREE_SHARE} .  ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/multimedia/clipgrab/Makefile b/multimedia/clipgrab/Makefile
index ec79c9fba34d..1f6c59465337 100644
--- a/multimedia/clipgrab/Makefile
+++ b/multimedia/clipgrab/Makefile
@@ -12,8 +12,9 @@ COMMENT=	Program to download videos from YouTube and etc
 
 LICENSE=	GPLv3
 
+USES=		qmake
 USE_BZIP2=	yes
-USE_QT4=	gui xml qmake_build uic_build moc_build \
+USE_QT4=	gui xml uic_build moc_build \
 		rcc_build network dbus webkit
 
 PLIST_FILES=	bin/${PORTNAME} \
@@ -26,19 +27,15 @@ PLIST_DIRS=	%%DATADIR%%
 
 DESKTOP_ENTRIES="Clipgrab" "Download and convert videos from YouTube and etc" \
 		"${DATADIR}/icon.png" "${PORTNAME}" \
-		"AudioVideo;" false
+		"AudioVideo;" true
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e 's,img/,share/${PORTNAME}/,g' \
 	${WRKSRC}/*.cpp
 
-do-configure:
-	cd ${WRKSRC} && ${QMAKE}
-
 do-install:
-	${MKDIR} ${DATADIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/*.png ${DATADIR}
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/*.png ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/multimedia/mediadownloader/Makefile b/multimedia/mediadownloader/Makefile
index 58bd97f99034..14a968dc10d9 100644
--- a/multimedia/mediadownloader/Makefile
+++ b/multimedia/mediadownloader/Makefile
@@ -13,11 +13,12 @@ COMMENT=	Search, watch, and download from Google Image and YouTube
 
 LICENSE=	GPLv3
 
+USES=		qmake
 USE_GL=		gl glu
 USE_XORG=	xtst
 USE_GSTREAMER=	ffmpeg
 USE_QT4=	dbus gui network moc_build opengl phonon phonon-gst \
-		qmake_build rcc_build uic_build webkit xml xmlpatterns
+		rcc_build uic_build webkit xml xmlpatterns
 QMAKEPRO=	${PORTNAME}.pro
 PLIST_FILES=	bin/${PORTNAME}
 
@@ -25,12 +26,10 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 DESKTOP_ENTRIES="MediaDownloader" "${COMMENT}" \
 		"${DATADIR}/${PORTNAME}.png" "${PORTNAME}" \
-		"" false
+		"" true
 
-NO_STAGE=	yes
-do-configure:
+pre-configure:
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \
 		${WRKSRC}/${QMAKEPRO}
-	@cd ${WRKSRC} && ${QMAKE} ${QMAKEFLAGS} ${QMAKEPRO}
 
 .include <bsd.port.mk>
diff --git a/net-im/qxmpp-leechcraft/Makefile b/net-im/qxmpp-leechcraft/Makefile
index 258b591c5cd5..27970c1db1cc 100644
--- a/net-im/qxmpp-leechcraft/Makefile
+++ b/net-im/qxmpp-leechcraft/Makefile
@@ -13,21 +13,18 @@ COMMENT=	XMPP client library based on C++ and Qt
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	speex:${PORTSDIR}/audio/speex
+LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
 
+USES=		qmake
 USE_BZIP2=	yes
-USE_QT4=	gui moc_build network qmake_build rcc_build uic_build xml
+USE_QT4=	gui moc_build network rcc_build uic_build xml
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|pkgconfig|../libdata/&|' \
 		${WRKSRC}/src/src.pro
 	@${REINPLACE_CMD} -E 's|(docs\.commands\|INSTALLS)|#&|' \
 		${WRKSRC}/${PORTNAME}.pro
 
-do-configure:
-	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS}
-
 .include <bsd.port.mk>
diff --git a/net-im/qxmpp/Makefile b/net-im/qxmpp/Makefile
index a73b6d429b13..9725a61f458d 100644
--- a/net-im/qxmpp/Makefile
+++ b/net-im/qxmpp/Makefile
@@ -12,16 +12,15 @@ COMMENT=	QXmpp is an xmpp client library based on Qt & C++
 
 LICENSE=	LGPL21
 
-USE_QT4=	gui network xml qmake_build uic_build moc_build rcc_build
+USES=		qmake
+USE_QT4=	gui network xml uic_build moc_build rcc_build
 
 CONFLICTS=	${PORTNAME}-leechcraft-[0-9]*
 
-NO_STAGE=	yes
-do-configure:
+pre-configure:
 	${REINPLACE_CMD} -e 's|%%QT_LIBDIR_REL%%|${QT_LIBDIR_REL}|g' \
 		${WRKSRC}/src/src.pro
 	${REINPLACE_CMD} -e 's|%%DOCSDIR%%|${DOCSDIR}|g' \
 		${WRKSRC}/${PORTNAME}.pro
-	cd ${WRKSRC} && ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
 
 .include <bsd.port.mk>
diff --git a/net-p2p/retroshare/Makefile b/net-p2p/retroshare/Makefile
index 256fdd9b7f4c..9c502a60b1ad 100644
--- a/net-p2p/retroshare/Makefile
+++ b/net-p2p/retroshare/Makefile
@@ -30,12 +30,12 @@ LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
 		libxslt.so:${PORTSDIR}/textproc/libxslt
 RUN_DEPENDS=	pinentry-qt4:${PORTSDIR}/security/pinentry-qt4
 
+USES=		qmake
 USE_ZIP=	yes
 USE_GNOME=	glib20
 USE_XORG=	ice sm x11 xau xcb xdmcp xext xrender
 USE_QT4=	corelib gui network xml script designer_build uic_build \
-		qmake_build moc_build rcc_build multimedia
-HAS_CONFIGURE=	yes
+		moc_build rcc_build multimedia
 BINARY=		RetroShare
 MAKE_JOBS_UNSAFE=yes
 USE_LDCONFIG=	yes
@@ -43,10 +43,6 @@ USE_LDCONFIG=	yes
 DESKTOP_ENTRIES="${BINARY}" "${COMMENT}" "${DATADIR}/retrosharelogo1.png" \
 		"${BINARY}" "Network;FileTransfer;" true
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} PREFIX=${PREFIX} ${BINARY}.pro
-
 USE_DOS2UNIX=	retroshare-gui/src/retroshare-gui.pro
 
 post-patch:
diff --git a/net/ostinato/Makefile b/net/ostinato/Makefile
index b73d475fec35..63270c02a1e6 100644
--- a/net/ostinato/Makefile
+++ b/net/ostinato/Makefile
@@ -11,9 +11,10 @@ DISTNAME=	${PORTNAME}-src-${PORTVERSION}${EXTRACTSUFFIX}
 MAINTAINER=	zeising@FreeBSD.org
 COMMENT=	Packet crafter/generator and analyzer with friendly GUI
 
-LIB_DEPENDS=	protobuf:${PORTSDIR}/devel/protobuf
+LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf
 
-USE_QT4=	gui moc_build qmake_build rcc_build uic_build network script \
+USES=		qmake
+USE_QT4=	gui moc_build rcc_build uic_build network script \
 		xml
 
 PLIST_FILES=	bin/drone \
@@ -21,11 +22,4 @@ PLIST_FILES=	bin/drone \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-HAS_CONFIGURE=	yes
-
-NO_STAGE=	yes
-do-configure:
-		@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
-
 .include <bsd.port.mk>
diff --git a/net/qoauth/Makefile b/net/qoauth/Makefile
index 48bc9374a404..5fedc9b2627c 100644
--- a/net/qoauth/Makefile
+++ b/net/qoauth/Makefile
@@ -8,27 +8,20 @@ MASTER_SITES=	http://files.ayoy.net/qoauth/release/${PORTVERSION}/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	QT support for OAuth-powered network services
+COMMENT=	Qt 4 support for OAuth-powered network services
 
-BUILD_DEPENDS+=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl
+BUILD_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl
 LIB_DEPENDS=	qca.2:${PORTSDIR}/devel/qca
 RUN_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl
 
+USES=		qmake
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
-USE_QT4=	corelib qtestlib network qmake_build moc_build
-HAS_CONFIGURE=	yes
+USE_QT4=	corelib qtestlib network moc_build
 USE_OPENSSL=	yes
 
-QMAKEFLAGS+=	PREFIX=${PREFIX}
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's,target.path}/pkgconfig,INSTALL_PREFIX}/libdata/pkgconfig,g' \
 		${WRKSRC}/src/src.pro
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} qoauth.pro
-
 .include <bsd.port.mk>
diff --git a/net/wpa_gui/Makefile b/net/wpa_gui/Makefile
index 9b56be3d971a..bc10d1d62c64 100644
--- a/net/wpa_gui/Makefile
+++ b/net/wpa_gui/Makefile
@@ -18,18 +18,14 @@ PLIST_FILES=	sbin/wpa_gui \
 		share/applications/wpa_gui.desktop \
 		share/pixmaps/wpa_gui.svg
 WRKSRC=		${WRKDIR}/${DISTNAME}/wpa_supplicant/wpa_gui-qt4
-USE_QT4=	gui moc_build qmake_build rcc_build uic_build
-HAS_CONFIGURE=	yes
+USE_QT4=	gui moc_build rcc_build uic_build
+USES=		qmake
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|Exec=wpa_gui|Exec=${PREFIX}/sbin/wpa_gui|" \
 	    ${WRKSRC}/wpa_gui.desktop
 	${MV} ${WRKDIR}/icons/hicolor ${WRKSRC}/icons
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/wpa_gui.desktop ${STAGEDIR}${PREFIX}/share/applications
diff --git a/polish/qfaktury/Makefile b/polish/qfaktury/Makefile
index 5aef6716b13c..59d43680c106 100644
--- a/polish/qfaktury/Makefile
+++ b/polish/qfaktury/Makefile
@@ -10,24 +10,17 @@ MASTER_SITES=	SF
 MAINTAINER=	meritus@innervision.pl
 COMMENT=	Polish invoicing desktop program
 
-USE_QT4=	qmake_build uic_build moc_build rcc_build corelib gui xml qt3support
+USES=		qmake
+USE_QT4=	uic_build moc_build rcc_build corelib gui xml qt3support
 
 PORTDOCS=	ChangeLog.txt ReadMe.txt ReleaseNotes.txt TODO.txt
 
-NO_STAGE=	yes
 post-patch:
 	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' qfaktury.pro \
 	QFaktury.desktop
 
-pre-build:
-	@cd ${WRKSRC} && ${QMAKE} -spec ${QMAKESPEC}
-
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/polish/qnapi/Makefile b/polish/qnapi/Makefile
index 936c7e974a95..808ae8bd5101 100644
--- a/polish/qnapi/Makefile
+++ b/polish/qnapi/Makefile
@@ -14,10 +14,11 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	7z:${PORTSDIR}/archivers/p7zip
 
-USE_QT4=	corelib gui network xml qmake_build moc_build uic_build rcc_build
+USES=		qmake
+USE_QT4=	corelib gui network xml moc_build uic_build rcc_build
 USE_KDE4=	kdehier
 PLIST_SUB=	KDE4=${KDE4_PREFIX:S|${LOCALBASE}/||}
-QMAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX} KDE4_PREFIX=${STAGEDIR}${KDE4_PREFIX}
+QMAKE_ARGS=	KDE4_PREFIX=${KDE4_PREFIX}
 INSTALLS_ICONS=	yes
 
 PORTDOCS=	ChangeLog README.pl COPYRIGHT
@@ -30,9 +31,6 @@ post-patch:
 		${WRKSRC}/doc/qnapi-download.desktop \
 		${WRKSRC}/doc/qnapi-download.schemas
 
-pre-build:
-	@cd ${WRKSRC} && ${QMAKE} -spec ${QMAKESPEC} ${QMAKEFLAGS} ${QMAKE_ARGS}
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|g} ${STAGEDIR}${DOCSDIR}
diff --git a/science/qtresistors/Makefile b/science/qtresistors/Makefile
index bfd20933862c..1345559735d1 100644
--- a/science/qtresistors/Makefile
+++ b/science/qtresistors/Makefile
@@ -11,17 +11,14 @@ DISTNAME=	118297-qtResistors-201001102229
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Calculate resistance of resistor by the colors on the resistor
 
-USE_QT4=	gui qmake_build uic_build moc_build
+USES=		qmake
+USE_QT4=	gui uic_build moc_build
 
 WRKSRC=		${WRKDIR}/qtResistors
 
 PLIST_FILES=	bin/${PORTNAME}
 
-NO_STAGE=	yes
-do-configure:
-	cd ${WRKSRC} && ${QMAKE} ${QMAKEFLAGS}
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/qtResistors ${PREFIX}/bin/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/qtResistors ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/x11-fm/qtfm/Makefile b/x11-fm/qtfm/Makefile
index 73087adbaacf..05d4ee7712af 100644
--- a/x11-fm/qtfm/Makefile
+++ b/x11-fm/qtfm/Makefile
@@ -7,17 +7,16 @@ CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.qtfm.org/
 
 MAINTAINER=	lichray@gmail.com
-COMMENT=	A small, lightweight file manager based on pure Qt
+COMMENT=	Small, lightweight file manager based on pure Qt
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_DOS2UNIX=	yes
+USES=		dos2unix qmake
 DOS2UNIX_REGEX=	.*\.(h|cpp)
-USE_QT4=	gui network qmake_build moc_build rcc_build \
+USE_QT4=	gui network moc_build rcc_build \
 		imageformats_run
 
-NO_STAGE=	yes
 # Override -A option:
 FETCH_ARGS=	-Fpr
 
@@ -32,10 +31,6 @@ post-patch:
 		${REINPLACE_CMD} -e s@/usr/@${LOCALBASE}/@g \
 		icondlg.cpp mainwindow.cpp mymodel.cpp
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} \
-		${QMAKEFLAGS} qtfm.pro
-
 post-install:
 	${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,}