- Convert to USES= qmake

- Bring stage support
- Adjust DESKTOP_ENTRIES
- Use options helpers
- Use new LIB_DEPENDS syntax

18 files changed, 187 insertions, 270 deletions

diff --git a/cad/librecad/Makefile b/cad/librecad/Makefile
index 041d8c343358..1bd86a72f6cd 100644
--- a/cad/librecad/Makefile
+++ b/cad/librecad/Makefile
@@ -12,6 +12,7 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libmuparser.a:${PORTSDIR}/math/muparser
 
 USE_QT4=	help qt3support help-tools_build moc_build qmake_build \
 		rcc_build uic_build uic3_build
+USES=		qmake
 MAKE_ENV=	XDG_CONFIG_HOME=/dev/null
 
 USE_GITHUB=	yes
@@ -22,7 +23,6 @@ GH_COMMIT=	c1f2eb6
 
 OPTIONS_DEFINE=	NLS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
@@ -39,9 +39,6 @@ post-patch:
 		'/^Icon/s,librecad,${PREFIX}/share/pixmaps/librecad.png,' \
 		${WRKSRC}/desktop/librecad.desktop
 
-do-configure:
-	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS})
-
 post-build:
 .if ${PORT_OPTIONS:MNLS}
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
@@ -53,13 +50,13 @@ post-build:
 		${SH} scripts/postprocess-unix.sh
 
 do-install:
-	${MKDIR} ${PREFIX}/bin && \
-	${INSTALL_PROGRAM} ${WRKSRC}/unix/librecad ${PREFIX}/bin
-	cd ${WRKSRC}/unix/resources && ${COPYTREE_SHARE} . ${DATADIR}
-	${MKDIR} ${PREFIX}/share/applications && \
+	${INSTALL_PROGRAM} ${WRKSRC}/unix/librecad ${STAGEDIR}${PREFIX}/bin
+	cd ${WRKSRC}/unix/resources && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/desktop/librecad.desktop \
-		${PREFIX}/share/applications
-	${MKDIR} ${PREFIX}/share/pixmaps && \
-	${INSTALL_DATA} ${WRKSRC}/res/main/librecad.png ${PREFIX}/share/pixmaps
+		${STAGEDIR}${PREFIX}/share/applications
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/res/main/librecad.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>
diff --git a/devel/qdevelop/Makefile b/devel/qdevelop/Makefile
index c2eca899d388..c95c501d1143 100644
--- a/devel/qdevelop/Makefile
+++ b/devel/qdevelop/Makefile
@@ -15,8 +15,8 @@ RUN_DEPENDS=	exctags:${PORTSDIR}/devel/ctags
 
 USE_QT4=	gui sql network xml designer sql-sqlite3_run \
 		qmake_build moc_build uic_build rcc_build
+USES=		qmake
 
-QMAKE_ARGS=	-recursive ${QMAKE_PRO}
 QMAKE_PRO=	QDevelop.pro
 STRIP_FILES=	bin/${PORTNAME}
 
@@ -27,13 +27,12 @@ DESKTOP_ENTRIES=	"QDevelop" \
 			"${PREFIX}/share/pixmaps/qdevelop.png" \
 			"qdevelop" \
 			"Development;IDE;Qt;" \
-			"false"
+			true
 
 OPTIONS_DEFINE=	TOOLS DOCS NLS
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 TOOLS_DESC=	Install Qt4 dev. tools (qmake, moc, etc.)
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
@@ -65,24 +64,21 @@ post-patch:
 		${WRKSRC}/plugins/tools-regexp-planner/replugin.cpp \
 		${WRKSRC}/plugins/formatting-astyle/astyleplugin.cpp
 
-do-configure:
+post-configure:
 .if ${PORT_OPTIONS:MNLS}
 	cd ${WRKSRC} && ${QT_LRELEASE} ${QMAKE_PRO}
 .endif
-	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}
 
 post-install:
-	${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,}
-	${INSTALL_DATA} ${WRKSRC}/resources/images/logo.png ${PREFIX}/share/pixmaps/qdevelop.png
+	${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,}
+	${INSTALL_DATA} ${WRKSRC}/resources/images/logo.png ${STAGEDIR}${PREFIX}/share/pixmaps/qdevelop.png
 .if ${PORT_OPTIONS:MNLS}
