- Convert USE_QT_VER=4 and QT_COMPONETS to USE_QT4

Review by:	bapt, David Naylor (kde team)

15 files changed, 15 insertions, 30 deletions

diff --git a/x11-themes/gtk-qt4-engine/Makefile b/x11-themes/gtk-qt4-engine/Makefile
index b93d45c1e97d..0bdd7c49b9cc 100644
--- a/x11-themes/gtk-qt4-engine/Makefile
+++ b/x11-themes/gtk-qt4-engine/Makefile
@@ -18,8 +18,7 @@ COMMENT=	GTK-QT Theme Engine allows GTK2 apps to use QT/KDE themes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
-USE_QT_VER=	4
-QT_COMPONENTS=	gui moc_build rcc_build uic_build qmake_build
+USE_QT4=	gui moc_build rcc_build uic_build qmake_build
 USE_CMAKE=	yes
 USE_KDE4=	kdebase kdeprefix automoc4
 
diff --git a/x11-themes/kde4-style-bespin/Makefile b/x11-themes/kde4-style-bespin/Makefile
index f8d3e6b47bb8..4a7cd8ebb6d4 100644
--- a/x11-themes/kde4-style-bespin/Makefile
+++ b/x11-themes/kde4-style-bespin/Makefile
@@ -19,8 +19,7 @@ IGNORE=		does not build with KDE SC 4.8
 
 WRKSRC=		${WRKDIR}/cloudcity
 USE_KDE4=	kdelibs kdehier kdeprefix automoc4 workspace
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib qmake_build moc_build rcc_build uic_build
+USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/kde4-style-nitrogen/Makefile b/x11-themes/kde4-style-nitrogen/Makefile
index abe0326475e0..b810cffed3ea 100644
--- a/x11-themes/kde4-style-nitrogen/Makefile
+++ b/x11-themes/kde4-style-nitrogen/Makefile
@@ -18,8 +18,7 @@ COMMENT=	KDE style with animations
 
 WRKSRC=		${WRKDIR}/kde4-kstyle-nitrogen-${PORTVERSION}-Source
 USE_KDE4=	kdelibs kdehier kdeprefix automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib qmake_build moc_build rcc_build uic_build
+USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/kde4-style-polyester/Makefile b/x11-themes/kde4-style-polyester/Makefile
index 9559a237c388..796fbd8f9664 100644
--- a/x11-themes/kde4-style-polyester/Makefile
+++ b/x11-themes/kde4-style-polyester/Makefile
@@ -17,8 +17,7 @@ COMMENT=	KDE style and window decoration
 
 USE_BZIP2=	yes
 USE_KDE4=	kdelibs kdehier kdeprefix automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib qmake_build moc_build rcc_build uic_build
+USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/kde4-style-skulpture/Makefile b/x11-themes/kde4-style-skulpture/Makefile
index 2db817a1a894..e3b78641e790 100644
--- a/x11-themes/kde4-style-skulpture/Makefile
+++ b/x11-themes/kde4-style-skulpture/Makefile
@@ -18,8 +18,7 @@ COMMENT=	KDE style featuring 3d artwork and enhanced the visual experience
 
 USE_BZIP2=	yes
 USE_KDE4=	kdelibs kdehier kdeprefix automoc4 workspace
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib qmake_build moc_build rcc_build uic_build
+USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-themes/kde4-wallpapers/Makefile b/x11-themes/kde4-wallpapers/Makefile
index 23aaac718d04..014c9dd8d572 100644
--- a/x11-themes/kde4-wallpapers/Makefile
+++ b/x11-themes/kde4-wallpapers/Makefile
@@ -20,8 +20,7 @@ CONFLICTS=	kdebase-workspace-4.[0-6].*
 USE_XZ=	yes
 USE_KDE4=	automoc4 kdehier kdelibs kdeprefix
 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
 
 NO_BUILD=	yes
 
diff --git a/x11-themes/kde4-windeco-crystal/Makefile b/x11-themes/kde4-windeco-crystal/Makefile
index bd64c2236066..8d7c24850e0b 100644
--- a/x11-themes/kde4-windeco-crystal/Makefile
+++ b/x11-themes/kde4-windeco-crystal/Makefile
@@ -20,8 +20,7 @@ LICENSE=	GPLv2
 
 USE_BZIP2=	yes
 USE_KDE4=	kdelibs kdehier kdeprefix automoc4 workspace
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib qmake_build moc_build rcc_build uic_build
+USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/x11-themes/kde4-windeco-dekorator/Makefile b/x11-themes/kde4-windeco-dekorator/Makefile
index c58bc9256d35..d37c5242a654 100644
--- a/x11-themes/kde4-windeco-dekorator/Makefile
+++ b/x11-themes/kde4-windeco-dekorator/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS=	qimageblitz.4:${PORTSDIR}/x11/qimageblitz
 
 USE_BZIP2=	yes
 USE_KDE4=	kdelibs kdehier kdeprefix automoc4 workspace
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib qmake_build moc_build rcc_build uic_build
+USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/x11-themes/kde4-windeco-nitrogen/Makefile b/x11-themes/kde4-windeco-nitrogen/Makefile
index 183c9a64d73e..ac9f287a531a 100644
--- a/x11-themes/kde4-windeco-nitrogen/Makefile
+++ b/x11-themes/kde4-windeco-nitrogen/Makefile
@@ -17,8 +17,7 @@ MAINTAINER=	shanjobe@gmail.com
 COMMENT=	KDE4 window decoration
 
 USE_KDE4=	kdelibs kdehier kdeprefix automoc4 workspace
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib qmake_build moc_build rcc_build uic_build
+USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes
 WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}-Source
 
