diff options
| author | tcberner <tcberner@FreeBSD.org> | 2018-06-29 01:39:53 +0800 |
|---|---|---|
| committer | tcberner <tcberner@FreeBSD.org> | 2018-06-29 01:39:53 +0800 |
| commit | 2a8bcfc8ea71d4438b926a8adc477de360863145 (patch) | |
| tree | 7b9785f1f0c244da1f5b69a2a610e3f37eb786a8 /devel | |
| parent | 62341874a942de5989d54a3ba471cb8719d251ee (diff) | |
| download | freebsd-ports-gnome-2a8bcfc8ea71d4438b926a8adc477de360863145.tar.gz freebsd-ports-gnome-2a8bcfc8ea71d4438b926a8adc477de360863145.tar.zst freebsd-ports-gnome-2a8bcfc8ea71d4438b926a8adc477de360863145.zip | |
Replace bsd.qt.mk by Uses/qt.mk and Uses/qt-dist.mk
From now on, ports that depend on Qt4 will have to set
USES= qt:4
USE_QT= foo bar
ports depending on Qt5 will use
USES= qt:5
USE_QT= foo bar
PR: 229225
Exp-run by: antoine
Reviewed by: mat
Approved by: portmgr (antoine)
Differential Revision: →https://reviews.freebsd.org/D15540
Diffstat (limited to 'devel')
204 files changed, 442 insertions, 443 deletions
diff --git a/devel/RStudio/Makefile b/devel/RStudio/Makefile index 0bd285b912d2..e54a35222f4f 100644 --- a/devel/RStudio/Makefile +++ b/devel/RStudio/Makefile @@ -28,8 +28,8 @@ LIB_DEPENDS= libR.so:math/R \ libinotify.so:devel/libinotify \ libuuid.so:misc/e2fsprogs-libuuid -USES= cmake:outsource desktop-file-utils fortran pkgconfig shared-mime-info ssl -USE_QT5= core dbus gui location network opengl printsupport qml quick sensors \ +USES= cmake:outsource desktop-file-utils fortran pkgconfig qt:5 shared-mime-info ssl +USE_QT= core dbus gui location network opengl printsupport qml quick sensors \ sql svg webchannel webengine webkit widgets xml xmlpatterns buildtools_build qmake_build USE_JAVA= yes JAVA_BUILD= yes diff --git a/devel/ace/Makefile b/devel/ace/Makefile index 89f6f9681b01..aed55fc03569 100644 --- a/devel/ace/Makefile +++ b/devel/ace/Makefile @@ -46,7 +46,8 @@ OPTIONS_SUB= yes FLTK_DESC= FLTK GUI toolkit FLTK_LIB_DEPENDS= libfltk.so:x11-toolkits/fltk FLTK_MAKE_ENV= fl=1 -QT4_USE= QT4=corelib,gui,moc_build +QT4_USES= qt:4 +QT4_USE= QT=corelib,gui,moc_build QT4_MAKE_ENV= qt=1 qt4=1 QTDIR="${PREFIX}" QT4_CPPFLAGS= -I${QT_INCDIR} QT4_LDFLAGS= -L${QT_LIBDIR} diff --git a/devel/apiextractor/Makefile b/devel/apiextractor/Makefile index 6ee5f97c7ee2..136140ea247e 100644 --- a/devel/apiextractor/Makefile +++ b/devel/apiextractor/Makefile @@ -17,9 +17,9 @@ USE_GITHUB= yes GH_ACCOUNT= PySide GH_PROJECT= Apiextractor -USES= cmake +USES= cmake qt:4 USE_GNOME= libxml2 libxslt -USE_QT4= gui moc_build qmake_build qtestlib_build \ +USE_QT= gui moc_build qmake_build qtestlib_build \ rcc_build uic_build xml xmlpatterns USE_LDCONFIG= yes diff --git a/devel/apitrace/Makefile b/devel/apitrace/Makefile index a2f3883c35bc..2ebf4919d40c 100644 --- a/devel/apitrace/Makefile +++ b/devel/apitrace/Makefile @@ -24,7 +24,8 @@ OPTIONS_DEFAULT= QT5 OPTIONS_SUB= yes QT5_CMAKE_BOOL= ENABLE_GUI -QT5_USE= qt5=core,gui,network,widgets,buildtools_build,qmake_build +QT5_USES= qt:5 +QT5_USE= qt=core,gui,network,widgets,buildtools_build,qmake_build post-install: ${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt diff --git a/devel/automoc4/Makefile b/devel/automoc4/Makefile index 15d3f8a0ce2a..e30f42f3a5fb 100644 --- a/devel/automoc4/Makefile +++ b/devel/automoc4/Makefile @@ -11,7 +11,7 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Automatic moc for Qt 4 packages -USE_QT4= corelib moc qmake_build rcc_build uic_build -USES= cmake tar:bzip2 +USE_QT= corelib moc qmake_build rcc_build uic_build +USES= cmake qt:4 tar:bzip2 .include <bsd.port.mk> diff --git a/devel/cervisia-kde4/Makefile b/devel/cervisia-kde4/Makefile index 93f379e7b375..816a7cc6d8da 100644 --- a/devel/cervisia-kde4/Makefile +++ b/devel/cervisia-kde4/Makefile @@ -8,8 +8,8 @@ CATEGORIES= devel kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= CVS Frontend for KDE -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/devel/cervisia/Makefile b/devel/cervisia/Makefile index 513720982ffb..5691a815de28 100644 --- a/devel/cervisia/Makefile +++ b/devel/cervisia/Makefile @@ -7,10 +7,10 @@ CATEGORIES= devel kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= CVS Frontend for KDE -USES= cmake:outsource gettext kde:5 tar:xz +USES= cmake:outsource gettext kde:5 qt:5 tar:xz USE_KDE= dbusaddons doctools ecm iconthemes init itemviews kdesu \ notifications parts widgetsaddons -USE_QT5= core dbus gui widgets \ +USE_QT= core dbus gui widgets \ buildtools_build qmake_build .include <bsd.port.mk> diff --git a/devel/cmake-doc/Makefile b/devel/cmake-doc/Makefile index b5f89c7d4b2f..af5c2c65422f 100644 --- a/devel/cmake-doc/Makefile +++ b/devel/cmake-doc/Makefile @@ -17,8 +17,8 @@ BUILD_DEPENDS= sphinx-build:textproc/py-sphinx DISTINFO_FILE= ${.CURDIR}/../cmake/distinfo NO_ARCH= yes -USES= cmake:outsource -USE_QT5= help_build +USES= cmake:outsource qt:5 +USE_QT= help_build CMAKE_OFF= SPHINX_MAN CMAKE_ON= SPHINX_HTML SPHINX_QTHELP diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile index 942fb15197dc..35473fdc5f05 100644 --- a/devel/cmake-gui/Makefile +++ b/devel/cmake-gui/Makefile @@ -19,9 +19,9 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libuv.so:devel/libuv \ librhash.so:security/rhash -USE_QT5= core gui widgets buildtools_build qmake_build +USE_QT= core gui widgets buildtools_build qmake_build USES= cmake:run desktop-file-utils libarchive \ - shared-mime-info + qt:5 shared-mime-info CMAKE_OFF= BUILD_CursesDialog \ CMake_SPHINX_DEPEND_ON_EXECUTABLES CMAKE_ON= BUILD_QtDialog \ diff --git a/devel/codequery/Makefile b/devel/codequery/Makefile index ffefda493b19..93a8e65cfe99 100644 --- a/devel/codequery/Makefile +++ b/devel/codequery/Makefile @@ -14,12 +14,12 @@ LICENSE_COMB= multi LICENSE_FILE_MPL20= ${WRKSRC}/LICENSE.md LICENSE_FILE_MIT= ${WRKSRC}/querylib/README.txt -USES= cmake compiler:c++11-lang ninja sqlite +USES= cmake compiler:c++11-lang ninja qt:4 sqlite USE_GITHUB= yes GH_ACCOUNT= ruben2020 -USE_QT4= linguisttools_build moc_build rcc_build uic_build \ +USE_QT= linguisttools_build moc_build rcc_build uic_build \ corelib gui qmake xml PLIST_FILES= bin/codequery \ diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile index 7835ff6dbfce..ffb076ad49c9 100644 --- a/devel/cppcheck/Makefile +++ b/devel/cppcheck/Makefile @@ -21,7 +21,8 @@ COMMENT= Static analysis of C/C++ code (GUI) RUN_DEPENDS= cppcheck:devel/cppcheck CMAKE_ARGS= -DBUILD_GUI=TRUE -USE_QT5= core gui widgets printsupport qmake_build buildtools_build linguisttools_build +USES+= qt:5 +USE_QT= core gui widgets printsupport qmake_build buildtools_build linguisttools_build BUILD_WRKSRC= ${WRKSRC}/gui INSTALL_WRKSRC= ${WRKSRC}/gui diff --git a/devel/dolphin-plugins-kde4/Makefile b/devel/dolphin-plugins-kde4/Makefile index 495e3f382b48..4e89eeef2de2 100644 --- a/devel/dolphin-plugins-kde4/Makefile +++ b/devel/dolphin-plugins-kde4/Makefile @@ -8,8 +8,8 @@ CATEGORIES= devel kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= Plugins for Dolphin file manager -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs libkonq automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/devel/dolphin-plugins/Makefile b/devel/dolphin-plugins/Makefile index 8c9f1ab6b08c..420c57209111 100644 --- a/devel/dolphin-plugins/Makefile +++ b/devel/dolphin-plugins/Makefile @@ -10,13 +10,13 @@ COMMENT= Plugins for Dolphin file manager BUILD_DEPENDS= dolphin:x11-fm/dolphin RUN_DEPENDS= dolphin:x11-fm/dolphin -USES= cmake:outsource gettext kde:5 tar:xz +USES= cmake:outsource gettext kde:5 qt:5 tar:xz USE_KDE= auth bookmarks codecs completion config configwidgets \ coreaddons crash guiaddons i18n iconthemes itemviews jobwidgets \ kdelibs4support kio notifications parts service solid sonnet \ texteditor textwidgets unitconversion widgetsaddons \ windowsystem xmlgui -USE_QT5= core dbus gui network printsupport widgets xml \ +USE_QT= core dbus gui network printsupport widgets xml \ buildtools_build qmake_build .include <bsd.port.mk> diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index de198bdcb1be..28340d3bd462 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -50,11 +50,13 @@ GRAPHVIZ_RUN_DEPENDS= dot:graphics/graphviz LATEX_USE= TEX=base,dvipsk,pdftex -QT4_USE= QT4=corelib,gui,xml,qmake_build,moc_build,rcc_build,uic_build +QT4_USES= qt:4 +QT4_USE= QT=corelib,gui,xml,qmake_build,moc_build,rcc_build,uic_build QT4_CMAKE_ON= -Dbuild_wizard:BOOLEAN=true -Dforce_qt4:BOOLEAN=true QT4_PLIST_FILES= bin/doxywizard -QT5_USE= QT5=core,widgets,gui,xml,qmake_build,buildtools_build +QT5_USES= qt:5 +QT5_USE= QT=core,widgets,gui,xml,qmake_build,buildtools_build QT5_CMAKE_ON= -Dbuild_wizard:BOOLEAN=true QT5_PLIST_FILES= bin/doxywizard diff --git a/devel/edb/Makefile b/devel/edb/Makefile index 79736b328d2d..459845b88484 100644 --- a/devel/edb/Makefile +++ b/devel/edb/Makefile @@ -14,8 +14,8 @@ LICENSE= GPLv2 LIB_DEPENDS= libboost_thread.so:devel/boost-libs -USES= qmake tar:tgz -USE_QT4= gui network xml moc_build rcc_build uic_build +USES= qmake qt:4 tar:tgz +USE_QT= gui network xml moc_build rcc_build uic_build QMAKE_ARGS= DEFAULT_PLUGIN_PATH="${PREFIX}/libexec/${PORTNAME}" WRKSRC= ${WRKDIR}/debugger diff --git a/devel/fuel/Makefile b/devel/fuel/Makefile index 307f60912e22..196e62adae8e 100644 --- a/devel/fuel/Makefile +++ b/devel/fuel/Makefile @@ -19,8 +19,10 @@ OPTIONS_SINGLE_GUI= QT4 QT5 OPTIONS_DEFAULT= QT5 USES= qmake shebangfix -QT4_USE= QT4=corelib,gui,webkit,linguisttools_build,moc_build,rcc_build,uic_build -QT5_USE= QT5=core,gui,network,webkit,widgets,buildtools_build,linguisttools_build +QT4_USES= qt:4 +QT4_USE= QT=corelib,gui,webkit,linguisttools_build,moc_build,rcc_build,uic_build +QT5_USES= qt:5 +QT5_USE= QT=core,gui,network,webkit,widgets,buildtools_build,linguisttools_build SHEBANG_FILES= intl/convert.sh PLIST_FILES= bin/fuel share/applications/fuel.desktop \ diff --git a/devel/gecode/Makefile b/devel/gecode/Makefile index 904cf7077739..9cb737dcd310 100644 --- a/devel/gecode/Makefile +++ b/devel/gecode/Makefile @@ -46,7 +46,8 @@ OPTIONS_DEFINE= GIST OPTIONS_SUB= yes GIST_DESC= Interactive Search Tool (requires Qt) -GIST_USE= QT4=corelib,gui,moc_build,qmake_build +GIST_USES= qt:4 +GIST_USE= QT=corelib,gui,moc_build,qmake_build GIST_CONFIGURE_ON= --enable-gist --enable-qt GIST_CONFIGURE_OFF= --disable-gist --disable-qt diff --git a/devel/generatorrunner/Makefile b/devel/generatorrunner/Makefile index 62fd691679c8..c9b25798a806 100644 --- a/devel/generatorrunner/Makefile +++ b/devel/generatorrunner/Makefile @@ -16,9 +16,9 @@ LIB_DEPENDS= libapiextractor.so:devel/apiextractor PLIST_SUB= PORTVERSION=${PORTVERSION} -USE_QT4= gui qmake_build qtestlib moc_build rcc_build uic_build xml +USE_QT= gui qmake_build qtestlib moc_build rcc_build uic_build xml -USES= cmake +USES= cmake qt:4 USE_GITHUB= yes USE_LDCONFIG= yes diff --git a/devel/grantlee/Makefile b/devel/grantlee/Makefile index e85161967560..39037ecb5d0c 100644 --- a/devel/grantlee/Makefile +++ b/devel/grantlee/Makefile @@ -15,9 +15,9 @@ LICENSE= LGPL21 PORTSCOUT= limit:^0\. -USE_QT4= corelib gui qtestlib_build script \ +USE_QT= corelib gui qtestlib_build script \ qmake_build moc_build rcc_build uic_build -USES= cmake:outsource grantlee:4,selfbuild +USES= cmake:outsource grantlee:4,selfbuild qt:4 CMAKE_ARGS+= -DBUILD_TESTS:BOOL=FALSE USE_LDCONFIG= yes diff --git a/devel/grantlee5/Makefile b/devel/grantlee5/Makefile index 38bca3da48e9..2bfd1c0ba151 100644 --- a/devel/grantlee5/Makefile +++ b/devel/grantlee5/Makefile @@ -15,8 +15,8 @@ LICENSE= LGPL21 PORTSCOUT= limit:^5\. -USE_QT5= buildtools_build core gui qmake_build script -USES= cmake:outsource compiler:c++11-lib grantlee:5,selfbuild +USE_QT= buildtools_build core gui qmake_build script +USES= cmake:outsource compiler:c++11-lib grantlee:5,selfbuild qt:5 CMAKE_ARGS+= -DBUILD_TESTS:BOOL=FALSE USE_LDCONFIG= yes diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile index 6c6175e4d43b..d471a3e04614 100644 --- a/devel/gwenhywfar/Makefile +++ b/devel/gwenhywfar/Makefile @@ -59,17 +59,17 @@ USE_GNOME+= cairo gdkpixbuf2 gtk20 . elif ${SLAVEPORT}=="gtk3" USE_GNOME+= cairo gdkpixbuf2 gtk30 . elif ${SLAVEPORT}=="qt4" -USE_QT4= corelib gui moc_build uic_build -QT_NONSTANDARD= yes +USES+= qmake:no_env qt:4 +USE_QT= corelib gui moc_build uic_build CONFIGURE_ARGS+=--with-qt4-includes=${QT_INCDIR} \ --with-qt4-libs=${QT_LIBDIR} \ --with-qt4-moc=${MOC} \ --with-qt4-uic=${UIC} . elif ${SLAVEPORT}=="qt5" +USES+= qmake:no_env qt:5 USE_GL= gl -USE_QT5= core gui widgets \ +USE_QT= core gui widgets \ buildtools_build qmake_build -QT_NONSTANDARD= yes CONFIGURE_ARGS+=--with-qt5-qmake=${QMAKE} \ --with-qt5-moc=${MOC} \ --with-qt5-uic=${UIC} diff --git a/devel/heimdall/Makefile b/devel/heimdall/Makefile index 4631b84cefe1..daddf86273fa 100644 --- a/devel/heimdall/Makefile +++ b/devel/heimdall/Makefile @@ -19,7 +19,8 @@ OPTIONS_DEFINE= DOCS GUI OPTIONS_DEFAULT=GUI OPTIONS_SUB= yes -GUI_USE= QT5=buildtools_build,core,gui,qmake_build,widgets +GUI_USES= qt:5 +GUI_USE= QT=buildtools_build,core,gui,qmake_build,widgets GUI_CMAKE_OFF= -DDISABLE_FRONTEND=YES GH_ACCOUNT= Benjamin-Dobell diff --git a/devel/injeqt/Makefile b/devel/injeqt/Makefile index 453536027192..2645c2d102c8 100644 --- a/devel/injeqt/Makefile +++ b/devel/injeqt/Makefile @@ -15,8 +15,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes GH_ACCOUNT= vogel -USES= cmake compiler:c++11-lib pathfix -USE_QT5= core buildtools_build qmake_build testlib_build +USES= cmake compiler:c++11-lib pathfix qt:5 +USE_QT= core buildtools_build qmake_build testlib_build USE_LDCONFIG= yes CMAKE_ARGS= -DDISABLE_EXAMPLES:BOOL=ON \ diff --git a/devel/kapptemplate-kde4/Makefile b/devel/kapptemplate-kde4/Makefile index 77b8e0eaf96f..06839e1dd2bc 100644 --- a/devel/kapptemplate-kde4/Makefile +++ b/devel/kapptemplate-kde4/Makefile @@ -8,9 +8,9 @@ CATEGORIES= devel kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= KDE template generator -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build \ +USE_QT= moc_build qmake_build rcc_build uic_build \ corelib dbus declarative .include <bsd.port.mk> diff --git a/devel/kapptemplate/Makefile b/devel/kapptemplate/Makefile index 588771687567..c5504a4f2ca0 100644 --- a/devel/kapptemplate/Makefile +++ b/devel/kapptemplate/Makefile @@ -10,10 +10,10 @@ COMMENT= KDE template generator BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \ docbook-xml>0:textproc/docbook-xml -USES= cmake:outsource gettext kde:5 tar:xz +USES= cmake:outsource gettext kde:5 qt:5 tar:xz USE_KDE= auth archive codecs completion config configwidgets coreaddons \ doctools ecm i18n jobwidgets kio newstuff service widgetsaddons -USE_QT5= core gui network testlib widgets xml \ +USE_QT= core gui network testlib widgets xml \ buildtools_build qmake_build .include <bsd.port.mk> diff --git a/devel/kaptain/Makefile b/devel/kaptain/Makefile index 09ba35669fa5..1325edbfce4a 100644 --- a/devel/kaptain/Makefile +++ b/devel/kaptain/Makefile @@ -12,8 +12,8 @@ COMMENT= Tool for building/running Qt GUIs for command line programs LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= qmake tar:tgz -USE_QT4= qt3support moc_build +USES= qmake qt:4 tar:tgz +USE_QT= qt3support moc_build INFO= kaptain PORTDOCS= * diff --git a/devel/kcachegrind-kde4/Makefile b/devel/kcachegrind-kde4/Makefile index 14d291c82494..47d380042488 100644 --- a/devel/kcachegrind-kde4/Makefile +++ b/devel/kcachegrind-kde4/Makefile @@ -9,9 +9,9 @@ CATEGORIES= devel kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= Profiler frontend for KDE -USES= cmake:outsource kde:4 python:run tar:xz shebangfix +USES= cmake:outsource kde:4 python:run qt:4 tar:xz shebangfix USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build \ +USE_QT= moc_build qmake_build rcc_build uic_build \ corelib dbus gui SHEBANG_FILES= converters/op2calltree converters/dprof2calltree \ converters/memprof2calltree \ diff --git a/devel/kcachegrind/Makefile b/devel/kcachegrind/Makefile index dd48e795b30e..d3ccc6416c65 100644 --- a/devel/kcachegrind/Makefile +++ b/devel/kcachegrind/Makefile @@ -7,11 +7,11 @@ CATEGORIES= devel kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= Profiler frontend for KDE -USES= cmake:outsource kde:5 python:run shebangfix tar:xz +USES= cmake:outsource kde:5 python:run qt:5 shebangfix tar:xz USE_KDE= archive auth bookmarks codecs completion config configwidgets \ coreaddons ecm i18n itemviews jobwidgets kio service solid \ widgetsaddons xmlgui -USE_QT5= core dbus gui network widgets xml \ +USE_QT= core dbus gui network widgets xml \ buildtools_build qmake_build SHEBANG_FILES= converters/hotshot2calltree.cmake \ diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile index d4eab7ff834f..38af022ec439 100644 --- a/devel/kdbg/Makefile +++ b/devel/kdbg/Makefile @@ -12,9 +12,9 @@ COMMENT= Graphical user interface around gdb using KDE LICENSE= GPLv2 -USES= cmake kde:4 +USES= cmake kde:4 qt:4 USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build network xml dbus corelib gui svg +USE_QT= moc_build qmake_build rcc_build uic_build network xml dbus corelib gui svg INSTALLS_ICONS= yes OPTIONS_DEFINE= NLS diff --git a/devel/kde-dev-scripts-kde4/Makefile b/devel/kde-dev-scripts-kde4/Makefile index bf88ecf561ba..883209a1ff3b 100644 --- a/devel/kde-dev-scripts-kde4/Makefile +++ b/devel/kde-dev-scripts-kde4/Makefile @@ -8,9 +8,9 @@ CATEGORIES= devel kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= KDE development scripts -USES= cmake:outsource kde:4 python:run shebangfix tar:xz +USES= cmake:outsource kde:4 python:run qt:4 shebangfix tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build SHEBANG_FILES= cxxmetric \ draw_lib_dependencies \ diff --git a/devel/kde-dev-scripts/Makefile b/devel/kde-dev-scripts/Makefile index 78e12fa1de9a..3199d8b1567e 100644 --- a/devel/kde-dev-scripts/Makefile +++ b/devel/kde-dev-scripts/Makefile @@ -7,9 +7,9 @@ CATEGORIES= devel kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE development scripts -USES= cmake:outsource kde:5 perl5 python:run shebangfix tar:xz +USES= cmake:outsource kde:5 perl5 python:run qt:5 shebangfix tar:xz USE_KDE= doctools ecm -USE_QT5= buildtools_build qmake_build +USE_QT= buildtools_build qmake_build SHEBANG_FILES= cxxmetric \ draw_lib_dependencies \ diff --git a/devel/kde-dev-utils-kde4/Makefile b/devel/kde-dev-utils-kde4/Makefile index 3e8db9097bb0..d36a7dd2843b 100644 --- a/devel/kde-dev-utils-kde4/Makefile +++ b/devel/kde-dev-utils-kde4/Makefile @@ -8,9 +8,9 @@ CATEGORIES= devel kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= KDE development utilities -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build \ +USE_QT= moc_build qmake_build rcc_build uic_build \ corelib designer gui qt3support xml .include <bsd.port.mk> diff --git a/devel/kde-dev-utils/Makefile b/devel/kde-dev-utils/Makefile index cf213fcf1096..387135580419 100644 --- a/devel/kde-dev-utils/Makefile +++ b/devel/kde-dev-utils/Makefile @@ -7,11 +7,11 @@ CATEGORIES= devel kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE development utilities -USES= cmake:outsource kde:5 tar:xz +USES= cmake:outsource kde:5 qt:5 tar:xz USE_KDE= auth bookmarks codecs completion config configwidgets \ coreaddons ecm i18n itemviews jobwidgets kio parts service \ solid sonnet textwidgets widgetsaddons xmlgui -USE_QT5= core dbus designer gui network widgets xml \ +USE_QT= core dbus designer gui network widgets xml \ buildtools_build qmake_build .include <bsd.port.mk> diff --git a/devel/kdesdk-kioslaves-kde4/Makefile b/devel/kdesdk-kioslaves-kde4/Makefile index 4ca111d6d86b..262b98f9fbe9 100644 --- a/devel/kdesdk-kioslaves-kde4/Makefile +++ b/devel/kdesdk-kioslaves-kde4/Makefile @@ -11,9 +11,9 @@ COMMENT= SDK related KIO slaves LIB_DEPENDS= libsvn_client-1.so:devel/subversion -USES= cmake:outsource kde:4 perl5 shebangfix tar:xz +USES= cmake:outsource kde:4 perl5 qt:4 shebangfix tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build SHEBANG_FILES= perldoc/pod2html.pl diff --git a/devel/kdesdk-strigi-analyzers-kde4/Makefile b/devel/kdesdk-strigi-analyzers-kde4/Makefile index c1d25cf68a36..7ca4f9dbff4b 100644 --- a/devel/kdesdk-strigi-analyzers-kde4/Makefile +++ b/devel/kdesdk-strigi-analyzers-kde4/Makefile @@ -9,8 +9,8 @@ PKGNAMESUFFIX= -kde4 MAINTAINER= kde@FreeBSD.org COMMENT= Strigi analyzers for SDK related file formats -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 strigi -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/devel/kdesdk-thumbnailers-kde4/Makefile b/devel/kdesdk-thumbnailers-kde4/Makefile index cd7bcf798deb..9a1a29b0cfca 100644 --- a/devel/kdesdk-thumbnailers-kde4/Makefile +++ b/devel/kdesdk-thumbnailers-kde4/Makefile @@ -9,8 +9,8 @@ PKGNAMESUFFIX= -kde4 MAINTAINER= kde@FreeBSD.org COMMENT= KDE thumbnail generator for gettext po files -USES= cmake:outsource gettext kde:4 tar:xz +USES= cmake:outsource gettext kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/devel/kdesdk-thumbnailers/Makefile b/devel/kdesdk-thumbnailers/Makefile index 1cf1c76650aa..403cfebe21c6 100644 --- a/devel/kdesdk-thumbnailers/Makefile +++ b/devel/kdesdk-thumbnailers/Makefile @@ -7,9 +7,9 @@ CATEGORIES= devel kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE thumbnail generator for gettext po files -USES= cmake:outsource gettext kde:5 tar:xz +USES= cmake:outsource gettext kde:5 qt:5 tar:xz USE_KDE= config ecm i18n kio -USE_QT5= core gui widgets \ +USE_QT= core gui widgets \ buildtools_build qmake_build .include <bsd.port.mk> diff --git a/devel/kdesdk/Makefile b/devel/kdesdk/Makefile index d91ad6584e75..dea801ab2eea 100644 --- a/devel/kdesdk/Makefile +++ b/devel/kdesdk/Makefile @@ -7,8 +7,8 @@ CATEGORIES= devel kde MAINTAINER= kde@FreeBSD.org COMMENT= KDE Software Development Kit -USES= kde:5 metaport -USE_QT5= # +USES= kde:5 metaport qt:5 +USE_QT= # OPTIONS_DEFINE= CERVISIA \ DEVUTILS \ @@ -24,7 +24,7 @@ OPTIONS_DEFINE= CERVISIA \ THUMBNAILER \ UMBRELLO -# Remove dolphin from the default list, as it conflicts with the metaport x11/kde4 +# Remove dolphin from the default list, as it conflicts with the metaport qt:5 x11/kde4 OPTIONS_DEFAULT= ${OPTIONS_DEFINE:NDOLPHIN} CERVISIA_DESC= CVS frontend diff --git a/devel/kdesvn-kde4/Makefile b/devel/kdesvn-kde4/Makefile index 5f65a2ba5af4..af9654b66424 100644 --- a/devel/kdesvn-kde4/Makefile +++ b/devel/kdesvn-kde4/Makefile @@ -25,10 +25,10 @@ CONFLICTS= kdesvn-2.* \ CMAKE_ARGS+= -DSUBVERSION_INCLUDE_DIR=${LOCALBASE}/include/subversion-1 \ -DMAN_INSTALL_DIR=${MANPREFIX}/man -USES= cmake:outsource compiler:c11 bdb kde:4 tar:xz +USES= cmake:outsource compiler:c11 bdb kde:4 qt:4 tar:xz USE_KDE= automoc4 kdelibs soprano baseapps_run USE_LDCONFIG= yes -USE_QT4= corelib gui xml network dbus svg sql \ +USE_QT= corelib gui xml network dbus svg sql \ qmake_build moc_build rcc_build uic_build linguist_build OPTIONS_DEFINE= DOCS NLS diff --git a/devel/kdesvn/Makefile b/devel/kdesvn/Makefile index 19b90d6190e3..eed4668c48bb 100644 --- a/devel/kdesvn/Makefile +++ b/devel/kdesvn/Makefile @@ -20,12 +20,12 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 \ CONFLICTS_INSTALL= kdesvn-kde4 \ qsvn-[0-9]* -USES= bdb cmake:outsource kde:5 tar:xz +USES= bdb cmake:outsource kde:5 qt:5 tar:xz USE_KDE= auth bookmarks codecs completion config configwidgets \ coreaddons dbusaddons ecm i18n iconthemes itemviews jobwidgets \ kio notifications parts service sonnet texteditor textwidgets \ wallet widgetsaddons xmlgui -USE_QT5= concurrent core dbus gui network sql widgets xml \ +USE_QT= concurrent core dbus gui network sql widgets xml \ buildtools_build qmake_build post-patch: diff --git a/devel/kdev-php/Makefile b/devel/kdev-php/Makefile index c3d42f7ac40b..29cb81577a97 100644 --- a/devel/kdev-php/Makefile +++ b/devel/kdev-php/Makefile @@ -12,11 +12,11 @@ COMMENT= PHP support for KDevelop BUILD_DEPENDS= kdev-pg-qt:devel/kdevelop-pg-qt LIB_DEPENDS= libkdevcmakecommon.so:devel/kdevelop -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= auth codecs completion config configwidgets coreaddons ecm \ i18n itemmodels jobwidgets kcmutils kio parts service sonnet \ texteditor textwidgets threadweaver widgetsaddons xmlgui -USE_QT5= concurrent core dbus gui network webkit widgets xml \ +USE_QT= concurrent core dbus gui network webkit widgets xml \ buildtools_build qmake_build # Does not build with jobs. diff --git a/devel/kdev-python/Makefile b/devel/kdev-python/Makefile index 2b8651efd63b..7a3d53d037c9 100644 --- a/devel/kdev-python/Makefile +++ b/devel/kdev-python/Makefile @@ -12,11 +12,11 @@ COMMENT= Python support for KDevelop BUILD_DEPENDS= kdev-pg-qt:devel/kdevelop-pg-qt LIB_DEPENDS= libkdevcmakecommon.so:devel/kdevelop -USES= cmake:outsource compiler:c++11-lib kde:5 python:3.4+ tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 python:3.4+ qt:5 tar:xz USE_KDE= attica auth codecs completion config configwidgets coreaddons \ ecm i18n itemmodels jobwidgets kio newstuff parts service \ sonnet texteditor textwidgets threadweaver widgetsaddons xmlgui -USE_QT5= concurrent core dbus gui network widgets xml \ +USE_QT= concurrent core dbus gui network widgets xml \ buildtools_build qmake_build # Does not build with jobs. diff --git a/devel/kdevelop-kde4/Makefile b/devel/kdevelop-kde4/Makefile index ae6c518a0ea4..e361316304e5 100644 --- a/devel/kdevelop-kde4/Makefile +++ b/devel/kdevelop-kde4/Makefile @@ -16,9 +16,9 @@ LIB_DEPENDS= libkdevplatforminterfaces.so:devel/kdevplatform-kde4 RUN_DEPENDS= gmake:devel/gmake USES= cmake:outsource compiler:c++11-lib kde:4 \ - shared-mime-info tar:xz + qt:4 shared-mime-info tar:xz USE_KDE= kdelibs workspace automoc4 -USE_QT4= qmake_build moc_build uic_build rcc_build \ +USE_QT= qmake_build moc_build uic_build rcc_build \ corelib declarative gui help script webkit xml OPTIONS_DEFINE= OKTETA PHP NLS diff --git a/devel/kdevelop-pg-qt-kde4/Makefile b/devel/kdevelop-pg-qt-kde4/Makefile index cbc2cdc064da..145d3ace364a 100644 --- a/devel/kdevelop-pg-qt-kde4/Makefile +++ b/devel/kdevelop-pg-qt-kde4/Makefile @@ -14,8 +14,8 @@ COMMENT= Parser-generator from KDevplatform BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex -USES= bison cmake:outsource compiler:c++11-lib kde:4 tar:bzip2 +USES= bison cmake:outsource compiler:c++11-lib kde:4 qt:4 tar:bzip2 USE_KDE= automoc4 kdelibs -USE_QT4= qmake_build moc_build uic_build rcc_build +USE_QT= qmake_build moc_build uic_build rcc_build .include <bsd.port.mk> diff --git a/devel/kdevelop-pg-qt/Makefile b/devel/kdevelop-pg-qt/Makefile index a76b29560cd0..5c021fbda600 100644 --- a/devel/kdevelop-pg-qt/Makefile +++ b/devel/kdevelop-pg-qt/Makefile @@ -15,9 +15,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING.LIB BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex -USES= bison cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= bison cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= ecm -USE_QT5= core testlib \ +USE_QT= core testlib \ buildtools_build qmake_build CONFLICTS= kdevelop-pg-qt-1.0* diff --git a/devel/kdevelop-php-docs-kde4/Makefile b/devel/kdevelop-php-docs-kde4/Makefile index 79ccaa6a69fe..92b6baf044a5 100644 --- a/devel/kdevelop-php-docs-kde4/Makefile +++ b/devel/kdevelop-php-docs-kde4/Makefile @@ -13,9 +13,9 @@ COMMENT= PHP documentation for KDevelop LIB_DEPENDS= libkdevplatforminterfaces.so:devel/kdevplatform-kde4 -USES= cmake:outsource compiler:c++11-lib kde:4 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build webkit +USE_QT= moc_build qmake_build rcc_build uic_build webkit OPTIONS_DEFINE= NLS OPTIONS_SUB= yes diff --git a/devel/kdevelop-php-kde4/Makefile b/devel/kdevelop-php-kde4/Makefile index 6c8acbab7a73..8a54c98aa4d7 100644 --- a/devel/kdevelop-php-kde4/Makefile +++ b/devel/kdevelop-php-kde4/Makefile @@ -14,9 +14,9 @@ COMMENT= PHP support for KDevelop LIB_DEPENDS= libkdevplatforminterfaces.so:devel/kdevplatform-kde4 BUILD_DEPENDS= ${KDE_PREFIX}/bin/kdev-pg-qt:devel/kdevelop-pg-qt-kde4 -USES= cmake:outsource compiler:c++11-lib kde:4 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= PHPDOCS NLS diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 2c06c48f8cba..c6c695a18aca 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= libkasten3controllers.so:devel/okteta \ RUN_DEPENDS= gmake:devel/gmake USES= cmake:outsource compiler:c++11-lib desktop-file-utils \ - gettext grantlee:5 kde:5 shared-mime-info shebangfix tar:xz + gettext grantlee:5 kde:5 qt:5 shared-mime-info shebangfix tar:xz USE_KDE= archive attica auth bookmarks codecs completion config configwidgets \ coreaddons crash guiaddons emoticons i18n iconthemes init \ itemmodels itemviews jobwidgets kcmutils kdeclarative \ @@ -30,7 +30,7 @@ USE_KDE= archive attica auth bookmarks codecs completion config configwidgets \ notifyconfig package parts plasma-framework \ runner service solid sonnet texteditor textwidgets threadweaver \ widgetsaddons windowsystem xmlgui -USE_QT5= concurrent core dbus gui help network qml quick \ +USE_QT= concurrent core dbus gui help network qml quick \ script sql widgets xml buildtools_build qmake_build CONFLICTS= kdevelop-kde4-4* kdevelop-4* kdevplatform-kde4-4* kdevplatform-4* SHEBANG_FILES= kdevplatform/util/kdevplatform_shell_environment.sh \ @@ -38,8 +38,9 @@ SHEBANG_FILES= kdevplatform/util/kdevplatform_shell_environment.sh \ OPTIONS_DEFINE= WEBENGINE WEBENGINE_DESC= Use WebEngine as help reader -WEBENGINE_USE= QT5=location,webchannel,webengine -WEBENGINE_USE_OFF= QT5=webkit +WEBENGINE_USES= qt:5 +WEBENGINE_USE= QT=location,webchannel,webengine +WEBENGINE_USE_OFF= QT=webkit WEBENGINE_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets:BOOL=TRUE SHEBANG_LANG= zsh diff --git a/devel/kdevplatform-kde4/Makefile b/devel/kdevplatform-kde4/Makefile index 654da2207c2a..a2c9fe5236e3 100644 --- a/devel/kdevplatform-kde4/Makefile +++ b/devel/kdevplatform-kde4/Makefile @@ -16,10 +16,10 @@ LIB_DEPENDS= libsvn_client-1.so:devel/subversion \ libboost_thread.so:devel/boost-libs \ libqjson.so:devel/qjson@qt4 -USES= cmake:outsource compiler:c++11-lib grantlee:4 kde:4 shebangfix \ +USES= cmake:outsource compiler:c++11-lib grantlee:4 kde:4 qt:4 shebangfix \ tar:xz USE_KDE= kate_run kdelibs automoc4 -USE_QT4= qmake_build moc_build uic_build rcc_build \ +USE_QT= qmake_build moc_build uic_build rcc_build \ corelib designer_build gui webkit USE_LDCONFIG= yes diff --git a/devel/kf5-extra-cmake-modules/Makefile b/devel/kf5-extra-cmake-modules/Makefile index 3e982e0b0224..01e16ed6dff4 100644 --- a/devel/kf5-extra-cmake-modules/Makefile +++ b/devel/kf5-extra-cmake-modules/Makefile @@ -11,11 +11,13 @@ COMMENT= Extra modules and scripts for CMake LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING-CMAKE-SCRIPTS -USES= cmake:outsource kde:5 tar:xz -USE_QT5= # +USES= cmake:outsource kde:5 qt:5 tar:xz +USE_QT= # -HELP_USE= QT5=help_build # qt5-help is only used to build a .qch file. -TEST_USE= QT5=buildtools_build,linguisttools_build,qmake_build +HELP_USES= qt:5 +HELP_USE= QT=help_build # qt5-help is only used to build a .qch file. +TEST_USES= qt:5 +TEST_USE= QT=buildtools_build,linguisttools_build,qmake_build NO_ARCH= yes ## options diff --git a/devel/kf5-kapidox/Makefile b/devel/kf5-kapidox/Makefile index 31e6a853281d..ff61fdd73485 100644 --- a/devel/kf5-kapidox/Makefile +++ b/devel/kf5-kapidox/Makefile @@ -10,9 +10,9 @@ COMMENT= KF5 API Documentation Tools LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cmake:outsource kde:5 python tar:xz +USES= cmake:outsource kde:5 python qt:5 tar:xz USE_KDE= archive ecm -USE_QT5= buildtools_build qmake_build +USE_QT= buildtools_build qmake_build USE_PYTHON= py3kplist NO_ARCH= yes diff --git a/devel/kf5-kauth/Makefile b/devel/kf5-kauth/Makefile index 7e4e215ade64..065b3f1aecfc 100644 --- a/devel/kf5-kauth/Makefile +++ b/devel/kf5-kauth/Makefile @@ -9,9 +9,9 @@ COMMENT= KF5 abstraction to system policy and authentication features LIB_DEPENDS= libpolkit-qt5-core-1.so:sysutils/polkit-qt@qt5 -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= coreaddons ecm -USE_QT5= buildtools_build core dbus gui linguisttools qmake_build \ +USE_QT= buildtools_build core dbus gui linguisttools qmake_build \ widgets .include <bsd.port.mk> diff --git a/devel/kf5-kbookmarks/Makefile b/devel/kf5-kbookmarks/Makefile index 0a51ae88df9e..969e8236e957 100644 --- a/devel/kf5-kbookmarks/Makefile +++ b/devel/kf5-kbookmarks/Makefile @@ -7,10 +7,10 @@ CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 library for bookmarks and the XBEL format -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= auth codecs config configwidgets coreaddons ecm \ iconthemes widgetsaddons xmlgui -USE_QT5= buildtools_build core dbus gui linguisttools \ +USE_QT= buildtools_build core dbus gui linguisttools \ qmake_build widgets xml .include <bsd.port.mk> diff --git a/devel/kf5-kcmutils/Makefile b/devel/kf5-kcmutils/Makefile index 2b308cfdd928..c914f8a33498 100644 --- a/devel/kf5-kcmutils/Makefile +++ b/devel/kf5-kcmutils/Makefile @@ -7,11 +7,11 @@ CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 utilities for working with KCModules -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= auth codecs config configwidgets coreaddons ecm i18n \ iconthemes itemviews kdeclarative package service \ widgetsaddons xmlgui -USE_QT5= buildtools_build core dbus gui network qmake_build \ +USE_QT= buildtools_build core dbus gui network qmake_build \ qml quick widgets xml .include <bsd.port.mk> diff --git a/devel/kf5-kconfig/Makefile b/devel/kf5-kconfig/Makefile index 3e0b0f3e739c..ba44f7fde53c 100644 --- a/devel/kf5-kconfig/Makefile +++ b/devel/kf5-kconfig/Makefile @@ -11,9 +11,9 @@ COMMENT= KF5 widgets for configuration dialogs LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING.LIB -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build concurrent core gui linguisttools \ +USE_QT= buildtools_build concurrent core gui linguisttools \ qmake_build testlib xml .include <bsd.port.mk> diff --git a/devel/kf5-kcoreaddons/Makefile b/devel/kf5-kcoreaddons/Makefile index 2909efbc3e83..5b003d2040b7 100644 --- a/devel/kf5-kcoreaddons/Makefile +++ b/devel/kf5-kcoreaddons/Makefile @@ -12,9 +12,9 @@ LICENSE_COMB= multi LICENSE_FILE_LGPL21+= ${WRKSRC}/COPYING.LIB LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/COPYING-CMAKE-SCRIPTS -USES= cmake:outsource compiler:c++11-lib kde:5 shared-mime-info tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 shared-mime-info tar:xz USE_KDE= ecm -USE_QT5= buildtools_build core linguisttools qmake_build +USE_QT= buildtools_build core linguisttools qmake_build OPTIONS_DEFINE= FAM INOTIFY OPTIONS_DEFAULT= INOTIFY diff --git a/devel/kf5-kcrash/Makefile b/devel/kf5-kcrash/Makefile index 34ddf8ba28a3..87604d8267b0 100644 --- a/devel/kf5-kcrash/Makefile +++ b/devel/kf5-kcrash/Makefile @@ -7,9 +7,9 @@ CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 library to handle crash analysis and bug report from apps -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= coreaddons ecm windowsystem -USE_QT5= buildtools_build core gui qmake_build widgets x11extras +USE_QT= buildtools_build core gui qmake_build widgets x11extras USE_XORG= ice sm x11 xext .include <bsd.port.mk> diff --git a/devel/kf5-kdbusaddons/Makefile b/devel/kf5-kdbusaddons/Makefile index d8856daeace0..f1be588b1544 100644 --- a/devel/kf5-kdbusaddons/Makefile +++ b/devel/kf5-kdbusaddons/Makefile @@ -10,9 +10,9 @@ COMMENT= KF5 addons to QtDBus LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING.LIB -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build core dbus gui linguisttools \ +USE_QT= buildtools_build core dbus gui linguisttools \ qmake_build testlib x11extras .include <bsd.port.mk> diff --git a/devel/kf5-kdeclarative/Makefile b/devel/kf5-kdeclarative/Makefile index 990964c6091a..729192ecc1a2 100644 --- a/devel/kf5-kdeclarative/Makefile +++ b/devel/kf5-kdeclarative/Makefile @@ -10,11 +10,11 @@ COMMENT= KF5 library providing integration of QML and KDE Frameworks LIB_DEPENDS= libepoxy.so:graphics/libepoxy USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig \ - tar:xz + qt:5 tar:xz USE_KDE= completion config coreaddons globalaccel guiaddons i18n \ iconthemes jobwidgets kio package service widgetsaddons \ windowsystem -USE_QT5= buildtools_build core dbus gui network qmake_build qml \ +USE_QT= buildtools_build core dbus gui network qmake_build qml \ quick testlib widgets xml .include <bsd.port.mk> diff --git a/devel/kf5-kdoctools/Makefile b/devel/kf5-kdoctools/Makefile index bfe8e5e24808..068fc398478e 100644 --- a/devel/kf5-kdoctools/Makefile +++ b/devel/kf5-kdoctools/Makefile @@ -13,9 +13,9 @@ BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook- RUN_DEPENDS= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \ docbook-xml>0:textproc/docbook-xml -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_GNOME= libxml2 libxslt USE_KDE= archive ecm i18n -USE_QT5= buildtools_build core qmake_build +USE_QT= buildtools_build core qmake_build .include <bsd.port.mk> diff --git a/devel/kf5-kfilemetadata/Makefile b/devel/kf5-kfilemetadata/Makefile index 946cd3f9d10f..8ed68b399d94 100644 --- a/devel/kf5-kfilemetadata/Makefile +++ b/devel/kf5-kfilemetadata/Makefile @@ -15,9 +15,9 @@ LIB_DEPENDS= libavutil.so:multimedia/ffmpeg \ # TODO: maybe depend on textproc/catdoc USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig \ - tar:xz + qt:5 tar:xz USE_KDE= archive ecm i18n -USE_QT5= buildtools_build core qmake_build xml +USE_QT= buildtools_build core qmake_build xml # Frameworks ports install localization files that conflict with some # KDE4 localization ports diff --git a/devel/kf5-ki18n/Makefile b/devel/kf5-ki18n/Makefile index 2f6c46410060..2daaf318fd53 100644 --- a/devel/kf5-ki18n/Makefile +++ b/devel/kf5-ki18n/Makefile @@ -8,8 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 advanced internationalization framework USES= cmake:outsource compiler:c++11-lib gettext-runtime \ - gettext-tools:build,run kde:5 tar:xz + gettext-tools:build,run kde:5 qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build concurrent core qmake_build qml script testlib +USE_QT= buildtools_build concurrent core qmake_build qml script testlib .include <bsd.port.mk> diff --git a/devel/kf5-kidletime/Makefile b/devel/kf5-kidletime/Makefile index 99a01a885556..60cb1f1fb79f 100644 --- a/devel/kf5-kidletime/Makefile +++ b/devel/kf5-kidletime/Makefile @@ -7,9 +7,9 @@ CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 library for monitoring user activity -USES= cmake:outsource compiler:c++11-lib kde:5 pkgconfig tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 pkgconfig qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build core dbus gui qmake_build widgets x11extras +USE_QT= buildtools_build core dbus gui qmake_build widgets x11extras USE_XORG= ice sm x11 xext xcb xscrnsaver .include <bsd.port.mk> diff --git a/devel/kf5-kio/Makefile b/devel/kf5-kio/Makefile index 12fff228365d..6c1e819e6067 100644 --- a/devel/kf5-kio/Makefile +++ b/devel/kf5-kio/Makefile @@ -8,14 +8,14 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 resource and network access abstraction USES= cmake:outsource compiler:c++11-lib desktop-file-utils \ - gettext kde:5 ssl tar:xz + gettext kde:5 qt:5 ssl tar:xz USE_GNOME= libxml2 libxslt USE_KDE= archive auth bookmarks codecs completion config \ configwidgets coreaddons dbusaddons doctools ecm \ i18n iconthemes itemviews jobwidgets \ notifications service solid sonnet textwidgets wallet \ widgetsaddons windowsystem xmlgui -USE_QT5= buildtools_build concurrent core dbus gui network \ +USE_QT= buildtools_build concurrent core dbus gui network \ qmake_build script widgets x11extras xml .include <bsd.port.mk> diff --git a/devel/kf5-kitemmodels/Makefile b/devel/kf5-kitemmodels/Makefile index 977ce26b7152..61fc04e85fe3 100644 --- a/devel/kf5-kitemmodels/Makefile +++ b/devel/kf5-kitemmodels/Makefile @@ -7,8 +7,8 @@ CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 models for Qt Model/View system -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build core qmake_build testlib_build +USE_QT= buildtools_build core qmake_build testlib_build .include <bsd.port.mk> diff --git a/devel/kf5-knewstuff/Makefile b/devel/kf5-knewstuff/Makefile index 85f6e8b85156..dfde8d3a8dea 100644 --- a/devel/kf5-knewstuff/Makefile +++ b/devel/kf5-knewstuff/Makefile @@ -7,12 +7,12 @@ CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 library for downloading application assets from the network -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= archive attica5 auth codecs completion config \ configwidgets coreaddons ecm i18n iconthemes itemviews \ jobwidgets kio service sonnet textwidgets widgetsaddons \ xmlgui -USE_QT5= buildtools_build core dbus gui network qmake_build \ +USE_QT= buildtools_build core dbus gui network qmake_build \ quick widgets xml .include <bsd.port.mk> diff --git a/devel/kf5-knotifications/Makefile b/devel/kf5-knotifications/Makefile index 19d844d43beb..6228e87977c3 100644 --- a/devel/kf5-knotifications/Makefile +++ b/devel/kf5-knotifications/Makefile @@ -10,9 +10,9 @@ COMMENT= KF5 abstraction for system notifications LIB_DEPENDS= libdbusmenu-qt5.so:devel/libdbusmenu-qt@qt5 -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= codecs config coreaddons ecm windowsystem -USE_QT5= buildtools_build core dbus gui linguisttools phonon4 \ +USE_QT= buildtools_build core dbus gui linguisttools phonon4 \ qmake_build widgets x11extras USE_XORG= x11 diff --git a/devel/kf5-knotifyconfig/Makefile b/devel/kf5-knotifyconfig/Makefile index f185256ac337..bbd8aaa339d3 100644 --- a/devel/kf5-knotifyconfig/Makefile +++ b/devel/kf5-knotifyconfig/Makefile @@ -8,10 +8,10 @@ CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 configuration system for KNotify -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= completion config coreaddons ecm i18n jobwidgets kio \ service widgetsaddons -USE_QT5= buildtools_build core dbus gui network phonon4 \ +USE_QT= buildtools_build core dbus gui network phonon4 \ qmake_build widgets .include <bsd.port.mk> diff --git a/devel/kf5-kpackage/Makefile b/devel/kf5-kpackage/Makefile index ae6637c67144..984ecb0c27b7 100644 --- a/devel/kf5-kpackage/Makefile +++ b/devel/kf5-kpackage/Makefile @@ -7,8 +7,8 @@ CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 library to load and install packages -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= archive config coreaddons doctools ecm i18n -USE_QT5= buildtools_build core qmake_build xml +USE_QT= buildtools_build core qmake_build xml .include <bsd.port.mk> diff --git a/devel/kf5-kparts/Makefile b/devel/kf5-kparts/Makefile index 792122c6c54b..c806d1d1cb0c 100644 --- a/devel/kf5-kparts/Makefile +++ b/devel/kf5-kparts/Makefile @@ -7,11 +7,11 @@ CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 document centric plugin system -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= auth codecs completion config configwidgets coreaddons \ i18n iconthemes jobwidgets kio notifications service \ sonnet textwidgets widgetsaddons xmlgui -USE_QT5= buildtools_build core dbus gui network qmake_build widgets \ +USE_QT= buildtools_build core dbus gui network qmake_build widgets \ xml .include <bsd.port.mk> diff --git a/devel/kf5-kpeople/Makefile b/devel/kf5-kpeople/Makefile index 2239844aefa8..da09ffe02c61 100644 --- a/devel/kf5-kpeople/Makefile +++ b/devel/kf5-kpeople/Makefile @@ -7,9 +7,9 @@ CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 library providing access to contacts -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= config coreaddons ecm i18n itemviews service widgetsaddons -USE_QT5= buildtools_build core dbus gui network qmake_build qml \ +USE_QT= buildtools_build core dbus gui network qmake_build qml \ sql widgets .include <bsd.port.mk> diff --git a/devel/kf5-kpty/Makefile b/devel/kf5-kpty/Makefile index ea5f61135b15..f860cff7213c 100644 --- a/devel/kf5-kpty/Makefile +++ b/devel/kf5-kpty/Makefile @@ -7,8 +7,8 @@ CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 pty abstraction -USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= coreaddons ecm i18n -USE_QT5= buildtools_build core qmake_build +USE_QT= buildtools_build core qmake_build .include <bsd.port.mk> diff --git a/devel/kf5-kservice/Makefile b/devel/kf5-kservice/Makefile index c7c750203b40..58442539c6ac 100644 --- a/devel/kf5-kservice/Makefile +++ b/devel/kf5-kservice/Makefile @@ -7,10 +7,10 @@ CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 advanced plugin and service introspection -USES= bison cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz +USES= bison cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz USE_KDE= archive config coreaddons crash dbusaddons \ doctools ecm i18n -USE_QT5= buildtools_build core dbus gui qmake_build xml +USE_QT= buildtools_build core dbus gui qmake_build xml # Make the applications.menu file not conflict with KDE4. CMAKE_ARGS= -DAPPLICATIONS_MENU_NAME:STRING="kf5-applications.menu" diff --git a/devel/kf5-ktexteditor/Makefile b/devel/kf5-ktexteditor/Makefile index b4f88769ab3e..e4200d9c4d02 100644 --- a/devel/kf5-ktexteditor/Makefile +++ b/devel/kf5-ktexteditor/Makefile @@ -9,12 +9,12 @@ COMMENT= KF5 advanced embeddable text editor LIB_DEPENDS= libgit2.so:devel/libgit2 -USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig qt:5 tar:xz USE_KDE= archive auth codecs completion config configwidgets \ coreaddons ecm guiaddons i18n iconthemes itemviews \ jobwidgets kio parts service sonnet syntaxhighlighting \ textwidgets widgetsaddons xmlgui -USE_QT5= buildtools_build core dbus gui network printsupport \ +USE_QT= buildtools_build core dbus gui network printsupport \ qmake_build script widgets xml xmlpatterns .include <bsd.port.mk> diff --git a/devel/kf5-kunitconversion/Makefile b/devel/kf5-kunitconversion/Makefile index 14628281632e..904e7fde972f 100644 --- a/devel/kf5-kunitconversion/Makefile +++ b/devel/kf5-kunitconversion/Makefile @@ -7,8 +7,8 @@ CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 library for unit conversion -USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig qt:5 tar:xz USE_KDE= ecm i18n -USE_QT5= buildtools_build core network qmake_build xml +USE_QT= buildtools_build core network qmake_build xml .include <bsd.port.mk> diff --git a/devel/kf5-solid/Makefile b/devel/kf5-solid/Makefile index 556fd25e0f20..31ce8441290b 100644 --- a/devel/kf5-solid/Makefile +++ b/devel/kf5-solid/Makefile @@ -7,9 +7,9 @@ CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 hardware integration and detection -USES= bison cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= bison cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build concurrent core dbus gui linguisttools \ +USE_QT= buildtools_build concurrent core dbus gui linguisttools \ network qmake_build qml testlib widgets xml OPTIONS_DEFINE= BSDISKS diff --git a/devel/kf5-threadweaver/Makefile b/devel/kf5-threadweaver/Makefile index fc597a6f4d9a..c2ed6a13583d 100644 --- a/devel/kf5-threadweaver/Makefile +++ b/devel/kf5-threadweaver/Makefile @@ -7,8 +7,8 @@ CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 addons to QtDBus -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= ecm -USE_QT5= buildtools_build core network qmake_build testlib widgets xml +USE_QT= buildtools_build core network qmake_build testlib widgets xml .include <bsd.port.mk> diff --git a/devel/kio-extras/Makefile b/devel/kio-extras/Makefile index 05b8e961ce60..03f09b696528 100644 --- a/devel/kio-extras/Makefile +++ b/devel/kio-extras/Makefile @@ -12,14 +12,14 @@ LIB_DEPENDS= libtag.so:audio/taglib \ libHalf.so:graphics/ilmbase USES= cmake:outsource compiler:c++11-lib gettext gperf kde:5 \ - pkgconfig shared-mime-info shebangfix tar:xz + pkgconfig qt:5 shared-mime-info shebangfix tar:xz USE_KDE= activities archive auth bookmarks codecs completion config \ configwidgets coreaddons crash dbusaddons dnssd doctools ecm \ emoticons guiaddons i18n iconthemes init itemmodels itemviews \ jobwidgets js kdelibs4support khtml kio notifications parts \ pty service solid sonnet textwidgets unitconversion \ widgetsaddons windowsystem xmlgui -USE_QT5= core dbus gui location network phonon4 printsupport qml quick \ +USE_QT= core dbus gui location network phonon4 printsupport qml quick \ sql svg testlib webchannel widgets xml \ buildtools_build qmake_build SHEBANG_FILES= info/kde-info2html @@ -59,7 +59,8 @@ TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib WEBENGINE_DESC= Needed to build the html thumbnailer WEBENGINE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidget -WEBENGINE_USE= QT5=webengine +WEBENGINE_USES= qt:5 +WEBENGINE_USE= QT=webengine .include <bsd.port.mk> diff --git a/devel/libdbusmenu-qt/Makefile b/devel/libdbusmenu-qt/Makefile index ec371ef3f0ff..be2487409429 100644 --- a/devel/libdbusmenu-qt/Makefile +++ b/devel/libdbusmenu-qt/Makefile @@ -22,13 +22,15 @@ USES= compiler:c++11-lib cmake:outsource USE_LDCONFIG= yes . if ${FLAVOR} == qt4 -USE_QT4= corelib dbus gui \ +USES+= qt:4 +USE_QT= corelib dbus gui \ moc_build qmake_build rcc_build uic_build CMAKE_ON= USE_QT4 CMAKE_OFF= USE_QT5 QTVER_SUFFIX= # empty . else -USE_QT5= core dbus gui widgets \ +USES+= qt:5 +USE_QT= core dbus gui widgets \ buildtools_build qmake_build CMAKE_ON= USE_QT5 CMAKE_OFF= USE_QT4 diff --git a/devel/libkgapi-kde4/Makefile b/devel/libkgapi-kde4/Makefile index 6b54cc04780f..3bbf3feb7896 100644 --- a/devel/libkgapi-kde4/Makefile +++ b/devel/libkgapi-kde4/Makefile @@ -15,10 +15,10 @@ LICENSE= GPLv2 LIB_DEPENDS= libqjson.so:devel/qjson@qt4 -USES= cmake:outsource kde:4 tar:bzip2 +USES= cmake:outsource kde:4 qt:4 tar:bzip2 USE_KDE= automoc4 kdelibs pimlibs USE_LDCONFIG= yes -USE_QT4= corelib network webkit xml \ +USE_QT= corelib network webkit xml \ qmake_build moc_build rcc_build uic_build PLIST_SUB+= PORTVERSION=${PORTVERSION} diff --git a/devel/libkolab/Makefile b/devel/libkolab/Makefile index 100505fd8063..577876b3bb81 100644 --- a/devel/libkolab/Makefile +++ b/devel/libkolab/Makefile @@ -25,10 +25,10 @@ CMAKE_ARGS= -DBUILD_TESTS:BOOL=OFF \ -DPHP_BINDINGS:BOOL=OFF \ -DPYTHON_BINDINGS:BOOL=OFF \ -DUSE_LIBCALENDARING:BOOL=OFF -USES= cmake:outsource kde:4 +USES= cmake:outsource kde:4 qt:4 USE_KDE= automoc4 kdelibs pimlibs USE_LDCONFIG= yes -USE_QT4= corelib dbus gui network svg xml \ +USE_QT= corelib dbus gui network svg xml \ moc_build qmake_build rcc_build uic_build # Fix build of desktuils/kdepim4-runtime: CXXFLAGS+= -DMAKE_KOLAB_LIB diff --git a/devel/liblxqt-l10n/Makefile b/devel/liblxqt-l10n/Makefile index c15381c11919..01df41b3249e 100644 --- a/devel/liblxqt-l10n/Makefile +++ b/devel/liblxqt-l10n/Makefile @@ -17,8 +17,8 @@ DISTINFO_FILE= ${MASTERDIR}/distinfo DESCR= ${MASTERDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist -USES= cmake:outsource lxqt pkgconfig tar:xz -USE_QT5= buildtools_build qmake_build linguisttools +USES= cmake:outsource lxqt pkgconfig qt:5 tar:xz +USE_QT= buildtools_build qmake_build linguisttools USE_LXQT= buildtools CMAKE_ARGS+= -DWITH_COMPTON_CONF:BOOL=OFF \ diff --git a/devel/liblxqt/Makefile b/devel/liblxqt/Makefile index bf7cd77f29ea..d904943a7b62 100644 --- a/devel/liblxqt/Makefile +++ b/devel/liblxqt/Makefile @@ -15,8 +15,8 @@ LIB_DEPENDS= libpolkit-qt5-core-1.so:sysutils/polkit-qt@qt5 BROKEN_aarch64= fails to compile: lxqtplugininfo.cpp:107:14: expected expression USES= cmake:outsource compiler:c++11-lib gettext kde:5 lxqt \ - pkgconfig tar:xz -USE_QT5= buildtools_build qmake_build dbus core gui linguisttools \ + pkgconfig qt:5 tar:xz +USE_QT= buildtools_build qmake_build dbus core gui linguisttools \ svg widgets x11extras xml USE_KDE= windowsystem USE_LXQT= buildtools qtxdg diff --git a/devel/libqtxdg/Makefile b/devel/libqtxdg/Makefile index 918cfaa6a01c..90d56a2f29f4 100644 --- a/devel/libqtxdg/Makefile +++ b/devel/libqtxdg/Makefile @@ -11,9 +11,9 @@ COMMENT= Qt implementation of freedesktop.org xdg specs LICENSE= LGPL21+ -USES= cmake:outsource compiler:c++11-lib lxqt pkgconfig tar:xz +USES= cmake:outsource compiler:c++11-lib lxqt pkgconfig qt:5 tar:xz USE_LDCONFIG= yes -USE_QT5= buildtools_build qmake_build core dbus gui svg widgets \ - xml +USE_QT= buildtools_build qmake_build core dbus gui svg widgets \ + xml .include <bsd.port.mk> diff --git a/devel/liteide/Makefile b/devel/liteide/Makefile index b15ad8f8f4c0..a63e3a957339 100644 --- a/devel/liteide/Makefile +++ b/devel/liteide/Makefile @@ -31,8 +31,10 @@ OPTIONS_SUB= yes DEBUG_CONFIGURE_ENABLE= debug -QT4_USE= QT4=corelib,gui,network,webkit,xml,moc_build,rcc_build,uic_build -QT5_USE= QT5=core,gui,network,printsupport,widgets,xml,buildtools_build +QT4_USES= qt:4 +QT4_USE= QT=corelib,gui,network,webkit,xml,moc_build,rcc_build,uic_build +QT5_USES= qt:5 +QT5_USE= QT=core,gui,network,printsupport,widgets,xml,buildtools_build post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/applications diff --git a/devel/lokalize-kde4/Makefile b/devel/lokalize-kde4/Makefile index c842a9fdd0f5..04600dc42444 100644 --- a/devel/lokalize-kde4/Makefile +++ b/devel/lokalize-kde4/Makefile @@ -10,9 +10,9 @@ COMMENT= Computer-aided translation system LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build \ +USE_QT= moc_build qmake_build rcc_build uic_build \ sql .include <bsd.port.mk> diff --git a/devel/lokalize/Makefile b/devel/lokalize/Makefile index dd0ed398c8d2..0a6c123db363 100644 --- a/devel/lokalize/Makefile +++ b/devel/lokalize/Makefile @@ -9,12 +9,12 @@ COMMENT= Computer-aided translation system LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell -USES= cmake:outsource desktop-file-utils gettext kde:5 tar:xz +USES= cmake:outsource desktop-file-utils gettext kde:5 qt:5 tar:xz USE_KDE= auth bookmarks codecs completion config configwidgets \ coreaddons crash dbusaddons doctools ecm i18n itemviews \ jobwidgets kio kross notifications parts service solid sonnet \ textwidgets widgetsaddons xmlgui -USE_QT5= core dbus gui network script sql widgets xml \ +USE_QT= core dbus gui network script sql widgets xml \ buildtools_build qmake_build .include <bsd.port.mk> diff --git a/devel/lxqt-build-tools/Makefile b/devel/lxqt-build-tools/Makefile index 88265183c4b7..16cd28672563 100644 --- a/devel/lxqt-build-tools/Makefile +++ b/devel/lxqt-build-tools/Makefile @@ -12,8 +12,8 @@ COMMENT= Helpers CMake modules for LXQt LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/BSD-3-Clause -USES= cmake:outsource lxqt pkgconfig tar:xz -USE_QT5= qmake_build buildtools_build core +USES= cmake:outsource lxqt pkgconfig qt:5 tar:xz +USE_QT= qmake_build buildtools_build core USE_GNOME= glib20 .include <bsd.port.mk> diff --git a/devel/okteta-kde4/Makefile b/devel/okteta-kde4/Makefile index ee24108e8095..d4eadcdcde82 100644 --- a/devel/okteta-kde4/Makefile +++ b/devel/okteta-kde4/Makefile @@ -10,9 +10,9 @@ COMMENT= KDE hex editor LIB_DEPENDS= libqca.so:devel/qca@qt4 -USES= cmake:outsource kde:4 shared-mime-info tar:xz +USES= cmake:outsource kde:4 qt:4 shared-mime-info tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build \ +USE_QT= moc_build qmake_build rcc_build uic_build \ corelib designer gui script scripttools xml USE_LDCONFIG= yes diff --git a/devel/okteta/Makefile b/devel/okteta/Makefile index 202b853dbd6e..3b933bcbf755 100644 --- a/devel/okteta/Makefile +++ b/devel/okteta/Makefile @@ -9,13 +9,13 @@ COMMENT= KDE hex editor LIB_DEPENDS= libqca-qt5.so:devel/qca@qt5 -USES= cmake:outsource gettext kde:5 shared-mime-info tar:xz +USES= cmake:outsource gettext kde:5 qt:5 shared-mime-info tar:xz USE_KDE= attica auth bookmarks codecs completion crash \ config configwidgets coreaddons dbusaddons doctools \ ecm i18n iconthemes itemviews jobwidgets kcmutils kio \ newstuff parts service solid sonnet textwidgets \ widgetsaddons xmlgui -USE_QT5= core dbus designer gui network printsupport script scripttools \ +USE_QT= core dbus designer gui network printsupport script scripttools \ widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes diff --git a/devel/p5-perlkde-kde4/Makefile b/devel/p5-perlkde-kde4/Makefile index a22b43b620c9..b944917cbc16 100644 --- a/devel/p5-perlkde-kde4/Makefile +++ b/devel/p5-perlkde-kde4/Makefile @@ -9,9 +9,9 @@ PKGNAMEPREFIX= p5- MAINTAINER= kde@FreeBSD.org COMMENT= Perl bindings for KDE -USES= cmake:outsource compiler:c++11-lib kde:4 perl5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:4 perl5 qt:4 tar:xz USE_KDE= perlqt smokekde automoc4 -USE_QT4= network opengl sql svg xml \ +USE_QT= network opengl sql svg xml \ qmake_build moc_build uic_build rcc_build # Respect PREFIX diff --git a/devel/p5-perlqt-kde4/Makefile b/devel/p5-perlqt-kde4/Makefile index 4ae132f9bca9..323c340c0688 100644 --- a/devel/p5-perlqt-kde4/Makefile +++ b/devel/p5-perlqt-kde4/Makefile @@ -12,9 +12,9 @@ COMMENT= Perl bindings for Qt LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2 \ libqwt.so:x11-toolkits/qwt5 -USES= cmake:outsource kde:4 perl5 tar:xz +USES= cmake:outsource kde:4 perl5 qt:4 tar:xz USE_KDE= smokeqt qimageblitz -USE_QT4= corelib dbus gui network xml \ +USE_QT= corelib dbus gui network xml \ qmake_build moc_build uic_build rcc_build USE_CXXSTD= gnu++98 diff --git a/devel/piklab/Makefile b/devel/piklab/Makefile index d1cb0ac2ba29..bbe26be3943e 100644 --- a/devel/piklab/Makefile +++ b/devel/piklab/Makefile @@ -13,9 +13,9 @@ COMMENT= KDE/Qt IDE for microcontroller development LICENSE= GPLv2+ DOS2UNIX_FILES= cmake/Piklab.cmake -USE_QT4= corelib gui qt3support qtestlib xml \ +USE_QT= corelib gui qt3support qtestlib xml \ moc_build qmake_build rcc_build uic_build -USES= cmake gettext readline dos2unix tar:bzip2 +USES= cmake gettext qt:4 readline dos2unix tar:bzip2 USE_CXXSTD= gnu++98 OPTIONS_DEFINE= KDE4 diff --git a/devel/plasma5-khotkeys/Makefile b/devel/plasma5-khotkeys/Makefile index db5c58adf6a1..0ea9b5a0cc0c 100644 --- a/devel/plasma5-khotkeys/Makefile +++ b/devel/plasma5-khotkeys/Makefile @@ -7,14 +7,14 @@ CATEGORIES= devel kde kde-plasma MAINTAINER= kde@FreeBSD.org COMMENT= Plasma5 library for hotkeys -USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 qt:5 tar:xz USE_KDE= auth bookmarks codecs completion config configwidgets \ coreaddons crash dbusaddons ecm emoticons globalaccel \ guiaddons i18n iconthemes init itemmodels itemviews jobwidgets \ kcmutils kdelibs4support kio notifications parts \ plasma-framework plasma-workspace service solid sonnet \ textwidgets unitconversion widgetsaddons windowsystem xmlgui -USE_QT5= core dbus gui network printsupport widgets x11extras xml \ +USE_QT= core dbus gui network printsupport widgets x11extras xml \ buildtools_build qmake_build USE_XORG= x11 xtst diff --git a/devel/plasma5-kwrited/Makefile b/devel/plasma5-kwrited/Makefile index 2e203a9ed34f..a578c0691750 100644 --- a/devel/plasma5-kwrited/Makefile +++ b/devel/plasma5-kwrited/Makefile @@ -7,9 +7,9 @@ CATEGORIES= devel kde kde-plasma MAINTAINER= kde@FreeBSD.org COMMENT= Plasma5 daemon listening for wall and write messages -USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 qt:5 tar:xz USE_KDE= coreaddons dbusaddons ecm i18n notifications pty -USE_QT5= core dbus gui widgets \ +USE_QT= core dbus gui widgets \ buildtools_build qmake_build .include <bsd.port.mk> diff --git a/devel/plasma5-plasma-sdk/Makefile b/devel/plasma5-plasma-sdk/Makefile index e985fca9e032..f0baf1db56f9 100644 --- a/devel/plasma5-plasma-sdk/Makefile +++ b/devel/plasma5-plasma-sdk/Makefile @@ -7,13 +7,13 @@ CATEGORIES= devel kde kde-plasma MAINTAINER= kde@FreeBSD.org COMMENT= Plasma5 applications useful for Plasma development -USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 qt:5 tar:xz USE_KDE= archive attica auth codecs completion config configwidgets \ coreaddons dbusaddons ecm i18n iconthemes itemmodels \ jobwidgets kdeclarative kio kirigami2 newstuff package parts \ plasma-framework service sonnet texteditor textwidgets \ widgetsaddons windowsystem xmlgui -USE_QT5= concurrent core dbus gui network qml quick webkit widgets x11extras xml \ +USE_QT= concurrent core dbus gui network qml quick webkit widgets x11extras xml \ buildtools_build qmake_build .include <bsd.port.mk> diff --git a/devel/poxml-kde4/Makefile b/devel/poxml-kde4/Makefile index 79e8644aafe3..210e5290931d 100644 --- a/devel/poxml-kde4/Makefile +++ b/devel/poxml-kde4/Makefile @@ -10,9 +10,9 @@ COMMENT= Tools to translate Docbook XML using gettext BUILD_DEPENDS= ${LOCALBASE}/lib/libantlr.a:devel/antlr -USES= cmake:outsource gettext-tools:build,run kde:4 tar:xz +USES= cmake:outsource gettext-tools:build,run kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= moc_build qmake_build rcc_build uic_build \ +USE_QT= moc_build qmake_build rcc_build uic_build \ corelib xml .include <bsd.port.mk> diff --git a/devel/poxml/Makefile b/devel/poxml/Makefile index 3bfa7c6ca12b..236b9c996dec 100644 --- a/devel/poxml/Makefile +++ b/devel/poxml/Makefile @@ -7,9 +7,9 @@ CATEGORIES= devel kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= Tools to translate Docbook XML using gettext -USES= cmake:outsource gettext-tools:build,run kde:5 tar:xz +USES= cmake:outsource gettext-tools:build,run kde:5 qt:5 tar:xz USE_KDE= doctools ecm -USE_QT5= core xml \ +USE_QT= core xml \ buildtools_build qmake_build .include <bsd.port.mk> diff --git a/devel/py-krosspython-kde4/Makefile b/devel/py-krosspython-kde4/Makefile index 0126d17c6d57..8f6b51855041 100644 --- a/devel/py-krosspython-kde4/Makefile +++ b/devel/py-krosspython-kde4/Makefile @@ -10,9 +10,9 @@ DISTNAME= kross-interpreters-${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Kross Python scripting library -USES= cmake:outsource kde:4 python:2.7 tar:xz +USES= cmake:outsource kde:4 python:2.7 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= corelib gui qmake_build moc_build uic_build rcc_build +USE_QT= corelib gui qmake_build moc_build uic_build rcc_build CMAKE_ARGS+= -DBUILD_falcon:BOOL=FALSE \ -DBUILD_ruby:BOOL=FALSE \ -DBUILD_java:BOOL=FALSE diff --git a/devel/py-pykde4-kde4/Makefile b/devel/py-pykde4-kde4/Makefile index 6cec34596f94..4360485df442 100644 --- a/devel/py-pykde4-kde4/Makefile +++ b/devel/py-pykde4-kde4/Makefile @@ -11,14 +11,14 @@ COMMENT= Python bindings for KDE LIB_DEPENDS= libqwt.so:x11-toolkits/qwt5 -USES= cmake:outsource kde:4 python:2.7 pyqt:4 tar:xz +USES= cmake:outsource kde:4 python:2.7 pyqt:4 qt:4 tar:xz USE_KDE= kdelibs nepomuk-core okular pimlibs \ akonadi automoc4 soprano USE_PYQT= declarative designer gui network opengl phonon script sip \ sql svg webkit xml \ dbussupport_run USE_PYTHON= flavors -USE_QT4= corelib dbus designer_build gui network xml \ +USE_QT= corelib dbus designer_build gui network xml \ qmake_build moc_build uic_build rcc_build USE_CXXSTD= gnu++98 diff --git a/devel/py-pykdeuic4-kde4/Makefile b/devel/py-pykdeuic4-kde4/Makefile index 72d3df873003..5bd8f91f7c8e 100644 --- a/devel/py-pykdeuic4-kde4/Makefile +++ b/devel/py-pykdeuic4-kde4/Makefile @@ -10,9 +10,9 @@ DISTNAME= pykde4-${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Enhanced version of pyuic4 -USES= cmake:outsource python:2.7 kde:4 shebangfix tar:xz +USES= cmake:outsource python:2.7 kde:4 qt:4 shebangfix tar:xz USE_KDE= kdelibs automoc4 pykde4 -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build DISTINFO_FILE= ${.CURDIR:H:H}/devel/py-pykde4-kde4/distinfo NO_ARCH= yes diff --git a/devel/py-qt4-assistant/Makefile b/devel/py-qt4-assistant/Makefile index ec35f11399ef..bb153cf7b66b 100644 --- a/devel/py-qt4-assistant/Makefile +++ b/devel/py-qt4-assistant/Makefile @@ -12,10 +12,10 @@ COMMENT= Python bindings for the Qt4 toolkit, QtAssistant module CONFIGURE_ARGS= --enable QtAssistant PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run USE_PYTHON= flavors -USE_QT4= assistantclient corelib gui network \ +USE_QT= assistantclient corelib gui network \ moc_build qmake_build OPTIONS_DEFINE= API DEBUG diff --git a/devel/py-qt4-core/Makefile b/devel/py-qt4-core/Makefile index 6cdf8324c217..bb8306645d57 100644 --- a/devel/py-qt4-core/Makefile +++ b/devel/py-qt4-core/Makefile @@ -12,10 +12,10 @@ COMMENT= Python bindings for the Qt4 toolkit, QtCore module CONFIGURE_ARGS= --enable QtCore PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYTHON= py3kplist flavors USE_PYQT= sip -USE_QT4= corelib qmake_build moc_build +USE_QT= corelib qmake_build moc_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API diff --git a/devel/py-qt4-dbus/Makefile b/devel/py-qt4-dbus/Makefile index 2457651d8a59..84b0f7e70ffb 100644 --- a/devel/py-qt4-dbus/Makefile +++ b/devel/py-qt4-dbus/Makefile @@ -12,10 +12,10 @@ COMMENT= Python bindings for the Qt4 toolkit, QtDBus module CONFIGURE_ARGS= --enable QtDBus PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run USE_PYTHON= flavors -USE_QT4= corelib dbus moc_build qmake_build +USE_QT= corelib dbus moc_build qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API diff --git a/devel/py-qt4-dbussupport/Makefile b/devel/py-qt4-dbussupport/Makefile index 9991d92c2293..252b73543aef 100644 --- a/devel/py-qt4-dbussupport/Makefile +++ b/devel/py-qt4-dbussupport/Makefile @@ -12,10 +12,10 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${PY_FLAVOR} CONFIGURE_ARGS= --enable QtCore PYQT_DIST= yes -USES= pkgconfig python pyqt:4 +USES= pkgconfig python pyqt:4 qt:4 USE_PYQT= sip_build USE_PYTHON= flavors -USE_QT4= corelib qmake_build moc_build +USE_QT= corelib qmake_build moc_build OPTIONS_DEFINE= DEBUG DEBUG_CONFIGURE_ON= --debug --trace diff --git a/devel/py-qt4-declarative/Makefile b/devel/py-qt4-declarative/Makefile index 7676f1e9f576..d4fbde4d6786 100644 --- a/devel/py-qt4-declarative/Makefile +++ b/devel/py-qt4-declarative/Makefile @@ -10,10 +10,10 @@ COMMENT= Python bindings for the Qt4 toolkit, QtDeclarative module CONFIGURE_ARGS= --enable QtDeclarative PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run gui_run network_run USE_PYTHON= flavors -USE_QT4= corelib declarative gui network script sql svg xmlpatterns \ +USE_QT= corelib declarative gui network script sql svg xmlpatterns \ qmake_build moc_build OPTIONS_DEFINE= API DEBUG diff --git a/devel/py-qt4-designer/Makefile b/devel/py-qt4-designer/Makefile index c2a741eb9e5b..ae1d73a8f9ec 100644 --- a/devel/py-qt4-designer/Makefile +++ b/devel/py-qt4-designer/Makefile @@ -12,10 +12,10 @@ COMMENT= Python bindings for the Qt4 toolkit, QtDesigner module CONFIGURE_ARGS= --enable QtDesigner --no-designer-plugin PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run gui_run USE_PYTHON= flavors -USE_QT4= corelib designer gui moc_build qmake_build +USE_QT= corelib designer gui moc_build qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API diff --git a/devel/py-qt4-designerplugin/Makefile b/devel/py-qt4-designerplugin/Makefile index 50aee9ecbe0e..2f54b9127cc6 100644 --- a/devel/py-qt4-designerplugin/Makefile +++ b/devel/py-qt4-designerplugin/Makefile @@ -15,10 +15,10 @@ DESTDIRNAME= INSTALL_ROOT CONFIGURE_ARGS= --enable QtDesigner PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build USE_PYTHON= flavors -USE_QT4= corelib designer gui script xml moc_build qmake_build +USE_QT= corelib designer gui script xml moc_build qmake_build OPTIONS_DEFINE= DEBUG DEBUG_CONFIGURE_ON= --debug --trace diff --git a/devel/py-qt4-help/Makefile b/devel/py-qt4-help/Makefile index b729d349004b..cedbdb6c13aa 100644 --- a/devel/py-qt4-help/Makefile +++ b/devel/py-qt4-help/Makefile @@ -10,10 +10,10 @@ COMMENT= Python bindings for the Qt4 toolkit, QtHelp module CONFIGURE_ARGS= --enable QtHelp PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run gui_run USE_PYTHON= flavors -USE_QT4= corelib gui help network sql moc_build qmake_build +USE_QT= corelib gui help network sql moc_build qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API diff --git a/devel/py-qt4-qscintilla2/Makefile b/devel/py-qt4-qscintilla2/Makefile index fccb30668c37..883c892f15de 100644 --- a/devel/py-qt4-qscintilla2/Makefile +++ b/devel/py-qt4-qscintilla2/Makefile @@ -18,12 +18,11 @@ DISTINFO_FILE= ${.CURDIR:H}/qscintilla2/distinfo DESTDIRNAME= INSTALL_ROOT HAS_CONFIGURE= yes -QT_NONSTANDARD= yes # Do not add unknown arguments to CONFIGURE_ARGS. -USES= python pyqt:4 +USES= python pyqt:4 qmake:no_env qt:4 USE_PYQT= sip core gui USE_PYTHON= flavors -USE_QT4= corelib gui moc_build qmake_build +USE_QT= corelib gui moc_build qmake_build OPTIONS_DEFINE= DEBUG DEBUG_CONFIGURE_ON= --debug --trace diff --git a/devel/py-qt4-script/Makefile b/devel/py-qt4-script/Makefile index 6459c1b25a47..8e68e44faf2d 100644 --- a/devel/py-qt4-script/Makefile +++ b/devel/py-qt4-script/Makefile @@ -12,10 +12,10 @@ COMMENT= Python bindings for the Qt4 toolkit, QtScript module CONFIGURE_ARGS= --enable QtScript PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run USE_PYTHON= flavors -USE_QT4= corelib script moc_build qmake_build +USE_QT= corelib script moc_build qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API diff --git a/devel/py-qt4-scripttools/Makefile b/devel/py-qt4-scripttools/Makefile index d9bcbcfa4b81..7e2ee69866a5 100644 --- a/devel/py-qt4-scripttools/Makefile +++ b/devel/py-qt4-scripttools/Makefile @@ -11,10 +11,10 @@ COMMENT= Python bindings for the Qt4 toolkit, QtScriptTools module CONFIGURE_ARGS= --enable QtScriptTools PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run gui_run script_run USE_PYTHON= flavors -USE_QT4= corelib gui script scripttools moc_build qmake_build +USE_QT= corelib gui script scripttools moc_build qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API diff --git a/devel/py-qt4-test/Makefile b/devel/py-qt4-test/Makefile index 43767ce5fa0e..3c4f259b5ab0 100644 --- a/devel/py-qt4-test/Makefile +++ b/devel/py-qt4-test/Makefile @@ -12,10 +12,10 @@ COMMENT= Python bindings for the Qt4 toolkit, QtTest module CONFIGURE_ARGS= --enable QtTest PYQT_DIST= yes -USES= python pyqt:4 +USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run gui_run USE_PYTHON= flavors -USE_QT4= corelib gui qtestlib moc_build qmake_build +USE_QT= corelib gui qtestlib moc_build qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API diff --git a/devel/py-qt5-core/Makefile b/devel/py-qt5-core/Makefile index 5b5bce9b70b9..fe02893d8074 100644 --- a/devel/py-qt5-core/Makefile +++ b/devel/py-qt5-core/Makefile @@ -13,10 +13,10 @@ CONFIGURE_ARGS= ${PYQT5_MODULES_ALL:N${PYQT_MODULE}:C/.*/--disable=&/} \ PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_PYTHON= py3kplist flavors USE_PYQT= sip_build -USE_QT5= core buildtools_build qmake_build +USE_QT= core buildtools_build qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API diff --git a/devel/py-qt5-dbus/Makefile b/devel/py-qt5-dbus/Makefile index c9326092cefb..f1c18ab07bc2 100644 --- a/devel/py-qt5-dbus/Makefile +++ b/devel/py-qt5-dbus/Makefile @@ -10,10 +10,10 @@ COMMENT= Python bindings for the Qt5 toolkit, QtDBus module CONFIGURE_ARGS= --enable QtDBus PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_PYQT= sip_build core_run USE_PYTHON= flavors -USE_QT5= core dbus qmake_build +USE_QT= core dbus qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API diff --git a/devel/py-qt5-dbussupport/Makefile b/devel/py-qt5-dbussupport/Makefile index f138f23f2392..8738fe45dc19 100644 --- a/devel/py-qt5-dbussupport/Makefile +++ b/devel/py-qt5-dbussupport/Makefile @@ -13,10 +13,10 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${PY_FLAVOR} CONFIGURE_ARGS= --enable QtCore PYQT_DIST= yes -USES= pkgconfig python pyqt:5 +USES= pkgconfig python pyqt:5 qt:5 USE_PYQT= sip_build USE_PYTHON= flavors -USE_QT5= core buildtools_build qmake_build +USE_QT= core buildtools_build qmake_build OPTIONS_DEFINE= DEBUG DEBUG_CONFIGURE_ON= --debug --trace diff --git a/devel/py-qt5-designer/Makefile b/devel/py-qt5-designer/Makefile index d3b20db2fd6b..ad908599b27c 100644 --- a/devel/py-qt5-designer/Makefile +++ b/devel/py-qt5-designer/Makefile @@ -10,11 +10,11 @@ COMMENT= Python bindings for the Qt5 toolkit, QtDesigner module CONFIGURE_ARGS= --enable QtDesigner --no-designer-plugin PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_GL= yes USE_PYQT= sip_build core_run widgets_run USE_PYTHON= flavors -USE_QT5= core gui designer widgets xml \ +USE_QT= core gui designer widgets xml \ buildtools_build qmake_build OPTIONS_DEFINE= API DEBUG diff --git a/devel/py-qt5-designerplugin/Makefile b/devel/py-qt5-designerplugin/Makefile index 43177853f9bb..501d40859470 100644 --- a/devel/py-qt5-designerplugin/Makefile +++ b/devel/py-qt5-designerplugin/Makefile @@ -14,11 +14,11 @@ DESTDIRNAME= INSTALL_ROOT CONFIGURE_ARGS= --enable QtDesigner PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build USE_PYTHON= flavors -USE_QT5= core designer gui xml widgets \ +USE_QT= core designer gui xml widgets \ buildtools_build qmake_build OPTIONS_DEFINE= DEBUG diff --git a/devel/py-qt5-help/Makefile b/devel/py-qt5-help/Makefile index 8c43fb4a8c96..c6efcca910e3 100644 --- a/devel/py-qt5-help/Makefile +++ b/devel/py-qt5-help/Makefile @@ -10,11 +10,11 @@ COMMENT= Python bindings for the Qt5 toolkit, QtHelp module CONFIGURE_ARGS= --enable QtHelp PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build core_run widgets_run USE_PYTHON= flavors -USE_QT5= core gui widgets help network sql buildtools_build qmake_build xml +USE_QT= core gui widgets help network sql buildtools_build qmake_build xml OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API diff --git a/devel/py-qt5-qscintilla2/Makefile b/devel/py-qt5-qscintilla2/Makefile index ecfaf41be8eb..2ea48e6791b2 100644 --- a/devel/py-qt5-qscintilla2/Makefile +++ b/devel/py-qt5-qscintilla2/Makefile @@ -16,13 +16,12 @@ DISTINFO_FILE= ${.CURDIR:H}/qscintilla2-qt5/distinfo DESTDIRNAME= INSTALL_ROOT HAS_CONFIGURE= yes -QT_NONSTANDARD= yes # Do not add unknown arguments to CONFIGURE_ARGS. -USES= python pyqt:5 +USES= python pyqt:5 qmake:no_env qt:5 USE_GL= gl USE_PYQT= sip core gui printsupport widgets USE_PYTHON= flavors -USE_QT5= core gui printsupport widgets buildtools_build qmake_build +USE_QT= core gui printsupport widgets buildtools_build qmake_build OPTIONS_DEFINE= DEBUG DEBUG_CONFIGURE_ON= --debug --trace diff --git a/devel/py-qt5-test/Makefile b/devel/py-qt5-test/Makefile index 32af8c452575..fe8c71471e88 100644 --- a/devel/py-qt5-test/Makefile +++ b/devel/py-qt5-test/Makefile @@ -10,11 +10,11 @@ COMMENT= Python bindings for the Qt5 toolkit, QtTest module CONFIGURE_ARGS= --enable QtTest PYQT_DIST= yes -USES= python pyqt:5 +USES= python pyqt:5 qt:5 USE_GL= gl USE_PYQT= sip_build core_run widgets_run USE_PYTHON= flavors -USE_QT5= core gui testlib widgets \ +USE_QT= core gui testlib widgets \ buildtools_build qmake_build OPTIONS_DEFINE= API DEBUG diff --git a/devel/pyside-tools/Makefile b/devel/pyside-tools/Makefile index 37807d155ba7..d3dba5174aca 100644 --- a/devel/pyside-tools/Makefile +++ b/devel/pyside-tools/Makefile @@ -21,8 +21,8 @@ USE_GITHUB= yes GH_ACCOUNT= PySide GH_PROJECT= Tools -USES= cmake python:2.7 shebangfix +USES= cmake python:2.7 qt:4 shebangfix SHEBANG_FILES= pyside-uic pysideuic/icon_cache.py -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/devel/pyside/Makefile b/devel/pyside/Makefile index bb170fe6e9df..9b1c41c10c7d 100644 --- a/devel/pyside/Makefile +++ b/devel/pyside/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= libapiextractor.so:devel/apiextractor \ CMAKE_ARGS+= -DGL_H:FILEPATH="${LOCALBASE}/include/GL/gl.h" \ -DGL_INCLUDE_DIR:FILEPATH="${LOCALBASE}/include" -USE_QT4= declarative designer gui help qmake_build \ +USE_QT= declarative designer gui help qmake_build \ moc_build multimedia network opengl \ phonon rcc_build script scripttools \ svg uic_build webkit @@ -29,7 +29,7 @@ USE_QT4= declarative designer gui help qmake_build \ PLIST_SUB= PORTVERSION=${PORTVERSION} \ PYTHON_VERSION=${PYTHON_VERSION} -USES= cmake python:2.7 tar:bzip2 +USES= cmake python:2.7 qt:4 tar:bzip2 USE_PYTHON= flavors USE_LDCONFIG= yes diff --git a/devel/qbs/Makefile b/devel/qbs/Makefile index a97891b9a228..629cd04c9544 100644 --- a/devel/qbs/Makefile +++ b/devel/qbs/Makefile @@ -14,10 +14,10 @@ COMMENT= Qbs Build Suite LICENSE= GPLv3 LGPL21 LICENSE_COMB= dual -USES= compiler:c++11-lib python:run qmake:outsource shebangfix +USES= compiler:c++11-lib python:run qmake:outsource qt:5 shebangfix USE_GL= gl USE_LDCONFIG= yes -USE_QT5= buildtools_build core concurrent gui network script testlib \ +USE_QT= buildtools_build core concurrent gui network script testlib \ widgets xml SHEBANG_FILES= src/3rdparty/python/bin/dmgbuild @@ -27,7 +27,8 @@ QMAKE_ARGS= CONFIG+=qbs_disable_rpath \ QMAKE_SOURCE_PATH= ${WRKSRC}/qbs.pro OPTIONS_DEFINE= DOCS -DOCS_USE= QT5=help_build,qdoc_build,sql-sqlite3_build +DOCS_USES= qt:5 +DOCS_USE= QT=help_build,qdoc_build,sql-sqlite3_build OPTIONS_DEFAULT= ${OPTIONS_DEFINE} ALL_TARGET= all diff --git a/devel/qbzr/Makefile b/devel/qbzr/Makefile index 9b983ee814e4..2e42cb6e2fe6 100644 --- a/devel/qbzr/Makefile +++ b/devel/qbzr/Makefile @@ -20,10 +20,10 @@ RUN_DEPENDS= bzr:devel/bzr WRKSRC= ${WRKDIR}/${PORTNAME} -USES= gettext pyqt:4 python:2.7 +USES= gettext pyqt:4 python:2.7 qt:4 USE_PYQT= core USE_PYTHON= distutils autoplist -USE_QT4= # empty +USE_QT= # empty INSTALLS_ICONS= yes .include <bsd.port.mk> diff --git a/devel/qca/Makefile b/devel/qca/Makefile index 59593e368e00..30dd88fd2740 100644 --- a/devel/qca/Makefile +++ b/devel/qca/Makefile @@ -27,10 +27,12 @@ USE_LDCONFIG= yes . if ${FLAVOR} == qt4 CMAKE_ON= QT4_BUILD -USE_QT4= corelib moc_build qmake_build rcc_build +USES+= qt:4 +USE_QT= corelib moc_build qmake_build rcc_build . else CMAKE_ARGS+= -DQCA_SUFFIX=qt5 -USE_QT5= core buildtools_build qmake_build +USES+= qt:5 +USE_QT= core buildtools_build qmake_build . endif qt4_PLIST= ${.CURDIR}/pkg-plist.qt4 qt5_PLIST= ${.CURDIR}/pkg-plist.qt5 diff --git a/devel/qconf/Makefile b/devel/qconf/Makefile index fbd5ebac542d..b49a261a29ec 100644 --- a/devel/qconf/Makefile +++ b/devel/qconf/Makefile @@ -12,10 +12,9 @@ COMMENT= Tool to create configure script for qmake-based project LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= tar:bzip2 -USE_QT4= corelib xml moc_build qmake_build rcc_build +USES= qmake:no_env qt:4 tar:bzip2 +USE_QT= corelib xml moc_build qmake_build rcc_build HAS_CONFIGURE= yes -QT_NONSTANDARD= yes MAKE_ARGS= INSTALL_ROOT="${STAGEDIR}" CONFIGURE_ARGS= --prefix=${PREFIX} \ diff --git a/devel/qdevelop/Makefile b/devel/qdevelop/Makefile index cbe374e116ae..15c9e73fc581 100644 --- a/devel/qdevelop/Makefile +++ b/devel/qdevelop/Makefile @@ -16,9 +16,9 @@ LICENSE_FILE= ${WRKSRC}/copying RUN_DEPENDS= exctags:devel/ctags -USE_QT4= corelib gui sql network xml designer sql-sqlite3_run \ +USE_QT= corelib gui sql network xml designer sql-sqlite3_run \ moc_build uic_build rcc_build -USES= qmake +USES= qmake qt:4 DESKTOP_ENTRIES= "QDevelop" \ "Qt 4 development environment" \ @@ -30,9 +30,10 @@ DESKTOP_ENTRIES= "QDevelop" \ OPTIONS_DEFINE= TOOLS DOCS NLS OPTIONS_DEFAULT:= ${OPTIONS_DEFINE} OPTIONS_SUB= yes -NLS_USE= QT4=linguisttools_build +NLS_USES= qt:4 +NLS_USE= QT=linguisttools_build TOOLS_DESC= Install Qt 4 development tools (qmake, moc, etc.) -TOOLS_USE= ${_TOOLS:C|.*|QT4=&_run|} +TOOLS_USE= ${_TOOLS:C|.*|QT=&_run|} _TOOLS= assistant linguisttools moc qmake rcc uic post-patch: diff --git a/devel/qgit/Makefile b/devel/qgit/Makefile index 9a48757f7bbf..c1a354430a9a 100644 --- a/devel/qgit/Makefile +++ b/devel/qgit/Makefile @@ -11,8 +11,8 @@ COMMENT= Graphical interface to git repositories LICENSE= GPLv2 -USES= cmake:outsource -USE_QT5= core gui widgets \ +USES= cmake:outsource qt:5 +USE_QT= core gui widgets \ buildtools_build qmake_build USE_GITHUB= yes diff --git a/devel/qjson/Makefile b/devel/qjson/Makefile index e837921b1044..6232cced2ced 100644 --- a/devel/qjson/Makefile +++ b/devel/qjson/Makefile @@ -21,11 +21,13 @@ GH_ACCOUNT= flavio USE_LDCONFIG= yes . if ${FLAVOR} == qt4 -USE_QT4= corelib moc_build qmake_build rcc_build uic_build +USES+= qt:4 +USE_QT= corelib moc_build qmake_build rcc_build uic_build CMAKE_ON= QT4_BUILD PLIST_SUB= QT5="@comment " NO_QT5="" . else -USE_QT5= core buildtools_build qmake_build +USES+= qt:5 +USE_QT= core buildtools_build qmake_build CMAKE_OFF= QT4_BUILD PLIST_SUB= QT5="" NO_QT5="@comment " QT_SUFFIX= -qt5 diff --git a/devel/qprog/Makefile b/devel/qprog/Makefile index 7b21e8aea8f4..83855cd22f7c 100644 --- a/devel/qprog/Makefile +++ b/devel/qprog/Makefile @@ -11,8 +11,8 @@ DISTNAME= QProg_${PORTVERSION} MAINTAINER= bfoz@bfoz.net COMMENT= Cross-platform software for the DIY line of PIC programmers -USES= qmake tar:tgz -USE_QT4= moc_build gui network +USES= qmake qt:4 tar:tgz +USE_QT= moc_build gui network WRKSRC= ${WRKDIR}/QProg diff --git a/devel/qross/Makefile b/devel/qross/Makefile index 549420b9807c..49d6abfb31c0 100644 --- a/devel/qross/Makefile +++ b/devel/qross/Makefile @@ -11,9 +11,9 @@ COMMENT= Qt-only fork of Kross, the KDE scripting framework LICENSE= LGPL20+ -USES= cmake +USES= cmake qt:4 USE_LDCONFIG= yes -USE_QT4= corelib designer gui network xml qmake_build uic_build moc_build \ +USE_QT= corelib designer gui network xml qmake_build uic_build moc_build \ rcc_build script testlib USE_GITHUB= yes GH_ACCOUNT= 0xd34df00d diff --git a/devel/qscintilla2-designerplugin-qt5/Makefile b/devel/qscintilla2-designerplugin-qt5/Makefile index cce854d74054..e1ff981da740 100644 --- a/devel/qscintilla2-designerplugin-qt5/Makefile +++ b/devel/qscintilla2-designerplugin-qt5/Makefile @@ -14,8 +14,8 @@ LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5 DISTINFO_FILE= ${.CURDIR:H}/qscintilla2-qt5/distinfo USE_GL= gl -USES= qmake pyqt:5 -USE_QT5= core designer printsupport gui widgets xml \ +USES= qmake pyqt:5 qt:5 +USE_QT= core designer printsupport gui widgets xml \ buildtools_build qmake_build WRKSRC= ${WRKDIR}/${DISTNAME}/designer-Qt4Qt5 diff --git a/devel/qscintilla2-designerplugin/Makefile b/devel/qscintilla2-designerplugin/Makefile index fc3f04bf55df..b8aa7a4bfd9b 100644 --- a/devel/qscintilla2-designerplugin/Makefile +++ b/devel/qscintilla2-designerplugin/Makefile @@ -15,8 +15,8 @@ COMMENT= Qt4 Designer plugin for QScintilla2 LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2 DISTINFO_FILE= ${.CURDIR:H}/qscintilla2/distinfo -USES= qmake pyqt:4 -USE_QT4= qmake_build moc_build gui xml designer +USES= qmake pyqt:4 qt:4 +USE_QT= qmake_build moc_build gui xml designer WRKSRC= ${WRKDIR}/${DISTNAME}/designer-Qt4Qt5 diff --git a/devel/qscintilla2-qt5/Makefile b/devel/qscintilla2-qt5/Makefile index af4ddf36cc14..8041d614f92d 100644 --- a/devel/qscintilla2-qt5/Makefile +++ b/devel/qscintilla2-qt5/Makefile @@ -9,10 +9,10 @@ DISTNAME= ${QSCI2_DISTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 port of the Scintilla C++ editor class -USES= qmake pyqt:5 +USES= qmake pyqt:5 qt:5 USE_GL= gl USE_PYQT= # -USE_QT5= buildtools_build core gui printsupport widgets +USE_QT= buildtools_build core gui printsupport widgets USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/Qt4Qt5 diff --git a/devel/qscintilla2/Makefile b/devel/qscintilla2/Makefile index a8155a1a646f..a706a28b7e3c 100644 --- a/devel/qscintilla2/Makefile +++ b/devel/qscintilla2/Makefile @@ -11,9 +11,9 @@ DISTNAME= ${QSCI2_DISTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4 port of the Scintilla C++ editor class -USES= compiler:c++11-lib qmake pyqt:4 +USES= compiler:c++11-lib qmake pyqt:4 qt:4 USE_PYQT= # -USE_QT4= moc_build corelib gui xml designer +USE_QT= moc_build corelib gui xml designer USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/Qt4Qt5 diff --git a/devel/qt-maybe/Makefile b/devel/qt-maybe/Makefile index d9de214e935e..04f441cb6650 100644 --- a/devel/qt-maybe/Makefile +++ b/devel/qt-maybe/Makefile @@ -11,11 +11,12 @@ COMMENT= Implementation of sum/option types using QVariant LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +USES= qt:5 USE_GITHUB= yes GH_ACCOUNT= robertknight GH_TAGNAME= 52b21af -USE_QT5= core +USE_QT= core NO_BUILD= yes PLIST_FILES= include/Either.h include/Maybe.h diff --git a/devel/qt4-assistant-adp/Makefile b/devel/qt4-assistant-adp/Makefile index 47722e35af9e..da903926ffa4 100644 --- a/devel/qt4-assistant-adp/Makefile +++ b/devel/qt4-assistant-adp/Makefile @@ -14,9 +14,9 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt *.adp-compatible documentation browser -USE_QT4= moc_build rcc_build uic_build corelib \ +USE_QT= moc_build rcc_build uic_build corelib \ gui network xml doc dbus -USES= qmake +USES= qmake qt:4 QMAKE_ARGS= QT_CONFIG+="dbus" QT_PRODUCT="OpenSource" ALL_TARGET= first diff --git a/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile index 9aac27efdb0c..07591f306e5e 100644 --- a/devel/qt4-assistant/Makefile +++ b/devel/qt4-assistant/Makefile @@ -10,10 +10,10 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4 documentation browser -USE_QT4= qmake_build moc_build rcc_build uic_build \ +USES= qmake:no_env qt-dist:4 +USE_QT= moc_build rcc_build uic_build \ corelib gui help network sql webkit xml \ doc_run sql-sqlite3_run -QT_DIST= yes HAS_CONFIGURE= yes diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile index a0f71b52a732..d60f16c9f8f7 100644 --- a/devel/qt4-corelib/Makefile +++ b/devel/qt4-corelib/Makefile @@ -13,9 +13,8 @@ COMMENT= Qt core non-graphical module LIB_DEPENDS= libicui18n.so:devel/icu USE_GNOME= glib20 -USE_QT4= qmake_build moc_build -QT_DIST= yes -USES= iconv pkgconfig +USE_QT= moc_build +USES= iconv pkgconfig qmake:no_env qt-dist:4 HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/devel/qt4-dbus/Makefile b/devel/qt4-dbus/Makefile index 18b1b04232b3..e15df497c704 100644 --- a/devel/qt4-dbus/Makefile +++ b/devel/qt4-dbus/Makefile @@ -14,9 +14,8 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus BROKEN_sparc64= fails to compile: invalid conversion -USES= pkgconfig -USE_QT4= qmake_build moc_build rcc_build corelib xml -QT_DIST= yes +USES= pkgconfig qmake:no_env qt-dist:4 +USE_QT= moc_build rcc_build corelib xml MAKE_JOBS_UNSAFE= yes HAS_CONFIGURE= yes diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile index f69c461ad108..f011795a22f8 100644 --- a/devel/qt4-designer/Makefile +++ b/devel/qt4-designer/Makefile @@ -10,10 +10,10 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4 graphical user interface designer -USE_QT4= qmake_build moc_build rcc_build uic_build assistant_run \ +USES= qmake:no_env qt-dist:4 +USE_QT= moc_build rcc_build uic_build assistant_run \ qt3support corelib declarative gui network script sql xml \ webkit -QT_DIST= yes HAS_CONFIGURE= yes # Try to fix linking when previous version is installed diff --git a/devel/qt4-help-tools/Makefile b/devel/qt4-help-tools/Makefile index 433b86bae3b7..11baded25d71 100644 --- a/devel/qt4-help-tools/Makefile +++ b/devel/qt4-help-tools/Makefile @@ -11,9 +11,9 @@ PKGNAMESUFFIX= -tools MAINTAINER= kde@FreeBSD.org COMMENT= Qt utilities for generating documentation -USE_QT4= qmake_build moc_build rcc_build uic_build corelib \ +USES= qmake:no_env qt-dist:4 +USE_QT= moc_build rcc_build uic_build corelib \ gui sql xml doc help -QT_DIST= yes HAS_CONFIGURE= yes diff --git a/devel/qt4-help/Makefile b/devel/qt4-help/Makefile index 143793b04369..27111cca1773 100644 --- a/devel/qt4-help/Makefile +++ b/devel/qt4-help/Makefile @@ -10,9 +10,9 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt online help integration module -USE_QT4= qmake_build moc_build rcc_build corelib clucene \ +USES= qmake:no_env qt-dist:4 +USE_QT= moc_build rcc_build corelib clucene \ gui sql sql-sqlite3_run xml network -QT_DIST= yes HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile index 6b48a6cbdd39..4d45d8c56518 100644 --- a/devel/qt4-libqtassistantclient/Makefile +++ b/devel/qt4-libqtassistantclient/Makefile @@ -13,8 +13,8 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation browser integration module -USE_QT4= moc_build rcc_build corelib gui network -USES= qmake +USE_QT= moc_build rcc_build corelib gui network +USES= qmake qt:4 QMAKE_ARGS= CONFIG+="create_prl link_prl" VERSION="${PORTVERSION}" USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile index 8b56ad01a02e..6affb8153b65 100644 --- a/devel/qt4-linguist/Makefile +++ b/devel/qt4-linguist/Makefile @@ -10,9 +10,9 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4 localization tools -USE_QT4= qmake_build designer_build moc_build rcc_build uic_build \ +USES= qmake:no_env qt-dist:4 +USE_QT= designer_build moc_build rcc_build uic_build \ assistant_run gui linguisttools_run network xml -QT_DIST= yes HAS_CONFIGURE= yes diff --git a/devel/qt4-linguisttools/Makefile b/devel/qt4-linguisttools/Makefile index 660bbf0fbd41..4c607879cc62 100644 --- a/devel/qt4-linguisttools/Makefile +++ b/devel/qt4-linguisttools/Makefile @@ -9,8 +9,8 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4 localization tools -USE_QT4= qmake_build xml -QT_DIST= yes +USES= qmake:no_env qt-dist:4 +USE_QT= xml HAS_CONFIGURE= yes diff --git a/devel/qt4-makeqpf/Makefile b/devel/qt4-makeqpf/Makefile index ca4d660f126a..032a430821ab 100644 --- a/devel/qt4-makeqpf/Makefile +++ b/devel/qt4-makeqpf/Makefile @@ -12,8 +12,8 @@ COMMENT= Qt QPF2 font generator BROKEN_sparc64= does not compile -USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui -QT_DIST= yes +USES= qmake:no_env qt-dist:4 +USE_QT= moc_build rcc_build uic_build corelib gui HAS_CONFIGURE= yes diff --git a/devel/qt4-moc/Makefile b/devel/qt4-moc/Makefile index 171a97c55462..7f5fbf432873 100644 --- a/devel/qt4-moc/Makefile +++ b/devel/qt4-moc/Makefile @@ -10,8 +10,7 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt Meta-Object Compiler -USE_QT4= qmake_build -QT_DIST= yes +USES= qt-dist:4 qmake:no_env HAS_CONFIGURE= yes diff --git a/devel/qt4-porting/Makefile b/devel/qt4-porting/Makefile index 85d991b703a2..171d5a84f448 100644 --- a/devel/qt4-porting/Makefile +++ b/devel/qt4-porting/Makefile @@ -10,8 +10,8 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt utility to assist with porting from Qt 3 to Qt 4 -USE_QT4= qmake_build moc_build rcc_build corelib xml -QT_DIST= yes +USES= qmake:no_env qt-dist:4 +USE_QT= moc_build rcc_build corelib xml HAS_CONFIGURE= yes diff --git a/devel/qt4-qdbusviewer/Makefile b/devel/qt4-qdbusviewer/Makefile index 0b77b7ed81e6..3d65944f55df 100644 --- a/devel/qt4-qdbusviewer/Makefile +++ b/devel/qt4-qdbusviewer/Makefile @@ -12,10 +12,9 @@ COMMENT= Qt 4 graphical interface to D-Bus LIB_DEPENDS= libdbus-1.so:devel/dbus -USES= pkgconfig -USE_QT4= qmake_build moc_build rcc_build corelib dbus gui xml \ +USES= pkgconfig qmake:no_env qt-dist:4 +USE_QT= moc_build rcc_build corelib dbus gui xml \ clucene -QT_DIST= yes HAS_CONFIGURE= yes diff --git a/devel/qt4-qdoc3/Makefile b/devel/qt4-qdoc3/Makefile index aaca09e66886..ff61a66326de 100644 --- a/devel/qt4-qdoc3/Makefile +++ b/devel/qt4-qdoc3/Makefile @@ -10,8 +10,8 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation generator -USE_QT4= qmake_build corelib gui xml -QT_DIST= yes +USES= qmake:no_env qt-dist:4 +USE_QT= corelib gui xml HAS_CONFIGURE= yes diff --git a/devel/qt4-qmake/Makefile b/devel/qt4-qmake/Makefile index 93e4bffa3516..87fc486e7f42 100644 --- a/devel/qt4-qmake/Makefile +++ b/devel/qt4-qmake/Makefile @@ -10,8 +10,8 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt Makefile generator -USE_QT4= # empty -QT_DIST= yes +USES= qt-dist:4 +USE_QT= # empty REINPLACE_ARGS= -i "" WRKSRC_SUBDIR= ${PORTNAME} MAKEFILE= ${FILESDIR}/Makefile.bsd diff --git a/devel/qt4-qmlviewer/Makefile b/devel/qt4-qmlviewer/Makefile index 0b5432926a49..349248058617 100644 --- a/devel/qt4-qmlviewer/Makefile +++ b/devel/qt4-qmlviewer/Makefile @@ -10,9 +10,9 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4 utility for QML application testing -USE_QT4= qmake_build moc_build rcc_build uic_build declarative script \ +USES= qmake:no_env qt-dist:4 +USE_QT= moc_build rcc_build uic_build declarative script \ svg xmlpatterns sql opengl network corelib -QT_DIST= yes HAS_CONFIGURE= yes diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile index c15b1f0028d9..d0a193320cf4 100644 --- a/devel/qt4-qt3support/Makefile +++ b/devel/qt4-qt3support/Makefile @@ -10,9 +10,8 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 3 compatibility module -USE_QT4= qmake_build moc_build corelib gui network sql xml -QT_DIST= yes -USES= pkgconfig +USE_QT= moc_build corelib gui network sql xml +USES= pkgconfig qmake:no_env qt-dist:4 HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/devel/qt4-qtsolutions-singleapplication/Makefile b/devel/qt4-qtsolutions-singleapplication/Makefile index 8db0ff18eef4..f73ac8efe08a 100644 --- a/devel/qt4-qtsolutions-singleapplication/Makefile +++ b/devel/qt4-qtsolutions-singleapplication/Makefile @@ -12,8 +12,8 @@ DISTNAME= qt4-qtsolutions-singleinstance-${PORTVERSION} MAINTAINER= yurkis@gmail.com COMMENT= Qt 4 Solutions Single Application Framework -USES= qmake -USE_QT4?= moc_build rcc_build uic_build gui network +USES= qmake qt:4 +USE_QT?= moc_build rcc_build uic_build gui network USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/qt-solutions-qt-solutions/${SUB_PROJECT_NAME} diff --git a/devel/qt4-qtsolutions-soap/Makefile b/devel/qt4-qtsolutions-soap/Makefile index fb35eb1a7d66..9f8c13555c2b 100644 --- a/devel/qt4-qtsolutions-soap/Makefile +++ b/devel/qt4-qtsolutions-soap/Makefile @@ -3,7 +3,8 @@ MASTERDIR= ${.CURDIR}/../qt4-qtsolutions-singleapplication -USE_QT4= qmake_build moc_build rcc_build uic_build network xml gui +USES= qt:4 +USE_QT= qmake_build moc_build rcc_build uic_build network xml gui .include "${MASTERDIR}/Makefile" diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile index 53cb5e7d2a90..b3b681d743d8 100644 --- a/devel/qt4-qvfb/Makefile +++ b/devel/qt4-qvfb/Makefile @@ -10,8 +10,8 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4 virtual framebuffer utility -USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui opengl -QT_DIST= yes +USES= qmake:no_env qt-dist:4 +USE_QT= moc_build rcc_build uic_build corelib gui opengl USE_XORG= xtst HAS_CONFIGURE= yes diff --git a/devel/qt4-rcc/Makefile b/devel/qt4-rcc/Makefile index 481acd220d48..da0d885dab41 100644 --- a/devel/qt4-rcc/Makefile +++ b/devel/qt4-rcc/Makefile @@ -10,8 +10,7 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt Resource Compiler -USE_QT4= qmake_build -QT_DIST= yes +USES= qmake:no_env qt-dist:4 HAS_CONFIGURE= yes diff --git a/devel/qt4-script/Makefile b/devel/qt4-script/Makefile index b8b41b7a3ba4..150c96719212 100644 --- a/devel/qt4-script/Makefile +++ b/devel/qt4-script/Makefile @@ -10,9 +10,8 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt scripting module -USES= pkgconfig -USE_QT4= qmake_build moc_build corelib -QT_DIST= yes +USES= pkgconfig qmake:no_env qt-dist:4 +USE_QT= moc_build corelib HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/devel/qt4-scripttools/Makefile b/devel/qt4-scripttools/Makefile index 40db106b71df..aa4cad9df718 100644 --- a/devel/qt4-scripttools/Makefile +++ b/devel/qt4-scripttools/Makefile @@ -9,8 +9,8 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt Script additional components -USE_QT4= qmake_build moc_build rcc_build gui script -QT_DIST= yes +USES= qmake:no_env qt-dist:4 +USE_QT= moc_build rcc_build gui script HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/devel/qt4-testlib/Makefile b/devel/qt4-testlib/Makefile index 425d47df7fcc..ec6e40167dd1 100644 --- a/devel/qt4-testlib/Makefile +++ b/devel/qt4-testlib/Makefile @@ -10,8 +10,8 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt unit testing module -USE_QT4= qmake_build moc_build corelib -QT_DIST= yes +USES= qmake:no_env qt-dist:4 +USE_QT= moc_build corelib HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/devel/qt4-uic/Makefile b/devel/qt4-uic/Makefile index 06d7cd7546b3..bae9e609ccbd 100644 --- a/devel/qt4-uic/Makefile +++ b/devel/qt4-uic/Makefile @@ -10,8 +10,7 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt User Interface Compiler -USE_QT4= qmake_build -QT_DIST= yes +USES= qmake:no_env qt-dist:4 HAS_CONFIGURE= yes diff --git a/devel/qt4-uic3/Makefile b/devel/qt4-uic3/Makefile index 167d1f2b5a78..c60a8f18f49a 100644 --- a/devel/qt4-uic3/Makefile +++ b/devel/qt4-uic3/Makefile @@ -10,8 +10,8 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 3-compatible User Interface Compiler -USE_QT4= qmake_build qt3support corelib gui network sql xml porting -QT_DIST= yes +USES= qmake:no_env qt-dist:4 +USE_QT= qt3support corelib gui network sql xml porting HAS_CONFIGURE= yes diff --git a/devel/qt4/Makefile b/devel/qt4/Makefile index 4ff86d49b51e..635d840422f7 100644 --- a/devel/qt4/Makefile +++ b/devel/qt4/Makefile @@ -9,13 +9,13 @@ CATEGORIES= devel MAINTAINER= kde@FreeBSD.org COMMENT= Cross-platform application and UI framework (metaport) -USE_QT4= accessible clucene corelib dbus declarative designer \ +USE_QT= accessible clucene corelib dbus declarative designer \ graphicssystems-opengl gui help iconengines \ imageformats inputmethods multimedia network opengl \ phonon qt3support qtestlib script scripttools sql \ svg webkit xml xmlpatterns -USE_QT4:= ${USE_QT4:S/$/_run/} -USES= metaport +USE_QT:= ${USE_QT:S/$/_run/} +USES= metaport qt:4 OPTIONS_DEFINE= CODECS DOCS EXAMPLES GSTREAMER NLS SQL_PLUGINS TOOLS OPTIONS_DEFAULT=${OPTIONS_DEFINE} @@ -42,7 +42,7 @@ TOOLS_USE= assistant help-tools linguist linguisttools makeqpf \ qvfb rcc uic uic3 xmlpatterns-tool .for opt in ${OPTIONS_DEFINE} -${opt}_USE:= ${${opt}_USE:S/^/QT4=/:S/$/_run/} +${opt}_USE:= ${${opt}_USE:S/^/QT=/:S/$/_run/} .endfor .include <bsd.port.options.mk> diff --git a/devel/qt4/Makefile.sqldrivers b/devel/qt4/Makefile.sqldrivers index 723b5ea092ff..85377dd47b2b 100644 --- a/devel/qt4/Makefile.sqldrivers +++ b/devel/qt4/Makefile.sqldrivers @@ -10,9 +10,8 @@ MAINTAINER= kde@FreeBSD.org EXTRA_PATCHES= # empty -USE_QT4= corelib sql moc_build qmake_build -QT_DIST= yes -USES+= qmake:outsource +USE_QT= corelib sql moc_build qmake_build +USES+= qmake:outsource qt-dist:4 CXXFLAGS+= -I${WRKSRC}/include # For private QtSql headers. diff --git a/devel/qt5-assistant/Makefile b/devel/qt5-assistant/Makefile index 75c9d7524b95..df3301d06515 100644 --- a/devel/qt5-assistant/Makefile +++ b/devel/qt5-assistant/Makefile @@ -8,10 +8,9 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 documentation browser -USE_QT5= core gui help network printsupport sql widgets \ +USE_QT= core gui help network printsupport sql widgets \ buildtools_build sql-sqlite3_run -QT_DIST= tools -USES= qmake +USES= qmake qt-dist:5,tools DESKTOP_ENTRIES="Qt 5 Assistant" "" \ "${PREFIX}/share/pixmaps/assistant-qt5.png" \ diff --git a/devel/qt5-buildtools/Makefile b/devel/qt5-buildtools/Makefile index cd0caf63ebde..9e599a819614 100644 --- a/devel/qt5-buildtools/Makefile +++ b/devel/qt5-buildtools/Makefile @@ -8,9 +8,7 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt build tools -USE_QT5= qmake_build -QT_DIST= base -USES= perl5 +USES= perl5 qmake:no_env qt-dist:5,base HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/devel/qt5-concurrent/Makefile b/devel/qt5-concurrent/Makefile index 9d5a26f792f9..b9fd86f08012 100644 --- a/devel/qt5-concurrent/Makefile +++ b/devel/qt5-concurrent/Makefile @@ -8,8 +8,8 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt multi-threading module -USE_QT5= core qmake_build buildtools_build -QT_DIST= base +USES= qmake:no_env qt-dist:5,base +USE_QT= core qmake_build buildtools_build HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile index adf224d2b584..646d1137c032 100644 --- a/devel/qt5-core/Makefile +++ b/devel/qt5-core/Makefile @@ -12,9 +12,9 @@ COMMENT= Qt core non-graphical module LIB_DEPENDS= libicui18n.so:devel/icu \ libpcre2-posix.so:devel/pcre2 +USES= qmake:no_env qt-dist:5,base USE_GNOME= glib20 -USE_QT5= qmake_build buildtools_build -QT_DIST= base +USE_QT= qmake_build buildtools_build HAS_CONFIGURE= yes # Disable (almost) everything to install minimal qconfig.h. # -no-feature-* adds QT_NO_* (for features which have no switch or diff --git a/devel/qt5-dbus/Makefile b/devel/qt5-dbus/Makefile index 9db2eb3c436e..8ae9f09b63e1 100644 --- a/devel/qt5-dbus/Makefile +++ b/devel/qt5-dbus/Makefile @@ -10,8 +10,8 @@ COMMENT= Qt D-Bus inter-process communication module LIB_DEPENDS= libdbus-1.so:devel/dbus -USE_QT5= core qmake_build buildtools_build -QT_DIST= base +USES= qmake:no_env qt-dist:5,base +USE_QT= core qmake_build buildtools_build HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/devel/qt5-designer/Makefile b/devel/qt5-designer/Makefile index 23680fb04add..d6efdf9590c2 100644 --- a/devel/qt5-designer/Makefile +++ b/devel/qt5-designer/Makefile @@ -8,10 +8,9 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 graphical user interface designer -USE_QT5= assistant_run core gui network printsupport quick uiplugin \ +USE_QT= assistant_run core gui network printsupport quick uiplugin \ widgets xml buildtools_build -QT_DIST= tools -USES= qmake +USES= qmake qt-dist:5,tools USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} DESKTOP_ENTRIES="Qt 5 Designer" "" \ @@ -26,7 +25,8 @@ OPTIONS_DEFINE= WEBKIT OPTIONS_SUB= yes WEBKIT_DESC= Build WebKit-based WebView widget WEBKIT_QMAKE_ON= CONFIG+=use_webkit -WEBKIT_USE= QT5=webkit +WEBKIT_USES= qt-dist:5,tools +WEBKIT_USE= QT=webkit post-patch: # uiplugin is built in x11-toolkits/qt5-uiplugin. diff --git a/devel/qt5-help/Makefile b/devel/qt5-help/Makefile index 8c4fb90f4d32..213c3d732f25 100644 --- a/devel/qt5-help/Makefile +++ b/devel/qt5-help/Makefile @@ -8,10 +8,9 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt online help integration module -USE_QT5= core gui network sql widgets \ +USE_QT= core gui network sql widgets \ buildtools_build sql-sqlite3_run -QT_DIST= tools -USES= qmake +USES= qmake qt-dist:5,tools USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/assistant diff --git a/devel/qt5-linguist/Makefile b/devel/qt5-linguist/Makefile index ce8b21165e00..9823111c5224 100644 --- a/devel/qt5-linguist/Makefile +++ b/devel/qt5-linguist/Makefile @@ -8,11 +8,10 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 translation tool -USE_QT5= core gui printsupport widgets xml \ +USE_QT= core gui printsupport widgets xml \ assistant_run linguisttools_run \ buildtools_build designer_build uitools_build -QT_DIST= tools -USES= qmake +USES= qmake qt-dist:5,tools DESKTOP_ENTRIES="Qt 5 Linguist" "" \ "${PREFIX}/share/pixmaps/linguist-qt5.png" \ diff --git a/devel/qt5-linguisttools/Makefile b/devel/qt5-linguisttools/Makefile index 9a4d7248e80c..c465d0c371e4 100644 --- a/devel/qt5-linguisttools/Makefile +++ b/devel/qt5-linguisttools/Makefile @@ -8,9 +8,8 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt localization tools -USE_QT5= core xml buildtools_build qml_build -QT_DIST= tools -USES= qmake +USE_QT= core xml buildtools_build qml_build +USES= qmake qt-dist:5,tools BUILD_WRKSRC= ${WRKSRC}/src/linguist INSTALL_WRKSRC= ${WRKSRC}/src/linguist diff --git a/devel/qt5-location/Makefile b/devel/qt5-location/Makefile index fce2cf053bb2..4a22974b93a3 100644 --- a/devel/qt5-location/Makefile +++ b/devel/qt5-location/Makefile @@ -8,9 +8,8 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt location module -USE_QT5= concurrent core dbus gui network qml quick buildtools_build -QT_DIST= ${PORTNAME} -USES= qmake:norecursive +USE_QT= concurrent core dbus gui network qml quick buildtools_build +USES= qmake:norecursive qt-dist:5,location USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/devel/qt5-qdbus/Makefile b/devel/qt5-qdbus/Makefile index 16b420d45efc..2fc0e4fa7691 100644 --- a/devel/qt5-qdbus/Makefile +++ b/devel/qt5-qdbus/Makefile @@ -8,9 +8,8 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt command-line interface to D-Bus -USE_QT5= core dbus xml buildtools_build -QT_DIST= tools -USES= qmake +USES= qmake qt-dist:5,tools +USE_QT= core dbus xml buildtools_build BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} diff --git a/devel/qt5-qdbusviewer/Makefile b/devel/qt5-qdbusviewer/Makefile index 3e4d0e7cb036..5fac5ffac615 100644 --- a/devel/qt5-qdbusviewer/Makefile +++ b/devel/qt5-qdbusviewer/Makefile @@ -8,9 +8,8 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 graphical interface to D-Bus -USE_QT5= core dbus gui widgets xml buildtools_build -QT_DIST= tools -USES= qmake +USE_QT= core dbus gui widgets xml buildtools_build +USES= qmake qt-dist:5,tools DESKTOP_ENTRIES="Qt 5 D-Bus Viewer" "" \ "${PREFIX}/share/pixmaps/qdbusviewer-qt5.png" \ diff --git a/devel/qt5-qdoc-data/Makefile b/devel/qt5-qdoc-data/Makefile index 1af096a6bd4f..d2d5a164b3d2 100644 --- a/devel/qt5-qdoc-data/Makefile +++ b/devel/qt5-qdoc-data/Makefile @@ -18,8 +18,8 @@ COMMENT= QDoc configuration files LICENSE= GFDL LICENSE_FILE= ${WRKSRC}/LICENSE.FDL -USES= tar:xz -USE_QT5= # empty +USES= qt:5 tar:xz +USE_QT= # empty EXTRACT_AFTER_ARGS= --include ${DISTNAME}/LICENSE.FDL \ --include ${DISTNAME}/doc diff --git a/devel/qt5-qdoc/Makefile b/devel/qt5-qdoc/Makefile index eee3e4e3c0fe..fc8bee4d0f4c 100644 --- a/devel/qt5-qdoc/Makefile +++ b/devel/qt5-qdoc/Makefile @@ -8,9 +8,8 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation generator -USE_QT5= core qml buildtools_build qdoc-data_run -QT_DIST= tools -USES= qmake +USE_QT= core qml buildtools_build qdoc-data_run +USES= qmake qt-dist:5,tools BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} diff --git a/devel/qt5-qmake/Makefile b/devel/qt5-qmake/Makefile index 89d2e7bb7f33..898e660df592 100644 --- a/devel/qt5-qmake/Makefile +++ b/devel/qt5-qmake/Makefile @@ -8,9 +8,8 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt Makefile generator -USE_QT5= # empty USES= compiler:c++11-lib gmake pkgconfig \ - python:build shebangfix + python:build qmake:no_env qt-dist:5,base shebangfix SHEBANG_FILES= util/harfbuzz/update-harfbuzz \ util/unicode/x11/makeencodings \ src/3rdparty/freetype/src/tools/afblue.pl \ @@ -18,7 +17,6 @@ SHEBANG_FILES= util/harfbuzz/update-harfbuzz \ mkspecs/features/uikit/devices.py \ mkspecs/features/uikit/device_destinations.sh -QT_DIST= base REINPLACE_ARGS= -i "" HAS_CONFIGURE= yes # Disable everything to install minimal qconfig.pri. diff --git a/devel/qt5-script/Makefile b/devel/qt5-script/Makefile index 75f45afe9b34..00ce095c27c5 100644 --- a/devel/qt5-script/Makefile +++ b/devel/qt5-script/Makefile @@ -10,9 +10,8 @@ COMMENT= Qt 4-compatible scripting module BROKEN_powerpc64= Does not build -USE_QT5= core buildtools_build -QT_DIST= ${PORTNAME} -USES= qmake +USE_QT= core buildtools_build +USES= qmake qt-dist:5,script # Keep make(1) from descending into src/script/obj/ (qmake:outsource # doesn't work). MAKE_ENV= MAKEOBJDIR=. diff --git a/devel/qt5-scripttools/Makefile b/devel/qt5-scripttools/Makefile index 369ecd813f13..acd1cafb9b3d 100644 --- a/devel/qt5-scripttools/Makefile +++ b/devel/qt5-scripttools/Makefile @@ -8,9 +8,8 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt Script additional components -USE_QT5= core gui script widgets buildtools_build -QT_DIST= script -USES= qmake +USE_QT= core gui script widgets buildtools_build +USES= qmake qt-dist:5,script USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} diff --git a/devel/qt5-scxml/Makefile b/devel/qt5-scxml/Makefile index 6b5bac09bb0b..f17ac26cf618 100644 --- a/devel/qt5-scxml/Makefile +++ b/devel/qt5-scxml/Makefile @@ -8,9 +8,8 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt5 SXCML module -USE_QT5= core network qml buildtools_build -QT_DIST= ${PORTNAME} -USES= qmake +USE_QT= core network qml buildtools_build +USES= qmake qt-dist:5,scxml USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/devel/qt5-testlib/Makefile b/devel/qt5-testlib/Makefile index e818285a89b9..301905eaa64c 100644 --- a/devel/qt5-testlib/Makefile +++ b/devel/qt5-testlib/Makefile @@ -8,8 +8,8 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt unit testing module -USE_QT5= core qmake_build buildtools_build -QT_DIST= base +USES= qmake:no_env qt-dist:5,base +USE_QT= core qmake_build buildtools_build HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/devel/qt5-uitools/Makefile b/devel/qt5-uitools/Makefile index 623b02d98ad2..873bdd3b775b 100644 --- a/devel/qt5-uitools/Makefile +++ b/devel/qt5-uitools/Makefile @@ -8,9 +8,8 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt Designer UI forms support module -USE_QT5= core gui uiplugin widgets buildtools_build -QT_DIST= tools -USES= qmake +USE_QT= core gui uiplugin widgets buildtools_build +USES= qmake qt-dist:5,tools USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME} diff --git a/devel/qt5/Makefile b/devel/qt5/Makefile index 3447a0281100..b512a838f373 100644 --- a/devel/qt5/Makefile +++ b/devel/qt5/Makefile @@ -10,7 +10,7 @@ COMMENT= Cross-platform application and UI framework (metaport) # * phonon4 is not part of Qt itself. # * we don't want to pull in wayland just yet. -USE_QT5= ${_USE_QT_ALL:Nphonon4:Ndeclarative:Nwayland:S/$/_run/} -USES= metaport +USE_QT= ${_USE_QT_ALL:Nphonon4:Ndeclarative:Nwayland:S/$/_run/} +USES= metaport qt:5 .include <bsd.port.mk> diff --git a/devel/qt5/Makefile.sqldrivers b/devel/qt5/Makefile.sqldrivers index 251359626589..c9c57548b74c 100644 --- a/devel/qt5/Makefile.sqldrivers +++ b/devel/qt5/Makefile.sqldrivers @@ -8,8 +8,8 @@ PKGNAMEPREFIX?= qt5-sqldrivers- MAINTAINER?= kde@FreeBSD.org COMMENT?= Qt ${DB_DESC} database plugin -USE_QT5+= core sql qmake_build buildtools_build -QT_DIST?= base +USES+= qmake:no_env qt-dist:5,base +USE_QT+= core sql qmake_build buildtools_build HAS_CONFIGURE= yes CONFIGURE_ARGS+=-no-gui -no-xcb diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile index 34691687b1cb..01221d090efe 100644 --- a/devel/qtcreator/Makefile +++ b/devel/qtcreator/Makefile @@ -14,10 +14,10 @@ COMMENT= C++ and QML IDE for Qt development # depend on the split out qbs LIB_DEPENDS= libqbscore.so:devel/qbs -USES= qmake compiler:c++14-lang tar:xz +USES= qmake compiler:c++14-lang qt:5 tar:xz USE_LDCONFIG= ${LOCALBASE}/lib/${PORTNAME} USE_GL= gl -USE_QT5= buildtools concurrent core designer gui help \ +USE_QT= buildtools concurrent core designer gui help \ linguist location network printsupport qdoc qmake qml quick \ quickcontrols script script sql svg webchannel webengine \ widgets xml xmlpatterns @@ -42,9 +42,11 @@ BROKEN_aarch64= fails to build: invokes x86 asm OPTIONS_DEFINE= DOCS EXAMPLES DOCS_DESC= Install the Qt5 api documentation -DOCS_USE= QT5=doc_run +DOCS_USES= qt:5 +DOCS_USE= QT=doc_run EXAMPLES_DESC= Install the Qt5 example projects -EXAMPLES_USE= QT5=examples_run +EXAMPLES_USES= qt:5 +EXAMPLES_USE= QT=examples_run OPTIONS_DEFAULT= ${OPTIONS_DEFINE} ALL_TARGET= all diff --git a/devel/qtscriptgenerator/Makefile b/devel/qtscriptgenerator/Makefile index 55b0549a2342..0cd033be0a62 100644 --- a/devel/qtscriptgenerator/Makefile +++ b/devel/qtscriptgenerator/Makefile @@ -20,8 +20,8 @@ OPTIONS_DEFINE= PHONON PHONON_DESC= Build Phonon support OPTIONS_DEFAULT= PHONON -USES= gmake qmake -USE_QT4= corelib declarative designer doc help help-tools gui \ +USES= gmake qmake qt:4 +USE_QT= corelib declarative designer doc help help-tools gui \ iconengines imageformats inputmethods linguist network \ opengl pixeltool porting qdbusviewer \ qt3support qtestlib qvfb script scripttools \ @@ -32,7 +32,7 @@ USE_LDCONFIG= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MPHONON} -USE_QT4+= phonon +USE_QT+= phonon PLIST_SUB+= PHONON="" .else EXTRA_PATCHES= ${FILESDIR}/extra-patch-no_phonon diff --git a/devel/ruby-korundum-kde4/Makefile b/devel/ruby-korundum-kde4/Makefile index 79fbdc4bcb7d..9573121023a3 100644 --- a/devel/ruby-korundum-kde4/Makefile +++ b/devel/ruby-korundum-kde4/Makefile @@ -9,11 +9,11 @@ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} MAINTAINER= kde@FreeBSD.org COMMENT= Ruby bindings for KDE -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kate kdelibs okular pimlibs \ qtruby smokegen smokekde smokeqt \ akonadi automoc4 soprano -USE_QT4= corelib network opengl sql svg xml \ +USE_QT= corelib network opengl sql svg xml \ qmake_build moc_build uic_build rcc_build USE_RUBY= yes diff --git a/devel/ruby-krossruby-kde4/Makefile b/devel/ruby-krossruby-kde4/Makefile index 496368244874..359bd2584892 100644 --- a/devel/ruby-krossruby-kde4/Makefile +++ b/devel/ruby-krossruby-kde4/Makefile @@ -10,9 +10,9 @@ DISTNAME= kross-interpreters-${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Ruby bindings for Qt/KDE -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs pimlibs automoc4 -USE_QT4= corelib gui qmake_build moc_build uic_build rcc_build +USE_QT= corelib gui qmake_build moc_build uic_build rcc_build USE_RUBY= yes CMAKE_ARGS+= -DBUILD_python:BOOL=FALSE \ -DBUILD_falcon:BOOL=FALSE \ diff --git a/devel/ruby-qtruby-kde4/Makefile b/devel/ruby-qtruby-kde4/Makefile index 8f162becd519..c7a172071b9b 100644 --- a/devel/ruby-qtruby-kde4/Makefile +++ b/devel/ruby-qtruby-kde4/Makefile @@ -14,9 +14,9 @@ BROKEN_powerpc64= fails to compile: ruby.h:1381: wrong number of arguments speci LIB_DEPENDS= libqwt.so:x11-toolkits/qwt5 \ libqscintilla2_qt4.so:devel/qscintilla2 -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= smokeqt -USE_QT4= corelib dbus declarative gui network phonon script webkit xml \ +USE_QT= corelib dbus declarative gui network phonon script webkit xml \ qmake_build moc_build uic_build rcc_build USE_RUBY= yes USE_LDCONFIG= yes diff --git a/devel/shiboken/Makefile b/devel/shiboken/Makefile index 5a72f8b6d823..67b73b63be6f 100644 --- a/devel/shiboken/Makefile +++ b/devel/shiboken/Makefile @@ -19,10 +19,10 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2 \ PLIST_SUB= PORTVERSION=${PORTVERSION} \ PYTHON_VERSION=${PYTHON_VERSION} -USE_QT4= corelib qmake_build qtestlib moc_build network \ +USE_QT= corelib qmake_build qtestlib moc_build network \ uic_build rcc_build xml xmlpatterns -USES= cmake python:2.7 tar:bzip2 +USES= cmake python:2.7 qt:4 tar:bzip2 USE_LDCONFIG= yes ALL_TARGET= all diff --git a/devel/smokegen-kde4/Makefile b/devel/smokegen-kde4/Makefile index 46d2987e44c0..060077fb0088 100644 --- a/devel/smokegen-kde4/Makefile +++ b/devel/smokegen-kde4/Makefile @@ -7,8 +7,8 @@ CATEGORIES= devel kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= SMOKE bindings for KDE -USES= cmake:outsource kde:4 tar:xz -USE_QT4= corelib xml qmake_build moc_build uic_build rcc_build +USES= cmake:outsource kde:4 qt:4 tar:xz +USE_QT= corelib xml qmake_build moc_build uic_build rcc_build CMAKE_ARGS+= -DSMOKE_CMAKE_MODULE_DIR:PATH=${PREFIX}/lib/cmake/smoke USE_LDCONFIG= yes diff --git a/devel/smokekde-kde4/Makefile b/devel/smokekde-kde4/Makefile index f2d894174903..2c9126967123 100644 --- a/devel/smokekde-kde4/Makefile +++ b/devel/smokekde-kde4/Makefile @@ -8,10 +8,10 @@ CATEGORIES= devel kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= SMOKE bindings for KDE -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kate kdelibs okular pimlibs \ smokegen smokeqt akonadi automoc4 soprano -USE_QT4= corelib dbus designer_build gui network opengl sql svg xml \ +USE_QT= corelib dbus designer_build gui network opengl sql svg xml \ qmake_build moc_build uic_build rcc_build USE_LDCONFIG= yes USE_CXXSTD= gnu++98 diff --git a/devel/smokeqt-kde4/Makefile b/devel/smokeqt-kde4/Makefile index 5978f19483ea..3a47588faaab 100644 --- a/devel/smokeqt-kde4/Makefile +++ b/devel/smokeqt-kde4/Makefile @@ -11,9 +11,9 @@ COMMENT= SMOKE bindings for Qt LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2 \ libqwt.so:x11-toolkits/qwt5 -USES= cmake:outsource kde:4 pkgconfig tar:xz +USES= cmake:outsource kde:4 pkgconfig qt:4 tar:xz USE_KDE= smokegen qimageblitz -USE_QT4= corelib dbus declarative designer_build gui help \ +USE_QT= corelib dbus declarative designer_build gui help \ multimedia network opengl phonon qtestlib script \ sql svg webkit xml xmlpatterns \ qmake_build moc_build uic_build rcc_build diff --git a/devel/subcommander2/Makefile b/devel/subcommander2/Makefile index 21f61535d7d3..1792c490ac5a 100644 --- a/devel/subcommander2/Makefile +++ b/devel/subcommander2/Makefile @@ -20,10 +20,9 @@ CONFLICTS= subcommander-1.* WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R:S,.b,b,}p${PORTVERSION:E} -USES= autoreconf gmake dos2unix ssl +USES= autoreconf gmake dos2unix qmake:no_env qt:4 ssl DOS2UNIX_GLOB= *.cpp *.h -USE_QT4= corelib gui network qt3support moc_build rcc_build uic_build -QT_NONSTANDARD= yes +USE_QT= corelib gui network qt3support moc_build rcc_build uic_build GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-boost=${LOCALBASE}/include \ --with-subversion=${LOCALBASE} --with-qt=${PREFIX} \ diff --git a/devel/svn2git/Makefile b/devel/svn2git/Makefile index 19f762ba3684..f2edce038f3d 100644 --- a/devel/svn2git/Makefile +++ b/devel/svn2git/Makefile @@ -17,9 +17,9 @@ RUN_DEPENDS= git:devel/git \ p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \ p5-subversion>=0:devel/p5-subversion -USES= qmake +USES= qmake qt:5 USE_GITHUB= yes -USE_QT5= core +USE_QT= core GH_ACCOUNT= svn-all-fast-export OPTIONS_DEFINE= FREEBSD_REPO diff --git a/devel/thrift-cpp/Makefile b/devel/thrift-cpp/Makefile index 57a755fb7bf9..72f0d8c83525 100644 --- a/devel/thrift-cpp/Makefile +++ b/devel/thrift-cpp/Makefile @@ -31,7 +31,8 @@ PLIST_SUB= PORTVERSION="${THRIFT_PORTVERSION}" OPTIONS_DEFINE= QT4 QT4_CONFIGURE_WITH= qt4 -QT4_USE= QT4=network,moc_build,qmake_build,rcc_build,uic_build +QT4_USES= qt:4 +QT4_USE= QT=network,moc_build,qmake_build,rcc_build,uic_build OPTIONS_SUB= yes diff --git a/devel/umbrello-kde4/Makefile b/devel/umbrello-kde4/Makefile index 4b91993b5942..910e9f98b708 100644 --- a/devel/umbrello-kde4/Makefile +++ b/devel/umbrello-kde4/Makefile @@ -10,9 +10,9 @@ COMMENT= UML modeller for KDE LIB_DEPENDS= libboost_thread.so:devel/boost-libs -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 USE_GNOME= libxml2 libxslt -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build .include <bsd.port.mk> diff --git a/devel/umbrello/Makefile b/devel/umbrello/Makefile index 18ffbd074319..10b3538f80e6 100644 --- a/devel/umbrello/Makefile +++ b/devel/umbrello/Makefile @@ -9,14 +9,14 @@ COMMENT= UML modeller for KDE LIB_DEPENDS= libboost_thread.so:devel/boost-libs -USES= cmake:outsource kde:5 tar:xz +USES= cmake:outsource kde:5 qt:5 tar:xz USE_GNOME= libxml2 libxslt USE_KDE= archive auth bookmarks codecs completion config configwidgets \ coreaddons crash ecm guiaddons i18n iconthemes itemviews \ jobwidgets kdelibs4support kio notifications parts service \ solid sonnet texteditor textwidgets unitconversion \ widgetsaddons windowsystem xmlgui -USE_QT5= core dbus gui network printsupport svg webkit widgets xml \ +USE_QT= core dbus gui network printsupport svg webkit widgets xml \ buildtools_build qmake_build # Build the KDE Frameworks 5 based version. diff --git a/devel/universalindentgui/Makefile b/devel/universalindentgui/Makefile index 521606c5f99a..1bc7d7f4746d 100644 --- a/devel/universalindentgui/Makefile +++ b/devel/universalindentgui/Makefile @@ -15,9 +15,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.GPL LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2 -USES= dos2unix qmake python:run shebangfix +USES= dos2unix qmake python:run qt:4 shebangfix SHEBANG_FILES= indenters/*.py indenters/*.rb -USE_QT4= corelib moc_build uic_build rcc_build \ +USE_QT= corelib moc_build uic_build rcc_build \ linguist_build network script gui DESKTOP_ENTRIES="UniversalIndentGUI" "${COMMENT}" "" "${PORTNAME}" "" true diff --git a/devel/zeal/Makefile b/devel/zeal/Makefile index dcd71c73f8f0..c2d23b975e93 100644 --- a/devel/zeal/Makefile +++ b/devel/zeal/Makefile @@ -15,11 +15,11 @@ LIB_DEPENDS= libxcb.so:x11/libxcb \ libxcb-keysyms.so:x11/xcb-util-keysyms USES= cmake:outsource compiler:c++11-lib desktop-file-utils \ - kde:5 libarchive pkgconfig sqlite + kde:5 libarchive pkgconfig qt:5 sqlite USE_GL= gl # Dependency added by qt5-gui. USE_GITHUB= yes USE_KDE= ecm -USE_QT5= concurrent core gui network webkit widgets x11extras \ +USE_QT= concurrent core gui network webkit widgets x11extras \ buildtools_build qmake_build USE_XORG= ice sm x11 xcb xext |