-	${MKDIR} ${DATADIR}
-	cd ${WRKSRC}/resources/translations/ && ${COPYTREE_SHARE} '*.qm' ${DATADIR}/translations
+	@${MKDIR} ${STAGEDIR}${DATADIR}/translations
+	${INSTALL_DATA} ${WRKSRC}/resources/translations/*.qm ${STAGEDIR}${DATADIR}/translations
 .endif
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-.for doc in ChangeLog.txt README.txt
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
-.endfor
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/ChangeLog.txt ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/emulators/dboxfe/Makefile b/emulators/dboxfe/Makefile
index 7ff9ea776afc..be34abad5c8a 100644
--- a/emulators/dboxfe/Makefile
+++ b/emulators/dboxfe/Makefile
@@ -14,7 +14,7 @@ RUN_DEPENDS=	dosbox:${PORTSDIR}/emulators/dosbox
 
 USE_BZIP2=	yes
 USE_QT4=	gui network xml uic_build moc_build qmake_build rcc_build
-HAS_CONFIGURE=	yes
+USES=		qmake
 
 PLIST_FILES=	bin/dboxfe \
 		bin/dboxfetray \
@@ -22,29 +22,20 @@ PLIST_FILES=	bin/dboxfe \
 
 DESKTOP_ENTRIES=	"DBoxFE" "DOSBox configuration manager" \
 		"${PREFIX}/share/pixmaps/dboxfe.png" \
-		"dboxfe" "Utility;Qt;" false \
+		"dboxfe" "Utility;Qt;" true \
 		"DBoxFEtray" "DBoxFE systray icon" \
 		"${PREFIX}/share/pixmaps/dboxfe.png" \
-		"dboxfetray" "Utility;Qt;TrayIcon;" false
+		"dboxfetray" "Utility;Qt;TrayIcon;" true
 
-PRO_DIRS=	. dboxfetray
-
-NO_STAGE=	yes
-do-configure:
-.for dir in ${PRO_DIRS}
-	@(cd ${WRKSRC}/${dir} && \
-		${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS})
-.endfor
-
-do-build:
-.for dir in ${PRO_DIRS}
-	@(cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${MAKE})
-.endfor
+post-build:
+	@(cd ${WRKSRC}/dboxfetray && \
+		${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} && \
+		${SETENV} ${MAKE_ENV} ${MAKE})
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/dboxfe ${PREFIX}/bin/dboxfe
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/dboxfetray ${PREFIX}/bin/dboxfetray
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/dboxfe ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/dboxfetray ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/dboxfetray/res/dboxfetray.png \
-		${PREFIX}/share/pixmaps/dboxfe.png
+		${STAGEDIR}${PREFIX}/share/pixmaps/dboxfe.png
 
 .include <bsd.port.mk>
diff --git a/emulators/qtemu/Makefile b/emulators/qtemu/Makefile
index 414684f4c076..6a32a3bd17e4 100644
--- a/emulators/qtemu/Makefile
+++ b/emulators/qtemu/Makefile
@@ -11,15 +11,14 @@ COMMENT=	Qt 4 based frontend for QEMU
 
 USE_BZIP2=	yes
 USE_QT4=	gui xml uic_build moc_build qmake_build rcc_build
-HAS_CONFIGURE=	yes
+USES=		qmake
 CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE}
 
 DESKTOP_ENTRIES="QtEmu" "QEMU frontend" "" \
-		"qtemu" "" false
+		"qtemu" "" true
 
 OPTIONS_DEFINE=	DOCS NLS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
@@ -29,18 +28,19 @@ PLIST_SUB+=	NLS=""
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-do-configure:
-	(cd ${WRKSRC} && ${LOCALBASE}/bin/lrelease-qt4 -verbose qtemu.pro \
-	&& ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS})
+post-configure:
+.if ${PORT_OPTIONS:MNLS}
+	(cd ${WRKSRC} && ${LOCALBASE}/bin/lrelease-qt4 qtemu.pro)
+.endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/qtemu ${PREFIX}/bin/qtemu
+	${INSTALL_PROGRAM} ${WRKSRC}/qtemu ${STAGEDIR}${PREFIX}/bin/qtemu
 .if ${PORT_OPTIONS:MNLS}
-	${MKDIR} ${DATADIR}
-	(cd ${WRKSRC}/translations/ && ${COPYTREE_SHARE} 'qtemu*.qm' ${DATADIR}/translations)
+	@${MKDIR} ${STAGEDIR}${DATADIR}/translations
+	${INSTALL_DATA} ${WRKSRC}/translations/qtemu*.qm ${STAGEDIR}${DATADIR}/translations
 .endif
 .if ${PORT_OPTIONS:MDOCS}
-	(cd ${WRKSRC}/help/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
+	(cd ${WRKSRC}/help && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/hexglass/Makefile b/games/hexglass/Makefile
index d0c1a534ce4e..81fbd60b09dc 100644
--- a/games/hexglass/Makefile
+++ b/games/hexglass/Makefile
@@ -10,24 +10,19 @@ MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Tetris-like puzzle game based on a hexagonal grid
 
 USE_QT4=	gui qmake_build moc_build rcc_build
-HAS_CONFIGURE=	yes
+USES=		qmake
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/pixmaps/${PORTNAME}.xpm
 
 DESKTOP_ENTRIES=	"HexGlass" "${COMMENT}" \
 			"${PREFIX}/share/pixmaps/${PORTNAME}.xpm" \
-			"${PORTNAME}" "BlocksGame;Game;" false
-
-NO_STAGE=	yes
-do-configure:
-	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS}
+			"${PORTNAME}" "BlocksGame;Game;" true
 
 do-install:
-	${MKDIR} ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/share/pixmaps
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/resources/logo512x512.xpm \
-		${PREFIX}/share/pixmaps/${PORTNAME}.xpm
+		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.xpm
 
 .include <bsd.port.mk>
diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile
index 59f485b9a3fc..27a3928f9cda 100644
--- a/math/qtiplot/Makefile
+++ b/math/qtiplot/Makefile
@@ -11,36 +11,32 @@ MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Data analysis and scientific plotting
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmuparser.a:${PORTSDIR}/math/muparser
-LIB_DEPENDS=	gsl:${PORTSDIR}/math/gsl \
-		png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl \
+		libpng15.so:${PORTSDIR}/graphics/png
 # use bundled modified libraries
 # 		qwt.5:${PORTSDIR}/x11-toolkits/qwt5 \
 # 		qwtplot3d-qt4:${PORTSDIR}/math/qwtplot3d-qt4
 
+USES=		gmake qmake
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_QT4=	gui opengl svg qt3support network assistantclient \
 		moc_build qmake_build rcc_build
 USE_GL=		glu
-HAS_CONFIGURE=	yes
-QMAKE_ARGS+=	-recursive PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} \
-		PYTHON_CMD=${PYTHON_CMD}
+QMAKE_ARGS+=	LOCALBASE=${LOCALBASE} PYTHON_CMD=${PYTHON_CMD}
 USE_DOS2UNIX=	*.pro
-MAN1=		qtiplot.1
 
 DESKTOP_ENTRIES="QtiPlot" "Data analysis and plotting" \
 		"${DATADIR}/qtiplot.png" \
-		"qtiplot" "" false
+		"qtiplot" "" true
 
 OPTIONS_DEFINE=	DOCS PYTHON NLS DEBUG
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+OPTIONS_DEFAULT=	DOCS PYTHON NLS
 
 DOCS_DESC=	Install the QtiPlot Handbook
 PYTHON_DESC=	Python scripting support
 
 STRIP_FILES=	bin/qtiplot share/qtiplot/fitPlugins/*.so.1.0.0
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYTHON}
@@ -66,54 +62,51 @@ PLIST_SUB+=	NLS=""
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-
 post-extract:
-	@${CP} ${FILESDIR}/build.conf ${WRKSRC}
+	${CP} ${FILESDIR}/build.conf ${WRKSRC}
 
 post-patch:
 .if ${PORT_OPTIONS:MPYTHON}
-	@${REINPLACE_CMD} -e \
+	${REINPLACE_CMD} -e \
 		'/^sys.path.append/s|"\."|"${DATADIR}"|' \
 		${WRKSRC}/${PORTNAME}/qtiplotrc.py
 .else
-	@${REINPLACE_CMD} -e \
+	${REINPLACE_CMD} -e \
 		"s/SCRIPTING_LANGS.*Python//" \
 		${WRKSRC}/build.conf
 .endif
-	@${REINPLACE_CMD} -e \
+	${REINPLACE_CMD} -e \
 		's|/usr/local/qtiplot/fitPlugins|${DATADIR}/fitPlugins|' \
 		${WRKSRC}/qtiplot/src/core/ApplicationWindow.cpp
-	@${REINPLACE_CMD} -e \
+	${REINPLACE_CMD} -e \
 		's|target.path=.*|target.path=${DATADIR}/fitPlugins|g' \
 		${WRKSRC}/fitPlugins/*/*.pro
