- Convert to USES=qmake

- Adjust USE_QT4 components

Approved by:	portmgr (blanket approval)

14 files changed, 39 insertions, 113 deletions

diff --git a/games/bubble-chains/Makefile b/games/bubble-chains/Makefile
index f7a541e..5d549e1 100644
--- a/games/bubble-chains/Makefile
+++ b/games/bubble-chains/Makefile
@@ -19,18 +19,19 @@ BUILD_DEPENDS=		7z:${PORTSDIR}/archivers/p7zip
 
 WRKSRC=		${WRKDIR}/chains-${PORTVERSION}-src
 
+USES=		qmake
 USE_SDL=	sdl image mixer
 USE_GL=		glut glew glu
 USE_XORG=	xrandr
 USE_DOS2UNIX=	*.pro *.cpp  *.h *.ui *.ui *.rc *.htm *.dat *.css
-USE_QT4=	moc_build qmake_build rcc_build uic_build iconengines imageformats \
+USE_QT4=	moc_build rcc_build uic_build iconengines_run imageformats_run \
 		corelib svg xml opengl network
-QMAKEFLAGS=	QMAKE_LFLAGS="-L${LOCALBASE}/lib -lX11 -lSDL-1.2"
+LDFLAGS+=	-L${LOCALBASE}/lib -lX11 -lSDL-1.2
 
 PORTDOCS=	README
 
 DESKTOP_ENTRIES="Bubble Chains" "${COMMENT}" "${PORTNAME}" \
-		"${PORTNAME}" "Game;ArcadeGame;" false
+		"${PORTNAME}" "Game;ArcadeGame;" true
 
 OPTIONS_DEFINE=	DOCS
 
@@ -47,10 +48,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local/games/chains|${DATADIR}|' \
 		${WRKSRC}/main.cpp ${WRKSRC}/Game.pro
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
-
 post-configure:
 	@${REINPLACE_CMD} -e 's|CFLAGS        =|CFLAGS        ?=|' \
 		-e 's|CXXFLAGS      =|CXXFLAGS     ?=|' \
diff --git a/games/capicity/Makefile b/games/capicity/Makefile
index a27d501..24f21b3 100644
--- a/games/capicity/Makefile
+++ b/games/capicity/Makefile
@@ -21,9 +21,9 @@ LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
 
 WRKSRC=		${WRKDIR}/CapiCity_${PORTVERSION}
 
-USES=		iconv
+USES=		iconv qmake
 USE_XORG=	ice sm x11 xau xcb xdmcp xext xrender
-USE_QT4=	moc_build qmake_build rcc_build uic_build iconengines imageformats \
+USE_QT4=	moc_build rcc_build uic_build iconengines_run imageformats_run \
 		corelib gui network script xml
 
 PORTDOCS=	README changelog
