- Convert unmaintained ports to USES=qmake

- Add stage support
- Convert LIB_DEPENDS to new syntax
- Minor changes/fixes

25 files changed, 216 insertions, 291 deletions

diff --git a/audio/quimup/Makefile b/audio/quimup/Makefile
index 4b8115868794..1996084363bf 100644
--- a/audio/quimup/Makefile
+++ b/audio/quimup/Makefile
@@ -8,36 +8,33 @@ MASTER_SITES=	SF/musicpd/Quimup/${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}_src
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Qt4 Client for MPD (the Music Player Daemon)
+COMMENT=	Qt 4 client for MPD (the Music Player Daemon)
 
 LICENSE=	GPLv2 # (or later)
 
-LIB_DEPENDS=	mpdclient:${PORTSDIR}/audio/libmpdclient
+LIB_DEPENDS=	libmpdclient.so:${PORTSDIR}/audio/libmpdclient
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 
-NO_STAGE=	yes
+USES=		qmake
 USE_QT4=	corelib gui network \
 		moc_build qmake_build rcc_build uic_build
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/pixmaps/${PORTNAME}.png
 
-DESKTOP_ENTRIES="Quimup" "" "${PREFIX}/share/pixmaps/${PORTNAME}.png" \
+DESKTOP_ENTRIES="Quimup" "MPD client" "${PREFIX}/share/pixmaps/${PORTNAME}.png" \
 		"${PORTNAME}" "Audio;AudioVideo;Qt;" true
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|qt release -O2|qt| ; \
+		'/^CONFIG/s|-O2|| ; \
 		 s|/usr/lib/|${LOCALBASE}/lib/| ; \
 		 s|^QMAKE_|#QMAKE_|' ${WRKSRC}/${PORTNAME}.pro
 
-do-configure:
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS})
-
 do-install:
-	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} ${PREFIX}/bin)
-	(cd ${WRKSRC}/src/resources && ${INSTALL_DATA} mn_icon.png \
-		${PREFIX}/share/pixmaps/${PORTNAME}.png)
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/src/resources/mn_icon.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 
 .include <bsd.port.mk>
diff --git a/deskutils/cdcat/Makefile b/deskutils/cdcat/Makefile
index a6cdd460c615..ca2a8df45b05 100644
--- a/deskutils/cdcat/Makefile
+++ b/deskutils/cdcat/Makefile
@@ -20,19 +20,21 @@ LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/archivers/p7zip:patch \
 		${NONEXISTENT}:${PORTSDIR}/multimedia/mediainfo:build
-LIB_DEPENDS=	tar:${PORTSDIR}/devel/libtar \
-		exif:${PORTSDIR}/graphics/libexif
+LIB_DEPENDS=	libtar.so:${PORTSDIR}/devel/libtar \
+		libexif.so:${PORTSDIR}/graphics/libexif
 
 OPTIONS_DEFINE=	DOCS
 
-BUILD_WRKSRC=	${WRKSRC}/src
+CONFIGURE_WRKSRC=	${WRKSRC}/src
+BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
 
+USES=		qmake
 USE_BZIP2=	yes
 USE_QT4=	corelib gui xml \
 		linguist_build moc_build qmake_build uic_build
 INSTALLS_ICONS=	yes
 
-QMAKEFLAGS+=	INCLUDEPATH+="${L7Z_WRKSRC}/Lib7Zip" \
+QMAKE_ARGS+=	INCLUDEPATH+="${L7Z_WRKSRC}/Lib7Zip" \
 		INCLUDEPATH+="${MIF_WRKSRC}/MediaInfoLib/Source" \
 		INCLUDEPATH+="${MIF_WRKSRC}/ZenLib/Source" \
 		LIBS+="${L7Z_WRKSRC}/Lib7Zip/lib7zip.a" \
@@ -42,6 +44,7 @@ QMAKEFLAGS+=	INCLUDEPATH+="${L7Z_WRKSRC}/Lib7Zip" \
 		DEFINES+="MEDIAINFO_STATIC" \
 		DEFINES+="MEDIAINFO_UNICODE" \
 		DEFINES+="USE_LIBEXIF"
+QMAKE_PRO=	${PORTNAME}.pro
 LRELEASE=	${QT_PREFIX}/bin/lrelease-qt4
 
 # spoof tinderbox: build deps for multimedia/mediainfo
@@ -63,7 +66,6 @@ L7Z_VERSION=	1.6.3
 L7Z_DISTFILE=	${L7Z_NAME}-${L7Z_VERSION}.tar.gz
 L7Z_WRKSRC=	${WRKDIR}/${L7Z_NAME}
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 P7Z_WRKSRC=	$$(cd ${PORTSDIR}/archivers/p7zip && ${MAKE} -V WRKSRC)
@@ -75,7 +77,7 @@ post-extract:
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		'/LIBS/s|^|#|' ${BUILD_WRKSRC}/${PORTNAME}.pro
+		'/LIBS/s|^|#|' ${BUILD_WRKSRC}/${QMAKE_PRO}
 	@${REINPLACE_CMD} -e \
 		's|/dev/sr0|/dev/cd0|' ${BUILD_WRKSRC}/config.cpp
 	@${REINPLACE_CMD} -e \
@@ -86,35 +88,29 @@ pre-configure:
 		CC="${CC}" CFLAGS="${CFLAGS}" \
 		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
 		P7ZIP_SOURCE_DIR="${P7Z_WRKSRC}"