-	@${REINPLACE_CMD} -e '/^system($$$$LUPDATE/d; /^system($$$$LRELEASE/d' \
+	${REINPLACE_CMD} -e '/^system($$$$LUPDATE/d; /^system($$$$LRELEASE/d' \
 		${WRKSRC}/${PORTNAME}/qtiplot.pro
 .if ${PORT_OPTIONS:MDEBUG}
-	@${REINPLACE_CMD} -e \
+	${REINPLACE_CMD} -e \
 		"/^CONFIG.*release/s|release|debug|" \
 		${WRKSRC}/build.conf
 .endif
 .if !${PORT_OPTIONS:MNLS}
-	@${REINPLACE_CMD} -e \
+	${REINPLACE_CMD} -e \
 		"/INSTALLS.*translations/d" \
 		${WRKSRC}/${PORTNAME}/qtiplot.pro
 .endif
 
-do-configure:
+pre-configure:
 .if ${PORT_OPTIONS:MNLS}
-	@(cd ${WRKSRC}/qtiplot && ${LOCALBASE}/bin/lrelease-qt4 -compress qtiplot.pro)
+	cd ${WRKSRC}/qtiplot && ${LOCALBASE}/bin/lrelease-qt4 -compress qtiplot.pro
 .endif
-	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS} )
 
 post-install:
-	${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,}
-	${INSTALL_DATA} ${WRKSRC}/qtiplot_logo.png ${DATADIR}/qtiplot.png
+	${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,}
+	${INSTALL_DATA} ${WRKSRC}/qtiplot_logo.png ${STAGEDIR}${DATADIR}/qtiplot.png
 .if ${PORT_OPTIONS:MPYTHON}
 .for s in qtiplotrc.py qtiUtil.py
-	@(cd ${WRKSRC}/qtiplot && ${PYTHON_CMD} -c "import py_compile; py_compile.compile('${s}')")
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/${s}c ${DATADIR}/${s}c
+	cd ${WRKSRC}/qtiplot && ${PYTHON_CMD} -c "import py_compile; py_compile.compile('${s}')"
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/${s}c ${STAGEDIR}${DATADIR}/${s}c
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/qtiplot/pkg-plist b/math/qtiplot/pkg-plist
index 88087bbd72cd..d312fb886ebc 100644
--- a/math/qtiplot/pkg-plist
+++ b/math/qtiplot/pkg-plist
@@ -1,4 +1,5 @@
 bin/qtiplot
+man/man1/qtiplot.1.gz
 %%DATADIR%%/fitPlugins/libexp_saturation.so
 %%DATADIR%%/fitPlugins/libexp_saturation.so.1
 %%DATADIR%%/fitPlugins/libexp_saturation.so.1.0
diff --git a/math/qwtplot3d-qt4/Makefile b/math/qwtplot3d-qt4/Makefile
index 35b428839814..370cbe33be93 100644
--- a/math/qwtplot3d-qt4/Makefile
+++ b/math/qwtplot3d-qt4/Makefile
@@ -11,31 +11,20 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	3D plotting widgets for scientific data and math expressions
 
+USES=		qmake
 USE_QT4=	gui moc_build qmake_build opengl
 USE_GL=		glu
 USE_LDCONFIG=	yes
-HAS_CONFIGURE=	yes
 USE_DOS2UNIX=	yes
 
 WRKSRC=	${WRKDIR}/${PORTNAME}
 
-NO_STAGE=	yes
-do-configure:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${QMAKE} -unix ${PORTNAME}.pro
-
-pre-build:
-	cd ${WRKSRC} && ${REINPLACE_CMD} -e \
-		's|^CC .*|CC=${CC}|; \
-		 s|^CXX .*|CXX=${CXX}|; \
-		 s|^LINK .*|LINK=${CXX}|; \
-		 s|^\(INCPATH .*=\)|\1 -Iinclude|;'  Makefile
 do-install:
-	${MKDIR} ${PREFIX}/include/qwtplot3d-qt4
-	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qwtplot3d-qt4
+	@${MKDIR} ${STAGEDIR}${PREFIX}/include/qwtplot3d-qt4
+	${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/include/qwtplot3d-qt4
 	${MKDIR} ${PREFIX}/lib
-	${INSTALL_LIB} ${WRKSRC}/lib/libqwtplot3d-qt4.so.${PORTVERSION} ${PREFIX}/lib
-	${LN} -fs ${PREFIX}/lib/libqwtplot3d-qt4.so.${PORTVERSION} ${PREFIX}/lib/libqwtplot3d-qt4.so.0
-	${LN} -fs ${PREFIX}/lib/libqwtplot3d-qt4.so.${PORTVERSION} ${PREFIX}/lib/libqwtplot3d-qt4.so
+	${INSTALL_LIB} ${WRKSRC}/lib/libqwtplot3d-qt4.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib
+	${LN} -fs ${PREFIX}/lib/libqwtplot3d-qt4.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libqwtplot3d-qt4.so.0
+	${LN} -fs ${PREFIX}/lib/libqwtplot3d-qt4.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libqwtplot3d-qt4.so
 
 .include <bsd.port.mk>
diff --git a/multimedia/minitube/Makefile b/multimedia/minitube/Makefile
index 2221201e0ab1..46e1963305ff 100644
--- a/multimedia/minitube/Makefile
+++ b/multimedia/minitube/Makefile
@@ -11,19 +11,18 @@ COMMENT=	TV-like client for YouTube
 USE_QT4=	gui network xml dbus phonon phonon-gst \
 		qmake_build moc_build rcc_build imageformats_run
 USE_GSTREAMER=	ffmpeg
-HAS_CONFIGURE=	yes
+USES=		qmake
 INSTALLS_ICONS=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-QMAKE_ARGS=	-recursive PREFIX=${PREFIX} QMAKE_LRELEASE=${LRELEASE} ${QMAKE_PRO}
+QMAKE_ARGS=	QMAKE_LRELEASE=${QT_LRELEASE}
 QMAKE_PRO=	${WRKSRC}/${PORTNAME}.pro
-LRELEASE=	${LOCALBASE}/bin/lrelease-qt4
+QT_LRELEASE=	${LOCALBASE}/bin/lrelease-qt4
 
 STRIP_FILES=	bin/minitube
 
 OPTIONS_DEFINE=	NLS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
@@ -39,10 +38,7 @@ pre-configure:
 	${REINPLACE_CMD} -e '/include(locale\/locale.pri)/d' ${QMAKE_PRO}
 .endif
 
-do-configure:
-	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}
-
 post-install:
-	${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,}
+	${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,}
 
 .include <bsd.port.mk>
diff --git a/print/kpdftool/Makefile b/print/kpdftool/Makefile
index 80ff746ea242..e0b71a63450d 100644
--- a/print/kpdftool/Makefile
+++ b/print/kpdftool/Makefile
@@ -16,17 +16,13 @@ RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 USE_ZIP=	yes
 USE_QT4=	qt3support moc_build porting_build qmake_build uic3_build
 USE_GHOSTSCRIPT_RUN=	yes
+USES=		qmake
 
 DESKTOP_ENTRIES=	"KPDFTool" "${COMMENT}" "kpdftool" \
-			"kpdftool" "Qt;Utility;" false
-
-NO_STAGE=	yes
-do-configure:
-	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}
+			"kpdftool" "Qt;Utility;" true
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	cd ${WRKSRC}/icons && ${COPYTREE_SHARE} hicolor ${PREFIX}/share/icons/
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	cd ${WRKSRC}/icons && ${COPYTREE_SHARE} hicolor ${STAGEDIR}${PREFIX}/share/icons/
 
 .include <bsd.port.mk>
diff --git a/textproc/beediff/Makefile b/textproc/beediff/Makefile
index 44accd071931..8cb322ce8b05 100644
--- a/textproc/beediff/Makefile
+++ b/textproc/beediff/Makefile
@@ -8,11 +8,10 @@ MASTER_SITES=	http://www.beesoft.pl/download/
 DISTNAME=	${PORTNAME}_${PORTVERSION}_src
 
 MAINTAINER=	makc@FreeBSD.org
-COMMENT=	Qt4 based diff frontend
+COMMENT=	Qt 4 based diff frontend
 
+USES=		qmake
 USE_QT4=	gui moc_build rcc_build qmake_build
-HAS_CONFIGURE=	yes
-INSTALLS_ICONS=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -20,14 +19,10 @@ PLIST_FILES=	bin/beediff share/pixmaps/beediff.png
 
 DESKTOP_ENTRIES="BeeDiff" "diff frontend" \
 		"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
-		"beediff" "" false
-
-NO_STAGE=	yes
-do-configure:
-	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS}
+		"beediff" "" true
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/beediff ${PREFIX}/bin/
-	${INSTALL_DATA} ${WRKSRC}/img/beediff.png ${PREFIX}/share/pixmaps/
+	${INSTALL_PROGRAM} ${WRKSRC}/beediff ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/img/beediff.png ${STAGEDIR}${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>
diff --git a/textproc/qstardict/Makefile b/textproc/qstardict/Makefile
index 79a0c15b19ec..5d40d9bad5cf 100644
--- a/textproc/qstardict/Makefile
+++ b/textproc/qstardict/Makefile
@@ -7,12 +7,11 @@ CATEGORIES=	textproc
 MASTER_SITES=	http://qstardict.ylsoftware.com/files/
 
 MAINTAINER=	makc@FreeBSD.org
-COMMENT=	Dictionary program written in Qt4
+COMMENT=	Qt 4 based dictionary program (stardict clone)
 
-USES=		pkgconfig
+USES=		pkgconfig qmake
 USE_BZIP2=	yes
 USE_QT4=	gui network xml qmake_build uic_build moc_build rcc_build
-QMAKE_ARGS+=	-recursive
 USE_DOS2UNIX=	qstardict.pri
 
 DICPATH=	${LOCALBASE}/share/stardict/dic
@@ -20,7 +19,6 @@ DICPATH=	${LOCALBASE}/share/stardict/dic
 OPTIONS_DEFINE=	DBUS DOCS NLS
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
@@ -47,10 +45,4 @@ post-patch:
 		-e "s|glib.*\.h|glib.h|g" \
 		${WRKSRC}/plugins/stardict/stardict.cpp
 
-do-configure:
-	cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKE_ARGS} ${QMAKEFLAGS}
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qwt5-designerplugin/Makefile b/x11-toolkits/qwt5-designerplugin/Makefile
index 59156a325d19..6b5d45520987 100644
--- a/x11-toolkits/qwt5-designerplugin/Makefile
+++ b/x11-toolkits/qwt5-designerplugin/Makefile
@@ -11,12 +11,11 @@ COMMENT=	Qt Designer plugin for Qwt
 
 LIB_DEPENDS=	libqwt.so:${PORTSDIR}/x11-toolkits/qwt5
 
