13 files changed, 13 insertions, 26 deletions

diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile
index 6f749e967cd0..cc7258890184 100644
--- a/security/fwbuilder-devel/Makefile
+++ b/security/fwbuilder-devel/Makefile
@@ -34,8 +34,7 @@ LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt \
 		netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
 
 PLIST_SUB=	BUILD_VERSION=${DISTVERSION}.${BUILD}
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib \
+USE_QT4=	corelib \
 		gui \
 		iconengines \
 		inputmethods \
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 3f9f39e523e0..88948815900a 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -35,8 +35,7 @@ LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt \
 		netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
 
 PLIST_SUB=	BUILD_VERSION=${DISTVERSION}.${BUILD}
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib \
+USE_QT4=	corelib \
 		gui \
 		iconengines \
 		inputmethods \
diff --git a/security/keepassx/Makefile b/security/keepassx/Makefile
index d193afe74dbe..7ecefb290676 100644
--- a/security/keepassx/Makefile
+++ b/security/keepassx/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
 DATADIR=	${PREFIX}/share/${PORTNAME:L}
 WRKSRC=		${WRKDIR}/${PORTNAME:L}-${PORTVERSION}
 
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build uic_build qt3support_build rcc_build \
+USE_QT4=	qmake_build moc_build uic_build qt3support_build rcc_build \
 		corelib gui xml
 HAS_CONFIGURE=	yes
 USE_XORG=	xt inputproto xtst xrender xrandr xfixes xcursor\
diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index c32d9ee40aef..f1fc41734607 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@@ -22,8 +22,7 @@ LATEST_LINK=	${PORTNAME}4
 USE_XZ=	yes
 USE_KDE4=	kdeprefix kdehier automoc4 kdelibs pimlibs
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build
+USE_QT4=	qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.mk>
diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile
index da6ee8c8674e..0c4f0ca283cf 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/Makefile
@@ -19,8 +19,7 @@ CONFLICTS_INSTALL=	kdeutils-4.[0-7].*
 USE_XZ=	yes
 USE_KDE4=	kdeprefix kdehier automoc4 kdelibs
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build
+USE_QT4=	qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.mk>
diff --git a/security/nmapsi4/Makefile b/security/nmapsi4/Makefile
index 44dc5b8f70a6..a62142e09c7f 100644
--- a/security/nmapsi4/Makefile
+++ b/security/nmapsi4/Makefile
@@ -21,8 +21,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap
 USE_CMAKE=	yes
 USE_BZIP2=	yes
 INSTALLS_ICONS=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui xml qmake_build uic_build moc_build rcc_build network \
+USE_QT4=	gui xml qmake_build uic_build moc_build rcc_build network \
 		linguist webkit dbus
 
 pre-configure:
diff --git a/security/ophcrack/Makefile b/security/ophcrack/Makefile
index f89a8f5a8e75..8f7431ae2002 100644
--- a/security/ophcrack/Makefile
+++ b/security/ophcrack/Makefile
@@ -31,8 +31,7 @@ OPTIONS=	GUI	"Build GUI frontend (Qt4 based)"	on \
 .include <bsd.port.options.mk>
 
 .if defined(WITH_GUI) || defined(WITH_GRAPH)
-USE_QT_VER=	4
-QT_COMPONENTS=	moc_build qmake_build rcc_build uic_build corelib gui
+USE_QT4=	moc_build qmake_build rcc_build uic_build corelib gui
 .else
 CONFIGURE_ARGS+=	--disable-gui
 .endif
diff --git a/security/qca-cyrus-sasl/Makefile b/security/qca-cyrus-sasl/Makefile
index 795821cffc62..68951d8182a1 100644
--- a/security/qca-cyrus-sasl/Makefile
+++ b/security/qca-cyrus-sasl/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS=	qca.2:${PORTSDIR}/devel/qca \
 		sasl2:${PORTSDIR}/security/cyrus-sasl2
 
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib qmake_build moc_build
+USE_QT4=	corelib qmake_build moc_build
 HAS_CONFIGURE=	yes
 QT_NONSTANDARD=	yes
 CONFIGURE_ARGS+=--plugins-path=${PREFIX}/${QT_PLUGINDIR_REL} \
