- Convert USE_QT_VER=4 and QT_COMPONETS to USE_QT4

Review by:	bapt, David Naylor (kde team)

13 files changed, 14 insertions, 26 deletions

diff --git a/editors/kate/Makefile b/editors/kate/Makefile
index 5e0af2b9563c..8087afafe0a8 100644
--- a/editors/kate/Makefile
+++ b/editors/kate/Makefile
@@ -23,8 +23,7 @@ USE_GETTEXT=	yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4 sharedmime
 KDE4_BUILDENV=	yes
 USE_PERL5_BUILD=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus gui qt3support script sql xml \
+USE_QT4=	dbus gui qt3support script sql xml \
 		moc_build qmake_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
diff --git a/editors/kile-kde4/Makefile b/editors/kile-kde4/Makefile
index 08aa77ff60fa..123fe5ca110c 100644
--- a/editors/kile-kde4/Makefile
+++ b/editors/kile-kde4/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
 
 USE_BZIP2=	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=	kdeprefix kdelibs automoc4 sharedmime
 MAKE_JOBS_SAFE=	yes
 
diff --git a/editors/klat4/Makefile b/editors/klat4/Makefile
index 90727234a0d9..e3277b43de2a 100644
--- a/editors/klat4/Makefile
+++ b/editors/klat4/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/katepart.so:${PORTSDIR}/editors/kate
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_KDE4=	kdeprefix kdelibs 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
 
 .include <bsd.port.mk>
diff --git a/editors/lfhex/Makefile b/editors/lfhex/Makefile
index a4cebea0b629..a12498ee811e 100644
--- a/editors/lfhex/Makefile
+++ b/editors/lfhex/Makefile
@@ -17,8 +17,7 @@ COMMENT=	Large file hex editor
 
 LICENSE=	GPLv2
 
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui moc_build qmake_build rcc_build
+USE_QT4=	corelib gui moc_build qmake_build rcc_build
 USE_BISON=	build
 MAKE_JOBS_SAFE=	yes
 
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index d7a2cd0cd238..5eeaf1ccb909 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -281,7 +281,7 @@ CONFIGURE_ARGS+=	--disable-neon
 
 .if ${PORT_OPTIONS:MKDE4}
 USE_KDE4=	kdelibs
-USE_QT_VER=	4
+USE_QT4=	yes
 CONFIGURE_ARGS+=	--enable-kde4 QT4DIR="${QT_PREFIX}" QT4LIB="${QT_LIBDIR}" QT4INC="${QT_INCDIR}" KDE4DIR="${KDE4_PREFIX}"
 QT_COMPONENTS+=		moc_build
 .else
diff --git a/editors/mp/Makefile b/editors/mp/Makefile
index 9068a361bea0..58a1bc5dd7c0 100644
--- a/editors/mp/Makefile
+++ b/editors/mp/Makefile
@@ -53,8 +53,7 @@ CONFIGURE_ARGS+=	--without-gtk
 .endif
 
 .if defined(WITH_QT4)
-USE_QT_VER+=	4
-QT_COMPONENTS=	corelib gui moc_build
+USE_QT4=	corelib gui moc_build
 QT_NONSTANDARD=	yes
 CONFIGURE_ENV+=	CPP="${CXX}" CCLINK="${CXX}"
 .else
diff --git a/editors/tea/Makefile b/editors/tea/Makefile
index 234e4537675c..0bfbdff29a6e 100644
--- a/editors/tea/Makefile
+++ b/editors/tea/Makefile
@@ -18,8 +18,7 @@ COMMENT=	A simple and powerful Qt4-based text editor
 LICENSE=	GPLv3
 
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build gui xml
+USE_QT4=	qmake_build moc_build rcc_build gui xml
 
 PLIST_FILES=	bin/${PORTNAME}
 
diff --git a/editors/texmacs/Makefile b/editors/texmacs/Makefile
index f94a2cb7acb7..c38b2eb67d91 100644
--- a/editors/texmacs/Makefile
+++ b/editors/texmacs/Makefile
@@ -83,8 +83,7 @@ CONFIGURE_ARGS+=	--enable-pdf-renderer
 .endif
 
 .if !defined(WITHOUT_QT4)
