- Convert USE_QT_VER=4 and QT_COMPONETS to USE_QT4

Review by:	bapt, David Naylor (kde team)

17 files changed, 18 insertions, 35 deletions

diff --git a/x11/kactivities/Makefile b/x11/kactivities/Makefile
index 49685957379a..9fdc8152485f 100644
--- a/x11/kactivities/Makefile
+++ b/x11/kactivities/Makefile
@@ -20,8 +20,7 @@ CONFLICTS_INSTALL=	kdelibs-4.7.* kde-runtime-4.7.*
 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
 MAKE_JOBS_SAFE=	yes
 
 post-patch:
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index da7449dac8ff..45810d6aff8c 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -27,8 +27,7 @@ USE_GNOME=	glib20
 USE_KDE4=	kdehier kdelibs kdeprefix libkonq \
 		automoc4 soprano strigi
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus gui qt3support script \
+USE_QT4=	dbus gui qt3support script \
 		moc_build qmake_build rcc_build uic_build
 USE_XORG=	x11 xt
 MAKE_JOBS_SAFE=	yes
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 6603742f86f8..25cdef56c969 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -39,8 +39,7 @@ USE_GETTEXT=	yes
 USE_KDE4=	kdehier kdelibs kdeprefix \
 		attica automoc4 ontologies sharedmime soprano strigi
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus declarative designer gui phonon qt3support \
+USE_QT4=	dbus declarative designer gui phonon qt3support \
 		script svg webkit xml \
 		moc_build qmake_build rcc_build uic_build
 USE_XORG=	x11 xcursor
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 33adda3825d8..61bbd1c9294b 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -64,8 +64,7 @@ USE_ICONV=	yes
 USE_KDE4=	kdehier kdelibs kdeprefix oxygen pimlibs \
 		akonadi automoc4 ontologies qimageblitz soprano strigi
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus declarative gui network opengl phonon \
+USE_QT4=	dbus declarative gui network opengl phonon \
 		qt3support qtestlib script sql webkit xml \
 		moc_build qmake_build rcc_build uic_build
 USE_XORG=	kbproto x11 xau xcomposite xcursor xdamage xdmcp xfixes \
@@ -110,7 +109,7 @@ PLIST_SUB+=	GPS="@comment "
 
 .if !defined(WITHOUT_PHONON_GSTREAMER)
 USE_GSTREAMER+=	core
-QT_COMPONENTS+=	phonon-gst_run
+USE_QT4+=	phonon-gst_run
 .endif
 
 .if defined(WITH_PHONON_VLC)
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 4748829a0ab1..e413aecf7e71 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -55,8 +55,7 @@ USE_KDE4=	kdehier kdeprefix oxygen \
 KDE4_BUILDENV=	yes
 USE_OPENSSL=	yes
 USE_PERL5=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus declarative designer gui imageformats_run \
+USE_QT4=	dbus declarative designer gui imageformats_run \
 		network opengl phonon qdbusviewer_run qt3support \
 		qtestlib script sql svg webkit xml \
 		moc_build qmake_build rcc_build uic_build
diff --git a/x11/kgamma/Makefile b/x11/kgamma/Makefile
index 911b615d1228..bc35856fe1ac 100644
--- a/x11/kgamma/Makefile
+++ b/x11/kgamma/Makefile
@@ -20,8 +20,7 @@ CONFLICTS=	kdegraphics-4.[0-6].*
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus qmake_build moc_build uic_build rcc_build
+USE_QT4=	dbus qmake_build moc_build uic_build rcc_build
 USE_XORG=	x11 xxf86vm
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/x11/konsole/Makefile b/x11/konsole/Makefile
index 18cc1e686181..4a3b6b8ffb05 100644
--- a/x11/konsole/Makefile
+++ b/x11/konsole/Makefile
@@ -20,8 +20,7 @@ CONFLICTS=	kdebase-4.[0-6].*
 USE_XZ=	yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4 libkonq
 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_XORG=	x11 xrender
 CMAKE_ARGS+=	-DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib"
 MAKE_JOBS_SAFE=	yes
diff --git a/x11/libkonq/Makefile b/x11/libkonq/Makefile
index 5eeb976014aa..8c39a9342342 100644
--- a/x11/libkonq/Makefile
+++ b/x11/libkonq/Makefile
@@ -21,8 +21,7 @@ CONFLICTS_INSTALL=	kdebase-4.[0-6].* kde-baseapps-4.7.*
 USE_XZ=	yes
 USE_CMAKE=	yes
 USE_KDE4=	kdelibs kdeprefix kdehier 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
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/x11/plasma-scriptengine-python/Makefile b/x11/plasma-scriptengine-python/Makefile
index 640728450fdb..1f72d60f088c 100644
--- a/x11/plasma-scriptengine-python/Makefile
+++ b/x11/plasma-scriptengine-python/Makefile
@@ -18,8 +18,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Plasma scriptengine for Python
 
 USE_KDE4=	kdehier kdelibs kdeprefix pykde4 automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build uic_build rcc_build