@@ -43,13 +43,6 @@ NLS_USES=		gettext
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-	${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
-
-post-configure:
-	@${REINPLACE_CMD} -e 's|-O2 -pthread||g' ${WRKSRC}/Makefile
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/CapiCity ${PREFIX}/bin/${PORTNAME}
 
diff --git a/games/capitalism/Makefile b/games/capitalism/Makefile
index 01fa365..47542ff 100644
--- a/games/capitalism/Makefile
+++ b/games/capitalism/Makefile
@@ -22,9 +22,9 @@ LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
 
 WRKSRC=		${WRKDIR}/Capitalism-${PORTVERSION}
 
-USES=		iconv
+USES=		iconv qmake
 USE_XORG=	ice sm x11 xau xcb xdmcp xext xrender
-USE_QT4=	moc_build qmake_build rcc_build uic_build iconengines imageformats \
+USE_QT4=	moc_build rcc_build uic_build iconengines_run imageformats_run \
 		corelib gui network script xml
 
 PORTDOCS=	README changelog readme.txt
@@ -33,7 +33,7 @@ INSTALLS_ICONS=	yes
 ICON_SIZES=	16x16 22x22 24x24 32x32 48x48 64x64
 
 DESKTOP_ENTRIES="Capitalism" "${COMMENT}" "${PORTNAME}" \
-		"${PORTNAME}" "Game;BoardGame;" false
+		"${PORTNAME}" "Game;BoardGame;" true
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
@@ -43,13 +43,6 @@ NLS_USES=	gettext
 
 .include <bsd.port.options.mk>
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-	${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
-
-post-configure:
-	@${REINPLACE_CMD} -e 's|-O2 -pthread||g' ${WRKSRC}/Makefile
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Capitalism ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
diff --git a/games/connectagram/Makefile b/games/connectagram/Makefile
index bee51d5..70cdf36 100644
--- a/games/connectagram/Makefile
+++ b/games/connectagram/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Word unscrambling game
 LICENSE=	GPLv3
 
 USE_BZIP2=	yes
-USES=		desktop-file-utils
-USE_QT4=	moc_build qmake_build rcc_build gui network iconengines \
-		imageformats
+USES=		desktop-file-utils qmake
+USE_QT4=	moc_build rcc_build gui network iconengines_run \
+		imageformats_run
 INSTALLS_ICONS=	yes
 
 PORTDOCS=	CREDITS ChangeLog
@@ -23,10 +23,6 @@ PORTDOCS=	CREDITS ChangeLog
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
-
 post-install:
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} data ${DATADIR})
 	@(cd ${WRKSRC}/icons && ${COPYTREE_SHARE} patterns ${DATADIR})
diff --git a/games/cutemaze/Makefile b/games/cutemaze/Makefile
index 5b1c0b7..8969da5 100644
--- a/games/cutemaze/Makefile
+++ b/games/cutemaze/Makefile
@@ -14,8 +14,9 @@ LICENSE=	GPLv3
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
+USES=		qmake
 USE_BZIP2=	yes
-USE_QT4=	moc_build qmake_build rcc_build uic_build iconengines imageformats
+USE_QT4=	moc_build rcc_build uic_build iconengines_run imageformats_run
 INSTALLS_ICONS=	yes
 
 PORTDOCS=	ChangeLog README
@@ -23,10 +24,6 @@ PORTDOCS=	ChangeLog README
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} ${WRKSRC}/${PORTNAME}.pro
-
 post-install:
 # Icons
 	@(cd ${WRKSRC}/icons && ${COPYTREE_SHARE} oxygen ${PREFIX}/share/icons/)
diff --git a/games/gottet/Makefile b/games/gottet/Makefile
index 2c33546..739ef98 100644
--- a/games/gottet/Makefile
+++ b/games/gottet/Makefile
@@ -12,8 +12,9 @@ COMMENT=	Tetris clone
 
 LICENSE=	GPLv3
 
+USES=		qmake
 USE_BZIP2=	yes
-USE_QT4=	moc_build qmake_build rcc_build iconengines imageformats
+USE_QT4=	moc_build rcc_build iconengines_run imageformats_run
 INSTALLS_ICONS=	yes
 
 PORTDOCS=	CREDITS ChangeLog
@@ -21,14 +22,6 @@ PORTDOCS=	CREDITS ChangeLog
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
-
-post-configure:
-	@${REINPLACE_CMD} 's|-O2 -Wall|-Wall|g' \
-		${WRKSRC}/Makefile
-
 post-install:
 	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/
 
diff --git a/games/jag/Makefile b/games/jag/Makefile
index 74696ab..a5fc517 100644
--- a/games/jag/Makefile
+++ b/games/jag/Makefile
@@ -19,9 +19,8 @@ USE_SDL=	sdl mixer
 USE_DOS2UNIX=	Game.pro
 USE_XORG=	x11
 
-MAKE_ARGS+=	INSTALL_ROOT="${STAGEDIR}"
-
-USE_QT4=	qmake_build uic_build moc_build rcc_build \
+USES=		qmake
+USE_QT4=	uic_build moc_build rcc_build \
 		corelib svg xml opengl network
 
 PLIST_FILES=	bin/${PORTNAME}
