30 files changed, 30 insertions, 60 deletions

diff --git a/games/allacrost/Makefile b/games/allacrost/Makefile
index 4a41a3ac6149..0dda1093fbce 100644
--- a/games/allacrost/Makefile
+++ b/games/allacrost/Makefile
@@ -46,9 +46,8 @@ OPTIONS=	EDITOR "Enable editor" off
 .include <bsd.port.options.mk>
 
 .if defined(WITH_EDITOR)
-USE_QT_VER=	4
 QT_NONSTANDARD=	yes
-QT_COMPONENTS+=	corelib gui opengl moc_build qt3support
+USE_QT4+=	corelib gui opengl moc_build qt3support
 CONFIGURE_ARGS+=--enable-editor=yes
 PLIST_SUB=	EDITOR=""
 .else
diff --git a/games/anki/Makefile.inc b/games/anki/Makefile.inc
index 5d6d099b4626..d82e5f215616 100644
--- a/games/anki/Makefile.inc
+++ b/games/anki/Makefile.inc
@@ -24,8 +24,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		py*-network>=4.4:${PORTSDIR}/net/py-qt4-network \
 		py*-webkit>=4.4:${PORTSDIR}/www/py-qt4-webkit
 
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui
+USE_QT4=	corelib gui
 PYDISTUTILS_PKGNAME=	ankiqt
 
 PORT_VERBS=	ankiqt
diff --git a/games/arx-libertatis/Makefile b/games/arx-libertatis/Makefile
index 0cf15e6f4652..ed6d7690d71a 100644
--- a/games/arx-libertatis/Makefile
+++ b/games/arx-libertatis/Makefile
@@ -39,8 +39,7 @@ OPTIONS=	CRASHREPORTER "Build crash reporter (requires Qt4)" off
 .include <bsd.port.options.mk>
 
 .if defined(WITH_CRASHREPORTER)
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui network rcc_build moc_build uic_build qmake_build
+USE_QT4=	corelib gui network rcc_build moc_build uic_build qmake_build
 CMAKE_ARGS+=	-DBUILD_CRASHREPORTER=ON
 PLIST_SUB+=	CRASHREPORTER=""
 .else
diff --git a/games/blinken/Makefile b/games/blinken/Makefile
index 70921583fc6c..7ea4c8a5c008 100644
--- a/games/blinken/Makefile
+++ b/games/blinken/Makefile
@@ -20,8 +20,7 @@ CONFLICTS=	kdeedu-4.[0-6].*
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib moc_build qmake_build rcc_build uic_build
+USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/games/bubble-chains/Makefile b/games/bubble-chains/Makefile
index 50b04fc21541..943863503e44 100644
--- a/games/bubble-chains/Makefile
+++ b/games/bubble-chains/Makefile
@@ -26,8 +26,7 @@ WRKSRC=		${WRKDIR}/chains-${PORTVERSION}-src
 USE_SDL=	sdl image mixer
 USE_GL=		glut glew glu
 USE_XORG=	xrandr
-USE_QT_VER=	4
-QT_COMPONENTS=	moc_build qmake_build rcc_build uic_build iconengines imageformats \
+USE_QT4=	moc_build qmake_build rcc_build uic_build iconengines imageformats \
 		corelib svg xml opengl network
 
 MAKE_JOBS_SAFE=	yes
