- Convert USE_QT_VER=4 and QT_COMPONETS to USE_QT4

Review by:	bapt, David Naylor (kde team)

23 files changed, 23 insertions, 46 deletions

diff --git a/sysutils/bacula-bat/Makefile b/sysutils/bacula-bat/Makefile
index dafbe81bcde1..60b54027fb9e 100644
--- a/sysutils/bacula-bat/Makefile
+++ b/sysutils/bacula-bat/Makefile
@@ -13,8 +13,7 @@ COMMENT=	The network backup solution (GUI)
 
 LIB_DEPENDS+=	qwt.5:${PORTSDIR}/x11-toolkits/qwt5
 
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build uic_build moc_build rcc_build
+USE_QT4=	qmake_build uic_build moc_build rcc_build
 WITH_BAT=	yes
 
 MAN1=		bat.1
diff --git a/sysutils/easypbi/Makefile b/sysutils/easypbi/Makefile
index bf2672af32fb..3fed874f99ee 100644
--- a/sysutils/easypbi/Makefile
+++ b/sysutils/easypbi/Makefile
@@ -21,8 +21,7 @@ LIB_DEPENDS=	Imath.6:${PORTSDIR}/graphics/ilmbase \
 RUN_DEPENDS=	${LOCALBASE}/bin/gksu:${PORTSDIR}/sysutils/gksu \
 		${LOCALBASE}/sbin/pbid:${PORTSDIR}/ports-mgmt/pbi-manager
 
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build \
+USE_QT4=	qmake_build moc_build rcc_build uic_build \
 		linguist_build assistant_run qt3support \
 		dbus designer gui help-tools network script \
 		sql svg xml webkit
diff --git a/sysutils/filelight-kde4/Makefile b/sysutils/filelight-kde4/Makefile
index b37b8a49020c..4876ae2cdd3a 100644
--- a/sysutils/filelight-kde4/Makefile
+++ b/sysutils/filelight-kde4/Makefile
@@ -22,8 +22,7 @@ CONFLICTS=	kdeutils-4.6.*
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 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
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index 5a2868767a74..5e9918c3d0ee 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -26,8 +26,7 @@ CMAKE_ARGS=	-DK3B_BUILD_K3BSETUP:BOOL=OFF \
 		-DK3B_ENABLE_MUSICBRAINZ:BOOL=OFF
 USE_KDE4=	automoc4 kdeprefix kdelibs
 USE_CDRTOOLS=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui dbus network phonon qt3support sql svg webkit xml \
+USE_QT4=	gui dbus network phonon qt3support sql svg webkit xml \
 		qmake_build moc_build rcc_build uic_build
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile
index 68cb0c93be29..d54752332f8f 100644
--- a/sysutils/kdeadmin4/Makefile
+++ b/sysutils/kdeadmin4/Makefile
@@ -20,8 +20,7 @@ LATEST_LINK=	${PORTNAME}4
 USE_XZ=	yes
 USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus moc_build qmake_build rcc_build uic_build
+USE_QT4=	dbus moc_build qmake_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
 # Disable system-config-printer-kde, it comes with
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 2f7be5cc7847..a6854b94bdde 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/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/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index f3f93fbc94f3..293bd9a27973 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -21,8 +21,7 @@ LATEST_LINK=	${PORTNAME}-kde4
 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/sysutils/kgrubeditor/Makefile b/sysutils/kgrubeditor/Makefile