-
-do-configure:
-	@${LRELEASE} ${BUILD_WRKSRC}/${PORTNAME}.pro
-	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} \
-		${PORTNAME}.pro ${QMAKEFLAGS}
+	@${LRELEASE} ${BUILD_WRKSRC}/${QMAKE_PRO}
 
 pre-build:
 	@cd ${L7Z_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} \
 		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
 
 do-install:
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${DATADIR}
-	@${MKDIR} ${DATADIR}/translations
-	${INSTALL_DATA} ${BUILD_WRKSRC}/lang/*.qm ${DATADIR}/translations
-	@${MKDIR} ${PREFIX}/share/icons/hicolor/scalable/apps
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}/translations
+	${INSTALL_DATA} ${BUILD_WRKSRC}/lang/*.qm ${STAGEDIR}${DATADIR}/translations
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}_logo.svg \
-		${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}_logo.svg
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}_logo.svg
 .for size in 16 22 32 48 64
-	@${MKDIR} ${PREFIX}/share/icons/hicolor/${size}x${size}/apps
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}_logo_${size}x${size}.png \
-		${PREFIX}/share/icons/hicolor/${size}x${size}/apps/${PORTNAME}_logo.png
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps/${PORTNAME}_logo.png
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-.for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/launchy/Makefile b/deskutils/launchy/Makefile
index 59337ad3cf12..64cfc7bfc6eb 100644
--- a/deskutils/launchy/Makefile
+++ b/deskutils/launchy/Makefile
@@ -13,12 +13,13 @@ COMMENT=	Open source keystroke launcher
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
 RUN_DEPENDS=	${LOCALBASE}/bin/xdg-open:${PORTSDIR}/devel/xdg-utils
 
+USES=		qmake
 USE_DOS2UNIX=	readme.lyx readme.txt
 USE_QT4=	qmake_build moc_build rcc_build uic_build gui network
 PORTDOCS=	*
 
 MAKE_JOBS_UNSAFE=	yes
-NO_STAGE=	yes
+
 .include <bsd.port.options.mk>
 
 post-patch:
@@ -31,14 +32,10 @@ post-patch:
 		${WRKSRC}/plugins/weby/weby.pro \
 		${WRKSRC}/src/src.pro
 
-do-configure:
-	@(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} -r Launchy.pro)
-
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/?eadme.* ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/?eadme.* ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/deskutils/nagaina/Makefile b/deskutils/nagaina/Makefile
index d3ca566c70ec..3e11f73035ab 100644
--- a/deskutils/nagaina/Makefile
+++ b/deskutils/nagaina/Makefile
@@ -9,22 +9,22 @@ CATEGORIES=	deskutils
 MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Notes-taking application based on Qt4
+COMMENT=	Notes-taking application based on Qt 4
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
-		pcre:${PORTSDIR}/devel/pcre \
-		png15:${PORTSDIR}/graphics/png \
-		freetype:${PORTSDIR}/print/freetype2 \
-		expat:${PORTSDIR}/textproc/expat2 \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
+		libpcre.so:${PORTSDIR}/devel/pcre \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libexpat.so:${PORTSDIR}/textproc/expat2 \
+		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 
 OPTIONS_DEFINE=	DOCS
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USES=		gettext iconv
+USES=		gettext iconv qmake
 USE_GNOME=	glib20
 USE_QT4=	corelib gui xml moc_build qmake_build rcc_build uic_build
 USE_XORG=	ice sm x11 xau xcb xdmcp xext xrender
@@ -33,28 +33,20 @@ PORTDOCS=	CHANGELOG TODO
 PLIST_FILES=	bin/${PORTNAME} share/pixmaps/${PORTNAME}.png
 
 DESKTOP_ENTRIES=	"Nagaina" \
-			"${COMMENT}" \
+			"Notes-taking application" \
 			"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
 			"${PORTNAME}" \
 			"Qt;Office;Utility;" \
-			"false"
+			"true"
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-do-configure:
-	@(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS})
-
 post-install:
-	(cd ${WRKSRC}/bin \
-		&& ${INSTALL_PROGRAM} ${PORTNAME} ${PREFIX}/bin)
-	(cd ${WRKSRC}/images \
-		&& ${INSTALL_DATA} ${PORTNAME}.png ${PREFIX}/share/pixmaps)
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/images/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-.for doc in ${PORTDOCS}
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${doc} ${DOCSDIR})
-.endfor
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/deskutils/qlabels/Makefile b/deskutils/qlabels/Makefile
index ee3910a78630..aa5cc7835b3c 100644
--- a/deskutils/qlabels/Makefile
+++ b/deskutils/qlabels/Makefile
@@ -12,6 +12,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Labels and business cards creating
 
+USES=		qmake
 USE_BZIP2=	yes
 USE_QT4=	xml gui corelib qmake_build uic_build moc_build rcc_build
 WRKSRC=		${WRKDIR}/${DISTNAME:C/_/-/}
@@ -21,24 +22,19 @@ DESKTOP_ENTRIES=	"qLabels" \
 			"" \
 			"qlabels" \
 			"Office;Qt;" \
-			"false"
+			"true"
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} 's|/usr|${PREFIX}|g' \
 		${WRKSRC}/qlabels.pro \
 		${WRKSRC}/lib/templates.cpp \
 		${WRKSRC}/lib/papers.cpp
 
-pre-build:
-	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS} qlabels.pro
-
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for doc in Changelog LICENSE
-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
-.endfor
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/Changelog ${WRKSRC}/LICENSE \
+		${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/alabastra/Makefile b/devel/alabastra/Makefile
index f1caa1f308fd..0ef164652802 100644
--- a/devel/alabastra/Makefile
+++ b/devel/alabastra/Makefile
@@ -10,26 +10,28 @@ DISTNAME=	Alabastra-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	C++ editor written with Qt4
+COMMENT=	C++ editor written with Qt 4
 
 LICENSE=	GPLv2 # (or later)
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
+USES=		qmake gmake
 USE_QT4=	gui xml \
 		moc_build qmake_build rcc_build uic_build \
 		iconengines_run
-USE_GMAKE=	yes
 ALL_TARGET=	Alabastra
 
 PLIST_FILES=	bin/alabastra
 
-NO_STAGE=	yes
-do-configure:
-	@(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS})
+DESKTOP_ENTRIES=	"Alabastra" \
+			"C++/Qt editor" \
+			"" \
+			"alabastra" \
+			"Development;IDE;Qt;" \
+			true
 
 do-install:
-	(cd ${INSTALL_WRKSRC} \
-		&& ${INSTALL_PROGRAM} Alabastra ${PREFIX}/bin/alabastra)
+	${INSTALL_PROGRAM} ${WRKSRC}/Alabastra ${STAGEDIR}${PREFIX}/bin/alabastra
 
 .include <bsd.port.mk>
diff --git a/devel/kaptain/Makefile b/devel/kaptain/Makefile
index adcdc9baecb7..831fba4bae98 100644
--- a/devel/kaptain/Makefile
+++ b/devel/kaptain/Makefile
@@ -14,15 +14,15 @@ LICENSE=	GPLv2 # (or later)
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
+USES=		qmake
 USE_QT4=	qt3support moc_build qmake_build
 
-MAN1=		kaptain.1
 INFO=		kaptain
 PORTDOCS=	*
 PORTEXAMPLES=	*
-PLIST_FILES=	bin/kaptain
+PLIST_FILES=	bin/kaptain \
+		man/man1/kaptain.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
@@ -32,27 +32,20 @@ post-patch:
 		${REINPLACE_CMD} -e \
 		's|/usr/bin/kaptain|${SETENV} kaptain|'
 
-do-configure:
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS})
-
 do-install:
-	(cd ${WRKSRC} \
-		&& ${INSTALL_PROGRAM} kaptain ${PREFIX}/bin)
-	(cd ${WRKSRC}/man \
-		&& ${INSTALL_MAN} kaptain.1 ${MANPREFIX}/man/man1)
-	(cd ${WRKSRC}/doc \
-		&& ${INSTALL_DATA} kaptain.info ${PREFIX}/${INFO_PATH})
+	${INSTALL_PROGRAM} ${WRKSRC}/kaptain ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/kaptain.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/doc/kaptain.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC} \
-		&& ${INSTALL_DATA} README ${DOCSDIR})
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc \
-		&& ${INSTALL_DATA} *.gif *.html *.png *.tgz ${DOCSDIR})
+		&& ${INSTALL_DATA} *.gif *.html *.png *.tgz ${STAGEDIR}${DOCSDIR})
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples \
-		&& ${INSTALL_DATA} *.kaptn *.tgz ${EXAMPLESDIR})
+		&& ${INSTALL_DATA} *.kaptn *.tgz ${STAGEDIR}${EXAMPLESDIR})
 .endif
 
 .include <bsd.port.mk>
diff --git a/editors/lfhex/Makefile b/editors/lfhex/Makefile
index 32fb05d90223..475bee4bd422 100644
--- a/editors/lfhex/Makefile
+++ b/editors/lfhex/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Large file hex editor
 LICENSE=	GPLv2
 
 USE_QT4=	corelib gui moc_build qmake_build rcc_build
-USES=		bison
+USES=		bison qmake
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
@@ -21,21 +21,19 @@ PORTDOCS=	README
 PLIST_FILES=	bin/lfhex
 LICENSE_FILES=	${WRKSRC}/../COPYING
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^DEFINES|# DEFINES|g' ${WRKSRC}/lfhex.pro
 	@${REINPLACE_CMD} -e 's| abs| llabs|g' ${WRKSRC}/reader.cpp
 
-do-configure:
-	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS}
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/lfhex ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../README ${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/lfhex ${STAGEDIR}${PREFIX}/bin
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/../README ${STAGEDIR}${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/editors/textroom/Makefile b/editors/textroom/Makefile
index 3116864d6876..612f1ec0fa2f 100644
--- a/editors/textroom/Makefile
+++ b/editors/textroom/Makefile
@@ -14,22 +14,16 @@ LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
 		libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26 \
 		libcurl.so:${PORTSDIR}/ftp/curl
 
-USES=		shared-mime-info
+USES=		qmake shared-mime-info
 USE_SDL=	mixer
 USE_QT4=	moc_build qmake_build rcc_build uic_build corelib gui xml \
 		svg opengl qt3support
-QMAKE_ARGS=	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE}
-HAS_CONFIGURE=	yes
+QMAKE_ARGS=	LOCALBASE=${LOCALBASE}
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \
 		${WRKSRC}/application/src/textroom.cpp \
 		${WRKSRC}/application/src/getaword.cpp \
 		${WRKSRC}/application/src/optionsdialog.cpp
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-	${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS} textroom.pro
-
 .include <bsd.port.mk>
diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index 62d939fe51ee..2922fb4178e3 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -8,54 +8,57 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Simple QT-based financial manager
+COMMENT=	Simple Qt-based financial manager
 
 LICENSE=	GPLv2 # (or later)
 
-LIB_DEPENDS=	qwt6:${PORTSDIR}/x11-toolkits/qwt6
+LIB_DEPENDS=	libqwt6.so:${PORTSDIR}/x11-toolkits/qwt6
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS DEBUG
 
+USES=		qmake
 USE_QT4=	corelib gui sql moc_build qmake_build rcc_build uic_build
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 
 CXXFLAGS+=	-fpermissive
 
-DESKTOP_ENTRIES="QHacc" "" "" "${PORTNAME}" "" ""
+DESKTOP_ENTRIES="QHacc" "Financial manager" "" "${PORTNAME}" "" ""
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MDEBUG}
+BUILD_TYPE=	debug
+.else
+BUILD_TYPE=	release
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^INSTALLDIR/s|=.*|=${DATADIR}| ; \
 		 /^QWTINCS/s|=.*|=${LOCALBASE}/include/qwt6| ; \
 		 /^QWTLIBS/s|=.*|=${LOCALBASE}/lib -lqwt6| ; \
-		 /+= debug/s|^|#|' ${WRKSRC}/user.pri
+		 /^CONFIG +=/s|debug|${BUILD_TYPE}|' ${WRKSRC}/user.pri
 	@${REINPLACE_CMD} -e \
 		's|/usr/include|${LOCALBASE}/include| ; \
 		 s|-lqwt||' ${WRKSRC}/gui/gui.pro
 	@${REINPLACE_CMD} -e \
 		's|/../qm/|/../share/qhacc/|' ${WRKSRC}/gui/main.cpp
 
-do-configure:
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS})
-
 do-install:
-	(cd ${WRKSRC}/gui/build/release && ${INSTALL_PROGRAM} \
-		qhacc ${PREFIX}/bin)
-	(cd ${WRKSRC}/engine/build/release && ${INSTALL_DATA} \
-		libengine.so.1.0.0 ${PREFIX}/lib)
-	@${LN} -sf libengine.so.1.0.0 ${PREFIX}/lib/libengine.so
-	@${LN} -sf libengine.so.1.0.0 ${PREFIX}/lib/libengine.so.1
-	@${LN} -sf libengine.so.1.0.0 ${PREFIX}/lib/libengine.so.1.0
-	@${MKDIR} ${DATADIR}
-	(cd ${WRKSRC}/qm && ${INSTALL_DATA} *.qm ${DATADIR})
+	${INSTALL_PROGRAM} ${WRKSRC}/gui/build/${BUILD_TYPE}/qhacc \
+		${STAGEDIR}${PREFIX}/bin
+	${INSTALL_LIB} ${WRKSRC}/engine/build/${BUILD_TYPE}/libengine.so.1.0.0 \
+		${STAGEDIR}${PREFIX}/lib
+	@${LN} -sf libengine.so.1.0.0 ${STAGEDIR}${PREFIX}/lib/libengine.so
+	@${LN} -sf libengine.so.1.0.0 ${STAGEDIR}${PREFIX}/lib/libengine.so.1
+	@${LN} -sf libengine.so.1.0.0 ${STAGEDIR}${PREFIX}/lib/libengine.so.1.0
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/qm/*.qm ${STAGEDIR}${DATADIR}
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in AUTHORS ChangeLog README THANKS TODO UPGRADE
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR})
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
diff --git a/games/kardsgt/Makefile b/games/kardsgt/Makefile
index 62a663f66a75..b1f6df99a8a8 100644
--- a/games/kardsgt/Makefile
+++ b/games/kardsgt/Makefile
@@ -10,38 +10,37 @@ MASTER_SITES=	SAVANNAH
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Card game suite
 
+USES=		qmake
 USE_QT4=	assistantclient corelib gui network \
 		moc_build qmake_build rcc_build uic_build
 ALL_TARGET=	qmake release
 MAKE_JOBS_UNSAFE=	yes
 
-MAN6=		kardsgt.6
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|^QT +=|#QT +=|g' \
 		${WRKSRC}/src/src.pro
 	@${REINPLACE_CMD} -e 's|/usr/share/kardsgt/|${DATADIR}/|g' \
 		${WRKSRC}/src/kardsgtinterface.cpp
 
-do-configure:
-	@(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS})
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/release/kardsgt ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/src/doc/kardsgt.6 ${MAN6PREFIX}/man/man6
-	@${MKDIR} ${PREFIX}/share/icons
-	${INSTALL_DATA} ${WRKSRC}/src/images/kardsgt.png ${PREFIX}/share/icons
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/src/doc/*.dcf ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/src/doc/*.html ${DATADIR}
-	@${MKDIR} ${DATADIR}/images
-	${INSTALL_DATA} ${WRKSRC}/src/doc/images/*.jpg ${DATADIR}/images
-	${INSTALL_DATA} ${WRKSRC}/src/doc/images/*.png ${DATADIR}/images
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/release/kardsgt ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/src/doc/kardsgt.6 ${STAGEDIR}${MAN6PREFIX}/man/man6
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons
+	${INSTALL_DATA} ${WRKSRC}/src/images/kardsgt.png ${STAGEDIR}${PREFIX}/share/icons
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/src/doc/*.dcf ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/src/doc/*.html ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}/images
+	${INSTALL_DATA} ${WRKSRC}/src/doc/images/*.jpg ${STAGEDIR}${DATADIR}/images
+	${INSTALL_DATA} ${WRKSRC}/src/doc/images/*.png ${STAGEDIR}${DATADIR}/images
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in CREDITS ChangeLog README
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
diff --git a/games/kardsgt/pkg-plist b/games/kardsgt/pkg-plist
index 3a83f5581d2e..c7aba9c2aa30 100644
--- a/games/kardsgt/pkg-plist
+++ b/games/kardsgt/pkg-plist
@@ -1,4 +1,5 @@
 bin/kardsgt
+man/man6/kardsgt.6.gz
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/games/qgo/Makefile b/games/qgo/Makefile
index 83052c424f17..a5acec124378 100644
--- a/games/qgo/Makefile
+++ b/games/qgo/Makefile
@@ -13,13 +13,12 @@ COMMENT=	Go board and SGF editor written with the Qt library
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_BZIP2=	yes
-USES=		desktop-file-utils
+USES=		desktop-file-utils qmake
 USE_QT4=	gui network qtestlib moc_build qmake_build rcc_build uic_build
 
 PLIST_FILES=	bin/qgo share/applications/qgo.desktop share/pixmaps/qgo.png
 PLIST_DIRSTRY=	share/applications
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/Icon/s|=.*|=${PREFIX}/share/pixmaps/qgo.png| ; \
@@ -29,14 +28,11 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/src/mainwindow_settings.cpp
 
-do-configure:
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS})
-
 do-install:
-	(cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} qgo ${PREFIX}/bin)
-	@${MKDIR} ${DESKTOPDIR}
-	(cd ${WRKSRC}/src && ${INSTALL_DATA} qgo.desktop ${DESKTOPDIR})
-	(cd ${WRKSRC}/src/ressources/pics && ${INSTALL_DATA} qgo.png \
-		${PREFIX}/share/pixmaps)
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/qgo ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
+	${INSTALL_DATA} ${WRKSRC}/src/qgo.desktop ${STAGEDIR}${DESKTOPDIR}
+	${INSTALL_DATA} ${WRKSRC}/src/ressources/pics/qgo.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>
diff --git a/games/spellathon/Makefile b/games/spellathon/Makefile
index b3bf3fbf03e8..4bad8c8372d9 100644
--- a/games/spellathon/Makefile
+++ b/games/spellathon/Makefile
@@ -12,41 +12,39 @@ COMMENT=	Word game to test your English vocabulary skills
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
-		pcre:${PORTSDIR}/devel/pcre \
-		png15:${PORTSDIR}/graphics/png \
-		freetype:${PORTSDIR}/print/freetype2 \
-		expat:${PORTSDIR}/textproc/expat2 \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
+		libpcre.so:${PORTSDIR}/devel/pcre \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libexpat.so:${PORTSDIR}/textproc/expat2 \
+		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 
 CXXFLAGS+=	-fPIC
-USES=		gettext iconv
+USES=		gettext iconv qmake
 USE_GNOME=	glib20
 USE_QT4=	corelib gui moc_build qmake_build rcc_build uic_build
 USE_XORG=	ice sm x11 xau xcb xdmcp xext xrender
 USE_LDCONFIG=	yes
 
+CONFIGURE_WRKSRC=	${WRKSRC}/src/gui
+
 DESKTOP_ENTRIES="Spellathon" "${COMMENT}" "" "${PORTNAME}" "Education;Languages;" "true"
 
-NO_STAGE=	yes
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|$${CC}|$${CXX}|g ; \
-		 s|$${CFLAGS}|$${CXXFLAGS}|g ; \
-		 s|qmake-qt4|${TRUE}|'
+		s|$${CFLAGS}|$${CXXFLAGS}|g ; \
+		s|qmake-qt4|${TRUE}|'
 	@${REINPLACE_CMD} \
 		's|dict/words.txt|${DATADIR}/words.txt|' ${WRKSRC}/src/logic/defines.h
 
-do-configure:
-	@(cd ${WRKSRC}/src/gui && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS})
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/spellathon ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/spellathon-cl ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/libspellathon.so.0.0 ${PREFIX}/lib
-	${LN} -sf libspellathon.so.0.0 ${PREFIX}/lib/libspellathon.so
-	${LN} -sf libspellathon.so.0.0 ${PREFIX}/lib/libspellathon.so.0
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/dict/words.txt ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/spellathon ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/spellathon-cl ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/libspellathon.so.0.0 ${STAGEDIR}${PREFIX}/lib
+	${LN} -sf libspellathon.so.0.0 ${STAGEDIR}${PREFIX}/lib/libspellathon.so
+	${LN} -sf libspellathon.so.0.0 ${STAGEDIR}${PREFIX}/lib/libspellathon.so.0
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/dict/words.txt ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/german/tipp10/Makefile b/german/tipp10/Makefile
index e76842d3c2ee..416aaddbe37f 100644
--- a/german/tipp10/Makefile
+++ b/german/tipp10/Makefile
@@ -9,39 +9,35 @@ MASTER_SITES=	http://www.tipp10.com/en/download/
 DISTNAME=	tipp10_source_v2-1-0
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A 10 finger touch typing learning program
+COMMENT=	10-finger touch typing learning program
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/license_en.txt
 
-RUN_DEPENDS=	${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlite2.so:${PORTSDIR}/databases/qt4-sqlite-plugin \
-		${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlite.so:${PORTSDIR}/databases/qt4-sqlite3-plugin
-
+USES=		qmake
+USE_DOS2UNIX=	*.pro *.cpp
 USE_ZIP=	yes
 USE_QT4=	gui sql corelib network script qtestlib \
-		qmake_build rcc_build uic_build moc_build
+		qmake_build rcc_build uic_build moc_build \
+		sql-sqlite2_run sql-sqlite3_run
+QMAKE_ARGS+=	DATADIR="${DATADIR}"
 WRKSRC=		${WRKDIR}/tipp10_source_v2-1-0
 
-NO_STAGE=	yes
 pre-configure:
 	@cd ${WRKSRC} \
 	&& for i in `grep -lR 'QCoreApplication::applicationDirPath()' *`; do ${REINPLACE_CMD} -e 's/QCoreApplication::applicationDirPath()/QString(DATADIR)/g' $$i ; done
 
-do-configure:
-	cd ${WRKSRC} \
-	&&  ${SETENV} ${MAKE_ENV} DATADIR="${DATADIR}" ${QMAKE} -spec ${QMAKESPEC}
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/tipp10 ${PREFIX}/bin
-	${INSTALL_DATA} -d ${DATADIR}/help/de/img
-	${INSTALL_DATA} -d ${DATADIR}/help/de/content
-	${INSTALL_DATA} -d ${DATADIR}/help/en/img
-	${INSTALL_DATA} -d ${DATADIR}/help/en/content
-	${INSTALL_DATA} ${WRKSRC}/release/tipp10v2.template ${WRKSRC}/metronome.wav ${WRKSRC}/error.wav ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/release/help/de/index.html ${DATADIR}/help/de
-	${INSTALL_DATA} ${WRKSRC}/release/help/de/content/* ${DATADIR}/help/de/content
-	${INSTALL_DATA} ${WRKSRC}/release/help/de/img/* ${DATADIR}/help/de/img
-	${INSTALL_DATA} ${WRKSRC}/release/help/en/index.html ${DATADIR}/help/en
-	${INSTALL_DATA} ${WRKSRC}/release/help/en/content/* ${DATADIR}/help/en/content
-	${INSTALL_DATA} ${WRKSRC}/release/help/en/img/* ${DATADIR}/help/en/img
+	${INSTALL_PROGRAM} ${WRKSRC}/tipp10 ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} -d ${STAGEDIR}${DATADIR}/help/de/img
+	${INSTALL_DATA} -d ${STAGEDIR}${DATADIR}/help/de/content
+	${INSTALL_DATA} -d ${STAGEDIR}${DATADIR}/help/en/img
+	${INSTALL_DATA} -d ${STAGEDIR}${DATADIR}/help/en/content
+	${INSTALL_DATA} ${WRKSRC}/release/tipp10v2.template ${WRKSRC}/metronome.wav ${WRKSRC}/error.wav ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/release/help/de/index.html ${STAGEDIR}${DATADIR}/help/de
+	${INSTALL_DATA} ${WRKSRC}/release/help/de/content/* ${STAGEDIR}${DATADIR}/help/de/content
+	${INSTALL_DATA} ${WRKSRC}/release/help/de/img/* ${STAGEDIR}${DATADIR}/help/de/img
+	${INSTALL_DATA} ${WRKSRC}/release/help/en/index.html ${STAGEDIR}${DATADIR}/help/en
+	${INSTALL_DATA} ${WRKSRC}/release/help/en/content/* ${STAGEDIR}${DATADIR}/help/en/content
+	${INSTALL_DATA} ${WRKSRC}/release/help/en/img/* ${STAGEDIR}${DATADIR}/help/en/img
 .include <bsd.port.mk>
diff --git a/german/tipp10/files/patch-tipp10.pro b/german/tipp10/files/patch-tipp10.pro
index 42d2e99e8675..05e362377731 100644
--- a/german/tipp10/files/patch-tipp10.pro
+++ b/german/tipp10/files/patch-tipp10.pro
@@ -1,8 +1,8 @@
 --- tipp10.pro	2011-03-12 20:22:32.000000000 +0100
 +++ tipp10.pro	2011-07-24 14:24:03.000000000 +0200
 @@ -88,3 +88,5 @@
-                     sql/startsql.cpp \

-                     games/abcrainwidget.cpp \

-                     games/charball.cpp

-+

-+DEFINES += "DATADIR=\"\\\"$$(DATADIR)\\\"\""

+                     sql/startsql.cpp \
+                     games/abcrainwidget.cpp \
+                     games/charball.cpp
++
++DEFINES += "DATADIR=\"\\\"$$(DATADIR)\\\"\""
diff --git a/graphics/darknock/Makefile b/graphics/darknock/Makefile
index 358744797eee..7f817ab819b1 100644
--- a/graphics/darknock/Makefile
+++ b/graphics/darknock/Makefile
@@ -14,6 +14,7 @@ LICENSE=	GPLv2 # (or later)
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+USES=		qmake
 USE_QT4=	gui linguist_build moc_build qmake_build rcc_build uic_build
 
 PORTDOCS=	changelog
@@ -24,11 +25,10 @@ DESKTOP_ENTRIES=	"${PORTNAME}" \
 			"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
 			"${PORTNAME}" \
 			"Graphics;Qt;" \
-			"false"
+			"true"
 
 LRELEASE=	${QT_PREFIX}/bin/lrelease-qt4
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
@@ -42,22 +42,19 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/darknock|${DATADIR}|g' \
 		${WRKSRC}/src/main.cpp
 
-pre-build:
+pre-configure:
 	@${LRELEASE} ${BUILD_WRKSRC}/${PORTNAME}.pro
-	@(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS})
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/images/${PORTNAME}.png ${PREFIX}/share/pixmaps
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/images/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps
 .if ${PORT_OPTIONS:MNLS}
-	@${MKDIR} ${DATADIR}/locale
-	${INSTALL_DATA} ${WRKSRC}/locale/*.qm ${DATADIR}/locale
+	@${MKDIR} ${STAGEDIR}${DATADIR}/locale
+	${INSTALL_DATA} ${WRKSRC}/locale/*.qm ${STAGEDIR}${DATADIR}/locale
 .endif
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for doc in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
-.endfor
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/changelog ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/multimedia/2mandvd/Makefile b/multimedia/2mandvd/Makefile
index ffee577a8039..128c28d9128e 100644
--- a/multimedia/2mandvd/Makefile
+++ b/multimedia/2mandvd/Makefile
@@ -12,7 +12,7 @@ COMMENT=	DVD authoring and slideshow tool
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	avcodec:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
 RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox \
 		notify-send:${PORTSDIR}/devel/libnotify \
 		exif:${PORTSDIR}/graphics/exif \
@@ -30,20 +30,17 @@ RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USES=		perl5
+USES=		perl5 qmake gmake
 USE_QT4=	corelib gui opengl \
 		linguist_build moc_build qmake_build rcc_build uic_build
 USE_GL=		glu
 USE_SDL=	sdl
 USE_PERL5=	run
-USE_GMAKE=	yes
-MAKE_ENV=	QTDIR="${QT_PREFIX}"
 
 DATADIR=	${PREFIX}/share/2ManDVD
 
 LRELEASE=	${LOCALBASE}/bin/lrelease-qt4
 
-NO_STAGE=	yes
 post-extract:
 	@${FIND} ${WRKSRC} -name "*~" -delete
 
@@ -66,21 +63,18 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		's|Ne slideshow|New slidshow|' ${WRKSRC}/2mandvd_en.ts
 
-do-configure:
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS})
-
 pre-build:
 	(cd ${WRKSRC} && ${LRELEASE} 2mandvd_en.ts)
 
 do-install:
-	(cd ${WRKSRC} && ${INSTALL_PROGRAM} 2ManDVD ${PREFIX}/bin)
-	@${MKDIR} ${DATADIR}
-	(cd ${WRKSRC} && ${INSTALL_SCRIPT} fake.pl ${DATADIR})
-	(cd ${WRKSRC} && ${INSTALL_DATA} *.qm ${DATADIR})
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} Bibliotheque ${DATADIR})
-	@${MKDIR} ${DESKTOPDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} 2ManDVD.desktop ${DESKTOPDIR})
-	(cd ${WRKSRC}/Interface && ${INSTALL_DATA} mandvdico.png \
-		${PREFIX}/share/pixmaps)
+	${INSTALL_PROGRAM} ${WRKSRC}/2ManDVD ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/fake.pl ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.qm ${STAGEDIR}${DATADIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} Bibliotheque ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
+	${INSTALL_DATA} ${WRKSRC}/2ManDVD.desktop ${STAGEDIR}${DESKTOPDIR}
+	${INSTALL_DATA} ${WRKSRC}/Interface/mandvdico.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>
diff --git a/multimedia/abby/Makefile b/multimedia/abby/Makefile
index 55345bbc180b..117c2daee4b2 100644
--- a/multimedia/abby/Makefile
+++ b/multimedia/abby/Makefile
@@ -14,15 +14,12 @@ OPTIONS_DEFINE=	CCLIVE
 OPTIONS_DEFAULT=	CCLIVE
 CCLIVE_DESC=	Use cclive backend (instead of clive)
 
+USES=		qmake
 USE_BZIP2=	yes
 USE_QT4=	gui network xml moc_build qmake_build rcc_build uic_build
-HAS_CONFIGURE=	yes
-QMAKE_ARGS=	-unix -recursive PREFIX=${PREFIX} ${QMAKE_PRO}
-QMAKE_PRO=	abby.pro
 
 PLIST_FILES=	bin/abby
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCCLIVE}
@@ -31,10 +28,7 @@ RUN_DEPENDS+=	cclive>=0.5.6:${PORTSDIR}/multimedia/cclive
 RUN_DEPENDS+=	clive>=2.2.5:${PORTSDIR}/multimedia/clive
 .endif
 
-do-configure:
-	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/abby ${PREFIX}/bin/abby
+	${INSTALL_PROGRAM} ${WRKSRC}/abby ${STAGEDIR}${PREFIX}/bin/abby
 
 .include <bsd.port.mk>
diff --git a/multimedia/smile/Makefile b/multimedia/smile/Makefile
index ec513147c1aa..ea93f0d5e48d 100644
--- a/multimedia/smile/Makefile
+++ b/multimedia/smile/Makefile
@@ -15,33 +15,28 @@ RUN_DEPENDS=	sox>=14.0:${PORTSDIR}/audio/sox \
 		mplayer:${PORTSDIR}/multimedia/mplayer \
 		ImageMagick>=6.4:${PORTSDIR}/graphics/ImageMagick
 
+USES=		qmake
 USE_QT4=	qmake_build gui corelib rcc_build moc_build uic_build \
 		opengl webkit
 
-MAKE_ENV=	QTDIR=${QT_PREFIX}
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 DESKTOP_ENTRIES="Smile" "${COMMENT}" "${PREFIX}/share/pixmaps/smile.png" \
-		"${PORTNAME}" "AudioVideo;Qt;" false
+		"${PORTNAME}" "AudioVideo;Qt;" true
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|bash|sh|' ${WRKSRC}/mainfrm.cpp \
 		${WRKSRC}/render.cpp
 	@${RM} -f ${WRKSRC}/ui_*.h ${WRKSRC}/moc_*.cpp ${WRKSRC}/qrc_*.cpp \
 		${WRKSRC}/BIB_ManSlide/Help/doc_fr ${WRKSRC}/BIB_ManSlide/*/*~
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${QMAKE} -spec ${QMAKESPEC} smile.pro
-
 do-install:
-	@${MKDIR} ${DATADIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} "BIB_ManSlide Interface" ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/*.qm ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "BIB_ManSlide Interface" ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.qm ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/Interface/Theme/smile.png \
-		${PREFIX}/share/pixmaps
-	${INSTALL_PROGRAM} ${WRKSRC}/smile ${DATADIR}
-	${LN} -fs ${DATADIR}/smile ${PREFIX}/bin
+		${STAGEDIR}${PREFIX}/share/pixmaps
+	${INSTALL_PROGRAM} ${WRKSRC}/smile ${STAGEDIR}${DATADIR}
+	${LN} -fs ${DATADIR}/smile ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/net-im/ramblercontacts/Makefile b/net-im/ramblercontacts/Makefile
index 211793a16304..e67c0794e647 100644
--- a/net-im/ramblercontacts/Makefile
+++ b/net-im/ramblercontacts/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Free, multi-service communication client from Rambler
 
 LICENSE=	GPLv3
 
+USES=		qmake
 USE_DOS2UNIX=	config.inc
 USE_XORG=	xscrnsaver
 USE_QT4=	qmake_build moc_build rcc_build uic_build designer_build \
 		webkit
 USE_LDCONFIG=	yes
 
-NO_STAGE=	yes
 post-patch:
 # Remove bogus Byte Order Mark (BOM) from some source files
 	@${REINPLACE_CMD} -e '1s/^[^#]*//' ${WRKSRC}/src/utils/balloontip.*
