aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accessibility/jovie/Makefile3
-rw-r--r--accessibility/kaccessible/Makefile3
-rw-r--r--accessibility/kmag/Makefile3
-rw-r--r--accessibility/kmousetool/Makefile3
-rw-r--r--accessibility/kmouth/Makefile3
-rw-r--r--accessibility/qt4-accessible/Makefile3
-rw-r--r--archivers/ark/Makefile3
-rw-r--r--astro/gpsd/Makefile3
-rw-r--r--astro/josm/Makefile3
-rw-r--r--astro/kstars/Makefile3
-rw-r--r--astro/marble/Makefile3
-rw-r--r--astro/merkaartor/Makefile5
-rw-r--r--astro/qlandkartegt/Makefile3
-rw-r--r--astro/stellarium/Makefile3
-rw-r--r--astro/xglobe/Makefile3
-rw-r--r--audio/amarok-kde4/Makefile3
-rw-r--r--audio/audex/Makefile3
-rw-r--r--audio/clementine-player/Makefile3
-rw-r--r--audio/cuberok/Makefile3
-rw-r--r--audio/cueplayer/Makefile3
-rw-r--r--audio/dssi/Makefile3
-rw-r--r--audio/esperanza/Makefile3
-rw-r--r--audio/fmit/Makefile3
-rw-r--r--audio/hydrogen/Makefile3
-rw-r--r--audio/kaudiocreator/Makefile3
-rw-r--r--audio/kid3-kde4/Makefile3
-rw-r--r--audio/kstreamripper/Makefile3
-rw-r--r--audio/last.fm/Makefile3
-rw-r--r--audio/liblastfm/Makefile3
-rw-r--r--audio/lmms/Makefile3
-rw-r--r--audio/mehdiaplayer/Makefile3
-rw-r--r--audio/midipp/Makefile3
-rw-r--r--audio/minitunes/Makefile3
-rw-r--r--audio/mixxx/Makefile3
-rw-r--r--audio/mumble/Makefile5
-rw-r--r--audio/murmur/Makefile5
-rw-r--r--audio/musescore/Makefile3
-rw-r--r--audio/mythplugin-mythmusic/Makefile3
-rw-r--r--audio/qjackctl/Makefile3
-rw-r--r--audio/qmpdclient/Makefile7
-rw-r--r--audio/qsampler/Makefile3
-rw-r--r--audio/qsynth/Makefile3
-rw-r--r--audio/quimup/Makefile3
-rw-r--r--audio/rosegarden/Makefile3
-rw-r--r--audio/soundkonverter/Makefile3
-rw-r--r--audio/tepsonic/Makefile3
-rw-r--r--audio/waheela/Makefile3
-rw-r--r--cad/klayout/Makefile3
-rw-r--r--cad/layouteditor/Makefile3
-rw-r--r--cad/librecad/Makefile5
-rw-r--r--cad/meshlab/Makefile3
-rw-r--r--cad/openscad/Makefile3
-rw-r--r--cad/qelectrotech/Makefile3
-rw-r--r--cad/qfsm/Makefile3
-rw-r--r--cad/salome/Makefile.ext3
-rw-r--r--chinese/fcitx/Makefile3
-rw-r--r--chinese/fqterm/Makefile3
-rw-r--r--chinese/gcin/Makefile3
-rw-r--r--chinese/qt4-codecs-cn/Makefile3
-rw-r--r--chinese/qt4-codecs-tw/Makefile3
-rw-r--r--comms/cutecom/Makefile3
-rw-r--r--comms/kremotecontrol/Makefile3
-rw-r--r--databases/akonadi-google/Makefile3
-rw-r--r--databases/akonadi-googledata/Makefile3
-rw-r--r--databases/akonadi/Makefile7
-rw-r--r--databases/kbibtex/Makefile3
-rw-r--r--databases/py-qt4-sql/Makefile3
-rw-r--r--databases/qt4-ibase-plugin/Makefile3
-rw-r--r--databases/qt4-mysql-plugin/Makefile3
-rw-r--r--databases/qt4-odbc-plugin/Makefile3
-rw-r--r--databases/qt4-pgsql-plugin/Makefile3
-rw-r--r--databases/qt4-sql/Makefile3
-rw-r--r--databases/qt4-sqlite-plugin/Makefile3
-rw-r--r--databases/qt4-sqlite3-plugin/Makefile3
-rw-r--r--databases/sqliteman/Makefile3
-rw-r--r--databases/tora/Makefile3
-rw-r--r--deskutils/calibre/Makefile3
-rw-r--r--deskutils/cdcat/Makefile3
-rw-r--r--deskutils/charmtimetracker/Makefile3
-rw-r--r--deskutils/epoch/Makefile3
-rw-r--r--deskutils/fbreader/Makefile3
-rw-r--r--deskutils/fet/Makefile3
-rw-r--r--deskutils/google-gadgets/Makefile3
-rw-r--r--deskutils/kchmviewer-kde4/Makefile3
-rw-r--r--deskutils/kdepim4-runtime/Makefile3
-rw-r--r--deskutils/kdepim4/Makefile3
-rw-r--r--deskutils/kdepim44-runtime/Makefile3
-rw-r--r--deskutils/kdepim44/Makefile3
-rw-r--r--deskutils/kdepimlibs4/Makefile3
-rw-r--r--deskutils/kdeplasma-addons/Makefile3
-rw-r--r--deskutils/kruler/Makefile3
-rw-r--r--deskutils/ksshaskpass/Makefile3
-rw-r--r--deskutils/launchy/Makefile3
-rw-r--r--deskutils/nagaina/Makefile3
-rw-r--r--deskutils/plasma-applet-cwp/Makefile3
-rw-r--r--deskutils/plasma-applet-fancytasks/Makefile3
-rw-r--r--deskutils/plasma-applet-panelspacer/Makefile3
-rw-r--r--deskutils/plasma-applet-playwolf/Makefile3
-rw-r--r--deskutils/plasma-applet-serverstatuswidget/Makefile3
-rw-r--r--deskutils/plasma-applet-simpleweatherforecast/Makefile3
-rw-r--r--deskutils/plasma-applet-teacooker/Makefile3
-rw-r--r--deskutils/plasma-applet-yawp/Makefile3
-rw-r--r--deskutils/q4wine/Makefile5
-rw-r--r--deskutils/qlabels/Makefile3
-rw-r--r--deskutils/qorganizer/Makefile3
-rw-r--r--deskutils/qrfcview/Makefile3
-rw-r--r--deskutils/qtm/Makefile3
-rw-r--r--deskutils/recoll/Makefile3
-rw-r--r--deskutils/semantik/Makefile3
-rw-r--r--deskutils/silence/Makefile3
-rw-r--r--deskutils/strigi/Makefile3
-rw-r--r--deskutils/superkaramba/Makefile3
-rw-r--r--deskutils/treeline/Makefile2
-rw-r--r--deskutils/tuxcards/Makefile3
-rw-r--r--deskutils/vym/Makefile5
-rw-r--r--deskutils/znotes/Makefile3
-rw-r--r--devel/ace/Makefile3
-rw-r--r--devel/alabastra/Makefile3
-rw-r--r--devel/apiextractor/Makefile3
-rw-r--r--devel/cmake-gui/Makefile3
-rw-r--r--devel/dbus-qt4/Makefile3
-rw-r--r--devel/doxygen/Makefile3
-rw-r--r--devel/fuel/Makefile3
-rw-r--r--devel/gecode/Makefile3
-rw-r--r--devel/generatorrunner/Makefile3
-rw-r--r--devel/grantlee/Makefile3
-rw-r--r--devel/kcachegrind/Makefile3
-rw-r--r--devel/kdebindings4-perl-perlkde/Makefile3
-rw-r--r--devel/kdebindings4-perl-perlqt/Makefile3
-rw-r--r--devel/kdebindings4-python-krosspython/Makefile3
-rw-r--r--devel/kdebindings4-python-pykde4/Makefile3
-rw-r--r--devel/kdebindings4-python-pykdeuic4/Makefile3
-rw-r--r--devel/kdebindings4-ruby-korundum/Makefile3
-rw-r--r--devel/kdebindings4-ruby-krossruby/Makefile3
-rw-r--r--devel/kdebindings4-ruby-qtruby/Makefile3
-rw-r--r--devel/kdebindings4-smoke-smokegen/Makefile3
-rw-r--r--devel/kdebindings4-smoke-smokekde/Makefile3
-rw-r--r--devel/kdebindings4-smoke-smokeqt/Makefile3
-rw-r--r--devel/kdesdk4/Makefile3
-rw-r--r--devel/kdesvn-kde4/Makefile3
-rw-r--r--devel/kdevelop-kde4/Makefile3
-rw-r--r--devel/kdevelop-pg-qt/Makefile3
-rw-r--r--devel/kdevelop-php-docs/Makefile3
-rw-r--r--devel/kdevelop-php/Makefile3
-rw-r--r--devel/kdevplatform/Makefile3
-rw-r--r--devel/libdbusmenu-qt/Makefile3
-rw-r--r--devel/py-qt4-assistant/Makefile3
-rw-r--r--devel/py-qt4-core/Makefile3
-rw-r--r--devel/py-qt4-dbus/Makefile3
-rw-r--r--devel/py-qt4-declarative/Makefile3
-rw-r--r--devel/py-qt4-designer/Makefile3
-rw-r--r--devel/py-qt4-designerplugin/Makefile3
-rw-r--r--devel/py-qt4-help/Makefile3
-rw-r--r--devel/py-qt4-qscintilla2/Makefile3
-rw-r--r--devel/py-qt4-script/Makefile3
-rw-r--r--devel/py-qt4-scripttools/Makefile3
-rw-r--r--devel/py-qt4-test/Makefile3
-rw-r--r--devel/pyside-tools/Makefile3
-rw-r--r--devel/pyside/Makefile3
-rw-r--r--devel/qbzr/Makefile2
-rw-r--r--devel/qca/Makefile5
-rw-r--r--devel/qconf/Makefile3
-rw-r--r--devel/qdevelop/Makefile7
-rw-r--r--devel/qgit/Makefile3
-rw-r--r--devel/qjson/Makefile3
-rw-r--r--devel/qprog/Makefile3
-rw-r--r--devel/qscintilla2-designerplugin/Makefile3
-rw-r--r--devel/qscintilla2/Makefile3
-rw-r--r--devel/qsvn/Makefile3
-rw-r--r--devel/qt4-assistant-adp/Makefile3
-rw-r--r--devel/qt4-assistant/Makefile3
-rw-r--r--devel/qt4-corelib/Makefile3
-rw-r--r--devel/qt4-declarative/Makefile3
-rw-r--r--devel/qt4-designer/Makefile3
-rw-r--r--devel/qt4-help-tools/Makefile3
-rw-r--r--devel/qt4-help/Makefile3
-rw-r--r--devel/qt4-libqtassistantclient/Makefile3
-rw-r--r--devel/qt4-linguist/Makefile3
-rw-r--r--devel/qt4-makeqpf/Makefile3
-rw-r--r--devel/qt4-moc/Makefile3
-rw-r--r--devel/qt4-porting/Makefile3
-rw-r--r--devel/qt4-qdbusviewer/Makefile3
-rw-r--r--devel/qt4-qdoc3/Makefile3
-rw-r--r--devel/qt4-qt3support/Makefile3
-rw-r--r--devel/qt4-qtestlib/Makefile3
-rw-r--r--devel/qt4-qtsolutions-singleapplication/Makefile3
-rw-r--r--devel/qt4-qvfb/Makefile3
-rw-r--r--devel/qt4-rcc/Makefile3
-rw-r--r--devel/qt4-script/Makefile3
-rw-r--r--devel/qt4-scripttools/Makefile3
-rw-r--r--devel/qt4-uic/Makefile3
-rw-r--r--devel/qt4-uic3/Makefile3
-rw-r--r--devel/qt4/Makefile13
-rw-r--r--devel/qtcreator/Makefile3
-rw-r--r--devel/qtscriptgenerator/Makefile5
-rw-r--r--devel/shiboken/Makefile3
-rw-r--r--devel/subcommander2/Makefile3
-rw-r--r--devel/svn2git/Makefile3
-rw-r--r--devel/universalindentgui/Makefile3
-rw-r--r--editors/kate/Makefile3
-rw-r--r--editors/kile-kde4/Makefile3
-rw-r--r--editors/klat4/Makefile3
-rw-r--r--editors/lfhex/Makefile3
-rw-r--r--editors/libreoffice/Makefile2
-rw-r--r--editors/mp/Makefile3
-rw-r--r--editors/tea/Makefile3
-rw-r--r--editors/texmacs/Makefile3
-rw-r--r--editors/texmaker/Makefile3
-rw-r--r--editors/texmakerx/Makefile3
-rw-r--r--editors/textroom/Makefile3
-rw-r--r--editors/texworks/Makefile3
-rw-r--r--editors/yzis/Makefile5
-rw-r--r--emulators/aqemu/Makefile3
-rw-r--r--emulators/bsnes/Makefile3
-rw-r--r--emulators/dboxfe/Makefile3
-rw-r--r--emulators/osmose/Makefile3
-rw-r--r--emulators/qmc2/Makefile3
-rw-r--r--emulators/qtemu/Makefile5
-rw-r--r--emulators/virtualbox-ose-legacy/Makefile3
-rw-r--r--emulators/virtualbox-ose/Makefile3
-rw-r--r--emulators/yabause/Makefile3
-rw-r--r--finance/eqonomize-kde4/Makefile3
-rw-r--r--finance/kmymoney-kde4/Makefile3
-rw-r--r--finance/libalkimia/Makefile3
-rw-r--r--finance/skrooge/Makefile3
-rw-r--r--ftp/plasma-applet-ftpmonitor/Makefile3
-rw-r--r--ftp/scythia/Makefile3
-rw-r--r--games/allacrost/Makefile3
-rw-r--r--games/anki/Makefile.inc3
-rw-r--r--games/arx-libertatis/Makefile3
-rw-r--r--games/blinken/Makefile3
-rw-r--r--games/bubble-chains/Makefile3
-rw-r--r--games/colorcode/Makefile3
-rw-r--r--games/cutemaze/Makefile3
-rw-r--r--games/djgame2/Makefile3
-rw-r--r--games/hedgewars/Makefile3
-rw-r--r--games/hexalate/Makefile3
-rw-r--r--games/hexglass/Makefile3
-rw-r--r--games/jag/Makefile3
-rw-r--r--games/kajongg/Makefile3
-rw-r--r--games/kanagram/Makefile3
-rw-r--r--games/kardsgt/Makefile3
-rw-r--r--games/kcheckers/Makefile3
-rw-r--r--games/kdegames4/Makefile3
-rw-r--r--games/khangman/Makefile3
-rw-r--r--games/kmancala/Makefile3
-rw-r--r--games/knights-kde4/Makefile3
-rw-r--r--games/openpref/Makefile3
-rw-r--r--games/peg-e/Makefile3
-rw-r--r--games/pokerth/Makefile3
-rw-r--r--games/qnetwalk/Makefile3
-rw-r--r--games/quackle/Makefile3
-rw-r--r--games/simsu/Makefile3
-rw-r--r--games/spellathon/Makefile3
-rw-r--r--games/tanglet/Makefile3
-rw-r--r--games/tbe/Makefile3
-rw-r--r--games/tetzle/Makefile3
-rw-r--r--german/tipp10/Makefile3
-rw-r--r--graphics/aqsis/Makefile3
-rw-r--r--graphics/autoq3d/Makefile3
-rw-r--r--graphics/darknock/Makefile3
-rw-r--r--graphics/digikam-kde4/Makefile3
-rw-r--r--graphics/djview4/Makefile3
-rw-r--r--graphics/easypaint/Makefile3
-rw-r--r--graphics/eos-movrec/Makefile3
-rw-r--r--graphics/evolvotron/Makefile3
-rw-r--r--graphics/fracplanet/Makefile3
-rw-r--r--graphics/fraqtive/Makefile3
-rw-r--r--graphics/gnash/Makefile3
-rw-r--r--graphics/graphviz/Makefile3
-rw-r--r--graphics/gwenview-kde4/Makefile3
-rw-r--r--graphics/ipe/Makefile3
-rw-r--r--graphics/kamera-kde4/Makefile3
-rw-r--r--graphics/kcolorchooser/Makefile3
-rw-r--r--graphics/kcoloredit/Makefile3
-rw-r--r--graphics/kdegraphics4-mobipocket/Makefile3
-rw-r--r--graphics/kdegraphics4-strigi-analyzer/Makefile3
-rw-r--r--graphics/kdegraphics4-svgpart/Makefile3
-rw-r--r--graphics/kdegraphics4-thumbnailers/Makefile3
-rw-r--r--graphics/kgraphviewer/Makefile3
-rw-r--r--graphics/kiconedit/Makefile3
-rw-r--r--graphics/kipi-plugins-kde4/Makefile3
-rw-r--r--graphics/klatexformula/Makefile3
-rw-r--r--graphics/kolourpaint/Makefile3
-rw-r--r--graphics/kphotoalbum-kde4/Makefile3
-rw-r--r--graphics/kpovmodeler/Makefile3
-rw-r--r--graphics/ksaneplugin/Makefile3
-rw-r--r--graphics/ksnapshot/Makefile3
-rw-r--r--graphics/kuickshow-kde4/Makefile3
-rw-r--r--graphics/libkdcraw-kde4/Makefile3
-rw-r--r--graphics/libkexiv2-kde4/Makefile3
-rw-r--r--graphics/libkipi-kde4/Makefile3
-rw-r--r--graphics/libksane/Makefile3
-rw-r--r--graphics/lprof-devel/Makefile3
-rw-r--r--graphics/luminance/Makefile3
-rw-r--r--graphics/luxrender/Makefile3
-rw-r--r--graphics/meshviewer/Makefile3
-rw-r--r--graphics/nvidia-texture-tools/Makefile3
-rw-r--r--graphics/okular/Makefile3
-rw-r--r--graphics/opencsg/Makefile3
-rw-r--r--graphics/opencv/Makefile3
-rw-r--r--graphics/openimageio/Makefile3
-rw-r--r--graphics/pencil/Makefile3
-rw-r--r--graphics/poppler/Makefile3
-rw-r--r--graphics/prison/Makefile3
-rw-r--r--graphics/py-qt4-svg/Makefile3
-rw-r--r--graphics/qcomicbook/Makefile3
-rw-r--r--graphics/qgis/Makefile3
-rw-r--r--graphics/qiviewer/Makefile3
-rw-r--r--graphics/qt4-iconengines/Makefile3
-rw-r--r--graphics/qt4-imageformats/Makefile3
-rw-r--r--graphics/qt4-pixeltool/Makefile3
-rw-r--r--graphics/qt4-svg/Makefile3
-rw-r--r--graphics/qtgtl/Makefile3
-rw-r--r--graphics/scantailor/Makefile3
-rw-r--r--graphics/seam-carving-gui/Makefile3
-rw-r--r--graphics/showimage/Makefile3
-rw-r--r--graphics/skanlite/Makefile3
-rw-r--r--graphics/structuresynth/Makefile3
-rw-r--r--graphics/tiled/Makefile3
-rw-r--r--graphics/tulip/Makefile3
-rw-r--r--graphics/visionworkbench/Makefile3
-rw-r--r--graphics/yagf/Makefile3
-rw-r--r--graphics/zbar/Makefile3
-rw-r--r--graphics/zint/Makefile3
-rw-r--r--irc/konversation-kde4/Makefile3
-rw-r--r--irc/kvirc/Makefile7
-rw-r--r--irc/quassel/Makefile11
-rw-r--r--japanese/kiten/Makefile3
-rw-r--r--japanese/mozc-server/Makefile3
-rw-r--r--japanese/qt4-codecs-jp/Makefile3
-rw-r--r--java/classpath/Makefile3
-rw-r--r--korean/qt4-codecs-kr/Makefile3
-rw-r--r--lang/basic256/Makefile3
-rw-r--r--lang/kturtle/Makefile3
-rw-r--r--lang/phantomjs/Makefile3
-rw-r--r--mail/kbiff/Makefile3
-rw-r--r--mail/kshowmail/Makefile3
-rw-r--r--mail/qgmailnotifier/Makefile3
-rw-r--r--math/analitza/Makefile3
-rw-r--r--math/cantor/Makefile3
-rw-r--r--math/cgal/Makefile3
-rw-r--r--math/freemat/Makefile3
-rw-r--r--math/kalgebra/Makefile3
-rw-r--r--math/kbruch/Makefile3
-rw-r--r--math/kcalc/Makefile3
-rw-r--r--math/kig/Makefile3
-rw-r--r--math/kmplot/Makefile3
-rw-r--r--math/plplot/Makefile3
-rw-r--r--math/qtiplot/Makefile7
-rw-r--r--math/qtoctave/Makefile3
-rw-r--r--math/qwtplot3d-qt4/Makefile3
-rw-r--r--math/rkward-kde4/Makefile3
-rw-r--r--math/rocs/Makefile3
-rw-r--r--math/speedcrunch/Makefile5
-rw-r--r--math/vtk5/Makefile3
-rw-r--r--misc/bibletime/Makefile3
-rw-r--r--misc/kde4-l10n/files/bsd.l10n.mk3
-rw-r--r--misc/kgeography/Makefile3
-rw-r--r--misc/klettres/Makefile3
-rw-r--r--misc/krecipes-kde4/Makefile9
-rw-r--r--misc/ktouch/Makefile3
-rw-r--r--misc/kwordquiz/Makefile3
-rw-r--r--misc/libkdeedu/Makefile3
-rw-r--r--misc/parley/Makefile3
-rw-r--r--misc/qbrew/Makefile3
-rw-r--r--misc/qt4-doc/Makefile2
-rw-r--r--misc/qt4-l10n/Makefile3
-rw-r--r--misc/qt4-qtconfig/Makefile5
-rw-r--r--misc/qt4-qtdemo/Makefile3
-rw-r--r--misc/tellico-kde4/Makefile3
-rw-r--r--multimedia/2mandvd/Makefile3
-rw-r--r--multimedia/abby/Makefile3
-rw-r--r--multimedia/avidemux2/Makefile.common5
-rw-r--r--multimedia/bangarang/Makefile3
-rw-r--r--multimedia/bino/Makefile3
-rw-r--r--multimedia/clipgrab/Makefile3
-rw-r--r--multimedia/dvbcut/Makefile2
-rw-r--r--multimedia/gstreamer-qt4/Makefile3
-rw-r--r--multimedia/k9copy-kde4/Makefile3
-rw-r--r--multimedia/kaffeine/Makefile3
-rw-r--r--multimedia/kdemultimedia4/Makefile3
-rw-r--r--multimedia/kmplayer-kde4/Makefile3
-rw-r--r--multimedia/kplayer-kde4/Makefile3
-rw-r--r--multimedia/mediadownloader/Makefile3
-rw-r--r--multimedia/minitube/Makefile5
-rw-r--r--multimedia/mlt/Makefile3
-rw-r--r--multimedia/mythtv-frontend/Makefile5
-rw-r--r--multimedia/mythtv/Makefile5
-rw-r--r--multimedia/phonon-gstreamer/Makefile3
-rw-r--r--multimedia/phonon-vlc/Makefile3
-rw-r--r--multimedia/phonon-xine/Makefile3
-rw-r--r--multimedia/phonon/Makefile5
-rw-r--r--multimedia/py-qt4-multimedia/Makefile3
-rw-r--r--multimedia/py-qt4-phonon/Makefile3
-rw-r--r--multimedia/qmmp/Makefile3
-rw-r--r--multimedia/qt4-multimedia/Makefile3
-rw-r--r--multimedia/qt4-phonon-gst/Makefile3
-rw-r--r--multimedia/qt4-phonon/Makefile3
-rw-r--r--multimedia/smile/Makefile3
-rw-r--r--multimedia/smplayer/Makefile3
-rw-r--r--multimedia/smtube/Makefile3
-rw-r--r--multimedia/subtitlecomposer-kde4/Makefile3
-rw-r--r--multimedia/umplayer/Makefile3
-rw-r--r--multimedia/vlc/Makefile3
-rw-r--r--net-im/decibel/Makefile3
-rw-r--r--net-im/kmess-kde4/Makefile3
-rw-r--r--net-im/licq-qt-gui/Makefile5
-rw-r--r--net-im/psi/Makefile3
-rw-r--r--net-im/psimedia/Makefile3
-rw-r--r--net-im/qutim-plugin-icq/Makefile3
-rw-r--r--net-im/qutim-plugin-jabber/Makefile3
-rw-r--r--net-im/qutim/Makefile3
-rw-r--r--net-im/qwit-devel/Makefile3
-rw-r--r--net-im/qwit/Makefile3
-rw-r--r--net-im/qxmpp/Makefile3
-rw-r--r--net-im/ramblercontacts/Makefile3
-rw-r--r--net-im/telepathy-qt/Makefile3
-rw-r--r--net-im/telepathy-qt4/Makefile3
-rw-r--r--net-im/vacuum-im/Makefile3
-rw-r--r--net-mgmt/nagiosagent/Makefile3
-rw-r--r--net-mgmt/qkismet/Makefile3
-rw-r--r--net-mgmt/vidalia/Makefile3
-rw-r--r--net-p2p/amule-devel/Makefile3
-rw-r--r--net-p2p/amule/Makefile3
-rw-r--r--net-p2p/eiskaltdcpp-qt/Makefile11
-rw-r--r--net-p2p/ktorrent/Makefile3
-rw-r--r--net-p2p/libktorrent/Makefile3
-rw-r--r--net-p2p/qbittorrent-29/Makefile7
-rw-r--r--net-p2p/retroshare/Makefile3
-rw-r--r--net-p2p/sharktorrent/Makefile3
-rw-r--r--net-p2p/transmission-qt4/Makefile3
-rw-r--r--net-p2p/valknut/Makefile3
-rw-r--r--net/avahi-qt4/Makefile3
-rw-r--r--net/cagibi/Makefile3
-rw-r--r--net/ekiga3/Makefile2
-rw-r--r--net/hupnp/Makefile3
-rw-r--r--net/kdenetwork4/Makefile3
-rw-r--r--net/kio-upnp-ms/Makefile3
-rw-r--r--net/knemo-kde4/Makefile3
-rw-r--r--net/kwooty/Makefile3
-rw-r--r--net/libproxy-kde/Makefile3
-rw-r--r--net/pcbsd-netmanager/Makefile3
-rw-r--r--net/py-qt4-network/Makefile3
-rw-r--r--net/qoauth/Makefile3
-rw-r--r--net/qt4-network/Makefile3
-rw-r--r--net/rsplib/Makefile3
-rw-r--r--net/smb4k-kde4/Makefile3
-rw-r--r--net/wpa_gui/Makefile3
-rw-r--r--net/x2goclient/Makefile3
-rw-r--r--polish/kadu/Makefile3
-rw-r--r--polish/qfaktury/Makefile3
-rw-r--r--polish/qnapi/Makefile3
-rw-r--r--ports-mgmt/kpackagekit/Makefile3
-rw-r--r--ports-mgmt/kports-qt4/Makefile3
-rw-r--r--ports-mgmt/packagekit/Makefile3
-rw-r--r--ports-mgmt/portrac/Makefile3
-rw-r--r--print/kdeutils4-printer-applet/Makefile3
-rw-r--r--print/kover/Makefile3
-rw-r--r--print/kpdftool/Makefile3
-rw-r--r--print/lyx/Makefile3
-rw-r--r--print/lyx16/Makefile3
-rw-r--r--print/scribus-devel/Makefile3
-rw-r--r--print/scribus/Makefile3
-rw-r--r--print/system-config-printer-kde/Makefile3
-rw-r--r--science/avogadro/Makefile3
-rw-r--r--science/kalzium/Makefile3
-rw-r--r--science/kst2/Makefile3
-rw-r--r--science/massxpert/Makefile3
-rw-r--r--science/paraview/Makefile3
-rw-r--r--science/qtresistors/Makefile3
-rw-r--r--science/step/Makefile3
-rw-r--r--security/fwbuilder-devel/Makefile3
-rw-r--r--security/fwbuilder/Makefile3
-rw-r--r--security/keepassx/Makefile3
-rw-r--r--security/kgpg-kde4/Makefile3
-rw-r--r--security/kwallet/Makefile3
-rw-r--r--security/nmapsi4/Makefile3
-rw-r--r--security/ophcrack/Makefile3
-rw-r--r--security/qca-cyrus-sasl/Makefile3
-rw-r--r--security/qca-gnupg/Makefile3
-rw-r--r--security/qca-ossl/Makefile3
-rw-r--r--security/quantis/Makefile3
-rw-r--r--security/tpmmanager/Makefile3
-rw-r--r--security/xca/Makefile3
-rw-r--r--sysutils/bacula-bat/Makefile3
-rw-r--r--sysutils/easypbi/Makefile3
-rw-r--r--sysutils/filelight-kde4/Makefile3
-rw-r--r--sysutils/k3b-kde4/Makefile3
-rw-r--r--sysutils/kdeadmin4/Makefile3
-rw-r--r--sysutils/kdf/Makefile3
-rw-r--r--sysutils/kfloppy/Makefile3
-rw-r--r--sysutils/kgrubeditor/Makefile3
-rw-r--r--sysutils/knutclient-kde4/Makefile3
-rw-r--r--sysutils/krename-kde4/Makefile3
-rw-r--r--sysutils/kshutdown-kde4/Makefile3
-rw-r--r--sysutils/libpcbsd/Makefile3
-rw-r--r--sysutils/luckybackup/Makefile3
-rw-r--r--sysutils/pbreg/Makefile3
-rw-r--r--sysutils/plasma-applet-apcups/Makefile3
-rw-r--r--sysutils/policykit-qt/Makefile3
-rw-r--r--sysutils/polkit-kde/Makefile3
-rw-r--r--sysutils/polkit-qt/Makefile3
-rw-r--r--sysutils/qpxtool/Makefile3
-rw-r--r--sysutils/qzeitgeist/Makefile3
-rw-r--r--sysutils/searchmonkey/Makefile3
-rw-r--r--sysutils/sweeper/Makefile3
-rw-r--r--sysutils/warden/Makefile3
-rw-r--r--textproc/beediff/Makefile3
-rw-r--r--textproc/dikt/Makefile3
-rw-r--r--textproc/dixit/Makefile3
-rw-r--r--textproc/goldendict/Makefile3
-rw-r--r--textproc/ibus-qt/Makefile3
-rw-r--r--textproc/kdiff3/Makefile3
-rw-r--r--textproc/py-qt4-xml/Makefile3
-rw-r--r--textproc/py-qt4-xmlpatterns/Makefile3
-rw-r--r--textproc/qstardict/Makefile3
-rw-r--r--textproc/qt4-clucene/Makefile3
-rw-r--r--textproc/qt4-xml/Makefile3
-rw-r--r--textproc/qt4-xmlpatterns-tool/Makefile3
-rw-r--r--textproc/qt4-xmlpatterns/Makefile3
-rw-r--r--textproc/scim-bridge-qt4/Makefile3
-rw-r--r--textproc/sigil/Makefile3
-rw-r--r--textproc/soprano/Makefile3
-rw-r--r--textproc/uim-kde4/Makefile3
-rw-r--r--textproc/uim-qt4/Makefile3
-rw-r--r--www/aria2fe/Makefile3
-rw-r--r--www/arora/Makefile5
-rw-r--r--www/bookmarkbridge/Makefile3
-rw-r--r--www/choqok/Makefile3
-rw-r--r--www/cutycapt/Makefile3
-rw-r--r--www/kdewebdev4/Makefile3
-rw-r--r--www/kwebkitpart/Makefile3
-rw-r--r--www/py-qt4-webkit/Makefile3
-rw-r--r--www/qt4-webkit/Makefile3
-rw-r--r--www/rekonq/Makefile3
-rw-r--r--x11-clocks/kdetoys4/Makefile3
-rw-r--r--x11-clocks/ktimer/Makefile3
-rw-r--r--x11-clocks/plasma-applet-adjustableclock/Makefile3
-rw-r--r--x11-clocks/plasma-applet-geekclock/Makefile3
-rw-r--r--x11-fm/krusader2/Makefile3
-rw-r--r--x11-fm/qtfm/Makefile3
-rw-r--r--x11-fm/ultracopier/Makefile3
-rw-r--r--x11-fonts/fontmatrix/Makefile3
-rw-r--r--x11-themes/gtk-qt4-engine/Makefile3
-rw-r--r--x11-themes/kde4-style-bespin/Makefile3
-rw-r--r--x11-themes/kde4-style-nitrogen/Makefile3
-rw-r--r--x11-themes/kde4-style-polyester/Makefile3
-rw-r--r--x11-themes/kde4-style-skulpture/Makefile3
-rw-r--r--x11-themes/kde4-wallpapers/Makefile3
-rw-r--r--x11-themes/kde4-windeco-crystal/Makefile3
-rw-r--r--x11-themes/kde4-windeco-dekorator/Makefile3
-rw-r--r--x11-themes/kde4-windeco-nitrogen/Makefile3
-rw-r--r--x11-themes/kdeartwork4/Makefile3
-rw-r--r--x11-themes/qt4-style-float/Makefile3
-rw-r--r--x11-themes/qt4-style-phase/Makefile3
-rw-r--r--x11-themes/qt4-style-quantumstyle/Makefile3
-rw-r--r--x11-themes/qtcurve-kde4/Makefile3
-rw-r--r--x11-themes/qtcurve-qt4/Makefile3
-rw-r--r--x11-toolkits/attica/Makefile3
-rw-r--r--x11-toolkits/nucleo/Makefile3
-rw-r--r--x11-toolkits/py-qt4-gui/Makefile3
-rw-r--r--x11-toolkits/qt4-gui/Makefile3
-rw-r--r--x11-toolkits/qt4pas/Makefile3
-rw-r--r--x11-toolkits/qwt5-designerplugin/Makefile3
-rw-r--r--x11-toolkits/qwt5/Makefile3
-rw-r--r--x11-toolkits/qwt6-designerplugin/Makefile3
-rw-r--r--x11-toolkits/qwt6/Makefile3
-rw-r--r--x11-toolkits/soqt/Makefile3
-rw-r--r--x11-wm/qlwm/Makefile3
-rw-r--r--x11/kactivities/Makefile3
-rw-r--r--x11/kde4-baseapps/Makefile3
-rw-r--r--x11/kde4-runtime/Makefile3
-rw-r--r--x11/kde4-workspace/Makefile5
-rw-r--r--x11/kdelibs4/Makefile3
-rw-r--r--x11/kgamma/Makefile3
-rw-r--r--x11/konsole/Makefile3
-rw-r--r--x11/libkonq/Makefile3
-rw-r--r--x11/plasma-scriptengine-python/Makefile3
-rw-r--r--x11/plasma-scriptengine-ruby/Makefile3
-rw-r--r--x11/py-qt4-opengl/Makefile3
-rw-r--r--x11/qimageblitz/Makefile3
-rw-r--r--x11/qt4-graphicssystems-opengl/Makefile3
-rw-r--r--x11/qt4-inputmethods/Makefile3
-rw-r--r--x11/qt4-opengl/Makefile3
-rw-r--r--x11/rsibreak-kde4/Makefile3
-rw-r--r--x11/yakuake-kde4/Makefile3
587 files changed, 635 insertions, 1216 deletions
diff --git a/accessibility/jovie/Makefile b/accessibility/jovie/Makefile
index 90c1025cccaf..319694caa325 100644
--- a/accessibility/jovie/Makefile
+++ b/accessibility/jovie/Makefile
@@ -23,8 +23,7 @@ CONFLICTS= ktts-4.[4-6].*
USE_XZ= yes
USE_CMAKE= yes
USE_KDE4= kdehier kdeprefix kdelibs automoc4
-USE_QT_VER= 4
-QT_COMPONENTS= xml qmake_build moc_build uic_build rcc_build
+USE_QT4= xml qmake_build moc_build uic_build rcc_build
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
diff --git a/accessibility/kaccessible/Makefile b/accessibility/kaccessible/Makefile
index a6915bbb09aa..0c8503c2c21a 100644
--- a/accessibility/kaccessible/Makefile
+++ b/accessibility/kaccessible/Makefile
@@ -22,8 +22,7 @@ CONFLICTS_INSTALL= kdeaccessibility-4.[0-7].*
USE_XZ= yes
USE_KDE4= kdelibs kdeprefix kdehier 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
MAKE_JOBS_SAFE= yes
.include <bsd.port.mk>
diff --git a/accessibility/kmag/Makefile b/accessibility/kmag/Makefile
index 6b9b8e396942..789f551e449e 100644
--- a/accessibility/kmag/Makefile
+++ b/accessibility/kmag/Makefile
@@ -20,8 +20,7 @@ CONFLICTS_INSTALL= kdeaccessibility-4.[0-7].*
USE_XZ= yes
USE_KDE4= kdelibs kdeprefix kdehier 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
MAKE_JOBS_SAFE= yes
MAN1= kmag.1
diff --git a/accessibility/kmousetool/Makefile b/accessibility/kmousetool/Makefile
index 2f08b6f55877..7756a3764dce 100644
--- a/accessibility/kmousetool/Makefile
+++ b/accessibility/kmousetool/Makefile
@@ -20,8 +20,7 @@ CONFLICTS_INSTALL= kdeaccessibility-4.[0-7].*
USE_XZ= yes
USE_KDE4= kdelibs kdeprefix kdehier 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_XORG= xtst
MAKE_JOBS_SAFE= yes
diff --git a/accessibility/kmouth/Makefile b/accessibility/kmouth/Makefile
index 44a2c63abbfd..713732afae61 100644
--- a/accessibility/kmouth/Makefile
+++ b/accessibility/kmouth/Makefile
@@ -20,8 +20,7 @@ CONFLICTS_INSTALL= kdeaccessibility-4.[0-7].*
USE_XZ= yes
USE_KDE4= kdelibs kdeprefix kdehier 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
MAKE_JOBS_SAFE= yes
MAN1= kmouth.1
diff --git a/accessibility/qt4-accessible/Makefile b/accessibility/qt4-accessible/Makefile
index 8557e75661c0..bcfa8cdf5cc0 100644
--- a/accessibility/qt4-accessible/Makefile
+++ b/accessibility/qt4-accessible/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt accessibility widgets
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build qt3support corelib gui network sql xml
+USE_QT4= qmake_build moc_build qt3support corelib gui network sql xml
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index bf5d5261caa3..f19511970322 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -21,8 +21,7 @@ CONFLICTS_INSTALL= kdeutils-4.[0-7].*
USE_XZ= yes
USE_KDE4= kdeprefix kdehier automoc4 kdelibs libkonq
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
MAN1= ark.1
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}
diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index 5a9acc71bd2d..571ecfa17235 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -32,8 +32,7 @@ LATEST_LINK= ${PORTNAME}-kde4
USE_GETTEXT= yes
USE_KDE4= kdehier kdeprefix kdelibs runtime automoc4
USE_MYSQL= embedded
-USE_QT_VER= 4
-QT_COMPONENTS= gui network opengl phonon script svg webkit \
+USE_QT4= gui network opengl phonon script svg webkit \
qmake_build moc_build rcc_build uic_build
USE_BZIP2= yes
USE_CMAKE= yes
diff --git a/audio/audex/Makefile b/audio/audex/Makefile
index b6056fdd8f70..1ed7b559b412 100644
--- a/audio/audex/Makefile
+++ b/audio/audex/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia \
USE_XZ= yes
USE_CMAKE= yes
USE_KDE4= automoc4 kdeprefix kdelibs
-USE_QT_VER= 4
-QT_COMPONENTS= gui dbus network svg xml \
+USE_QT4= gui dbus network svg xml \
qmake_build moc_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
diff --git a/audio/clementine-player/Makefile b/audio/clementine-player/Makefile
index 28d6e9b48d7d..5b850688ae8d 100644
--- a/audio/clementine-player/Makefile
+++ b/audio/clementine-player/Makefile
@@ -28,8 +28,7 @@ PROJECTHOST= ${PORTNAME}${PKGNAMESUFFIX}
USE_CMAKE= yes
USE_ICONV= yes
USE_GL= glew
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml qmake_build uic_build moc_build rcc_build \
+USE_QT4= gui xml qmake_build uic_build moc_build rcc_build \
linguist_build network sql opengl dbus qtestlib corelib
USE_GCC= 4.2+
INSTALLS_ICONS= yes
diff --git a/audio/cuberok/Makefile b/audio/cuberok/Makefile
index 09e93b74752a..928915892ecd 100644
--- a/audio/cuberok/Makefile
+++ b/audio/cuberok/Makefile
@@ -21,9 +21,8 @@ LIB_DEPENDS= avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
avutil.1:${PORTSDIR}/multimedia/ffmpeg \
tag.1:${PORTSDIR}/audio/taglib
-USE_QT_VER= 4
USE_LDCONFIG= yes
-QT_COMPONENTS= gui xml qmake_build uic_build moc_build rcc_build \
+USE_QT4= gui xml qmake_build uic_build moc_build rcc_build \
network phonon-gst sql
USE_ICONV= yes
USE_GETTEXT= yes
diff --git a/audio/cueplayer/Makefile b/audio/cueplayer/Makefile
index f709d5bf079b..ebb0e17386a9 100644
--- a/audio/cueplayer/Makefile
+++ b/audio/cueplayer/Makefile
@@ -16,8 +16,7 @@ COMMENT= CUE player
LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml qmake_build uic_build moc_build rcc_build network
+USE_QT4= gui xml qmake_build uic_build moc_build rcc_build network
USE_GSTREAMER= flac good dvd lame ugly ffmpeg taglib ogg vorbis soup libmms wavpack
LICENSE= GPLv3
diff --git a/audio/dssi/Makefile b/audio/dssi/Makefile
index 70f0484bd8a2..19b1c8ea98d4 100644
--- a/audio/dssi/Makefile
+++ b/audio/dssi/Makefile
@@ -40,8 +40,7 @@ MAN1= dssi_analyse_plugin.1 dssi_list_plugins.1 dssi_osc_send.1 \
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MQT4}
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui
+USE_QT4= corelib gui
QT_NONSTANDARD= yes
PLIST_SUB= QT=""
.else
diff --git a/audio/esperanza/Makefile b/audio/esperanza/Makefile
index 7dd76f4dc479..1a8a525f3da7 100644
--- a/audio/esperanza/Makefile
+++ b/audio/esperanza/Makefile
@@ -21,8 +21,7 @@ LIB_DEPENDS= xmmsclient++.4:${PORTSDIR}/audio/cpp-xmms2
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}+git${PORTVERSION:E}
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml network imageformats_run \
+USE_QT4= gui xml network imageformats_run \
qmake_build moc_build rcc_build uic_build
QT_NONSTANDARD= yes
USE_GMAKE= yes
diff --git a/audio/fmit/Makefile b/audio/fmit/Makefile
index 57c46481984c..08a79c17b5b7 100644
--- a/audio/fmit/Makefile
+++ b/audio/fmit/Makefile
@@ -23,8 +23,7 @@ OPTIONS_DEFINE= OSS ALSA PORTAUDIO JACK
OPTIONS_DEFAULT= OSS JACK
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui opengl \
+USE_QT4= corelib gui opengl \
linguist_build moc_build qmake_build rcc_build uic_build
USE_GL= glut
USE_CMAKE= yes
diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index c15a27185800..4191c0e92e67 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -23,8 +23,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN= does not install
MAJORVERSION= 0.9.5
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui linguist_build moc_build network qt3support rcc_build sql uic_build xml
+USE_QT4= corelib gui linguist_build moc_build network qt3support rcc_build sql uic_build xml
USE_SCONS= yes
OPTIONS= JACK "JACK support" on \
diff --git a/audio/kaudiocreator/Makefile b/audio/kaudiocreator/Makefile
index 4497c84cec74..55c79f0cecb9 100644
--- a/audio/kaudiocreator/Makefile
+++ b/audio/kaudiocreator/Makefile
@@ -25,8 +25,7 @@ RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame
USE_BZIP2= 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
LICENSE= GPLv2
diff --git a/audio/kid3-kde4/Makefile b/audio/kid3-kde4/Makefile
index 612bb5ab7c09..becf72aa3a4e 100644
--- a/audio/kid3-kde4/Makefile
+++ b/audio/kid3-kde4/Makefile
@@ -19,8 +19,7 @@ LICENSE= GPLv2
LATEST_LINK= ${PORTNAME}-kde4
USE_KDE4= kdelibs kdeprefix kdehier automoc4
-USE_QT_VER= 4
-QT_COMPONENTS= svg gui network dbus xml \
+USE_QT4= svg gui network dbus xml \
qmake_build moc_build rcc_build uic_build
USE_CMAKE= yes
# libchromaprint has not been ported yet
diff --git a/audio/kstreamripper/Makefile b/audio/kstreamripper/Makefile
index 9711ae728363..fb7c5e13b534 100644
--- a/audio/kstreamripper/Makefile
+++ b/audio/kstreamripper/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/streamripper:${PORTSDIR}/audio/streamripper
USE_BZIP2= yes
USE_CMAKE= yes
USE_KDE4= kdelibs kdehier kdeprefix 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
CMAKE_ARGS+= -DWITHOUT_LIBPROXY=YES # requires libproxy >= 0.3.1
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/audio/last.fm/Makefile b/audio/last.fm/Makefile
index df97a3b883b5..6da770a0594d 100644
--- a/audio/last.fm/Makefile
+++ b/audio/last.fm/Makefile
@@ -28,8 +28,7 @@ PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
SUB_FILES= pkg-install pkg-deinstall
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui imageformats_run moc_build network qmake_build rcc_build \
+USE_QT4= gui imageformats_run moc_build network qmake_build rcc_build \
sql uic_build xml
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/audio/liblastfm/Makefile b/audio/liblastfm/Makefile
index 278f3392aa00..e0e9b5a40fe6 100644
--- a/audio/liblastfm/Makefile
+++ b/audio/liblastfm/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS= samplerate.1:${PORTSDIR}/audio/libsamplerate \
USE_RUBY= yes
USE_GMAKE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib xml network sql gui qtestlib \
+USE_QT4= corelib xml network sql gui qtestlib \
qmake_build moc_build rcc_build uic_build
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= -release --prefix ${PREFIX}
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index 33084cceb74f..73af664870f5 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -38,8 +38,7 @@ OPTIONS= JACK "Enable JACK support" OFF \
USE_LDCONFIG= yes
USE_BZIP2= yes
USE_XORG= xft
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui xml moc_build uic_build rcc_build \
+USE_QT4= corelib gui xml moc_build uic_build rcc_build \
qmake_build
USE_CMAKE= yes
CMAKE_ARGS= -DWANT_ALSA:BOOL=OFF \
diff --git a/audio/mehdiaplayer/Makefile b/audio/mehdiaplayer/Makefile
index 804c4158c312..bc8d1e8cfd62 100644
--- a/audio/mehdiaplayer/Makefile
+++ b/audio/mehdiaplayer/Makefile
@@ -15,8 +15,7 @@ MAINTAINER= g.veniamin@googlemail.com
COMMENT= A simple media player using Qt/Phonon
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml qmake_build uic_build moc_build \
+USE_QT4= gui xml qmake_build uic_build moc_build \
rcc_build phonon
QMAKE_PRO= ${PORTNAME}.pro
diff --git a/audio/midipp/Makefile b/audio/midipp/Makefile
index adae10be376a..f59562c4eb04 100644
--- a/audio/midipp/Makefile
+++ b/audio/midipp/Makefile
@@ -21,9 +21,8 @@ LIB_DEPENDS= umidi20.1:${PORTSDIR}/audio/libumidi
LICENSE= BSD
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui qmake_build moc_build rcc_build
+USE_QT4= gui qmake_build moc_build rcc_build
MAKE_JOBS_SAFE= yes
diff --git a/audio/minitunes/Makefile b/audio/minitunes/Makefile
index ca49c2779dee..30f13b296427 100644
--- a/audio/minitunes/Makefile
+++ b/audio/minitunes/Makefile
@@ -16,8 +16,7 @@ COMMENT= Minitunes is just another music player
LIB_DEPENDS= tag.1:${PORTSDIR}/audio/taglib
-USE_QT_VER= 4
-QT_COMPONENTS= dbus gui moc_build network phonon qmake_build rcc_build \
+USE_QT4= dbus gui moc_build network phonon qmake_build rcc_build \
sql uic_build xml
INSTALLS_ICONS= yes
diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
index 81c9172743f7..908ab36d2b52 100644
--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@@ -36,8 +36,7 @@ WAVPACK_DESC= Enable WavPack audio support plugin
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_GL= glu
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui network opengl script sql svg webkit xml \
+USE_QT4= corelib gui network opengl script sql svg webkit xml \
xmlpatterns linguist_build moc_build qmake_build rcc_build \
uic_build
USE_SCONS= yes
diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile
index f2f10e9283a1..c53ae6ea3739 100644
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@@ -21,8 +21,7 @@ LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex \
protoc:${PORTSDIR}/devel/protobuf
USE_GMAKE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui svg iconengines_run xml sql network l10n \
+USE_QT4= gui svg iconengines_run xml sql network l10n \
linguist_build qmake_build moc_build rcc_build uic_build \
opengl sql-sqlite3_run
@@ -49,7 +48,7 @@ BROKEN= does not compile on FreeBSD 7.x
.if defined(WITHOUT_DBUS)
CONFIG+= no-dbus
.else
-QT_COMPONENTS+= dbus
+USE_QT4+= dbus
.endif
.if defined(WITHOUT_SYSCELT)
diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile
index 254821bb5d60..17ab30baf52e 100644
--- a/audio/murmur/Makefile
+++ b/audio/murmur/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS= protobuf.7:${PORTSDIR}/devel/protobuf
USERS= ${PORTNAME}
GROUPS= ${USERS}
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build corelib network xml sql sql-sqlite3_run
+USE_QT4= qmake_build moc_build corelib network xml sql sql-sqlite3_run
CONFIG= no-client
@@ -41,7 +40,7 @@ CONFIG+= no-ice
.endif
.if defined(WITH_DBUS)
-QT_COMPONENTS+= dbus
+USE_QT4+= dbus
.else
CONFIG+= no-dbus
.endif
diff --git a/audio/musescore/Makefile b/audio/musescore/Makefile
index 1c6e4f2d0493..67f30d401c05 100644
--- a/audio/musescore/Makefile
+++ b/audio/musescore/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so:${PORTSDIR}
USE_BZIP2= yes
USE_CMAKE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui network svg xml script scripttools designer webkit \
+USE_QT4= corelib gui network svg xml script scripttools designer webkit \
qmake_build moc_build uic_build linguist_build rcc_build
MAKE_JOBS_SAFE= yes
diff --git a/audio/mythplugin-mythmusic/Makefile b/audio/mythplugin-mythmusic/Makefile
index b9736b25f1f1..eb9e284de021 100644
--- a/audio/mythplugin-mythmusic/Makefile
+++ b/audio/mythplugin-mythmusic/Makefile
@@ -27,8 +27,7 @@ LIB_DEPENDS= cdio.13:${PORTSDIR}/sysutils/libcdio \
BUILD_DEPENDS= mythfrontend:${PORTSDIR}/multimedia/mythtv
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= linguist_build moc_build qmake_build rcc_build uic_build
+USE_QT4= linguist_build moc_build qmake_build rcc_build uic_build
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/lib/mythtv/plugins
diff --git a/audio/qjackctl/Makefile b/audio/qjackctl/Makefile
index 7ecb69ffecc4..a09e99e856ac 100644
--- a/audio/qjackctl/Makefile
+++ b/audio/qjackctl/Makefile
@@ -18,8 +18,7 @@ LICENSE= GPLv2
LIB_DEPENDS= asound.2:${PORTSDIR}/audio/alsa-lib \
jack.0:${PORTSDIR}/audio/jack
-USE_QT_VER= 4
-QT_COMPONENTS= corelib dbus gui xml \
+USE_QT4= corelib dbus gui xml \
linguist_build moc_build qmake_build rcc_build uic_build
QT_NONSTANDARD= yes
USE_GMAKE= yes
diff --git a/audio/qmpdclient/Makefile b/audio/qmpdclient/Makefile
index c671fe036078..5df300e9125f 100644
--- a/audio/qmpdclient/Makefile
+++ b/audio/qmpdclient/Makefile
@@ -20,8 +20,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS+= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
USE_BZIP2= 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 \
corelib gui network xml xmlpatterns
MAKE_JOBS_SAFE= yes
INSTALLS_ICONS= yes
@@ -39,12 +38,12 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
.if defined(WITHOUT_NLS)
PLIST_SUB+= NLS="@comment "
.else
-QT_COMPONENTS+= linguist_build
+USE_QT4+= linguist_build
PLIST_SUB+= NLS=""
.endif
.if defined(WITH_DBUS) && !defined(WITHOUT_DBUS)
-QT_COMPONENTS+= dbus
+USE_QT4+= dbus
QMAKEFLAGS+= "CONFIG+=qdbus"
.endif
diff --git a/audio/qsampler/Makefile b/audio/qsampler/Makefile
index 02c1f6cf4619..151b9259b102 100644
--- a/audio/qsampler/Makefile
+++ b/audio/qsampler/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS= gig.10:${PORTSDIR}/audio/libgig \
lscp.6:${PORTSDIR}/audio/liblscp
RUN_DEPENDS= linuxsampler:${PORTSDIR}/audio/linuxsampler
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui \
+USE_QT4= corelib gui \
linguist_build moc_build qmake_build rcc_build uic_build
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/audio/qsynth/Makefile b/audio/qsynth/Makefile
index 5ad9c4d8a907..c312514f7ab6 100644
--- a/audio/qsynth/Makefile
+++ b/audio/qsynth/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS= fluidsynth:${PORTSDIR}/audio/fluidsynth
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui qmake_build moc_build uic_build rcc_build linguist_build
+USE_QT4= gui qmake_build moc_build uic_build rcc_build linguist_build
CFLAGS+= -I${QT_INCDIR} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
LDFLAGS+= -L${QT_LIBDIR}
CONFIGURE_ARGS+=ac_cv_path_ac_moc=${MOC} ac_cv_path_ac_uic=${UIC} \
diff --git a/audio/quimup/Makefile b/audio/quimup/Makefile
index f4cee089881f..6dce542ba91a 100644
--- a/audio/quimup/Makefile
+++ b/audio/quimup/Makefile
@@ -18,8 +18,7 @@ COMMENT= QT4 Client for MPD (the Music Player Daemon)
LIB_DEPENDS= mpdclient.2:${PORTSDIR}/audio/libmpdclient
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui network \
+USE_QT4= corelib gui network \
qmake_build moc_build rcc_build uic_build
QMAKE_ARGS= PREFIX=${PREFIX}
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index b3b0af414eca..adc7124a3e05 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -28,8 +28,7 @@ LIB_DEPENDS+= lrdf.2:${PORTSDIR}/textproc/liblrdf \
USE_BZIP2= yes
USE_GMAKE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml network corelib sql qt3support \
+USE_QT4= gui xml network corelib sql qt3support \
rcc_build moc_build uic_build linguist_build
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/audio/soundkonverter/Makefile b/audio/soundkonverter/Makefile
index ee5f11037946..0016ec12b534 100644
--- a/audio/soundkonverter/Makefile
+++ b/audio/soundkonverter/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib \
kcddb:${PORTSDIR}/multimedia/kdemultimedia4
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 kdelibs
INSTALLS_ICONS= yes
diff --git a/audio/tepsonic/Makefile b/audio/tepsonic/Makefile
index abeee13941a5..733bb9532953 100644
--- a/audio/tepsonic/Makefile
+++ b/audio/tepsonic/Makefile
@@ -18,10 +18,9 @@ COMMENT= TepSonic is a simple and fast audio player
LIB_DEPENDS= tag.1:${PORTSDIR}/audio/taglib
USE_CMAKE= yes
-USE_QT_VER= 4
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
-QT_COMPONENTS= gui xml sql phonon network linguist_build \
+USE_QT4= gui xml sql phonon network linguist_build \
rcc_build qmake_build uic_build moc_build
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/audio/waheela/Makefile b/audio/waheela/Makefile
index 040a078fe9ae..b19636d8d381 100644
--- a/audio/waheela/Makefile
+++ b/audio/waheela/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= amarok>=2:${PORTSDIR}/audio/amarok-kde4
USE_CMAKE= yes
USE_KDE4= automoc4 kdeprefix kdehier kdelibs
-USE_QT_VER= 4
-QT_COMPONENTS= gui dbus network svg xml \
+USE_QT4= gui dbus network svg xml \
qmake_build moc_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
diff --git a/cad/klayout/Makefile b/cad/klayout/Makefile
index cb24b0aeb69d..a0ac261dac4a 100644
--- a/cad/klayout/Makefile
+++ b/cad/klayout/Makefile
@@ -15,8 +15,7 @@ MAINTAINER= hrs@FreeBSD.org
COMMENT= A Qt-based GDS2 Viewer
USE_GMAKE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui network moc_build sql uic_build \
+USE_QT4= corelib gui network moc_build sql uic_build \
rcc_build qt3support xml
PLIST_FILES= bin/klayout \
bin/strm2cif \
diff --git a/cad/layouteditor/Makefile b/cad/layouteditor/Makefile
index df0f5b89a304..4ed18cd30680 100644
--- a/cad/layouteditor/Makefile
+++ b/cad/layouteditor/Makefile
@@ -16,8 +16,7 @@ DISTNAME= LayoutEditor-${PORTVERSION:S,^0.0.,,}-gpl-src
MAINTAINER= hrs@FreeBSD.org
COMMENT= IC/MEMS layout editor
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui network moc_build sql uic_build \
+USE_QT4= corelib gui network moc_build sql uic_build \
rcc_build qmake qt3support xml
USE_ZIP= yes
USE_FREETYPE= yes
diff --git a/cad/librecad/Makefile b/cad/librecad/Makefile
index 7cc0a80a7de0..2d882f26278b 100644
--- a/cad/librecad/Makefile
+++ b/cad/librecad/Makefile
@@ -15,13 +15,12 @@ MAINTAINER= makc@FreeBSD.org
COMMENT= 2D CAD system
USE_XZ= yes
-USE_QT_VER= 4
-QT_COMPONENTS= help qt3support help-tools_build moc_build qmake_build \
+USE_QT4= help qt3support help-tools_build moc_build qmake_build \
rcc_build uic_build uic3_build
MAKE_JOBS_SAFE= yes
.if !defined(WITHOUT_NLS)
-QT_COMPONENTS+= linguist_build
+USE_QT4+= linguist_build
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
diff --git a/cad/meshlab/Makefile b/cad/meshlab/Makefile
index b6cfdcebbbd6..a4586ff01716 100644
--- a/cad/meshlab/Makefile
+++ b/cad/meshlab/Makefile
@@ -18,8 +18,7 @@ MAINTAINER= gahr@FreeBSD.org
COMMENT= A tool for processing and editing 3D triangular meshes
USE_GL= glew glu
-USE_QT_VER= 4
-QT_COMPONENTS= qmake corelib gui xml opengl network moc uic rcc
+USE_QT4= qmake corelib gui xml opengl network moc uic rcc
USE_LDCONFIG= yes
diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
index 9bd87f593a52..75372e52a0d8 100644
--- a/cad/openscad/Makefile
+++ b/cad/openscad/Makefile
@@ -27,8 +27,7 @@ LIB_DEPENDS= GLU.1:${PORTSDIR}/graphics/libGLU \
opencsg:${PORTSDIR}/graphics/opencsg
USE_GL= glew
-USE_QT_VER= 4
-QT_COMPONENTS= qmake corelib gui opengl moc uic rcc
+USE_QT4= qmake corelib gui opengl moc uic rcc
PLIST_SUB= PORTVERSION=${PORTVERSION}
#MAKE_JOBS_UNSAFE=yes
QMAKE_ENV = EIGEN2DIR=${LOCALBASE}/include/eigen2
diff --git a/cad/qelectrotech/Makefile b/cad/qelectrotech/Makefile
index 2fe2528e2dd4..b77a4caf5d44 100644
--- a/cad/qelectrotech/Makefile
+++ b/cad/qelectrotech/Makefile
@@ -15,8 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= g.veniamin@googlemail.com
COMMENT= QElectroTech is application to design electric diagrams
-USE_QT_VER= 4
-QT_COMPONENTS= gui network svg xml \
+USE_QT4= gui network svg xml \
moc_build qmake_build rcc_build uic_build
INSTALLS_ICONS= yes
diff --git a/cad/qfsm/Makefile b/cad/qfsm/Makefile
index 005cf72e5f57..90bc7bad6c56 100644
--- a/cad/qfsm/Makefile
+++ b/cad/qfsm/Makefile
@@ -18,8 +18,7 @@ COMMENT= A graphical tool for designing finite state machines
USE_BZIP2= yes
USE_XORG= xi
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui qt3support svg xml \
+USE_QT4= corelib gui qt3support svg xml \
moc_build porting_build qmake_build \
uic_build uic3_build rcc_build
USE_GNOME= desktopfileutils
diff --git a/cad/salome/Makefile.ext b/cad/salome/Makefile.ext
index f7fd798c60f3..2d440c1fe0c3 100644
--- a/cad/salome/Makefile.ext
+++ b/cad/salome/Makefile.ext
@@ -170,10 +170,9 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libboost_python.so:${PORTSDIR}/devel/boost-pyt
#Dependency from qt4
.if !${SAL_MODULE} == "kernel" && !${SAL_MODULE} == "randomizer"
-USE_QT_VER= 4
CONFIGURE_ENV+= QTDIR=${LOCALBASE}
QTFLAGS+= -I${LOCALBASE}/include/qt4 -L${LOCALBASE}/lib/qt4
-QT_COMPONENTS= gui opengl svg xml qmake_build moc_build rcc_build uic_build linguist
+USE_QT4= gui opengl svg xml qmake_build moc_build rcc_build uic_build linguist
AUTOTOOLS_ENV+= QTDIR=${LOCALBASE}
.endif
diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index 0b363d804237..90168ed05a95 100644
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -68,8 +68,7 @@ SUB_LIST+= GTK3_IM=xim
.if ${PORT_OPTIONS:MQT4}
USE_QT= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui
+USE_QT4= gui
CMAKE_ARGS+= -DENABLE_QT_IM_MODULE=ON
PLIST_SUB+= QT4=""
.else
diff --git a/chinese/fqterm/Makefile b/chinese/fqterm/Makefile
index edaf4d55a6f6..187294a06b68 100644
--- a/chinese/fqterm/Makefile
+++ b/chinese/fqterm/Makefile
@@ -21,8 +21,7 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
SUB_FILES= pkg-install pkg-deinstall ${PORTNAME}.desktop
USE_XORG= x11 ice xext xt xaw xpm xi xproto xextproto
USE_ZIP= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui network script qt3support imageformats \
+USE_QT4= gui network script qt3support imageformats \
codecs-cn codecs-tw codecs-jp codecs-kr \
qmake_build moc_build rcc_build uic_build linguist_build
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 41cba2a7f500..52d50cf6075d 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -38,8 +38,7 @@ MAN1= gcin.1 gcin-exit.1 gcin2tab.1 gcin-gb-toggle.1 gcin-kbm-toggle.1 \
.include <bsd.port.options.mk>
.if defined(WITH_QT_IM_MODULE)
-USE_QT_VER= 4
-QT_COMPONENTS= inputmethods qmake_build moc_build corelib gui
+USE_QT4= inputmethods qmake_build moc_build corelib gui
LIB_DEPENDS+= mng:${PORTSDIR}/graphics/libmng
PLIST_SUB+= QT_IM_MODULE=""
.else
diff --git a/chinese/qt4-codecs-cn/Makefile b/chinese/qt4-codecs-cn/Makefile
index 672df5ed9b79..72b085611d49 100644
--- a/chinese/qt4-codecs-cn/Makefile
+++ b/chinese/qt4-codecs-cn/Makefile
@@ -15,8 +15,7 @@ PKGNAMESUFFIX= -cn
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt GB 18030 codec plugin
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build corelib
+USE_QT4= qmake_build corelib
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/chinese/qt4-codecs-tw/Makefile b/chinese/qt4-codecs-tw/Makefile
index addf41698bff..ed2d86033179 100644
--- a/chinese/qt4-codecs-tw/Makefile
+++ b/chinese/qt4-codecs-tw/Makefile
@@ -15,8 +15,7 @@ PKGNAMESUFFIX= -tw
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt Big-5 codec plugin
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build corelib
+USE_QT4= qmake_build corelib
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/comms/cutecom/Makefile b/comms/cutecom/Makefile
index 3846a2a50e8d..209a5243b577 100644
--- a/comms/cutecom/Makefile
+++ b/comms/cutecom/Makefile
@@ -16,8 +16,7 @@ COMMENT= Graphical serial terminal
RUN_DEPENDS= lsz:${PORTSDIR}/comms/lrzsz
-USE_QT_VER= 4
-QT_COMPONENTS= qt3support qmake_build moc_build rcc_build uic_build
+USE_QT4= qt3support qmake_build moc_build rcc_build uic_build
USE_CMAKE= yes
MAN1= cutecom.1
diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile
index 0a43e40c8e97..bf78c25cfa82 100644
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/Makefile
@@ -21,8 +21,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/databases/akonadi-google/Makefile b/databases/akonadi-google/Makefile
index 96f1a13f84ea..27a39550a600 100644
--- a/databases/akonadi-google/Makefile
+++ b/databases/akonadi-google/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS= qjson.0:${PORTSDIR}/devel/qjson
BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
USE_KDE4= kdehier kdelibs kdeprefix pimlibs automoc4
-USE_QT_VER= 4
-QT_COMPONENTS= dbus gui network webkit xml \
+USE_QT4= dbus gui network webkit xml \
moc_build qmake_build rcc_build uic_build
USE_CMAKE= yes
MAKE_JOBS_SAFE= yes
diff --git a/databases/akonadi-googledata/Makefile b/databases/akonadi-googledata/Makefile
index 6aab8d79c144..7f0c083aa1bc 100644
--- a/databases/akonadi-googledata/Makefile
+++ b/databases/akonadi-googledata/Makefile
@@ -19,8 +19,7 @@ LIB_DEPENDS= gcal:${PORTSDIR}/deskutils/libgcal
USE_BZIP2= yes
USE_CMAKE= yes
USE_GETTEXT= yes
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build rcc_build moc_build uic_build dbus
+USE_QT4= qmake_build rcc_build moc_build uic_build dbus
USE_KDE4= kdelibs kdeprefix pimlibs automoc4 akonadi
.include <bsd.port.mk>
diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile
index 97a590f27b4c..ce84eced1e7e 100644
--- a/databases/akonadi/Makefile
+++ b/databases/akonadi/Makefile
@@ -24,8 +24,7 @@ LIB_DEPENDS+= execinfo.1:${PORTSDIR}/devel/libexecinfo
BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib network qtestlib dbus gui sql \
+USE_QT4= corelib network qtestlib dbus gui sql \
qmake_build moc_build rcc_build uic_build
USE_KDE4= kdehier kdeprefix sharedmime automoc4 soprano
KDE4_BUILDENV= yes
@@ -44,7 +43,7 @@ OPTIONS= MYSQL "Install MySQL plugin and server (recommended)" on \
.ifndef(WITHOUT_MYSQL)
USE_MYSQL= server
-QT_COMPONENTS+= sql-mysql_run
+USE_QT4+= sql-mysql_run
.endif
.ifdef(WITH_PGSQL)
@@ -52,7 +51,7 @@ QT_COMPONENTS+= sql-mysql_run
# it over MySQL might like to use some advanced configuration like a
# remote server.
#USE_PGSQL= server
-QT_COMPONENTS+= sql-pgsql_run
+USE_QT4+= sql-pgsql_run
.endif
.ifdef(WITH_SQLITE)
diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile
index eba7b9596938..99510b815c60 100644
--- a/databases/kbibtex/Makefile
+++ b/databases/kbibtex/Makefile
@@ -19,8 +19,7 @@ USE_BZIP2= yes
USE_CMAKE= yes
USE_GNOME= libxml2 libxslt
USE_KDE4= kdelibs kdeprefix automoc4 sharedmime
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build uic_build rcc_build \
+USE_QT4= qmake_build moc_build uic_build rcc_build \
webkit
MAKE_JOBS_SAFE= yes
diff --git a/databases/py-qt4-sql/Makefile b/databases/py-qt4-sql/Makefile
index cdfd6b399bab..7ac43108fc9f 100644
--- a/databases/py-qt4-sql/Makefile
+++ b/databases/py-qt4-sql/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= sql qmake_build
+USE_QT4= sql qmake_build
OPTIONS= API "Install QtSql API for QScintilla2" on \
DEBUG "Enable debugging in generated code" off \
diff --git a/databases/qt4-ibase-plugin/Makefile b/databases/qt4-ibase-plugin/Makefile
index 1522a5b10de4..5a8128810d0a 100644
--- a/databases/qt4-ibase-plugin/Makefile
+++ b/databases/qt4-ibase-plugin/Makefile
@@ -16,8 +16,7 @@ COMMENT= Qt IBase/Firebird database plugin
DB= ibase
USE_FIREBIRD= yes
-USE_QT_VER= 4
-QT_COMPONENTS= moc_build sql
+USE_QT4= moc_build sql
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/databases/qt4-mysql-plugin/Makefile b/databases/qt4-mysql-plugin/Makefile
index d7553face495..c554119f6a89 100644
--- a/databases/qt4-mysql-plugin/Makefile
+++ b/databases/qt4-mysql-plugin/Makefile
@@ -15,8 +15,7 @@ COMMENT= Qt MySQL database plugin
DB= mysql
-USE_QT_VER= 4
-QT_COMPONENTS= moc_build sql
+USE_QT4= moc_build sql
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/databases/qt4-odbc-plugin/Makefile b/databases/qt4-odbc-plugin/Makefile
index e14c60e384a7..148140a7c151 100644
--- a/databases/qt4-odbc-plugin/Makefile
+++ b/databases/qt4-odbc-plugin/Makefile
@@ -17,8 +17,7 @@ DB= odbc
LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc
-USE_QT_VER= 4
-QT_COMPONENTS= moc_build sql
+USE_QT4= moc_build sql
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/databases/qt4-pgsql-plugin/Makefile b/databases/qt4-pgsql-plugin/Makefile
index ae8b81659e3d..7af82d56a597 100644
--- a/databases/qt4-pgsql-plugin/Makefile
+++ b/databases/qt4-pgsql-plugin/Makefile
@@ -15,8 +15,7 @@ COMMENT= Qt PostgreSQL database plugin
DB= psql
-USE_QT_VER= 4
-QT_COMPONENTS= moc_build sql
+USE_QT4= moc_build sql
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/databases/qt4-sql/Makefile b/databases/qt4-sql/Makefile
index 57fc3a25f969..43a52983414d 100644
--- a/databases/qt4-sql/Makefile
+++ b/databases/qt4-sql/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SQL library
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build corelib
+USE_QT4= qmake_build moc_build corelib
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/databases/qt4-sqlite-plugin/Makefile b/databases/qt4-sqlite-plugin/Makefile
index f1396a71eb12..72a342fb8ff7 100644
--- a/databases/qt4-sqlite-plugin/Makefile
+++ b/databases/qt4-sqlite-plugin/Makefile
@@ -17,8 +17,7 @@ DB= sqlite2
LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2
-USE_QT_VER= 4
-QT_COMPONENTS= moc_build sql
+USE_QT4= moc_build sql
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/databases/qt4-sqlite3-plugin/Makefile b/databases/qt4-sqlite3-plugin/Makefile
index a7a957c831ac..befcb225d775 100644
--- a/databases/qt4-sqlite3-plugin/Makefile
+++ b/databases/qt4-sqlite3-plugin/Makefile
@@ -18,8 +18,7 @@ DISTINFO_FILE= ${PORTSDIR}/devel/qt4/distinfo
LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3
-USE_QT_VER= 4
-QT_COMPONENTS= moc_build sql
+USE_QT4= moc_build sql
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/databases/sqliteman/Makefile b/databases/sqliteman/Makefile
index 4be522840a27..a600ea2722b6 100644
--- a/databases/sqliteman/Makefile
+++ b/databases/sqliteman/Makefile
@@ -17,10 +17,9 @@ COMMENT= Admin's GUI tool for Sqlite3
LIB_DEPENDS= qscintilla2:${PORTSDIR}/devel/qscintilla2
USE_CMAKE= yes
-USE_QT_VER= 4
USE_SQLITE= yes
CMAKE_ENV+= QMAKESPEC=${QMAKESPEC}
-QT_COMPONENTS= qmake_build gui moc_build rcc_build uic_build xml sql
+USE_QT4= qmake_build gui moc_build rcc_build uic_build xml sql
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/databases/tora/Makefile b/databases/tora/Makefile
index b824c2fc061b..0fb1306186d2 100644
--- a/databases/tora/Makefile
+++ b/databases/tora/Makefile
@@ -24,8 +24,7 @@ OPTIONS= ORACLE "Build with Oracle support (i386 only)" off \
MYSQL "Build with MySQL support" on
USE_AUTOTOOLS= aclocal automake autoconf autoheader libtool
-USE_QT_VER= 4
-QT_COMPONENTS= gui corelib sql xml network linguist moc_build uic_build rcc_build
+USE_QT4= gui corelib sql xml network linguist moc_build uic_build rcc_build
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index 3b74f123366a..c26e9b291753 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -49,8 +49,7 @@ OPTIONS= PODOFO "PDF support via PoDoFo library" on
USE_XZ= yes
USE_PYTHON= 2.7
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build
+USE_QT4= qmake_build moc_build
INSTALLS_ICONS= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
CFLAGS+= "-I${LOCALBASE}/include"
diff --git a/deskutils/cdcat/Makefile b/deskutils/cdcat/Makefile
index 8eabd83084fc..c249cad78cd5 100644
--- a/deskutils/cdcat/Makefile
+++ b/deskutils/cdcat/Makefile
@@ -30,8 +30,7 @@ BUILD_WRKSRC= ${WRKSRC}/src
PROJECTHOST= lib7zip
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui xml \
+USE_QT4= corelib gui xml \
linguist_build moc_build qmake_build uic_build
INSTALLS_ICONS= yes
MAKE_JOBS_SAFE= yes
diff --git a/deskutils/charmtimetracker/Makefile b/deskutils/charmtimetracker/Makefile
index 5d8ed724deb5..ba4454c9d2a4 100644
--- a/deskutils/charmtimetracker/Makefile
+++ b/deskutils/charmtimetracker/Makefile
@@ -24,8 +24,7 @@ WRKSRC= ${WRKDIR}/KDAB-Charm-3151d25
USE_CMAKE= yes
CMAKE_ARGS+= -DCharm_VERSION:STRING=${PORTVERSION}
USE_KDE4= kdehier kdeprefix
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib gui network \
+USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui network \
qtestlib sql sql-sqlite3 xml
USE_XORG= ice x11 xext xscrnsaver
INSTALLS_ICONS= yes
diff --git a/deskutils/epoch/Makefile b/deskutils/epoch/Makefile
index 1010513e6459..85830e164ac4 100644
--- a/deskutils/epoch/Makefile
+++ b/deskutils/epoch/Makefile
@@ -19,8 +19,7 @@ LINCENSE= GPLv3
PROJECTHOST= gepoch
USE_ZIP= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui qmake_build moc_build rcc_build
+USE_QT4= gui qmake_build moc_build rcc_build
PLIST_FILES= bin/${PORTNAME} share/pixmaps/${PORTNAME}.png
diff --git a/deskutils/fbreader/Makefile b/deskutils/fbreader/Makefile
index 774f5246bc73..146702dd4294 100644
--- a/deskutils/fbreader/Makefile
+++ b/deskutils/fbreader/Makefile
@@ -26,8 +26,7 @@ UI= gtk
USE_GNOME= gtk20
.else
UI= qt4
-USE_QT_VER= 4
-QT_COMPONENTS= gui corelib imageformats network moc_build
+USE_QT4= gui corelib imageformats network moc_build
LDFLAGS+= -L${QT_LIBDIR}
.endif
diff --git a/deskutils/fet/Makefile b/deskutils/fet/Makefile
index 2c48430003c9..868fc1f97e95 100644
--- a/deskutils/fet/Makefile
+++ b/deskutils/fet/Makefile
@@ -18,8 +18,7 @@ MAINTAINER= salfrancl@yahoo.es
COMMENT= FET is free timetabling software
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui network qt3support xml \
+USE_QT4= gui network qt3support xml \
moc_build qmake_build rcc_build uic_build
HAS_CONFIGURE= yes
QMAKE_ARGS= -unix PREFIX=${PREFIX} \
diff --git a/deskutils/google-gadgets/Makefile b/deskutils/google-gadgets/Makefile
index d1db55e38d12..573574d283ea 100644
--- a/deskutils/google-gadgets/Makefile
+++ b/deskutils/google-gadgets/Makefile
@@ -53,8 +53,7 @@ OPTIONS= DEBUGGING "Enable debug output on runtime" on\
.include <bsd.port.options.mk>
.if defined(WITH_QT)
-USE_QT_VER= 4
-QT_COMPONENTS= webkit opengl gui corelib script network moc_build
+USE_QT4= webkit opengl gui corelib script network moc_build
.endif
.if defined(WITH_GTKWEBKIT)
diff --git a/deskutils/kchmviewer-kde4/Makefile b/deskutils/kchmviewer-kde4/Makefile
index 160ec0fb29bb..e97e0e20b849 100644
--- a/deskutils/kchmviewer-kde4/Makefile
+++ b/deskutils/kchmviewer-kde4/Makefile
@@ -20,8 +20,7 @@ LATEST_LINK= ${PORTNAME}-kde4
USE_CMAKE= yes
USE_KDE4= kdeprefix kdelibs automoc4
-USE_QT_VER= 4
-QT_COMPONENTS= webkit qmake_build moc_build rcc_build uic_build
+USE_QT4= webkit qmake_build moc_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
post-install:
diff --git a/deskutils/kdepim4-runtime/Makefile b/deskutils/kdepim4-runtime/Makefile
index d6f4b4889d8d..2c98635f2821 100644
--- a/deskutils/kdepim4-runtime/Makefile
+++ b/deskutils/kdepim4-runtime/Makefile
@@ -25,8 +25,7 @@ USE_GNOME= libxml2
USE_KDE4= kdehier kdelibs kdeprefix pimlibs \
akonadi automoc4 ontologies sharedmime soprano strigi
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= dbus designer gui network xml xmlpatterns \
+USE_QT4= dbus designer gui network xml xmlpatterns \
qmake_build moc_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
CMAKE_ARGS= -DKDEPIM_MOBILE_UI:BOOL=OFF
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index bc9aa2fc38d7..35abc8e5bc12 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -34,8 +34,7 @@ USE_KDE4= kdehier kdelibs kdeprefix pimlibs \
akonadi automoc4 ontologies soprano strigi
KDE4_BUILDENV= yes
USE_OPENLDAP= yes
-USE_QT_VER= 4
-QT_COMPONENTS= dbus designer gui network \
+USE_QT4= dbus designer gui network \
qt3support script sql webkit xml \
qmake_build moc_build rcc_build uic_build
USE_XORG= x11 xscrnsaver
diff --git a/deskutils/kdepim44-runtime/Makefile b/deskutils/kdepim44-runtime/Makefile
index 13e0455dba6a..10d82ce06b13 100644
--- a/deskutils/kdepim44-runtime/Makefile
+++ b/deskutils/kdepim44-runtime/Makefile
@@ -23,8 +23,7 @@ LATEST_LINK= ${PORTNAME}44
USE_KDE4= pimlibs kdeprefix kdehier sharedmime automoc4
KDE4_BUILDENV= yes
USE_BZIP2= 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
post-patch:
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index bf402e372ce9..ebfe438f1ebe 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -28,8 +28,7 @@ USE_KDE4= kdelibs pimlibs \
akonadi kdeprefix kdehier automoc4 oxygen
KDE4_BUILDENV= yes
USE_BZIP2= 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_OPENLDAP= yes
MAKE_JOBS_SAFE= yes
diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile
index 228abd55dc29..21cbf2bf57aa 100644
--- a/deskutils/kdepimlibs4/Makefile
+++ b/deskutils/kdepimlibs4/Makefile
@@ -29,8 +29,7 @@ USE_KDE4= kdelibs akonadi kdeprefix kdehier \
automoc4 ontologies sharedmime soprano
KDE4_BUILDENV= yes
USE_OPENLDAP= yes
-USE_QT_VER= 4
-QT_COMPONENTS= dbus designer gui network sql xml \
+USE_QT4= dbus designer gui network sql xml \
qmake_build moc_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
diff --git a/deskutils/kdeplasma-addons/Makefile b/deskutils/kdeplasma-addons/Makefile
index 0da8e2445c47..266c549754e7 100644
--- a/deskutils/kdeplasma-addons/Makefile
+++ b/deskutils/kdeplasma-addons/Makefile
@@ -28,8 +28,7 @@ USE_XZ= yes
USE_KDE4= kdehier kdelibs kdeprefix libkexiv2 pimlibs workspace \
akonadi attica automoc4 qimageblitz sharedmime soprano
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= dbus gui network opengl script sql svg webkit xml \
+USE_QT4= dbus gui network opengl script sql svg webkit xml \
qmake_build moc_build rcc_build uic_build
USE_XORG= x11 xrender xtst
MAKE_JOBS_SAFE= yes
diff --git a/deskutils/kruler/Makefile b/deskutils/kruler/Makefile
index a65b01f078ca..05e42ec61357 100644
--- a/deskutils/kruler/Makefile
+++ b/deskutils/kruler/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= corelib qmake_build moc_build uic_build rcc_build
+USE_QT4= corelib qmake_build moc_build uic_build rcc_build
USE_XORG= x11
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/deskutils/ksshaskpass/Makefile b/deskutils/ksshaskpass/Makefile
index 705c99852891..1c9a8bb9f083 100644
--- a/deskutils/ksshaskpass/Makefile
+++ b/deskutils/ksshaskpass/Makefile
@@ -18,8 +18,7 @@ COMMENT= A KDE 4 version of ssh-askpass with KWallet support
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_CMAKE= yes
USE_KDE4= kdelibs automoc4
-USE_QT_VER= 4
-QT_COMPONENTS= qmake moc_build uic_build qmake_build rcc_build
+USE_QT4= qmake moc_build uic_build qmake_build rcc_build
MAN1= ksshaskpass.1
SUB_FILES= pkg-message
diff --git a/deskutils/launchy/Makefile b/deskutils/launchy/Makefile
index 3ee7c915cad1..a73326389a15 100644
--- a/deskutils/launchy/Makefile
+++ b/deskutils/launchy/Makefile
@@ -18,8 +18,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/spirit/core.hpp:${PORTSDIR}/devel/boos
RUN_DEPENDS= ${LOCALBASE}/bin/xdg-open:${PORTSDIR}/devel/xdg-utils
USE_DOS2UNIX= readme.lyx readme.txt
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build gui network
+USE_QT4= qmake_build moc_build rcc_build uic_build gui network
PORTDOCS= *
post-patch:
diff --git a/deskutils/nagaina/Makefile b/deskutils/nagaina/Makefile
index 1e4bb85e75b1..15ba839f519b 100644
--- a/deskutils/nagaina/Makefile
+++ b/deskutils/nagaina/Makefile
@@ -15,8 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-sources
MAINTAINER= ports@FreeBSD.org
COMMENT= A notes-taking application based QT4
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml qmake_build moc_build rcc_build uic_build
+USE_QT4= gui xml qmake_build moc_build rcc_build uic_build
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
PLIST_FILES= bin/${PORTNAME} share/pixmaps/${PORTNAME}.png
diff --git a/deskutils/plasma-applet-cwp/Makefile b/deskutils/plasma-applet-cwp/Makefile
index f504b0178bea..2caa4ef4b17a 100644
--- a/deskutils/plasma-applet-cwp/Makefile
+++ b/deskutils/plasma-applet-cwp/Makefile
@@ -22,8 +22,7 @@ USE_GETTEXT= yes
USE_BZIP2= yes
USE_CMAKE= yes
USE_KDE4= automoc4 kdeprefix kdelibs
-USE_QT_VER= 4
-QT_COMPONENTS= gui dbus network opengl svg phonon webkit xml \
+USE_QT4= gui dbus network opengl svg phonon webkit xml \
qmake_build moc_build rcc_build uic_build
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/deskutils/plasma-applet-fancytasks/Makefile b/deskutils/plasma-applet-fancytasks/Makefile
index ee8702c80dcd..b5c7e29e0710 100644
--- a/deskutils/plasma-applet-fancytasks/Makefile
+++ b/deskutils/plasma-applet-fancytasks/Makefile
@@ -23,8 +23,7 @@ LIB_DEPENDS= qimageblitz.4:${PORTSDIR}/x11/qimageblitz
USE_BZIP2= yes
USE_CMAKE= yes
USE_KDE4= automoc4 kdeprefix kdelibs kdebase workspace
-USE_QT_VER= 4
-QT_COMPONENTS= gui dbus network opengl svg phonon webkit xml \
+USE_QT4= gui dbus network opengl svg phonon webkit xml \
qmake_build moc_build rcc_build uic_build
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/deskutils/plasma-applet-panelspacer/Makefile b/deskutils/plasma-applet-panelspacer/Makefile
index a1b465ac9da6..745c2105f351 100644
--- a/deskutils/plasma-applet-panelspacer/Makefile
+++ b/deskutils/plasma-applet-panelspacer/Makefile
@@ -18,8 +18,7 @@ COMMENT= Panel spacer plasma applet for KDE4
USE_CMAKE= yes
USE_KDE4= automoc4 kdeprefix workspace
-USE_QT_VER= 4
-QT_COMPONENTS= gui dbus network opengl svg webkit xml \
+USE_QT4= gui dbus network opengl svg webkit xml \
qmake_build moc_build rcc_build uic_build
WRKSRC= ${WRKDIR}/Panelspacer_from_svn_pour_kdelook-tmp
diff --git a/deskutils/plasma-applet-playwolf/Makefile b/deskutils/plasma-applet-playwolf/Makefile
index 7722bb178e62..94afd694f7ce 100644
--- a/deskutils/plasma-applet-playwolf/Makefile
+++ b/deskutils/plasma-applet-playwolf/Makefile
@@ -18,8 +18,7 @@ COMMENT= Amarok 2.x plasma applet for KDE4
USE_BZIP2= yes
USE_CMAKE= yes
USE_KDE4= automoc4 kdeprefix kdelibs
-USE_QT_VER= 4
-QT_COMPONENTS= gui dbus network opengl phonon svg webkit xml xmlpatterns \
+USE_QT4= gui dbus network opengl phonon svg webkit xml xmlpatterns \
qmake_build moc_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
diff --git a/deskutils/plasma-applet-serverstatuswidget/Makefile b/deskutils/plasma-applet-serverstatuswidget/Makefile
index 33aa7b686c83..59adfd112f97 100644
--- a/deskutils/plasma-applet-serverstatuswidget/Makefile
+++ b/deskutils/plasma-applet-serverstatuswidget/Makefile
@@ -20,8 +20,7 @@ USE_BZIP2= yes
USE_CMAKE= yes
USE_GETTEXT= yes
USE_KDE4= automoc4 kdeprefix workspace
-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
LICENSE= GPLv2
diff --git a/deskutils/plasma-applet-simpleweatherforecast/Makefile b/deskutils/plasma-applet-simpleweatherforecast/Makefile
index 6988e7215e44..d5cf52ace200 100644
--- a/deskutils/plasma-applet-simpleweatherforecast/Makefile
+++ b/deskutils/plasma-applet-simpleweatherforecast/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget
USE_CMAKE= yes
USE_KDE4= automoc4 kdeprefix kdelibs
-USE_QT_VER= 4
-QT_COMPONENTS= gui dbus network opengl svg webkit xml \
+USE_QT4= gui dbus network opengl svg webkit xml \
qmake_build moc_build rcc_build uic_build
WRKSRC= ${WRKDIR}/plasma-${PORTNAME}-${PORTVERSION}-kde-4.3.80
diff --git a/deskutils/plasma-applet-teacooker/Makefile b/deskutils/plasma-applet-teacooker/Makefile
index aaeb6780e19e..5fd20f6a865b 100644
--- a/deskutils/plasma-applet-teacooker/Makefile
+++ b/deskutils/plasma-applet-teacooker/Makefile
@@ -18,8 +18,7 @@ COMMENT= Tea cooker plasma applet for KDE4
USE_CMAKE= yes
USE_KDE4= automoc4 kdeprefix kdelibs
-USE_QT_VER= 4
-QT_COMPONENTS= gui dbus network opengl svg webkit xml \
+USE_QT4= gui dbus network opengl svg webkit xml \
qmake_build moc_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
diff --git a/deskutils/plasma-applet-yawp/Makefile b/deskutils/plasma-applet-yawp/Makefile
index e1a828e23137..56f2924bc632 100644
--- a/deskutils/plasma-applet-yawp/Makefile
+++ b/deskutils/plasma-applet-yawp/Makefile
@@ -20,8 +20,7 @@ LICENSE= GPLv2
USE_BZIP2= yes
USE_CMAKE= yes
USE_KDE4= automoc4 kdeprefix workspace
-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_GETTEXT= yes
MAKE_JOBS_SAFE= yes
diff --git a/deskutils/q4wine/Makefile b/deskutils/q4wine/Makefile
index 70f981a5b68b..a53cfa468224 100644
--- a/deskutils/q4wine/Makefile
+++ b/deskutils/q4wine/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS= sudo:${PORTSDIR}/security/sudo \
cabextract:${PORTSDIR}/archivers/cabextract \
icotool:${PORTSDIR}/graphics/icoutils
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build rcc_build moc_build uic_build \
+USE_QT4= qmake_build rcc_build moc_build uic_build \
linguist_build corelib gui sql network
ONLY_FOR_ARCHS= i386
@@ -39,7 +38,7 @@ OPTIONS= DBUS "Enable DBus notification support" on
.if defined(WITHOUT_DBUS)
CMAKE_ARGS+= -DWITH_DBUS:BOOL=OFF
.else
-QT_COMPONENTS+= dbus
+USE_QT4+= dbus
.endif
post-install:
diff --git a/deskutils/qlabels/Makefile b/deskutils/qlabels/Makefile
index c1883433ccf9..da834a532025 100644
--- a/deskutils/qlabels/Makefile
+++ b/deskutils/qlabels/Makefile
@@ -17,8 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A labels and business cards creating and printing software
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= xml gui corelib qmake_build uic_build moc_build rcc_build
+USE_QT4= xml gui corelib qmake_build uic_build moc_build rcc_build
WRKSRC= ${WRKDIR}/${DISTNAME:C/_/-/}
DESKTOP_ENTRIES= "qlabels" \
diff --git a/deskutils/qorganizer/Makefile b/deskutils/qorganizer/Makefile
index e16b2058a297..c4020ae85dc7 100644
--- a/deskutils/qorganizer/Makefile
+++ b/deskutils/qorganizer/Makefile
@@ -15,8 +15,7 @@ DISTNAME= qOrganizer-${PORTVERSION}
MAINTAINER= miwi@FreeBSD.org
COMMENT= A general organizer that includes calendar with jurnal and schedule
-USE_QT_VER= 4
-QT_COMPONENTS= gui network qmake_build moc_build rcc_build sql
+USE_QT4= gui network qmake_build moc_build rcc_build sql
WRKSRC= ${WRKDIR}/qOrganizer/src
PLIST_FILES= bin/qOrganizer share/pixmaps/qOrganizer.png
diff --git a/deskutils/qrfcview/Makefile b/deskutils/qrfcview/Makefile
index 2a0c448f0684..be2672a220fa 100644
--- a/deskutils/qrfcview/Makefile
+++ b/deskutils/qrfcview/Makefile
@@ -15,8 +15,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Graphical RFC viewer
-USE_QT_VER= 4
-QT_COMPONENTS= gui network corelib qmake_build uic_build moc_build rcc_build
+USE_QT4= gui network corelib qmake_build uic_build moc_build rcc_build
PLIST_FILES= bin/qRFCView
do-configure:
diff --git a/deskutils/qtm/Makefile b/deskutils/qtm/Makefile
index c65fd04eebaa..baf2d21d201a 100644
--- a/deskutils/qtm/Makefile
+++ b/deskutils/qtm/Makefile
@@ -18,8 +18,7 @@ COMMENT= Blog management application based on Qt 4
LICENSE= GPLv2
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib dbus gui network xml \
+USE_QT4= corelib dbus gui network xml \
moc_build qmake_build rcc_build uic_build
USE_OPENSSL= yes
USE_CMAKE= yes
diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile
index 7b3cd34c03ea..3b9c01c50018 100644
--- a/deskutils/recoll/Makefile
+++ b/deskutils/recoll/Makefile
@@ -37,8 +37,7 @@ MAN5= recoll.conf.5
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MQT4}
-USE_QT_VER= 4
-QT_COMPONENTS= webkit moc_build qmake_build rcc_build uic_build
+USE_QT4= webkit moc_build qmake_build rcc_build uic_build
QT_NONSTANDARD= yes
CONFIGURE_ENV+= QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}"
INSTALLS_ICONS= yes
diff --git a/deskutils/semantik/Makefile b/deskutils/semantik/Makefile
index 2f181688723b..0013aaf07ef5 100644
--- a/deskutils/semantik/Makefile
+++ b/deskutils/semantik/Makefile
@@ -23,8 +23,7 @@ USE_KDE4= kdehier kdelibs kdeprefix
USE_OCAML= yes
NO_OCAML_RUNDEPENDS= yes
USE_PYTHON_BUILD= 2.5+
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui linguist svg webkit xml \
+USE_QT4= corelib gui linguist svg webkit xml \
moc_build qmake_build uic_build
MAKE_JOBS_SAFE= yes
CONFIGURE_ENV= PATH="${KDE4_PREFIX}/bin:$$PATH" WAF_HOME="${WRKSRC}"
diff --git a/deskutils/silence/Makefile b/deskutils/silence/Makefile
index 9f22a1978883..98438d6503db 100644
--- a/deskutils/silence/Makefile
+++ b/deskutils/silence/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/katepart.so:${PORTSDIR}/editors/kate
USE_CMAKE= yes
USE_KDE4= kdelibs kdehier kdeprefix automoc4
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build linguist_build
+USE_QT4= qmake_build moc_build rcc_build uic_build linguist_build
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/deskutils/strigi/Makefile b/deskutils/strigi/Makefile
index b2ca3d2febdf..745ad0b87dc2 100644
--- a/deskutils/strigi/Makefile
+++ b/deskutils/strigi/Makefile
@@ -21,8 +21,7 @@ LIB_DEPENDS= avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
exiv2.10:${PORTSDIR}/graphics/exiv2 \
boost_thread:${PORTSDIR}/devel/boost-libs
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui dbus moc_build uic_build qmake_build rcc_build
+USE_QT4= corelib gui dbus moc_build uic_build qmake_build rcc_build
USE_BZIP2= yes
USE_GNOME= libxml2 pkgconfig
USE_FAM= yes
diff --git a/deskutils/superkaramba/Makefile b/deskutils/superkaramba/Makefile
index f91d0338c48a..55c5cd427a9f 100644
--- a/deskutils/superkaramba/Makefile
+++ b/deskutils/superkaramba/Makefile
@@ -20,8 +20,7 @@ USE_XZ= yes
USE_PYTHON= 2.5+
USE_KDE4= kdehier kdelibs kdeprefix automoc4 qimageblitz
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/deskutils/treeline/Makefile b/deskutils/treeline/Makefile
index 456153ac05e3..c346b39452f5 100644
--- a/deskutils/treeline/Makefile
+++ b/deskutils/treeline/Makefile
@@ -30,7 +30,7 @@ OPTIONS= ASPELL "install with aspell support" off \
HTTPLOAD "install httpLoad plugin" off
WRKSRC= ${WRKDIR}/TreeLine
-USE_QT_VER= 4
+USE_QT4= yes
USE_PYTHON= 2.5+
NO_BUILD= yes
diff --git a/deskutils/tuxcards/Makefile b/deskutils/tuxcards/Makefile
index 4ac94f6a28c2..f3a12b93b946 100644
--- a/deskutils/tuxcards/Makefile
+++ b/deskutils/tuxcards/Makefile
@@ -16,8 +16,7 @@ MAINTAINER= johans@FreeBSD.org
COMMENT= Tool for managing notes within a hierarchical tree
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml qmake_build moc_build uic_build rcc_build
+USE_QT4= gui xml qmake_build moc_build uic_build rcc_build
MAKE_ENV= QTDIR="${QT_PREFIX}"
PLIST_FILES= bin/tuxcards
diff --git a/deskutils/vym/Makefile b/deskutils/vym/Makefile
index 6f228c68713d..ebc5629216fc 100644
--- a/deskutils/vym/Makefile
+++ b/deskutils/vym/Makefile
@@ -15,8 +15,7 @@ MAINTAINER= lichray@gmail.com
COMMENT= VYM is a tool to generate and manipulate mind maps
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build uic_build moc_build \
+USE_QT4= qmake_build uic_build moc_build \
qt3support network xml dbus svg
QMAKE_ARGS= PREFIX=${PREFIX} \
DATADIR=${DATADIR:C,/vym$,,} \
@@ -34,7 +33,7 @@ DESKTOP_ENTRIES= "VYM" \
false
.if !defined(WITHOUT_NLS)
-QT_COMPONENTS+= linguist_build
+USE_QT4+= linguist_build
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
diff --git a/deskutils/znotes/Makefile b/deskutils/znotes/Makefile
index 02dd410139fa..a284befeec62 100644
--- a/deskutils/znotes/Makefile
+++ b/deskutils/znotes/Makefile
@@ -16,8 +16,7 @@ COMMENT= Simple notes based on QT4
LICENSE= GPLv3
-USE_QT_VER= 4
-QT_COMPONENTS= gui network xml qmake_build uic_build moc_build rcc_build \
+USE_QT4= gui network xml qmake_build uic_build moc_build rcc_build \
linguist_build
DESKTOP_ENTRIES="zNotes" "Simple notes" \
diff --git a/devel/ace/Makefile b/devel/ace/Makefile
index e62d564f4e42..696d8f45d988 100644
--- a/devel/ace/Makefile
+++ b/devel/ace/Makefile
@@ -81,8 +81,7 @@ PLIST_SUB+= TK="@comment "
.endif
.if ${PORT_OPTIONS:MQT4}
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui moc_build
+USE_QT4= corelib gui moc_build
MAKE_ENV+= qt=1 qt4=1 QTDIR="${QT_PREFIX}"
CPPFLAGS+= -I${QT_INCDIR}
LDFLAGS+= -L${QT_LIBDIR}
diff --git a/devel/alabastra/Makefile b/devel/alabastra/Makefile
index 04a6dbc97d68..8c1f1a799a8e 100644
--- a/devel/alabastra/Makefile
+++ b/devel/alabastra/Makefile
@@ -15,8 +15,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ Editor writen with QT4
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml qmake_build moc_build uic_build rcc_build \
+USE_QT4= gui xml qmake_build moc_build uic_build rcc_build \
iconengines
USE_GMAKE= yes
ALL_TARGET= Alabastra
diff --git a/devel/apiextractor/Makefile b/devel/apiextractor/Makefile
index 07881c25ca28..77c5ed2aaf53 100644
--- a/devel/apiextractor/Makefile
+++ b/devel/apiextractor/Makefile
@@ -22,12 +22,11 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
PLIST_SUB= PORTVERSION=${PORTVERSION}
-QT_COMPONENTS= gui moc_build qmake_build qtestlib_build \
+USE_QT4= gui moc_build qmake_build qtestlib_build \
rcc_build uic_build xml xmlpatterns
USE_BZIP2= yes
USE_CMAKE= yes
USE_LDCONFIG= yes
-USE_QT_VER= 4
.include <bsd.port.mk>
diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile
index 227f3ac68a7e..4c854216ca89 100644
--- a/devel/cmake-gui/Makefile
+++ b/devel/cmake-gui/Makefile
@@ -17,8 +17,7 @@ COMMENT= Qt4 GUI for cmake
RUN_DEPENDS= ${CMAKE_BIN}:${CMAKE_PORT}
-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
CMAKE_ARGS= -DBUILD_QtDialog:bool=on \
-DCMAKE_DATA_DIR:STRING="/${DATADIR_REL}" \
diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile
index 491848e454d8..87ba33f84f46 100644
--- a/devel/dbus-qt4/Makefile
+++ b/devel/dbus-qt4/Makefile
@@ -16,8 +16,7 @@ COMMENT= Qt4 bindings for the D-BUS messaging system
LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build corelib xml
+USE_QT4= qmake_build moc_build rcc_build corelib xml
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_UNSAFE= yes
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 1bb422c35b67..93c1ed32bcb0 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -64,8 +64,7 @@ MAKE_ARGS+= HAVE_LATEX=yes
.endif # !defined(NOPORTDOCS)
.if !defined(WITHOUT_DOXYWIZARD)
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui xml qmake_build moc_build rcc_build
+USE_QT4= corelib gui xml qmake_build moc_build rcc_build
# Need this in env for build
QTDIR?= ${QT_PREFIX}
diff --git a/devel/fuel/Makefile b/devel/fuel/Makefile
index 0af8385b9905..52531773cb37 100644
--- a/devel/fuel/Makefile
+++ b/devel/fuel/Makefile
@@ -17,8 +17,7 @@ LICENSE= GPLv2
RUN_DEPENDS= ${LOCALBASE}/bin/fossil:${PORTSDIR}/devel/fossil
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui \
+USE_QT4= corelib gui \
qmake_build moc_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
diff --git a/devel/gecode/Makefile b/devel/gecode/Makefile
index 93dcfbd86ff8..8ba2cbad8f68 100644
--- a/devel/gecode/Makefile
+++ b/devel/gecode/Makefile
@@ -39,8 +39,7 @@ MAKE_JOBS_UNSAFE=yes
.include <bsd.port.options.mk>
.if defined(WITH_GIST)
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui moc_build qmake_build
+USE_QT4= corelib gui moc_build qmake_build
CONFIGURE_ARGS+=--enable-gist --enable-qt
PLIST_SUB+= GIST=""
.else
diff --git a/devel/generatorrunner/Makefile b/devel/generatorrunner/Makefile
index 56f5acde3ddc..06f7b5152ef3 100644
--- a/devel/generatorrunner/Makefile
+++ b/devel/generatorrunner/Makefile
@@ -27,11 +27,10 @@ CMAKE_ARGS= -DNO_INSTALL_MANPAGES:BOOL=ON
PLIST_SUB= PORTVERSION=${PORTVERSION}
-QT_COMPONENTS= gui qmake_build qtestlib moc_build rcc_build uic_build xml
+USE_QT4= gui qmake_build qtestlib moc_build rcc_build uic_build xml
USE_BZIP2= yes
USE_CMAKE= yes
USE_LDCONFIG= yes
-USE_QT_VER= 4
.include <bsd.port.mk>
diff --git a/devel/grantlee/Makefile b/devel/grantlee/Makefile
index 28a05c437e40..ab118964f71e 100644
--- a/devel/grantlee/Makefile
+++ b/devel/grantlee/Makefile
@@ -18,9 +18,8 @@ LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING.LIB
USE_CMAKE= yes
-USE_QT_VER= 4
USE_LDCONFIG= yes
-QT_COMPONENTS= corelib gui script \
+USE_QT4= corelib gui script \
qmake_build moc_build rcc_build uic_build qtestlib_build
CMAKE_ARGS+= -DBUILD_TESTS:BOOL=FALSE
CMAKE_OUTSOURCE= yes
diff --git a/devel/kcachegrind/Makefile b/devel/kcachegrind/Makefile
index 9ddf841476bf..0f2d8f162983 100644
--- a/devel/kcachegrind/Makefile
+++ b/devel/kcachegrind/Makefile
@@ -21,8 +21,7 @@ ONLY_FOR_ARCHS= i386 amd64
USE_CMAKE= yes
USE_KDE4= automoc4 kdehier kdelibs
-USE_QT_VER= 4
-QT_COMPONENTS= moc_build qmake_build rcc_build uic_build
+USE_QT4= moc_build qmake_build rcc_build uic_build
INSTALLS_ICONS= yes
USE_GETTEXT= yes
diff --git a/devel/kdebindings4-perl-perlkde/Makefile b/devel/kdebindings4-perl-perlkde/Makefile
index 4e3a4f97e195..b6e40e6490c6 100644
--- a/devel/kdebindings4-perl-perlkde/Makefile
+++ b/devel/kdebindings4-perl-perlkde/Makefile
@@ -21,8 +21,7 @@ USE_PERL5= yes
# Build fails with system gcc
USE_GCC= 4.6+
USE_KDE4= kdehier kdeprefix perlqt smokekde 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_CMAKE= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/kdebindings4-perl-perlqt/Makefile b/devel/kdebindings4-perl-perlqt/Makefile
index 78e7b6ff4d34..31bc57a93b9a 100644
--- a/devel/kdebindings4-perl-perlqt/Makefile
+++ b/devel/kdebindings4-perl-perlqt/Makefile
@@ -24,8 +24,7 @@ USE_PERL5= yes
# Build fails with system gcc
USE_GCC= 4.6+
USE_KDE4= kdehier kdeprefix smokeqt qimageblitz
-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_CMAKE= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/kdebindings4-python-krosspython/Makefile b/devel/kdebindings4-python-krosspython/Makefile
index 0a0300448ce5..b68c4734bc44 100644
--- a/devel/kdebindings4-python-krosspython/Makefile
+++ b/devel/kdebindings4-python-krosspython/Makefile
@@ -20,8 +20,7 @@ COMMENT= Kross Python scripting library
USE_KDE4= kdehier kdelibs kdeprefix automoc4
USE_PYTHON= 2.5+
-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_XZ= yes
USE_CMAKE= yes
CMAKE_ARGS+= -DBUILD_falcon:BOOL=FALSE \
diff --git a/devel/kdebindings4-python-pykde4/Makefile b/devel/kdebindings4-python-pykde4/Makefile
index 7525a6078184..d79320278df4 100644
--- a/devel/kdebindings4-python-pykde4/Makefile
+++ b/devel/kdebindings4-python-pykde4/Makefile
@@ -36,8 +36,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \
USE_KDE4= kdehier kdelibs kdeprefix okular pimlibs \
akonadi automoc4 soprano
USE_PYTHON= 2.5+
-USE_QT_VER= 4
-QT_COMPONENTS= corelib qmake_build moc_build uic_build rcc_build
+USE_QT4= corelib qmake_build moc_build uic_build rcc_build
USE_XZ= yes
USE_CMAKE= yes
CMAKE_ARGS+= -DWITH_PolkitQt:BOOL=FALSE
diff --git a/devel/kdebindings4-python-pykdeuic4/Makefile b/devel/kdebindings4-python-pykdeuic4/Makefile
index 45bf9aa3f87d..c1449106c8b1 100644
--- a/devel/kdebindings4-python-pykdeuic4/Makefile
+++ b/devel/kdebindings4-python-pykdeuic4/Makefile
@@ -20,8 +20,7 @@ COMMENT= An enhanced version of pyuic4
USE_KDE4= kdelibs automoc4 pykde4
USE_PYTHON= 2.5+
-USE_QT_VER= 4
-QT_COMPONENTS= corelib qmake_build moc_build uic_build rcc_build
+USE_QT4= corelib qmake_build moc_build uic_build rcc_build
USE_XZ= yes
DISTINFO_FILE= ${PORTSDIR}/devel/kdebindings4-python-pykde4/distinfo
USE_CMAKE= yes
diff --git a/devel/kdebindings4-ruby-korundum/Makefile b/devel/kdebindings4-ruby-korundum/Makefile
index 6b53e5a02059..942b780e1804 100644
--- a/devel/kdebindings4-ruby-korundum/Makefile
+++ b/devel/kdebindings4-ruby-korundum/Makefile
@@ -22,8 +22,7 @@ CONFLICTS= ruby1[89]-kdebindings-4.[0-6].*
USE_KDE4= kate kdehier kdelibs kdeprefix okular pimlibs \
qtruby smokegen smokekde smokeqt \
akonadi automoc4 soprano
-USE_QT_VER= 4
-QT_COMPONENTS= dbus network opengl sql svg xml \
+USE_QT4= dbus network opengl sql svg xml \
qmake_build moc_build uic_build rcc_build
USE_RUBY= yes
USE_XZ= yes
diff --git a/devel/kdebindings4-ruby-krossruby/Makefile b/devel/kdebindings4-ruby-krossruby/Makefile
index 04c6da89afe2..85e11e9c1b28 100644
--- a/devel/kdebindings4-ruby-krossruby/Makefile
+++ b/devel/kdebindings4-ruby-krossruby/Makefile
@@ -20,8 +20,7 @@ COMMENT= Ruby bindings for Qt/KDE
CONFLICTS= ruby1[89]-kdebindings-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix pimlibs automoc4
-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_RUBY= yes
USE_XZ= yes
USE_CMAKE= yes
diff --git a/devel/kdebindings4-ruby-qtruby/Makefile b/devel/kdebindings4-ruby-qtruby/Makefile
index 41902d652606..0442320a27bc 100644
--- a/devel/kdebindings4-ruby-qtruby/Makefile
+++ b/devel/kdebindings4-ruby-qtruby/Makefile
@@ -24,8 +24,7 @@ CONFLICTS_INSTALL= ruby1[89]-kdebindings-4.[0-6].* \
ruby1[89]-kdebindings-korundum-4.7.*
USE_KDE4= kdehier kdeprefix smokeqt
-USE_QT_VER= 4
-QT_COMPONENTS= dbus declarative designer gui network \
+USE_QT4= dbus declarative designer gui network \
phonon qtestlib script webkit xml \
qmake_build moc_build uic_build rcc_build
USE_RUBY= yes
diff --git a/devel/kdebindings4-smoke-smokegen/Makefile b/devel/kdebindings4-smoke-smokegen/Makefile
index b3ed662032e0..ed32f5d638bf 100644
--- a/devel/kdebindings4-smoke-smokegen/Makefile
+++ b/devel/kdebindings4-smoke-smokegen/Makefile
@@ -19,8 +19,7 @@ COMMENT= SMOKE bindings for KDE
CONFLICTS= kdebindings-smoke-4.[0-6].*
USE_KDE4= kdehier kdeprefix
-USE_QT_VER= 4
-QT_COMPONENTS= xml qmake_build moc_build uic_build rcc_build
+USE_QT4= xml qmake_build moc_build uic_build rcc_build
USE_XZ= yes
USE_CMAKE= yes
CMAKE_ARGS+= -DSMOKE_CMAKE_MODULE_DIR:PATH=${PREFIX}/lib/cmake/smoke
diff --git a/devel/kdebindings4-smoke-smokekde/Makefile b/devel/kdebindings4-smoke-smokekde/Makefile
index c6ebe333b718..ff6cfb8da2ca 100644
--- a/devel/kdebindings4-smoke-smokekde/Makefile
+++ b/devel/kdebindings4-smoke-smokekde/Makefile
@@ -21,8 +21,7 @@ CONFLICTS= kdebindings-smoke-4.[0-6].*
USE_KDE4= kate kdehier kdelibs kdeprefix okular pimlibs \
smokegen smokeqt akonadi automoc4 soprano
-USE_QT_VER= 4
-QT_COMPONENTS= dbus designer gui network opengl qt3support sql svg xml \
+USE_QT4= dbus designer gui network opengl qt3support sql svg xml \
qmake_build moc_build uic_build rcc_build
USE_XZ= yes
USE_CMAKE= yes
diff --git a/devel/kdebindings4-smoke-smokeqt/Makefile b/devel/kdebindings4-smoke-smokeqt/Makefile
index a6ad69f64d8f..abd7a45c1503 100644
--- a/devel/kdebindings4-smoke-smokeqt/Makefile
+++ b/devel/kdebindings4-smoke-smokeqt/Makefile
@@ -23,8 +23,7 @@ LIB_DEPENDS= qscintilla2:${PORTSDIR}/devel/qscintilla2 \
CONFLICTS= kdebindings-smoke-4.[0-6].*
USE_KDE4= kdehier kdeprefix smokegen qimageblitz
-USE_QT_VER= 4
-QT_COMPONENTS= dbus declarative designer gui help multimedia \
+USE_QT4= dbus declarative designer gui help multimedia \
network opengl phonon qt3support qtestlib \
script sql svg xml xmlpatterns webkit \
qmake_build moc_build uic_build rcc_build
diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index f587826a2bc0..e1ef2d33d41c 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -32,8 +32,7 @@ USE_KDE4= kdehier kdelibs kdeprefix libkonq pimlibs sharedmime \
akonadi automoc4 qimageblitz_build strigi
KDE4_BUILDENV= yes
USE_PERL5= yes
-USE_QT_VER= 4
-QT_COMPONENTS= dbus designer gui qt3support \
+USE_QT4= dbus designer gui qt3support \
script scripttools sql svg xml \
qmake_build moc_build rcc_build uic_build uic3_build
USE_GMAKE= yes
diff --git a/devel/kdesvn-kde4/Makefile b/devel/kdesvn-kde4/Makefile
index ba2d11e4f90c..8b1079dde176 100644
--- a/devel/kdesvn-kde4/Makefile
+++ b/devel/kdesvn-kde4/Makefile
@@ -25,8 +25,7 @@ CMAKE_ARGS+= -DSUBVERSION_INCLUDE_DIR=${LOCALBASE}/include/subversion-1
USE_GETTEXT= yes
USE_KDE4= kdelibs kdeprefix automoc4
USE_LDCONFIG= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui xml network dbus svg qt3support sql \
+USE_QT4= corelib gui xml network dbus svg qt3support sql \
qmake_build moc_build rcc_build uic_build linguist_build
MAKE_JOBS_SAFE= yes
diff --git a/devel/kdevelop-kde4/Makefile b/devel/kdevelop-kde4/Makefile
index 5541caaf6e07..f9863e7f8103 100644
--- a/devel/kdevelop-kde4/Makefile
+++ b/devel/kdevelop-kde4/Makefile
@@ -21,8 +21,7 @@ USE_BZIP2= yes
USE_CMAKE= yes
USE_GMAKE= yes
USE_KDE4= automoc4 kdehier kdelibs kdeprefix workspace
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build uic_build rcc_build
+USE_QT4= qmake_build moc_build uic_build rcc_build
MAKE_JOBS_SAFE= yes
OPTIONS= OKTETA "Install Okteta plugin" on \
diff --git a/devel/kdevelop-pg-qt/Makefile b/devel/kdevelop-pg-qt/Makefile
index 40afb9fd65f5..b19d5dd5299e 100644
--- a/devel/kdevelop-pg-qt/Makefile
+++ b/devel/kdevelop-pg-qt/Makefile
@@ -24,8 +24,7 @@ USE_BZIP2= yes
USE_BISON= build
USE_KDE4= automoc4 kdehier kdelibs kdeprefix
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib qmake_build moc_build uic_build rcc_build
+USE_QT4= corelib qmake_build moc_build uic_build rcc_build
MAKE_JOBS_SAFE= yes
.include <bsd.port.mk>
diff --git a/devel/kdevelop-php-docs/Makefile b/devel/kdevelop-php-docs/Makefile
index e307da2420a4..20c6c1b70fb4 100644
--- a/devel/kdevelop-php-docs/Makefile
+++ b/devel/kdevelop-php-docs/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS= kdevplatforminterfaces.5:${PORTSDIR}/devel/kdevplatform
USE_BZIP2= 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
.include <bsd.port.mk>
diff --git a/devel/kdevelop-php/Makefile b/devel/kdevelop-php/Makefile
index 0a9d42000845..6d6d07330810 100644
--- a/devel/kdevelop-php/Makefile
+++ b/devel/kdevelop-php/Makefile
@@ -24,8 +24,7 @@ USE_BZIP2= yes
USE_CMAKE= yes
USE_GMAKE= yes
USE_KDE4= automoc4 kdehier kdelibs kdeprefix
-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_UNSAFE= yes
OPTIONS= DOCS "Integrate with PHP.net online documentation" on
diff --git a/devel/kdevplatform/Makefile b/devel/kdevplatform/Makefile
index ba4c5ca809b2..062c98a2772e 100644
--- a/devel/kdevplatform/Makefile
+++ b/devel/kdevplatform/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS= svn_client-1.0:${PORTSDIR}/devel/subversion \
USE_BZIP2= yes
USE_KDE4= kate_run kdehier kdelibs kdeprefix automoc4
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib dbus gui network qtestlib \
+USE_QT4= corelib dbus gui network qtestlib \
qmake_build moc_build uic_build rcc_build
MAKE_JOBS_SAFE= yes
diff --git a/devel/libdbusmenu-qt/Makefile b/devel/libdbusmenu-qt/Makefile
index 77c572293ea3..d8e8e1e0b0ee 100644
--- a/devel/libdbusmenu-qt/Makefile
+++ b/devel/libdbusmenu-qt/Makefile
@@ -20,8 +20,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
FETCH_ARGS= -Fpr
USE_BZIP2= yes
USE_CMAKE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= dbus gui xml \
+USE_QT4= dbus gui xml \
moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
diff --git a/devel/py-qt4-assistant/Makefile b/devel/py-qt4-assistant/Makefile
index 526ca35b1013..2577059d0698 100644
--- a/devel/py-qt4-assistant/Makefile
+++ b/devel/py-qt4-assistant/Makefile
@@ -23,8 +23,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= assistantclient qmake_build
+USE_QT4= assistantclient qmake_build
OPTIONS= API "Install QtAssistant API for QScintilla2" on \
DEBUG "Enable debugging in generated code" off \
diff --git a/devel/py-qt4-core/Makefile b/devel/py-qt4-core/Makefile
index 4b3a9f9ad75c..8782575aa153 100644
--- a/devel/py-qt4-core/Makefile
+++ b/devel/py-qt4-core/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
DISTINFO_FILE= ${PYQT4_DISTINFO_FILE}
HAS_CONFIGURE= yes
USE_PYTHON= 2.5+
-USE_QT_VER= 4
-QT_COMPONENTS= corelib qmake_build moc_build
+USE_QT4= corelib qmake_build moc_build
OPTIONS= API "Install QtCore API for QScintilla2" on \
DEBUG "Enable debugging in generated code" off \
diff --git a/devel/py-qt4-dbus/Makefile b/devel/py-qt4-dbus/Makefile
index 903f201b5d16..c0a910c96ae9 100644
--- a/devel/py-qt4-dbus/Makefile
+++ b/devel/py-qt4-dbus/Makefile
@@ -24,8 +24,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py-dbus \
DISTINFO_FILE= ${PYQT4_DISTINFO_FILE}
HAS_CONFIGURE= yes
USE_PYTHON= 2.5+
-USE_QT_VER= 4
-QT_COMPONENTS= corelib qmake_build moc_build
+USE_QT4= corelib qmake_build moc_build
USE_XORG= x11 xext
BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}
diff --git a/devel/py-qt4-declarative/Makefile b/devel/py-qt4-declarative/Makefile
index 22528e2a7ce2..07ea553e2bdb 100644
--- a/devel/py-qt4-declarative/Makefile
+++ b/devel/py-qt4-declarative/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= declarative qmake_build moc_build
+USE_QT4= declarative qmake_build moc_build
OPTIONS= API "Install QtDeclarative API for QScintilla2" on \
DEBUG "Enable debugging in generated code" off \
diff --git a/devel/py-qt4-designer/Makefile b/devel/py-qt4-designer/Makefile
index ea70f113978e..ee84212b0714 100644
--- a/devel/py-qt4-designer/Makefile
+++ b/devel/py-qt4-designer/Makefile
@@ -24,8 +24,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= gui xml designer moc_build qmake_build
+USE_QT4= gui xml designer moc_build qmake_build
OPTIONS= API "Install QtDesigner API for QScintilla2" on \
DEBUG "Enable debugging in generated code" off \
diff --git a/devel/py-qt4-designerplugin/Makefile b/devel/py-qt4-designerplugin/Makefile
index 9762978ea480..25ebf6e162c2 100644
--- a/devel/py-qt4-designerplugin/Makefile
+++ b/devel/py-qt4-designerplugin/Makefile
@@ -25,8 +25,7 @@ INSTALL_WRKSRC= ${WRKSRC}/designer
DISTINFO_FILE= ${PYQT4_DISTINFO_FILE}
HAS_CONFIGURE= yes
USE_PYTHON= 2.5+
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml designer moc_build qmake_build
+USE_QT4= gui xml designer moc_build qmake_build
OPTIONS= DEBUG "Enable debugging in generated code" off \
TRACING "Enable tracing in generated code" off
diff --git a/devel/py-qt4-help/Makefile b/devel/py-qt4-help/Makefile
index b39c96abd2a2..092672f9c963 100644
--- a/devel/py-qt4-help/Makefile
+++ b/devel/py-qt4-help/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= help qmake_build
+USE_QT4= help qmake_build
OPTIONS= API "Install QtHelp API for QScintilla2" on \
DEBUG "Enable debugging in generated code" off \
diff --git a/devel/py-qt4-qscintilla2/Makefile b/devel/py-qt4-qscintilla2/Makefile
index affb39234cd0..bf35824eab6e 100644
--- a/devel/py-qt4-qscintilla2/Makefile
+++ b/devel/py-qt4-qscintilla2/Makefile
@@ -25,8 +25,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
DISTINFO_FILE= ${QSCI2_DISTINFO_FILE}
HAS_CONFIGURE= yes
USE_PYTHON= 2.5+
-USE_QT_VER= 4
-QT_COMPONENTS= gui
+USE_QT4= gui
OPTIONS= API "Install binding API for QScintilla2" on \
DEBUG "Enable debugging in generated code" off \
diff --git a/devel/py-qt4-script/Makefile b/devel/py-qt4-script/Makefile
index 2d11aabcc733..0e09ad9c125b 100644
--- a/devel/py-qt4-script/Makefile
+++ b/devel/py-qt4-script/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-cor
DISTINFO_FILE= ${PYQT4_DISTINFO_FILE}
HAS_CONFIGURE= yes
USE_PYTHON= 2.5+
-USE_QT_VER= 4
-QT_COMPONENTS= script qmake_build
+USE_QT4= script qmake_build
OPTIONS= API "Install QtScript API for QScintilla2" on \
DEBUG "Enable debugging in generated code" off \
diff --git a/devel/py-qt4-scripttools/Makefile b/devel/py-qt4-scripttools/Makefile
index 8eef71f22a2d..4e0aea903dab 100644
--- a/devel/py-qt4-scripttools/Makefile
+++ b/devel/py-qt4-scripttools/Makefile
@@ -23,8 +23,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-cor
DISTINFO_FILE= ${PYQT4_DISTINFO_FILE}
HAS_CONFIGURE= yes
USE_PYTHON= 2.5+
-USE_QT_VER= 4
-QT_COMPONENTS= scripttools qmake_build
+USE_QT4= scripttools qmake_build
OPTIONS= API "Install QtScript API for QScintilla2" on \
DEBUG "Enable debugging in generated code" off \
diff --git a/devel/py-qt4-test/Makefile b/devel/py-qt4-test/Makefile
index 218c42998212..ff3c61b4519b 100644
--- a/devel/py-qt4-test/Makefile
+++ b/devel/py-qt4-test/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= qtestlib qmake_build
+USE_QT4= qtestlib qmake_build
OPTIONS= API "Install QtTest API for QScintilla2" on \
DEBUG "Enable debugging in generated code" off \
diff --git a/devel/pyside-tools/Makefile b/devel/pyside-tools/Makefile
index 2fc69ae59759..e37b3df3d98a 100644
--- a/devel/pyside-tools/Makefile
+++ b/devel/pyside-tools/Makefile
@@ -31,7 +31,7 @@ MAN1= pyside-lupdate.1 \
CMAKE_ARGS= -DNO_INSTALL_MANPAGES:BOOL=ON
.endif
-QT_COMPONENTS= moc_build qmake_build rcc_build uic_build
+USE_QT4= moc_build qmake_build rcc_build uic_build
REINPLACE_ARGS= -i.bak -e 's+/usr/bin/env python+&${PYTHON_VER}+' \
${WRKSRC}/pyside-uic ${WRKSRC}/pysideuic/icon_cache.py
@@ -39,7 +39,6 @@ REINPLACE_ARGS= -i.bak -e 's+/usr/bin/env python+&${PYTHON_VER}+' \
USE_BZIP2= yes
USE_CMAKE= yes
USE_PYTHON= 2.5-2.7
-USE_QT_VER= 4
post-patch:
${REINPLACE_CMD}
diff --git a/devel/pyside/Makefile b/devel/pyside/Makefile
index f6c742fb00a2..4afa67248730 100644
--- a/devel/pyside/Makefile
+++ b/devel/pyside/Makefile
@@ -25,7 +25,7 @@ CMAKE_ARGS= -DGL_H:FILEPATH="${LOCALBASE}/include/GL/gl.h" \
-DGL_INCLUDE_DIR:FILEPATH="${LOCALBASE}/include"
# QT4_OPTIONS=QGTKSTYLE in /etc/make.conf removes some warnings
-QT_COMPONENTS= declarative designer gui help qmake_build \
+USE_QT4= declarative designer gui help qmake_build \
moc_build multimedia network opengl \
phonon rcc_build script scripttools \
svg uic_build webkit
@@ -37,7 +37,6 @@ USE_BZIP2= yes
USE_CMAKE= yes
USE_LDCONFIG= yes
USE_PYTHON= 2.5-2.7
-USE_QT_VER= 4
# API documentation requires graphics/graphviz and Qt4 src to build
diff --git a/devel/qbzr/Makefile b/devel/qbzr/Makefile
index 39d16ef6aff4..b723ca658a98 100644
--- a/devel/qbzr/Makefile
+++ b/devel/qbzr/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS= bzr:${PORTSDIR}/devel/bazaar-ng
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_PYTHON= yes
-USE_QT_VER= 4
+USE_QT4= yes
USE_PYDISTUTILS= yes
USE_GETTEXT= yes
INSTALLS_ICONS= yes
diff --git a/devel/qca/Makefile b/devel/qca/Makefile
index 59579832e74a..00ccb0b551ce 100644
--- a/devel/qca/Makefile
+++ b/devel/qca/Makefile
@@ -15,8 +15,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Cross-platform crypto API for QT
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib qmake_build moc_build
+USE_QT4= corelib qmake_build moc_build
HAS_CONFIGURE= yes
QT_NONSTANDARD= yes
CONFIGURE_ARGS+=--prefix=${PREFIX}
@@ -31,7 +30,7 @@ CONFIGURE_ENV+= QC_VERBOSE=Y
.endif
.if defined(MAINTAINER_MODE)
-QT_COMPONENTS+= qtestlib
+USE_QT4+= qtestlib
.else
CONFIGURE_ARGS+=--disable-tests
.endif
diff --git a/devel/qconf/Makefile b/devel/qconf/Makefile
index 8e057ef4c527..de7cc4e47e9c 100644
--- a/devel/qconf/Makefile
+++ b/devel/qconf/Makefile
@@ -14,8 +14,7 @@ MAINTAINER= andreevmaxim@gmail.com
COMMENT= Tool to create configure script for qmake-based project
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib xml moc_build qmake_build
+USE_QT4= corelib xml moc_build qmake_build
HAS_CONFIGURE= yes
QT_NONSTANDARD= yes
diff --git a/devel/qdevelop/Makefile b/devel/qdevelop/Makefile
index 893240eebb46..e1e72fefc397 100644
--- a/devel/qdevelop/Makefile
+++ b/devel/qdevelop/Makefile
@@ -18,8 +18,7 @@ COMMENT= A development environment entirely dedicated to Qt4
RUN_DEPENDS= exctags:${PORTSDIR}/devel/ctags \
qt4-sqlite-plugin>=0:${PORTSDIR}/databases/qt4-sqlite3-plugin
-USE_QT_VER= 4
-QT_COMPONENTS= gui sql network xml designer \
+USE_QT4= gui sql network xml designer \
qmake_build moc_build uic_build rcc_build
MAKE_JOBS_SAFE= yes
@@ -40,14 +39,14 @@ OPTIONS= TOOLS "Install Qt4 dev. tools (qmake, moc, etc.)" on
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_NLS)
-QT_COMPONENTS+= linguist_build
+USE_QT4+= linguist_build
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
.endif
.if !defined(WITHOUT_TOOLS)
-QT_COMPONENTS+= assistant_run linguist_run \
+USE_QT4+= assistant_run linguist_run \
qmake_run moc_run uic_run rcc_run
.endif
diff --git a/devel/qgit/Makefile b/devel/qgit/Makefile
index 1279d3edca88..1e3e771828ee 100644
--- a/devel/qgit/Makefile
+++ b/devel/qgit/Makefile
@@ -15,8 +15,7 @@ MAINTAINER= itetcu@FreeBSD.org
COMMENT= A graphical interface to git repositories
USE_BZIP2= 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_UNSAFE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/devel/qjson/Makefile b/devel/qjson/Makefile
index 219d057cff90..7f734beb89ba 100644
--- a/devel/qjson/Makefile
+++ b/devel/qjson/Makefile
@@ -17,8 +17,7 @@ LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib moc_build qmake_build rcc_build uic_build
+USE_QT4= corelib moc_build qmake_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
USE_CMAKE= yes
USE_LDCONFIG= yes
diff --git a/devel/qprog/Makefile b/devel/qprog/Makefile
index 13e8643c5473..2fb906daa7e2 100644
--- a/devel/qprog/Makefile
+++ b/devel/qprog/Makefile
@@ -15,8 +15,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= bfoz@bfoz.net
COMMENT= Cross-platform software for the DIY line of PIC programmers
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build gui network
+USE_QT4= qmake_build moc_build gui network
WRKSRC= ${WRKDIR}/QProg
diff --git a/devel/qscintilla2-designerplugin/Makefile b/devel/qscintilla2-designerplugin/Makefile
index 75b7223ffd82..dc43d1f126bf 100644
--- a/devel/qscintilla2-designerplugin/Makefile
+++ b/devel/qscintilla2-designerplugin/Makefile
@@ -19,8 +19,7 @@ COMMENT= Qt Designer plugin for QScintilla2 (Qt4)
LIB_DEPENDS= qscintilla2.8:${PORTSDIR}/devel/qscintilla2
DISTINFO_FILE= ${QSCI2_DISTINFO_FILE}
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build gui xml designer
+USE_QT4= qmake_build moc_build gui xml designer
HAS_CONFIGURE= yes
QMAKE_ARGS= -unix PREFIX=${PREFIX}
diff --git a/devel/qscintilla2/Makefile b/devel/qscintilla2/Makefile
index 0ba22163c2e5..0948431fcfed 100644
--- a/devel/qscintilla2/Makefile
+++ b/devel/qscintilla2/Makefile
@@ -15,8 +15,7 @@ DISTNAME= ${QSCI2_DISTNAME}
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt4 port of the Scintilla C++ editor class
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build gui xml designer
+USE_QT4= qmake_build moc_build gui xml designer
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/devel/qsvn/Makefile b/devel/qsvn/Makefile
index 31b4aedec9e2..dad13dec9662 100644
--- a/devel/qsvn/Makefile
+++ b/devel/qsvn/Makefile
@@ -17,8 +17,7 @@ COMMENT= Qt based GUI frontend for Subversion
LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion
-USE_QT_VER= 4
-QT_COMPONENTS= gui sql moc_build uic_build rcc_build qmake_build
+USE_QT4= gui sql moc_build uic_build rcc_build qmake_build
USE_LDCONFIG= yes
USE_CMAKE= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/qt4-assistant-adp/Makefile b/devel/qt4-assistant-adp/Makefile
index e9d62351998b..c4a6acf22f40 100644
--- a/devel/qt4-assistant-adp/Makefile
+++ b/devel/qt4-assistant-adp/Makefile
@@ -18,8 +18,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt documentation browser, adp compat version
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib \
+USE_QT4= qmake_build moc_build rcc_build uic_build corelib \
gui network xml doc dbus
MAKE_JOBS_SAFE= yes
diff --git a/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile
index fc56b40af9bb..d0c8b07a937f 100644
--- a/devel/qt4-assistant/Makefile
+++ b/devel/qt4-assistant/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt documentation browser
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build qt3support corelib \
+USE_QT4= qmake_build moc_build rcc_build uic_build qt3support corelib \
gui network sql xml doc help webkit
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile
index b6dfd3482808..7935aac8d64e 100644
--- a/devel/qt4-corelib/Makefile
+++ b/devel/qt4-corelib/Makefile
@@ -16,8 +16,7 @@ COMMENT= Qt core library
LIB_DEPENDS= glib-2.0:${PORTSDIR}/devel/glib20
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build
+USE_QT4= qmake_build moc_build
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/qt4-declarative/Makefile b/devel/qt4-declarative/Makefile
index 2b5f2205468a..51d200dac641 100644
--- a/devel/qt4-declarative/Makefile
+++ b/devel/qt4-declarative/Makefile
@@ -13,8 +13,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt4 framework for building highly dynamic user interfaces
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib gui network \
+USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui network \
opengl script sql svg xml xmlpatterns
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile
index 1144032e10ee..2801797fd0c7 100644
--- a/devel/qt4-designer/Makefile
+++ b/devel/qt4-designer/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt ui editor
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build assistant_run \
+USE_QT4= qmake_build moc_build rcc_build uic_build assistant_run \
qt3support corelib declarative gui network script sql xml \
webkit phonon
QT_NONSTANDARD= yes
diff --git a/devel/qt4-help-tools/Makefile b/devel/qt4-help-tools/Makefile
index ad29da63574e..629406b80f77 100644
--- a/devel/qt4-help-tools/Makefile
+++ b/devel/qt4-help-tools/Makefile
@@ -15,8 +15,7 @@ PKGNAMESUFFIX= -tools
MAINTAINER= kde@FreeBSD.org
COMMENT= QtHelp tools to generate and convert documentation
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib \
+USE_QT4= qmake_build moc_build rcc_build uic_build corelib \
gui sql xml doc help
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/devel/qt4-help/Makefile b/devel/qt4-help/Makefile
index 65d6825c532d..372be7a2a0dc 100644
--- a/devel/qt4-help/Makefile
+++ b/devel/qt4-help/Makefile
@@ -13,8 +13,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= QtHelp module provides QHelpEngine API and is used by Assistant
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build corelib clucene \
+USE_QT4= qmake_build moc_build rcc_build corelib clucene \
gui sql sql-sqlite3_run xml network
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile
index e14df9fd3267..15c12a77958f 100644
--- a/devel/qt4-libqtassistantclient/Makefile
+++ b/devel/qt4-libqtassistantclient/Makefile
@@ -18,8 +18,7 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt documentation browser integration library
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build corelib gui network
+USE_QT4= qmake_build moc_build rcc_build corelib gui network
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile
index b0a37da1ad5d..beffcc50be77 100644
--- a/devel/qt4-linguist/Makefile
+++ b/devel/qt4-linguist/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt localisation tool
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build designer_build moc_build rcc_build uic_build \
+USE_QT4= qmake_build designer_build moc_build rcc_build uic_build \
assistant_run gui network xml
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/devel/qt4-makeqpf/Makefile b/devel/qt4-makeqpf/Makefile
index 5bbabf40bf7e..bc30b7f75ded 100644
--- a/devel/qt4-makeqpf/Makefile
+++ b/devel/qt4-makeqpf/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt qtopia font creator
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib gui
+USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/qt4-moc/Makefile b/devel/qt4-moc/Makefile
index 25086b301f24..0cd7c464a805 100644
--- a/devel/qt4-moc/Makefile
+++ b/devel/qt4-moc/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt meta object compiler
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build
+USE_QT4= qmake_build
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/qt4-porting/Makefile b/devel/qt4-porting/Makefile
index 5b95bfc88e76..02bd2f016b25 100644
--- a/devel/qt4-porting/Makefile
+++ b/devel/qt4-porting/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt utility to assist with porting Qt3 applications to Qt4
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build corelib xml
+USE_QT4= qmake_build moc_build rcc_build corelib xml
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/qt4-qdbusviewer/Makefile b/devel/qt4-qdbusviewer/Makefile
index d62636ea063a..e535d00bf778 100644
--- a/devel/qt4-qdbusviewer/Makefile
+++ b/devel/qt4-qdbusviewer/Makefile
@@ -16,8 +16,7 @@ COMMENT= Qt4 D-BUS viewer
LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build corelib dbus gui xml \
+USE_QT4= qmake_build moc_build rcc_build corelib dbus gui xml \
clucene
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/devel/qt4-qdoc3/Makefile b/devel/qt4-qdoc3/Makefile
index 0ebbdde8792b..c10baab523eb 100644
--- a/devel/qt4-qdoc3/Makefile
+++ b/devel/qt4-qdoc3/Makefile
@@ -13,8 +13,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt documentation generator
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build corelib gui xml
+USE_QT4= qmake_build corelib gui xml
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile
index 0eabf96da490..739afd344ee9 100644
--- a/devel/qt4-qt3support/Makefile
+++ b/devel/qt4-qt3support/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt3 compatibility library
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build corelib gui network sql xml
+USE_QT4= qmake_build moc_build corelib gui network sql xml
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/qt4-qtestlib/Makefile b/devel/qt4-qtestlib/Makefile
index d77e50e25fb7..63ca2bc17d77 100644
--- a/devel/qt4-qtestlib/Makefile
+++ b/devel/qt4-qtestlib/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt unit testing library
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build corelib
+USE_QT4= qmake_build moc_build corelib
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/qt4-qtsolutions-singleapplication/Makefile b/devel/qt4-qtsolutions-singleapplication/Makefile
index d4dd8376ce94..8ff5cd476206 100644
--- a/devel/qt4-qtsolutions-singleapplication/Makefile
+++ b/devel/qt4-qtsolutions-singleapplication/Makefile
@@ -16,8 +16,7 @@ DISTNAME= qt4-qtsolutions-singleinstance-${PORTVERSION}
MAINTAINER= yurkis@gmail.com
COMMENT= QT4 Solutions Single Application Framework
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build gui network
+USE_QT4= qmake_build moc_build rcc_build uic_build gui network
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile
index b8fc3bd5e262..70f12feb4235 100644
--- a/devel/qt4-qvfb/Makefile
+++ b/devel/qt4-qvfb/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt virtual framebuffer utility
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib gui opengl
+USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui opengl
QT_NONSTANDARD= yes
QT_DIST= yes
USE_XORG= xtst
diff --git a/devel/qt4-rcc/Makefile b/devel/qt4-rcc/Makefile
index a0048bc97311..7615cf9cb4eb 100644
--- a/devel/qt4-rcc/Makefile
+++ b/devel/qt4-rcc/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt resource compiler
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build
+USE_QT4= qmake_build
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/qt4-script/Makefile b/devel/qt4-script/Makefile
index 943207d93485..e7cf3735657c 100644
--- a/devel/qt4-script/Makefile
+++ b/devel/qt4-script/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt script
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build corelib
+USE_QT4= qmake_build moc_build corelib
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/qt4-scripttools/Makefile b/devel/qt4-scripttools/Makefile
index 4b76c5b2967a..e5d205e783e1 100644
--- a/devel/qt4-scripttools/Makefile
+++ b/devel/qt4-scripttools/Makefile
@@ -13,8 +13,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt script
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build gui script
+USE_QT4= qmake_build moc_build rcc_build gui script
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/qt4-uic/Makefile b/devel/qt4-uic/Makefile
index 66f8b5656abe..231bad5105d4 100644
--- a/devel/qt4-uic/Makefile
+++ b/devel/qt4-uic/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt user interface compiler
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build
+USE_QT4= qmake_build
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/qt4-uic3/Makefile b/devel/qt4-uic3/Makefile
index de05ab3c6a3f..0524fbc69a1f 100644
--- a/devel/qt4-uic3/Makefile
+++ b/devel/qt4-uic3/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt backwards-compatible user interface compiler
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build qt3support corelib gui network sql xml
+USE_QT4= qmake_build qt3support corelib gui network sql xml
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/qt4/Makefile b/devel/qt4/Makefile
index e865376025e3..b2707eae40e8 100644
--- a/devel/qt4/Makefile
+++ b/devel/qt4/Makefile
@@ -20,8 +20,7 @@ OPTIONS= CODECS "Enable support for CN, JP, KR, TW" off \
TOOLS "Install Qt tools (qmake, moc, etc.)" off \
DEMO "Install demonstration and example programs" off
-USE_QT_VER= 4
-QT_COMPONENTS= accessible assistant clucene corelib \
+USE_QT4= accessible assistant clucene corelib \
dbus declarative designer doc \
graphicssystems-opengl gui help \
iconengines imageformats inputmethods \
@@ -35,24 +34,24 @@ NO_BUILD= yes
.include <bsd.port.options.mk>
.if !defined(WITHOUT_NLS)
-QT_COMPONENTS+= l10n
+USE_QT4+= l10n
.endif
.if defined(WITH_TOOLS)
-QT_COMPONENTS+= help-tools linguist makeqpf moc pixeltool \
+USE_QT4+= help-tools linguist makeqpf moc pixeltool \
porting qmake rcc uic uic3 qdoc3
.endif
.if defined(WITH_CODECS)
-QT_COMPONENTS+= codecs-cn codecs-jp codecs-kr codecs-tw
+USE_QT4+= codecs-cn codecs-jp codecs-kr codecs-tw
.endif
.if defined(WITH_SQL_PLUGINS)
-QT_COMPONENTS+= sql-mysql sql-odbc sql-pgsql sql-sqlite2 sql-sqlite3
+USE_QT4+= sql-mysql sql-odbc sql-pgsql sql-sqlite2 sql-sqlite3
.endif
.if defined(WITH_DEMO)
-QT_COMPONENTS+= demo
+USE_QT4+= demo
.endif
do-patch: #empty
diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile
index 61879a182b4b..0f50e3b896d9 100644
--- a/devel/qtcreator/Makefile
+++ b/devel/qtcreator/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS= Imath.6:${PORTSDIR}/graphics/ilmbase \
jasper.4:${PORTSDIR}/graphics/jasper \
jpeg.11:${PORTSDIR}/graphics/jpeg
-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_build network script \
sql svg xml webkit qdoc3_build
diff --git a/devel/qtscriptgenerator/Makefile b/devel/qtscriptgenerator/Makefile
index b3a94a8b4f21..f4d86275725e 100644
--- a/devel/qtscriptgenerator/Makefile
+++ b/devel/qtscriptgenerator/Makefile
@@ -16,8 +16,7 @@ COMMENT= Tool that generates Qt bindings for Qt Script
OPTIONS= PHONON "Build Phonon support" on
-USE_QT_VER= 4
-QT_COMPONENTS= corelib declarative designer doc help help-tools gui \
+USE_QT4= corelib declarative designer doc help help-tools gui \
iconengines imageformats inputmethods linguist network \
opengl pixeltool porting qdbusviewer \
qt3support qtestlib qvfb script scripttools \
@@ -30,7 +29,7 @@ USE_LDCONFIG= yes
.include <bsd.port.options.mk>
.if !defined(WITHOUT_PHONON)
-QT_COMPONENTS+= phonon
+USE_QT4+= phonon
PLIST_SUB+= PHONON=""
.else
EXTRA_PATCHES= ${FILESDIR}/extra-patch-no_phonon
diff --git a/devel/shiboken/Makefile b/devel/shiboken/Makefile
index 50ca454b435e..551873afdc6d 100644
--- a/devel/shiboken/Makefile
+++ b/devel/shiboken/Makefile
@@ -24,13 +24,12 @@ LIB_DEPENDS= apiextractor.0:${PORTSDIR}/devel/apiextractor \
PLIST_SUB= PORTVERSION=${PORTVERSION} \
PYTHON_VERSION=${PYTHON_VERSION}
-QT_COMPONENTS= corelib qmake_build moc_build uic_build rcc_build
+USE_QT4= corelib qmake_build moc_build uic_build rcc_build
USE_BZIP2= yes
USE_CMAKE= yes
USE_LDCONFIG= yes
USE_PYTHON= yes
-USE_QT_VER= 4
.if !defined(NO_INSTALL_MANPAGES)
MAN1= shiboken.1
diff --git a/devel/subcommander2/Makefile b/devel/subcommander2/Makefile
index c10f83d9a2ec..7b54dbbc15f5 100644
--- a/devel/subcommander2/Makefile
+++ b/devel/subcommander2/Makefile
@@ -29,8 +29,7 @@ USE_DOS2UNIX= *.cpp *.h
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_OPENSSL= yes
-USE_QT_VER= 4
-QT_COMPONENTS= qt3support gui network corelib moc_build uic_build rcc_build
+USE_QT4= qt3support gui network corelib moc_build uic_build rcc_build
CONFIGURE_ARGS+= --with-boost=${LOCALBASE}/include --with-neon=${LOCALBASE} \
--with-subversion=${LOCALBASE} --with-qt=${LOCALBASE} \
--with-apr=${LOCALBASE}/bin/apr-1-config \
diff --git a/devel/svn2git/Makefile b/devel/svn2git/Makefile
index 4a17ce0e516c..daf9f3ac8f6f 100644
--- a/devel/svn2git/Makefile
+++ b/devel/svn2git/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS+= git:${PORTSDIR}/devel/git \
LICENSES= GPLv1 GPLv2 GPLv3
USE_XZ= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib qmake_build
+USE_QT4= corelib qmake_build
MAKE_JOBS_SAFE= yes
PLIST_FILES= bin/svn2git
diff --git a/devel/universalindentgui/Makefile b/devel/universalindentgui/Makefile
index 66ad037db7a1..1284940ae37b 100644
--- a/devel/universalindentgui/Makefile
+++ b/devel/universalindentgui/Makefile
@@ -16,8 +16,7 @@ COMMENT= Graphical UI for multiple source code indent/format/beautify tools
LIB_DEPENDS= qscintilla2:${PORTSDIR}/devel/qscintilla2
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build uic_build rcc_build \
+USE_QT4= qmake_build moc_build uic_build rcc_build \
linguist network script gui
HAS_CONFIGURE= yes
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>
diff --git a/emulators/aqemu/Makefile b/emulators/aqemu/Makefile
index 8f34208d2474..927c1702fc55 100644
--- a/emulators/aqemu/Makefile
+++ b/emulators/aqemu/Makefile
@@ -17,8 +17,7 @@ COMMENT= Qt4 based Qemu frontend
LIB_DEPENDS= vncclient.0:${PORTSDIR}/net/libvncserver
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui qtestlib xml qmake_build uic_build moc_build rcc_build \
+USE_QT4= gui qtestlib xml qmake_build uic_build moc_build rcc_build \
linguist_build
USE_CMAKE= yes
MAKE_JOBS_SAFE= yes
diff --git a/emulators/bsnes/Makefile b/emulators/bsnes/Makefile
index 8dd1ca13bb61..b127f04b614c 100644
--- a/emulators/bsnes/Makefile
+++ b/emulators/bsnes/Makefile
@@ -40,8 +40,7 @@ OPTIONS= GUI_GTK "Build with GTK+ GUI" on \
.if defined(WITH_GUI_GTK)
MAKE_ENV+= phoenix="gtk"
.else
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui
+USE_QT4= corelib gui
MAKE_ENV+= phoenix="qt"
.endif
diff --git a/emulators/dboxfe/Makefile b/emulators/dboxfe/Makefile
index 98e8feb6714c..6d9abf405ac8 100644
--- a/emulators/dboxfe/Makefile
+++ b/emulators/dboxfe/Makefile
@@ -18,8 +18,7 @@ COMMENT= A Qt4 front-end to DOSBox
RUN_DEPENDS= dosbox:${PORTSDIR}/emulators/dosbox
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui network xml uic_build moc_build qmake_build rcc_build
+USE_QT4= gui network xml uic_build moc_build qmake_build rcc_build
HAS_CONFIGURE= yes
PLIST_FILES= bin/dboxfe bin/dboxfetray
diff --git a/emulators/osmose/Makefile b/emulators/osmose/Makefile
index c0ed53cce4b5..9fb8469920fe 100644
--- a/emulators/osmose/Makefile
+++ b/emulators/osmose/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS= asound.2:${PORTSDIR}/audio/alsa-lib
RUN_DEPENDS= ${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js
USE_ZIP= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui opengl moc_build qmake_build uic_build
+USE_QT4= corelib gui opengl moc_build qmake_build uic_build
QMAKEFLAGS+= TARGET=release
PORTDOCS= Readme.txt TODO.txt
diff --git a/emulators/qmc2/Makefile b/emulators/qmc2/Makefile
index 8b27ec2dd890..3e3cc54eff43 100644
--- a/emulators/qmc2/Makefile
+++ b/emulators/qmc2/Makefile
@@ -22,8 +22,7 @@ NO_WRKSUBDIR= yes
USE_BZIP2= yes
USE_XORG= xmu
USE_GL= glu
-USE_QT_VER= 4
-QT_COMPONENTS= gui opengl phonon qtestlib webkit xml \
+USE_QT4= gui opengl phonon qtestlib webkit xml \
moc_build qmake_build rcc_build uic_build
USE_SDL= sdl
USE_GMAKE= yes
diff --git a/emulators/qtemu/Makefile b/emulators/qtemu/Makefile
index 4f955b5ddef6..511eedb918bf 100644
--- a/emulators/qtemu/Makefile
+++ b/emulators/qtemu/Makefile
@@ -15,8 +15,7 @@ MAINTAINER= makc@FreeBSD.org
COMMENT= A Qt4 front-end to Qemu
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml uic_build moc_build qmake_build rcc_build
+USE_QT4= gui xml uic_build moc_build qmake_build rcc_build
HAS_CONFIGURE= yes
CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
@@ -26,7 +25,7 @@ DESKTOP_ENTRIES="QtEmu" "QEMU frontend" "" \
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_NLS)
-#QT_COMPONENTS+= linguist
+#USE_QT4+= linguist
BUILD_DEPENDS+= ${LOCALBASE}/bin/lupdate-qt4:${PORTSDIR}/devel/qt4-linguist
PLIST_SUB+= NLS=""
.else
diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile
index e1575e9cbbcf..af377ef144e3 100644
--- a/emulators/virtualbox-ose-legacy/Makefile
+++ b/emulators/virtualbox-ose-legacy/Makefile
@@ -103,9 +103,8 @@ PLIST_SUB+= X11="@comment "
.endif
.if !defined(WITHOUT_QT4)
-USE_QT_VER= 4
QT_NONSTANDARD= yes
-QT_COMPONENTS= gui network moc_build uic_build rcc_build linguist
+USE_QT4= gui network moc_build uic_build rcc_build linguist
INSTALLS_ICONS= yes
VBOX_FRONTENDS+=VirtualBox VBoxTestOGL
PLIST_SUB+= QT4=""
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 0ac5406f0cc2..95f3e0aa8890 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -104,9 +104,8 @@ PLIST_SUB+= X11="@comment "
.endif
.if !defined(WITHOUT_QT4)
-USE_QT_VER= 4
QT_NONSTANDARD= yes
-QT_COMPONENTS= gui network moc_build uic_build rcc_build linguist
+USE_QT4= gui network moc_build uic_build rcc_build linguist
INSTALLS_ICONS= yes
VBOX_FRONTENDS+=VirtualBox VBoxTestOGL
PLIST_SUB+= QT4=""
diff --git a/emulators/yabause/Makefile b/emulators/yabause/Makefile
index ed579f37d141..cff1594d93a0 100644
--- a/emulators/yabause/Makefile
+++ b/emulators/yabause/Makefile
@@ -22,7 +22,6 @@ USE_GMAKE= yes
USE_GL= gl glu glut
USE_GNOME= #
USE_OPENAL= soft
-USE_QT_VER= 4
USE_SDL= yes
SUB_FILES= pkg-message
@@ -33,7 +32,7 @@ OPTIONS= QT4 "Build wit qt4 interface instead of gtk2 one" on
.include <bsd.port.pre.mk>
.if defined(WITH_QT4)
-QT_COMPONENTS= corelib gui opengl
+USE_QT4= corelib gui opengl
CONFIGURE_ARGS+= --with-port=qt
.else
USE_GNOME= gtk20
diff --git a/finance/eqonomize-kde4/Makefile b/finance/eqonomize-kde4/Makefile
index 1b0ea1166046..96c4acdb4c57 100644
--- a/finance/eqonomize-kde4/Makefile
+++ b/finance/eqonomize-kde4/Makefile
@@ -16,8 +16,7 @@ MAINTAINER= cm@therek.net
COMMENT= A personal accounting software
USE_KDE4= kdelibs kdeprefix kdehier automoc4
-USE_QT_VER= 4
-QT_COMPONENTS= corelib dbus gui network svg xml qmake_build moc_build uic_build rcc_build
+USE_QT4= corelib dbus gui network svg xml qmake_build moc_build uic_build rcc_build
USE_CMAKE= yes
USE_GETTEXT= yes
USE_ICONV= yes
diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile
index 4fd9c081d9df..e561a2ebf2b0 100644
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS= boost_graph.4:${PORTSDIR}/devel/boost-libs \
USE_BZIP2= yes
USE_CMAKE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui dbus network phonon sql svg xml \
+USE_QT4= gui dbus network phonon sql svg xml \
qmake_build moc_build rcc_build uic_build
USE_KDE4= kdehier kdeprefix automoc4 kdelibs pimlibs sharedmime
USE_LDCONFIG= yes
diff --git a/finance/libalkimia/Makefile b/finance/libalkimia/Makefile
index 85cfefe24529..559dd9b123ff 100644
--- a/finance/libalkimia/Makefile
+++ b/finance/libalkimia/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp
USE_BZIP2= yes
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
USE_LDCONFIG= yes
diff --git a/finance/skrooge/Makefile b/finance/skrooge/Makefile
index c59679a12900..7ebd1f29db38 100644
--- a/finance/skrooge/Makefile
+++ b/finance/skrooge/Makefile
@@ -21,8 +21,7 @@ LIB_DEPENDS= ofx.5:${PORTSDIR}/finance/libofx \
USE_BZIP2= yes
USE_CMAKE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build uic_build rcc_build \
+USE_QT4= qmake_build moc_build uic_build rcc_build \
corelib dbus gui script xml sql sql-sqlite3_run
USE_KDE4= kdelibs kdeprefix automoc4
USE_LDCONFIG= yes
diff --git a/ftp/plasma-applet-ftpmonitor/Makefile b/ftp/plasma-applet-ftpmonitor/Makefile
index 43e9d5539b76..1bc85bf19031 100644
--- a/ftp/plasma-applet-ftpmonitor/Makefile
+++ b/ftp/plasma-applet-ftpmonitor/Makefile
@@ -18,8 +18,7 @@ COMMENT= KDE4 Plasma applet, which monitors connections to ftp daemons
USE_BZIP2= yes
USE_CMAKE= yes
USE_KDE4= kdelibs kdeprefix 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
MAKE_JOS_SAFE= yes
post-patch:
diff --git a/ftp/scythia/Makefile b/ftp/scythia/Makefile
index 6b7bd455ee56..8c6a69c54af8 100644
--- a/ftp/scythia/Makefile
+++ b/ftp/scythia/Makefile
@@ -16,8 +16,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}-2-src
MAINTAINER= dhn@FreeBSD.org
COMMENT= A small ftp client unpretentious based on QT4
-USE_QT_VER= 4
-QT_COMPONENTS= gui network corelib qmake_build uic_build moc_build rcc_build
+USE_QT4= gui network corelib qmake_build uic_build moc_build rcc_build
INSTALLS_ICONS= yes
MAKE_JOBS_SAFE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/games/allacrost/Makefile b/games/allacrost/Makefile
index 4a41a3ac6149..0dda1093fbce 100644
--- a/games/allacrost/Makefile
+++ b/games/allacrost/Makefile
@@ -46,9 +46,8 @@ OPTIONS= EDITOR "Enable editor" off
.include <bsd.port.options.mk>
.if defined(WITH_EDITOR)
-USE_QT_VER= 4
QT_NONSTANDARD= yes
-QT_COMPONENTS+= corelib gui opengl moc_build qt3support
+USE_QT4+= corelib gui opengl moc_build qt3support
CONFIGURE_ARGS+=--enable-editor=yes
PLIST_SUB= EDITOR=""
.else
diff --git a/games/anki/Makefile.inc b/games/anki/Makefile.inc
index 5d6d099b4626..d82e5f215616 100644
--- a/games/anki/Makefile.inc
+++ b/games/anki/Makefile.inc
@@ -24,8 +24,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \
py*-network>=4.4:${PORTSDIR}/net/py-qt4-network \
py*-webkit>=4.4:${PORTSDIR}/www/py-qt4-webkit
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui
+USE_QT4= corelib gui
PYDISTUTILS_PKGNAME= ankiqt
PORT_VERBS= ankiqt
diff --git a/games/arx-libertatis/Makefile b/games/arx-libertatis/Makefile
index 0cf15e6f4652..ed6d7690d71a 100644
--- a/games/arx-libertatis/Makefile
+++ b/games/arx-libertatis/Makefile
@@ -39,8 +39,7 @@ OPTIONS= CRASHREPORTER "Build crash reporter (requires Qt4)" off
.include <bsd.port.options.mk>
.if defined(WITH_CRASHREPORTER)
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui network rcc_build moc_build uic_build qmake_build
+USE_QT4= corelib gui network rcc_build moc_build uic_build qmake_build
CMAKE_ARGS+= -DBUILD_CRASHREPORTER=ON
PLIST_SUB+= CRASHREPORTER=""
.else
diff --git a/games/blinken/Makefile b/games/blinken/Makefile
index 70921583fc6c..7ea4c8a5c008 100644
--- a/games/blinken/Makefile
+++ b/games/blinken/Makefile
@@ -20,8 +20,7 @@ CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib moc_build qmake_build rcc_build uic_build
+USE_QT4= corelib moc_build qmake_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/games/bubble-chains/Makefile b/games/bubble-chains/Makefile
index 50b04fc21541..943863503e44 100644
--- a/games/bubble-chains/Makefile
+++ b/games/bubble-chains/Makefile
@@ -26,8 +26,7 @@ WRKSRC= ${WRKDIR}/chains-${PORTVERSION}-src
USE_SDL= sdl image mixer
USE_GL= glut glew glu
USE_XORG= xrandr
-USE_QT_VER= 4
-QT_COMPONENTS= moc_build qmake_build rcc_build uic_build iconengines imageformats \
+USE_QT4= moc_build qmake_build rcc_build uic_build iconengines imageformats \
corelib svg xml opengl network
MAKE_JOBS_SAFE= yes
diff --git a/games/colorcode/Makefile b/games/colorcode/Makefile
index ebd621cedae9..bcd6688f792b 100644
--- a/games/colorcode/Makefile
+++ b/games/colorcode/Makefile
@@ -15,8 +15,7 @@ DISTNAME= ColorCode-${PORTVERSION}
MAINTAINER= makc@FreeBSD.org
COMMENT= A free advanced MasterMind game and solver
-USE_QT_VER= 4
-QT_COMPONENTS= gui moc_build qmake_build rcc_build uic_build
+USE_QT4= gui moc_build qmake_build rcc_build uic_build
HAS_CONFIGURE= yes
WRKSRC= ${WRKDIR}/ColorCode-${PORTVERSION}
diff --git a/games/cutemaze/Makefile b/games/cutemaze/Makefile
index 876c206d75fc..1f9a4db66ec1 100644
--- a/games/cutemaze/Makefile
+++ b/games/cutemaze/Makefile
@@ -18,8 +18,7 @@ COMMENT= Is a simple, top-down game in which mazes are randomly generated
LICENSE= GPLv3
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= moc_build qmake_build rcc_build uic_build iconengines imageformats
+USE_QT4= moc_build qmake_build rcc_build uic_build iconengines imageformats
INSTALLS_ICONS= yes
MAKE_JOBS_SAFE= yes
diff --git a/games/djgame2/Makefile b/games/djgame2/Makefile
index a09d1d02460e..a27fc85fea15 100644
--- a/games/djgame2/Makefile
+++ b/games/djgame2/Makefile
@@ -18,8 +18,7 @@ COMMENT= bluedj contains many popular online games
NO_BUILD= yes
USE_ZIP= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui qt3support qmake_build uic_build rcc_build moc_build svg
+USE_QT4= gui qt3support qmake_build uic_build rcc_build moc_build svg
QMAKE?= qmake-qt4
QMAKESPEC?= ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++
diff --git a/games/hedgewars/Makefile b/games/hedgewars/Makefile
index 2c767e6e73f4..e08433825044 100644
--- a/games/hedgewars/Makefile
+++ b/games/hedgewars/Makefile
@@ -23,9 +23,8 @@ USE_BZIP2= yes
USE_CMAKE= yes
USE_SDL= sdl mixer image ttf net
USE_FPC= opengl
-USE_QT_VER= 4
USE_LUA= 5.1+
-QT_COMPONENTS= corelib gui moc_build network \
+USE_QT4= corelib gui moc_build network \
qmake_build rcc_build svg xml \
uic_build linguist_build
MAKE_JOBS_SAFE= yes
diff --git a/games/hexalate/Makefile b/games/hexalate/Makefile
index 83da773d3f29..11aae684b5d3 100644
--- a/games/hexalate/Makefile
+++ b/games/hexalate/Makefile
@@ -17,8 +17,7 @@ MAINTAINER= amdmi3@FreeBSD.org
COMMENT= A color matching game
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui moc_build qmake_build rcc_build
+USE_QT4= corelib gui moc_build qmake_build rcc_build
WANT_GNOME= yes
INSTALLS_ICONS= yes
MAKE_JOBS_SAFE= yes
diff --git a/games/hexglass/Makefile b/games/hexglass/Makefile
index 3b34e4bc9ac9..387781a3d9f5 100644
--- a/games/hexglass/Makefile
+++ b/games/hexglass/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES= GOOGLE_CODE
MAINTAINER= makc@FreeBSD.org
COMMENT= Tetris-like puzzle game based on a hexagonal grid
-USE_QT_VER= 4
-QT_COMPONENTS= gui qmake_build moc_build rcc_build
+USE_QT4= gui qmake_build moc_build rcc_build
HAS_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
diff --git a/games/jag/Makefile b/games/jag/Makefile
index bf8e3c20d406..1ba06cf10f2e 100644
--- a/games/jag/Makefile
+++ b/games/jag/Makefile
@@ -21,8 +21,7 @@ COMMENT= 2d arcade-puzzle game like KDiamonds
USE_ZIP= yes
USE_SDL= sdl mixer
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build uic_build moc_build rcc_build \
+USE_QT4= qmake_build uic_build moc_build rcc_build \
corelib svg xml opengl network
MAKE_JOBS_SAFE= yes
diff --git a/games/kajongg/Makefile b/games/kajongg/Makefile
index 52f186af2694..df3705ecc98e 100644
--- a/games/kajongg/Makefile
+++ b/games/kajongg/Makefile
@@ -24,8 +24,7 @@ CONFLICTS= kdegames-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix pykde4 automoc4
KDE4_BUILDENV= yes
USE_PYTHON= 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_SQLITE= 3
USE_TWISTED_RUN= yes
DISTINFO_FILE= ${PORTSDIR}/games/kdegames4/distinfo
diff --git a/games/kanagram/Makefile b/games/kanagram/Makefile
index 920faaad84fd..13db862c4144 100644
--- a/games/kanagram/Makefile
+++ b/games/kanagram/Makefile
@@ -20,8 +20,7 @@ CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix libkdeedu automoc4
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_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/games/kardsgt/Makefile b/games/kardsgt/Makefile
index 680c3c58a93e..94a7b261612b 100644
--- a/games/kardsgt/Makefile
+++ b/games/kardsgt/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Card game suite
-USE_QT_VER= 4
-QT_COMPONENTS= assistantclient corelib gui network \
+USE_QT4= assistantclient corelib gui network \
moc_build qmake_build rcc_build uic_build
ALL_TARGET= qmake release
MAKE_JOBS_UNSAFE= yes
diff --git a/games/kcheckers/Makefile b/games/kcheckers/Makefile
index 16c4109c4849..a4cbb8009222 100644
--- a/games/kcheckers/Makefile
+++ b/games/kcheckers/Makefile
@@ -13,8 +13,7 @@ MASTER_SITES= SF/qcheckers/${PORTNAME}/${PORTVERSION}
MAINTAINER= johans@FreeBSD.org
COMMENT= Qt version of the classic boardgame checkers
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui qmake_build moc_build rcc_build
+USE_QT4= corelib gui qmake_build moc_build rcc_build
MAKE_ENV= QTDIR="${QT_PREFIX}"
post-patch:
diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile
index 820d2dc58637..49195949a010 100644
--- a/games/kdegames4/Makefile
+++ b/games/kdegames4/Makefile
@@ -26,8 +26,7 @@ USE_GL= glu
USE_KDE4= kdehier kdelibs kdeprefix sharedmime automoc4
KDE4_BUILDENV= yes
USE_OPENAL= al
-USE_QT_VER= 4
-QT_COMPONENTS= dbus gui network opengl qt3support script svg xml \
+USE_QT4= dbus gui network opengl qt3support script svg xml \
moc_build qmake_build rcc_build uic_build
USE_XZ= yes
CMAKE_ARGS+= -DBUILD_kajongg:BOOL=FALSE
diff --git a/games/khangman/Makefile b/games/khangman/Makefile
index 8e7980fdb9e9..5189580b6761 100644
--- a/games/khangman/Makefile
+++ b/games/khangman/Makefile
@@ -20,8 +20,7 @@ CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix libkdeedu automoc4
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
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/games/kmancala/Makefile b/games/kmancala/Makefile
index df415b1f441e..6df8f890cb6b 100644
--- a/games/kmancala/Makefile
+++ b/games/kmancala/Makefile
@@ -21,7 +21,6 @@ LIB_DEPENDS= kdegames.5:${PORTSDIR}/games/kdegames4
USE_BZIP2= yes
USE_CMAKE= yes
USE_KDE4= 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
.include <bsd.port.mk>
diff --git a/games/knights-kde4/Makefile b/games/knights-kde4/Makefile
index 15531ebdfdfa..bc5f21026466 100644
--- a/games/knights-kde4/Makefile
+++ b/games/knights-kde4/Makefile
@@ -21,7 +21,6 @@ LATEST_LINK= ${PORTNAME}-kde4
USE_BZIP2= yes
USE_CMAKE= yes
USE_KDE4= kdelibs kdehier kdeprefix automoc4 workspace
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build
+USE_QT4= qmake_build moc_build rcc_build uic_build
.include <bsd.port.mk>
diff --git a/games/openpref/Makefile b/games/openpref/Makefile
index 825c939a5884..ef1ac05349b5 100644
--- a/games/openpref/Makefile
+++ b/games/openpref/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES= SF/${PORTNAME}/OpenPref-Qt4/${PORTNAME}-${PORTVERSION}
MAINTAINER= annulen@yandex.ru
COMMENT= Preferans game
-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
MAKE_JOBS_UNSAFE= yes
diff --git a/games/peg-e/Makefile b/games/peg-e/Makefile
index 49d063c7b6a1..1ea907d64754 100644
--- a/games/peg-e/Makefile
+++ b/games/peg-e/Makefile
@@ -17,8 +17,7 @@ MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Peg elimination game
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui moc_build qmake_build rcc_build
+USE_QT4= corelib gui moc_build qmake_build rcc_build
WANT_GNOME= yes
INSTALLS_ICONS= yes
MAKE_JOBS_SAFE= yes
diff --git a/games/pokerth/Makefile b/games/pokerth/Makefile
index 50d96234cc08..6da474ed8d8c 100644
--- a/games/pokerth/Makefile
+++ b/games/pokerth/Makefile
@@ -30,8 +30,7 @@ USE_ICONV= yes
USE_BZIP2= yes
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui corelib network sql sql-sqlite3 qmake_build \
+USE_QT4= gui corelib network sql sql-sqlite3 qmake_build \
moc_build rcc_build uic_build
USE_SDL= mixer
HAS_CONFIGURE= yes
diff --git a/games/qnetwalk/Makefile b/games/qnetwalk/Makefile
index 1f33083f2351..85a4da8ee072 100644
--- a/games/qnetwalk/Makefile
+++ b/games/qnetwalk/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES= http://qt.osdn.org.ua/ \
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Qt-version of the NetWalk game
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui qmake_build moc_build rcc_build
+USE_QT4= corelib gui qmake_build moc_build rcc_build
MAKE_JOBS_SAFE= yes
MAN6= qnetwalk.6
diff --git a/games/quackle/Makefile b/games/quackle/Makefile
index 39390eec9ddb..9676f78c0799 100644
--- a/games/quackle/Makefile
+++ b/games/quackle/Makefile
@@ -22,8 +22,7 @@ LICENSE_COMB= dual
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
BUILD_WRKSRC= ${WRKSRC}/quacker
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui moc_build qmake_build
+USE_QT4= corelib gui moc_build qmake_build
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
diff --git a/games/simsu/Makefile b/games/simsu/Makefile
index a466ae349f29..3d2fdcb6eecb 100644
--- a/games/simsu/Makefile
+++ b/games/simsu/Makefile
@@ -16,8 +16,7 @@ COMMENT= Simsu is a basic Sudoku game
LICENSE= GPLv3
-USE_QT_VER= 4
-QT_COMPONENTS= moc_build qmake_build rcc_build uic_build iconengines imageformats
+USE_QT4= moc_build qmake_build rcc_build uic_build iconengines imageformats
INSTALLS_ICONS= yes
HAS_CONFIGURE= yes
diff --git a/games/spellathon/Makefile b/games/spellathon/Makefile
index aa02fed411cb..bcf00e2714e3 100644
--- a/games/spellathon/Makefile
+++ b/games/spellathon/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES= SF
MAINTAINER= girish.rao.dev@gmail.com
COMMENT= Word game to test your English vocabulary skills
-USE_QT_VER= 4
-QT_COMPONENTS= gui moc_build qmake_build rcc_build uic_build
+USE_QT4= gui moc_build qmake_build rcc_build uic_build
post-patch:
@${REINPLACE_CMD} 's|qmake|qmake-qt4|' ${WRKSRC}/Makefile
diff --git a/games/tanglet/Makefile b/games/tanglet/Makefile
index 498037e944a6..7fcc0fe499fb 100644
--- a/games/tanglet/Makefile
+++ b/games/tanglet/Makefile
@@ -17,8 +17,7 @@ COMMENT= Tanglet is a single player word finding game based on Boggle
LICENSE= GPLv3
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= moc_build qmake_build rcc_build corelib gui iconengines imageformats
+USE_QT4= moc_build qmake_build rcc_build corelib gui iconengines imageformats
INSTALLS_ICONS= yes
MAKE_JOBS_SAFE= yes
diff --git a/games/tbe/Makefile b/games/tbe/Makefile
index 19f1d6a18e2c..131d5e4c18b0 100644
--- a/games/tbe/Makefile
+++ b/games/tbe/Makefile
@@ -19,8 +19,7 @@ COMMENT= The Butterfly Effect
BUILD_DEPENDS= ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
USE_GMAKE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build corelib gui moc_build rcc_build svg uic_build xml
+USE_QT4= qmake_build corelib gui moc_build rcc_build svg uic_build xml
MAKE_JOBS_SAFE= yes
WRKSRC= ${WRKDIR}/TheButterflyEffect-m${PORTVERSION}
diff --git a/games/tetzle/Makefile b/games/tetzle/Makefile
index 38184a79b7d5..5f3a143ca8f9 100644
--- a/games/tetzle/Makefile
+++ b/games/tetzle/Makefile
@@ -17,8 +17,7 @@ MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Jigsaw puzzle with tetrominoes
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui moc_build opengl qmake_build rcc_build xml
+USE_QT4= corelib gui moc_build opengl qmake_build rcc_build xml
WANT_GNOME= yes
INSTALLS_ICONS= yes
MAKE_JOBS_SAFE= yes
diff --git a/german/tipp10/Makefile b/german/tipp10/Makefile
index e327b36c8636..62dd36f0db07 100644
--- a/german/tipp10/Makefile
+++ b/german/tipp10/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlite2.so:${PORTSDIR}/
${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlite.so:${PORTSDIR}/databases/qt4-sqlite3-plugin
USE_ZIP= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui sql corelib network script qtestlib \
+USE_QT4= gui sql corelib network script qtestlib \
qmake_build rcc_build uic_build moc_build
WRKSRC= ${WRKDIR}/tipp10_source_v2-1-0
diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index b3cabb3fba4b..76b273a5347b 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -32,8 +32,7 @@ USE_LDCONFIG= yes
USE_CMAKE= yes
CMAKE_OUTSOURCE= yes
CMAKE_VERBOSE= 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
PLIST_SUB+= LIBVERS=${PORTVERSION:R}
INSTALLS_ICONS= yes
diff --git a/graphics/autoq3d/Makefile b/graphics/autoq3d/Makefile
index 18cf651f73f3..a467e4499b2b 100644
--- a/graphics/autoq3d/Makefile
+++ b/graphics/autoq3d/Makefile
@@ -20,8 +20,7 @@ LICENSE_COMB= dual
USE_GL= glu
USE_ZIP= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui opengl \
+USE_QT4= corelib gui opengl \
moc_build qmake_build
MAKE_JOBS_SAFE= yes
diff --git a/graphics/darknock/Makefile b/graphics/darknock/Makefile
index 232609f91d91..b31375d19c37 100644
--- a/graphics/darknock/Makefile
+++ b/graphics/darknock/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A program that can detect edges in images
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build linguist_build gui
+USE_QT4= qmake_build moc_build rcc_build uic_build linguist_build gui
WRKSRC= ${WRKDIR}/${PORTNAME}
LRELEASE= ${QT_PREFIX}/bin/lrelease-qt4
MAKE_JOBS_SAFE= yes
diff --git a/graphics/digikam-kde4/Makefile b/graphics/digikam-kde4/Makefile
index 0153e8459b80..2de2dbd62a15 100644
--- a/graphics/digikam-kde4/Makefile
+++ b/graphics/digikam-kde4/Makefile
@@ -29,8 +29,7 @@ LATEST_LINK= ${PORTNAME}-kde4
MAKE_JOBS_SAFE= yes
USE_BZIP2= yes
USE_KDE4= automoc4 kdehier kdeprefix kdelibs
-USE_QT_VER= 4
-QT_COMPONENTS= gui dbus network qt3support sql svg xml \
+USE_QT4= gui dbus network qt3support sql svg xml \
qmake_build moc_build rcc_build uic_build
USE_GNOME= pkgconfig
USE_CMAKE= yes
diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile
index a78b89741071..c792831eb848 100644
--- a/graphics/djview4/Makefile
+++ b/graphics/djview4/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS= djvulibre.24:${PORTSDIR}/graphics/djvulibre-nox11
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig
-USE_QT_VER= 4
-QT_COMPONENTS= gui network rcc_build uic_build moc_build qmake_build
+USE_QT4= gui network rcc_build uic_build moc_build qmake_build
QT_NONSTANDARD= yes
CONFIGURE_ARGS= --x-includes="${LOCALBASE}/include" \
--x-libraries="${LOCALBASE}/lib"
diff --git a/graphics/easypaint/Makefile b/graphics/easypaint/Makefile
index ef91dc00303e..597c29be6c20 100644
--- a/graphics/easypaint/Makefile
+++ b/graphics/easypaint/Makefile
@@ -17,8 +17,7 @@ COMMENT= Easy graphic editing program
LICENSE= GPLv3
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml qmake_build uic_build moc_build rcc_build
+USE_QT4= gui xml qmake_build uic_build moc_build rcc_build
QPROFILE= easyPaint
WRKSRC= ${WRKDIR}/${QPROFILE}
diff --git a/graphics/eos-movrec/Makefile b/graphics/eos-movrec/Makefile
index a4a39ac625d4..50f97f931635 100644
--- a/graphics/eos-movrec/Makefile
+++ b/graphics/eos-movrec/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS= gphoto2.2:${PORTSDIR}/graphics/libgphoto2
USE_ZIP= yes
USE_CMAKE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build gui
+USE_QT4= qmake_build moc_build rcc_build uic_build gui
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
DISTVERSIONSUFFIX= -src
diff --git a/graphics/evolvotron/Makefile b/graphics/evolvotron/Makefile
index a5ee2fc2da89..77cb4ff6c084 100644
--- a/graphics/evolvotron/Makefile
+++ b/graphics/evolvotron/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui moc_build qmake_build xml
+USE_QT4= corelib gui moc_build qmake_build xml
USE_PYTHON= yes
USE_XORG= x11
GNU_CONFIGURE= yes
diff --git a/graphics/fracplanet/Makefile b/graphics/fracplanet/Makefile
index 0931eeea8025..156ab27dc45b 100644
--- a/graphics/fracplanet/Makefile
+++ b/graphics/fracplanet/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS= boost_program_options.4:${PORTSDIR}/devel/boost-libs
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_GL= glu
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui opengl \
+USE_QT4= corelib gui opengl \
moc_build qmake_build
QT_NONSTANDARD= yes
HAS_CONFIGURE= yes
diff --git a/graphics/fraqtive/Makefile b/graphics/fraqtive/Makefile
index e0fba2ded3c0..a555677bbd74 100644
--- a/graphics/fraqtive/Makefile
+++ b/graphics/fraqtive/Makefile
@@ -15,8 +15,7 @@ MAINTAINER= makc@FreeBSD.org
COMMENT= Draws Mandelbrot and Julia fractals
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui opengl qmake_build uic_build moc_build rcc_build
+USE_QT4= gui opengl qmake_build uic_build moc_build rcc_build
QT_NONSTANDARD= yes
USE_GL= glu
HAS_CONFIGURE= yes
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index e9ffa3c7c2d7..6fe5a6912629 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -149,8 +149,7 @@ PLIST_SUB+= KDE="@comment "
.if defined(WITH_KDE4)
GNASH_GUIS+= kde4
PLIST_SUB+= KDE4=""
-USE_QT_VER= 4
-QT_COMPONENTS= moc_build
+USE_QT4= moc_build
QT_NONSTANDARD= yes
USE_KDE4= kdehier kdelibs
CONFIGURE_ENV+= KDE4_CONFIG="${KDE4_PREFIX}/bin/kde4-config"
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index aaee48e9e27a..cf67638bd7f1 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -94,8 +94,7 @@ OPTIONS= ICONV "Build with ICONV support" on \
.include <bsd.port.options.mk>
.if defined(WITH_GVEDIT)
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build linguist_build
+USE_QT4= qmake_build moc_build rcc_build uic_build linguist_build
.endif
.include <bsd.port.pre.mk>
diff --git a/graphics/gwenview-kde4/Makefile b/graphics/gwenview-kde4/Makefile
index 3fa47a115bb8..c5c2c4daccfb 100644
--- a/graphics/gwenview-kde4/Makefile
+++ b/graphics/gwenview-kde4/Makefile
@@ -26,8 +26,7 @@ CONFLICTS= kdegraphics-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix libkipi libkonq \
automoc4 soprano
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_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/ipe/Makefile b/graphics/ipe/Makefile
index 1b2712c1e544..97f5075e862d 100644
--- a/graphics/ipe/Makefile
+++ b/graphics/ipe/Makefile
@@ -25,8 +25,7 @@ USE_LDCONFIG= yes
USE_LUA= 5.1
USE_GMAKE= yes
USE_GNOME= pkgconfig
-USE_QT_VER= 4
-QT_COMPONENTS= gui qt3support qmake_build moc_build uic_build rcc_build
+USE_QT4= gui qt3support qmake_build moc_build uic_build rcc_build
MAN1= ipe.1 ipe6upgrade.1 ipeextract.1 iperender.1 ipetoipe.1 ipescript.1
.if defined(NOPORTDOCS)
diff --git a/graphics/kamera-kde4/Makefile b/graphics/kamera-kde4/Makefile
index d708569b26bc..3b12e6277163 100644
--- a/graphics/kamera-kde4/Makefile
+++ b/graphics/kamera-kde4/Makefile
@@ -24,8 +24,7 @@ CONFLICTS= kdegraphics-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= dbus qt3support qmake_build moc_build uic_build rcc_build
+USE_QT4= dbus qt3support qmake_build moc_build uic_build rcc_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/kcolorchooser/Makefile b/graphics/kcolorchooser/Makefile
index 3cbd59cda553..25e948d9eb18 100644
--- a/graphics/kcolorchooser/Makefile
+++ b/graphics/kcolorchooser/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_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/kcoloredit/Makefile b/graphics/kcoloredit/Makefile
index 5a866d78bdd4..080018aaa3fc 100644
--- a/graphics/kcoloredit/Makefile
+++ b/graphics/kcoloredit/Makefile
@@ -19,8 +19,7 @@ COMMENT= Palette files editor for KDE
USE_BZIP2= yes
USE_KDE4= kdelibs kdeprefix kdehier 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
USE_CMAKE= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/kdegraphics4-mobipocket/Makefile b/graphics/kdegraphics4-mobipocket/Makefile
index c7ff0a56ca52..2f6f7176bc10 100644
--- a/graphics/kdegraphics4-mobipocket/Makefile
+++ b/graphics/kdegraphics4-mobipocket/Makefile
@@ -20,8 +20,7 @@ CONFLICTS= kdegraphics-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix okular automoc4 strigi
KDE4_BUILDENV= 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_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/kdegraphics4-strigi-analyzer/Makefile b/graphics/kdegraphics4-strigi-analyzer/Makefile
index f4d3e2456216..068286b2eed1 100644
--- a/graphics/kdegraphics4-strigi-analyzer/Makefile
+++ b/graphics/kdegraphics4-strigi-analyzer/Makefile
@@ -22,8 +22,7 @@ CONFLICTS= kdegraphics-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4 strigi
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib qmake_build moc_build uic_build rcc_build
+USE_QT4= corelib qmake_build moc_build uic_build rcc_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/kdegraphics4-svgpart/Makefile b/graphics/kdegraphics4-svgpart/Makefile
index cfa246a2174c..2bbb36e9a53c 100644
--- a/graphics/kdegraphics4-svgpart/Makefile
+++ b/graphics/kdegraphics4-svgpart/Makefile
@@ -21,8 +21,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_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/kdegraphics4-thumbnailers/Makefile b/graphics/kdegraphics4-thumbnailers/Makefile
index bc61bd233d1a..9ea3e83277f1 100644
--- a/graphics/kdegraphics4-thumbnailers/Makefile
+++ b/graphics/kdegraphics4-thumbnailers/Makefile
@@ -20,8 +20,7 @@ CONFLICTS= kdegraphics-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix libkdcraw libkexiv2 automoc4
KDE4_BUILDENV= 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_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/kgraphviewer/Makefile b/graphics/kgraphviewer/Makefile
index c289c68dab5d..c72756acc1e9 100644
--- a/graphics/kgraphviewer/Makefile
+++ b/graphics/kgraphviewer/Makefile
@@ -21,8 +21,7 @@ LIB_DEPENDS= gvc:${PORTSDIR}/graphics/graphviz
USE_BZIP2= yes
USE_KDE4= kdelibs pimlibs kdeprefix kdehier 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
USE_CMAKE= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/kiconedit/Makefile b/graphics/kiconedit/Makefile
index d4e4f92b69a5..60ee0dedf9a7 100644
--- a/graphics/kiconedit/Makefile
+++ b/graphics/kiconedit/Makefile
@@ -18,8 +18,7 @@ COMMENT= A KDE icon editor
USE_BZIP2= yes
USE_KDE4= kdelibs kdeprefix kdehier 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
USE_CMAKE= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/kipi-plugins-kde4/Makefile b/graphics/kipi-plugins-kde4/Makefile
index 8b17166c9279..2111dc1535d7 100644
--- a/graphics/kipi-plugins-kde4/Makefile
+++ b/graphics/kipi-plugins-kde4/Makefile
@@ -30,8 +30,7 @@ USE_CMAKE= yes
USE_GETTEXT= yes
USE_GL= glu
USE_KDE4= automoc4 kdehier kdeprefix kdelibs
-USE_QT_VER= 4
-QT_COMPONENTS= gui dbus network svg xml opengl \
+USE_QT4= gui dbus network svg xml opengl \
qmake_build moc_build rcc_build uic_build
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/klatexformula/Makefile b/graphics/klatexformula/Makefile
index 9bdc9e8e9fee..dc7277ec49df 100644
--- a/graphics/klatexformula/Makefile
+++ b/graphics/klatexformula/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX-base \
dvips:${PORTSDIR}/print/dvipsk-tetex \
${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml dbus designer_build \
+USE_QT4= gui xml dbus designer_build \
qmake_build moc_build rcc_build uic_build
HAS_CONFIGURE= yes
USE_GHOSTSCRIPT= yes
diff --git a/graphics/kolourpaint/Makefile b/graphics/kolourpaint/Makefile
index ab347e50bd56..17786a22dc1e 100644
--- a/graphics/kolourpaint/Makefile
+++ b/graphics/kolourpaint/Makefile
@@ -20,8 +20,7 @@ CONFLICTS= kdegraphics-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4 qimageblitz
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib qmake_build moc_build uic_build rcc_build
+USE_QT4= corelib qmake_build moc_build uic_build rcc_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/kphotoalbum-kde4/Makefile b/graphics/kphotoalbum-kde4/Makefile
index 08f22e9522b5..acb21e9d75bc 100644
--- a/graphics/kphotoalbum-kde4/Makefile
+++ b/graphics/kphotoalbum-kde4/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
USE_BZIP2= yes
USE_KDE4= kdelibs kdeprefix kdehier 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
USE_CMAKE= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/kpovmodeler/Makefile b/graphics/kpovmodeler/Makefile
index d63ffb2209a7..e83ef14d092d 100644
--- a/graphics/kpovmodeler/Makefile
+++ b/graphics/kpovmodeler/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray-meta
USE_BZIP2= yes
USE_GL= glu
USE_KDE4= kdelibs kdeprefix kdehier automoc4
-USE_QT_VER= 4
-QT_COMPONENTS= corelib opengl qmake_build moc_build rcc_build uic_build
+USE_QT4= corelib opengl qmake_build moc_build rcc_build uic_build
USE_CMAKE= yes
USE_GETTEXT= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/ksaneplugin/Makefile b/graphics/ksaneplugin/Makefile
index 38b4ccfc17a5..fc4834ab65cf 100644
--- a/graphics/ksaneplugin/Makefile
+++ b/graphics/ksaneplugin/Makefile
@@ -20,8 +20,7 @@ CONFLICTS= kdegraphics-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix libksane 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_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/ksnapshot/Makefile b/graphics/ksnapshot/Makefile
index 538db09a5b86..732a6963bc20 100644
--- a/graphics/ksnapshot/Makefile
+++ b/graphics/ksnapshot/Makefile
@@ -20,8 +20,7 @@ CONFLICTS= kdegraphics-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix libkipi 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 xext xfixes
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/kuickshow-kde4/Makefile b/graphics/kuickshow-kde4/Makefile
index b82555954b18..b9364849548b 100644
--- a/graphics/kuickshow-kde4/Makefile
+++ b/graphics/kuickshow-kde4/Makefile
@@ -20,8 +20,7 @@ COMMENT= KDE image viewer
USE_BZIP2= yes
USE_GNOME= imlib
USE_KDE4= kdelibs kdeprefix kdehier automoc4
-USE_QT_VER= 4
-QT_COMPONENTS= corelib opengl qmake_build moc_build rcc_build uic_build
+USE_QT4= corelib opengl qmake_build moc_build rcc_build uic_build
USE_CMAKE= yes
USE_GETTEXT= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/libkdcraw-kde4/Makefile b/graphics/libkdcraw-kde4/Makefile
index c12b7c9a05b0..0fa454a71c3c 100644
--- a/graphics/libkdcraw-kde4/Makefile
+++ b/graphics/libkdcraw-kde4/Makefile
@@ -24,8 +24,7 @@ CONFLICTS= kdegraphics-4.[0-6].*
USE_XZ= yes
USE_KDE4= automoc4 kdehier kdeprefix kdelibs
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= dbus gui xml \
+USE_QT4= dbus gui xml \
moc_build qmake_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
diff --git a/graphics/libkexiv2-kde4/Makefile b/graphics/libkexiv2-kde4/Makefile
index fc53688247bd..ffc6c81e4749 100644
--- a/graphics/libkexiv2-kde4/Makefile
+++ b/graphics/libkexiv2-kde4/Makefile
@@ -25,8 +25,7 @@ CONFLICTS= kdegraphics-4.[0-6].*
USE_XZ= yes
USE_KDE4= automoc4 kdehier kdeprefix kdelibs
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= dbus gui xml \
+USE_QT4= dbus gui xml \
moc_build qmake_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
diff --git a/graphics/libkipi-kde4/Makefile b/graphics/libkipi-kde4/Makefile
index f1f05f4246d6..80efa01d3059 100644
--- a/graphics/libkipi-kde4/Makefile
+++ b/graphics/libkipi-kde4/Makefile
@@ -22,8 +22,7 @@ CONFLICTS= kdegraphics-4.[0-6].*
USE_XZ= yes
USE_KDE4= automoc4 kdehier kdeprefix kdelibs
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= dbus gui xml \
+USE_QT4= dbus gui xml \
moc_build qmake_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
diff --git a/graphics/libksane/Makefile b/graphics/libksane/Makefile
index 160b396f3f56..303cd96bd6ef 100644
--- a/graphics/libksane/Makefile
+++ b/graphics/libksane/Makefile
@@ -21,8 +21,7 @@ CONFLICTS= kdegraphics-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib moc_build qmake_build rcc_build uic_build
+USE_QT4= corelib moc_build qmake_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/lprof-devel/Makefile b/graphics/lprof-devel/Makefile
index a0a103c5c2d7..56f8e86c77de 100644
--- a/graphics/lprof-devel/Makefile
+++ b/graphics/lprof-devel/Makefile
@@ -23,8 +23,7 @@ LIB_DEPENDS= lcms.1:${PORTSDIR}/graphics/lcms \
USE_BZIP2= yes
USE_XORG= x11 xext sm ice xxf86vm
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui qt3support assistantclient linguist_build qmake_build moc_build uic_build rcc_build
+USE_QT4= corelib gui qt3support assistantclient linguist_build qmake_build moc_build uic_build rcc_build
USE_CMAKE= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/luminance/Makefile b/graphics/luminance/Makefile
index 5009b65d01b9..533b3d2ef90b 100644
--- a/graphics/luminance/Makefile
+++ b/graphics/luminance/Makefile
@@ -25,8 +25,7 @@ LIB_DEPENDS= exiv2.10:${PORTSDIR}/graphics/exiv2 \
fftw3f:${PORTSDIR}/math/fftw3-float \
gsl.16:${PORTSDIR}/math/gsl
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml webkit imageformats_run linguist_build \
+USE_QT4= gui xml webkit imageformats_run linguist_build \
moc_build qmake_build rcc_build uic_build
QMAKE_ARGS= PREFIX=${PREFIX} DOCDIR=${DOCSDIR} I18NDIR=${DATADIR}/i18n
MAKE_JOBS_SAFE= yes
diff --git a/graphics/luxrender/Makefile b/graphics/luxrender/Makefile
index 47c73fd9f757..97ba697d4feb 100644
--- a/graphics/luxrender/Makefile
+++ b/graphics/luxrender/Makefile
@@ -44,8 +44,7 @@ OPTIONS= QT4 "Build Qt4 GUI executable" on \
.include <bsd.port.options.mk>
.if defined(WITH_QT4)
-USE_QT_VER= 4
-QT_COMPONENTS= moc_build qmake_build rcc_build uic_build corelib gui
+USE_QT4= moc_build qmake_build rcc_build uic_build corelib gui
PLIST_FILES+= bin/luxrender
.endif
diff --git a/graphics/meshviewer/Makefile b/graphics/meshviewer/Makefile
index 8b9a7dadb4e3..ddcc3f738459 100644
--- a/graphics/meshviewer/Makefile
+++ b/graphics/meshviewer/Makefile
@@ -17,8 +17,7 @@ COMMENT= Mesh Viewer
WRKSRC= ${WRKDIR}/mview-${PORTVERSION}
USE_GL= glu
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui opengl moc_build
+USE_QT4= corelib gui opengl moc_build
USE_GMAKE= yes
CXXFLAGS+= -I. -Imesh -Imathvector \
`pkg-config --cflags QtOpenGL glu`
diff --git a/graphics/nvidia-texture-tools/Makefile b/graphics/nvidia-texture-tools/Makefile
index 33ea6a0bae80..dff1314ed906 100644
--- a/graphics/nvidia-texture-tools/Makefile
+++ b/graphics/nvidia-texture-tools/Makefile
@@ -36,9 +36,8 @@ OPTIONS= COMPRESSUI "Build compressor UI (requires Qt4)" off
.include <bsd.port.options.mk>
.if defined(WITH_COMPRESSUI)
-USE_QT_VER= 4
# *_build stuff is not really needed, but cmake's Qt finder won't work otherwise
-QT_COMPONENTS= qmake_build moc_build uic_build rcc_build corelib gui opengl
+USE_QT4= qmake_build moc_build uic_build rcc_build corelib gui opengl
PLIST_SUB+= COMPRESSUI=""
.else
PLIST_SUB+= COMPRESSUI="@comment "
diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile
index 04669db90368..85096e41ec85 100644
--- a/graphics/okular/Makefile
+++ b/graphics/okular/Makefile
@@ -30,8 +30,7 @@ CONFLICTS= kdegraphics-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4 qimageblitz
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml qmake_build moc_build uic_build rcc_build
+USE_QT4= gui xml qmake_build moc_build uic_build rcc_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/opencsg/Makefile b/graphics/opencsg/Makefile
index 84875cd338a2..4a883371604d 100644
--- a/graphics/opencsg/Makefile
+++ b/graphics/opencsg/Makefile
@@ -18,8 +18,7 @@ COMMENT= Constructive Solid Geometry rendering library
USE_GL= glew
WRKSRC= ${WRKDIR}/${DISTNAME}/src
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build corelib gui
+USE_QT4= qmake_build corelib gui
PLIST_SUB= PORTVERSION=${PORTVERSION}
#MAKE_JOBS_UNSAFE=yes
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 36d3dd5f6fac..49e80c072368 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -118,8 +118,7 @@ CMAKE_ARGS+= -DWITH_PNG:BOOL=Off
.endif
.if defined(WITH_QT4)
-USE_QT_VER= 4
-QT_COMPONENTS+= opengl moc_build qmake_build rcc_build uic_build
+USE_QT4+= opengl moc_build qmake_build rcc_build uic_build
CMAKE_ARGS+= -DWITH_QT:BOOL=On -DWITH_QT_OPENGL:BOOL=On
.else
CMAKE_ARGS+= -DWITH_QT:BOOL=Off
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 9490d030cc30..a4b059282eab 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -51,8 +51,7 @@ CMAKE_ARGS+= -DINSTALL_DOCS:BOOL=OFF
.if defined(WITH_IMAGEVIEWER)
USE_GL= glew
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui opengl qmake_build moc_build rcc_build uic_build
+USE_QT4= corelib gui opengl qmake_build moc_build rcc_build uic_build
CMAKE_ARGS+= -DUSE_QT:BOOL=ON -DUSE_OPENGL:BOOL=ON
CMAKE_ENV+= QTDIR=${QT_PREFIX} QT_INCLUDES=${QT_INCDIR}
PLIST_SUB+= IMAGEVIEWER=""
diff --git a/graphics/pencil/Makefile b/graphics/pencil/Makefile
index 5278d5e3b232..6cb510bc7c12 100644
--- a/graphics/pencil/Makefile
+++ b/graphics/pencil/Makefile
@@ -29,8 +29,7 @@ LIB_DEPENDS+= ming:${PORTSDIR}/graphics/ming \
USE_ZIP= yes
USE_GETTEXT= yes
USE_GNOME= glib20
-USE_QT_VER= 4
-QT_COMPONENTS= gui moc_build qmake_build rcc_build xml_build opengl_build
+USE_QT4= gui moc_build qmake_build rcc_build xml_build opengl_build
USE_XORG= xi xrender xrandr xfixes xcursor xinerama xext x11 xau xdmcp \
xxf86vm xdamage
USE_GL= gl glu
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index f72bb073e9d9..16d93605a40f 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -58,8 +58,7 @@ CONFIGURE_ARGS+=--disable-poppler-glib
.if ${SLAVEPORT}=="qt4"
CONFIGURE_ARGS+=--enable-poppler-qt4
CONFIGURE_ENV+= ac_cv_prog_MOCQT4=${LOCALBASE}/bin/moc-qt4
-USE_QT_VER+= 4
-QT_COMPONENTS= gui corelib xml qtestlib moc_build
+USE_QT4= gui corelib xml qtestlib moc_build
# It requires poppler/splash to be built unless you disable splash backend
# support to allow you use BUILD_WRKSRC here. It seems that splash backend
# can read more PDF files than without, tested with demos's poppler_qt4viewer.
diff --git a/graphics/prison/Makefile b/graphics/prison/Makefile
index deb1ad52820f..2a8469cc36f8 100644
--- a/graphics/prison/Makefile
+++ b/graphics/prison/Makefile
@@ -18,8 +18,7 @@ COMMENT= A barcode library for KDE
LIB_DEPENDS= dmtx.0:${PORTSDIR}/graphics/libdmtx \
qrencode.3:${PORTSDIR}/graphics/libqrencode
-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
USE_CMAKE= yes
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
diff --git a/graphics/py-qt4-svg/Makefile b/graphics/py-qt4-svg/Makefile
index 7d474dece6f1..981d40143a22 100644
--- a/graphics/py-qt4-svg/Makefile
+++ b/graphics/py-qt4-svg/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= svg qmake_build
+USE_QT4= svg qmake_build
OPTIONS= API "Install QtSvg API for QScintilla2" on \
DEBUG "Enable debugging in generated code" off \
diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile
index 0bfa80ab4e8f..f1bf175799b1 100644
--- a/graphics/qcomicbook/Makefile
+++ b/graphics/qcomicbook/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS= poppler-qt4.3:${PORTSDIR}/graphics/poppler-qt4
RUN_DEPENDS= unzip:${PORTSDIR}/archivers/unzip \
unrar:${PORTSDIR}/archivers/unrar
-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 \
xml
USE_CMAKE= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 4f1043aef45d..d72b03be5c01 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -25,9 +25,8 @@ USE_BZIP2= yes
USE_PYTHON= yes
USE_BISON= build
USE_CMAKE= yes
-USE_QT_VER= 4
USE_SQLITE= yes
-QT_COMPONENTS= gui svg xml network sql designer linguist_build \
+USE_QT4= gui svg xml network sql designer linguist_build \
qmake_build moc_build rcc_build uic_build
USE_LDCONFIG= yes
diff --git a/graphics/qiviewer/Makefile b/graphics/qiviewer/Makefile
index 886312ccd4ce..5895fd5ed5fd 100644
--- a/graphics/qiviewer/Makefile
+++ b/graphics/qiviewer/Makefile
@@ -17,8 +17,7 @@ COMMENT= Fast and lightweight image viewer
LICENSE= GPLv2
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml dbus linguist_build qmake_build moc_build \
+USE_QT4= gui xml dbus linguist_build qmake_build moc_build \
rcc_build uic_build
QMAKEFLAGS+= PREFIX="${PREFIX}"
diff --git a/graphics/qt4-iconengines/Makefile b/graphics/qt4-iconengines/Makefile
index a672a857a744..066a1059ec88 100644
--- a/graphics/qt4-iconengines/Makefile
+++ b/graphics/qt4-iconengines/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SVG icon engine plugin
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build corelib gui svg xml
+USE_QT4= qmake_build moc_build corelib gui svg xml
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/qt4-imageformats/Makefile b/graphics/qt4-imageformats/Makefile
index bf8c5c5b5af6..f827e647e4bb 100644
--- a/graphics/qt4-imageformats/Makefile
+++ b/graphics/qt4-imageformats/Makefile
@@ -19,8 +19,7 @@ LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
png15:${PORTSDIR}/graphics/png \
tiff:${PORTSDIR}/graphics/tiff
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build corelib gui svg xml
+USE_QT4= qmake_build moc_build rcc_build corelib gui svg xml
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= true
diff --git a/graphics/qt4-pixeltool/Makefile b/graphics/qt4-pixeltool/Makefile
index 76818fe56b22..3896030d0138 100644
--- a/graphics/qt4-pixeltool/Makefile
+++ b/graphics/qt4-pixeltool/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt screen magnification utility
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build corelib gui network
+USE_QT4= qmake_build moc_build corelib gui network
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/qt4-svg/Makefile b/graphics/qt4-svg/Makefile
index af73d7b8b3fe..f4088c43e930 100644
--- a/graphics/qt4-svg/Makefile
+++ b/graphics/qt4-svg/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SVG 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/graphics/qtgtl/Makefile b/graphics/qtgtl/Makefile
index ae963962a36b..46453b1d4033 100644
--- a/graphics/qtgtl/Makefile
+++ b/graphics/qtgtl/Makefile
@@ -20,8 +20,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= GTLCore.0:${PORTSDIR}/graphics/opengtl
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui moc_build qmake_build rcc_build uic_build
+USE_QT4= gui moc_build qmake_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
USE_CMAKE= yes
USE_LDCONFIG= yes
diff --git a/graphics/scantailor/Makefile b/graphics/scantailor/Makefile
index 8813609e4adf..a33303954d07 100644
--- a/graphics/scantailor/Makefile
+++ b/graphics/scantailor/Makefile
@@ -25,8 +25,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost
USE_CMAKE= yes
USE_ICONV= yes
USE_GETTEXT= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml qmake_build uic_build moc_build rcc_build \
+USE_QT4= gui xml qmake_build uic_build moc_build rcc_build \
linguist_build
MAKE_JOBS_SAFE= yes
diff --git a/graphics/seam-carving-gui/Makefile b/graphics/seam-carving-gui/Makefile
index 74bdbb477c95..8b3a419d68c9 100644
--- a/graphics/seam-carving-gui/Makefile
+++ b/graphics/seam-carving-gui/Makefile
@@ -18,8 +18,7 @@ COMMENT= The Seam Carving GUI is a GUI front end to CAIR
HAS_CONFIGURE= yes
USE_GMAKE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui imageformats_run moc_build qmake_build uic_build
+USE_QT4= gui imageformats_run moc_build qmake_build uic_build
WRKSRC= ${WRKDIR}/Src\ Seam\ Carving\ GUI\ ${PORTVERSION}
diff --git a/graphics/showimage/Makefile b/graphics/showimage/Makefile
index 5fb4f9e9a188..f0da0f33f16d 100644
--- a/graphics/showimage/Makefile
+++ b/graphics/showimage/Makefile
@@ -18,8 +18,7 @@ COMMENT= ShowImage is a simple KDE based image viewer
USE_BZIP2= yes
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
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/graphics/skanlite/Makefile b/graphics/skanlite/Makefile
index 1cb8838ef996..bc467f53a4d6 100644
--- a/graphics/skanlite/Makefile
+++ b/graphics/skanlite/Makefile
@@ -19,8 +19,7 @@ LIB_DEPENDS= ksane.0:${PORTSDIR}/graphics/libksane
USE_BZIP2= yes
USE_KDE4= kdelibs kdeprefix kdehier 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
USE_CMAKE= yes
MAKE_JOBS_SAFE= yes
diff --git a/graphics/structuresynth/Makefile b/graphics/structuresynth/Makefile
index 73edb2db5660..6f78916e2a80 100644
--- a/graphics/structuresynth/Makefile
+++ b/graphics/structuresynth/Makefile
@@ -17,8 +17,7 @@ COMMENT= Rule-based 3D structure generator
USE_GL= glu
USE_ZIP= yes
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build corelib gui opengl moc_build rcc_build xml script
+USE_QT4= qmake_build corelib gui opengl moc_build rcc_build xml script
MAKE_JOBS_SAFE= yes
WRKSRC= ${WRKDIR}/structure-synth
diff --git a/graphics/tiled/Makefile b/graphics/tiled/Makefile
index f94285eabd82..9ace4a926223 100644
--- a/graphics/tiled/Makefile
+++ b/graphics/tiled/Makefile
@@ -14,8 +14,7 @@ DISTNAME= tiled-qt-${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= General purpose tile map editor
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui opengl \
+USE_QT4= corelib gui opengl \
linguist_build qmake_build moc_build uic_build rcc_build
MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile
index e83233fa75b3..6bfd46d6dc69 100644
--- a/graphics/tulip/Makefile
+++ b/graphics/tulip/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
qscintilla2:${PORTSDIR}/devel/qscintilla2 \
jpeg.11:${PORTSDIR}/graphics/jpeg
-USE_QT_VER= 4
-QT_COMPONENTS= corelib moc_build uic_build rcc_build gui opengl xml network qmake_build \
+USE_QT4= corelib moc_build uic_build rcc_build gui opengl xml network qmake_build \
designer assistant assistantclient
USE_GL= glew glut
USE_GNOME= libxml2
diff --git a/graphics/visionworkbench/Makefile b/graphics/visionworkbench/Makefile
index 9460c1ce7a3b..57b91a3e3543 100644
--- a/graphics/visionworkbench/Makefile
+++ b/graphics/visionworkbench/Makefile
@@ -24,8 +24,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
BROKEN= does not compile
GNU_CONFIGURE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= moc_build qmake_build
+USE_QT4= moc_build qmake_build
USE_FORTRAN= yes
USE_LDCONFIG= yes
USE_PYTHON= 2.4+
diff --git a/graphics/yagf/Makefile b/graphics/yagf/Makefile
index 46d1405a7bd3..214798f6a458 100644
--- a/graphics/yagf/Makefile
+++ b/graphics/yagf/Makefile
@@ -22,8 +22,7 @@ USE_CMAKE= yes
USE_LDCONFIG= yes
USE_GNOME= pkgconfig
INSTALLS_ICONS= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui imageformats linguist_build \
+USE_QT4= corelib gui imageformats linguist_build \
moc_build qmake_build rcc_build uic_build
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile
index c221c3c16a1c..a5e675a9a4ba 100644
--- a/graphics/zbar/Makefile
+++ b/graphics/zbar/Makefile
@@ -85,8 +85,7 @@ PLIST_SUB+= GTK2="@comment "
.endif
.if defined(WITH_QT4)
-USE_QT_VER= 4
-QT_COMPONENTS= gui moc_build
+USE_QT4= gui moc_build
CONFIGURE_ARGS+= --with-qt=yes
PLIST_SUB+= QT4=""
.else
diff --git a/graphics/zint/Makefile b/graphics/zint/Makefile
index f366002fc0ad..bc23dd1bfb38 100644
--- a/graphics/zint/Makefile
+++ b/graphics/zint/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
USE_CMAKE= yes
USE_LDCONFIG= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml qmake_build uic_build moc_build rcc_build designer
+USE_QT4= gui xml qmake_build uic_build moc_build rcc_build designer
MAKE_JOBS_SAFE= yes
DESKTOP_ENTRIES="Zint" "Barcode generator" "" "zint-qt" "" false
diff --git a/irc/konversation-kde4/Makefile b/irc/konversation-kde4/Makefile
index 9c863db75dc6..8167aedae073 100644
--- a/irc/konversation-kde4/Makefile
+++ b/irc/konversation-kde4/Makefile
@@ -22,8 +22,7 @@ LATEST_LINK= ${PORTNAME}-kde4
USE_XZ= yes
USE_CMAKE= yes
USE_KDE4= kdeprefix pimlibs 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/irc/kvirc/Makefile b/irc/kvirc/Makefile
index 07ca3c9fcd65..be16a197b93a 100644
--- a/irc/kvirc/Makefile
+++ b/irc/kvirc/Makefile
@@ -30,8 +30,7 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_OPENSSL= yes
USE_PERL5_BUILD= 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 \
dbus gui network sql xml
USE_CMAKE= yes
CMAKE_ARGS= -DWITHOUT_ESD=yes -DWITHOUT_DOXYGEN=yes \
@@ -61,12 +60,12 @@ PLIST_SUB+= VER="${PORTVERSION:R}"
CMAKE_ARGS+= -DWITHOUT_KDE4=yes
PLIST_SUB+= QT="" KDE="@comment "
. if defined(WITH_PHONON)
-QT_COMPONENTS+= phonon
+USE_QT4+= phonon
. else
CMAKE_ARGS+= -DWITHOUT_PHONON=yes
. endif
. if defined(WITH_WEBKIT)
-QT_COMPONENTS+= webkit
+USE_QT4+= webkit
. else
CMAKE_ARGS+= -DWITHOUT_QTWEBKIT=yes
. endif
diff --git a/irc/quassel/Makefile b/irc/quassel/Makefile
index c1e59b11ac08..9e2c19b8ea4c 100644
--- a/irc/quassel/Makefile
+++ b/irc/quassel/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
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
MAKE_JOBS_SAFE= yes
OPTIONS= MONO "Quassel standalone client" on \
@@ -38,7 +37,7 @@ IGNORE= needs at least one Quassel component. Please, rerun 'make config'
.endif
.if !defined(WITHOUT_NLS)
-QT_COMPONENTS+= linguist_build
+USE_QT4+= linguist_build
.endif
.if defined(WITHOUT_MONO) && defined(WITHOUT_CLIENT)
@@ -48,7 +47,7 @@ PLIST_SUB+= MONO_OR_CLIENT=""
.endif
.if !defined(WITHOUT_MONO)
-QT_COMPONENTS+= dbus gui network script sql xml webkit
+USE_QT4+= dbus gui network script sql xml webkit
QUASSEL_MONO= ON
PLIST_SUB+= MONO=""
.else
@@ -57,7 +56,7 @@ PLIST_SUB+= MONO="@comment "
.endif
.if !defined(WITHOUT_CORE)
-QT_COMPONENTS+= network script sql sql-sqlite3_run
+USE_QT4+= network script sql sql-sqlite3_run
QUASSEL_CORE= ON
PLIST_SUB+= CORE=""
@@ -71,7 +70,7 @@ PLIST_SUB+= CORE="@comment "
.endif
.if !defined(WITHOUT_CLIENT)
-QT_COMPONENTS+= dbus gui network xml webkit
+USE_QT4+= dbus gui network xml webkit
QUASSEL_CLIENT= ON
PLIST_SUB+= CLIENT=""
.else
diff --git a/japanese/kiten/Makefile b/japanese/kiten/Makefile
index 6ed06386c579..f0ce78fc9c00 100644
--- a/japanese/kiten/Makefile
+++ b/japanese/kiten/Makefile
@@ -20,8 +20,7 @@ CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib moc_build qmake_build rcc_build uic_build
+USE_QT4= corelib moc_build qmake_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index d81598340205..24c35cbc794f 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -31,8 +31,7 @@ USE_OPENSSL= yes
BUILD_MOZC_LIST?= mozc_server
.if ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool"
-USE_QT_VER= 4
-QT_COMPONENTS= gui dbus qmake_build moc_build uic_build rcc_build
+USE_QT4= gui dbus qmake_build moc_build uic_build rcc_build
.endif
.if ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc" || ${BUILD_MOZC_LIST:Mscim_mozc} == "scim_mozc"
USE_GNOME= pygtk2
diff --git a/japanese/qt4-codecs-jp/Makefile b/japanese/qt4-codecs-jp/Makefile
index 96906e93aadf..4a362a97400f 100644
--- a/japanese/qt4-codecs-jp/Makefile
+++ b/japanese/qt4-codecs-jp/Makefile
@@ -15,8 +15,7 @@ PKGNAMESUFFIX= -jp
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt EUC-JP/JIS codec plugins
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build corelib
+USE_QT4= qmake_build corelib
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/java/classpath/Makefile b/java/classpath/Makefile
index ddfd0cf6c64b..635db5a2bf5e 100644
--- a/java/classpath/Makefile
+++ b/java/classpath/Makefile
@@ -82,8 +82,7 @@ CONFIGURE_ARGS+= --enable-qt-peer
CONFIGURE_ARGS+= --enable-default-toolkit=gnu.java.awt.peer.qt.QtToolkit
.endif
CONFIGURE_ENV+= MOC="${LOCALBASE}/bin/moc-qt4"
-USE_QT_VER= 4
-QT_COMPONENTS= moc_build corelib gui
+USE_QT4= moc_build corelib gui
PLIST_SUB+= QT4=""
.else
PLIST_SUB+= QT4="@comment "
diff --git a/korean/qt4-codecs-kr/Makefile b/korean/qt4-codecs-kr/Makefile
index 14cded2c4e9f..9bca995e1126 100644
--- a/korean/qt4-codecs-kr/Makefile
+++ b/korean/qt4-codecs-kr/Makefile
@@ -15,8 +15,7 @@ PKGNAMESUFFIX= -kr
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt EUC-KR codec plugin
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build corelib
+USE_QT4= qmake_build corelib
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/lang/basic256/Makefile b/lang/basic256/Makefile
index 6121d8b8e20e..ea7ebd207cd4 100644
--- a/lang/basic256/Makefile
+++ b/lang/basic256/Makefile
@@ -24,8 +24,7 @@ WRKSRC= ${WRKDIR}
USE_SDL= sdl mixer
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui network xml webkit moc_build qmake_build rcc_build uic_build
+USE_QT4= corelib gui network xml webkit moc_build qmake_build rcc_build uic_build
USE_DOS2UNIX= yes
diff --git a/lang/kturtle/Makefile b/lang/kturtle/Makefile
index 6f9bcc2915a8..6deb37645e09 100644
--- a/lang/kturtle/Makefile
+++ b/lang/kturtle/Makefile
@@ -20,8 +20,7 @@ CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml moc_build qmake_build rcc_build uic_build
+USE_QT4= gui xml moc_build qmake_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/lang/phantomjs/Makefile b/lang/phantomjs/Makefile
index 4dc46b543d81..43396b6831b2 100644
--- a/lang/phantomjs/Makefile
+++ b/lang/phantomjs/Makefile
@@ -16,10 +16,9 @@ MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Minimalistic, headless, WebKit-based, JavaScript-driven tool
PROJECTHOST= phantomjs
-USE_QT_VER= 4
USE_GMAKE= YES
USE_DOS2UNIX= YES
-QT_COMPONENTS= moc qmake gui webkit rcc
+USE_QT4= moc qmake gui webkit rcc
PLIST_FILES= bin/phantomjs
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index 3dca0fbc4313..97c3ab757730 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -18,8 +18,7 @@ LICENSE= GPLv2
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_GETTEXT= yes
diff --git a/mail/kshowmail/Makefile b/mail/kshowmail/Makefile
index 206bc1cd39b5..edd722cf144d 100644
--- a/mail/kshowmail/Makefile
+++ b/mail/kshowmail/Makefile
@@ -16,8 +16,7 @@ COMMENT= POP3 mail checker for KDE
LICENSE= GPLv2
USE_KDE4= automoc4 kdehier kdeprefix kdelibs pimlibs
-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_GETTEXT= yes
diff --git a/mail/qgmailnotifier/Makefile b/mail/qgmailnotifier/Makefile
index a69d3f21a3a7..e371ad61eaed 100644
--- a/mail/qgmailnotifier/Makefile
+++ b/mail/qgmailnotifier/Makefile
@@ -15,8 +15,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= crees@FreeBSD.org
COMMENT= A portable QT4 based GMail notifier
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build uic_build gui network xml rcc_build
+USE_QT4= qmake_build moc_build uic_build gui network xml rcc_build
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/math/analitza/Makefile b/math/analitza/Makefile
index c1baf00e90d0..87d2f3f2c61f 100644
--- a/math/analitza/Makefile
+++ b/math/analitza/Makefile
@@ -20,8 +20,7 @@ CONFLICTS_INSTALL= kalgebra-4.7.* kdeedu-4.[0-6].*
USE_XZ= yes
USE_KDE4= kdehier kdelibs kdeprefix automoc4
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
.include <bsd.port.mk>
diff --git a/math/cantor/Makefile b/math/cantor/Makefile
index e27ba78dc33b..c7d07d07a5a3 100644
--- a/math/cantor/Makefile
+++ b/math/cantor/Makefile
@@ -24,8 +24,7 @@ CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= qtestlib_build xmlpatterns \
+USE_QT4= qtestlib_build xmlpatterns \
moc_build qmake_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/math/cgal/Makefile b/math/cgal/Makefile
index 3e91b2a236ad..b062f6ade667 100644
--- a/math/cgal/Makefile
+++ b/math/cgal/Makefile
@@ -32,8 +32,7 @@ FETCH_ARGS= -pRr
USE_LDCONFIG= yes
USE_CMAKE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib opengl qmake_build gui moc_build rcc_build
+USE_QT4= corelib opengl qmake_build gui moc_build rcc_build
HAS_CONFIGURE= yes
DOCSDIR= ${PREFIX}/share/doc/CGAL-3.4
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/math/freemat/Makefile b/math/freemat/Makefile
index b314b24d8747..7a62b33cf8ff 100644
--- a/math/freemat/Makefile
+++ b/math/freemat/Makefile
@@ -35,9 +35,8 @@ USE_FORTRAN= yes
FFLAGS+= -O2
USE_GL= yes
-USE_QT_VER= 4
USE_CMAKE= yes
-QT_COMPONENTS= gui network opengl moc_build rcc_build uic_build \
+USE_QT4= gui network opengl moc_build rcc_build uic_build \
qmake_build xml svg
CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include ${AMDINC}
diff --git a/math/kalgebra/Makefile b/math/kalgebra/Makefile
index 1018e7d0f4ba..1bf26dbc5d57 100644
--- a/math/kalgebra/Makefile
+++ b/math/kalgebra/Makefile
@@ -23,8 +23,7 @@ CONFLICTS= kdeedu-4.[0-6].*
USE_GL= glu
USE_KDE4= kdehier kdelibs kdeprefix libkdeedu automoc4
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui opengl script scripttools xml \
+USE_QT4= gui opengl script scripttools xml \
moc_build qmake_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/math/kbruch/Makefile b/math/kbruch/Makefile
index 01b2923b6cfe..001084f64bee 100644
--- a/math/kbruch/Makefile
+++ b/math/kbruch/Makefile
@@ -20,8 +20,7 @@ CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib moc_build qmake_build rcc_build uic_build
+USE_QT4= corelib moc_build qmake_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index 15561d06fddc..5b683df5b68e 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -21,8 +21,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/math/kig/Makefile b/math/kig/Makefile
index e7d67abb3827..b87d876413df 100644
--- a/math/kig/Makefile
+++ b/math/kig/Makefile
@@ -20,8 +20,7 @@ CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix 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
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/math/kmplot/Makefile b/math/kmplot/Makefile
index 2abb766a83dd..43152cdf7425 100644
--- a/math/kmplot/Makefile
+++ b/math/kmplot/Makefile
@@ -20,8 +20,7 @@ CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
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_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 1afd844e1c6b..8bdb0aee0d73 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -94,8 +94,7 @@ PLIST_SUB+= TCLTK="@comment "
.if defined(WITH_QT)
.undef WITHOUT_X11
PKGNAMESUFFIX= -qt
-USE_QT_VER= 4
-QT_COMPONENTS= assistant assistantclient clucene corelib dbus \
+USE_QT4= assistant assistantclient clucene corelib dbus \
designer doc gui help help-tools linguist moc \
network opengl phonon qmake qt3support qtestlib \
rcc script scripttools sql svg uic uic3 webkit \
diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile
index ec32ab95b52b..38c2567415c1 100644
--- a/math/qtiplot/Makefile
+++ b/math/qtiplot/Makefile
@@ -23,8 +23,7 @@ LIB_DEPENDS= gsl.16:${PORTSDIR}/math/gsl \
USE_BZIP2= yes
USE_GMAKE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui opengl svg qt3support network assistantclient \
+USE_QT4= gui opengl svg qt3support network assistantclient \
moc_build qmake_build rcc_build
USE_GL= glu
HAS_CONFIGURE= yes
@@ -58,11 +57,11 @@ PLIST_SUB+= PYTHON="@comment "
.if !defined(WITHOUT_DOCS)
RUN_DEPENDS+= qtiplot-doc>=0:${PORTSDIR}/math/qtiplot-doc
-QT_COMPONENTS+= assistant-adp_run
+USE_QT4+= assistant-adp_run
.endif
.if !defined(WITHOUT_NLS)
-QT_COMPONENTS+= linguist_build
+USE_QT4+= linguist_build
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
diff --git a/math/qtoctave/Makefile b/math/qtoctave/Makefile
index 61e13b2f99cf..dc71ca98dda6 100644
--- a/math/qtoctave/Makefile
+++ b/math/qtoctave/Makefile
@@ -17,8 +17,7 @@ COMMENT= Qt4 frontend for Octave
RUN_DEPENDS= octave:${PORTSDIR}/math/octave
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= designer gui network script svg xml \
+USE_QT4= designer gui network script svg xml \
qmake_build moc_build rcc_build uic_build
USE_CMAKE= yes
CMAKE_ARGS+= -DWITH_UseRPMTools:Bool=Off
diff --git a/math/qwtplot3d-qt4/Makefile b/math/qwtplot3d-qt4/Makefile
index 3339208fac8d..205fec178030 100644
--- a/math/qwtplot3d-qt4/Makefile
+++ b/math/qwtplot3d-qt4/Makefile
@@ -16,8 +16,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= makc@FreeBSD.org
COMMENT= 3D plotting widgets for scientific data and math expressions
-USE_QT_VER= 4
-QT_COMPONENTS= gui moc_build qmake_build opengl
+USE_QT4= gui moc_build qmake_build opengl
USE_GL= glu
USE_LDCONFIG= yes
HAS_CONFIGURE= yes
diff --git a/math/rkward-kde4/Makefile b/math/rkward-kde4/Makefile
index cc10b3a76ec1..acb84cd449b5 100644
--- a/math/rkward-kde4/Makefile
+++ b/math/rkward-kde4/Makefile
@@ -23,8 +23,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/R:${PORTSDIR}/math/R \
CONFLICTS= rkward-0.4.*
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build phonon
+USE_QT4= qmake_build moc_build rcc_build uic_build phonon
USE_KDE4= kdehier kdeprefix automoc4 kdelibs
USE_PHP= yes
diff --git a/math/rocs/Makefile b/math/rocs/Makefile
index cb87c3cc0e88..5a3df7ef6d9e 100644
--- a/math/rocs/Makefile
+++ b/math/rocs/Makefile
@@ -22,8 +22,7 @@ CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= script scripttools \
+USE_QT4= script scripttools \
moc_build qmake_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/math/speedcrunch/Makefile b/math/speedcrunch/Makefile
index 25b88713db19..1f6e21966282 100644
--- a/math/speedcrunch/Makefile
+++ b/math/speedcrunch/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
MAINTAINER= makc@FreeBSD.org
COMMENT= A desktop calculator for power users
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build gui xml
+USE_QT4= qmake_build moc_build rcc_build uic_build gui xml
USE_CMAKE= yes
CMAKE_SOURCE_PATH= src
@@ -25,7 +24,7 @@ LRELEASE_CMD= ${LOCALBASE}/bin/lrelease-qt4
LRELEASE_ARGS= -compress -silent
.if !defined(WITHOUT_NLS)
-QT_COMPONENTS+= linguist
+USE_QT4+= linguist
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile
index ebc647e759d2..6cc8250c3337 100644
--- a/math/vtk5/Makefile
+++ b/math/vtk5/Makefile
@@ -118,8 +118,7 @@ PLIST_SUB+= X11=""
.endif
.if defined(WITH_QT)
-USE_QT_VER= 4
-QT_COMPONENTS= corelib assistant assistantclient designer \
+USE_QT4= corelib assistant assistantclient designer \
gui opengl qtestlib sql dbus \
qmake_build uic_build moc_build rcc_build
CMAKE_ARGS+= -DVTK_USE_GUISUPPORT:BOOL=ON \
diff --git a/misc/bibletime/Makefile b/misc/bibletime/Makefile
index 664eecde60dd..af0a70669763 100644
--- a/misc/bibletime/Makefile
+++ b/misc/bibletime/Makefile
@@ -24,8 +24,7 @@ LIB_DEPENDS= clucene.0:${PORTSDIR}/textproc/clucene
USE_BZIP2= yes
USE_OPENSSL= yes
USE_CMAKE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib dbus gui iconengines network phonon qtestlib script \
+USE_QT4= corelib dbus gui iconengines network phonon qtestlib script \
svg webkit xml linguist_build moc_build qmake_build \
rcc_build uic_build
diff --git a/misc/kde4-l10n/files/bsd.l10n.mk b/misc/kde4-l10n/files/bsd.l10n.mk
index c1c98d6fe4ce..e0e63e695df2 100644
--- a/misc/kde4-l10n/files/bsd.l10n.mk
+++ b/misc/kde4-l10n/files/bsd.l10n.mk
@@ -6,8 +6,7 @@ DISTNAME= ${PORTNAME}-${KDE4_L10N}-${PORTVERSION}
DIST_SUBDIR?= KDE/kde-l10n
USE_XZ= yes
-USE_QT_VER= 4
-QT_COMPONENTS= uic_build moc_build qmake_build rcc_build xml
+USE_QT4= uic_build moc_build qmake_build rcc_build xml
USE_GETTEXT= yes
USE_KDE4= kdelibs kdehier kdeprefix automoc4
USE_CMAKE= yes
diff --git a/misc/kgeography/Makefile b/misc/kgeography/Makefile
index 28dbd15e919e..b59b6e842e40 100644
--- a/misc/kgeography/Makefile
+++ b/misc/kgeography/Makefile
@@ -20,8 +20,7 @@ CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
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_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/misc/klettres/Makefile b/misc/klettres/Makefile
index 7a90c1a54d55..3418a372595a 100644
--- a/misc/klettres/Makefile
+++ b/misc/klettres/Makefile
@@ -20,8 +20,7 @@ CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
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_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/misc/krecipes-kde4/Makefile b/misc/krecipes-kde4/Makefile
index 3224bc627309..3c22928b99fd 100644
--- a/misc/krecipes-kde4/Makefile
+++ b/misc/krecipes-kde4/Makefile
@@ -20,8 +20,7 @@ LATEST_LINK= ${PORTNAME}-kde4
USE_CMAKE= yes
USE_GETTEXT= 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 kdeprefix kdelibs sharedmime
MAKE_JOBS_SAFE= yes
@@ -38,17 +37,17 @@ OPTIONS= SQLITE "Support for SQLite backend" on \
CMAKE_ARGS+= -DWITH_Sqlite:BOOL=OFF
.else
USE_SQLITE= yes
-QT_COMPONENTS+= sql-sqlite3_run
+USE_QT4+= sql-sqlite3_run
.endif
.if defined(WITH_MYSQL)
USE_MYSQL= yes
-QT_COMPONENTS+= sql-mysql_run
+USE_QT4+= sql-mysql_run
.endif
.if defined(WITH_POSTGRESQL)
USE_PGSQL= yes
-QT_COMPONENTS+= sql-pgsql_run
+USE_QT4+= sql-pgsql_run
.endif
pre-configure:
diff --git a/misc/ktouch/Makefile b/misc/ktouch/Makefile
index f7538c5e849f..35849ff13c0c 100644
--- a/misc/ktouch/Makefile
+++ b/misc/ktouch/Makefile
@@ -20,8 +20,7 @@ CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= phonon moc_build qmake_build rcc_build uic_build
+USE_QT4= phonon moc_build qmake_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/misc/kwordquiz/Makefile b/misc/kwordquiz/Makefile
index 608f189580cf..aff96a454daf 100644
--- a/misc/kwordquiz/Makefile
+++ b/misc/kwordquiz/Makefile
@@ -20,8 +20,7 @@ CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix libkdeedu automoc4
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
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/misc/libkdeedu/Makefile b/misc/libkdeedu/Makefile
index 3db2f0391257..c671c3ab4465 100644
--- a/misc/libkdeedu/Makefile
+++ b/misc/libkdeedu/Makefile
@@ -20,8 +20,7 @@ CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml moc_build qmake_build rcc_build uic_build
+USE_QT4= gui xml moc_build qmake_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/misc/parley/Makefile b/misc/parley/Makefile
index f223fe2c2f63..f8884f54f97c 100644
--- a/misc/parley/Makefile
+++ b/misc/parley/Makefile
@@ -21,8 +21,7 @@ CONFLICTS= kdeedu-4.[0-6].*
USE_GNOME= libxml2 libxslt
USE_KDE4= kdehier kdelibs kdeprefix libkdeedu attica automoc4
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib moc_build qmake_build rcc_build uic_build
+USE_QT4= corelib moc_build qmake_build rcc_build uic_build
USE_XORG= x11 xrender
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/misc/qbrew/Makefile b/misc/qbrew/Makefile
index 9218ca27c85b..e4c1ee9fb80e 100644
--- a/misc/qbrew/Makefile
+++ b/misc/qbrew/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES= http://www.usermode.org/code/
MAINTAINER= david@usermode.org
COMMENT= A homebrewer's recipe calculator
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build uic_build rcc_build xml gui
+USE_QT4= qmake_build moc_build uic_build rcc_build xml gui
PORTDOCS= *
HAS_CONFIGURE= yes
diff --git a/misc/qt4-doc/Makefile b/misc/qt4-doc/Makefile
index caf0284e9718..4bbb57d2f99c 100644
--- a/misc/qt4-doc/Makefile
+++ b/misc/qt4-doc/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Multiplatform C++ application framework
-USE_QT_VER= 4
+USE_QT4= yes
QT_DIST= yes
NO_BUILD= yes
diff --git a/misc/qt4-l10n/Makefile b/misc/qt4-l10n/Makefile
index 7add3a5b4af9..b89658585a66 100644
--- a/misc/qt4-l10n/Makefile
+++ b/misc/qt4-l10n/Makefile
@@ -13,8 +13,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt translations messages
-USE_QT_VER= 4
-QT_COMPONENTS= linguist_build
+USE_QT4= linguist_build
QT_DIST= yes
QT_NONSTANDARD= yes
diff --git a/misc/qt4-qtconfig/Makefile b/misc/qt4-qtconfig/Makefile
index ef9d1ab2bff5..419d9d5a0ea4 100644
--- a/misc/qt4-qtconfig/Makefile
+++ b/misc/qt4-qtconfig/Makefile
@@ -15,8 +15,7 @@ COMMENT= Qt graphical configuration utility
OPTIONS= PHONON "Add support for Phonon (implies GStreamer)" on
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build qt3support corelib \
+USE_QT4= qmake_build moc_build rcc_build uic_build qt3support corelib \
gui sql xml
QT_NONSTANDARD= yes
QT_DIST= yes
@@ -43,7 +42,7 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
.include <bsd.port.options.mk>
.if !defined(WITHOUT_PHONON)
-QT_COMPONENTS+= phonon phonon-gst
+USE_QT4+= phonon phonon-gst
USE_GSTREAMER= yes
.else
CONFIGURE_ARGS+= -no-phonon -no-gstreamer
diff --git a/misc/qt4-qtdemo/Makefile b/misc/qt4-qtdemo/Makefile
index e2f724045a86..dc4903ab52cc 100644
--- a/misc/qt4-qtdemo/Makefile
+++ b/misc/qt4-qtdemo/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt demonstration and example programs
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib designer \
+USE_QT4= qmake_build moc_build rcc_build uic_build corelib designer \
gui network opengl sql svg qtestlib xml imageformats_run dbus \
script webkit phonon help assistant_run phonon-gst scripttools \
xmlpatterns multimedia
diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile
index 084114735d57..bc2173c94c3f 100644
--- a/misc/tellico-kde4/Makefile
+++ b/misc/tellico-kde4/Makefile
@@ -29,8 +29,7 @@ LATEST_LINK= ${PORTNAME}-kde4
USE_BZIP2= yes
USE_KDE4= pimlibs kdelibs kdeprefix 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_CMAKE= yes
USE_GETTEXT= yes
MAKE_JOBS_SAFE= yes
diff --git a/multimedia/2mandvd/Makefile b/multimedia/2mandvd/Makefile
index fa62d8cb2ec5..6a5f02307c83 100644
--- a/multimedia/2mandvd/Makefile
+++ b/multimedia/2mandvd/Makefile
@@ -29,10 +29,9 @@ RUN_DEPENDS= sox:${PORTSDIR}/audio/sox \
LICENSE= GPLv2
-USE_QT_VER= 4
USE_CDRTOOLS= true
USE_PERL5_RUN= yes
-QT_COMPONENTS= qmake_build gui corelib rcc_build moc_build uic_build \
+USE_QT4= qmake_build gui corelib rcc_build moc_build uic_build \
webkit
MAKE_ENV+= QTDIR=${QT_PREFIX}
diff --git a/multimedia/abby/Makefile b/multimedia/abby/Makefile
index f0a1b3b59cc5..c67d2215eb84 100644
--- a/multimedia/abby/Makefile
+++ b/multimedia/abby/Makefile
@@ -17,8 +17,7 @@ COMMENT= Front-end for c/clive
OPTIONS= CCLIVE "Use cclive backend (instead of clive)" on
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui network xml moc_build qmake_build rcc_build uic_build
+USE_QT4= gui network xml moc_build qmake_build rcc_build uic_build
HAS_CONFIGURE= yes
QMAKE_ARGS= -unix -recursive PREFIX=${PREFIX} ${QMAKE_PRO}
QMAKE_PRO= abby.pro
diff --git a/multimedia/avidemux2/Makefile.common b/multimedia/avidemux2/Makefile.common
index bcaefce86600..ff3c1e96758d 100644
--- a/multimedia/avidemux2/Makefile.common
+++ b/multimedia/avidemux2/Makefile.common
@@ -20,8 +20,7 @@ LICENSE= GPLv2
CONFLICTS= avidemux2-2.[0-46-9].*
USE_GNOME= libxml2
-USE_QT_VER= 4
-QT_COMPONENTS=
+USE_QT4= yes
USE_GMAKE= yes
USE_ICONV= yes
@@ -71,7 +70,7 @@ PLIST_SUB+= GTK="@comment "
.if ${PORT_OPTIONS:MQT4}
CMAKE_ARGS+= -DLRELEASE_EXECUTABLE=${LOCALBASE}/bin/lrelease-qt4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build linguist_build gui
+USE_QT4= qmake_build moc_build rcc_build uic_build linguist_build gui
PLIST_SUB+= QT4=""
.else
CMAKE_ARGS+= -DQT4:BOOL=OFF
diff --git a/multimedia/bangarang/Makefile b/multimedia/bangarang/Makefile
index 69fd9dcbd669..ac885e8bbd8c 100644
--- a/multimedia/bangarang/Makefile
+++ b/multimedia/bangarang/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS= tag.1:${PORTSDIR}/audio/taglib
PROJECTHOST= bangarangissuetracking
USE_CMAKE= yes
USE_GETTEXT= 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= automoc4 kdelibs kdebase kdeprefix
MAKE_JOBS_SAFE= yes
diff --git a/multimedia/bino/Makefile b/multimedia/bino/Makefile
index b86727e29fb7..6aa79e62a800 100644
--- a/multimedia/bino/Makefile
+++ b/multimedia/bino/Makefile
@@ -21,8 +21,7 @@ USE_XZ= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
INSTALLS_ICONS= yes
-USE_QT_VER= 4
-QT_COMPONENTS= moc_build opengl rcc_build
+USE_QT4= moc_build opengl rcc_build
# no port fow equalizer now, lirc detecting not working
CONFIGURE_ARGS+= --without-equalizer --without-liblircclient --docdir=${DOCSDIR}
diff --git a/multimedia/clipgrab/Makefile b/multimedia/clipgrab/Makefile
index ff4ef074f783..d427ee4ce688 100644
--- a/multimedia/clipgrab/Makefile
+++ b/multimedia/clipgrab/Makefile
@@ -18,8 +18,7 @@ COMMENT= Program to download videos from YouTube and etc
LICENSE= GPLv3
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml qmake_build uic_build moc_build \
+USE_QT4= gui xml qmake_build uic_build moc_build \
rcc_build network dbus webkit
PLIST_FILES= bin/${PORTNAME} \
diff --git a/multimedia/dvbcut/Makefile b/multimedia/dvbcut/Makefile
index 9ed4ec3382c2..b9ce62cb8561 100644
--- a/multimedia/dvbcut/Makefile
+++ b/multimedia/dvbcut/Makefile
@@ -47,7 +47,7 @@ QTCPPFLAGS+= ${PTHREAD_CFLAGS}
QTCFGLIBS+= ${PTHREAD_LIBS}
.else
USE_CMAKE= yes
-QT_COMPONENTS= gui qt3support xml moc_build qmake_build rcc_build uic_build
+USE_QT4= gui qt3support xml moc_build qmake_build rcc_build uic_build
CXXFLAGS+= -I${PREFIX}/include \
-I${PREFIX}/include/libavcodec \
-I${PREFIX}/include/libavformat \
diff --git a/multimedia/gstreamer-qt4/Makefile b/multimedia/gstreamer-qt4/Makefile
index 871e053a78d1..e43269e61a7d 100644
--- a/multimedia/gstreamer-qt4/Makefile
+++ b/multimedia/gstreamer-qt4/Makefile
@@ -26,8 +26,7 @@ USE_LDCONFIG= yes
USE_GSTREAMER= yes
USE_GNOME= glib20
USE_KDE4= automoc4
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui opengl declarative \
+USE_QT4= corelib gui opengl declarative \
qmake_build moc_build rcc_build uic_build qtestlib_build
PLIST_SUB= VERSION="${GST_VERSION}"
diff --git a/multimedia/k9copy-kde4/Makefile b/multimedia/k9copy-kde4/Makefile
index 238723694a7e..23ee8cbcd7ea 100644
--- a/multimedia/k9copy-kde4/Makefile
+++ b/multimedia/k9copy-kde4/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS= xine:${PORTSDIR}/multimedia/libxine \
USE_CMAKE= yes
USE_KDE4= kdeprefix kdelibs 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
MAKE_JOBS_SAFE= yes
LATEST_LINK= ${PORTNAME}-kde4
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index a9d26e2e757b..195ac8a26b37 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -23,8 +23,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USE_GMAKE= yes
USE_GETTEXT= yes
USE_KDE4= kdehier kdeprefix automoc4 kdelibs
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui phonon svg network dbus xml sql \
+USE_QT4= corelib gui phonon svg network dbus xml sql \
qmake_build moc_build rcc_build uic_build
USE_CMAKE= yes
CMAKE_VERBOSE= yes
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 2d9a481e32bb..179b8a81eb80 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -31,8 +31,7 @@ LATEST_LINK= ${PORTNAME}4
USE_KDE4= automoc4 kdehier kdelibs kdeprefix
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= dbus qt3support svg xml \
+USE_QT4= dbus qt3support svg xml \
moc_build qmake_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/multimedia/kmplayer-kde4/Makefile b/multimedia/kmplayer-kde4/Makefile
index fb992303c9e0..24ca2f7c9a11 100644
--- a/multimedia/kmplayer-kde4/Makefile
+++ b/multimedia/kmplayer-kde4/Makefile
@@ -24,8 +24,7 @@ USE_GNOME= gtk20
USE_BZIP2= yes
USE_CMAKE= yes
USE_KDE4= automoc4 kdehier kdeprefix kdelibs
-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
post-patch:
#Fix build with kdelibs>=4.5.0
diff --git a/multimedia/kplayer-kde4/Makefile b/multimedia/kplayer-kde4/Makefile
index 69f7ee2af9fd..68fc5a3ad0ab 100644
--- a/multimedia/kplayer-kde4/Makefile
+++ b/multimedia/kplayer-kde4/Makefile
@@ -21,8 +21,7 @@ LATEST_LINK= ${PORTNAME}-kde4
USE_BZIP2= yes
USE_GETTEXT= yes
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
USE_KDE4= kdehier kdeprefix kdelibs automoc4
MAKE_JOBS_SAFE= yes
diff --git a/multimedia/mediadownloader/Makefile b/multimedia/mediadownloader/Makefile
index e4ea1a56323c..e4b918038933 100644
--- a/multimedia/mediadownloader/Makefile
+++ b/multimedia/mediadownloader/Makefile
@@ -19,9 +19,8 @@ LICENSE= GPLv3
USE_GL= gl glu
USE_XORG= xtst
-USE_QT_VER= 4
USE_GSTREAMER= ffmpeg
-QT_COMPONENTS= dbus gui network moc_build opengl phonon phonon-gst \
+USE_QT4= dbus gui network moc_build opengl phonon phonon-gst \
qmake_build rcc_build uic_build webkit xml xmlpatterns
QMAKEPRO= ${PORTNAME}.pro
PLIST_FILES= bin/${PORTNAME}
diff --git a/multimedia/minitube/Makefile b/multimedia/minitube/Makefile
index bc6a174af4d5..dceefe61c424 100644
--- a/multimedia/minitube/Makefile
+++ b/multimedia/minitube/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES= http://flavio.tordini.org/files/minitube/
MAINTAINER= makc@FreeBSD.org
COMMENT= A native YouTube client
-USE_QT_VER= 4
-QT_COMPONENTS= gui network xml dbus phonon phonon-gst \
+USE_QT4= gui network xml dbus phonon phonon-gst \
qmake_build moc_build rcc_build imageformats_run
USE_GSTREAMER= ffmpeg
HAS_CONFIGURE= yes
@@ -30,7 +29,7 @@ LRELEASE= ${LOCALBASE}/bin/lrelease-qt4
STRIP_FILES= bin/minitube
.if !defined(WITHOUT_NLS)
-QT_COMPONENTS+= linguist_build
+USE_QT4+= linguist_build
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
index 22a4be50a6f2..fe64e561f216 100644
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -118,8 +118,7 @@ PLIST_SUB+= KINO="@comment "
.ifndef(WITHOUT_QT4)
LIB_DEPENDS+= exif.12:${PORTSDIR}/graphics/libexif
-USE_QT_VER= 4
-QT_COMPONENTS+= gui svg xml
+USE_QT4+= gui svg xml
CONFIGURE_ARGS+= --enable-qimage \
--qimage-includedir="${QT_INCDIR}" \
--qimage-libdir="${QT_LIBDIR}"
diff --git a/multimedia/mythtv-frontend/Makefile b/multimedia/mythtv-frontend/Makefile
index 2d92a977342d..7e6ecb0820cb 100644
--- a/multimedia/mythtv-frontend/Makefile
+++ b/multimedia/mythtv-frontend/Makefile
@@ -26,8 +26,7 @@ CONFLICTS= mythtv-[0-9]*
ONLY_FOR_ARCHS= i386 amd64
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui sql network script linguist_build l10n sql-mysql_run \
+USE_QT4= gui sql network script linguist_build l10n sql-mysql_run \
moc_build qmake_build rcc_build uic_build
QT_NONSTANDARD= yes
USE_GMAKE= yes
@@ -69,7 +68,7 @@ CONFIGURE_ARGS+= --disable-audio-jack
.endif
.if defined(WITH_OPENGL)
-QT_COMPONENTS+= opengl
+USE_QT4+= opengl
CONFIGURE_ARGS+= --enable-opengl-video
.else
CONFIGURE_ARGS+= --disable-opengl-video
diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile
index 647d7bc24799..3f4e956c21c7 100644
--- a/multimedia/mythtv/Makefile
+++ b/multimedia/mythtv/Makefile
@@ -29,8 +29,7 @@ CONFLICTS= mythtv-frontend-[0-9]*
ONLY_FOR_ARCHS= i386 amd64
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui sql network script linguist_build l10n sql-mysql_run \
+USE_QT4= gui sql network script linguist_build l10n sql-mysql_run \
moc_build qmake_build rcc_build uic_build imageformats
QT_NONSTANDARD= yes
USE_MYSQL= 51
@@ -96,7 +95,7 @@ RUN_DEPENDS+= mysqld_safe:${PORTSDIR}/databases/mysql${MYSQL_VER}-server
.endif
.if defined(WITH_OPENGL)
-QT_COMPONENTS+= opengl
+USE_QT4+= opengl
CONFIGURE_ARGS+= --enable-opengl-video
.else
CONFIGURE_ARGS+= --disable-opengl-video
diff --git a/multimedia/phonon-gstreamer/Makefile b/multimedia/phonon-gstreamer/Makefile
index 0b87a5ebb44e..ab0a1ea62662 100644
--- a/multimedia/phonon-gstreamer/Makefile
+++ b/multimedia/phonon-gstreamer/Makefile
@@ -28,8 +28,7 @@ USE_GL= gl
USE_GNOME= glib20 libxml2
USE_GSTREAMER= yes
USE_KDE4= kdehier kdeprefix automoc4
-USE_QT_VER= 4
-QT_COMPONENTS= gui phonon xml \
+USE_QT4= gui phonon xml \
qmake_build moc_build rcc_build uic_build
USE_XORG= x11
USE_XZ= yes
diff --git a/multimedia/phonon-vlc/Makefile b/multimedia/phonon-vlc/Makefile
index 27955fa86e87..00fa5c208b9a 100644
--- a/multimedia/phonon-vlc/Makefile
+++ b/multimedia/phonon-vlc/Makefile
@@ -26,8 +26,7 @@ LIB_DEPENDS= vlc.7:${PORTSDIR}/multimedia/vlc
PHONON_BRANCH= stable
USE_KDE4= kdehier kdeprefix automoc4
-USE_QT_VER= 4
-QT_COMPONENTS= gui phonon \
+USE_QT4= gui phonon \
qmake_build moc_build rcc_build uic_build
USE_XZ= yes
USE_CMAKE= yes
diff --git a/multimedia/phonon-xine/Makefile b/multimedia/phonon-xine/Makefile
index 8c0921d84ba9..0fbfb5d802d8 100644
--- a/multimedia/phonon-xine/Makefile
+++ b/multimedia/phonon-xine/Makefile
@@ -25,8 +25,7 @@ PHONON_BRANCH= stable
USE_BZIP2= yes
USE_CMAKE= yes
USE_KDE4= kdehier automoc4 kdeprefix
-USE_QT_VER= 4
-QT_COMPONENTS= gui dbus xml phonon \
+USE_QT4= gui dbus xml phonon \
qmake_build moc_build rcc_build uic_build
PLIST_SUB+= QT_PREFIX=${QT_PREFIX}
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 788748a32b63..255c7f678f25 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -22,8 +22,7 @@ CONFLICTS= qt4-phonon-4*
PHONON_BRANCH= stable
USE_KDE4= kdehier kdeprefix automoc4
-USE_QT_VER= 4
-QT_COMPONENTS= dbus gui \
+USE_QT4= dbus gui \
qmake_build moc_build rcc_build uic_build
USE_XZ= yes
USE_CMAKE= yes
@@ -41,7 +40,7 @@ OPTIONS= PULSEAUDIO "Support playback via PulseAudio" off
# circular dependency.
.undef WITH_DESIGNER
.ifdef(WITH_DESIGNER)
-QT_COMPONENTS+= designer
+USE_QT4+= designer
CMAKE_ARGS+= -DPHONON_BUILD_DESIGNER_PLUGIN:BOOL=ON
PLIST_SUB+= DESIGNER=""
.else
diff --git a/multimedia/py-qt4-multimedia/Makefile b/multimedia/py-qt4-multimedia/Makefile
index b023e1c9ba91..13a2a6d67526 100644
--- a/multimedia/py-qt4-multimedia/Makefile
+++ b/multimedia/py-qt4-multimedia/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= multimedia qmake_build
+USE_QT4= multimedia qmake_build
OPTIONS= API "Install Phonon API for QScintilla2" on \
DEBUG "Enable debugging in generated code" off \
diff --git a/multimedia/py-qt4-phonon/Makefile b/multimedia/py-qt4-phonon/Makefile
index 823d41b05a47..6da186352778 100644
--- a/multimedia/py-qt4-phonon/Makefile
+++ b/multimedia/py-qt4-phonon/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-cor
DISTINFO_FILE= ${PYQT4_DISTINFO_FILE}
HAS_CONFIGURE= yes
USE_PYTHON= 2.5+
-USE_QT_VER= 4
-QT_COMPONENTS= phonon qmake_build
+USE_QT4= phonon qmake_build
OPTIONS= API "Install Phonon API for QScintilla2" on \
DEBUG "Enable debugging in generated code" off \
diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile
index 09f9f9f02543..024b7563b43a 100644
--- a/multimedia/qmmp/Makefile
+++ b/multimedia/qmmp/Makefile
@@ -18,9 +18,8 @@ COMMENT= A Qt4-based multimedia player
LICENSE= GPLv2
USE_BZIP2= yes
-USE_QT_VER= 4
USE_CMAKE= yes
-QT_COMPONENTS= corelib gui network xml dbus \
+USE_QT4= corelib gui network xml dbus \
qmake_build rcc_build uic_build moc_build linguist_build
USE_LDCONFIG= yes
diff --git a/multimedia/qt4-multimedia/Makefile b/multimedia/qt4-multimedia/Makefile
index 5d77b8b4051f..9961932c3caf 100644
--- a/multimedia/qt4-multimedia/Makefile
+++ b/multimedia/qt4-multimedia/Makefile
@@ -13,8 +13,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt4 low-level multimedia API
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build uic_build corelib gui
+USE_QT4= qmake_build moc_build uic_build corelib gui
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/multimedia/qt4-phonon-gst/Makefile b/multimedia/qt4-phonon-gst/Makefile
index a484a98e27dc..d0dbf1e7e09a 100644
--- a/multimedia/qt4-phonon-gst/Makefile
+++ b/multimedia/qt4-phonon-gst/Makefile
@@ -14,8 +14,7 @@ PKGNAMESUFFIX= -gst
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt4 multimedia framework, gstreamer backend
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build corelib gui phonon opengl dbus
+USE_QT4= qmake_build moc_build corelib gui phonon opengl dbus
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/multimedia/qt4-phonon/Makefile b/multimedia/qt4-phonon/Makefile
index 32870c3de6de..ccff63b26a3d 100644
--- a/multimedia/qt4-phonon/Makefile
+++ b/multimedia/qt4-phonon/Makefile
@@ -15,8 +15,7 @@ COMMENT= Qt4 multimedia framework
CONFLICTS= phonon-4.*
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build corelib dbus gui xml
+USE_QT4= qmake_build moc_build corelib dbus gui xml
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/multimedia/smile/Makefile b/multimedia/smile/Makefile
index 57a0320daf03..357095645869 100644
--- a/multimedia/smile/Makefile
+++ b/multimedia/smile/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS= sox>=14.0:${PORTSDIR}/audio/sox \
mplayer:${PORTSDIR}/multimedia/mplayer \
ImageMagick>=6.4:${PORTSDIR}/graphics/ImageMagick
-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 \
opengl webkit
MAKE_ENV+= QTDIR=${QT_PREFIX}
diff --git a/multimedia/smplayer/Makefile b/multimedia/smplayer/Makefile
index 6d24f6100e3c..6e6bea6fae6b 100644
--- a/multimedia/smplayer/Makefile
+++ b/multimedia/smplayer/Makefile
@@ -17,8 +17,7 @@ COMMENT= A complete front-end based on QT4 for mplayer
RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer \
${LOCALBASE}/share/smplayer/themes:${PORTSDIR}/multimedia/smplayer-themes
-USE_QT_VER= 4
-QT_COMPONENTS= gui network xml qmake_build moc_build rcc_build uic_build \
+USE_QT4= gui network xml qmake_build moc_build rcc_build uic_build \
uic3_build porting_build linguist_build
ALL_TARGET= src/smplayer
diff --git a/multimedia/smtube/Makefile b/multimedia/smtube/Makefile
index 893c391076bb..9a7e186caa0a 100644
--- a/multimedia/smtube/Makefile
+++ b/multimedia/smtube/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/smplayer:${PORTSDIR}/multimedia/smplayer
USE_BZIP2= yes
USE_GMAKE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= linguist_build moc_build qmake_build rcc_build uic_build \
+USE_QT4= linguist_build moc_build qmake_build rcc_build uic_build \
corelib gui network xml
INSTALLS_ICONS= yes
diff --git a/multimedia/subtitlecomposer-kde4/Makefile b/multimedia/subtitlecomposer-kde4/Makefile
index 225bfb9fbc32..492ffb9e0aa7 100644
--- a/multimedia/subtitlecomposer-kde4/Makefile
+++ b/multimedia/subtitlecomposer-kde4/Makefile
@@ -17,8 +17,7 @@ COMMENT= Subtitle editor for KDE
USE_BZIP2= yes
USE_CMAKE= yes
USE_KDE4= kdeprefix kdelibs automoc4
-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
WANT_GSTREAMER= yes
LATEST_LINK= ${PORTNAME}-kde4
diff --git a/multimedia/umplayer/Makefile b/multimedia/umplayer/Makefile
index 86a17259d5e8..262fc33a3195 100644
--- a/multimedia/umplayer/Makefile
+++ b/multimedia/umplayer/Makefile
@@ -16,8 +16,7 @@ COMMENT= A modern front-end for mplayer (forked from smplayer)
RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer
-USE_QT_VER= 4
-QT_COMPONENTS= gui network xml qmake_build moc_build rcc_build uic_build \
+USE_QT4= gui network xml qmake_build moc_build rcc_build uic_build \
linguist_build
ALL_TARGET= src/umplayer
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index bc12c8257af1..36c66b0d7f58 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -176,8 +176,7 @@ CONFIGURE_ARGS+=--disable-debug
.if defined(WITHOUT_QT4)
CONFIGURE_ARGS+=--disable-qt4
.else
-USE_QT_VER= 4
-QT_COMPONENTS= gui corelib moc_build rcc_build uic_build
+USE_QT4= gui corelib moc_build rcc_build uic_build
CONFIGURE_ARGS+=--enable-qt4
.endif
diff --git a/net-im/decibel/Makefile b/net-im/decibel/Makefile
index 3ec03e3bbca2..d14be2d0d060 100644
--- a/net-im/decibel/Makefile
+++ b/net-im/decibel/Makefile
@@ -15,8 +15,7 @@ COMMENT= Realtime communications framework
LIB_DEPENDS= QtTapioca.0:${PORTSDIR}/net-im/tapioca-qt
-USE_QT_VER= 4
-QT_COMPONENTS= xml dbus gui qtestlib qmake_build moc_build uic_build rcc_build
+USE_QT4= xml dbus gui qtestlib qmake_build moc_build uic_build rcc_build
USE_LDCONFIG= yes
USE_CMAKE= yes
diff --git a/net-im/kmess-kde4/Makefile b/net-im/kmess-kde4/Makefile
index 5fb45a246bc2..de6e4882acea 100644
--- a/net-im/kmess-kde4/Makefile
+++ b/net-im/kmess-kde4/Makefile
@@ -24,8 +24,7 @@ MAKE_JOBS_SAFE= yes
USE_BZIP2= yes
USE_GNOME= libxml2 libxslt
USE_KDE4= kdehier kdeprefix kdebase automoc4
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui network opengl script svg webkit \
+USE_QT4= corelib gui network opengl script svg webkit \
qmake_build moc_build rcc_build uic_build phonon
USE_CMAKE= yes
USE_GETTEXT= yes
diff --git a/net-im/licq-qt-gui/Makefile b/net-im/licq-qt-gui/Makefile
index 3a8673335457..3141900a8d8d 100644
--- a/net-im/licq-qt-gui/Makefile
+++ b/net-im/licq-qt-gui/Makefile
@@ -21,8 +21,7 @@ LICENSE= GPLv2
USE_XORG= x11 xext ice xscrnsaver
USE_CMAKE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build linguist_build
+USE_QT4= qmake_build moc_build rcc_build uic_build linguist_build
.if defined(WITH_KDE)
KDE_SUFFIX= -kde
@@ -32,7 +31,7 @@ PLIST_SUB+= GUI_NAME=kde4
PLIST_SUB+= WITH_KDE=""
PLIST_SUB+= WITH_QT="@comment "
.else
-QT_COMPONENTS+= xml gui
+USE_QT4+= xml gui
PLIST_SUB+= GUI_NAME=qt4
PLIST_SUB+= WITH_KDE="@comment "
PLIST_SUB+= WITH_QT=""
diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile
index f7c0ec691e20..c47d1fd632d4 100644
--- a/net-im/psi/Makefile
+++ b/net-im/psi/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS= qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl \
HAS_CONFIGURE= yes
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib dbus gui iconengines imageformats qt3support \
+USE_QT4= corelib dbus gui iconengines imageformats qt3support \
inputmethods network script svg xml \
qmake_build moc_build rcc_build uic_build
diff --git a/net-im/psimedia/Makefile b/net-im/psimedia/Makefile
index 58508e20b1db..91f1ed78e4bc 100644
--- a/net-im/psimedia/Makefile
+++ b/net-im/psimedia/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS= oil-0.3:${PORTSDIR}/devel/liboil
USE_BZIP2= yes
HAS_CONFIGURE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui qmake_build moc_build uic_build
+USE_QT4= gui qmake_build moc_build uic_build
USE_GSTREAMER= jpeg speex theora vorbis
QT_NONSTANDARD= yes
diff --git a/net-im/qutim-plugin-icq/Makefile b/net-im/qutim-plugin-icq/Makefile
index c948ed8b23bc..a8616be59758 100644
--- a/net-im/qutim-plugin-icq/Makefile
+++ b/net-im/qutim-plugin-icq/Makefile
@@ -25,8 +25,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/qutim:${PORTSDIR}/net-im/qutim
MAKE_JOBS_SAFE=yes
USE_GMAKE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui network xml moc_build qmake_build rcc_build uic_build
+USE_QT4= gui network xml moc_build qmake_build rcc_build uic_build
WRKSRC= ${WRKDIR}/icq
diff --git a/net-im/qutim-plugin-jabber/Makefile b/net-im/qutim-plugin-jabber/Makefile
index eaf5e4991eea..9653ddae3ce4 100644
--- a/net-im/qutim-plugin-jabber/Makefile
+++ b/net-im/qutim-plugin-jabber/Makefile
@@ -23,8 +23,7 @@ LIB_DEPENDS= idn.17:${PORTSDIR}/dns/libidn
BUILD_DEPENDS= ${LOCALBASE}/bin/qutim:${PORTSDIR}/net-im/qutim
RUN_DEPENDS= ${LOCALBASE}/bin/qutim:${PORTSDIR}/net-im/qutim
-USE_QT_VER= 4
-QT_COMPONENTS= gui \
+USE_QT4= gui \
moc_build \
network \
qmake_build \
diff --git a/net-im/qutim/Makefile b/net-im/qutim/Makefile
index 2752212e04fb..184e4101c386 100644
--- a/net-im/qutim/Makefile
+++ b/net-im/qutim/Makefile
@@ -17,8 +17,7 @@ DISTNAME= qutim_${PORTVERSION}_svn529
MAINTAINER= webmaster@kibab.com
COMMENT= A Qt4-based multiprotocol IM client with advanced features
-USE_QT_VER= 4
-QT_COMPONENTS= designer_build \
+USE_QT4= designer_build \
gui \
imageformats \
moc_build \
diff --git a/net-im/qwit-devel/Makefile b/net-im/qwit-devel/Makefile
index f8db069d762c..e2e23325de72 100644
--- a/net-im/qwit-devel/Makefile
+++ b/net-im/qwit-devel/Makefile
@@ -17,8 +17,7 @@ MAINTAINER= sokolov@TrueBSD.org
COMMENT= A Qt4-based lightweight Twitter client
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui network xml qmake_build moc_build rcc_build \
+USE_QT4= gui network xml qmake_build moc_build rcc_build \
uic
PLIST_FILES= bin/qwit-devel
diff --git a/net-im/qwit/Makefile b/net-im/qwit/Makefile
index 33bc294f05f5..3853e5928716 100644
--- a/net-im/qwit/Makefile
+++ b/net-im/qwit/Makefile
@@ -16,8 +16,7 @@ MAINTAINER= sokolov@TrueBSD.org
COMMENT= A Qt4-based lightweight Twitter client
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui network xml qmake_build moc_build rcc_build \
+USE_QT4= gui network xml qmake_build moc_build rcc_build \
uic
PLIST_FILES= bin/qwit
diff --git a/net-im/qxmpp/Makefile b/net-im/qxmpp/Makefile
index 4b0ae2e594f9..e1068f32cf83 100644
--- a/net-im/qxmpp/Makefile
+++ b/net-im/qxmpp/Makefile
@@ -16,8 +16,7 @@ COMMENT= QXmpp is an xmpp client library based on Qt & C++
LICENSE= LGPL21
-USE_QT_VER= 4
-QT_COMPONENTS= gui network xml qmake_build uic_build moc_build rcc_build
+USE_QT4= gui network xml qmake_build uic_build moc_build rcc_build
CONFLICTS= ${PORTNAME}-leechcraft-[0-9]*
diff --git a/net-im/ramblercontacts/Makefile b/net-im/ramblercontacts/Makefile
index 629157541a83..52965f2a8cf2 100644
--- a/net-im/ramblercontacts/Makefile
+++ b/net-im/ramblercontacts/Makefile
@@ -19,8 +19,7 @@ LICENSE= GPLv3
USE_DOS2UNIX= config.inc
USE_XORG= xscrnsaver
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build designer_build \
+USE_QT4= qmake_build moc_build rcc_build uic_build designer_build \
webkit
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/net-im/telepathy-qt/Makefile b/net-im/telepathy-qt/Makefile
index c0b7656ce815..49488c535872 100644
--- a/net-im/telepathy-qt/Makefile
+++ b/net-im/telepathy-qt/Makefile
@@ -18,8 +18,7 @@ LICENSE_FILE= ${WRKSRC}/../COPYING
USE_CMAKE= yes
CMAKE_SOURCE_PATH= ..
-USE_QT_VER= 4
-QT_COMPONENTS= corelib qmake_build uic_build moc_build rcc_build xml dbus
+USE_QT4= corelib qmake_build uic_build moc_build rcc_build xml dbus
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/build
diff --git a/net-im/telepathy-qt4/Makefile b/net-im/telepathy-qt4/Makefile
index 0b92953ebdde..978181cf50d7 100644
--- a/net-im/telepathy-qt4/Makefile
+++ b/net-im/telepathy-qt4/Makefile
@@ -23,8 +23,7 @@ BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
USE_GNOME= pkgconfig
USE_PYTHON_BUILD= 2.5+
-USE_QT_VER= 4
-QT_COMPONENTS= dbus gui network qtestlib_build xml \
+USE_QT4= dbus gui network qtestlib_build xml \
moc_build qmake_build rcc_build uic_build
USE_CMAKE= yes
MAKE_JOBS_SAFE= yes
diff --git a/net-im/vacuum-im/Makefile b/net-im/vacuum-im/Makefile
index d22fdb064c10..7395bb8f4639 100644
--- a/net-im/vacuum-im/Makefile
+++ b/net-im/vacuum-im/Makefile
@@ -22,9 +22,8 @@ PROJECTHOST= ${PORTNAME}${PKGNAMESUFFIX}
USE_XZ= yes
USE_CMAKE= yes
USE_XORG= xscrnsaver
-USE_QT_VER= 4
USE_LDCONFIG= yes
-QT_COMPONENTS= gui xml qmake_build uic_build moc_build rcc_build \
+USE_QT4= gui xml qmake_build uic_build moc_build rcc_build \
network linguist_build webkit
DESKTOP_ENTRIES="Vacuum-IM" "Modular, crossplatform Jabber client" \
diff --git a/net-mgmt/nagiosagent/Makefile b/net-mgmt/nagiosagent/Makefile
index 00c3d36f45a2..ee45b02517ea 100644
--- a/net-mgmt/nagiosagent/Makefile
+++ b/net-mgmt/nagiosagent/Makefile
@@ -20,8 +20,7 @@ PLIST_FILES= bin/NagiosAgent \
share/pixmaps/NagiosAgent.png
USE_ZIP= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui network corelib qmake_build uic_build rcc_build moc_build
+USE_QT4= gui network corelib qmake_build uic_build rcc_build moc_build
DESKTOP_ENTRIES= "NagiosAgent" "GUI client for Nagios" \
"NagiosAgent.png" \
diff --git a/net-mgmt/qkismet/Makefile b/net-mgmt/qkismet/Makefile
index aadd29a9bee0..44153708fa70 100644
--- a/net-mgmt/qkismet/Makefile
+++ b/net-mgmt/qkismet/Makefile
@@ -17,8 +17,7 @@ COMMENT= This is graphical Kismet client writtent in Qt
RUN_DEPENDS= kismet:${PORTSDIR}/net-mgmt/kismet
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml qmake_build uic_build moc_build rcc_build network
+USE_QT4= gui xml qmake_build uic_build moc_build rcc_build network
QMAKE_PRO= ${PORTNAME}.pro
diff --git a/net-mgmt/vidalia/Makefile b/net-mgmt/vidalia/Makefile
index 8c5512fa2d6b..c09abde34d06 100644
--- a/net-mgmt/vidalia/Makefile
+++ b/net-mgmt/vidalia/Makefile
@@ -20,8 +20,7 @@ COMMENT= A graphical Tor controller based on Qt 4.x
USE_CMAKE= yes
INSTALLS_ICONS= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui moc_build qmake_build rcc_build uic_build network xml linguist_build
+USE_QT4= gui moc_build qmake_build rcc_build uic_build network xml linguist_build
MAKE_JOBS_SAFE= yes
.include <bsd.port.mk>
diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index 1dddca1c4e95..41624c732b6e 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -183,8 +183,7 @@ CONFIGURE_ENV+= ac_cv_path_KDE4_CONFIG=${KDE4_PREFIX}/bin/kde4-config \
UPDATE_MIME_DATABASE=/usr/bin/true
CONFIGURE_ARGS+= --enable-plasmamule
USE_KDE4= kdelibs
-USE_QT_VER= 4
-QT_COMPONENTS+= dbus gui moc_build
+USE_QT4= dbus gui moc_build
PLIST_SUB+= PLASMAMULE=""
.else
CONFIGURE_ARGS+= --disable-plasmamule
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index abc33c5c1535..cd2b9ae1342f 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -173,8 +173,7 @@ CONFIGURE_ENV+= ac_cv_path_KDE4_CONFIG=${KDE4_PREFIX}/bin/kde4-config \
UPDATE_MIME_DATABASE=/usr/bin/true
CONFIGURE_ARGS+= --enable-plasmamule
USE_KDE4= kdelibs
-USE_QT_VER= 4
-QT_COMPONENTS+= dbus gui moc_build
+USE_QT4+= dbus gui moc_build
PLIST_SUB+= PLASMAMULE=""
.else
CONFIGURE_ARGS+= --disable-plasmamule
diff --git a/net-p2p/eiskaltdcpp-qt/Makefile b/net-p2p/eiskaltdcpp-qt/Makefile
index ef7d0a15ca89..c37850f0d63e 100644
--- a/net-p2p/eiskaltdcpp-qt/Makefile
+++ b/net-p2p/eiskaltdcpp-qt/Makefile
@@ -45,8 +45,7 @@ OPTIONS= ASPELL "Build with aspell support" off \
SQLITE "SQLite support (experimental)" off \
MINIUPNP "UPnP support" on
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml network qmake_build uic_build \
+USE_QT4= gui xml network qmake_build uic_build \
moc_build rcc_build linguist_build
CMAKE_ARGS+= -DUSE_QT:BOOL=ON
CMAKE_ARGS+= -DUSE_GTK:BOOL=OFF
@@ -75,14 +74,14 @@ CMAKE_ARGS+= -DFREE_SPACE_BAR_C:BOOL=OFF
.if defined(WITH_DBUS_NOTIFY) && !defined(WITHOUT_DBUS)
CMAKE_ARGS+= -DDBUS_NOTIFY:BOOL=ON
-QT_COMPONENTS+= dbus
+USE_QT4+= dbus
.else
CMAKE_ARGS+= -DDBUS_NOTIFY:BOOL=OFF
.endif
.if defined(WITH_QTSCRIPT)
CMAKE_ARGS+= -DUSE_JS:BOOL=ON
-QT_COMPONENTS+= script
+USE_QT4+= script
RUN_DEPENDS+= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so:${PORTSDIR}/devel/qtscriptgenerator
PLIST_SUB+= QTSCRIPT=""
.else
@@ -92,14 +91,14 @@ PLIST_SUB+= QTSCRIPT="@comment "
.if defined(WITH_QML)
CMAKE_ARGS+= -DUSE_QT_QML:BOOL=ON
-QT_COMPONENTS+= declarative
+USE_QT4+= declarative
.else
CMAKE_ARGS+= -DUSE_QT_QML:BOOL=OFF
.endif
.if defined(WITH_SQLITE) && !defined(WITHOUT_SQLITE)
CMAKE_ARGS+= -DUSE_QT_SQLITE:BOOL=ON
-QT_COMPONENTS+= sql-sqlite3
+USE_QT4+= sql-sqlite3
.else
CMAKE_ARGS+= -DUSE_QT_SQLITE:BOOL=OFF
.endif
diff --git a/net-p2p/ktorrent/Makefile b/net-p2p/ktorrent/Makefile
index c6f94e690062..26a67cf60b33 100644
--- a/net-p2p/ktorrent/Makefile
+++ b/net-p2p/ktorrent/Makefile
@@ -19,8 +19,7 @@ LIB_DEPENDS= tag.1:${PORTSDIR}/audio/taglib \
USE_BZIP2= yes
USE_KDE4= kdelibs kdehier kdeprefix automoc4 pimlibs workspace
-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_CMAKE= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
diff --git a/net-p2p/libktorrent/Makefile b/net-p2p/libktorrent/Makefile
index 9713b97440d1..6fb57daff341 100644
--- a/net-p2p/libktorrent/Makefile
+++ b/net-p2p/libktorrent/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp \
USE_BZIP2= yes
USE_KDE4= kdelibs kdehier kdeprefix 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
USE_CMAKE= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
diff --git a/net-p2p/qbittorrent-29/Makefile b/net-p2p/qbittorrent-29/Makefile
index 8d520507935c..feb4f3392f56 100644
--- a/net-p2p/qbittorrent-29/Makefile
+++ b/net-p2p/qbittorrent-29/Makefile
@@ -21,8 +21,7 @@ MAKE_JOBS_SAFE= yes
CONFLICTS= qbittorrent-2.[2345678].* qbittorrent-3.[0-9].*
-USE_QT_VER= 4
-QT_COMPONENTS= corelib network qmake_build moc_build rcc_build
+USE_QT4= corelib network qmake_build moc_build rcc_build
.if !defined(QB29_NOX_SLAVE)
.if defined(WITHOUT_X11)
@@ -30,7 +29,7 @@ BROKEN= Use net-p2p/${PORTNAME}-nox11 for the non-GUI version
.endif
LIB_DEPENDS+= GeoIP.5:${PORTSDIR}/net/GeoIP
OPTIONS= DBUS "Enable dbus support" off
-QT_COMPONENTS+= gui xml uic_build
+USE_QT4+= gui xml uic_build
INSTALLS_ICONS= yes
.else
CONFIGURE_ARGS+= --disable-gui
@@ -44,7 +43,7 @@ MAN1?= qbittorrent.1
.include <bsd.port.pre.mk>
.if defined(WITH_DBUS)
-QT_COMPONENTS+= dbus
+USE_QT4+= dbus
.else
CONFIGURE_ARGS+= --disable-qt-dbus
.endif
diff --git a/net-p2p/retroshare/Makefile b/net-p2p/retroshare/Makefile
index 4e94ced2ba70..18c8e5eb49c6 100644
--- a/net-p2p/retroshare/Makefile
+++ b/net-p2p/retroshare/Makefile
@@ -25,8 +25,7 @@ LIB_DEPENDS= gpgme.19:${PORTSDIR}/security/gpgme \
RUN_DEPENDS+= pinentry-qt4:${PORTSDIR}/security/pinentry-qt4
WRKSRC= ${WRKDIR}/trunk
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui network xml script designer_build uic_build \
+USE_QT4= corelib gui network xml script designer_build uic_build \
qmake_build moc_build rcc_build
HAS_CONFIGURE= yes
BINARY= RetroShare
diff --git a/net-p2p/sharktorrent/Makefile b/net-p2p/sharktorrent/Makefile
index 48e25e351b40..d5db30e76cb7 100644
--- a/net-p2p/sharktorrent/Makefile
+++ b/net-p2p/sharktorrent/Makefile
@@ -18,8 +18,7 @@ COMMENT= C++ Bittorrent client using wxWidgets, libtorrent and boost
LIB_DEPENDS= boost_filesystem.4:${PORTSDIR}/devel/boost-libs \
torrent-rasterbar.5:${PORTSDIR}/net-p2p/libtorrent-rasterbar-14
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build corelib gui network
+USE_QT4= qmake_build moc_build rcc_build corelib gui network
MAKE_JOBS_SAFE= yes
PLIST_FILES= bin/sharktorrent
diff --git a/net-p2p/transmission-qt4/Makefile b/net-p2p/transmission-qt4/Makefile
index 439bcb6f8daa..aa3e60c8735a 100644
--- a/net-p2p/transmission-qt4/Makefile
+++ b/net-p2p/transmission-qt4/Makefile
@@ -19,9 +19,8 @@ MASTERDIR= ${.CURDIR}/../transmission-cli
PLIST= ${.CURDIR}/pkg-plist
SLAVEPORT= qt4
-USE_QT_VER= 4
QT_NONSTANDARD= yes
-QT_COMPONENTS= moc_build qmake_build rcc_build uic_build gui dbus network
+USE_QT4= moc_build qmake_build rcc_build uic_build gui dbus network
USE_GNOME= desktopfileutils
EXTRA_CONF_ARGS=--disable-cli \
diff --git a/net-p2p/valknut/Makefile b/net-p2p/valknut/Makefile
index c0520567eddc..2000168e022f 100644
--- a/net-p2p/valknut/Makefile
+++ b/net-p2p/valknut/Makefile
@@ -23,8 +23,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
MAN1= valknut.1
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui network qt3support \
+USE_QT4= corelib gui network qt3support \
moc_build uic_build rcc_build linguist_build
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/net/avahi-qt4/Makefile b/net/avahi-qt4/Makefile
index a13acdc6a5ef..d03a7e4c50fe 100644
--- a/net/avahi-qt4/Makefile
+++ b/net/avahi-qt4/Makefile
@@ -22,8 +22,7 @@ PLIST= ${.CURDIR}/pkg-plist
AVAHI_SLAVE= qt4
USE_GNOME= gnomehack ltverhack intltool
-USE_QT_VER= 4
-QT_COMPONENTS= corelib moc_build
+USE_QT4= corelib moc_build
AVAHI_PKGCONFIG= avahi-qt4.pc
.include "${MASTERDIR}/Makefile"
diff --git a/net/cagibi/Makefile b/net/cagibi/Makefile
index 5718d3b7b9f1..ffd194ed8ad4 100644
--- a/net/cagibi/Makefile
+++ b/net/cagibi/Makefile
@@ -16,8 +16,7 @@ COMMENT= KDE SSDP/uPNP proxy
USE_BZIP2= yes
USE_CMAKE= yes
USE_KDE4= automoc4
-USE_QT_VER= 4
-QT_COMPONENTS= corelib network xml dbus \
+USE_QT4= corelib network xml dbus \
qmake_build moc_build rcc_build uic_build
.include <bsd.port.mk>
diff --git a/net/ekiga3/Makefile b/net/ekiga3/Makefile
index 056276a01011..9f0ef2e28284 100644
--- a/net/ekiga3/Makefile
+++ b/net/ekiga3/Makefile
@@ -56,7 +56,7 @@ OPTIONS= LDAP "Enable LDAP support" off \
BROKEN= Please set WITH_DBUS or remove WITH_KDE4!
. endif
USE_KDE4= kdehier kdelibs
-USE_QT_VER= 4
+USE_QT4= yes
CONFIGURE_ARGS+= --enable-kde
.else
CONFIGURE_ARGS+= --disable-kde
diff --git a/net/hupnp/Makefile b/net/hupnp/Makefile
index 4f9951541c65..c53ad0f1d846 100644
--- a/net/hupnp/Makefile
+++ b/net/hupnp/Makefile
@@ -16,8 +16,7 @@ COMMENT= A library for building UPnP devices and control points
USE_ZIP= yes
USE_GMAKE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib network xml dbus gui \
+USE_QT4= corelib network xml dbus gui \
qmake_build moc_build rcc_build uic_build
QMAKE_ARGS= PREFIX=${PREFIX} herqq.pro
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index 2fae3386aa1a..98f8f993e9a2 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -46,8 +46,7 @@ USE_KDE4= kdehier kdelibs kdeprefix libkonq pimlibs workspace \
automoc4 ontologies qimageblitz soprano strigi
KDE4_BUILDENV= yes
USE_OPENSSL= yes
-USE_QT_VER= 4
-QT_COMPONENTS= dbus gui network qt3support sql xml \
+USE_QT4= dbus gui network qt3support sql xml \
moc_build qmake_build rcc_build uic_build uic3_build
USE_SQLITE= yes
USE_XORG= x11 xdamage xext xscrnsaver xtst
diff --git a/net/kio-upnp-ms/Makefile b/net/kio-upnp-ms/Makefile
index 66f1a65ebb1a..9e52b76927e0 100644
--- a/net/kio-upnp-ms/Makefile
+++ b/net/kio-upnp-ms/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS= HUpnp.1:${PORTSDIR}/net/hupnp
USE_BZIP2= yes
USE_CMAKE= yes
USE_KDE4= automoc4 kdehier kdeprefix kdelibs
-USE_QT_VER= 4
-QT_COMPONENTS= corelib network xml dbus gui \
+USE_QT4= corelib network xml dbus gui \
qmake_build moc_build rcc_build uic_build
WRKSRC= ${WRKDIR}/${DISTNAME:C/.[^.]*$//}
diff --git a/net/knemo-kde4/Makefile b/net/knemo-kde4/Makefile
index 181954dc315a..5017e96b07e5 100644
--- a/net/knemo-kde4/Makefile
+++ b/net/knemo-kde4/Makefile
@@ -18,8 +18,7 @@ LATEST_LINK= ${PORTNAME}-kde4
USE_BZIP2= yes
USE_CMAKE= yes
-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_KDE4= kdeprefix kdelibs automoc4
MAKE_JOBS_SAFE= yes
diff --git a/net/kwooty/Makefile b/net/kwooty/Makefile
index bdd54692bec1..78d12b9d2fcb 100644
--- a/net/kwooty/Makefile
+++ b/net/kwooty/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar \
${LOCALBASE}/bin/7z:${PORTSDIR}/archivers/p7zip
USE_KDE4= kdelibs kdehier kdeprefix automoc4 workspace
-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
USE_CMAKE= yes
USE_LDCONFIG= yes
diff --git a/net/libproxy-kde/Makefile b/net/libproxy-kde/Makefile
index 3458c2394650..07c667afcd23 100644
--- a/net/libproxy-kde/Makefile
+++ b/net/libproxy-kde/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS= proxy.1:${PORTSDIR}/net/libproxy
MASTERDIR= ${.CURDIR}/../libproxy
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-USE_QT_VER= 4
-QT_COMPONENTS= corelib moc_build qmake_build uic_build rcc_build
+USE_QT4= corelib moc_build qmake_build uic_build rcc_build
USE_KDE4= automoc4 kdelibs
LIBPROXY_SLAVE= kde
diff --git a/net/pcbsd-netmanager/Makefile b/net/pcbsd-netmanager/Makefile
index 5d5cad413c9c..2c848961f769 100644
--- a/net/pcbsd-netmanager/Makefile
+++ b/net/pcbsd-netmanager/Makefile
@@ -21,8 +21,7 @@ WRKSRC= ${WRKDIR}/pcbsd-netmanager
USE_KDE4= automoc4 kdehier kdeprefix kdelibs workspace
USE_LDCONFIG= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib qmake_build moc_build rcc_build uic_build linguist
+USE_QT4= corelib qmake_build moc_build rcc_build uic_build linguist
HAS_CONFIGURE= yes
MAKE_ARGS= INSTALL_ROOT=${DESTDIR}
diff --git a/net/py-qt4-network/Makefile b/net/py-qt4-network/Makefile
index 54bf09b2303a..517676efcaa4 100644
--- a/net/py-qt4-network/Makefile
+++ b/net/py-qt4-network/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-cor
DISTINFO_FILE= ${PYQT4_DISTINFO_FILE}
HAS_CONFIGURE= yes
USE_PYTHON= 2.5+
-USE_QT_VER= 4
-QT_COMPONENTS= network qmake_build
+USE_QT4= network qmake_build
OPTIONS= API "Install QtNetwork API for QScintilla2" on \
DEBUG "Enable debugging in generated code" off \
diff --git a/net/qoauth/Makefile b/net/qoauth/Makefile
index d275d3967f2d..f1c4206928a2 100644
--- a/net/qoauth/Makefile
+++ b/net/qoauth/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS= qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl
USE_LDCONFIG= yes
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib qtestlib network qmake_build moc_build
+USE_QT4= corelib qtestlib network qmake_build moc_build
HAS_CONFIGURE= yes
USE_OPENSSL= yes
diff --git a/net/qt4-network/Makefile b/net/qt4-network/Makefile
index 083e3bad88f9..3ed7837d2266 100644
--- a/net/qt4-network/Makefile
+++ b/net/qt4-network/Makefile
@@ -16,8 +16,7 @@ COMMENT= Qt network library
RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build corelib
+USE_QT4= qmake_build moc_build rcc_build corelib
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/net/rsplib/Makefile b/net/rsplib/Makefile
index 88aa64a5cdbf..8ac40145b98f 100644
--- a/net/rsplib/Makefile
+++ b/net/rsplib/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES= http://www.tdr.wiwi.uni-due.de/fileadmin/fileupload/I-TDR/Reliable
MAINTAINER= dreibh@iem.uni-due.de
COMMENT= RSerPool Framework and Example Applications
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml moc_build
+USE_QT4= gui xml moc_build
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-maintainer-mode \
diff --git a/net/smb4k-kde4/Makefile b/net/smb4k-kde4/Makefile
index e35db20fa57b..d30111701e1c 100644
--- a/net/smb4k-kde4/Makefile
+++ b/net/smb4k-kde4/Makefile
@@ -26,8 +26,7 @@ USE_GETTEXT= yes
USE_BZIP2= yes
USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/kde4
USE_KDE4= kdehier kdeprefix kdelibs automoc4 runtime
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui network opengl script svg webkit \
+USE_QT4= corelib gui network opengl script svg webkit \
qmake_build moc_build rcc_build uic_build phonon
DOCSDIR= ${PREFIX}/share/doc/HTML/en/smb4k
SUB_FILES= pkg-message
diff --git a/net/wpa_gui/Makefile b/net/wpa_gui/Makefile
index c444e7dd0ffa..b4c28f008107 100644
--- a/net/wpa_gui/Makefile
+++ b/net/wpa_gui/Makefile
@@ -17,8 +17,7 @@ COMMENT= QT GUI for wpa_supplicant
PLIST_FILES= sbin/${PORTNAME}
WRKSRC= ${WRKDIR}/${DISTNAME}/wpa_gui-qt4
-USE_QT_VER= 4
-QT_COMPONENTS= gui qt3support qmake_build moc_build uic_build
+USE_QT4= gui qt3support qmake_build moc_build uic_build
HAS_CONFIGURE= yes
diff --git a/net/x2goclient/Makefile b/net/x2goclient/Makefile
index 76b6029d439a..af2911c5d7c5 100644
--- a/net/x2goclient/Makefile
+++ b/net/x2goclient/Makefile
@@ -23,8 +23,7 @@ RUN_DEPENDS= nxproxy:${PORTSDIR}/net/nxproxy \
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:S,-5,,}
-USE_QT_VER= 4
-QT_COMPONENTS= gui network svg qmake_build moc_build uic_build rcc_build
+USE_QT4= gui network svg qmake_build moc_build uic_build rcc_build
USE_OPENLDAP= yes
MAKE_JOBS_SAFE= yes
diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile
index 5567eb710232..8888a4d2f09c 100644
--- a/polish/kadu/Makefile
+++ b/polish/kadu/Makefile
@@ -46,8 +46,7 @@ CMAKE_ARGS= -DKADU_VERSION:STRING="${DISTVERSION}" -DWITH_ENCHANT=ON
# Setting KADU_VERSION disables git invocation
MAKE_JOBS_SAFE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= dbus gui network script scripttools webkit xml phonon \
+USE_QT4= dbus gui network script scripttools webkit xml phonon \
linguist_build moc_build qmake_build rcc_build uic_build \
imageformats_run sql-sqlite3_run
WANT_GNOME= yes
diff --git a/polish/qfaktury/Makefile b/polish/qfaktury/Makefile
index 46d4bdd7830c..c0224a130619 100644
--- a/polish/qfaktury/Makefile
+++ b/polish/qfaktury/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES= SF
MAINTAINER= meritus@innervision.pl
COMMENT= Polish invoicing desktop program
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build uic_build moc_build rcc_build corelib gui xml qt3support
+USE_QT4= qmake_build uic_build moc_build rcc_build corelib gui xml qt3support
PORTDOCS= ChangeLog.txt ReadMe.txt ReleaseNotes.txt TODO.txt
diff --git a/polish/qnapi/Makefile b/polish/qnapi/Makefile
index ca1ebfaf2828..7701eaa2e942 100644
--- a/polish/qnapi/Makefile
+++ b/polish/qnapi/Makefile
@@ -18,8 +18,7 @@ LICENSE= GPLv2
RUN_DEPENDS= 7z:${PORTSDIR}/archivers/p7zip
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui network qmake_build moc_build uic_build rcc_build
+USE_QT4= corelib gui network qmake_build moc_build uic_build rcc_build
USE_KDE4= kdehier
QMAKE_ARGS= PREFIX=${PREFIX} KDE4_PREFIX=${KDE4_PREFIX}
MAKE_JOBS_SAFE= yes
diff --git a/ports-mgmt/kpackagekit/Makefile b/ports-mgmt/kpackagekit/Makefile
index 0532860ce501..18cf53b92663 100644
--- a/ports-mgmt/kpackagekit/Makefile
+++ b/ports-mgmt/kpackagekit/Makefile
@@ -23,8 +23,7 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_GNOME= pkgconfig
USE_KDE4= automoc4 kdehier kdelibs kdeprefix
-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
USE_CMAKE= yes
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/ports-mgmt/kports-qt4/Makefile b/ports-mgmt/kports-qt4/Makefile
index 6cdf2085b579..b7514fb5873b 100644
--- a/ports-mgmt/kports-qt4/Makefile
+++ b/ports-mgmt/kports-qt4/Makefile
@@ -21,8 +21,7 @@ CONFLICTS= kports-0.[0-7]*
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui network qmake_build moc_build uic_build rcc_build
+USE_QT4= corelib gui network qmake_build moc_build uic_build rcc_build
QMAKE_ARGS+= PREFIX=${PREFIX}
MAKE_JOBS_SAFE= yes
diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile
index d72ae1364a9a..8d8a9e4f56a8 100644
--- a/ports-mgmt/packagekit/Makefile
+++ b/ports-mgmt/packagekit/Makefile
@@ -90,8 +90,7 @@ LIB_DEPENDS+= packagekit-glib2.14:${PORTSDIR}/ports-mgmt/packagekit
.if ${SLAVEPORT}=="qt4"
CONFIGURE_ARGS+=--enable-qt
LIB_DEPENDS+= cppunit-1.12.1:${PORTSDIR}/devel/cppunit
-USE_QT_VER+= 4
-QT_COMPONENTS+= dbus gui xml sql moc_build
+USE_QT4+= dbus gui xml sql moc_build
.include "${PORTSDIR}/Mk/bsd.qt.mk"
.endif
.else
diff --git a/ports-mgmt/portrac/Makefile b/ports-mgmt/portrac/Makefile
index b5cbb8c7fc34..f37156963ec5 100644
--- a/ports-mgmt/portrac/Makefile
+++ b/ports-mgmt/portrac/Makefile
@@ -26,8 +26,7 @@ PLIST_DIRS= share/portrac
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui moc_build qmake_build
+USE_QT4= gui moc_build qmake_build
do-configure:
@cd ${WRKDIR}/${DISTNAME} && ${QMAKE} portrac.pro
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
diff --git a/science/avogadro/Makefile b/science/avogadro/Makefile
index 1272c7d00f5b..66fb29a5c13c 100644
--- a/science/avogadro/Makefile
+++ b/science/avogadro/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS= openbabel.3:${PORTSDIR}/science/openbabel
USE_LDCONFIG= yes
USE_BZIP2= yes
USE_GL= glu
-USE_QT_VER= 4
-QT_COMPONENTS= gui opengl network linguist_build \
+USE_QT4= gui opengl network linguist_build \
qmake_build moc_build rcc_build uic_build
USE_CMAKE= yes
CMAKE_ARGS= -DENABLE_GLSL=OFF \
diff --git a/science/kalzium/Makefile b/science/kalzium/Makefile
index 782869829523..3c4fedc207f1 100644
--- a/science/kalzium/Makefile
+++ b/science/kalzium/Makefile
@@ -30,8 +30,7 @@ USE_KDE4= kdehier kdelibs kdeprefix automoc4
KDE4_BUILDENV= yes
USE_OCAML= yes
NO_OCAML_RUNDEPENDS= yes
-USE_QT_VER= 4
-QT_COMPONENTS= dbus designer opengl script xml \
+USE_QT4= dbus designer opengl script xml \
moc_build qmake_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/science/kst2/Makefile b/science/kst2/Makefile
index 45b929e03882..798b51f5bd5e 100644
--- a/science/kst2/Makefile
+++ b/science/kst2/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS= gsl.16:${PORTSDIR}/math/gsl
LATEST_LINK= kst2
USE_CMAKE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml designer svg opengl \
+USE_QT4= gui xml designer svg opengl \
qmake_build moc_build rcc_build uic_build
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/science/massxpert/Makefile b/science/massxpert/Makefile
index 1689dc767657..61bfcb02e3d9 100644
--- a/science/massxpert/Makefile
+++ b/science/massxpert/Makefile
@@ -16,10 +16,9 @@ COMMENT= The massXpert software for (bio)chemists
LICENSE= GPLv3
-USE_QT_VER= 4
USE_CMAKE= yes
USE_LDCONFIG= yes
-QT_COMPONENTS= gui xml rcc_build qmake_build uic_build moc_build \
+USE_QT4= gui xml rcc_build qmake_build uic_build moc_build \
svg
MAN7= massxpert-data.7
MAN1= massxpert.1
diff --git a/science/paraview/Makefile b/science/paraview/Makefile
index 5359a834ed71..207fd7a49b94 100644
--- a/science/paraview/Makefile
+++ b/science/paraview/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS= hdf5.7:${PORTSDIR}/science/hdf5-18 \
freetype.9:${PORTSDIR}/print/freetype2 \
expat.6:${PORTSDIR}/textproc/expat2
-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 assistantclient
diff --git a/science/qtresistors/Makefile b/science/qtresistors/Makefile
index 5be7ec70fcd6..a46b8cb033be 100644
--- a/science/qtresistors/Makefile
+++ b/science/qtresistors/Makefile
@@ -15,8 +15,7 @@ DISTNAME= 118297-qtResistors-201001102229
MAINTAINER= g.veniamin@googlemail.com
COMMENT= Calculate resistance of resistor by the colors on the resistor
-USE_QT_VER= 4
-QT_COMPONENTS= gui qmake_build uic_build moc_build
+USE_QT4= gui qmake_build uic_build moc_build
WRKSRC= ${WRKDIR}/qtResistors
diff --git a/science/step/Makefile b/science/step/Makefile
index 0e1eda188146..cc69bcb0f6e3 100644
--- a/science/step/Makefile
+++ b/science/step/Makefile
@@ -25,8 +25,7 @@ CONFLICTS= kdeedu-4.[0-6].*
USE_KDE4= kdehier kdelibs kdeprefix automoc4
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= opengl xml moc_build qmake_build rcc_build uic_build
+USE_QT4= opengl xml moc_build qmake_build rcc_build uic_build
USE_XZ= yes
MAKE_JOBS_SAFE= yes
diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile
index 6f749e967cd0..cc7258890184 100644
--- a/security/fwbuilder-devel/Makefile
+++ b/security/fwbuilder-devel/Makefile
@@ -34,8 +34,7 @@ LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt \
netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
PLIST_SUB= BUILD_VERSION=${DISTVERSION}.${BUILD}
-USE_QT_VER= 4
-QT_COMPONENTS= corelib \
+USE_QT4= corelib \
gui \
iconengines \
inputmethods \
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 3f9f39e523e0..88948815900a 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -35,8 +35,7 @@ LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt \
netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
PLIST_SUB= BUILD_VERSION=${DISTVERSION}.${BUILD}
-USE_QT_VER= 4
-QT_COMPONENTS= corelib \
+USE_QT4= corelib \
gui \
iconengines \
inputmethods \
diff --git a/security/keepassx/Makefile b/security/keepassx/Makefile
index d193afe74dbe..7ecefb290676 100644
--- a/security/keepassx/Makefile
+++ b/security/keepassx/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info
DATADIR= ${PREFIX}/share/${PORTNAME:L}
WRKSRC= ${WRKDIR}/${PORTNAME:L}-${PORTVERSION}
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build uic_build qt3support_build rcc_build \
+USE_QT4= qmake_build moc_build uic_build qt3support_build rcc_build \
corelib gui xml
HAS_CONFIGURE= yes
USE_XORG= xt inputproto xtst xrender xrandr xfixes xcursor\
diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index c32d9ee40aef..f1fc41734607 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@@ -22,8 +22,7 @@ LATEST_LINK= ${PORTNAME}4
USE_XZ= yes
USE_KDE4= kdeprefix kdehier automoc4 kdelibs pimlibs
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/security/kwallet/Makefile b/security/kwallet/Makefile
index da6ee8c8674e..0c4f0ca283cf 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/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/security/nmapsi4/Makefile b/security/nmapsi4/Makefile
index 44dc5b8f70a6..a62142e09c7f 100644
--- a/security/nmapsi4/Makefile
+++ b/security/nmapsi4/Makefile
@@ -21,8 +21,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap
USE_CMAKE= yes
USE_BZIP2= yes
INSTALLS_ICONS= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui xml qmake_build uic_build moc_build rcc_build network \
+USE_QT4= gui xml qmake_build uic_build moc_build rcc_build network \
linguist webkit dbus
pre-configure:
diff --git a/security/ophcrack/Makefile b/security/ophcrack/Makefile
index f89a8f5a8e75..8f7431ae2002 100644
--- a/security/ophcrack/Makefile
+++ b/security/ophcrack/Makefile
@@ -31,8 +31,7 @@ OPTIONS= GUI "Build GUI frontend (Qt4 based)" on \
.include <bsd.port.options.mk>
.if defined(WITH_GUI) || defined(WITH_GRAPH)
-USE_QT_VER= 4
-QT_COMPONENTS= moc_build qmake_build rcc_build uic_build corelib gui
+USE_QT4= moc_build qmake_build rcc_build uic_build corelib gui
.else
CONFIGURE_ARGS+= --disable-gui
.endif
diff --git a/security/qca-cyrus-sasl/Makefile b/security/qca-cyrus-sasl/Makefile
index 795821cffc62..68951d8182a1 100644
--- a/security/qca-cyrus-sasl/Makefile
+++ b/security/qca-cyrus-sasl/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS= qca.2:${PORTSDIR}/devel/qca \
sasl2:${PORTSDIR}/security/cyrus-sasl2
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib qmake_build moc_build
+USE_QT4= corelib qmake_build moc_build
HAS_CONFIGURE= yes
QT_NONSTANDARD= yes
CONFIGURE_ARGS+=--plugins-path=${PREFIX}/${QT_PLUGINDIR_REL} \
diff --git a/security/qca-gnupg/Makefile b/security/qca-gnupg/Makefile
index becc5a982ba3..a55d7fed43f3 100644
--- a/security/qca-gnupg/Makefile
+++ b/security/qca-gnupg/Makefile
@@ -17,8 +17,7 @@ COMMENT= QCA GnuPG plugin
LIB_DEPENDS= qca.2:${PORTSDIR}/devel/qca
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib qmake_build moc_build
+USE_QT4= corelib qmake_build moc_build
HAS_CONFIGURE= yes
QT_NONSTANDARD= yes
CONFIGURE_ARGS+=--plugins-path=${PREFIX}/${QT_PLUGINDIR_REL}
diff --git a/security/qca-ossl/Makefile b/security/qca-ossl/Makefile
index 375a463482bf..cf4ea93a9223 100644
--- a/security/qca-ossl/Makefile
+++ b/security/qca-ossl/Makefile
@@ -16,8 +16,7 @@ COMMENT= QCA OpenSLL plugin
LIB_DEPENDS= qca.2:${PORTSDIR}/devel/qca
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib qmake_build moc_build
+USE_QT4= corelib qmake_build moc_build
HAS_CONFIGURE= yes
QT_NONSTANDARD= yes
USE_OPENSSL= yes
diff --git a/security/quantis/Makefile b/security/quantis/Makefile
index 3f1be19b99c7..9107b4828747 100644
--- a/security/quantis/Makefile
+++ b/security/quantis/Makefile
@@ -31,7 +31,6 @@ LICENSE_FILE= ${WRKSRC}/Quantis-${DISTVERSION}/License.txt
USE_ZIP= yes
EXTRACT_BEFORE_ARGS= -aqo
USE_CMAKE= yes
-USE_QT_VER= 4
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/Quantis-${DISTVERSION}/Libs-Apps
@@ -78,7 +77,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libboost_date_time.a:${PORTSDIR}/devel/boost-li
CXXFLAGS+= -I${LOCALBASE}/include
. if defined(WITH_GUI)
-QT_COMPONENTS+= gui moc_build uic_build rcc_build qmake_build
+USE_QT4+= gui moc_build uic_build rcc_build qmake_build
. else
CMAKE_ARGS+= -DDISABLE_EASYQUANTIS_GUI=1
. endif
diff --git a/security/tpmmanager/Makefile b/security/tpmmanager/Makefile
index c22611ec727c..5e5b925f8c74 100644
--- a/security/tpmmanager/Makefile
+++ b/security/tpmmanager/Makefile
@@ -19,9 +19,8 @@ LIB_DEPENDS= tspi.2:${PORTSDIR}/security/trousers
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USE_QT_VER= 4
QT_NONSTANDARD= YES
-QT_COMPONENTS= gui moc_build qmake_build rcc_build uic_build
+USE_QT4= gui moc_build qmake_build rcc_build uic_build
HAS_CONFIGURE= YES
MAKE_JOBS_SAFE= YES
diff --git a/security/xca/Makefile b/security/xca/Makefile
index c8d28e526f06..2f71ee3b2c93 100644
--- a/security/xca/Makefile
+++ b/security/xca/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info
USE_GMAKE= yes
USE_OPENSSL= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui moc_build uic_build qmake_build rcc_build linguist_build
+USE_QT4= gui moc_build uic_build qmake_build rcc_build linguist_build
USE_AUTOTOOLS= libltdl
CC?= gcc
CXX?= g++
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
diff --git a/textproc/beediff/Makefile b/textproc/beediff/Makefile
index f84092c5e730..b6521d6b2726 100644
--- a/textproc/beediff/Makefile
+++ b/textproc/beediff/Makefile
@@ -15,8 +15,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}_src
MAINTAINER= makc@FreeBSD.org
COMMENT= QT4 based diff frontend
-USE_QT_VER= 4
-QT_COMPONENTS= gui moc_build rcc_build qmake_build
+USE_QT4= gui moc_build rcc_build qmake_build
HAS_CONFIGURE= yes
INSTALLS_ICONS= yes
diff --git a/textproc/dikt/Makefile b/textproc/dikt/Makefile
index ec237a1f1ab3..e3942fa05e86 100644
--- a/textproc/dikt/Makefile
+++ b/textproc/dikt/Makefile
@@ -17,8 +17,7 @@ COMMENT= Dictionary for KDE4
USE_XZ= yes
USE_KDE4= kdelibs kdeprefix kdehier automoc4
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui network svg xml \
+USE_QT4= corelib gui network svg xml \
qmake_build moc_build rcc_build uic_build
USE_CMAKE= yes
diff --git a/textproc/dixit/Makefile b/textproc/dixit/Makefile
index 442708a7b3ce..5a8498ef0b39 100644
--- a/textproc/dixit/Makefile
+++ b/textproc/dixit/Makefile
@@ -37,8 +37,7 @@ _DB= ${DB_DIR}/${_DB_F}
HAS_CONFIGURE= yes
QT_VER=4
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui network moc_build qmake_build rcc_build
+USE_QT4= corelib gui network moc_build qmake_build rcc_build
#USE_GMAKE= yes
#MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} QTDIR="${QT_PREFIX}"
diff --git a/textproc/goldendict/Makefile b/textproc/goldendict/Makefile
index b9a107d5b87f..cc5f0891d55b 100644
--- a/textproc/goldendict/Makefile
+++ b/textproc/goldendict/Makefile
@@ -24,8 +24,7 @@ USE_BZIP2= yes
HAS_CONFIGURE= yes
USE_GNOME= pkgconfig
USE_XORG= xtst
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui webkit phonon \
+USE_QT4= corelib gui webkit phonon \
qmake_build linguist_build moc_build rcc_build script_build uic_build
WRKSRC= ${WRKDIR}
diff --git a/textproc/ibus-qt/Makefile b/textproc/ibus-qt/Makefile
index b62c8b746927..e395e98bc010 100644
--- a/textproc/ibus-qt/Makefile
+++ b/textproc/ibus-qt/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ibus-1.0.pc:${PORTSDIR}/textproc/ibu
${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus \
${LOCALBASE}/bin/icu-config:${PORTSDIR}/devel/icu
-USE_QT_VER= 4
-QT_COMPONENTS= gui dbus moc_build qmake_build moc_build uic_build rcc_build
+USE_QT4= gui dbus moc_build qmake_build moc_build uic_build rcc_build
USE_CMAKE= yes
CMAKE_ARGS= -DCMAKE_INSTALL_PREFIX=${PREFIX} -DDOCDIR=${PREFIX}/share/doc/ibus-qt
USE_LDCONFIG= yes
diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile
index 7ca061809f87..6fcf2c7fc8f8 100644
--- a/textproc/kdiff3/Makefile
+++ b/textproc/kdiff3/Makefile
@@ -16,8 +16,7 @@ COMMENT= A KDE4 graphical frontend for diff
USE_KDE4= kdebase kdeprefix kdehier automoc4
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_GETTEXT= yes
MAKE_JOBS_SAFE= yes
diff --git a/textproc/py-qt4-xml/Makefile b/textproc/py-qt4-xml/Makefile
index 32ade50ba54e..ccf894bd59ab 100644
--- a/textproc/py-qt4-xml/Makefile
+++ b/textproc/py-qt4-xml/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-cor
DISTINFO_FILE= ${PYQT4_DISTINFO_FILE}
HAS_CONFIGURE= yes
USE_PYTHON= 2.5+
-USE_QT_VER= 4
-QT_COMPONENTS= xml qmake_build moc_build
+USE_QT4= xml qmake_build moc_build
OPTIONS= API "Install QtXml API for QScintilla2" on \
DEBUG "Enable debugging in generated code" off \
diff --git a/textproc/py-qt4-xmlpatterns/Makefile b/textproc/py-qt4-xmlpatterns/Makefile
index 7abc54971d7e..0b61dbe05670 100644
--- a/textproc/py-qt4-xmlpatterns/Makefile
+++ b/textproc/py-qt4-xmlpatterns/Makefile
@@ -21,8 +21,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}xml>=${PYQT4_VERSION}:${PORTSDIR}/textproc/py-qt4-x
DISTINFO_FILE= ${PYQT4_DISTINFO_FILE}
HAS_CONFIGURE= yes
USE_PYTHON= 2.5+
-USE_QT_VER= 4
-QT_COMPONENTS= xmlpatterns qmake_build
+USE_QT4= xmlpatterns qmake_build
OPTIONS= API "Install QtXml API for QScintilla2" on \
DEBUG "Enable debugging in generated code" off \
diff --git a/textproc/qstardict/Makefile b/textproc/qstardict/Makefile
index 1b2efa1ee1ee..c1c1900da979 100644
--- a/textproc/qstardict/Makefile
+++ b/textproc/qstardict/Makefile
@@ -15,8 +15,7 @@ MAINTAINER= makc@FreeBSD.org
COMMENT= A StarDict clone written with using Qt4
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui network xml qmake_build uic_build moc_build rcc_build
+USE_QT4= gui network xml qmake_build uic_build moc_build rcc_build
QMAKE_ARGS+= -recursive
USE_DOS2UNIX= qstardict.pri
diff --git a/textproc/qt4-clucene/Makefile b/textproc/qt4-clucene/Makefile
index 4fb0a49da433..f0caa2039849 100644
--- a/textproc/qt4-clucene/Makefile
+++ b/textproc/qt4-clucene/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= QtCLucene full text search library wrapper
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build corelib
+USE_QT4= qmake_build corelib
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/textproc/qt4-xml/Makefile b/textproc/qt4-xml/Makefile
index d3f41557a1c7..c6d70b92438b 100644
--- a/textproc/qt4-xml/Makefile
+++ b/textproc/qt4-xml/Makefile
@@ -14,8 +14,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt XML library
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build corelib
+USE_QT4= qmake_build moc_build corelib
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/textproc/qt4-xmlpatterns-tool/Makefile b/textproc/qt4-xmlpatterns-tool/Makefile
index 664f445eb0c4..74be22fe94e4 100644
--- a/textproc/qt4-xmlpatterns-tool/Makefile
+++ b/textproc/qt4-xmlpatterns-tool/Makefile
@@ -13,8 +13,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt4 command line utility for running XQueries
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build xmlpatterns
+USE_QT4= qmake_build xmlpatterns
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/textproc/qt4-xmlpatterns/Makefile b/textproc/qt4-xmlpatterns/Makefile
index fee501494434..cb5d58616741 100644
--- a/textproc/qt4-xmlpatterns/Makefile
+++ b/textproc/qt4-xmlpatterns/Makefile
@@ -13,8 +13,7 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= kde@FreeBSD.org
COMMENT= XQuery 1.0 and XPath 2.0 support for Qt4
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build corelib network
+USE_QT4= qmake_build moc_build rcc_build corelib network
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/textproc/scim-bridge-qt4/Makefile b/textproc/scim-bridge-qt4/Makefile
index 65db67ad0cfd..1c5c697e1b06 100644
--- a/textproc/scim-bridge-qt4/Makefile
+++ b/textproc/scim-bridge-qt4/Makefile
@@ -17,8 +17,7 @@ COMMENT= Qt4 client for Scim-bridge
RUN_DEPENDS= scim-bridge:${PORTSDIR}/textproc/scim-bridge
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui moc_build
+USE_QT4= corelib gui moc_build
QT_NONSTANDARD= yes
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/textproc/sigil/Makefile b/textproc/sigil/Makefile
index e1ccc4e66a70..509e83dcc8ab 100644
--- a/textproc/sigil/Makefile
+++ b/textproc/sigil/Makefile
@@ -23,9 +23,8 @@ LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \
USE_ZIP= yes
USE_CMAKE= yes
USE_DOS2UNIX= CMakeLists.txt DirEnumerator.cpp ZipFile_stl.cpp ZipPlatform_lnx.cpp
-USE_QT_VER= 4
NO_WRKSUBDIR= yes
-QT_COMPONENTS= qmake gui svg webkit xml moc uic rcc imageformats linguist
+USE_QT4= qmake gui svg webkit xml moc uic rcc imageformats linguist
DESKTOP_ENTRIES="Sigil Editor" \
"${COMMENT}" \
diff --git a/textproc/soprano/Makefile b/textproc/soprano/Makefile
index 30b22f94fc82..fd4d18415992 100644
--- a/textproc/soprano/Makefile
+++ b/textproc/soprano/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS= raptor2.0:${PORTSDIR}/textproc/raptor2 \
iodbc.3:${PORTSDIR}/databases/libiodbc
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib dbus qtestlib network \
+USE_QT4= corelib dbus qtestlib network \
qmake_build moc_build uic_build rcc_build
USE_GNOME= pkgconfig
USE_LDCONFIG= yes
diff --git a/textproc/uim-kde4/Makefile b/textproc/uim-kde4/Makefile
index 8c56fab16539..47f5aa84c602 100644
--- a/textproc/uim-kde4/Makefile
+++ b/textproc/uim-kde4/Makefile
@@ -15,8 +15,7 @@ RUN_DEPENDS= uim-pref-qt4:${PORTSDIR}/textproc/uim-qt4
USE_GCC= 4.2+
USE_KDE4= kdehier kdeprefix kdelibs automoc4
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build qt3support uic rcc
+USE_QT4= qmake_build moc_build qt3support uic rcc
USE_AUTOTOOLS= libtool
MASTERDIR= ${.CURDIR}/../../textproc/uim
diff --git a/textproc/uim-qt4/Makefile b/textproc/uim-qt4/Makefile
index dac05fa60292..d0ae1c606a49 100644
--- a/textproc/uim-qt4/Makefile
+++ b/textproc/uim-qt4/Makefile
@@ -11,8 +11,7 @@ COMMENT= Qt4 modules of uim input method
LIB_DEPENDS= uim.8:${PORTSDIR}/textproc/uim
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build qt3support uic
+USE_QT4= qmake_build moc_build qt3support uic
USE_AUTOTOOLS= libtool
USE_ICONV= yes
diff --git a/www/aria2fe/Makefile b/www/aria2fe/Makefile
index 258cf25db797..c3d4ad454df4 100644
--- a/www/aria2fe/Makefile
+++ b/www/aria2fe/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= aria2c:${PORTSDIR}/www/aria2 \
xterm:${PORTSDIR}/x11/xterm
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui qmake_build uic_build moc_build rcc_build
+USE_QT4= gui qmake_build uic_build moc_build rcc_build
PLIST_FILES= bin/${PORTNAME}
BUILD_WRKSRC= ${WRKSRC}/src
diff --git a/www/arora/Makefile b/www/arora/Makefile
index 0dab64ea1e78..7dd4c7bc25d9 100644
--- a/www/arora/Makefile
+++ b/www/arora/Makefile
@@ -15,8 +15,7 @@ COMMENT= Simple Qt4 based browser
LICENSE= GPLv3
-USE_QT_VER= 4
-QT_COMPONENTS= network webkit qmake_build moc_build uic_build rcc_build \
+USE_QT4= network webkit qmake_build moc_build uic_build rcc_build \
imageformats gui script sql
HAS_CONFIGURE= yes
QMAKE_ARGS+= -unix -recursive PREFIX=${PREFIX}
@@ -33,7 +32,7 @@ BROKEN= core dump on application startup
.if defined(WITHOUT_NLS)
PLIST_SUB+= NLS="@comment "
.else
-QT_COMPONENTS+= linguist_build
+USE_QT4+= linguist_build
PLIST_SUB+= NLS=""
.endif
diff --git a/www/bookmarkbridge/Makefile b/www/bookmarkbridge/Makefile
index 4730540374bf..5a2d98f0d2cf 100644
--- a/www/bookmarkbridge/Makefile
+++ b/www/bookmarkbridge/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2
USE_PERL5_BUILD= yes
USE_XORG= x11 ice xext
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui moc_build rcc_build uic_build qt3support
+USE_QT4= corelib gui moc_build rcc_build uic_build qt3support
USE_GNOME= libxml2
USE_GMAKE= yes
USE_AUTOTOOLS= aclocal automake autoconf
diff --git a/www/choqok/Makefile b/www/choqok/Makefile
index e05a7a0f6c6f..534e6da56bec 100644
--- a/www/choqok/Makefile
+++ b/www/choqok/Makefile
@@ -24,8 +24,7 @@ LIB_DEPENDS= qjson.0:${PORTSDIR}/devel/qjson \
USE_GETTEXT= yes
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-USE_QT_VER= 4
-QT_COMPONENTS= gui imageformats_run network \
+USE_QT4= gui imageformats_run network \
moc_build qmake_build rcc_build uic_build
USE_BZIP2= yes
USE_CMAKE= yes
diff --git a/www/cutycapt/Makefile b/www/cutycapt/Makefile
index 0850239441c0..1f1bdbb9655d 100644
--- a/www/cutycapt/Makefile
+++ b/www/cutycapt/Makefile
@@ -18,8 +18,7 @@ LICENSE= GPLv2
WRKSRC= ${WRKDIR}/CutyCapt
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build imageformats webkit
+USE_QT4= qmake_build moc_build imageformats webkit
MAKE_JOBS_SAFE= yes
PLIST_FILES= bin/CutyCapt
diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile
index 501fae0e177e..746b451e59e5 100644
--- a/www/kdewebdev4/Makefile
+++ b/www/kdewebdev4/Makefile
@@ -24,8 +24,7 @@ USE_XZ= yes
USE_GNOME= libxml2 libxslt
USE_KDE4= kdelibs pimlibs kdeprefix kdehier automoc4
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= dbus porting_build \
+USE_QT4= dbus porting_build \
qmake_build moc_build rcc_build uic_build uic3_build
MAKE_JOBS_SAFE= yes
diff --git a/www/kwebkitpart/Makefile b/www/kwebkitpart/Makefile
index 6cca484df76e..a124e99d1e7e 100644
--- a/www/kwebkitpart/Makefile
+++ b/www/kwebkitpart/Makefile
@@ -15,8 +15,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Web browser component for KDE SC based on QtWebKit
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-USE_QT_VER= 4
-QT_COMPONENTS= designer gui webkit \
+USE_QT4= designer gui webkit \
moc_build qmake_build rcc_build uic_build
USE_BZIP2= yes
USE_CMAKE= yes
diff --git a/www/py-qt4-webkit/Makefile b/www/py-qt4-webkit/Makefile
index 0ff74ce89510..c2fe2aae0b42 100644
--- a/www/py-qt4-webkit/Makefile
+++ b/www/py-qt4-webkit/Makefile
@@ -21,8 +21,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= qmake_build gui network webkit
+USE_QT4= qmake_build gui network webkit
OPTIONS= API "Install QtXml API for QScintilla2" on \
DEBUG "Enable debugging in generated code" off \
diff --git a/www/qt4-webkit/Makefile b/www/qt4-webkit/Makefile
index 4c6cbe4d0ae4..4ec7ead9f8b4 100644
--- a/www/qt4-webkit/Makefile
+++ b/www/qt4-webkit/Makefile
@@ -15,8 +15,7 @@ COMMENT= Qt4 WebKit engine
USE_GNOME= glib20
USE_GSTREAMER= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib declarative gui network \
+USE_QT4= corelib declarative gui network \
qmake_build moc_build rcc_build
QT_NONSTANDARD= yes
QT_DIST= yes
diff --git a/www/rekonq/Makefile b/www/rekonq/Makefile
index ec1e981ab558..97e0a55b68c3 100644
--- a/www/rekonq/Makefile
+++ b/www/rekonq/Makefile
@@ -17,8 +17,7 @@ COMMENT= Lightweight KDE browser based on WebKit
USE_BZIP2= yes
USE_CMAKE= yes
USE_KDE4= kdehier kdelibs kdeprefix automoc4
-USE_QT_VER= 4
-QT_COMPONENTS= script webkit \
+USE_QT4= script webkit \
moc_build qmake_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile
index a0c671ef6122..f3c92ee91140 100644
--- a/x11-clocks/kdetoys4/Makefile
+++ b/x11-clocks/kdetoys4/Makefile
@@ -19,8 +19,7 @@ LATEST_LINK= ${PORTNAME}4
USE_KDE4= kdehier kdelibs kdeprefix workspace automoc4
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= dbus gui qt3support \
+USE_QT4= dbus gui qt3support \
qmake_build moc_build rcc_build uic_build
USE_XORG= x11
USE_XZ= yes
diff --git a/x11-clocks/ktimer/Makefile b/x11-clocks/ktimer/Makefile
index 80eb0db8ed27..64a5f3f40f51 100644
--- a/x11-clocks/ktimer/Makefile
+++ b/x11-clocks/ktimer/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/x11-clocks/plasma-applet-adjustableclock/Makefile b/x11-clocks/plasma-applet-adjustableclock/Makefile
index 3360f4dbae25..b092aab21bc6 100644
--- a/x11-clocks/plasma-applet-adjustableclock/Makefile
+++ b/x11-clocks/plasma-applet-adjustableclock/Makefile
@@ -22,8 +22,7 @@ USE_BZIP2= yes
USE_CMAKE= yes
USE_GETTEXT= yes
USE_KDE4= automoc4 kdeprefix workspace
-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
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-clocks/plasma-applet-geekclock/Makefile b/x11-clocks/plasma-applet-geekclock/Makefile
index f99c27ab836e..850051f674b4 100644
--- a/x11-clocks/plasma-applet-geekclock/Makefile
+++ b/x11-clocks/plasma-applet-geekclock/Makefile
@@ -18,8 +18,7 @@ COMMENT= Geeky analog clock plasma applet for KDE4
USE_CMAKE= yes
USE_KDE4= automoc4 kdeprefix kdelibs workspace
-USE_QT_VER= 4
-QT_COMPONENTS= gui dbus network opengl svg webkit xml \
+USE_QT4= gui dbus network opengl svg webkit xml \
qmake_build moc_build rcc_build uic_build
MAKE_JOBS_SAFE= yes
diff --git a/x11-fm/krusader2/Makefile b/x11-fm/krusader2/Makefile
index 7600edac3215..69cabbd076e0 100644
--- a/x11-fm/krusader2/Makefile
+++ b/x11-fm/krusader2/Makefile
@@ -17,8 +17,7 @@ COMMENT= A two window file-manager for KDE, like midnight or norton commander
USE_KDE4= kdelibs kdeprefix kdehier automoc4
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui network xml moc_build qmake_build \
+USE_QT4= gui network xml moc_build qmake_build \
rcc_build uic_build
USE_BZIP2= yes
USE_GETTEXT= yes
diff --git a/x11-fm/qtfm/Makefile b/x11-fm/qtfm/Makefile
index d4a68cebf3a1..7535f1a989d3 100644
--- a/x11-fm/qtfm/Makefile
+++ b/x11-fm/qtfm/Makefile
@@ -19,8 +19,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USE_DOS2UNIX= yes
DOS2UNIX_REGEX= .*\.(h|cpp)
-USE_QT_VER= 4
-QT_COMPONENTS= gui network qmake_build moc_build rcc_build \
+USE_QT4= gui network qmake_build moc_build rcc_build \
imageformats_run
# Override -A option:
diff --git a/x11-fm/ultracopier/Makefile b/x11-fm/ultracopier/Makefile
index a5dd6e7c6281..3795e768e8ae 100644
--- a/x11-fm/ultracopier/Makefile
+++ b/x11-fm/ultracopier/Makefile
@@ -21,8 +21,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USE_BZIP2= yes
USE_GNOME= desktopfileutils
USE_KDE4= automoc4 kdelibs
-USE_QT_VER= 4
-QT_COMPONENTS= corelib dbus gui moc_build network qmake_build rcc_build svg \
+USE_QT4= corelib dbus gui moc_build network qmake_build rcc_build svg \
uic_build xml xmlpatterns
USE_CMAKE= yes
diff --git a/x11-fonts/fontmatrix/Makefile b/x11-fonts/fontmatrix/Makefile
index ea53b01fc29c..37e44e69580f 100644
--- a/x11-fonts/fontmatrix/Makefile
+++ b/x11-fonts/fontmatrix/Makefile
@@ -17,8 +17,7 @@ COMMENT= A graphical font manager
RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
-USE_QT_VER= 4
-QT_COMPONENTS= gui svg network moc_build uic_build rcc_build qmake_build linguist_build
+USE_QT4= gui svg network moc_build uic_build rcc_build qmake_build linguist_build
INSTALLS_ICONS= yes
USE_CMAKE= yes
diff --git a/x11-themes/gtk-qt4-engine/Makefile b/x11-themes/gtk-qt4-engine/Makefile
index b93d45c1e97d..0bdd7c49b9cc 100644
--- a/x11-themes/gtk-qt4-engine/Makefile
+++ b/x11-themes/gtk-qt4-engine/Makefile
@@ -18,8 +18,7 @@ COMMENT= GTK-QT Theme Engine allows GTK2 apps to use QT/KDE themes
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GNOME= gtk20
-USE_QT_VER= 4
-QT_COMPONENTS= gui moc_build rcc_build uic_build qmake_build
+USE_QT4= gui moc_build rcc_build uic_build qmake_build
USE_CMAKE= yes
USE_KDE4= kdebase kdeprefix automoc4
diff --git a/x11-themes/kde4-style-bespin/Makefile b/x11-themes/kde4-style-bespin/Makefile
index f8d3e6b47bb8..4a7cd8ebb6d4 100644
--- a/x11-themes/kde4-style-bespin/Makefile
+++ b/x11-themes/kde4-style-bespin/Makefile
@@ -19,8 +19,7 @@ IGNORE= does not build with KDE SC 4.8
WRKSRC= ${WRKDIR}/cloudcity
USE_KDE4= kdelibs kdehier kdeprefix automoc4 workspace
-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
USE_CMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-themes/kde4-style-nitrogen/Makefile b/x11-themes/kde4-style-nitrogen/Makefile
index abe0326475e0..b810cffed3ea 100644
--- a/x11-themes/kde4-style-nitrogen/Makefile
+++ b/x11-themes/kde4-style-nitrogen/Makefile
@@ -18,8 +18,7 @@ COMMENT= KDE style with animations
WRKSRC= ${WRKDIR}/kde4-kstyle-nitrogen-${PORTVERSION}-Source
USE_KDE4= kdelibs kdehier kdeprefix 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
USE_CMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-themes/kde4-style-polyester/Makefile b/x11-themes/kde4-style-polyester/Makefile
index 9559a237c388..796fbd8f9664 100644
--- a/x11-themes/kde4-style-polyester/Makefile
+++ b/x11-themes/kde4-style-polyester/Makefile
@@ -17,8 +17,7 @@ COMMENT= KDE style and window decoration
USE_BZIP2= yes
USE_KDE4= kdelibs kdehier kdeprefix 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
USE_CMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-themes/kde4-style-skulpture/Makefile b/x11-themes/kde4-style-skulpture/Makefile
index 2db817a1a894..e3b78641e790 100644
--- a/x11-themes/kde4-style-skulpture/Makefile
+++ b/x11-themes/kde4-style-skulpture/Makefile
@@ -18,8 +18,7 @@ COMMENT= KDE style featuring 3d artwork and enhanced the visual experience
USE_BZIP2= yes
USE_KDE4= kdelibs kdehier kdeprefix automoc4 workspace
-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
USE_CMAKE= yes
.include <bsd.port.mk>
diff --git a/x11-themes/kde4-wallpapers/Makefile b/x11-themes/kde4-wallpapers/Makefile
index 23aaac718d04..014c9dd8d572 100644
--- a/x11-themes/kde4-wallpapers/Makefile
+++ b/x11-themes/kde4-wallpapers/Makefile
@@ -20,8 +20,7 @@ CONFLICTS= kdebase-workspace-4.[0-6].*
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
NO_BUILD= yes
diff --git a/x11-themes/kde4-windeco-crystal/Makefile b/x11-themes/kde4-windeco-crystal/Makefile
index bd64c2236066..8d7c24850e0b 100644
--- a/x11-themes/kde4-windeco-crystal/Makefile
+++ b/x11-themes/kde4-windeco-crystal/Makefile
@@ -20,8 +20,7 @@ LICENSE= GPLv2
USE_BZIP2= yes
USE_KDE4= kdelibs kdehier kdeprefix automoc4 workspace
-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
USE_CMAKE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-themes/kde4-windeco-dekorator/Makefile b/x11-themes/kde4-windeco-dekorator/Makefile
index c58bc9256d35..d37c5242a654 100644
--- a/x11-themes/kde4-windeco-dekorator/Makefile
+++ b/x11-themes/kde4-windeco-dekorator/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS= qimageblitz.4:${PORTSDIR}/x11/qimageblitz
USE_BZIP2= yes
USE_KDE4= kdelibs kdehier kdeprefix automoc4 workspace
-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
USE_CMAKE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-themes/kde4-windeco-nitrogen/Makefile b/x11-themes/kde4-windeco-nitrogen/Makefile
index 183c9a64d73e..ac9f287a531a 100644
--- a/x11-themes/kde4-windeco-nitrogen/Makefile
+++ b/x11-themes/kde4-windeco-nitrogen/Makefile
@@ -17,8 +17,7 @@ MAINTAINER= shanjobe@gmail.com
COMMENT= KDE4 window decoration
USE_KDE4= kdelibs kdehier kdeprefix automoc4 workspace
-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
USE_CMAKE= yes
WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}-Source
diff --git a/x11-themes/kdeartwork4/Makefile b/x11-themes/kdeartwork4/Makefile
index 86f0178697ff..4b60a6e48b17 100644
--- a/x11-themes/kdeartwork4/Makefile
+++ b/x11-themes/kdeartwork4/Makefile
@@ -26,8 +26,7 @@ LATEST_LINK= ${PORTNAME}4
USE_XZ= yes
USE_KDE4= kdehier kdelibs kdeprefix libkexiv2 workspace automoc4
KDE4_BUILDENV= yes
-USE_QT_VER= 4
-QT_COMPONENTS= gui opengl \
+USE_QT4= gui opengl \
moc_build qmake_build rcc_build uic_build
USE_XORG= x11 xt
MAKE_JOBS_SAFE= yes
diff --git a/x11-themes/qt4-style-float/Makefile b/x11-themes/qt4-style-float/Makefile
index 2af4cd37b527..c8d6d66204ba 100644
--- a/x11-themes/qt4-style-float/Makefile
+++ b/x11-themes/qt4-style-float/Makefile
@@ -20,8 +20,7 @@ COMMENT= Style for Qt 4 and KDE
LICENSE= GPLv2
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui qmake_build moc_build rcc_build
+USE_QT4= corelib gui qmake_build moc_build rcc_build
MAKE_JOBS_SAFE= yes
WRKSRC= ${WRKDIR}/floatstyle-${PORTVERSION}
diff --git a/x11-themes/qt4-style-phase/Makefile b/x11-themes/qt4-style-phase/Makefile
index 8da41e3ef25e..48408f3e39bd 100644
--- a/x11-themes/qt4-style-phase/Makefile
+++ b/x11-themes/qt4-style-phase/Makefile
@@ -20,8 +20,7 @@ COMMENT= Widget style for Qt 4 and KDE 4
LICENSE= MIT
USE_BZIP2= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui qmake_build moc_build
+USE_QT4= corelib gui qmake_build moc_build
MAKE_JOBS_SAFE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-themes/qt4-style-quantumstyle/Makefile b/x11-themes/qt4-style-quantumstyle/Makefile
index 791188c787b6..4a6d304a6834 100644
--- a/x11-themes/qt4-style-quantumstyle/Makefile
+++ b/x11-themes/qt4-style-quantumstyle/Makefile
@@ -20,8 +20,7 @@ COMMENT= SVG themable style for Qt 4 and KDE
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui svg qmake_build rcc_build uic_build moc_build
+USE_QT4= corelib gui svg qmake_build rcc_build uic_build moc_build
MAKE_JOBS_SAFE= yes
WRKSRC= ${WRKDIR}/QuantumStyle
diff --git a/x11-themes/qtcurve-kde4/Makefile b/x11-themes/qtcurve-kde4/Makefile
index abbd1d1dcb73..20bc6ebdfa84 100644
--- a/x11-themes/qtcurve-kde4/Makefile
+++ b/x11-themes/qtcurve-kde4/Makefile
@@ -18,8 +18,7 @@ COMMENT= QtCurve KDE4 widget style
USE_BZIP2= yes
USE_CMAKE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib qmake_build uic_build moc_build rcc_build
+USE_QT4= corelib qmake_build uic_build moc_build rcc_build
USE_KDE4= kdelibs workspace kdehier kdeprefix automoc4
.include <bsd.port.mk>
diff --git a/x11-themes/qtcurve-qt4/Makefile b/x11-themes/qtcurve-qt4/Makefile
index 717e5d945e6b..a4c7041efc25 100644
--- a/x11-themes/qtcurve-qt4/Makefile
+++ b/x11-themes/qtcurve-qt4/Makefile
@@ -19,8 +19,7 @@ COMMENT= QtCurve Qt4 widget style
USE_BZIP2= yes
USE_GCC= 4.2+
USE_CMAKE= yes
-USE_QT_VER= 4
-QT_COMPONENTS= dbus gui svg imageformats_run \
+USE_QT4= dbus gui svg imageformats_run \
qmake_build uic_build moc_build rcc_build
CFLAGS+= -I${LOCALBASE}/include
CMAKE_ARGS+= -DQTC_QT_ONLY:BOOL=ON \
diff --git a/x11-toolkits/attica/Makefile b/x11-toolkits/attica/Makefile
index 81fa680d43d2..bc08cb6d15bd 100644
--- a/x11-toolkits/attica/Makefile
+++ b/x11-toolkits/attica/Makefile
@@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR= stable/${PORTNAME}/
MAINTAINER= kde@FreeBSD.org
COMMENT= Collaboration Services API library
-USE_QT_VER= 4
-QT_COMPONENTS= dbus network moc_build uic_build rcc_build qmake_build
+USE_QT4= dbus network moc_build uic_build rcc_build qmake_build
USE_BZIP2= yes
USE_GNOME= pkgconfig
USE_LDCONFIG= yes
diff --git a/x11-toolkits/nucleo/Makefile b/x11-toolkits/nucleo/Makefile
index 4c229acd6c27..8cf4e018f0e3 100644
--- a/x11-toolkits/nucleo/Makefile
+++ b/x11-toolkits/nucleo/Makefile
@@ -24,7 +24,6 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
USE_BZIP2= yes
USE_GMAKE= yes
USE_GL= glu
-USE_QT_VER= 4
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
@@ -67,7 +66,7 @@ PLIST_SUB+= FFMPEG="@comment "
.endif
.if defined(WITH_QT4)
-QT_COMPONENTS= moc_build corelib
+USE_QT4= moc_build corelib
MAKE_ARGS+= QT4MOC=${LOCALBASE}/bin/moc-qt4
PLIST_SUB+= QT4=""
.else
diff --git a/x11-toolkits/py-qt4-gui/Makefile b/x11-toolkits/py-qt4-gui/Makefile
index 9e62ab332546..cee7bcac2bf7 100644
--- a/x11-toolkits/py-qt4-gui/Makefile
+++ b/x11-toolkits/py-qt4-gui/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-cor
DISTINFO_FILE= ${PYQT4_DISTINFO_FILE}
HAS_CONFIGURE= yes
USE_PYTHON= 2.5+
-USE_QT_VER= 4
-QT_COMPONENTS= gui imageformats_run inputmethods_run iconengines_run \
+USE_QT4= gui imageformats_run inputmethods_run iconengines_run \
qmake_build moc_build
OPTIONS= API "Install QtGui API for QScintilla2" on \
diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile
index 7cf71375e83e..e82ff9329bc5 100644
--- a/x11-toolkits/qt4-gui/Makefile
+++ b/x11-toolkits/qt4-gui/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils
-USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib
+USE_QT4= qmake_build moc_build rcc_build uic_build corelib
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_SAFE= yes
diff --git a/x11-toolkits/qt4pas/Makefile b/x11-toolkits/qt4pas/Makefile
index 5f7465f1af11..0e7a2e588b36 100644
--- a/x11-toolkits/qt4pas/Makefile
+++ b/x11-toolkits/qt4pas/Makefile
@@ -15,8 +15,7 @@ MAINTAINER= acm@FreeBSD.org
COMMENT= Qt4 binding for FreePascal
USE_LDCONFIG= yes
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui network script webkit qmake_build \
+USE_QT4= corelib gui network script webkit qmake_build \
moc_build
QT4_VER_MIN= 4.5.3
diff --git a/x11-toolkits/qwt5-designerplugin/Makefile b/x11-toolkits/qwt5-designerplugin/Makefile
index fc4cb55d297b..a97546b135a0 100644
--- a/x11-toolkits/qwt5-designerplugin/Makefile
+++ b/x11-toolkits/qwt5-designerplugin/Makefile
@@ -17,8 +17,7 @@ COMMENT= Qt Designer plugin for Qwt
LIB_DEPENDS= qwt.5:${PORTSDIR}/x11-toolkits/qwt5
-USE_QT_VER= 4
-QT_COMPONENTS= designer moc_build qmake_build rcc_build
+USE_QT4= designer moc_build qmake_build rcc_build
USE_BZIP2= yes
USE_GMAKE= yes
QMAKE_ARGS+= -unix -recursive CONFIG+=QwtDesigner \
diff --git a/x11-toolkits/qwt5/Makefile b/x11-toolkits/qwt5/Makefile
index a1084b4c4ada..9d16adf72124 100644
--- a/x11-toolkits/qwt5/Makefile
+++ b/x11-toolkits/qwt5/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES= SF
MAINTAINER= makc@FreeBSD.org
COMMENT= Qt Widgets for Technical Applications
-USE_QT_VER= 4
-QT_COMPONENTS= gui svg moc_build qmake_build
+USE_QT4= gui svg moc_build qmake_build
USE_BZIP2= yes
USE_GMAKE= yes
QMAKE_ARGS+= -unix -recursive PREFIX=${PREFIX}
diff --git a/x11-toolkits/qwt6-designerplugin/Makefile b/x11-toolkits/qwt6-designerplugin/Makefile
index bbea19803fcb..e9f39d89f9f3 100644
--- a/x11-toolkits/qwt6-designerplugin/Makefile
+++ b/x11-toolkits/qwt6-designerplugin/Makefile
@@ -17,8 +17,7 @@ COMMENT= Qt Designer plugin for Qwt
LIB_DEPENDS= qwt6.6:${PORTSDIR}/x11-toolkits/qwt6
-USE_QT_VER= 4
-QT_COMPONENTS= designer moc_build qmake_build rcc_build
+USE_QT4= designer moc_build qmake_build rcc_build
USE_BZIP2= yes
USE_GMAKE= yes
QMAKE_ARGS+= -recursive CONFIG+=QwtDesigner \
diff --git a/x11-toolkits/qwt6/Makefile b/x11-toolkits/qwt6/Makefile
index b6b575911566..906e02ae5bbf 100644
--- a/x11-toolkits/qwt6/Makefile
+++ b/x11-toolkits/qwt6/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES= SF
MAINTAINER= makc@FreeBSD.org
COMMENT= Qt Widgets for Technical Applications
-USE_QT_VER= 4
-QT_COMPONENTS= gui svg xml moc_build qmake_build
+USE_QT4= gui svg xml moc_build qmake_build
USE_BZIP2= yes
USE_GMAKE= yes
QMAKE_ARGS+= -recursive PREFIX=${PREFIX}
diff --git a/x11-toolkits/soqt/Makefile b/x11-toolkits/soqt/Makefile
index 7c8280e06e66..95b8f593540a 100644
--- a/x11-toolkits/soqt/Makefile
+++ b/x11-toolkits/soqt/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS= Coin.61:${PORTSDIR}/graphics/Coin
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack
-USE_QT_VER= 4
-QT_COMPONENTS= corelib opengl moc_build
+USE_QT4= corelib opengl moc_build
USE_GMAKE= yes
CPPFLAGS+= -I${QT_INCDIR} -I${QT_INCDIR}/Qt -I${LOCALBASE}/include
LDFLAGS+= -L${QT_LIBDIR} -L${LOCALBASE}/lib
diff --git a/x11-wm/qlwm/Makefile b/x11-wm/qlwm/Makefile
index e11bf9f7f61c..4aa1ee6a0647 100644
--- a/x11-wm/qlwm/Makefile
+++ b/x11-wm/qlwm/Makefile
@@ -16,8 +16,7 @@ MASTER_SITES= http://www.alinden.mynetcologne.de/qlwm/
MAINTAINER= ports@FreeBSD.org
COMMENT= Qt-based window manager
-USE_QT_VER= 4
-QT_COMPONENTS= corelib gui moc_build qmake_build
+USE_QT4= corelib gui moc_build qmake_build
MAN1= qlwm.1
PORTDOCS= CHANGES README
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