diff --git a/x11-themes/kdeartwork4/Makefile b/x11-themes/kdeartwork4/Makefile
index 86f0178697ff..4b60a6e48b17 100644
--- a/x11-themes/kdeartwork4/Makefile
+++ b/x11-themes/kdeartwork4/Makefile
@@ -26,8 +26,7 @@ LATEST_LINK=	${PORTNAME}4
 USE_XZ=	yes
 USE_KDE4=	kdehier kdelibs kdeprefix libkexiv2 workspace automoc4
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui opengl \
+USE_QT4=	gui opengl \
 		moc_build qmake_build rcc_build uic_build
 USE_XORG=	x11 xt
 MAKE_JOBS_SAFE=	yes
diff --git a/x11-themes/qt4-style-float/Makefile b/x11-themes/qt4-style-float/Makefile
index 2af4cd37b527..c8d6d66204ba 100644
--- a/x11-themes/qt4-style-float/Makefile
+++ b/x11-themes/qt4-style-float/Makefile
@@ -20,8 +20,7 @@ COMMENT=	Style for Qt 4 and KDE
 LICENSE=	GPLv2
 
 USE_BZIP2=	yes
-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
 
 WRKSRC=		${WRKDIR}/floatstyle-${PORTVERSION}
diff --git a/x11-themes/qt4-style-phase/Makefile b/x11-themes/qt4-style-phase/Makefile
index 8da41e3ef25e..48408f3e39bd 100644
--- a/x11-themes/qt4-style-phase/Makefile
+++ b/x11-themes/qt4-style-phase/Makefile
@@ -20,8 +20,7 @@ COMMENT=	Widget style for Qt 4 and KDE 4
 LICENSE=	MIT
 
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui qmake_build moc_build
+USE_QT4=	corelib gui qmake_build moc_build
 MAKE_JOBS_SAFE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-themes/qt4-style-quantumstyle/Makefile b/x11-themes/qt4-style-quantumstyle/Makefile
index 791188c787b6..4a6d304a6834 100644
--- a/x11-themes/qt4-style-quantumstyle/Makefile
+++ b/x11-themes/qt4-style-quantumstyle/Makefile
@@ -20,8 +20,7 @@ COMMENT=	SVG themable style for Qt 4 and KDE
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui svg qmake_build rcc_build uic_build moc_build
+USE_QT4=	corelib gui svg qmake_build rcc_build uic_build moc_build
 MAKE_JOBS_SAFE=	yes
 
 WRKSRC=		${WRKDIR}/QuantumStyle
diff --git a/x11-themes/qtcurve-kde4/Makefile b/x11-themes/qtcurve-kde4/Makefile
index abbd1d1dcb73..20bc6ebdfa84 100644
--- a/x11-themes/qtcurve-kde4/Makefile
+++ b/x11-themes/qtcurve-kde4/Makefile
@@ -18,8 +18,7 @@ COMMENT=	QtCurve KDE4 widget style
 
 USE_BZIP2=	yes
 USE_CMAKE=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib qmake_build uic_build moc_build rcc_build
+USE_QT4=	corelib qmake_build uic_build moc_build rcc_build
 USE_KDE4=	kdelibs workspace kdehier kdeprefix automoc4
 
 .include <bsd.port.mk>
diff --git a/x11-themes/qtcurve-qt4/Makefile b/x11-themes/qtcurve-qt4/Makefile
index 717e5d945e6b..a4c7041efc25 100644
--- a/x11-themes/qtcurve-qt4/Makefile
+++ b/x11-themes/qtcurve-qt4/Makefile
@@ -19,8 +19,7 @@ COMMENT=	QtCurve Qt4 widget style
 USE_BZIP2=	yes
 USE_GCC=	4.2+
 USE_CMAKE=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus gui svg imageformats_run \
+USE_QT4=	dbus gui svg imageformats_run \
 		qmake_build uic_build moc_build rcc_build
 CFLAGS+=	-I${LOCALBASE}/include
 CMAKE_ARGS+=	-DQTC_QT_ONLY:BOOL=ON \