diff --git a/games/colorcode/Makefile b/games/colorcode/Makefile
index ebd621cedae9..bcd6688f792b 100644
--- a/games/colorcode/Makefile
+++ b/games/colorcode/Makefile
@@ -15,8 +15,7 @@ DISTNAME=	ColorCode-${PORTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	A free advanced MasterMind game and solver
 
-USE_QT_VER=	4
-QT_COMPONENTS=	gui moc_build qmake_build rcc_build uic_build
+USE_QT4=	gui moc_build qmake_build rcc_build uic_build
 HAS_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/ColorCode-${PORTVERSION}
 
diff --git a/games/cutemaze/Makefile b/games/cutemaze/Makefile
index 876c206d75fc..1f9a4db66ec1 100644
--- a/games/cutemaze/Makefile
+++ b/games/cutemaze/Makefile
@@ -18,8 +18,7 @@ COMMENT=	Is a simple, top-down game in which mazes are randomly generated
 LICENSE=	GPLv3
 
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	moc_build qmake_build rcc_build uic_build iconengines imageformats
+USE_QT4=	moc_build qmake_build rcc_build uic_build iconengines imageformats
 INSTALLS_ICONS=	yes
 
 MAKE_JOBS_SAFE=	yes
diff --git a/games/djgame2/Makefile b/games/djgame2/Makefile
index a09d1d02460e..a27fc85fea15 100644
--- a/games/djgame2/Makefile
+++ b/games/djgame2/Makefile
@@ -18,8 +18,7 @@ COMMENT=	bluedj contains many popular online games
 
 NO_BUILD=	yes
 USE_ZIP=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui qt3support qmake_build uic_build rcc_build moc_build svg
+USE_QT4=	gui qt3support qmake_build uic_build rcc_build moc_build svg
 
 QMAKE?=		qmake-qt4
 QMAKESPEC?=	${LOCALBASE}/share/qt4/mkspecs/freebsd-g++
diff --git a/games/hedgewars/Makefile b/games/hedgewars/Makefile
index 2c767e6e73f4..e08433825044 100644
--- a/games/hedgewars/Makefile
+++ b/games/hedgewars/Makefile
@@ -23,9 +23,8 @@ USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_SDL=	sdl mixer image ttf net
 USE_FPC=	opengl
-USE_QT_VER=	4
 USE_LUA=	5.1+
-QT_COMPONENTS=	corelib gui moc_build network \
+USE_QT4=	corelib gui moc_build network \
 		qmake_build rcc_build svg xml \
 		uic_build linguist_build
 MAKE_JOBS_SAFE=	yes
diff --git a/games/hexalate/Makefile b/games/hexalate/Makefile
index 83da773d3f29..11aae684b5d3 100644
--- a/games/hexalate/Makefile
+++ b/games/hexalate/Makefile
@@ -17,8 +17,7 @@ MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	A color matching game
 
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui moc_build qmake_build rcc_build
+USE_QT4=	corelib gui moc_build qmake_build rcc_build
 WANT_GNOME=	yes
 INSTALLS_ICONS=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/games/hexglass/Makefile b/games/hexglass/Makefile
index 3b34e4bc9ac9..387781a3d9f5 100644
--- a/games/hexglass/Makefile
+++ b/games/hexglass/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Tetris-like puzzle game based on a hexagonal grid
 
-USE_QT_VER=	4
-QT_COMPONENTS=	gui qmake_build moc_build rcc_build
+USE_QT4=	gui qmake_build moc_build rcc_build
 HAS_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/games/jag/Makefile b/games/jag/Makefile
index bf8e3c20d406..1ba06cf10f2e 100644
--- a/games/jag/Makefile
+++ b/games/jag/Makefile
@@ -21,8 +21,7 @@ COMMENT=	2d arcade-puzzle game like KDiamonds
 USE_ZIP=	yes
 USE_SDL=	sdl mixer
 
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build uic_build moc_build rcc_build \
+USE_QT4=	qmake_build uic_build moc_build rcc_build \
 		corelib svg xml opengl network
 MAKE_JOBS_SAFE=	yes
 
diff --git a/games/kajongg/Makefile b/games/kajongg/Makefile
index 52f186af2694..df3705ecc98e 100644
--- a/games/kajongg/Makefile
+++ b/games/kajongg/Makefile
@@ -24,8 +24,7 @@ CONFLICTS=	kdegames-4.[0-6].*
 USE_KDE4=	kdehier kdelibs kdeprefix pykde4 automoc4
 KDE4_BUILDENV=	yes
 USE_PYTHON=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	moc_build qmake_build rcc_build uic_build
+USE_QT4=	moc_build qmake_build rcc_build uic_build
 USE_SQLITE=	3
 USE_TWISTED_RUN=	yes
 DISTINFO_FILE=	${PORTSDIR}/games/kdegames4/distinfo
diff --git a/games/kanagram/Makefile b/games/kanagram/Makefile
index 920faaad84fd..13db862c4144 100644
--- a/games/kanagram/Makefile
+++ b/games/kanagram/Makefile
@@ -20,8 +20,7 @@ CONFLICTS=	kdeedu-4.[0-6].*
 
 USE_KDE4=	kdehier kdelibs kdeprefix libkdeedu automoc4
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	xml moc_build qmake_build rcc_build uic_build
+USE_QT4=	xml moc_build qmake_build rcc_build uic_build
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/games/kardsgt/Makefile b/games/kardsgt/Makefile
index 680c3c58a93e..94a7b261612b 100644
--- a/games/kardsgt/Makefile
+++ b/games/kardsgt/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES=	SAVANNAH
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Card game suite
 
-USE_QT_VER=	4
-QT_COMPONENTS=	assistantclient corelib gui network \
+USE_QT4=	assistantclient corelib gui network \
 		moc_build qmake_build rcc_build uic_build
 ALL_TARGET=	qmake release
 MAKE_JOBS_UNSAFE=	yes
diff --git a/games/kcheckers/Makefile b/games/kcheckers/Makefile
index 16c4109c4849..a4cbb8009222 100644
--- a/games/kcheckers/Makefile
+++ b/games/kcheckers/Makefile
@@ -13,8 +13,7 @@ MASTER_SITES=	SF/qcheckers/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Qt version of the classic boardgame checkers
 
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui qmake_build moc_build rcc_build
+USE_QT4=	corelib gui qmake_build moc_build rcc_build
 MAKE_ENV=	QTDIR="${QT_PREFIX}"
 
 post-patch:
diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile
index 820d2dc58637..49195949a010 100644
--- a/games/kdegames4/Makefile
+++ b/games/kdegames4/Makefile
@@ -26,8 +26,7 @@ USE_GL=		glu
 USE_KDE4=	kdehier kdelibs kdeprefix sharedmime automoc4
 KDE4_BUILDENV=	yes
 USE_OPENAL=	al
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus gui network opengl qt3support script svg xml \
+USE_QT4=	dbus gui network opengl qt3support script svg xml \
 		moc_build qmake_build rcc_build uic_build
 USE_XZ=		yes
 CMAKE_ARGS+=	-DBUILD_kajongg:BOOL=FALSE
diff --git a/games/khangman/Makefile b/games/khangman/Makefile
index 8e7980fdb9e9..5189580b6761 100644
--- a/games/khangman/Makefile
+++ b/games/khangman/Makefile
@@ -20,8 +20,7 @@ CONFLICTS=	kdeedu-4.[0-6].*
 
 USE_KDE4=	kdehier kdelibs kdeprefix libkdeedu automoc4
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	moc_build qmake_build rcc_build uic_build
+USE_QT4=	moc_build qmake_build rcc_build uic_build
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/games/kmancala/Makefile b/games/kmancala/Makefile
index df415b1f441e..6df8f890cb6b 100644
--- a/games/kmancala/Makefile
+++ b/games/kmancala/Makefile
@@ -21,7 +21,6 @@ LIB_DEPENDS=	kdegames.5:${PORTSDIR}/games/kdegames4
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_KDE4=	kdelibs kdeprefix automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	moc_build qmake_build rcc_build uic_build
+USE_QT4=	moc_build qmake_build rcc_build uic_build
 
 .include <bsd.port.mk>
diff --git a/games/knights-kde4/Makefile b/games/knights-kde4/Makefile
index 15531ebdfdfa..bc5f21026466 100644
--- a/games/knights-kde4/Makefile
+++ b/games/knights-kde4/Makefile
@@ -21,7 +21,6 @@ LATEST_LINK=	${PORTNAME}-kde4
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_KDE4=	kdelibs kdehier kdeprefix automoc4 workspace
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build
+USE_QT4=	qmake_build moc_build rcc_build uic_build
 
 .include <bsd.port.mk>
diff --git a/games/openpref/Makefile b/games/openpref/Makefile
index 825c939a5884..ef1ac05349b5 100644
--- a/games/openpref/Makefile
+++ b/games/openpref/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES=	SF/${PORTNAME}/OpenPref-Qt4/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	annulen@yandex.ru
 COMMENT=	Preferans game
 
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui qmake_build moc_build rcc_build uic_build
+USE_QT4=	corelib gui qmake_build moc_build rcc_build uic_build
 HAS_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/games/peg-e/Makefile b/games/peg-e/Makefile
index 49d063c7b6a1..1ea907d64754 100644
--- a/games/peg-e/Makefile
+++ b/games/peg-e/Makefile
@@ -17,8 +17,7 @@ MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Peg elimination game
 
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui moc_build qmake_build rcc_build
+USE_QT4=	corelib gui moc_build qmake_build rcc_build
 WANT_GNOME=	yes
 INSTALLS_ICONS=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/games/pokerth/Makefile b/games/pokerth/Makefile
index 50d96234cc08..6da474ed8d8c 100644
--- a/games/pokerth/Makefile
+++ b/games/pokerth/Makefile
@@ -30,8 +30,7 @@ USE_ICONV=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui corelib network sql sql-sqlite3 qmake_build \
+USE_QT4=	gui corelib network sql sql-sqlite3 qmake_build \
 		moc_build rcc_build uic_build
 USE_SDL=	mixer
 HAS_CONFIGURE=	yes
diff --git a/games/qnetwalk/Makefile b/games/qnetwalk/Makefile
index 1f33083f2351..85a4da8ee072 100644
--- a/games/qnetwalk/Makefile
+++ b/games/qnetwalk/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES=	http://qt.osdn.org.ua/ \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Qt-version of the NetWalk game
 
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui qmake_build moc_build rcc_build
+USE_QT4=	corelib gui qmake_build moc_build rcc_build
 MAKE_JOBS_SAFE=	yes
 
 MAN6=		qnetwalk.6
diff --git a/games/quackle/Makefile b/games/quackle/Makefile
index 39390eec9ddb..9676f78c0799 100644
--- a/games/quackle/Makefile
+++ b/games/quackle/Makefile
@@ -22,8 +22,7 @@ LICENSE_COMB=	dual
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 BUILD_WRKSRC=	${WRKSRC}/quacker
 
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui moc_build qmake_build
+USE_QT4=	corelib gui moc_build qmake_build
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/games/simsu/Makefile b/games/simsu/Makefile
index a466ae349f29..3d2fdcb6eecb 100644
--- a/games/simsu/Makefile
+++ b/games/simsu/Makefile
@@ -16,8 +16,7 @@ COMMENT=	Simsu is a basic Sudoku game
 
 LICENSE=	GPLv3
 
-USE_QT_VER=	4
-QT_COMPONENTS=	moc_build qmake_build rcc_build uic_build iconengines imageformats
+USE_QT4=	moc_build qmake_build rcc_build uic_build iconengines imageformats
 
 INSTALLS_ICONS=	yes
 HAS_CONFIGURE=	yes
diff --git a/games/spellathon/Makefile b/games/spellathon/Makefile
index aa02fed411cb..bcf00e2714e3 100644
--- a/games/spellathon/Makefile
+++ b/games/spellathon/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES=	SF
 MAINTAINER=	girish.rao.dev@gmail.com
 COMMENT=	Word game to test your English vocabulary skills
 
-USE_QT_VER=	4
-QT_COMPONENTS=	gui moc_build qmake_build rcc_build uic_build
+USE_QT4=	gui moc_build qmake_build rcc_build uic_build
 
 post-patch:
 	@${REINPLACE_CMD} 's|qmake|qmake-qt4|' ${WRKSRC}/Makefile
diff --git a/games/tanglet/Makefile b/games/tanglet/Makefile
index 498037e944a6..7fcc0fe499fb 100644
--- a/games/tanglet/Makefile
+++ b/games/tanglet/Makefile
@@ -17,8 +17,7 @@ COMMENT=	Tanglet is a single player word finding game based on Boggle
 LICENSE=	GPLv3
 
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	moc_build qmake_build rcc_build corelib gui iconengines imageformats
+USE_QT4=	moc_build qmake_build rcc_build corelib gui iconengines imageformats
 INSTALLS_ICONS=	yes
 
 MAKE_JOBS_SAFE=	yes
diff --git a/games/tbe/Makefile b/games/tbe/Makefile
index 19f1d6a18e2c..131d5e4c18b0 100644
--- a/games/tbe/Makefile
+++ b/games/tbe/Makefile
@@ -19,8 +19,7 @@ COMMENT=	The Butterfly Effect
 BUILD_DEPENDS=	${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
 
 USE_GMAKE=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build corelib gui moc_build rcc_build svg uic_build xml
+USE_QT4=	qmake_build corelib gui moc_build rcc_build svg uic_build xml
 MAKE_JOBS_SAFE=	yes
 WRKSRC=		${WRKDIR}/TheButterflyEffect-m${PORTVERSION}
 
diff --git a/games/tetzle/Makefile b/games/tetzle/Makefile
index 38184a79b7d5..5f3a143ca8f9 100644
--- a/games/tetzle/Makefile
+++ b/games/tetzle/Makefile
@@ -17,8 +17,7 @@ MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Jigsaw puzzle with tetrominoes
 
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui moc_build opengl qmake_build rcc_build xml
+USE_QT4=	corelib gui moc_build opengl qmake_build rcc_build xml
 WANT_GNOME=	yes
 INSTALLS_ICONS=	yes
 MAKE_JOBS_SAFE=	yes