@@ -35,7 +35,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's| ../../COPYING||' \
 		${WRKSRC}/src/loader/loader.pro
 
-pre-build:
-	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS}
-
 .include <bsd.port.mk>
diff --git a/net/x2goclient/Makefile b/net/x2goclient/Makefile
index 56a099e5b6ad..281b0803ab37 100644
--- a/net/x2goclient/Makefile
+++ b/net/x2goclient/Makefile
@@ -11,6 +11,8 @@ COMMENT=	Qt client for the X2Go system
 
 LICENSE=	GPLv2
 
+# Avoid clash with libssh from base
+BUILD_DEPENDS=	${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh
 LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client \
 		libssh.so:${PORTSDIR}/security/libssh
 RUN_DEPENDS=	nxproxy:${PORTSDIR}/net/nxproxy \
@@ -19,10 +21,11 @@ RUN_DEPENDS=	nxproxy:${PORTSDIR}/net/nxproxy \
 OPTIONS_DEFINE=	LDAP DOCS
 OPTIONS_DEFAULT=LDAP
 
+USES=		qmake
 USE_XORG=	xpm
 USE_QT4=	gui network svg \
 		linguist_build moc_build qmake_build rcc_build uic_build
-QMAKEFLAGS=	QMAKE_LRELEASE="${QT_PREFIX}/bin/lrelease-qt4"
+QMAKE_ARGS=	QMAKE_LRELEASE="${QT_PREFIX}/bin/lrelease-qt4"
 INSTALLS_ICONS=	yes
 
 .include <bsd.port.options.mk>
@@ -30,9 +33,9 @@ INSTALLS_ICONS=	yes
 .if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=	yes
 CFLAGS+=	-DUSELDAP
-QMAKEFLAGS+=	LIBS+="-lX11 -lXpm -lcups -lldap"
+QMAKE_ARGS+=	LIBS+="-lX11 -lXpm -lcups -lldap"
 .else
-QMAKEFLAGS+=	LIBS+="-lX11 -lXpm -lcups"
+QMAKE_ARGS+=	LIBS+="-lX11 -lXpm -lcups"
 .endif
 
 post-patch:
@@ -42,9 +45,6 @@ post-patch:
 		 /<linux\/fs.h>/s|^|//| ; \
 		 /#define USELDAP/s|^|//|'
 
-do-configure:
-	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS})
-
 pre-build:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 		${MAKEFILE} compiler_TSQM_make_all)