@@ -32,10 +31,6 @@ post-patch:
 		${WRKSRC}/main.cpp ${WRKSRC}/Game.pro
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/Game.pro
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} Game.pro
-
 post-install:
 	cd ${WRKDIR}/${DISTNAME:C/src/data/} && ${COPYTREE_SHARE} data ${STAGEDIR}${DATADIR}/
 
diff --git a/games/peg-e/Makefile b/games/peg-e/Makefile
index 183ddaf..65c3fb1 100644
--- a/games/peg-e/Makefile
+++ b/games/peg-e/Makefile
@@ -11,15 +11,11 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Peg elimination game
 
+USES=		qmake
 USE_BZIP2=	yes
-USE_QT4=	corelib gui moc_build qmake_build rcc_build
+USE_QT4=	corelib gui moc_build rcc_build
 INSTALLS_ICONS=	yes
-DESTDIRNAME=	INSTALL_ROOT
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS} \
-		PREFIX=${PREFIX} ${PORTNAME}.pro
-
 .include <bsd.port.mk>
diff --git a/games/qnetwalk/Makefile b/games/qnetwalk/Makefile
index 7a8b526..8f0dd7b 100644
--- a/games/qnetwalk/Makefile
+++ b/games/qnetwalk/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Qt-version of the NetWalk game
 
 LICENSE=	GPLv2
 
-USE_QT4=	corelib gui qmake_build moc_build rcc_build
+USES=		qmake
+USE_QT4=	corelib gui moc_build rcc_build
 USE_SDL=	mixer
-DESTDIRNAME=	INSTALL_ROOT
 
 PORTDOCS=	ChangeLog README
 
@@ -26,10 +26,6 @@ post-patch:
 		s|/usr/share|$$$${PREFIX}/share|; \
 		/INSTALLS.*menu/ d' ${WRKSRC}/${PORTNAME}.pro
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/
diff --git a/games/simsu/Makefile b/games/simsu/Makefile
index dde8aac..68c5217 100644
--- a/games/simsu/Makefile
+++ b/games/simsu/Makefile
@@ -13,8 +13,9 @@ COMMENT=	Basic Sudoku game
 
 LICENSE=	GPLv3
 
+USES=		qmake
 USE_BZIP2=	yes
-USE_QT4=	moc_build qmake_build rcc_build uic_build iconengines imageformats
+USE_QT4=	moc_build rcc_build uic_build iconengines_run imageformats_run
 INSTALLS_ICONS=	yes
 
 PORTDOCS=	CREDITS ChangeLog
@@ -22,10 +23,6 @@ PORTDOCS=	CREDITS ChangeLog
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
-
 post-install:
 	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/
 
diff --git a/games/tanglet/Makefile b/games/tanglet/Makefile
index fe7baa9..902ca04 100644
--- a/games/tanglet/Makefile
+++ b/games/tanglet/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Single player word finding game based on Boggle
 LICENSE=	GPLv3
 
 USE_BZIP2=	yes
-USES=		desktop-file-utils
-USE_QT4=	moc_build qmake_build rcc_build gui iconengines imageformats
-QMAKEFLAGS=	QMAKE_LFLAGS="-lz"
+USES=		desktop-file-utils qmake
+USE_QT4=	moc_build rcc_build gui iconengines_run imageformats_run
+LDFLAGS+=	-lz
 INSTALLS_ICONS=	yes
 
 PORTDOCS=	CREDITS ChangeLog NEWS
@@ -28,10 +28,6 @@ post-patch:
 	@${REINPLACE_CMD} -i '' -e '/PKGCONFIG += zlib/d' \
 		${WRKSRC}/tanglet.pro
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
-
 post-install:
 	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/
 
