diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2018-06-28 17:39:53 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2018-06-28 17:39:53 +0000 |
| commit | b1a1d38bf9ef78334b640d30046388a9c055c3a9 (patch) | |
| tree | 7b9785f1f0c244da1f5b69a2a610e3f37eb786a8 /deskutils | |
| parent | bc77780d41178cf3d0327c79ac10737af704f236 (diff) | |
| download | freebsd-ports-b1a1d38bf9ef78334b640d30046388a9c055c3a9.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 'deskutils')
79 files changed, 179 insertions, 174 deletions
diff --git a/deskutils/akonadi-calendar-tools/Makefile b/deskutils/akonadi-calendar-tools/Makefile index 737e11b4ca1a..32072c6ae9f2 100644 --- a/deskutils/akonadi-calendar-tools/Makefile +++ b/deskutils/akonadi-calendar-tools/Makefile @@ -9,7 +9,7 @@ COMMENT= CLI tools to manage akonadi calendars LIB_DEPENDS= libical.so:devel/libical -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 bookmarks codecs completion config configwidgets \ coreaddons crash ecm guiaddons i18n iconthemes itemmodels \ itemviews jobwidgets kdelibs4support kio notifications parts \ @@ -18,7 +18,7 @@ USE_KDE= auth bookmarks codecs completion config configwidgets \ # pim components USE_KDE+= akonadi akonadicalendar calendarsupport calendarcore calendarutils \ identitymanagement libkdepim mime pimtextedit -USE_QT5= core dbus gui network printsupport widgets xml \ +USE_QT= core dbus gui network printsupport widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes diff --git a/deskutils/akonadi-import-wizard/Makefile b/deskutils/akonadi-import-wizard/Makefile index 91794e5e2546..75d4ae6d712c 100644 --- a/deskutils/akonadi-import-wizard/Makefile +++ b/deskutils/akonadi-import-wizard/Makefile @@ -13,7 +13,7 @@ LIB_DEPENDS= libassuan.so:security/libassuan \ libgpgmepp.so:security/gpgme-cpp \ libqgpgme.so:security/gpgme-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= archive auth codecs completion config configwidgets coreaddons \ crash dbusaddons ecm i18n itemmodels kio service wallet \ widgetsaddons xmlgui @@ -21,7 +21,7 @@ USE_KDE= archive auth codecs completion config configwidgets coreaddons \ USE_KDE+= akonadi akonadicontacts akonadimime contacts identitymanagement \ libkdepim libkleo mailcommon mailimporter mailtransport \ messagelib mime pimcommon pimtextedit -USE_QT5= core dbus gui network widgets xml \ +USE_QT= core dbus gui network widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes diff --git a/deskutils/akonadiconsole/Makefile b/deskutils/akonadiconsole/Makefile index c2112e7c69b6..3ffade32e679 100644 --- a/deskutils/akonadiconsole/Makefile +++ b/deskutils/akonadiconsole/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libassuan.so:security/libassuan \ libical.so:devel/libical \ libxapian.so:databases/xapian-core -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 bookmarks codecs completion config configwidgets \ coreaddons crash dbusaddons ecm guiaddons i18n iconthemes \ itemmodels itemviews jobwidgets kdelibs4support kio \ @@ -28,7 +28,7 @@ USE_KDE+= akonadi akonadicalendar akonadicontacts akonadimime \ akonadisearch calendarcore calendarsupport contacts \ identitymanagement libkdepim libkleo messagelib mime \ pimcommon pimtextedit -USE_QT5= core dbus gui network printsupport sql widgets xml \ +USE_QT= core dbus gui network printsupport sql widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes diff --git a/deskutils/akregator/Makefile b/deskutils/akregator/Makefile index 135a51d57757..5033496b74ee 100644 --- a/deskutils/akregator/Makefile +++ b/deskutils/akregator/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libassuan.so:security/libassuan \ libgpgmepp.so:security/gpgme-cpp \ libqgpgme.so:security/gpgme-qt5 -USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 qt:5 tar:xz USE_KDE= auth codecs completion config configwidgets coreaddons crash \ ecm i18n iconthemes itemmodels jobwidgets kcmutils kio \ notifications notifyconfig parts service sonnet texteditor\ @@ -23,7 +23,7 @@ USE_KDE= auth codecs completion config configwidgets coreaddons crash \ # pim components USE_KDE+= akonadi akonadimime contacts grantleetheme kontactinterface \ libkdepim libkleo messagelib mime pimcommon pimtextedit syndication -USE_QT5= core dbus gui location network printsupport qml quick \ +USE_QT= core dbus gui location network printsupport qml quick \ webchannel webengine widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes diff --git a/deskutils/basket/Makefile b/deskutils/basket/Makefile index a6f3aa0145be..900e4222bc4e 100644 --- a/deskutils/basket/Makefile +++ b/deskutils/basket/Makefile @@ -14,10 +14,10 @@ LICENSE= GPLv2 LIB_DEPENDS= libgpgme.so:security/gpgme -USES= cmake gettext-tools kde:4 tar:bzip2 +USES= cmake gettext-tools kde:4 qt:4 tar:bzip2 USE_XORG= xft xpm USE_KDE= automoc4 kdelibs qimageblitz -USE_QT4= moc_build qmake_build rcc_build uic_build +USE_QT= moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes USE_CXXSTD= gnu++98 diff --git a/deskutils/cairo-dock-plugins/Makefile b/deskutils/cairo-dock-plugins/Makefile index 2964ee47d391..81630e1cb679 100644 --- a/deskutils/cairo-dock-plugins/Makefile +++ b/deskutils/cairo-dock-plugins/Makefile @@ -87,8 +87,8 @@ IMPULSE_LIB_DEPENDS= libpulse.so:audio/pulseaudio IMPULSE_CMAKE_BOOL= enable-impulse #KDE_INTEGRATION_LIB_DEPENDS= -KDE_INTEGRATION_USE_QT4= corelib -KDE_INTEGRATION_USES= kde:4 +KDE_INTEGRATION_USE_QT= corelib +KDE_INTEGRATION_USES= kde:4 qt:4 KDE_INTEGRATION_USE= KDE=kdelibs KDE_INTEGRATION_CMAKE_BOOL= enable-kde-integration diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index 1abcd63f84e9..a57a655b37aa 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -48,13 +48,13 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \ pdftohtml:graphics/poppler-utils USES= desktop-file-utils gettext-runtime gnome localbase:ldflags pkgconfig \ - python:2.7 pyqt:5 shared-mime-info shebangfix ssl tar:xz + python:2.7 pyqt:5 qt:5 shared-mime-info shebangfix ssl tar:xz USE_RC_SUBR= calibre EXTRACT_BEFORE_ARGS= -x -s '/^calibre/~-src/' -f SHEBANG_GLOB= *.sh *.py python_OLD_CMD= "/usr/bin/env python2" /bin/python2 /usr/bin/python2 /usr/local/bin/python2 USE_PYQT= core gui network sip svg webkit widgets webkitwidgets xmlpatterns -USE_QT5= buildtools_build core dbus gui qmake_build widgets +USE_QT= buildtools_build core dbus gui qmake_build widgets USE_GL= egl gl USE_GNOME= glib20 USE_XORG= xrender xext x11 diff --git a/deskutils/cdcat/Makefile b/deskutils/cdcat/Makefile index fb5ca60ac889..341ff3b5776e 100644 --- a/deskutils/cdcat/Makefile +++ b/deskutils/cdcat/Makefile @@ -22,8 +22,8 @@ LIB_DEPENDS= libtar.so:devel/libtar \ CONFIGURE_WRKSRC= ${WRKSRC}/src BUILD_WRKSRC= ${CONFIGURE_WRKSRC} -USES= libtool qmake:norecursive tar:bzip2 -USE_QT4= corelib gui xml linguisttools_build moc_build uic_build +USES= libtool qmake:norecursive qt:4 tar:bzip2 +USE_QT= corelib gui xml linguisttools_build moc_build uic_build QMAKE_ARGS= LIBS+="${LOCALBASE}/lib/libcryptopp.a" \ LIBS+="-lz -lbz2 -ltar -lexif -lmediainfo -lzen" \ DEFINES+="MEDIAINFO_STATIC" \ diff --git a/deskutils/charmtimetracker/Makefile b/deskutils/charmtimetracker/Makefile index 4aa063343531..c65db3cc69c9 100644 --- a/deskutils/charmtimetracker/Makefile +++ b/deskutils/charmtimetracker/Makefile @@ -14,7 +14,7 @@ COMMENT= Time tracker LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake:outsource compiler:c++11-lib +USES= cmake:outsource compiler:c++11-lib qt:5 # Use bundled keychain; the keychain is only used for KDAB-internal # features not available or configurable in the port. CMAKE_ARGS= -DCharm_VERSION:STRING=${PORTVERSION} \ @@ -24,7 +24,7 @@ USE_GITHUB= yes GH_ACCOUNT= KDAB GH_PROJECT= Charm -USE_QT5= core dbus gui \ +USE_QT= core dbus gui \ network printsupport script sql sql-sqlite3 \ testlib widgets xml \ buildtools_build qmake_build diff --git a/deskutils/copyq/Makefile b/deskutils/copyq/Makefile index 7e4f52d5e912..4614ae200178 100644 --- a/deskutils/copyq/Makefile +++ b/deskutils/copyq/Makefile @@ -11,9 +11,9 @@ COMMENT= Qt5 based clipboard manager LICENSE= GPLv3 -USES= qmake +USES= qmake qt:5 USE_XORG= x11 xfixes xtst -USE_QT5= core gui network svg multimedia imageformats \ +USE_QT= core gui network svg multimedia imageformats \ buildtools_build x11extras concurrent widgets xml \ script USE_GL= gl diff --git a/deskutils/fbreader/Makefile b/deskutils/fbreader/Makefile index dce5a4a6a87f..3659a90d6312 100644 --- a/deskutils/fbreader/Makefile +++ b/deskutils/fbreader/Makefile @@ -45,7 +45,8 @@ OPTIONS_SUB= yes GTK2_USE= gnome=gtk20 GTK2_MAKE_ENV= UI_TYPE=gtk -QT4_USE= qt4=gui,corelib,imageformats,network,moc_build +QT4_USES= qt:4 +QT4_USE= qt=gui,corelib,imageformats,network,moc_build QT4_LIBS= -L${QT_LIBDIR} QT4_MAKE_ENV= UI_TYPE=qt4 diff --git a/deskutils/fet/Makefile b/deskutils/fet/Makefile index d23158e3a260..107419b199b9 100644 --- a/deskutils/fet/Makefile +++ b/deskutils/fet/Makefile @@ -15,7 +15,7 @@ COMMENT= Free timetabling software LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= qmake tar:bzip2 +USES= qmake qt:4 tar:bzip2 PORTEXAMPLES= * @@ -34,8 +34,10 @@ ONLYCL_DESC= Build only command line version (without Qt GUI) OPTIONS_SUB= yes -QT4_USE= QT4=corelib,moc_build,rcc_build,uic_build,xml -QT5_USE= QT5=buildtools_build,core,xml GL=gl +QT4_USES= qt:4 +QT4_USE= QT=corelib,moc_build,rcc_build,uic_build,xml +QT5_USES= qt:5 +QT5_USE= QT=buildtools_build,core,xml GL=gl .include <bsd.port.options.mk> @@ -45,9 +47,9 @@ QMAKE_SOURCE_PATH= ${WRKSRC}/src/src-cl.pro .else INSTALL_TARGET+= ${WRKSRC}/fet .if ${PORT_OPTIONS:MQT4} -USE_QT4+=gui network +USE_QT+= gui network .else -USE_QT5+=gui network printsupport widgets +USE_QT+= gui network printsupport widgets .endif .endif diff --git a/deskutils/flameshot/Makefile b/deskutils/flameshot/Makefile index ab7e7016b21b..0d5892be8736 100644 --- a/deskutils/flameshot/Makefile +++ b/deskutils/flameshot/Makefile @@ -17,10 +17,10 @@ GH_ACCOUNT= lupoDharkael INSTALL_ICONS= yes -USES= qmake +USES= qmake qt:5 USE_GITHUB= yes USE_GL= gl -USE_QT5= core dbus gui linguist network widgets \ +USE_QT= core dbus gui linguist network widgets \ buildtools_build post-patch: diff --git a/deskutils/grantlee-editor/Makefile b/deskutils/grantlee-editor/Makefile index 13bfaf80c7bc..c5fbb811e476 100644 --- a/deskutils/grantlee-editor/Makefile +++ b/deskutils/grantlee-editor/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libassuan.so:security/libassuan \ libqgpgme.so:security/gpgme-qt5 USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 \ - kde:5 tar:xz + kde:5 qt:5 tar:xz USE_KDE= archive attica auth codecs completion config configwidgets \ coreaddons crash dbusaddons ecm i18n itemmodels jobwidgets \ kio newstuff service syntaxhighlighting texteditor \ @@ -24,7 +24,7 @@ USE_KDE= archive attica auth codecs completion config configwidgets \ # pim components USE_KDE+= akonadi akonadicontacts akonadimime contacts grantleetheme \ kdepim-apps-libs libkleo messagelib mime pimcommon pimtextedit -USE_QT5= core dbus gui location network qml quick webchannel webengine \ +USE_QT= core dbus gui location network qml quick webchannel webengine \ widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes diff --git a/deskutils/grantleetheme/Makefile b/deskutils/grantleetheme/Makefile index 70a524efc740..c935098f27c8 100644 --- a/deskutils/grantleetheme/Makefile +++ b/deskutils/grantleetheme/Makefile @@ -10,10 +10,10 @@ COMMENT= KDE PIM grantleetheme LICENSE= LGPL21 USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 \ - pkgconfig tar:xz + pkgconfig qt:5 tar:xz USE_KDE= attica auth codecs config configwidgets coreaddons ecm i18n \ iconthemes newstuff service widgetsaddons xmlgui -USE_QT5= core dbus gui network testlib widgets xml \ +USE_QT= core dbus gui network testlib widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes diff --git a/deskutils/homerun/Makefile b/deskutils/homerun/Makefile index 5c2b169a10ba..1d1410b7dd99 100644 --- a/deskutils/homerun/Makefile +++ b/deskutils/homerun/Makefile @@ -9,9 +9,9 @@ MASTER_SITES= KDE/unstable/${PORTNAME}/src/ MAINTAINER= yurkis@gmail.com COMMENT= Fullscreen launcher with content organized in tabs -USES= cmake:outsource compiler:c++0x gettext kde:4 tar:bzip2 +USES= cmake:outsource compiler:c++0x gettext kde:4 qt:4 tar:bzip2 USE_KDE= kdelibs automoc4 workspace -USE_QT4= moc_build qmake_build rcc_build uic_build corelib gui +USE_QT= moc_build qmake_build rcc_build uic_build corelib gui USE_XORG= x11 USE_LDCONFIG= yes diff --git a/deskutils/kaddressbook/Makefile b/deskutils/kaddressbook/Makefile index 8a5cf52ec63f..0a0275eecf80 100644 --- a/deskutils/kaddressbook/Makefile +++ b/deskutils/kaddressbook/Makefile @@ -14,14 +14,14 @@ LIB_DEPENDS= libassuan.so:security/libassuan \ libqgpgme.so:security/gpgme-qt5 USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 \ - tar:xz + qt:5 tar:xz USE_KDE= auth codecs completion config configwidgets coreaddons crash \ ecm i18n iconthemes itemmodels jobwidgets kcmutils kio parts \ prison service sonnet textwidgets widgetsaddons xmlgui # pim components USE_KDE+= akonadi akonadicontacts akonadisearch contacts grantleetheme \ kdepim-apps-libs kontactinterface libkdepim pimcommon -USE_QT5= core dbus gui network printsupport widgets xml \ +USE_QT= core dbus gui network printsupport widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes diff --git a/deskutils/kalarm/Makefile b/deskutils/kalarm/Makefile index bc4d36d9dbd5..226e824dcadd 100644 --- a/deskutils/kalarm/Makefile +++ b/deskutils/kalarm/Makefile @@ -10,7 +10,7 @@ COMMENT= Personal alarm scheduler LIB_DEPENDS= libical.so:devel/libical -USES= cmake:outsource compiler:c++11-lib gettext kde:5 shebangfix tar:xz +USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 shebangfix tar:xz USE_KDE= auth bookmarks codecs completion config configwidgets \ coreaddons crash dbusaddons ecm guiaddons i18n iconthemes \ itemmodels itemviews jobwidgets kcmutils kdelibs4support kio \ @@ -21,7 +21,7 @@ USE_KDE+= akonadi akonadicontacts akonadimime alarmcalendar calendarcore \ calendarutils contacts holidays identitymanagement \ kdepim-apps-libs libkdepim mailcommon mailtransport mime \ pimcommon pimtextedit imap -USE_QT5= core dbus gui network phonon4 printsupport widgets x11extras xml \ +USE_QT= core dbus gui network phonon4 printsupport widgets x11extras xml \ buildtools_build qmake_build USE_LDCONFIG= yes diff --git a/deskutils/kcharselect-kde4/Makefile b/deskutils/kcharselect-kde4/Makefile index e8e7755f1ea1..33e6c38227aa 100644 --- a/deskutils/kcharselect-kde4/Makefile +++ b/deskutils/kcharselect-kde4/Makefile @@ -9,8 +9,8 @@ CATEGORIES= deskutils kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= Character selector for KDE -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= automoc4 kdelibs -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build .include <bsd.port.mk> diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile index ccb73695726e..89e13658c5ab 100644 --- a/deskutils/kcharselect/Makefile +++ b/deskutils/kcharselect/Makefile @@ -10,8 +10,8 @@ COMMENT= Character selector for KDE 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= ecm bookmarks doctools i18n widgetsaddons xmlgui -USE_QT5= buildtools_build qmake_build widgets +USE_QT= buildtools_build qmake_build widgets .include <bsd.port.mk> diff --git a/deskutils/kchmviewer/Makefile b/deskutils/kchmviewer/Makefile index 32ae5521ab40..447e661ea2e9 100644 --- a/deskutils/kchmviewer/Makefile +++ b/deskutils/kchmviewer/Makefile @@ -13,8 +13,8 @@ COMMENT= KDE viewer for CHM files LIB_DEPENDS= libchm.so:misc/chmlib \ libzip.so:archivers/libzip -USES= dos2unix qmake:outsource -USE_QT5= core dbus gui network printsupport webkit widgets xml \ +USES= dos2unix qmake:outsource qt:5 +USE_QT= core dbus gui network printsupport webkit widgets xml \ buildtools_build qmake_build USE_XORG= x11 diff --git a/deskutils/kdeconnect/Makefile b/deskutils/kdeconnect/Makefile index 7b22833422fa..8177fba57e7d 100644 --- a/deskutils/kdeconnect/Makefile +++ b/deskutils/kdeconnect/Makefile @@ -9,9 +9,9 @@ MASTER_SITES= KDE/unstable/kdeconnect/${PORTVERSION}/src/ MAINTAINER= yurkis@gmail.com COMMENT= Support for KDE to interface between your phone and your computer -USES= cmake:noninja compiler:c++0x gettext kde:4 tar:xz +USES= cmake:noninja compiler:c++0x gettext kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 workspace runtime -USE_QT4= corelib gui moc_build qmake_build uic_build rcc_build +USE_QT= corelib gui moc_build qmake_build uic_build rcc_build USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/deskutils/kdepim-addons/Makefile b/deskutils/kdepim-addons/Makefile index e7c1d907cf87..e0b0bfa3f38d 100644 --- a/deskutils/kdepim-addons/Makefile +++ b/deskutils/kdepim-addons/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libassuan.so:security/libassuan \ libqgpgme.so:security/gpgme-qt5 USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 \ - pkgconfig tar:xz + pkgconfig qt:5 tar:xz USE_KDE= archive auth codecs completion config configwidgets coreaddons \ dbusaddons ecm i18n iconthemes itemmodels itemviews jobwidgets \ kdeclarative khtml kio prison service sonnet syntaxhighlighting \ @@ -29,7 +29,7 @@ USE_KDE+= akonadi akonadicalendar akonadicontacts akonadiimportwizard \ kdepim-apps-libs libkdepim libkleo libksieve mailcommon \ mailimporter mailtransport messagelib mime pimcommon \ pimtextedit tnef -USE_QT5= core dbus gui location network printsupport qml quick testlib \ +USE_QT= core dbus gui location network printsupport qml quick testlib \ webchannel webengine widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes diff --git a/deskutils/kdepim-apps-libs/Makefile b/deskutils/kdepim-apps-libs/Makefile index cddb1176ce6e..6da57b355b22 100644 --- a/deskutils/kdepim-apps-libs/Makefile +++ b/deskutils/kdepim-apps-libs/Makefile @@ -15,14 +15,14 @@ LIB_DEPENDS= libassuan.so:security/libassuan \ libgpgmepp.so:security/gpgme-cpp \ libqgpgme.so:security/gpgme-qt5 -USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 qt:5 tar:xz USE_KDE= auth codecs completion config configwidgets coreaddons \ dbusaddons ecm i18n iconthemes itemmodels jobwidgets \ kdewebkit kio service sonnet widgetsaddons xmlgui # pim components USE_KDE+= akonadi akonadicontacts contacts grantleetheme libkleo mime \ pimcommon pimtextedit -USE_QT5= core dbus gui network testlib uitools webkit widgets xml \ +USE_QT= core dbus gui network testlib uitools webkit widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes diff --git a/deskutils/kdepim-kde4/Makefile b/deskutils/kdepim-kde4/Makefile index d9f73189a32b..ffca4192842c 100644 --- a/deskutils/kdepim-kde4/Makefile +++ b/deskutils/kdepim-kde4/Makefile @@ -25,12 +25,12 @@ CONFLICTS_INSTALL= kdepim44-4.* USE_GNOME= libxml2 libxslt:build USE_KDE= kdelibs pimlibs kactivities \ akonadi automoc4 soprano nepomuk-widgets baloo -USES= cmake:outsource grantlee:4 iconv kde:4 shebangfix tar:xz +USES= cmake:outsource grantlee:4 iconv kde:4 qt:4 shebangfix tar:xz SHEBANG_FILES= agents/mailfilteragent/kconf_update/migrate-kmail-filters.pl \ kalarm/*.pl kmail/kconf_update/*.pl \ libkpgp/kconf_update/kpgp-3.1-upgrade-address-data.pl USE_OPENLDAP= yes -USE_QT4= corelib dbus declarative designer_build gui network opengl \ +USE_QT= corelib dbus declarative designer_build gui network opengl \ qt3support script sql webkit xml \ qmake_build moc_build rcc_build uic_build USE_XORG= x11 xscrnsaver diff --git a/deskutils/kdepim-runtime-kde4/Makefile b/deskutils/kdepim-runtime-kde4/Makefile index 01d5b6f4c550..aa5b2715da61 100644 --- a/deskutils/kdepim-runtime-kde4/Makefile +++ b/deskutils/kdepim-runtime-kde4/Makefile @@ -21,11 +21,11 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ CONFLICTS_INSTALL= kdepim-runtime44-4.* -USES= cmake:outsource kde:4 shared-mime-info tar:xz +USES= cmake:outsource kde:4 qt:4 shared-mime-info tar:xz USE_GNOME= libxml2 libxslt:build USE_KDE= kdelibs pimlibs \ akonadi automoc4 -USE_QT4= corelib dbus declarative designer_build gui network qtestlib \ +USE_QT= corelib dbus declarative designer_build gui network qtestlib \ script xml xmlpatterns \ qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/deskutils/kdepim-runtime/Makefile b/deskutils/kdepim-runtime/Makefile index b3b2dae7f299..5b7007eaef81 100644 --- a/deskutils/kdepim-runtime/Makefile +++ b/deskutils/kdepim-runtime/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \ libsasl2.so:security/cyrus-sasl2 \ libxerces-c-3.2.so:textproc/xerces-c3 -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 bookmarks codecs completion config configwidgets \ coreaddons crash dbusaddons guiaddons holidays i18n iconthemes \ itemmodels itemviews jobwidgets kcmutils kdelibs4support kio \ @@ -28,7 +28,7 @@ USE_KDE+= akonadi akonadicontacts akonadimime akonadinotes \ calendarutils contacts gapi identitymanagement imap \ kontactinterface kpimdav mailtransport mbox mime pimcommon \ pimtextedit syndication -USE_QT5= core dbus gui location network printsupport qml quick speech \ +USE_QT= core dbus gui location network printsupport qml quick speech \ script webchannel webengine widgets xml xmlpatterns \ buildtools_build qmake_build USE_LDCONFIG= yes diff --git a/deskutils/kdepimlibs-kde4/Makefile b/deskutils/kdepimlibs-kde4/Makefile index 2ceb79126576..ff34b47d893a 100644 --- a/deskutils/kdepimlibs-kde4/Makefile +++ b/deskutils/kdepimlibs-kde4/Makefile @@ -21,12 +21,12 @@ LIB_DEPENDS= libgpgme.so:security/gpgme \ libprison.so:graphics/prison \ libqjson.so:devel/qjson@qt4 -USES= cmake:outsource kde:4 shared-mime-info shebangfix tar:xz +USES= cmake:outsource kde:4 qt:4 shared-mime-info shebangfix tar:xz USE_KDE= kdelibs akonadi \ automoc4 ontologies soprano SHEBANG_FILES= mailtransport/kconf_update/migrate-transports.pl USE_OPENLDAP= yes -USE_QT4= corelib dbus declarative designer_build gui network sql xml \ +USE_QT= corelib dbus declarative designer_build gui network sql xml \ qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/deskutils/kdeplasma-addons-kde4/Makefile b/deskutils/kdeplasma-addons-kde4/Makefile index 2131397a923d..d61dc47309b4 100644 --- a/deskutils/kdeplasma-addons-kde4/Makefile +++ b/deskutils/kdeplasma-addons-kde4/Makefile @@ -15,10 +15,10 @@ LIB_DEPENDS= libqalculate.so:math/libqalculate \ libqjson.so:devel/qjson@qt4 CONFLICTS_INSTALL= plasma-applet-icontasks-0.[89].* -USES= cmake:outsource eigen:2 kde:4 pkgconfig shared-mime-info tar:xz +USES= cmake:outsource eigen:2 kde:4 pkgconfig qt:4 shared-mime-info tar:xz USE_KDE= kdelibs libkexiv2 pimlibs workspace \ akonadi attica automoc4 qimageblitz soprano -USE_QT4= corelib dbus declarative gui network script sql webkit \ +USE_QT= corelib dbus declarative gui network script sql webkit \ qmake_build moc_build rcc_build uic_build USE_XORG= x11 xrender xtst USE_LDCONFIG= yes diff --git a/deskutils/keditbookmarks/Makefile b/deskutils/keditbookmarks/Makefile index 8ad251d74158..f2b058004f7b 100644 --- a/deskutils/keditbookmarks/Makefile +++ b/deskutils/keditbookmarks/Makefile @@ -7,11 +7,11 @@ CATEGORIES= deskutils kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= Bookmark Organizer and Editor -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 ecm i18n iconthemes jobwidgets kio parts service \ sonnet textwidgets widgetsaddons windowsystem xmlgui -USE_QT5= core dbus gui network widgets xml \ +USE_QT= core dbus gui network widgets xml \ buildtools_build qmake_build .include <bsd.port.mk> diff --git a/deskutils/kfind/Makefile b/deskutils/kfind/Makefile index e4827855cc4d..af4a60655f3f 100644 --- a/deskutils/kfind/Makefile +++ b/deskutils/kfind/Makefile @@ -7,13 +7,13 @@ CATEGORIES= deskutils kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= Find files and folders -USES= cmake:outsource gettext kde:5 tar:xz +USES= cmake:outsource gettext kde:5 qt:5 tar:xz USE_KDE= archive auth bookmarks codecs completion config configwidgets \ coreaddons crash ecm guiaddons i18n iconthemes itemviews \ jobwidgets kdelibs4support kio notifications parts service \ solid sonnet 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/deskutils/kmail-account-wizard/Makefile b/deskutils/kmail-account-wizard/Makefile index ada68bb3bbfc..70e2e4e69c3f 100644 --- a/deskutils/kmail-account-wizard/Makefile +++ b/deskutils/kmail-account-wizard/Makefile @@ -13,7 +13,7 @@ LIB_DEPENDS= libassuan.so:security/libassuan \ libgpgmepp.so:security/gpgme-cpp \ libqgpgme.so:security/gpgme-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= attica auth codecs config configwidgets coreaddons crash \ dbusaddons ecm i18n itemmodels itemviews kcmutils kio kross \ newstuff notifications notifyconfig service texteditor wallet \ @@ -21,7 +21,7 @@ USE_KDE= attica auth codecs config configwidgets coreaddons crash \ # pim components USE_KDE+= akonadi akonadimime identitymanagement ldap libkdepim libkleo \ mailtransport mime pimcommon pimtextedit -USE_QT5= core dbus gui network script widgets xml \ +USE_QT= core dbus gui network script widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes diff --git a/deskutils/kmail/Makefile b/deskutils/kmail/Makefile index 9724911c5391..b4d23b069fb7 100644 --- a/deskutils/kmail/Makefile +++ b/deskutils/kmail/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= accountwizard:deskutils/kmail-account-wizard \ mboximporter:deskutils/mbox-importer \ sieveeditor:deskutils/pim-sieve-editor -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 bookmarks codecs completion config configwidgets \ coreaddons crash dbusaddons ecm guiaddons i18n iconthemes \ itemmodels itemviews jobwidgets kcmutils kdelibs4support kio \ @@ -33,7 +33,7 @@ USE_KDE+= akonadi akonadicontacts akonadimime akonadisearch calendarcore \ identitymanagement libkdepim libkleo libksieve \ kontactinterface ldap mailcommon mailtransport messagelib \ mime pimcommon pimtextedit tnef -USE_QT5= core dbus gui location network printsupport qml quick \ +USE_QT= core dbus gui location network printsupport qml quick \ webchannel webengine widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes diff --git a/deskutils/knotes/Makefile b/deskutils/knotes/Makefile index dbcd42c2d82a..a61dfcbd121d 100644 --- a/deskutils/knotes/Makefile +++ b/deskutils/knotes/Makefile @@ -11,7 +11,7 @@ LICENSE= LGPL21 LIB_DEPENDS= libical.so:devel/libical -USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib gettext grantlee:5 kde:5 qt:5 tar:xz USE_KDE= attica auth bookmarks codecs completion config configwidgets \ coreaddons crash dbusaddons dnssd globalaccel guiaddons i18n \ iconthemes itemmodels itemviews jobwidgets kcmutils \ @@ -22,7 +22,7 @@ USE_KDE= attica auth bookmarks codecs completion config configwidgets \ USE_KDE+= akonadi akonadicontacts akonadinotes akonadisearch \ calendarcore calendarutils contacts kontactinterface libkdepim \ mime pimcommon pimtextedit -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= ice sm x11 xext USE_LDCONFIG= yes diff --git a/deskutils/kontact/Makefile b/deskutils/kontact/Makefile index f59742493508..7f668e1dd950 100644 --- a/deskutils/kontact/Makefile +++ b/deskutils/kontact/Makefile @@ -9,13 +9,13 @@ COMMENT= KDE Personal Information Manager LICENSE= LGPL21 -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 crash \ ecm i18n iconthemes itemmodels jobwidgets kcmutils kio parts \ service sonnet textwidgets widgetsaddons windowsystem xmlgui # pim components USE_KDE+= akonadi grantleetheme kdepim-apps-libs kontactinterface libkdepim -USE_QT5= core dbus gui location network qml quick webchannel webengine \ +USE_QT= core dbus gui location network qml quick webchannel webengine \ widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes diff --git a/deskutils/korganizer/Makefile b/deskutils/korganizer/Makefile index 2135db53f0e6..37645acba6d3 100644 --- a/deskutils/korganizer/Makefile +++ b/deskutils/korganizer/Makefile @@ -10,7 +10,7 @@ COMMENT= Calendar and scheduling Program LIB_DEPENDS= libical.so:devel/libical -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= attica auth bookmarks codecs completion config configwidgets \ coreaddons crash dbusaddons ecm guiaddons i18n iconthemes \ itemmodels itemviews jobwidgets kcmutils kdelibs4support kio \ @@ -22,7 +22,7 @@ USE_KDE+= akonadi akonadicalendar akonadicontacts akonadimime \ calendarutils contacts eventviews holidays identitymanagement \ incidenceeditor kdepim-apps-libs kontactinterface ldap \ libkdepim mailtransport mime pimcommon pimtextedit -USE_QT5= core dbus gui network phonon4 printsupport widgets xml \ +USE_QT= core dbus gui network phonon4 printsupport widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes diff --git a/deskutils/kruler-kde4/Makefile b/deskutils/kruler-kde4/Makefile index 33e0588ddd6f..df6f5d644e0f 100644 --- a/deskutils/kruler-kde4/Makefile +++ b/deskutils/kruler-kde4/Makefile @@ -8,9 +8,9 @@ CATEGORIES= deskutils kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 screen ruler -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 USE_XORG= x11 .include <bsd.port.mk> diff --git a/deskutils/kruler/Makefile b/deskutils/kruler/Makefile index 49d2e2076fb6..b0efa16f03fb 100644 --- a/deskutils/kruler/Makefile +++ b/deskutils/kruler/Makefile @@ -7,10 +7,10 @@ CATEGORIES= deskutils kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE screen ruler -USES= cmake:outsource gettext kde:5 tar:xz +USES= cmake:outsource gettext kde:5 qt:5 tar:xz USE_KDE= auth codecs config configwidgets coreaddons ecm doctools i18n \ notifications widgetsaddons windowsystem xmlgui -USE_QT5= core dbus gui widgets x11extras xml \ +USE_QT= core dbus gui widgets x11extras xml \ buildtools_build qmake_build USE_XORG= x11 xcb diff --git a/deskutils/ksshaskpass/Makefile b/deskutils/ksshaskpass/Makefile index ff5807da5a2f..0bc3dc4dcf65 100644 --- a/deskutils/ksshaskpass/Makefile +++ b/deskutils/ksshaskpass/Makefile @@ -12,9 +12,9 @@ MAINTAINER= swills@FreeBSD.org COMMENT= KDE 4 version of ssh-askpass with KWallet support WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= cmake kde:4 +USES= cmake kde:4 qt:4 USE_KDE= kdelibs automoc4 -USE_QT4= moc_build uic_build qmake_build rcc_build +USE_QT= moc_build uic_build qmake_build rcc_build SUB_FILES= pkg-message diff --git a/deskutils/latte-dock/Makefile b/deskutils/latte-dock/Makefile index a0dfc4c8659e..0a4c8ecabefd 100644 --- a/deskutils/latte-dock/Makefile +++ b/deskutils/latte-dock/Makefile @@ -13,13 +13,13 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libxcb-util.so:x11/xcb-util -USES= cmake:outsource gettext kde:5 tar:xz +USES= cmake:outsource gettext kde:5 qt:5 tar:xz USE_KDE= activities archive auth codecs config configwidgets \ coreaddons crash dbusaddons globalaccel i18n iconthemes \ kdeclarative notifications package plasma-framework service \ wayland widgetsaddons windowsystem xmlgui \ ecm_build -USE_QT5= core dbus gui network qml quick widgets x11extras xml \ +USE_QT= core dbus gui network qml quick widgets x11extras xml \ buildtools_build qmake_build USE_XORG= ice sm x11 xcb xext diff --git a/deskutils/launchy/Makefile b/deskutils/launchy/Makefile index 3a72b9843431..521142782139 100644 --- a/deskutils/launchy/Makefile +++ b/deskutils/launchy/Makefile @@ -16,9 +16,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs RUN_DEPENDS= ${LOCALBASE}/bin/xdg-open:devel/xdg-utils -USES= dos2unix qmake +USES= dos2unix qmake qt:4 DOS2UNIX_FILES= readme.lyx readme.txt -USE_QT4= moc_build rcc_build uic_build gui network +USE_QT= moc_build rcc_build uic_build gui network LDFLAGS+= -lX11 PORTDOCS= * diff --git a/deskutils/libkdepim/Makefile b/deskutils/libkdepim/Makefile index 21747b5c5588..494dc902e721 100644 --- a/deskutils/libkdepim/Makefile +++ b/deskutils/libkdepim/Makefile @@ -11,13 +11,13 @@ LICENSE= LGPL21 LIB_DEPENDS= libboost_thread.so:devel/boost-libs -USES= cmake:outsource gettext compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource gettext compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= auth codecs completion config configwidgets coreaddons ecm \ i18n iconthemes itemmodels itemviews jobwidgets kcmutils \ kio service wallet widgetsaddons # pim components USE_KDE+= akonadi akonadicontacts akonadisearch contacts ldap mime -USE_QT5= core dbus designer gui network testlib uiplugin uitools \ +USE_QT= core dbus designer gui network testlib uiplugin uitools \ widgets xml \ buildtools_build qmake_build diff --git a/deskutils/lumina-archiver/Makefile b/deskutils/lumina-archiver/Makefile index 3a58ed48cf31..86f88d05eb45 100644 --- a/deskutils/lumina-archiver/Makefile +++ b/deskutils/lumina-archiver/Makefile @@ -22,8 +22,8 @@ I18N_DESC= Install localization files MAKE_JOBS_UNSAFE=yes -USES= qmake -USE_QT5= core gui widgets network svg \ +USES= qmake qt:5 +USE_QT= core gui widgets network svg \ buildtools_build x11extras concurrent multimedia USE_GITHUB= yes GH_ACCOUNT= trueos @@ -32,7 +32,7 @@ GH_TAGNAME= b6536c1547571ae8dd0618bed752e2e0025bf2a7 WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME} .if${PORT_OPTIONS:MI18N} -USE_QT5+= linguist_build +USE_QT+= linguist_build QMAKE_ARGS+=CONFIG+=WITH_I18N .endif diff --git a/deskutils/lumina-calculator/Makefile b/deskutils/lumina-calculator/Makefile index 9bfffbc47267..abfe88cea427 100644 --- a/deskutils/lumina-calculator/Makefile +++ b/deskutils/lumina-calculator/Makefile @@ -27,10 +27,10 @@ I18N_DESC= Install localization files MAKE_JOBS_UNSAFE=yes -USES= qmake +USES= qmake qt:5 USE_GL= gl USE_XORG= x11 xdamage xcb -USE_QT5= core gui widgets network svg \ +USE_QT= core gui widgets network svg \ buildtools_build x11extras concurrent multimedia USE_GITHUB= yes GH_ACCOUNT= trueos @@ -39,7 +39,7 @@ GH_TAGNAME= b6536c1547571ae8dd0618bed752e2e0025bf2a7 WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME} .if${PORT_OPTIONS:MI18N} -USE_QT5+= linguist_build +USE_QT+= linguist_build QMAKE_ARGS+=CONFIG+=WITH_I18N .endif diff --git a/deskutils/lumina-fileinfo/Makefile b/deskutils/lumina-fileinfo/Makefile index eb07c3de5069..3b3fef629ee7 100644 --- a/deskutils/lumina-fileinfo/Makefile +++ b/deskutils/lumina-fileinfo/Makefile @@ -22,8 +22,8 @@ I18N_DESC= Install localization files MAKE_JOBS_UNSAFE=yes -USES= qmake -USE_QT5= core gui widgets network svg \ +USES= qmake qt:5 +USE_QT= core gui widgets network svg \ buildtools_build x11extras concurrent multimedia USE_GITHUB= yes GH_ACCOUNT= trueos @@ -32,7 +32,7 @@ GH_TAGNAME= b6536c1547571ae8dd0618bed752e2e0025bf2a7 WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME} .if${PORT_OPTIONS:MI18N} -USE_QT5+= linguist_build +USE_QT+= linguist_build QMAKE_ARGS+=CONFIG+=WITH_I18N .endif diff --git a/deskutils/lumina-fm/Makefile b/deskutils/lumina-fm/Makefile index feb10c4f732b..191fd1e1d365 100644 --- a/deskutils/lumina-fm/Makefile +++ b/deskutils/lumina-fm/Makefile @@ -22,9 +22,9 @@ I18N_DESC= Install localization files MAKE_JOBS_UNSAFE=yes -USE_QT5= core gui widgets network svg imageformats \ +USE_QT= core gui widgets network svg imageformats \ buildtools_build x11extras multimedia concurrent -USES= qmake +USES= qmake qt:5 USE_GITHUB= yes GH_ACCOUNT= trueos GH_PROJECT= lumina @@ -32,7 +32,7 @@ GH_TAGNAME= b6536c1547571ae8dd0618bed752e2e0025bf2a7 WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME} .if${PORT_OPTIONS:MI18N} -USE_QT5+= linguist_build +USE_QT+= linguisttools_build QMAKE_ARGS+=CONFIG+=WITH_I18N .endif diff --git a/deskutils/lumina-mediaplayer/Makefile b/deskutils/lumina-mediaplayer/Makefile index bd63b79cd123..efe6efe7a0a8 100644 --- a/deskutils/lumina-mediaplayer/Makefile +++ b/deskutils/lumina-mediaplayer/Makefile @@ -24,8 +24,8 @@ I18N_DESC= Install localization files MAKE_JOBS_UNSAFE=yes -USES= qmake -USE_QT5= core gui widgets network svg \ +USES= qmake qt:5 +USE_QT= core gui widgets network svg \ buildtools_build x11extras multimedia concurrent USE_GITHUB= yes GH_ACCOUNT= trueos @@ -34,7 +34,7 @@ GH_TAGNAME= b6536c1547571ae8dd0618bed752e2e0025bf2a7 WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME} .if${PORT_OPTIONS:MI18N} -USE_QT5+= linguist_build +USE_QT+= linguist_build QMAKE_ARGS+=CONFIG+=WITH_I18N .endif diff --git a/deskutils/lumina-notify/Makefile b/deskutils/lumina-notify/Makefile index 0d8dcfc394f7..47c152c6c7f6 100644 --- a/deskutils/lumina-notify/Makefile +++ b/deskutils/lumina-notify/Makefile @@ -18,8 +18,8 @@ I18N_DESC= Install localization files MAKE_JOBS_UNSAFE=yes -USES= qmake -USE_QT5= core gui widgets network svg \ +USES= qmake qt:5 +USE_QT= core gui widgets network svg \ buildtools_build x11extras concurrent multimedia USE_GITHUB= yes GH_ACCOUNT= trueos @@ -28,7 +28,7 @@ GH_TAGNAME= b6536c1547571ae8dd0618bed752e2e0025bf2a7 WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME} .if${PORT_OPTIONS:MI18N} -USE_QT5+= linguist_build +USE_QT+= linguist_build QMAKE_ARGS+=CONFIG+=WITH_I18N .endif diff --git a/deskutils/lumina-pdf/Makefile b/deskutils/lumina-pdf/Makefile index 504e48b1c055..87e42df7fb4c 100644 --- a/deskutils/lumina-pdf/Makefile +++ b/deskutils/lumina-pdf/Makefile @@ -23,9 +23,9 @@ I18N_DESC= Install localization files MAKE_JOBS_UNSAFE=yes -USE_QT5= core gui widgets network svg multimedia \ +USE_QT= core gui widgets network svg multimedia \ buildtools_build x11extras concurrent printsupport -USES= qmake +USES= qmake qt:5 USE_GITHUB= yes GH_ACCOUNT= trueos GH_PROJECT= lumina @@ -33,7 +33,7 @@ GH_TAGNAME= b6536c1547571ae8dd0618bed752e2e0025bf2a7 WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME} .if${PORT_OPTIONS:MI18N} -USE_QT5+= linguist_build +USE_QT+= linguist_build QMAKE_ARGS+=CONFIG+=WITH_I18N .endif diff --git a/deskutils/lumina-screenshot/Makefile b/deskutils/lumina-screenshot/Makefile index 5b7f1f304a82..ba3c74b015d6 100644 --- a/deskutils/lumina-screenshot/Makefile +++ b/deskutils/lumina-screenshot/Makefile @@ -22,9 +22,9 @@ I18N_DESC= Install localization files MAKE_JOBS_UNSAFE=yes -USE_QT5= core gui widgets network svg \ +USE_QT= core gui widgets network svg \ buildtools_build x11extras concurrent multimedia -USES= qmake +USES= qmake qt:5 USE_GITHUB= yes GH_ACCOUNT= trueos GH_PROJECT= lumina @@ -32,7 +32,7 @@ GH_TAGNAME= b6536c1547571ae8dd0618bed752e2e0025bf2a7 WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME} .if${PORT_OPTIONS:MI18N} -USE_QT5+= linguist_build +USE_QT+= linguist_build QMAKE_ARGS+=CONFIG+=WITH_I18N .endif diff --git a/deskutils/lumina-textedit/Makefile b/deskutils/lumina-textedit/Makefile index 795aaa7cbe18..6e4fb37965a2 100644 --- a/deskutils/lumina-textedit/Makefile +++ b/deskutils/lumina-textedit/Makefile @@ -23,9 +23,9 @@ I18N_DESC= Install localization files MAKE_JOBS_UNSAFE=yes -USE_QT5= core gui widgets network svg printsupport \ +USE_QT= core gui widgets network svg printsupport \ buildtools_build x11extras concurrent multimedia -USES= qmake +USES= qmake qt:5 USE_GITHUB= yes GH_ACCOUNT= trueos GH_PROJECT= lumina @@ -33,7 +33,7 @@ GH_TAGNAME= b6536c1547571ae8dd0618bed752e2e0025bf2a7 WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME} .if${PORT_OPTIONS:MI18N} -USE_QT5+= linguist_build +USE_QT+= linguist_build QMAKE_ARGS+=CONFIG+=WITH_I18N .endif diff --git a/deskutils/lumina-xdg-entry/Makefile b/deskutils/lumina-xdg-entry/Makefile index ad6ec727d7bb..1e8d5f236a38 100644 --- a/deskutils/lumina-xdg-entry/Makefile +++ b/deskutils/lumina-xdg-entry/Makefile @@ -20,16 +20,16 @@ I18N_DESC= Install localization files MAKE_JOBS_UNSAFE=yes -USE_QT5= core gui widgets network svg \ +USE_QT= core gui widgets network svg \ buildtools_build x11extras concurrent multimedia -USES= qmake +USES= qmake qt:5 USE_GITHUB= yes GH_ACCOUNT= trueos GH_PROJECT= lumina WRKSRC_SUBDIR= src-qt5/desktop-utils/${PORTNAME} .if${PORT_OPTIONS:MI18N} -USE_QT5+= linguist_build +USE_QT+= linguist_build QMAKE_ARGS+= CONFIG+=WITH_I18N .endif diff --git a/deskutils/mbox-importer/Makefile b/deskutils/mbox-importer/Makefile index a389e3f8b012..da51e285573a 100644 --- a/deskutils/mbox-importer/Makefile +++ b/deskutils/mbox-importer/Makefile @@ -13,14 +13,14 @@ LIB_DEPENDS= libassuan.so:security/libassuan \ libgpgmepp.so:security/gpgme-cpp \ libqgpgme.so:security/gpgme-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= archive auth codecs completion config configwidgets coreaddons \ crash ecm i18n itemmodels kio service widgetsaddons # pim components USE_KDE+= akonadi akonadicontacts akonadimime contacts \ identitymanagement libkleo mailcommon mailimporter messagelib \ mime pimcommon pimtextedit -USE_QT5= core gui network widgets xml \ +USE_QT= core gui network widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes diff --git a/deskutils/nextcloudclient/Makefile b/deskutils/nextcloudclient/Makefile index 41e49189617c..a4c213fed90d 100644 --- a/deskutils/nextcloudclient/Makefile +++ b/deskutils/nextcloudclient/Makefile @@ -16,8 +16,8 @@ LIB_DEPENDS= libinotify.so:devel/libinotify \ libqt5keychain.so:security/qtkeychain@qt5 USES= cmake:outsource,noninja compiler:c++11-lib gmake iconv \ - localbase:ldflags pkgconfig sqlite ssl -USE_QT5= buildtools_build concurrent core dbus gui linguist_build network \ + localbase:ldflags pkgconfig qt:5 sqlite ssl +USE_QT= buildtools_build concurrent core dbus gui linguist_build network \ qmake_build sql webkit widgets xml CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=OFF \ -DCMAKE_INSTALL_MANDIR:STRING=man \ diff --git a/deskutils/owncloudclient/Makefile b/deskutils/owncloudclient/Makefile index c1cfd7afc0a2..8c12db6fd07f 100644 --- a/deskutils/owncloudclient/Makefile +++ b/deskutils/owncloudclient/Makefile @@ -16,8 +16,8 @@ LIB_DEPENDS= libinotify.so:devel/libinotify \ libqt5keychain.so:security/qtkeychain@qt5 USES= cmake:outsource,noninja compiler:c++11-lib gmake iconv kde:5 \ - localbase:ldflags pkgconfig sqlite -USE_QT5= buildtools_build concurrent core dbus gui linguist_build network \ + localbase:ldflags pkgconfig qt:5 sqlite +USE_QT= buildtools_build concurrent core dbus gui linguist_build network \ qmake_build sql webkit widgets xml USE_KDE= completion config coreaddons jobwidgets kio service widgetsaddons CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=OFF \ diff --git a/deskutils/pim-data-exporter/Makefile b/deskutils/pim-data-exporter/Makefile index 7c2b4d14d6ba..8c2a9326574e 100644 --- a/deskutils/pim-data-exporter/Makefile +++ b/deskutils/pim-data-exporter/Makefile @@ -13,7 +13,7 @@ LIB_DEPENDS= libassuan.so:security/libassuan \ libgpgmepp.so:security/gpgme-cpp \ libqgpgme.so:security/gpgme-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= archive auth bookmarks codecs completion config configwidgets \ coreaddons crash dbusaddons ecm i18n itemmodels itemviews \ jobwidgets kio notifications service solid wallet \ @@ -22,7 +22,7 @@ USE_KDE= archive auth bookmarks codecs completion config configwidgets \ USE_KDE+= akonadi akonadicontacts akonadimime contacts \ identitymanagement libkdepim libkleo mailcommon mailtransport \ messagelib mime pimcommon pimtextedit -USE_QT5= core dbus gui network widgets xml \ +USE_QT= core dbus gui network widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes diff --git a/deskutils/pim-sieve-editor/Makefile b/deskutils/pim-sieve-editor/Makefile index 6344a91db91b..dff38cad3fb0 100644 --- a/deskutils/pim-sieve-editor/Makefile +++ b/deskutils/pim-sieve-editor/Makefile @@ -7,14 +7,13 @@ CATEGORIES= deskutils kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= Mail sieve editor - - 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 bookmarks codecs config configwidgets coreaddons crash \ dbusaddons ecm i18n iconthemes kio service wallet \ widgetsaddons xmlgui # pim components USE_KDE+= libksieve mailtransport pimcommon -USE_QT5= core dbus gui network widgets xml \ +USE_QT= core dbus gui network widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes diff --git a/deskutils/plasma-applet-cwp/Makefile b/deskutils/plasma-applet-cwp/Makefile index 051a40c0f75b..c2c0f169af9b 100644 --- a/deskutils/plasma-applet-cwp/Makefile +++ b/deskutils/plasma-applet-cwp/Makefile @@ -14,9 +14,9 @@ COMMENT= Weather plasma applet for KDE4 LICENSE= GPLv3 -USES= cmake gettext kde:4 tar:bzip2 +USES= cmake gettext kde:4 qt:4 tar:bzip2 USE_KDE= automoc4 kdelibs -USE_QT4= gui dbus network opengl svg phonon webkit xml \ +USE_QT= gui dbus network opengl svg phonon webkit xml \ qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/deskutils/plasma-applet-daisy/Makefile b/deskutils/plasma-applet-daisy/Makefile index 39b8e1a3d479..059df80f53b9 100644 --- a/deskutils/plasma-applet-daisy/Makefile +++ b/deskutils/plasma-applet-daisy/Makefile @@ -14,9 +14,9 @@ COMMENT= Simple launcher plasma applet for KDE4 LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake gettext kde:4 +USES= cmake gettext kde:4 qt:4 USE_KDE= automoc4 kdelibs workspace -USE_QT4= corelib dbus gui network svg xml \ +USE_QT= corelib dbus gui network svg xml \ qmake_build moc_build rcc_build uic_build .include <bsd.port.mk> diff --git a/deskutils/plasma-applet-fancytasks/Makefile b/deskutils/plasma-applet-fancytasks/Makefile index f07c145e7aef..ac577f463ec6 100644 --- a/deskutils/plasma-applet-fancytasks/Makefile +++ b/deskutils/plasma-applet-fancytasks/Makefile @@ -14,9 +14,9 @@ COMMENT= Plasmoid fancy representation of your tasks and launchers LICENSE= GPLv2 -USES= cmake kde:4 tar:bzip2 +USES= cmake kde:4 qt:4 tar:bzip2 USE_KDE= automoc4 kdelibs workspace qimageblitz -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/deskutils/plasma-applet-panelspacer/Makefile b/deskutils/plasma-applet-panelspacer/Makefile index c6bf6d54661c..0ccefad29aab 100644 --- a/deskutils/plasma-applet-panelspacer/Makefile +++ b/deskutils/plasma-applet-panelspacer/Makefile @@ -13,9 +13,9 @@ COMMENT= Panel spacer plasma applet for KDE4 LICENSE= GPLv2 -USES= cmake kde:4 +USES= cmake kde:4 qt:4 USE_KDE= automoc4 workspace -USE_QT4= gui dbus network opengl svg webkit xml \ +USE_QT= gui dbus network opengl svg webkit xml \ qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/Panelspacer_from_svn_pour_kdelook-tmp diff --git a/deskutils/plasma-applet-qstardict/Makefile b/deskutils/plasma-applet-qstardict/Makefile index e2acdb6a0c74..a6e4e26d6d5d 100644 --- a/deskutils/plasma-applet-qstardict/Makefile +++ b/deskutils/plasma-applet-qstardict/Makefile @@ -15,8 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${QSTARDICT_PLUGIN_PATH}/libstardict.so:textproc/qstardict -USES= cmake kde:4 tar:bzip2 -USE_QT4= qmake_build uic_build moc_build rcc_build +USES= cmake kde:4 qt:4 tar:bzip2 +USE_QT= qmake_build uic_build moc_build rcc_build USE_KDE= automoc4 kdelibs CMAKE_SOURCE_PATH= ${WRKSRC}/kdeplasma diff --git a/deskutils/plasma-applet-serverstatuswidget/Makefile b/deskutils/plasma-applet-serverstatuswidget/Makefile index 06e4a5759a51..69850a56ae99 100644 --- a/deskutils/plasma-applet-serverstatuswidget/Makefile +++ b/deskutils/plasma-applet-serverstatuswidget/Makefile @@ -13,9 +13,9 @@ COMMENT= KDE4 server monitoring plasma applet LICENSE= GPLv2 -USES= cmake gettext kde:4 tar:bzip2 +USES= cmake gettext kde:4 qt:4 tar:bzip2 USE_KDE= automoc4 workspace -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/deskutils/plasma-applet-simpleweatherforecast/Makefile b/deskutils/plasma-applet-simpleweatherforecast/Makefile index c24e8cd675a6..6d622545d1e6 100644 --- a/deskutils/plasma-applet-simpleweatherforecast/Makefile +++ b/deskutils/plasma-applet-simpleweatherforecast/Makefile @@ -14,9 +14,9 @@ COMMENT= Weather plasma applet for KDE4 RUN_DEPENDS= wget:ftp/wget -USES= cmake kde:4 +USES= cmake kde:4 qt:4 USE_KDE= automoc4 kdelibs -USE_QT4= gui dbus network opengl svg webkit xml \ +USE_QT= gui dbus network opengl svg webkit xml \ qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/plasma-${PORTNAME}-${PORTVERSION}-kde-4.3.80 diff --git a/deskutils/plasma-applet-teacooker/Makefile b/deskutils/plasma-applet-teacooker/Makefile index 3670155c7995..8410f00d7251 100644 --- a/deskutils/plasma-applet-teacooker/Makefile +++ b/deskutils/plasma-applet-teacooker/Makefile @@ -13,9 +13,9 @@ COMMENT= KDE4 tea cooker plasma applet LICENSE= GPLv3 -USES= cmake kde:4 +USES= cmake kde:4 qt:4 USE_KDE= automoc4 kdelibs -USE_QT4= gui dbus network opengl svg webkit xml \ +USE_QT= gui dbus network opengl svg webkit xml \ qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/TeaCooker diff --git a/deskutils/plasma-applet-yawp/Makefile b/deskutils/plasma-applet-yawp/Makefile index a729b6813e6c..16533ad75f5b 100644 --- a/deskutils/plasma-applet-yawp/Makefile +++ b/deskutils/plasma-applet-yawp/Makefile @@ -13,9 +13,9 @@ COMMENT= KDE4 weather plasma applet LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE-GPL2 -USES= cmake gettext kde:4 tar:bzip2 +USES= cmake gettext kde:4 qt:4 tar:bzip2 USE_KDE= automoc4 kdelibs workspace -USE_QT4= corelib dbus gui network svg xml \ +USE_QT= corelib dbus gui network svg xml \ qmake_build moc_build rcc_build uic_build .include <bsd.port.mk> diff --git a/deskutils/plasma5-milou/Makefile b/deskutils/plasma5-milou/Makefile index 1a8ba984d9fe..4b6bb9ed1093 100644 --- a/deskutils/plasma5-milou/Makefile +++ b/deskutils/plasma5-milou/Makefile @@ -7,10 +7,10 @@ CATEGORIES= deskutils kde kde-plasma MAINTAINER= kde@FreeBSD.org COMMENT= Plasma5 Plasmoid for search -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 codecs config coreaddons i18n kdeclarative package \ plasma-framework runner service -USE_QT5= core gui network qml quick script testlib widgets \ +USE_QT= core gui network qml quick script testlib widgets \ buildtools_build qmake_build .include <bsd.port.mk> diff --git a/deskutils/plasma5-sddm-kcm/Makefile b/deskutils/plasma5-sddm-kcm/Makefile index e33bb8286650..8b23c9e80fc4 100644 --- a/deskutils/plasma5-sddm-kcm/Makefile +++ b/deskutils/plasma5-sddm-kcm/Makefile @@ -8,11 +8,11 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Plasma5 config module for SDDM USES= cmake:outsource compiler:c++11-lib gettext kde:5 cpe pkgconfig \ - tar:xz + qt:5 tar:xz USE_KDE= auth archive attica codecs completion config configwidgets \ coreaddons ecm i18n jobwidgets kio newstuff service \ widgetsaddons xmlgui -USE_QT5= concurrent core dbus designer gui network qml quick uiplugin widgets \ +USE_QT= concurrent core dbus designer gui network qml quick uiplugin widgets \ x11extras xml \ buildtools_build qmake_build USE_XORG= ice sm x11 xcb xcursor xext xfixes diff --git a/deskutils/qorganizer/Makefile b/deskutils/qorganizer/Makefile index 0ebdb512d08e..0994a89ae920 100644 --- a/deskutils/qorganizer/Makefile +++ b/deskutils/qorganizer/Makefile @@ -14,8 +14,8 @@ COMMENT= General organizer that includes calendar with jurnal and schedule LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/../COPYING -USES= qmake -USE_QT4= corelib gui network moc_build rcc_build sql +USES= qmake qt:4 +USE_QT= corelib gui network moc_build rcc_build sql WRKSRC= ${WRKDIR}/qOrganizer/src PLIST_FILES= bin/qOrganizer share/pixmaps/qOrganizer.png diff --git a/deskutils/qrfcview/Makefile b/deskutils/qrfcview/Makefile index 1febafc1c89d..4bd65b79b9e4 100644 --- a/deskutils/qrfcview/Makefile +++ b/deskutils/qrfcview/Makefile @@ -13,8 +13,8 @@ COMMENT= Graphical RFC viewer LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE -USES= qmake tar:tgz -USE_QT4= gui network corelib uic_build moc_build rcc_build +USES= qmake qt:4 tar:tgz +USE_QT= gui network corelib uic_build moc_build rcc_build SUB_FILES= qRFCView diff --git a/deskutils/qtm/Makefile b/deskutils/qtm/Makefile index 3eb014623091..1b434af6a6da 100644 --- a/deskutils/qtm/Makefile +++ b/deskutils/qtm/Makefile @@ -12,8 +12,8 @@ COMMENT= Blog management application based on Qt 4 LICENSE= GPLv2 # only LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake tar:bzip2 ssl -USE_QT4= corelib dbus gui network xml \ +USES= cmake qt:4 tar:bzip2 ssl +USE_QT= corelib dbus gui network xml \ moc_build qmake_build rcc_build uic_build CMAKE_ARGS= -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \ -DMANPAGE_DIRECTORY:STRING="${MANPREFIX}/man/man1" \ diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile index 5417f0d2416f..06937b1957eb 100644 --- a/deskutils/recoll/Makefile +++ b/deskutils/recoll/Makefile @@ -55,13 +55,13 @@ KONQUEROR_RUN_DEPENDS= kwebkitpart>0:www/kwebkitpart LATEX_USE= tex=dvipsk:run,latex:run PDF_RUN_DEPENDS= pdftotext:graphics/poppler-utils PS_RUN_DEPENDS= pstotext:print/pstotext -QT4_USE= qt4=moc_build,qmake_build,rcc_build,uic_build \ - qt4=iconengines_run,imageformats_run \ - qt4=corelib,gui,xml,webkit +QT4_USES= qmake:no_env qt:4 +QT4_USE= qt=moc_build,qmake_build,rcc_build,uic_build \ + qt=iconengines_run,imageformats_run \ + qt=corelib,gui,xml,webkit QT4_CONFIGURE_ENABLE= qtgui QT4_CONFIGURE_ENV= QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" \ QTDIR="${PREFIX}" -QT4_VARS= QT_NONSTANDARD=yes SOUND_RUN_DEPENDS= mutagen-pony:audio/py-mutagen@${PY_FLAVOR} \ pykaraoke:audio/py-karaoke@${PY_FLAVOR} X11MON_DESC= X11 session monitoring support diff --git a/deskutils/semantik/Makefile b/deskutils/semantik/Makefile index 02123a5046e6..3f59441e9cdd 100644 --- a/deskutils/semantik/Makefile +++ b/deskutils/semantik/Makefile @@ -12,14 +12,13 @@ COMMENT= KDE mind mapping tool LICENSE= GPLv3 -USES= kde:4 pkgconfig python:2.7 shebangfix tar:bzip2 waf \ +USES= kde:4 pkgconfig python:2.7 qmake:no_env,no_configure qt:4 shebangfix tar:bzip2 waf \ gettext shared-mime-info USE_KDE= kdelibs USE_OCAML= yes NO_OCAML_RUNDEPENDS= yes -USE_QT4= corelib gui linguist_build svg webkit xml \ +USE_QT= corelib gui linguist_build svg webkit xml \ moc_build qmake_build uic_build -QT_NONSTANDARD= yes CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS}" \ PATH="${KDE_PREFIX}/bin:$$PATH" \ WAF_HOME="${WRKSRC}" diff --git a/deskutils/silence/Makefile b/deskutils/silence/Makefile index a938b072bf08..56429f35ef86 100644 --- a/deskutils/silence/Makefile +++ b/deskutils/silence/Makefile @@ -16,9 +16,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/katepart.so:editors/kate-kde4 -USES= cmake kde:4 +USES= cmake kde:4 qt:4 USE_KDE= kdelibs automoc4 -USE_QT4= qmake_build moc_build rcc_build uic_build linguisttools_build +USE_QT= qmake_build moc_build rcc_build uic_build linguisttools_build WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/deskutils/strigiclient/Makefile b/deskutils/strigiclient/Makefile index 04f818a9ab2e..257ae5de8e8a 100644 --- a/deskutils/strigiclient/Makefile +++ b/deskutils/strigiclient/Makefile @@ -13,7 +13,8 @@ LIB_DEPENDS= libstreams.so:deskutils/libstreams \ libstreamanalyzer.so:deskutils/libstreamanalyzer \ libsearchclient.so:deskutils/strigidaemon -USE_QT4= corelib gui dbus moc_build uic_build qmake_build rcc_build +USES= qt:4 +USE_QT= corelib gui dbus moc_build uic_build qmake_build rcc_build USE_LDCONFIG= yes .include <${.CURDIR}/../strigi/Makefile.common> diff --git a/deskutils/superkaramba-kde4/Makefile b/deskutils/superkaramba-kde4/Makefile index 76d62734daa2..eaf8b41d2203 100644 --- a/deskutils/superkaramba-kde4/Makefile +++ b/deskutils/superkaramba-kde4/Makefile @@ -8,9 +8,9 @@ CATEGORIES= deskutils kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= Widget framework for KDE -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 qimageblitz -USE_QT4= qmake_build moc_build rcc_build uic_build +USE_QT= qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes USE_CXXSTD= gnu++98 diff --git a/deskutils/tuxcards/Makefile b/deskutils/tuxcards/Makefile index fb24bec88f9d..0c66985aa066 100644 --- a/deskutils/tuxcards/Makefile +++ b/deskutils/tuxcards/Makefile @@ -11,8 +11,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Tool for managing notes within a hierarchical tree WRKSRC= ${WRKDIR}/${PORTNAME} -USES= qmake -USE_QT4= gui xml moc_build uic_build rcc_build +USES= qmake qt:4 +USE_QT= gui xml moc_build uic_build rcc_build PLIST_FILES= bin/tuxcards diff --git a/deskutils/vym/Makefile b/deskutils/vym/Makefile index 84ac5b2a02cf..16e6e93e5e5f 100644 --- a/deskutils/vym/Makefile +++ b/deskutils/vym/Makefile @@ -10,9 +10,9 @@ MASTER_SITES= SF/vym/Archive/${PORTVERSION} MAINTAINER= lichray@gmail.com COMMENT= VYM is a tool to generate and manipulate mind maps -USES= qmake shebangfix tar:bzip2 +USES= qmake qt:4 shebangfix tar:bzip2 SHEBANG_FILES= scripts/makedist-vym scripts/vivym -USE_QT4= uic_build moc_build qt3support_build \ +USE_QT= uic_build moc_build qt3support_build \ network xml dbus svg QMAKE_ARGS= DATADIR=${DATADIR:C,/vym$,,} \ DOCDIR=${DOCSDIR} @@ -28,7 +28,8 @@ DESKTOP_ENTRIES= "VYM" \ OPTIONS_DEFINE= NLS DOCS OPTIONS_SUB= yes -NLS_USE= QT4=linguist_build +NLS_USES= qt:4 +NLS_USE= QT=linguist_build .include <bsd.port.options.mk> diff --git a/deskutils/znotes/Makefile b/deskutils/znotes/Makefile index 4315079a7980..ba0492191d6a 100644 --- a/deskutils/znotes/Makefile +++ b/deskutils/znotes/Makefile @@ -24,9 +24,11 @@ GH_PROJECT= zNotes GH_TAGNAME= 6423c5e . if ${FLAVOR} == qt4 -USE_QT4= uic_build moc_build rcc_build linguisttools_build corelib gui network xml +USES+= qt:4 +USE_QT= uic_build moc_build rcc_build linguisttools_build corelib gui network xml . else -USE_QT5= buildtools_build linguisttools_build core gui network printsupport widgets xml +USES+= qt:5 +USE_QT= buildtools_build linguisttools_build core gui network printsupport widgets xml . endif DESKTOP_ENTRIES="zNotes" "Notes managment" \ |