diff --git a/sysutils/searchmonkey/Makefile b/sysutils/searchmonkey/Makefile
index db504c8fdddf..ffb4581301bb 100644
--- a/sysutils/searchmonkey/Makefile
+++ b/sysutils/searchmonkey/Makefile
@@ -13,18 +13,14 @@ COMMENT=	Search using regexes for file names and text
 
 LICENSE=	GPLv3 # (or later)
 
+USES=		qmake
 USE_ZIP=	yes
 USE_DOS2UNIX=	*.cpp *.h
 USE_QT4=	corelib gui moc_build qmake_build rcc_build uic_build
 
 PLIST_FILES=	bin/${PORTNAME}
 
-NO_STAGE=	yes
-do-configure:
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${PORTNAME}_2_0.pro \
-		${QMAKEFLAGS})
-
 do-install:
-	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} ${PREFIX}/bin)
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/textproc/dixit/Makefile b/textproc/dixit/Makefile
index e5c73c25373f..585e6f08d683 100644
--- a/textproc/dixit/Makefile
+++ b/textproc/dixit/Makefile
@@ -20,9 +20,9 @@ LICENSE=	GPLv3 # (or later)
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.${QT_VER}
 
+USES=		qmake
 USE_QT4=	corelib gui network moc_build qmake_build rcc_build
