- Convert USE_QT_VER=4 and QT_COMPONETS to USE_QT4

Review by:	bapt, David Naylor (kde team)

8 files changed, 9 insertions, 17 deletions

diff --git a/astro/gpsd/Makefile b/astro/gpsd/Makefile
index 6116d3d19e71..2e69fa43439b 100644
--- a/astro/gpsd/Makefile
+++ b/astro/gpsd/Makefile
@@ -240,8 +240,7 @@ SCONS_ARGS+=	oldstyle=no
 .endif
 
 .if defined(WITH_QTBIND)
-USE_QT_VER=	4
-QT_COMPONENTS=	network
+USE_QT4=	network
 SCONS_ARGS+=	libQgpsmm=yes
 PLIST_SUB+=	QTBIND=""
 .else
diff --git a/astro/josm/Makefile b/astro/josm/Makefile
index ae65ce432bc9..76e8d5bed521 100644
--- a/astro/josm/Makefile
+++ b/astro/josm/Makefile
@@ -44,8 +44,7 @@ pre-everything::
 .if defined(WITH_WEBKIT_IMAGE)
 PLIST_FILES+=	bin/webkit-image
 
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui webkit moc_build
+USE_QT4=	corelib gui webkit moc_build
 
 do-build:
 	cd ${WRKSRC} && \
diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile
index 1feb7c841cde..379b5142b60a 100644
--- a/astro/kstars/Makefile
+++ b/astro/kstars/Makefile
@@ -27,8 +27,7 @@ CONFLICTS=	kdeedu-4.[0-6].*
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	opengl qmake_build moc_build rcc_build uic_build
+USE_QT4=	opengl qmake_build moc_build rcc_build uic_build
 USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/astro/marble/Makefile b/astro/marble/Makefile
index 6b0b460c0e37..cfe930ef8b37 100644
--- a/astro/marble/Makefile
+++ b/astro/marble/Makefile
@@ -20,8 +20,7 @@ CONFLICTS=	kdeedu-4.4.[0-4]
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 KDE4_BUILDENV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus declarative gui network \
+USE_QT4=	dbus declarative gui network \
 		phonon script sql svg webkit xml \
 		qmake_build moc_build rcc_build uic_build
 USE_XZ=	yes
diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
index 65eec9077647..95fc3dad5ed8 100644
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS=	gdal:${PORTSDIR}/graphics/gdal \
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build uic_build moc_build rcc_build \
+USE_QT4=	qmake_build uic_build moc_build rcc_build \
 		gui network svg webkit xml imageformats script scripttools
 MAKE_JOBS_SAFE=	yes
 
@@ -57,7 +56,7 @@ QMAKEFLAGS+=	NODEBUG=1
 PLIST_SUB+=	NLS="@comment "
 .else
 PLIST_SUB+=	NLS=""
-QT_COMPONENTS+=	linguist_build
+USE_QT4+=	linguist_build
 
 pre-build:
 	@cd ${WRKSRC}/translations && lrelease-qt4 ../src/src.pro
diff --git a/astro/qlandkartegt/Makefile b/astro/qlandkartegt/Makefile
index 877a36bdd1a2..857102636677 100644
--- a/astro/qlandkartegt/Makefile
+++ b/astro/qlandkartegt/Makefile
@@ -21,8 +21,7 @@ LIB_DEPENDS=	gdal:${PORTSDIR}/graphics/gdal \
 		gps.20:${PORTSDIR}/astro/gpsd
 
 USE_CMAKE=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	dbus gui opengl network sql xml linguist_build \
+USE_QT4=	dbus gui opengl network sql xml linguist_build \
 		moc_build uic_build rcc_build qmake_build
 USE_GL=		glu
 MAKE_JOBS_SAFE=	yes
diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile
index 303e0288e508..73023b160c1e 100644
--- a/astro/stellarium/Makefile
+++ b/astro/stellarium/Makefile
@@ -22,8 +22,7 @@ USE_CMAKE=	yes
 USE_GETTEXT=	yes
 USE_GL=		glu
 USE_ICONV=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	moc_build rcc_build uic_build qmake_build \
+USE_QT4=	moc_build rcc_build uic_build qmake_build \
 		corelib gui network opengl script
 MAKE_JOBS_SAFE=	yes
 
diff --git a/astro/xglobe/Makefile b/astro/xglobe/Makefile
index ca3f964dd2ce..51b4ed09fde2 100644
--- a/astro/xglobe/Makefile
+++ b/astro/xglobe/Makefile
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=kris
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Displays a view of the Earth (like xearth) with a rendered photo map
 
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui qt3support moc_build
+USE_QT4=	corelib gui qt3support moc_build
 USE_GMAKE=	yes
 MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS} QT_PREFIX=${QT_PREFIX}