diff --git a/security/qca-gnupg/Makefile b/security/qca-gnupg/Makefile
index becc5a982ba3..a55d7fed43f3 100644
--- a/security/qca-gnupg/Makefile
+++ b/security/qca-gnupg/Makefile
@@ -17,8 +17,7 @@ COMMENT=	QCA GnuPG plugin
 LIB_DEPENDS=	qca.2:${PORTSDIR}/devel/qca
 
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib qmake_build moc_build
+USE_QT4=	corelib qmake_build moc_build
 HAS_CONFIGURE=	yes
 QT_NONSTANDARD=	yes
 CONFIGURE_ARGS+=--plugins-path=${PREFIX}/${QT_PLUGINDIR_REL}
diff --git a/security/qca-ossl/Makefile b/security/qca-ossl/Makefile
index 375a463482bf..cf4ea93a9223 100644
--- a/security/qca-ossl/Makefile
+++ b/security/qca-ossl/Makefile
@@ -16,8 +16,7 @@ COMMENT=	QCA OpenSLL plugin
 LIB_DEPENDS=	qca.2:${PORTSDIR}/devel/qca
 
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib qmake_build moc_build
+USE_QT4=	corelib qmake_build moc_build
 HAS_CONFIGURE=	yes
 QT_NONSTANDARD=	yes
 USE_OPENSSL=	yes
diff --git a/security/quantis/Makefile b/security/quantis/Makefile
index 3f1be19b99c7..9107b4828747 100644
--- a/security/quantis/Makefile
+++ b/security/quantis/Makefile
@@ -31,7 +31,6 @@ LICENSE_FILE=	${WRKSRC}/Quantis-${DISTVERSION}/License.txt
 USE_ZIP=	yes
 EXTRACT_BEFORE_ARGS=	-aqo
 USE_CMAKE=	yes
-USE_QT_VER=	4
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/Quantis-${DISTVERSION}/Libs-Apps
@@ -78,7 +77,7 @@ BUILD_DEPENDS+=	${LOCALBASE}/lib/libboost_date_time.a:${PORTSDIR}/devel/boost-li
 CXXFLAGS+=	-I${LOCALBASE}/include
 
 . if defined(WITH_GUI)
-QT_COMPONENTS+=	gui moc_build uic_build rcc_build qmake_build
+USE_QT4+=	gui moc_build uic_build rcc_build qmake_build
 . else
 CMAKE_ARGS+=	-DDISABLE_EASYQUANTIS_GUI=1
 . endif
diff --git a/security/tpmmanager/Makefile b/security/tpmmanager/Makefile
index c22611ec727c..5e5b925f8c74 100644
--- a/security/tpmmanager/Makefile
+++ b/security/tpmmanager/Makefile
@@ -19,9 +19,8 @@ LIB_DEPENDS=		tspi.2:${PORTSDIR}/security/trousers
 LICENSE=		GPLv2
 LICENSE_FILE=		${WRKSRC}/COPYING
 
-USE_QT_VER=		4
 QT_NONSTANDARD=		YES
-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
 MAKE_JOBS_SAFE=		YES
diff --git a/security/xca/Makefile b/security/xca/Makefile
index c8d28e526f06..2f71ee3b2c93 100644
--- a/security/xca/Makefile
+++ b/security/xca/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
 
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui moc_build uic_build qmake_build rcc_build linguist_build
+USE_QT4=	gui moc_build uic_build qmake_build rcc_build linguist_build
 USE_AUTOTOOLS=	libltdl
 CC?=		gcc
 CXX?=		g++