10 files changed, 16 insertions, 26 deletions

diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index 1dddca1c4e95..41624c732b6e 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -183,8 +183,7 @@ CONFIGURE_ENV+=		ac_cv_path_KDE4_CONFIG=${KDE4_PREFIX}/bin/kde4-config \
 			UPDATE_MIME_DATABASE=/usr/bin/true
 CONFIGURE_ARGS+=	--enable-plasmamule
 USE_KDE4=		kdelibs
-USE_QT_VER=		4
-QT_COMPONENTS+=		dbus gui moc_build
+USE_QT4=		dbus gui moc_build
 PLIST_SUB+=		PLASMAMULE=""
 .else
 CONFIGURE_ARGS+=	--disable-plasmamule
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index abc33c5c1535..cd2b9ae1342f 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -173,8 +173,7 @@ CONFIGURE_ENV+=		ac_cv_path_KDE4_CONFIG=${KDE4_PREFIX}/bin/kde4-config \
 			UPDATE_MIME_DATABASE=/usr/bin/true
 CONFIGURE_ARGS+=	--enable-plasmamule
 USE_KDE4=		kdelibs
-USE_QT_VER=		4
-QT_COMPONENTS+=		dbus gui moc_build
+USE_QT4+=		dbus gui moc_build
 PLIST_SUB+=		PLASMAMULE=""
 .else
 CONFIGURE_ARGS+=	--disable-plasmamule
diff --git a/net-p2p/eiskaltdcpp-qt/Makefile b/net-p2p/eiskaltdcpp-qt/Makefile
index ef7d0a15ca89..c37850f0d63e 100644
--- a/net-p2p/eiskaltdcpp-qt/Makefile
+++ b/net-p2p/eiskaltdcpp-qt/Makefile
@@ -45,8 +45,7 @@ OPTIONS=	ASPELL		"Build with aspell support" off \
 		SQLITE	"SQLite support (experimental)" off \
 		MINIUPNP	"UPnP support"	on
 
-USE_QT_VER=	4
-QT_COMPONENTS=	gui xml network qmake_build uic_build \
+USE_QT4=	gui xml network qmake_build uic_build \
 		moc_build rcc_build linguist_build
 CMAKE_ARGS+=	-DUSE_QT:BOOL=ON
 CMAKE_ARGS+=	-DUSE_GTK:BOOL=OFF
@@ -75,14 +74,14 @@ CMAKE_ARGS+=	-DFREE_SPACE_BAR_C:BOOL=OFF
 
 .if defined(WITH_DBUS_NOTIFY) && !defined(WITHOUT_DBUS)
 CMAKE_ARGS+=	-DDBUS_NOTIFY:BOOL=ON
-QT_COMPONENTS+=	dbus
+USE_QT4+=	dbus
 .else
 CMAKE_ARGS+=	-DDBUS_NOTIFY:BOOL=OFF
 .endif
 
 .if defined(WITH_QTSCRIPT)
 CMAKE_ARGS+=	-DUSE_JS:BOOL=ON
-QT_COMPONENTS+=	script
+USE_QT4+=	script
 RUN_DEPENDS+=	${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so:${PORTSDIR}/devel/qtscriptgenerator
 PLIST_SUB+=	QTSCRIPT=""
 .else
@@ -92,14 +91,14 @@ PLIST_SUB+=	QTSCRIPT="@comment "
 
 .if defined(WITH_QML)
 CMAKE_ARGS+=	-DUSE_QT_QML:BOOL=ON
-QT_COMPONENTS+=	declarative
+USE_QT4+=	declarative
 .else
 CMAKE_ARGS+=	-DUSE_QT_QML:BOOL=OFF
 .endif
 
 .if defined(WITH_SQLITE) && !defined(WITHOUT_SQLITE)
 CMAKE_ARGS+=	-DUSE_QT_SQLITE:BOOL=ON
-QT_COMPONENTS+=	sql-sqlite3
+USE_QT4+=	sql-sqlite3
 .else
 CMAKE_ARGS+=	-DUSE_QT_SQLITE:BOOL=OFF
 .endif
diff --git a/net-p2p/ktorrent/Makefile b/net-p2p/ktorrent/Makefile
index c6f94e690062..26a67cf60b33 100644
--- a/net-p2p/ktorrent/Makefile
+++ b/net-p2p/ktorrent/Makefile
@@ -19,8 +19,7 @@ LIB_DEPENDS=	tag.1:${PORTSDIR}/audio/taglib \
 
 USE_BZIP2=	yes
 USE_KDE4=	kdelibs kdehier kdeprefix automoc4 pimlibs 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
 USE_CMAKE=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
diff --git a/net-p2p/libktorrent/Makefile b/net-p2p/libktorrent/Makefile
index 9713b97440d1..6fb57daff341 100644
--- a/net-p2p/libktorrent/Makefile
+++ b/net-p2p/libktorrent/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp \
 
 USE_BZIP2=	yes
 USE_KDE4=	kdelibs kdehier kdeprefix automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build
+USE_QT4=	qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
diff --git a/net-p2p/qbittorrent-29/Makefile b/net-p2p/qbittorrent-29/Makefile
index 8d520507935c..feb4f3392f56 100644
--- a/net-p2p/qbittorrent-29/Makefile
+++ b/net-p2p/qbittorrent-29/Makefile
@@ -21,8 +21,7 @@ MAKE_JOBS_SAFE=	yes
 
 CONFLICTS=	qbittorrent-2.[2345678].* qbittorrent-3.[0-9].*
 
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib network qmake_build moc_build rcc_build
+USE_QT4=	corelib network qmake_build moc_build rcc_build
 
 .if !defined(QB29_NOX_SLAVE)
 .if defined(WITHOUT_X11)
@@ -30,7 +29,7 @@ BROKEN=	Use net-p2p/${PORTNAME}-nox11 for the non-GUI version
 .endif
 LIB_DEPENDS+=	GeoIP.5:${PORTSDIR}/net/GeoIP
 OPTIONS=	DBUS "Enable dbus support" off
-QT_COMPONENTS+=	gui xml uic_build
+USE_QT4+=	gui xml uic_build
 INSTALLS_ICONS=	yes
 .else
 CONFIGURE_ARGS+=	--disable-gui
@@ -44,7 +43,7 @@ MAN1?=		qbittorrent.1
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_DBUS)
-QT_COMPONENTS+=		dbus
+USE_QT4+=		dbus
 .else
 CONFIGURE_ARGS+=	--disable-qt-dbus
 .endif