index 53b26b4e8ce8..4c59a7b32d85 100644
--- a/sysutils/kgrubeditor/Makefile
+++ b/sysutils/kgrubeditor/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS=	grub:${PORTSDIR}/sysutils/grub
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_KDE4=	automoc4 kdeprefix kdelibs
-USE_QT_VER=	4
-QT_COMPONENTS=	gui qmake_build moc_build rcc_build uic_build
+USE_QT4=	gui qmake_build moc_build rcc_build uic_build
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/sysutils/knutclient-kde4/Makefile b/sysutils/knutclient-kde4/Makefile
index 6e91cae94286..7233b614fc36 100644
--- a/sysutils/knutclient-kde4/Makefile
+++ b/sysutils/knutclient-kde4/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS=	qimageblitz.4:${PORTSDIR}/x11/qimageblitz
 
 USE_CMAKE=	yes
 USE_KDE4=	kdehier kdeprefix kdelibs automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui qmake_build moc_build rcc_build uic_build
+USE_QT4=	corelib gui qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 LATEST_LINK=	knutclient-kde4
 
diff --git a/sysutils/krename-kde4/Makefile b/sysutils/krename-kde4/Makefile
index 2f8d58588fae..cb78130d8120 100644
--- a/sysutils/krename-kde4/Makefile
+++ b/sysutils/krename-kde4/Makefile
@@ -23,8 +23,7 @@ LATEST_LINK=	${PORTNAME}-kde4
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_KDE4=	kdeprefix kdelibs 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
 MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/kshutdown-kde4/Makefile b/sysutils/kshutdown-kde4/Makefile
index 604a16e96272..ceba654d308f 100644
--- a/sysutils/kshutdown-kde4/Makefile
+++ b/sysutils/kshutdown-kde4/Makefile
@@ -16,8 +16,7 @@ COMMENT=	Advanced shutdown utility for KDE
 
 USE_ZIP=	yes
 USE_CMAKE=	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
 USE_KDE4=	automoc4 kdehier kdeprefix workspace
 
 MAKE_JOBS_SAFE=	yes
diff --git a/sysutils/libpcbsd/Makefile b/sysutils/libpcbsd/Makefile
index 9bea09596971..bff7b4ad6f1e 100644
--- a/sysutils/libpcbsd/Makefile
+++ b/sysutils/libpcbsd/Makefile
@@ -17,8 +17,7 @@ COMMENT=	PC-BSD Support Library
 WRKSRC=		${WRKDIR}/libpcbsd
 
 USE_CMAKE=	yes
-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
 
 PLIST_FILES=	lib/libpcbsd.so \
 		lib/libpcbsd.so.0 \
diff --git a/sysutils/luckybackup/Makefile b/sysutils/luckybackup/Makefile
index b834493a219a..301f959a0cf3 100644
--- a/sysutils/luckybackup/Makefile
+++ b/sysutils/luckybackup/Makefile
@@ -17,8 +17,7 @@ LICENSE=	GPLv3
 
 RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
 
-USE_QT_VER=	4
-QT_COMPONENTS=	gui qmake_build moc_build rcc_build uic_build
+USE_QT4=	gui qmake_build moc_build rcc_build uic_build
 MAKE_ENV=	INSTALL_ROOT=${PREFIX}
 MAKE_JOBS_SAFE=	yes
 
diff --git a/sysutils/pbreg/Makefile b/sysutils/pbreg/Makefile
index 8c39674c55bf..ec4af06cc868 100644
--- a/sysutils/pbreg/Makefile
+++ b/sysutils/pbreg/Makefile
@@ -17,8 +17,7 @@ COMMENT=	PC-BSD Registry Editor
 
 WRKSRC=		${WRKDIR}/PBReg
 
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui qmake_build moc_build rcc_build uic_build
+USE_QT4=	corelib gui qmake_build moc_build rcc_build uic_build
 HAS_CONFIGURE=	yes
 
 QMAKE_ARGS=     -unix -recursive ${QMAKE_PRO}
diff --git a/sysutils/plasma-applet-apcups/Makefile b/sysutils/plasma-applet-apcups/Makefile
index a7827e8cdadb..d059faabafa2 100644
--- a/sysutils/plasma-applet-apcups/Makefile
+++ b/sysutils/plasma-applet-apcups/Makefile
@@ -20,8 +20,7 @@ PROJECTHOST=	plasma-apcups
 
 USE_CMAKE=	yes
 USE_KDE4=	automoc4 kdeprefix kdelibs