-USE_QT_VER=	4
-QT_COMPONENTS=	gui moc_build qmake_build rcc uic_build
+USE_QT4=	gui moc_build qmake_build rcc uic_build
 CONFIGURE_ARGS+=	--with-qt --enable-qtpipes
 .else
 CONFIGURE_ARGS+=	--disable-qt
diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
index 39ee3bd9f5ec..3c87389c6b9c 100644
--- a/editors/texmaker/Makefile
+++ b/editors/texmaker/Makefile
@@ -24,8 +24,7 @@ RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
 
 USE_BZIP2=	yes
 USE_GHOSTSCRIPT=yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui network xml webkit \
+USE_QT4=	gui network xml webkit \
 		moc_build qmake_build rcc_build uic_build
 HAS_CONFIGURE=	yes
 QMAKE_ARGS=	PREFIX=${PREFIX} ICONDIR=${PREFIX}/share/pixmaps \
diff --git a/editors/texmakerx/Makefile b/editors/texmakerx/Makefile
index 5280e97a1f01..499d0473e2f0 100644
--- a/editors/texmakerx/Makefile
+++ b/editors/texmakerx/Makefile
@@ -24,8 +24,7 @@ RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
 WRKSRC=	${WRKDIR}/${PORTNAME}${PORTVERSION}
 
 USE_GHOSTSCRIPT=yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui network xml moc_build qmake_build rcc_build \
+USE_QT4=	gui network xml moc_build qmake_build rcc_build \
 		uic_build qtestlib script
 HAS_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/editors/textroom/Makefile b/editors/textroom/Makefile
index c599ee914ecd..be93f74466f1 100644
--- a/editors/textroom/Makefile
+++ b/editors/textroom/Makefile
@@ -21,8 +21,7 @@ LIB_DEPENDS=	hunspell-1.3:${PORTSDIR}/textproc/hunspell \
 RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
 
 USE_SDL=	mixer
-USE_QT_VER=	4
-QT_COMPONENTS=	moc_build qmake_build rcc_build uic_build corelib gui xml \
+USE_QT4=	moc_build qmake_build rcc_build uic_build corelib gui xml \
 		svg opengl qt3support
 QMAKE_ARGS=	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE}
 HAS_CONFIGURE=	yes
diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile
index 63af8365e551..6e3a4ba53787 100644
--- a/editors/texworks/Makefile
+++ b/editors/texworks/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS=	poppler-qt4:${PORTSDIR}/graphics/poppler-qt4 \
 
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build gui corelib rcc_build moc_build uic_build \
+USE_QT4=	qmake_build gui corelib rcc_build moc_build uic_build \
 		dbus xml
 
 MAKE_ENV+=	QTDIR=${QT_PREFIX}
diff --git a/editors/yzis/Makefile b/editors/yzis/Makefile
index 8f892b64041c..6a3517eb9410 100644
--- a/editors/yzis/Makefile
+++ b/editors/yzis/Makefile
@@ -24,8 +24,7 @@ USE_GETTEXT=	yes
 USE_XORG=	x11 xext ice
 USE_LUA=	5.1
 LUA_COMPS=	lua
-USE_QT_VER=	4
-QT_COMPONENTS=	qtestlib qmake_build rcc_build uic_build moc_build gui xml
+USE_QT4=	qtestlib qmake_build rcc_build uic_build moc_build gui xml
 USE_PERL5=	yes
 
 USE_CMAKE=	yes
@@ -45,7 +44,7 @@ OPTIONS=	KYZIS "Build Kyzis and Yzis kpart" off \
 
 .if defined(WITH_KYZIS)
 USE_KDE4=	kdehier kdeprefix kdelibs automoc4
-QT_COMPONENTS+=	phonon
+USE_QT4+=	phonon
 .endif
 
 .include <bsd.port.pre.mk>