diff --git a/net-p2p/retroshare/Makefile b/net-p2p/retroshare/Makefile
index 4e94ced2ba70..18c8e5eb49c6 100644
--- a/net-p2p/retroshare/Makefile
+++ b/net-p2p/retroshare/Makefile
@@ -25,8 +25,7 @@ LIB_DEPENDS=	gpgme.19:${PORTSDIR}/security/gpgme \
 RUN_DEPENDS+=	pinentry-qt4:${PORTSDIR}/security/pinentry-qt4
 
 WRKSRC=		${WRKDIR}/trunk
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui network xml script designer_build uic_build \
+USE_QT4=	corelib gui network xml script designer_build uic_build \
 		qmake_build moc_build rcc_build
 HAS_CONFIGURE=	yes
 BINARY=		RetroShare
diff --git a/net-p2p/sharktorrent/Makefile b/net-p2p/sharktorrent/Makefile
index 48e25e351b40..d5db30e76cb7 100644
--- a/net-p2p/sharktorrent/Makefile
+++ b/net-p2p/sharktorrent/Makefile
@@ -18,8 +18,7 @@ COMMENT=	C++ Bittorrent client using wxWidgets, libtorrent and boost
 LIB_DEPENDS=	boost_filesystem.4:${PORTSDIR}/devel/boost-libs \
 		torrent-rasterbar.5:${PORTSDIR}/net-p2p/libtorrent-rasterbar-14
 
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build corelib gui network
+USE_QT4=	qmake_build moc_build rcc_build corelib gui network
 MAKE_JOBS_SAFE=	yes
 
 PLIST_FILES=	bin/sharktorrent
diff --git a/net-p2p/transmission-qt4/Makefile b/net-p2p/transmission-qt4/Makefile
index 439bcb6f8daa..aa3e60c8735a 100644
--- a/net-p2p/transmission-qt4/Makefile
+++ b/net-p2p/transmission-qt4/Makefile
@@ -19,9 +19,8 @@ MASTERDIR=	${.CURDIR}/../transmission-cli
 PLIST=		${.CURDIR}/pkg-plist
 SLAVEPORT=	qt4
 
-USE_QT_VER=	4
 QT_NONSTANDARD=	yes
-QT_COMPONENTS=	moc_build qmake_build rcc_build uic_build gui dbus network
+USE_QT4=	moc_build qmake_build rcc_build uic_build gui dbus network
 USE_GNOME=	desktopfileutils
 
 EXTRA_CONF_ARGS=--disable-cli \
diff --git a/net-p2p/valknut/Makefile b/net-p2p/valknut/Makefile
index c0520567eddc..2000168e022f 100644
--- a/net-p2p/valknut/Makefile
+++ b/net-p2p/valknut/Makefile
@@ -23,8 +23,7 @@ WRKSRC=	${WRKDIR}/${DISTNAME}
 
 MAN1=	valknut.1
 
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui network qt3support \
+USE_QT4=	corelib gui network qt3support \
 		moc_build uic_build rcc_build linguist_build
 USE_BZIP2=	yes
 USE_GMAKE=	yes