-HAS_CONFIGURE=	yes
-QMAKEFLAGS=	QMAKE_LFLAGS="-lz"
+QMAKE_ARGS=	QMAKE_LFLAGS="-lz"
 
 PLIST_SUB=	_DB=${_DB} DB_DIR=${DB_DIR} _DB_F=${_DB_F}
 
@@ -60,9 +60,6 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		's|dixit.qdb|${_DB}|' ${WRKSRC}/src/dixit.h
 
-do-configure:
-	(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS})
-
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} ${PREFIX}/bin)
 	@${TOUCH} -t ${DB_DATE} ${WRKSRC}/${_DB_F}
diff --git a/www/aria2fe/Makefile b/www/aria2fe/Makefile
index f8dd42ccde3b..fa12377f66b4 100644
--- a/www/aria2fe/Makefile
+++ b/www/aria2fe/Makefile
@@ -15,19 +15,16 @@ LICENSE=	GPLv3 # (or later)
 RUN_DEPENDS=	aria2c:${PORTSDIR}/www/aria2 \
 		xterm:${PORTSDIR}/x11/xterm
 
-BUILD_WRKSRC=	${WRKSRC}/src
-INSTALL_WRKSRC=	${WRKSRC}/bin
-
+USES=		qmake
 USE_BZIP2=	yes
 USE_QT4=	gui moc_build qmake_build rcc_build uic_build
 
 PLIST_FILES=	bin/${PORTNAME}
 
-NO_STAGE=	yes
-do-configure:
-	@(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS})
+CONFIGURE_WRKSRC=	${WRKSRC}/src
+BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>