-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/sysutils/policykit-qt/Makefile b/sysutils/policykit-qt/Makefile
index dad753f51cde..a7d59635d23d 100644
--- a/sysutils/policykit-qt/Makefile
+++ b/sysutils/policykit-qt/Makefile
@@ -22,8 +22,7 @@ USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_KDE4=	automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib dbus gui network svg xml  \
+USE_QT4=	corelib dbus gui network svg xml  \
 		qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes
 
diff --git a/sysutils/polkit-kde/Makefile b/sysutils/polkit-kde/Makefile
index d49bdb0661a6..730fa3d6d795 100644
--- a/sysutils/polkit-kde/Makefile
+++ b/sysutils/polkit-kde/Makefile
@@ -24,8 +24,7 @@ LIB_DEPENDS=	polkit-qt-agent-1.1:${PORTSDIR}/sysutils/polkit-qt
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_KDE4=	kdehier kdelibs kdeprefix 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_CMAKE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/sysutils/polkit-qt/Makefile b/sysutils/polkit-qt/Makefile
index 90bea20d6167..0c015cae6b99 100644
--- a/sysutils/polkit-qt/Makefile
+++ b/sysutils/polkit-qt/Makefile
@@ -25,8 +25,7 @@ USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_KDE4=	automoc4
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib dbus gui network svg xml  \
+USE_QT4=	corelib dbus gui network svg xml  \
 		qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes
 # TODO: the next release (post-0.103.0) should have commit 56883bd, which
diff --git a/sysutils/qpxtool/Makefile b/sysutils/qpxtool/Makefile
index dec0bf284abf..1db1957a966a 100644
--- a/sysutils/qpxtool/Makefile
+++ b/sysutils/qpxtool/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build rcc_build linguist_build corelib gui network
+USE_QT4=	qmake_build moc_build rcc_build linguist_build corelib gui network
 QT_NONSTANDARD=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	PREFIX=${PREFIX}
diff --git a/sysutils/qzeitgeist/Makefile b/sysutils/qzeitgeist/Makefile
index c050be33c6a9..d66c60dfc796 100644
--- a/sysutils/qzeitgeist/Makefile
+++ b/sysutils/qzeitgeist/Makefile
@@ -27,8 +27,7 @@ BUILD_DEPENDS=	rapper:${PORTSDIR}/textproc/raptor2 \
 
 USE_KDE4=	automoc4
 USE_PYTHON_BUILD=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus declarative qtestlib \
+USE_QT4=	dbus declarative qtestlib \
 		moc_build qmake_build rcc_build uic_build
 USE_BZIP2=	yes
 USE_CMAKE=	yes
diff --git a/sysutils/searchmonkey/Makefile b/sysutils/searchmonkey/Makefile
index 318cf02b5516..09414c6bea91 100644
--- a/sysutils/searchmonkey/Makefile
+++ b/sysutils/searchmonkey/Makefile
@@ -16,8 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Search using regexes for file names and text
 
 USE_ZIP=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui moc_build qmake_build rcc_build uic_build
+USE_QT4=	corelib gui moc_build qmake_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
 PLIST_FILES=	bin/${PORTNAME}
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index d5e39e0ce23a..17ce0b47e9ed 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/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/sysutils/warden/Makefile b/sysutils/warden/Makefile
index 47b28b60d6d3..9b5799d514c0 100644
--- a/sysutils/warden/Makefile
+++ b/sysutils/warden/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS=	pbreg:${PORTSDIR}/sysutils/pbreg
 
 WRKSRC=		${WRKDIR}/warden
 
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui qmake_build moc_build rcc_build uic_build
+USE_QT4=	corelib gui qmake_build moc_build rcc_build uic_build
 HAS_CONFIGURE=	yes
 
 QMAKE_PRO=	warden.pro