8 files changed, 8 insertions, 16 deletions

diff --git a/print/kdeutils4-printer-applet/Makefile b/print/kdeutils4-printer-applet/Makefile
index dca2455e66ed..cd3c16d4a999 100644
--- a/print/kdeutils4-printer-applet/Makefile
+++ b/print/kdeutils4-printer-applet/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS=	system-config-printer:${PORTSDIR}/print/system-config-printer \
 
 USE_KDE4=	kdehier kdelibs kdeprefix pykde4 pykdeuic4 automoc4
 USE_PYTHON=	2.5+
-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_XZ=	yes
 USE_CMAKE=	yes
 CMAKE_ARGS+=	-DINSTALL_PRINTER_APPLET:BOOL=ON
diff --git a/print/kover/Makefile b/print/kover/Makefile
index 5a80a731f8bb..6d8532f6e802 100644
--- a/print/kover/Makefile
+++ b/print/kover/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS=	cddb.4:${PORTSDIR}/audio/libcddb \
 
 USE_BZIP2=	yes
 USE_KDE4=	automoc4 kdehier kdeprefix kdelibs
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib dbus gui network svg xml \
+USE_QT4=	corelib dbus gui network svg xml \
 		qmake_build uic_build rcc_build
 USE_PERL5_BUILD=yes
 USE_CMAKE=	yes
diff --git a/print/kpdftool/Makefile b/print/kpdftool/Makefile
index 0c5535e6598d..0af9bf2e145d 100644
--- a/print/kpdftool/Makefile
+++ b/print/kpdftool/Makefile
@@ -17,8 +17,7 @@ COMMENT=	Tool to ease your PDF related work
 RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 
 USE_ZIP=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	qt3support moc_build porting_build qmake_build uic3_build
+USE_QT4=	qt3support moc_build porting_build qmake_build uic3_build
 USE_GHOSTSCRIPT_RUN=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 816e611a73e8..1c8b9ec90c18 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -30,8 +30,7 @@ MINOR_VERSION=	3
 
 USE_XZ=		yes
 USE_GMAKE=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui moc_build uic_build rcc_build
+USE_QT4=	corelib gui moc_build uic_build rcc_build
 USE_GNOME=	desktopfileutils
 USE_PYTHON=	yes
 USE_PERL5=	yes
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index 313e64680664..556bc97578d4 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -30,8 +30,7 @@ MINOR_VERSION=	10
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui moc_build uic_build rcc_build
+USE_QT4=	gui moc_build uic_build rcc_build
 USE_PYTHON=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
index 1a78377cafed..cdfffe8c3418 100644
--- a/print/scribus-devel/Makefile
+++ b/print/scribus-devel/Makefile
@@ -34,8 +34,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinte
 
 USE_SVN=	yes
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui linguist_build moc_build qmake_build rcc_build uic_build xml network
+USE_QT4=	gui linguist_build moc_build qmake_build rcc_build uic_build xml network
 USE_GNOME=	desktopfileutils libartlgpl2 libxml2 pkgconfig
 USE_GHOSTSCRIPT_RUN=	yes
 USE_PYTHON=	yes
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 4e8d5bbe1426..f8be7b6ce42b 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -35,8 +35,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinte
 
 NO_LATEST_LINK=	yes
 USE_XZ=		yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui linguist_build moc_build qmake_build rcc_build uic_build xml network
+USE_QT4=	gui linguist_build moc_build qmake_build rcc_build uic_build xml network
 USE_GNOME=	desktopfileutils libartlgpl2 libxml2 pkgconfig
 USE_GHOSTSCRIPT_RUN=	yes
 USE_PYTHON=	yes
diff --git a/print/system-config-printer-kde/Makefile b/print/system-config-printer-kde/Makefile
index ca1ac8ba3e07..c1805bb6d2af 100644
--- a/print/system-config-printer-kde/Makefile
+++ b/print/system-config-printer-kde/Makefile
@@ -23,8 +23,7 @@ RUN_DEPENDS=	system-config-printer:${PORTSDIR}/print/system-config-printer \
 
 USE_KDE4=	kdehier kdelibs kdeprefix pykde4 pykdeuic4 automoc4
 USE_PYTHON=	2.5+
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build uic_build rcc_build
+USE_QT4=	qmake_build moc_build uic_build rcc_build
 DISTINFO_FILE=	${PORTSDIR}/sysutils/kdeadmin4/distinfo
 USE_XZ=	yes
 USE_CMAKE=	yes