diff --git a/games/tbe/Makefile b/games/tbe/Makefile
index 08656f7..74f3e6a 100644
--- a/games/tbe/Makefile
+++ b/games/tbe/Makefile
@@ -13,8 +13,9 @@ COMMENT=	The Butterfly Effect
 BUILD_DEPENDS=	${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo
 
+USES=		qmake
 USE_GMAKE=	yes
-USE_QT4=	qmake_build corelib gui moc_build rcc_build svg uic_build xml
+USE_QT4=	corelib gui moc_build rcc_build svg uic_build xml
 WRKSRC=		${WRKDIR}/TheButterflyEffect-M${PORTVERSION}rc3
 
 PLIST_FILES=	bin/tbe
@@ -34,10 +35,9 @@ post-patch:
 		@${REINPLACE_CMD} -e '/ensure that no-one tries to build/,$$d' \
 			${WRKSRC}/tbe.pro
 
-pre-build:
+pre-configure:
 		# This is supposedly done by the ./configure script
 		@cd ${WRKSRC}/3rdParty && ${GMAKE}
-		@cd ${WRKSRC} && ${QMAKE} ${QMAKEFLAGS}
 
 do-install:
 		@${MKDIR} ${PREFIX}/bin
diff --git a/security/tpmmanager/Makefile b/security/tpmmanager/Makefile
index 87970d3..31a619d 100644
--- a/security/tpmmanager/Makefile
+++ b/security/tpmmanager/Makefile
@@ -13,20 +13,14 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libtspi.so:${PORTSDIR}/security/trousers
 
-QT_NONSTANDARD=	YES
-USE_QT4=	gui moc_build qmake_build rcc_build uic_build
-
-HAS_CONFIGURE=	YES
+USES=		qmake
+USE_QT4=	gui moc_build rcc_build uic_build
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} PREFIX=${PREFIX} tpmmanager.pro
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/pcbsd-utils-qt4/Makefile b/sysutils/pcbsd-utils-qt4/Makefile
index 73f8bbd..80dfeed 100644
--- a/sysutils/pcbsd-utils-qt4/Makefile
+++ b/sysutils/pcbsd-utils-qt4/Makefile
@@ -8,33 +8,23 @@ MASTER_SITES=	http://www.pcbsd.org/~kris/software/ \
 		ftp://ftp.pcbsd.org/pub/software/
 
 MAINTAINER=	kmoore@FreeBSD.org
-COMMENT=	PC-BSD QT4 Utilities
+COMMENT=	PC-BSD Qt 4 Utilities
 
 RUN_DEPENDS=	pc-metapkgmanager:${PORTSDIR}/sysutils/pcbsd-utils
-LIB_DEPENDS=	QtSolutions_SingleApplication-head.1:${PORTSDIR}/devel/qt4-qtsolutions-singleapplication \
-		curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libQtSolutions_SingleApplication-head.so:${PORTSDIR}/devel/qt4-qtsolutions-singleapplication \
+		libcurl.so:${PORTSDIR}/ftp/curl
 
 MAKE_JOBS_UNSAFE=yes
 USE_CDRTOOLS=	yes
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
-USE_QT4=	accessible \
-		clucene codecs-cn codecs-jp codecs-kr codecs-tw corelib \
-		dbus declarative \
-		graphicssystems-opengl gui help help-tools \
-		iconengines imageformats inputmethods \
-		linguist l10n makeqpf moc multimedia network opengl \
-		pixeltool porting phonon phonon-gst \
-		qdbusviewer qmlviewer qmake qtconfig qtestlib \
-		qvfb rcc script scripttools \
-		svg uic uic3 \
-		xml xmlpatterns xmlpatterns-tool
+USE_QT4=	corelib gui network svg \
+		moc_build rcc_build uic_build
+USES=		qmake
 
 WRKSRC=		${WRKDIR}/src-qt4
-HAS_CONFIGURE=	yes
 
-QMAKE_PRO=	src-qt4.pro
-QMAKE_ARGS=	-recursive ${QMAKE_PRO}
+QMAKE_ARGS+=	CONFIG+="configure"
 
 .include <bsd.port.pre.mk>
 
@@ -42,11 +32,4 @@ QMAKE_ARGS=	-recursive ${QMAKE_PRO}
 IGNORE=		requires FreeBSD 9.0 or later
 .endif
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} PREFIX=${PREFIX} -unix CONFIG+="configure" ${QMAKE_PRO}
-
-do-install:
-	cd ${WRKSRC} && make install INSTALL_ROOT=${STAGEDIR}
-
 .include <bsd.port.post.mk>