+USES=		gmake qmake
 USE_QT4=	designer moc_build qmake_build rcc_build
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-QMAKE_ARGS+=	-recursive CONFIG+=QwtDesigner \
+QMAKE_ARGS+=	CONFIG+=QwtDesigner \
 		PLUGINDIR=${PREFIX}/${QT_PLUGINDIR_REL}
-HAS_CONFIGURE=	yes
 PORTSCOUT=	limit:^5\.
 
 STRIP_FILES=	${QT_PLUGINDIR_REL}/designer/libqwt_designer_plugin.so
@@ -25,11 +24,7 @@ CONFIGURE_WRKSRC=	${WRKSRC}/designer
 BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
 INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
 
-NO_STAGE=	yes
-do-configure:
-	(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS})
-
 post-install:
-	${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,}
+	${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qwt5/Makefile b/x11-toolkits/qwt5/Makefile
index 2a797d0b6202..f06ffbad5ace 100644
--- a/x11-toolkits/qwt5/Makefile
+++ b/x11-toolkits/qwt5/Makefile
@@ -9,11 +9,9 @@ PKGNAMESUFFIX=	5
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Qt Widgets for Technical Applications
 
+USES=		gmake qmake
 USE_QT4=	gui svg moc_build qmake_build
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-QMAKE_ARGS+=	-recursive PREFIX=${PREFIX}
-HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 PORTSCOUT=	limit:^5\.
 
@@ -25,19 +23,13 @@ STRIP_FILES=	lib/libqwt.so.${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-.include <${FILESDIR}/Makefile.man>
-
-do-configure:
-	(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS})
+.include <bsd.port.options.mk>
 
 post-install:
-	${MKDIR} ${PREFIX}/man/man3
-	${INSTALL_MAN} ${WRKSRC}/doc/man/man3/Qwt* ${PREFIX}/man/man3
-	${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,}
+	${INSTALL_MAN} ${WRKSRC}/doc/man/man3/Qwt* ${STAGEDIR}${PREFIX}/man/man3
+	${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,}
 .if ${PORT_OPTIONS:MDOCS}
-	(cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
+	(cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/qwt5/files/Makefile.man b/x11-toolkits/qwt5/files/Makefile.man
deleted file mode 100644
index 3a5658873815..000000000000
--- a/x11-toolkits/qwt5/files/Makefile.man
+++ /dev/null
@@ -1,87 +0,0 @@
-MAN3=	QwtAbstractScale.3 \
-	QwtAbstractScaleDraw.3 \
-	QwtAbstractSlider.3 \
-	QwtAlphaColorMap.3 \
-	QwtAnalogClock.3 \
-	QwtArrayData.3 \
-	QwtArrowButton.3 \
-	QwtCPointerData.3 \
-	QwtClipper.3 \
-	QwtColorMap.3 \
-	QwtCompass.3 \
-	QwtCompassMagnetNeedle.3 \
-	QwtCompassRose.3 \
-	QwtCompassWindArrow.3 \
-	QwtCounter.3 \
-	QwtCurveFitter.3 \
-	QwtData.3 \
-	QwtDial.3 \
-	QwtDialNeedle.3 \
-	QwtDialScaleDraw.3 \
-	QwtDialSimpleNeedle.3 \
-	QwtDoubleInterval.3 \
-	QwtDoubleRange.3 \
-	QwtDynGridLayout.3 \
-	QwtEventPattern.3 \
-	QwtEventPattern_KeyPattern.3 \
-	QwtEventPattern_MousePattern.3 \
-	QwtIntervalData.3 \
-	QwtKnob.3 \
-	QwtLegend.3 \
-	QwtLegendItem.3 \
-	QwtLegendItemManager.3 \
-	QwtLinearColorMap.3 \
-	QwtLinearScaleEngine.3 \
-	QwtLog10ScaleEngine.3 \
-	QwtMagnifier.3 \
-	QwtMathMLTextEngine.3 \
-	QwtMetricsMap.3 \
-	QwtPainter.3 \
-	QwtPanner.3 \
-	QwtPicker.3 \
-	QwtPickerClickPointMachine.3 \
-	QwtPickerClickRectMachine.3 \
-	QwtPickerDragPointMachine.3 \
-	QwtPickerDragRectMachine.3 \
-	QwtPickerMachine.3 \
-	QwtPickerPolygonMachine.3 \
-	QwtPlainTextEngine.3 \
-	QwtPlot.3 \
-	QwtPlotCanvas.3 \
-	QwtPlotCurve.3 \
-	QwtPlotDict.3 \
-	QwtPlotGrid.3 \
-	QwtPlotItem.3 \
-	QwtPlotLayout.3 \
-	QwtPlotMagnifier.3 \
-	QwtPlotMarker.3 \
-	QwtPlotPanner.3 \
-	QwtPlotPicker.3 \
-	QwtPlotPrintFilter.3 \
-	QwtPlotRasterItem.3 \
-	QwtPlotRescaler.3 \
-	QwtPlotScaleItem.3 \
-	QwtPlotSpectrogram.3 \
-	QwtPlotSvgItem.3 \
-	QwtPlotZoomer.3 \
-	QwtPolygonFData.3 \
-	QwtRasterData.3 \
-	QwtRichTextEngine.3 \
-	QwtRoundScaleDraw.3 \
-	QwtScaleArithmetic.3 \
-	QwtScaleDiv.3 \
-	QwtScaleDraw.3 \
-	QwtScaleEngine.3 \
-	QwtScaleMap.3 \
-	QwtScaleTransformation.3 \
-	QwtScaleWidget.3 \
-	QwtSimpleCompassRose.3 \
-	QwtSlider.3 \
-	QwtSpline.3 \
-	QwtSplineCurveFitter.3 \
-	QwtSymbol.3 \
-	QwtText.3 \
-	QwtTextEngine.3 \
-	QwtTextLabel.3 \
-	QwtThermo.3 \
-	QwtWheel.3
diff --git a/x11-toolkits/qwt5/pkg-plist b/x11-toolkits/qwt5/pkg-plist
index 616be914d978..7e3db30e4268 100644
--- a/x11-toolkits/qwt5/pkg-plist
+++ b/x11-toolkits/qwt5/pkg-plist
@@ -72,4 +72,91 @@ lib/libqwt.so
 lib/libqwt.so.5
 lib/libqwt.so.%%SHLIB_VER%%
 lib/libqwt.so.%%SHLIB_SHVER%%
+man/man3/QwtAbstractScale.3.gz
+man/man3/QwtAbstractScaleDraw.3.gz
+man/man3/QwtAbstractSlider.3.gz
+man/man3/QwtAlphaColorMap.3.gz
+man/man3/QwtAnalogClock.3.gz
+man/man3/QwtArrayData.3.gz
+man/man3/QwtArrowButton.3.gz
+man/man3/QwtCPointerData.3.gz
+man/man3/QwtClipper.3.gz
+man/man3/QwtColorMap.3.gz
+man/man3/QwtCompass.3.gz
+man/man3/QwtCompassMagnetNeedle.3.gz
+man/man3/QwtCompassRose.3.gz
+man/man3/QwtCompassWindArrow.3.gz
+man/man3/QwtCounter.3.gz
+man/man3/QwtCurveFitter.3.gz
+man/man3/QwtData.3.gz
+man/man3/QwtDial.3.gz
+man/man3/QwtDialNeedle.3.gz
+man/man3/QwtDialScaleDraw.3.gz
+man/man3/QwtDialSimpleNeedle.3.gz
+man/man3/QwtDoubleInterval.3.gz
+man/man3/QwtDoubleRange.3.gz
+man/man3/QwtDynGridLayout.3.gz
+man/man3/QwtEventPattern.3.gz
+man/man3/QwtEventPattern_KeyPattern.3.gz
+man/man3/QwtEventPattern_MousePattern.3.gz
+man/man3/QwtIntervalData.3.gz
+man/man3/QwtKnob.3.gz
+man/man3/QwtLegend.3.gz
+man/man3/QwtLegendItem.3.gz
+man/man3/QwtLegendItemManager.3.gz
+man/man3/QwtLinearColorMap.3.gz
+man/man3/QwtLinearScaleEngine.3.gz
+man/man3/QwtLog10ScaleEngine.3.gz
+man/man3/QwtMagnifier.3.gz
+man/man3/QwtMathMLTextEngine.3.gz
+man/man3/QwtMetricsMap.3.gz
+man/man3/QwtPainter.3.gz
+man/man3/QwtPanner.3.gz
+man/man3/QwtPicker.3.gz
+man/man3/QwtPickerClickPointMachine.3.gz
+man/man3/QwtPickerClickRectMachine.3.gz
+man/man3/QwtPickerDragPointMachine.3.gz
+man/man3/QwtPickerDragRectMachine.3.gz
+man/man3/QwtPickerMachine.3.gz
+man/man3/QwtPickerPolygonMachine.3.gz
+man/man3/QwtPlainTextEngine.3.gz
+man/man3/QwtPlot.3.gz
+man/man3/QwtPlotCanvas.3.gz
+man/man3/QwtPlotCurve.3.gz
+man/man3/QwtPlotDict.3.gz
+man/man3/QwtPlotGrid.3.gz
+man/man3/QwtPlotItem.3.gz
+man/man3/QwtPlotLayout.3.gz
+man/man3/QwtPlotMagnifier.3.gz
+man/man3/QwtPlotMarker.3.gz
+man/man3/QwtPlotPanner.3.gz
+man/man3/QwtPlotPicker.3.gz
+man/man3/QwtPlotPrintFilter.3.gz
+man/man3/QwtPlotRasterItem.3.gz
+man/man3/QwtPlotRescaler.3.gz
+man/man3/QwtPlotScaleItem.3.gz
+man/man3/QwtPlotSpectrogram.3.gz
+man/man3/QwtPlotSvgItem.3.gz
+man/man3/QwtPlotZoomer.3.gz
+man/man3/QwtPolygonFData.3.gz
+man/man3/QwtRasterData.3.gz
+man/man3/QwtRichTextEngine.3.gz
+man/man3/QwtRoundScaleDraw.3.gz
+man/man3/QwtScaleArithmetic.3.gz
+man/man3/QwtScaleDiv.3.gz
+man/man3/QwtScaleDraw.3.gz
+man/man3/QwtScaleEngine.3.gz
+man/man3/QwtScaleMap.3.gz
+man/man3/QwtScaleTransformation.3.gz
+man/man3/QwtScaleWidget.3.gz
+man/man3/QwtSimpleCompassRose.3.gz
+man/man3/QwtSlider.3.gz
+man/man3/QwtSpline.3.gz
+man/man3/QwtSplineCurveFitter.3.gz
+man/man3/QwtSymbol.3.gz
+man/man3/QwtText.3.gz
+man/man3/QwtTextEngine.3.gz
+man/man3/QwtTextLabel.3.gz
+man/man3/QwtThermo.3.gz
+man/man3/QwtWheel.3.gz
 @dirrm include/qwt
diff --git a/x11-toolkits/qwt6-designerplugin/Makefile b/x11-toolkits/qwt6-designerplugin/Makefile
index 155ec476c68c..4eb11f8035f6 100644
--- a/x11-toolkits/qwt6-designerplugin/Makefile
+++ b/x11-toolkits/qwt6-designerplugin/Makefile
@@ -11,12 +11,11 @@ COMMENT=	Qt Designer plugin for Qwt
 
 LIB_DEPENDS=	libqwt6.so:${PORTSDIR}/x11-toolkits/qwt6
 
+USES=		gmake qmake
 USE_QT4=	designer moc_build qmake_build rcc_build
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-QMAKE_ARGS+=	-recursive CONFIG+=QwtDesigner \
+QMAKE_ARGS+=	CONFIG+=QwtDesigner \
 		PLUGINDIR=${PREFIX}/${QT_PLUGINDIR_REL}
-HAS_CONFIGURE=	yes
 
 PLIST_FILES=	${QT_PLUGINDIR_REL}/designer/libqwt6_designer_plugin.so
 PLIST_DIRSTRY=	${QT_PLUGINDIR_REL}/designer \
@@ -28,11 +27,7 @@ CONFIGURE_WRKSRC=	${WRKSRC}/designer
 BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
 INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
 
-NO_STAGE=	yes
-do-configure:
-	(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS})
-
 post-install:
-	${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,}
+	${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qwt6/Makefile b/x11-toolkits/qwt6/Makefile
index d7d4e0e6f284..8fbd10240f84 100644
--- a/x11-toolkits/qwt6/Makefile
+++ b/x11-toolkits/qwt6/Makefile
@@ -9,11 +9,9 @@ PKGNAMESUFFIX=	6
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Qt Widgets for Technical Applications
 
+USES=		gmake qmake
 USE_QT4=	gui opengl svg xml moc_build qmake_build
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-QMAKE_ARGS+=	-recursive PREFIX=${PREFIX}
-HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 DOCSDIR=	${PREFIX}/share/doc/qwt6
 
@@ -28,7 +26,6 @@ STRIP_FILES=	lib/libqwt6.so.${PORTVERSION} \
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
@@ -37,13 +34,10 @@ post-patch:
 		qwt.prf textengines/textengines.pri && \
 	${REINPLACE_CMD} -e '/INSTALLS.*doc/d' doc/doc.pro
 
-do-configure:
-	(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS})
-
 post-install:
-	${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,}
+	${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,}
 .if ${PORT_OPTIONS:MDOCS}
-	(cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
+	(cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 .endif
 
 .include <bsd.port.mk>