+USE_QT4=	qmake_build moc_build uic_build rcc_build
 USE_PYTHON=	2.5+
 DISTINFO_FILE=	${PORTSDIR}/x11/kde4-workspace/distinfo
 USE_XZ=	yes
diff --git a/x11/plasma-scriptengine-ruby/Makefile b/x11/plasma-scriptengine-ruby/Makefile
index 6332f82fb75f..cc6511d234cd 100644
--- a/x11/plasma-scriptengine-ruby/Makefile
+++ b/x11/plasma-scriptengine-ruby/Makefile
@@ -18,8 +18,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Plasma scriptengine for Ruby
 
 USE_KDE4=	kdehier kdelibs kdeprefix korundum automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build uic_build rcc_build
+USE_QT4=	qmake_build moc_build uic_build rcc_build
 USE_RUBY=	yes
 DISTINFO_FILE=	${PORTSDIR}/x11/kde4-workspace/distinfo
 USE_XZ=	yes
diff --git a/x11/py-qt4-opengl/Makefile b/x11/py-qt4-opengl/Makefile
index 3cba32608da1..4fe12b27255c 100644
--- a/x11/py-qt4-opengl/Makefile
+++ b/x11/py-qt4-opengl/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS=	${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-q
 DISTINFO_FILE=	${PYQT4_DISTINFO_FILE}
 HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
-USE_QT_VER=	4
-QT_COMPONENTS=	opengl qmake_build
+USE_QT4=	opengl qmake_build
 
 OPTIONS=	API		"Install QtOpenGL API for QScintilla2" on \
 		DEBUG		"Enable debugging in generated code" off \
diff --git a/x11/qimageblitz/Makefile b/x11/qimageblitz/Makefile
index 3ce4299a4712..804f11731432 100644
--- a/x11/qimageblitz/Makefile
+++ b/x11/qimageblitz/Makefile
@@ -17,8 +17,7 @@ COMMENT=	Graphical effects and filters library for KDE4
 
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui qmake_build moc_build uic_build rcc_build
+USE_QT4=	gui qmake_build moc_build uic_build rcc_build
 USE_CMAKE=	yes
 
 post-patch:
diff --git a/x11/qt4-graphicssystems-opengl/Makefile b/x11/qt4-graphicssystems-opengl/Makefile
index 025f56393b59..f221e5ef0967 100644
--- a/x11/qt4-graphicssystems-opengl/Makefile
+++ b/x11/qt4-graphicssystems-opengl/Makefile
@@ -14,8 +14,7 @@ PKGNAMESUFFIX=	-opengl
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	OpenGL rendering engine (experimental)
 
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build opengl
+USE_QT4=	qmake_build opengl
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/x11/qt4-inputmethods/Makefile b/x11/qt4-inputmethods/Makefile
index ef8f2ff8274e..ebded8af87a7 100644
--- a/x11/qt4-inputmethods/Makefile
+++ b/x11/qt4-inputmethods/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt input method plugins
 
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build corelib gui
+USE_QT4=	qmake_build moc_build corelib gui
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/x11/qt4-opengl/Makefile b/x11/qt4-opengl/Makefile
index 8c733042cc92..86b11ffa3c13 100644
--- a/x11/qt4-opengl/Makefile
+++ b/x11/qt4-opengl/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt OpenGL library
 
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build corelib gui
+USE_QT4=	qmake_build moc_build corelib gui
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/x11/rsibreak-kde4/Makefile b/x11/rsibreak-kde4/Makefile
index 6a1923d12d8a..aafe9e6470e9 100644
--- a/x11/rsibreak-kde4/Makefile
+++ b/x11/rsibreak-kde4/Makefile
@@ -19,8 +19,7 @@ LATEST_LINK=	${PORTNAME}-kde4
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_CMAKE=	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
 USE_KDE4=	kdehier kdeprefix kdelibs automoc4
 INSTALLS_ICONS=	yes
 
diff --git a/x11/yakuake-kde4/Makefile b/x11/yakuake-kde4/Makefile
index fa07270b9b8b..7cc37a651159 100644
--- a/x11/yakuake-kde4/Makefile
+++ b/x11/yakuake-kde4/Makefile
@@ -29,8 +29,7 @@ PLIST_SUB+=	NLS=""
 USE_GETTEXT=	yes
 .endif
 
-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
 INSTALLS_ICONS=	yes
 MAKE_JOBS_SAFE=	yes